diff --git a/circle_and_problems_in_core.txt b/circle_and_problems_in_core.txt new file mode 100644 index 00000000..50bb5ad3 --- /dev/null +++ b/circle_and_problems_in_core.txt @@ -0,0 +1,102 @@ + (0001/185) Calculating build dep of busybox (0002/185) Calculating build dep of libuser (0004/185) Calculating build dep of libpipeline (0005/185) Calculating build dep of liblogging (0006/185) Calculating build dep of alternatives (0003/185) Calculating build dep of less (0007/185) Calculating build dep of kbd (0008/185) Calculating build dep of spidermonkey ---> borks in 'check-devel' + (0009/185) Calculating build dep of sysvinit (0010/185) Calculating build dep of findutils ---> borks in 'libX11-devel' + (0011/185) Calculating build dep of rsyslog (0012/185) Calculating build dep of popt (0013/185) Calculating build dep of gdbm (0014/185) Calculating build dep of python-pyliblzma (0015/185) Calculating build dep of gobject-introspection ---> borks in 'cairo-devel' + (0016/185) Calculating build dep of pisilinux-python ---> borks in 'xmlto' + (0017/185) Calculating build dep of mingetty (0018/185) Calculating build dep of scons ---> borks in 'xmlto' + (0019/185) Calculating build dep of grub2 ---> borks in 'gc-devel' + (0020/185) Calculating build dep of snappy ---> borks in 'xmlto' + (0021/185) Calculating build dep of gnuconfig (0022/185) Calculating build dep of dejavu-fonts ---> borks in 'fontforge' + (0023/185) Calculating build dep of os-prober (0024/185) Calculating build dep of gmp ---> borks in 'xmlto' + (0025/185) Calculating build dep of baselayout ---> borks in 'xmlto' + (0026/185) Calculating build dep of swig (0027/185) Calculating build dep of flex ---> borks in 'xmlto' + (0028/185) Calculating build dep of python-setuptools (0029/185) Calculating build dep of unzip (0030/185) Calculating build dep of libusb-compat ---> borks in 'libX11-devel' + (0031/185) Calculating build dep of python (0032/185) Calculating build dep of libidn (0033/185) Calculating build dep of db (0034/185) Calculating build dep of cpio (0035/185) Calculating build dep of ca-certificates (0036/185) Calculating build dep of lzo ---> borks in 'xmlto' + (0037/185) Calculating build dep of libseccomp (0038/185) Calculating build dep of shadow ---> borks in 'xmlto' + (0039/185) Calculating build dep of util-linux ---> borks in 'xmlto' + (0040/185) Calculating build dep of dhcpcd (0041/185) Calculating build dep of attr ---> borks in 'xmlto' + (0042/185) Calculating build dep of python-psutil ---> borks in 'xmlto' + (0043/185) Calculating build dep of nspr (0044/185) Calculating build dep of dbus ---> borks in 'libX11-devel' + (0045/185) Calculating build dep of comar-api (0046/185) Calculating build dep of patch ---> borks in 'xmlto' + (0047/185) Calculating build dep of psmisc ---> borks in 'xmlto' + (0048/185) Calculating build dep of bison ---> borks in 'xmlto' + (0049/185) Calculating build dep of net-tools (0050/185) Calculating build dep of help2man ---> borks in 'xmlto' + (0051/185) Calculating build dep of man-pages ---> borks in 'libX11-devel' + (0052/185) Calculating build dep of kernel ---> borks in 'xmlto' + (0053/185) Calculating build dep of quilt (0054/185) Calculating build dep of json-c (0055/185) Calculating build dep of udev ---> borks in 'xmlto' + (0056/185) Calculating build dep of yacc (0057/185) Calculating build dep of util-macros (0058/185) Calculating build dep of sed (0059/185) Calculating build dep of intltool ---> borks in 'xmlto' + (0060/185) Calculating build dep of tcp-wrappers (0061/185) Calculating build dep of gperftools (0062/185) Calculating build dep of mdadm (0063/185) Calculating build dep of klibc (0064/185) Calculating build dep of mailcap (0065/185) Calculating build dep of kmod ---> borks in 'xmlto' + (0066/185) Calculating build dep of nss-mdns (0067/185) Calculating build dep of pisi ---> borks in 'xmlto' + (0068/185) Calculating build dep of libunistring (0069/185) Calculating build dep of glibc ---> borks in 'xmlto' + (0070/185) Calculating build dep of libestr (0071/185) Calculating build dep of piksemel ---> borks in 'cython' + (0072/185) Calculating build dep of automake ---> borks in 'xmlto' + (0073/185) Calculating build dep of icecream ---> borks in 'xmlto' + (0074/185) Calculating build dep of miscfiles ---> borks in 'librsync-devel' + (0075/185) Calculating build dep of ccache (0076/185) Calculating build dep of linux-firmware (0077/185) Calculating build dep of run-parts (0078/185) Calculating build dep of libpng ---> borks in 'xmlto' + (0079/185) Calculating build dep of uClibc (0080/185) Calculating build dep of bc (0081/185) Calculating build dep of v86d (0082/185) Calculating build dep of gawk ---> borks in 'xmlto' + (0083/185) Calculating build dep of xcb-proto (0084/185) Calculating build dep of libgcrypt ---> borks in 'xmlto' + (0085/185) Calculating build dep of bash (0086/185) Calculating build dep of eudev (0087/185) Calculating build dep of pcmciautils (0088/185) Calculating build dep of openssl ---> borks in 'xmlto' + (0089/185) Calculating build dep of acl ---> borks in 'xmlto' + (0090/185) Calculating build dep of btyacc (0091/185) Calculating build dep of guile ---> borks in 'gc-devel' + (0092/185) Calculating build dep of glib2 ---> borks in 'libX11-devel' + (0093/185) Calculating build dep of binutils ---> borks in 'xmlto' + (0094/185) Calculating build dep of ppl ---> borks in 'xmlto' + (0095/185) Calculating build dep of cryptsetup ---> borks in 'xmlto' + (0096/185) Calculating build dep of lvm2 (0097/185) Calculating build dep of perl-XML-Parser (0098/185) Calculating build dep of isl (0099/185) Calculating build dep of xz ---> borks in 'xmlto' + (0100/185) Calculating build dep of ntfs-3g ---> borks in 'xmlto' + (0101/185) Calculating build dep of unifdef (0102/185) Calculating build dep of biosdevname ---> borks in 'xmlto' + (0103/185) Calculating build dep of perl-Locale-gettext ---> borks in 'xmlto' + (0104/185) Calculating build dep of lsb-release ---> borks in 'xmlto' + (0105/185) Calculating build dep of mudur ---> borks in 'xmlto' + (0106/185) Calculating build dep of libssh2 ---> borks in 'xmlto' + (0107/185) Calculating build dep of zip (0108/185) Calculating build dep of pkgconfig ---> borks in 'xmlto' + (0109/185) Calculating build dep of perl ---> borks in 'libX11-devel' + (0110/185) Calculating build dep of m4 ---> borks in 'libX11-devel' + (0111/185) Calculating build dep of glpk (0112/185) Calculating build dep of dietlibc (0113/185) Calculating build dep of man-db ---> borks in 'xmlto' + (0114/185) Calculating build dep of libpcre (0115/185) Calculating build dep of groff ---> borks in 'xmlto' + (0116/185) Calculating build dep of libee (0117/185) Calculating build dep of cracklib (0118/185) Calculating build dep of autogen ---> borks in 'gc-devel' + (0119/185) Calculating build dep of libmpc (0120/185) Calculating build dep of ncurses (0121/185) Calculating build dep of yasm (0122/185) Calculating build dep of libunwind (0123/185) Calculating build dep of dbus-python ---> borks in 'python3' + (0124/185) Calculating build dep of sysfsutils (0125/185) Calculating build dep of pypolkit (0126/185) Calculating build dep of grep ---> borks in 'xmlto' + (0127/185) Calculating build dep of pycurl ---> borks in 'xmlto' + (0128/185) Calculating build dep of plyvel ---> borks in 'cython' + (0129/185) Calculating build dep of catbox (0130/185) Calculating build dep of zlib ---> borks in 'libX11-devel' + (0131/185) Calculating build dep of libgpg-error ---> borks in 'xmlto' + (0132/185) Calculating build dep of xtrans (0133/185) Calculating build dep of autoconf ---> borks in 'xmlto' + (0134/185) Calculating build dep of procps (0135/185) Calculating build dep of libsigsegv (0136/185) Calculating build dep of sqlite ---> borks in 'xmlto' + (0137/185) Calculating build dep of chrpath (0138/185) Calculating build dep of tar ---> borks in 'xmlto' + (0139/185) Calculating build dep of diffstat ---> borks in 'xmlto' + (0140/185) Calculating build dep of libxml2 (0141/185) Calculating build dep of expat ---> borks in 'xmlto' + (0142/185) Calculating build dep of freetype ---> borks in 'xmlto' + (0143/185) Calculating build dep of cloog (0144/185) Calculating build dep of file ---> borks in 'xmlto' + (0145/185) Calculating build dep of timezone ---> borks in 'xmlto' + (0146/185) Calculating build dep of curl ---> borks in 'xmlto' + (0147/185) Calculating build dep of libarchive ---> borks in 'xmlto' + (0148/185) Calculating build dep of texinfo (0149/185) Calculating build dep of dbus-glib (0150/185) Calculating build dep of bzip2 ---> borks in 'xmlto' + (0151/185) Calculating build dep of leveldb (0152/185) Calculating build dep of cmake ---> borks in 'libX11-devel' + (0153/185) Calculating build dep of make ---> borks in 'gc-devel' + (0154/185) Calculating build dep of gettext ---> borks in 'xmlto' + (0155/185) Calculating build dep of coreutils (0156/185) Calculating build dep of vixie-cron (0157/185) Calculating build dep of libcap-ng (0158/185) Calculating build dep of which (0159/185) Calculating build dep of libcap (0160/185) Calculating build dep of pam ---> borks in 'xmlto' + (0161/185) Calculating build dep of wireless-tools (0162/185) Calculating build dep of xorg-util (0163/185) Calculating build dep of gperf ---> borks in 'libX11-devel' + (0164/185) Calculating build dep of time (0165/185) Calculating build dep of gcc ---> borks in 'xmlto' + (0166/185) Calculating build dep of polkit ---> borks in 'libX11-devel' + (0167/185) Calculating build dep of fuse (0168/185) Calculating build dep of libtool (0169/185) Calculating build dep of ncompress (0170/185) Calculating build dep of libffi (0171/185) Calculating build dep of readline (0172/185) Calculating build dep of slang ---> borks in 'xmlto' + (0173/185) Calculating build dep of comar ---> borks in 'libX11-devel' + (0174/185) Calculating build dep of nano ---> borks in 'xmlto' + (0175/185) Calculating build dep of diffutils ---> borks in 'xmlto' + (0176/185) Calculating build dep of urlgrabber (0177/185) Calculating build dep of usbutils (0178/185) Calculating build dep of e2fsprogs ---> borks in 'xmlto' + (0179/185) Calculating build dep of nettle ---> borks in 'xmlto' + (0180/185) Calculating build dep of libusb ---> borks in 'xmlto' + (0181/185) Calculating build dep of pciutils (0182/185) Calculating build dep of gzip (0183/185) Calculating build dep of nasm (0184/185) Calculating build dep of elfutils ---> borks in 'xmlto' + (0185/185) Calculating build dep of mpfr ---> borks in 'xmlto' + + +Encountered cycle ['gcc', 'isl', 'gmp'] +Encountered cycle ['glibc', 'binutils'] +Encountered cycle ['gcc', 'gmp'] +Encountered cycle ['gcc', 'libmpc', 'gmp'] +Encountered cycle ['gcc', 'elfutils'] +Encountered cycle ['gettext', 'gcc'] +Encountered cycle ['gcc', 'gettext'] +Encountered cycle ['glibc', 'gettext', 'gcc', 'zlib'] +Encountered cycle ['ppl', 'gcc'] +Encountered cycle ['gcc', 'ppl'] +Encountered cycle ['gettext', 'gcc', 'zlib', 'glibc'] diff --git a/circledep-finder b/circledep-finder new file mode 100755 index 00000000..d237f861 --- /dev/null +++ b/circledep-finder @@ -0,0 +1,193 @@ +#!/usr/bin/python +# +# -*- coding: utf-8 -*- +# +# Copyright (C) 2008, TUBITAK/UEKAE +# +# 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. +# +# Please read the COPYING file. +# + +import sys +import multiprocessing + +import urllib2 +import bz2 +import lzma + +import piksemel + +import pisi +import pisi.dependency as dependency +from pisi.graph import CycleException + + +class SourceDB: + def __init__(self, index): + + self.__source_nodes = {} + self.__pkgstosrc = {} + + doc = piksemel.parseString(index) + self.__source_nodes, self.__pkgstosrc = self.__generate_sources(doc) + + def __generate_sources(self, doc): + sources = {} + pkgstosrc = {} + + for spec in doc.tags("SpecFile"): + src_name = spec.getTag("Source").getTagData("Name") + sources[src_name] = spec.toString() + for package in spec.tags("Package"): + pkgstosrc[package.getTagData("Name")] = src_name + + return sources, pkgstosrc + + def has_spec(self, name): + return self.__source_nodes.has_key(name) + + def get_spec(self, name): + src = self.__source_nodes[name] + spec = pisi.specfile.SpecFile() + spec.parse(src) + return spec + + def list_specs(self): + return self.__source_nodes.keys() + + def pkgtosrc(self, name): + return self.__pkgstosrc[name] + +def find_circle(sourcedb, A): + + G_f = pisi.graph.Digraph() + + def get_spec(name): + if sourcedb.has_spec(name): + return sourcedb.get_spec(name) + else: + raise Exception('Cannot find source package: %s' % name) + + def get_src(name): + return get_spec(name).source + + def add_src(src): + if not str(src.name) in G_f.vertices(): + G_f.add_vertex(str(src.name), (src.version, src.release)) + + def pkgtosrc(pkg): + try: + tmp = sourcedb.pkgtosrc(pkg) + except KeyError, e: + # this is a bad hack but after we hit a problem we need to continue + tmp = "e3" + print "---> borks in ", e + + return tmp + + B = A + + install_list = set() + + while len(B) > 0: + Bp = set() + for x in B: + sf = get_spec(x) + src = sf.source + add_src(src) + + # add dependencies + + def process_dep(dep): + srcdep = pkgtosrc(dep.package) + if not srcdep in G_f.vertices(): + Bp.add(srcdep) + add_src(get_src(srcdep)) + if not src.name == srcdep: # firefox - firefox-devel thing + G_f.add_edge(src.name, srcdep) + + for builddep in src.buildDependencies: + process_dep(builddep) + + for pkg in sf.packages: + for rtdep in pkg.packageDependencies: + process_dep(rtdep) + B = Bp + + try: + order_build = G_f.topological_sort() + order_build.reverse() + except CycleException, cycle: + return str(cycle) + + return "" + +def getIndex(uri): + try: + if "://" in uri: + rawdata = urllib2.urlopen(uri).read() + else: + rawdata = open(uri, "r").read() + except IOError: + print "could not fetch %s" % uri + return None + + if uri.endswith("bz2"): + data = bz2.decompress(rawdata) + elif uri.endswith("xz") or uri.endswith("lzma"): + data = lzma.decompress(rawdata) + else: + data = rawdata + + return data + +def processPackage(pkg, sourcesLength, counter): + global sourcedb + + sys.stdout.write("\r(%04d/%d) Calculating build dep of %s " % (counter, sourcesLength, pkg)) + sys.stdout.flush() + + return find_circle(sourcedb, [pkg]) + +def updateStatus(circleResult): + global cycles + cycles.add(circleResult) + + +if __name__ == "__main__": + + if len(sys.argv) < 2: + print "Usage: circlefinder.py " + sys.exit(1) + + rawIndex = getIndex(sys.argv[1]) + sourcedb = SourceDB(rawIndex) + sources = sourcedb.list_specs() + + sourcesLength = len(sources) + counter = 0 + + global cycles + cycles = set() + + pool = multiprocessing.Pool() + + for pkg in sources: + counter += 1 + pool.apply_async(processPackage, (pkg, sourcesLength, counter), callback=updateStatus) + + pool.close() + pool.join() + + if len(cycles): + print + for cycle in cycles: + print cycle + else: + print "No circular dep found" + + diff --git a/components.xml b/components.xml index d1a67859..cc4fcdef 100755 --- a/components.xml +++ b/components.xml @@ -792,6 +792,17 @@ admins@pisilinux.org + + desktop.toolkit.qt5 + FIXME + FIXME + FIXME + programming + + PisiLinux Community + admins@pisilinux.org + + desktop.toolkit.motif FIXME @@ -1210,39 +1221,6 @@ admins@pisilinux.org - - desktop.lxde - FIXME - FIXME - FIXME - lxde.desktop - - PisiLinux Community - admins@pisilinux.org - - - - desktop.lxde.addon - FIXME - FIXME - FIXME - lxde.addon - - PisiLinux Community - admins@pisilinux.org - - - - desktop.lxde.base - FIXME - FIXME - FIXME - lxde.desktop - - PisiLinux Community - admins@pisilinux.org - - desktop.lxqt FIXME @@ -1298,6 +1276,17 @@ admins@pisilinux.org + + kernel.tools + Kernel Tools + Kernel Tools; perf, cpupowertools + FIXME + system + + PisiLinux Community + admins@pisilinux.org + + x11 FIXME diff --git a/desktop/component.xml b/desktop/component.xml new file mode 100644 index 00000000..f2e99cf5 --- /dev/null +++ b/desktop/component.xml @@ -0,0 +1,3 @@ + + desktop + diff --git a/desktop/font/component.xml b/desktop/font/component.xml new file mode 100644 index 00000000..709d503f --- /dev/null +++ b/desktop/font/component.xml @@ -0,0 +1,3 @@ + + desktop.font + diff --git a/desktop/font/dejavu-fonts/actions.py b/desktop/font/dejavu-fonts/actions.py new file mode 100644 index 00000000..72e68e5b --- /dev/null +++ b/desktop/font/dejavu-fonts/actions.py @@ -0,0 +1,30 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl-3.0.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import pisitools +from pisi.actionsapi import autotools +from pisi.actionsapi import get + + +def build(): + autotools.make('FC-LANG="" BLOCKS="/usr/share/unicode/ucd/Blocks.txt" UNICODEDATA="/usr/share/unicode/ucd/UnicodeData.txt"') + +def check(): + autotools.make("check") + +def install(): + pisitools.insinto("/usr/share/fonts/dejavu", "build/*.ttf") + + # Create symlinks for fontconfig files + for conf in shelltools.ls("fontconfig"): + pisitools.insinto("/etc/fonts/conf.avail", "fontconfig/%s" % conf) + pisitools.dosym("/etc/fonts/conf.avail/%s" % conf, "/etc/fonts/conf.d/%s" % conf) + + + pisitools.dosym("/usr/share/fonts/dejavu" , "/etc/X11/fontpath.d/dejavu") + + pisitools.dodoc("AUTHORS", "LICENSE", "NEWS", "README") diff --git a/desktop/font/dejavu-fonts/pspec.xml b/desktop/font/dejavu-fonts/pspec.xml new file mode 100644 index 00000000..cac22b24 --- /dev/null +++ b/desktop/font/dejavu-fonts/pspec.xml @@ -0,0 +1,56 @@ + + + + + dejavu-fonts + http://www.dejavu-fonts.org + + Sezai Yeniay + sezaiyeniay@pisilinux.org + + as-is + data:font + DejaVu fonts + Contains DejaVu fonts that are based on Bitstream fonts, with improvements. + mirrors://sourceforge/dejavu/dejavu-fonts-2.34.tar.bz2 + + fontforge + perl-Font-TTF + unicode-ucd + + + + + dejavu-fonts + + /etc/fonts + /etc/X11/fontpath.d/dejavu + /usr/share/fonts + /usr/share/doc + + + + + + 2014-01-27 + 2.34 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-05-24 + 2.33.2514 + First release + PisiLinux Community + admins@pisilinux.org + + + 2012-05-24 + 2.33 + First release + Sezai Yeniay + sezaiyeniay@pisilinux.org + + + diff --git a/desktop/font/dejavu-fonts/translations.xml b/desktop/font/dejavu-fonts/translations.xml new file mode 100644 index 00000000..533b9c34 --- /dev/null +++ b/desktop/font/dejavu-fonts/translations.xml @@ -0,0 +1,11 @@ + + + + dejavu-fonts + DejaVu yazıtipleri + DejaVu yazıtipleri + Les fontes DejaVu basées sur des fontes Bitstream avec des améliorations. + DejaVu fonts + Bevat de DejaVu fonts die zijn gebasserd op de Bitstream fonts, met verbeteringen. + + diff --git a/system/base/freetype/actions.py b/desktop/font/freetype/actions.py similarity index 83% rename from system/base/freetype/actions.py rename to desktop/font/freetype/actions.py index 30e30b53..c8c7e356 100644 --- a/system/base/freetype/actions.py +++ b/desktop/font/freetype/actions.py @@ -10,7 +10,8 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): - autotools.configure("-disable-static") + autotools.configure("--disable-static \ + --with-harfbuzz=no") def build(): autotools.make() diff --git a/system/base/freetype/pspec.xml b/desktop/font/freetype/pspec.xml similarity index 87% rename from system/base/freetype/pspec.xml rename to desktop/font/freetype/pspec.xml index 61f1c112..d2146a34 100644 --- a/system/base/freetype/pspec.xml +++ b/desktop/font/freetype/pspec.xml @@ -13,18 +13,12 @@ library A high-quality and portable font engine FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output. It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well. - mirrors://sourceforge/freetype/freetype-2.5.3.tar.bz2 + mirrors://sourceforge/freetype/freetype-2.5.5.tar.bz2 zlib-devel bzip2 libpng-devel - - freetype-2.2.1-enable-valid.patch - freetype-2.5.1-enable-sph.patch - freetype-2.5.1-enable-spr.patch - fix_segfault_with_harfbuzz.diff - @@ -43,11 +37,10 @@ freetype-devel - system.devel Development files for freetype - freetype - harfbuzz-devel + zlib-devel + libpng-devel /usr/bin @@ -66,10 +59,9 @@ zlib-32bit libpng-32bit - harfbuzz-32bit - freetype + glibc-32bit zlib-32bit libpng-32bit @@ -79,6 +71,13 @@ + + 2015-03-11 + 2.5.5 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-05-11 2.5.3 diff --git a/system/base/freetype/translations.xml b/desktop/font/freetype/translations.xml similarity index 100% rename from system/base/freetype/translations.xml rename to desktop/font/freetype/translations.xml diff --git a/distribution.xml b/distribution.xml index 829a01db..bb6898ac 100755 --- a/distribution.xml +++ b/distribution.xml @@ -8,6 +8,9 @@ Core PisiLinux + xorg-video-modesetting + glamor-egl + glamor-egl-devel kdeadmin kdenetwork kdenetwork-devel @@ -363,5 +366,39 @@ libusbx-devel libusbx-32bit labltk + udev + libudev + libgudev1 + libudev-devel + libgudev1-devel + libudev-32bit + libgudev1-32bit + mdbtools-gui + module-nvidia96 + xorg-video-nvidia96 + module-nvidia173 + xorg-video-nvidia173 + libfm + libfm-devel + lxappearance + lxappearance-devel + lxappearance-obconf + lxde-common + lxde-menu-cache + lxde-menu-cache-devel + lxinput + lxmenu-data + lxpanel + lxpanel-devel + lxpolkit + lxrandr + lxsession + lxtask + lxterminal + pcmanfm + pcmanfm-devel + gpicview + lxlauncher + screengrab diff --git a/groups.xml b/groups.xml index fa4560d3..856d45c1 100755 --- a/groups.xml +++ b/groups.xml @@ -288,30 +288,14 @@ Escritorio Razor-qt razor-qt - - lxde.desktop - LXDE Desktop - LXDE Desktop - Skrivbord, LXDE - LXDE Masaüstü - Bureau LXDE - Escritorio LXDE - preferences-desktop - - - lxde.addon - Lxde Desktop Addons - Lxde Masaüstü Araçları - preferences-desktop - lxqt.desktop - LXQT Desktop - LXQT Desktop - Skrivbord, LXQT - LXQT Masaüstü - Bureau LXQT - Escritorio LXQT + Lxqt Desktop + Lxqt Desktop + Skrivbord, Lxqt + Lxqt Masaüstü + Bureau Lxqt + Escritorio Lxqt preferences-desktop diff --git a/hardware/component.xml b/hardware/component.xml new file mode 100644 index 00000000..3d5a2b3c --- /dev/null +++ b/hardware/component.xml @@ -0,0 +1,3 @@ + + hardware + diff --git a/hardware/disk/component.xml b/hardware/disk/component.xml new file mode 100644 index 00000000..1e279a7b --- /dev/null +++ b/hardware/disk/component.xml @@ -0,0 +1,3 @@ + + hardware.disk + diff --git a/system/base/lvm2/actions.py b/hardware/disk/lvm2/actions.py similarity index 97% rename from system/base/lvm2/actions.py rename to hardware/disk/lvm2/actions.py index b7e66566..2eab4ef5 100644 --- a/system/base/lvm2/actions.py +++ b/hardware/disk/lvm2/actions.py @@ -11,11 +11,13 @@ from pisi.actionsapi import shelltools def builddiet(): pisitools.flags.add("-fno-lto") + shelltools.export("LIBS","-lpthread -luuid") #dietCC = "diet %s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS()) dietCC = "%s %s %s -Os -static" % (get.CC(), get.CFLAGS(), get.LDFLAGS()) shelltools.export("CC", dietCC) - + autotools.make("distclean") + autotools.autoreconf("-fi") autotools.configure('ac_cv_lib_dl_dlopen=no \ --with-staticdir="/sbin" \ @@ -31,6 +33,7 @@ def builddiet(): --enable-cmdlib \ --enable-pkgconfig \ --enable-udev_rules \ + --with-systemdsystemunitdir=no \ --enable-udev_sync' % get.CFLAGS()) pisitools.dosed("lib/misc/configure.h","rpl_malloc","malloc") diff --git a/system/base/lvm2/comar/package.py b/hardware/disk/lvm2/comar/package.py similarity index 100% rename from system/base/lvm2/comar/package.py rename to hardware/disk/lvm2/comar/package.py diff --git a/system/base/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch b/hardware/disk/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch similarity index 100% rename from system/base/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch rename to hardware/disk/lvm2/files/lvm2-2.02.105-pthread-pkgconfig.patch diff --git a/system/base/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch b/hardware/disk/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch similarity index 100% rename from system/base/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch rename to hardware/disk/lvm2/files/lvm2-2.02.106-static-pkgconfig-libs.patch diff --git a/system/base/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch b/hardware/disk/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch similarity index 100% rename from system/base/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch rename to hardware/disk/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch diff --git a/system/base/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch b/hardware/disk/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch similarity index 100% rename from system/base/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch rename to hardware/disk/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch diff --git a/system/base/lvm2/files/tmpfiles.conf b/hardware/disk/lvm2/files/tmpfiles.conf similarity index 100% rename from system/base/lvm2/files/tmpfiles.conf rename to hardware/disk/lvm2/files/tmpfiles.conf diff --git a/hardware/disk/lvm2/pspec.xml b/hardware/disk/lvm2/pspec.xml new file mode 100644 index 00000000..d2f17dbd --- /dev/null +++ b/hardware/disk/lvm2/pspec.xml @@ -0,0 +1,241 @@ + + + + + lvm2 + http://sources.redhat.com/lvm/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + Userland logical volume management tools + LVM2 includes all of the support for handling read/write operations physical and logical volumes. + ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz + + libutil-linux-devel + eudev-devel + + + + + + + + device-mapper + + eudev + + Light-weight kernel component can support user-space tools for logical volume management + Device-mapper includes the driver enables the definition of new block devices composed of ranges of sectors of existing devices to define disk partitions or logical volumes. + + /usr/sbin/dmsetup + /usr/lib/libdevmapper.a + /usr/lib/libdevmapper.so* + /lib/udev/rules.d/10-dm.rules + /lib/udev/rules.d/13-dm-disk.rules + /lib/udev/rules.d/95-dm-notify.rules + /usr/share/doc/VERSION_DM + /usr/share/doc/WHATS_NEW_DM + /usr/share/man/man8/dmsetup.8 + + + + + device-mapper-devel + system.devel + Development libraries and headers for device-mapper + Device-mapper-devel contains files needed to develop applications that use the device-mapper libraries. + + device-mapper + eudev-devel + + + /usr/include/libdevmapper.h + /usr/lib/pkgconfig/devmapper.pc + + + + + device-mapper-event + Device-mapper event daemon + This package contains the dmeventd daemon for monitoring the state of device-mapper devices. + + device-mapper + + + /usr/sbin/dmeventd + /usr/lib/libdevmapper-event.a + /usr/lib/libdevmapper-event.so* + /usr/lib/libdevmapper-event-lvm2thin.so + /usr/lib/device-mapper/libdevmapper-event-lvm2thin.so + /usr/share/man/man8/dmeventd.8 + + + + + device-mapper-event-devel + system.devel + Development libraries and headers for the device-mapper event daemon + This contains contains files needed to develop applications that use the device-mapper event library. + + device-mapper-event + + + /usr/include/libdevmapper-event.h + /usr/lib/pkgconfig/devmapper-event.pc + + + + + lvm2 + Userland logical volume management tools + LVM2 includes all of the support for handling read/write operations on physical volumes,creating volume groups from one or more physical volumes and creating one or more logical volumes in volume groups. + + device-mapper + device-mapper-event + libutil-linux + eudev + + + /sbin/lvmconf + /usr/sbin/blkdeactivate + /usr/sbin/fsadm + /usr/sbin/lv* + /usr/sbin/vg* + /usr/sbin/pv* + /usr/lib/liblvm2app.so* + /usr/lib/liblvm2cmd.so* + /usr/lib/libdevmapper-event-lvm2.so* + /usr/lib/device-mapper/libdevmapper-event-lvm2mirror.so + /usr/lib/device-mapper/libdevmapper-event-lvm2snapshot.so + /usr/lib/libdevmapper-event-lvm2mirror.so + /usr/lib/libdevmapper-event-lvm2snapshot.so + /usr/lib/libdevmapper-event-lvm2raid.so + /usr/lib/device-mapper/libdevmapper-event-lvm2raid.so + /etc/lvm + /etc/lvm/archive + /etc/lvm/backup + /etc/lvm/cache + /var/lock/lvm + /lib/udev/rules.d/11-dm-lvm.rules + /usr/lib/tmpfiles.d/lvm2.conf + /usr/share/doc + /usr/share/man/man5/lvm.conf.5 + /usr/share/man/man7 + /usr/share/man/man8/fsadm.8 + /usr/share/man/man8/blkdeactivate.8 + /usr/share/man/man8/*pv* + /usr/share/man/man8/*lv* + /usr/share/man/man8/*vg* + + + tmpfiles.conf + + + System.Package + + + + + lvm2-devel + system.devel + Development libraries and headers + This package contains files needed to develop applications that use the lvm2 libraries. + + libutil-linux-devel + lvm2 + device-mapper-devel + device-mapper-event-devel + + + /usr/include/lvm2cmd.h + /usr/include/lvm2app.h + /usr/lib/pkgconfig/lvm2app.pc + + + + + dietlibc-libdevmapper + system.devel + Static devmapper library built with dietlibc + device mapper contains ioctl library and utilities for use with logical volume management (LVM2) built with dietlibc + + /usr/lib/dietlibc/lib-i386/libdevmapper.a + + + + + device-mapper-static + Staticaly linked Device-mapper library and utility + device mapper contains statically linked libraries and utility for initramfs. + + /sbin/dmsetup.static + + + + + lvm2-static + Staticaly linked Logical Volume Management utilities + Number of utilities for creating, checking, and repairing logical volumes - statically linked for initramfs. + + /sbin/lvm.static + + + + + + 2015-05-02 + 2.02.118 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-09-04 + 2.02.111 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-09 + 2.02.106 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-07 + 2.02.105 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-09 + 2.02.103 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-26 + 2.02.98 + Fix dep, release bump. + Serdar Soytetir + kaptanan@pisilinux.org + + + 2012-11-14 + 2.02.98 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/system/base/lvm2/pspec.xml b/hardware/disk/lvm2/pspec.xml.new similarity index 92% rename from system/base/lvm2/pspec.xml rename to hardware/disk/lvm2/pspec.xml.new index 7eef1335..fb194a20 100644 --- a/system/base/lvm2/pspec.xml +++ b/hardware/disk/lvm2/pspec.xml.new @@ -3,7 +3,7 @@ lvm2 - http://sources.redhat.com/lvm/ + https://www.sourceware.org/lvm2/ PisiLinux Community admins@pisilinux.org @@ -12,16 +12,15 @@ app:console Userland logical volume management tools LVM2 includes all of the support for handling read/write operations physical and logical volumes. - ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.111.tgz + ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz - libuuid-devel - libblkid-devel + libutil-linux-devel - lvm2-2.02.63-always-make-static-libdm.patch - lvm2-2.02.92-dynamic-static-ldflags.patch - lvm2-2.02.105-pthread-pkgconfig.patch - lvm2-2.02.106-static-pkgconfig-libs.patch + lvm2-make-sockets-static.patch + @@ -97,8 +96,7 @@ device-mapper device-mapper-event - libudev - libblkid + libutil-linux /sbin/lvmconf @@ -186,6 +184,13 @@ + + 2015-04-30 + 2.02.118 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-09-04 2.02.111 diff --git a/system/base/lvm2/translations.xml b/hardware/disk/lvm2/translations.xml similarity index 100% rename from system/base/lvm2/translations.xml rename to hardware/disk/lvm2/translations.xml diff --git a/hardware/disk/mdadm/actions.py b/hardware/disk/mdadm/actions.py new file mode 100644 index 00000000..b264c923 --- /dev/null +++ b/hardware/disk/mdadm/actions.py @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def builddiet(): + autotools.make("clean") + shelltools.export("CC", "diet %s %s %s %s -DHAVE_STDINT_H -Os -static" % (get.CC(), get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS())) + autotools.make("mdadm.static") + autotools.make("mdassemble.static") + + pisitools.insinto("/sbin", "mdadm.static") + pisitools.insinto("/sbin", "mdassemble.static") + +def build(): + # fix build with gcc-4.9.0 + pisitools.dosed("Makefile", "(Wall) -Werror", "\\1") + # Not sure about MDASSEMBLE_AUTO=1. Need to investigate. + autotools.make("SYSCONFDIR=/%s MDASSEMBLE_AUTO=1 mdassemble mdadm mdmon" % get.confDIR()) + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # Remove the udev file as its shipped with udev package + pisitools.remove("/lib/udev/rules.d/*") + + # Install config file + pisitools.insinto("/etc", "mdadm.conf-example", "mdadm.conf") + + builddiet() + + pisitools.dodoc("TODO", "ChangeLog", "COPYING", "mdadm.conf-example", "misc/*") + diff --git a/hardware/disk/mdadm/comar/service.py b/hardware/disk/mdadm/comar/service.py new file mode 100644 index 00000000..7f6355f4 --- /dev/null +++ b/hardware/disk/mdadm/comar/service.py @@ -0,0 +1,42 @@ +from comar.service import * + +serviceType = "server" +serviceDesc = _({"en": "RAID monitor daemon", + "tr": "RAID izleme servisi"}) +serviceConf = "mdadm" + +MSG_ERR_STRTSRVC = {"en": "Couldn't start service.Please edit mdadm.conf file.", + "tr": "Servis başlatılamadı.Lütfen mdadm.conf dosyasını düzenleyiniz.", + } + +def check(): + try: + f = file("/etc/mdadm.conf") + confLines = [a.lstrip() for a in f] + confLines = filter(lambda x: not (x.startswith("\#") or x == ""), confLines) + check = False + for line in confLines: + if "MAILADDR" or "PROGRAM" in line.split(): + check = True + if not check: + fail(MSG_ERR_STRTSRVC) + except: + fail(MSG_ERR_STRTSRVC) + finally: + f.close() + +@synchronized +def start(): + check() + startService(command="/sbin/mdadm", + args="--monitor --scan --daemonise --pid-file /run/mdadm.pid %s" % config.get("MDADM_OPTS"), + pidfile="/run/mdadm.pid", + donotify=True) + +@synchronized +def stop(): + stopService(pidfile="/run/mdadm.pid", + donotify=True) + +def status(): + return isServiceRunning("/run/mdadm.pid") diff --git a/hardware/disk/mdadm/files/mdadm.confd b/hardware/disk/mdadm/files/mdadm.confd new file mode 100644 index 00000000..d23368c3 --- /dev/null +++ b/hardware/disk/mdadm/files/mdadm.confd @@ -0,0 +1,7 @@ +# config file for mdadm + +# Misc options to pass to mdadm in monitor mode. +# For more info, run `mdadm --monitor --help` or see +# the mdadm(8) manpage. + +MDADM_OPTS="--syslog" diff --git a/hardware/disk/mdadm/files/mdadm.rules b/hardware/disk/mdadm/files/mdadm.rules new file mode 100644 index 00000000..39fd0cd4 --- /dev/null +++ b/hardware/disk/mdadm/files/mdadm.rules @@ -0,0 +1,8 @@ +# This file causes block devices with Linux RAID (mdadm) signatures to +# automatically cause mdadm to be run. +# See udev(8) for syntax + +SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \ + IMPORT{program}="/sbin/mdadm --examine --export $tempnode", \ + RUN+="/bin/bash -c '[ ! -f /dev/.in_sysinit ] && mdadm -I $env{DEVNAME}'" + diff --git a/hardware/disk/mdadm/files/mdadm.service b/hardware/disk/mdadm/files/mdadm.service new file mode 100644 index 00000000..d09ad8e8 --- /dev/null +++ b/hardware/disk/mdadm/files/mdadm.service @@ -0,0 +1,8 @@ +[Unit] +Description=MDADM Event Monitor + +[Service] +ExecStart=/sbin/mdadm --monitor --scan + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/hardware/disk/mdadm/files/mdadm.tmpfiles.conf b/hardware/disk/mdadm/files/mdadm.tmpfiles.conf new file mode 100644 index 00000000..3207ddae --- /dev/null +++ b/hardware/disk/mdadm/files/mdadm.tmpfiles.conf @@ -0,0 +1 @@ +d /run/mdadm 0710 root root - diff --git a/hardware/disk/mdadm/files/scripts/raid-check b/hardware/disk/mdadm/files/scripts/raid-check new file mode 100644 index 00000000..31091bf8 --- /dev/null +++ b/hardware/disk/mdadm/files/scripts/raid-check @@ -0,0 +1,6 @@ +#!/bin/bash + +for dev in `grep "^md.*: active" /proc/mdstat | cut -f 1 -d ' '`; do + echo "repair" > /sys/block/$dev/md/sync_action +done + diff --git a/hardware/disk/mdadm/files/scripts/raid-start.sh b/hardware/disk/mdadm/files/scripts/raid-start.sh new file mode 100644 index 00000000..290b1e89 --- /dev/null +++ b/hardware/disk/mdadm/files/scripts/raid-start.sh @@ -0,0 +1,29 @@ +[[ -f /proc/mdstat ]] || exit 0 + +# Try to make sure the devices exist before we use them +create_devs() { + local node dir minor + for node in $@ ; do + [[ ${node} != /dev/* ]] && node=/dev/${node} + [[ -e ${node} ]] && continue + + dir=${node%/*} + [[ ! -d ${dir} ]] && mkdir -p "${dir}" + + minor=${node##*/} + mknod "${node}" b ${MAJOR} ${minor##*md} &> /dev/null + done +} + +[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf" +if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then + devs=$(awk '/^[[:space:]]*ARRAY/ { print $2 }' ${mdadm_conf}) + if [[ -n ${devs} ]] ; then + create_devs ${devs} + ebegin "Starting up RAID devices (mdadm)" + output=$(mdadm -As 2>&1) + ret=$? + [[ ${ret} -ne 0 ]] && echo "${output}" + eend ${ret} + fi +fi diff --git a/hardware/disk/mdadm/files/scripts/raid-stop.sh b/hardware/disk/mdadm/files/scripts/raid-stop.sh new file mode 100644 index 00000000..67a3cfe1 --- /dev/null +++ b/hardware/disk/mdadm/files/scripts/raid-stop.sh @@ -0,0 +1,10 @@ +[[ -f /proc/mdstat ]] || exit 0 + +[[ -e /etc/mdadm.conf ]] && mdadm_conf="/etc/mdadm.conf" +if [[ -x /sbin/mdadm && -f ${mdadm_conf} ]] ; then + ebegin "Shutting down RAID devices (mdadm)" + output=$(mdadm -Ss 2>&1) + ret=$? + [[ ${ret} -ne 0 ]] && echo "${output}" + eend ${ret} +fi diff --git a/hardware/disk/mdadm/pspec.xml b/hardware/disk/mdadm/pspec.xml new file mode 100644 index 00000000..665bc572 --- /dev/null +++ b/hardware/disk/mdadm/pspec.xml @@ -0,0 +1,90 @@ + + + + + mdadm + http://www.kernel.org/pub/linux/utils/raid/mdadm + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + Utility to control Linux MD devices (software RAID arrays) + mdadm is used to create, manage, and monitor Linux MD (software RAID) devices. + https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.3.2.tar.xz + + + + mdadm + + /sbin/mdadm + /sbin/mdmon + /lib/udev/rules.d + /usr/lib/tmpfiles.d + /usr/share/man + /usr/share/doc + /etc + + + mdadm.tmpfiles.conf + + scripts/raid-check + + mdadm.confd + + + mdadm.rules + + + System.Service + + + + + mdadm-static + system.base + + /sbin/mdadm.static + /sbin/mdassemble.static + + + + + + 2014-12-13 + 3.3.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-17 + 3.3 + Rebuild. Fixed service.py file + Aydın Demirel + aydin.demirel@pisilinux.org + + + 2014-04-13 + 3.3 + mdadm-static is a part of system.base now. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-31 + 3.3 + Ver. bump, rebuild + Kamil Atlı + admins@pisilinux.org + + + 2012-11-14 + 3.2.6 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/hardware/disk/mdadm/translations.xml b/hardware/disk/mdadm/translations.xml new file mode 100644 index 00000000..2edd3633 --- /dev/null +++ b/hardware/disk/mdadm/translations.xml @@ -0,0 +1,14 @@ + + + + mdadm + MD aygıtlarını (Yazılımsal RAID) denetleme aracı + mdadm Linux MD (yazılımsal RAID) aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır. + + + + mdadm-static + Statik linklemiş Raid denetleme aracı + mdadm Linux MD (yazılımsal RAID) aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır. + + diff --git a/hardware/firmware/component.xml b/hardware/firmware/component.xml new file mode 100644 index 00000000..ada4b9d0 --- /dev/null +++ b/hardware/firmware/component.xml @@ -0,0 +1,3 @@ + + hardware.firmware + diff --git a/hardware/firmware/linux-firmware/actions.py b/hardware/firmware/linux-firmware/actions.py new file mode 100644 index 00000000..aaddc341 --- /dev/null +++ b/hardware/firmware/linux-firmware/actions.py @@ -0,0 +1,43 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +WorkDir = "linux-firmware" + +def setup(): + # Remove source files + shelltools.unlink("usbdux/*dux") + shelltools.unlink("*/*.asm") + + # These + a lot of other firmware are shipped within alsa-firmware + for fw in ("ess", "korg", "sb16", "yamaha"): + shelltools.unlinkDir(fw) + +def build(): + autotools.make() + + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.insinto("/lib/firmware", "mix/*") + + # Remove installed and LIC* files from /lib/firmware + pisitools.remove("/lib/firmware/GPL-3") + pisitools.remove("/lib/firmware/LICENCE*") + pisitools.remove("/lib/firmware/LICENSE*") + pisitools.remove("/lib/firmware/configure") + pisitools.remove("/lib/firmware/Makefile") + pisitools.removeDir("/lib/firmware/mix") + #conflict on alsa-firmware + #pisitools.remove("/lib/firmware/ctefx.bin") + pisitools.remove("/lib/firmware/ctspeq.bin") + + # Install LICENSE files + pisitools.dodoc("WHENCE", "LICENCE.*", "LICENSE.*", "GPL-3") diff --git a/hardware/firmware/linux-firmware/files/fw-check b/hardware/firmware/linux-firmware/files/fw-check new file mode 100644 index 00000000..9cbcae9f --- /dev/null +++ b/hardware/firmware/linux-firmware/files/fw-check @@ -0,0 +1,17 @@ +#!/bin/bash + +KVER=$1 + +if [ -z $KVER ]; then + KVER=`uname -r` +fi + +MODPATH=/lib/modules/$KVER + +for mod in `find $MODPATH -name "*.ko"`; do + for fw in `modinfo -F firmware $mod`; do + if [ ! -e "/lib/firmware/$fw" ]; then + echo "`basename $mod` requires $fw which is missing." + fi + done +done diff --git a/hardware/firmware/linux-firmware/files/fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq b/hardware/firmware/linux-firmware/files/fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq new file mode 100644 index 00000000..5b87ae1c Binary files /dev/null and b/hardware/firmware/linux-firmware/files/fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq differ diff --git a/hardware/firmware/linux-firmware/pspec.xml b/hardware/firmware/linux-firmware/pspec.xml new file mode 100644 index 00000000..febc8e1b --- /dev/null +++ b/hardware/firmware/linux-firmware/pspec.xml @@ -0,0 +1,168 @@ + + + + + linux-firmware + http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ + + PisiLinux Community + admins@pisilinux.org + + ipw2100-fw + ipw2200-fw + freedist + GPLv2+ + GPLv2 + MIT + data + Firmware files used by the Linux kernel + linux-firmware contains different firmware files required for some devices to operate correctly. + + http://source.pisilinux.org/1.0/linux-firmware/linux-firmware-20150320.tar.bz2 + http://source.pisilinux.org/erdinc/common-fw.tar.xz + http://source.pisilinux.org/erdinc/firmware-ipw.tar.xz + http://source.pisilinux.org/erdinc/firmware/firmware-nonfreebox-2-tar.bz2 + http://source.pisilinux.org/erdinc/firmware/ar9170.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/ipw2x00-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/aic94xx-seq.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/zd12x1-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/accessrunner-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/rtl8192se-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/nouveau-1.tar.xz + + fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq + + + + + + + + + linux-firmware + + /lib/firmware + /usr/share/doc + + + noDelta + + + + + + 2015-03-26 + 20150320 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-02-14 + 20150214 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-12-16 + 20141216 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-11-07 + 20141107 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-07-23 + 20140603 + Version bump. + Marcin Bojara + marcin.bojara@pisilinux.org + + + 2014-04-02 + 20140316 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-03-01 + 20140217 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-11-30 + 20131013 + Remove unneeded build dep,fix unpack problem. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-11-23 + 20131013 + Version bump to 20131013 git. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-30 + 20130811 + add update Intel-Bluetooth patchs + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-08-11 + 20130811 + add update patchs + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-07-19 + 20130609 + add update patchs + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-06-09 + 20130609 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-04-07 + 20130421 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-03-07 + 20130224 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2012-12-12 + 20121212 + First release + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + diff --git a/hardware/firmware/linux-firmware/translations.xml b/hardware/firmware/linux-firmware/translations.xml new file mode 100644 index 00000000..50210c1a --- /dev/null +++ b/hardware/firmware/linux-firmware/translations.xml @@ -0,0 +1,8 @@ + + + + linux-firmware + Linux çekirdeği tarafından kullanılan firmware dosyaları + linux-firmware, bazı aygıtların düzgün çalışabilmesi için gerekli firmware dosyalarını içerir. + + diff --git a/kernel/component.xml b/kernel/component.xml new file mode 100644 index 00000000..7adc4a67 --- /dev/null +++ b/kernel/component.xml @@ -0,0 +1,3 @@ + + kernel + diff --git a/kernel/kernel/actions.py b/kernel/kernel/actions.py new file mode 100644 index 00000000..e4aedaef --- /dev/null +++ b/kernel/kernel/actions.py @@ -0,0 +1,36 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import kerneltools +from pisi.actionsapi import shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +NoStrip = ["/lib", "/boot"] + +shelltools.export("KBUILD_BUILD_USER", "pisilinux") +shelltools.export("KBUILD_BUILD_HOST", "buildfarm") +shelltools.export("PYTHONDONTWRITEBYTECODE", "1") + +#cpupower_arch = get.ARCH().replace("i686", "i386") + +def setup(): + kerneltools.configure() + +def build(): + kerneltools.build(debugSymbols=False) + +def install(): + kerneltools.install() + + # Install kernel headers needed for out-of-tree module compilation + kerneltools.installHeaders() + + kerneltools.installLibcHeaders() + + # Generate some module lists to use within mkinitramfs + shelltools.system("./generate-module-list %s/lib/modules/%s" % (get.installDIR(), kerneltools.__getSuffix())) diff --git a/kernel/kernel/comar/package.py b/kernel/kernel/comar/package.py new file mode 100644 index 00000000..60ff125b --- /dev/null +++ b/kernel/kernel/comar/package.py @@ -0,0 +1,22 @@ +#!/usr/bin/python + +import os + +def read_file(path): + with open(path) as f: + return f.read().strip() + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + gcf = "/boot/grub2/grub.cfg" + if not os.path.isfile(gcf): return + + if os.path.isfile("/etc/mudur/locale"): os.environ["LANG"] = read_file("/etc/mudur/locale").split("\n")[0] + os.environ["PATH"] = "/usr/sbin:/usr/bin:/sbin:/bin" + os.system("grub2-mkconfig -o %s" % gcf) + + # Update GRUB entry + #if os.path.exists("/boot/grub/grub.conf"): + # call("grub", "Boot.Loader", "updateKernelEntry", (KVER, "")) + +def preRemove(): + pass diff --git a/kernel/kernel/files/configs/kernel-i686-config b/kernel/kernel/files/configs/kernel-i686-config new file mode 100644 index 00000000..657c42c3 --- /dev/null +++ b/kernel/kernel/files/configs/kernel-i686-config @@ -0,0 +1,5486 @@ +# +# Automatically generated file; DO NOT EDIT. +# PisiLinux/i386 3.8.5 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(PisiLinux)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_FHANDLE=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_NOCB_CPU is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set +CONFIG_HAVE_UID16=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_KALLSYMS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +CONFIG_OPROFILE_EVENT_MULTIPLEX=y +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y +CONFIG_UPROBES=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_GENERIC_SIGALTSTACK=y +CONFIG_CLONE_BACKWARDS=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_THROTTLING=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +# CONFIG_LDM_PARTITION is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=m +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +CONFIG_X86_BIGSMP=y +CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_WANT_INTEL_MID is not set +# CONFIG_X86_RDC321X is not set +CONFIG_X86_32_NON_STANDARD=y +# CONFIG_X86_NUMAQ is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +# CONFIG_STA2X11 is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_ES7000 is not set +CONFIG_X86_32_IRIS=m +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=64 +CONFIG_XEN_SAVE_RESTORE=y +CONFIG_XEN_DEBUG_FS=y +CONFIG_KVM_GUEST=y +CONFIG_LGUEST_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +CONFIG_M686=y +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MELAN is not set +# CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +# CONFIG_X86_PPRO_FENCE is not set +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_NR_CPUS=32 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +# CONFIG_X86_ANCIENT_MCE is not set +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_VM86=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +# CONFIG_X86_REBOOTFIXUPS is not set +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y +# CONFIG_NOHIGHMEM is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=y +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +# CONFIG_NUMA is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ILLEGAL_POINTER_VALUE=0 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_HIGHPTE=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +CONFIG_CRASH_DUMP=y +# CONFIG_KEXEC_JUMP is not set +CONFIG_PHYSICAL_START=0x400000 +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x400000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y + +# +# Power management and ACPI options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_TEST_SUSPEND=y +CONFIG_PM_SLEEP_DEBUG=y +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=y +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_I2C=m +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y +CONFIG_ACPI_BLACKLIST_YEAR=1999 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +# CONFIG_ACPI_APEI_EINJ is not set +# CONFIG_ACPI_APEI_ERST_DEBUG is not set +CONFIG_SFI=y +# CONFIG_APM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y + +# +# x86 CPU frequency scaling drivers +# +CONFIG_X86_PCC_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y +# CONFIG_X86_POWERNOW_K6 is not set +CONFIG_X86_POWERNOW_K7=y +CONFIG_X86_POWERNOW_K7_ACPI=y +CONFIG_X86_POWERNOW_K8=y +# CONFIG_X86_GX_SUSPMOD is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_SPEEDSTEP_ICH=y +CONFIG_X86_SPEEDSTEP_SMI=y +CONFIG_X86_P4_CLOCKMOD=y +# CONFIG_X86_CPUFREQ_NFORCE2 is not set +CONFIG_X86_LONGRUN=y +# CONFIG_X86_LONGHAUL is not set +# CONFIG_X86_E_POWERSAVER is not set + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=y +# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set +CONFIG_PCI_STUB=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_SCx200 is not set +# CONFIG_ALIX is not set +# CONFIG_NET5501 is not set +# CONFIG_GEOS is not set +CONFIG_AMD_NB=y +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_COMPAQ=m +# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set +CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set +# CONFIG_RAPIDIO is not set + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_ARPD=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=y +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set +# CONFIG_NF_CT_NETLINK_HELPER is not set +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_PSD=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +# CONFIG_ATM_MPOA is not set +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +CONFIG_WAN_ROUTER=m +# CONFIG_PHONET is not set +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +# CONFIG_TOSHIBA_FIR is not set +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEFAULT_PS is not set +CONFIG_CFG80211_DEBUGFS=y +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUGFS=y +CONFIG_MAC80211_MESSAGE_TRACING=y +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y +CONFIG_NFC_LLCP=y + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_HCI_NFC=m +CONFIG_NFC_PN533=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLKDEVS is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_TS5500 is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +# CONFIG_AD525X_DPOT is not set +CONFIG_IBM_ASM=m +# CONFIG_PHANTOM is not set +# CONFIG_INTEL_MID_PTI is not set +# CONFIG_SGI_IOC4 is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +# CONFIG_ICS932S401 is not set +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_CS5535_MFGPT=m +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_CS5535_CLOCK_EVENT_SRC=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +# CONFIG_SENSORS_BH1780 is not set +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +CONFIG_VMWARE_BALLOON=m +# CONFIG_BMP085_I2C is not set +CONFIG_PCH_PHUB=m +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_TGT=m +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_FC_TGT_ATTRS=y +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_SRP_TGT_ATTRS=y +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +# CONFIG_SCSI_DPT_I2O is not set +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +CONFIG_PPSCSI=m +CONFIG_PPSCSI_T348=m +CONFIG_PPSCSI_T358=m +CONFIG_PPSCSI_VPI0=m +CONFIG_PPSCSI_VPI2=m +CONFIG_PPSCSI_ONSCSI=m +CONFIG_PPSCSI_SPARCSI=m +CONFIG_PPSCSI_EPSA2=m +CONFIG_PPSCSI_EPST=m +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_IPR is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_NSP32 is not set +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_SRP=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=y +CONFIG_SATA_HIGHBANK=m +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARASAN_CF=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m +CONFIG_PATA_CS5535=m +CONFIG_PATA_CS5536=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RDC=m +# CONFIG_PATA_SC1200 is not set +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=y +CONFIG_DM_DEBUG=y +CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_MIRROR=y +CONFIG_DM_RAID=m +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_ZERO=y +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +# CONFIG_DM_DELAY is not set +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +CONFIG_FUSION_LOGGING=y + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +# CONFIG_I2O is not set +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_MII=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_VXLAN=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NETPOLL_TRAP=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +# CONFIG_ATM_LANAI is not set +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +# CONFIG_ATM_ZATM is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +# CONFIG_ATM_IDT77252 is not set +# CONFIG_ATM_AMBASSADOR is not set +# CONFIG_ATM_HORIZON is not set +# CONFIG_ATM_IA is not set +# CONFIG_ATM_FORE200E is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +CONFIG_NET_CADENCE=y +CONFIG_ARM_AT91_ETHER=m +CONFIG_MACB=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DE600=m +CONFIG_DE620=m +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +# CONFIG_NET_VENDOR_FUJITSU is not set +# CONFIG_NET_VENDOR_HP is not set +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +# CONFIG_NET_VENDOR_I825XX is not set +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +# CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +# CONFIG_SFC_MTD is not set +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_PLATFORM is not set +# CONFIG_STMMAC_PCI is not set +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_NET_SB1000 is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +CONFIG_AT803X_PHY=m +CONFIG_AMD_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_MDIO_BITBANG=m +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_WLAN=y +# CONFIG_PCMCIA_RAYCS is not set +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +CONFIG_AT76C50X_USB=m +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +# CONFIG_ADM8211 is not set +CONFIG_MAC80211_HWSIM=m +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +CONFIG_ATH_CARDS=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +CONFIG_ATH5K_DEBUG=y +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +CONFIG_ATH9K_DEBUGFS=y +# CONFIG_ATH9K_MAC_DEBUG is not set +CONFIG_ATH9K_RATE_CONTROL=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set +CONFIG_CARL9170_WPC=y +# CONFIG_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +CONFIG_ATH6KL_DEBUG=y +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +CONFIG_B43_DEBUG=y +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_SDIO_OOB=y +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +# CONFIG_HOSTAP is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m + +# +# Debugging Options +# +CONFIG_IWLWIFI_DEBUG=y +CONFIG_IWLWIFI_DEBUGFS=y +# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +# CONFIG_IWLWIFI_P2P is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +CONFIG_IWLEGACY_DEBUG=y +CONFIG_IWLEGACY_DEBUGFS=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +# CONFIG_HERMES is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2X00_LIB_DEBUGFS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +# CONFIG_WL_TI is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +# CONFIG_ISDN_PPP_BSDCOMP is not set +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +CONFIG_HISAX_NO_SENDCOMPLETE=y +CONFIG_HISAX_NO_LLC=y +CONFIG_HISAX_NO_KEYPAD=y +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +# CONFIG_HISAX_HFCUSB is not set +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +# CONFIG_INPUT_MATRIXKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_VSXXXAA=m +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_MOUSE_LMPCM_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_AS5011 is not set +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_ELOUSB=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_BMA150 is not set +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_PCF8574 is not set +CONFIG_INPUT_PWM_BEEPER=m +# CONFIG_INPUT_ADXL34X is not set +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +# CONFIG_SERIO_PS2MULT is not set +CONFIG_SERIO_ARC_PS2=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +# CONFIG_TRACE_SINK is not set +# CONFIG_DEVKMEM is not set +# CONFIG_STALDRV is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MFD_HSU is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_PCH_UART is not set +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_NVRAM=y +CONFIG_R3964=m +# CONFIG_APPLICOM is not set +CONFIG_SONYPI=m + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_RAW_DRIVER=y +CONFIG_MAX_RAW_DEVS=8192 +CONFIG_HPET=y +# CONFIG_HPET_MMAP is not set +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EG20T is not set +# CONFIG_I2C_INTEL_MID is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_SCx200_ACB=m +CONFIG_I2C_STUB=m +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_W1_SLAVE_DS2433_CRC=y +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_SMB347=m +# CONFIG_POWER_RESET is not set +CONFIG_POWER_AVS=y +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +CONFIG_SENSORS_IT87=m +# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SIS5595=m +# CONFIG_SENSORS_SMM665 is not set +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +# CONFIG_SENSORS_EMC2103 is not set +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_APPLESMC=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_FAIR_SHARE=y +CONFIG_STEP_WISE=y +CONFIG_USER_SPACE=y +CONFIG_CPU_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_GEODE_WDT=m +# CONFIG_SC520_WDT is not set +CONFIG_SBC_FITPC2_WATCHDOG=m +# CONFIG_EUROTECH_WDT is not set +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +# CONFIG_WAFER_WDT is not set +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +# CONFIG_SC1200_WDT is not set +# CONFIG_PC87413_WDT is not set +CONFIG_NV_TCO=m +# CONFIG_60XX_WDT is not set +# CONFIG_SBC8360_WDT is not set +# CONFIG_SBC7240_WDT is not set +# CONFIG_CPU5_WDT is not set +CONFIG_SMSC_SCH311X_WDT=m +# CONFIG_SMSC37B787_WDT is not set +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83697HF_WDT=m +CONFIG_W83697UG_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +# CONFIG_SBC_EPX_C3_WATCHDOG is not set +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_TI_AM335X_TSCADC=m +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_ABX500_CORE is not set +CONFIG_MFD_CS5535=m +CONFIG_LPC_SCH=m +CONFIG_LPC_ICH=m +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +# CONFIG_USB_SN9C102 is not set + +# +# Analog TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +# CONFIG_VIDEO_CX25821 is not set +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +# CONFIG_RADIO_TEF6862 is not set +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# MPEG video encoders +# +CONFIG_VIDEO_CX2341X=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_ALI=y +CONFIG_AGP_ATI=y +CONFIG_AGP_AMD=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +CONFIG_AGP_NVIDIA=y +CONFIG_AGP_SIS=y +CONFIG_AGP_SWORKS=y +CONFIG_AGP_VIA=y +CONFIG_AGP_EFFICEON=y +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_I810 is not set +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +CONFIG_DRM_VIA=m +# CONFIG_DRM_SAVAGE is not set +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +# CONFIG_DRM_GMA600 is not set +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +# CONFIG_STUB_POULSBO is not set +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_DDC=m +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +# CONFIG_FB_WMT_GE_ROPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +# CONFIG_FB_UVESA is not set +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=y +CONFIG_FB_GEODE_GX=y +# CONFIG_FB_GEODE_GX1 is not set +# CONFIG_FB_TMIO is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +# CONFIG_FB_UDL is not set +CONFIG_FB_VIRTUAL=m +CONFIG_XEN_FBDEV_FRONTEND=y +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_LM3630=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_BT_SCO=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_TEA575X=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +# CONFIG_SND_AW2 is not set +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_CS5535AUDIO=m +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=0 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_CODEC_CIRRUS=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SIS7019=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_FIREWIRE_SPEAKERS=m +CONFIG_SND_ISIGHT=m +CONFIG_SND_SCS1X=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=y +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=y +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=y +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CYPRESS=y +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_EZKEY=y +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=y +CONFIG_HID_LOGITECH=y +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=y +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m + +# +# USB HID support +# +CONFIG_USB_HID=y +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +CONFIG_USB_MON=y +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=y +# CONFIG_USB_XHCI_HCD_DEBUGGING is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=y +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_HCD_ISO=y +# CONFIG_USB_SL811_CS is not set +# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +# CONFIG_USB_CHIPIDEA is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +# CONFIG_USB_SERIAL_F81232 is not set +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_METRO is not set +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIEMENS_MPI=m +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +# CONFIG_USB_TEST is not set +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +CONFIG_USB_OTG_UTILS=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +# CONFIG_INFINIBAND_OCRDMA is not set +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +# CONFIG_RTC_DRV_S35390A is not set +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_DS2404=m + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +# CONFIG_INTEL_MID_DMAC is not set +CONFIG_INTEL_IOATDMA=m +# CONFIG_TIMB_DMA is not set +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +# CONFIG_UIO_PDRV is not set +# CONFIG_UIO_PDRV_GENIRQ is not set +CONFIG_UIO_DMEM_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +# CONFIG_UIO_NETX is not set +CONFIG_VFIO_IOMMU_TYPE1=y +CONFIG_VFIO=y +CONFIG_VFIO_PCI=y +CONFIG_VIRTIO=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SELFBALLOONING=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_STAGING=y +# CONFIG_ET131X is not set +# CONFIG_SLICOSS is not set +# CONFIG_USBIP_CORE is not set +# CONFIG_W35UND is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_ECHO is not set +# CONFIG_COMEDI is not set +# CONFIG_ASUS_OLED is not set +# CONFIG_PANEL is not set +# CONFIG_R8187SE is not set +# CONFIG_RTL8192U is not set +# CONFIG_RTLLIB is not set +CONFIG_R8712U=m +# CONFIG_RTS5139 is not set +# CONFIG_TRANZPORT is not set +# CONFIG_IDE_PHISON is not set +# CONFIG_LINE6_USB is not set +# CONFIG_USB_SERIAL_QUATECH2 is not set +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set +# CONFIG_DX_SEP is not set +# CONFIG_ZSMALLOC is not set +# CONFIG_WLAGS49_H2 is not set +# CONFIG_WLAGS49_H25 is not set +# CONFIG_FB_SM7XX is not set +CONFIG_CRYSTALHD=m +# CONFIG_FB_XGI is not set +# CONFIG_ACPI_QUICKSTART is not set +# CONFIG_USB_ENESTORAGE is not set +# CONFIG_BCM_WIMAX is not set +# CONFIG_FT1000 is not set + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set +CONFIG_STAGING_MEDIA=y +# CONFIG_DVB_AS102 is not set +# CONFIG_DVB_CXD2099 is not set +# CONFIG_VIDEO_DT3155 is not set +# CONFIG_VIDEO_GO7007 is not set +# CONFIG_SOLO6X10 is not set +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IGORPLUGUSB=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_USB_WPAN_HCD is not set +# CONFIG_WIMAX_GDM72XX is not set +CONFIG_CSR_WIFI=m +CONFIG_ZCACHE2=y +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m +CONFIG_SB105X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_TC1100_WMI=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +# CONFIG_INTEL_MENLOW is not set +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +# CONFIG_IBM_RTL is not set +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m +CONFIG_SHUTTLE_WMI=m +CONFIG_FSAM7400=m +CONFIG_FSAM7440=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y + +# +# Remoteproc drivers (EXPERIMENTAL) +# +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m + +# +# Rpmsg drivers (EXPERIMENTAL) +# +# CONFIG_VIRT_DRIVERS is not set +# CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +# CONFIG_IPACK_BUS is not set + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT23=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +# CONFIG_OCFS2_FS_STATS is not set +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAYFS_FS=m +CONFIG_GENERIC_ACL=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +CONFIG_FSCACHE_OBJECT_LIST=y +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=y +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_LOGFS is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_FTRACE=y +CONFIG_PSTORE_RAM=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_CEPH_FS=m +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +CONFIG_CIFS_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SMB2 is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +CONFIG_HEADERS_CHECK=y +CONFIG_DEBUG_SECTION_MISMATCH=y +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_SPARSE_RCU_POINTER=y +CONFIG_STACKTRACE=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_LKDTM is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_EVENT_POWER_TRACING_DEPRECATED=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +# CONFIG_FUNCTION_GRAPH_TRACER is not set +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +# CONFIG_BUILD_DOCSRC is not set +CONFIG_DYNAMIC_DEBUG=y +# CONFIG_DMA_API_DEBUG is not set +CONFIG_ATOMIC64_SELFTEST=y +CONFIG_ASYNC_RAID6_TEST=m +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_TEST_KSTRTOX=y +CONFIG_STRICT_DEVMEM=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +CONFIG_EARLY_PRINTK=y +CONFIG_EARLY_PRINTK_DBGP=y +CONFIG_DEBUG_SET_MODULE_RONX=y +CONFIG_DOUBLEFAULT=y +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +CONFIG_OPTIMIZE_INLINING=y + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +CONFIG_KEYS_DEBUG_PROC_KEYS=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_PATH=y +CONFIG_INTEL_TXT=y +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +# CONFIG_SECURITY_YAMA is not set +# CONFIG_IMA is not set +CONFIG_DEFAULT_SECURITY_TOMOYO=y +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="tomoyo" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_FIPS=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER_X86=y +CONFIG_CRYPTO_GLUE_HELPER_X86=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=y + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=y + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_586=y +CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_586=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_586=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_586=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_USER_API=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_GEODE=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_VHOST_NET=m +CONFIG_TCM_VHOST=m +CONFIG_LGUEST=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +# CONFIG_DDR is not set +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m + +# +# Unofficial 3rd party kernel additions +# +CONFIG_ACERHK=y +CONFIG_NDISWRAPPER=m +# CONFIG_AES2501 is not set + +# +# RF Switch +# +CONFIG_RFSWITCH=m +CONFIG_AVERATEC_5100P=m +CONFIG_PACKARDBELL_E5=m +CONFIG_VIAHSS=m diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config new file mode 100644 index 00000000..52dd691a --- /dev/null +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -0,0 +1,6337 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86_64 4.0.3 Kernel Configuration +# +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_PERF_EVENTS_INTEL_UNCORE=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_FHANDLE=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_GENERIC_MSI_IRQ=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +CONFIG_SRCU=y +# CONFIG_TASKS_RCU is not set +CONFIG_RCU_STALL_COMMON=y +CONFIG_CONTEXT_TRACKING=y +CONFIG_RCU_USER_QS=y +CONFIG_CONTEXT_TRACKING_FORCE=y +CONFIG_RCU_FANOUT=64 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +CONFIG_RCU_KTHREAD_PRIO=0 +CONFIG_RCU_NOCB_CPU=y +# CONFIG_RCU_NOCB_CPU_NONE is not set +# CONFIG_RCU_NOCB_CPU_ZERO is not set +CONFIG_RCU_NOCB_CPU_ALL=y +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_SUPPORTS_INT128=y +# CONFIG_NUMA_BALANCING is not set +CONFIG_CGROUPS=y +CONFIG_CGROUP_DEBUG=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +# CONFIG_USER_NS is not set +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +CONFIG_RD_LZ4=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BPF=y +# CONFIG_EXPERT is not set +CONFIG_UID16=y +CONFIG_SGETMASK_SYSCALL=y +CONFIG_SYSFS_SYSCALL=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_KALLSYMS=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +# CONFIG_BPF_SYSCALL is not set +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_PCI_QUIRKS=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +CONFIG_OPROFILE=m +CONFIG_OPROFILE_EVENT_MULTIPLEX=y +CONFIG_HAVE_OPROFILE=y +CONFIG_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=y +CONFIG_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_KPROBES_ON_FTRACE=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y +CONFIG_HAVE_USER_RETURN_NOTIFIER=y +CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR_NONE=y +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +# CONFIG_CC_STACKPROTECTOR_STRONG is not set +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_SOFT_DIRTY=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_SLABINFO=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_BLK_CMDLINE_PARSER=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +# CONFIG_LDM_PARTITION is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_CMDLINE_PARTITION=y +CONFIG_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=m +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_INLINE_READ_UNLOCK=y +CONFIG_INLINE_READ_UNLOCK_IRQ=y +CONFIG_INLINE_WRITE_UNLOCK=y +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUE_RWLOCK=y +CONFIG_QUEUE_RWLOCK=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_X2APIC=y +CONFIG_X86_MPPARSE=y +CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_NUMACHIP is not set +# CONFIG_X86_VSMP is not set +# CONFIG_X86_UV is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_IOSF_MBI=m +# CONFIG_IOSF_MBI_DEBUG is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +CONFIG_XEN_DEBUG_FS=y +CONFIG_XEN_PVH=y +CONFIG_KVM_GUEST=y +# CONFIG_KVM_DEBUG_FS is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_PARAVIRT_CLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_MEMTEST is not set +# CONFIG_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +# CONFIG_CALGARY_IOMMU is not set +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +CONFIG_X86_UP_APIC_MSI=y +CONFIG_X86_LOCAL_APIC=y +CONFIG_X86_IO_APIC=y +CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y +CONFIG_X86_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y +CONFIG_X86_VSYSCALL_EMULATION=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +CONFIG_MICROCODE_INTEL=y +CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_OLD_INTERFACE=y +# CONFIG_MICROCODE_INTEL_EARLY is not set +# CONFIG_MICROCODE_AMD_EARLY is not set +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=10 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +# CONFIG_MOVABLE_NODE is not set +CONFIG_HAVE_BOOTMEM_INFO_NODE=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_NEED_BOUNCE_POOL=y +CONFIG_VIRT_TO_BUS=y +CONFIG_MMU_NOTIFIER=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_MEMORY_FAILURE=y +CONFIG_TRANSPARENT_HUGEPAGE=y +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +# CONFIG_CMA is not set +# CONFIG_ZSWAP is not set +CONFIG_ZPOOL=y +# CONFIG_ZBUD is not set +# CONFIG_ZSMALLOC is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +CONFIG_MTRR=y +CONFIG_MTRR_SANITIZER=y +CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 +CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 +CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +# CONFIG_X86_INTEL_MPX is not set +CONFIG_EFI=y +CONFIG_EFI_STUB=y +# CONFIG_EFI_MIXED is not set +CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_KEXEC_FILE is not set +CONFIG_CRASH_DUMP=y +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x200000 +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000 +CONFIG_X86_NEED_RELOCS=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_HAVE_LIVEPATCH=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_TEST_SUSPEND=y +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_DPM_WATCHDOG is not set +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_PM_CLK=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_ACPI=y +CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=y +CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=y +CONFIG_ACPI_DOCK=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_MEMORY=y +CONFIG_ACPI_HOTPLUG_IOAPIC=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set +CONFIG_HAVE_ACPI_APEI=y +CONFIG_HAVE_ACPI_APEI_NMI=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +# CONFIG_ACPI_APEI_EINJ is not set +# CONFIG_ACPI_APEI_ERST_DEBUG is not set +CONFIG_ACPI_EXTLOG=m +# CONFIG_PMIC_OPREGION is not set +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y + +# +# CPU frequency scaling drivers +# +CONFIG_X86_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_AMD_FREQ_SENSITIVITY=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_P4_CLOCKMOD=y + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=y + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +CONFIG_PCIE_ECRC=y +CONFIG_PCIEAER_INJECT=m +CONFIG_PCIEASPM=y +# CONFIG_PCIEASPM_DEBUG is not set +CONFIG_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set +CONFIG_PCI_STUB=y +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_LABEL=y + +# +# PCI host controller drivers +# +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m +# CONFIG_HOTPLUG_PCI_CPCI is not set +CONFIG_HOTPLUG_PCI_SHPC=m +# CONFIG_RAPIDIO is not set +# CONFIG_X86_SYSFB is not set + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +CONFIG_IA32_EMULATION=y +# CONFIG_IA32_AOUT is not set +CONFIG_X86_X32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_X86_DEV_DMA_OPS=y +CONFIG_PMC_ATOM=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_FIB_TRIE_STATS=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_ROUTE_CLASSID=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +# CONFIG_NET_FOU is not set +# CONFIG_NET_FOU_IP_TUNNELS is not set +# CONFIG_GENEVE is not set +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_TCP_CONG_DCTCP is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=y +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y +CONFIG_IPV6_PIMSM_V2=y +CONFIG_NETLABEL=y +CONFIG_NETWORK_SECMARK=y +CONFIG_NET_PTP_CLASSIFY=y +CONFIG_NETWORK_PHY_TIMESTAMPING=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_ACCT=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_SECMARK=y +CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=y +CONFIG_NF_CT_PROTO_DCCP=m +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CONNTRACK_AMANDA=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set +# CONFIG_NF_CT_NETLINK_HELPER is not set +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_CT=m +CONFIG_NFT_RBTREE=m +CONFIG_NFT_HASH=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +# CONFIG_NFT_MASQ is not set +# CONFIG_NFT_REDIR is not set +CONFIG_NFT_NAT=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_SET=m + +# +# Xtables targets +# +CONFIG_NETFILTER_XT_TARGET_AUDIT=m +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_TARGET_RATEEST=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TRACE=m +CONFIG_NETFILTER_XT_TARGET_SECMARK=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m + +# +# Xtables matches +# +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_CPU=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPCOMP=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m +CONFIG_NETFILTER_XT_MATCH_L2TP=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_NFACCT=m +CONFIG_NETFILTER_XT_MATCH_OSF=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_RATEEST=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_RECENT=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_SOCKET=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_IP_SET=m +CONFIG_IP_SET_MAX=256 +CONFIG_IP_SET_BITMAP_IP=m +CONFIG_IP_SET_BITMAP_IPMAC=m +CONFIG_IP_SET_BITMAP_PORT=m +CONFIG_IP_SET_HASH_IP=m +CONFIG_IP_SET_HASH_IPMARK=m +CONFIG_IP_SET_HASH_IPPORT=m +CONFIG_IP_SET_HASH_IPPORTIP=m +CONFIG_IP_SET_HASH_IPPORTNET=m +# CONFIG_IP_SET_HASH_MAC is not set +CONFIG_IP_SET_HASH_NETPORTNET=m +CONFIG_IP_SET_HASH_NET=m +CONFIG_IP_SET_HASH_NETNET=m +CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m +CONFIG_IP_SET_LIST_SET=m +CONFIG_IP_VS=m +CONFIG_IP_VS_IPV6=y +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_AH_ESP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y +CONFIG_IP_VS_PROTO_SCTP=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +# CONFIG_IP_VS_FO is not set +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PE_SIP=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_TABLES_IPV4=m +CONFIG_NFT_CHAIN_ROUTE_IPV4=m +CONFIG_NF_REJECT_IPV4=y +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NF_TABLES_ARP=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_TABLES_IPV6=m +CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_IP6=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_NFLOG=m +CONFIG_IP_DCCP=m +CONFIG_INET_DCCP_DIAG=m + +# +# DCCP CCIDs Configuration +# +# CONFIG_IP_DCCP_CCID2_DEBUG is not set +CONFIG_IP_DCCP_CCID3=y +# CONFIG_IP_DCCP_CCID3_DEBUG is not set +CONFIG_IP_DCCP_TFRC_LIB=y +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_OBJCNT is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +# CONFIG_ATM_MPOA is not set +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_L2TP=m +CONFIG_L2TP_DEBUGFS=m +CONFIG_L2TP_V3=y +CONFIG_L2TP_IP=m +CONFIG_L2TP_ETH=m +CONFIG_STP=m +CONFIG_GARP=m +CONFIG_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_HWMON=y +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_VLAN_8021Q=m +CONFIG_VLAN_8021Q_GVRP=y +CONFIG_VLAN_8021Q_MVRP=y +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=m +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +CONFIG_6LOWPAN=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_SOCKET=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=m +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFB=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_DRR=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_CHOKE=m +CONFIG_NET_SCH_QFQ=m +CONFIG_NET_SCH_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +# CONFIG_NET_SCH_FQ is not set +CONFIG_NET_SCH_HHF=m +CONFIG_NET_SCH_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_CGROUP=y +CONFIG_NET_CLS_BPF=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_EMATCH_IPSET=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_CSUM=m +# CONFIG_NET_ACT_VLAN is not set +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y +CONFIG_DCB=y +CONFIG_DNS_RESOLVER=y +CONFIG_BATMAN_ADV=m +CONFIG_BATMAN_ADV_BLA=y +CONFIG_BATMAN_ADV_DAT=y +# CONFIG_BATMAN_ADV_NC is not set +# CONFIG_BATMAN_ADV_MCAST is not set +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_OPENVSWITCH_GRE=m +CONFIG_OPENVSWITCH_VXLAN=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_NETLINK_MMAP=y +CONFIG_NETLINK_DIAG=m +CONFIG_NET_MPLS_GSO=m +CONFIG_HSR=m +# CONFIG_NET_SWITCHDEV is not set +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_NET_TCPPROBE is not set +CONFIG_NET_DROP_MONITOR=y +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +CONFIG_NSC_FIR=m +CONFIG_WINBOND_FIR=m +CONFIG_SMC_IRCC_FIR=m +CONFIG_ALI_FIR=m +CONFIG_VLSI_FIR=m +CONFIG_VIA_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m +CONFIG_BT_BREDR=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m +CONFIG_BT_LE=y +CONFIG_BT_6LOWPAN=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_DEFAULT_PS is not set +CONFIG_CFG80211_DEBUGFS=y +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_WEXT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUGFS=y +CONFIG_MAC80211_MESSAGE_TRACING=y +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_RFKILL=m +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y +CONFIG_RFKILL_GPIO=m +CONFIG_NET_9P=m +CONFIG_NET_9P_VIRTIO=m +CONFIG_NET_9P_RDMA=m +# CONFIG_NET_9P_DEBUG is not set +# CONFIG_CAIF is not set +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_DIGITAL=m +CONFIG_NFC_NCI=m +CONFIG_NFC_HCI=m +CONFIG_NFC_SHDLC=y + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_NFC_MEI_PHY=m +# CONFIG_NFC_SIM is not set +CONFIG_NFC_PORT100=m +CONFIG_NFC_PN544=m +CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m +CONFIG_NFC_MRVL=m +CONFIG_NFC_MRVL_USB=m +CONFIG_NFC_ST21NFCA=m +CONFIG_NFC_ST21NFCA_I2C=m +# CONFIG_NFC_ST21NFCB is not set +CONFIG_HAVE_BPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_WANT_DEV_COREDUMP=y +CONFIG_ALLOW_DEV_COREDUMP=y +CONFIG_DEV_COREDUMP=y +CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_FENCE_TRACE is not set + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR & LPDDR2 PCM memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_MTD_UBI=m +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +CONFIG_PARPORT_1284=y +CONFIG_PARPORT_NOT_PC=y +CONFIG_PNP=y +# CONFIG_PNP_DEBUG_MESSAGES is not set + +# +# Protocols +# +CONFIG_PNPACPI=y +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +# CONFIG_DRBD_FAULT_INJECTION is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_SKD=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +CONFIG_BLK_DEV_RAM=m +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_DAX=y +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +CONFIG_XEN_BLKDEV_FRONTEND=m +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +# CONFIG_AD525X_DPOT is not set +CONFIG_DUMMY_IRQ=m +# CONFIG_IBM_ASM is not set +# CONFIG_PHANTOM is not set +CONFIG_SGI_IOC4=m +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m +# CONFIG_ICS932S401 is not set +CONFIG_ENCLOSURE_SERVICES=m +CONFIG_HP_ILO=m +CONFIG_APDS9802ALS=m +CONFIG_ISL29003=m +CONFIG_ISL29020=m +CONFIG_SENSORS_TSL2550=m +# CONFIG_SENSORS_BH1780 is not set +CONFIG_SENSORS_BH1770=m +CONFIG_SENSORS_APDS990X=m +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +CONFIG_VMWARE_BALLOON=m +# CONFIG_BMP085_I2C is not set +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_SRAM is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=y +CONFIG_INTEL_MEI_ME=m +CONFIG_INTEL_MEI_TXE=m +CONFIG_VMWARE_VMCI=m + +# +# Intel MIC Bus Driver +# +CONFIG_INTEL_MIC_BUS=m + +# +# Intel MIC Host Driver +# +CONFIG_INTEL_MIC_HOST=m + +# +# Intel MIC Card Driver +# +CONFIG_INTEL_MIC_CARD=m +CONFIG_GENWQE=m +CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=1 +# CONFIG_ECHO is not set +# CONFIG_CXL_BASE is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SCH=m +CONFIG_SCSI_ENCLOSURE=m +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +CONFIG_SCSI_SAS_ATA=y +CONFIG_SCSI_SAS_HOST_SMP=y +CONFIG_SCSI_SRP_ATTRS=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m +CONFIG_SCSI_CXGB3_ISCSI=m +CONFIG_SCSI_CXGB4_ISCSI=m +CONFIG_SCSI_BNX2_ISCSI=m +CONFIG_SCSI_BNX2X_FCOE=m +CONFIG_BE2ISCSI=m +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_HPSA=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_3W_SAS=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +# CONFIG_AIC7XXX_DEBUG_ENABLE is not set +CONFIG_AIC7XXX_DEBUG_MASK=0 +# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=4 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +# CONFIG_AIC79XX_DEBUG_ENABLE is not set +CONFIG_AIC79XX_DEBUG_MASK=0 +# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set +CONFIG_SCSI_MVSAS=m +# CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +# CONFIG_SCSI_DPT_I2O is not set +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +# CONFIG_SCSI_ESAS2R is not set +CONFIG_MEGARAID_NEWGEN=y +CONFIG_MEGARAID_MM=m +CONFIG_MEGARAID_MAILBOX=m +CONFIG_MEGARAID_LEGACY=m +CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS_LOGGING=y +CONFIG_SCSI_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_UFSHCD_PLATFORM=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +# CONFIG_XEN_SCSI_FRONTEND is not set +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_ISCI=m +CONFIG_SCSI_IPS=m +CONFIG_SCSI_INITIO=m +CONFIG_SCSI_INIA100=m +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +CONFIG_SCSI_STEX=m +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_IPR is not set +CONFIG_SCSI_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_WD719X is not set +CONFIG_SCSI_DEBUG=m +CONFIG_SCSI_PMCRAID=m +CONFIG_SCSI_PM8001=m +CONFIG_SCSI_BFA_FC=m +CONFIG_SCSI_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set +CONFIG_SCSI_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_ACPI=y +CONFIG_SATA_ZPODD=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SATA_INIC162X=m +CONFIG_SATA_ACARD_AHCI=m +CONFIG_SATA_SIL24=m +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +CONFIG_PDC_ADMA=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SX4=m +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +CONFIG_ATA_PIIX=y +CONFIG_SATA_MV=m +CONFIG_SATA_NV=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_ULI=m +CONFIG_SATA_VIA=m +CONFIG_SATA_VITESSE=m + +# +# PATA SFF controllers with BMDMA +# +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m +CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CYPRESS=m +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m +# CONFIG_PATA_HPT3X3_DMA is not set +CONFIG_PATA_IT8213=m +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m +CONFIG_PATA_MARVELL=m +CONFIG_PATA_NETCELL=m +CONFIG_PATA_NINJA32=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m +CONFIG_PATA_OPTIDMA=m +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +# CONFIG_PATA_RADISYS is not set +CONFIG_PATA_RDC=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m +CONFIG_PATA_SIS=m +CONFIG_PATA_TOSHIBA=m +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m + +# +# PIO-only SFF controllers +# +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +CONFIG_PATA_ACPI=m +CONFIG_ATA_GENERIC=m +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +CONFIG_MD_AUTODETECT=y +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +CONFIG_MD_RAID10=m +CONFIG_MD_RAID456=m +CONFIG_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BCACHE=m +# CONFIG_BCACHE_DEBUG is not set +# CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_DEBUG=y +CONFIG_DM_BUFIO=y +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_THIN_PROVISIONING=m +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m +CONFIG_DM_ERA=m +CONFIG_DM_MIRROR=y +CONFIG_DM_LOG_USERSPACE=m +CONFIG_DM_RAID=m +CONFIG_DM_ZERO=y +CONFIG_DM_MULTIPATH=m +CONFIG_DM_MULTIPATH_QL=m +CONFIG_DM_MULTIPATH_ST=m +# CONFIG_DM_DELAY is not set +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +# CONFIG_DM_SWITCH is not set +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +# CONFIG_TCM_USER is not set +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=m +CONFIG_FUSION=y +CONFIG_FUSION_SPI=m +CONFIG_FUSION_FC=m +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=40 +CONFIG_FUSION_CTL=m +CONFIG_FUSION_LAN=m +CONFIG_FUSION_LOGGING=y + +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +CONFIG_FIREWIRE_NET=m +CONFIG_FIREWIRE_NOSY=m +CONFIG_MACINTOSH_DRIVERS=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +CONFIG_NET_FC=y +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +# CONFIG_IPVLAN is not set +CONFIG_VXLAN=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_NTB_NETDEV=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +# CONFIG_NLMON is not set +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET is not set +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +# CONFIG_ATM_LANAI is not set +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +# CONFIG_ATM_ZATM is not set +CONFIG_ATM_NICSTAR=m +# CONFIG_ATM_NICSTAR_USE_SUNI is not set +# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set +# CONFIG_ATM_IDT77252 is not set +# CONFIG_ATM_AMBASSADOR is not set +# CONFIG_ATM_HORIZON is not set +# CONFIG_ATM_IA is not set +# CONFIG_ATM_FORE200E is not set +CONFIG_ATM_HE=m +# CONFIG_ATM_HE_USE_SUNI is not set +CONFIG_ATM_SOLOS=m + +# +# CAIF transport drivers +# +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_RING=m +CONFIG_VHOST=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m +# CONFIG_NET_DSA_MV88E6171 is not set +# CONFIG_NET_DSA_MV88E6352 is not set +# CONFIG_NET_DSA_BCM_SF2 is not set +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_AGERE=y +# CONFIG_ET131X is not set +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_ALTERA_TSE=m +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_AMD_XGBE=m +CONFIG_AMD_XGBE_DCB=y +CONFIG_NET_XGENE=m +CONFIG_NET_VENDOR_ARC=y +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_ALX=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +# CONFIG_BCMGENET is not set +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4_DCB=y +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_CX_ECAT=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_DE2104X_DSL=0 +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +CONFIG_PCMCIA_XIRCOM=m +CONFIG_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_BE2NET_VXLAN=y +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +# CONFIG_NET_VENDOR_FUJITSU is not set +# CONFIG_NET_VENDOR_HP is not set +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_VXLAN=y +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBE_DCB=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m +CONFIG_I40E_VXLAN=y +CONFIG_I40E_DCB=y +# CONFIG_I40E_FCOE is not set +CONFIG_I40EVF=m +# CONFIG_FM10K is not set +# CONFIG_NET_VENDOR_I825XX is not set +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_EN_VXLAN=y +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +# CONFIG_MLX5_CORE is not set +CONFIG_NET_VENDOR_MICREL=y +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_VXLAN=y +CONFIG_QLCNIC_HWMON=y +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_QUALCOMM=y +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_ROCKER=y +CONFIG_NET_VENDOR_SAMSUNG=y +CONFIG_SXGBE_ETH=m +# CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +# CONFIG_SFC_MTD is not set +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC911X=m +# CONFIG_SMSC911X_ARCH_HOOKS is not set +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_PLATFORM is not set +# CONFIG_STMMAC_PCI is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TI_CPSW_ALE=m +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +CONFIG_VIA_RHINE_MMIO=y +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_NET_SB1000 is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +CONFIG_AT803X_PHY=m +CONFIG_AMD_PHY=m +CONFIG_AMD_XGBE_PHY=m +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_NATIONAL_PHY=m +CONFIG_STE10XP=m +CONFIG_LSI_ET1011C_PHY=m +CONFIG_MICREL_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_GPIO=m +# CONFIG_MDIO_BCM_UNIMAC is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_USB_NET_DRIVERS=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_HUAWEI_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y +CONFIG_USB_NET_ZAURUS=m +CONFIG_USB_NET_CX82310_ETH=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_QMI_WWAN=m +CONFIG_USB_HSO=m +CONFIG_USB_NET_INT51X1=m +CONFIG_USB_IPHETH=m +CONFIG_USB_SIERRA_NET=m +CONFIG_USB_VL600=m +CONFIG_WLAN=y +# CONFIG_PCMCIA_RAYCS is not set +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +CONFIG_AT76C50X_USB=m +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +# CONFIG_ADM8211 is not set +CONFIG_MAC80211_HWSIM=m +CONFIG_MWL8K=m +CONFIG_ATH_COMMON=m +CONFIG_ATH_CARDS=m +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH5K=m +CONFIG_ATH5K_DEBUG=y +# CONFIG_ATH5K_TRACER is not set +CONFIG_ATH5K_PCI=y +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +CONFIG_ATH9K_AHB=y +CONFIG_ATH9K_DEBUGFS=y +# CONFIG_ATH9K_STATION_STATISTICS is not set +# CONFIG_ATH9K_DYNACK is not set +CONFIG_ATH9K_WOW=y +CONFIG_ATH9K_RFKILL=y +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +CONFIG_ATH9K_PCOEM=y +CONFIG_ATH9K_HTC=m +# CONFIG_ATH9K_HTC_DEBUGFS is not set +CONFIG_CARL9170=m +CONFIG_CARL9170_LEDS=y +# CONFIG_CARL9170_DEBUGFS is not set +CONFIG_CARL9170_WPC=y +CONFIG_CARL9170_HWRNG=y +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_WIL6210_TRACING=y +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m +CONFIG_ATH10K_DEBUG=y +# CONFIG_ATH10K_DEBUGFS is not set +# CONFIG_ATH10K_TRACING is not set +CONFIG_WCN36XX=m +# CONFIG_WCN36XX_DEBUGFS is not set +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +CONFIG_B43_DEBUG=y +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG is not set +# CONFIG_HOSTAP is not set +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBIPW=m +# CONFIG_LIBIPW_DEBUG is not set +CONFIG_IWLWIFI=m +CONFIG_IWLWIFI_LEDS=y +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m +CONFIG_IWLWIFI_OPMODE_MODULAR=y +# CONFIG_IWLWIFI_BCAST_FILTERING is not set +# CONFIG_IWLWIFI_UAPSD is not set + +# +# Debugging Options +# +CONFIG_IWLWIFI_DEBUG=y +CONFIG_IWLWIFI_DEBUGFS=y +# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +CONFIG_IWLEGACY_DEBUG=y +CONFIG_IWLEGACY_DEBUGFS=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_LIBERTAS_MESH=y +# CONFIG_HERMES is not set +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_P54_LEDS=y +CONFIG_RT2X00=m +CONFIG_RT2400PCI=m +CONFIG_RT2500PCI=m +CONFIG_RT61PCI=m +CONFIG_RT2800PCI=m +CONFIG_RT2800PCI_RT33XX=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +# CONFIG_RT2800USB_RT3573 is not set +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2800_LIB_MMIO=m +CONFIG_RT2X00_LIB_MMIO=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2X00_LIB_DEBUGFS=y +# CONFIG_RT2X00_DEBUG is not set +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8723BE=m +CONFIG_RTL8188EE=m +# CONFIG_RTL8192EE is not set +# CONFIG_RTL8821AE is not set +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_PCI=m +CONFIG_RTLWIFI_USB=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8723_COMMON=m +CONFIG_RTLBTCOEXIST=m +# CONFIG_WL_TI is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_CW1200=m +CONFIG_CW1200_WLAN_SDIO=m +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=m +CONFIG_ISDN=y +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +# CONFIG_ISDN_PPP_BSDCOMP is not set +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DIVERSION=m + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +CONFIG_HISAX_NO_SENDCOMPLETE=y +CONFIG_HISAX_NO_LLC=y +CONFIG_HISAX_NO_KEYPAD=y +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_HFC_PCI=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +CONFIG_HISAX_ENTERNOW_PCI=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +CONFIG_HISAX_AVM_A1_CS=m +CONFIG_HISAX_TELES_CS=m + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +# CONFIG_HISAX_HFCUSB is not set +CONFIG_HISAX_HFC4S8S=m +CONFIG_HISAX_FRITZ_PCIPNP=m + +# +# Active cards +# +CONFIG_ISDN_CAPI=m +# CONFIG_CAPI_TRACE is not set +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_AVM_CS=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_CAPI=y +# CONFIG_GIGASET_I4L is not set +# CONFIG_GIGASET_DUMMYLL is not set +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +CONFIG_GIGASET_M101=m +# CONFIG_GIGASET_DEBUG is not set +CONFIG_HYSDN=m +CONFIG_HYSDN_CAPI=y +CONFIG_MISDN=m +CONFIG_MISDN_DSP=m +CONFIG_MISDN_L1OIP=m + +# +# mISDN hardware drivers +# +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_AVMFRITZ=m +CONFIG_MISDN_SPEEDFAX=m +CONFIG_MISDN_INFINEON=m +CONFIG_MISDN_W6692=m +CONFIG_MISDN_NETJET=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=m +CONFIG_ISDN_HDLC=m + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_GPIO_POLLED=m +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +CONFIG_KEYBOARD_SAMSUNG=m +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_KEYBOARD_CROS_EC=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=m +# CONFIG_MOUSE_ELAN_I2C is not set +CONFIG_MOUSE_VSXXXAA=m +CONFIG_MOUSE_GPIO=m +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +CONFIG_JOYSTICK_TWIDJOY=m +CONFIG_JOYSTICK_ZHENHUA=m +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_AS5011 is not set +CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_JOYSTICK_WALKERA0701=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_HANWANG=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_SERIAL_WACOM4=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +# CONFIG_TOUCHSCREEN_GOODIX is not set +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +# CONFIG_TOUCHSCREEN_ELAN is not set +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=m +CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TOUCHSCREEN_WM9705=y +CONFIG_TOUCHSCREEN_WM9712=y +CONFIG_TOUCHSCREEN_WM9713=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_SUR40=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_TOUCHSCREEN_ZFORCE=m +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_BMA150 is not set +CONFIG_INPUT_E3X0_BUTTON=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +CONFIG_INPUT_GPIO_BEEPER=m +CONFIG_INPUT_GPIO_TILT_POLLED=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_TPS65218_PWRBUTTON=m +CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_PCF8574 is not set +CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +# CONFIG_INPUT_ADXL34X is not set +CONFIG_INPUT_IMS_PCU=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=m +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m +CONFIG_INPUT_SOC_BUTTON_ARRAY=m +CONFIG_INPUT_DRV260X_HAPTICS=m +# CONFIG_INPUT_DRV2667_HAPTICS is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_CT82C710=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIO_RAW=m +CONFIG_SERIO_ALTERA_PS2=m +CONFIG_SERIO_PS2MULT=m +CONFIG_SERIO_ARC_PS2=m +CONFIG_HYPERV_KEYBOARD=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +CONFIG_SYNCLINK_GT=m +CONFIG_NOZOMI=m +# CONFIG_ISI is not set +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +# CONFIG_TRACE_SINK is not set +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_CS=m +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y +CONFIG_SERIAL_8250_DW=m +# CONFIG_SERIAL_8250_FINTEK is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m +CONFIG_SERIAL_SC16IS7XX=m +CONFIG_SERIAL_ALTERA_JTAGUART=m +CONFIG_SERIAL_ALTERA_UART=m +CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 +CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +CONFIG_SERIAL_FSL_LPUART=m +CONFIG_PRINTER=m +CONFIG_LP_CONSOLE=y +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=y +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +# CONFIG_IPMI_SI_PROBE_DEFAULTS is not set +# CONFIG_IPMI_SSIF is not set +CONFIG_IPMI_WATCHDOG=m +CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_NVRAM=y +CONFIG_R3964=m +# CONFIG_APPLICOM is not set + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=m +CONFIG_RAW_DRIVER=y +CONFIG_MAX_RAW_DEVS=8192 +CONFIG_HPET=y +# CONFIG_HPET_MMAP is not set +CONFIG_HANGCHECK_TIMER=m +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_TIS_I2C_ST33=m +CONFIG_TCG_XEN=m +CONFIG_TCG_CRB=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_XILLYBUS=m +# CONFIG_XILLYBUS_PCIE is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_MUX=m + +# +# Multiplexer I2C Chip support +# +CONFIG_I2C_MUX_GPIO=m +CONFIG_I2C_MUX_PCA9541=m +CONFIG_I2C_MUX_PCA954x=m +CONFIG_I2C_MUX_PINCTRL=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_SMBUS=m +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +CONFIG_I2C_AMD756=m +CONFIG_I2C_AMD756_S4882=m +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_ISCH=m +CONFIG_I2C_ISMT=m +CONFIG_I2C_PIIX4=m +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_NFORCE2_S4985=m +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +CONFIG_I2C_SIS96X=m +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m + +# +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_CBUS_GPIO=m +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +# CONFIG_I2C_DESIGNWARE_PCI is not set +CONFIG_I2C_GPIO=m +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_PCA_PLATFORM=m +# CONFIG_I2C_PXA_PCI is not set +CONFIG_I2C_SIMTEC=m +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +CONFIG_I2C_DIOLAN_U2C=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_ROBOTFUZZ_OSIF=m +# CONFIG_I2C_TAOS_EVM is not set +CONFIG_I2C_TINY_USB=m +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_CROS_EC_TUNNEL=m +CONFIG_I2C_STUB=m +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_SPI is not set +CONFIG_SPMI=m +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=m +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +CONFIG_PPS_CLIENT_LDISC=m +CONFIG_PPS_CLIENT_PARPORT=m +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PINCTRL=y + +# +# Pin controllers +# +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=y +CONFIG_GPIO_MAX730X=m + +# +# Memory mapped GPIO drivers: +# +CONFIG_GPIO_GENERIC_PLATFORM=y +CONFIG_GPIO_IT8761E=m +CONFIG_GPIO_F7188X=m +CONFIG_GPIO_SCH311X=m +CONFIG_GPIO_SCH=m +CONFIG_GPIO_ICH=m +CONFIG_GPIO_VX855=m +CONFIG_GPIO_LYNXPOINT=m + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_LP3943=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_ADP5588=m + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_INTEL_MID=y +CONFIG_GPIO_ML_IOH=m +CONFIG_GPIO_RDC321X=m + +# +# SPI GPIO expanders: +# +CONFIG_GPIO_MCP23S08=m + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=m + +# +# LPC GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# + +# +# USB GPIO expanders: +# +CONFIG_GPIO_VIPERBOARD=m +CONFIG_W1=m +CONFIG_W1_CON=y + +# +# 1-wire Bus Masters +# +# CONFIG_W1_MASTER_MATROX is not set +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_MASTER_DS1WM=m +CONFIG_W1_MASTER_GPIO=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2408=m +CONFIG_W1_SLAVE_DS2408_READBACK=y +CONFIG_W1_SLAVE_DS2413=m +CONFIG_W1_SLAVE_DS2406=m +CONFIG_W1_SLAVE_DS2423=m +CONFIG_W1_SLAVE_DS2431=m +CONFIG_W1_SLAVE_DS2433=m +CONFIG_W1_SLAVE_DS2433_CRC=y +CONFIG_W1_SLAVE_DS2760=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_BQ27000=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +CONFIG_CHARGER_GPIO=m +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_SMB347=m +CONFIG_BATTERY_GAUGE_LTC2941=m +# CONFIG_POWER_RESET is not set +CONFIG_POWER_AVS=y +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7X10=m +CONFIG_SENSORS_ADT7410=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS620=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_G762=m +CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_IBMAEM=m +CONFIG_SENSORS_IBMPEX=m +# CONFIG_SENSORS_I5500 is not set +CONFIG_SENSORS_CORETEMP=m +CONFIG_SENSORS_IT87=m +# CONFIG_SENSORS_JC42 is not set +CONFIG_SENSORS_POWR1220=m +CONFIG_SENSORS_LINEAGE=m +CONFIG_SENSORS_LTC2945=m +CONFIG_SENSORS_LTC4151=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4222=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4260=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_HTU21=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LM95234=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_NTC_THERMISTOR=m +CONFIG_SENSORS_NCT6683=m +CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NCT7802 is not set +CONFIG_SENSORS_PCF8591=m +CONFIG_PMBUS=m +CONFIG_SENSORS_PMBUS=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SHT21=m +CONFIG_SENSORS_SHTC1=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +# CONFIG_SENSORS_EMC2103 is not set +CONFIG_SENSORS_EMC6W201=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +# CONFIG_SENSORS_SMM665 is not set +CONFIG_SENSORS_ADC128D818=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP103=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_INTEL_POWERCLAMP is not set +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_THERMAL=m +# CONFIG_INT340X_THERMAL is not set + +# +# Texas Instruments thermal drivers +# +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +# CONFIG_XILINX_WATCHDOG is not set +CONFIG_DW_WATCHDOG=m +CONFIG_RETU_WATCHDOG=m +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +CONFIG_ALIM1535_WDT=m +CONFIG_ALIM7101_WDT=m +CONFIG_F71808E_WDT=m +CONFIG_SP5100_TCO=m +CONFIG_SBC_FITPC2_WATCHDOG=m +# CONFIG_EUROTECH_WDT is not set +CONFIG_IB700_WDT=m +CONFIG_IBMASR=m +# CONFIG_WAFER_WDT is not set +CONFIG_I6300ESB_WDT=m +CONFIG_IE6XX_WDT=m +CONFIG_ITCO_WDT=m +CONFIG_ITCO_VENDOR_SUPPORT=y +CONFIG_IT8712F_WDT=m +CONFIG_IT87_WDT=m +CONFIG_HP_WATCHDOG=m +CONFIG_HPWDT_NMI_DECODING=y +# CONFIG_SC1200_WDT is not set +# CONFIG_PC87413_WDT is not set +CONFIG_NV_TCO=m +# CONFIG_60XX_WDT is not set +# CONFIG_CPU5_WDT is not set +CONFIG_SMSC_SCH311X_WDT=m +# CONFIG_SMSC37B787_WDT is not set +CONFIG_VIA_WDT=m +CONFIG_W83627HF_WDT=m +CONFIG_W83877F_WDT=m +CONFIG_W83977F_WDT=m +CONFIG_MACHZ_WDT=m +# CONFIG_SBC_EPX_C3_WATCHDOG is not set +CONFIG_MEN_A21_WDT=m +CONFIG_XEN_WDT=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +CONFIG_SSB=m +CONFIG_SSB_SPROM=y +CONFIG_SSB_BLOCKIO=y +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y +CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y +CONFIG_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +# CONFIG_BCMA_HOST_SOC is not set +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_BCM590XX=m +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_HTC_PASIC3 is not set +CONFIG_LPC_ICH=m +CONFIG_LPC_SCH=m +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_MENF21BMC is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +# CONFIG_MFD_PCF50633 is not set +CONFIG_UCB1400_CORE=m +CONFIG_MFD_RDC321X=m +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_RTSX_USB=m +# CONFIG_MFD_RN5T618 is not set +CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +# CONFIG_ABX500_CORE is not set +CONFIG_MFD_SYSCON=y +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_MFD_LP3943=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65217 is not set +CONFIG_MFD_TPS65218=m +CONFIG_MFD_TPS65912=y +CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TMIO is not set +CONFIG_MFD_VX855=m +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +CONFIG_DVB_DYNAMIC_MINORS=y + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_ENE=m +# CONFIG_IR_HIX5HD2 is not set +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_ITE_CIR=m +CONFIG_IR_FINTEK=m +CONFIG_IR_NUVOTON=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m +CONFIG_IR_WINBOND_CIR=m +# CONFIG_IR_IGORPLUGUSB is not set +CONFIG_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_GSPCA=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m +CONFIG_USB_GSPCA_BENQ=m +CONFIG_USB_GSPCA_CONEX=m +CONFIG_USB_GSPCA_CPIA1=m +CONFIG_USB_GSPCA_DTCS033=m +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m +CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m +CONFIG_USB_GSPCA_NW80X=m +CONFIG_USB_GSPCA_OV519=m +CONFIG_USB_GSPCA_OV534=m +CONFIG_USB_GSPCA_OV534_9=m +CONFIG_USB_GSPCA_PAC207=m +CONFIG_USB_GSPCA_PAC7302=m +CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m +CONFIG_USB_GSPCA_SN9C2028=m +CONFIG_USB_GSPCA_SN9C20X=m +CONFIG_USB_GSPCA_SONIXB=m +CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA500=m +CONFIG_USB_GSPCA_SPCA501=m +CONFIG_USB_GSPCA_SPCA505=m +CONFIG_USB_GSPCA_SPCA506=m +CONFIG_USB_GSPCA_SPCA508=m +CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SPCA1528=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m +CONFIG_USB_GSPCA_SQ930X=m +CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m +CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TOUPTEK=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_VIDEO_USBTV=m + +# +# Analog TV USB devices +# +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DVB=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160_COMMON=m +CONFIG_VIDEO_STK1160_AC97=y +CONFIG_VIDEO_STK1160=m +# CONFIG_VIDEO_GO7007 is not set + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_AU0828_RC=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +# CONFIG_DVB_USB_DVBSKY is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set +# CONFIG_DVB_AS102 is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_V4L2=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m + +# +# Software defined radio USB devices +# +CONFIG_USB_AIRSPY=m +# CONFIG_USB_HACKRF is not set +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_SOLO6X10=m +# CONFIG_VIDEO_TW68 is not set + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +# CONFIG_VIDEO_CX25821 is not set +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +CONFIG_DVB_AV7110_IR=y +CONFIG_DVB_AV7110=m +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +# CONFIG_DVB_PT3 is not set +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_SMIPCIE is not set +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +CONFIG_V4L_TEST_DRIVERS=y +# CONFIG_VIDEO_VIVID is not set +# CONFIG_VIDEO_VIM2M is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_SI4713=m +CONFIG_PLATFORM_SI4713=m +CONFIG_I2C_SI4713=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_USB_KEENE=m +CONFIG_USB_RAREMONO=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +# CONFIG_RADIO_TEF6862 is not set +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# +CONFIG_MEDIA_TUNER=m +CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_M88TS2022=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TUA9001=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_R820T=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m +CONFIG_DVB_M88DS3103=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m +CONFIG_DVB_SI2165=m + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24123=m +CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_STV0288=m +CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m +CONFIG_DVB_TDA8083=m +CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8261=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_SI21XX=m +CONFIG_DVB_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_DRXD=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_EC100=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=m +CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_SI2168=m +# CONFIG_DVB_AS102_FE is not set + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LGDT3305=m +CONFIG_DVB_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m +CONFIG_DVB_S5H1411=m + +# +# ISDB-T (terrestrial) frontends +# +CONFIG_DVB_S921=m +CONFIG_DVB_DIB8000=m +CONFIG_DVB_MB86A20S=m + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# + +# +# Digital terrestrial only tuners/PLL +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_DIB0090=m + +# +# SEC control devices for DVB-S +# +CONFIG_DVB_DRX39XYJ=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +CONFIG_AGP_SIS=y +CONFIG_AGP_VIA=y +CONFIG_INTEL_GTT=y +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y + +# +# Direct Rendering Manager +# +CONFIG_DRM=m +CONFIG_DRM_MIPI_DSI=y +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_UMS is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I810=m +CONFIG_DRM_I915=m +CONFIG_DRM_I915_KMS=y +CONFIG_DRM_I915_FBDEV=y +CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=y +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# CONFIG_HSA_AMD is not set + +# +# Frame buffer Devices +# +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_CMDLINE=y +# CONFIG_FB_DDC is not set +CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +# CONFIG_FB_UVESA is not set +CONFIG_FB_VESA=y +CONFIG_FB_EFI=y +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +CONFIG_FB_OPENCORES=m +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +CONFIG_FB_VOODOO1=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_SM501 is not set +# CONFIG_FB_SMSCUFX is not set +# CONFIG_FB_UDL is not set +CONFIG_FB_VIRTUAL=m +CONFIG_XEN_FBDEV_FRONTEND=y +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +CONFIG_FB_HYPERV=m +# CONFIG_FB_SIMPLE is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_PLATFORM=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_LM3630A=m +CONFIG_BACKLIGHT_LM3639=m +CONFIG_BACKLIGHT_LP855X=m +CONFIG_BACKLIGHT_GPIO=m +CONFIG_BACKLIGHT_LV5207LP=m +CONFIG_BACKLIGHT_BD6107=m +CONFIG_VGASTATE=m +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +# CONFIG_LOGO is not set +CONFIG_SOUND=m +CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_JACK=y +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_SEQUENCER_OSS=y +CONFIG_SND_HRTIMER=m +CONFIG_SND_SEQ_HRTIMER_DEFAULT=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +CONFIG_SND_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_DRIVERS=y +CONFIG_SND_PCSP=m +CONFIG_SND_DUMMY=m +CONFIG_SND_ALOOP=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +CONFIG_SND_AC97_POWER_SAVE=y +CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 +CONFIG_SND_SB_COMMON=m +CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ASIHPI=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +# CONFIG_SND_AW2 is not set +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CTXFI=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_LOLA=m +CONFIG_SND_LX6464ES=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# HD-Audio +# +CONFIG_SND_HDA=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_HWDEP=y +CONFIG_SND_HDA_RECONFIG=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_BEEP_MODE=0 +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_ANALOG=m +CONFIG_SND_HDA_CODEC_SIGMATEL=m +CONFIG_SND_HDA_CODEC_VIA=m +CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_I915=y +CONFIG_SND_HDA_CODEC_CIRRUS=m +CONFIG_SND_HDA_CODEC_CONEXANT=m +CONFIG_SND_HDA_CODEC_CA0110=m +CONFIG_SND_HDA_CODEC_CA0132=m +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=m +CONFIG_SND_HDA_CODEC_SI3054=m +CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_US122L=m +CONFIG_SND_USB_6FIRE=m +# CONFIG_SND_USB_HIFACE is not set +CONFIG_SND_BCD2000=m +CONFIG_SND_USB_LINE6=m +CONFIG_SND_USB_POD=m +CONFIG_SND_USB_PODHD=m +CONFIG_SND_USB_TONEPORT=m +CONFIG_SND_USB_VARIAX=m +CONFIG_SND_FIREWIRE=y +CONFIG_SND_FIREWIRE_LIB=m +CONFIG_SND_DICE=m +# CONFIG_SND_OXFW is not set +CONFIG_SND_ISIGHT=m +CONFIG_SND_SCS1X=m +CONFIG_SND_FIREWORKS=m +CONFIG_SND_BEBOB=m +# CONFIG_SND_PCMCIA is not set +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=y +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=y +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=y +CONFIG_HID_APPLEIR=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=y +CONFIG_HID_BETOP_FF=m +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CP2112=m +CONFIG_HID_CYPRESS=y +CONFIG_HID_DRAGONRISE=m +CONFIG_DRAGONRISE_FF=y +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m +CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=y +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_GT683R=m +CONFIG_HID_HUION=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO=m +CONFIG_HID_LOGITECH=y +CONFIG_HID_LOGITECH_DJ=m +CONFIG_HID_LOGITECH_HIDPP=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_FF=y +CONFIG_HID_MAGICMOUSE=m +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_MULTITOUCH=m +CONFIG_HID_NTRIG=y +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_PANTHERLORD_FF=y +# CONFIG_HID_PENMOUNT is not set +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m +CONFIG_HID_PICOLCD_FB=y +CONFIG_HID_PICOLCD_BACKLIGHT=y +CONFIG_HID_PICOLCD_LCD=y +CONFIG_HID_PICOLCD_LEDS=y +CONFIG_HID_PICOLCD_CIR=y +CONFIG_HID_PLANTRONICS=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_SONY_FF=y +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_RMI=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_XINMO=m +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m + +# +# USB HID support +# +CONFIG_USB_HID=y +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +CONFIG_USB_OTG_FSM=m +CONFIG_USB_MON=y +CONFIG_USB_WUSB=m +CONFIG_USB_WUSB_CBAF=m +# CONFIG_USB_WUSB_CBAF_DEBUG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_EHCI_PCI=y +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FUSBH200_HCD=m +CONFIG_USB_FOTG210_HCD=m +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PCI=y +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +CONFIG_USB_UHCI_HCD=y +CONFIG_USB_U132_HCD=m +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_HCD_ISO=y +# CONFIG_USB_SL811_CS is not set +# CONFIG_USB_R8A66597_HCD is not set +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m +CONFIG_USB_TMC=m + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_REALTEK=m +CONFIG_REALTEK_AUTOPM=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m +CONFIG_USB_UAS=m + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +# CONFIG_USBIP_CORE is not set +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_HOST=y + +# +# Platform Glue Layer +# +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_HOST=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m + +# +# Debugging features +# +# CONFIG_USB_DWC3_DEBUG is not set +CONFIG_DWC3_HOST_USB3_LPM_ENABLE=y +CONFIG_USB_DWC2=y +CONFIG_USB_DWC2_HOST=y + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +CONFIG_USB_DWC2_PLATFORM=y +CONFIG_USB_DWC2_PCI=y +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +# CONFIG_USB_CHIPIDEA is not set +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1760_HOST_ROLE=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_SIMPLE is not set +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP210X=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +# CONFIG_USB_SERIAL_F81232 is not set +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_METRO is not set +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7715_PARPORT=y +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MXUPORT=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QCAUX=m +CONFIG_USB_SERIAL_QUALCOMM=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_WWAN=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_OPTICON=m +CONFIG_USB_SERIAL_XSENS_MT=m +CONFIG_USB_SERIAL_WISHBONE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_DEBUG=m + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_SEVSEG=m +# CONFIG_USB_RIO500 is not set +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +# CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set +CONFIG_USB_ISIGHTFW=m +CONFIG_USB_YUREX=m +CONFIG_USB_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m +# CONFIG_USB_LINK_LAYER_TEST is not set +CONFIG_USB_ATM=m +CONFIG_USB_SPEEDTOUCH=m +CONFIG_USB_CXACRU=m +CONFIG_USB_UEAGLEATM=m +CONFIG_USB_XUSBATM=m + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_USB_ISP1301=m +# CONFIG_USB_GADGET is not set +# CONFIG_USB_LED_TRIG is not set +CONFIG_UWB=m +CONFIG_UWB_HWA=m +CONFIG_UWB_WHCI=m +CONFIG_UWB_I1480U=m +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_CLKGATE is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_SDIO_UART=m +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_PCI=m +CONFIG_MMC_RICOH_MMC=y +CONFIG_MMC_SDHCI_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MMC_USDHI6ROL0=m +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m +# CONFIG_MMC_TOSHIBA_PCI is not set +CONFIG_MEMSTICK=m +# CONFIG_MEMSTICK_DEBUG is not set + +# +# MemoryStick drivers +# +# CONFIG_MEMSTICK_UNSAFE_RESUME is not set +CONFIG_MSPRO_BLOCK=m +# CONFIG_MS_BLOCK is not set + +# +# MemoryStick Host Controller Drivers +# +CONFIG_MEMSTICK_TIFM_MS=m +CONFIG_MEMSTICK_JMICRON_38X=m +CONFIG_MEMSTICK_R592=m +CONFIG_MEMSTICK_REALTEK_PCI=m +CONFIG_MEMSTICK_REALTEK_USB=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS_FLASH=m + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA9532_GPIO=y +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m +# CONFIG_LEDS_LP8860 is not set +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_PWM=m +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM355x=m + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +CONFIG_LEDS_BLINKM=m + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_IPATH=m +CONFIG_INFINIBAND_QIB=m +CONFIG_INFINIBAND_QIB_DCA=y +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set +CONFIG_INFINIBAND_CXGB3=m +# CONFIG_INFINIBAND_CXGB3_DEBUG is not set +CONFIG_INFINIBAND_CXGB4=m +CONFIG_MLX4_INFINIBAND=m +# CONFIG_MLX5_INFINIBAND is not set +CONFIG_INFINIBAND_NES=m +# CONFIG_INFINIBAND_NES_DEBUG is not set +# CONFIG_INFINIBAND_OCRDMA is not set +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_IPOIB=m +CONFIG_INFINIBAND_IPOIB_CM=y +CONFIG_INFINIBAND_IPOIB_DEBUG=y +CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y +CONFIG_INFINIBAND_SRP=m +CONFIG_INFINIBAND_SRPT=m +CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_ISERT=m +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_IE31200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_ABB5ZES3=m +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +# CONFIG_RTC_DRV_DS1374_WDT is not set +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_ISL12057=m +CONFIG_RTC_DRV_X1205=m +# CONFIG_RTC_DRV_PCF2127 is not set +CONFIG_RTC_DRV_PCF8523=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF85063=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +# CONFIG_RTC_DRV_S35390A is not set +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1685_FAMILY=m +CONFIG_RTC_DRV_DS1685=y +# CONFIG_RTC_DRV_DS1689 is not set +# CONFIG_RTC_DRV_DS17285 is not set +# CONFIG_RTC_DRV_DS17485 is not set +# CONFIG_RTC_DRV_DS17885 is not set +CONFIG_RTC_DS1685_PROC_REGS=y +CONFIG_RTC_DS1685_SYSFS_REGS=y +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_DS2404=m +CONFIG_RTC_DRV_STK17TA8=m +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_XGENE=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MIC_X100_DMA=m +# CONFIG_INTEL_MID_DMAC is not set +CONFIG_INTEL_IOATDMA=m +# CONFIG_DW_DMAC_CORE is not set +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set +CONFIG_DMA_ENGINE=y +CONFIG_DMA_ACPI=y + +# +# DMA Clients +# +CONFIG_ASYNC_TX_DMA=y +# CONFIG_DMATEST is not set +CONFIG_DMA_ENGINE_RAID=y +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_UIO=m +CONFIG_UIO_CIF=m +# CONFIG_UIO_PDRV_GENIRQ is not set +CONFIG_UIO_DMEM_GENIRQ=m +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +# CONFIG_UIO_NETX is not set +# CONFIG_UIO_MF624 is not set +CONFIG_VFIO_IOMMU_TYPE1=y +CONFIG_VFIO=y +CONFIG_VFIO_PCI=y +CONFIG_VFIO_PCI_VGA=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y +# CONFIG_VIRT_DRIVERS is not set +CONFIG_VIRTIO=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SELFBALLOONING=y +# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_DEV_EVTCHN=m +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=m +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=m +CONFIG_XEN_PCIDEV_BACKEND=m +# CONFIG_XEN_SCSI_BACKEND is not set +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y +CONFIG_STAGING=y +# CONFIG_SLICOSS is not set +# CONFIG_PRISM2_USB is not set +# CONFIG_COMEDI is not set +# CONFIG_PANEL is not set +# CONFIG_RTL8192U is not set +# CONFIG_RTLLIB is not set +CONFIG_R8712U=m +CONFIG_R8188EU=m +CONFIG_88EU_AP_MODE=y +CONFIG_R8723AU=m +CONFIG_8723AU_AP_MODE=y +CONFIG_8723AU_BT_COEXIST=y +CONFIG_RTS5208=m +# CONFIG_VT6655 is not set +# CONFIG_VT6656 is not set +CONFIG_FB_SM7XX=m +# CONFIG_FB_XGI is not set +# CONFIG_FT1000 is not set + +# +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set +CONFIG_STAGING_MEDIA=y +CONFIG_I2C_BCM2048=m +# CONFIG_DVB_CXD2099 is not set +# CONFIG_VIDEO_DT3155 is not set +# CONFIG_DVB_MN88472 is not set +# CONFIG_DVB_MN88473 is not set +CONFIG_LIRC_STAGING=y +CONFIG_LIRC_BT829=m +CONFIG_LIRC_IMON=m +CONFIG_LIRC_PARALLEL=m +CONFIG_LIRC_SASEM=m +CONFIG_LIRC_SERIAL=m +CONFIG_LIRC_SERIAL_TRANSMITTER=y +CONFIG_LIRC_SIR=m +CONFIG_LIRC_ZILOG=m + +# +# Android +# +# CONFIG_ASHMEM is not set +CONFIG_ANDROID_TIMED_OUTPUT=y +CONFIG_ANDROID_TIMED_GPIO=m +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +CONFIG_SYNC=y +CONFIG_SW_SYNC=y +CONFIG_SW_SYNC_USER=y +# CONFIG_ION is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_WIMAX_GDM72XX=m +CONFIG_WIMAX_GDM72XX_QOS=y +CONFIG_WIMAX_GDM72XX_K_MODE=y +CONFIG_WIMAX_GDM72XX_WIMAX2=y +CONFIG_WIMAX_GDM72XX_USB=y +# CONFIG_WIMAX_GDM72XX_SDIO is not set +CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +# CONFIG_LUSTRE_FS is not set +CONFIG_DGNC=m +CONFIG_DGAP=m +# CONFIG_GS_FPGABOOT is not set +# CONFIG_CRYPTO_SKEIN is not set +CONFIG_UNISYSSPAR=y +CONFIG_UNISYS_VISORUTIL=m +CONFIG_UNISYS_VISORCHANNEL=m +CONFIG_UNISYS_VISORCHIPSET=m +CONFIG_UNISYS_UISLIB=m +CONFIG_UNISYS_VIRTPCI=m +CONFIG_UNISYS_VIRTHBA=m +# CONFIG_I2O is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m +CONFIG_FUJITSU_LAPTOP=m +# CONFIG_FUJITSU_LAPTOP_DEBUG is not set +CONFIG_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_MSI_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_THINKPAD_ACPI=m +CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y +# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set +# CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_THINKPAD_ACPI_VIDEO=y +CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y +CONFIG_SENSORS_HDAPS=m +CONFIG_INTEL_MENLOW=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_WMI=m +CONFIG_ACPI_WMI=m +CONFIG_MSI_WMI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m +CONFIG_ACPI_CMPC=m +CONFIG_INTEL_IPS=m +# CONFIG_IBM_RTL is not set +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m +CONFIG_INTEL_RST=m +# CONFIG_INTEL_SMARTCONNECT is not set +CONFIG_PVPANIC=m +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +CONFIG_COMMON_CLK_SI5351=m +# CONFIG_COMMON_CLK_PXA is not set +CONFIG_COMMON_CLK_CDCE706=m + +# +# Hardware Spinlock drivers +# + +# +# Clock Source drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# CONFIG_ATMEL_PIT is not set +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set +CONFIG_MAILBOX=y +# CONFIG_PCC is not set +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +CONFIG_IOMMU_IOVA=y +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_STATS=y +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m + +# +# Rpmsg drivers +# + +# +# SOC (System On Chip) specific Drivers +# +# CONFIG_SOC_TI is not set +CONFIG_PM_DEVFREQ=y + +# +# DEVFREQ Governors +# +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m +# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set +# CONFIG_DEVFREQ_GOV_POWERSAVE is not set +# CONFIG_DEVFREQ_GOV_USERSPACE is not set + +# +# DEVFREQ Drivers +# +CONFIG_PM_DEVFREQ_EVENT=y +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +CONFIG_NTB=m +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_LP3943=m +CONFIG_PWM_LPSS=m +# CONFIG_PWM_LPSS_PCI is not set +# CONFIG_PWM_LPSS_PLATFORM is not set +# CONFIG_IPACK_BUS is not set +CONFIG_RESET_CONTROLLER=y +# CONFIG_FMC is not set + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_BCM_KONA_USB2_PHY=m +CONFIG_PHY_SAMSUNG_USB2=m +# CONFIG_PHY_EXYNOS4210_USB2 is not set +# CONFIG_PHY_EXYNOS4X12_USB2 is not set +# CONFIG_PHY_EXYNOS5250_USB2 is not set +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL=m +# CONFIG_MCB is not set +CONFIG_RAS=y +CONFIG_THUNDERBOLT=m + +# +# Android +# +CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_IPC=y + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y +CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +CONFIG_GOOGLE_FIRMWARE=y + +# +# Google Firmware Drivers +# +CONFIG_GOOGLE_SMI=m +# CONFIG_GOOGLE_MEMCONSOLE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_RUNTIME_MAP=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_UEFI_CPER=y + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_EXT2_FS=m +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=m +CONFIG_EXT3_DEFAULTS_TO_ORDERED=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG is not set +CONFIG_GFS2_FS=m +CONFIG_GFS2_FS_LOCKING_DLM=y +CONFIG_OCFS2_FS=m +CONFIG_OCFS2_FS_O2CB=m +CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m +# CONFIG_OCFS2_FS_STATS is not set +# CONFIG_OCFS2_DEBUG_MASKLOG is not set +# CONFIG_OCFS2_DEBUG_FS is not set +CONFIG_BTRFS_FS=m +CONFIG_BTRFS_FS_POSIX_ACL=y +# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set +# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set +# CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_DAX=y +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +# CONFIG_QUOTA_DEBUG is not set +CONFIG_QUOTA_TREE=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_CUSE=m +CONFIG_OVERLAY_FS=y + +# +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +# CONFIG_FSCACHE_HISTOGRAM is not set +# CONFIG_FSCACHE_DEBUG is not set +CONFIG_FSCACHE_OBJECT_LIST=y +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_VMCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y +CONFIG_CONFIGFS_FS=y +CONFIG_EFIVAR_FS=m +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +# CONFIG_HFSPLUS_FS_POSIX_ACL is not set +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_UBIFS_FS=m +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_LOGFS is not set +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZ4 is not set +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +CONFIG_MINIX_FS=m +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_FTRACE=y +CONFIG_PSTORE_RAM=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +# CONFIG_EXOFS_FS is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +# CONFIG_F2FS_FS_SECURITY is not set +# CONFIG_F2FS_CHECK_FS is not set +CONFIG_F2FS_IO_TRACE=y +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_V4_1=y +# CONFIG_NFS_V4_2 is not set +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_PNFS_FLEXFILE_LAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +# CONFIG_NFS_V4_1_MIGRATION is not set +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFS_DEBUG=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_PNFS=y +# CONFIG_NFSD_V4_SECURITY_LABEL is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_SUNRPC_SWAP=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m +CONFIG_SUNRPC_XPRT_RDMA_SERVER=m +CONFIG_CEPH_FS=m +# CONFIG_CEPH_FSCACHE is not set +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CIFS=m +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +CONFIG_CIFS_WEAK_PW_HASH=y +CONFIG_CIFS_UPCALL=y +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +CONFIG_CIFS_ACL=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +# CONFIG_CIFS_SMB2 is not set +CONFIG_CIFS_FSCACHE=y +CONFIG_NCP_FS=m +CONFIG_NCPFS_PACKET_SIGNING=y +CONFIG_NCPFS_IOCTL_LOCKING=y +CONFIG_NCPFS_STRONG=y +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +CONFIG_NCPFS_SMALLDOS=y +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_AFS_FS is not set +CONFIG_9P_FS=m +CONFIG_9P_FSCACHE=y +CONFIG_9P_FS_POSIX_ACL=y +# CONFIG_9P_FS_SECURITY is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=m +CONFIG_NLS_UTF8=m +CONFIG_DLM=m +CONFIG_DLM_DEBUG=y + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_DYNAMIC_DEBUG=y + +# +# Compile-time checks and compiler options +# +# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=2048 +CONFIG_STRIP_ASM_SYMS=y +CONFIG_UNUSED_SYMBOLS=y +CONFIG_DEBUG_FS=y +CONFIG_HEADERS_CHECK=y +CONFIG_DEBUG_SECTION_MISMATCH=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +# CONFIG_DEBUG_KERNEL is not set + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_KASAN_SHADOW_OFFSET=0xdffffc0000000000 + +# +# Debug Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_STACKTRACE=y +CONFIG_DEBUG_BUGVERBOSE=y + +# +# RCU Debugging +# +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=y +CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y +CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_TRACER_SNAPSHOT=y +CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y +CONFIG_BRANCH_PROFILE_NONE=y +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set +# CONFIG_PROFILE_ALL_BRANCHES is not set +CONFIG_STACK_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_MMIOTRACE is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m +# CONFIG_RING_BUFFER_STARTUP_TEST is not set + +# +# Runtime Testing +# +# CONFIG_LKDTM is not set +CONFIG_ATOMIC64_SELFTEST=y +CONFIG_ASYNC_RAID6_TEST=m +CONFIG_TEST_HEXDUMP=m +# CONFIG_TEST_STRING_HELPERS is not set +CONFIG_TEST_KSTRTOX=y +# CONFIG_TEST_RHASHTABLE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_BUILD_DOCSRC is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_STRICT_DEVMEM=y +# CONFIG_X86_VERBOSE_BOOTUP is not set +CONFIG_EARLY_PRINTK=y +CONFIG_EARLY_PRINTK_DBGP=y +# CONFIG_EARLY_PRINTK_EFI is not set +CONFIG_DEBUG_SET_MODULE_RONX=y +CONFIG_DOUBLEFAULT=y +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +CONFIG_OPTIMIZE_INLINING=y + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +CONFIG_TRUSTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_PATH=y +CONFIG_INTEL_TXT=y +# CONFIG_SECURITY_SELINUX is not set +# CONFIG_SECURITY_SMACK is not set +CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y +# CONFIG_SECURITY_YAMA is not set +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_EVM is not set +CONFIG_DEFAULT_SECURITY_TOMOYO=y +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="tomoyo" +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_CRYPTD=y +# CONFIG_CRYPTO_MCRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ABLK_HELPER=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=y + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=y + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=y +CONFIG_CRYPTO_CRC32_PCLMUL=m +CONFIG_CRYPTO_CRCT10DIF=y +# CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_RMD128=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_RMD256=m +CONFIG_CRYPTO_RMD320=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m +# CONFIG_CRYPTO_SHA1_MB is not set +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_LZ4=m +CONFIG_CRYPTO_LZ4HC=m + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_USER_API=y +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=m +CONFIG_CRYPTO_DEV_PADLOCK_SHA=m +CONFIG_CRYPTO_DEV_CCP=y +CONFIG_CRYPTO_DEV_CCP_DD=m +CONFIG_CRYPTO_DEV_CCP_CRYPTO=m +CONFIG_CRYPTO_DEV_QAT=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m +# CONFIG_PKCS7_MESSAGE_PARSER is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_KVM_DEVICE_ASSIGNMENT=y +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=y +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=m +CONFIG_LZ4HC_COMPRESS=m +CONFIG_LZ4_DECOMPRESS=y +CONFIG_XZ_DEC=y +CONFIG_XZ_DEC_X86=y +CONFIG_XZ_DEC_POWERPC=y +CONFIG_XZ_DEC_IA64=y +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +CONFIG_XZ_DEC_SPARC=y +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DECOMPRESS_XZ=y +CONFIG_DECOMPRESS_LZO=y +CONFIG_DECOMPRESS_LZ4=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_CHECK_SIGNATURE=y +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +# CONFIG_DDR is not set +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/kernel/kernel/files/patches/archlinux/change-default-console-loglevel.patch b/kernel/kernel/files/patches/archlinux/change-default-console-loglevel.patch new file mode 100644 index 00000000..11da2a9d --- /dev/null +++ b/kernel/kernel/files/patches/archlinux/change-default-console-loglevel.patch @@ -0,0 +1,11 @@ +--- linux-3.16/include/linux/printk.h.old 2014-08-04 18:48:30.686043266 +0200 ++++ linux-3.16/include/linux/printk.h 2014-08-04 18:48:47.706218528 +0200 +@@ -37,7 +37,7 @@ + #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ + #define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */ + #define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */ +-#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */ ++#define CONSOLE_LOGLEVEL_DEFAULT 4 /* anything MORE serious than KERN_DEBUG */ + #define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */ + #define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */ + diff --git a/kernel/kernel/files/patches/archlinux/fix_CPU0_microcode_on_resume.patch b/kernel/kernel/files/patches/archlinux/fix_CPU0_microcode_on_resume.patch new file mode 100644 index 00000000..56f8094f --- /dev/null +++ b/kernel/kernel/files/patches/archlinux/fix_CPU0_microcode_on_resume.patch @@ -0,0 +1,21 @@ +diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c +index dd9d6190b08d..181e42bd85d3 100644 +--- a/arch/x86/kernel/cpu/microcode/core.c ++++ b/arch/x86/kernel/cpu/microcode/core.c +@@ -85,6 +85,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -465,6 +466,8 @@ static void mc_bp_resume(void) + + if (uci->valid && uci->mc) + microcode_ops->apply_microcode(cpu); ++ else if (!uci->mc) ++ load_ucode_intel_ap(); + } + + static struct syscore_ops mc_syscore_ops = { diff --git a/kernel/kernel/files/patches/gentoo/1500_XATTR_USER_PREFIX.patch b/kernel/kernel/files/patches/gentoo/1500_XATTR_USER_PREFIX.patch new file mode 100644 index 00000000..cc15cd51 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/1500_XATTR_USER_PREFIX.patch @@ -0,0 +1,54 @@ +From: Anthony G. Basile + +This patch adds support for a restricted user-controlled namespace on +tmpfs filesystem used to house PaX flags. The namespace must be of the +form user.pax.* and its value cannot exceed a size of 8 bytes. + +This is needed even on all Gentoo systems so that XATTR_PAX flags +are preserved for users who might build packages using portage on +a tmpfs system with a non-hardened kernel and then switch to a +hardened kernel with XATTR_PAX enabled. + +The namespace is added to any user with Extended Attribute support +enabled for tmpfs. Users who do not enable xattrs will not have +the XATTR_PAX flags preserved. + +diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h +index e4629b9..6958086 100644 +--- a/include/uapi/linux/xattr.h ++++ b/include/uapi/linux/xattr.h +@@ -63,5 +63,9 @@ + #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default" + #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT + ++/* User namespace */ ++#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax." ++#define XATTR_PAX_FLAGS_SUFFIX "flags" ++#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX + + #endif /* _UAPI_LINUX_XATTR_H */ +diff --git a/mm/shmem.c b/mm/shmem.c +index 1c44af7..f23bb1b 100644 +--- a/mm/shmem.c ++++ b/mm/shmem.c +@@ -2201,6 +2201,7 @@ static const struct xattr_handler *shmem_xattr_handlers[] = { + static int shmem_xattr_validate(const char *name) + { + struct { const char *prefix; size_t len; } arr[] = { ++ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN}, + { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN }, + { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN } + }; +@@ -2256,6 +2257,12 @@ static int shmem_setxattr(struct dentry *dentry, const char *name, + if (err) + return err; + ++ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) { ++ if (strcmp(name, XATTR_NAME_PAX_FLAGS)) ++ return -EOPNOTSUPP; ++ if (size > 8) ++ return -EINVAL; ++ } + return simple_xattr_set(&info->xattrs, name, value, size, flags); + } + diff --git a/kernel/kernel/files/patches/gentoo/1510_fs-enable-link-security-restrictions-by-default.patch b/kernel/kernel/files/patches/gentoo/1510_fs-enable-link-security-restrictions-by-default.patch new file mode 100644 index 00000000..639fb3c3 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/1510_fs-enable-link-security-restrictions-by-default.patch @@ -0,0 +1,22 @@ +From: Ben Hutchings +Subject: fs: Enable link security restrictions by default +Date: Fri, 02 Nov 2012 05:32:06 +0000 +Bug-Debian: https://bugs.debian.org/609455 +Forwarded: not-needed + +This reverts commit 561ec64ae67ef25cac8d72bb9c4bfc955edfd415 +('VFS: don't do protected {sym,hard}links by default'). + +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -651,8 +651,8 @@ static inline void put_link(struct namei + path_put(link); + } + +-int sysctl_protected_symlinks __read_mostly = 0; +-int sysctl_protected_hardlinks __read_mostly = 0; ++int sysctl_protected_symlinks __read_mostly = 1; ++int sysctl_protected_hardlinks __read_mostly = 1; + + /** + * may_follow_link - Check symlink following for unsafe situations diff --git a/kernel/kernel/files/patches/gentoo/2700_ThinkPad-30-brightness-control-fix.patch b/kernel/kernel/files/patches/gentoo/2700_ThinkPad-30-brightness-control-fix.patch new file mode 100644 index 00000000..b548c6dc --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/2700_ThinkPad-30-brightness-control-fix.patch @@ -0,0 +1,67 @@ +diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c +index cb96296..6c242ed 100644 +--- a/drivers/acpi/blacklist.c ++++ b/drivers/acpi/blacklist.c +@@ -269,6 +276,61 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { + }, + + /* ++ * The following Lenovo models have a broken workaround in the ++ * acpi_video backlight implementation to meet the Windows 8 ++ * requirement of 101 backlight levels. Reverting to pre-Win8 ++ * behavior fixes the problem. ++ */ ++ { ++ .callback = dmi_disable_osi_win8, ++ .ident = "Lenovo ThinkPad L430", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L430"), ++ }, ++ }, ++ { ++ .callback = dmi_disable_osi_win8, ++ .ident = "Lenovo ThinkPad T430s", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"), ++ }, ++ }, ++ { ++ .callback = dmi_disable_osi_win8, ++ .ident = "Lenovo ThinkPad T530", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"), ++ }, ++ }, ++ { ++ .callback = dmi_disable_osi_win8, ++ .ident = "Lenovo ThinkPad W530", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"), ++ }, ++ }, ++ { ++ .callback = dmi_disable_osi_win8, ++ .ident = "Lenovo ThinkPad X1 Carbon", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X1 Carbon"), ++ }, ++ }, ++ { ++ .callback = dmi_disable_osi_win8, ++ .ident = "Lenovo ThinkPad X230", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"), ++ }, ++ }, ++ ++ /* + * BIOS invocation of _OSI(Linux) is almost always a BIOS bug. + * Linux ignores it, except for the machines enumerated below. + */ + diff --git a/kernel/kernel/files/patches/gentoo/2900_dev-root-proc-mount-fix.patch b/kernel/kernel/files/patches/gentoo/2900_dev-root-proc-mount-fix.patch new file mode 100644 index 00000000..6ea86e29 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/2900_dev-root-proc-mount-fix.patch @@ -0,0 +1,30 @@ +--- a/init/do_mounts.c 2014-08-26 08:03:30.000013100 -0400 ++++ b/init/do_mounts.c 2014-08-26 08:11:19.720014712 -0400 +@@ -484,7 +484,10 @@ void __init change_floppy(char *fmt, ... + va_start(args, fmt); + vsprintf(buf, fmt, args); + va_end(args); +- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0); ++ if (saved_root_name[0]) ++ fd = sys_open(saved_root_name, O_RDWR | O_NDELAY, 0); ++ else ++ fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0); + if (fd >= 0) { + sys_ioctl(fd, FDEJECT, 0); + sys_close(fd); +@@ -527,8 +530,13 @@ void __init mount_root(void) + } + #endif + #ifdef CONFIG_BLOCK +- create_dev("/dev/root", ROOT_DEV); +- mount_block_root("/dev/root", root_mountflags); ++ if (saved_root_name[0]) { ++ create_dev(saved_root_name, ROOT_DEV); ++ mount_block_root(saved_root_name, root_mountflags); ++ } else { ++ create_dev("/dev/root", ROOT_DEV); ++ mount_block_root("/dev/root", root_mountflags); ++ } + #endif + } + diff --git a/kernel/kernel/files/patches/gentoo/2905_2disk-resume-image-fix.patch b/kernel/kernel/files/patches/gentoo/2905_2disk-resume-image-fix.patch new file mode 100644 index 00000000..7e95d298 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/2905_2disk-resume-image-fix.patch @@ -0,0 +1,24 @@ +diff --git a/kernel/kmod.c b/kernel/kmod.c +index fb32636..d968882 100644 +--- a/kernel/kmod.c ++++ b/kernel/kmod.c +@@ -575,7 +575,8 @@ + call_usermodehelper_freeinfo(sub_info); + return -EINVAL; + } +- helper_lock(); ++ if (!(current->flags & PF_FREEZER_SKIP)) ++ helper_lock(); + if (!khelper_wq || usermodehelper_disabled) { + retval = -EBUSY; + goto out; +@@ -611,7 +612,8 @@ wait_done: + out: + call_usermodehelper_freeinfo(sub_info); + unlock: +- helper_unlock(); ++ if (!(current->flags & PF_FREEZER_SKIP)) ++ helper_unlock(); + return retval; + } + EXPORT_SYMBOL(call_usermodehelper_exec); diff --git a/kernel/kernel/files/patches/gentoo/4200_fbcondecor-3.19.patch b/kernel/kernel/files/patches/gentoo/4200_fbcondecor-3.19.patch new file mode 100644 index 00000000..29c379fe --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/4200_fbcondecor-3.19.patch @@ -0,0 +1,2119 @@ +diff --git a/Documentation/fb/00-INDEX b/Documentation/fb/00-INDEX +index fe85e7c..2230930 100644 +--- a/Documentation/fb/00-INDEX ++++ b/Documentation/fb/00-INDEX +@@ -23,6 +23,8 @@ ep93xx-fb.txt + - info on the driver for EP93xx LCD controller. + fbcon.txt + - intro to and usage guide for the framebuffer console (fbcon). ++fbcondecor.txt ++ - info on the Framebuffer Console Decoration + framebuffer.txt + - introduction to frame buffer devices. + gxfb.txt +diff --git a/Documentation/fb/fbcondecor.txt b/Documentation/fb/fbcondecor.txt +new file mode 100644 +index 0000000..3388c61 +--- /dev/null ++++ b/Documentation/fb/fbcondecor.txt +@@ -0,0 +1,207 @@ ++What is it? ++----------- ++ ++The framebuffer decorations are a kernel feature which allows displaying a ++background picture on selected consoles. ++ ++What do I need to get it to work? ++--------------------------------- ++ ++To get fbcondecor up-and-running you will have to: ++ 1) get a copy of splashutils [1] or a similar program ++ 2) get some fbcondecor themes ++ 3) build the kernel helper program ++ 4) build your kernel with the FB_CON_DECOR option enabled. ++ ++To get fbcondecor operational right after fbcon initialization is finished, you ++will have to include a theme and the kernel helper into your initramfs image. ++Please refer to splashutils documentation for instructions on how to do that. ++ ++[1] The splashutils package can be downloaded from: ++ http://github.com/alanhaggai/fbsplash ++ ++The userspace helper ++-------------------- ++ ++The userspace fbcondecor helper (by default: /sbin/fbcondecor_helper) is called by the ++kernel whenever an important event occurs and the kernel needs some kind of ++job to be carried out. Important events include console switches and video ++mode switches (the kernel requests background images and configuration ++parameters for the current console). The fbcondecor helper must be accessible at ++all times. If it's not, fbcondecor will be switched off automatically. ++ ++It's possible to set path to the fbcondecor helper by writing it to ++/proc/sys/kernel/fbcondecor. ++ ++***************************************************************************** ++ ++The information below is mostly technical stuff. There's probably no need to ++read it unless you plan to develop a userspace helper. ++ ++The fbcondecor protocol ++----------------------- ++ ++The fbcondecor protocol defines a communication interface between the kernel and ++the userspace fbcondecor helper. ++ ++The kernel side is responsible for: ++ ++ * rendering console text, using an image as a background (instead of a ++ standard solid color fbcon uses), ++ * accepting commands from the user via ioctls on the fbcondecor device, ++ * calling the userspace helper to set things up as soon as the fb subsystem ++ is initialized. ++ ++The userspace helper is responsible for everything else, including parsing ++configuration files, decompressing the image files whenever the kernel needs ++it, and communicating with the kernel if necessary. ++ ++The fbcondecor protocol specifies how communication is done in both ways: ++kernel->userspace and userspace->helper. ++ ++Kernel -> Userspace ++------------------- ++ ++The kernel communicates with the userspace helper by calling it and specifying ++the task to be done in a series of arguments. ++ ++The arguments follow the pattern: ++ ++ ++All commands defined in fbcondecor protocol v2 have the following parameters: ++ virtual console ++ framebuffer number ++ theme ++ ++Fbcondecor protocol v1 specified an additional 'fbcondecor mode' after the ++framebuffer number. Fbcondecor protocol v1 is deprecated and should not be used. ++ ++Fbcondecor protocol v2 specifies the following commands: ++ ++getpic ++------ ++ The kernel issues this command to request image data. It's up to the ++ userspace helper to find a background image appropriate for the specified ++ theme and the current resolution. The userspace helper should respond by ++ issuing the FBIOCONDECOR_SETPIC ioctl. ++ ++init ++---- ++ The kernel issues this command after the fbcondecor device is created and ++ the fbcondecor interface is initialized. Upon receiving 'init', the userspace ++ helper should parse the kernel command line (/proc/cmdline) or otherwise ++ decide whether fbcondecor is to be activated. ++ ++ To activate fbcondecor on the first console the helper should issue the ++ FBIOCONDECOR_SETCFG, FBIOCONDECOR_SETPIC and FBIOCONDECOR_SETSTATE commands, ++ in the above-mentioned order. ++ ++ When the userspace helper is called in an early phase of the boot process ++ (right after the initialization of fbcon), no filesystems will be mounted. ++ The helper program should mount sysfs and then create the appropriate ++ framebuffer, fbcondecor and tty0 devices (if they don't already exist) to get ++ current display settings and to be able to communicate with the kernel side. ++ It should probably also mount the procfs to be able to parse the kernel ++ command line parameters. ++ ++ Note that the console sem is not held when the kernel calls fbcondecor_helper ++ with the 'init' command. The fbcondecor helper should perform all ioctls with ++ origin set to FBCON_DECOR_IO_ORIG_USER. ++ ++modechange ++---------- ++ The kernel issues this command on a mode change. The helper's response should ++ be similar to the response to the 'init' command. Note that this time the ++ console sem is held and all ioctls must be performed with origin set to ++ FBCON_DECOR_IO_ORIG_KERNEL. ++ ++ ++Userspace -> Kernel ++------------------- ++ ++Userspace programs can communicate with fbcondecor via ioctls on the ++fbcondecor device. These ioctls are to be used by both the userspace helper ++(called only by the kernel) and userspace configuration tools (run by the users). ++ ++The fbcondecor helper should set the origin field to FBCON_DECOR_IO_ORIG_KERNEL ++when doing the appropriate ioctls. All userspace configuration tools should ++use FBCON_DECOR_IO_ORIG_USER. Failure to set the appropriate value in the origin ++field when performing ioctls from the kernel helper will most likely result ++in a console deadlock. ++ ++FBCON_DECOR_IO_ORIG_KERNEL instructs fbcondecor not to try to acquire the console ++semaphore. Not surprisingly, FBCON_DECOR_IO_ORIG_USER instructs it to acquire ++the console sem. ++ ++The framebuffer console decoration provides the following ioctls (all defined in ++linux/fb.h): ++ ++FBIOCONDECOR_SETPIC ++description: loads a background picture for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: struct fb_image* ++notes: ++If called for consoles other than the current foreground one, the picture data ++will be ignored. ++ ++If the current virtual console is running in a 8-bpp mode, the cmap substruct ++of fb_image has to be filled appropriately: start should be set to 16 (first ++16 colors are reserved for fbcon), len to a value <= 240 and red, green and ++blue should point to valid cmap data. The transp field is ingored. The fields ++dx, dy, bg_color, fg_color in fb_image are ignored as well. ++ ++FBIOCONDECOR_SETCFG ++description: sets the fbcondecor config for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: struct vc_decor* ++notes: The structure has to be filled with valid data. ++ ++FBIOCONDECOR_GETCFG ++description: gets the fbcondecor config for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: struct vc_decor* ++ ++FBIOCONDECOR_SETSTATE ++description: sets the fbcondecor state for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: unsigned int* ++ values: 0 = disabled, 1 = enabled. ++ ++FBIOCONDECOR_GETSTATE ++description: gets the fbcondecor state for a virtual console ++argument: struct fbcon_decor_iowrapper*; data: unsigned int* ++ values: as in FBIOCONDECOR_SETSTATE ++ ++Info on used structures: ++ ++Definition of struct vc_decor can be found in linux/console_decor.h. It's ++heavily commented. Note that the 'theme' field should point to a string ++no longer than FBCON_DECOR_THEME_LEN. When FBIOCONDECOR_GETCFG call is ++performed, the theme field should point to a char buffer of length ++FBCON_DECOR_THEME_LEN. ++ ++Definition of struct fbcon_decor_iowrapper can be found in linux/fb.h. ++The fields in this struct have the following meaning: ++ ++vc: ++Virtual console number. ++ ++origin: ++Specifies if the ioctl is performed as a response to a kernel request. The ++fbcondecor helper should set this field to FBCON_DECOR_IO_ORIG_KERNEL, userspace ++programs should set it to FBCON_DECOR_IO_ORIG_USER. This field is necessary to ++avoid console semaphore deadlocks. ++ ++data: ++Pointer to a data structure appropriate for the performed ioctl. Type of ++the data struct is specified in the ioctls description. ++ ++***************************************************************************** ++ ++Credit ++------ ++ ++Original 'bootsplash' project & implementation by: ++ Volker Poplawski , Stefan Reinauer , ++ Steffen Winterfeldt , Michael Schroeder , ++ Ken Wimer . ++ ++Fbcondecor, fbcondecor protocol design, current implementation & docs by: ++ Michal Januszewski ++ +diff --git a/drivers/Makefile b/drivers/Makefile +index 7183b6a..d576148 100644 +--- a/drivers/Makefile ++++ b/drivers/Makefile +@@ -17,6 +17,10 @@ obj-y += pwm/ + obj-$(CONFIG_PCI) += pci/ + obj-$(CONFIG_PARISC) += parisc/ + obj-$(CONFIG_RAPIDIO) += rapidio/ ++# tty/ comes before char/ so that the VT console is the boot-time ++# default. ++obj-y += tty/ ++obj-y += char/ + obj-y += video/ + obj-y += idle/ + +@@ -42,11 +46,6 @@ obj-$(CONFIG_REGULATOR) += regulator/ + # reset controllers early, since gpu drivers might rely on them to initialize + obj-$(CONFIG_RESET_CONTROLLER) += reset/ + +-# tty/ comes before char/ so that the VT console is the boot-time +-# default. +-obj-y += tty/ +-obj-y += char/ +- + # iommu/ comes before gpu as gpu are using iommu controllers + obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ + +diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig +index fe1cd01..6d2e87a 100644 +--- a/drivers/video/console/Kconfig ++++ b/drivers/video/console/Kconfig +@@ -126,6 +126,19 @@ config FRAMEBUFFER_CONSOLE_ROTATION + such that other users of the framebuffer will remain normally + oriented. + ++config FB_CON_DECOR ++ bool "Support for the Framebuffer Console Decorations" ++ depends on FRAMEBUFFER_CONSOLE=y && !FB_TILEBLITTING ++ default n ++ ---help--- ++ This option enables support for framebuffer console decorations which ++ makes it possible to display images in the background of the system ++ consoles. Note that userspace utilities are necessary in order to take ++ advantage of these features. Refer to Documentation/fb/fbcondecor.txt ++ for more information. ++ ++ If unsure, say N. ++ + config STI_CONSOLE + bool "STI text console" + depends on PARISC +diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile +index 43bfa48..cc104b6f 100644 +--- a/drivers/video/console/Makefile ++++ b/drivers/video/console/Makefile +@@ -16,4 +16,5 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon_rotate.o fbcon_cw.o fbcon_ud.o \ + fbcon_ccw.o + endif + ++obj-$(CONFIG_FB_CON_DECOR) += fbcondecor.o cfbcondecor.o + obj-$(CONFIG_FB_STI) += sticore.o +diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c +index 61b182b..984384b 100644 +--- a/drivers/video/console/bitblit.c ++++ b/drivers/video/console/bitblit.c +@@ -18,6 +18,7 @@ + #include + #include + #include "fbcon.h" ++#include "fbcondecor.h" + + /* + * Accelerated handlers. +@@ -55,6 +56,13 @@ static void bit_bmove(struct vc_data *vc, struct fb_info *info, int sy, + area.height = height * vc->vc_font.height; + area.width = width * vc->vc_font.width; + ++ if (fbcon_decor_active(info, vc)) { ++ area.sx += vc->vc_decor.tx; ++ area.sy += vc->vc_decor.ty; ++ area.dx += vc->vc_decor.tx; ++ area.dy += vc->vc_decor.ty; ++ } ++ + info->fbops->fb_copyarea(info, &area); + } + +@@ -380,11 +388,15 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, + cursor.image.depth = 1; + cursor.rop = ROP_XOR; + +- if (info->fbops->fb_cursor) +- err = info->fbops->fb_cursor(info, &cursor); ++ if (fbcon_decor_active(info, vc)) { ++ fbcon_decor_cursor(info, &cursor); ++ } else { ++ if (info->fbops->fb_cursor) ++ err = info->fbops->fb_cursor(info, &cursor); + +- if (err) +- soft_cursor(info, &cursor); ++ if (err) ++ soft_cursor(info, &cursor); ++ } + + ops->cursor_reset = 0; + } +diff --git a/drivers/video/console/cfbcondecor.c b/drivers/video/console/cfbcondecor.c +new file mode 100644 +index 0000000..a2b4497 +--- /dev/null ++++ b/drivers/video/console/cfbcondecor.c +@@ -0,0 +1,471 @@ ++/* ++ * linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions ++ * ++ * Copyright (C) 2004 Michal Januszewski ++ * ++ * Code based upon "Bootdecor" (C) 2001-2003 ++ * Volker Poplawski , ++ * Stefan Reinauer , ++ * Steffen Winterfeldt , ++ * Michael Schroeder , ++ * Ken Wimer . ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "fbcon.h" ++#include "fbcondecor.h" ++ ++#define parse_pixel(shift,bpp,type) \ ++ do { \ ++ if (d & (0x80 >> (shift))) \ ++ dd2[(shift)] = fgx; \ ++ else \ ++ dd2[(shift)] = transparent ? *(type *)decor_src : bgx; \ ++ decor_src += (bpp); \ ++ } while (0) \ ++ ++extern int get_color(struct vc_data *vc, struct fb_info *info, ++ u16 c, int is_fg); ++ ++void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc) ++{ ++ int i, j, k; ++ int minlen = min(min(info->var.red.length, info->var.green.length), ++ info->var.blue.length); ++ u32 col; ++ ++ for (j = i = 0; i < 16; i++) { ++ k = color_table[i]; ++ ++ col = ((vc->vc_palette[j++] >> (8-minlen)) ++ << info->var.red.offset); ++ col |= ((vc->vc_palette[j++] >> (8-minlen)) ++ << info->var.green.offset); ++ col |= ((vc->vc_palette[j++] >> (8-minlen)) ++ << info->var.blue.offset); ++ ((u32 *)info->pseudo_palette)[k] = col; ++ } ++} ++ ++void fbcon_decor_renderc(struct fb_info *info, int ypos, int xpos, int height, ++ int width, u8* src, u32 fgx, u32 bgx, u8 transparent) ++{ ++ unsigned int x, y; ++ u32 dd; ++ int bytespp = ((info->var.bits_per_pixel + 7) >> 3); ++ unsigned int d = ypos * info->fix.line_length + xpos * bytespp; ++ unsigned int ds = (ypos * info->var.xres + xpos) * bytespp; ++ u16 dd2[4]; ++ ++ u8* decor_src = (u8 *)(info->bgdecor.data + ds); ++ u8* dst = (u8 *)(info->screen_base + d); ++ ++ if ((ypos + height) > info->var.yres || (xpos + width) > info->var.xres) ++ return; ++ ++ for (y = 0; y < height; y++) { ++ switch (info->var.bits_per_pixel) { ++ ++ case 32: ++ for (x = 0; x < width; x++) { ++ ++ if ((x & 7) == 0) ++ d = *src++; ++ if (d & 0x80) ++ dd = fgx; ++ else ++ dd = transparent ? ++ *(u32 *)decor_src : bgx; ++ ++ d <<= 1; ++ decor_src += 4; ++ fb_writel(dd, dst); ++ dst += 4; ++ } ++ break; ++ case 24: ++ for (x = 0; x < width; x++) { ++ ++ if ((x & 7) == 0) ++ d = *src++; ++ if (d & 0x80) ++ dd = fgx; ++ else ++ dd = transparent ? ++ (*(u32 *)decor_src & 0xffffff) : bgx; ++ ++ d <<= 1; ++ decor_src += 3; ++#ifdef __LITTLE_ENDIAN ++ fb_writew(dd & 0xffff, dst); ++ dst += 2; ++ fb_writeb((dd >> 16), dst); ++#else ++ fb_writew(dd >> 8, dst); ++ dst += 2; ++ fb_writeb(dd & 0xff, dst); ++#endif ++ dst++; ++ } ++ break; ++ case 16: ++ for (x = 0; x < width; x += 2) { ++ if ((x & 7) == 0) ++ d = *src++; ++ ++ parse_pixel(0, 2, u16); ++ parse_pixel(1, 2, u16); ++#ifdef __LITTLE_ENDIAN ++ dd = dd2[0] | (dd2[1] << 16); ++#else ++ dd = dd2[1] | (dd2[0] << 16); ++#endif ++ d <<= 2; ++ fb_writel(dd, dst); ++ dst += 4; ++ } ++ break; ++ ++ case 8: ++ for (x = 0; x < width; x += 4) { ++ if ((x & 7) == 0) ++ d = *src++; ++ ++ parse_pixel(0, 1, u8); ++ parse_pixel(1, 1, u8); ++ parse_pixel(2, 1, u8); ++ parse_pixel(3, 1, u8); ++ ++#ifdef __LITTLE_ENDIAN ++ dd = dd2[0] | (dd2[1] << 8) | (dd2[2] << 16) | (dd2[3] << 24); ++#else ++ dd = dd2[3] | (dd2[2] << 8) | (dd2[1] << 16) | (dd2[0] << 24); ++#endif ++ d <<= 4; ++ fb_writel(dd, dst); ++ dst += 4; ++ } ++ } ++ ++ dst += info->fix.line_length - width * bytespp; ++ decor_src += (info->var.xres - width) * bytespp; ++ } ++} ++ ++#define cc2cx(a) \ ++ ((info->fix.visual == FB_VISUAL_TRUECOLOR || \ ++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) ? \ ++ ((u32*)info->pseudo_palette)[a] : a) ++ ++void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, ++ const unsigned short *s, int count, int yy, int xx) ++{ ++ unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; ++ struct fbcon_ops *ops = info->fbcon_par; ++ int fg_color, bg_color, transparent; ++ u8 *src; ++ u32 bgx, fgx; ++ u16 c = scr_readw(s); ++ ++ fg_color = get_color(vc, info, c, 1); ++ bg_color = get_color(vc, info, c, 0); ++ ++ /* Don't paint the background image if console is blanked */ ++ transparent = ops->blank_state ? 0 : ++ (vc->vc_decor.bg_color == bg_color); ++ ++ xx = xx * vc->vc_font.width + vc->vc_decor.tx; ++ yy = yy * vc->vc_font.height + vc->vc_decor.ty; ++ ++ fgx = cc2cx(fg_color); ++ bgx = cc2cx(bg_color); ++ ++ while (count--) { ++ c = scr_readw(s++); ++ src = vc->vc_font.data + (c & charmask) * vc->vc_font.height * ++ ((vc->vc_font.width + 7) >> 3); ++ ++ fbcon_decor_renderc(info, yy, xx, vc->vc_font.height, ++ vc->vc_font.width, src, fgx, bgx, transparent); ++ xx += vc->vc_font.width; ++ } ++} ++ ++void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor) ++{ ++ int i; ++ unsigned int dsize, s_pitch; ++ struct fbcon_ops *ops = info->fbcon_par; ++ struct vc_data* vc; ++ u8 *src; ++ ++ /* we really don't need any cursors while the console is blanked */ ++ if (info->state != FBINFO_STATE_RUNNING || ops->blank_state) ++ return; ++ ++ vc = vc_cons[ops->currcon].d; ++ ++ src = kmalloc(64 + sizeof(struct fb_image), GFP_ATOMIC); ++ if (!src) ++ return; ++ ++ s_pitch = (cursor->image.width + 7) >> 3; ++ dsize = s_pitch * cursor->image.height; ++ if (cursor->enable) { ++ switch (cursor->rop) { ++ case ROP_XOR: ++ for (i = 0; i < dsize; i++) ++ src[i] = cursor->image.data[i] ^ cursor->mask[i]; ++ break; ++ case ROP_COPY: ++ default: ++ for (i = 0; i < dsize; i++) ++ src[i] = cursor->image.data[i] & cursor->mask[i]; ++ break; ++ } ++ } else ++ memcpy(src, cursor->image.data, dsize); ++ ++ fbcon_decor_renderc(info, ++ cursor->image.dy + vc->vc_decor.ty, ++ cursor->image.dx + vc->vc_decor.tx, ++ cursor->image.height, ++ cursor->image.width, ++ (u8*)src, ++ cc2cx(cursor->image.fg_color), ++ cc2cx(cursor->image.bg_color), ++ cursor->image.bg_color == vc->vc_decor.bg_color); ++ ++ kfree(src); ++} ++ ++static void decorset(u8 *dst, int height, int width, int dstbytes, ++ u32 bgx, int bpp) ++{ ++ int i; ++ ++ if (bpp == 8) ++ bgx |= bgx << 8; ++ if (bpp == 16 || bpp == 8) ++ bgx |= bgx << 16; ++ ++ while (height-- > 0) { ++ u8 *p = dst; ++ ++ switch (bpp) { ++ ++ case 32: ++ for (i=0; i < width; i++) { ++ fb_writel(bgx, p); p += 4; ++ } ++ break; ++ case 24: ++ for (i=0; i < width; i++) { ++#ifdef __LITTLE_ENDIAN ++ fb_writew((bgx & 0xffff),(u16*)p); p += 2; ++ fb_writeb((bgx >> 16),p++); ++#else ++ fb_writew((bgx >> 8),(u16*)p); p += 2; ++ fb_writeb((bgx & 0xff),p++); ++#endif ++ } ++ case 16: ++ for (i=0; i < width/4; i++) { ++ fb_writel(bgx,p); p += 4; ++ fb_writel(bgx,p); p += 4; ++ } ++ if (width & 2) { ++ fb_writel(bgx,p); p += 4; ++ } ++ if (width & 1) ++ fb_writew(bgx,(u16*)p); ++ break; ++ case 8: ++ for (i=0; i < width/4; i++) { ++ fb_writel(bgx,p); p += 4; ++ } ++ ++ if (width & 2) { ++ fb_writew(bgx,p); p += 2; ++ } ++ if (width & 1) ++ fb_writeb(bgx,(u8*)p); ++ break; ++ ++ } ++ dst += dstbytes; ++ } ++} ++ ++void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes, ++ int srclinebytes, int bpp) ++{ ++ int i; ++ ++ while (height-- > 0) { ++ u32 *p = (u32 *)dst; ++ u32 *q = (u32 *)src; ++ ++ switch (bpp) { ++ ++ case 32: ++ for (i=0; i < width; i++) ++ fb_writel(*q++, p++); ++ break; ++ case 24: ++ for (i=0; i < (width*3/4); i++) ++ fb_writel(*q++, p++); ++ if ((width*3) % 4) { ++ if (width & 2) { ++ fb_writeb(*(u8*)q, (u8*)p); ++ } else if (width & 1) { ++ fb_writew(*(u16*)q, (u16*)p); ++ fb_writeb(*(u8*)((u16*)q+1),(u8*)((u16*)p+2)); ++ } ++ } ++ break; ++ case 16: ++ for (i=0; i < width/4; i++) { ++ fb_writel(*q++, p++); ++ fb_writel(*q++, p++); ++ } ++ if (width & 2) ++ fb_writel(*q++, p++); ++ if (width & 1) ++ fb_writew(*(u16*)q, (u16*)p); ++ break; ++ case 8: ++ for (i=0; i < width/4; i++) ++ fb_writel(*q++, p++); ++ ++ if (width & 2) { ++ fb_writew(*(u16*)q, (u16*)p); ++ q = (u32*) ((u16*)q + 1); ++ p = (u32*) ((u16*)p + 1); ++ } ++ if (width & 1) ++ fb_writeb(*(u8*)q, (u8*)p); ++ break; ++ } ++ ++ dst += linebytes; ++ src += srclinebytes; ++ } ++} ++ ++static void decorfill(struct fb_info *info, int sy, int sx, int height, ++ int width) ++{ ++ int bytespp = ((info->var.bits_per_pixel + 7) >> 3); ++ int d = sy * info->fix.line_length + sx * bytespp; ++ int ds = (sy * info->var.xres + sx) * bytespp; ++ ++ fbcon_decor_copy((u8 *)(info->screen_base + d), (u8 *)(info->bgdecor.data + ds), ++ height, width, info->fix.line_length, info->var.xres * bytespp, ++ info->var.bits_per_pixel); ++} ++ ++void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, ++ int height, int width) ++{ ++ int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; ++ struct fbcon_ops *ops = info->fbcon_par; ++ u8 *dst; ++ int transparent, bg_color = attr_bgcol_ec(bgshift, vc, info); ++ ++ transparent = (vc->vc_decor.bg_color == bg_color); ++ sy = sy * vc->vc_font.height + vc->vc_decor.ty; ++ sx = sx * vc->vc_font.width + vc->vc_decor.tx; ++ height *= vc->vc_font.height; ++ width *= vc->vc_font.width; ++ ++ /* Don't paint the background image if console is blanked */ ++ if (transparent && !ops->blank_state) { ++ decorfill(info, sy, sx, height, width); ++ } else { ++ dst = (u8 *)(info->screen_base + sy * info->fix.line_length + ++ sx * ((info->var.bits_per_pixel + 7) >> 3)); ++ decorset(dst, height, width, info->fix.line_length, cc2cx(bg_color), ++ info->var.bits_per_pixel); ++ } ++} ++ ++void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, ++ int bottom_only) ++{ ++ unsigned int tw = vc->vc_cols*vc->vc_font.width; ++ unsigned int th = vc->vc_rows*vc->vc_font.height; ++ ++ if (!bottom_only) { ++ /* top margin */ ++ decorfill(info, 0, 0, vc->vc_decor.ty, info->var.xres); ++ /* left margin */ ++ decorfill(info, vc->vc_decor.ty, 0, th, vc->vc_decor.tx); ++ /* right margin */ ++ decorfill(info, vc->vc_decor.ty, vc->vc_decor.tx + tw, th, ++ info->var.xres - vc->vc_decor.tx - tw); ++ } ++ decorfill(info, vc->vc_decor.ty + th, 0, ++ info->var.yres - vc->vc_decor.ty - th, info->var.xres); ++} ++ ++void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, ++ int sx, int dx, int width) ++{ ++ u16 *d = (u16 *) (vc->vc_origin + vc->vc_size_row * y + dx * 2); ++ u16 *s = d + (dx - sx); ++ u16 *start = d; ++ u16 *ls = d; ++ u16 *le = d + width; ++ u16 c; ++ int x = dx; ++ u16 attr = 1; ++ ++ do { ++ c = scr_readw(d); ++ if (attr != (c & 0xff00)) { ++ attr = c & 0xff00; ++ if (d > start) { ++ fbcon_decor_putcs(vc, info, start, d - start, y, x); ++ x += d - start; ++ start = d; ++ } ++ } ++ if (s >= ls && s < le && c == scr_readw(s)) { ++ if (d > start) { ++ fbcon_decor_putcs(vc, info, start, d - start, y, x); ++ x += d - start + 1; ++ start = d + 1; ++ } else { ++ x++; ++ start++; ++ } ++ } ++ s++; ++ d++; ++ } while (d < le); ++ if (d > start) ++ fbcon_decor_putcs(vc, info, start, d - start, y, x); ++} ++ ++void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank) ++{ ++ if (blank) { ++ decorset((u8 *)info->screen_base, info->var.yres, info->var.xres, ++ info->fix.line_length, 0, info->var.bits_per_pixel); ++ } else { ++ update_screen(vc); ++ fbcon_decor_clear_margins(vc, info, 0); ++ } ++} ++ +diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c +index f447734..da50d61 100644 +--- a/drivers/video/console/fbcon.c ++++ b/drivers/video/console/fbcon.c +@@ -79,6 +79,7 @@ + #include + + #include "fbcon.h" ++#include "../console/fbcondecor.h" + + #ifdef FBCONDEBUG + # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args) +@@ -94,7 +95,7 @@ enum { + + static struct display fb_display[MAX_NR_CONSOLES]; + +-static signed char con2fb_map[MAX_NR_CONSOLES]; ++signed char con2fb_map[MAX_NR_CONSOLES]; + static signed char con2fb_map_boot[MAX_NR_CONSOLES]; + + static int logo_lines; +@@ -286,7 +287,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info) + !vt_force_oops_output(vc); + } + +-static int get_color(struct vc_data *vc, struct fb_info *info, ++int get_color(struct vc_data *vc, struct fb_info *info, + u16 c, int is_fg) + { + int depth = fb_get_color_depth(&info->var, &info->fix); +@@ -551,6 +552,9 @@ static int do_fbcon_takeover(int show_logo) + info_idx = -1; + } else { + fbcon_has_console_bind = 1; ++#ifdef CONFIG_FB_CON_DECOR ++ fbcon_decor_init(); ++#endif + } + + return err; +@@ -1007,6 +1011,12 @@ static const char *fbcon_startup(void) + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); + cols /= vc->vc_font.width; + rows /= vc->vc_font.height; ++ ++ if (fbcon_decor_active(info, vc)) { ++ cols = vc->vc_decor.twidth / vc->vc_font.width; ++ rows = vc->vc_decor.theight / vc->vc_font.height; ++ } ++ + vc_resize(vc, cols, rows); + + DPRINTK("mode: %s\n", info->fix.id); +@@ -1036,7 +1046,7 @@ static void fbcon_init(struct vc_data *vc, int init) + cap = info->flags; + + if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || +- (info->fix.type == FB_TYPE_TEXT)) ++ (info->fix.type == FB_TYPE_TEXT) || fbcon_decor_active(info, vc)) + logo = 0; + + if (var_to_display(p, &info->var, info)) +@@ -1260,6 +1270,11 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height, + fbcon_clear_margins(vc, 0); + } + ++ if (fbcon_decor_active(info, vc)) { ++ fbcon_decor_clear(vc, info, sy, sx, height, width); ++ return; ++ } ++ + /* Split blits that cross physical y_wrap boundary */ + + y_break = p->vrows - p->yscroll; +@@ -1279,10 +1294,15 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, + struct display *p = &fb_display[vc->vc_num]; + struct fbcon_ops *ops = info->fbcon_par; + +- if (!fbcon_is_inactive(vc, info)) +- ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, +- get_color(vc, info, scr_readw(s), 1), +- get_color(vc, info, scr_readw(s), 0)); ++ if (!fbcon_is_inactive(vc, info)) { ++ ++ if (fbcon_decor_active(info, vc)) ++ fbcon_decor_putcs(vc, info, s, count, ypos, xpos); ++ else ++ ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, ++ get_color(vc, info, scr_readw(s), 1), ++ get_color(vc, info, scr_readw(s), 0)); ++ } + } + + static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) +@@ -1298,8 +1318,13 @@ static void fbcon_clear_margins(struct vc_data *vc, int bottom_only) + struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; + struct fbcon_ops *ops = info->fbcon_par; + +- if (!fbcon_is_inactive(vc, info)) +- ops->clear_margins(vc, info, bottom_only); ++ if (!fbcon_is_inactive(vc, info)) { ++ if (fbcon_decor_active(info, vc)) { ++ fbcon_decor_clear_margins(vc, info, bottom_only); ++ } else { ++ ops->clear_margins(vc, info, bottom_only); ++ } ++ } + } + + static void fbcon_cursor(struct vc_data *vc, int mode) +@@ -1819,7 +1844,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir, + count = vc->vc_rows; + if (softback_top) + fbcon_softback_note(vc, t, count); +- if (logo_shown >= 0) ++ if (logo_shown >= 0 || fbcon_decor_active(info, vc)) + goto redraw_up; + switch (p->scrollmode) { + case SCROLL_MOVE: +@@ -1912,6 +1937,8 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir, + count = vc->vc_rows; + if (logo_shown >= 0) + goto redraw_down; ++ if (fbcon_decor_active(info, vc)) ++ goto redraw_down; + switch (p->scrollmode) { + case SCROLL_MOVE: + fbcon_redraw_blit(vc, info, p, b - 1, b - t - count, +@@ -2060,6 +2087,13 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s + } + return; + } ++ ++ if (fbcon_decor_active(info, vc) && sy == dy && height == 1) { ++ /* must use slower redraw bmove to keep background pic intact */ ++ fbcon_decor_bmove_redraw(vc, info, sy, sx, dx, width); ++ return; ++ } ++ + ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx, + height, width); + } +@@ -2130,8 +2164,8 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width, + var.yres = virt_h * virt_fh; + x_diff = info->var.xres - var.xres; + y_diff = info->var.yres - var.yres; +- if (x_diff < 0 || x_diff > virt_fw || +- y_diff < 0 || y_diff > virt_fh) { ++ if ((x_diff < 0 || x_diff > virt_fw || ++ y_diff < 0 || y_diff > virt_fh) && !vc->vc_decor.state) { + const struct fb_videomode *mode; + + DPRINTK("attempting resize %ix%i\n", var.xres, var.yres); +@@ -2167,6 +2201,21 @@ static int fbcon_switch(struct vc_data *vc) + + info = registered_fb[con2fb_map[vc->vc_num]]; + ops = info->fbcon_par; ++ prev_console = ops->currcon; ++ if (prev_console != -1) ++ old_info = registered_fb[con2fb_map[prev_console]]; ++ ++#ifdef CONFIG_FB_CON_DECOR ++ if (!fbcon_decor_active_vc(vc) && info->fix.visual == FB_VISUAL_DIRECTCOLOR) { ++ struct vc_data *vc_curr = vc_cons[prev_console].d; ++ if (vc_curr && fbcon_decor_active_vc(vc_curr)) { ++ /* Clear the screen to avoid displaying funky colors during ++ * palette updates. */ ++ memset((u8*)info->screen_base + info->fix.line_length * info->var.yoffset, ++ 0, info->var.yres * info->fix.line_length); ++ } ++ } ++#endif + + if (softback_top) { + if (softback_lines) +@@ -2185,9 +2234,6 @@ static int fbcon_switch(struct vc_data *vc) + logo_shown = FBCON_LOGO_CANSHOW; + } + +- prev_console = ops->currcon; +- if (prev_console != -1) +- old_info = registered_fb[con2fb_map[prev_console]]; + /* + * FIXME: If we have multiple fbdev's loaded, we need to + * update all info->currcon. Perhaps, we can place this +@@ -2231,6 +2277,18 @@ static int fbcon_switch(struct vc_data *vc) + fbcon_del_cursor_timer(old_info); + } + ++ if (fbcon_decor_active_vc(vc)) { ++ struct vc_data *vc_curr = vc_cons[prev_console].d; ++ ++ if (!vc_curr->vc_decor.theme || ++ strcmp(vc->vc_decor.theme, vc_curr->vc_decor.theme) || ++ (fbcon_decor_active_nores(info, vc_curr) && ++ !fbcon_decor_active(info, vc_curr))) { ++ fbcon_decor_disable(vc, 0); ++ fbcon_decor_call_helper("modechange", vc->vc_num); ++ } ++ } ++ + if (fbcon_is_inactive(vc, info) || + ops->blank_state != FB_BLANK_UNBLANK) + fbcon_del_cursor_timer(info); +@@ -2339,15 +2397,20 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch) + } + } + +- if (!fbcon_is_inactive(vc, info)) { ++ if (!fbcon_is_inactive(vc, info)) { + if (ops->blank_state != blank) { + ops->blank_state = blank; + fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW); + ops->cursor_flash = (!blank); + +- if (!(info->flags & FBINFO_MISC_USEREVENT)) +- if (fb_blank(info, blank)) +- fbcon_generic_blank(vc, info, blank); ++ if (!(info->flags & FBINFO_MISC_USEREVENT)) { ++ if (fb_blank(info, blank)) { ++ if (fbcon_decor_active(info, vc)) ++ fbcon_decor_blank(vc, info, blank); ++ else ++ fbcon_generic_blank(vc, info, blank); ++ } ++ } + } + + if (!blank) +@@ -2522,13 +2585,22 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, + } + + if (resize) { ++ /* reset wrap/pan */ + int cols, rows; + + cols = FBCON_SWAP(ops->rotate, info->var.xres, info->var.yres); + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); ++ ++ if (fbcon_decor_active(info, vc)) { ++ info->var.xoffset = info->var.yoffset = p->yscroll = 0; ++ cols = vc->vc_decor.twidth; ++ rows = vc->vc_decor.theight; ++ } + cols /= w; + rows /= h; ++ + vc_resize(vc, cols, rows); ++ + if (CON_IS_VISIBLE(vc) && softback_buf) + fbcon_update_softback(vc); + } else if (CON_IS_VISIBLE(vc) +@@ -2657,7 +2729,11 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table) + int i, j, k, depth; + u8 val; + +- if (fbcon_is_inactive(vc, info)) ++ if (fbcon_is_inactive(vc, info) ++#ifdef CONFIG_FB_CON_DECOR ++ || vc->vc_num != fg_console ++#endif ++ ) + return -EINVAL; + + if (!CON_IS_VISIBLE(vc)) +@@ -2683,14 +2759,56 @@ static int fbcon_set_palette(struct vc_data *vc, unsigned char *table) + } else + fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap); + +- return fb_set_cmap(&palette_cmap, info); ++ if (fbcon_decor_active(info, vc_cons[fg_console].d) && ++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) { ++ ++ u16 *red, *green, *blue; ++ int minlen = min(min(info->var.red.length, info->var.green.length), ++ info->var.blue.length); ++ int h; ++ ++ struct fb_cmap cmap = { ++ .start = 0, ++ .len = (1 << minlen), ++ .red = NULL, ++ .green = NULL, ++ .blue = NULL, ++ .transp = NULL ++ }; ++ ++ red = kmalloc(256 * sizeof(u16) * 3, GFP_KERNEL); ++ ++ if (!red) ++ goto out; ++ ++ green = red + 256; ++ blue = green + 256; ++ cmap.red = red; ++ cmap.green = green; ++ cmap.blue = blue; ++ ++ for (i = 0; i < cmap.len; i++) { ++ red[i] = green[i] = blue[i] = (0xffff * i)/(cmap.len-1); ++ } ++ ++ h = fb_set_cmap(&cmap, info); ++ fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d); ++ kfree(red); ++ ++ return h; ++ ++ } else if (fbcon_decor_active(info, vc_cons[fg_console].d) && ++ info->var.bits_per_pixel == 8 && info->bgdecor.cmap.red != NULL) ++ fb_set_cmap(&info->bgdecor.cmap, info); ++ ++out: return fb_set_cmap(&palette_cmap, info); + } + + static u16 *fbcon_screen_pos(struct vc_data *vc, int offset) + { + unsigned long p; + int line; +- ++ + if (vc->vc_num != fg_console || !softback_lines) + return (u16 *) (vc->vc_origin + offset); + line = offset / vc->vc_size_row; +@@ -2909,7 +3027,14 @@ static void fbcon_modechanged(struct fb_info *info) + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); + cols /= vc->vc_font.width; + rows /= vc->vc_font.height; +- vc_resize(vc, cols, rows); ++ ++ if (!fbcon_decor_active_nores(info, vc)) { ++ vc_resize(vc, cols, rows); ++ } else { ++ fbcon_decor_disable(vc, 0); ++ fbcon_decor_call_helper("modechange", vc->vc_num); ++ } ++ + updatescrollmode(p, info, vc); + scrollback_max = 0; + scrollback_current = 0; +@@ -2954,7 +3079,9 @@ static void fbcon_set_all_vcs(struct fb_info *info) + rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); + cols /= vc->vc_font.width; + rows /= vc->vc_font.height; +- vc_resize(vc, cols, rows); ++ if (!fbcon_decor_active_nores(info, vc)) { ++ vc_resize(vc, cols, rows); ++ } + } + + if (fg != -1) +@@ -3596,6 +3723,7 @@ static void fbcon_exit(void) + } + } + ++ fbcon_decor_exit(); + fbcon_has_exited = 1; + } + +diff --git a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondecor.c +new file mode 100644 +index 0000000..babc8c5 +--- /dev/null ++++ b/drivers/video/console/fbcondecor.c +@@ -0,0 +1,555 @@ ++/* ++ * linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations ++ * ++ * Copyright (C) 2004-2009 Michal Januszewski ++ * ++ * Code based upon "Bootsplash" (C) 2001-2003 ++ * Volker Poplawski , ++ * Stefan Reinauer , ++ * Steffen Winterfeldt , ++ * Michael Schroeder , ++ * Ken Wimer . ++ * ++ * Compat ioctl support by Thorsten Klein . ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive for ++ * more details. ++ * ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#include "fbcon.h" ++#include "fbcondecor.h" ++ ++extern signed char con2fb_map[]; ++static int fbcon_decor_enable(struct vc_data *vc); ++char fbcon_decor_path[KMOD_PATH_LEN] = "/sbin/fbcondecor_helper"; ++static int initialized = 0; ++ ++int fbcon_decor_call_helper(char* cmd, unsigned short vc) ++{ ++ char *envp[] = { ++ "HOME=/", ++ "PATH=/sbin:/bin", ++ NULL ++ }; ++ ++ char tfb[5]; ++ char tcons[5]; ++ unsigned char fb = (int) con2fb_map[vc]; ++ ++ char *argv[] = { ++ fbcon_decor_path, ++ "2", ++ cmd, ++ tcons, ++ tfb, ++ vc_cons[vc].d->vc_decor.theme, ++ NULL ++ }; ++ ++ snprintf(tfb,5,"%d",fb); ++ snprintf(tcons,5,"%d",vc); ++ ++ return call_usermodehelper(fbcon_decor_path, argv, envp, UMH_WAIT_EXEC); ++} ++ ++/* Disables fbcondecor on a virtual console; called with console sem held. */ ++int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw) ++{ ++ struct fb_info* info; ++ ++ if (!vc->vc_decor.state) ++ return -EINVAL; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (info == NULL) ++ return -EINVAL; ++ ++ vc->vc_decor.state = 0; ++ vc_resize(vc, info->var.xres / vc->vc_font.width, ++ info->var.yres / vc->vc_font.height); ++ ++ if (fg_console == vc->vc_num && redraw) { ++ redraw_screen(vc, 0); ++ update_region(vc, vc->vc_origin + ++ vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ } ++ ++ printk(KERN_INFO "fbcondecor: switched decor state to 'off' on console %d\n", ++ vc->vc_num); ++ ++ return 0; ++} ++ ++/* Enables fbcondecor on a virtual console; called with console sem held. */ ++static int fbcon_decor_enable(struct vc_data *vc) ++{ ++ struct fb_info* info; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (vc->vc_decor.twidth == 0 || vc->vc_decor.theight == 0 || ++ info == NULL || vc->vc_decor.state || (!info->bgdecor.data && ++ vc->vc_num == fg_console)) ++ return -EINVAL; ++ ++ vc->vc_decor.state = 1; ++ vc_resize(vc, vc->vc_decor.twidth / vc->vc_font.width, ++ vc->vc_decor.theight / vc->vc_font.height); ++ ++ if (fg_console == vc->vc_num) { ++ redraw_screen(vc, 0); ++ update_region(vc, vc->vc_origin + ++ vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ fbcon_decor_clear_margins(vc, info, 0); ++ } ++ ++ printk(KERN_INFO "fbcondecor: switched decor state to 'on' on console %d\n", ++ vc->vc_num); ++ ++ return 0; ++} ++ ++static inline int fbcon_decor_ioctl_dosetstate(struct vc_data *vc, unsigned int state, unsigned char origin) ++{ ++ int ret; ++ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_lock(); ++ if (!state) ++ ret = fbcon_decor_disable(vc, 1); ++ else ++ ret = fbcon_decor_enable(vc); ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_unlock(); ++ ++ return ret; ++} ++ ++static inline void fbcon_decor_ioctl_dogetstate(struct vc_data *vc, unsigned int *state) ++{ ++ *state = vc->vc_decor.state; ++} ++ ++static int fbcon_decor_ioctl_dosetcfg(struct vc_data *vc, struct vc_decor *cfg, unsigned char origin) ++{ ++ struct fb_info *info; ++ int len; ++ char *tmp; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (info == NULL || !cfg->twidth || !cfg->theight || ++ cfg->tx + cfg->twidth > info->var.xres || ++ cfg->ty + cfg->theight > info->var.yres) ++ return -EINVAL; ++ ++ len = strlen_user(cfg->theme); ++ if (!len || len > FBCON_DECOR_THEME_LEN) ++ return -EINVAL; ++ tmp = kmalloc(len, GFP_KERNEL); ++ if (!tmp) ++ return -ENOMEM; ++ if (copy_from_user(tmp, (void __user *)cfg->theme, len)) ++ return -EFAULT; ++ cfg->theme = tmp; ++ cfg->state = 0; ++ ++ /* If this ioctl is a response to a request from kernel, the console sem ++ * is already held; we also don't need to disable decor because either the ++ * new config and background picture will be successfully loaded, and the ++ * decor will stay on, or in case of a failure it'll be turned off in fbcon. */ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) { ++ console_lock(); ++ if (vc->vc_decor.state) ++ fbcon_decor_disable(vc, 1); ++// } ++ ++ if (vc->vc_decor.theme) ++ kfree(vc->vc_decor.theme); ++ ++ vc->vc_decor = *cfg; ++ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_unlock(); ++ ++ printk(KERN_INFO "fbcondecor: console %d using theme '%s'\n", ++ vc->vc_num, vc->vc_decor.theme); ++ return 0; ++} ++ ++static int fbcon_decor_ioctl_dogetcfg(struct vc_data *vc, struct vc_decor *decor) ++{ ++ char __user *tmp; ++ ++ tmp = decor->theme; ++ *decor = vc->vc_decor; ++ decor->theme = tmp; ++ ++ if (vc->vc_decor.theme) { ++ if (copy_to_user(tmp, vc->vc_decor.theme, strlen(vc->vc_decor.theme) + 1)) ++ return -EFAULT; ++ } else ++ if (put_user(0, tmp)) ++ return -EFAULT; ++ ++ return 0; ++} ++ ++static int fbcon_decor_ioctl_dosetpic(struct vc_data *vc, struct fb_image *img, unsigned char origin) ++{ ++ struct fb_info *info; ++ int len; ++ u8 *tmp; ++ ++ if (vc->vc_num != fg_console) ++ return -EINVAL; ++ ++ info = registered_fb[(int) con2fb_map[vc->vc_num]]; ++ ++ if (info == NULL) ++ return -EINVAL; ++ ++ if (img->width != info->var.xres || img->height != info->var.yres) { ++ printk(KERN_ERR "fbcondecor: picture dimensions mismatch\n"); ++ printk(KERN_ERR "%dx%d vs %dx%d\n", img->width, img->height, info->var.xres, info->var.yres); ++ return -EINVAL; ++ } ++ ++ if (img->depth != info->var.bits_per_pixel) { ++ printk(KERN_ERR "fbcondecor: picture depth mismatch\n"); ++ return -EINVAL; ++ } ++ ++ if (img->depth == 8) { ++ if (!img->cmap.len || !img->cmap.red || !img->cmap.green || ++ !img->cmap.blue) ++ return -EINVAL; ++ ++ tmp = vmalloc(img->cmap.len * 3 * 2); ++ if (!tmp) ++ return -ENOMEM; ++ ++ if (copy_from_user(tmp, ++ (void __user*)img->cmap.red, (img->cmap.len << 1)) || ++ copy_from_user(tmp + (img->cmap.len << 1), ++ (void __user*)img->cmap.green, (img->cmap.len << 1)) || ++ copy_from_user(tmp + (img->cmap.len << 2), ++ (void __user*)img->cmap.blue, (img->cmap.len << 1))) { ++ vfree(tmp); ++ return -EFAULT; ++ } ++ ++ img->cmap.transp = NULL; ++ img->cmap.red = (u16*)tmp; ++ img->cmap.green = img->cmap.red + img->cmap.len; ++ img->cmap.blue = img->cmap.green + img->cmap.len; ++ } else { ++ img->cmap.red = NULL; ++ } ++ ++ len = ((img->depth + 7) >> 3) * img->width * img->height; ++ ++ /* ++ * Allocate an additional byte so that we never go outside of the ++ * buffer boundaries in the rendering functions in a 24 bpp mode. ++ */ ++ tmp = vmalloc(len + 1); ++ ++ if (!tmp) ++ goto out; ++ ++ if (copy_from_user(tmp, (void __user*)img->data, len)) ++ goto out; ++ ++ img->data = tmp; ++ ++ /* If this ioctl is a response to a request from kernel, the console sem ++ * is already held. */ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_lock(); ++ ++ if (info->bgdecor.data) ++ vfree((u8*)info->bgdecor.data); ++ if (info->bgdecor.cmap.red) ++ vfree(info->bgdecor.cmap.red); ++ ++ info->bgdecor = *img; ++ ++ if (fbcon_decor_active_vc(vc) && fg_console == vc->vc_num) { ++ redraw_screen(vc, 0); ++ update_region(vc, vc->vc_origin + ++ vc->vc_size_row * vc->vc_top, ++ vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); ++ fbcon_decor_clear_margins(vc, info, 0); ++ } ++ ++// if (origin == FBCON_DECOR_IO_ORIG_USER) ++ console_unlock(); ++ ++ return 0; ++ ++out: if (img->cmap.red) ++ vfree(img->cmap.red); ++ ++ if (tmp) ++ vfree(tmp); ++ return -ENOMEM; ++} ++ ++static long fbcon_decor_ioctl(struct file *filp, u_int cmd, u_long arg) ++{ ++ struct fbcon_decor_iowrapper __user *wrapper = (void __user*) arg; ++ struct vc_data *vc = NULL; ++ unsigned short vc_num = 0; ++ unsigned char origin = 0; ++ void __user *data = NULL; ++ ++ if (!access_ok(VERIFY_READ, wrapper, ++ sizeof(struct fbcon_decor_iowrapper))) ++ return -EFAULT; ++ ++ __get_user(vc_num, &wrapper->vc); ++ __get_user(origin, &wrapper->origin); ++ __get_user(data, &wrapper->data); ++ ++ if (!vc_cons_allocated(vc_num)) ++ return -EINVAL; ++ ++ vc = vc_cons[vc_num].d; ++ ++ switch (cmd) { ++ case FBIOCONDECOR_SETPIC: ++ { ++ struct fb_image img; ++ if (copy_from_user(&img, (struct fb_image __user *)data, sizeof(struct fb_image))) ++ return -EFAULT; ++ ++ return fbcon_decor_ioctl_dosetpic(vc, &img, origin); ++ } ++ case FBIOCONDECOR_SETCFG: ++ { ++ struct vc_decor cfg; ++ if (copy_from_user(&cfg, (struct vc_decor __user *)data, sizeof(struct vc_decor))) ++ return -EFAULT; ++ ++ return fbcon_decor_ioctl_dosetcfg(vc, &cfg, origin); ++ } ++ case FBIOCONDECOR_GETCFG: ++ { ++ int rval; ++ struct vc_decor cfg; ++ ++ if (copy_from_user(&cfg, (struct vc_decor __user *)data, sizeof(struct vc_decor))) ++ return -EFAULT; ++ ++ rval = fbcon_decor_ioctl_dogetcfg(vc, &cfg); ++ ++ if (copy_to_user(data, &cfg, sizeof(struct vc_decor))) ++ return -EFAULT; ++ return rval; ++ } ++ case FBIOCONDECOR_SETSTATE: ++ { ++ unsigned int state = 0; ++ if (get_user(state, (unsigned int __user *)data)) ++ return -EFAULT; ++ return fbcon_decor_ioctl_dosetstate(vc, state, origin); ++ } ++ case FBIOCONDECOR_GETSTATE: ++ { ++ unsigned int state = 0; ++ fbcon_decor_ioctl_dogetstate(vc, &state); ++ return put_user(state, (unsigned int __user *)data); ++ } ++ ++ default: ++ return -ENOIOCTLCMD; ++ } ++} ++ ++#ifdef CONFIG_COMPAT ++ ++static long fbcon_decor_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { ++ ++ struct fbcon_decor_iowrapper32 __user *wrapper = (void __user *)arg; ++ struct vc_data *vc = NULL; ++ unsigned short vc_num = 0; ++ unsigned char origin = 0; ++ compat_uptr_t data_compat = 0; ++ void __user *data = NULL; ++ ++ if (!access_ok(VERIFY_READ, wrapper, ++ sizeof(struct fbcon_decor_iowrapper32))) ++ return -EFAULT; ++ ++ __get_user(vc_num, &wrapper->vc); ++ __get_user(origin, &wrapper->origin); ++ __get_user(data_compat, &wrapper->data); ++ data = compat_ptr(data_compat); ++ ++ if (!vc_cons_allocated(vc_num)) ++ return -EINVAL; ++ ++ vc = vc_cons[vc_num].d; ++ ++ switch (cmd) { ++ case FBIOCONDECOR_SETPIC32: ++ { ++ struct fb_image32 img_compat; ++ struct fb_image img; ++ ++ if (copy_from_user(&img_compat, (struct fb_image32 __user *)data, sizeof(struct fb_image32))) ++ return -EFAULT; ++ ++ fb_image_from_compat(img, img_compat); ++ ++ return fbcon_decor_ioctl_dosetpic(vc, &img, origin); ++ } ++ ++ case FBIOCONDECOR_SETCFG32: ++ { ++ struct vc_decor32 cfg_compat; ++ struct vc_decor cfg; ++ ++ if (copy_from_user(&cfg_compat, (struct vc_decor32 __user *)data, sizeof(struct vc_decor32))) ++ return -EFAULT; ++ ++ vc_decor_from_compat(cfg, cfg_compat); ++ ++ return fbcon_decor_ioctl_dosetcfg(vc, &cfg, origin); ++ } ++ ++ case FBIOCONDECOR_GETCFG32: ++ { ++ int rval; ++ struct vc_decor32 cfg_compat; ++ struct vc_decor cfg; ++ ++ if (copy_from_user(&cfg_compat, (struct vc_decor32 __user *)data, sizeof(struct vc_decor32))) ++ return -EFAULT; ++ cfg.theme = compat_ptr(cfg_compat.theme); ++ ++ rval = fbcon_decor_ioctl_dogetcfg(vc, &cfg); ++ ++ vc_decor_to_compat(cfg_compat, cfg); ++ ++ if (copy_to_user((struct vc_decor32 __user *)data, &cfg_compat, sizeof(struct vc_decor32))) ++ return -EFAULT; ++ return rval; ++ } ++ ++ case FBIOCONDECOR_SETSTATE32: ++ { ++ compat_uint_t state_compat = 0; ++ unsigned int state = 0; ++ ++ if (get_user(state_compat, (compat_uint_t __user *)data)) ++ return -EFAULT; ++ ++ state = (unsigned int)state_compat; ++ ++ return fbcon_decor_ioctl_dosetstate(vc, state, origin); ++ } ++ ++ case FBIOCONDECOR_GETSTATE32: ++ { ++ compat_uint_t state_compat = 0; ++ unsigned int state = 0; ++ ++ fbcon_decor_ioctl_dogetstate(vc, &state); ++ state_compat = (compat_uint_t)state; ++ ++ return put_user(state_compat, (compat_uint_t __user *)data); ++ } ++ ++ default: ++ return -ENOIOCTLCMD; ++ } ++} ++#else ++ #define fbcon_decor_compat_ioctl NULL ++#endif ++ ++static struct file_operations fbcon_decor_ops = { ++ .owner = THIS_MODULE, ++ .unlocked_ioctl = fbcon_decor_ioctl, ++ .compat_ioctl = fbcon_decor_compat_ioctl ++}; ++ ++static struct miscdevice fbcon_decor_dev = { ++ .minor = MISC_DYNAMIC_MINOR, ++ .name = "fbcondecor", ++ .fops = &fbcon_decor_ops ++}; ++ ++void fbcon_decor_reset(void) ++{ ++ int i; ++ ++ for (i = 0; i < num_registered_fb; i++) { ++ registered_fb[i]->bgdecor.data = NULL; ++ registered_fb[i]->bgdecor.cmap.red = NULL; ++ } ++ ++ for (i = 0; i < MAX_NR_CONSOLES && vc_cons[i].d; i++) { ++ vc_cons[i].d->vc_decor.state = vc_cons[i].d->vc_decor.twidth = ++ vc_cons[i].d->vc_decor.theight = 0; ++ vc_cons[i].d->vc_decor.theme = NULL; ++ } ++ ++ return; ++} ++ ++int fbcon_decor_init(void) ++{ ++ int i; ++ ++ fbcon_decor_reset(); ++ ++ if (initialized) ++ return 0; ++ ++ i = misc_register(&fbcon_decor_dev); ++ if (i) { ++ printk(KERN_ERR "fbcondecor: failed to register device\n"); ++ return i; ++ } ++ ++ fbcon_decor_call_helper("init", 0); ++ initialized = 1; ++ return 0; ++} ++ ++int fbcon_decor_exit(void) ++{ ++ fbcon_decor_reset(); ++ return 0; ++} ++ ++EXPORT_SYMBOL(fbcon_decor_path); +diff --git a/drivers/video/console/fbcondecor.h b/drivers/video/console/fbcondecor.h +new file mode 100644 +index 0000000..3b3724b +--- /dev/null ++++ b/drivers/video/console/fbcondecor.h +@@ -0,0 +1,78 @@ ++/* ++ * linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers ++ * ++ * Copyright (C) 2004 Michal Januszewski ++ * ++ */ ++ ++#ifndef __FBCON_DECOR_H ++#define __FBCON_DECOR_H ++ ++#ifndef _LINUX_FB_H ++#include ++#endif ++ ++/* This is needed for vc_cons in fbcmap.c */ ++#include ++ ++struct fb_cursor; ++struct fb_info; ++struct vc_data; ++ ++#ifdef CONFIG_FB_CON_DECOR ++/* fbcondecor.c */ ++int fbcon_decor_init(void); ++int fbcon_decor_exit(void); ++int fbcon_decor_call_helper(char* cmd, unsigned short cons); ++int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw); ++ ++/* cfbcondecor.c */ ++void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, const unsigned short *s, int count, int yy, int xx); ++void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor); ++void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, int height, int width); ++void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, int bottom_only); ++void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank); ++void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, int sx, int dx, int width); ++void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes, int srclinesbytes, int bpp); ++void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc); ++ ++/* vt.c */ ++void acquire_console_sem(void); ++void release_console_sem(void); ++void do_unblank_screen(int entering_gfx); ++ ++/* struct vc_data *y */ ++#define fbcon_decor_active_vc(y) (y->vc_decor.state && y->vc_decor.theme) ++ ++/* struct fb_info *x, struct vc_data *y */ ++#define fbcon_decor_active_nores(x,y) (x->bgdecor.data && fbcon_decor_active_vc(y)) ++ ++/* struct fb_info *x, struct vc_data *y */ ++#define fbcon_decor_active(x,y) (fbcon_decor_active_nores(x,y) && \ ++ x->bgdecor.width == x->var.xres && \ ++ x->bgdecor.height == x->var.yres && \ ++ x->bgdecor.depth == x->var.bits_per_pixel) ++ ++ ++#else /* CONFIG_FB_CON_DECOR */ ++ ++static inline void fbcon_decor_putcs(struct vc_data *vc, struct fb_info *info, const unsigned short *s, int count, int yy, int xx) {} ++static inline void fbcon_decor_putc(struct vc_data *vc, struct fb_info *info, int c, int ypos, int xpos) {} ++static inline void fbcon_decor_cursor(struct fb_info *info, struct fb_cursor *cursor) {} ++static inline void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx, int height, int width) {} ++static inline void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info, int bottom_only) {} ++static inline void fbcon_decor_blank(struct vc_data *vc, struct fb_info *info, int blank) {} ++static inline void fbcon_decor_bmove_redraw(struct vc_data *vc, struct fb_info *info, int y, int sx, int dx, int width) {} ++static inline void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc) {} ++static inline int fbcon_decor_call_helper(char* cmd, unsigned short cons) { return 0; } ++static inline int fbcon_decor_init(void) { return 0; } ++static inline int fbcon_decor_exit(void) { return 0; } ++static inline int fbcon_decor_disable(struct vc_data *vc, unsigned char redraw) { return 0; } ++ ++#define fbcon_decor_active_vc(y) (0) ++#define fbcon_decor_active_nores(x,y) (0) ++#define fbcon_decor_active(x,y) (0) ++ ++#endif /* CONFIG_FB_CON_DECOR */ ++ ++#endif /* __FBCON_DECOR_H */ +diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig +index e1f4727..2952e33 100644 +--- a/drivers/video/fbdev/Kconfig ++++ b/drivers/video/fbdev/Kconfig +@@ -1204,7 +1204,6 @@ config FB_MATROX + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT +- select FB_TILEBLITTING + select FB_MACMODES if PPC_PMAC + ---help--- + Say Y here if you have a Matrox Millennium, Matrox Millennium II, +diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c +index f89245b..05e036c 100644 +--- a/drivers/video/fbdev/core/fbcmap.c ++++ b/drivers/video/fbdev/core/fbcmap.c +@@ -17,6 +17,8 @@ + #include + #include + ++#include "../../console/fbcondecor.h" ++ + static u16 red2[] __read_mostly = { + 0x0000, 0xaaaa + }; +@@ -249,14 +251,17 @@ int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *info) + if (transp) + htransp = *transp++; + if (info->fbops->fb_setcolreg(start++, +- hred, hgreen, hblue, ++ hred, hgreen, hblue, + htransp, info)) + break; + } + } +- if (rc == 0) ++ if (rc == 0) { + fb_copy_cmap(cmap, &info->cmap); +- ++ if (fbcon_decor_active(info, vc_cons[fg_console].d) && ++ info->fix.visual == FB_VISUAL_DIRECTCOLOR) ++ fbcon_decor_fix_pseudo_pal(info, vc_cons[fg_console].d); ++ } + return rc; + } + +diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c +index b6d5008..d6703f2 100644 +--- a/drivers/video/fbdev/core/fbmem.c ++++ b/drivers/video/fbdev/core/fbmem.c +@@ -1250,15 +1250,6 @@ struct fb_fix_screeninfo32 { + u16 reserved[3]; + }; + +-struct fb_cmap32 { +- u32 start; +- u32 len; +- compat_caddr_t red; +- compat_caddr_t green; +- compat_caddr_t blue; +- compat_caddr_t transp; +-}; +- + static int fb_getput_cmap(struct fb_info *info, unsigned int cmd, + unsigned long arg) + { +diff --git a/include/linux/console_decor.h b/include/linux/console_decor.h +new file mode 100644 +index 0000000..04b8d80 +--- /dev/null ++++ b/include/linux/console_decor.h +@@ -0,0 +1,46 @@ ++#ifndef _LINUX_CONSOLE_DECOR_H_ ++#define _LINUX_CONSOLE_DECOR_H_ 1 ++ ++/* A structure used by the framebuffer console decorations (drivers/video/console/fbcondecor.c) */ ++struct vc_decor { ++ __u8 bg_color; /* The color that is to be treated as transparent */ ++ __u8 state; /* Current decor state: 0 = off, 1 = on */ ++ __u16 tx, ty; /* Top left corner coordinates of the text field */ ++ __u16 twidth, theight; /* Width and height of the text field */ ++ char* theme; ++}; ++ ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++#include ++ ++struct vc_decor32 { ++ __u8 bg_color; /* The color that is to be treated as transparent */ ++ __u8 state; /* Current decor state: 0 = off, 1 = on */ ++ __u16 tx, ty; /* Top left corner coordinates of the text field */ ++ __u16 twidth, theight; /* Width and height of the text field */ ++ compat_uptr_t theme; ++}; ++ ++#define vc_decor_from_compat(to, from) \ ++ (to).bg_color = (from).bg_color; \ ++ (to).state = (from).state; \ ++ (to).tx = (from).tx; \ ++ (to).ty = (from).ty; \ ++ (to).twidth = (from).twidth; \ ++ (to).theight = (from).theight; \ ++ (to).theme = compat_ptr((from).theme) ++ ++#define vc_decor_to_compat(to, from) \ ++ (to).bg_color = (from).bg_color; \ ++ (to).state = (from).state; \ ++ (to).tx = (from).tx; \ ++ (to).ty = (from).ty; \ ++ (to).twidth = (from).twidth; \ ++ (to).theight = (from).theight; \ ++ (to).theme = ptr_to_compat((from).theme) ++ ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ ++#endif +diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h +index 7f0c329..98f5d60 100644 +--- a/include/linux/console_struct.h ++++ b/include/linux/console_struct.h +@@ -19,6 +19,7 @@ + struct vt_struct; + + #define NPAR 16 ++#include + + struct vc_data { + struct tty_port port; /* Upper level data */ +@@ -107,6 +108,8 @@ struct vc_data { + unsigned long vc_uni_pagedir; + unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ + bool vc_panic_force_write; /* when oops/panic this VC can accept forced output/blanking */ ++ ++ struct vc_decor vc_decor; + /* additional information is in vt_kern.h */ + }; + +diff --git a/include/linux/fb.h b/include/linux/fb.h +index fe6ac95..1e36b03 100644 +--- a/include/linux/fb.h ++++ b/include/linux/fb.h +@@ -219,6 +219,34 @@ struct fb_deferred_io { + }; + #endif + ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++struct fb_image32 { ++ __u32 dx; /* Where to place image */ ++ __u32 dy; ++ __u32 width; /* Size of image */ ++ __u32 height; ++ __u32 fg_color; /* Only used when a mono bitmap */ ++ __u32 bg_color; ++ __u8 depth; /* Depth of the image */ ++ const compat_uptr_t data; /* Pointer to image data */ ++ struct fb_cmap32 cmap; /* color map info */ ++}; ++ ++#define fb_image_from_compat(to, from) \ ++ (to).dx = (from).dx; \ ++ (to).dy = (from).dy; \ ++ (to).width = (from).width; \ ++ (to).height = (from).height; \ ++ (to).fg_color = (from).fg_color; \ ++ (to).bg_color = (from).bg_color; \ ++ (to).depth = (from).depth; \ ++ (to).data = compat_ptr((from).data); \ ++ fb_cmap_from_compat((to).cmap, (from).cmap) ++ ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ + /* + * Frame buffer operations + * +@@ -489,6 +517,9 @@ struct fb_info { + #define FBINFO_STATE_SUSPENDED 1 + u32 state; /* Hardware state i.e suspend */ + void *fbcon_par; /* fbcon use-only private area */ ++ ++ struct fb_image bgdecor; ++ + /* From here on everything is device dependent */ + void *par; + /* we need the PCI or similar aperture base/size not +diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h +index fb795c3..dc77a03 100644 +--- a/include/uapi/linux/fb.h ++++ b/include/uapi/linux/fb.h +@@ -8,6 +8,25 @@ + + #define FB_MAX 32 /* sufficient for now */ + ++struct fbcon_decor_iowrapper ++{ ++ unsigned short vc; /* Virtual console */ ++ unsigned char origin; /* Point of origin of the request */ ++ void *data; ++}; ++ ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++#include ++struct fbcon_decor_iowrapper32 ++{ ++ unsigned short vc; /* Virtual console */ ++ unsigned char origin; /* Point of origin of the request */ ++ compat_uptr_t data; ++}; ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ + /* ioctls + 0x46 is 'F' */ + #define FBIOGET_VSCREENINFO 0x4600 +@@ -35,6 +54,25 @@ + #define FBIOGET_DISPINFO 0x4618 + #define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32) + ++#define FBIOCONDECOR_SETCFG _IOWR('F', 0x19, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_GETCFG _IOR('F', 0x1A, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_SETSTATE _IOWR('F', 0x1B, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_GETSTATE _IOR('F', 0x1C, struct fbcon_decor_iowrapper) ++#define FBIOCONDECOR_SETPIC _IOWR('F', 0x1D, struct fbcon_decor_iowrapper) ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++#define FBIOCONDECOR_SETCFG32 _IOWR('F', 0x19, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_GETCFG32 _IOR('F', 0x1A, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_SETSTATE32 _IOWR('F', 0x1B, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_GETSTATE32 _IOR('F', 0x1C, struct fbcon_decor_iowrapper32) ++#define FBIOCONDECOR_SETPIC32 _IOWR('F', 0x1D, struct fbcon_decor_iowrapper32) ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ ++#define FBCON_DECOR_THEME_LEN 128 /* Maximum lenght of a theme name */ ++#define FBCON_DECOR_IO_ORIG_KERNEL 0 /* Kernel ioctl origin */ ++#define FBCON_DECOR_IO_ORIG_USER 1 /* User ioctl origin */ ++ + #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ + #define FB_TYPE_PLANES 1 /* Non interleaved planes */ + #define FB_TYPE_INTERLEAVED_PLANES 2 /* Interleaved planes */ +@@ -277,6 +315,29 @@ struct fb_var_screeninfo { + __u32 reserved[4]; /* Reserved for future compatibility */ + }; + ++#ifdef __KERNEL__ ++#ifdef CONFIG_COMPAT ++struct fb_cmap32 { ++ __u32 start; ++ __u32 len; /* Number of entries */ ++ compat_uptr_t red; /* Red values */ ++ compat_uptr_t green; ++ compat_uptr_t blue; ++ compat_uptr_t transp; /* transparency, can be NULL */ ++}; ++ ++#define fb_cmap_from_compat(to, from) \ ++ (to).start = (from).start; \ ++ (to).len = (from).len; \ ++ (to).red = compat_ptr((from).red); \ ++ (to).green = compat_ptr((from).green); \ ++ (to).blue = compat_ptr((from).blue); \ ++ (to).transp = compat_ptr((from).transp) ++ ++#endif /* CONFIG_COMPAT */ ++#endif /* __KERNEL__ */ ++ ++ + struct fb_cmap { + __u32 start; /* First entry */ + __u32 len; /* Number of entries */ +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 74f5b58..6386ab0 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -146,6 +146,10 @@ static const int cap_last_cap = CAP_LAST_CAP; + static unsigned long hung_task_timeout_max = (LONG_MAX/HZ); + #endif + ++#ifdef CONFIG_FB_CON_DECOR ++extern char fbcon_decor_path[]; ++#endif ++ + #ifdef CONFIG_INOTIFY_USER + #include + #endif +@@ -255,6 +259,15 @@ static struct ctl_table sysctl_base_table[] = { + .mode = 0555, + .child = dev_table, + }, ++#ifdef CONFIG_FB_CON_DECOR ++ { ++ .procname = "fbcondecor", ++ .data = &fbcon_decor_path, ++ .maxlen = KMOD_PATH_LEN, ++ .mode = 0644, ++ .proc_handler = &proc_dostring, ++ }, ++#endif + { } + }; + diff --git a/kernel/kernel/files/patches/gentoo/4567_distro-Gentoo-Kconfig.patch b/kernel/kernel/files/patches/gentoo/4567_distro-Gentoo-Kconfig.patch new file mode 100644 index 00000000..c7af596c --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/4567_distro-Gentoo-Kconfig.patch @@ -0,0 +1,143 @@ +--- a/Kconfig ++++ b/Kconfig +@@ -8,4 +8,6 @@ config SRCARCH + string + option env="SRCARCH" + ++source "distro/Kconfig" ++ + source "arch/$SRCARCH/Kconfig" +--- /dev/null ++++ b/distro/Kconfig +@@ -0,0 +1,131 @@ ++menu "Gentoo Linux" ++ ++config GENTOO_LINUX ++ bool "Gentoo Linux support" ++ ++ default y ++ ++ help ++ In order to boot Gentoo Linux a minimal set of config settings needs to ++ be enabled in the kernel; to avoid the users from having to enable them ++ manually as part of a Gentoo Linux installation or a new clean config, ++ we enable these config settings by default for convenience. ++ ++ See the settings that become available for more details and fine-tuning. ++ ++config GENTOO_LINUX_UDEV ++ bool "Linux dynamic and persistent device naming (userspace devfs) support" ++ ++ depends on GENTOO_LINUX ++ default y if GENTOO_LINUX ++ ++ select DEVTMPFS ++ select TMPFS ++ ++ select MMU ++ select SHMEM ++ ++ help ++ In order to boot Gentoo Linux a minimal set of config settings needs to ++ be enabled in the kernel; to avoid the users from having to enable them ++ manually as part of a Gentoo Linux installation or a new clean config, ++ we enable these config settings by default for convenience. ++ ++ Currently this only selects TMPFS, DEVTMPFS and their dependencies. ++ TMPFS is enabled to maintain a tmpfs file system at /dev/shm, /run and ++ /sys/fs/cgroup; DEVTMPFS to maintain a devtmpfs file system at /dev. ++ ++ Some of these are critical files that need to be available early in the ++ boot process; if not available, it causes sysfs and udev to malfunction. ++ ++ To ensure Gentoo Linux boots, it is best to leave this setting enabled; ++ if you run a custom setup, you could consider whether to disable this. ++ ++config GENTOO_LINUX_PORTAGE ++ bool "Select options required by Portage features" ++ ++ depends on GENTOO_LINUX ++ default y if GENTOO_LINUX ++ ++ select CGROUPS ++ select NAMESPACES ++ select IPC_NS ++ select NET_NS ++ ++ help ++ This enables options required by various Portage FEATURES. ++ Currently this selects: ++ ++ CGROUPS (required for FEATURES=cgroup) ++ IPC_NS (required for FEATURES=ipc-sandbox) ++ NET_NS (required for FEATURES=network-sandbox) ++ ++ It is highly recommended that you leave this enabled as these FEATURES ++ are, or will soon be, enabled by default. ++ ++menu "Support for init systems, system and service managers" ++ visible if GENTOO_LINUX ++ ++config GENTOO_LINUX_INIT_SCRIPT ++ bool "OpenRC, runit and other script based systems and managers" ++ ++ default y if GENTOO_LINUX ++ ++ depends on GENTOO_LINUX ++ ++ select BINFMT_SCRIPT ++ ++ help ++ The init system is the first thing that loads after the kernel booted. ++ ++ These config settings allow you to select which init systems to support; ++ instead of having to select all the individual settings all over the ++ place, these settings allows you to select all the settings at once. ++ ++ This particular setting enables all the known requirements for OpenRC, ++ runit and similar script based systems and managers. ++ ++ If you are unsure about this, it is best to leave this setting enabled. ++ ++config GENTOO_LINUX_INIT_SYSTEMD ++ bool "systemd" ++ ++ default n ++ ++ depends on GENTOO_LINUX && GENTOO_LINUX_UDEV ++ ++ select AUTOFS4_FS ++ select BLK_DEV_BSG ++ select CGROUPS ++ select DEVPTS_MULTIPLE_INSTANCES ++ select EPOLL ++ select FANOTIFY ++ select FHANDLE ++ select INOTIFY_USER ++ select NET ++ select NET_NS ++ select PROC_FS ++ select SIGNALFD ++ select SYSFS ++ select TIMERFD ++ ++ select ANON_INODES ++ select BLOCK ++ select EVENTFD ++ select FSNOTIFY ++ select INET ++ select NLATTR ++ ++ help ++ The init system is the first thing that loads after the kernel booted. ++ ++ These config settings allow you to select which init systems to support; ++ instead of having to select all the individual settings all over the ++ place, these settings allows you to select all the settings at once. ++ ++ This particular setting enables all the known requirements for systemd; ++ it also enables suggested optional settings, as the package suggests to. ++ ++endmenu ++ ++endmenu diff --git a/kernel/kernel/files/patches/gentoo/5001_block-cgroups-kconfig-build-bits-for-BFQ-v7r7-3.19.patch b/kernel/kernel/files/patches/gentoo/5001_block-cgroups-kconfig-build-bits-for-BFQ-v7r7-3.19.patch new file mode 100644 index 00000000..b36d572c --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/5001_block-cgroups-kconfig-build-bits-for-BFQ-v7r7-3.19.patch @@ -0,0 +1,104 @@ +From a828d56aebc0735676be23734cccf31e279c0d1b Mon Sep 17 00:00:00 2001 +From: Paolo Valente +Date: Mon, 8 Dec 2014 16:04:25 +0100 +Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r7-3.19 + +Update Kconfig.iosched and do the related Makefile changes to include +kernel configuration options for BFQ. Also add the bfqio controller +to the cgroups subsystem. + +Signed-off-by: Paolo Valente +Signed-off-by: Arianna Avanzini +--- + block/Kconfig.iosched | 32 ++++++++++++++++++++++++++++++++ + block/Makefile | 1 + + include/linux/cgroup_subsys.h | 4 ++++ + 3 files changed, 37 insertions(+) + +diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched +index 421bef9..0ee5f0f 100644 +--- a/block/Kconfig.iosched ++++ b/block/Kconfig.iosched +@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED + ---help--- + Enable group IO scheduling in CFQ. + ++config IOSCHED_BFQ ++ tristate "BFQ I/O scheduler" ++ default n ++ ---help--- ++ The BFQ I/O scheduler tries to distribute bandwidth among ++ all processes according to their weights. ++ It aims at distributing the bandwidth as desired, independently of ++ the disk parameters and with any workload. It also tries to ++ guarantee low latency to interactive and soft real-time ++ applications. If compiled built-in (saying Y here), BFQ can ++ be configured to support hierarchical scheduling. ++ ++config CGROUP_BFQIO ++ bool "BFQ hierarchical scheduling support" ++ depends on CGROUPS && IOSCHED_BFQ=y ++ default n ++ ---help--- ++ Enable hierarchical scheduling in BFQ, using the cgroups ++ filesystem interface. The name of the subsystem will be ++ bfqio. ++ + choice + prompt "Default I/O scheduler" + default DEFAULT_CFQ +@@ -52,6 +73,16 @@ choice + config DEFAULT_CFQ + bool "CFQ" if IOSCHED_CFQ=y + ++ config DEFAULT_BFQ ++ bool "BFQ" if IOSCHED_BFQ=y ++ help ++ Selects BFQ as the default I/O scheduler which will be ++ used by default for all block devices. ++ The BFQ I/O scheduler aims at distributing the bandwidth ++ as desired, independently of the disk parameters and with ++ any workload. It also tries to guarantee low latency to ++ interactive and soft real-time applications. ++ + config DEFAULT_NOOP + bool "No-op" + +@@ -61,6 +92,7 @@ config DEFAULT_IOSCHED + string + default "deadline" if DEFAULT_DEADLINE + default "cfq" if DEFAULT_CFQ ++ default "bfq" if DEFAULT_BFQ + default "noop" if DEFAULT_NOOP + + endmenu +diff --git a/block/Makefile b/block/Makefile +index 00ecc97..1ed86d5 100644 +--- a/block/Makefile ++++ b/block/Makefile +@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o + obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o + obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o + obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o ++obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o + + obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o + obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o +diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h +index 98c4f9b..13b010d 100644 +--- a/include/linux/cgroup_subsys.h ++++ b/include/linux/cgroup_subsys.h +@@ -35,6 +35,10 @@ SUBSYS(net_cls) + SUBSYS(blkio) + #endif + ++#if IS_ENABLED(CONFIG_CGROUP_BFQIO) ++SUBSYS(bfqio) ++#endif ++ + #if IS_ENABLED(CONFIG_CGROUP_PERF) + SUBSYS(perf_event) + #endif +-- +2.3.0 + diff --git a/kernel/kernel/files/patches/gentoo/5002_block-introduce-the-BFQ-v7r7-I-O-sched-for-3.19.patch b/kernel/kernel/files/patches/gentoo/5002_block-introduce-the-BFQ-v7r7-I-O-sched-for-3.19.patch new file mode 100644 index 00000000..fb96ff28 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/5002_block-introduce-the-BFQ-v7r7-I-O-sched-for-3.19.patch @@ -0,0 +1,6966 @@ +From 5bfaaa91a51940efaccb66bc5cd562ba3b9d4053 Mon Sep 17 00:00:00 2001 +From: Paolo Valente +Date: Thu, 9 May 2013 19:10:02 +0200 +Subject: [PATCH 2/3] block: introduce the BFQ-v7r7 I/O sched for 3.19 + +Add the BFQ-v7r7 I/O scheduler to 3.19. +The general structure is borrowed from CFQ, as much of the code for +handling I/O contexts. Over time, several useful features have been +ported from CFQ as well (details in the changelog in README.BFQ). A +(bfq_)queue is associated to each task doing I/O on a device, and each +time a scheduling decision has to be made a queue is selected and served +until it expires. + + - Slices are given in the service domain: tasks are assigned + budgets, measured in number of sectors. Once got the disk, a task + must however consume its assigned budget within a configurable + maximum time (by default, the maximum possible value of the + budgets is automatically computed to comply with this timeout). + This allows the desired latency vs "throughput boosting" tradeoff + to be set. + + - Budgets are scheduled according to a variant of WF2Q+, implemented + using an augmented rb-tree to take eligibility into account while + preserving an O(log N) overall complexity. + + - A low-latency tunable is provided; if enabled, both interactive + and soft real-time applications are guaranteed a very low latency. + + - Latency guarantees are preserved also in the presence of NCQ. + + - Also with flash-based devices, a high throughput is achieved + while still preserving latency guarantees. + + - BFQ features Early Queue Merge (EQM), a sort of fusion of the + cooperating-queue-merging and the preemption mechanisms present + in CFQ. EQM is in fact a unified mechanism that tries to get a + sequential read pattern, and hence a high throughput, with any + set of processes performing interleaved I/O over a contiguous + sequence of sectors. + + - BFQ supports full hierarchical scheduling, exporting a cgroups + interface. Since each node has a full scheduler, each group can + be assigned its own weight. + + - If the cgroups interface is not used, only I/O priorities can be + assigned to processes, with ioprio values mapped to weights + with the relation weight = IOPRIO_BE_NR - ioprio. + + - ioprio classes are served in strict priority order, i.e., lower + priority queues are not served as long as there are higher + priority queues. Among queues in the same class the bandwidth is + distributed in proportion to the weight of each queue. A very + thin extra bandwidth is however guaranteed to the Idle class, to + prevent it from starving. + +Signed-off-by: Paolo Valente +Signed-off-by: Arianna Avanzini +--- + block/bfq-cgroup.c | 936 ++++++++++++ + block/bfq-ioc.c | 36 + + block/bfq-iosched.c | 3902 +++++++++++++++++++++++++++++++++++++++++++++++++++ + block/bfq-sched.c | 1214 ++++++++++++++++ + block/bfq.h | 775 ++++++++++ + 5 files changed, 6863 insertions(+) + create mode 100644 block/bfq-cgroup.c + create mode 100644 block/bfq-ioc.c + create mode 100644 block/bfq-iosched.c + create mode 100644 block/bfq-sched.c + create mode 100644 block/bfq.h + +diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c +new file mode 100644 +index 0000000..11e2f1d +--- /dev/null ++++ b/block/bfq-cgroup.c +@@ -0,0 +1,936 @@ ++/* ++ * BFQ: CGROUPS support. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ * ++ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ ++ * file. ++ */ ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ ++static DEFINE_MUTEX(bfqio_mutex); ++ ++static bool bfqio_is_removed(struct bfqio_cgroup *bgrp) ++{ ++ return bgrp ? !bgrp->online : false; ++} ++ ++static struct bfqio_cgroup bfqio_root_cgroup = { ++ .weight = BFQ_DEFAULT_GRP_WEIGHT, ++ .ioprio = BFQ_DEFAULT_GRP_IOPRIO, ++ .ioprio_class = BFQ_DEFAULT_GRP_CLASS, ++}; ++ ++static inline void bfq_init_entity(struct bfq_entity *entity, ++ struct bfq_group *bfqg) ++{ ++ entity->weight = entity->new_weight; ++ entity->orig_weight = entity->new_weight; ++ entity->ioprio = entity->new_ioprio; ++ entity->ioprio_class = entity->new_ioprio_class; ++ entity->parent = bfqg->my_entity; ++ entity->sched_data = &bfqg->sched_data; ++} ++ ++static struct bfqio_cgroup *css_to_bfqio(struct cgroup_subsys_state *css) ++{ ++ return css ? container_of(css, struct bfqio_cgroup, css) : NULL; ++} ++ ++/* ++ * Search the bfq_group for bfqd into the hash table (by now only a list) ++ * of bgrp. Must be called under rcu_read_lock(). ++ */ ++static struct bfq_group *bfqio_lookup_group(struct bfqio_cgroup *bgrp, ++ struct bfq_data *bfqd) ++{ ++ struct bfq_group *bfqg; ++ void *key; ++ ++ hlist_for_each_entry_rcu(bfqg, &bgrp->group_data, group_node) { ++ key = rcu_dereference(bfqg->bfqd); ++ if (key == bfqd) ++ return bfqg; ++ } ++ ++ return NULL; ++} ++ ++static inline void bfq_group_init_entity(struct bfqio_cgroup *bgrp, ++ struct bfq_group *bfqg) ++{ ++ struct bfq_entity *entity = &bfqg->entity; ++ ++ /* ++ * If the weight of the entity has never been set via the sysfs ++ * interface, then bgrp->weight == 0. In this case we initialize ++ * the weight from the current ioprio value. Otherwise, the group ++ * weight, if set, has priority over the ioprio value. ++ */ ++ if (bgrp->weight == 0) { ++ entity->new_weight = bfq_ioprio_to_weight(bgrp->ioprio); ++ entity->new_ioprio = bgrp->ioprio; ++ } else { ++ if (bgrp->weight < BFQ_MIN_WEIGHT || ++ bgrp->weight > BFQ_MAX_WEIGHT) { ++ printk(KERN_CRIT "bfq_group_init_entity: " ++ "bgrp->weight %d\n", bgrp->weight); ++ BUG(); ++ } ++ entity->new_weight = bgrp->weight; ++ entity->new_ioprio = bfq_weight_to_ioprio(bgrp->weight); ++ } ++ entity->orig_weight = entity->weight = entity->new_weight; ++ entity->ioprio = entity->new_ioprio; ++ entity->ioprio_class = entity->new_ioprio_class = bgrp->ioprio_class; ++ entity->my_sched_data = &bfqg->sched_data; ++ bfqg->active_entities = 0; ++} ++ ++static inline void bfq_group_set_parent(struct bfq_group *bfqg, ++ struct bfq_group *parent) ++{ ++ struct bfq_entity *entity; ++ ++ BUG_ON(parent == NULL); ++ BUG_ON(bfqg == NULL); ++ ++ entity = &bfqg->entity; ++ entity->parent = parent->my_entity; ++ entity->sched_data = &parent->sched_data; ++} ++ ++/** ++ * bfq_group_chain_alloc - allocate a chain of groups. ++ * @bfqd: queue descriptor. ++ * @css: the leaf cgroup_subsys_state this chain starts from. ++ * ++ * Allocate a chain of groups starting from the one belonging to ++ * @cgroup up to the root cgroup. Stop if a cgroup on the chain ++ * to the root has already an allocated group on @bfqd. ++ */ ++static struct bfq_group *bfq_group_chain_alloc(struct bfq_data *bfqd, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp; ++ struct bfq_group *bfqg, *prev = NULL, *leaf = NULL; ++ ++ for (; css != NULL; css = css->parent) { ++ bgrp = css_to_bfqio(css); ++ ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ if (bfqg != NULL) { ++ /* ++ * All the cgroups in the path from there to the ++ * root must have a bfq_group for bfqd, so we don't ++ * need any more allocations. ++ */ ++ break; ++ } ++ ++ bfqg = kzalloc(sizeof(*bfqg), GFP_ATOMIC); ++ if (bfqg == NULL) ++ goto cleanup; ++ ++ bfq_group_init_entity(bgrp, bfqg); ++ bfqg->my_entity = &bfqg->entity; ++ ++ if (leaf == NULL) { ++ leaf = bfqg; ++ prev = leaf; ++ } else { ++ bfq_group_set_parent(prev, bfqg); ++ /* ++ * Build a list of allocated nodes using the bfqd ++ * filed, that is still unused and will be ++ * initialized only after the node will be ++ * connected. ++ */ ++ prev->bfqd = bfqg; ++ prev = bfqg; ++ } ++ } ++ ++ return leaf; ++ ++cleanup: ++ while (leaf != NULL) { ++ prev = leaf; ++ leaf = leaf->bfqd; ++ kfree(prev); ++ } ++ ++ return NULL; ++} ++ ++/** ++ * bfq_group_chain_link - link an allocated group chain to a cgroup ++ * hierarchy. ++ * @bfqd: the queue descriptor. ++ * @css: the leaf cgroup_subsys_state to start from. ++ * @leaf: the leaf group (to be associated to @cgroup). ++ * ++ * Try to link a chain of groups to a cgroup hierarchy, connecting the ++ * nodes bottom-up, so we can be sure that when we find a cgroup in the ++ * hierarchy that already as a group associated to @bfqd all the nodes ++ * in the path to the root cgroup have one too. ++ * ++ * On locking: the queue lock protects the hierarchy (there is a hierarchy ++ * per device) while the bfqio_cgroup lock protects the list of groups ++ * belonging to the same cgroup. ++ */ ++static void bfq_group_chain_link(struct bfq_data *bfqd, ++ struct cgroup_subsys_state *css, ++ struct bfq_group *leaf) ++{ ++ struct bfqio_cgroup *bgrp; ++ struct bfq_group *bfqg, *next, *prev = NULL; ++ unsigned long flags; ++ ++ assert_spin_locked(bfqd->queue->queue_lock); ++ ++ for (; css != NULL && leaf != NULL; css = css->parent) { ++ bgrp = css_to_bfqio(css); ++ next = leaf->bfqd; ++ ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ BUG_ON(bfqg != NULL); ++ ++ spin_lock_irqsave(&bgrp->lock, flags); ++ ++ rcu_assign_pointer(leaf->bfqd, bfqd); ++ hlist_add_head_rcu(&leaf->group_node, &bgrp->group_data); ++ hlist_add_head(&leaf->bfqd_node, &bfqd->group_list); ++ ++ spin_unlock_irqrestore(&bgrp->lock, flags); ++ ++ prev = leaf; ++ leaf = next; ++ } ++ ++ BUG_ON(css == NULL && leaf != NULL); ++ if (css != NULL && prev != NULL) { ++ bgrp = css_to_bfqio(css); ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ bfq_group_set_parent(prev, bfqg); ++ } ++} ++ ++/** ++ * bfq_find_alloc_group - return the group associated to @bfqd in @cgroup. ++ * @bfqd: queue descriptor. ++ * @cgroup: cgroup being searched for. ++ * ++ * Return a group associated to @bfqd in @cgroup, allocating one if ++ * necessary. When a group is returned all the cgroups in the path ++ * to the root have a group associated to @bfqd. ++ * ++ * If the allocation fails, return the root group: this breaks guarantees ++ * but is a safe fallback. If this loss becomes a problem it can be ++ * mitigated using the equivalent weight (given by the product of the ++ * weights of the groups in the path from @group to the root) in the ++ * root scheduler. ++ * ++ * We allocate all the missing nodes in the path from the leaf cgroup ++ * to the root and we connect the nodes only after all the allocations ++ * have been successful. ++ */ ++static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ struct bfq_group *bfqg; ++ ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ if (bfqg != NULL) ++ return bfqg; ++ ++ bfqg = bfq_group_chain_alloc(bfqd, css); ++ if (bfqg != NULL) ++ bfq_group_chain_link(bfqd, css, bfqg); ++ else ++ bfqg = bfqd->root_group; ++ ++ return bfqg; ++} ++ ++/** ++ * bfq_bfqq_move - migrate @bfqq to @bfqg. ++ * @bfqd: queue descriptor. ++ * @bfqq: the queue to move. ++ * @entity: @bfqq's entity. ++ * @bfqg: the group to move to. ++ * ++ * Move @bfqq to @bfqg, deactivating it from its old group and reactivating ++ * it on the new one. Avoid putting the entity on the old group idle tree. ++ * ++ * Must be called under the queue lock; the cgroup owning @bfqg must ++ * not disappear (by now this just means that we are called under ++ * rcu_read_lock()). ++ */ ++static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ struct bfq_entity *entity, struct bfq_group *bfqg) ++{ ++ int busy, resume; ++ ++ busy = bfq_bfqq_busy(bfqq); ++ resume = !RB_EMPTY_ROOT(&bfqq->sort_list); ++ ++ BUG_ON(resume && !entity->on_st); ++ BUG_ON(busy && !resume && entity->on_st && ++ bfqq != bfqd->in_service_queue); ++ ++ if (busy) { ++ BUG_ON(atomic_read(&bfqq->ref) < 2); ++ ++ if (!resume) ++ bfq_del_bfqq_busy(bfqd, bfqq, 0); ++ else ++ bfq_deactivate_bfqq(bfqd, bfqq, 0); ++ } else if (entity->on_st) ++ bfq_put_idle_entity(bfq_entity_service_tree(entity), entity); ++ ++ /* ++ * Here we use a reference to bfqg. We don't need a refcounter ++ * as the cgroup reference will not be dropped, so that its ++ * destroy() callback will not be invoked. ++ */ ++ entity->parent = bfqg->my_entity; ++ entity->sched_data = &bfqg->sched_data; ++ ++ if (busy && resume) ++ bfq_activate_bfqq(bfqd, bfqq); ++ ++ if (bfqd->in_service_queue == NULL && !bfqd->rq_in_driver) ++ bfq_schedule_dispatch(bfqd); ++} ++ ++/** ++ * __bfq_bic_change_cgroup - move @bic to @cgroup. ++ * @bfqd: the queue descriptor. ++ * @bic: the bic to move. ++ * @cgroup: the cgroup to move to. ++ * ++ * Move bic to cgroup, assuming that bfqd->queue is locked; the caller ++ * has to make sure that the reference to cgroup is valid across the call. ++ * ++ * NOTE: an alternative approach might have been to store the current ++ * cgroup in bfqq and getting a reference to it, reducing the lookup ++ * time here, at the price of slightly more complex code. ++ */ ++static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd, ++ struct bfq_io_cq *bic, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0); ++ struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1); ++ struct bfq_entity *entity; ++ struct bfq_group *bfqg; ++ struct bfqio_cgroup *bgrp; ++ ++ bgrp = css_to_bfqio(css); ++ ++ bfqg = bfq_find_alloc_group(bfqd, css); ++ if (async_bfqq != NULL) { ++ entity = &async_bfqq->entity; ++ ++ if (entity->sched_data != &bfqg->sched_data) { ++ bic_set_bfqq(bic, NULL, 0); ++ bfq_log_bfqq(bfqd, async_bfqq, ++ "bic_change_group: %p %d", ++ async_bfqq, atomic_read(&async_bfqq->ref)); ++ bfq_put_queue(async_bfqq); ++ } ++ } ++ ++ if (sync_bfqq != NULL) { ++ entity = &sync_bfqq->entity; ++ if (entity->sched_data != &bfqg->sched_data) ++ bfq_bfqq_move(bfqd, sync_bfqq, entity, bfqg); ++ } ++ ++ return bfqg; ++} ++ ++/** ++ * bfq_bic_change_cgroup - move @bic to @cgroup. ++ * @bic: the bic being migrated. ++ * @cgroup: the destination cgroup. ++ * ++ * When the task owning @bic is moved to @cgroup, @bic is immediately ++ * moved into its new parent group. ++ */ ++static void bfq_bic_change_cgroup(struct bfq_io_cq *bic, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfq_data *bfqd; ++ unsigned long uninitialized_var(flags); ++ ++ bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data), ++ &flags); ++ if (bfqd != NULL) { ++ __bfq_bic_change_cgroup(bfqd, bic, css); ++ bfq_put_bfqd_unlock(bfqd, &flags); ++ } ++} ++ ++/** ++ * bfq_bic_update_cgroup - update the cgroup of @bic. ++ * @bic: the @bic to update. ++ * ++ * Make sure that @bic is enqueued in the cgroup of the current task. ++ * We need this in addition to moving bics during the cgroup attach ++ * phase because the task owning @bic could be at its first disk ++ * access or we may end up in the root cgroup as the result of a ++ * memory allocation failure and here we try to move to the right ++ * group. ++ * ++ * Must be called under the queue lock. It is safe to use the returned ++ * value even after the rcu_read_unlock() as the migration/destruction ++ * paths act under the queue lock too. IOW it is impossible to race with ++ * group migration/destruction and end up with an invalid group as: ++ * a) here cgroup has not yet been destroyed, nor its destroy callback ++ * has started execution, as current holds a reference to it, ++ * b) if it is destroyed after rcu_read_unlock() [after current is ++ * migrated to a different cgroup] its attach() callback will have ++ * taken care of remove all the references to the old cgroup data. ++ */ ++static struct bfq_group *bfq_bic_update_cgroup(struct bfq_io_cq *bic) ++{ ++ struct bfq_data *bfqd = bic_to_bfqd(bic); ++ struct bfq_group *bfqg; ++ struct cgroup_subsys_state *css; ++ ++ BUG_ON(bfqd == NULL); ++ ++ rcu_read_lock(); ++ css = task_css(current, bfqio_cgrp_id); ++ bfqg = __bfq_bic_change_cgroup(bfqd, bic, css); ++ rcu_read_unlock(); ++ ++ return bfqg; ++} ++ ++/** ++ * bfq_flush_idle_tree - deactivate any entity on the idle tree of @st. ++ * @st: the service tree being flushed. ++ */ ++static inline void bfq_flush_idle_tree(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *entity = st->first_idle; ++ ++ for (; entity != NULL; entity = st->first_idle) ++ __bfq_deactivate_entity(entity, 0); ++} ++ ++/** ++ * bfq_reparent_leaf_entity - move leaf entity to the root_group. ++ * @bfqd: the device data structure with the root group. ++ * @entity: the entity to move. ++ */ ++static inline void bfq_reparent_leaf_entity(struct bfq_data *bfqd, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ ++ BUG_ON(bfqq == NULL); ++ bfq_bfqq_move(bfqd, bfqq, entity, bfqd->root_group); ++ return; ++} ++ ++/** ++ * bfq_reparent_active_entities - move to the root group all active ++ * entities. ++ * @bfqd: the device data structure with the root group. ++ * @bfqg: the group to move from. ++ * @st: the service tree with the entities. ++ * ++ * Needs queue_lock to be taken and reference to be valid over the call. ++ */ ++static inline void bfq_reparent_active_entities(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, ++ struct bfq_service_tree *st) ++{ ++ struct rb_root *active = &st->active; ++ struct bfq_entity *entity = NULL; ++ ++ if (!RB_EMPTY_ROOT(&st->active)) ++ entity = bfq_entity_of(rb_first(active)); ++ ++ for (; entity != NULL; entity = bfq_entity_of(rb_first(active))) ++ bfq_reparent_leaf_entity(bfqd, entity); ++ ++ if (bfqg->sched_data.in_service_entity != NULL) ++ bfq_reparent_leaf_entity(bfqd, ++ bfqg->sched_data.in_service_entity); ++ ++ return; ++} ++ ++/** ++ * bfq_destroy_group - destroy @bfqg. ++ * @bgrp: the bfqio_cgroup containing @bfqg. ++ * @bfqg: the group being destroyed. ++ * ++ * Destroy @bfqg, making sure that it is not referenced from its parent. ++ */ ++static void bfq_destroy_group(struct bfqio_cgroup *bgrp, struct bfq_group *bfqg) ++{ ++ struct bfq_data *bfqd; ++ struct bfq_service_tree *st; ++ struct bfq_entity *entity = bfqg->my_entity; ++ unsigned long uninitialized_var(flags); ++ int i; ++ ++ hlist_del(&bfqg->group_node); ++ ++ /* ++ * Empty all service_trees belonging to this group before ++ * deactivating the group itself. ++ */ ++ for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) { ++ st = bfqg->sched_data.service_tree + i; ++ ++ /* ++ * The idle tree may still contain bfq_queues belonging ++ * to exited task because they never migrated to a different ++ * cgroup from the one being destroyed now. No one else ++ * can access them so it's safe to act without any lock. ++ */ ++ bfq_flush_idle_tree(st); ++ ++ /* ++ * It may happen that some queues are still active ++ * (busy) upon group destruction (if the corresponding ++ * processes have been forced to terminate). We move ++ * all the leaf entities corresponding to these queues ++ * to the root_group. ++ * Also, it may happen that the group has an entity ++ * in service, which is disconnected from the active ++ * tree: it must be moved, too. ++ * There is no need to put the sync queues, as the ++ * scheduler has taken no reference. ++ */ ++ bfqd = bfq_get_bfqd_locked(&bfqg->bfqd, &flags); ++ if (bfqd != NULL) { ++ bfq_reparent_active_entities(bfqd, bfqg, st); ++ bfq_put_bfqd_unlock(bfqd, &flags); ++ } ++ BUG_ON(!RB_EMPTY_ROOT(&st->active)); ++ BUG_ON(!RB_EMPTY_ROOT(&st->idle)); ++ } ++ BUG_ON(bfqg->sched_data.next_in_service != NULL); ++ BUG_ON(bfqg->sched_data.in_service_entity != NULL); ++ ++ /* ++ * We may race with device destruction, take extra care when ++ * dereferencing bfqg->bfqd. ++ */ ++ bfqd = bfq_get_bfqd_locked(&bfqg->bfqd, &flags); ++ if (bfqd != NULL) { ++ hlist_del(&bfqg->bfqd_node); ++ __bfq_deactivate_entity(entity, 0); ++ bfq_put_async_queues(bfqd, bfqg); ++ bfq_put_bfqd_unlock(bfqd, &flags); ++ } ++ BUG_ON(entity->tree != NULL); ++ ++ /* ++ * No need to defer the kfree() to the end of the RCU grace ++ * period: we are called from the destroy() callback of our ++ * cgroup, so we can be sure that no one is a) still using ++ * this cgroup or b) doing lookups in it. ++ */ ++ kfree(bfqg); ++} ++ ++static void bfq_end_wr_async(struct bfq_data *bfqd) ++{ ++ struct hlist_node *tmp; ++ struct bfq_group *bfqg; ++ ++ hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node) ++ bfq_end_wr_async_queues(bfqd, bfqg); ++ bfq_end_wr_async_queues(bfqd, bfqd->root_group); ++} ++ ++/** ++ * bfq_disconnect_groups - disconnect @bfqd from all its groups. ++ * @bfqd: the device descriptor being exited. ++ * ++ * When the device exits we just make sure that no lookup can return ++ * the now unused group structures. They will be deallocated on cgroup ++ * destruction. ++ */ ++static void bfq_disconnect_groups(struct bfq_data *bfqd) ++{ ++ struct hlist_node *tmp; ++ struct bfq_group *bfqg; ++ ++ bfq_log(bfqd, "disconnect_groups beginning"); ++ hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node) { ++ hlist_del(&bfqg->bfqd_node); ++ ++ __bfq_deactivate_entity(bfqg->my_entity, 0); ++ ++ /* ++ * Don't remove from the group hash, just set an ++ * invalid key. No lookups can race with the ++ * assignment as bfqd is being destroyed; this ++ * implies also that new elements cannot be added ++ * to the list. ++ */ ++ rcu_assign_pointer(bfqg->bfqd, NULL); ++ ++ bfq_log(bfqd, "disconnect_groups: put async for group %p", ++ bfqg); ++ bfq_put_async_queues(bfqd, bfqg); ++ } ++} ++ ++static inline void bfq_free_root_group(struct bfq_data *bfqd) ++{ ++ struct bfqio_cgroup *bgrp = &bfqio_root_cgroup; ++ struct bfq_group *bfqg = bfqd->root_group; ++ ++ bfq_put_async_queues(bfqd, bfqg); ++ ++ spin_lock_irq(&bgrp->lock); ++ hlist_del_rcu(&bfqg->group_node); ++ spin_unlock_irq(&bgrp->lock); ++ ++ /* ++ * No need to synchronize_rcu() here: since the device is gone ++ * there cannot be any read-side access to its root_group. ++ */ ++ kfree(bfqg); ++} ++ ++static struct bfq_group *bfq_alloc_root_group(struct bfq_data *bfqd, int node) ++{ ++ struct bfq_group *bfqg; ++ struct bfqio_cgroup *bgrp; ++ int i; ++ ++ bfqg = kzalloc_node(sizeof(*bfqg), GFP_KERNEL, node); ++ if (bfqg == NULL) ++ return NULL; ++ ++ bfqg->entity.parent = NULL; ++ for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) ++ bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT; ++ ++ bgrp = &bfqio_root_cgroup; ++ spin_lock_irq(&bgrp->lock); ++ rcu_assign_pointer(bfqg->bfqd, bfqd); ++ hlist_add_head_rcu(&bfqg->group_node, &bgrp->group_data); ++ spin_unlock_irq(&bgrp->lock); ++ ++ return bfqg; ++} ++ ++#define SHOW_FUNCTION(__VAR) \ ++static u64 bfqio_cgroup_##__VAR##_read(struct cgroup_subsys_state *css, \ ++ struct cftype *cftype) \ ++{ \ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); \ ++ u64 ret = -ENODEV; \ ++ \ ++ mutex_lock(&bfqio_mutex); \ ++ if (bfqio_is_removed(bgrp)) \ ++ goto out_unlock; \ ++ \ ++ spin_lock_irq(&bgrp->lock); \ ++ ret = bgrp->__VAR; \ ++ spin_unlock_irq(&bgrp->lock); \ ++ \ ++out_unlock: \ ++ mutex_unlock(&bfqio_mutex); \ ++ return ret; \ ++} ++ ++SHOW_FUNCTION(weight); ++SHOW_FUNCTION(ioprio); ++SHOW_FUNCTION(ioprio_class); ++#undef SHOW_FUNCTION ++ ++#define STORE_FUNCTION(__VAR, __MIN, __MAX) \ ++static int bfqio_cgroup_##__VAR##_write(struct cgroup_subsys_state *css,\ ++ struct cftype *cftype, \ ++ u64 val) \ ++{ \ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); \ ++ struct bfq_group *bfqg; \ ++ int ret = -EINVAL; \ ++ \ ++ if (val < (__MIN) || val > (__MAX)) \ ++ return ret; \ ++ \ ++ ret = -ENODEV; \ ++ mutex_lock(&bfqio_mutex); \ ++ if (bfqio_is_removed(bgrp)) \ ++ goto out_unlock; \ ++ ret = 0; \ ++ \ ++ spin_lock_irq(&bgrp->lock); \ ++ bgrp->__VAR = (unsigned short)val; \ ++ hlist_for_each_entry(bfqg, &bgrp->group_data, group_node) { \ ++ /* \ ++ * Setting the ioprio_changed flag of the entity \ ++ * to 1 with new_##__VAR == ##__VAR would re-set \ ++ * the value of the weight to its ioprio mapping. \ ++ * Set the flag only if necessary. \ ++ */ \ ++ if ((unsigned short)val != bfqg->entity.new_##__VAR) { \ ++ bfqg->entity.new_##__VAR = (unsigned short)val; \ ++ /* \ ++ * Make sure that the above new value has been \ ++ * stored in bfqg->entity.new_##__VAR before \ ++ * setting the ioprio_changed flag. In fact, \ ++ * this flag may be read asynchronously (in \ ++ * critical sections protected by a different \ ++ * lock than that held here), and finding this \ ++ * flag set may cause the execution of the code \ ++ * for updating parameters whose value may \ ++ * depend also on bfqg->entity.new_##__VAR (in \ ++ * __bfq_entity_update_weight_prio). \ ++ * This barrier makes sure that the new value \ ++ * of bfqg->entity.new_##__VAR is correctly \ ++ * seen in that code. \ ++ */ \ ++ smp_wmb(); \ ++ bfqg->entity.ioprio_changed = 1; \ ++ } \ ++ } \ ++ spin_unlock_irq(&bgrp->lock); \ ++ \ ++out_unlock: \ ++ mutex_unlock(&bfqio_mutex); \ ++ return ret; \ ++} ++ ++STORE_FUNCTION(weight, BFQ_MIN_WEIGHT, BFQ_MAX_WEIGHT); ++STORE_FUNCTION(ioprio, 0, IOPRIO_BE_NR - 1); ++STORE_FUNCTION(ioprio_class, IOPRIO_CLASS_RT, IOPRIO_CLASS_IDLE); ++#undef STORE_FUNCTION ++ ++static struct cftype bfqio_files[] = { ++ { ++ .name = "weight", ++ .read_u64 = bfqio_cgroup_weight_read, ++ .write_u64 = bfqio_cgroup_weight_write, ++ }, ++ { ++ .name = "ioprio", ++ .read_u64 = bfqio_cgroup_ioprio_read, ++ .write_u64 = bfqio_cgroup_ioprio_write, ++ }, ++ { ++ .name = "ioprio_class", ++ .read_u64 = bfqio_cgroup_ioprio_class_read, ++ .write_u64 = bfqio_cgroup_ioprio_class_write, ++ }, ++ { }, /* terminate */ ++}; ++ ++static struct cgroup_subsys_state *bfqio_create(struct cgroup_subsys_state ++ *parent_css) ++{ ++ struct bfqio_cgroup *bgrp; ++ ++ if (parent_css != NULL) { ++ bgrp = kzalloc(sizeof(*bgrp), GFP_KERNEL); ++ if (bgrp == NULL) ++ return ERR_PTR(-ENOMEM); ++ } else ++ bgrp = &bfqio_root_cgroup; ++ ++ spin_lock_init(&bgrp->lock); ++ INIT_HLIST_HEAD(&bgrp->group_data); ++ bgrp->ioprio = BFQ_DEFAULT_GRP_IOPRIO; ++ bgrp->ioprio_class = BFQ_DEFAULT_GRP_CLASS; ++ ++ return &bgrp->css; ++} ++ ++/* ++ * We cannot support shared io contexts, as we have no means to support ++ * two tasks with the same ioc in two different groups without major rework ++ * of the main bic/bfqq data structures. By now we allow a task to change ++ * its cgroup only if it's the only owner of its ioc; the drawback of this ++ * behavior is that a group containing a task that forked using CLONE_IO ++ * will not be destroyed until the tasks sharing the ioc die. ++ */ ++static int bfqio_can_attach(struct cgroup_subsys_state *css, ++ struct cgroup_taskset *tset) ++{ ++ struct task_struct *task; ++ struct io_context *ioc; ++ int ret = 0; ++ ++ cgroup_taskset_for_each(task, tset) { ++ /* ++ * task_lock() is needed to avoid races with ++ * exit_io_context() ++ */ ++ task_lock(task); ++ ioc = task->io_context; ++ if (ioc != NULL && atomic_read(&ioc->nr_tasks) > 1) ++ /* ++ * ioc == NULL means that the task is either too ++ * young or exiting: if it has still no ioc the ++ * ioc can't be shared, if the task is exiting the ++ * attach will fail anyway, no matter what we ++ * return here. ++ */ ++ ret = -EINVAL; ++ task_unlock(task); ++ if (ret) ++ break; ++ } ++ ++ return ret; ++} ++ ++static void bfqio_attach(struct cgroup_subsys_state *css, ++ struct cgroup_taskset *tset) ++{ ++ struct task_struct *task; ++ struct io_context *ioc; ++ struct io_cq *icq; ++ ++ /* ++ * IMPORTANT NOTE: The move of more than one process at a time to a ++ * new group has not yet been tested. ++ */ ++ cgroup_taskset_for_each(task, tset) { ++ ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE); ++ if (ioc) { ++ /* ++ * Handle cgroup change here. ++ */ ++ rcu_read_lock(); ++ hlist_for_each_entry_rcu(icq, &ioc->icq_list, ioc_node) ++ if (!strncmp( ++ icq->q->elevator->type->elevator_name, ++ "bfq", ELV_NAME_MAX)) ++ bfq_bic_change_cgroup(icq_to_bic(icq), ++ css); ++ rcu_read_unlock(); ++ put_io_context(ioc); ++ } ++ } ++} ++ ++static void bfqio_destroy(struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ struct hlist_node *tmp; ++ struct bfq_group *bfqg; ++ ++ /* ++ * Since we are destroying the cgroup, there are no more tasks ++ * referencing it, and all the RCU grace periods that may have ++ * referenced it are ended (as the destruction of the parent ++ * cgroup is RCU-safe); bgrp->group_data will not be accessed by ++ * anything else and we don't need any synchronization. ++ */ ++ hlist_for_each_entry_safe(bfqg, tmp, &bgrp->group_data, group_node) ++ bfq_destroy_group(bgrp, bfqg); ++ ++ BUG_ON(!hlist_empty(&bgrp->group_data)); ++ ++ kfree(bgrp); ++} ++ ++static int bfqio_css_online(struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ ++ mutex_lock(&bfqio_mutex); ++ bgrp->online = true; ++ mutex_unlock(&bfqio_mutex); ++ ++ return 0; ++} ++ ++static void bfqio_css_offline(struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ ++ mutex_lock(&bfqio_mutex); ++ bgrp->online = false; ++ mutex_unlock(&bfqio_mutex); ++} ++ ++struct cgroup_subsys bfqio_cgrp_subsys = { ++ .css_alloc = bfqio_create, ++ .css_online = bfqio_css_online, ++ .css_offline = bfqio_css_offline, ++ .can_attach = bfqio_can_attach, ++ .attach = bfqio_attach, ++ .css_free = bfqio_destroy, ++ .legacy_cftypes = bfqio_files, ++}; ++#else ++static inline void bfq_init_entity(struct bfq_entity *entity, ++ struct bfq_group *bfqg) ++{ ++ entity->weight = entity->new_weight; ++ entity->orig_weight = entity->new_weight; ++ entity->ioprio = entity->new_ioprio; ++ entity->ioprio_class = entity->new_ioprio_class; ++ entity->sched_data = &bfqg->sched_data; ++} ++ ++static inline struct bfq_group * ++bfq_bic_update_cgroup(struct bfq_io_cq *bic) ++{ ++ struct bfq_data *bfqd = bic_to_bfqd(bic); ++ return bfqd->root_group; ++} ++ ++static inline void bfq_bfqq_move(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct bfq_entity *entity, ++ struct bfq_group *bfqg) ++{ ++} ++ ++static void bfq_end_wr_async(struct bfq_data *bfqd) ++{ ++ bfq_end_wr_async_queues(bfqd, bfqd->root_group); ++} ++ ++static inline void bfq_disconnect_groups(struct bfq_data *bfqd) ++{ ++ bfq_put_async_queues(bfqd, bfqd->root_group); ++} ++ ++static inline void bfq_free_root_group(struct bfq_data *bfqd) ++{ ++ kfree(bfqd->root_group); ++} ++ ++static struct bfq_group *bfq_alloc_root_group(struct bfq_data *bfqd, int node) ++{ ++ struct bfq_group *bfqg; ++ int i; ++ ++ bfqg = kmalloc_node(sizeof(*bfqg), GFP_KERNEL | __GFP_ZERO, node); ++ if (bfqg == NULL) ++ return NULL; ++ ++ for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) ++ bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT; ++ ++ return bfqg; ++} ++#endif +diff --git a/block/bfq-ioc.c b/block/bfq-ioc.c +new file mode 100644 +index 0000000..7f6b000 +--- /dev/null ++++ b/block/bfq-ioc.c +@@ -0,0 +1,36 @@ ++/* ++ * BFQ: I/O context handling. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ */ ++ ++/** ++ * icq_to_bic - convert iocontext queue structure to bfq_io_cq. ++ * @icq: the iocontext queue. ++ */ ++static inline struct bfq_io_cq *icq_to_bic(struct io_cq *icq) ++{ ++ /* bic->icq is the first member, %NULL will convert to %NULL */ ++ return container_of(icq, struct bfq_io_cq, icq); ++} ++ ++/** ++ * bfq_bic_lookup - search into @ioc a bic associated to @bfqd. ++ * @bfqd: the lookup key. ++ * @ioc: the io_context of the process doing I/O. ++ * ++ * Queue lock must be held. ++ */ ++static inline struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd, ++ struct io_context *ioc) ++{ ++ if (ioc) ++ return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue)); ++ return NULL; ++} +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +new file mode 100644 +index 0000000..97ee934 +--- /dev/null ++++ b/block/bfq-iosched.c +@@ -0,0 +1,3902 @@ ++/* ++ * Budget Fair Queueing (BFQ) disk scheduler. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ * ++ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ ++ * file. ++ * ++ * BFQ is a proportional-share storage-I/O scheduling algorithm based on ++ * the slice-by-slice service scheme of CFQ. But BFQ assigns budgets, ++ * measured in number of sectors, to processes instead of time slices. The ++ * device is not granted to the in-service process for a given time slice, ++ * but until it has exhausted its assigned budget. This change from the time ++ * to the service domain allows BFQ to distribute the device throughput ++ * among processes as desired, without any distortion due to ZBR, workload ++ * fluctuations or other factors. BFQ uses an ad hoc internal scheduler, ++ * called B-WF2Q+, to schedule processes according to their budgets. More ++ * precisely, BFQ schedules queues associated to processes. Thanks to the ++ * accurate policy of B-WF2Q+, BFQ can afford to assign high budgets to ++ * I/O-bound processes issuing sequential requests (to boost the ++ * throughput), and yet guarantee a low latency to interactive and soft ++ * real-time applications. ++ * ++ * BFQ is described in [1], where also a reference to the initial, more ++ * theoretical paper on BFQ can be found. The interested reader can find ++ * in the latter paper full details on the main algorithm, as well as ++ * formulas of the guarantees and formal proofs of all the properties. ++ * With respect to the version of BFQ presented in these papers, this ++ * implementation adds a few more heuristics, such as the one that ++ * guarantees a low latency to soft real-time applications, and a ++ * hierarchical extension based on H-WF2Q+. ++ * ++ * B-WF2Q+ is based on WF2Q+, that is described in [2], together with ++ * H-WF2Q+, while the augmented tree used to implement B-WF2Q+ with O(log N) ++ * complexity derives from the one introduced with EEVDF in [3]. ++ * ++ * [1] P. Valente and M. Andreolini, ``Improving Application Responsiveness ++ * with the BFQ Disk I/O Scheduler'', ++ * Proceedings of the 5th Annual International Systems and Storage ++ * Conference (SYSTOR '12), June 2012. ++ * ++ * http://algogroup.unimo.it/people/paolo/disk_sched/bf1-v1-suite-results.pdf ++ * ++ * [2] Jon C.R. Bennett and H. Zhang, ``Hierarchical Packet Fair Queueing ++ * Algorithms,'' IEEE/ACM Transactions on Networking, 5(5):675-689, ++ * Oct 1997. ++ * ++ * http://www.cs.cmu.edu/~hzhang/papers/TON-97-Oct.ps.gz ++ * ++ * [3] I. Stoica and H. Abdel-Wahab, ``Earliest Eligible Virtual Deadline ++ * First: A Flexible and Accurate Mechanism for Proportional Share ++ * Resource Allocation,'' technical report. ++ * ++ * http://www.cs.berkeley.edu/~istoica/papers/eevdf-tr-95.pdf ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "bfq.h" ++#include "blk.h" ++ ++/* Max number of dispatches in one round of service. */ ++static const int bfq_quantum = 4; ++ ++/* Expiration time of sync (0) and async (1) requests, in jiffies. */ ++static const int bfq_fifo_expire[2] = { HZ / 4, HZ / 8 }; ++ ++/* Maximum backwards seek, in KiB. */ ++static const int bfq_back_max = 16 * 1024; ++ ++/* Penalty of a backwards seek, in number of sectors. */ ++static const int bfq_back_penalty = 2; ++ ++/* Idling period duration, in jiffies. */ ++static int bfq_slice_idle = HZ / 125; ++ ++/* Default maximum budget values, in sectors and number of requests. */ ++static const int bfq_default_max_budget = 16 * 1024; ++static const int bfq_max_budget_async_rq = 4; ++ ++/* ++ * Async to sync throughput distribution is controlled as follows: ++ * when an async request is served, the entity is charged the number ++ * of sectors of the request, multiplied by the factor below ++ */ ++static const int bfq_async_charge_factor = 10; ++ ++/* Default timeout values, in jiffies, approximating CFQ defaults. */ ++static const int bfq_timeout_sync = HZ / 8; ++static int bfq_timeout_async = HZ / 25; ++ ++struct kmem_cache *bfq_pool; ++ ++/* Below this threshold (in ms), we consider thinktime immediate. */ ++#define BFQ_MIN_TT 2 ++ ++/* hw_tag detection: parallel requests threshold and min samples needed. */ ++#define BFQ_HW_QUEUE_THRESHOLD 4 ++#define BFQ_HW_QUEUE_SAMPLES 32 ++ ++#define BFQQ_SEEK_THR (sector_t)(8 * 1024) ++#define BFQQ_SEEKY(bfqq) ((bfqq)->seek_mean > BFQQ_SEEK_THR) ++ ++/* Min samples used for peak rate estimation (for autotuning). */ ++#define BFQ_PEAK_RATE_SAMPLES 32 ++ ++/* Shift used for peak rate fixed precision calculations. */ ++#define BFQ_RATE_SHIFT 16 ++ ++/* ++ * By default, BFQ computes the duration of the weight raising for ++ * interactive applications automatically, using the following formula: ++ * duration = (R / r) * T, where r is the peak rate of the device, and ++ * R and T are two reference parameters. ++ * In particular, R is the peak rate of the reference device (see below), ++ * and T is a reference time: given the systems that are likely to be ++ * installed on the reference device according to its speed class, T is ++ * about the maximum time needed, under BFQ and while reading two files in ++ * parallel, to load typical large applications on these systems. ++ * In practice, the slower/faster the device at hand is, the more/less it ++ * takes to load applications with respect to the reference device. ++ * Accordingly, the longer/shorter BFQ grants weight raising to interactive ++ * applications. ++ * ++ * BFQ uses four different reference pairs (R, T), depending on: ++ * . whether the device is rotational or non-rotational; ++ * . whether the device is slow, such as old or portable HDDs, as well as ++ * SD cards, or fast, such as newer HDDs and SSDs. ++ * ++ * The device's speed class is dynamically (re)detected in ++ * bfq_update_peak_rate() every time the estimated peak rate is updated. ++ * ++ * In the following definitions, R_slow[0]/R_fast[0] and T_slow[0]/T_fast[0] ++ * are the reference values for a slow/fast rotational device, whereas ++ * R_slow[1]/R_fast[1] and T_slow[1]/T_fast[1] are the reference values for ++ * a slow/fast non-rotational device. Finally, device_speed_thresh are the ++ * thresholds used to switch between speed classes. ++ * Both the reference peak rates and the thresholds are measured in ++ * sectors/usec, left-shifted by BFQ_RATE_SHIFT. ++ */ ++static int R_slow[2] = {1536, 10752}; ++static int R_fast[2] = {17415, 34791}; ++/* ++ * To improve readability, a conversion function is used to initialize the ++ * following arrays, which entails that they can be initialized only in a ++ * function. ++ */ ++static int T_slow[2]; ++static int T_fast[2]; ++static int device_speed_thresh[2]; ++ ++#define BFQ_SERVICE_TREE_INIT ((struct bfq_service_tree) \ ++ { RB_ROOT, RB_ROOT, NULL, NULL, 0, 0 }) ++ ++#define RQ_BIC(rq) ((struct bfq_io_cq *) (rq)->elv.priv[0]) ++#define RQ_BFQQ(rq) ((rq)->elv.priv[1]) ++ ++static inline void bfq_schedule_dispatch(struct bfq_data *bfqd); ++ ++#include "bfq-ioc.c" ++#include "bfq-sched.c" ++#include "bfq-cgroup.c" ++ ++#define bfq_class_idle(bfqq) ((bfqq)->entity.ioprio_class ==\ ++ IOPRIO_CLASS_IDLE) ++#define bfq_class_rt(bfqq) ((bfqq)->entity.ioprio_class ==\ ++ IOPRIO_CLASS_RT) ++ ++#define bfq_sample_valid(samples) ((samples) > 80) ++ ++/* ++ * We regard a request as SYNC, if either it's a read or has the SYNC bit ++ * set (in which case it could also be a direct WRITE). ++ */ ++static inline int bfq_bio_sync(struct bio *bio) ++{ ++ if (bio_data_dir(bio) == READ || (bio->bi_rw & REQ_SYNC)) ++ return 1; ++ ++ return 0; ++} ++ ++/* ++ * Scheduler run of queue, if there are requests pending and no one in the ++ * driver that will restart queueing. ++ */ ++static inline void bfq_schedule_dispatch(struct bfq_data *bfqd) ++{ ++ if (bfqd->queued != 0) { ++ bfq_log(bfqd, "schedule dispatch"); ++ kblockd_schedule_work(&bfqd->unplug_work); ++ } ++} ++ ++/* ++ * Lifted from AS - choose which of rq1 and rq2 that is best served now. ++ * We choose the request that is closesr to the head right now. Distance ++ * behind the head is penalized and only allowed to a certain extent. ++ */ ++static struct request *bfq_choose_req(struct bfq_data *bfqd, ++ struct request *rq1, ++ struct request *rq2, ++ sector_t last) ++{ ++ sector_t s1, s2, d1 = 0, d2 = 0; ++ unsigned long back_max; ++#define BFQ_RQ1_WRAP 0x01 /* request 1 wraps */ ++#define BFQ_RQ2_WRAP 0x02 /* request 2 wraps */ ++ unsigned wrap = 0; /* bit mask: requests behind the disk head? */ ++ ++ if (rq1 == NULL || rq1 == rq2) ++ return rq2; ++ if (rq2 == NULL) ++ return rq1; ++ ++ if (rq_is_sync(rq1) && !rq_is_sync(rq2)) ++ return rq1; ++ else if (rq_is_sync(rq2) && !rq_is_sync(rq1)) ++ return rq2; ++ if ((rq1->cmd_flags & REQ_META) && !(rq2->cmd_flags & REQ_META)) ++ return rq1; ++ else if ((rq2->cmd_flags & REQ_META) && !(rq1->cmd_flags & REQ_META)) ++ return rq2; ++ ++ s1 = blk_rq_pos(rq1); ++ s2 = blk_rq_pos(rq2); ++ ++ /* ++ * By definition, 1KiB is 2 sectors. ++ */ ++ back_max = bfqd->bfq_back_max * 2; ++ ++ /* ++ * Strict one way elevator _except_ in the case where we allow ++ * short backward seeks which are biased as twice the cost of a ++ * similar forward seek. ++ */ ++ if (s1 >= last) ++ d1 = s1 - last; ++ else if (s1 + back_max >= last) ++ d1 = (last - s1) * bfqd->bfq_back_penalty; ++ else ++ wrap |= BFQ_RQ1_WRAP; ++ ++ if (s2 >= last) ++ d2 = s2 - last; ++ else if (s2 + back_max >= last) ++ d2 = (last - s2) * bfqd->bfq_back_penalty; ++ else ++ wrap |= BFQ_RQ2_WRAP; ++ ++ /* Found required data */ ++ ++ /* ++ * By doing switch() on the bit mask "wrap" we avoid having to ++ * check two variables for all permutations: --> faster! ++ */ ++ switch (wrap) { ++ case 0: /* common case for CFQ: rq1 and rq2 not wrapped */ ++ if (d1 < d2) ++ return rq1; ++ else if (d2 < d1) ++ return rq2; ++ else { ++ if (s1 >= s2) ++ return rq1; ++ else ++ return rq2; ++ } ++ ++ case BFQ_RQ2_WRAP: ++ return rq1; ++ case BFQ_RQ1_WRAP: ++ return rq2; ++ case (BFQ_RQ1_WRAP|BFQ_RQ2_WRAP): /* both rqs wrapped */ ++ default: ++ /* ++ * Since both rqs are wrapped, ++ * start with the one that's further behind head ++ * (--> only *one* back seek required), ++ * since back seek takes more time than forward. ++ */ ++ if (s1 <= s2) ++ return rq1; ++ else ++ return rq2; ++ } ++} ++ ++static struct bfq_queue * ++bfq_rq_pos_tree_lookup(struct bfq_data *bfqd, struct rb_root *root, ++ sector_t sector, struct rb_node **ret_parent, ++ struct rb_node ***rb_link) ++{ ++ struct rb_node **p, *parent; ++ struct bfq_queue *bfqq = NULL; ++ ++ parent = NULL; ++ p = &root->rb_node; ++ while (*p) { ++ struct rb_node **n; ++ ++ parent = *p; ++ bfqq = rb_entry(parent, struct bfq_queue, pos_node); ++ ++ /* ++ * Sort strictly based on sector. Smallest to the left, ++ * largest to the right. ++ */ ++ if (sector > blk_rq_pos(bfqq->next_rq)) ++ n = &(*p)->rb_right; ++ else if (sector < blk_rq_pos(bfqq->next_rq)) ++ n = &(*p)->rb_left; ++ else ++ break; ++ p = n; ++ bfqq = NULL; ++ } ++ ++ *ret_parent = parent; ++ if (rb_link) ++ *rb_link = p; ++ ++ bfq_log(bfqd, "rq_pos_tree_lookup %llu: returning %d", ++ (long long unsigned)sector, ++ bfqq != NULL ? bfqq->pid : 0); ++ ++ return bfqq; ++} ++ ++static void bfq_rq_pos_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ struct rb_node **p, *parent; ++ struct bfq_queue *__bfqq; ++ ++ if (bfqq->pos_root != NULL) { ++ rb_erase(&bfqq->pos_node, bfqq->pos_root); ++ bfqq->pos_root = NULL; ++ } ++ ++ if (bfq_class_idle(bfqq)) ++ return; ++ if (!bfqq->next_rq) ++ return; ++ ++ bfqq->pos_root = &bfqd->rq_pos_tree; ++ __bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root, ++ blk_rq_pos(bfqq->next_rq), &parent, &p); ++ if (__bfqq == NULL) { ++ rb_link_node(&bfqq->pos_node, parent, p); ++ rb_insert_color(&bfqq->pos_node, bfqq->pos_root); ++ } else ++ bfqq->pos_root = NULL; ++} ++ ++/* ++ * Tell whether there are active queues or groups with differentiated weights. ++ */ ++static inline bool bfq_differentiated_weights(struct bfq_data *bfqd) ++{ ++ BUG_ON(!bfqd->hw_tag); ++ /* ++ * For weights to differ, at least one of the trees must contain ++ * at least two nodes. ++ */ ++ return (!RB_EMPTY_ROOT(&bfqd->queue_weights_tree) && ++ (bfqd->queue_weights_tree.rb_node->rb_left || ++ bfqd->queue_weights_tree.rb_node->rb_right) ++#ifdef CONFIG_CGROUP_BFQIO ++ ) || ++ (!RB_EMPTY_ROOT(&bfqd->group_weights_tree) && ++ (bfqd->group_weights_tree.rb_node->rb_left || ++ bfqd->group_weights_tree.rb_node->rb_right) ++#endif ++ ); ++} ++ ++/* ++ * If the weight-counter tree passed as input contains no counter for ++ * the weight of the input entity, then add that counter; otherwise just ++ * increment the existing counter. ++ * ++ * Note that weight-counter trees contain few nodes in mostly symmetric ++ * scenarios. For example, if all queues have the same weight, then the ++ * weight-counter tree for the queues may contain at most one node. ++ * This holds even if low_latency is on, because weight-raised queues ++ * are not inserted in the tree. ++ * In most scenarios, the rate at which nodes are created/destroyed ++ * should be low too. ++ */ ++static void bfq_weights_tree_add(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root) ++{ ++ struct rb_node **new = &(root->rb_node), *parent = NULL; ++ ++ /* ++ * Do not insert if: ++ * - the device does not support queueing; ++ * - the entity is already associated with a counter, which happens if: ++ * 1) the entity is associated with a queue, 2) a request arrival ++ * has caused the queue to become both non-weight-raised, and hence ++ * change its weight, and backlogged; in this respect, each ++ * of the two events causes an invocation of this function, ++ * 3) this is the invocation of this function caused by the second ++ * event. This second invocation is actually useless, and we handle ++ * this fact by exiting immediately. More efficient or clearer ++ * solutions might possibly be adopted. ++ */ ++ if (!bfqd->hw_tag || entity->weight_counter) ++ return; ++ ++ while (*new) { ++ struct bfq_weight_counter *__counter = container_of(*new, ++ struct bfq_weight_counter, ++ weights_node); ++ parent = *new; ++ ++ if (entity->weight == __counter->weight) { ++ entity->weight_counter = __counter; ++ goto inc_counter; ++ } ++ if (entity->weight < __counter->weight) ++ new = &((*new)->rb_left); ++ else ++ new = &((*new)->rb_right); ++ } ++ ++ entity->weight_counter = kzalloc(sizeof(struct bfq_weight_counter), ++ GFP_ATOMIC); ++ entity->weight_counter->weight = entity->weight; ++ rb_link_node(&entity->weight_counter->weights_node, parent, new); ++ rb_insert_color(&entity->weight_counter->weights_node, root); ++ ++inc_counter: ++ entity->weight_counter->num_active++; ++} ++ ++/* ++ * Decrement the weight counter associated with the entity, and, if the ++ * counter reaches 0, remove the counter from the tree. ++ * See the comments to the function bfq_weights_tree_add() for considerations ++ * about overhead. ++ */ ++static void bfq_weights_tree_remove(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root) ++{ ++ /* ++ * Check whether the entity is actually associated with a counter. ++ * In fact, the device may not be considered NCQ-capable for a while, ++ * which implies that no insertion in the weight trees is performed, ++ * after which the device may start to be deemed NCQ-capable, and hence ++ * this function may start to be invoked. This may cause the function ++ * to be invoked for entities that are not associated with any counter. ++ */ ++ if (!entity->weight_counter) ++ return; ++ ++ BUG_ON(RB_EMPTY_ROOT(root)); ++ BUG_ON(entity->weight_counter->weight != entity->weight); ++ ++ BUG_ON(!entity->weight_counter->num_active); ++ entity->weight_counter->num_active--; ++ if (entity->weight_counter->num_active > 0) ++ goto reset_entity_pointer; ++ ++ rb_erase(&entity->weight_counter->weights_node, root); ++ kfree(entity->weight_counter); ++ ++reset_entity_pointer: ++ entity->weight_counter = NULL; ++} ++ ++static struct request *bfq_find_next_rq(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct request *last) ++{ ++ struct rb_node *rbnext = rb_next(&last->rb_node); ++ struct rb_node *rbprev = rb_prev(&last->rb_node); ++ struct request *next = NULL, *prev = NULL; ++ ++ BUG_ON(RB_EMPTY_NODE(&last->rb_node)); ++ ++ if (rbprev != NULL) ++ prev = rb_entry_rq(rbprev); ++ ++ if (rbnext != NULL) ++ next = rb_entry_rq(rbnext); ++ else { ++ rbnext = rb_first(&bfqq->sort_list); ++ if (rbnext && rbnext != &last->rb_node) ++ next = rb_entry_rq(rbnext); ++ } ++ ++ return bfq_choose_req(bfqd, next, prev, blk_rq_pos(last)); ++} ++ ++/* see the definition of bfq_async_charge_factor for details */ ++static inline unsigned long bfq_serv_to_charge(struct request *rq, ++ struct bfq_queue *bfqq) ++{ ++ return blk_rq_sectors(rq) * ++ (1 + ((!bfq_bfqq_sync(bfqq)) * (bfqq->wr_coeff == 1) * ++ bfq_async_charge_factor)); ++} ++ ++/** ++ * bfq_updated_next_req - update the queue after a new next_rq selection. ++ * @bfqd: the device data the queue belongs to. ++ * @bfqq: the queue to update. ++ * ++ * If the first request of a queue changes we make sure that the queue ++ * has enough budget to serve at least its first request (if the ++ * request has grown). We do this because if the queue has not enough ++ * budget for its first request, it has to go through two dispatch ++ * rounds to actually get it dispatched. ++ */ ++static void bfq_updated_next_req(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ struct bfq_service_tree *st = bfq_entity_service_tree(entity); ++ struct request *next_rq = bfqq->next_rq; ++ unsigned long new_budget; ++ ++ if (next_rq == NULL) ++ return; ++ ++ if (bfqq == bfqd->in_service_queue) ++ /* ++ * In order not to break guarantees, budgets cannot be ++ * changed after an entity has been selected. ++ */ ++ return; ++ ++ BUG_ON(entity->tree != &st->active); ++ BUG_ON(entity == entity->sched_data->in_service_entity); ++ ++ new_budget = max_t(unsigned long, bfqq->max_budget, ++ bfq_serv_to_charge(next_rq, bfqq)); ++ if (entity->budget != new_budget) { ++ entity->budget = new_budget; ++ bfq_log_bfqq(bfqd, bfqq, "updated next rq: new budget %lu", ++ new_budget); ++ bfq_activate_bfqq(bfqd, bfqq); ++ } ++} ++ ++static inline unsigned int bfq_wr_duration(struct bfq_data *bfqd) ++{ ++ u64 dur; ++ ++ if (bfqd->bfq_wr_max_time > 0) ++ return bfqd->bfq_wr_max_time; ++ ++ dur = bfqd->RT_prod; ++ do_div(dur, bfqd->peak_rate); ++ ++ return dur; ++} ++ ++/* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */ ++static inline void bfq_reset_burst_list(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ struct bfq_queue *item; ++ struct hlist_node *n; ++ ++ hlist_for_each_entry_safe(item, n, &bfqd->burst_list, burst_list_node) ++ hlist_del_init(&item->burst_list_node); ++ hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list); ++ bfqd->burst_size = 1; ++} ++ ++/* Add bfqq to the list of queues in current burst (see bfq_handle_burst) */ ++static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ /* Increment burst size to take into account also bfqq */ ++ bfqd->burst_size++; ++ ++ if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) { ++ struct bfq_queue *pos, *bfqq_item; ++ struct hlist_node *n; ++ ++ /* ++ * Enough queues have been activated shortly after each ++ * other to consider this burst as large. ++ */ ++ bfqd->large_burst = true; ++ ++ /* ++ * We can now mark all queues in the burst list as ++ * belonging to a large burst. ++ */ ++ hlist_for_each_entry(bfqq_item, &bfqd->burst_list, ++ burst_list_node) ++ bfq_mark_bfqq_in_large_burst(bfqq_item); ++ bfq_mark_bfqq_in_large_burst(bfqq); ++ ++ /* ++ * From now on, and until the current burst finishes, any ++ * new queue being activated shortly after the last queue ++ * was inserted in the burst can be immediately marked as ++ * belonging to a large burst. So the burst list is not ++ * needed any more. Remove it. ++ */ ++ hlist_for_each_entry_safe(pos, n, &bfqd->burst_list, ++ burst_list_node) ++ hlist_del_init(&pos->burst_list_node); ++ } else /* burst not yet large: add bfqq to the burst list */ ++ hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list); ++} ++ ++/* ++ * If many queues happen to become active shortly after each other, then, ++ * to help the processes associated to these queues get their job done as ++ * soon as possible, it is usually better to not grant either weight-raising ++ * or device idling to these queues. In this comment we describe, firstly, ++ * the reasons why this fact holds, and, secondly, the next function, which ++ * implements the main steps needed to properly mark these queues so that ++ * they can then be treated in a different way. ++ * ++ * As for the terminology, we say that a queue becomes active, i.e., ++ * switches from idle to backlogged, either when it is created (as a ++ * consequence of the arrival of an I/O request), or, if already existing, ++ * when a new request for the queue arrives while the queue is idle. ++ * Bursts of activations, i.e., activations of different queues occurring ++ * shortly after each other, are typically caused by services or applications ++ * that spawn or reactivate many parallel threads/processes. Examples are ++ * systemd during boot or git grep. ++ * ++ * These services or applications benefit mostly from a high throughput: ++ * the quicker the requests of the activated queues are cumulatively served, ++ * the sooner the target job of these queues gets completed. As a consequence, ++ * weight-raising any of these queues, which also implies idling the device ++ * for it, is almost always counterproductive: in most cases it just lowers ++ * throughput. ++ * ++ * On the other hand, a burst of activations may be also caused by the start ++ * of an application that does not consist in a lot of parallel I/O-bound ++ * threads. In fact, with a complex application, the burst may be just a ++ * consequence of the fact that several processes need to be executed to ++ * start-up the application. To start an application as quickly as possible, ++ * the best thing to do is to privilege the I/O related to the application ++ * with respect to all other I/O. Therefore, the best strategy to start as ++ * quickly as possible an application that causes a burst of activations is ++ * to weight-raise all the queues activated during the burst. This is the ++ * exact opposite of the best strategy for the other type of bursts. ++ * ++ * In the end, to take the best action for each of the two cases, the two ++ * types of bursts need to be distinguished. Fortunately, this seems ++ * relatively easy to do, by looking at the sizes of the bursts. In ++ * particular, we found a threshold such that bursts with a larger size ++ * than that threshold are apparently caused only by services or commands ++ * such as systemd or git grep. For brevity, hereafter we call just 'large' ++ * these bursts. BFQ *does not* weight-raise queues whose activations occur ++ * in a large burst. In addition, for each of these queues BFQ performs or ++ * does not perform idling depending on which choice boosts the throughput ++ * most. The exact choice depends on the device and request pattern at ++ * hand. ++ * ++ * Turning back to the next function, it implements all the steps needed ++ * to detect the occurrence of a large burst and to properly mark all the ++ * queues belonging to it (so that they can then be treated in a different ++ * way). This goal is achieved by maintaining a special "burst list" that ++ * holds, temporarily, the queues that belong to the burst in progress. The ++ * list is then used to mark these queues as belonging to a large burst if ++ * the burst does become large. The main steps are the following. ++ * ++ * . when the very first queue is activated, the queue is inserted into the ++ * list (as it could be the first queue in a possible burst) ++ * ++ * . if the current burst has not yet become large, and a queue Q that does ++ * not yet belong to the burst is activated shortly after the last time ++ * at which a new queue entered the burst list, then the function appends ++ * Q to the burst list ++ * ++ * . if, as a consequence of the previous step, the burst size reaches ++ * the large-burst threshold, then ++ * ++ * . all the queues in the burst list are marked as belonging to a ++ * large burst ++ * ++ * . the burst list is deleted; in fact, the burst list already served ++ * its purpose (keeping temporarily track of the queues in a burst, ++ * so as to be able to mark them as belonging to a large burst in the ++ * previous sub-step), and now is not needed any more ++ * ++ * . the device enters a large-burst mode ++ * ++ * . if a queue Q that does not belong to the burst is activated while ++ * the device is in large-burst mode and shortly after the last time ++ * at which a queue either entered the burst list or was marked as ++ * belonging to the current large burst, then Q is immediately marked ++ * as belonging to a large burst. ++ * ++ * . if a queue Q that does not belong to the burst is activated a while ++ * later, i.e., not shortly after, than the last time at which a queue ++ * either entered the burst list or was marked as belonging to the ++ * current large burst, then the current burst is deemed as finished and: ++ * ++ * . the large-burst mode is reset if set ++ * ++ * . the burst list is emptied ++ * ++ * . Q is inserted in the burst list, as Q may be the first queue ++ * in a possible new burst (then the burst list contains just Q ++ * after this step). ++ */ ++static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ bool idle_for_long_time) ++{ ++ /* ++ * If bfqq happened to be activated in a burst, but has been idle ++ * for at least as long as an interactive queue, then we assume ++ * that, in the overall I/O initiated in the burst, the I/O ++ * associated to bfqq is finished. So bfqq does not need to be ++ * treated as a queue belonging to a burst anymore. Accordingly, ++ * we reset bfqq's in_large_burst flag if set, and remove bfqq ++ * from the burst list if it's there. We do not decrement instead ++ * burst_size, because the fact that bfqq does not need to belong ++ * to the burst list any more does not invalidate the fact that ++ * bfqq may have been activated during the current burst. ++ */ ++ if (idle_for_long_time) { ++ hlist_del_init(&bfqq->burst_list_node); ++ bfq_clear_bfqq_in_large_burst(bfqq); ++ } ++ ++ /* ++ * If bfqq is already in the burst list or is part of a large ++ * burst, then there is nothing else to do. ++ */ ++ if (!hlist_unhashed(&bfqq->burst_list_node) || ++ bfq_bfqq_in_large_burst(bfqq)) ++ return; ++ ++ /* ++ * If bfqq's activation happens late enough, then the current ++ * burst is finished, and related data structures must be reset. ++ * ++ * In this respect, consider the special case where bfqq is the very ++ * first queue being activated. In this case, last_ins_in_burst is ++ * not yet significant when we get here. But it is easy to verify ++ * that, whether or not the following condition is true, bfqq will ++ * end up being inserted into the burst list. In particular the ++ * list will happen to contain only bfqq. And this is exactly what ++ * has to happen, as bfqq may be the first queue in a possible ++ * burst. ++ */ ++ if (time_is_before_jiffies(bfqd->last_ins_in_burst + ++ bfqd->bfq_burst_interval)) { ++ bfqd->large_burst = false; ++ bfq_reset_burst_list(bfqd, bfqq); ++ return; ++ } ++ ++ /* ++ * If we get here, then bfqq is being activated shortly after the ++ * last queue. So, if the current burst is also large, we can mark ++ * bfqq as belonging to this large burst immediately. ++ */ ++ if (bfqd->large_burst) { ++ bfq_mark_bfqq_in_large_burst(bfqq); ++ return; ++ } ++ ++ /* ++ * If we get here, then a large-burst state has not yet been ++ * reached, but bfqq is being activated shortly after the last ++ * queue. Then we add bfqq to the burst. ++ */ ++ bfq_add_to_burst(bfqd, bfqq); ++} ++ ++static void bfq_add_request(struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_entity *entity = &bfqq->entity; ++ struct bfq_data *bfqd = bfqq->bfqd; ++ struct request *next_rq, *prev; ++ unsigned long old_wr_coeff = bfqq->wr_coeff; ++ bool interactive = false; ++ ++ bfq_log_bfqq(bfqd, bfqq, "add_request %d", rq_is_sync(rq)); ++ bfqq->queued[rq_is_sync(rq)]++; ++ bfqd->queued++; ++ ++ elv_rb_add(&bfqq->sort_list, rq); ++ ++ /* ++ * Check if this request is a better next-serve candidate. ++ */ ++ prev = bfqq->next_rq; ++ next_rq = bfq_choose_req(bfqd, bfqq->next_rq, rq, bfqd->last_position); ++ BUG_ON(next_rq == NULL); ++ bfqq->next_rq = next_rq; ++ ++ /* ++ * Adjust priority tree position, if next_rq changes. ++ */ ++ if (prev != bfqq->next_rq) ++ bfq_rq_pos_tree_add(bfqd, bfqq); ++ ++ if (!bfq_bfqq_busy(bfqq)) { ++ bool soft_rt, ++ idle_for_long_time = time_is_before_jiffies( ++ bfqq->budget_timeout + ++ bfqd->bfq_wr_min_idle_time); ++ ++ if (bfq_bfqq_sync(bfqq)) { ++ bool already_in_burst = ++ !hlist_unhashed(&bfqq->burst_list_node) || ++ bfq_bfqq_in_large_burst(bfqq); ++ bfq_handle_burst(bfqd, bfqq, idle_for_long_time); ++ /* ++ * If bfqq was not already in the current burst, ++ * then, at this point, bfqq either has been ++ * added to the current burst or has caused the ++ * current burst to terminate. In particular, in ++ * the second case, bfqq has become the first ++ * queue in a possible new burst. ++ * In both cases last_ins_in_burst needs to be ++ * moved forward. ++ */ ++ if (!already_in_burst) ++ bfqd->last_ins_in_burst = jiffies; ++ } ++ ++ soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && ++ !bfq_bfqq_in_large_burst(bfqq) && ++ time_is_before_jiffies(bfqq->soft_rt_next_start); ++ interactive = !bfq_bfqq_in_large_burst(bfqq) && ++ idle_for_long_time; ++ entity->budget = max_t(unsigned long, bfqq->max_budget, ++ bfq_serv_to_charge(next_rq, bfqq)); ++ ++ if (!bfq_bfqq_IO_bound(bfqq)) { ++ if (time_before(jiffies, ++ RQ_BIC(rq)->ttime.last_end_request + ++ bfqd->bfq_slice_idle)) { ++ bfqq->requests_within_timer++; ++ if (bfqq->requests_within_timer >= ++ bfqd->bfq_requests_within_timer) ++ bfq_mark_bfqq_IO_bound(bfqq); ++ } else ++ bfqq->requests_within_timer = 0; ++ } ++ ++ if (!bfqd->low_latency) ++ goto add_bfqq_busy; ++ ++ /* ++ * If the queue is not being boosted and has been idle ++ * for enough time, start a weight-raising period ++ */ ++ if (old_wr_coeff == 1 && (interactive || soft_rt)) { ++ bfqq->wr_coeff = bfqd->bfq_wr_coeff; ++ if (interactive) ++ bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); ++ else ++ bfqq->wr_cur_max_time = ++ bfqd->bfq_wr_rt_max_time; ++ bfq_log_bfqq(bfqd, bfqq, ++ "wrais starting at %lu, rais_max_time %u", ++ jiffies, ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } else if (old_wr_coeff > 1) { ++ if (interactive) ++ bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); ++ else if (bfq_bfqq_in_large_burst(bfqq) || ++ (bfqq->wr_cur_max_time == ++ bfqd->bfq_wr_rt_max_time && ++ !soft_rt)) { ++ bfqq->wr_coeff = 1; ++ bfq_log_bfqq(bfqd, bfqq, ++ "wrais ending at %lu, rais_max_time %u", ++ jiffies, ++ jiffies_to_msecs(bfqq-> ++ wr_cur_max_time)); ++ } else if (time_before( ++ bfqq->last_wr_start_finish + ++ bfqq->wr_cur_max_time, ++ jiffies + ++ bfqd->bfq_wr_rt_max_time) && ++ soft_rt) { ++ /* ++ * ++ * The remaining weight-raising time is lower ++ * than bfqd->bfq_wr_rt_max_time, which ++ * means that the application is enjoying ++ * weight raising either because deemed soft- ++ * rt in the near past, or because deemed ++ * interactive a long ago. In both cases, ++ * resetting now the current remaining weight- ++ * raising time for the application to the ++ * weight-raising duration for soft rt ++ * applications would not cause any latency ++ * increase for the application (as the new ++ * duration would be higher than the remaining ++ * time). ++ * ++ * In addition, the application is now meeting ++ * the requirements for being deemed soft rt. ++ * In the end we can correctly and safely ++ * (re)charge the weight-raising duration for ++ * the application with the weight-raising ++ * duration for soft rt applications. ++ * ++ * In particular, doing this recharge now, i.e., ++ * before the weight-raising period for the ++ * application finishes, reduces the probability ++ * of the following negative scenario: ++ * 1) the weight of a soft rt application is ++ * raised at startup (as for any newly ++ * created application), ++ * 2) since the application is not interactive, ++ * at a certain time weight-raising is ++ * stopped for the application, ++ * 3) at that time the application happens to ++ * still have pending requests, and hence ++ * is destined to not have a chance to be ++ * deemed soft rt before these requests are ++ * completed (see the comments to the ++ * function bfq_bfqq_softrt_next_start() ++ * for details on soft rt detection), ++ * 4) these pending requests experience a high ++ * latency because the application is not ++ * weight-raised while they are pending. ++ */ ++ bfqq->last_wr_start_finish = jiffies; ++ bfqq->wr_cur_max_time = ++ bfqd->bfq_wr_rt_max_time; ++ } ++ } ++ if (old_wr_coeff != bfqq->wr_coeff) ++ entity->ioprio_changed = 1; ++add_bfqq_busy: ++ bfqq->last_idle_bklogged = jiffies; ++ bfqq->service_from_backlogged = 0; ++ bfq_clear_bfqq_softrt_update(bfqq); ++ bfq_add_bfqq_busy(bfqd, bfqq); ++ } else { ++ if (bfqd->low_latency && old_wr_coeff == 1 && !rq_is_sync(rq) && ++ time_is_before_jiffies( ++ bfqq->last_wr_start_finish + ++ bfqd->bfq_wr_min_inter_arr_async)) { ++ bfqq->wr_coeff = bfqd->bfq_wr_coeff; ++ bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); ++ ++ bfqd->wr_busy_queues++; ++ entity->ioprio_changed = 1; ++ bfq_log_bfqq(bfqd, bfqq, ++ "non-idle wrais starting at %lu, rais_max_time %u", ++ jiffies, ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } ++ if (prev != bfqq->next_rq) ++ bfq_updated_next_req(bfqd, bfqq); ++ } ++ ++ if (bfqd->low_latency && ++ (old_wr_coeff == 1 || bfqq->wr_coeff == 1 || interactive)) ++ bfqq->last_wr_start_finish = jiffies; ++} ++ ++static struct request *bfq_find_rq_fmerge(struct bfq_data *bfqd, ++ struct bio *bio) ++{ ++ struct task_struct *tsk = current; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq; ++ ++ bic = bfq_bic_lookup(bfqd, tsk->io_context); ++ if (bic == NULL) ++ return NULL; ++ ++ bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio)); ++ if (bfqq != NULL) ++ return elv_rb_find(&bfqq->sort_list, bio_end_sector(bio)); ++ ++ return NULL; ++} ++ ++static void bfq_activate_request(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ ++ bfqd->rq_in_driver++; ++ bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq); ++ bfq_log(bfqd, "activate_request: new bfqd->last_position %llu", ++ (long long unsigned)bfqd->last_position); ++} ++ ++static inline void bfq_deactivate_request(struct request_queue *q, ++ struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ ++ BUG_ON(bfqd->rq_in_driver == 0); ++ bfqd->rq_in_driver--; ++} ++ ++static void bfq_remove_request(struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_data *bfqd = bfqq->bfqd; ++ const int sync = rq_is_sync(rq); ++ ++ if (bfqq->next_rq == rq) { ++ bfqq->next_rq = bfq_find_next_rq(bfqd, bfqq, rq); ++ bfq_updated_next_req(bfqd, bfqq); ++ } ++ ++ list_del_init(&rq->queuelist); ++ BUG_ON(bfqq->queued[sync] == 0); ++ bfqq->queued[sync]--; ++ bfqd->queued--; ++ elv_rb_del(&bfqq->sort_list, rq); ++ ++ if (RB_EMPTY_ROOT(&bfqq->sort_list)) { ++ if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) ++ bfq_del_bfqq_busy(bfqd, bfqq, 1); ++ /* ++ * Remove queue from request-position tree as it is empty. ++ */ ++ if (bfqq->pos_root != NULL) { ++ rb_erase(&bfqq->pos_node, bfqq->pos_root); ++ bfqq->pos_root = NULL; ++ } ++ } ++ ++ if (rq->cmd_flags & REQ_META) { ++ BUG_ON(bfqq->meta_pending == 0); ++ bfqq->meta_pending--; ++ } ++} ++ ++static int bfq_merge(struct request_queue *q, struct request **req, ++ struct bio *bio) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct request *__rq; ++ ++ __rq = bfq_find_rq_fmerge(bfqd, bio); ++ if (__rq != NULL && elv_rq_merge_ok(__rq, bio)) { ++ *req = __rq; ++ return ELEVATOR_FRONT_MERGE; ++ } ++ ++ return ELEVATOR_NO_MERGE; ++} ++ ++static void bfq_merged_request(struct request_queue *q, struct request *req, ++ int type) ++{ ++ if (type == ELEVATOR_FRONT_MERGE && ++ rb_prev(&req->rb_node) && ++ blk_rq_pos(req) < ++ blk_rq_pos(container_of(rb_prev(&req->rb_node), ++ struct request, rb_node))) { ++ struct bfq_queue *bfqq = RQ_BFQQ(req); ++ struct bfq_data *bfqd = bfqq->bfqd; ++ struct request *prev, *next_rq; ++ ++ /* Reposition request in its sort_list */ ++ elv_rb_del(&bfqq->sort_list, req); ++ elv_rb_add(&bfqq->sort_list, req); ++ /* Choose next request to be served for bfqq */ ++ prev = bfqq->next_rq; ++ next_rq = bfq_choose_req(bfqd, bfqq->next_rq, req, ++ bfqd->last_position); ++ BUG_ON(next_rq == NULL); ++ bfqq->next_rq = next_rq; ++ /* ++ * If next_rq changes, update both the queue's budget to ++ * fit the new request and the queue's position in its ++ * rq_pos_tree. ++ */ ++ if (prev != bfqq->next_rq) { ++ bfq_updated_next_req(bfqd, bfqq); ++ bfq_rq_pos_tree_add(bfqd, bfqq); ++ } ++ } ++} ++ ++static void bfq_merged_requests(struct request_queue *q, struct request *rq, ++ struct request *next) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ /* ++ * Reposition in fifo if next is older than rq. ++ */ ++ if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) && ++ time_before(next->fifo_time, rq->fifo_time)) { ++ list_move(&rq->queuelist, &next->queuelist); ++ rq->fifo_time = next->fifo_time; ++ } ++ ++ if (bfqq->next_rq == next) ++ bfqq->next_rq = rq; ++ ++ bfq_remove_request(next); ++} ++ ++/* Must be called with bfqq != NULL */ ++static inline void bfq_bfqq_end_wr(struct bfq_queue *bfqq) ++{ ++ BUG_ON(bfqq == NULL); ++ if (bfq_bfqq_busy(bfqq)) ++ bfqq->bfqd->wr_busy_queues--; ++ bfqq->wr_coeff = 1; ++ bfqq->wr_cur_max_time = 0; ++ /* Trigger a weight change on the next activation of the queue */ ++ bfqq->entity.ioprio_changed = 1; ++} ++ ++static void bfq_end_wr_async_queues(struct bfq_data *bfqd, ++ struct bfq_group *bfqg) ++{ ++ int i, j; ++ ++ for (i = 0; i < 2; i++) ++ for (j = 0; j < IOPRIO_BE_NR; j++) ++ if (bfqg->async_bfqq[i][j] != NULL) ++ bfq_bfqq_end_wr(bfqg->async_bfqq[i][j]); ++ if (bfqg->async_idle_bfqq != NULL) ++ bfq_bfqq_end_wr(bfqg->async_idle_bfqq); ++} ++ ++static void bfq_end_wr(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq; ++ ++ spin_lock_irq(bfqd->queue->queue_lock); ++ ++ list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) ++ bfq_bfqq_end_wr(bfqq); ++ list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) ++ bfq_bfqq_end_wr(bfqq); ++ bfq_end_wr_async(bfqd); ++ ++ spin_unlock_irq(bfqd->queue->queue_lock); ++} ++ ++static int bfq_allow_merge(struct request_queue *q, struct request *rq, ++ struct bio *bio) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq; ++ ++ /* ++ * Disallow merge of a sync bio into an async request. ++ */ ++ if (bfq_bio_sync(bio) && !rq_is_sync(rq)) ++ return 0; ++ ++ /* ++ * Lookup the bfqq that this bio will be queued with. Allow ++ * merge only if rq is queued there. ++ * Queue lock is held here. ++ */ ++ bic = bfq_bic_lookup(bfqd, current->io_context); ++ if (bic == NULL) ++ return 0; ++ ++ bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio)); ++ return bfqq == RQ_BFQQ(rq); ++} ++ ++static void __bfq_set_in_service_queue(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (bfqq != NULL) { ++ bfq_mark_bfqq_must_alloc(bfqq); ++ bfq_mark_bfqq_budget_new(bfqq); ++ bfq_clear_bfqq_fifo_expire(bfqq); ++ ++ bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8; ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "set_in_service_queue, cur-budget = %lu", ++ bfqq->entity.budget); ++ } ++ ++ bfqd->in_service_queue = bfqq; ++} ++ ++/* ++ * Get and set a new queue for service. ++ */ ++static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (!bfqq) ++ bfqq = bfq_get_next_queue(bfqd); ++ else ++ bfq_get_next_queue_forced(bfqd, bfqq); ++ ++ __bfq_set_in_service_queue(bfqd, bfqq); ++ return bfqq; ++} ++ ++static inline sector_t bfq_dist_from_last(struct bfq_data *bfqd, ++ struct request *rq) ++{ ++ if (blk_rq_pos(rq) >= bfqd->last_position) ++ return blk_rq_pos(rq) - bfqd->last_position; ++ else ++ return bfqd->last_position - blk_rq_pos(rq); ++} ++ ++/* ++ * Return true if bfqq has no request pending and rq is close enough to ++ * bfqd->last_position, or if rq is closer to bfqd->last_position than ++ * bfqq->next_rq ++ */ ++static inline int bfq_rq_close(struct bfq_data *bfqd, struct request *rq) ++{ ++ return bfq_dist_from_last(bfqd, rq) <= BFQQ_SEEK_THR; ++} ++ ++static struct bfq_queue *bfqq_close(struct bfq_data *bfqd) ++{ ++ struct rb_root *root = &bfqd->rq_pos_tree; ++ struct rb_node *parent, *node; ++ struct bfq_queue *__bfqq; ++ sector_t sector = bfqd->last_position; ++ ++ if (RB_EMPTY_ROOT(root)) ++ return NULL; ++ ++ /* ++ * First, if we find a request starting at the end of the last ++ * request, choose it. ++ */ ++ __bfqq = bfq_rq_pos_tree_lookup(bfqd, root, sector, &parent, NULL); ++ if (__bfqq != NULL) ++ return __bfqq; ++ ++ /* ++ * If the exact sector wasn't found, the parent of the NULL leaf ++ * will contain the closest sector (rq_pos_tree sorted by ++ * next_request position). ++ */ ++ __bfqq = rb_entry(parent, struct bfq_queue, pos_node); ++ if (bfq_rq_close(bfqd, __bfqq->next_rq)) ++ return __bfqq; ++ ++ if (blk_rq_pos(__bfqq->next_rq) < sector) ++ node = rb_next(&__bfqq->pos_node); ++ else ++ node = rb_prev(&__bfqq->pos_node); ++ if (node == NULL) ++ return NULL; ++ ++ __bfqq = rb_entry(node, struct bfq_queue, pos_node); ++ if (bfq_rq_close(bfqd, __bfqq->next_rq)) ++ return __bfqq; ++ ++ return NULL; ++} ++ ++/* ++ * bfqd - obvious ++ * cur_bfqq - passed in so that we don't decide that the current queue ++ * is closely cooperating with itself. ++ * ++ * We are assuming that cur_bfqq has dispatched at least one request, ++ * and that bfqd->last_position reflects a position on the disk associated ++ * with the I/O issued by cur_bfqq. ++ */ ++static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd, ++ struct bfq_queue *cur_bfqq) ++{ ++ struct bfq_queue *bfqq; ++ ++ if (bfq_class_idle(cur_bfqq)) ++ return NULL; ++ if (!bfq_bfqq_sync(cur_bfqq)) ++ return NULL; ++ if (BFQQ_SEEKY(cur_bfqq)) ++ return NULL; ++ ++ /* If device has only one backlogged bfq_queue, don't search. */ ++ if (bfqd->busy_queues == 1) ++ return NULL; ++ ++ /* ++ * We should notice if some of the queues are cooperating, e.g. ++ * working closely on the same area of the disk. In that case, ++ * we can group them together and don't waste time idling. ++ */ ++ bfqq = bfqq_close(bfqd); ++ if (bfqq == NULL || bfqq == cur_bfqq) ++ return NULL; ++ ++ /* ++ * Do not merge queues from different bfq_groups. ++ */ ++ if (bfqq->entity.parent != cur_bfqq->entity.parent) ++ return NULL; ++ ++ /* ++ * It only makes sense to merge sync queues. ++ */ ++ if (!bfq_bfqq_sync(bfqq)) ++ return NULL; ++ if (BFQQ_SEEKY(bfqq)) ++ return NULL; ++ ++ /* ++ * Do not merge queues of different priority classes. ++ */ ++ if (bfq_class_rt(bfqq) != bfq_class_rt(cur_bfqq)) ++ return NULL; ++ ++ return bfqq; ++} ++ ++/* ++ * If enough samples have been computed, return the current max budget ++ * stored in bfqd, which is dynamically updated according to the ++ * estimated disk peak rate; otherwise return the default max budget ++ */ ++static inline unsigned long bfq_max_budget(struct bfq_data *bfqd) ++{ ++ if (bfqd->budgets_assigned < 194) ++ return bfq_default_max_budget; ++ else ++ return bfqd->bfq_max_budget; ++} ++ ++/* ++ * Return min budget, which is a fraction of the current or default ++ * max budget (trying with 1/32) ++ */ ++static inline unsigned long bfq_min_budget(struct bfq_data *bfqd) ++{ ++ if (bfqd->budgets_assigned < 194) ++ return bfq_default_max_budget / 32; ++ else ++ return bfqd->bfq_max_budget / 32; ++} ++ ++static void bfq_arm_slice_timer(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq = bfqd->in_service_queue; ++ struct bfq_io_cq *bic; ++ unsigned long sl; ++ ++ BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list)); ++ ++ /* Processes have exited, don't wait. */ ++ bic = bfqd->in_service_bic; ++ if (bic == NULL || atomic_read(&bic->icq.ioc->active_ref) == 0) ++ return; ++ ++ bfq_mark_bfqq_wait_request(bfqq); ++ ++ /* ++ * We don't want to idle for seeks, but we do want to allow ++ * fair distribution of slice time for a process doing back-to-back ++ * seeks. So allow a little bit of time for him to submit a new rq. ++ * ++ * To prevent processes with (partly) seeky workloads from ++ * being too ill-treated, grant them a small fraction of the ++ * assigned budget before reducing the waiting time to ++ * BFQ_MIN_TT. This happened to help reduce latency. ++ */ ++ sl = bfqd->bfq_slice_idle; ++ /* ++ * Unless the queue is being weight-raised, grant only minimum idle ++ * time if the queue either has been seeky for long enough or has ++ * already proved to be constantly seeky. ++ */ ++ if (bfq_sample_valid(bfqq->seek_samples) && ++ ((BFQQ_SEEKY(bfqq) && bfqq->entity.service > ++ bfq_max_budget(bfqq->bfqd) / 8) || ++ bfq_bfqq_constantly_seeky(bfqq)) && bfqq->wr_coeff == 1) ++ sl = min(sl, msecs_to_jiffies(BFQ_MIN_TT)); ++ else if (bfqq->wr_coeff > 1) ++ sl = sl * 3; ++ bfqd->last_idling_start = ktime_get(); ++ mod_timer(&bfqd->idle_slice_timer, jiffies + sl); ++ bfq_log(bfqd, "arm idle: %u/%u ms", ++ jiffies_to_msecs(sl), jiffies_to_msecs(bfqd->bfq_slice_idle)); ++} ++ ++/* ++ * Set the maximum time for the in-service queue to consume its ++ * budget. This prevents seeky processes from lowering the disk ++ * throughput (always guaranteed with a time slice scheme as in CFQ). ++ */ ++static void bfq_set_budget_timeout(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq = bfqd->in_service_queue; ++ unsigned int timeout_coeff; ++ if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time) ++ timeout_coeff = 1; ++ else ++ timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight; ++ ++ bfqd->last_budget_start = ktime_get(); ++ ++ bfq_clear_bfqq_budget_new(bfqq); ++ bfqq->budget_timeout = jiffies + ++ bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * timeout_coeff; ++ ++ bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u", ++ jiffies_to_msecs(bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * ++ timeout_coeff)); ++} ++ ++/* ++ * Move request from internal lists to the request queue dispatch list. ++ */ ++static void bfq_dispatch_insert(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ /* ++ * For consistency, the next instruction should have been executed ++ * after removing the request from the queue and dispatching it. ++ * We execute instead this instruction before bfq_remove_request() ++ * (and hence introduce a temporary inconsistency), for efficiency. ++ * In fact, in a forced_dispatch, this prevents two counters related ++ * to bfqq->dispatched to risk to be uselessly decremented if bfqq ++ * is not in service, and then to be incremented again after ++ * incrementing bfqq->dispatched. ++ */ ++ bfqq->dispatched++; ++ bfq_remove_request(rq); ++ elv_dispatch_sort(q, rq); ++ ++ if (bfq_bfqq_sync(bfqq)) ++ bfqd->sync_flight++; ++} ++ ++/* ++ * Return expired entry, or NULL to just start from scratch in rbtree. ++ */ ++static struct request *bfq_check_fifo(struct bfq_queue *bfqq) ++{ ++ struct request *rq = NULL; ++ ++ if (bfq_bfqq_fifo_expire(bfqq)) ++ return NULL; ++ ++ bfq_mark_bfqq_fifo_expire(bfqq); ++ ++ if (list_empty(&bfqq->fifo)) ++ return NULL; ++ ++ rq = rq_entry_fifo(bfqq->fifo.next); ++ ++ if (time_before(jiffies, rq->fifo_time)) ++ return NULL; ++ ++ return rq; ++} ++ ++/* Must be called with the queue_lock held. */ ++static int bfqq_process_refs(struct bfq_queue *bfqq) ++{ ++ int process_refs, io_refs; ++ ++ io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE]; ++ process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st; ++ BUG_ON(process_refs < 0); ++ return process_refs; ++} ++ ++static void bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) ++{ ++ int process_refs, new_process_refs; ++ struct bfq_queue *__bfqq; ++ ++ /* ++ * If there are no process references on the new_bfqq, then it is ++ * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain ++ * may have dropped their last reference (not just their last process ++ * reference). ++ */ ++ if (!bfqq_process_refs(new_bfqq)) ++ return; ++ ++ /* Avoid a circular list and skip interim queue merges. */ ++ while ((__bfqq = new_bfqq->new_bfqq)) { ++ if (__bfqq == bfqq) ++ return; ++ new_bfqq = __bfqq; ++ } ++ ++ process_refs = bfqq_process_refs(bfqq); ++ new_process_refs = bfqq_process_refs(new_bfqq); ++ /* ++ * If the process for the bfqq has gone away, there is no ++ * sense in merging the queues. ++ */ ++ if (process_refs == 0 || new_process_refs == 0) ++ return; ++ ++ /* ++ * Merge in the direction of the lesser amount of work. ++ */ ++ if (new_process_refs >= process_refs) { ++ bfqq->new_bfqq = new_bfqq; ++ atomic_add(process_refs, &new_bfqq->ref); ++ } else { ++ new_bfqq->new_bfqq = bfqq; ++ atomic_add(new_process_refs, &bfqq->ref); ++ } ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d", ++ new_bfqq->pid); ++} ++ ++static inline unsigned long bfq_bfqq_budget_left(struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ return entity->budget - entity->service; ++} ++ ++static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ BUG_ON(bfqq != bfqd->in_service_queue); ++ ++ __bfq_bfqd_reset_in_service(bfqd); ++ ++ /* ++ * If this bfqq is shared between multiple processes, check ++ * to make sure that those processes are still issuing I/Os ++ * within the mean seek distance. If not, it may be time to ++ * break the queues apart again. ++ */ ++ if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq)) ++ bfq_mark_bfqq_split_coop(bfqq); ++ ++ if (RB_EMPTY_ROOT(&bfqq->sort_list)) { ++ /* ++ * Overloading budget_timeout field to store the time ++ * at which the queue remains with no backlog; used by ++ * the weight-raising mechanism. ++ */ ++ bfqq->budget_timeout = jiffies; ++ bfq_del_bfqq_busy(bfqd, bfqq, 1); ++ } else { ++ bfq_activate_bfqq(bfqd, bfqq); ++ /* ++ * Resort priority tree of potential close cooperators. ++ */ ++ bfq_rq_pos_tree_add(bfqd, bfqq); ++ } ++} ++ ++/** ++ * __bfq_bfqq_recalc_budget - try to adapt the budget to the @bfqq behavior. ++ * @bfqd: device data. ++ * @bfqq: queue to update. ++ * @reason: reason for expiration. ++ * ++ * Handle the feedback on @bfqq budget. See the body for detailed ++ * comments. ++ */ ++static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ enum bfqq_expiration reason) ++{ ++ struct request *next_rq; ++ unsigned long budget, min_budget; ++ ++ budget = bfqq->max_budget; ++ min_budget = bfq_min_budget(bfqd); ++ ++ BUG_ON(bfqq != bfqd->in_service_queue); ++ ++ bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last budg %lu, budg left %lu", ++ bfqq->entity.budget, bfq_bfqq_budget_left(bfqq)); ++ bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last max_budg %lu, min budg %lu", ++ budget, bfq_min_budget(bfqd)); ++ bfq_log_bfqq(bfqd, bfqq, "recalc_budg: sync %d, seeky %d", ++ bfq_bfqq_sync(bfqq), BFQQ_SEEKY(bfqd->in_service_queue)); ++ ++ if (bfq_bfqq_sync(bfqq)) { ++ switch (reason) { ++ /* ++ * Caveat: in all the following cases we trade latency ++ * for throughput. ++ */ ++ case BFQ_BFQQ_TOO_IDLE: ++ /* ++ * This is the only case where we may reduce ++ * the budget: if there is no request of the ++ * process still waiting for completion, then ++ * we assume (tentatively) that the timer has ++ * expired because the batch of requests of ++ * the process could have been served with a ++ * smaller budget. Hence, betting that ++ * process will behave in the same way when it ++ * becomes backlogged again, we reduce its ++ * next budget. As long as we guess right, ++ * this budget cut reduces the latency ++ * experienced by the process. ++ * ++ * However, if there are still outstanding ++ * requests, then the process may have not yet ++ * issued its next request just because it is ++ * still waiting for the completion of some of ++ * the still outstanding ones. So in this ++ * subcase we do not reduce its budget, on the ++ * contrary we increase it to possibly boost ++ * the throughput, as discussed in the ++ * comments to the BUDGET_TIMEOUT case. ++ */ ++ if (bfqq->dispatched > 0) /* still outstanding reqs */ ++ budget = min(budget * 2, bfqd->bfq_max_budget); ++ else { ++ if (budget > 5 * min_budget) ++ budget -= 4 * min_budget; ++ else ++ budget = min_budget; ++ } ++ break; ++ case BFQ_BFQQ_BUDGET_TIMEOUT: ++ /* ++ * We double the budget here because: 1) it ++ * gives the chance to boost the throughput if ++ * this is not a seeky process (which may have ++ * bumped into this timeout because of, e.g., ++ * ZBR), 2) together with charge_full_budget ++ * it helps give seeky processes higher ++ * timestamps, and hence be served less ++ * frequently. ++ */ ++ budget = min(budget * 2, bfqd->bfq_max_budget); ++ break; ++ case BFQ_BFQQ_BUDGET_EXHAUSTED: ++ /* ++ * The process still has backlog, and did not ++ * let either the budget timeout or the disk ++ * idling timeout expire. Hence it is not ++ * seeky, has a short thinktime and may be ++ * happy with a higher budget too. So ++ * definitely increase the budget of this good ++ * candidate to boost the disk throughput. ++ */ ++ budget = min(budget * 4, bfqd->bfq_max_budget); ++ break; ++ case BFQ_BFQQ_NO_MORE_REQUESTS: ++ /* ++ * Leave the budget unchanged. ++ */ ++ default: ++ return; ++ } ++ } else /* async queue */ ++ /* async queues get always the maximum possible budget ++ * (their ability to dispatch is limited by ++ * @bfqd->bfq_max_budget_async_rq). ++ */ ++ budget = bfqd->bfq_max_budget; ++ ++ bfqq->max_budget = budget; ++ ++ if (bfqd->budgets_assigned >= 194 && bfqd->bfq_user_max_budget == 0 && ++ bfqq->max_budget > bfqd->bfq_max_budget) ++ bfqq->max_budget = bfqd->bfq_max_budget; ++ ++ /* ++ * Make sure that we have enough budget for the next request. ++ * Since the finish time of the bfqq must be kept in sync with ++ * the budget, be sure to call __bfq_bfqq_expire() after the ++ * update. ++ */ ++ next_rq = bfqq->next_rq; ++ if (next_rq != NULL) ++ bfqq->entity.budget = max_t(unsigned long, bfqq->max_budget, ++ bfq_serv_to_charge(next_rq, bfqq)); ++ else ++ bfqq->entity.budget = bfqq->max_budget; ++ ++ bfq_log_bfqq(bfqd, bfqq, "head sect: %u, new budget %lu", ++ next_rq != NULL ? blk_rq_sectors(next_rq) : 0, ++ bfqq->entity.budget); ++} ++ ++static unsigned long bfq_calc_max_budget(u64 peak_rate, u64 timeout) ++{ ++ unsigned long max_budget; ++ ++ /* ++ * The max_budget calculated when autotuning is equal to the ++ * amount of sectors transfered in timeout_sync at the ++ * estimated peak rate. ++ */ ++ max_budget = (unsigned long)(peak_rate * 1000 * ++ timeout >> BFQ_RATE_SHIFT); ++ ++ return max_budget; ++} ++ ++/* ++ * In addition to updating the peak rate, checks whether the process ++ * is "slow", and returns 1 if so. This slow flag is used, in addition ++ * to the budget timeout, to reduce the amount of service provided to ++ * seeky processes, and hence reduce their chances to lower the ++ * throughput. See the code for more details. ++ */ ++static int bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ int compensate, enum bfqq_expiration reason) ++{ ++ u64 bw, usecs, expected, timeout; ++ ktime_t delta; ++ int update = 0; ++ ++ if (!bfq_bfqq_sync(bfqq) || bfq_bfqq_budget_new(bfqq)) ++ return 0; ++ ++ if (compensate) ++ delta = bfqd->last_idling_start; ++ else ++ delta = ktime_get(); ++ delta = ktime_sub(delta, bfqd->last_budget_start); ++ usecs = ktime_to_us(delta); ++ ++ /* Don't trust short/unrealistic values. */ ++ if (usecs < 100 || usecs >= LONG_MAX) ++ return 0; ++ ++ /* ++ * Calculate the bandwidth for the last slice. We use a 64 bit ++ * value to store the peak rate, in sectors per usec in fixed ++ * point math. We do so to have enough precision in the estimate ++ * and to avoid overflows. ++ */ ++ bw = (u64)bfqq->entity.service << BFQ_RATE_SHIFT; ++ do_div(bw, (unsigned long)usecs); ++ ++ timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]); ++ ++ /* ++ * Use only long (> 20ms) intervals to filter out spikes for ++ * the peak rate estimation. ++ */ ++ if (usecs > 20000) { ++ if (bw > bfqd->peak_rate || ++ (!BFQQ_SEEKY(bfqq) && ++ reason == BFQ_BFQQ_BUDGET_TIMEOUT)) { ++ bfq_log(bfqd, "measured bw =%llu", bw); ++ /* ++ * To smooth oscillations use a low-pass filter with ++ * alpha=7/8, i.e., ++ * new_rate = (7/8) * old_rate + (1/8) * bw ++ */ ++ do_div(bw, 8); ++ if (bw == 0) ++ return 0; ++ bfqd->peak_rate *= 7; ++ do_div(bfqd->peak_rate, 8); ++ bfqd->peak_rate += bw; ++ update = 1; ++ bfq_log(bfqd, "new peak_rate=%llu", bfqd->peak_rate); ++ } ++ ++ update |= bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES - 1; ++ ++ if (bfqd->peak_rate_samples < BFQ_PEAK_RATE_SAMPLES) ++ bfqd->peak_rate_samples++; ++ ++ if (bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES && ++ update) { ++ int dev_type = blk_queue_nonrot(bfqd->queue); ++ if (bfqd->bfq_user_max_budget == 0) { ++ bfqd->bfq_max_budget = ++ bfq_calc_max_budget(bfqd->peak_rate, ++ timeout); ++ bfq_log(bfqd, "new max_budget=%lu", ++ bfqd->bfq_max_budget); ++ } ++ if (bfqd->device_speed == BFQ_BFQD_FAST && ++ bfqd->peak_rate < device_speed_thresh[dev_type]) { ++ bfqd->device_speed = BFQ_BFQD_SLOW; ++ bfqd->RT_prod = R_slow[dev_type] * ++ T_slow[dev_type]; ++ } else if (bfqd->device_speed == BFQ_BFQD_SLOW && ++ bfqd->peak_rate > device_speed_thresh[dev_type]) { ++ bfqd->device_speed = BFQ_BFQD_FAST; ++ bfqd->RT_prod = R_fast[dev_type] * ++ T_fast[dev_type]; ++ } ++ } ++ } ++ ++ /* ++ * If the process has been served for a too short time ++ * interval to let its possible sequential accesses prevail on ++ * the initial seek time needed to move the disk head on the ++ * first sector it requested, then give the process a chance ++ * and for the moment return false. ++ */ ++ if (bfqq->entity.budget <= bfq_max_budget(bfqd) / 8) ++ return 0; ++ ++ /* ++ * A process is considered ``slow'' (i.e., seeky, so that we ++ * cannot treat it fairly in the service domain, as it would ++ * slow down too much the other processes) if, when a slice ++ * ends for whatever reason, it has received service at a ++ * rate that would not be high enough to complete the budget ++ * before the budget timeout expiration. ++ */ ++ expected = bw * 1000 * timeout >> BFQ_RATE_SHIFT; ++ ++ /* ++ * Caveat: processes doing IO in the slower disk zones will ++ * tend to be slow(er) even if not seeky. And the estimated ++ * peak rate will actually be an average over the disk ++ * surface. Hence, to not be too harsh with unlucky processes, ++ * we keep a budget/3 margin of safety before declaring a ++ * process slow. ++ */ ++ return expected > (4 * bfqq->entity.budget) / 3; ++} ++ ++/* ++ * To be deemed as soft real-time, an application must meet two ++ * requirements. First, the application must not require an average ++ * bandwidth higher than the approximate bandwidth required to playback or ++ * record a compressed high-definition video. ++ * The next function is invoked on the completion of the last request of a ++ * batch, to compute the next-start time instant, soft_rt_next_start, such ++ * that, if the next request of the application does not arrive before ++ * soft_rt_next_start, then the above requirement on the bandwidth is met. ++ * ++ * The second requirement is that the request pattern of the application is ++ * isochronous, i.e., that, after issuing a request or a batch of requests, ++ * the application stops issuing new requests until all its pending requests ++ * have been completed. After that, the application may issue a new batch, ++ * and so on. ++ * For this reason the next function is invoked to compute ++ * soft_rt_next_start only for applications that meet this requirement, ++ * whereas soft_rt_next_start is set to infinity for applications that do ++ * not. ++ * ++ * Unfortunately, even a greedy application may happen to behave in an ++ * isochronous way if the CPU load is high. In fact, the application may ++ * stop issuing requests while the CPUs are busy serving other processes, ++ * then restart, then stop again for a while, and so on. In addition, if ++ * the disk achieves a low enough throughput with the request pattern ++ * issued by the application (e.g., because the request pattern is random ++ * and/or the device is slow), then the application may meet the above ++ * bandwidth requirement too. To prevent such a greedy application to be ++ * deemed as soft real-time, a further rule is used in the computation of ++ * soft_rt_next_start: soft_rt_next_start must be higher than the current ++ * time plus the maximum time for which the arrival of a request is waited ++ * for when a sync queue becomes idle, namely bfqd->bfq_slice_idle. ++ * This filters out greedy applications, as the latter issue instead their ++ * next request as soon as possible after the last one has been completed ++ * (in contrast, when a batch of requests is completed, a soft real-time ++ * application spends some time processing data). ++ * ++ * Unfortunately, the last filter may easily generate false positives if ++ * only bfqd->bfq_slice_idle is used as a reference time interval and one ++ * or both the following cases occur: ++ * 1) HZ is so low that the duration of a jiffy is comparable to or higher ++ * than bfqd->bfq_slice_idle. This happens, e.g., on slow devices with ++ * HZ=100. ++ * 2) jiffies, instead of increasing at a constant rate, may stop increasing ++ * for a while, then suddenly 'jump' by several units to recover the lost ++ * increments. This seems to happen, e.g., inside virtual machines. ++ * To address this issue, we do not use as a reference time interval just ++ * bfqd->bfq_slice_idle, but bfqd->bfq_slice_idle plus a few jiffies. In ++ * particular we add the minimum number of jiffies for which the filter ++ * seems to be quite precise also in embedded systems and KVM/QEMU virtual ++ * machines. ++ */ ++static inline unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ return max(bfqq->last_idle_bklogged + ++ HZ * bfqq->service_from_backlogged / ++ bfqd->bfq_wr_max_softrt_rate, ++ jiffies + bfqq->bfqd->bfq_slice_idle + 4); ++} ++ ++/* ++ * Return the largest-possible time instant such that, for as long as possible, ++ * the current time will be lower than this time instant according to the macro ++ * time_is_before_jiffies(). ++ */ ++static inline unsigned long bfq_infinity_from_now(unsigned long now) ++{ ++ return now + ULONG_MAX / 2; ++} ++ ++/** ++ * bfq_bfqq_expire - expire a queue. ++ * @bfqd: device owning the queue. ++ * @bfqq: the queue to expire. ++ * @compensate: if true, compensate for the time spent idling. ++ * @reason: the reason causing the expiration. ++ * ++ * ++ * If the process associated to the queue is slow (i.e., seeky), or in ++ * case of budget timeout, or, finally, if it is async, we ++ * artificially charge it an entire budget (independently of the ++ * actual service it received). As a consequence, the queue will get ++ * higher timestamps than the correct ones upon reactivation, and ++ * hence it will be rescheduled as if it had received more service ++ * than what it actually received. In the end, this class of processes ++ * will receive less service in proportion to how slowly they consume ++ * their budgets (and hence how seriously they tend to lower the ++ * throughput). ++ * ++ * In contrast, when a queue expires because it has been idling for ++ * too much or because it exhausted its budget, we do not touch the ++ * amount of service it has received. Hence when the queue will be ++ * reactivated and its timestamps updated, the latter will be in sync ++ * with the actual service received by the queue until expiration. ++ * ++ * Charging a full budget to the first type of queues and the exact ++ * service to the others has the effect of using the WF2Q+ policy to ++ * schedule the former on a timeslice basis, without violating the ++ * service domain guarantees of the latter. ++ */ ++static void bfq_bfqq_expire(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ int compensate, ++ enum bfqq_expiration reason) ++{ ++ int slow; ++ BUG_ON(bfqq != bfqd->in_service_queue); ++ ++ /* Update disk peak rate for autotuning and check whether the ++ * process is slow (see bfq_update_peak_rate). ++ */ ++ slow = bfq_update_peak_rate(bfqd, bfqq, compensate, reason); ++ ++ /* ++ * As above explained, 'punish' slow (i.e., seeky), timed-out ++ * and async queues, to favor sequential sync workloads. ++ * ++ * Processes doing I/O in the slower disk zones will tend to be ++ * slow(er) even if not seeky. Hence, since the estimated peak ++ * rate is actually an average over the disk surface, these ++ * processes may timeout just for bad luck. To avoid punishing ++ * them we do not charge a full budget to a process that ++ * succeeded in consuming at least 2/3 of its budget. ++ */ ++ if (slow || (reason == BFQ_BFQQ_BUDGET_TIMEOUT && ++ bfq_bfqq_budget_left(bfqq) >= bfqq->entity.budget / 3)) ++ bfq_bfqq_charge_full_budget(bfqq); ++ ++ bfqq->service_from_backlogged += bfqq->entity.service; ++ ++ if (BFQQ_SEEKY(bfqq) && reason == BFQ_BFQQ_BUDGET_TIMEOUT && ++ !bfq_bfqq_constantly_seeky(bfqq)) { ++ bfq_mark_bfqq_constantly_seeky(bfqq); ++ if (!blk_queue_nonrot(bfqd->queue)) ++ bfqd->const_seeky_busy_in_flight_queues++; ++ } ++ ++ if (reason == BFQ_BFQQ_TOO_IDLE && ++ bfqq->entity.service <= 2 * bfqq->entity.budget / 10 ) ++ bfq_clear_bfqq_IO_bound(bfqq); ++ ++ if (bfqd->low_latency && bfqq->wr_coeff == 1) ++ bfqq->last_wr_start_finish = jiffies; ++ ++ if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 && ++ RB_EMPTY_ROOT(&bfqq->sort_list)) { ++ /* ++ * If we get here, and there are no outstanding requests, ++ * then the request pattern is isochronous (see the comments ++ * to the function bfq_bfqq_softrt_next_start()). Hence we ++ * can compute soft_rt_next_start. If, instead, the queue ++ * still has outstanding requests, then we have to wait ++ * for the completion of all the outstanding requests to ++ * discover whether the request pattern is actually ++ * isochronous. ++ */ ++ if (bfqq->dispatched == 0) ++ bfqq->soft_rt_next_start = ++ bfq_bfqq_softrt_next_start(bfqd, bfqq); ++ else { ++ /* ++ * The application is still waiting for the ++ * completion of one or more requests: ++ * prevent it from possibly being incorrectly ++ * deemed as soft real-time by setting its ++ * soft_rt_next_start to infinity. In fact, ++ * without this assignment, the application ++ * would be incorrectly deemed as soft ++ * real-time if: ++ * 1) it issued a new request before the ++ * completion of all its in-flight ++ * requests, and ++ * 2) at that time, its soft_rt_next_start ++ * happened to be in the past. ++ */ ++ bfqq->soft_rt_next_start = ++ bfq_infinity_from_now(jiffies); ++ /* ++ * Schedule an update of soft_rt_next_start to when ++ * the task may be discovered to be isochronous. ++ */ ++ bfq_mark_bfqq_softrt_update(bfqq); ++ } ++ } ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "expire (%d, slow %d, num_disp %d, idle_win %d)", reason, ++ slow, bfqq->dispatched, bfq_bfqq_idle_window(bfqq)); ++ ++ /* ++ * Increase, decrease or leave budget unchanged according to ++ * reason. ++ */ ++ __bfq_bfqq_recalc_budget(bfqd, bfqq, reason); ++ __bfq_bfqq_expire(bfqd, bfqq); ++} ++ ++/* ++ * Budget timeout is not implemented through a dedicated timer, but ++ * just checked on request arrivals and completions, as well as on ++ * idle timer expirations. ++ */ ++static int bfq_bfqq_budget_timeout(struct bfq_queue *bfqq) ++{ ++ if (bfq_bfqq_budget_new(bfqq) || ++ time_before(jiffies, bfqq->budget_timeout)) ++ return 0; ++ return 1; ++} ++ ++/* ++ * If we expire a queue that is waiting for the arrival of a new ++ * request, we may prevent the fictitious timestamp back-shifting that ++ * allows the guarantees of the queue to be preserved (see [1] for ++ * this tricky aspect). Hence we return true only if this condition ++ * does not hold, or if the queue is slow enough to deserve only to be ++ * kicked off for preserving a high throughput. ++*/ ++static inline int bfq_may_expire_for_budg_timeout(struct bfq_queue *bfqq) ++{ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, ++ "may_budget_timeout: wait_request %d left %d timeout %d", ++ bfq_bfqq_wait_request(bfqq), ++ bfq_bfqq_budget_left(bfqq) >= bfqq->entity.budget / 3, ++ bfq_bfqq_budget_timeout(bfqq)); ++ ++ return (!bfq_bfqq_wait_request(bfqq) || ++ bfq_bfqq_budget_left(bfqq) >= bfqq->entity.budget / 3) ++ && ++ bfq_bfqq_budget_timeout(bfqq); ++} ++ ++/* ++ * Device idling is allowed only for the queues for which this function ++ * returns true. For this reason, the return value of this function plays a ++ * critical role for both throughput boosting and service guarantees. The ++ * return value is computed through a logical expression. In this rather ++ * long comment, we try to briefly describe all the details and motivations ++ * behind the components of this logical expression. ++ * ++ * First, the expression is false if bfqq is not sync, or if: bfqq happened ++ * to become active during a large burst of queue activations, and the ++ * pattern of requests bfqq contains boosts the throughput if bfqq is ++ * expired. In fact, queues that became active during a large burst benefit ++ * only from throughput, as discussed in the comments to bfq_handle_burst. ++ * In this respect, expiring bfqq certainly boosts the throughput on NCQ- ++ * capable flash-based devices, whereas, on rotational devices, it boosts ++ * the throughput only if bfqq contains random requests. ++ * ++ * On the opposite end, if (a) bfqq is sync, (b) the above burst-related ++ * condition does not hold, and (c) bfqq is being weight-raised, then the ++ * expression always evaluates to true, as device idling is instrumental ++ * for preserving low-latency guarantees (see [1]). If, instead, conditions ++ * (a) and (b) do hold, but (c) does not, then the expression evaluates to ++ * true only if: (1) bfqq is I/O-bound and has a non-null idle window, and ++ * (2) at least one of the following two conditions holds. ++ * The first condition is that the device is not performing NCQ, because ++ * idling the device most certainly boosts the throughput if this condition ++ * holds and bfqq is I/O-bound and has been granted a non-null idle window. ++ * The second compound condition is made of the logical AND of two components. ++ * ++ * The first component is true only if there is no weight-raised busy ++ * queue. This guarantees that the device is not idled for a sync non- ++ * weight-raised queue when there are busy weight-raised queues. The former ++ * is then expired immediately if empty. Combined with the timestamping ++ * rules of BFQ (see [1] for details), this causes sync non-weight-raised ++ * queues to get a lower number of requests served, and hence to ask for a ++ * lower number of requests from the request pool, before the busy weight- ++ * raised queues get served again. ++ * ++ * This is beneficial for the processes associated with weight-raised ++ * queues, when the request pool is saturated (e.g., in the presence of ++ * write hogs). In fact, if the processes associated with the other queues ++ * ask for requests at a lower rate, then weight-raised processes have a ++ * higher probability to get a request from the pool immediately (or at ++ * least soon) when they need one. Hence they have a higher probability to ++ * actually get a fraction of the disk throughput proportional to their ++ * high weight. This is especially true with NCQ-capable drives, which ++ * enqueue several requests in advance and further reorder internally- ++ * queued requests. ++ * ++ * In the end, mistreating non-weight-raised queues when there are busy ++ * weight-raised queues seems to mitigate starvation problems in the ++ * presence of heavy write workloads and NCQ, and hence to guarantee a ++ * higher application and system responsiveness in these hostile scenarios. ++ * ++ * If the first component of the compound condition is instead true, i.e., ++ * there is no weight-raised busy queue, then the second component of the ++ * compound condition takes into account service-guarantee and throughput ++ * issues related to NCQ (recall that the compound condition is evaluated ++ * only if the device is detected as supporting NCQ). ++ * ++ * As for service guarantees, allowing the drive to enqueue more than one ++ * request at a time, and hence delegating de facto final scheduling ++ * decisions to the drive's internal scheduler, causes loss of control on ++ * the actual request service order. In this respect, when the drive is ++ * allowed to enqueue more than one request at a time, the service ++ * distribution enforced by the drive's internal scheduler is likely to ++ * coincide with the desired device-throughput distribution only in the ++ * following, perfectly symmetric, scenario: ++ * 1) all active queues have the same weight, ++ * 2) all active groups at the same level in the groups tree have the same ++ * weight, ++ * 3) all active groups at the same level in the groups tree have the same ++ * number of children. ++ * ++ * Even in such a scenario, sequential I/O may still receive a preferential ++ * treatment, but this is not likely to be a big issue with flash-based ++ * devices, because of their non-dramatic loss of throughput with random ++ * I/O. Things do differ with HDDs, for which additional care is taken, as ++ * explained after completing the discussion for flash-based devices. ++ * ++ * Unfortunately, keeping the necessary state for evaluating exactly the ++ * above symmetry conditions would be quite complex and time-consuming. ++ * Therefore BFQ evaluates instead the following stronger sub-conditions, ++ * for which it is much easier to maintain the needed state: ++ * 1) all active queues have the same weight, ++ * 2) all active groups have the same weight, ++ * 3) all active groups have at most one active child each. ++ * In particular, the last two conditions are always true if hierarchical ++ * support and the cgroups interface are not enabled, hence no state needs ++ * to be maintained in this case. ++ * ++ * According to the above considerations, the second component of the ++ * compound condition evaluates to true if any of the above symmetry ++ * sub-condition does not hold, or the device is not flash-based. Therefore, ++ * if also the first component is true, then idling is allowed for a sync ++ * queue. These are the only sub-conditions considered if the device is ++ * flash-based, as, for such a device, it is sensible to force idling only ++ * for service-guarantee issues. In fact, as for throughput, idling ++ * NCQ-capable flash-based devices would not boost the throughput even ++ * with sequential I/O; rather it would lower the throughput in proportion ++ * to how fast the device is. In the end, (only) if all the three ++ * sub-conditions hold and the device is flash-based, the compound ++ * condition evaluates to false and therefore no idling is performed. ++ * ++ * As already said, things change with a rotational device, where idling ++ * boosts the throughput with sequential I/O (even with NCQ). Hence, for ++ * such a device the second component of the compound condition evaluates ++ * to true also if the following additional sub-condition does not hold: ++ * the queue is constantly seeky. Unfortunately, this different behavior ++ * with respect to flash-based devices causes an additional asymmetry: if ++ * some sync queues enjoy idling and some other sync queues do not, then ++ * the latter get a low share of the device throughput, simply because the ++ * former get many requests served after being set as in service, whereas ++ * the latter do not. As a consequence, to guarantee the desired throughput ++ * distribution, on HDDs the compound expression evaluates to true (and ++ * hence device idling is performed) also if the following last symmetry ++ * condition does not hold: no other queue is benefiting from idling. Also ++ * this last condition is actually replaced with a simpler-to-maintain and ++ * stronger condition: there is no busy queue which is not constantly seeky ++ * (and hence may also benefit from idling). ++ * ++ * To sum up, when all the required symmetry and throughput-boosting ++ * sub-conditions hold, the second component of the compound condition ++ * evaluates to false, and hence no idling is performed. This helps to ++ * keep the drives' internal queues full on NCQ-capable devices, and hence ++ * to boost the throughput, without causing 'almost' any loss of service ++ * guarantees. The 'almost' follows from the fact that, if the internal ++ * queue of one such device is filled while all the sub-conditions hold, ++ * but at some point in time some sub-condition stops to hold, then it may ++ * become impossible to let requests be served in the new desired order ++ * until all the requests already queued in the device have been served. ++ */ ++static inline bool bfq_bfqq_must_not_expire(struct bfq_queue *bfqq) ++{ ++ struct bfq_data *bfqd = bfqq->bfqd; ++#ifdef CONFIG_CGROUP_BFQIO ++#define symmetric_scenario (!bfqd->active_numerous_groups && \ ++ !bfq_differentiated_weights(bfqd)) ++#else ++#define symmetric_scenario (!bfq_differentiated_weights(bfqd)) ++#endif ++#define cond_for_seeky_on_ncq_hdd (bfq_bfqq_constantly_seeky(bfqq) && \ ++ bfqd->busy_in_flight_queues == \ ++ bfqd->const_seeky_busy_in_flight_queues) ++ ++#define cond_for_expiring_in_burst (bfq_bfqq_in_large_burst(bfqq) && \ ++ bfqd->hw_tag && \ ++ (blk_queue_nonrot(bfqd->queue) || \ ++ bfq_bfqq_constantly_seeky(bfqq))) ++ ++/* ++ * Condition for expiring a non-weight-raised queue (and hence not idling ++ * the device). ++ */ ++#define cond_for_expiring_non_wr (bfqd->hw_tag && \ ++ (bfqd->wr_busy_queues > 0 || \ ++ (symmetric_scenario && \ ++ (blk_queue_nonrot(bfqd->queue) || \ ++ cond_for_seeky_on_ncq_hdd)))) ++ ++ return bfq_bfqq_sync(bfqq) && ++ !cond_for_expiring_in_burst && ++ (bfqq->wr_coeff > 1 || ++ (bfq_bfqq_IO_bound(bfqq) && bfq_bfqq_idle_window(bfqq) && ++ !cond_for_expiring_non_wr) ++ ); ++} ++ ++/* ++ * If the in-service queue is empty but sync, and the function ++ * bfq_bfqq_must_not_expire returns true, then: ++ * 1) the queue must remain in service and cannot be expired, and ++ * 2) the disk must be idled to wait for the possible arrival of a new ++ * request for the queue. ++ * See the comments to the function bfq_bfqq_must_not_expire for the reasons ++ * why performing device idling is the best choice to boost the throughput ++ * and preserve service guarantees when bfq_bfqq_must_not_expire itself ++ * returns true. ++ */ ++static inline bool bfq_bfqq_must_idle(struct bfq_queue *bfqq) ++{ ++ struct bfq_data *bfqd = bfqq->bfqd; ++ ++ return RB_EMPTY_ROOT(&bfqq->sort_list) && bfqd->bfq_slice_idle != 0 && ++ bfq_bfqq_must_not_expire(bfqq); ++} ++ ++/* ++ * Select a queue for service. If we have a current queue in service, ++ * check whether to continue servicing it, or retrieve and set a new one. ++ */ ++static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq, *new_bfqq = NULL; ++ struct request *next_rq; ++ enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT; ++ ++ bfqq = bfqd->in_service_queue; ++ if (bfqq == NULL) ++ goto new_queue; ++ ++ bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue"); ++ ++ /* ++ * If another queue has a request waiting within our mean seek ++ * distance, let it run. The expire code will check for close ++ * cooperators and put the close queue at the front of the ++ * service tree. If possible, merge the expiring queue with the ++ * new bfqq. ++ */ ++ new_bfqq = bfq_close_cooperator(bfqd, bfqq); ++ if (new_bfqq != NULL && bfqq->new_bfqq == NULL) ++ bfq_setup_merge(bfqq, new_bfqq); ++ ++ if (bfq_may_expire_for_budg_timeout(bfqq) && ++ !timer_pending(&bfqd->idle_slice_timer) && ++ !bfq_bfqq_must_idle(bfqq)) ++ goto expire; ++ ++ next_rq = bfqq->next_rq; ++ /* ++ * If bfqq has requests queued and it has enough budget left to ++ * serve them, keep the queue, otherwise expire it. ++ */ ++ if (next_rq != NULL) { ++ if (bfq_serv_to_charge(next_rq, bfqq) > ++ bfq_bfqq_budget_left(bfqq)) { ++ reason = BFQ_BFQQ_BUDGET_EXHAUSTED; ++ goto expire; ++ } else { ++ /* ++ * The idle timer may be pending because we may ++ * not disable disk idling even when a new request ++ * arrives. ++ */ ++ if (timer_pending(&bfqd->idle_slice_timer)) { ++ /* ++ * If we get here: 1) at least a new request ++ * has arrived but we have not disabled the ++ * timer because the request was too small, ++ * 2) then the block layer has unplugged ++ * the device, causing the dispatch to be ++ * invoked. ++ * ++ * Since the device is unplugged, now the ++ * requests are probably large enough to ++ * provide a reasonable throughput. ++ * So we disable idling. ++ */ ++ bfq_clear_bfqq_wait_request(bfqq); ++ del_timer(&bfqd->idle_slice_timer); ++ } ++ if (new_bfqq == NULL) ++ goto keep_queue; ++ else ++ goto expire; ++ } ++ } ++ ++ /* ++ * No requests pending. If the in-service queue still has requests ++ * in flight (possibly waiting for a completion) or is idling for a ++ * new request, then keep it. ++ */ ++ if (new_bfqq == NULL && (timer_pending(&bfqd->idle_slice_timer) || ++ (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq)))) { ++ bfqq = NULL; ++ goto keep_queue; ++ } else if (new_bfqq != NULL && timer_pending(&bfqd->idle_slice_timer)) { ++ /* ++ * Expiring the queue because there is a close cooperator, ++ * cancel timer. ++ */ ++ bfq_clear_bfqq_wait_request(bfqq); ++ del_timer(&bfqd->idle_slice_timer); ++ } ++ ++ reason = BFQ_BFQQ_NO_MORE_REQUESTS; ++expire: ++ bfq_bfqq_expire(bfqd, bfqq, 0, reason); ++new_queue: ++ bfqq = bfq_set_in_service_queue(bfqd, new_bfqq); ++ bfq_log(bfqd, "select_queue: new queue %d returned", ++ bfqq != NULL ? bfqq->pid : 0); ++keep_queue: ++ return bfqq; ++} ++ ++static void bfq_update_wr_data(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (bfqq->wr_coeff > 1) { /* queue is being boosted */ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "raising period dur %u/%u msec, old coeff %u, w %d(%d)", ++ jiffies_to_msecs(jiffies - ++ bfqq->last_wr_start_finish), ++ jiffies_to_msecs(bfqq->wr_cur_max_time), ++ bfqq->wr_coeff, ++ bfqq->entity.weight, bfqq->entity.orig_weight); ++ ++ BUG_ON(bfqq != bfqd->in_service_queue && entity->weight != ++ entity->orig_weight * bfqq->wr_coeff); ++ if (entity->ioprio_changed) ++ bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change"); ++ /* ++ * If the queue was activated in a burst, or ++ * too much time has elapsed from the beginning ++ * of this weight-raising, then end weight raising. ++ */ ++ if (bfq_bfqq_in_large_burst(bfqq) || ++ time_is_before_jiffies(bfqq->last_wr_start_finish + ++ bfqq->wr_cur_max_time)) { ++ bfqq->last_wr_start_finish = jiffies; ++ bfq_log_bfqq(bfqd, bfqq, ++ "wrais ending at %lu, rais_max_time %u", ++ bfqq->last_wr_start_finish, ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ bfq_bfqq_end_wr(bfqq); ++ __bfq_entity_update_weight_prio( ++ bfq_entity_service_tree(entity), ++ entity); ++ } ++ } ++} ++ ++/* ++ * Dispatch one request from bfqq, moving it to the request queue ++ * dispatch list. ++ */ ++static int bfq_dispatch_request(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ int dispatched = 0; ++ struct request *rq; ++ unsigned long service_to_charge; ++ ++ BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list)); ++ ++ /* Follow expired path, else get first next available. */ ++ rq = bfq_check_fifo(bfqq); ++ if (rq == NULL) ++ rq = bfqq->next_rq; ++ service_to_charge = bfq_serv_to_charge(rq, bfqq); ++ ++ if (service_to_charge > bfq_bfqq_budget_left(bfqq)) { ++ /* ++ * This may happen if the next rq is chosen in fifo order ++ * instead of sector order. The budget is properly ++ * dimensioned to be always sufficient to serve the next ++ * request only if it is chosen in sector order. The reason ++ * is that it would be quite inefficient and little useful ++ * to always make sure that the budget is large enough to ++ * serve even the possible next rq in fifo order. ++ * In fact, requests are seldom served in fifo order. ++ * ++ * Expire the queue for budget exhaustion, and make sure ++ * that the next act_budget is enough to serve the next ++ * request, even if it comes from the fifo expired path. ++ */ ++ bfqq->next_rq = rq; ++ /* ++ * Since this dispatch is failed, make sure that ++ * a new one will be performed ++ */ ++ if (!bfqd->rq_in_driver) ++ bfq_schedule_dispatch(bfqd); ++ goto expire; ++ } ++ ++ /* Finally, insert request into driver dispatch list. */ ++ bfq_bfqq_served(bfqq, service_to_charge); ++ bfq_dispatch_insert(bfqd->queue, rq); ++ ++ bfq_update_wr_data(bfqd, bfqq); ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "dispatched %u sec req (%llu), budg left %lu", ++ blk_rq_sectors(rq), ++ (long long unsigned)blk_rq_pos(rq), ++ bfq_bfqq_budget_left(bfqq)); ++ ++ dispatched++; ++ ++ if (bfqd->in_service_bic == NULL) { ++ atomic_long_inc(&RQ_BIC(rq)->icq.ioc->refcount); ++ bfqd->in_service_bic = RQ_BIC(rq); ++ } ++ ++ if (bfqd->busy_queues > 1 && ((!bfq_bfqq_sync(bfqq) && ++ dispatched >= bfqd->bfq_max_budget_async_rq) || ++ bfq_class_idle(bfqq))) ++ goto expire; ++ ++ return dispatched; ++ ++expire: ++ bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_EXHAUSTED); ++ return dispatched; ++} ++ ++static int __bfq_forced_dispatch_bfqq(struct bfq_queue *bfqq) ++{ ++ int dispatched = 0; ++ ++ while (bfqq->next_rq != NULL) { ++ bfq_dispatch_insert(bfqq->bfqd->queue, bfqq->next_rq); ++ dispatched++; ++ } ++ ++ BUG_ON(!list_empty(&bfqq->fifo)); ++ return dispatched; ++} ++ ++/* ++ * Drain our current requests. ++ * Used for barriers and when switching io schedulers on-the-fly. ++ */ ++static int bfq_forced_dispatch(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq, *n; ++ struct bfq_service_tree *st; ++ int dispatched = 0; ++ ++ bfqq = bfqd->in_service_queue; ++ if (bfqq != NULL) ++ __bfq_bfqq_expire(bfqd, bfqq); ++ ++ /* ++ * Loop through classes, and be careful to leave the scheduler ++ * in a consistent state, as feedback mechanisms and vtime ++ * updates cannot be disabled during the process. ++ */ ++ list_for_each_entry_safe(bfqq, n, &bfqd->active_list, bfqq_list) { ++ st = bfq_entity_service_tree(&bfqq->entity); ++ ++ dispatched += __bfq_forced_dispatch_bfqq(bfqq); ++ bfqq->max_budget = bfq_max_budget(bfqd); ++ ++ bfq_forget_idle(st); ++ } ++ ++ BUG_ON(bfqd->busy_queues != 0); ++ ++ return dispatched; ++} ++ ++static int bfq_dispatch_requests(struct request_queue *q, int force) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_queue *bfqq; ++ int max_dispatch; ++ ++ bfq_log(bfqd, "dispatch requests: %d busy queues", bfqd->busy_queues); ++ if (bfqd->busy_queues == 0) ++ return 0; ++ ++ if (unlikely(force)) ++ return bfq_forced_dispatch(bfqd); ++ ++ bfqq = bfq_select_queue(bfqd); ++ if (bfqq == NULL) ++ return 0; ++ ++ max_dispatch = bfqd->bfq_quantum; ++ if (bfq_class_idle(bfqq)) ++ max_dispatch = 1; ++ ++ if (!bfq_bfqq_sync(bfqq)) ++ max_dispatch = bfqd->bfq_max_budget_async_rq; ++ ++ if (bfqq->dispatched >= max_dispatch) { ++ if (bfqd->busy_queues > 1) ++ return 0; ++ if (bfqq->dispatched >= 4 * max_dispatch) ++ return 0; ++ } ++ ++ if (bfqd->sync_flight != 0 && !bfq_bfqq_sync(bfqq)) ++ return 0; ++ ++ bfq_clear_bfqq_wait_request(bfqq); ++ BUG_ON(timer_pending(&bfqd->idle_slice_timer)); ++ ++ if (!bfq_dispatch_request(bfqd, bfqq)) ++ return 0; ++ ++ bfq_log_bfqq(bfqd, bfqq, "dispatched one request of %d (max_disp %d)", ++ bfqq->pid, max_dispatch); ++ ++ return 1; ++} ++ ++/* ++ * Task holds one reference to the queue, dropped when task exits. Each rq ++ * in-flight on this queue also holds a reference, dropped when rq is freed. ++ * ++ * Queue lock must be held here. ++ */ ++static void bfq_put_queue(struct bfq_queue *bfqq) ++{ ++ struct bfq_data *bfqd = bfqq->bfqd; ++ ++ BUG_ON(atomic_read(&bfqq->ref) <= 0); ++ ++ bfq_log_bfqq(bfqd, bfqq, "put_queue: %p %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ if (!atomic_dec_and_test(&bfqq->ref)) ++ return; ++ ++ BUG_ON(rb_first(&bfqq->sort_list) != NULL); ++ BUG_ON(bfqq->allocated[READ] + bfqq->allocated[WRITE] != 0); ++ BUG_ON(bfqq->entity.tree != NULL); ++ BUG_ON(bfq_bfqq_busy(bfqq)); ++ BUG_ON(bfqd->in_service_queue == bfqq); ++ ++ if (bfq_bfqq_sync(bfqq)) ++ /* ++ * The fact that this queue is being destroyed does not ++ * invalidate the fact that this queue may have been ++ * activated during the current burst. As a consequence, ++ * although the queue does not exist anymore, and hence ++ * needs to be removed from the burst list if there, ++ * the burst size has not to be decremented. ++ */ ++ hlist_del_init(&bfqq->burst_list_node); ++ ++ bfq_log_bfqq(bfqd, bfqq, "put_queue: %p freed", bfqq); ++ ++ kmem_cache_free(bfq_pool, bfqq); ++} ++ ++static void bfq_put_cooperator(struct bfq_queue *bfqq) ++{ ++ struct bfq_queue *__bfqq, *next; ++ ++ /* ++ * If this queue was scheduled to merge with another queue, be ++ * sure to drop the reference taken on that queue (and others in ++ * the merge chain). See bfq_setup_merge and bfq_merge_bfqqs. ++ */ ++ __bfqq = bfqq->new_bfqq; ++ while (__bfqq) { ++ if (__bfqq == bfqq) ++ break; ++ next = __bfqq->new_bfqq; ++ bfq_put_queue(__bfqq); ++ __bfqq = next; ++ } ++} ++ ++static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ if (bfqq == bfqd->in_service_queue) { ++ __bfq_bfqq_expire(bfqd, bfqq); ++ bfq_schedule_dispatch(bfqd); ++ } ++ ++ bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ ++ bfq_put_cooperator(bfqq); ++ ++ bfq_put_queue(bfqq); ++} ++ ++static inline void bfq_init_icq(struct io_cq *icq) ++{ ++ struct bfq_io_cq *bic = icq_to_bic(icq); ++ ++ bic->ttime.last_end_request = jiffies; ++} ++ ++static void bfq_exit_icq(struct io_cq *icq) ++{ ++ struct bfq_io_cq *bic = icq_to_bic(icq); ++ struct bfq_data *bfqd = bic_to_bfqd(bic); ++ ++ if (bic->bfqq[BLK_RW_ASYNC]) { ++ bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_ASYNC]); ++ bic->bfqq[BLK_RW_ASYNC] = NULL; ++ } ++ ++ if (bic->bfqq[BLK_RW_SYNC]) { ++ bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]); ++ bic->bfqq[BLK_RW_SYNC] = NULL; ++ } ++} ++ ++/* ++ * Update the entity prio values; note that the new values will not ++ * be used until the next (re)activation. ++ */ ++static void bfq_init_prio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic) ++{ ++ struct task_struct *tsk = current; ++ int ioprio_class; ++ ++ if (!bfq_bfqq_prio_changed(bfqq)) ++ return; ++ ++ ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio); ++ switch (ioprio_class) { ++ default: ++ dev_err(bfqq->bfqd->queue->backing_dev_info.dev, ++ "bfq: bad prio class %d\n", ioprio_class); ++ case IOPRIO_CLASS_NONE: ++ /* ++ * No prio set, inherit CPU scheduling settings. ++ */ ++ bfqq->entity.new_ioprio = task_nice_ioprio(tsk); ++ bfqq->entity.new_ioprio_class = task_nice_ioclass(tsk); ++ break; ++ case IOPRIO_CLASS_RT: ++ bfqq->entity.new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio); ++ bfqq->entity.new_ioprio_class = IOPRIO_CLASS_RT; ++ break; ++ case IOPRIO_CLASS_BE: ++ bfqq->entity.new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio); ++ bfqq->entity.new_ioprio_class = IOPRIO_CLASS_BE; ++ break; ++ case IOPRIO_CLASS_IDLE: ++ bfqq->entity.new_ioprio_class = IOPRIO_CLASS_IDLE; ++ bfqq->entity.new_ioprio = 7; ++ bfq_clear_bfqq_idle_window(bfqq); ++ break; ++ } ++ ++ if (bfqq->entity.new_ioprio < 0 || ++ bfqq->entity.new_ioprio >= IOPRIO_BE_NR) { ++ printk(KERN_CRIT "bfq_init_prio_data: new_ioprio %d\n", ++ bfqq->entity.new_ioprio); ++ BUG(); ++ } ++ ++ bfqq->entity.ioprio_changed = 1; ++ ++ bfq_clear_bfqq_prio_changed(bfqq); ++} ++ ++static void bfq_changed_ioprio(struct bfq_io_cq *bic) ++{ ++ struct bfq_data *bfqd; ++ struct bfq_queue *bfqq, *new_bfqq; ++ struct bfq_group *bfqg; ++ unsigned long uninitialized_var(flags); ++ int ioprio = bic->icq.ioc->ioprio; ++ ++ bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data), ++ &flags); ++ /* ++ * This condition may trigger on a newly created bic, be sure to ++ * drop the lock before returning. ++ */ ++ if (unlikely(bfqd == NULL) || likely(bic->ioprio == ioprio)) ++ goto out; ++ ++ bfqq = bic->bfqq[BLK_RW_ASYNC]; ++ if (bfqq != NULL) { ++ bfqg = container_of(bfqq->entity.sched_data, struct bfq_group, ++ sched_data); ++ new_bfqq = bfq_get_queue(bfqd, bfqg, BLK_RW_ASYNC, bic, ++ GFP_ATOMIC); ++ if (new_bfqq != NULL) { ++ bic->bfqq[BLK_RW_ASYNC] = new_bfqq; ++ bfq_log_bfqq(bfqd, bfqq, ++ "changed_ioprio: bfqq %p %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ } ++ } ++ ++ bfqq = bic->bfqq[BLK_RW_SYNC]; ++ if (bfqq != NULL) ++ bfq_mark_bfqq_prio_changed(bfqq); ++ ++ bic->ioprio = ioprio; ++ ++out: ++ bfq_put_bfqd_unlock(bfqd, &flags); ++} ++ ++static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ pid_t pid, int is_sync) ++{ ++ RB_CLEAR_NODE(&bfqq->entity.rb_node); ++ INIT_LIST_HEAD(&bfqq->fifo); ++ INIT_HLIST_NODE(&bfqq->burst_list_node); ++ ++ atomic_set(&bfqq->ref, 0); ++ bfqq->bfqd = bfqd; ++ ++ bfq_mark_bfqq_prio_changed(bfqq); ++ ++ if (is_sync) { ++ if (!bfq_class_idle(bfqq)) ++ bfq_mark_bfqq_idle_window(bfqq); ++ bfq_mark_bfqq_sync(bfqq); ++ } ++ bfq_mark_bfqq_IO_bound(bfqq); ++ ++ /* Tentative initial value to trade off between thr and lat */ ++ bfqq->max_budget = (2 * bfq_max_budget(bfqd)) / 3; ++ bfqq->pid = pid; ++ ++ bfqq->wr_coeff = 1; ++ bfqq->last_wr_start_finish = 0; ++ /* ++ * Set to the value for which bfqq will not be deemed as ++ * soft rt when it becomes backlogged. ++ */ ++ bfqq->soft_rt_next_start = bfq_infinity_from_now(jiffies); ++} ++ ++static struct bfq_queue *bfq_find_alloc_queue(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, ++ int is_sync, ++ struct bfq_io_cq *bic, ++ gfp_t gfp_mask) ++{ ++ struct bfq_queue *bfqq, *new_bfqq = NULL; ++ ++retry: ++ /* bic always exists here */ ++ bfqq = bic_to_bfqq(bic, is_sync); ++ ++ /* ++ * Always try a new alloc if we fall back to the OOM bfqq ++ * originally, since it should just be a temporary situation. ++ */ ++ if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) { ++ bfqq = NULL; ++ if (new_bfqq != NULL) { ++ bfqq = new_bfqq; ++ new_bfqq = NULL; ++ } else if (gfp_mask & __GFP_WAIT) { ++ spin_unlock_irq(bfqd->queue->queue_lock); ++ new_bfqq = kmem_cache_alloc_node(bfq_pool, ++ gfp_mask | __GFP_ZERO, ++ bfqd->queue->node); ++ spin_lock_irq(bfqd->queue->queue_lock); ++ if (new_bfqq != NULL) ++ goto retry; ++ } else { ++ bfqq = kmem_cache_alloc_node(bfq_pool, ++ gfp_mask | __GFP_ZERO, ++ bfqd->queue->node); ++ } ++ ++ if (bfqq != NULL) { ++ bfq_init_bfqq(bfqd, bfqq, current->pid, is_sync); ++ bfq_init_prio_data(bfqq, bic); ++ bfq_init_entity(&bfqq->entity, bfqg); ++ bfq_log_bfqq(bfqd, bfqq, "allocated"); ++ } else { ++ bfqq = &bfqd->oom_bfqq; ++ bfq_log_bfqq(bfqd, bfqq, "using oom bfqq"); ++ } ++ } ++ ++ if (new_bfqq != NULL) ++ kmem_cache_free(bfq_pool, new_bfqq); ++ ++ return bfqq; ++} ++ ++static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, ++ int ioprio_class, int ioprio) ++{ ++ switch (ioprio_class) { ++ case IOPRIO_CLASS_RT: ++ return &bfqg->async_bfqq[0][ioprio]; ++ case IOPRIO_CLASS_NONE: ++ ioprio = IOPRIO_NORM; ++ /* fall through */ ++ case IOPRIO_CLASS_BE: ++ return &bfqg->async_bfqq[1][ioprio]; ++ case IOPRIO_CLASS_IDLE: ++ return &bfqg->async_idle_bfqq; ++ default: ++ BUG(); ++ } ++} ++ ++static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, int is_sync, ++ struct bfq_io_cq *bic, gfp_t gfp_mask) ++{ ++ const int ioprio = IOPRIO_PRIO_DATA(bic->ioprio); ++ const int ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio); ++ struct bfq_queue **async_bfqq = NULL; ++ struct bfq_queue *bfqq = NULL; ++ ++ if (!is_sync) { ++ async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class, ++ ioprio); ++ bfqq = *async_bfqq; ++ } ++ ++ if (bfqq == NULL) ++ bfqq = bfq_find_alloc_queue(bfqd, bfqg, is_sync, bic, gfp_mask); ++ ++ /* ++ * Pin the queue now that it's allocated, scheduler exit will ++ * prune it. ++ */ ++ if (!is_sync && *async_bfqq == NULL) { ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqd, bfqq, "get_queue, bfqq not in async: %p, %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ *async_bfqq = bfqq; ++ } ++ ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ return bfqq; ++} ++ ++static void bfq_update_io_thinktime(struct bfq_data *bfqd, ++ struct bfq_io_cq *bic) ++{ ++ unsigned long elapsed = jiffies - bic->ttime.last_end_request; ++ unsigned long ttime = min(elapsed, 2UL * bfqd->bfq_slice_idle); ++ ++ bic->ttime.ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8; ++ bic->ttime.ttime_total = (7*bic->ttime.ttime_total + 256*ttime) / 8; ++ bic->ttime.ttime_mean = (bic->ttime.ttime_total + 128) / ++ bic->ttime.ttime_samples; ++} ++ ++static void bfq_update_io_seektime(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct request *rq) ++{ ++ sector_t sdist; ++ u64 total; ++ ++ if (bfqq->last_request_pos < blk_rq_pos(rq)) ++ sdist = blk_rq_pos(rq) - bfqq->last_request_pos; ++ else ++ sdist = bfqq->last_request_pos - blk_rq_pos(rq); ++ ++ /* ++ * Don't allow the seek distance to get too large from the ++ * odd fragment, pagein, etc. ++ */ ++ if (bfqq->seek_samples == 0) /* first request, not really a seek */ ++ sdist = 0; ++ else if (bfqq->seek_samples <= 60) /* second & third seek */ ++ sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*1024); ++ else ++ sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*64); ++ ++ bfqq->seek_samples = (7*bfqq->seek_samples + 256) / 8; ++ bfqq->seek_total = (7*bfqq->seek_total + (u64)256*sdist) / 8; ++ total = bfqq->seek_total + (bfqq->seek_samples/2); ++ do_div(total, bfqq->seek_samples); ++ bfqq->seek_mean = (sector_t)total; ++ ++ bfq_log_bfqq(bfqd, bfqq, "dist=%llu mean=%llu", (u64)sdist, ++ (u64)bfqq->seek_mean); ++} ++ ++/* ++ * Disable idle window if the process thinks too long or seeks so much that ++ * it doesn't matter. ++ */ ++static void bfq_update_idle_window(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct bfq_io_cq *bic) ++{ ++ int enable_idle; ++ ++ /* Don't idle for async or idle io prio class. */ ++ if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq)) ++ return; ++ ++ enable_idle = bfq_bfqq_idle_window(bfqq); ++ ++ if (atomic_read(&bic->icq.ioc->active_ref) == 0 || ++ bfqd->bfq_slice_idle == 0 || ++ (bfqd->hw_tag && BFQQ_SEEKY(bfqq) && ++ bfqq->wr_coeff == 1)) ++ enable_idle = 0; ++ else if (bfq_sample_valid(bic->ttime.ttime_samples)) { ++ if (bic->ttime.ttime_mean > bfqd->bfq_slice_idle && ++ bfqq->wr_coeff == 1) ++ enable_idle = 0; ++ else ++ enable_idle = 1; ++ } ++ bfq_log_bfqq(bfqd, bfqq, "update_idle_window: enable_idle %d", ++ enable_idle); ++ ++ if (enable_idle) ++ bfq_mark_bfqq_idle_window(bfqq); ++ else ++ bfq_clear_bfqq_idle_window(bfqq); ++} ++ ++/* ++ * Called when a new fs request (rq) is added to bfqq. Check if there's ++ * something we should do about it. ++ */ ++static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ struct request *rq) ++{ ++ struct bfq_io_cq *bic = RQ_BIC(rq); ++ ++ if (rq->cmd_flags & REQ_META) ++ bfqq->meta_pending++; ++ ++ bfq_update_io_thinktime(bfqd, bic); ++ bfq_update_io_seektime(bfqd, bfqq, rq); ++ if (!BFQQ_SEEKY(bfqq) && bfq_bfqq_constantly_seeky(bfqq)) { ++ bfq_clear_bfqq_constantly_seeky(bfqq); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ BUG_ON(!bfqd->const_seeky_busy_in_flight_queues); ++ bfqd->const_seeky_busy_in_flight_queues--; ++ } ++ } ++ if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 || ++ !BFQQ_SEEKY(bfqq)) ++ bfq_update_idle_window(bfqd, bfqq, bic); ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "rq_enqueued: idle_window=%d (seeky %d, mean %llu)", ++ bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq), ++ (long long unsigned)bfqq->seek_mean); ++ ++ bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq); ++ ++ if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) { ++ int small_req = bfqq->queued[rq_is_sync(rq)] == 1 && ++ blk_rq_sectors(rq) < 32; ++ int budget_timeout = bfq_bfqq_budget_timeout(bfqq); ++ ++ /* ++ * There is just this request queued: if the request ++ * is small and the queue is not to be expired, then ++ * just exit. ++ * ++ * In this way, if the disk is being idled to wait for ++ * a new request from the in-service queue, we avoid ++ * unplugging the device and committing the disk to serve ++ * just a small request. On the contrary, we wait for ++ * the block layer to decide when to unplug the device: ++ * hopefully, new requests will be merged to this one ++ * quickly, then the device will be unplugged and ++ * larger requests will be dispatched. ++ */ ++ if (small_req && !budget_timeout) ++ return; ++ ++ /* ++ * A large enough request arrived, or the queue is to ++ * be expired: in both cases disk idling is to be ++ * stopped, so clear wait_request flag and reset ++ * timer. ++ */ ++ bfq_clear_bfqq_wait_request(bfqq); ++ del_timer(&bfqd->idle_slice_timer); ++ ++ /* ++ * The queue is not empty, because a new request just ++ * arrived. Hence we can safely expire the queue, in ++ * case of budget timeout, without risking that the ++ * timestamps of the queue are not updated correctly. ++ * See [1] for more details. ++ */ ++ if (budget_timeout) ++ bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_TIMEOUT); ++ ++ /* ++ * Let the request rip immediately, or let a new queue be ++ * selected if bfqq has just been expired. ++ */ ++ __blk_run_queue(bfqd->queue); ++ } ++} ++ ++static void bfq_insert_request(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ assert_spin_locked(bfqd->queue->queue_lock); ++ bfq_init_prio_data(bfqq, RQ_BIC(rq)); ++ ++ bfq_add_request(rq); ++ ++ rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; ++ list_add_tail(&rq->queuelist, &bfqq->fifo); ++ ++ bfq_rq_enqueued(bfqd, bfqq, rq); ++} ++ ++static void bfq_update_hw_tag(struct bfq_data *bfqd) ++{ ++ bfqd->max_rq_in_driver = max(bfqd->max_rq_in_driver, ++ bfqd->rq_in_driver); ++ ++ if (bfqd->hw_tag == 1) ++ return; ++ ++ /* ++ * This sample is valid if the number of outstanding requests ++ * is large enough to allow a queueing behavior. Note that the ++ * sum is not exact, as it's not taking into account deactivated ++ * requests. ++ */ ++ if (bfqd->rq_in_driver + bfqd->queued < BFQ_HW_QUEUE_THRESHOLD) ++ return; ++ ++ if (bfqd->hw_tag_samples++ < BFQ_HW_QUEUE_SAMPLES) ++ return; ++ ++ bfqd->hw_tag = bfqd->max_rq_in_driver > BFQ_HW_QUEUE_THRESHOLD; ++ bfqd->max_rq_in_driver = 0; ++ bfqd->hw_tag_samples = 0; ++} ++ ++static void bfq_completed_request(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_data *bfqd = bfqq->bfqd; ++ bool sync = bfq_bfqq_sync(bfqq); ++ ++ bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left (%d)", ++ blk_rq_sectors(rq), sync); ++ ++ bfq_update_hw_tag(bfqd); ++ ++ BUG_ON(!bfqd->rq_in_driver); ++ BUG_ON(!bfqq->dispatched); ++ bfqd->rq_in_driver--; ++ bfqq->dispatched--; ++ ++ if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) { ++ bfq_weights_tree_remove(bfqd, &bfqq->entity, ++ &bfqd->queue_weights_tree); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ BUG_ON(!bfqd->busy_in_flight_queues); ++ bfqd->busy_in_flight_queues--; ++ if (bfq_bfqq_constantly_seeky(bfqq)) { ++ BUG_ON(!bfqd-> ++ const_seeky_busy_in_flight_queues); ++ bfqd->const_seeky_busy_in_flight_queues--; ++ } ++ } ++ } ++ ++ if (sync) { ++ bfqd->sync_flight--; ++ RQ_BIC(rq)->ttime.last_end_request = jiffies; ++ } ++ ++ /* ++ * If we are waiting to discover whether the request pattern of the ++ * task associated with the queue is actually isochronous, and ++ * both requisites for this condition to hold are satisfied, then ++ * compute soft_rt_next_start (see the comments to the function ++ * bfq_bfqq_softrt_next_start()). ++ */ ++ if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 && ++ RB_EMPTY_ROOT(&bfqq->sort_list)) ++ bfqq->soft_rt_next_start = ++ bfq_bfqq_softrt_next_start(bfqd, bfqq); ++ ++ /* ++ * If this is the in-service queue, check if it needs to be expired, ++ * or if we want to idle in case it has no pending requests. ++ */ ++ if (bfqd->in_service_queue == bfqq) { ++ if (bfq_bfqq_budget_new(bfqq)) ++ bfq_set_budget_timeout(bfqd); ++ ++ if (bfq_bfqq_must_idle(bfqq)) { ++ bfq_arm_slice_timer(bfqd); ++ goto out; ++ } else if (bfq_may_expire_for_budg_timeout(bfqq)) ++ bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_TIMEOUT); ++ else if (RB_EMPTY_ROOT(&bfqq->sort_list) && ++ (bfqq->dispatched == 0 || ++ !bfq_bfqq_must_not_expire(bfqq))) ++ bfq_bfqq_expire(bfqd, bfqq, 0, ++ BFQ_BFQQ_NO_MORE_REQUESTS); ++ } ++ ++ if (!bfqd->rq_in_driver) ++ bfq_schedule_dispatch(bfqd); ++ ++out: ++ return; ++} ++ ++static inline int __bfq_may_queue(struct bfq_queue *bfqq) ++{ ++ if (bfq_bfqq_wait_request(bfqq) && bfq_bfqq_must_alloc(bfqq)) { ++ bfq_clear_bfqq_must_alloc(bfqq); ++ return ELV_MQUEUE_MUST; ++ } ++ ++ return ELV_MQUEUE_MAY; ++} ++ ++static int bfq_may_queue(struct request_queue *q, int rw) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct task_struct *tsk = current; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq; ++ ++ /* ++ * Don't force setup of a queue from here, as a call to may_queue ++ * does not necessarily imply that a request actually will be ++ * queued. So just lookup a possibly existing queue, or return ++ * 'may queue' if that fails. ++ */ ++ bic = bfq_bic_lookup(bfqd, tsk->io_context); ++ if (bic == NULL) ++ return ELV_MQUEUE_MAY; ++ ++ bfqq = bic_to_bfqq(bic, rw_is_sync(rw)); ++ if (bfqq != NULL) { ++ bfq_init_prio_data(bfqq, bic); ++ ++ return __bfq_may_queue(bfqq); ++ } ++ ++ return ELV_MQUEUE_MAY; ++} ++ ++/* ++ * Queue lock held here. ++ */ ++static void bfq_put_request(struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ if (bfqq != NULL) { ++ const int rw = rq_data_dir(rq); ++ ++ BUG_ON(!bfqq->allocated[rw]); ++ bfqq->allocated[rw]--; ++ ++ rq->elv.priv[0] = NULL; ++ rq->elv.priv[1] = NULL; ++ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "put_request %p, %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ } ++} ++ ++static struct bfq_queue * ++bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic, ++ struct bfq_queue *bfqq) ++{ ++ bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu", ++ (long unsigned)bfqq->new_bfqq->pid); ++ bic_set_bfqq(bic, bfqq->new_bfqq, 1); ++ bfq_mark_bfqq_coop(bfqq->new_bfqq); ++ bfq_put_queue(bfqq); ++ return bic_to_bfqq(bic, 1); ++} ++ ++/* ++ * Returns NULL if a new bfqq should be allocated, or the old bfqq if this ++ * was the last process referring to said bfqq. ++ */ ++static struct bfq_queue * ++bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq) ++{ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue"); ++ if (bfqq_process_refs(bfqq) == 1) { ++ bfqq->pid = current->pid; ++ bfq_clear_bfqq_coop(bfqq); ++ bfq_clear_bfqq_split_coop(bfqq); ++ return bfqq; ++ } ++ ++ bic_set_bfqq(bic, NULL, 1); ++ ++ bfq_put_cooperator(bfqq); ++ ++ bfq_put_queue(bfqq); ++ return NULL; ++} ++ ++/* ++ * Allocate bfq data structures associated with this request. ++ */ ++static int bfq_set_request(struct request_queue *q, struct request *rq, ++ struct bio *bio, gfp_t gfp_mask) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_io_cq *bic = icq_to_bic(rq->elv.icq); ++ const int rw = rq_data_dir(rq); ++ const int is_sync = rq_is_sync(rq); ++ struct bfq_queue *bfqq; ++ struct bfq_group *bfqg; ++ unsigned long flags; ++ ++ might_sleep_if(gfp_mask & __GFP_WAIT); ++ ++ bfq_changed_ioprio(bic); ++ ++ spin_lock_irqsave(q->queue_lock, flags); ++ ++ if (bic == NULL) ++ goto queue_fail; ++ ++ bfqg = bfq_bic_update_cgroup(bic); ++ ++new_queue: ++ bfqq = bic_to_bfqq(bic, is_sync); ++ if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) { ++ bfqq = bfq_get_queue(bfqd, bfqg, is_sync, bic, gfp_mask); ++ bic_set_bfqq(bic, bfqq, is_sync); ++ } else { ++ /* ++ * If the queue was seeky for too long, break it apart. ++ */ ++ if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) { ++ bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq"); ++ bfqq = bfq_split_bfqq(bic, bfqq); ++ if (!bfqq) ++ goto new_queue; ++ } ++ ++ /* ++ * Check to see if this queue is scheduled to merge with ++ * another closely cooperating queue. The merging of queues ++ * happens here as it must be done in process context. ++ * The reference on new_bfqq was taken in merge_bfqqs. ++ */ ++ if (bfqq->new_bfqq != NULL) ++ bfqq = bfq_merge_bfqqs(bfqd, bic, bfqq); ++ } ++ ++ bfqq->allocated[rw]++; ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ ++ rq->elv.priv[0] = bic; ++ rq->elv.priv[1] = bfqq; ++ ++ spin_unlock_irqrestore(q->queue_lock, flags); ++ ++ return 0; ++ ++queue_fail: ++ bfq_schedule_dispatch(bfqd); ++ spin_unlock_irqrestore(q->queue_lock, flags); ++ ++ return 1; ++} ++ ++static void bfq_kick_queue(struct work_struct *work) ++{ ++ struct bfq_data *bfqd = ++ container_of(work, struct bfq_data, unplug_work); ++ struct request_queue *q = bfqd->queue; ++ ++ spin_lock_irq(q->queue_lock); ++ __blk_run_queue(q); ++ spin_unlock_irq(q->queue_lock); ++} ++ ++/* ++ * Handler of the expiration of the timer running if the in-service queue ++ * is idling inside its time slice. ++ */ ++static void bfq_idle_slice_timer(unsigned long data) ++{ ++ struct bfq_data *bfqd = (struct bfq_data *)data; ++ struct bfq_queue *bfqq; ++ unsigned long flags; ++ enum bfqq_expiration reason; ++ ++ spin_lock_irqsave(bfqd->queue->queue_lock, flags); ++ ++ bfqq = bfqd->in_service_queue; ++ /* ++ * Theoretical race here: the in-service queue can be NULL or ++ * different from the queue that was idling if the timer handler ++ * spins on the queue_lock and a new request arrives for the ++ * current queue and there is a full dispatch cycle that changes ++ * the in-service queue. This can hardly happen, but in the worst ++ * case we just expire a queue too early. ++ */ ++ if (bfqq != NULL) { ++ bfq_log_bfqq(bfqd, bfqq, "slice_timer expired"); ++ if (bfq_bfqq_budget_timeout(bfqq)) ++ /* ++ * Also here the queue can be safely expired ++ * for budget timeout without wasting ++ * guarantees ++ */ ++ reason = BFQ_BFQQ_BUDGET_TIMEOUT; ++ else if (bfqq->queued[0] == 0 && bfqq->queued[1] == 0) ++ /* ++ * The queue may not be empty upon timer expiration, ++ * because we may not disable the timer when the ++ * first request of the in-service queue arrives ++ * during disk idling. ++ */ ++ reason = BFQ_BFQQ_TOO_IDLE; ++ else ++ goto schedule_dispatch; ++ ++ bfq_bfqq_expire(bfqd, bfqq, 1, reason); ++ } ++ ++schedule_dispatch: ++ bfq_schedule_dispatch(bfqd); ++ ++ spin_unlock_irqrestore(bfqd->queue->queue_lock, flags); ++} ++ ++static void bfq_shutdown_timer_wq(struct bfq_data *bfqd) ++{ ++ del_timer_sync(&bfqd->idle_slice_timer); ++ cancel_work_sync(&bfqd->unplug_work); ++} ++ ++static inline void __bfq_put_async_bfqq(struct bfq_data *bfqd, ++ struct bfq_queue **bfqq_ptr) ++{ ++ struct bfq_group *root_group = bfqd->root_group; ++ struct bfq_queue *bfqq = *bfqq_ptr; ++ ++ bfq_log(bfqd, "put_async_bfqq: %p", bfqq); ++ if (bfqq != NULL) { ++ bfq_bfqq_move(bfqd, bfqq, &bfqq->entity, root_group); ++ bfq_log_bfqq(bfqd, bfqq, "put_async_bfqq: putting %p, %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ *bfqq_ptr = NULL; ++ } ++} ++ ++/* ++ * Release all the bfqg references to its async queues. If we are ++ * deallocating the group these queues may still contain requests, so ++ * we reparent them to the root cgroup (i.e., the only one that will ++ * exist for sure until all the requests on a device are gone). ++ */ ++static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg) ++{ ++ int i, j; ++ ++ for (i = 0; i < 2; i++) ++ for (j = 0; j < IOPRIO_BE_NR; j++) ++ __bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j]); ++ ++ __bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq); ++} ++ ++static void bfq_exit_queue(struct elevator_queue *e) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ struct request_queue *q = bfqd->queue; ++ struct bfq_queue *bfqq, *n; ++ ++ bfq_shutdown_timer_wq(bfqd); ++ ++ spin_lock_irq(q->queue_lock); ++ ++ BUG_ON(bfqd->in_service_queue != NULL); ++ list_for_each_entry_safe(bfqq, n, &bfqd->idle_list, bfqq_list) ++ bfq_deactivate_bfqq(bfqd, bfqq, 0); ++ ++ bfq_disconnect_groups(bfqd); ++ spin_unlock_irq(q->queue_lock); ++ ++ bfq_shutdown_timer_wq(bfqd); ++ ++ synchronize_rcu(); ++ ++ BUG_ON(timer_pending(&bfqd->idle_slice_timer)); ++ ++ bfq_free_root_group(bfqd); ++ kfree(bfqd); ++} ++ ++static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) ++{ ++ struct bfq_group *bfqg; ++ struct bfq_data *bfqd; ++ struct elevator_queue *eq; ++ ++ eq = elevator_alloc(q, e); ++ if (eq == NULL) ++ return -ENOMEM; ++ ++ bfqd = kzalloc_node(sizeof(*bfqd), GFP_KERNEL, q->node); ++ if (bfqd == NULL) { ++ kobject_put(&eq->kobj); ++ return -ENOMEM; ++ } ++ eq->elevator_data = bfqd; ++ ++ /* ++ * Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues. ++ * Grab a permanent reference to it, so that the normal code flow ++ * will not attempt to free it. ++ */ ++ bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, 1, 0); ++ atomic_inc(&bfqd->oom_bfqq.ref); ++ bfqd->oom_bfqq.entity.new_ioprio = BFQ_DEFAULT_QUEUE_IOPRIO; ++ bfqd->oom_bfqq.entity.new_ioprio_class = IOPRIO_CLASS_BE; ++ /* ++ * Trigger weight initialization, according to ioprio, at the ++ * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio ++ * class won't be changed any more. ++ */ ++ bfqd->oom_bfqq.entity.ioprio_changed = 1; ++ ++ bfqd->queue = q; ++ ++ spin_lock_irq(q->queue_lock); ++ q->elevator = eq; ++ spin_unlock_irq(q->queue_lock); ++ ++ bfqg = bfq_alloc_root_group(bfqd, q->node); ++ if (bfqg == NULL) { ++ kfree(bfqd); ++ kobject_put(&eq->kobj); ++ return -ENOMEM; ++ } ++ ++ bfqd->root_group = bfqg; ++ bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group); ++#ifdef CONFIG_CGROUP_BFQIO ++ bfqd->active_numerous_groups = 0; ++#endif ++ ++ init_timer(&bfqd->idle_slice_timer); ++ bfqd->idle_slice_timer.function = bfq_idle_slice_timer; ++ bfqd->idle_slice_timer.data = (unsigned long)bfqd; ++ ++ bfqd->rq_pos_tree = RB_ROOT; ++ bfqd->queue_weights_tree = RB_ROOT; ++ bfqd->group_weights_tree = RB_ROOT; ++ ++ INIT_WORK(&bfqd->unplug_work, bfq_kick_queue); ++ ++ INIT_LIST_HEAD(&bfqd->active_list); ++ INIT_LIST_HEAD(&bfqd->idle_list); ++ INIT_HLIST_HEAD(&bfqd->burst_list); ++ ++ bfqd->hw_tag = -1; ++ ++ bfqd->bfq_max_budget = bfq_default_max_budget; ++ ++ bfqd->bfq_quantum = bfq_quantum; ++ bfqd->bfq_fifo_expire[0] = bfq_fifo_expire[0]; ++ bfqd->bfq_fifo_expire[1] = bfq_fifo_expire[1]; ++ bfqd->bfq_back_max = bfq_back_max; ++ bfqd->bfq_back_penalty = bfq_back_penalty; ++ bfqd->bfq_slice_idle = bfq_slice_idle; ++ bfqd->bfq_class_idle_last_service = 0; ++ bfqd->bfq_max_budget_async_rq = bfq_max_budget_async_rq; ++ bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async; ++ bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync; ++ ++ bfqd->bfq_coop_thresh = 2; ++ bfqd->bfq_failed_cooperations = 7000; ++ bfqd->bfq_requests_within_timer = 120; ++ ++ bfqd->bfq_large_burst_thresh = 11; ++ bfqd->bfq_burst_interval = msecs_to_jiffies(500); ++ ++ bfqd->low_latency = true; ++ ++ bfqd->bfq_wr_coeff = 20; ++ bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300); ++ bfqd->bfq_wr_max_time = 0; ++ bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000); ++ bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500); ++ bfqd->bfq_wr_max_softrt_rate = 7000; /* ++ * Approximate rate required ++ * to playback or record a ++ * high-definition compressed ++ * video. ++ */ ++ bfqd->wr_busy_queues = 0; ++ bfqd->busy_in_flight_queues = 0; ++ bfqd->const_seeky_busy_in_flight_queues = 0; ++ ++ /* ++ * Begin by assuming, optimistically, that the device peak rate is ++ * equal to the highest reference rate. ++ */ ++ bfqd->RT_prod = R_fast[blk_queue_nonrot(bfqd->queue)] * ++ T_fast[blk_queue_nonrot(bfqd->queue)]; ++ bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)]; ++ bfqd->device_speed = BFQ_BFQD_FAST; ++ ++ return 0; ++} ++ ++static void bfq_slab_kill(void) ++{ ++ if (bfq_pool != NULL) ++ kmem_cache_destroy(bfq_pool); ++} ++ ++static int __init bfq_slab_setup(void) ++{ ++ bfq_pool = KMEM_CACHE(bfq_queue, 0); ++ if (bfq_pool == NULL) ++ return -ENOMEM; ++ return 0; ++} ++ ++static ssize_t bfq_var_show(unsigned int var, char *page) ++{ ++ return sprintf(page, "%d\n", var); ++} ++ ++static ssize_t bfq_var_store(unsigned long *var, const char *page, ++ size_t count) ++{ ++ unsigned long new_val; ++ int ret = kstrtoul(page, 10, &new_val); ++ ++ if (ret == 0) ++ *var = new_val; ++ ++ return count; ++} ++ ++static ssize_t bfq_wr_max_time_show(struct elevator_queue *e, char *page) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ return sprintf(page, "%d\n", bfqd->bfq_wr_max_time > 0 ? ++ jiffies_to_msecs(bfqd->bfq_wr_max_time) : ++ jiffies_to_msecs(bfq_wr_duration(bfqd))); ++} ++ ++static ssize_t bfq_weights_show(struct elevator_queue *e, char *page) ++{ ++ struct bfq_queue *bfqq; ++ struct bfq_data *bfqd = e->elevator_data; ++ ssize_t num_char = 0; ++ ++ num_char += sprintf(page + num_char, "Tot reqs queued %d\n\n", ++ bfqd->queued); ++ ++ spin_lock_irq(bfqd->queue->queue_lock); ++ ++ num_char += sprintf(page + num_char, "Active:\n"); ++ list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) { ++ num_char += sprintf(page + num_char, ++ "pid%d: weight %hu, nr_queued %d %d, dur %d/%u\n", ++ bfqq->pid, ++ bfqq->entity.weight, ++ bfqq->queued[0], ++ bfqq->queued[1], ++ jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish), ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } ++ ++ num_char += sprintf(page + num_char, "Idle:\n"); ++ list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) { ++ num_char += sprintf(page + num_char, ++ "pid%d: weight %hu, dur %d/%u\n", ++ bfqq->pid, ++ bfqq->entity.weight, ++ jiffies_to_msecs(jiffies - ++ bfqq->last_wr_start_finish), ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } ++ ++ spin_unlock_irq(bfqd->queue->queue_lock); ++ ++ return num_char; ++} ++ ++#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ ++static ssize_t __FUNC(struct elevator_queue *e, char *page) \ ++{ \ ++ struct bfq_data *bfqd = e->elevator_data; \ ++ unsigned int __data = __VAR; \ ++ if (__CONV) \ ++ __data = jiffies_to_msecs(__data); \ ++ return bfq_var_show(__data, (page)); \ ++} ++SHOW_FUNCTION(bfq_quantum_show, bfqd->bfq_quantum, 0); ++SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 1); ++SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 1); ++SHOW_FUNCTION(bfq_back_seek_max_show, bfqd->bfq_back_max, 0); ++SHOW_FUNCTION(bfq_back_seek_penalty_show, bfqd->bfq_back_penalty, 0); ++SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 1); ++SHOW_FUNCTION(bfq_max_budget_show, bfqd->bfq_user_max_budget, 0); ++SHOW_FUNCTION(bfq_max_budget_async_rq_show, ++ bfqd->bfq_max_budget_async_rq, 0); ++SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout[BLK_RW_SYNC], 1); ++SHOW_FUNCTION(bfq_timeout_async_show, bfqd->bfq_timeout[BLK_RW_ASYNC], 1); ++SHOW_FUNCTION(bfq_low_latency_show, bfqd->low_latency, 0); ++SHOW_FUNCTION(bfq_wr_coeff_show, bfqd->bfq_wr_coeff, 0); ++SHOW_FUNCTION(bfq_wr_rt_max_time_show, bfqd->bfq_wr_rt_max_time, 1); ++SHOW_FUNCTION(bfq_wr_min_idle_time_show, bfqd->bfq_wr_min_idle_time, 1); ++SHOW_FUNCTION(bfq_wr_min_inter_arr_async_show, bfqd->bfq_wr_min_inter_arr_async, ++ 1); ++SHOW_FUNCTION(bfq_wr_max_softrt_rate_show, bfqd->bfq_wr_max_softrt_rate, 0); ++#undef SHOW_FUNCTION ++ ++#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ ++static ssize_t \ ++__FUNC(struct elevator_queue *e, const char *page, size_t count) \ ++{ \ ++ struct bfq_data *bfqd = e->elevator_data; \ ++ unsigned long uninitialized_var(__data); \ ++ int ret = bfq_var_store(&__data, (page), count); \ ++ if (__data < (MIN)) \ ++ __data = (MIN); \ ++ else if (__data > (MAX)) \ ++ __data = (MAX); \ ++ if (__CONV) \ ++ *(__PTR) = msecs_to_jiffies(__data); \ ++ else \ ++ *(__PTR) = __data; \ ++ return ret; \ ++} ++STORE_FUNCTION(bfq_quantum_store, &bfqd->bfq_quantum, 1, INT_MAX, 0); ++STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_fifo_expire_async_store, &bfqd->bfq_fifo_expire[0], 1, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_back_seek_max_store, &bfqd->bfq_back_max, 0, INT_MAX, 0); ++STORE_FUNCTION(bfq_back_seek_penalty_store, &bfqd->bfq_back_penalty, 1, ++ INT_MAX, 0); ++STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 1); ++STORE_FUNCTION(bfq_max_budget_async_rq_store, &bfqd->bfq_max_budget_async_rq, ++ 1, INT_MAX, 0); ++STORE_FUNCTION(bfq_timeout_async_store, &bfqd->bfq_timeout[BLK_RW_ASYNC], 0, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_coeff_store, &bfqd->bfq_wr_coeff, 1, INT_MAX, 0); ++STORE_FUNCTION(bfq_wr_max_time_store, &bfqd->bfq_wr_max_time, 0, INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_rt_max_time_store, &bfqd->bfq_wr_rt_max_time, 0, INT_MAX, ++ 1); ++STORE_FUNCTION(bfq_wr_min_idle_time_store, &bfqd->bfq_wr_min_idle_time, 0, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_min_inter_arr_async_store, ++ &bfqd->bfq_wr_min_inter_arr_async, 0, INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_max_softrt_rate_store, &bfqd->bfq_wr_max_softrt_rate, 0, ++ INT_MAX, 0); ++#undef STORE_FUNCTION ++ ++/* do nothing for the moment */ ++static ssize_t bfq_weights_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ return count; ++} ++ ++static inline unsigned long bfq_estimated_max_budget(struct bfq_data *bfqd) ++{ ++ u64 timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]); ++ ++ if (bfqd->peak_rate_samples >= BFQ_PEAK_RATE_SAMPLES) ++ return bfq_calc_max_budget(bfqd->peak_rate, timeout); ++ else ++ return bfq_default_max_budget; ++} ++ ++static ssize_t bfq_max_budget_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ unsigned long uninitialized_var(__data); ++ int ret = bfq_var_store(&__data, (page), count); ++ ++ if (__data == 0) ++ bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd); ++ else { ++ if (__data > INT_MAX) ++ __data = INT_MAX; ++ bfqd->bfq_max_budget = __data; ++ } ++ ++ bfqd->bfq_user_max_budget = __data; ++ ++ return ret; ++} ++ ++static ssize_t bfq_timeout_sync_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ unsigned long uninitialized_var(__data); ++ int ret = bfq_var_store(&__data, (page), count); ++ ++ if (__data < 1) ++ __data = 1; ++ else if (__data > INT_MAX) ++ __data = INT_MAX; ++ ++ bfqd->bfq_timeout[BLK_RW_SYNC] = msecs_to_jiffies(__data); ++ if (bfqd->bfq_user_max_budget == 0) ++ bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd); ++ ++ return ret; ++} ++ ++static ssize_t bfq_low_latency_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ unsigned long uninitialized_var(__data); ++ int ret = bfq_var_store(&__data, (page), count); ++ ++ if (__data > 1) ++ __data = 1; ++ if (__data == 0 && bfqd->low_latency != 0) ++ bfq_end_wr(bfqd); ++ bfqd->low_latency = __data; ++ ++ return ret; ++} ++ ++#define BFQ_ATTR(name) \ ++ __ATTR(name, S_IRUGO|S_IWUSR, bfq_##name##_show, bfq_##name##_store) ++ ++static struct elv_fs_entry bfq_attrs[] = { ++ BFQ_ATTR(quantum), ++ BFQ_ATTR(fifo_expire_sync), ++ BFQ_ATTR(fifo_expire_async), ++ BFQ_ATTR(back_seek_max), ++ BFQ_ATTR(back_seek_penalty), ++ BFQ_ATTR(slice_idle), ++ BFQ_ATTR(max_budget), ++ BFQ_ATTR(max_budget_async_rq), ++ BFQ_ATTR(timeout_sync), ++ BFQ_ATTR(timeout_async), ++ BFQ_ATTR(low_latency), ++ BFQ_ATTR(wr_coeff), ++ BFQ_ATTR(wr_max_time), ++ BFQ_ATTR(wr_rt_max_time), ++ BFQ_ATTR(wr_min_idle_time), ++ BFQ_ATTR(wr_min_inter_arr_async), ++ BFQ_ATTR(wr_max_softrt_rate), ++ BFQ_ATTR(weights), ++ __ATTR_NULL ++}; ++ ++static struct elevator_type iosched_bfq = { ++ .ops = { ++ .elevator_merge_fn = bfq_merge, ++ .elevator_merged_fn = bfq_merged_request, ++ .elevator_merge_req_fn = bfq_merged_requests, ++ .elevator_allow_merge_fn = bfq_allow_merge, ++ .elevator_dispatch_fn = bfq_dispatch_requests, ++ .elevator_add_req_fn = bfq_insert_request, ++ .elevator_activate_req_fn = bfq_activate_request, ++ .elevator_deactivate_req_fn = bfq_deactivate_request, ++ .elevator_completed_req_fn = bfq_completed_request, ++ .elevator_former_req_fn = elv_rb_former_request, ++ .elevator_latter_req_fn = elv_rb_latter_request, ++ .elevator_init_icq_fn = bfq_init_icq, ++ .elevator_exit_icq_fn = bfq_exit_icq, ++ .elevator_set_req_fn = bfq_set_request, ++ .elevator_put_req_fn = bfq_put_request, ++ .elevator_may_queue_fn = bfq_may_queue, ++ .elevator_init_fn = bfq_init_queue, ++ .elevator_exit_fn = bfq_exit_queue, ++ }, ++ .icq_size = sizeof(struct bfq_io_cq), ++ .icq_align = __alignof__(struct bfq_io_cq), ++ .elevator_attrs = bfq_attrs, ++ .elevator_name = "bfq", ++ .elevator_owner = THIS_MODULE, ++}; ++ ++static int __init bfq_init(void) ++{ ++ /* ++ * Can be 0 on HZ < 1000 setups. ++ */ ++ if (bfq_slice_idle == 0) ++ bfq_slice_idle = 1; ++ ++ if (bfq_timeout_async == 0) ++ bfq_timeout_async = 1; ++ ++ if (bfq_slab_setup()) ++ return -ENOMEM; ++ ++ /* ++ * Times to load large popular applications for the typical systems ++ * installed on the reference devices (see the comments before the ++ * definitions of the two arrays). ++ */ ++ T_slow[0] = msecs_to_jiffies(2600); ++ T_slow[1] = msecs_to_jiffies(1000); ++ T_fast[0] = msecs_to_jiffies(5500); ++ T_fast[1] = msecs_to_jiffies(2000); ++ ++ /* ++ * Thresholds that determine the switch between speed classes (see ++ * the comments before the definition of the array). ++ */ ++ device_speed_thresh[0] = (R_fast[0] + R_slow[0]) / 2; ++ device_speed_thresh[1] = (R_fast[1] + R_slow[1]) / 2; ++ ++ elv_register(&iosched_bfq); ++ pr_info("BFQ I/O-scheduler version: v7r7"); ++ ++ return 0; ++} ++ ++static void __exit bfq_exit(void) ++{ ++ elv_unregister(&iosched_bfq); ++ bfq_slab_kill(); ++} ++ ++module_init(bfq_init); ++module_exit(bfq_exit); ++ ++MODULE_AUTHOR("Fabio Checconi, Paolo Valente"); ++MODULE_LICENSE("GPL"); +diff --git a/block/bfq-sched.c b/block/bfq-sched.c +new file mode 100644 +index 0000000..2931563 +--- /dev/null ++++ b/block/bfq-sched.c +@@ -0,0 +1,1214 @@ ++/* ++ * BFQ: Hierarchical B-WF2Q+ scheduler. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ */ ++ ++#ifdef CONFIG_CGROUP_BFQIO ++#define for_each_entity(entity) \ ++ for (; entity != NULL; entity = entity->parent) ++ ++#define for_each_entity_safe(entity, parent) \ ++ for (; entity && ({ parent = entity->parent; 1; }); entity = parent) ++ ++static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd, ++ int extract, ++ struct bfq_data *bfqd); ++ ++static inline void bfq_update_budget(struct bfq_entity *next_in_service) ++{ ++ struct bfq_entity *bfqg_entity; ++ struct bfq_group *bfqg; ++ struct bfq_sched_data *group_sd; ++ ++ BUG_ON(next_in_service == NULL); ++ ++ group_sd = next_in_service->sched_data; ++ ++ bfqg = container_of(group_sd, struct bfq_group, sched_data); ++ /* ++ * bfq_group's my_entity field is not NULL only if the group ++ * is not the root group. We must not touch the root entity ++ * as it must never become an in-service entity. ++ */ ++ bfqg_entity = bfqg->my_entity; ++ if (bfqg_entity != NULL) ++ bfqg_entity->budget = next_in_service->budget; ++} ++ ++static int bfq_update_next_in_service(struct bfq_sched_data *sd) ++{ ++ struct bfq_entity *next_in_service; ++ ++ if (sd->in_service_entity != NULL) ++ /* will update/requeue at the end of service */ ++ return 0; ++ ++ /* ++ * NOTE: this can be improved in many ways, such as returning ++ * 1 (and thus propagating upwards the update) only when the ++ * budget changes, or caching the bfqq that will be scheduled ++ * next from this subtree. By now we worry more about ++ * correctness than about performance... ++ */ ++ next_in_service = bfq_lookup_next_entity(sd, 0, NULL); ++ sd->next_in_service = next_in_service; ++ ++ if (next_in_service != NULL) ++ bfq_update_budget(next_in_service); ++ ++ return 1; ++} ++ ++static inline void bfq_check_next_in_service(struct bfq_sched_data *sd, ++ struct bfq_entity *entity) ++{ ++ BUG_ON(sd->next_in_service != entity); ++} ++#else ++#define for_each_entity(entity) \ ++ for (; entity != NULL; entity = NULL) ++ ++#define for_each_entity_safe(entity, parent) \ ++ for (parent = NULL; entity != NULL; entity = parent) ++ ++static inline int bfq_update_next_in_service(struct bfq_sched_data *sd) ++{ ++ return 0; ++} ++ ++static inline void bfq_check_next_in_service(struct bfq_sched_data *sd, ++ struct bfq_entity *entity) ++{ ++} ++ ++static inline void bfq_update_budget(struct bfq_entity *next_in_service) ++{ ++} ++#endif ++ ++/* ++ * Shift for timestamp calculations. This actually limits the maximum ++ * service allowed in one timestamp delta (small shift values increase it), ++ * the maximum total weight that can be used for the queues in the system ++ * (big shift values increase it), and the period of virtual time ++ * wraparounds. ++ */ ++#define WFQ_SERVICE_SHIFT 22 ++ ++/** ++ * bfq_gt - compare two timestamps. ++ * @a: first ts. ++ * @b: second ts. ++ * ++ * Return @a > @b, dealing with wrapping correctly. ++ */ ++static inline int bfq_gt(u64 a, u64 b) ++{ ++ return (s64)(a - b) > 0; ++} ++ ++static inline struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = NULL; ++ ++ BUG_ON(entity == NULL); ++ ++ if (entity->my_sched_data == NULL) ++ bfqq = container_of(entity, struct bfq_queue, entity); ++ ++ return bfqq; ++} ++ ++ ++/** ++ * bfq_delta - map service into the virtual time domain. ++ * @service: amount of service. ++ * @weight: scale factor (weight of an entity or weight sum). ++ */ ++static inline u64 bfq_delta(unsigned long service, ++ unsigned long weight) ++{ ++ u64 d = (u64)service << WFQ_SERVICE_SHIFT; ++ ++ do_div(d, weight); ++ return d; ++} ++ ++/** ++ * bfq_calc_finish - assign the finish time to an entity. ++ * @entity: the entity to act upon. ++ * @service: the service to be charged to the entity. ++ */ ++static inline void bfq_calc_finish(struct bfq_entity *entity, ++ unsigned long service) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ ++ BUG_ON(entity->weight == 0); ++ ++ entity->finish = entity->start + ++ bfq_delta(service, entity->weight); ++ ++ if (bfqq != NULL) { ++ bfq_log_bfqq(bfqq->bfqd, bfqq, ++ "calc_finish: serv %lu, w %d", ++ service, entity->weight); ++ bfq_log_bfqq(bfqq->bfqd, bfqq, ++ "calc_finish: start %llu, finish %llu, delta %llu", ++ entity->start, entity->finish, ++ bfq_delta(service, entity->weight)); ++ } ++} ++ ++/** ++ * bfq_entity_of - get an entity from a node. ++ * @node: the node field of the entity. ++ * ++ * Convert a node pointer to the relative entity. This is used only ++ * to simplify the logic of some functions and not as the generic ++ * conversion mechanism because, e.g., in the tree walking functions, ++ * the check for a %NULL value would be redundant. ++ */ ++static inline struct bfq_entity *bfq_entity_of(struct rb_node *node) ++{ ++ struct bfq_entity *entity = NULL; ++ ++ if (node != NULL) ++ entity = rb_entry(node, struct bfq_entity, rb_node); ++ ++ return entity; ++} ++ ++/** ++ * bfq_extract - remove an entity from a tree. ++ * @root: the tree root. ++ * @entity: the entity to remove. ++ */ ++static inline void bfq_extract(struct rb_root *root, ++ struct bfq_entity *entity) ++{ ++ BUG_ON(entity->tree != root); ++ ++ entity->tree = NULL; ++ rb_erase(&entity->rb_node, root); ++} ++ ++/** ++ * bfq_idle_extract - extract an entity from the idle tree. ++ * @st: the service tree of the owning @entity. ++ * @entity: the entity being removed. ++ */ ++static void bfq_idle_extract(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct rb_node *next; ++ ++ BUG_ON(entity->tree != &st->idle); ++ ++ if (entity == st->first_idle) { ++ next = rb_next(&entity->rb_node); ++ st->first_idle = bfq_entity_of(next); ++ } ++ ++ if (entity == st->last_idle) { ++ next = rb_prev(&entity->rb_node); ++ st->last_idle = bfq_entity_of(next); ++ } ++ ++ bfq_extract(&st->idle, entity); ++ ++ if (bfqq != NULL) ++ list_del(&bfqq->bfqq_list); ++} ++ ++/** ++ * bfq_insert - generic tree insertion. ++ * @root: tree root. ++ * @entity: entity to insert. ++ * ++ * This is used for the idle and the active tree, since they are both ++ * ordered by finish time. ++ */ ++static void bfq_insert(struct rb_root *root, struct bfq_entity *entity) ++{ ++ struct bfq_entity *entry; ++ struct rb_node **node = &root->rb_node; ++ struct rb_node *parent = NULL; ++ ++ BUG_ON(entity->tree != NULL); ++ ++ while (*node != NULL) { ++ parent = *node; ++ entry = rb_entry(parent, struct bfq_entity, rb_node); ++ ++ if (bfq_gt(entry->finish, entity->finish)) ++ node = &parent->rb_left; ++ else ++ node = &parent->rb_right; ++ } ++ ++ rb_link_node(&entity->rb_node, parent, node); ++ rb_insert_color(&entity->rb_node, root); ++ ++ entity->tree = root; ++} ++ ++/** ++ * bfq_update_min - update the min_start field of a entity. ++ * @entity: the entity to update. ++ * @node: one of its children. ++ * ++ * This function is called when @entity may store an invalid value for ++ * min_start due to updates to the active tree. The function assumes ++ * that the subtree rooted at @node (which may be its left or its right ++ * child) has a valid min_start value. ++ */ ++static inline void bfq_update_min(struct bfq_entity *entity, ++ struct rb_node *node) ++{ ++ struct bfq_entity *child; ++ ++ if (node != NULL) { ++ child = rb_entry(node, struct bfq_entity, rb_node); ++ if (bfq_gt(entity->min_start, child->min_start)) ++ entity->min_start = child->min_start; ++ } ++} ++ ++/** ++ * bfq_update_active_node - recalculate min_start. ++ * @node: the node to update. ++ * ++ * @node may have changed position or one of its children may have moved, ++ * this function updates its min_start value. The left and right subtrees ++ * are assumed to hold a correct min_start value. ++ */ ++static inline void bfq_update_active_node(struct rb_node *node) ++{ ++ struct bfq_entity *entity = rb_entry(node, struct bfq_entity, rb_node); ++ ++ entity->min_start = entity->start; ++ bfq_update_min(entity, node->rb_right); ++ bfq_update_min(entity, node->rb_left); ++} ++ ++/** ++ * bfq_update_active_tree - update min_start for the whole active tree. ++ * @node: the starting node. ++ * ++ * @node must be the deepest modified node after an update. This function ++ * updates its min_start using the values held by its children, assuming ++ * that they did not change, and then updates all the nodes that may have ++ * changed in the path to the root. The only nodes that may have changed ++ * are the ones in the path or their siblings. ++ */ ++static void bfq_update_active_tree(struct rb_node *node) ++{ ++ struct rb_node *parent; ++ ++up: ++ bfq_update_active_node(node); ++ ++ parent = rb_parent(node); ++ if (parent == NULL) ++ return; ++ ++ if (node == parent->rb_left && parent->rb_right != NULL) ++ bfq_update_active_node(parent->rb_right); ++ else if (parent->rb_left != NULL) ++ bfq_update_active_node(parent->rb_left); ++ ++ node = parent; ++ goto up; ++} ++ ++static void bfq_weights_tree_add(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root); ++ ++static void bfq_weights_tree_remove(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root); ++ ++ ++/** ++ * bfq_active_insert - insert an entity in the active tree of its ++ * group/device. ++ * @st: the service tree of the entity. ++ * @entity: the entity being inserted. ++ * ++ * The active tree is ordered by finish time, but an extra key is kept ++ * per each node, containing the minimum value for the start times of ++ * its children (and the node itself), so it's possible to search for ++ * the eligible node with the lowest finish time in logarithmic time. ++ */ ++static void bfq_active_insert(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct rb_node *node = &entity->rb_node; ++#ifdef CONFIG_CGROUP_BFQIO ++ struct bfq_sched_data *sd = NULL; ++ struct bfq_group *bfqg = NULL; ++ struct bfq_data *bfqd = NULL; ++#endif ++ ++ bfq_insert(&st->active, entity); ++ ++ if (node->rb_left != NULL) ++ node = node->rb_left; ++ else if (node->rb_right != NULL) ++ node = node->rb_right; ++ ++ bfq_update_active_tree(node); ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ sd = entity->sched_data; ++ bfqg = container_of(sd, struct bfq_group, sched_data); ++ BUG_ON(!bfqg); ++ bfqd = (struct bfq_data *)bfqg->bfqd; ++#endif ++ if (bfqq != NULL) ++ list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list); ++#ifdef CONFIG_CGROUP_BFQIO ++ else { /* bfq_group */ ++ BUG_ON(!bfqd); ++ bfq_weights_tree_add(bfqd, entity, &bfqd->group_weights_tree); ++ } ++ if (bfqg != bfqd->root_group) { ++ BUG_ON(!bfqg); ++ BUG_ON(!bfqd); ++ bfqg->active_entities++; ++ if (bfqg->active_entities == 2) ++ bfqd->active_numerous_groups++; ++ } ++#endif ++} ++ ++/** ++ * bfq_ioprio_to_weight - calc a weight from an ioprio. ++ * @ioprio: the ioprio value to convert. ++ */ ++static inline unsigned short bfq_ioprio_to_weight(int ioprio) ++{ ++ BUG_ON(ioprio < 0 || ioprio >= IOPRIO_BE_NR); ++ return IOPRIO_BE_NR - ioprio; ++} ++ ++/** ++ * bfq_weight_to_ioprio - calc an ioprio from a weight. ++ * @weight: the weight value to convert. ++ * ++ * To preserve as mush as possible the old only-ioprio user interface, ++ * 0 is used as an escape ioprio value for weights (numerically) equal or ++ * larger than IOPRIO_BE_NR ++ */ ++static inline unsigned short bfq_weight_to_ioprio(int weight) ++{ ++ BUG_ON(weight < BFQ_MIN_WEIGHT || weight > BFQ_MAX_WEIGHT); ++ return IOPRIO_BE_NR - weight < 0 ? 0 : IOPRIO_BE_NR - weight; ++} ++ ++static inline void bfq_get_entity(struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ ++ if (bfqq != NULL) { ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ } ++} ++ ++/** ++ * bfq_find_deepest - find the deepest node that an extraction can modify. ++ * @node: the node being removed. ++ * ++ * Do the first step of an extraction in an rb tree, looking for the ++ * node that will replace @node, and returning the deepest node that ++ * the following modifications to the tree can touch. If @node is the ++ * last node in the tree return %NULL. ++ */ ++static struct rb_node *bfq_find_deepest(struct rb_node *node) ++{ ++ struct rb_node *deepest; ++ ++ if (node->rb_right == NULL && node->rb_left == NULL) ++ deepest = rb_parent(node); ++ else if (node->rb_right == NULL) ++ deepest = node->rb_left; ++ else if (node->rb_left == NULL) ++ deepest = node->rb_right; ++ else { ++ deepest = rb_next(node); ++ if (deepest->rb_right != NULL) ++ deepest = deepest->rb_right; ++ else if (rb_parent(deepest) != node) ++ deepest = rb_parent(deepest); ++ } ++ ++ return deepest; ++} ++ ++/** ++ * bfq_active_extract - remove an entity from the active tree. ++ * @st: the service_tree containing the tree. ++ * @entity: the entity being removed. ++ */ ++static void bfq_active_extract(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct rb_node *node; ++#ifdef CONFIG_CGROUP_BFQIO ++ struct bfq_sched_data *sd = NULL; ++ struct bfq_group *bfqg = NULL; ++ struct bfq_data *bfqd = NULL; ++#endif ++ ++ node = bfq_find_deepest(&entity->rb_node); ++ bfq_extract(&st->active, entity); ++ ++ if (node != NULL) ++ bfq_update_active_tree(node); ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ sd = entity->sched_data; ++ bfqg = container_of(sd, struct bfq_group, sched_data); ++ BUG_ON(!bfqg); ++ bfqd = (struct bfq_data *)bfqg->bfqd; ++#endif ++ if (bfqq != NULL) ++ list_del(&bfqq->bfqq_list); ++#ifdef CONFIG_CGROUP_BFQIO ++ else { /* bfq_group */ ++ BUG_ON(!bfqd); ++ bfq_weights_tree_remove(bfqd, entity, ++ &bfqd->group_weights_tree); ++ } ++ if (bfqg != bfqd->root_group) { ++ BUG_ON(!bfqg); ++ BUG_ON(!bfqd); ++ BUG_ON(!bfqg->active_entities); ++ bfqg->active_entities--; ++ if (bfqg->active_entities == 1) { ++ BUG_ON(!bfqd->active_numerous_groups); ++ bfqd->active_numerous_groups--; ++ } ++ } ++#endif ++} ++ ++/** ++ * bfq_idle_insert - insert an entity into the idle tree. ++ * @st: the service tree containing the tree. ++ * @entity: the entity to insert. ++ */ ++static void bfq_idle_insert(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct bfq_entity *first_idle = st->first_idle; ++ struct bfq_entity *last_idle = st->last_idle; ++ ++ if (first_idle == NULL || bfq_gt(first_idle->finish, entity->finish)) ++ st->first_idle = entity; ++ if (last_idle == NULL || bfq_gt(entity->finish, last_idle->finish)) ++ st->last_idle = entity; ++ ++ bfq_insert(&st->idle, entity); ++ ++ if (bfqq != NULL) ++ list_add(&bfqq->bfqq_list, &bfqq->bfqd->idle_list); ++} ++ ++/** ++ * bfq_forget_entity - remove an entity from the wfq trees. ++ * @st: the service tree. ++ * @entity: the entity being removed. ++ * ++ * Update the device status and forget everything about @entity, putting ++ * the device reference to it, if it is a queue. Entities belonging to ++ * groups are not refcounted. ++ */ ++static void bfq_forget_entity(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct bfq_sched_data *sd; ++ ++ BUG_ON(!entity->on_st); ++ ++ entity->on_st = 0; ++ st->wsum -= entity->weight; ++ if (bfqq != NULL) { ++ sd = entity->sched_data; ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "forget_entity: %p %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ } ++} ++ ++/** ++ * bfq_put_idle_entity - release the idle tree ref of an entity. ++ * @st: service tree for the entity. ++ * @entity: the entity being released. ++ */ ++static void bfq_put_idle_entity(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ bfq_idle_extract(st, entity); ++ bfq_forget_entity(st, entity); ++} ++ ++/** ++ * bfq_forget_idle - update the idle tree if necessary. ++ * @st: the service tree to act upon. ++ * ++ * To preserve the global O(log N) complexity we only remove one entry here; ++ * as the idle tree will not grow indefinitely this can be done safely. ++ */ ++static void bfq_forget_idle(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *first_idle = st->first_idle; ++ struct bfq_entity *last_idle = st->last_idle; ++ ++ if (RB_EMPTY_ROOT(&st->active) && last_idle != NULL && ++ !bfq_gt(last_idle->finish, st->vtime)) { ++ /* ++ * Forget the whole idle tree, increasing the vtime past ++ * the last finish time of idle entities. ++ */ ++ st->vtime = last_idle->finish; ++ } ++ ++ if (first_idle != NULL && !bfq_gt(first_idle->finish, st->vtime)) ++ bfq_put_idle_entity(st, first_idle); ++} ++ ++static struct bfq_service_tree * ++__bfq_entity_update_weight_prio(struct bfq_service_tree *old_st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_service_tree *new_st = old_st; ++ ++ if (entity->ioprio_changed) { ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ unsigned short prev_weight, new_weight; ++ struct bfq_data *bfqd = NULL; ++ struct rb_root *root; ++#ifdef CONFIG_CGROUP_BFQIO ++ struct bfq_sched_data *sd; ++ struct bfq_group *bfqg; ++#endif ++ ++ if (bfqq != NULL) ++ bfqd = bfqq->bfqd; ++#ifdef CONFIG_CGROUP_BFQIO ++ else { ++ sd = entity->my_sched_data; ++ bfqg = container_of(sd, struct bfq_group, sched_data); ++ BUG_ON(!bfqg); ++ bfqd = (struct bfq_data *)bfqg->bfqd; ++ BUG_ON(!bfqd); ++ } ++#endif ++ ++ BUG_ON(old_st->wsum < entity->weight); ++ old_st->wsum -= entity->weight; ++ ++ if (entity->new_weight != entity->orig_weight) { ++ if (entity->new_weight < BFQ_MIN_WEIGHT || ++ entity->new_weight > BFQ_MAX_WEIGHT) { ++ printk(KERN_CRIT "update_weight_prio: " ++ "new_weight %d\n", ++ entity->new_weight); ++ BUG(); ++ } ++ entity->orig_weight = entity->new_weight; ++ entity->ioprio = ++ bfq_weight_to_ioprio(entity->orig_weight); ++ } else if (entity->new_ioprio != entity->ioprio) { ++ entity->ioprio = entity->new_ioprio; ++ entity->orig_weight = ++ bfq_ioprio_to_weight(entity->ioprio); ++ } else ++ entity->new_weight = entity->orig_weight = ++ bfq_ioprio_to_weight(entity->ioprio); ++ ++ entity->ioprio_class = entity->new_ioprio_class; ++ entity->ioprio_changed = 0; ++ ++ /* ++ * NOTE: here we may be changing the weight too early, ++ * this will cause unfairness. The correct approach ++ * would have required additional complexity to defer ++ * weight changes to the proper time instants (i.e., ++ * when entity->finish <= old_st->vtime). ++ */ ++ new_st = bfq_entity_service_tree(entity); ++ ++ prev_weight = entity->weight; ++ new_weight = entity->orig_weight * ++ (bfqq != NULL ? bfqq->wr_coeff : 1); ++ /* ++ * If the weight of the entity changes, remove the entity ++ * from its old weight counter (if there is a counter ++ * associated with the entity), and add it to the counter ++ * associated with its new weight. ++ */ ++ if (prev_weight != new_weight) { ++ root = bfqq ? &bfqd->queue_weights_tree : ++ &bfqd->group_weights_tree; ++ bfq_weights_tree_remove(bfqd, entity, root); ++ } ++ entity->weight = new_weight; ++ /* ++ * Add the entity to its weights tree only if it is ++ * not associated with a weight-raised queue. ++ */ ++ if (prev_weight != new_weight && ++ (bfqq ? bfqq->wr_coeff == 1 : 1)) ++ /* If we get here, root has been initialized. */ ++ bfq_weights_tree_add(bfqd, entity, root); ++ ++ new_st->wsum += entity->weight; ++ ++ if (new_st != old_st) ++ entity->start = new_st->vtime; ++ } ++ ++ return new_st; ++} ++ ++/** ++ * bfq_bfqq_served - update the scheduler status after selection for ++ * service. ++ * @bfqq: the queue being served. ++ * @served: bytes to transfer. ++ * ++ * NOTE: this can be optimized, as the timestamps of upper level entities ++ * are synchronized every time a new bfqq is selected for service. By now, ++ * we keep it to better check consistency. ++ */ ++static void bfq_bfqq_served(struct bfq_queue *bfqq, unsigned long served) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ struct bfq_service_tree *st; ++ ++ for_each_entity(entity) { ++ st = bfq_entity_service_tree(entity); ++ ++ entity->service += served; ++ BUG_ON(entity->service > entity->budget); ++ BUG_ON(st->wsum == 0); ++ ++ st->vtime += bfq_delta(served, st->wsum); ++ bfq_forget_idle(st); ++ } ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %lu secs", served); ++} ++ ++/** ++ * bfq_bfqq_charge_full_budget - set the service to the entity budget. ++ * @bfqq: the queue that needs a service update. ++ * ++ * When it's not possible to be fair in the service domain, because ++ * a queue is not consuming its budget fast enough (the meaning of ++ * fast depends on the timeout parameter), we charge it a full ++ * budget. In this way we should obtain a sort of time-domain ++ * fairness among all the seeky/slow queues. ++ */ ++static inline void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "charge_full_budget"); ++ ++ bfq_bfqq_served(bfqq, entity->budget - entity->service); ++} ++ ++/** ++ * __bfq_activate_entity - activate an entity. ++ * @entity: the entity being activated. ++ * ++ * Called whenever an entity is activated, i.e., it is not active and one ++ * of its children receives a new request, or has to be reactivated due to ++ * budget exhaustion. It uses the current budget of the entity (and the ++ * service received if @entity is active) of the queue to calculate its ++ * timestamps. ++ */ ++static void __bfq_activate_entity(struct bfq_entity *entity) ++{ ++ struct bfq_sched_data *sd = entity->sched_data; ++ struct bfq_service_tree *st = bfq_entity_service_tree(entity); ++ ++ if (entity == sd->in_service_entity) { ++ BUG_ON(entity->tree != NULL); ++ /* ++ * If we are requeueing the current entity we have ++ * to take care of not charging to it service it has ++ * not received. ++ */ ++ bfq_calc_finish(entity, entity->service); ++ entity->start = entity->finish; ++ sd->in_service_entity = NULL; ++ } else if (entity->tree == &st->active) { ++ /* ++ * Requeueing an entity due to a change of some ++ * next_in_service entity below it. We reuse the ++ * old start time. ++ */ ++ bfq_active_extract(st, entity); ++ } else if (entity->tree == &st->idle) { ++ /* ++ * Must be on the idle tree, bfq_idle_extract() will ++ * check for that. ++ */ ++ bfq_idle_extract(st, entity); ++ entity->start = bfq_gt(st->vtime, entity->finish) ? ++ st->vtime : entity->finish; ++ } else { ++ /* ++ * The finish time of the entity may be invalid, and ++ * it is in the past for sure, otherwise the queue ++ * would have been on the idle tree. ++ */ ++ entity->start = st->vtime; ++ st->wsum += entity->weight; ++ bfq_get_entity(entity); ++ ++ BUG_ON(entity->on_st); ++ entity->on_st = 1; ++ } ++ ++ st = __bfq_entity_update_weight_prio(st, entity); ++ bfq_calc_finish(entity, entity->budget); ++ bfq_active_insert(st, entity); ++} ++ ++/** ++ * bfq_activate_entity - activate an entity and its ancestors if necessary. ++ * @entity: the entity to activate. ++ * ++ * Activate @entity and all the entities on the path from it to the root. ++ */ ++static void bfq_activate_entity(struct bfq_entity *entity) ++{ ++ struct bfq_sched_data *sd; ++ ++ for_each_entity(entity) { ++ __bfq_activate_entity(entity); ++ ++ sd = entity->sched_data; ++ if (!bfq_update_next_in_service(sd)) ++ /* ++ * No need to propagate the activation to the ++ * upper entities, as they will be updated when ++ * the in-service entity is rescheduled. ++ */ ++ break; ++ } ++} ++ ++/** ++ * __bfq_deactivate_entity - deactivate an entity from its service tree. ++ * @entity: the entity to deactivate. ++ * @requeue: if false, the entity will not be put into the idle tree. ++ * ++ * Deactivate an entity, independently from its previous state. If the ++ * entity was not on a service tree just return, otherwise if it is on ++ * any scheduler tree, extract it from that tree, and if necessary ++ * and if the caller did not specify @requeue, put it on the idle tree. ++ * ++ * Return %1 if the caller should update the entity hierarchy, i.e., ++ * if the entity was in service or if it was the next_in_service for ++ * its sched_data; return %0 otherwise. ++ */ ++static int __bfq_deactivate_entity(struct bfq_entity *entity, int requeue) ++{ ++ struct bfq_sched_data *sd = entity->sched_data; ++ struct bfq_service_tree *st = bfq_entity_service_tree(entity); ++ int was_in_service = entity == sd->in_service_entity; ++ int ret = 0; ++ ++ if (!entity->on_st) ++ return 0; ++ ++ BUG_ON(was_in_service && entity->tree != NULL); ++ ++ if (was_in_service) { ++ bfq_calc_finish(entity, entity->service); ++ sd->in_service_entity = NULL; ++ } else if (entity->tree == &st->active) ++ bfq_active_extract(st, entity); ++ else if (entity->tree == &st->idle) ++ bfq_idle_extract(st, entity); ++ else if (entity->tree != NULL) ++ BUG(); ++ ++ if (was_in_service || sd->next_in_service == entity) ++ ret = bfq_update_next_in_service(sd); ++ ++ if (!requeue || !bfq_gt(entity->finish, st->vtime)) ++ bfq_forget_entity(st, entity); ++ else ++ bfq_idle_insert(st, entity); ++ ++ BUG_ON(sd->in_service_entity == entity); ++ BUG_ON(sd->next_in_service == entity); ++ ++ return ret; ++} ++ ++/** ++ * bfq_deactivate_entity - deactivate an entity. ++ * @entity: the entity to deactivate. ++ * @requeue: true if the entity can be put on the idle tree ++ */ ++static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue) ++{ ++ struct bfq_sched_data *sd; ++ struct bfq_entity *parent; ++ ++ for_each_entity_safe(entity, parent) { ++ sd = entity->sched_data; ++ ++ if (!__bfq_deactivate_entity(entity, requeue)) ++ /* ++ * The parent entity is still backlogged, and ++ * we don't need to update it as it is still ++ * in service. ++ */ ++ break; ++ ++ if (sd->next_in_service != NULL) ++ /* ++ * The parent entity is still backlogged and ++ * the budgets on the path towards the root ++ * need to be updated. ++ */ ++ goto update; ++ ++ /* ++ * If we reach there the parent is no more backlogged and ++ * we want to propagate the dequeue upwards. ++ */ ++ requeue = 1; ++ } ++ ++ return; ++ ++update: ++ entity = parent; ++ for_each_entity(entity) { ++ __bfq_activate_entity(entity); ++ ++ sd = entity->sched_data; ++ if (!bfq_update_next_in_service(sd)) ++ break; ++ } ++} ++ ++/** ++ * bfq_update_vtime - update vtime if necessary. ++ * @st: the service tree to act upon. ++ * ++ * If necessary update the service tree vtime to have at least one ++ * eligible entity, skipping to its start time. Assumes that the ++ * active tree of the device is not empty. ++ * ++ * NOTE: this hierarchical implementation updates vtimes quite often, ++ * we may end up with reactivated processes getting timestamps after a ++ * vtime skip done because we needed a ->first_active entity on some ++ * intermediate node. ++ */ ++static void bfq_update_vtime(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *entry; ++ struct rb_node *node = st->active.rb_node; ++ ++ entry = rb_entry(node, struct bfq_entity, rb_node); ++ if (bfq_gt(entry->min_start, st->vtime)) { ++ st->vtime = entry->min_start; ++ bfq_forget_idle(st); ++ } ++} ++ ++/** ++ * bfq_first_active_entity - find the eligible entity with ++ * the smallest finish time ++ * @st: the service tree to select from. ++ * ++ * This function searches the first schedulable entity, starting from the ++ * root of the tree and going on the left every time on this side there is ++ * a subtree with at least one eligible (start >= vtime) entity. The path on ++ * the right is followed only if a) the left subtree contains no eligible ++ * entities and b) no eligible entity has been found yet. ++ */ ++static struct bfq_entity *bfq_first_active_entity(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *entry, *first = NULL; ++ struct rb_node *node = st->active.rb_node; ++ ++ while (node != NULL) { ++ entry = rb_entry(node, struct bfq_entity, rb_node); ++left: ++ if (!bfq_gt(entry->start, st->vtime)) ++ first = entry; ++ ++ BUG_ON(bfq_gt(entry->min_start, st->vtime)); ++ ++ if (node->rb_left != NULL) { ++ entry = rb_entry(node->rb_left, ++ struct bfq_entity, rb_node); ++ if (!bfq_gt(entry->min_start, st->vtime)) { ++ node = node->rb_left; ++ goto left; ++ } ++ } ++ if (first != NULL) ++ break; ++ node = node->rb_right; ++ } ++ ++ BUG_ON(first == NULL && !RB_EMPTY_ROOT(&st->active)); ++ return first; ++} ++ ++/** ++ * __bfq_lookup_next_entity - return the first eligible entity in @st. ++ * @st: the service tree. ++ * ++ * Update the virtual time in @st and return the first eligible entity ++ * it contains. ++ */ ++static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st, ++ bool force) ++{ ++ struct bfq_entity *entity, *new_next_in_service = NULL; ++ ++ if (RB_EMPTY_ROOT(&st->active)) ++ return NULL; ++ ++ bfq_update_vtime(st); ++ entity = bfq_first_active_entity(st); ++ BUG_ON(bfq_gt(entity->start, st->vtime)); ++ ++ /* ++ * If the chosen entity does not match with the sched_data's ++ * next_in_service and we are forcedly serving the IDLE priority ++ * class tree, bubble up budget update. ++ */ ++ if (unlikely(force && entity != entity->sched_data->next_in_service)) { ++ new_next_in_service = entity; ++ for_each_entity(new_next_in_service) ++ bfq_update_budget(new_next_in_service); ++ } ++ ++ return entity; ++} ++ ++/** ++ * bfq_lookup_next_entity - return the first eligible entity in @sd. ++ * @sd: the sched_data. ++ * @extract: if true the returned entity will be also extracted from @sd. ++ * ++ * NOTE: since we cache the next_in_service entity at each level of the ++ * hierarchy, the complexity of the lookup can be decreased with ++ * absolutely no effort just returning the cached next_in_service value; ++ * we prefer to do full lookups to test the consistency of * the data ++ * structures. ++ */ ++static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd, ++ int extract, ++ struct bfq_data *bfqd) ++{ ++ struct bfq_service_tree *st = sd->service_tree; ++ struct bfq_entity *entity; ++ int i = 0; ++ ++ BUG_ON(sd->in_service_entity != NULL); ++ ++ if (bfqd != NULL && ++ jiffies - bfqd->bfq_class_idle_last_service > BFQ_CL_IDLE_TIMEOUT) { ++ entity = __bfq_lookup_next_entity(st + BFQ_IOPRIO_CLASSES - 1, ++ true); ++ if (entity != NULL) { ++ i = BFQ_IOPRIO_CLASSES - 1; ++ bfqd->bfq_class_idle_last_service = jiffies; ++ sd->next_in_service = entity; ++ } ++ } ++ for (; i < BFQ_IOPRIO_CLASSES; i++) { ++ entity = __bfq_lookup_next_entity(st + i, false); ++ if (entity != NULL) { ++ if (extract) { ++ bfq_check_next_in_service(sd, entity); ++ bfq_active_extract(st + i, entity); ++ sd->in_service_entity = entity; ++ sd->next_in_service = NULL; ++ } ++ break; ++ } ++ } ++ ++ return entity; ++} ++ ++/* ++ * Get next queue for service. ++ */ ++static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd) ++{ ++ struct bfq_entity *entity = NULL; ++ struct bfq_sched_data *sd; ++ struct bfq_queue *bfqq; ++ ++ BUG_ON(bfqd->in_service_queue != NULL); ++ ++ if (bfqd->busy_queues == 0) ++ return NULL; ++ ++ sd = &bfqd->root_group->sched_data; ++ for (; sd != NULL; sd = entity->my_sched_data) { ++ entity = bfq_lookup_next_entity(sd, 1, bfqd); ++ BUG_ON(entity == NULL); ++ entity->service = 0; ++ } ++ ++ bfqq = bfq_entity_to_bfqq(entity); ++ BUG_ON(bfqq == NULL); ++ ++ return bfqq; ++} ++ ++/* ++ * Forced extraction of the given queue. ++ */ ++static void bfq_get_next_queue_forced(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity; ++ struct bfq_sched_data *sd; ++ ++ BUG_ON(bfqd->in_service_queue != NULL); ++ ++ entity = &bfqq->entity; ++ /* ++ * Bubble up extraction/update from the leaf to the root. ++ */ ++ for_each_entity(entity) { ++ sd = entity->sched_data; ++ bfq_update_budget(entity); ++ bfq_update_vtime(bfq_entity_service_tree(entity)); ++ bfq_active_extract(bfq_entity_service_tree(entity), entity); ++ sd->in_service_entity = entity; ++ sd->next_in_service = NULL; ++ entity->service = 0; ++ } ++ ++ return; ++} ++ ++static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd) ++{ ++ if (bfqd->in_service_bic != NULL) { ++ put_io_context(bfqd->in_service_bic->icq.ioc); ++ bfqd->in_service_bic = NULL; ++ } ++ ++ bfqd->in_service_queue = NULL; ++ del_timer(&bfqd->idle_slice_timer); ++} ++ ++static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ int requeue) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ if (bfqq == bfqd->in_service_queue) ++ __bfq_bfqd_reset_in_service(bfqd); ++ ++ bfq_deactivate_entity(entity, requeue); ++} ++ ++static void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ bfq_activate_entity(entity); ++} ++ ++/* ++ * Called when the bfqq no longer has requests pending, remove it from ++ * the service tree. ++ */ ++static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ int requeue) ++{ ++ BUG_ON(!bfq_bfqq_busy(bfqq)); ++ BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list)); ++ ++ bfq_log_bfqq(bfqd, bfqq, "del from busy"); ++ ++ bfq_clear_bfqq_busy(bfqq); ++ ++ BUG_ON(bfqd->busy_queues == 0); ++ bfqd->busy_queues--; ++ ++ if (!bfqq->dispatched) { ++ bfq_weights_tree_remove(bfqd, &bfqq->entity, ++ &bfqd->queue_weights_tree); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ BUG_ON(!bfqd->busy_in_flight_queues); ++ bfqd->busy_in_flight_queues--; ++ if (bfq_bfqq_constantly_seeky(bfqq)) { ++ BUG_ON(!bfqd-> ++ const_seeky_busy_in_flight_queues); ++ bfqd->const_seeky_busy_in_flight_queues--; ++ } ++ } ++ } ++ if (bfqq->wr_coeff > 1) ++ bfqd->wr_busy_queues--; ++ ++ bfq_deactivate_bfqq(bfqd, bfqq, requeue); ++} ++ ++/* ++ * Called when an inactive queue receives a new request. ++ */ ++static void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ BUG_ON(bfq_bfqq_busy(bfqq)); ++ BUG_ON(bfqq == bfqd->in_service_queue); ++ ++ bfq_log_bfqq(bfqd, bfqq, "add to busy"); ++ ++ bfq_activate_bfqq(bfqd, bfqq); ++ ++ bfq_mark_bfqq_busy(bfqq); ++ bfqd->busy_queues++; ++ ++ if (!bfqq->dispatched) { ++ if (bfqq->wr_coeff == 1) ++ bfq_weights_tree_add(bfqd, &bfqq->entity, ++ &bfqd->queue_weights_tree); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ bfqd->busy_in_flight_queues++; ++ if (bfq_bfqq_constantly_seeky(bfqq)) ++ bfqd->const_seeky_busy_in_flight_queues++; ++ } ++ } ++ if (bfqq->wr_coeff > 1) ++ bfqd->wr_busy_queues++; ++} +diff --git a/block/bfq.h b/block/bfq.h +new file mode 100644 +index 0000000..3c5d85e +--- /dev/null ++++ b/block/bfq.h +@@ -0,0 +1,775 @@ ++/* ++ * BFQ-v7r7 for 3.19.0: data structures and common functions prototypes. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ */ ++ ++#ifndef _BFQ_H ++#define _BFQ_H ++ ++#include ++#include ++#include ++#include ++ ++#define BFQ_IOPRIO_CLASSES 3 ++#define BFQ_CL_IDLE_TIMEOUT (HZ/5) ++ ++#define BFQ_MIN_WEIGHT 1 ++#define BFQ_MAX_WEIGHT 1000 ++ ++#define BFQ_DEFAULT_QUEUE_IOPRIO 4 ++ ++#define BFQ_DEFAULT_GRP_WEIGHT 10 ++#define BFQ_DEFAULT_GRP_IOPRIO 0 ++#define BFQ_DEFAULT_GRP_CLASS IOPRIO_CLASS_BE ++ ++struct bfq_entity; ++ ++/** ++ * struct bfq_service_tree - per ioprio_class service tree. ++ * @active: tree for active entities (i.e., those backlogged). ++ * @idle: tree for idle entities (i.e., those not backlogged, with V <= F_i). ++ * @first_idle: idle entity with minimum F_i. ++ * @last_idle: idle entity with maximum F_i. ++ * @vtime: scheduler virtual time. ++ * @wsum: scheduler weight sum; active and idle entities contribute to it. ++ * ++ * Each service tree represents a B-WF2Q+ scheduler on its own. Each ++ * ioprio_class has its own independent scheduler, and so its own ++ * bfq_service_tree. All the fields are protected by the queue lock ++ * of the containing bfqd. ++ */ ++struct bfq_service_tree { ++ struct rb_root active; ++ struct rb_root idle; ++ ++ struct bfq_entity *first_idle; ++ struct bfq_entity *last_idle; ++ ++ u64 vtime; ++ unsigned long wsum; ++}; ++ ++/** ++ * struct bfq_sched_data - multi-class scheduler. ++ * @in_service_entity: entity in service. ++ * @next_in_service: head-of-the-line entity in the scheduler. ++ * @service_tree: array of service trees, one per ioprio_class. ++ * ++ * bfq_sched_data is the basic scheduler queue. It supports three ++ * ioprio_classes, and can be used either as a toplevel queue or as ++ * an intermediate queue on a hierarchical setup. ++ * @next_in_service points to the active entity of the sched_data ++ * service trees that will be scheduled next. ++ * ++ * The supported ioprio_classes are the same as in CFQ, in descending ++ * priority order, IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE. ++ * Requests from higher priority queues are served before all the ++ * requests from lower priority queues; among requests of the same ++ * queue requests are served according to B-WF2Q+. ++ * All the fields are protected by the queue lock of the containing bfqd. ++ */ ++struct bfq_sched_data { ++ struct bfq_entity *in_service_entity; ++ struct bfq_entity *next_in_service; ++ struct bfq_service_tree service_tree[BFQ_IOPRIO_CLASSES]; ++}; ++ ++/** ++ * struct bfq_weight_counter - counter of the number of all active entities ++ * with a given weight. ++ * @weight: weight of the entities that this counter refers to. ++ * @num_active: number of active entities with this weight. ++ * @weights_node: weights tree member (see bfq_data's @queue_weights_tree ++ * and @group_weights_tree). ++ */ ++struct bfq_weight_counter { ++ short int weight; ++ unsigned int num_active; ++ struct rb_node weights_node; ++}; ++ ++/** ++ * struct bfq_entity - schedulable entity. ++ * @rb_node: service_tree member. ++ * @weight_counter: pointer to the weight counter associated with this entity. ++ * @on_st: flag, true if the entity is on a tree (either the active or ++ * the idle one of its service_tree). ++ * @finish: B-WF2Q+ finish timestamp (aka F_i). ++ * @start: B-WF2Q+ start timestamp (aka S_i). ++ * @tree: tree the entity is enqueued into; %NULL if not on a tree. ++ * @min_start: minimum start time of the (active) subtree rooted at ++ * this entity; used for O(log N) lookups into active trees. ++ * @service: service received during the last round of service. ++ * @budget: budget used to calculate F_i; F_i = S_i + @budget / @weight. ++ * @weight: weight of the queue ++ * @parent: parent entity, for hierarchical scheduling. ++ * @my_sched_data: for non-leaf nodes in the cgroup hierarchy, the ++ * associated scheduler queue, %NULL on leaf nodes. ++ * @sched_data: the scheduler queue this entity belongs to. ++ * @ioprio: the ioprio in use. ++ * @new_weight: when a weight change is requested, the new weight value. ++ * @orig_weight: original weight, used to implement weight boosting ++ * @new_ioprio: when an ioprio change is requested, the new ioprio value. ++ * @ioprio_class: the ioprio_class in use. ++ * @new_ioprio_class: when an ioprio_class change is requested, the new ++ * ioprio_class value. ++ * @ioprio_changed: flag, true when the user requested a weight, ioprio or ++ * ioprio_class change. ++ * ++ * A bfq_entity is used to represent either a bfq_queue (leaf node in the ++ * cgroup hierarchy) or a bfq_group into the upper level scheduler. Each ++ * entity belongs to the sched_data of the parent group in the cgroup ++ * hierarchy. Non-leaf entities have also their own sched_data, stored ++ * in @my_sched_data. ++ * ++ * Each entity stores independently its priority values; this would ++ * allow different weights on different devices, but this ++ * functionality is not exported to userspace by now. Priorities and ++ * weights are updated lazily, first storing the new values into the ++ * new_* fields, then setting the @ioprio_changed flag. As soon as ++ * there is a transition in the entity state that allows the priority ++ * update to take place the effective and the requested priority ++ * values are synchronized. ++ * ++ * Unless cgroups are used, the weight value is calculated from the ++ * ioprio to export the same interface as CFQ. When dealing with ++ * ``well-behaved'' queues (i.e., queues that do not spend too much ++ * time to consume their budget and have true sequential behavior, and ++ * when there are no external factors breaking anticipation) the ++ * relative weights at each level of the cgroups hierarchy should be ++ * guaranteed. All the fields are protected by the queue lock of the ++ * containing bfqd. ++ */ ++struct bfq_entity { ++ struct rb_node rb_node; ++ struct bfq_weight_counter *weight_counter; ++ ++ int on_st; ++ ++ u64 finish; ++ u64 start; ++ ++ struct rb_root *tree; ++ ++ u64 min_start; ++ ++ unsigned long service, budget; ++ unsigned short weight, new_weight; ++ unsigned short orig_weight; ++ ++ struct bfq_entity *parent; ++ ++ struct bfq_sched_data *my_sched_data; ++ struct bfq_sched_data *sched_data; ++ ++ unsigned short ioprio, new_ioprio; ++ unsigned short ioprio_class, new_ioprio_class; ++ ++ int ioprio_changed; ++}; ++ ++struct bfq_group; ++ ++/** ++ * struct bfq_queue - leaf schedulable entity. ++ * @ref: reference counter. ++ * @bfqd: parent bfq_data. ++ * @new_bfqq: shared bfq_queue if queue is cooperating with ++ * one or more other queues. ++ * @pos_node: request-position tree member (see bfq_data's @rq_pos_tree). ++ * @pos_root: request-position tree root (see bfq_data's @rq_pos_tree). ++ * @sort_list: sorted list of pending requests. ++ * @next_rq: if fifo isn't expired, next request to serve. ++ * @queued: nr of requests queued in @sort_list. ++ * @allocated: currently allocated requests. ++ * @meta_pending: pending metadata requests. ++ * @fifo: fifo list of requests in sort_list. ++ * @entity: entity representing this queue in the scheduler. ++ * @max_budget: maximum budget allowed from the feedback mechanism. ++ * @budget_timeout: budget expiration (in jiffies). ++ * @dispatched: number of requests on the dispatch list or inside driver. ++ * @flags: status flags. ++ * @bfqq_list: node for active/idle bfqq list inside our bfqd. ++ * @burst_list_node: node for the device's burst list. ++ * @seek_samples: number of seeks sampled ++ * @seek_total: sum of the distances of the seeks sampled ++ * @seek_mean: mean seek distance ++ * @last_request_pos: position of the last request enqueued ++ * @requests_within_timer: number of consecutive pairs of request completion ++ * and arrival, such that the queue becomes idle ++ * after the completion, but the next request arrives ++ * within an idle time slice; used only if the queue's ++ * IO_bound has been cleared. ++ * @pid: pid of the process owning the queue, used for logging purposes. ++ * @last_wr_start_finish: start time of the current weight-raising period if ++ * the @bfq-queue is being weight-raised, otherwise ++ * finish time of the last weight-raising period ++ * @wr_cur_max_time: current max raising time for this queue ++ * @soft_rt_next_start: minimum time instant such that, only if a new ++ * request is enqueued after this time instant in an ++ * idle @bfq_queue with no outstanding requests, then ++ * the task associated with the queue it is deemed as ++ * soft real-time (see the comments to the function ++ * bfq_bfqq_softrt_next_start()). ++ * @last_idle_bklogged: time of the last transition of the @bfq_queue from ++ * idle to backlogged ++ * @service_from_backlogged: cumulative service received from the @bfq_queue ++ * since the last transition from idle to ++ * backlogged ++ * ++ * A bfq_queue is a leaf request queue; it can be associated with an io_context ++ * or more, if it is async or shared between cooperating processes. @cgroup ++ * holds a reference to the cgroup, to be sure that it does not disappear while ++ * a bfqq still references it (mostly to avoid races between request issuing and ++ * task migration followed by cgroup destruction). ++ * All the fields are protected by the queue lock of the containing bfqd. ++ */ ++struct bfq_queue { ++ atomic_t ref; ++ struct bfq_data *bfqd; ++ ++ /* fields for cooperating queues handling */ ++ struct bfq_queue *new_bfqq; ++ struct rb_node pos_node; ++ struct rb_root *pos_root; ++ ++ struct rb_root sort_list; ++ struct request *next_rq; ++ int queued[2]; ++ int allocated[2]; ++ int meta_pending; ++ struct list_head fifo; ++ ++ struct bfq_entity entity; ++ ++ unsigned long max_budget; ++ unsigned long budget_timeout; ++ ++ int dispatched; ++ ++ unsigned int flags; ++ ++ struct list_head bfqq_list; ++ ++ struct hlist_node burst_list_node; ++ ++ unsigned int seek_samples; ++ u64 seek_total; ++ sector_t seek_mean; ++ sector_t last_request_pos; ++ ++ unsigned int requests_within_timer; ++ ++ pid_t pid; ++ ++ /* weight-raising fields */ ++ unsigned long wr_cur_max_time; ++ unsigned long soft_rt_next_start; ++ unsigned long last_wr_start_finish; ++ unsigned int wr_coeff; ++ unsigned long last_idle_bklogged; ++ unsigned long service_from_backlogged; ++}; ++ ++/** ++ * struct bfq_ttime - per process thinktime stats. ++ * @ttime_total: total process thinktime ++ * @ttime_samples: number of thinktime samples ++ * @ttime_mean: average process thinktime ++ */ ++struct bfq_ttime { ++ unsigned long last_end_request; ++ ++ unsigned long ttime_total; ++ unsigned long ttime_samples; ++ unsigned long ttime_mean; ++}; ++ ++/** ++ * struct bfq_io_cq - per (request_queue, io_context) structure. ++ * @icq: associated io_cq structure ++ * @bfqq: array of two process queues, the sync and the async ++ * @ttime: associated @bfq_ttime struct ++ */ ++struct bfq_io_cq { ++ struct io_cq icq; /* must be the first member */ ++ struct bfq_queue *bfqq[2]; ++ struct bfq_ttime ttime; ++ int ioprio; ++}; ++ ++enum bfq_device_speed { ++ BFQ_BFQD_FAST, ++ BFQ_BFQD_SLOW, ++}; ++ ++/** ++ * struct bfq_data - per device data structure. ++ * @queue: request queue for the managed device. ++ * @root_group: root bfq_group for the device. ++ * @rq_pos_tree: rbtree sorted by next_request position, used when ++ * determining if two or more queues have interleaving ++ * requests (see bfq_close_cooperator()). ++ * @active_numerous_groups: number of bfq_groups containing more than one ++ * active @bfq_entity. ++ * @queue_weights_tree: rbtree of weight counters of @bfq_queues, sorted by ++ * weight. Used to keep track of whether all @bfq_queues ++ * have the same weight. The tree contains one counter ++ * for each distinct weight associated to some active ++ * and not weight-raised @bfq_queue (see the comments to ++ * the functions bfq_weights_tree_[add|remove] for ++ * further details). ++ * @group_weights_tree: rbtree of non-queue @bfq_entity weight counters, sorted ++ * by weight. Used to keep track of whether all ++ * @bfq_groups have the same weight. The tree contains ++ * one counter for each distinct weight associated to ++ * some active @bfq_group (see the comments to the ++ * functions bfq_weights_tree_[add|remove] for further ++ * details). ++ * @busy_queues: number of bfq_queues containing requests (including the ++ * queue in service, even if it is idling). ++ * @busy_in_flight_queues: number of @bfq_queues containing pending or ++ * in-flight requests, plus the @bfq_queue in ++ * service, even if idle but waiting for the ++ * possible arrival of its next sync request. This ++ * field is updated only if the device is rotational, ++ * but used only if the device is also NCQ-capable. ++ * The reason why the field is updated also for non- ++ * NCQ-capable rotational devices is related to the ++ * fact that the value of @hw_tag may be set also ++ * later than when busy_in_flight_queues may need to ++ * be incremented for the first time(s). Taking also ++ * this possibility into account, to avoid unbalanced ++ * increments/decrements, would imply more overhead ++ * than just updating busy_in_flight_queues ++ * regardless of the value of @hw_tag. ++ * @const_seeky_busy_in_flight_queues: number of constantly-seeky @bfq_queues ++ * (that is, seeky queues that expired ++ * for budget timeout at least once) ++ * containing pending or in-flight ++ * requests, including the in-service ++ * @bfq_queue if constantly seeky. This ++ * field is updated only if the device ++ * is rotational, but used only if the ++ * device is also NCQ-capable (see the ++ * comments to @busy_in_flight_queues). ++ * @wr_busy_queues: number of weight-raised busy @bfq_queues. ++ * @queued: number of queued requests. ++ * @rq_in_driver: number of requests dispatched and waiting for completion. ++ * @sync_flight: number of sync requests in the driver. ++ * @max_rq_in_driver: max number of reqs in driver in the last ++ * @hw_tag_samples completed requests. ++ * @hw_tag_samples: nr of samples used to calculate hw_tag. ++ * @hw_tag: flag set to one if the driver is showing a queueing behavior. ++ * @budgets_assigned: number of budgets assigned. ++ * @idle_slice_timer: timer set when idling for the next sequential request ++ * from the queue in service. ++ * @unplug_work: delayed work to restart dispatching on the request queue. ++ * @in_service_queue: bfq_queue in service. ++ * @in_service_bic: bfq_io_cq (bic) associated with the @in_service_queue. ++ * @last_position: on-disk position of the last served request. ++ * @last_budget_start: beginning of the last budget. ++ * @last_idling_start: beginning of the last idle slice. ++ * @peak_rate: peak transfer rate observed for a budget. ++ * @peak_rate_samples: number of samples used to calculate @peak_rate. ++ * @bfq_max_budget: maximum budget allotted to a bfq_queue before ++ * rescheduling. ++ * @group_list: list of all the bfq_groups active on the device. ++ * @active_list: list of all the bfq_queues active on the device. ++ * @idle_list: list of all the bfq_queues idle on the device. ++ * @bfq_quantum: max number of requests dispatched per dispatch round. ++ * @bfq_fifo_expire: timeout for async/sync requests; when it expires ++ * requests are served in fifo order. ++ * @bfq_back_penalty: weight of backward seeks wrt forward ones. ++ * @bfq_back_max: maximum allowed backward seek. ++ * @bfq_slice_idle: maximum idling time. ++ * @bfq_user_max_budget: user-configured max budget value ++ * (0 for auto-tuning). ++ * @bfq_max_budget_async_rq: maximum budget (in nr of requests) allotted to ++ * async queues. ++ * @bfq_timeout: timeout for bfq_queues to consume their budget; used to ++ * to prevent seeky queues to impose long latencies to well ++ * behaved ones (this also implies that seeky queues cannot ++ * receive guarantees in the service domain; after a timeout ++ * they are charged for the whole allocated budget, to try ++ * to preserve a behavior reasonably fair among them, but ++ * without service-domain guarantees). ++ * @bfq_coop_thresh: number of queue merges after which a @bfq_queue is ++ * no more granted any weight-raising. ++ * @bfq_failed_cooperations: number of consecutive failed cooperation ++ * chances after which weight-raising is restored ++ * to a queue subject to more than bfq_coop_thresh ++ * queue merges. ++ * @bfq_requests_within_timer: number of consecutive requests that must be ++ * issued within the idle time slice to set ++ * again idling to a queue which was marked as ++ * non-I/O-bound (see the definition of the ++ * IO_bound flag for further details). ++ * @last_ins_in_burst: last time at which a queue entered the current ++ * burst of queues being activated shortly after ++ * each other; for more details about this and the ++ * following parameters related to a burst of ++ * activations, see the comments to the function ++ * @bfq_handle_burst. ++ * @bfq_burst_interval: reference time interval used to decide whether a ++ * queue has been activated shortly after ++ * @last_ins_in_burst. ++ * @burst_size: number of queues in the current burst of queue activations. ++ * @bfq_large_burst_thresh: maximum burst size above which the current ++ * queue-activation burst is deemed as 'large'. ++ * @large_burst: true if a large queue-activation burst is in progress. ++ * @burst_list: head of the burst list (as for the above fields, more details ++ * in the comments to the function bfq_handle_burst). ++ * @low_latency: if set to true, low-latency heuristics are enabled. ++ * @bfq_wr_coeff: maximum factor by which the weight of a weight-raised ++ * queue is multiplied. ++ * @bfq_wr_max_time: maximum duration of a weight-raising period (jiffies). ++ * @bfq_wr_rt_max_time: maximum duration for soft real-time processes. ++ * @bfq_wr_min_idle_time: minimum idle period after which weight-raising ++ * may be reactivated for a queue (in jiffies). ++ * @bfq_wr_min_inter_arr_async: minimum period between request arrivals ++ * after which weight-raising may be ++ * reactivated for an already busy queue ++ * (in jiffies). ++ * @bfq_wr_max_softrt_rate: max service-rate for a soft real-time queue, ++ * sectors per seconds. ++ * @RT_prod: cached value of the product R*T used for computing the maximum ++ * duration of the weight raising automatically. ++ * @device_speed: device-speed class for the low-latency heuristic. ++ * @oom_bfqq: fallback dummy bfqq for extreme OOM conditions. ++ * ++ * All the fields are protected by the @queue lock. ++ */ ++struct bfq_data { ++ struct request_queue *queue; ++ ++ struct bfq_group *root_group; ++ struct rb_root rq_pos_tree; ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ int active_numerous_groups; ++#endif ++ ++ struct rb_root queue_weights_tree; ++ struct rb_root group_weights_tree; ++ ++ int busy_queues; ++ int busy_in_flight_queues; ++ int const_seeky_busy_in_flight_queues; ++ int wr_busy_queues; ++ int queued; ++ int rq_in_driver; ++ int sync_flight; ++ ++ int max_rq_in_driver; ++ int hw_tag_samples; ++ int hw_tag; ++ ++ int budgets_assigned; ++ ++ struct timer_list idle_slice_timer; ++ struct work_struct unplug_work; ++ ++ struct bfq_queue *in_service_queue; ++ struct bfq_io_cq *in_service_bic; ++ ++ sector_t last_position; ++ ++ ktime_t last_budget_start; ++ ktime_t last_idling_start; ++ int peak_rate_samples; ++ u64 peak_rate; ++ unsigned long bfq_max_budget; ++ ++ struct hlist_head group_list; ++ struct list_head active_list; ++ struct list_head idle_list; ++ ++ unsigned int bfq_quantum; ++ unsigned int bfq_fifo_expire[2]; ++ unsigned int bfq_back_penalty; ++ unsigned int bfq_back_max; ++ unsigned int bfq_slice_idle; ++ u64 bfq_class_idle_last_service; ++ ++ unsigned int bfq_user_max_budget; ++ unsigned int bfq_max_budget_async_rq; ++ unsigned int bfq_timeout[2]; ++ ++ unsigned int bfq_coop_thresh; ++ unsigned int bfq_failed_cooperations; ++ unsigned int bfq_requests_within_timer; ++ ++ unsigned long last_ins_in_burst; ++ unsigned long bfq_burst_interval; ++ int burst_size; ++ unsigned long bfq_large_burst_thresh; ++ bool large_burst; ++ struct hlist_head burst_list; ++ ++ bool low_latency; ++ ++ /* parameters of the low_latency heuristics */ ++ unsigned int bfq_wr_coeff; ++ unsigned int bfq_wr_max_time; ++ unsigned int bfq_wr_rt_max_time; ++ unsigned int bfq_wr_min_idle_time; ++ unsigned long bfq_wr_min_inter_arr_async; ++ unsigned int bfq_wr_max_softrt_rate; ++ u64 RT_prod; ++ enum bfq_device_speed device_speed; ++ ++ struct bfq_queue oom_bfqq; ++}; ++ ++enum bfqq_state_flags { ++ BFQ_BFQQ_FLAG_busy = 0, /* has requests or is in service */ ++ BFQ_BFQQ_FLAG_wait_request, /* waiting for a request */ ++ BFQ_BFQQ_FLAG_must_alloc, /* must be allowed rq alloc */ ++ BFQ_BFQQ_FLAG_fifo_expire, /* FIFO checked in this slice */ ++ BFQ_BFQQ_FLAG_idle_window, /* slice idling enabled */ ++ BFQ_BFQQ_FLAG_prio_changed, /* task priority has changed */ ++ BFQ_BFQQ_FLAG_sync, /* synchronous queue */ ++ BFQ_BFQQ_FLAG_budget_new, /* no completion with this budget */ ++ BFQ_BFQQ_FLAG_IO_bound, /* ++ * bfqq has timed-out at least once ++ * having consumed at most 2/10 of ++ * its budget ++ */ ++ BFQ_BFQQ_FLAG_in_large_burst, /* ++ * bfqq activated in a large burst, ++ * see comments to bfq_handle_burst. ++ */ ++ BFQ_BFQQ_FLAG_constantly_seeky, /* ++ * bfqq has proved to be slow and ++ * seeky until budget timeout ++ */ ++ BFQ_BFQQ_FLAG_softrt_update, /* ++ * may need softrt-next-start ++ * update ++ */ ++ BFQ_BFQQ_FLAG_coop, /* bfqq is shared */ ++ BFQ_BFQQ_FLAG_split_coop, /* shared bfqq will be splitted */ ++}; ++ ++#define BFQ_BFQQ_FNS(name) \ ++static inline void bfq_mark_bfqq_##name(struct bfq_queue *bfqq) \ ++{ \ ++ (bfqq)->flags |= (1 << BFQ_BFQQ_FLAG_##name); \ ++} \ ++static inline void bfq_clear_bfqq_##name(struct bfq_queue *bfqq) \ ++{ \ ++ (bfqq)->flags &= ~(1 << BFQ_BFQQ_FLAG_##name); \ ++} \ ++static inline int bfq_bfqq_##name(const struct bfq_queue *bfqq) \ ++{ \ ++ return ((bfqq)->flags & (1 << BFQ_BFQQ_FLAG_##name)) != 0; \ ++} ++ ++BFQ_BFQQ_FNS(busy); ++BFQ_BFQQ_FNS(wait_request); ++BFQ_BFQQ_FNS(must_alloc); ++BFQ_BFQQ_FNS(fifo_expire); ++BFQ_BFQQ_FNS(idle_window); ++BFQ_BFQQ_FNS(prio_changed); ++BFQ_BFQQ_FNS(sync); ++BFQ_BFQQ_FNS(budget_new); ++BFQ_BFQQ_FNS(IO_bound); ++BFQ_BFQQ_FNS(in_large_burst); ++BFQ_BFQQ_FNS(constantly_seeky); ++BFQ_BFQQ_FNS(coop); ++BFQ_BFQQ_FNS(split_coop); ++BFQ_BFQQ_FNS(softrt_update); ++#undef BFQ_BFQQ_FNS ++ ++/* Logging facilities. */ ++#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) \ ++ blk_add_trace_msg((bfqd)->queue, "bfq%d " fmt, (bfqq)->pid, ##args) ++ ++#define bfq_log(bfqd, fmt, args...) \ ++ blk_add_trace_msg((bfqd)->queue, "bfq " fmt, ##args) ++ ++/* Expiration reasons. */ ++enum bfqq_expiration { ++ BFQ_BFQQ_TOO_IDLE = 0, /* ++ * queue has been idling for ++ * too long ++ */ ++ BFQ_BFQQ_BUDGET_TIMEOUT, /* budget took too long to be used */ ++ BFQ_BFQQ_BUDGET_EXHAUSTED, /* budget consumed */ ++ BFQ_BFQQ_NO_MORE_REQUESTS, /* the queue has no more requests */ ++}; ++ ++#ifdef CONFIG_CGROUP_BFQIO ++/** ++ * struct bfq_group - per (device, cgroup) data structure. ++ * @entity: schedulable entity to insert into the parent group sched_data. ++ * @sched_data: own sched_data, to contain child entities (they may be ++ * both bfq_queues and bfq_groups). ++ * @group_node: node to be inserted into the bfqio_cgroup->group_data ++ * list of the containing cgroup's bfqio_cgroup. ++ * @bfqd_node: node to be inserted into the @bfqd->group_list list ++ * of the groups active on the same device; used for cleanup. ++ * @bfqd: the bfq_data for the device this group acts upon. ++ * @async_bfqq: array of async queues for all the tasks belonging to ++ * the group, one queue per ioprio value per ioprio_class, ++ * except for the idle class that has only one queue. ++ * @async_idle_bfqq: async queue for the idle class (ioprio is ignored). ++ * @my_entity: pointer to @entity, %NULL for the toplevel group; used ++ * to avoid too many special cases during group creation/ ++ * migration. ++ * @active_entities: number of active entities belonging to the group; ++ * unused for the root group. Used to know whether there ++ * are groups with more than one active @bfq_entity ++ * (see the comments to the function ++ * bfq_bfqq_must_not_expire()). ++ * ++ * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup ++ * there is a set of bfq_groups, each one collecting the lower-level ++ * entities belonging to the group that are acting on the same device. ++ * ++ * Locking works as follows: ++ * o @group_node is protected by the bfqio_cgroup lock, and is accessed ++ * via RCU from its readers. ++ * o @bfqd is protected by the queue lock, RCU is used to access it ++ * from the readers. ++ * o All the other fields are protected by the @bfqd queue lock. ++ */ ++struct bfq_group { ++ struct bfq_entity entity; ++ struct bfq_sched_data sched_data; ++ ++ struct hlist_node group_node; ++ struct hlist_node bfqd_node; ++ ++ void *bfqd; ++ ++ struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR]; ++ struct bfq_queue *async_idle_bfqq; ++ ++ struct bfq_entity *my_entity; ++ ++ int active_entities; ++}; ++ ++/** ++ * struct bfqio_cgroup - bfq cgroup data structure. ++ * @css: subsystem state for bfq in the containing cgroup. ++ * @online: flag marked when the subsystem is inserted. ++ * @weight: cgroup weight. ++ * @ioprio: cgroup ioprio. ++ * @ioprio_class: cgroup ioprio_class. ++ * @lock: spinlock that protects @ioprio, @ioprio_class and @group_data. ++ * @group_data: list containing the bfq_group belonging to this cgroup. ++ * ++ * @group_data is accessed using RCU, with @lock protecting the updates, ++ * @ioprio and @ioprio_class are protected by @lock. ++ */ ++struct bfqio_cgroup { ++ struct cgroup_subsys_state css; ++ bool online; ++ ++ unsigned short weight, ioprio, ioprio_class; ++ ++ spinlock_t lock; ++ struct hlist_head group_data; ++}; ++#else ++struct bfq_group { ++ struct bfq_sched_data sched_data; ++ ++ struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR]; ++ struct bfq_queue *async_idle_bfqq; ++}; ++#endif ++ ++static inline struct bfq_service_tree * ++bfq_entity_service_tree(struct bfq_entity *entity) ++{ ++ struct bfq_sched_data *sched_data = entity->sched_data; ++ unsigned int idx = entity->ioprio_class - 1; ++ ++ BUG_ON(idx >= BFQ_IOPRIO_CLASSES); ++ BUG_ON(sched_data == NULL); ++ ++ return sched_data->service_tree + idx; ++} ++ ++static inline struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, ++ bool is_sync) ++{ ++ return bic->bfqq[is_sync]; ++} ++ ++static inline void bic_set_bfqq(struct bfq_io_cq *bic, ++ struct bfq_queue *bfqq, bool is_sync) ++{ ++ bic->bfqq[is_sync] = bfqq; ++} ++ ++static inline struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic) ++{ ++ return bic->icq.q->elevator->elevator_data; ++} ++ ++/** ++ * bfq_get_bfqd_locked - get a lock to a bfqd using a RCU protected pointer. ++ * @ptr: a pointer to a bfqd. ++ * @flags: storage for the flags to be saved. ++ * ++ * This function allows bfqg->bfqd to be protected by the ++ * queue lock of the bfqd they reference; the pointer is dereferenced ++ * under RCU, so the storage for bfqd is assured to be safe as long ++ * as the RCU read side critical section does not end. After the ++ * bfqd->queue->queue_lock is taken the pointer is rechecked, to be ++ * sure that no other writer accessed it. If we raced with a writer, ++ * the function returns NULL, with the queue unlocked, otherwise it ++ * returns the dereferenced pointer, with the queue locked. ++ */ ++static inline struct bfq_data *bfq_get_bfqd_locked(void **ptr, ++ unsigned long *flags) ++{ ++ struct bfq_data *bfqd; ++ ++ rcu_read_lock(); ++ bfqd = rcu_dereference(*(struct bfq_data **)ptr); ++ ++ if (bfqd != NULL) { ++ spin_lock_irqsave(bfqd->queue->queue_lock, *flags); ++ if (*ptr == bfqd) ++ goto out; ++ spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags); ++ } ++ ++ bfqd = NULL; ++out: ++ rcu_read_unlock(); ++ return bfqd; ++} ++ ++static inline void bfq_put_bfqd_unlock(struct bfq_data *bfqd, ++ unsigned long *flags) ++{ ++ spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags); ++} ++ ++static void bfq_changed_ioprio(struct bfq_io_cq *bic); ++static void bfq_put_queue(struct bfq_queue *bfqq); ++static void bfq_dispatch_insert(struct request_queue *q, struct request *rq); ++static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, int is_sync, ++ struct bfq_io_cq *bic, gfp_t gfp_mask); ++static void bfq_end_wr_async_queues(struct bfq_data *bfqd, ++ struct bfq_group *bfqg); ++static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg); ++static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq); ++ ++#endif /* _BFQ_H */ +-- +2.3.0 + diff --git a/kernel/kernel/files/patches/gentoo/5002_block-introduce-the-BFQ-v7r7-I-O-sched-for-3.19.patch1.txt b/kernel/kernel/files/patches/gentoo/5002_block-introduce-the-BFQ-v7r7-I-O-sched-for-3.19.patch1.txt new file mode 100644 index 00000000..fb96ff28 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/5002_block-introduce-the-BFQ-v7r7-I-O-sched-for-3.19.patch1.txt @@ -0,0 +1,6966 @@ +From 5bfaaa91a51940efaccb66bc5cd562ba3b9d4053 Mon Sep 17 00:00:00 2001 +From: Paolo Valente +Date: Thu, 9 May 2013 19:10:02 +0200 +Subject: [PATCH 2/3] block: introduce the BFQ-v7r7 I/O sched for 3.19 + +Add the BFQ-v7r7 I/O scheduler to 3.19. +The general structure is borrowed from CFQ, as much of the code for +handling I/O contexts. Over time, several useful features have been +ported from CFQ as well (details in the changelog in README.BFQ). A +(bfq_)queue is associated to each task doing I/O on a device, and each +time a scheduling decision has to be made a queue is selected and served +until it expires. + + - Slices are given in the service domain: tasks are assigned + budgets, measured in number of sectors. Once got the disk, a task + must however consume its assigned budget within a configurable + maximum time (by default, the maximum possible value of the + budgets is automatically computed to comply with this timeout). + This allows the desired latency vs "throughput boosting" tradeoff + to be set. + + - Budgets are scheduled according to a variant of WF2Q+, implemented + using an augmented rb-tree to take eligibility into account while + preserving an O(log N) overall complexity. + + - A low-latency tunable is provided; if enabled, both interactive + and soft real-time applications are guaranteed a very low latency. + + - Latency guarantees are preserved also in the presence of NCQ. + + - Also with flash-based devices, a high throughput is achieved + while still preserving latency guarantees. + + - BFQ features Early Queue Merge (EQM), a sort of fusion of the + cooperating-queue-merging and the preemption mechanisms present + in CFQ. EQM is in fact a unified mechanism that tries to get a + sequential read pattern, and hence a high throughput, with any + set of processes performing interleaved I/O over a contiguous + sequence of sectors. + + - BFQ supports full hierarchical scheduling, exporting a cgroups + interface. Since each node has a full scheduler, each group can + be assigned its own weight. + + - If the cgroups interface is not used, only I/O priorities can be + assigned to processes, with ioprio values mapped to weights + with the relation weight = IOPRIO_BE_NR - ioprio. + + - ioprio classes are served in strict priority order, i.e., lower + priority queues are not served as long as there are higher + priority queues. Among queues in the same class the bandwidth is + distributed in proportion to the weight of each queue. A very + thin extra bandwidth is however guaranteed to the Idle class, to + prevent it from starving. + +Signed-off-by: Paolo Valente +Signed-off-by: Arianna Avanzini +--- + block/bfq-cgroup.c | 936 ++++++++++++ + block/bfq-ioc.c | 36 + + block/bfq-iosched.c | 3902 +++++++++++++++++++++++++++++++++++++++++++++++++++ + block/bfq-sched.c | 1214 ++++++++++++++++ + block/bfq.h | 775 ++++++++++ + 5 files changed, 6863 insertions(+) + create mode 100644 block/bfq-cgroup.c + create mode 100644 block/bfq-ioc.c + create mode 100644 block/bfq-iosched.c + create mode 100644 block/bfq-sched.c + create mode 100644 block/bfq.h + +diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c +new file mode 100644 +index 0000000..11e2f1d +--- /dev/null ++++ b/block/bfq-cgroup.c +@@ -0,0 +1,936 @@ ++/* ++ * BFQ: CGROUPS support. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ * ++ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ ++ * file. ++ */ ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ ++static DEFINE_MUTEX(bfqio_mutex); ++ ++static bool bfqio_is_removed(struct bfqio_cgroup *bgrp) ++{ ++ return bgrp ? !bgrp->online : false; ++} ++ ++static struct bfqio_cgroup bfqio_root_cgroup = { ++ .weight = BFQ_DEFAULT_GRP_WEIGHT, ++ .ioprio = BFQ_DEFAULT_GRP_IOPRIO, ++ .ioprio_class = BFQ_DEFAULT_GRP_CLASS, ++}; ++ ++static inline void bfq_init_entity(struct bfq_entity *entity, ++ struct bfq_group *bfqg) ++{ ++ entity->weight = entity->new_weight; ++ entity->orig_weight = entity->new_weight; ++ entity->ioprio = entity->new_ioprio; ++ entity->ioprio_class = entity->new_ioprio_class; ++ entity->parent = bfqg->my_entity; ++ entity->sched_data = &bfqg->sched_data; ++} ++ ++static struct bfqio_cgroup *css_to_bfqio(struct cgroup_subsys_state *css) ++{ ++ return css ? container_of(css, struct bfqio_cgroup, css) : NULL; ++} ++ ++/* ++ * Search the bfq_group for bfqd into the hash table (by now only a list) ++ * of bgrp. Must be called under rcu_read_lock(). ++ */ ++static struct bfq_group *bfqio_lookup_group(struct bfqio_cgroup *bgrp, ++ struct bfq_data *bfqd) ++{ ++ struct bfq_group *bfqg; ++ void *key; ++ ++ hlist_for_each_entry_rcu(bfqg, &bgrp->group_data, group_node) { ++ key = rcu_dereference(bfqg->bfqd); ++ if (key == bfqd) ++ return bfqg; ++ } ++ ++ return NULL; ++} ++ ++static inline void bfq_group_init_entity(struct bfqio_cgroup *bgrp, ++ struct bfq_group *bfqg) ++{ ++ struct bfq_entity *entity = &bfqg->entity; ++ ++ /* ++ * If the weight of the entity has never been set via the sysfs ++ * interface, then bgrp->weight == 0. In this case we initialize ++ * the weight from the current ioprio value. Otherwise, the group ++ * weight, if set, has priority over the ioprio value. ++ */ ++ if (bgrp->weight == 0) { ++ entity->new_weight = bfq_ioprio_to_weight(bgrp->ioprio); ++ entity->new_ioprio = bgrp->ioprio; ++ } else { ++ if (bgrp->weight < BFQ_MIN_WEIGHT || ++ bgrp->weight > BFQ_MAX_WEIGHT) { ++ printk(KERN_CRIT "bfq_group_init_entity: " ++ "bgrp->weight %d\n", bgrp->weight); ++ BUG(); ++ } ++ entity->new_weight = bgrp->weight; ++ entity->new_ioprio = bfq_weight_to_ioprio(bgrp->weight); ++ } ++ entity->orig_weight = entity->weight = entity->new_weight; ++ entity->ioprio = entity->new_ioprio; ++ entity->ioprio_class = entity->new_ioprio_class = bgrp->ioprio_class; ++ entity->my_sched_data = &bfqg->sched_data; ++ bfqg->active_entities = 0; ++} ++ ++static inline void bfq_group_set_parent(struct bfq_group *bfqg, ++ struct bfq_group *parent) ++{ ++ struct bfq_entity *entity; ++ ++ BUG_ON(parent == NULL); ++ BUG_ON(bfqg == NULL); ++ ++ entity = &bfqg->entity; ++ entity->parent = parent->my_entity; ++ entity->sched_data = &parent->sched_data; ++} ++ ++/** ++ * bfq_group_chain_alloc - allocate a chain of groups. ++ * @bfqd: queue descriptor. ++ * @css: the leaf cgroup_subsys_state this chain starts from. ++ * ++ * Allocate a chain of groups starting from the one belonging to ++ * @cgroup up to the root cgroup. Stop if a cgroup on the chain ++ * to the root has already an allocated group on @bfqd. ++ */ ++static struct bfq_group *bfq_group_chain_alloc(struct bfq_data *bfqd, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp; ++ struct bfq_group *bfqg, *prev = NULL, *leaf = NULL; ++ ++ for (; css != NULL; css = css->parent) { ++ bgrp = css_to_bfqio(css); ++ ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ if (bfqg != NULL) { ++ /* ++ * All the cgroups in the path from there to the ++ * root must have a bfq_group for bfqd, so we don't ++ * need any more allocations. ++ */ ++ break; ++ } ++ ++ bfqg = kzalloc(sizeof(*bfqg), GFP_ATOMIC); ++ if (bfqg == NULL) ++ goto cleanup; ++ ++ bfq_group_init_entity(bgrp, bfqg); ++ bfqg->my_entity = &bfqg->entity; ++ ++ if (leaf == NULL) { ++ leaf = bfqg; ++ prev = leaf; ++ } else { ++ bfq_group_set_parent(prev, bfqg); ++ /* ++ * Build a list of allocated nodes using the bfqd ++ * filed, that is still unused and will be ++ * initialized only after the node will be ++ * connected. ++ */ ++ prev->bfqd = bfqg; ++ prev = bfqg; ++ } ++ } ++ ++ return leaf; ++ ++cleanup: ++ while (leaf != NULL) { ++ prev = leaf; ++ leaf = leaf->bfqd; ++ kfree(prev); ++ } ++ ++ return NULL; ++} ++ ++/** ++ * bfq_group_chain_link - link an allocated group chain to a cgroup ++ * hierarchy. ++ * @bfqd: the queue descriptor. ++ * @css: the leaf cgroup_subsys_state to start from. ++ * @leaf: the leaf group (to be associated to @cgroup). ++ * ++ * Try to link a chain of groups to a cgroup hierarchy, connecting the ++ * nodes bottom-up, so we can be sure that when we find a cgroup in the ++ * hierarchy that already as a group associated to @bfqd all the nodes ++ * in the path to the root cgroup have one too. ++ * ++ * On locking: the queue lock protects the hierarchy (there is a hierarchy ++ * per device) while the bfqio_cgroup lock protects the list of groups ++ * belonging to the same cgroup. ++ */ ++static void bfq_group_chain_link(struct bfq_data *bfqd, ++ struct cgroup_subsys_state *css, ++ struct bfq_group *leaf) ++{ ++ struct bfqio_cgroup *bgrp; ++ struct bfq_group *bfqg, *next, *prev = NULL; ++ unsigned long flags; ++ ++ assert_spin_locked(bfqd->queue->queue_lock); ++ ++ for (; css != NULL && leaf != NULL; css = css->parent) { ++ bgrp = css_to_bfqio(css); ++ next = leaf->bfqd; ++ ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ BUG_ON(bfqg != NULL); ++ ++ spin_lock_irqsave(&bgrp->lock, flags); ++ ++ rcu_assign_pointer(leaf->bfqd, bfqd); ++ hlist_add_head_rcu(&leaf->group_node, &bgrp->group_data); ++ hlist_add_head(&leaf->bfqd_node, &bfqd->group_list); ++ ++ spin_unlock_irqrestore(&bgrp->lock, flags); ++ ++ prev = leaf; ++ leaf = next; ++ } ++ ++ BUG_ON(css == NULL && leaf != NULL); ++ if (css != NULL && prev != NULL) { ++ bgrp = css_to_bfqio(css); ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ bfq_group_set_parent(prev, bfqg); ++ } ++} ++ ++/** ++ * bfq_find_alloc_group - return the group associated to @bfqd in @cgroup. ++ * @bfqd: queue descriptor. ++ * @cgroup: cgroup being searched for. ++ * ++ * Return a group associated to @bfqd in @cgroup, allocating one if ++ * necessary. When a group is returned all the cgroups in the path ++ * to the root have a group associated to @bfqd. ++ * ++ * If the allocation fails, return the root group: this breaks guarantees ++ * but is a safe fallback. If this loss becomes a problem it can be ++ * mitigated using the equivalent weight (given by the product of the ++ * weights of the groups in the path from @group to the root) in the ++ * root scheduler. ++ * ++ * We allocate all the missing nodes in the path from the leaf cgroup ++ * to the root and we connect the nodes only after all the allocations ++ * have been successful. ++ */ ++static struct bfq_group *bfq_find_alloc_group(struct bfq_data *bfqd, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ struct bfq_group *bfqg; ++ ++ bfqg = bfqio_lookup_group(bgrp, bfqd); ++ if (bfqg != NULL) ++ return bfqg; ++ ++ bfqg = bfq_group_chain_alloc(bfqd, css); ++ if (bfqg != NULL) ++ bfq_group_chain_link(bfqd, css, bfqg); ++ else ++ bfqg = bfqd->root_group; ++ ++ return bfqg; ++} ++ ++/** ++ * bfq_bfqq_move - migrate @bfqq to @bfqg. ++ * @bfqd: queue descriptor. ++ * @bfqq: the queue to move. ++ * @entity: @bfqq's entity. ++ * @bfqg: the group to move to. ++ * ++ * Move @bfqq to @bfqg, deactivating it from its old group and reactivating ++ * it on the new one. Avoid putting the entity on the old group idle tree. ++ * ++ * Must be called under the queue lock; the cgroup owning @bfqg must ++ * not disappear (by now this just means that we are called under ++ * rcu_read_lock()). ++ */ ++static void bfq_bfqq_move(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ struct bfq_entity *entity, struct bfq_group *bfqg) ++{ ++ int busy, resume; ++ ++ busy = bfq_bfqq_busy(bfqq); ++ resume = !RB_EMPTY_ROOT(&bfqq->sort_list); ++ ++ BUG_ON(resume && !entity->on_st); ++ BUG_ON(busy && !resume && entity->on_st && ++ bfqq != bfqd->in_service_queue); ++ ++ if (busy) { ++ BUG_ON(atomic_read(&bfqq->ref) < 2); ++ ++ if (!resume) ++ bfq_del_bfqq_busy(bfqd, bfqq, 0); ++ else ++ bfq_deactivate_bfqq(bfqd, bfqq, 0); ++ } else if (entity->on_st) ++ bfq_put_idle_entity(bfq_entity_service_tree(entity), entity); ++ ++ /* ++ * Here we use a reference to bfqg. We don't need a refcounter ++ * as the cgroup reference will not be dropped, so that its ++ * destroy() callback will not be invoked. ++ */ ++ entity->parent = bfqg->my_entity; ++ entity->sched_data = &bfqg->sched_data; ++ ++ if (busy && resume) ++ bfq_activate_bfqq(bfqd, bfqq); ++ ++ if (bfqd->in_service_queue == NULL && !bfqd->rq_in_driver) ++ bfq_schedule_dispatch(bfqd); ++} ++ ++/** ++ * __bfq_bic_change_cgroup - move @bic to @cgroup. ++ * @bfqd: the queue descriptor. ++ * @bic: the bic to move. ++ * @cgroup: the cgroup to move to. ++ * ++ * Move bic to cgroup, assuming that bfqd->queue is locked; the caller ++ * has to make sure that the reference to cgroup is valid across the call. ++ * ++ * NOTE: an alternative approach might have been to store the current ++ * cgroup in bfqq and getting a reference to it, reducing the lookup ++ * time here, at the price of slightly more complex code. ++ */ ++static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd, ++ struct bfq_io_cq *bic, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfq_queue *async_bfqq = bic_to_bfqq(bic, 0); ++ struct bfq_queue *sync_bfqq = bic_to_bfqq(bic, 1); ++ struct bfq_entity *entity; ++ struct bfq_group *bfqg; ++ struct bfqio_cgroup *bgrp; ++ ++ bgrp = css_to_bfqio(css); ++ ++ bfqg = bfq_find_alloc_group(bfqd, css); ++ if (async_bfqq != NULL) { ++ entity = &async_bfqq->entity; ++ ++ if (entity->sched_data != &bfqg->sched_data) { ++ bic_set_bfqq(bic, NULL, 0); ++ bfq_log_bfqq(bfqd, async_bfqq, ++ "bic_change_group: %p %d", ++ async_bfqq, atomic_read(&async_bfqq->ref)); ++ bfq_put_queue(async_bfqq); ++ } ++ } ++ ++ if (sync_bfqq != NULL) { ++ entity = &sync_bfqq->entity; ++ if (entity->sched_data != &bfqg->sched_data) ++ bfq_bfqq_move(bfqd, sync_bfqq, entity, bfqg); ++ } ++ ++ return bfqg; ++} ++ ++/** ++ * bfq_bic_change_cgroup - move @bic to @cgroup. ++ * @bic: the bic being migrated. ++ * @cgroup: the destination cgroup. ++ * ++ * When the task owning @bic is moved to @cgroup, @bic is immediately ++ * moved into its new parent group. ++ */ ++static void bfq_bic_change_cgroup(struct bfq_io_cq *bic, ++ struct cgroup_subsys_state *css) ++{ ++ struct bfq_data *bfqd; ++ unsigned long uninitialized_var(flags); ++ ++ bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data), ++ &flags); ++ if (bfqd != NULL) { ++ __bfq_bic_change_cgroup(bfqd, bic, css); ++ bfq_put_bfqd_unlock(bfqd, &flags); ++ } ++} ++ ++/** ++ * bfq_bic_update_cgroup - update the cgroup of @bic. ++ * @bic: the @bic to update. ++ * ++ * Make sure that @bic is enqueued in the cgroup of the current task. ++ * We need this in addition to moving bics during the cgroup attach ++ * phase because the task owning @bic could be at its first disk ++ * access or we may end up in the root cgroup as the result of a ++ * memory allocation failure and here we try to move to the right ++ * group. ++ * ++ * Must be called under the queue lock. It is safe to use the returned ++ * value even after the rcu_read_unlock() as the migration/destruction ++ * paths act under the queue lock too. IOW it is impossible to race with ++ * group migration/destruction and end up with an invalid group as: ++ * a) here cgroup has not yet been destroyed, nor its destroy callback ++ * has started execution, as current holds a reference to it, ++ * b) if it is destroyed after rcu_read_unlock() [after current is ++ * migrated to a different cgroup] its attach() callback will have ++ * taken care of remove all the references to the old cgroup data. ++ */ ++static struct bfq_group *bfq_bic_update_cgroup(struct bfq_io_cq *bic) ++{ ++ struct bfq_data *bfqd = bic_to_bfqd(bic); ++ struct bfq_group *bfqg; ++ struct cgroup_subsys_state *css; ++ ++ BUG_ON(bfqd == NULL); ++ ++ rcu_read_lock(); ++ css = task_css(current, bfqio_cgrp_id); ++ bfqg = __bfq_bic_change_cgroup(bfqd, bic, css); ++ rcu_read_unlock(); ++ ++ return bfqg; ++} ++ ++/** ++ * bfq_flush_idle_tree - deactivate any entity on the idle tree of @st. ++ * @st: the service tree being flushed. ++ */ ++static inline void bfq_flush_idle_tree(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *entity = st->first_idle; ++ ++ for (; entity != NULL; entity = st->first_idle) ++ __bfq_deactivate_entity(entity, 0); ++} ++ ++/** ++ * bfq_reparent_leaf_entity - move leaf entity to the root_group. ++ * @bfqd: the device data structure with the root group. ++ * @entity: the entity to move. ++ */ ++static inline void bfq_reparent_leaf_entity(struct bfq_data *bfqd, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ ++ BUG_ON(bfqq == NULL); ++ bfq_bfqq_move(bfqd, bfqq, entity, bfqd->root_group); ++ return; ++} ++ ++/** ++ * bfq_reparent_active_entities - move to the root group all active ++ * entities. ++ * @bfqd: the device data structure with the root group. ++ * @bfqg: the group to move from. ++ * @st: the service tree with the entities. ++ * ++ * Needs queue_lock to be taken and reference to be valid over the call. ++ */ ++static inline void bfq_reparent_active_entities(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, ++ struct bfq_service_tree *st) ++{ ++ struct rb_root *active = &st->active; ++ struct bfq_entity *entity = NULL; ++ ++ if (!RB_EMPTY_ROOT(&st->active)) ++ entity = bfq_entity_of(rb_first(active)); ++ ++ for (; entity != NULL; entity = bfq_entity_of(rb_first(active))) ++ bfq_reparent_leaf_entity(bfqd, entity); ++ ++ if (bfqg->sched_data.in_service_entity != NULL) ++ bfq_reparent_leaf_entity(bfqd, ++ bfqg->sched_data.in_service_entity); ++ ++ return; ++} ++ ++/** ++ * bfq_destroy_group - destroy @bfqg. ++ * @bgrp: the bfqio_cgroup containing @bfqg. ++ * @bfqg: the group being destroyed. ++ * ++ * Destroy @bfqg, making sure that it is not referenced from its parent. ++ */ ++static void bfq_destroy_group(struct bfqio_cgroup *bgrp, struct bfq_group *bfqg) ++{ ++ struct bfq_data *bfqd; ++ struct bfq_service_tree *st; ++ struct bfq_entity *entity = bfqg->my_entity; ++ unsigned long uninitialized_var(flags); ++ int i; ++ ++ hlist_del(&bfqg->group_node); ++ ++ /* ++ * Empty all service_trees belonging to this group before ++ * deactivating the group itself. ++ */ ++ for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) { ++ st = bfqg->sched_data.service_tree + i; ++ ++ /* ++ * The idle tree may still contain bfq_queues belonging ++ * to exited task because they never migrated to a different ++ * cgroup from the one being destroyed now. No one else ++ * can access them so it's safe to act without any lock. ++ */ ++ bfq_flush_idle_tree(st); ++ ++ /* ++ * It may happen that some queues are still active ++ * (busy) upon group destruction (if the corresponding ++ * processes have been forced to terminate). We move ++ * all the leaf entities corresponding to these queues ++ * to the root_group. ++ * Also, it may happen that the group has an entity ++ * in service, which is disconnected from the active ++ * tree: it must be moved, too. ++ * There is no need to put the sync queues, as the ++ * scheduler has taken no reference. ++ */ ++ bfqd = bfq_get_bfqd_locked(&bfqg->bfqd, &flags); ++ if (bfqd != NULL) { ++ bfq_reparent_active_entities(bfqd, bfqg, st); ++ bfq_put_bfqd_unlock(bfqd, &flags); ++ } ++ BUG_ON(!RB_EMPTY_ROOT(&st->active)); ++ BUG_ON(!RB_EMPTY_ROOT(&st->idle)); ++ } ++ BUG_ON(bfqg->sched_data.next_in_service != NULL); ++ BUG_ON(bfqg->sched_data.in_service_entity != NULL); ++ ++ /* ++ * We may race with device destruction, take extra care when ++ * dereferencing bfqg->bfqd. ++ */ ++ bfqd = bfq_get_bfqd_locked(&bfqg->bfqd, &flags); ++ if (bfqd != NULL) { ++ hlist_del(&bfqg->bfqd_node); ++ __bfq_deactivate_entity(entity, 0); ++ bfq_put_async_queues(bfqd, bfqg); ++ bfq_put_bfqd_unlock(bfqd, &flags); ++ } ++ BUG_ON(entity->tree != NULL); ++ ++ /* ++ * No need to defer the kfree() to the end of the RCU grace ++ * period: we are called from the destroy() callback of our ++ * cgroup, so we can be sure that no one is a) still using ++ * this cgroup or b) doing lookups in it. ++ */ ++ kfree(bfqg); ++} ++ ++static void bfq_end_wr_async(struct bfq_data *bfqd) ++{ ++ struct hlist_node *tmp; ++ struct bfq_group *bfqg; ++ ++ hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node) ++ bfq_end_wr_async_queues(bfqd, bfqg); ++ bfq_end_wr_async_queues(bfqd, bfqd->root_group); ++} ++ ++/** ++ * bfq_disconnect_groups - disconnect @bfqd from all its groups. ++ * @bfqd: the device descriptor being exited. ++ * ++ * When the device exits we just make sure that no lookup can return ++ * the now unused group structures. They will be deallocated on cgroup ++ * destruction. ++ */ ++static void bfq_disconnect_groups(struct bfq_data *bfqd) ++{ ++ struct hlist_node *tmp; ++ struct bfq_group *bfqg; ++ ++ bfq_log(bfqd, "disconnect_groups beginning"); ++ hlist_for_each_entry_safe(bfqg, tmp, &bfqd->group_list, bfqd_node) { ++ hlist_del(&bfqg->bfqd_node); ++ ++ __bfq_deactivate_entity(bfqg->my_entity, 0); ++ ++ /* ++ * Don't remove from the group hash, just set an ++ * invalid key. No lookups can race with the ++ * assignment as bfqd is being destroyed; this ++ * implies also that new elements cannot be added ++ * to the list. ++ */ ++ rcu_assign_pointer(bfqg->bfqd, NULL); ++ ++ bfq_log(bfqd, "disconnect_groups: put async for group %p", ++ bfqg); ++ bfq_put_async_queues(bfqd, bfqg); ++ } ++} ++ ++static inline void bfq_free_root_group(struct bfq_data *bfqd) ++{ ++ struct bfqio_cgroup *bgrp = &bfqio_root_cgroup; ++ struct bfq_group *bfqg = bfqd->root_group; ++ ++ bfq_put_async_queues(bfqd, bfqg); ++ ++ spin_lock_irq(&bgrp->lock); ++ hlist_del_rcu(&bfqg->group_node); ++ spin_unlock_irq(&bgrp->lock); ++ ++ /* ++ * No need to synchronize_rcu() here: since the device is gone ++ * there cannot be any read-side access to its root_group. ++ */ ++ kfree(bfqg); ++} ++ ++static struct bfq_group *bfq_alloc_root_group(struct bfq_data *bfqd, int node) ++{ ++ struct bfq_group *bfqg; ++ struct bfqio_cgroup *bgrp; ++ int i; ++ ++ bfqg = kzalloc_node(sizeof(*bfqg), GFP_KERNEL, node); ++ if (bfqg == NULL) ++ return NULL; ++ ++ bfqg->entity.parent = NULL; ++ for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) ++ bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT; ++ ++ bgrp = &bfqio_root_cgroup; ++ spin_lock_irq(&bgrp->lock); ++ rcu_assign_pointer(bfqg->bfqd, bfqd); ++ hlist_add_head_rcu(&bfqg->group_node, &bgrp->group_data); ++ spin_unlock_irq(&bgrp->lock); ++ ++ return bfqg; ++} ++ ++#define SHOW_FUNCTION(__VAR) \ ++static u64 bfqio_cgroup_##__VAR##_read(struct cgroup_subsys_state *css, \ ++ struct cftype *cftype) \ ++{ \ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); \ ++ u64 ret = -ENODEV; \ ++ \ ++ mutex_lock(&bfqio_mutex); \ ++ if (bfqio_is_removed(bgrp)) \ ++ goto out_unlock; \ ++ \ ++ spin_lock_irq(&bgrp->lock); \ ++ ret = bgrp->__VAR; \ ++ spin_unlock_irq(&bgrp->lock); \ ++ \ ++out_unlock: \ ++ mutex_unlock(&bfqio_mutex); \ ++ return ret; \ ++} ++ ++SHOW_FUNCTION(weight); ++SHOW_FUNCTION(ioprio); ++SHOW_FUNCTION(ioprio_class); ++#undef SHOW_FUNCTION ++ ++#define STORE_FUNCTION(__VAR, __MIN, __MAX) \ ++static int bfqio_cgroup_##__VAR##_write(struct cgroup_subsys_state *css,\ ++ struct cftype *cftype, \ ++ u64 val) \ ++{ \ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); \ ++ struct bfq_group *bfqg; \ ++ int ret = -EINVAL; \ ++ \ ++ if (val < (__MIN) || val > (__MAX)) \ ++ return ret; \ ++ \ ++ ret = -ENODEV; \ ++ mutex_lock(&bfqio_mutex); \ ++ if (bfqio_is_removed(bgrp)) \ ++ goto out_unlock; \ ++ ret = 0; \ ++ \ ++ spin_lock_irq(&bgrp->lock); \ ++ bgrp->__VAR = (unsigned short)val; \ ++ hlist_for_each_entry(bfqg, &bgrp->group_data, group_node) { \ ++ /* \ ++ * Setting the ioprio_changed flag of the entity \ ++ * to 1 with new_##__VAR == ##__VAR would re-set \ ++ * the value of the weight to its ioprio mapping. \ ++ * Set the flag only if necessary. \ ++ */ \ ++ if ((unsigned short)val != bfqg->entity.new_##__VAR) { \ ++ bfqg->entity.new_##__VAR = (unsigned short)val; \ ++ /* \ ++ * Make sure that the above new value has been \ ++ * stored in bfqg->entity.new_##__VAR before \ ++ * setting the ioprio_changed flag. In fact, \ ++ * this flag may be read asynchronously (in \ ++ * critical sections protected by a different \ ++ * lock than that held here), and finding this \ ++ * flag set may cause the execution of the code \ ++ * for updating parameters whose value may \ ++ * depend also on bfqg->entity.new_##__VAR (in \ ++ * __bfq_entity_update_weight_prio). \ ++ * This barrier makes sure that the new value \ ++ * of bfqg->entity.new_##__VAR is correctly \ ++ * seen in that code. \ ++ */ \ ++ smp_wmb(); \ ++ bfqg->entity.ioprio_changed = 1; \ ++ } \ ++ } \ ++ spin_unlock_irq(&bgrp->lock); \ ++ \ ++out_unlock: \ ++ mutex_unlock(&bfqio_mutex); \ ++ return ret; \ ++} ++ ++STORE_FUNCTION(weight, BFQ_MIN_WEIGHT, BFQ_MAX_WEIGHT); ++STORE_FUNCTION(ioprio, 0, IOPRIO_BE_NR - 1); ++STORE_FUNCTION(ioprio_class, IOPRIO_CLASS_RT, IOPRIO_CLASS_IDLE); ++#undef STORE_FUNCTION ++ ++static struct cftype bfqio_files[] = { ++ { ++ .name = "weight", ++ .read_u64 = bfqio_cgroup_weight_read, ++ .write_u64 = bfqio_cgroup_weight_write, ++ }, ++ { ++ .name = "ioprio", ++ .read_u64 = bfqio_cgroup_ioprio_read, ++ .write_u64 = bfqio_cgroup_ioprio_write, ++ }, ++ { ++ .name = "ioprio_class", ++ .read_u64 = bfqio_cgroup_ioprio_class_read, ++ .write_u64 = bfqio_cgroup_ioprio_class_write, ++ }, ++ { }, /* terminate */ ++}; ++ ++static struct cgroup_subsys_state *bfqio_create(struct cgroup_subsys_state ++ *parent_css) ++{ ++ struct bfqio_cgroup *bgrp; ++ ++ if (parent_css != NULL) { ++ bgrp = kzalloc(sizeof(*bgrp), GFP_KERNEL); ++ if (bgrp == NULL) ++ return ERR_PTR(-ENOMEM); ++ } else ++ bgrp = &bfqio_root_cgroup; ++ ++ spin_lock_init(&bgrp->lock); ++ INIT_HLIST_HEAD(&bgrp->group_data); ++ bgrp->ioprio = BFQ_DEFAULT_GRP_IOPRIO; ++ bgrp->ioprio_class = BFQ_DEFAULT_GRP_CLASS; ++ ++ return &bgrp->css; ++} ++ ++/* ++ * We cannot support shared io contexts, as we have no means to support ++ * two tasks with the same ioc in two different groups without major rework ++ * of the main bic/bfqq data structures. By now we allow a task to change ++ * its cgroup only if it's the only owner of its ioc; the drawback of this ++ * behavior is that a group containing a task that forked using CLONE_IO ++ * will not be destroyed until the tasks sharing the ioc die. ++ */ ++static int bfqio_can_attach(struct cgroup_subsys_state *css, ++ struct cgroup_taskset *tset) ++{ ++ struct task_struct *task; ++ struct io_context *ioc; ++ int ret = 0; ++ ++ cgroup_taskset_for_each(task, tset) { ++ /* ++ * task_lock() is needed to avoid races with ++ * exit_io_context() ++ */ ++ task_lock(task); ++ ioc = task->io_context; ++ if (ioc != NULL && atomic_read(&ioc->nr_tasks) > 1) ++ /* ++ * ioc == NULL means that the task is either too ++ * young or exiting: if it has still no ioc the ++ * ioc can't be shared, if the task is exiting the ++ * attach will fail anyway, no matter what we ++ * return here. ++ */ ++ ret = -EINVAL; ++ task_unlock(task); ++ if (ret) ++ break; ++ } ++ ++ return ret; ++} ++ ++static void bfqio_attach(struct cgroup_subsys_state *css, ++ struct cgroup_taskset *tset) ++{ ++ struct task_struct *task; ++ struct io_context *ioc; ++ struct io_cq *icq; ++ ++ /* ++ * IMPORTANT NOTE: The move of more than one process at a time to a ++ * new group has not yet been tested. ++ */ ++ cgroup_taskset_for_each(task, tset) { ++ ioc = get_task_io_context(task, GFP_ATOMIC, NUMA_NO_NODE); ++ if (ioc) { ++ /* ++ * Handle cgroup change here. ++ */ ++ rcu_read_lock(); ++ hlist_for_each_entry_rcu(icq, &ioc->icq_list, ioc_node) ++ if (!strncmp( ++ icq->q->elevator->type->elevator_name, ++ "bfq", ELV_NAME_MAX)) ++ bfq_bic_change_cgroup(icq_to_bic(icq), ++ css); ++ rcu_read_unlock(); ++ put_io_context(ioc); ++ } ++ } ++} ++ ++static void bfqio_destroy(struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ struct hlist_node *tmp; ++ struct bfq_group *bfqg; ++ ++ /* ++ * Since we are destroying the cgroup, there are no more tasks ++ * referencing it, and all the RCU grace periods that may have ++ * referenced it are ended (as the destruction of the parent ++ * cgroup is RCU-safe); bgrp->group_data will not be accessed by ++ * anything else and we don't need any synchronization. ++ */ ++ hlist_for_each_entry_safe(bfqg, tmp, &bgrp->group_data, group_node) ++ bfq_destroy_group(bgrp, bfqg); ++ ++ BUG_ON(!hlist_empty(&bgrp->group_data)); ++ ++ kfree(bgrp); ++} ++ ++static int bfqio_css_online(struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ ++ mutex_lock(&bfqio_mutex); ++ bgrp->online = true; ++ mutex_unlock(&bfqio_mutex); ++ ++ return 0; ++} ++ ++static void bfqio_css_offline(struct cgroup_subsys_state *css) ++{ ++ struct bfqio_cgroup *bgrp = css_to_bfqio(css); ++ ++ mutex_lock(&bfqio_mutex); ++ bgrp->online = false; ++ mutex_unlock(&bfqio_mutex); ++} ++ ++struct cgroup_subsys bfqio_cgrp_subsys = { ++ .css_alloc = bfqio_create, ++ .css_online = bfqio_css_online, ++ .css_offline = bfqio_css_offline, ++ .can_attach = bfqio_can_attach, ++ .attach = bfqio_attach, ++ .css_free = bfqio_destroy, ++ .legacy_cftypes = bfqio_files, ++}; ++#else ++static inline void bfq_init_entity(struct bfq_entity *entity, ++ struct bfq_group *bfqg) ++{ ++ entity->weight = entity->new_weight; ++ entity->orig_weight = entity->new_weight; ++ entity->ioprio = entity->new_ioprio; ++ entity->ioprio_class = entity->new_ioprio_class; ++ entity->sched_data = &bfqg->sched_data; ++} ++ ++static inline struct bfq_group * ++bfq_bic_update_cgroup(struct bfq_io_cq *bic) ++{ ++ struct bfq_data *bfqd = bic_to_bfqd(bic); ++ return bfqd->root_group; ++} ++ ++static inline void bfq_bfqq_move(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct bfq_entity *entity, ++ struct bfq_group *bfqg) ++{ ++} ++ ++static void bfq_end_wr_async(struct bfq_data *bfqd) ++{ ++ bfq_end_wr_async_queues(bfqd, bfqd->root_group); ++} ++ ++static inline void bfq_disconnect_groups(struct bfq_data *bfqd) ++{ ++ bfq_put_async_queues(bfqd, bfqd->root_group); ++} ++ ++static inline void bfq_free_root_group(struct bfq_data *bfqd) ++{ ++ kfree(bfqd->root_group); ++} ++ ++static struct bfq_group *bfq_alloc_root_group(struct bfq_data *bfqd, int node) ++{ ++ struct bfq_group *bfqg; ++ int i; ++ ++ bfqg = kmalloc_node(sizeof(*bfqg), GFP_KERNEL | __GFP_ZERO, node); ++ if (bfqg == NULL) ++ return NULL; ++ ++ for (i = 0; i < BFQ_IOPRIO_CLASSES; i++) ++ bfqg->sched_data.service_tree[i] = BFQ_SERVICE_TREE_INIT; ++ ++ return bfqg; ++} ++#endif +diff --git a/block/bfq-ioc.c b/block/bfq-ioc.c +new file mode 100644 +index 0000000..7f6b000 +--- /dev/null ++++ b/block/bfq-ioc.c +@@ -0,0 +1,36 @@ ++/* ++ * BFQ: I/O context handling. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ */ ++ ++/** ++ * icq_to_bic - convert iocontext queue structure to bfq_io_cq. ++ * @icq: the iocontext queue. ++ */ ++static inline struct bfq_io_cq *icq_to_bic(struct io_cq *icq) ++{ ++ /* bic->icq is the first member, %NULL will convert to %NULL */ ++ return container_of(icq, struct bfq_io_cq, icq); ++} ++ ++/** ++ * bfq_bic_lookup - search into @ioc a bic associated to @bfqd. ++ * @bfqd: the lookup key. ++ * @ioc: the io_context of the process doing I/O. ++ * ++ * Queue lock must be held. ++ */ ++static inline struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd, ++ struct io_context *ioc) ++{ ++ if (ioc) ++ return icq_to_bic(ioc_lookup_icq(ioc, bfqd->queue)); ++ return NULL; ++} +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +new file mode 100644 +index 0000000..97ee934 +--- /dev/null ++++ b/block/bfq-iosched.c +@@ -0,0 +1,3902 @@ ++/* ++ * Budget Fair Queueing (BFQ) disk scheduler. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ * ++ * Licensed under the GPL-2 as detailed in the accompanying COPYING.BFQ ++ * file. ++ * ++ * BFQ is a proportional-share storage-I/O scheduling algorithm based on ++ * the slice-by-slice service scheme of CFQ. But BFQ assigns budgets, ++ * measured in number of sectors, to processes instead of time slices. The ++ * device is not granted to the in-service process for a given time slice, ++ * but until it has exhausted its assigned budget. This change from the time ++ * to the service domain allows BFQ to distribute the device throughput ++ * among processes as desired, without any distortion due to ZBR, workload ++ * fluctuations or other factors. BFQ uses an ad hoc internal scheduler, ++ * called B-WF2Q+, to schedule processes according to their budgets. More ++ * precisely, BFQ schedules queues associated to processes. Thanks to the ++ * accurate policy of B-WF2Q+, BFQ can afford to assign high budgets to ++ * I/O-bound processes issuing sequential requests (to boost the ++ * throughput), and yet guarantee a low latency to interactive and soft ++ * real-time applications. ++ * ++ * BFQ is described in [1], where also a reference to the initial, more ++ * theoretical paper on BFQ can be found. The interested reader can find ++ * in the latter paper full details on the main algorithm, as well as ++ * formulas of the guarantees and formal proofs of all the properties. ++ * With respect to the version of BFQ presented in these papers, this ++ * implementation adds a few more heuristics, such as the one that ++ * guarantees a low latency to soft real-time applications, and a ++ * hierarchical extension based on H-WF2Q+. ++ * ++ * B-WF2Q+ is based on WF2Q+, that is described in [2], together with ++ * H-WF2Q+, while the augmented tree used to implement B-WF2Q+ with O(log N) ++ * complexity derives from the one introduced with EEVDF in [3]. ++ * ++ * [1] P. Valente and M. Andreolini, ``Improving Application Responsiveness ++ * with the BFQ Disk I/O Scheduler'', ++ * Proceedings of the 5th Annual International Systems and Storage ++ * Conference (SYSTOR '12), June 2012. ++ * ++ * http://algogroup.unimo.it/people/paolo/disk_sched/bf1-v1-suite-results.pdf ++ * ++ * [2] Jon C.R. Bennett and H. Zhang, ``Hierarchical Packet Fair Queueing ++ * Algorithms,'' IEEE/ACM Transactions on Networking, 5(5):675-689, ++ * Oct 1997. ++ * ++ * http://www.cs.cmu.edu/~hzhang/papers/TON-97-Oct.ps.gz ++ * ++ * [3] I. Stoica and H. Abdel-Wahab, ``Earliest Eligible Virtual Deadline ++ * First: A Flexible and Accurate Mechanism for Proportional Share ++ * Resource Allocation,'' technical report. ++ * ++ * http://www.cs.berkeley.edu/~istoica/papers/eevdf-tr-95.pdf ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "bfq.h" ++#include "blk.h" ++ ++/* Max number of dispatches in one round of service. */ ++static const int bfq_quantum = 4; ++ ++/* Expiration time of sync (0) and async (1) requests, in jiffies. */ ++static const int bfq_fifo_expire[2] = { HZ / 4, HZ / 8 }; ++ ++/* Maximum backwards seek, in KiB. */ ++static const int bfq_back_max = 16 * 1024; ++ ++/* Penalty of a backwards seek, in number of sectors. */ ++static const int bfq_back_penalty = 2; ++ ++/* Idling period duration, in jiffies. */ ++static int bfq_slice_idle = HZ / 125; ++ ++/* Default maximum budget values, in sectors and number of requests. */ ++static const int bfq_default_max_budget = 16 * 1024; ++static const int bfq_max_budget_async_rq = 4; ++ ++/* ++ * Async to sync throughput distribution is controlled as follows: ++ * when an async request is served, the entity is charged the number ++ * of sectors of the request, multiplied by the factor below ++ */ ++static const int bfq_async_charge_factor = 10; ++ ++/* Default timeout values, in jiffies, approximating CFQ defaults. */ ++static const int bfq_timeout_sync = HZ / 8; ++static int bfq_timeout_async = HZ / 25; ++ ++struct kmem_cache *bfq_pool; ++ ++/* Below this threshold (in ms), we consider thinktime immediate. */ ++#define BFQ_MIN_TT 2 ++ ++/* hw_tag detection: parallel requests threshold and min samples needed. */ ++#define BFQ_HW_QUEUE_THRESHOLD 4 ++#define BFQ_HW_QUEUE_SAMPLES 32 ++ ++#define BFQQ_SEEK_THR (sector_t)(8 * 1024) ++#define BFQQ_SEEKY(bfqq) ((bfqq)->seek_mean > BFQQ_SEEK_THR) ++ ++/* Min samples used for peak rate estimation (for autotuning). */ ++#define BFQ_PEAK_RATE_SAMPLES 32 ++ ++/* Shift used for peak rate fixed precision calculations. */ ++#define BFQ_RATE_SHIFT 16 ++ ++/* ++ * By default, BFQ computes the duration of the weight raising for ++ * interactive applications automatically, using the following formula: ++ * duration = (R / r) * T, where r is the peak rate of the device, and ++ * R and T are two reference parameters. ++ * In particular, R is the peak rate of the reference device (see below), ++ * and T is a reference time: given the systems that are likely to be ++ * installed on the reference device according to its speed class, T is ++ * about the maximum time needed, under BFQ and while reading two files in ++ * parallel, to load typical large applications on these systems. ++ * In practice, the slower/faster the device at hand is, the more/less it ++ * takes to load applications with respect to the reference device. ++ * Accordingly, the longer/shorter BFQ grants weight raising to interactive ++ * applications. ++ * ++ * BFQ uses four different reference pairs (R, T), depending on: ++ * . whether the device is rotational or non-rotational; ++ * . whether the device is slow, such as old or portable HDDs, as well as ++ * SD cards, or fast, such as newer HDDs and SSDs. ++ * ++ * The device's speed class is dynamically (re)detected in ++ * bfq_update_peak_rate() every time the estimated peak rate is updated. ++ * ++ * In the following definitions, R_slow[0]/R_fast[0] and T_slow[0]/T_fast[0] ++ * are the reference values for a slow/fast rotational device, whereas ++ * R_slow[1]/R_fast[1] and T_slow[1]/T_fast[1] are the reference values for ++ * a slow/fast non-rotational device. Finally, device_speed_thresh are the ++ * thresholds used to switch between speed classes. ++ * Both the reference peak rates and the thresholds are measured in ++ * sectors/usec, left-shifted by BFQ_RATE_SHIFT. ++ */ ++static int R_slow[2] = {1536, 10752}; ++static int R_fast[2] = {17415, 34791}; ++/* ++ * To improve readability, a conversion function is used to initialize the ++ * following arrays, which entails that they can be initialized only in a ++ * function. ++ */ ++static int T_slow[2]; ++static int T_fast[2]; ++static int device_speed_thresh[2]; ++ ++#define BFQ_SERVICE_TREE_INIT ((struct bfq_service_tree) \ ++ { RB_ROOT, RB_ROOT, NULL, NULL, 0, 0 }) ++ ++#define RQ_BIC(rq) ((struct bfq_io_cq *) (rq)->elv.priv[0]) ++#define RQ_BFQQ(rq) ((rq)->elv.priv[1]) ++ ++static inline void bfq_schedule_dispatch(struct bfq_data *bfqd); ++ ++#include "bfq-ioc.c" ++#include "bfq-sched.c" ++#include "bfq-cgroup.c" ++ ++#define bfq_class_idle(bfqq) ((bfqq)->entity.ioprio_class ==\ ++ IOPRIO_CLASS_IDLE) ++#define bfq_class_rt(bfqq) ((bfqq)->entity.ioprio_class ==\ ++ IOPRIO_CLASS_RT) ++ ++#define bfq_sample_valid(samples) ((samples) > 80) ++ ++/* ++ * We regard a request as SYNC, if either it's a read or has the SYNC bit ++ * set (in which case it could also be a direct WRITE). ++ */ ++static inline int bfq_bio_sync(struct bio *bio) ++{ ++ if (bio_data_dir(bio) == READ || (bio->bi_rw & REQ_SYNC)) ++ return 1; ++ ++ return 0; ++} ++ ++/* ++ * Scheduler run of queue, if there are requests pending and no one in the ++ * driver that will restart queueing. ++ */ ++static inline void bfq_schedule_dispatch(struct bfq_data *bfqd) ++{ ++ if (bfqd->queued != 0) { ++ bfq_log(bfqd, "schedule dispatch"); ++ kblockd_schedule_work(&bfqd->unplug_work); ++ } ++} ++ ++/* ++ * Lifted from AS - choose which of rq1 and rq2 that is best served now. ++ * We choose the request that is closesr to the head right now. Distance ++ * behind the head is penalized and only allowed to a certain extent. ++ */ ++static struct request *bfq_choose_req(struct bfq_data *bfqd, ++ struct request *rq1, ++ struct request *rq2, ++ sector_t last) ++{ ++ sector_t s1, s2, d1 = 0, d2 = 0; ++ unsigned long back_max; ++#define BFQ_RQ1_WRAP 0x01 /* request 1 wraps */ ++#define BFQ_RQ2_WRAP 0x02 /* request 2 wraps */ ++ unsigned wrap = 0; /* bit mask: requests behind the disk head? */ ++ ++ if (rq1 == NULL || rq1 == rq2) ++ return rq2; ++ if (rq2 == NULL) ++ return rq1; ++ ++ if (rq_is_sync(rq1) && !rq_is_sync(rq2)) ++ return rq1; ++ else if (rq_is_sync(rq2) && !rq_is_sync(rq1)) ++ return rq2; ++ if ((rq1->cmd_flags & REQ_META) && !(rq2->cmd_flags & REQ_META)) ++ return rq1; ++ else if ((rq2->cmd_flags & REQ_META) && !(rq1->cmd_flags & REQ_META)) ++ return rq2; ++ ++ s1 = blk_rq_pos(rq1); ++ s2 = blk_rq_pos(rq2); ++ ++ /* ++ * By definition, 1KiB is 2 sectors. ++ */ ++ back_max = bfqd->bfq_back_max * 2; ++ ++ /* ++ * Strict one way elevator _except_ in the case where we allow ++ * short backward seeks which are biased as twice the cost of a ++ * similar forward seek. ++ */ ++ if (s1 >= last) ++ d1 = s1 - last; ++ else if (s1 + back_max >= last) ++ d1 = (last - s1) * bfqd->bfq_back_penalty; ++ else ++ wrap |= BFQ_RQ1_WRAP; ++ ++ if (s2 >= last) ++ d2 = s2 - last; ++ else if (s2 + back_max >= last) ++ d2 = (last - s2) * bfqd->bfq_back_penalty; ++ else ++ wrap |= BFQ_RQ2_WRAP; ++ ++ /* Found required data */ ++ ++ /* ++ * By doing switch() on the bit mask "wrap" we avoid having to ++ * check two variables for all permutations: --> faster! ++ */ ++ switch (wrap) { ++ case 0: /* common case for CFQ: rq1 and rq2 not wrapped */ ++ if (d1 < d2) ++ return rq1; ++ else if (d2 < d1) ++ return rq2; ++ else { ++ if (s1 >= s2) ++ return rq1; ++ else ++ return rq2; ++ } ++ ++ case BFQ_RQ2_WRAP: ++ return rq1; ++ case BFQ_RQ1_WRAP: ++ return rq2; ++ case (BFQ_RQ1_WRAP|BFQ_RQ2_WRAP): /* both rqs wrapped */ ++ default: ++ /* ++ * Since both rqs are wrapped, ++ * start with the one that's further behind head ++ * (--> only *one* back seek required), ++ * since back seek takes more time than forward. ++ */ ++ if (s1 <= s2) ++ return rq1; ++ else ++ return rq2; ++ } ++} ++ ++static struct bfq_queue * ++bfq_rq_pos_tree_lookup(struct bfq_data *bfqd, struct rb_root *root, ++ sector_t sector, struct rb_node **ret_parent, ++ struct rb_node ***rb_link) ++{ ++ struct rb_node **p, *parent; ++ struct bfq_queue *bfqq = NULL; ++ ++ parent = NULL; ++ p = &root->rb_node; ++ while (*p) { ++ struct rb_node **n; ++ ++ parent = *p; ++ bfqq = rb_entry(parent, struct bfq_queue, pos_node); ++ ++ /* ++ * Sort strictly based on sector. Smallest to the left, ++ * largest to the right. ++ */ ++ if (sector > blk_rq_pos(bfqq->next_rq)) ++ n = &(*p)->rb_right; ++ else if (sector < blk_rq_pos(bfqq->next_rq)) ++ n = &(*p)->rb_left; ++ else ++ break; ++ p = n; ++ bfqq = NULL; ++ } ++ ++ *ret_parent = parent; ++ if (rb_link) ++ *rb_link = p; ++ ++ bfq_log(bfqd, "rq_pos_tree_lookup %llu: returning %d", ++ (long long unsigned)sector, ++ bfqq != NULL ? bfqq->pid : 0); ++ ++ return bfqq; ++} ++ ++static void bfq_rq_pos_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ struct rb_node **p, *parent; ++ struct bfq_queue *__bfqq; ++ ++ if (bfqq->pos_root != NULL) { ++ rb_erase(&bfqq->pos_node, bfqq->pos_root); ++ bfqq->pos_root = NULL; ++ } ++ ++ if (bfq_class_idle(bfqq)) ++ return; ++ if (!bfqq->next_rq) ++ return; ++ ++ bfqq->pos_root = &bfqd->rq_pos_tree; ++ __bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root, ++ blk_rq_pos(bfqq->next_rq), &parent, &p); ++ if (__bfqq == NULL) { ++ rb_link_node(&bfqq->pos_node, parent, p); ++ rb_insert_color(&bfqq->pos_node, bfqq->pos_root); ++ } else ++ bfqq->pos_root = NULL; ++} ++ ++/* ++ * Tell whether there are active queues or groups with differentiated weights. ++ */ ++static inline bool bfq_differentiated_weights(struct bfq_data *bfqd) ++{ ++ BUG_ON(!bfqd->hw_tag); ++ /* ++ * For weights to differ, at least one of the trees must contain ++ * at least two nodes. ++ */ ++ return (!RB_EMPTY_ROOT(&bfqd->queue_weights_tree) && ++ (bfqd->queue_weights_tree.rb_node->rb_left || ++ bfqd->queue_weights_tree.rb_node->rb_right) ++#ifdef CONFIG_CGROUP_BFQIO ++ ) || ++ (!RB_EMPTY_ROOT(&bfqd->group_weights_tree) && ++ (bfqd->group_weights_tree.rb_node->rb_left || ++ bfqd->group_weights_tree.rb_node->rb_right) ++#endif ++ ); ++} ++ ++/* ++ * If the weight-counter tree passed as input contains no counter for ++ * the weight of the input entity, then add that counter; otherwise just ++ * increment the existing counter. ++ * ++ * Note that weight-counter trees contain few nodes in mostly symmetric ++ * scenarios. For example, if all queues have the same weight, then the ++ * weight-counter tree for the queues may contain at most one node. ++ * This holds even if low_latency is on, because weight-raised queues ++ * are not inserted in the tree. ++ * In most scenarios, the rate at which nodes are created/destroyed ++ * should be low too. ++ */ ++static void bfq_weights_tree_add(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root) ++{ ++ struct rb_node **new = &(root->rb_node), *parent = NULL; ++ ++ /* ++ * Do not insert if: ++ * - the device does not support queueing; ++ * - the entity is already associated with a counter, which happens if: ++ * 1) the entity is associated with a queue, 2) a request arrival ++ * has caused the queue to become both non-weight-raised, and hence ++ * change its weight, and backlogged; in this respect, each ++ * of the two events causes an invocation of this function, ++ * 3) this is the invocation of this function caused by the second ++ * event. This second invocation is actually useless, and we handle ++ * this fact by exiting immediately. More efficient or clearer ++ * solutions might possibly be adopted. ++ */ ++ if (!bfqd->hw_tag || entity->weight_counter) ++ return; ++ ++ while (*new) { ++ struct bfq_weight_counter *__counter = container_of(*new, ++ struct bfq_weight_counter, ++ weights_node); ++ parent = *new; ++ ++ if (entity->weight == __counter->weight) { ++ entity->weight_counter = __counter; ++ goto inc_counter; ++ } ++ if (entity->weight < __counter->weight) ++ new = &((*new)->rb_left); ++ else ++ new = &((*new)->rb_right); ++ } ++ ++ entity->weight_counter = kzalloc(sizeof(struct bfq_weight_counter), ++ GFP_ATOMIC); ++ entity->weight_counter->weight = entity->weight; ++ rb_link_node(&entity->weight_counter->weights_node, parent, new); ++ rb_insert_color(&entity->weight_counter->weights_node, root); ++ ++inc_counter: ++ entity->weight_counter->num_active++; ++} ++ ++/* ++ * Decrement the weight counter associated with the entity, and, if the ++ * counter reaches 0, remove the counter from the tree. ++ * See the comments to the function bfq_weights_tree_add() for considerations ++ * about overhead. ++ */ ++static void bfq_weights_tree_remove(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root) ++{ ++ /* ++ * Check whether the entity is actually associated with a counter. ++ * In fact, the device may not be considered NCQ-capable for a while, ++ * which implies that no insertion in the weight trees is performed, ++ * after which the device may start to be deemed NCQ-capable, and hence ++ * this function may start to be invoked. This may cause the function ++ * to be invoked for entities that are not associated with any counter. ++ */ ++ if (!entity->weight_counter) ++ return; ++ ++ BUG_ON(RB_EMPTY_ROOT(root)); ++ BUG_ON(entity->weight_counter->weight != entity->weight); ++ ++ BUG_ON(!entity->weight_counter->num_active); ++ entity->weight_counter->num_active--; ++ if (entity->weight_counter->num_active > 0) ++ goto reset_entity_pointer; ++ ++ rb_erase(&entity->weight_counter->weights_node, root); ++ kfree(entity->weight_counter); ++ ++reset_entity_pointer: ++ entity->weight_counter = NULL; ++} ++ ++static struct request *bfq_find_next_rq(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct request *last) ++{ ++ struct rb_node *rbnext = rb_next(&last->rb_node); ++ struct rb_node *rbprev = rb_prev(&last->rb_node); ++ struct request *next = NULL, *prev = NULL; ++ ++ BUG_ON(RB_EMPTY_NODE(&last->rb_node)); ++ ++ if (rbprev != NULL) ++ prev = rb_entry_rq(rbprev); ++ ++ if (rbnext != NULL) ++ next = rb_entry_rq(rbnext); ++ else { ++ rbnext = rb_first(&bfqq->sort_list); ++ if (rbnext && rbnext != &last->rb_node) ++ next = rb_entry_rq(rbnext); ++ } ++ ++ return bfq_choose_req(bfqd, next, prev, blk_rq_pos(last)); ++} ++ ++/* see the definition of bfq_async_charge_factor for details */ ++static inline unsigned long bfq_serv_to_charge(struct request *rq, ++ struct bfq_queue *bfqq) ++{ ++ return blk_rq_sectors(rq) * ++ (1 + ((!bfq_bfqq_sync(bfqq)) * (bfqq->wr_coeff == 1) * ++ bfq_async_charge_factor)); ++} ++ ++/** ++ * bfq_updated_next_req - update the queue after a new next_rq selection. ++ * @bfqd: the device data the queue belongs to. ++ * @bfqq: the queue to update. ++ * ++ * If the first request of a queue changes we make sure that the queue ++ * has enough budget to serve at least its first request (if the ++ * request has grown). We do this because if the queue has not enough ++ * budget for its first request, it has to go through two dispatch ++ * rounds to actually get it dispatched. ++ */ ++static void bfq_updated_next_req(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ struct bfq_service_tree *st = bfq_entity_service_tree(entity); ++ struct request *next_rq = bfqq->next_rq; ++ unsigned long new_budget; ++ ++ if (next_rq == NULL) ++ return; ++ ++ if (bfqq == bfqd->in_service_queue) ++ /* ++ * In order not to break guarantees, budgets cannot be ++ * changed after an entity has been selected. ++ */ ++ return; ++ ++ BUG_ON(entity->tree != &st->active); ++ BUG_ON(entity == entity->sched_data->in_service_entity); ++ ++ new_budget = max_t(unsigned long, bfqq->max_budget, ++ bfq_serv_to_charge(next_rq, bfqq)); ++ if (entity->budget != new_budget) { ++ entity->budget = new_budget; ++ bfq_log_bfqq(bfqd, bfqq, "updated next rq: new budget %lu", ++ new_budget); ++ bfq_activate_bfqq(bfqd, bfqq); ++ } ++} ++ ++static inline unsigned int bfq_wr_duration(struct bfq_data *bfqd) ++{ ++ u64 dur; ++ ++ if (bfqd->bfq_wr_max_time > 0) ++ return bfqd->bfq_wr_max_time; ++ ++ dur = bfqd->RT_prod; ++ do_div(dur, bfqd->peak_rate); ++ ++ return dur; ++} ++ ++/* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */ ++static inline void bfq_reset_burst_list(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ struct bfq_queue *item; ++ struct hlist_node *n; ++ ++ hlist_for_each_entry_safe(item, n, &bfqd->burst_list, burst_list_node) ++ hlist_del_init(&item->burst_list_node); ++ hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list); ++ bfqd->burst_size = 1; ++} ++ ++/* Add bfqq to the list of queues in current burst (see bfq_handle_burst) */ ++static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ /* Increment burst size to take into account also bfqq */ ++ bfqd->burst_size++; ++ ++ if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) { ++ struct bfq_queue *pos, *bfqq_item; ++ struct hlist_node *n; ++ ++ /* ++ * Enough queues have been activated shortly after each ++ * other to consider this burst as large. ++ */ ++ bfqd->large_burst = true; ++ ++ /* ++ * We can now mark all queues in the burst list as ++ * belonging to a large burst. ++ */ ++ hlist_for_each_entry(bfqq_item, &bfqd->burst_list, ++ burst_list_node) ++ bfq_mark_bfqq_in_large_burst(bfqq_item); ++ bfq_mark_bfqq_in_large_burst(bfqq); ++ ++ /* ++ * From now on, and until the current burst finishes, any ++ * new queue being activated shortly after the last queue ++ * was inserted in the burst can be immediately marked as ++ * belonging to a large burst. So the burst list is not ++ * needed any more. Remove it. ++ */ ++ hlist_for_each_entry_safe(pos, n, &bfqd->burst_list, ++ burst_list_node) ++ hlist_del_init(&pos->burst_list_node); ++ } else /* burst not yet large: add bfqq to the burst list */ ++ hlist_add_head(&bfqq->burst_list_node, &bfqd->burst_list); ++} ++ ++/* ++ * If many queues happen to become active shortly after each other, then, ++ * to help the processes associated to these queues get their job done as ++ * soon as possible, it is usually better to not grant either weight-raising ++ * or device idling to these queues. In this comment we describe, firstly, ++ * the reasons why this fact holds, and, secondly, the next function, which ++ * implements the main steps needed to properly mark these queues so that ++ * they can then be treated in a different way. ++ * ++ * As for the terminology, we say that a queue becomes active, i.e., ++ * switches from idle to backlogged, either when it is created (as a ++ * consequence of the arrival of an I/O request), or, if already existing, ++ * when a new request for the queue arrives while the queue is idle. ++ * Bursts of activations, i.e., activations of different queues occurring ++ * shortly after each other, are typically caused by services or applications ++ * that spawn or reactivate many parallel threads/processes. Examples are ++ * systemd during boot or git grep. ++ * ++ * These services or applications benefit mostly from a high throughput: ++ * the quicker the requests of the activated queues are cumulatively served, ++ * the sooner the target job of these queues gets completed. As a consequence, ++ * weight-raising any of these queues, which also implies idling the device ++ * for it, is almost always counterproductive: in most cases it just lowers ++ * throughput. ++ * ++ * On the other hand, a burst of activations may be also caused by the start ++ * of an application that does not consist in a lot of parallel I/O-bound ++ * threads. In fact, with a complex application, the burst may be just a ++ * consequence of the fact that several processes need to be executed to ++ * start-up the application. To start an application as quickly as possible, ++ * the best thing to do is to privilege the I/O related to the application ++ * with respect to all other I/O. Therefore, the best strategy to start as ++ * quickly as possible an application that causes a burst of activations is ++ * to weight-raise all the queues activated during the burst. This is the ++ * exact opposite of the best strategy for the other type of bursts. ++ * ++ * In the end, to take the best action for each of the two cases, the two ++ * types of bursts need to be distinguished. Fortunately, this seems ++ * relatively easy to do, by looking at the sizes of the bursts. In ++ * particular, we found a threshold such that bursts with a larger size ++ * than that threshold are apparently caused only by services or commands ++ * such as systemd or git grep. For brevity, hereafter we call just 'large' ++ * these bursts. BFQ *does not* weight-raise queues whose activations occur ++ * in a large burst. In addition, for each of these queues BFQ performs or ++ * does not perform idling depending on which choice boosts the throughput ++ * most. The exact choice depends on the device and request pattern at ++ * hand. ++ * ++ * Turning back to the next function, it implements all the steps needed ++ * to detect the occurrence of a large burst and to properly mark all the ++ * queues belonging to it (so that they can then be treated in a different ++ * way). This goal is achieved by maintaining a special "burst list" that ++ * holds, temporarily, the queues that belong to the burst in progress. The ++ * list is then used to mark these queues as belonging to a large burst if ++ * the burst does become large. The main steps are the following. ++ * ++ * . when the very first queue is activated, the queue is inserted into the ++ * list (as it could be the first queue in a possible burst) ++ * ++ * . if the current burst has not yet become large, and a queue Q that does ++ * not yet belong to the burst is activated shortly after the last time ++ * at which a new queue entered the burst list, then the function appends ++ * Q to the burst list ++ * ++ * . if, as a consequence of the previous step, the burst size reaches ++ * the large-burst threshold, then ++ * ++ * . all the queues in the burst list are marked as belonging to a ++ * large burst ++ * ++ * . the burst list is deleted; in fact, the burst list already served ++ * its purpose (keeping temporarily track of the queues in a burst, ++ * so as to be able to mark them as belonging to a large burst in the ++ * previous sub-step), and now is not needed any more ++ * ++ * . the device enters a large-burst mode ++ * ++ * . if a queue Q that does not belong to the burst is activated while ++ * the device is in large-burst mode and shortly after the last time ++ * at which a queue either entered the burst list or was marked as ++ * belonging to the current large burst, then Q is immediately marked ++ * as belonging to a large burst. ++ * ++ * . if a queue Q that does not belong to the burst is activated a while ++ * later, i.e., not shortly after, than the last time at which a queue ++ * either entered the burst list or was marked as belonging to the ++ * current large burst, then the current burst is deemed as finished and: ++ * ++ * . the large-burst mode is reset if set ++ * ++ * . the burst list is emptied ++ * ++ * . Q is inserted in the burst list, as Q may be the first queue ++ * in a possible new burst (then the burst list contains just Q ++ * after this step). ++ */ ++static void bfq_handle_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ bool idle_for_long_time) ++{ ++ /* ++ * If bfqq happened to be activated in a burst, but has been idle ++ * for at least as long as an interactive queue, then we assume ++ * that, in the overall I/O initiated in the burst, the I/O ++ * associated to bfqq is finished. So bfqq does not need to be ++ * treated as a queue belonging to a burst anymore. Accordingly, ++ * we reset bfqq's in_large_burst flag if set, and remove bfqq ++ * from the burst list if it's there. We do not decrement instead ++ * burst_size, because the fact that bfqq does not need to belong ++ * to the burst list any more does not invalidate the fact that ++ * bfqq may have been activated during the current burst. ++ */ ++ if (idle_for_long_time) { ++ hlist_del_init(&bfqq->burst_list_node); ++ bfq_clear_bfqq_in_large_burst(bfqq); ++ } ++ ++ /* ++ * If bfqq is already in the burst list or is part of a large ++ * burst, then there is nothing else to do. ++ */ ++ if (!hlist_unhashed(&bfqq->burst_list_node) || ++ bfq_bfqq_in_large_burst(bfqq)) ++ return; ++ ++ /* ++ * If bfqq's activation happens late enough, then the current ++ * burst is finished, and related data structures must be reset. ++ * ++ * In this respect, consider the special case where bfqq is the very ++ * first queue being activated. In this case, last_ins_in_burst is ++ * not yet significant when we get here. But it is easy to verify ++ * that, whether or not the following condition is true, bfqq will ++ * end up being inserted into the burst list. In particular the ++ * list will happen to contain only bfqq. And this is exactly what ++ * has to happen, as bfqq may be the first queue in a possible ++ * burst. ++ */ ++ if (time_is_before_jiffies(bfqd->last_ins_in_burst + ++ bfqd->bfq_burst_interval)) { ++ bfqd->large_burst = false; ++ bfq_reset_burst_list(bfqd, bfqq); ++ return; ++ } ++ ++ /* ++ * If we get here, then bfqq is being activated shortly after the ++ * last queue. So, if the current burst is also large, we can mark ++ * bfqq as belonging to this large burst immediately. ++ */ ++ if (bfqd->large_burst) { ++ bfq_mark_bfqq_in_large_burst(bfqq); ++ return; ++ } ++ ++ /* ++ * If we get here, then a large-burst state has not yet been ++ * reached, but bfqq is being activated shortly after the last ++ * queue. Then we add bfqq to the burst. ++ */ ++ bfq_add_to_burst(bfqd, bfqq); ++} ++ ++static void bfq_add_request(struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_entity *entity = &bfqq->entity; ++ struct bfq_data *bfqd = bfqq->bfqd; ++ struct request *next_rq, *prev; ++ unsigned long old_wr_coeff = bfqq->wr_coeff; ++ bool interactive = false; ++ ++ bfq_log_bfqq(bfqd, bfqq, "add_request %d", rq_is_sync(rq)); ++ bfqq->queued[rq_is_sync(rq)]++; ++ bfqd->queued++; ++ ++ elv_rb_add(&bfqq->sort_list, rq); ++ ++ /* ++ * Check if this request is a better next-serve candidate. ++ */ ++ prev = bfqq->next_rq; ++ next_rq = bfq_choose_req(bfqd, bfqq->next_rq, rq, bfqd->last_position); ++ BUG_ON(next_rq == NULL); ++ bfqq->next_rq = next_rq; ++ ++ /* ++ * Adjust priority tree position, if next_rq changes. ++ */ ++ if (prev != bfqq->next_rq) ++ bfq_rq_pos_tree_add(bfqd, bfqq); ++ ++ if (!bfq_bfqq_busy(bfqq)) { ++ bool soft_rt, ++ idle_for_long_time = time_is_before_jiffies( ++ bfqq->budget_timeout + ++ bfqd->bfq_wr_min_idle_time); ++ ++ if (bfq_bfqq_sync(bfqq)) { ++ bool already_in_burst = ++ !hlist_unhashed(&bfqq->burst_list_node) || ++ bfq_bfqq_in_large_burst(bfqq); ++ bfq_handle_burst(bfqd, bfqq, idle_for_long_time); ++ /* ++ * If bfqq was not already in the current burst, ++ * then, at this point, bfqq either has been ++ * added to the current burst or has caused the ++ * current burst to terminate. In particular, in ++ * the second case, bfqq has become the first ++ * queue in a possible new burst. ++ * In both cases last_ins_in_burst needs to be ++ * moved forward. ++ */ ++ if (!already_in_burst) ++ bfqd->last_ins_in_burst = jiffies; ++ } ++ ++ soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && ++ !bfq_bfqq_in_large_burst(bfqq) && ++ time_is_before_jiffies(bfqq->soft_rt_next_start); ++ interactive = !bfq_bfqq_in_large_burst(bfqq) && ++ idle_for_long_time; ++ entity->budget = max_t(unsigned long, bfqq->max_budget, ++ bfq_serv_to_charge(next_rq, bfqq)); ++ ++ if (!bfq_bfqq_IO_bound(bfqq)) { ++ if (time_before(jiffies, ++ RQ_BIC(rq)->ttime.last_end_request + ++ bfqd->bfq_slice_idle)) { ++ bfqq->requests_within_timer++; ++ if (bfqq->requests_within_timer >= ++ bfqd->bfq_requests_within_timer) ++ bfq_mark_bfqq_IO_bound(bfqq); ++ } else ++ bfqq->requests_within_timer = 0; ++ } ++ ++ if (!bfqd->low_latency) ++ goto add_bfqq_busy; ++ ++ /* ++ * If the queue is not being boosted and has been idle ++ * for enough time, start a weight-raising period ++ */ ++ if (old_wr_coeff == 1 && (interactive || soft_rt)) { ++ bfqq->wr_coeff = bfqd->bfq_wr_coeff; ++ if (interactive) ++ bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); ++ else ++ bfqq->wr_cur_max_time = ++ bfqd->bfq_wr_rt_max_time; ++ bfq_log_bfqq(bfqd, bfqq, ++ "wrais starting at %lu, rais_max_time %u", ++ jiffies, ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } else if (old_wr_coeff > 1) { ++ if (interactive) ++ bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); ++ else if (bfq_bfqq_in_large_burst(bfqq) || ++ (bfqq->wr_cur_max_time == ++ bfqd->bfq_wr_rt_max_time && ++ !soft_rt)) { ++ bfqq->wr_coeff = 1; ++ bfq_log_bfqq(bfqd, bfqq, ++ "wrais ending at %lu, rais_max_time %u", ++ jiffies, ++ jiffies_to_msecs(bfqq-> ++ wr_cur_max_time)); ++ } else if (time_before( ++ bfqq->last_wr_start_finish + ++ bfqq->wr_cur_max_time, ++ jiffies + ++ bfqd->bfq_wr_rt_max_time) && ++ soft_rt) { ++ /* ++ * ++ * The remaining weight-raising time is lower ++ * than bfqd->bfq_wr_rt_max_time, which ++ * means that the application is enjoying ++ * weight raising either because deemed soft- ++ * rt in the near past, or because deemed ++ * interactive a long ago. In both cases, ++ * resetting now the current remaining weight- ++ * raising time for the application to the ++ * weight-raising duration for soft rt ++ * applications would not cause any latency ++ * increase for the application (as the new ++ * duration would be higher than the remaining ++ * time). ++ * ++ * In addition, the application is now meeting ++ * the requirements for being deemed soft rt. ++ * In the end we can correctly and safely ++ * (re)charge the weight-raising duration for ++ * the application with the weight-raising ++ * duration for soft rt applications. ++ * ++ * In particular, doing this recharge now, i.e., ++ * before the weight-raising period for the ++ * application finishes, reduces the probability ++ * of the following negative scenario: ++ * 1) the weight of a soft rt application is ++ * raised at startup (as for any newly ++ * created application), ++ * 2) since the application is not interactive, ++ * at a certain time weight-raising is ++ * stopped for the application, ++ * 3) at that time the application happens to ++ * still have pending requests, and hence ++ * is destined to not have a chance to be ++ * deemed soft rt before these requests are ++ * completed (see the comments to the ++ * function bfq_bfqq_softrt_next_start() ++ * for details on soft rt detection), ++ * 4) these pending requests experience a high ++ * latency because the application is not ++ * weight-raised while they are pending. ++ */ ++ bfqq->last_wr_start_finish = jiffies; ++ bfqq->wr_cur_max_time = ++ bfqd->bfq_wr_rt_max_time; ++ } ++ } ++ if (old_wr_coeff != bfqq->wr_coeff) ++ entity->ioprio_changed = 1; ++add_bfqq_busy: ++ bfqq->last_idle_bklogged = jiffies; ++ bfqq->service_from_backlogged = 0; ++ bfq_clear_bfqq_softrt_update(bfqq); ++ bfq_add_bfqq_busy(bfqd, bfqq); ++ } else { ++ if (bfqd->low_latency && old_wr_coeff == 1 && !rq_is_sync(rq) && ++ time_is_before_jiffies( ++ bfqq->last_wr_start_finish + ++ bfqd->bfq_wr_min_inter_arr_async)) { ++ bfqq->wr_coeff = bfqd->bfq_wr_coeff; ++ bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); ++ ++ bfqd->wr_busy_queues++; ++ entity->ioprio_changed = 1; ++ bfq_log_bfqq(bfqd, bfqq, ++ "non-idle wrais starting at %lu, rais_max_time %u", ++ jiffies, ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } ++ if (prev != bfqq->next_rq) ++ bfq_updated_next_req(bfqd, bfqq); ++ } ++ ++ if (bfqd->low_latency && ++ (old_wr_coeff == 1 || bfqq->wr_coeff == 1 || interactive)) ++ bfqq->last_wr_start_finish = jiffies; ++} ++ ++static struct request *bfq_find_rq_fmerge(struct bfq_data *bfqd, ++ struct bio *bio) ++{ ++ struct task_struct *tsk = current; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq; ++ ++ bic = bfq_bic_lookup(bfqd, tsk->io_context); ++ if (bic == NULL) ++ return NULL; ++ ++ bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio)); ++ if (bfqq != NULL) ++ return elv_rb_find(&bfqq->sort_list, bio_end_sector(bio)); ++ ++ return NULL; ++} ++ ++static void bfq_activate_request(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ ++ bfqd->rq_in_driver++; ++ bfqd->last_position = blk_rq_pos(rq) + blk_rq_sectors(rq); ++ bfq_log(bfqd, "activate_request: new bfqd->last_position %llu", ++ (long long unsigned)bfqd->last_position); ++} ++ ++static inline void bfq_deactivate_request(struct request_queue *q, ++ struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ ++ BUG_ON(bfqd->rq_in_driver == 0); ++ bfqd->rq_in_driver--; ++} ++ ++static void bfq_remove_request(struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_data *bfqd = bfqq->bfqd; ++ const int sync = rq_is_sync(rq); ++ ++ if (bfqq->next_rq == rq) { ++ bfqq->next_rq = bfq_find_next_rq(bfqd, bfqq, rq); ++ bfq_updated_next_req(bfqd, bfqq); ++ } ++ ++ list_del_init(&rq->queuelist); ++ BUG_ON(bfqq->queued[sync] == 0); ++ bfqq->queued[sync]--; ++ bfqd->queued--; ++ elv_rb_del(&bfqq->sort_list, rq); ++ ++ if (RB_EMPTY_ROOT(&bfqq->sort_list)) { ++ if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) ++ bfq_del_bfqq_busy(bfqd, bfqq, 1); ++ /* ++ * Remove queue from request-position tree as it is empty. ++ */ ++ if (bfqq->pos_root != NULL) { ++ rb_erase(&bfqq->pos_node, bfqq->pos_root); ++ bfqq->pos_root = NULL; ++ } ++ } ++ ++ if (rq->cmd_flags & REQ_META) { ++ BUG_ON(bfqq->meta_pending == 0); ++ bfqq->meta_pending--; ++ } ++} ++ ++static int bfq_merge(struct request_queue *q, struct request **req, ++ struct bio *bio) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct request *__rq; ++ ++ __rq = bfq_find_rq_fmerge(bfqd, bio); ++ if (__rq != NULL && elv_rq_merge_ok(__rq, bio)) { ++ *req = __rq; ++ return ELEVATOR_FRONT_MERGE; ++ } ++ ++ return ELEVATOR_NO_MERGE; ++} ++ ++static void bfq_merged_request(struct request_queue *q, struct request *req, ++ int type) ++{ ++ if (type == ELEVATOR_FRONT_MERGE && ++ rb_prev(&req->rb_node) && ++ blk_rq_pos(req) < ++ blk_rq_pos(container_of(rb_prev(&req->rb_node), ++ struct request, rb_node))) { ++ struct bfq_queue *bfqq = RQ_BFQQ(req); ++ struct bfq_data *bfqd = bfqq->bfqd; ++ struct request *prev, *next_rq; ++ ++ /* Reposition request in its sort_list */ ++ elv_rb_del(&bfqq->sort_list, req); ++ elv_rb_add(&bfqq->sort_list, req); ++ /* Choose next request to be served for bfqq */ ++ prev = bfqq->next_rq; ++ next_rq = bfq_choose_req(bfqd, bfqq->next_rq, req, ++ bfqd->last_position); ++ BUG_ON(next_rq == NULL); ++ bfqq->next_rq = next_rq; ++ /* ++ * If next_rq changes, update both the queue's budget to ++ * fit the new request and the queue's position in its ++ * rq_pos_tree. ++ */ ++ if (prev != bfqq->next_rq) { ++ bfq_updated_next_req(bfqd, bfqq); ++ bfq_rq_pos_tree_add(bfqd, bfqq); ++ } ++ } ++} ++ ++static void bfq_merged_requests(struct request_queue *q, struct request *rq, ++ struct request *next) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ /* ++ * Reposition in fifo if next is older than rq. ++ */ ++ if (!list_empty(&rq->queuelist) && !list_empty(&next->queuelist) && ++ time_before(next->fifo_time, rq->fifo_time)) { ++ list_move(&rq->queuelist, &next->queuelist); ++ rq->fifo_time = next->fifo_time; ++ } ++ ++ if (bfqq->next_rq == next) ++ bfqq->next_rq = rq; ++ ++ bfq_remove_request(next); ++} ++ ++/* Must be called with bfqq != NULL */ ++static inline void bfq_bfqq_end_wr(struct bfq_queue *bfqq) ++{ ++ BUG_ON(bfqq == NULL); ++ if (bfq_bfqq_busy(bfqq)) ++ bfqq->bfqd->wr_busy_queues--; ++ bfqq->wr_coeff = 1; ++ bfqq->wr_cur_max_time = 0; ++ /* Trigger a weight change on the next activation of the queue */ ++ bfqq->entity.ioprio_changed = 1; ++} ++ ++static void bfq_end_wr_async_queues(struct bfq_data *bfqd, ++ struct bfq_group *bfqg) ++{ ++ int i, j; ++ ++ for (i = 0; i < 2; i++) ++ for (j = 0; j < IOPRIO_BE_NR; j++) ++ if (bfqg->async_bfqq[i][j] != NULL) ++ bfq_bfqq_end_wr(bfqg->async_bfqq[i][j]); ++ if (bfqg->async_idle_bfqq != NULL) ++ bfq_bfqq_end_wr(bfqg->async_idle_bfqq); ++} ++ ++static void bfq_end_wr(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq; ++ ++ spin_lock_irq(bfqd->queue->queue_lock); ++ ++ list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) ++ bfq_bfqq_end_wr(bfqq); ++ list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) ++ bfq_bfqq_end_wr(bfqq); ++ bfq_end_wr_async(bfqd); ++ ++ spin_unlock_irq(bfqd->queue->queue_lock); ++} ++ ++static int bfq_allow_merge(struct request_queue *q, struct request *rq, ++ struct bio *bio) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq; ++ ++ /* ++ * Disallow merge of a sync bio into an async request. ++ */ ++ if (bfq_bio_sync(bio) && !rq_is_sync(rq)) ++ return 0; ++ ++ /* ++ * Lookup the bfqq that this bio will be queued with. Allow ++ * merge only if rq is queued there. ++ * Queue lock is held here. ++ */ ++ bic = bfq_bic_lookup(bfqd, current->io_context); ++ if (bic == NULL) ++ return 0; ++ ++ bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio)); ++ return bfqq == RQ_BFQQ(rq); ++} ++ ++static void __bfq_set_in_service_queue(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (bfqq != NULL) { ++ bfq_mark_bfqq_must_alloc(bfqq); ++ bfq_mark_bfqq_budget_new(bfqq); ++ bfq_clear_bfqq_fifo_expire(bfqq); ++ ++ bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8; ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "set_in_service_queue, cur-budget = %lu", ++ bfqq->entity.budget); ++ } ++ ++ bfqd->in_service_queue = bfqq; ++} ++ ++/* ++ * Get and set a new queue for service. ++ */ ++static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (!bfqq) ++ bfqq = bfq_get_next_queue(bfqd); ++ else ++ bfq_get_next_queue_forced(bfqd, bfqq); ++ ++ __bfq_set_in_service_queue(bfqd, bfqq); ++ return bfqq; ++} ++ ++static inline sector_t bfq_dist_from_last(struct bfq_data *bfqd, ++ struct request *rq) ++{ ++ if (blk_rq_pos(rq) >= bfqd->last_position) ++ return blk_rq_pos(rq) - bfqd->last_position; ++ else ++ return bfqd->last_position - blk_rq_pos(rq); ++} ++ ++/* ++ * Return true if bfqq has no request pending and rq is close enough to ++ * bfqd->last_position, or if rq is closer to bfqd->last_position than ++ * bfqq->next_rq ++ */ ++static inline int bfq_rq_close(struct bfq_data *bfqd, struct request *rq) ++{ ++ return bfq_dist_from_last(bfqd, rq) <= BFQQ_SEEK_THR; ++} ++ ++static struct bfq_queue *bfqq_close(struct bfq_data *bfqd) ++{ ++ struct rb_root *root = &bfqd->rq_pos_tree; ++ struct rb_node *parent, *node; ++ struct bfq_queue *__bfqq; ++ sector_t sector = bfqd->last_position; ++ ++ if (RB_EMPTY_ROOT(root)) ++ return NULL; ++ ++ /* ++ * First, if we find a request starting at the end of the last ++ * request, choose it. ++ */ ++ __bfqq = bfq_rq_pos_tree_lookup(bfqd, root, sector, &parent, NULL); ++ if (__bfqq != NULL) ++ return __bfqq; ++ ++ /* ++ * If the exact sector wasn't found, the parent of the NULL leaf ++ * will contain the closest sector (rq_pos_tree sorted by ++ * next_request position). ++ */ ++ __bfqq = rb_entry(parent, struct bfq_queue, pos_node); ++ if (bfq_rq_close(bfqd, __bfqq->next_rq)) ++ return __bfqq; ++ ++ if (blk_rq_pos(__bfqq->next_rq) < sector) ++ node = rb_next(&__bfqq->pos_node); ++ else ++ node = rb_prev(&__bfqq->pos_node); ++ if (node == NULL) ++ return NULL; ++ ++ __bfqq = rb_entry(node, struct bfq_queue, pos_node); ++ if (bfq_rq_close(bfqd, __bfqq->next_rq)) ++ return __bfqq; ++ ++ return NULL; ++} ++ ++/* ++ * bfqd - obvious ++ * cur_bfqq - passed in so that we don't decide that the current queue ++ * is closely cooperating with itself. ++ * ++ * We are assuming that cur_bfqq has dispatched at least one request, ++ * and that bfqd->last_position reflects a position on the disk associated ++ * with the I/O issued by cur_bfqq. ++ */ ++static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd, ++ struct bfq_queue *cur_bfqq) ++{ ++ struct bfq_queue *bfqq; ++ ++ if (bfq_class_idle(cur_bfqq)) ++ return NULL; ++ if (!bfq_bfqq_sync(cur_bfqq)) ++ return NULL; ++ if (BFQQ_SEEKY(cur_bfqq)) ++ return NULL; ++ ++ /* If device has only one backlogged bfq_queue, don't search. */ ++ if (bfqd->busy_queues == 1) ++ return NULL; ++ ++ /* ++ * We should notice if some of the queues are cooperating, e.g. ++ * working closely on the same area of the disk. In that case, ++ * we can group them together and don't waste time idling. ++ */ ++ bfqq = bfqq_close(bfqd); ++ if (bfqq == NULL || bfqq == cur_bfqq) ++ return NULL; ++ ++ /* ++ * Do not merge queues from different bfq_groups. ++ */ ++ if (bfqq->entity.parent != cur_bfqq->entity.parent) ++ return NULL; ++ ++ /* ++ * It only makes sense to merge sync queues. ++ */ ++ if (!bfq_bfqq_sync(bfqq)) ++ return NULL; ++ if (BFQQ_SEEKY(bfqq)) ++ return NULL; ++ ++ /* ++ * Do not merge queues of different priority classes. ++ */ ++ if (bfq_class_rt(bfqq) != bfq_class_rt(cur_bfqq)) ++ return NULL; ++ ++ return bfqq; ++} ++ ++/* ++ * If enough samples have been computed, return the current max budget ++ * stored in bfqd, which is dynamically updated according to the ++ * estimated disk peak rate; otherwise return the default max budget ++ */ ++static inline unsigned long bfq_max_budget(struct bfq_data *bfqd) ++{ ++ if (bfqd->budgets_assigned < 194) ++ return bfq_default_max_budget; ++ else ++ return bfqd->bfq_max_budget; ++} ++ ++/* ++ * Return min budget, which is a fraction of the current or default ++ * max budget (trying with 1/32) ++ */ ++static inline unsigned long bfq_min_budget(struct bfq_data *bfqd) ++{ ++ if (bfqd->budgets_assigned < 194) ++ return bfq_default_max_budget / 32; ++ else ++ return bfqd->bfq_max_budget / 32; ++} ++ ++static void bfq_arm_slice_timer(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq = bfqd->in_service_queue; ++ struct bfq_io_cq *bic; ++ unsigned long sl; ++ ++ BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list)); ++ ++ /* Processes have exited, don't wait. */ ++ bic = bfqd->in_service_bic; ++ if (bic == NULL || atomic_read(&bic->icq.ioc->active_ref) == 0) ++ return; ++ ++ bfq_mark_bfqq_wait_request(bfqq); ++ ++ /* ++ * We don't want to idle for seeks, but we do want to allow ++ * fair distribution of slice time for a process doing back-to-back ++ * seeks. So allow a little bit of time for him to submit a new rq. ++ * ++ * To prevent processes with (partly) seeky workloads from ++ * being too ill-treated, grant them a small fraction of the ++ * assigned budget before reducing the waiting time to ++ * BFQ_MIN_TT. This happened to help reduce latency. ++ */ ++ sl = bfqd->bfq_slice_idle; ++ /* ++ * Unless the queue is being weight-raised, grant only minimum idle ++ * time if the queue either has been seeky for long enough or has ++ * already proved to be constantly seeky. ++ */ ++ if (bfq_sample_valid(bfqq->seek_samples) && ++ ((BFQQ_SEEKY(bfqq) && bfqq->entity.service > ++ bfq_max_budget(bfqq->bfqd) / 8) || ++ bfq_bfqq_constantly_seeky(bfqq)) && bfqq->wr_coeff == 1) ++ sl = min(sl, msecs_to_jiffies(BFQ_MIN_TT)); ++ else if (bfqq->wr_coeff > 1) ++ sl = sl * 3; ++ bfqd->last_idling_start = ktime_get(); ++ mod_timer(&bfqd->idle_slice_timer, jiffies + sl); ++ bfq_log(bfqd, "arm idle: %u/%u ms", ++ jiffies_to_msecs(sl), jiffies_to_msecs(bfqd->bfq_slice_idle)); ++} ++ ++/* ++ * Set the maximum time for the in-service queue to consume its ++ * budget. This prevents seeky processes from lowering the disk ++ * throughput (always guaranteed with a time slice scheme as in CFQ). ++ */ ++static void bfq_set_budget_timeout(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq = bfqd->in_service_queue; ++ unsigned int timeout_coeff; ++ if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time) ++ timeout_coeff = 1; ++ else ++ timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight; ++ ++ bfqd->last_budget_start = ktime_get(); ++ ++ bfq_clear_bfqq_budget_new(bfqq); ++ bfqq->budget_timeout = jiffies + ++ bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * timeout_coeff; ++ ++ bfq_log_bfqq(bfqd, bfqq, "set budget_timeout %u", ++ jiffies_to_msecs(bfqd->bfq_timeout[bfq_bfqq_sync(bfqq)] * ++ timeout_coeff)); ++} ++ ++/* ++ * Move request from internal lists to the request queue dispatch list. ++ */ ++static void bfq_dispatch_insert(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ /* ++ * For consistency, the next instruction should have been executed ++ * after removing the request from the queue and dispatching it. ++ * We execute instead this instruction before bfq_remove_request() ++ * (and hence introduce a temporary inconsistency), for efficiency. ++ * In fact, in a forced_dispatch, this prevents two counters related ++ * to bfqq->dispatched to risk to be uselessly decremented if bfqq ++ * is not in service, and then to be incremented again after ++ * incrementing bfqq->dispatched. ++ */ ++ bfqq->dispatched++; ++ bfq_remove_request(rq); ++ elv_dispatch_sort(q, rq); ++ ++ if (bfq_bfqq_sync(bfqq)) ++ bfqd->sync_flight++; ++} ++ ++/* ++ * Return expired entry, or NULL to just start from scratch in rbtree. ++ */ ++static struct request *bfq_check_fifo(struct bfq_queue *bfqq) ++{ ++ struct request *rq = NULL; ++ ++ if (bfq_bfqq_fifo_expire(bfqq)) ++ return NULL; ++ ++ bfq_mark_bfqq_fifo_expire(bfqq); ++ ++ if (list_empty(&bfqq->fifo)) ++ return NULL; ++ ++ rq = rq_entry_fifo(bfqq->fifo.next); ++ ++ if (time_before(jiffies, rq->fifo_time)) ++ return NULL; ++ ++ return rq; ++} ++ ++/* Must be called with the queue_lock held. */ ++static int bfqq_process_refs(struct bfq_queue *bfqq) ++{ ++ int process_refs, io_refs; ++ ++ io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE]; ++ process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st; ++ BUG_ON(process_refs < 0); ++ return process_refs; ++} ++ ++static void bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) ++{ ++ int process_refs, new_process_refs; ++ struct bfq_queue *__bfqq; ++ ++ /* ++ * If there are no process references on the new_bfqq, then it is ++ * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain ++ * may have dropped their last reference (not just their last process ++ * reference). ++ */ ++ if (!bfqq_process_refs(new_bfqq)) ++ return; ++ ++ /* Avoid a circular list and skip interim queue merges. */ ++ while ((__bfqq = new_bfqq->new_bfqq)) { ++ if (__bfqq == bfqq) ++ return; ++ new_bfqq = __bfqq; ++ } ++ ++ process_refs = bfqq_process_refs(bfqq); ++ new_process_refs = bfqq_process_refs(new_bfqq); ++ /* ++ * If the process for the bfqq has gone away, there is no ++ * sense in merging the queues. ++ */ ++ if (process_refs == 0 || new_process_refs == 0) ++ return; ++ ++ /* ++ * Merge in the direction of the lesser amount of work. ++ */ ++ if (new_process_refs >= process_refs) { ++ bfqq->new_bfqq = new_bfqq; ++ atomic_add(process_refs, &new_bfqq->ref); ++ } else { ++ new_bfqq->new_bfqq = bfqq; ++ atomic_add(new_process_refs, &bfqq->ref); ++ } ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d", ++ new_bfqq->pid); ++} ++ ++static inline unsigned long bfq_bfqq_budget_left(struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ return entity->budget - entity->service; ++} ++ ++static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ BUG_ON(bfqq != bfqd->in_service_queue); ++ ++ __bfq_bfqd_reset_in_service(bfqd); ++ ++ /* ++ * If this bfqq is shared between multiple processes, check ++ * to make sure that those processes are still issuing I/Os ++ * within the mean seek distance. If not, it may be time to ++ * break the queues apart again. ++ */ ++ if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq)) ++ bfq_mark_bfqq_split_coop(bfqq); ++ ++ if (RB_EMPTY_ROOT(&bfqq->sort_list)) { ++ /* ++ * Overloading budget_timeout field to store the time ++ * at which the queue remains with no backlog; used by ++ * the weight-raising mechanism. ++ */ ++ bfqq->budget_timeout = jiffies; ++ bfq_del_bfqq_busy(bfqd, bfqq, 1); ++ } else { ++ bfq_activate_bfqq(bfqd, bfqq); ++ /* ++ * Resort priority tree of potential close cooperators. ++ */ ++ bfq_rq_pos_tree_add(bfqd, bfqq); ++ } ++} ++ ++/** ++ * __bfq_bfqq_recalc_budget - try to adapt the budget to the @bfqq behavior. ++ * @bfqd: device data. ++ * @bfqq: queue to update. ++ * @reason: reason for expiration. ++ * ++ * Handle the feedback on @bfqq budget. See the body for detailed ++ * comments. ++ */ ++static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ enum bfqq_expiration reason) ++{ ++ struct request *next_rq; ++ unsigned long budget, min_budget; ++ ++ budget = bfqq->max_budget; ++ min_budget = bfq_min_budget(bfqd); ++ ++ BUG_ON(bfqq != bfqd->in_service_queue); ++ ++ bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last budg %lu, budg left %lu", ++ bfqq->entity.budget, bfq_bfqq_budget_left(bfqq)); ++ bfq_log_bfqq(bfqd, bfqq, "recalc_budg: last max_budg %lu, min budg %lu", ++ budget, bfq_min_budget(bfqd)); ++ bfq_log_bfqq(bfqd, bfqq, "recalc_budg: sync %d, seeky %d", ++ bfq_bfqq_sync(bfqq), BFQQ_SEEKY(bfqd->in_service_queue)); ++ ++ if (bfq_bfqq_sync(bfqq)) { ++ switch (reason) { ++ /* ++ * Caveat: in all the following cases we trade latency ++ * for throughput. ++ */ ++ case BFQ_BFQQ_TOO_IDLE: ++ /* ++ * This is the only case where we may reduce ++ * the budget: if there is no request of the ++ * process still waiting for completion, then ++ * we assume (tentatively) that the timer has ++ * expired because the batch of requests of ++ * the process could have been served with a ++ * smaller budget. Hence, betting that ++ * process will behave in the same way when it ++ * becomes backlogged again, we reduce its ++ * next budget. As long as we guess right, ++ * this budget cut reduces the latency ++ * experienced by the process. ++ * ++ * However, if there are still outstanding ++ * requests, then the process may have not yet ++ * issued its next request just because it is ++ * still waiting for the completion of some of ++ * the still outstanding ones. So in this ++ * subcase we do not reduce its budget, on the ++ * contrary we increase it to possibly boost ++ * the throughput, as discussed in the ++ * comments to the BUDGET_TIMEOUT case. ++ */ ++ if (bfqq->dispatched > 0) /* still outstanding reqs */ ++ budget = min(budget * 2, bfqd->bfq_max_budget); ++ else { ++ if (budget > 5 * min_budget) ++ budget -= 4 * min_budget; ++ else ++ budget = min_budget; ++ } ++ break; ++ case BFQ_BFQQ_BUDGET_TIMEOUT: ++ /* ++ * We double the budget here because: 1) it ++ * gives the chance to boost the throughput if ++ * this is not a seeky process (which may have ++ * bumped into this timeout because of, e.g., ++ * ZBR), 2) together with charge_full_budget ++ * it helps give seeky processes higher ++ * timestamps, and hence be served less ++ * frequently. ++ */ ++ budget = min(budget * 2, bfqd->bfq_max_budget); ++ break; ++ case BFQ_BFQQ_BUDGET_EXHAUSTED: ++ /* ++ * The process still has backlog, and did not ++ * let either the budget timeout or the disk ++ * idling timeout expire. Hence it is not ++ * seeky, has a short thinktime and may be ++ * happy with a higher budget too. So ++ * definitely increase the budget of this good ++ * candidate to boost the disk throughput. ++ */ ++ budget = min(budget * 4, bfqd->bfq_max_budget); ++ break; ++ case BFQ_BFQQ_NO_MORE_REQUESTS: ++ /* ++ * Leave the budget unchanged. ++ */ ++ default: ++ return; ++ } ++ } else /* async queue */ ++ /* async queues get always the maximum possible budget ++ * (their ability to dispatch is limited by ++ * @bfqd->bfq_max_budget_async_rq). ++ */ ++ budget = bfqd->bfq_max_budget; ++ ++ bfqq->max_budget = budget; ++ ++ if (bfqd->budgets_assigned >= 194 && bfqd->bfq_user_max_budget == 0 && ++ bfqq->max_budget > bfqd->bfq_max_budget) ++ bfqq->max_budget = bfqd->bfq_max_budget; ++ ++ /* ++ * Make sure that we have enough budget for the next request. ++ * Since the finish time of the bfqq must be kept in sync with ++ * the budget, be sure to call __bfq_bfqq_expire() after the ++ * update. ++ */ ++ next_rq = bfqq->next_rq; ++ if (next_rq != NULL) ++ bfqq->entity.budget = max_t(unsigned long, bfqq->max_budget, ++ bfq_serv_to_charge(next_rq, bfqq)); ++ else ++ bfqq->entity.budget = bfqq->max_budget; ++ ++ bfq_log_bfqq(bfqd, bfqq, "head sect: %u, new budget %lu", ++ next_rq != NULL ? blk_rq_sectors(next_rq) : 0, ++ bfqq->entity.budget); ++} ++ ++static unsigned long bfq_calc_max_budget(u64 peak_rate, u64 timeout) ++{ ++ unsigned long max_budget; ++ ++ /* ++ * The max_budget calculated when autotuning is equal to the ++ * amount of sectors transfered in timeout_sync at the ++ * estimated peak rate. ++ */ ++ max_budget = (unsigned long)(peak_rate * 1000 * ++ timeout >> BFQ_RATE_SHIFT); ++ ++ return max_budget; ++} ++ ++/* ++ * In addition to updating the peak rate, checks whether the process ++ * is "slow", and returns 1 if so. This slow flag is used, in addition ++ * to the budget timeout, to reduce the amount of service provided to ++ * seeky processes, and hence reduce their chances to lower the ++ * throughput. See the code for more details. ++ */ ++static int bfq_update_peak_rate(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ int compensate, enum bfqq_expiration reason) ++{ ++ u64 bw, usecs, expected, timeout; ++ ktime_t delta; ++ int update = 0; ++ ++ if (!bfq_bfqq_sync(bfqq) || bfq_bfqq_budget_new(bfqq)) ++ return 0; ++ ++ if (compensate) ++ delta = bfqd->last_idling_start; ++ else ++ delta = ktime_get(); ++ delta = ktime_sub(delta, bfqd->last_budget_start); ++ usecs = ktime_to_us(delta); ++ ++ /* Don't trust short/unrealistic values. */ ++ if (usecs < 100 || usecs >= LONG_MAX) ++ return 0; ++ ++ /* ++ * Calculate the bandwidth for the last slice. We use a 64 bit ++ * value to store the peak rate, in sectors per usec in fixed ++ * point math. We do so to have enough precision in the estimate ++ * and to avoid overflows. ++ */ ++ bw = (u64)bfqq->entity.service << BFQ_RATE_SHIFT; ++ do_div(bw, (unsigned long)usecs); ++ ++ timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]); ++ ++ /* ++ * Use only long (> 20ms) intervals to filter out spikes for ++ * the peak rate estimation. ++ */ ++ if (usecs > 20000) { ++ if (bw > bfqd->peak_rate || ++ (!BFQQ_SEEKY(bfqq) && ++ reason == BFQ_BFQQ_BUDGET_TIMEOUT)) { ++ bfq_log(bfqd, "measured bw =%llu", bw); ++ /* ++ * To smooth oscillations use a low-pass filter with ++ * alpha=7/8, i.e., ++ * new_rate = (7/8) * old_rate + (1/8) * bw ++ */ ++ do_div(bw, 8); ++ if (bw == 0) ++ return 0; ++ bfqd->peak_rate *= 7; ++ do_div(bfqd->peak_rate, 8); ++ bfqd->peak_rate += bw; ++ update = 1; ++ bfq_log(bfqd, "new peak_rate=%llu", bfqd->peak_rate); ++ } ++ ++ update |= bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES - 1; ++ ++ if (bfqd->peak_rate_samples < BFQ_PEAK_RATE_SAMPLES) ++ bfqd->peak_rate_samples++; ++ ++ if (bfqd->peak_rate_samples == BFQ_PEAK_RATE_SAMPLES && ++ update) { ++ int dev_type = blk_queue_nonrot(bfqd->queue); ++ if (bfqd->bfq_user_max_budget == 0) { ++ bfqd->bfq_max_budget = ++ bfq_calc_max_budget(bfqd->peak_rate, ++ timeout); ++ bfq_log(bfqd, "new max_budget=%lu", ++ bfqd->bfq_max_budget); ++ } ++ if (bfqd->device_speed == BFQ_BFQD_FAST && ++ bfqd->peak_rate < device_speed_thresh[dev_type]) { ++ bfqd->device_speed = BFQ_BFQD_SLOW; ++ bfqd->RT_prod = R_slow[dev_type] * ++ T_slow[dev_type]; ++ } else if (bfqd->device_speed == BFQ_BFQD_SLOW && ++ bfqd->peak_rate > device_speed_thresh[dev_type]) { ++ bfqd->device_speed = BFQ_BFQD_FAST; ++ bfqd->RT_prod = R_fast[dev_type] * ++ T_fast[dev_type]; ++ } ++ } ++ } ++ ++ /* ++ * If the process has been served for a too short time ++ * interval to let its possible sequential accesses prevail on ++ * the initial seek time needed to move the disk head on the ++ * first sector it requested, then give the process a chance ++ * and for the moment return false. ++ */ ++ if (bfqq->entity.budget <= bfq_max_budget(bfqd) / 8) ++ return 0; ++ ++ /* ++ * A process is considered ``slow'' (i.e., seeky, so that we ++ * cannot treat it fairly in the service domain, as it would ++ * slow down too much the other processes) if, when a slice ++ * ends for whatever reason, it has received service at a ++ * rate that would not be high enough to complete the budget ++ * before the budget timeout expiration. ++ */ ++ expected = bw * 1000 * timeout >> BFQ_RATE_SHIFT; ++ ++ /* ++ * Caveat: processes doing IO in the slower disk zones will ++ * tend to be slow(er) even if not seeky. And the estimated ++ * peak rate will actually be an average over the disk ++ * surface. Hence, to not be too harsh with unlucky processes, ++ * we keep a budget/3 margin of safety before declaring a ++ * process slow. ++ */ ++ return expected > (4 * bfqq->entity.budget) / 3; ++} ++ ++/* ++ * To be deemed as soft real-time, an application must meet two ++ * requirements. First, the application must not require an average ++ * bandwidth higher than the approximate bandwidth required to playback or ++ * record a compressed high-definition video. ++ * The next function is invoked on the completion of the last request of a ++ * batch, to compute the next-start time instant, soft_rt_next_start, such ++ * that, if the next request of the application does not arrive before ++ * soft_rt_next_start, then the above requirement on the bandwidth is met. ++ * ++ * The second requirement is that the request pattern of the application is ++ * isochronous, i.e., that, after issuing a request or a batch of requests, ++ * the application stops issuing new requests until all its pending requests ++ * have been completed. After that, the application may issue a new batch, ++ * and so on. ++ * For this reason the next function is invoked to compute ++ * soft_rt_next_start only for applications that meet this requirement, ++ * whereas soft_rt_next_start is set to infinity for applications that do ++ * not. ++ * ++ * Unfortunately, even a greedy application may happen to behave in an ++ * isochronous way if the CPU load is high. In fact, the application may ++ * stop issuing requests while the CPUs are busy serving other processes, ++ * then restart, then stop again for a while, and so on. In addition, if ++ * the disk achieves a low enough throughput with the request pattern ++ * issued by the application (e.g., because the request pattern is random ++ * and/or the device is slow), then the application may meet the above ++ * bandwidth requirement too. To prevent such a greedy application to be ++ * deemed as soft real-time, a further rule is used in the computation of ++ * soft_rt_next_start: soft_rt_next_start must be higher than the current ++ * time plus the maximum time for which the arrival of a request is waited ++ * for when a sync queue becomes idle, namely bfqd->bfq_slice_idle. ++ * This filters out greedy applications, as the latter issue instead their ++ * next request as soon as possible after the last one has been completed ++ * (in contrast, when a batch of requests is completed, a soft real-time ++ * application spends some time processing data). ++ * ++ * Unfortunately, the last filter may easily generate false positives if ++ * only bfqd->bfq_slice_idle is used as a reference time interval and one ++ * or both the following cases occur: ++ * 1) HZ is so low that the duration of a jiffy is comparable to or higher ++ * than bfqd->bfq_slice_idle. This happens, e.g., on slow devices with ++ * HZ=100. ++ * 2) jiffies, instead of increasing at a constant rate, may stop increasing ++ * for a while, then suddenly 'jump' by several units to recover the lost ++ * increments. This seems to happen, e.g., inside virtual machines. ++ * To address this issue, we do not use as a reference time interval just ++ * bfqd->bfq_slice_idle, but bfqd->bfq_slice_idle plus a few jiffies. In ++ * particular we add the minimum number of jiffies for which the filter ++ * seems to be quite precise also in embedded systems and KVM/QEMU virtual ++ * machines. ++ */ ++static inline unsigned long bfq_bfqq_softrt_next_start(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ return max(bfqq->last_idle_bklogged + ++ HZ * bfqq->service_from_backlogged / ++ bfqd->bfq_wr_max_softrt_rate, ++ jiffies + bfqq->bfqd->bfq_slice_idle + 4); ++} ++ ++/* ++ * Return the largest-possible time instant such that, for as long as possible, ++ * the current time will be lower than this time instant according to the macro ++ * time_is_before_jiffies(). ++ */ ++static inline unsigned long bfq_infinity_from_now(unsigned long now) ++{ ++ return now + ULONG_MAX / 2; ++} ++ ++/** ++ * bfq_bfqq_expire - expire a queue. ++ * @bfqd: device owning the queue. ++ * @bfqq: the queue to expire. ++ * @compensate: if true, compensate for the time spent idling. ++ * @reason: the reason causing the expiration. ++ * ++ * ++ * If the process associated to the queue is slow (i.e., seeky), or in ++ * case of budget timeout, or, finally, if it is async, we ++ * artificially charge it an entire budget (independently of the ++ * actual service it received). As a consequence, the queue will get ++ * higher timestamps than the correct ones upon reactivation, and ++ * hence it will be rescheduled as if it had received more service ++ * than what it actually received. In the end, this class of processes ++ * will receive less service in proportion to how slowly they consume ++ * their budgets (and hence how seriously they tend to lower the ++ * throughput). ++ * ++ * In contrast, when a queue expires because it has been idling for ++ * too much or because it exhausted its budget, we do not touch the ++ * amount of service it has received. Hence when the queue will be ++ * reactivated and its timestamps updated, the latter will be in sync ++ * with the actual service received by the queue until expiration. ++ * ++ * Charging a full budget to the first type of queues and the exact ++ * service to the others has the effect of using the WF2Q+ policy to ++ * schedule the former on a timeslice basis, without violating the ++ * service domain guarantees of the latter. ++ */ ++static void bfq_bfqq_expire(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ int compensate, ++ enum bfqq_expiration reason) ++{ ++ int slow; ++ BUG_ON(bfqq != bfqd->in_service_queue); ++ ++ /* Update disk peak rate for autotuning and check whether the ++ * process is slow (see bfq_update_peak_rate). ++ */ ++ slow = bfq_update_peak_rate(bfqd, bfqq, compensate, reason); ++ ++ /* ++ * As above explained, 'punish' slow (i.e., seeky), timed-out ++ * and async queues, to favor sequential sync workloads. ++ * ++ * Processes doing I/O in the slower disk zones will tend to be ++ * slow(er) even if not seeky. Hence, since the estimated peak ++ * rate is actually an average over the disk surface, these ++ * processes may timeout just for bad luck. To avoid punishing ++ * them we do not charge a full budget to a process that ++ * succeeded in consuming at least 2/3 of its budget. ++ */ ++ if (slow || (reason == BFQ_BFQQ_BUDGET_TIMEOUT && ++ bfq_bfqq_budget_left(bfqq) >= bfqq->entity.budget / 3)) ++ bfq_bfqq_charge_full_budget(bfqq); ++ ++ bfqq->service_from_backlogged += bfqq->entity.service; ++ ++ if (BFQQ_SEEKY(bfqq) && reason == BFQ_BFQQ_BUDGET_TIMEOUT && ++ !bfq_bfqq_constantly_seeky(bfqq)) { ++ bfq_mark_bfqq_constantly_seeky(bfqq); ++ if (!blk_queue_nonrot(bfqd->queue)) ++ bfqd->const_seeky_busy_in_flight_queues++; ++ } ++ ++ if (reason == BFQ_BFQQ_TOO_IDLE && ++ bfqq->entity.service <= 2 * bfqq->entity.budget / 10 ) ++ bfq_clear_bfqq_IO_bound(bfqq); ++ ++ if (bfqd->low_latency && bfqq->wr_coeff == 1) ++ bfqq->last_wr_start_finish = jiffies; ++ ++ if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 && ++ RB_EMPTY_ROOT(&bfqq->sort_list)) { ++ /* ++ * If we get here, and there are no outstanding requests, ++ * then the request pattern is isochronous (see the comments ++ * to the function bfq_bfqq_softrt_next_start()). Hence we ++ * can compute soft_rt_next_start. If, instead, the queue ++ * still has outstanding requests, then we have to wait ++ * for the completion of all the outstanding requests to ++ * discover whether the request pattern is actually ++ * isochronous. ++ */ ++ if (bfqq->dispatched == 0) ++ bfqq->soft_rt_next_start = ++ bfq_bfqq_softrt_next_start(bfqd, bfqq); ++ else { ++ /* ++ * The application is still waiting for the ++ * completion of one or more requests: ++ * prevent it from possibly being incorrectly ++ * deemed as soft real-time by setting its ++ * soft_rt_next_start to infinity. In fact, ++ * without this assignment, the application ++ * would be incorrectly deemed as soft ++ * real-time if: ++ * 1) it issued a new request before the ++ * completion of all its in-flight ++ * requests, and ++ * 2) at that time, its soft_rt_next_start ++ * happened to be in the past. ++ */ ++ bfqq->soft_rt_next_start = ++ bfq_infinity_from_now(jiffies); ++ /* ++ * Schedule an update of soft_rt_next_start to when ++ * the task may be discovered to be isochronous. ++ */ ++ bfq_mark_bfqq_softrt_update(bfqq); ++ } ++ } ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "expire (%d, slow %d, num_disp %d, idle_win %d)", reason, ++ slow, bfqq->dispatched, bfq_bfqq_idle_window(bfqq)); ++ ++ /* ++ * Increase, decrease or leave budget unchanged according to ++ * reason. ++ */ ++ __bfq_bfqq_recalc_budget(bfqd, bfqq, reason); ++ __bfq_bfqq_expire(bfqd, bfqq); ++} ++ ++/* ++ * Budget timeout is not implemented through a dedicated timer, but ++ * just checked on request arrivals and completions, as well as on ++ * idle timer expirations. ++ */ ++static int bfq_bfqq_budget_timeout(struct bfq_queue *bfqq) ++{ ++ if (bfq_bfqq_budget_new(bfqq) || ++ time_before(jiffies, bfqq->budget_timeout)) ++ return 0; ++ return 1; ++} ++ ++/* ++ * If we expire a queue that is waiting for the arrival of a new ++ * request, we may prevent the fictitious timestamp back-shifting that ++ * allows the guarantees of the queue to be preserved (see [1] for ++ * this tricky aspect). Hence we return true only if this condition ++ * does not hold, or if the queue is slow enough to deserve only to be ++ * kicked off for preserving a high throughput. ++*/ ++static inline int bfq_may_expire_for_budg_timeout(struct bfq_queue *bfqq) ++{ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, ++ "may_budget_timeout: wait_request %d left %d timeout %d", ++ bfq_bfqq_wait_request(bfqq), ++ bfq_bfqq_budget_left(bfqq) >= bfqq->entity.budget / 3, ++ bfq_bfqq_budget_timeout(bfqq)); ++ ++ return (!bfq_bfqq_wait_request(bfqq) || ++ bfq_bfqq_budget_left(bfqq) >= bfqq->entity.budget / 3) ++ && ++ bfq_bfqq_budget_timeout(bfqq); ++} ++ ++/* ++ * Device idling is allowed only for the queues for which this function ++ * returns true. For this reason, the return value of this function plays a ++ * critical role for both throughput boosting and service guarantees. The ++ * return value is computed through a logical expression. In this rather ++ * long comment, we try to briefly describe all the details and motivations ++ * behind the components of this logical expression. ++ * ++ * First, the expression is false if bfqq is not sync, or if: bfqq happened ++ * to become active during a large burst of queue activations, and the ++ * pattern of requests bfqq contains boosts the throughput if bfqq is ++ * expired. In fact, queues that became active during a large burst benefit ++ * only from throughput, as discussed in the comments to bfq_handle_burst. ++ * In this respect, expiring bfqq certainly boosts the throughput on NCQ- ++ * capable flash-based devices, whereas, on rotational devices, it boosts ++ * the throughput only if bfqq contains random requests. ++ * ++ * On the opposite end, if (a) bfqq is sync, (b) the above burst-related ++ * condition does not hold, and (c) bfqq is being weight-raised, then the ++ * expression always evaluates to true, as device idling is instrumental ++ * for preserving low-latency guarantees (see [1]). If, instead, conditions ++ * (a) and (b) do hold, but (c) does not, then the expression evaluates to ++ * true only if: (1) bfqq is I/O-bound and has a non-null idle window, and ++ * (2) at least one of the following two conditions holds. ++ * The first condition is that the device is not performing NCQ, because ++ * idling the device most certainly boosts the throughput if this condition ++ * holds and bfqq is I/O-bound and has been granted a non-null idle window. ++ * The second compound condition is made of the logical AND of two components. ++ * ++ * The first component is true only if there is no weight-raised busy ++ * queue. This guarantees that the device is not idled for a sync non- ++ * weight-raised queue when there are busy weight-raised queues. The former ++ * is then expired immediately if empty. Combined with the timestamping ++ * rules of BFQ (see [1] for details), this causes sync non-weight-raised ++ * queues to get a lower number of requests served, and hence to ask for a ++ * lower number of requests from the request pool, before the busy weight- ++ * raised queues get served again. ++ * ++ * This is beneficial for the processes associated with weight-raised ++ * queues, when the request pool is saturated (e.g., in the presence of ++ * write hogs). In fact, if the processes associated with the other queues ++ * ask for requests at a lower rate, then weight-raised processes have a ++ * higher probability to get a request from the pool immediately (or at ++ * least soon) when they need one. Hence they have a higher probability to ++ * actually get a fraction of the disk throughput proportional to their ++ * high weight. This is especially true with NCQ-capable drives, which ++ * enqueue several requests in advance and further reorder internally- ++ * queued requests. ++ * ++ * In the end, mistreating non-weight-raised queues when there are busy ++ * weight-raised queues seems to mitigate starvation problems in the ++ * presence of heavy write workloads and NCQ, and hence to guarantee a ++ * higher application and system responsiveness in these hostile scenarios. ++ * ++ * If the first component of the compound condition is instead true, i.e., ++ * there is no weight-raised busy queue, then the second component of the ++ * compound condition takes into account service-guarantee and throughput ++ * issues related to NCQ (recall that the compound condition is evaluated ++ * only if the device is detected as supporting NCQ). ++ * ++ * As for service guarantees, allowing the drive to enqueue more than one ++ * request at a time, and hence delegating de facto final scheduling ++ * decisions to the drive's internal scheduler, causes loss of control on ++ * the actual request service order. In this respect, when the drive is ++ * allowed to enqueue more than one request at a time, the service ++ * distribution enforced by the drive's internal scheduler is likely to ++ * coincide with the desired device-throughput distribution only in the ++ * following, perfectly symmetric, scenario: ++ * 1) all active queues have the same weight, ++ * 2) all active groups at the same level in the groups tree have the same ++ * weight, ++ * 3) all active groups at the same level in the groups tree have the same ++ * number of children. ++ * ++ * Even in such a scenario, sequential I/O may still receive a preferential ++ * treatment, but this is not likely to be a big issue with flash-based ++ * devices, because of their non-dramatic loss of throughput with random ++ * I/O. Things do differ with HDDs, for which additional care is taken, as ++ * explained after completing the discussion for flash-based devices. ++ * ++ * Unfortunately, keeping the necessary state for evaluating exactly the ++ * above symmetry conditions would be quite complex and time-consuming. ++ * Therefore BFQ evaluates instead the following stronger sub-conditions, ++ * for which it is much easier to maintain the needed state: ++ * 1) all active queues have the same weight, ++ * 2) all active groups have the same weight, ++ * 3) all active groups have at most one active child each. ++ * In particular, the last two conditions are always true if hierarchical ++ * support and the cgroups interface are not enabled, hence no state needs ++ * to be maintained in this case. ++ * ++ * According to the above considerations, the second component of the ++ * compound condition evaluates to true if any of the above symmetry ++ * sub-condition does not hold, or the device is not flash-based. Therefore, ++ * if also the first component is true, then idling is allowed for a sync ++ * queue. These are the only sub-conditions considered if the device is ++ * flash-based, as, for such a device, it is sensible to force idling only ++ * for service-guarantee issues. In fact, as for throughput, idling ++ * NCQ-capable flash-based devices would not boost the throughput even ++ * with sequential I/O; rather it would lower the throughput in proportion ++ * to how fast the device is. In the end, (only) if all the three ++ * sub-conditions hold and the device is flash-based, the compound ++ * condition evaluates to false and therefore no idling is performed. ++ * ++ * As already said, things change with a rotational device, where idling ++ * boosts the throughput with sequential I/O (even with NCQ). Hence, for ++ * such a device the second component of the compound condition evaluates ++ * to true also if the following additional sub-condition does not hold: ++ * the queue is constantly seeky. Unfortunately, this different behavior ++ * with respect to flash-based devices causes an additional asymmetry: if ++ * some sync queues enjoy idling and some other sync queues do not, then ++ * the latter get a low share of the device throughput, simply because the ++ * former get many requests served after being set as in service, whereas ++ * the latter do not. As a consequence, to guarantee the desired throughput ++ * distribution, on HDDs the compound expression evaluates to true (and ++ * hence device idling is performed) also if the following last symmetry ++ * condition does not hold: no other queue is benefiting from idling. Also ++ * this last condition is actually replaced with a simpler-to-maintain and ++ * stronger condition: there is no busy queue which is not constantly seeky ++ * (and hence may also benefit from idling). ++ * ++ * To sum up, when all the required symmetry and throughput-boosting ++ * sub-conditions hold, the second component of the compound condition ++ * evaluates to false, and hence no idling is performed. This helps to ++ * keep the drives' internal queues full on NCQ-capable devices, and hence ++ * to boost the throughput, without causing 'almost' any loss of service ++ * guarantees. The 'almost' follows from the fact that, if the internal ++ * queue of one such device is filled while all the sub-conditions hold, ++ * but at some point in time some sub-condition stops to hold, then it may ++ * become impossible to let requests be served in the new desired order ++ * until all the requests already queued in the device have been served. ++ */ ++static inline bool bfq_bfqq_must_not_expire(struct bfq_queue *bfqq) ++{ ++ struct bfq_data *bfqd = bfqq->bfqd; ++#ifdef CONFIG_CGROUP_BFQIO ++#define symmetric_scenario (!bfqd->active_numerous_groups && \ ++ !bfq_differentiated_weights(bfqd)) ++#else ++#define symmetric_scenario (!bfq_differentiated_weights(bfqd)) ++#endif ++#define cond_for_seeky_on_ncq_hdd (bfq_bfqq_constantly_seeky(bfqq) && \ ++ bfqd->busy_in_flight_queues == \ ++ bfqd->const_seeky_busy_in_flight_queues) ++ ++#define cond_for_expiring_in_burst (bfq_bfqq_in_large_burst(bfqq) && \ ++ bfqd->hw_tag && \ ++ (blk_queue_nonrot(bfqd->queue) || \ ++ bfq_bfqq_constantly_seeky(bfqq))) ++ ++/* ++ * Condition for expiring a non-weight-raised queue (and hence not idling ++ * the device). ++ */ ++#define cond_for_expiring_non_wr (bfqd->hw_tag && \ ++ (bfqd->wr_busy_queues > 0 || \ ++ (symmetric_scenario && \ ++ (blk_queue_nonrot(bfqd->queue) || \ ++ cond_for_seeky_on_ncq_hdd)))) ++ ++ return bfq_bfqq_sync(bfqq) && ++ !cond_for_expiring_in_burst && ++ (bfqq->wr_coeff > 1 || ++ (bfq_bfqq_IO_bound(bfqq) && bfq_bfqq_idle_window(bfqq) && ++ !cond_for_expiring_non_wr) ++ ); ++} ++ ++/* ++ * If the in-service queue is empty but sync, and the function ++ * bfq_bfqq_must_not_expire returns true, then: ++ * 1) the queue must remain in service and cannot be expired, and ++ * 2) the disk must be idled to wait for the possible arrival of a new ++ * request for the queue. ++ * See the comments to the function bfq_bfqq_must_not_expire for the reasons ++ * why performing device idling is the best choice to boost the throughput ++ * and preserve service guarantees when bfq_bfqq_must_not_expire itself ++ * returns true. ++ */ ++static inline bool bfq_bfqq_must_idle(struct bfq_queue *bfqq) ++{ ++ struct bfq_data *bfqd = bfqq->bfqd; ++ ++ return RB_EMPTY_ROOT(&bfqq->sort_list) && bfqd->bfq_slice_idle != 0 && ++ bfq_bfqq_must_not_expire(bfqq); ++} ++ ++/* ++ * Select a queue for service. If we have a current queue in service, ++ * check whether to continue servicing it, or retrieve and set a new one. ++ */ ++static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq, *new_bfqq = NULL; ++ struct request *next_rq; ++ enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT; ++ ++ bfqq = bfqd->in_service_queue; ++ if (bfqq == NULL) ++ goto new_queue; ++ ++ bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue"); ++ ++ /* ++ * If another queue has a request waiting within our mean seek ++ * distance, let it run. The expire code will check for close ++ * cooperators and put the close queue at the front of the ++ * service tree. If possible, merge the expiring queue with the ++ * new bfqq. ++ */ ++ new_bfqq = bfq_close_cooperator(bfqd, bfqq); ++ if (new_bfqq != NULL && bfqq->new_bfqq == NULL) ++ bfq_setup_merge(bfqq, new_bfqq); ++ ++ if (bfq_may_expire_for_budg_timeout(bfqq) && ++ !timer_pending(&bfqd->idle_slice_timer) && ++ !bfq_bfqq_must_idle(bfqq)) ++ goto expire; ++ ++ next_rq = bfqq->next_rq; ++ /* ++ * If bfqq has requests queued and it has enough budget left to ++ * serve them, keep the queue, otherwise expire it. ++ */ ++ if (next_rq != NULL) { ++ if (bfq_serv_to_charge(next_rq, bfqq) > ++ bfq_bfqq_budget_left(bfqq)) { ++ reason = BFQ_BFQQ_BUDGET_EXHAUSTED; ++ goto expire; ++ } else { ++ /* ++ * The idle timer may be pending because we may ++ * not disable disk idling even when a new request ++ * arrives. ++ */ ++ if (timer_pending(&bfqd->idle_slice_timer)) { ++ /* ++ * If we get here: 1) at least a new request ++ * has arrived but we have not disabled the ++ * timer because the request was too small, ++ * 2) then the block layer has unplugged ++ * the device, causing the dispatch to be ++ * invoked. ++ * ++ * Since the device is unplugged, now the ++ * requests are probably large enough to ++ * provide a reasonable throughput. ++ * So we disable idling. ++ */ ++ bfq_clear_bfqq_wait_request(bfqq); ++ del_timer(&bfqd->idle_slice_timer); ++ } ++ if (new_bfqq == NULL) ++ goto keep_queue; ++ else ++ goto expire; ++ } ++ } ++ ++ /* ++ * No requests pending. If the in-service queue still has requests ++ * in flight (possibly waiting for a completion) or is idling for a ++ * new request, then keep it. ++ */ ++ if (new_bfqq == NULL && (timer_pending(&bfqd->idle_slice_timer) || ++ (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq)))) { ++ bfqq = NULL; ++ goto keep_queue; ++ } else if (new_bfqq != NULL && timer_pending(&bfqd->idle_slice_timer)) { ++ /* ++ * Expiring the queue because there is a close cooperator, ++ * cancel timer. ++ */ ++ bfq_clear_bfqq_wait_request(bfqq); ++ del_timer(&bfqd->idle_slice_timer); ++ } ++ ++ reason = BFQ_BFQQ_NO_MORE_REQUESTS; ++expire: ++ bfq_bfqq_expire(bfqd, bfqq, 0, reason); ++new_queue: ++ bfqq = bfq_set_in_service_queue(bfqd, new_bfqq); ++ bfq_log(bfqd, "select_queue: new queue %d returned", ++ bfqq != NULL ? bfqq->pid : 0); ++keep_queue: ++ return bfqq; ++} ++ ++static void bfq_update_wr_data(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (bfqq->wr_coeff > 1) { /* queue is being boosted */ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "raising period dur %u/%u msec, old coeff %u, w %d(%d)", ++ jiffies_to_msecs(jiffies - ++ bfqq->last_wr_start_finish), ++ jiffies_to_msecs(bfqq->wr_cur_max_time), ++ bfqq->wr_coeff, ++ bfqq->entity.weight, bfqq->entity.orig_weight); ++ ++ BUG_ON(bfqq != bfqd->in_service_queue && entity->weight != ++ entity->orig_weight * bfqq->wr_coeff); ++ if (entity->ioprio_changed) ++ bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change"); ++ /* ++ * If the queue was activated in a burst, or ++ * too much time has elapsed from the beginning ++ * of this weight-raising, then end weight raising. ++ */ ++ if (bfq_bfqq_in_large_burst(bfqq) || ++ time_is_before_jiffies(bfqq->last_wr_start_finish + ++ bfqq->wr_cur_max_time)) { ++ bfqq->last_wr_start_finish = jiffies; ++ bfq_log_bfqq(bfqd, bfqq, ++ "wrais ending at %lu, rais_max_time %u", ++ bfqq->last_wr_start_finish, ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ bfq_bfqq_end_wr(bfqq); ++ __bfq_entity_update_weight_prio( ++ bfq_entity_service_tree(entity), ++ entity); ++ } ++ } ++} ++ ++/* ++ * Dispatch one request from bfqq, moving it to the request queue ++ * dispatch list. ++ */ ++static int bfq_dispatch_request(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ int dispatched = 0; ++ struct request *rq; ++ unsigned long service_to_charge; ++ ++ BUG_ON(RB_EMPTY_ROOT(&bfqq->sort_list)); ++ ++ /* Follow expired path, else get first next available. */ ++ rq = bfq_check_fifo(bfqq); ++ if (rq == NULL) ++ rq = bfqq->next_rq; ++ service_to_charge = bfq_serv_to_charge(rq, bfqq); ++ ++ if (service_to_charge > bfq_bfqq_budget_left(bfqq)) { ++ /* ++ * This may happen if the next rq is chosen in fifo order ++ * instead of sector order. The budget is properly ++ * dimensioned to be always sufficient to serve the next ++ * request only if it is chosen in sector order. The reason ++ * is that it would be quite inefficient and little useful ++ * to always make sure that the budget is large enough to ++ * serve even the possible next rq in fifo order. ++ * In fact, requests are seldom served in fifo order. ++ * ++ * Expire the queue for budget exhaustion, and make sure ++ * that the next act_budget is enough to serve the next ++ * request, even if it comes from the fifo expired path. ++ */ ++ bfqq->next_rq = rq; ++ /* ++ * Since this dispatch is failed, make sure that ++ * a new one will be performed ++ */ ++ if (!bfqd->rq_in_driver) ++ bfq_schedule_dispatch(bfqd); ++ goto expire; ++ } ++ ++ /* Finally, insert request into driver dispatch list. */ ++ bfq_bfqq_served(bfqq, service_to_charge); ++ bfq_dispatch_insert(bfqd->queue, rq); ++ ++ bfq_update_wr_data(bfqd, bfqq); ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "dispatched %u sec req (%llu), budg left %lu", ++ blk_rq_sectors(rq), ++ (long long unsigned)blk_rq_pos(rq), ++ bfq_bfqq_budget_left(bfqq)); ++ ++ dispatched++; ++ ++ if (bfqd->in_service_bic == NULL) { ++ atomic_long_inc(&RQ_BIC(rq)->icq.ioc->refcount); ++ bfqd->in_service_bic = RQ_BIC(rq); ++ } ++ ++ if (bfqd->busy_queues > 1 && ((!bfq_bfqq_sync(bfqq) && ++ dispatched >= bfqd->bfq_max_budget_async_rq) || ++ bfq_class_idle(bfqq))) ++ goto expire; ++ ++ return dispatched; ++ ++expire: ++ bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_EXHAUSTED); ++ return dispatched; ++} ++ ++static int __bfq_forced_dispatch_bfqq(struct bfq_queue *bfqq) ++{ ++ int dispatched = 0; ++ ++ while (bfqq->next_rq != NULL) { ++ bfq_dispatch_insert(bfqq->bfqd->queue, bfqq->next_rq); ++ dispatched++; ++ } ++ ++ BUG_ON(!list_empty(&bfqq->fifo)); ++ return dispatched; ++} ++ ++/* ++ * Drain our current requests. ++ * Used for barriers and when switching io schedulers on-the-fly. ++ */ ++static int bfq_forced_dispatch(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq, *n; ++ struct bfq_service_tree *st; ++ int dispatched = 0; ++ ++ bfqq = bfqd->in_service_queue; ++ if (bfqq != NULL) ++ __bfq_bfqq_expire(bfqd, bfqq); ++ ++ /* ++ * Loop through classes, and be careful to leave the scheduler ++ * in a consistent state, as feedback mechanisms and vtime ++ * updates cannot be disabled during the process. ++ */ ++ list_for_each_entry_safe(bfqq, n, &bfqd->active_list, bfqq_list) { ++ st = bfq_entity_service_tree(&bfqq->entity); ++ ++ dispatched += __bfq_forced_dispatch_bfqq(bfqq); ++ bfqq->max_budget = bfq_max_budget(bfqd); ++ ++ bfq_forget_idle(st); ++ } ++ ++ BUG_ON(bfqd->busy_queues != 0); ++ ++ return dispatched; ++} ++ ++static int bfq_dispatch_requests(struct request_queue *q, int force) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_queue *bfqq; ++ int max_dispatch; ++ ++ bfq_log(bfqd, "dispatch requests: %d busy queues", bfqd->busy_queues); ++ if (bfqd->busy_queues == 0) ++ return 0; ++ ++ if (unlikely(force)) ++ return bfq_forced_dispatch(bfqd); ++ ++ bfqq = bfq_select_queue(bfqd); ++ if (bfqq == NULL) ++ return 0; ++ ++ max_dispatch = bfqd->bfq_quantum; ++ if (bfq_class_idle(bfqq)) ++ max_dispatch = 1; ++ ++ if (!bfq_bfqq_sync(bfqq)) ++ max_dispatch = bfqd->bfq_max_budget_async_rq; ++ ++ if (bfqq->dispatched >= max_dispatch) { ++ if (bfqd->busy_queues > 1) ++ return 0; ++ if (bfqq->dispatched >= 4 * max_dispatch) ++ return 0; ++ } ++ ++ if (bfqd->sync_flight != 0 && !bfq_bfqq_sync(bfqq)) ++ return 0; ++ ++ bfq_clear_bfqq_wait_request(bfqq); ++ BUG_ON(timer_pending(&bfqd->idle_slice_timer)); ++ ++ if (!bfq_dispatch_request(bfqd, bfqq)) ++ return 0; ++ ++ bfq_log_bfqq(bfqd, bfqq, "dispatched one request of %d (max_disp %d)", ++ bfqq->pid, max_dispatch); ++ ++ return 1; ++} ++ ++/* ++ * Task holds one reference to the queue, dropped when task exits. Each rq ++ * in-flight on this queue also holds a reference, dropped when rq is freed. ++ * ++ * Queue lock must be held here. ++ */ ++static void bfq_put_queue(struct bfq_queue *bfqq) ++{ ++ struct bfq_data *bfqd = bfqq->bfqd; ++ ++ BUG_ON(atomic_read(&bfqq->ref) <= 0); ++ ++ bfq_log_bfqq(bfqd, bfqq, "put_queue: %p %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ if (!atomic_dec_and_test(&bfqq->ref)) ++ return; ++ ++ BUG_ON(rb_first(&bfqq->sort_list) != NULL); ++ BUG_ON(bfqq->allocated[READ] + bfqq->allocated[WRITE] != 0); ++ BUG_ON(bfqq->entity.tree != NULL); ++ BUG_ON(bfq_bfqq_busy(bfqq)); ++ BUG_ON(bfqd->in_service_queue == bfqq); ++ ++ if (bfq_bfqq_sync(bfqq)) ++ /* ++ * The fact that this queue is being destroyed does not ++ * invalidate the fact that this queue may have been ++ * activated during the current burst. As a consequence, ++ * although the queue does not exist anymore, and hence ++ * needs to be removed from the burst list if there, ++ * the burst size has not to be decremented. ++ */ ++ hlist_del_init(&bfqq->burst_list_node); ++ ++ bfq_log_bfqq(bfqd, bfqq, "put_queue: %p freed", bfqq); ++ ++ kmem_cache_free(bfq_pool, bfqq); ++} ++ ++static void bfq_put_cooperator(struct bfq_queue *bfqq) ++{ ++ struct bfq_queue *__bfqq, *next; ++ ++ /* ++ * If this queue was scheduled to merge with another queue, be ++ * sure to drop the reference taken on that queue (and others in ++ * the merge chain). See bfq_setup_merge and bfq_merge_bfqqs. ++ */ ++ __bfqq = bfqq->new_bfqq; ++ while (__bfqq) { ++ if (__bfqq == bfqq) ++ break; ++ next = __bfqq->new_bfqq; ++ bfq_put_queue(__bfqq); ++ __bfqq = next; ++ } ++} ++ ++static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ if (bfqq == bfqd->in_service_queue) { ++ __bfq_bfqq_expire(bfqd, bfqq); ++ bfq_schedule_dispatch(bfqd); ++ } ++ ++ bfq_log_bfqq(bfqd, bfqq, "exit_bfqq: %p, %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ ++ bfq_put_cooperator(bfqq); ++ ++ bfq_put_queue(bfqq); ++} ++ ++static inline void bfq_init_icq(struct io_cq *icq) ++{ ++ struct bfq_io_cq *bic = icq_to_bic(icq); ++ ++ bic->ttime.last_end_request = jiffies; ++} ++ ++static void bfq_exit_icq(struct io_cq *icq) ++{ ++ struct bfq_io_cq *bic = icq_to_bic(icq); ++ struct bfq_data *bfqd = bic_to_bfqd(bic); ++ ++ if (bic->bfqq[BLK_RW_ASYNC]) { ++ bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_ASYNC]); ++ bic->bfqq[BLK_RW_ASYNC] = NULL; ++ } ++ ++ if (bic->bfqq[BLK_RW_SYNC]) { ++ bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]); ++ bic->bfqq[BLK_RW_SYNC] = NULL; ++ } ++} ++ ++/* ++ * Update the entity prio values; note that the new values will not ++ * be used until the next (re)activation. ++ */ ++static void bfq_init_prio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic) ++{ ++ struct task_struct *tsk = current; ++ int ioprio_class; ++ ++ if (!bfq_bfqq_prio_changed(bfqq)) ++ return; ++ ++ ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio); ++ switch (ioprio_class) { ++ default: ++ dev_err(bfqq->bfqd->queue->backing_dev_info.dev, ++ "bfq: bad prio class %d\n", ioprio_class); ++ case IOPRIO_CLASS_NONE: ++ /* ++ * No prio set, inherit CPU scheduling settings. ++ */ ++ bfqq->entity.new_ioprio = task_nice_ioprio(tsk); ++ bfqq->entity.new_ioprio_class = task_nice_ioclass(tsk); ++ break; ++ case IOPRIO_CLASS_RT: ++ bfqq->entity.new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio); ++ bfqq->entity.new_ioprio_class = IOPRIO_CLASS_RT; ++ break; ++ case IOPRIO_CLASS_BE: ++ bfqq->entity.new_ioprio = IOPRIO_PRIO_DATA(bic->ioprio); ++ bfqq->entity.new_ioprio_class = IOPRIO_CLASS_BE; ++ break; ++ case IOPRIO_CLASS_IDLE: ++ bfqq->entity.new_ioprio_class = IOPRIO_CLASS_IDLE; ++ bfqq->entity.new_ioprio = 7; ++ bfq_clear_bfqq_idle_window(bfqq); ++ break; ++ } ++ ++ if (bfqq->entity.new_ioprio < 0 || ++ bfqq->entity.new_ioprio >= IOPRIO_BE_NR) { ++ printk(KERN_CRIT "bfq_init_prio_data: new_ioprio %d\n", ++ bfqq->entity.new_ioprio); ++ BUG(); ++ } ++ ++ bfqq->entity.ioprio_changed = 1; ++ ++ bfq_clear_bfqq_prio_changed(bfqq); ++} ++ ++static void bfq_changed_ioprio(struct bfq_io_cq *bic) ++{ ++ struct bfq_data *bfqd; ++ struct bfq_queue *bfqq, *new_bfqq; ++ struct bfq_group *bfqg; ++ unsigned long uninitialized_var(flags); ++ int ioprio = bic->icq.ioc->ioprio; ++ ++ bfqd = bfq_get_bfqd_locked(&(bic->icq.q->elevator->elevator_data), ++ &flags); ++ /* ++ * This condition may trigger on a newly created bic, be sure to ++ * drop the lock before returning. ++ */ ++ if (unlikely(bfqd == NULL) || likely(bic->ioprio == ioprio)) ++ goto out; ++ ++ bfqq = bic->bfqq[BLK_RW_ASYNC]; ++ if (bfqq != NULL) { ++ bfqg = container_of(bfqq->entity.sched_data, struct bfq_group, ++ sched_data); ++ new_bfqq = bfq_get_queue(bfqd, bfqg, BLK_RW_ASYNC, bic, ++ GFP_ATOMIC); ++ if (new_bfqq != NULL) { ++ bic->bfqq[BLK_RW_ASYNC] = new_bfqq; ++ bfq_log_bfqq(bfqd, bfqq, ++ "changed_ioprio: bfqq %p %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ } ++ } ++ ++ bfqq = bic->bfqq[BLK_RW_SYNC]; ++ if (bfqq != NULL) ++ bfq_mark_bfqq_prio_changed(bfqq); ++ ++ bic->ioprio = ioprio; ++ ++out: ++ bfq_put_bfqd_unlock(bfqd, &flags); ++} ++ ++static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ pid_t pid, int is_sync) ++{ ++ RB_CLEAR_NODE(&bfqq->entity.rb_node); ++ INIT_LIST_HEAD(&bfqq->fifo); ++ INIT_HLIST_NODE(&bfqq->burst_list_node); ++ ++ atomic_set(&bfqq->ref, 0); ++ bfqq->bfqd = bfqd; ++ ++ bfq_mark_bfqq_prio_changed(bfqq); ++ ++ if (is_sync) { ++ if (!bfq_class_idle(bfqq)) ++ bfq_mark_bfqq_idle_window(bfqq); ++ bfq_mark_bfqq_sync(bfqq); ++ } ++ bfq_mark_bfqq_IO_bound(bfqq); ++ ++ /* Tentative initial value to trade off between thr and lat */ ++ bfqq->max_budget = (2 * bfq_max_budget(bfqd)) / 3; ++ bfqq->pid = pid; ++ ++ bfqq->wr_coeff = 1; ++ bfqq->last_wr_start_finish = 0; ++ /* ++ * Set to the value for which bfqq will not be deemed as ++ * soft rt when it becomes backlogged. ++ */ ++ bfqq->soft_rt_next_start = bfq_infinity_from_now(jiffies); ++} ++ ++static struct bfq_queue *bfq_find_alloc_queue(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, ++ int is_sync, ++ struct bfq_io_cq *bic, ++ gfp_t gfp_mask) ++{ ++ struct bfq_queue *bfqq, *new_bfqq = NULL; ++ ++retry: ++ /* bic always exists here */ ++ bfqq = bic_to_bfqq(bic, is_sync); ++ ++ /* ++ * Always try a new alloc if we fall back to the OOM bfqq ++ * originally, since it should just be a temporary situation. ++ */ ++ if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) { ++ bfqq = NULL; ++ if (new_bfqq != NULL) { ++ bfqq = new_bfqq; ++ new_bfqq = NULL; ++ } else if (gfp_mask & __GFP_WAIT) { ++ spin_unlock_irq(bfqd->queue->queue_lock); ++ new_bfqq = kmem_cache_alloc_node(bfq_pool, ++ gfp_mask | __GFP_ZERO, ++ bfqd->queue->node); ++ spin_lock_irq(bfqd->queue->queue_lock); ++ if (new_bfqq != NULL) ++ goto retry; ++ } else { ++ bfqq = kmem_cache_alloc_node(bfq_pool, ++ gfp_mask | __GFP_ZERO, ++ bfqd->queue->node); ++ } ++ ++ if (bfqq != NULL) { ++ bfq_init_bfqq(bfqd, bfqq, current->pid, is_sync); ++ bfq_init_prio_data(bfqq, bic); ++ bfq_init_entity(&bfqq->entity, bfqg); ++ bfq_log_bfqq(bfqd, bfqq, "allocated"); ++ } else { ++ bfqq = &bfqd->oom_bfqq; ++ bfq_log_bfqq(bfqd, bfqq, "using oom bfqq"); ++ } ++ } ++ ++ if (new_bfqq != NULL) ++ kmem_cache_free(bfq_pool, new_bfqq); ++ ++ return bfqq; ++} ++ ++static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, ++ int ioprio_class, int ioprio) ++{ ++ switch (ioprio_class) { ++ case IOPRIO_CLASS_RT: ++ return &bfqg->async_bfqq[0][ioprio]; ++ case IOPRIO_CLASS_NONE: ++ ioprio = IOPRIO_NORM; ++ /* fall through */ ++ case IOPRIO_CLASS_BE: ++ return &bfqg->async_bfqq[1][ioprio]; ++ case IOPRIO_CLASS_IDLE: ++ return &bfqg->async_idle_bfqq; ++ default: ++ BUG(); ++ } ++} ++ ++static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, int is_sync, ++ struct bfq_io_cq *bic, gfp_t gfp_mask) ++{ ++ const int ioprio = IOPRIO_PRIO_DATA(bic->ioprio); ++ const int ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio); ++ struct bfq_queue **async_bfqq = NULL; ++ struct bfq_queue *bfqq = NULL; ++ ++ if (!is_sync) { ++ async_bfqq = bfq_async_queue_prio(bfqd, bfqg, ioprio_class, ++ ioprio); ++ bfqq = *async_bfqq; ++ } ++ ++ if (bfqq == NULL) ++ bfqq = bfq_find_alloc_queue(bfqd, bfqg, is_sync, bic, gfp_mask); ++ ++ /* ++ * Pin the queue now that it's allocated, scheduler exit will ++ * prune it. ++ */ ++ if (!is_sync && *async_bfqq == NULL) { ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqd, bfqq, "get_queue, bfqq not in async: %p, %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ *async_bfqq = bfqq; ++ } ++ ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqd, bfqq, "get_queue, at end: %p, %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ return bfqq; ++} ++ ++static void bfq_update_io_thinktime(struct bfq_data *bfqd, ++ struct bfq_io_cq *bic) ++{ ++ unsigned long elapsed = jiffies - bic->ttime.last_end_request; ++ unsigned long ttime = min(elapsed, 2UL * bfqd->bfq_slice_idle); ++ ++ bic->ttime.ttime_samples = (7*bic->ttime.ttime_samples + 256) / 8; ++ bic->ttime.ttime_total = (7*bic->ttime.ttime_total + 256*ttime) / 8; ++ bic->ttime.ttime_mean = (bic->ttime.ttime_total + 128) / ++ bic->ttime.ttime_samples; ++} ++ ++static void bfq_update_io_seektime(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct request *rq) ++{ ++ sector_t sdist; ++ u64 total; ++ ++ if (bfqq->last_request_pos < blk_rq_pos(rq)) ++ sdist = blk_rq_pos(rq) - bfqq->last_request_pos; ++ else ++ sdist = bfqq->last_request_pos - blk_rq_pos(rq); ++ ++ /* ++ * Don't allow the seek distance to get too large from the ++ * odd fragment, pagein, etc. ++ */ ++ if (bfqq->seek_samples == 0) /* first request, not really a seek */ ++ sdist = 0; ++ else if (bfqq->seek_samples <= 60) /* second & third seek */ ++ sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*1024); ++ else ++ sdist = min(sdist, (bfqq->seek_mean * 4) + 2*1024*64); ++ ++ bfqq->seek_samples = (7*bfqq->seek_samples + 256) / 8; ++ bfqq->seek_total = (7*bfqq->seek_total + (u64)256*sdist) / 8; ++ total = bfqq->seek_total + (bfqq->seek_samples/2); ++ do_div(total, bfqq->seek_samples); ++ bfqq->seek_mean = (sector_t)total; ++ ++ bfq_log_bfqq(bfqd, bfqq, "dist=%llu mean=%llu", (u64)sdist, ++ (u64)bfqq->seek_mean); ++} ++ ++/* ++ * Disable idle window if the process thinks too long or seeks so much that ++ * it doesn't matter. ++ */ ++static void bfq_update_idle_window(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq, ++ struct bfq_io_cq *bic) ++{ ++ int enable_idle; ++ ++ /* Don't idle for async or idle io prio class. */ ++ if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq)) ++ return; ++ ++ enable_idle = bfq_bfqq_idle_window(bfqq); ++ ++ if (atomic_read(&bic->icq.ioc->active_ref) == 0 || ++ bfqd->bfq_slice_idle == 0 || ++ (bfqd->hw_tag && BFQQ_SEEKY(bfqq) && ++ bfqq->wr_coeff == 1)) ++ enable_idle = 0; ++ else if (bfq_sample_valid(bic->ttime.ttime_samples)) { ++ if (bic->ttime.ttime_mean > bfqd->bfq_slice_idle && ++ bfqq->wr_coeff == 1) ++ enable_idle = 0; ++ else ++ enable_idle = 1; ++ } ++ bfq_log_bfqq(bfqd, bfqq, "update_idle_window: enable_idle %d", ++ enable_idle); ++ ++ if (enable_idle) ++ bfq_mark_bfqq_idle_window(bfqq); ++ else ++ bfq_clear_bfqq_idle_window(bfqq); ++} ++ ++/* ++ * Called when a new fs request (rq) is added to bfqq. Check if there's ++ * something we should do about it. ++ */ ++static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ struct request *rq) ++{ ++ struct bfq_io_cq *bic = RQ_BIC(rq); ++ ++ if (rq->cmd_flags & REQ_META) ++ bfqq->meta_pending++; ++ ++ bfq_update_io_thinktime(bfqd, bic); ++ bfq_update_io_seektime(bfqd, bfqq, rq); ++ if (!BFQQ_SEEKY(bfqq) && bfq_bfqq_constantly_seeky(bfqq)) { ++ bfq_clear_bfqq_constantly_seeky(bfqq); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ BUG_ON(!bfqd->const_seeky_busy_in_flight_queues); ++ bfqd->const_seeky_busy_in_flight_queues--; ++ } ++ } ++ if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 || ++ !BFQQ_SEEKY(bfqq)) ++ bfq_update_idle_window(bfqd, bfqq, bic); ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "rq_enqueued: idle_window=%d (seeky %d, mean %llu)", ++ bfq_bfqq_idle_window(bfqq), BFQQ_SEEKY(bfqq), ++ (long long unsigned)bfqq->seek_mean); ++ ++ bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq); ++ ++ if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) { ++ int small_req = bfqq->queued[rq_is_sync(rq)] == 1 && ++ blk_rq_sectors(rq) < 32; ++ int budget_timeout = bfq_bfqq_budget_timeout(bfqq); ++ ++ /* ++ * There is just this request queued: if the request ++ * is small and the queue is not to be expired, then ++ * just exit. ++ * ++ * In this way, if the disk is being idled to wait for ++ * a new request from the in-service queue, we avoid ++ * unplugging the device and committing the disk to serve ++ * just a small request. On the contrary, we wait for ++ * the block layer to decide when to unplug the device: ++ * hopefully, new requests will be merged to this one ++ * quickly, then the device will be unplugged and ++ * larger requests will be dispatched. ++ */ ++ if (small_req && !budget_timeout) ++ return; ++ ++ /* ++ * A large enough request arrived, or the queue is to ++ * be expired: in both cases disk idling is to be ++ * stopped, so clear wait_request flag and reset ++ * timer. ++ */ ++ bfq_clear_bfqq_wait_request(bfqq); ++ del_timer(&bfqd->idle_slice_timer); ++ ++ /* ++ * The queue is not empty, because a new request just ++ * arrived. Hence we can safely expire the queue, in ++ * case of budget timeout, without risking that the ++ * timestamps of the queue are not updated correctly. ++ * See [1] for more details. ++ */ ++ if (budget_timeout) ++ bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_TIMEOUT); ++ ++ /* ++ * Let the request rip immediately, or let a new queue be ++ * selected if bfqq has just been expired. ++ */ ++ __blk_run_queue(bfqd->queue); ++ } ++} ++ ++static void bfq_insert_request(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ assert_spin_locked(bfqd->queue->queue_lock); ++ bfq_init_prio_data(bfqq, RQ_BIC(rq)); ++ ++ bfq_add_request(rq); ++ ++ rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; ++ list_add_tail(&rq->queuelist, &bfqq->fifo); ++ ++ bfq_rq_enqueued(bfqd, bfqq, rq); ++} ++ ++static void bfq_update_hw_tag(struct bfq_data *bfqd) ++{ ++ bfqd->max_rq_in_driver = max(bfqd->max_rq_in_driver, ++ bfqd->rq_in_driver); ++ ++ if (bfqd->hw_tag == 1) ++ return; ++ ++ /* ++ * This sample is valid if the number of outstanding requests ++ * is large enough to allow a queueing behavior. Note that the ++ * sum is not exact, as it's not taking into account deactivated ++ * requests. ++ */ ++ if (bfqd->rq_in_driver + bfqd->queued < BFQ_HW_QUEUE_THRESHOLD) ++ return; ++ ++ if (bfqd->hw_tag_samples++ < BFQ_HW_QUEUE_SAMPLES) ++ return; ++ ++ bfqd->hw_tag = bfqd->max_rq_in_driver > BFQ_HW_QUEUE_THRESHOLD; ++ bfqd->max_rq_in_driver = 0; ++ bfqd->hw_tag_samples = 0; ++} ++ ++static void bfq_completed_request(struct request_queue *q, struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_data *bfqd = bfqq->bfqd; ++ bool sync = bfq_bfqq_sync(bfqq); ++ ++ bfq_log_bfqq(bfqd, bfqq, "completed one req with %u sects left (%d)", ++ blk_rq_sectors(rq), sync); ++ ++ bfq_update_hw_tag(bfqd); ++ ++ BUG_ON(!bfqd->rq_in_driver); ++ BUG_ON(!bfqq->dispatched); ++ bfqd->rq_in_driver--; ++ bfqq->dispatched--; ++ ++ if (!bfqq->dispatched && !bfq_bfqq_busy(bfqq)) { ++ bfq_weights_tree_remove(bfqd, &bfqq->entity, ++ &bfqd->queue_weights_tree); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ BUG_ON(!bfqd->busy_in_flight_queues); ++ bfqd->busy_in_flight_queues--; ++ if (bfq_bfqq_constantly_seeky(bfqq)) { ++ BUG_ON(!bfqd-> ++ const_seeky_busy_in_flight_queues); ++ bfqd->const_seeky_busy_in_flight_queues--; ++ } ++ } ++ } ++ ++ if (sync) { ++ bfqd->sync_flight--; ++ RQ_BIC(rq)->ttime.last_end_request = jiffies; ++ } ++ ++ /* ++ * If we are waiting to discover whether the request pattern of the ++ * task associated with the queue is actually isochronous, and ++ * both requisites for this condition to hold are satisfied, then ++ * compute soft_rt_next_start (see the comments to the function ++ * bfq_bfqq_softrt_next_start()). ++ */ ++ if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 && ++ RB_EMPTY_ROOT(&bfqq->sort_list)) ++ bfqq->soft_rt_next_start = ++ bfq_bfqq_softrt_next_start(bfqd, bfqq); ++ ++ /* ++ * If this is the in-service queue, check if it needs to be expired, ++ * or if we want to idle in case it has no pending requests. ++ */ ++ if (bfqd->in_service_queue == bfqq) { ++ if (bfq_bfqq_budget_new(bfqq)) ++ bfq_set_budget_timeout(bfqd); ++ ++ if (bfq_bfqq_must_idle(bfqq)) { ++ bfq_arm_slice_timer(bfqd); ++ goto out; ++ } else if (bfq_may_expire_for_budg_timeout(bfqq)) ++ bfq_bfqq_expire(bfqd, bfqq, 0, BFQ_BFQQ_BUDGET_TIMEOUT); ++ else if (RB_EMPTY_ROOT(&bfqq->sort_list) && ++ (bfqq->dispatched == 0 || ++ !bfq_bfqq_must_not_expire(bfqq))) ++ bfq_bfqq_expire(bfqd, bfqq, 0, ++ BFQ_BFQQ_NO_MORE_REQUESTS); ++ } ++ ++ if (!bfqd->rq_in_driver) ++ bfq_schedule_dispatch(bfqd); ++ ++out: ++ return; ++} ++ ++static inline int __bfq_may_queue(struct bfq_queue *bfqq) ++{ ++ if (bfq_bfqq_wait_request(bfqq) && bfq_bfqq_must_alloc(bfqq)) { ++ bfq_clear_bfqq_must_alloc(bfqq); ++ return ELV_MQUEUE_MUST; ++ } ++ ++ return ELV_MQUEUE_MAY; ++} ++ ++static int bfq_may_queue(struct request_queue *q, int rw) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct task_struct *tsk = current; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq; ++ ++ /* ++ * Don't force setup of a queue from here, as a call to may_queue ++ * does not necessarily imply that a request actually will be ++ * queued. So just lookup a possibly existing queue, or return ++ * 'may queue' if that fails. ++ */ ++ bic = bfq_bic_lookup(bfqd, tsk->io_context); ++ if (bic == NULL) ++ return ELV_MQUEUE_MAY; ++ ++ bfqq = bic_to_bfqq(bic, rw_is_sync(rw)); ++ if (bfqq != NULL) { ++ bfq_init_prio_data(bfqq, bic); ++ ++ return __bfq_may_queue(bfqq); ++ } ++ ++ return ELV_MQUEUE_MAY; ++} ++ ++/* ++ * Queue lock held here. ++ */ ++static void bfq_put_request(struct request *rq) ++{ ++ struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ ++ if (bfqq != NULL) { ++ const int rw = rq_data_dir(rq); ++ ++ BUG_ON(!bfqq->allocated[rw]); ++ bfqq->allocated[rw]--; ++ ++ rq->elv.priv[0] = NULL; ++ rq->elv.priv[1] = NULL; ++ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "put_request %p, %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ } ++} ++ ++static struct bfq_queue * ++bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic, ++ struct bfq_queue *bfqq) ++{ ++ bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu", ++ (long unsigned)bfqq->new_bfqq->pid); ++ bic_set_bfqq(bic, bfqq->new_bfqq, 1); ++ bfq_mark_bfqq_coop(bfqq->new_bfqq); ++ bfq_put_queue(bfqq); ++ return bic_to_bfqq(bic, 1); ++} ++ ++/* ++ * Returns NULL if a new bfqq should be allocated, or the old bfqq if this ++ * was the last process referring to said bfqq. ++ */ ++static struct bfq_queue * ++bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq) ++{ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue"); ++ if (bfqq_process_refs(bfqq) == 1) { ++ bfqq->pid = current->pid; ++ bfq_clear_bfqq_coop(bfqq); ++ bfq_clear_bfqq_split_coop(bfqq); ++ return bfqq; ++ } ++ ++ bic_set_bfqq(bic, NULL, 1); ++ ++ bfq_put_cooperator(bfqq); ++ ++ bfq_put_queue(bfqq); ++ return NULL; ++} ++ ++/* ++ * Allocate bfq data structures associated with this request. ++ */ ++static int bfq_set_request(struct request_queue *q, struct request *rq, ++ struct bio *bio, gfp_t gfp_mask) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_io_cq *bic = icq_to_bic(rq->elv.icq); ++ const int rw = rq_data_dir(rq); ++ const int is_sync = rq_is_sync(rq); ++ struct bfq_queue *bfqq; ++ struct bfq_group *bfqg; ++ unsigned long flags; ++ ++ might_sleep_if(gfp_mask & __GFP_WAIT); ++ ++ bfq_changed_ioprio(bic); ++ ++ spin_lock_irqsave(q->queue_lock, flags); ++ ++ if (bic == NULL) ++ goto queue_fail; ++ ++ bfqg = bfq_bic_update_cgroup(bic); ++ ++new_queue: ++ bfqq = bic_to_bfqq(bic, is_sync); ++ if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) { ++ bfqq = bfq_get_queue(bfqd, bfqg, is_sync, bic, gfp_mask); ++ bic_set_bfqq(bic, bfqq, is_sync); ++ } else { ++ /* ++ * If the queue was seeky for too long, break it apart. ++ */ ++ if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) { ++ bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq"); ++ bfqq = bfq_split_bfqq(bic, bfqq); ++ if (!bfqq) ++ goto new_queue; ++ } ++ ++ /* ++ * Check to see if this queue is scheduled to merge with ++ * another closely cooperating queue. The merging of queues ++ * happens here as it must be done in process context. ++ * The reference on new_bfqq was taken in merge_bfqqs. ++ */ ++ if (bfqq->new_bfqq != NULL) ++ bfqq = bfq_merge_bfqqs(bfqd, bic, bfqq); ++ } ++ ++ bfqq->allocated[rw]++; ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqd, bfqq, "set_request: bfqq %p, %d", bfqq, ++ atomic_read(&bfqq->ref)); ++ ++ rq->elv.priv[0] = bic; ++ rq->elv.priv[1] = bfqq; ++ ++ spin_unlock_irqrestore(q->queue_lock, flags); ++ ++ return 0; ++ ++queue_fail: ++ bfq_schedule_dispatch(bfqd); ++ spin_unlock_irqrestore(q->queue_lock, flags); ++ ++ return 1; ++} ++ ++static void bfq_kick_queue(struct work_struct *work) ++{ ++ struct bfq_data *bfqd = ++ container_of(work, struct bfq_data, unplug_work); ++ struct request_queue *q = bfqd->queue; ++ ++ spin_lock_irq(q->queue_lock); ++ __blk_run_queue(q); ++ spin_unlock_irq(q->queue_lock); ++} ++ ++/* ++ * Handler of the expiration of the timer running if the in-service queue ++ * is idling inside its time slice. ++ */ ++static void bfq_idle_slice_timer(unsigned long data) ++{ ++ struct bfq_data *bfqd = (struct bfq_data *)data; ++ struct bfq_queue *bfqq; ++ unsigned long flags; ++ enum bfqq_expiration reason; ++ ++ spin_lock_irqsave(bfqd->queue->queue_lock, flags); ++ ++ bfqq = bfqd->in_service_queue; ++ /* ++ * Theoretical race here: the in-service queue can be NULL or ++ * different from the queue that was idling if the timer handler ++ * spins on the queue_lock and a new request arrives for the ++ * current queue and there is a full dispatch cycle that changes ++ * the in-service queue. This can hardly happen, but in the worst ++ * case we just expire a queue too early. ++ */ ++ if (bfqq != NULL) { ++ bfq_log_bfqq(bfqd, bfqq, "slice_timer expired"); ++ if (bfq_bfqq_budget_timeout(bfqq)) ++ /* ++ * Also here the queue can be safely expired ++ * for budget timeout without wasting ++ * guarantees ++ */ ++ reason = BFQ_BFQQ_BUDGET_TIMEOUT; ++ else if (bfqq->queued[0] == 0 && bfqq->queued[1] == 0) ++ /* ++ * The queue may not be empty upon timer expiration, ++ * because we may not disable the timer when the ++ * first request of the in-service queue arrives ++ * during disk idling. ++ */ ++ reason = BFQ_BFQQ_TOO_IDLE; ++ else ++ goto schedule_dispatch; ++ ++ bfq_bfqq_expire(bfqd, bfqq, 1, reason); ++ } ++ ++schedule_dispatch: ++ bfq_schedule_dispatch(bfqd); ++ ++ spin_unlock_irqrestore(bfqd->queue->queue_lock, flags); ++} ++ ++static void bfq_shutdown_timer_wq(struct bfq_data *bfqd) ++{ ++ del_timer_sync(&bfqd->idle_slice_timer); ++ cancel_work_sync(&bfqd->unplug_work); ++} ++ ++static inline void __bfq_put_async_bfqq(struct bfq_data *bfqd, ++ struct bfq_queue **bfqq_ptr) ++{ ++ struct bfq_group *root_group = bfqd->root_group; ++ struct bfq_queue *bfqq = *bfqq_ptr; ++ ++ bfq_log(bfqd, "put_async_bfqq: %p", bfqq); ++ if (bfqq != NULL) { ++ bfq_bfqq_move(bfqd, bfqq, &bfqq->entity, root_group); ++ bfq_log_bfqq(bfqd, bfqq, "put_async_bfqq: putting %p, %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ *bfqq_ptr = NULL; ++ } ++} ++ ++/* ++ * Release all the bfqg references to its async queues. If we are ++ * deallocating the group these queues may still contain requests, so ++ * we reparent them to the root cgroup (i.e., the only one that will ++ * exist for sure until all the requests on a device are gone). ++ */ ++static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg) ++{ ++ int i, j; ++ ++ for (i = 0; i < 2; i++) ++ for (j = 0; j < IOPRIO_BE_NR; j++) ++ __bfq_put_async_bfqq(bfqd, &bfqg->async_bfqq[i][j]); ++ ++ __bfq_put_async_bfqq(bfqd, &bfqg->async_idle_bfqq); ++} ++ ++static void bfq_exit_queue(struct elevator_queue *e) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ struct request_queue *q = bfqd->queue; ++ struct bfq_queue *bfqq, *n; ++ ++ bfq_shutdown_timer_wq(bfqd); ++ ++ spin_lock_irq(q->queue_lock); ++ ++ BUG_ON(bfqd->in_service_queue != NULL); ++ list_for_each_entry_safe(bfqq, n, &bfqd->idle_list, bfqq_list) ++ bfq_deactivate_bfqq(bfqd, bfqq, 0); ++ ++ bfq_disconnect_groups(bfqd); ++ spin_unlock_irq(q->queue_lock); ++ ++ bfq_shutdown_timer_wq(bfqd); ++ ++ synchronize_rcu(); ++ ++ BUG_ON(timer_pending(&bfqd->idle_slice_timer)); ++ ++ bfq_free_root_group(bfqd); ++ kfree(bfqd); ++} ++ ++static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) ++{ ++ struct bfq_group *bfqg; ++ struct bfq_data *bfqd; ++ struct elevator_queue *eq; ++ ++ eq = elevator_alloc(q, e); ++ if (eq == NULL) ++ return -ENOMEM; ++ ++ bfqd = kzalloc_node(sizeof(*bfqd), GFP_KERNEL, q->node); ++ if (bfqd == NULL) { ++ kobject_put(&eq->kobj); ++ return -ENOMEM; ++ } ++ eq->elevator_data = bfqd; ++ ++ /* ++ * Our fallback bfqq if bfq_find_alloc_queue() runs into OOM issues. ++ * Grab a permanent reference to it, so that the normal code flow ++ * will not attempt to free it. ++ */ ++ bfq_init_bfqq(bfqd, &bfqd->oom_bfqq, 1, 0); ++ atomic_inc(&bfqd->oom_bfqq.ref); ++ bfqd->oom_bfqq.entity.new_ioprio = BFQ_DEFAULT_QUEUE_IOPRIO; ++ bfqd->oom_bfqq.entity.new_ioprio_class = IOPRIO_CLASS_BE; ++ /* ++ * Trigger weight initialization, according to ioprio, at the ++ * oom_bfqq's first activation. The oom_bfqq's ioprio and ioprio ++ * class won't be changed any more. ++ */ ++ bfqd->oom_bfqq.entity.ioprio_changed = 1; ++ ++ bfqd->queue = q; ++ ++ spin_lock_irq(q->queue_lock); ++ q->elevator = eq; ++ spin_unlock_irq(q->queue_lock); ++ ++ bfqg = bfq_alloc_root_group(bfqd, q->node); ++ if (bfqg == NULL) { ++ kfree(bfqd); ++ kobject_put(&eq->kobj); ++ return -ENOMEM; ++ } ++ ++ bfqd->root_group = bfqg; ++ bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group); ++#ifdef CONFIG_CGROUP_BFQIO ++ bfqd->active_numerous_groups = 0; ++#endif ++ ++ init_timer(&bfqd->idle_slice_timer); ++ bfqd->idle_slice_timer.function = bfq_idle_slice_timer; ++ bfqd->idle_slice_timer.data = (unsigned long)bfqd; ++ ++ bfqd->rq_pos_tree = RB_ROOT; ++ bfqd->queue_weights_tree = RB_ROOT; ++ bfqd->group_weights_tree = RB_ROOT; ++ ++ INIT_WORK(&bfqd->unplug_work, bfq_kick_queue); ++ ++ INIT_LIST_HEAD(&bfqd->active_list); ++ INIT_LIST_HEAD(&bfqd->idle_list); ++ INIT_HLIST_HEAD(&bfqd->burst_list); ++ ++ bfqd->hw_tag = -1; ++ ++ bfqd->bfq_max_budget = bfq_default_max_budget; ++ ++ bfqd->bfq_quantum = bfq_quantum; ++ bfqd->bfq_fifo_expire[0] = bfq_fifo_expire[0]; ++ bfqd->bfq_fifo_expire[1] = bfq_fifo_expire[1]; ++ bfqd->bfq_back_max = bfq_back_max; ++ bfqd->bfq_back_penalty = bfq_back_penalty; ++ bfqd->bfq_slice_idle = bfq_slice_idle; ++ bfqd->bfq_class_idle_last_service = 0; ++ bfqd->bfq_max_budget_async_rq = bfq_max_budget_async_rq; ++ bfqd->bfq_timeout[BLK_RW_ASYNC] = bfq_timeout_async; ++ bfqd->bfq_timeout[BLK_RW_SYNC] = bfq_timeout_sync; ++ ++ bfqd->bfq_coop_thresh = 2; ++ bfqd->bfq_failed_cooperations = 7000; ++ bfqd->bfq_requests_within_timer = 120; ++ ++ bfqd->bfq_large_burst_thresh = 11; ++ bfqd->bfq_burst_interval = msecs_to_jiffies(500); ++ ++ bfqd->low_latency = true; ++ ++ bfqd->bfq_wr_coeff = 20; ++ bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300); ++ bfqd->bfq_wr_max_time = 0; ++ bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000); ++ bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500); ++ bfqd->bfq_wr_max_softrt_rate = 7000; /* ++ * Approximate rate required ++ * to playback or record a ++ * high-definition compressed ++ * video. ++ */ ++ bfqd->wr_busy_queues = 0; ++ bfqd->busy_in_flight_queues = 0; ++ bfqd->const_seeky_busy_in_flight_queues = 0; ++ ++ /* ++ * Begin by assuming, optimistically, that the device peak rate is ++ * equal to the highest reference rate. ++ */ ++ bfqd->RT_prod = R_fast[blk_queue_nonrot(bfqd->queue)] * ++ T_fast[blk_queue_nonrot(bfqd->queue)]; ++ bfqd->peak_rate = R_fast[blk_queue_nonrot(bfqd->queue)]; ++ bfqd->device_speed = BFQ_BFQD_FAST; ++ ++ return 0; ++} ++ ++static void bfq_slab_kill(void) ++{ ++ if (bfq_pool != NULL) ++ kmem_cache_destroy(bfq_pool); ++} ++ ++static int __init bfq_slab_setup(void) ++{ ++ bfq_pool = KMEM_CACHE(bfq_queue, 0); ++ if (bfq_pool == NULL) ++ return -ENOMEM; ++ return 0; ++} ++ ++static ssize_t bfq_var_show(unsigned int var, char *page) ++{ ++ return sprintf(page, "%d\n", var); ++} ++ ++static ssize_t bfq_var_store(unsigned long *var, const char *page, ++ size_t count) ++{ ++ unsigned long new_val; ++ int ret = kstrtoul(page, 10, &new_val); ++ ++ if (ret == 0) ++ *var = new_val; ++ ++ return count; ++} ++ ++static ssize_t bfq_wr_max_time_show(struct elevator_queue *e, char *page) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ return sprintf(page, "%d\n", bfqd->bfq_wr_max_time > 0 ? ++ jiffies_to_msecs(bfqd->bfq_wr_max_time) : ++ jiffies_to_msecs(bfq_wr_duration(bfqd))); ++} ++ ++static ssize_t bfq_weights_show(struct elevator_queue *e, char *page) ++{ ++ struct bfq_queue *bfqq; ++ struct bfq_data *bfqd = e->elevator_data; ++ ssize_t num_char = 0; ++ ++ num_char += sprintf(page + num_char, "Tot reqs queued %d\n\n", ++ bfqd->queued); ++ ++ spin_lock_irq(bfqd->queue->queue_lock); ++ ++ num_char += sprintf(page + num_char, "Active:\n"); ++ list_for_each_entry(bfqq, &bfqd->active_list, bfqq_list) { ++ num_char += sprintf(page + num_char, ++ "pid%d: weight %hu, nr_queued %d %d, dur %d/%u\n", ++ bfqq->pid, ++ bfqq->entity.weight, ++ bfqq->queued[0], ++ bfqq->queued[1], ++ jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish), ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } ++ ++ num_char += sprintf(page + num_char, "Idle:\n"); ++ list_for_each_entry(bfqq, &bfqd->idle_list, bfqq_list) { ++ num_char += sprintf(page + num_char, ++ "pid%d: weight %hu, dur %d/%u\n", ++ bfqq->pid, ++ bfqq->entity.weight, ++ jiffies_to_msecs(jiffies - ++ bfqq->last_wr_start_finish), ++ jiffies_to_msecs(bfqq->wr_cur_max_time)); ++ } ++ ++ spin_unlock_irq(bfqd->queue->queue_lock); ++ ++ return num_char; ++} ++ ++#define SHOW_FUNCTION(__FUNC, __VAR, __CONV) \ ++static ssize_t __FUNC(struct elevator_queue *e, char *page) \ ++{ \ ++ struct bfq_data *bfqd = e->elevator_data; \ ++ unsigned int __data = __VAR; \ ++ if (__CONV) \ ++ __data = jiffies_to_msecs(__data); \ ++ return bfq_var_show(__data, (page)); \ ++} ++SHOW_FUNCTION(bfq_quantum_show, bfqd->bfq_quantum, 0); ++SHOW_FUNCTION(bfq_fifo_expire_sync_show, bfqd->bfq_fifo_expire[1], 1); ++SHOW_FUNCTION(bfq_fifo_expire_async_show, bfqd->bfq_fifo_expire[0], 1); ++SHOW_FUNCTION(bfq_back_seek_max_show, bfqd->bfq_back_max, 0); ++SHOW_FUNCTION(bfq_back_seek_penalty_show, bfqd->bfq_back_penalty, 0); ++SHOW_FUNCTION(bfq_slice_idle_show, bfqd->bfq_slice_idle, 1); ++SHOW_FUNCTION(bfq_max_budget_show, bfqd->bfq_user_max_budget, 0); ++SHOW_FUNCTION(bfq_max_budget_async_rq_show, ++ bfqd->bfq_max_budget_async_rq, 0); ++SHOW_FUNCTION(bfq_timeout_sync_show, bfqd->bfq_timeout[BLK_RW_SYNC], 1); ++SHOW_FUNCTION(bfq_timeout_async_show, bfqd->bfq_timeout[BLK_RW_ASYNC], 1); ++SHOW_FUNCTION(bfq_low_latency_show, bfqd->low_latency, 0); ++SHOW_FUNCTION(bfq_wr_coeff_show, bfqd->bfq_wr_coeff, 0); ++SHOW_FUNCTION(bfq_wr_rt_max_time_show, bfqd->bfq_wr_rt_max_time, 1); ++SHOW_FUNCTION(bfq_wr_min_idle_time_show, bfqd->bfq_wr_min_idle_time, 1); ++SHOW_FUNCTION(bfq_wr_min_inter_arr_async_show, bfqd->bfq_wr_min_inter_arr_async, ++ 1); ++SHOW_FUNCTION(bfq_wr_max_softrt_rate_show, bfqd->bfq_wr_max_softrt_rate, 0); ++#undef SHOW_FUNCTION ++ ++#define STORE_FUNCTION(__FUNC, __PTR, MIN, MAX, __CONV) \ ++static ssize_t \ ++__FUNC(struct elevator_queue *e, const char *page, size_t count) \ ++{ \ ++ struct bfq_data *bfqd = e->elevator_data; \ ++ unsigned long uninitialized_var(__data); \ ++ int ret = bfq_var_store(&__data, (page), count); \ ++ if (__data < (MIN)) \ ++ __data = (MIN); \ ++ else if (__data > (MAX)) \ ++ __data = (MAX); \ ++ if (__CONV) \ ++ *(__PTR) = msecs_to_jiffies(__data); \ ++ else \ ++ *(__PTR) = __data; \ ++ return ret; \ ++} ++STORE_FUNCTION(bfq_quantum_store, &bfqd->bfq_quantum, 1, INT_MAX, 0); ++STORE_FUNCTION(bfq_fifo_expire_sync_store, &bfqd->bfq_fifo_expire[1], 1, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_fifo_expire_async_store, &bfqd->bfq_fifo_expire[0], 1, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_back_seek_max_store, &bfqd->bfq_back_max, 0, INT_MAX, 0); ++STORE_FUNCTION(bfq_back_seek_penalty_store, &bfqd->bfq_back_penalty, 1, ++ INT_MAX, 0); ++STORE_FUNCTION(bfq_slice_idle_store, &bfqd->bfq_slice_idle, 0, INT_MAX, 1); ++STORE_FUNCTION(bfq_max_budget_async_rq_store, &bfqd->bfq_max_budget_async_rq, ++ 1, INT_MAX, 0); ++STORE_FUNCTION(bfq_timeout_async_store, &bfqd->bfq_timeout[BLK_RW_ASYNC], 0, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_coeff_store, &bfqd->bfq_wr_coeff, 1, INT_MAX, 0); ++STORE_FUNCTION(bfq_wr_max_time_store, &bfqd->bfq_wr_max_time, 0, INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_rt_max_time_store, &bfqd->bfq_wr_rt_max_time, 0, INT_MAX, ++ 1); ++STORE_FUNCTION(bfq_wr_min_idle_time_store, &bfqd->bfq_wr_min_idle_time, 0, ++ INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_min_inter_arr_async_store, ++ &bfqd->bfq_wr_min_inter_arr_async, 0, INT_MAX, 1); ++STORE_FUNCTION(bfq_wr_max_softrt_rate_store, &bfqd->bfq_wr_max_softrt_rate, 0, ++ INT_MAX, 0); ++#undef STORE_FUNCTION ++ ++/* do nothing for the moment */ ++static ssize_t bfq_weights_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ return count; ++} ++ ++static inline unsigned long bfq_estimated_max_budget(struct bfq_data *bfqd) ++{ ++ u64 timeout = jiffies_to_msecs(bfqd->bfq_timeout[BLK_RW_SYNC]); ++ ++ if (bfqd->peak_rate_samples >= BFQ_PEAK_RATE_SAMPLES) ++ return bfq_calc_max_budget(bfqd->peak_rate, timeout); ++ else ++ return bfq_default_max_budget; ++} ++ ++static ssize_t bfq_max_budget_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ unsigned long uninitialized_var(__data); ++ int ret = bfq_var_store(&__data, (page), count); ++ ++ if (__data == 0) ++ bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd); ++ else { ++ if (__data > INT_MAX) ++ __data = INT_MAX; ++ bfqd->bfq_max_budget = __data; ++ } ++ ++ bfqd->bfq_user_max_budget = __data; ++ ++ return ret; ++} ++ ++static ssize_t bfq_timeout_sync_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ unsigned long uninitialized_var(__data); ++ int ret = bfq_var_store(&__data, (page), count); ++ ++ if (__data < 1) ++ __data = 1; ++ else if (__data > INT_MAX) ++ __data = INT_MAX; ++ ++ bfqd->bfq_timeout[BLK_RW_SYNC] = msecs_to_jiffies(__data); ++ if (bfqd->bfq_user_max_budget == 0) ++ bfqd->bfq_max_budget = bfq_estimated_max_budget(bfqd); ++ ++ return ret; ++} ++ ++static ssize_t bfq_low_latency_store(struct elevator_queue *e, ++ const char *page, size_t count) ++{ ++ struct bfq_data *bfqd = e->elevator_data; ++ unsigned long uninitialized_var(__data); ++ int ret = bfq_var_store(&__data, (page), count); ++ ++ if (__data > 1) ++ __data = 1; ++ if (__data == 0 && bfqd->low_latency != 0) ++ bfq_end_wr(bfqd); ++ bfqd->low_latency = __data; ++ ++ return ret; ++} ++ ++#define BFQ_ATTR(name) \ ++ __ATTR(name, S_IRUGO|S_IWUSR, bfq_##name##_show, bfq_##name##_store) ++ ++static struct elv_fs_entry bfq_attrs[] = { ++ BFQ_ATTR(quantum), ++ BFQ_ATTR(fifo_expire_sync), ++ BFQ_ATTR(fifo_expire_async), ++ BFQ_ATTR(back_seek_max), ++ BFQ_ATTR(back_seek_penalty), ++ BFQ_ATTR(slice_idle), ++ BFQ_ATTR(max_budget), ++ BFQ_ATTR(max_budget_async_rq), ++ BFQ_ATTR(timeout_sync), ++ BFQ_ATTR(timeout_async), ++ BFQ_ATTR(low_latency), ++ BFQ_ATTR(wr_coeff), ++ BFQ_ATTR(wr_max_time), ++ BFQ_ATTR(wr_rt_max_time), ++ BFQ_ATTR(wr_min_idle_time), ++ BFQ_ATTR(wr_min_inter_arr_async), ++ BFQ_ATTR(wr_max_softrt_rate), ++ BFQ_ATTR(weights), ++ __ATTR_NULL ++}; ++ ++static struct elevator_type iosched_bfq = { ++ .ops = { ++ .elevator_merge_fn = bfq_merge, ++ .elevator_merged_fn = bfq_merged_request, ++ .elevator_merge_req_fn = bfq_merged_requests, ++ .elevator_allow_merge_fn = bfq_allow_merge, ++ .elevator_dispatch_fn = bfq_dispatch_requests, ++ .elevator_add_req_fn = bfq_insert_request, ++ .elevator_activate_req_fn = bfq_activate_request, ++ .elevator_deactivate_req_fn = bfq_deactivate_request, ++ .elevator_completed_req_fn = bfq_completed_request, ++ .elevator_former_req_fn = elv_rb_former_request, ++ .elevator_latter_req_fn = elv_rb_latter_request, ++ .elevator_init_icq_fn = bfq_init_icq, ++ .elevator_exit_icq_fn = bfq_exit_icq, ++ .elevator_set_req_fn = bfq_set_request, ++ .elevator_put_req_fn = bfq_put_request, ++ .elevator_may_queue_fn = bfq_may_queue, ++ .elevator_init_fn = bfq_init_queue, ++ .elevator_exit_fn = bfq_exit_queue, ++ }, ++ .icq_size = sizeof(struct bfq_io_cq), ++ .icq_align = __alignof__(struct bfq_io_cq), ++ .elevator_attrs = bfq_attrs, ++ .elevator_name = "bfq", ++ .elevator_owner = THIS_MODULE, ++}; ++ ++static int __init bfq_init(void) ++{ ++ /* ++ * Can be 0 on HZ < 1000 setups. ++ */ ++ if (bfq_slice_idle == 0) ++ bfq_slice_idle = 1; ++ ++ if (bfq_timeout_async == 0) ++ bfq_timeout_async = 1; ++ ++ if (bfq_slab_setup()) ++ return -ENOMEM; ++ ++ /* ++ * Times to load large popular applications for the typical systems ++ * installed on the reference devices (see the comments before the ++ * definitions of the two arrays). ++ */ ++ T_slow[0] = msecs_to_jiffies(2600); ++ T_slow[1] = msecs_to_jiffies(1000); ++ T_fast[0] = msecs_to_jiffies(5500); ++ T_fast[1] = msecs_to_jiffies(2000); ++ ++ /* ++ * Thresholds that determine the switch between speed classes (see ++ * the comments before the definition of the array). ++ */ ++ device_speed_thresh[0] = (R_fast[0] + R_slow[0]) / 2; ++ device_speed_thresh[1] = (R_fast[1] + R_slow[1]) / 2; ++ ++ elv_register(&iosched_bfq); ++ pr_info("BFQ I/O-scheduler version: v7r7"); ++ ++ return 0; ++} ++ ++static void __exit bfq_exit(void) ++{ ++ elv_unregister(&iosched_bfq); ++ bfq_slab_kill(); ++} ++ ++module_init(bfq_init); ++module_exit(bfq_exit); ++ ++MODULE_AUTHOR("Fabio Checconi, Paolo Valente"); ++MODULE_LICENSE("GPL"); +diff --git a/block/bfq-sched.c b/block/bfq-sched.c +new file mode 100644 +index 0000000..2931563 +--- /dev/null ++++ b/block/bfq-sched.c +@@ -0,0 +1,1214 @@ ++/* ++ * BFQ: Hierarchical B-WF2Q+ scheduler. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ */ ++ ++#ifdef CONFIG_CGROUP_BFQIO ++#define for_each_entity(entity) \ ++ for (; entity != NULL; entity = entity->parent) ++ ++#define for_each_entity_safe(entity, parent) \ ++ for (; entity && ({ parent = entity->parent; 1; }); entity = parent) ++ ++static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd, ++ int extract, ++ struct bfq_data *bfqd); ++ ++static inline void bfq_update_budget(struct bfq_entity *next_in_service) ++{ ++ struct bfq_entity *bfqg_entity; ++ struct bfq_group *bfqg; ++ struct bfq_sched_data *group_sd; ++ ++ BUG_ON(next_in_service == NULL); ++ ++ group_sd = next_in_service->sched_data; ++ ++ bfqg = container_of(group_sd, struct bfq_group, sched_data); ++ /* ++ * bfq_group's my_entity field is not NULL only if the group ++ * is not the root group. We must not touch the root entity ++ * as it must never become an in-service entity. ++ */ ++ bfqg_entity = bfqg->my_entity; ++ if (bfqg_entity != NULL) ++ bfqg_entity->budget = next_in_service->budget; ++} ++ ++static int bfq_update_next_in_service(struct bfq_sched_data *sd) ++{ ++ struct bfq_entity *next_in_service; ++ ++ if (sd->in_service_entity != NULL) ++ /* will update/requeue at the end of service */ ++ return 0; ++ ++ /* ++ * NOTE: this can be improved in many ways, such as returning ++ * 1 (and thus propagating upwards the update) only when the ++ * budget changes, or caching the bfqq that will be scheduled ++ * next from this subtree. By now we worry more about ++ * correctness than about performance... ++ */ ++ next_in_service = bfq_lookup_next_entity(sd, 0, NULL); ++ sd->next_in_service = next_in_service; ++ ++ if (next_in_service != NULL) ++ bfq_update_budget(next_in_service); ++ ++ return 1; ++} ++ ++static inline void bfq_check_next_in_service(struct bfq_sched_data *sd, ++ struct bfq_entity *entity) ++{ ++ BUG_ON(sd->next_in_service != entity); ++} ++#else ++#define for_each_entity(entity) \ ++ for (; entity != NULL; entity = NULL) ++ ++#define for_each_entity_safe(entity, parent) \ ++ for (parent = NULL; entity != NULL; entity = parent) ++ ++static inline int bfq_update_next_in_service(struct bfq_sched_data *sd) ++{ ++ return 0; ++} ++ ++static inline void bfq_check_next_in_service(struct bfq_sched_data *sd, ++ struct bfq_entity *entity) ++{ ++} ++ ++static inline void bfq_update_budget(struct bfq_entity *next_in_service) ++{ ++} ++#endif ++ ++/* ++ * Shift for timestamp calculations. This actually limits the maximum ++ * service allowed in one timestamp delta (small shift values increase it), ++ * the maximum total weight that can be used for the queues in the system ++ * (big shift values increase it), and the period of virtual time ++ * wraparounds. ++ */ ++#define WFQ_SERVICE_SHIFT 22 ++ ++/** ++ * bfq_gt - compare two timestamps. ++ * @a: first ts. ++ * @b: second ts. ++ * ++ * Return @a > @b, dealing with wrapping correctly. ++ */ ++static inline int bfq_gt(u64 a, u64 b) ++{ ++ return (s64)(a - b) > 0; ++} ++ ++static inline struct bfq_queue *bfq_entity_to_bfqq(struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = NULL; ++ ++ BUG_ON(entity == NULL); ++ ++ if (entity->my_sched_data == NULL) ++ bfqq = container_of(entity, struct bfq_queue, entity); ++ ++ return bfqq; ++} ++ ++ ++/** ++ * bfq_delta - map service into the virtual time domain. ++ * @service: amount of service. ++ * @weight: scale factor (weight of an entity or weight sum). ++ */ ++static inline u64 bfq_delta(unsigned long service, ++ unsigned long weight) ++{ ++ u64 d = (u64)service << WFQ_SERVICE_SHIFT; ++ ++ do_div(d, weight); ++ return d; ++} ++ ++/** ++ * bfq_calc_finish - assign the finish time to an entity. ++ * @entity: the entity to act upon. ++ * @service: the service to be charged to the entity. ++ */ ++static inline void bfq_calc_finish(struct bfq_entity *entity, ++ unsigned long service) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ ++ BUG_ON(entity->weight == 0); ++ ++ entity->finish = entity->start + ++ bfq_delta(service, entity->weight); ++ ++ if (bfqq != NULL) { ++ bfq_log_bfqq(bfqq->bfqd, bfqq, ++ "calc_finish: serv %lu, w %d", ++ service, entity->weight); ++ bfq_log_bfqq(bfqq->bfqd, bfqq, ++ "calc_finish: start %llu, finish %llu, delta %llu", ++ entity->start, entity->finish, ++ bfq_delta(service, entity->weight)); ++ } ++} ++ ++/** ++ * bfq_entity_of - get an entity from a node. ++ * @node: the node field of the entity. ++ * ++ * Convert a node pointer to the relative entity. This is used only ++ * to simplify the logic of some functions and not as the generic ++ * conversion mechanism because, e.g., in the tree walking functions, ++ * the check for a %NULL value would be redundant. ++ */ ++static inline struct bfq_entity *bfq_entity_of(struct rb_node *node) ++{ ++ struct bfq_entity *entity = NULL; ++ ++ if (node != NULL) ++ entity = rb_entry(node, struct bfq_entity, rb_node); ++ ++ return entity; ++} ++ ++/** ++ * bfq_extract - remove an entity from a tree. ++ * @root: the tree root. ++ * @entity: the entity to remove. ++ */ ++static inline void bfq_extract(struct rb_root *root, ++ struct bfq_entity *entity) ++{ ++ BUG_ON(entity->tree != root); ++ ++ entity->tree = NULL; ++ rb_erase(&entity->rb_node, root); ++} ++ ++/** ++ * bfq_idle_extract - extract an entity from the idle tree. ++ * @st: the service tree of the owning @entity. ++ * @entity: the entity being removed. ++ */ ++static void bfq_idle_extract(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct rb_node *next; ++ ++ BUG_ON(entity->tree != &st->idle); ++ ++ if (entity == st->first_idle) { ++ next = rb_next(&entity->rb_node); ++ st->first_idle = bfq_entity_of(next); ++ } ++ ++ if (entity == st->last_idle) { ++ next = rb_prev(&entity->rb_node); ++ st->last_idle = bfq_entity_of(next); ++ } ++ ++ bfq_extract(&st->idle, entity); ++ ++ if (bfqq != NULL) ++ list_del(&bfqq->bfqq_list); ++} ++ ++/** ++ * bfq_insert - generic tree insertion. ++ * @root: tree root. ++ * @entity: entity to insert. ++ * ++ * This is used for the idle and the active tree, since they are both ++ * ordered by finish time. ++ */ ++static void bfq_insert(struct rb_root *root, struct bfq_entity *entity) ++{ ++ struct bfq_entity *entry; ++ struct rb_node **node = &root->rb_node; ++ struct rb_node *parent = NULL; ++ ++ BUG_ON(entity->tree != NULL); ++ ++ while (*node != NULL) { ++ parent = *node; ++ entry = rb_entry(parent, struct bfq_entity, rb_node); ++ ++ if (bfq_gt(entry->finish, entity->finish)) ++ node = &parent->rb_left; ++ else ++ node = &parent->rb_right; ++ } ++ ++ rb_link_node(&entity->rb_node, parent, node); ++ rb_insert_color(&entity->rb_node, root); ++ ++ entity->tree = root; ++} ++ ++/** ++ * bfq_update_min - update the min_start field of a entity. ++ * @entity: the entity to update. ++ * @node: one of its children. ++ * ++ * This function is called when @entity may store an invalid value for ++ * min_start due to updates to the active tree. The function assumes ++ * that the subtree rooted at @node (which may be its left or its right ++ * child) has a valid min_start value. ++ */ ++static inline void bfq_update_min(struct bfq_entity *entity, ++ struct rb_node *node) ++{ ++ struct bfq_entity *child; ++ ++ if (node != NULL) { ++ child = rb_entry(node, struct bfq_entity, rb_node); ++ if (bfq_gt(entity->min_start, child->min_start)) ++ entity->min_start = child->min_start; ++ } ++} ++ ++/** ++ * bfq_update_active_node - recalculate min_start. ++ * @node: the node to update. ++ * ++ * @node may have changed position or one of its children may have moved, ++ * this function updates its min_start value. The left and right subtrees ++ * are assumed to hold a correct min_start value. ++ */ ++static inline void bfq_update_active_node(struct rb_node *node) ++{ ++ struct bfq_entity *entity = rb_entry(node, struct bfq_entity, rb_node); ++ ++ entity->min_start = entity->start; ++ bfq_update_min(entity, node->rb_right); ++ bfq_update_min(entity, node->rb_left); ++} ++ ++/** ++ * bfq_update_active_tree - update min_start for the whole active tree. ++ * @node: the starting node. ++ * ++ * @node must be the deepest modified node after an update. This function ++ * updates its min_start using the values held by its children, assuming ++ * that they did not change, and then updates all the nodes that may have ++ * changed in the path to the root. The only nodes that may have changed ++ * are the ones in the path or their siblings. ++ */ ++static void bfq_update_active_tree(struct rb_node *node) ++{ ++ struct rb_node *parent; ++ ++up: ++ bfq_update_active_node(node); ++ ++ parent = rb_parent(node); ++ if (parent == NULL) ++ return; ++ ++ if (node == parent->rb_left && parent->rb_right != NULL) ++ bfq_update_active_node(parent->rb_right); ++ else if (parent->rb_left != NULL) ++ bfq_update_active_node(parent->rb_left); ++ ++ node = parent; ++ goto up; ++} ++ ++static void bfq_weights_tree_add(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root); ++ ++static void bfq_weights_tree_remove(struct bfq_data *bfqd, ++ struct bfq_entity *entity, ++ struct rb_root *root); ++ ++ ++/** ++ * bfq_active_insert - insert an entity in the active tree of its ++ * group/device. ++ * @st: the service tree of the entity. ++ * @entity: the entity being inserted. ++ * ++ * The active tree is ordered by finish time, but an extra key is kept ++ * per each node, containing the minimum value for the start times of ++ * its children (and the node itself), so it's possible to search for ++ * the eligible node with the lowest finish time in logarithmic time. ++ */ ++static void bfq_active_insert(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct rb_node *node = &entity->rb_node; ++#ifdef CONFIG_CGROUP_BFQIO ++ struct bfq_sched_data *sd = NULL; ++ struct bfq_group *bfqg = NULL; ++ struct bfq_data *bfqd = NULL; ++#endif ++ ++ bfq_insert(&st->active, entity); ++ ++ if (node->rb_left != NULL) ++ node = node->rb_left; ++ else if (node->rb_right != NULL) ++ node = node->rb_right; ++ ++ bfq_update_active_tree(node); ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ sd = entity->sched_data; ++ bfqg = container_of(sd, struct bfq_group, sched_data); ++ BUG_ON(!bfqg); ++ bfqd = (struct bfq_data *)bfqg->bfqd; ++#endif ++ if (bfqq != NULL) ++ list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list); ++#ifdef CONFIG_CGROUP_BFQIO ++ else { /* bfq_group */ ++ BUG_ON(!bfqd); ++ bfq_weights_tree_add(bfqd, entity, &bfqd->group_weights_tree); ++ } ++ if (bfqg != bfqd->root_group) { ++ BUG_ON(!bfqg); ++ BUG_ON(!bfqd); ++ bfqg->active_entities++; ++ if (bfqg->active_entities == 2) ++ bfqd->active_numerous_groups++; ++ } ++#endif ++} ++ ++/** ++ * bfq_ioprio_to_weight - calc a weight from an ioprio. ++ * @ioprio: the ioprio value to convert. ++ */ ++static inline unsigned short bfq_ioprio_to_weight(int ioprio) ++{ ++ BUG_ON(ioprio < 0 || ioprio >= IOPRIO_BE_NR); ++ return IOPRIO_BE_NR - ioprio; ++} ++ ++/** ++ * bfq_weight_to_ioprio - calc an ioprio from a weight. ++ * @weight: the weight value to convert. ++ * ++ * To preserve as mush as possible the old only-ioprio user interface, ++ * 0 is used as an escape ioprio value for weights (numerically) equal or ++ * larger than IOPRIO_BE_NR ++ */ ++static inline unsigned short bfq_weight_to_ioprio(int weight) ++{ ++ BUG_ON(weight < BFQ_MIN_WEIGHT || weight > BFQ_MAX_WEIGHT); ++ return IOPRIO_BE_NR - weight < 0 ? 0 : IOPRIO_BE_NR - weight; ++} ++ ++static inline void bfq_get_entity(struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ ++ if (bfqq != NULL) { ++ atomic_inc(&bfqq->ref); ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ } ++} ++ ++/** ++ * bfq_find_deepest - find the deepest node that an extraction can modify. ++ * @node: the node being removed. ++ * ++ * Do the first step of an extraction in an rb tree, looking for the ++ * node that will replace @node, and returning the deepest node that ++ * the following modifications to the tree can touch. If @node is the ++ * last node in the tree return %NULL. ++ */ ++static struct rb_node *bfq_find_deepest(struct rb_node *node) ++{ ++ struct rb_node *deepest; ++ ++ if (node->rb_right == NULL && node->rb_left == NULL) ++ deepest = rb_parent(node); ++ else if (node->rb_right == NULL) ++ deepest = node->rb_left; ++ else if (node->rb_left == NULL) ++ deepest = node->rb_right; ++ else { ++ deepest = rb_next(node); ++ if (deepest->rb_right != NULL) ++ deepest = deepest->rb_right; ++ else if (rb_parent(deepest) != node) ++ deepest = rb_parent(deepest); ++ } ++ ++ return deepest; ++} ++ ++/** ++ * bfq_active_extract - remove an entity from the active tree. ++ * @st: the service_tree containing the tree. ++ * @entity: the entity being removed. ++ */ ++static void bfq_active_extract(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct rb_node *node; ++#ifdef CONFIG_CGROUP_BFQIO ++ struct bfq_sched_data *sd = NULL; ++ struct bfq_group *bfqg = NULL; ++ struct bfq_data *bfqd = NULL; ++#endif ++ ++ node = bfq_find_deepest(&entity->rb_node); ++ bfq_extract(&st->active, entity); ++ ++ if (node != NULL) ++ bfq_update_active_tree(node); ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ sd = entity->sched_data; ++ bfqg = container_of(sd, struct bfq_group, sched_data); ++ BUG_ON(!bfqg); ++ bfqd = (struct bfq_data *)bfqg->bfqd; ++#endif ++ if (bfqq != NULL) ++ list_del(&bfqq->bfqq_list); ++#ifdef CONFIG_CGROUP_BFQIO ++ else { /* bfq_group */ ++ BUG_ON(!bfqd); ++ bfq_weights_tree_remove(bfqd, entity, ++ &bfqd->group_weights_tree); ++ } ++ if (bfqg != bfqd->root_group) { ++ BUG_ON(!bfqg); ++ BUG_ON(!bfqd); ++ BUG_ON(!bfqg->active_entities); ++ bfqg->active_entities--; ++ if (bfqg->active_entities == 1) { ++ BUG_ON(!bfqd->active_numerous_groups); ++ bfqd->active_numerous_groups--; ++ } ++ } ++#endif ++} ++ ++/** ++ * bfq_idle_insert - insert an entity into the idle tree. ++ * @st: the service tree containing the tree. ++ * @entity: the entity to insert. ++ */ ++static void bfq_idle_insert(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct bfq_entity *first_idle = st->first_idle; ++ struct bfq_entity *last_idle = st->last_idle; ++ ++ if (first_idle == NULL || bfq_gt(first_idle->finish, entity->finish)) ++ st->first_idle = entity; ++ if (last_idle == NULL || bfq_gt(entity->finish, last_idle->finish)) ++ st->last_idle = entity; ++ ++ bfq_insert(&st->idle, entity); ++ ++ if (bfqq != NULL) ++ list_add(&bfqq->bfqq_list, &bfqq->bfqd->idle_list); ++} ++ ++/** ++ * bfq_forget_entity - remove an entity from the wfq trees. ++ * @st: the service tree. ++ * @entity: the entity being removed. ++ * ++ * Update the device status and forget everything about @entity, putting ++ * the device reference to it, if it is a queue. Entities belonging to ++ * groups are not refcounted. ++ */ ++static void bfq_forget_entity(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ struct bfq_sched_data *sd; ++ ++ BUG_ON(!entity->on_st); ++ ++ entity->on_st = 0; ++ st->wsum -= entity->weight; ++ if (bfqq != NULL) { ++ sd = entity->sched_data; ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "forget_entity: %p %d", ++ bfqq, atomic_read(&bfqq->ref)); ++ bfq_put_queue(bfqq); ++ } ++} ++ ++/** ++ * bfq_put_idle_entity - release the idle tree ref of an entity. ++ * @st: service tree for the entity. ++ * @entity: the entity being released. ++ */ ++static void bfq_put_idle_entity(struct bfq_service_tree *st, ++ struct bfq_entity *entity) ++{ ++ bfq_idle_extract(st, entity); ++ bfq_forget_entity(st, entity); ++} ++ ++/** ++ * bfq_forget_idle - update the idle tree if necessary. ++ * @st: the service tree to act upon. ++ * ++ * To preserve the global O(log N) complexity we only remove one entry here; ++ * as the idle tree will not grow indefinitely this can be done safely. ++ */ ++static void bfq_forget_idle(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *first_idle = st->first_idle; ++ struct bfq_entity *last_idle = st->last_idle; ++ ++ if (RB_EMPTY_ROOT(&st->active) && last_idle != NULL && ++ !bfq_gt(last_idle->finish, st->vtime)) { ++ /* ++ * Forget the whole idle tree, increasing the vtime past ++ * the last finish time of idle entities. ++ */ ++ st->vtime = last_idle->finish; ++ } ++ ++ if (first_idle != NULL && !bfq_gt(first_idle->finish, st->vtime)) ++ bfq_put_idle_entity(st, first_idle); ++} ++ ++static struct bfq_service_tree * ++__bfq_entity_update_weight_prio(struct bfq_service_tree *old_st, ++ struct bfq_entity *entity) ++{ ++ struct bfq_service_tree *new_st = old_st; ++ ++ if (entity->ioprio_changed) { ++ struct bfq_queue *bfqq = bfq_entity_to_bfqq(entity); ++ unsigned short prev_weight, new_weight; ++ struct bfq_data *bfqd = NULL; ++ struct rb_root *root; ++#ifdef CONFIG_CGROUP_BFQIO ++ struct bfq_sched_data *sd; ++ struct bfq_group *bfqg; ++#endif ++ ++ if (bfqq != NULL) ++ bfqd = bfqq->bfqd; ++#ifdef CONFIG_CGROUP_BFQIO ++ else { ++ sd = entity->my_sched_data; ++ bfqg = container_of(sd, struct bfq_group, sched_data); ++ BUG_ON(!bfqg); ++ bfqd = (struct bfq_data *)bfqg->bfqd; ++ BUG_ON(!bfqd); ++ } ++#endif ++ ++ BUG_ON(old_st->wsum < entity->weight); ++ old_st->wsum -= entity->weight; ++ ++ if (entity->new_weight != entity->orig_weight) { ++ if (entity->new_weight < BFQ_MIN_WEIGHT || ++ entity->new_weight > BFQ_MAX_WEIGHT) { ++ printk(KERN_CRIT "update_weight_prio: " ++ "new_weight %d\n", ++ entity->new_weight); ++ BUG(); ++ } ++ entity->orig_weight = entity->new_weight; ++ entity->ioprio = ++ bfq_weight_to_ioprio(entity->orig_weight); ++ } else if (entity->new_ioprio != entity->ioprio) { ++ entity->ioprio = entity->new_ioprio; ++ entity->orig_weight = ++ bfq_ioprio_to_weight(entity->ioprio); ++ } else ++ entity->new_weight = entity->orig_weight = ++ bfq_ioprio_to_weight(entity->ioprio); ++ ++ entity->ioprio_class = entity->new_ioprio_class; ++ entity->ioprio_changed = 0; ++ ++ /* ++ * NOTE: here we may be changing the weight too early, ++ * this will cause unfairness. The correct approach ++ * would have required additional complexity to defer ++ * weight changes to the proper time instants (i.e., ++ * when entity->finish <= old_st->vtime). ++ */ ++ new_st = bfq_entity_service_tree(entity); ++ ++ prev_weight = entity->weight; ++ new_weight = entity->orig_weight * ++ (bfqq != NULL ? bfqq->wr_coeff : 1); ++ /* ++ * If the weight of the entity changes, remove the entity ++ * from its old weight counter (if there is a counter ++ * associated with the entity), and add it to the counter ++ * associated with its new weight. ++ */ ++ if (prev_weight != new_weight) { ++ root = bfqq ? &bfqd->queue_weights_tree : ++ &bfqd->group_weights_tree; ++ bfq_weights_tree_remove(bfqd, entity, root); ++ } ++ entity->weight = new_weight; ++ /* ++ * Add the entity to its weights tree only if it is ++ * not associated with a weight-raised queue. ++ */ ++ if (prev_weight != new_weight && ++ (bfqq ? bfqq->wr_coeff == 1 : 1)) ++ /* If we get here, root has been initialized. */ ++ bfq_weights_tree_add(bfqd, entity, root); ++ ++ new_st->wsum += entity->weight; ++ ++ if (new_st != old_st) ++ entity->start = new_st->vtime; ++ } ++ ++ return new_st; ++} ++ ++/** ++ * bfq_bfqq_served - update the scheduler status after selection for ++ * service. ++ * @bfqq: the queue being served. ++ * @served: bytes to transfer. ++ * ++ * NOTE: this can be optimized, as the timestamps of upper level entities ++ * are synchronized every time a new bfqq is selected for service. By now, ++ * we keep it to better check consistency. ++ */ ++static void bfq_bfqq_served(struct bfq_queue *bfqq, unsigned long served) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ struct bfq_service_tree *st; ++ ++ for_each_entity(entity) { ++ st = bfq_entity_service_tree(entity); ++ ++ entity->service += served; ++ BUG_ON(entity->service > entity->budget); ++ BUG_ON(st->wsum == 0); ++ ++ st->vtime += bfq_delta(served, st->wsum); ++ bfq_forget_idle(st); ++ } ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "bfqq_served %lu secs", served); ++} ++ ++/** ++ * bfq_bfqq_charge_full_budget - set the service to the entity budget. ++ * @bfqq: the queue that needs a service update. ++ * ++ * When it's not possible to be fair in the service domain, because ++ * a queue is not consuming its budget fast enough (the meaning of ++ * fast depends on the timeout parameter), we charge it a full ++ * budget. In this way we should obtain a sort of time-domain ++ * fairness among all the seeky/slow queues. ++ */ ++static inline void bfq_bfqq_charge_full_budget(struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "charge_full_budget"); ++ ++ bfq_bfqq_served(bfqq, entity->budget - entity->service); ++} ++ ++/** ++ * __bfq_activate_entity - activate an entity. ++ * @entity: the entity being activated. ++ * ++ * Called whenever an entity is activated, i.e., it is not active and one ++ * of its children receives a new request, or has to be reactivated due to ++ * budget exhaustion. It uses the current budget of the entity (and the ++ * service received if @entity is active) of the queue to calculate its ++ * timestamps. ++ */ ++static void __bfq_activate_entity(struct bfq_entity *entity) ++{ ++ struct bfq_sched_data *sd = entity->sched_data; ++ struct bfq_service_tree *st = bfq_entity_service_tree(entity); ++ ++ if (entity == sd->in_service_entity) { ++ BUG_ON(entity->tree != NULL); ++ /* ++ * If we are requeueing the current entity we have ++ * to take care of not charging to it service it has ++ * not received. ++ */ ++ bfq_calc_finish(entity, entity->service); ++ entity->start = entity->finish; ++ sd->in_service_entity = NULL; ++ } else if (entity->tree == &st->active) { ++ /* ++ * Requeueing an entity due to a change of some ++ * next_in_service entity below it. We reuse the ++ * old start time. ++ */ ++ bfq_active_extract(st, entity); ++ } else if (entity->tree == &st->idle) { ++ /* ++ * Must be on the idle tree, bfq_idle_extract() will ++ * check for that. ++ */ ++ bfq_idle_extract(st, entity); ++ entity->start = bfq_gt(st->vtime, entity->finish) ? ++ st->vtime : entity->finish; ++ } else { ++ /* ++ * The finish time of the entity may be invalid, and ++ * it is in the past for sure, otherwise the queue ++ * would have been on the idle tree. ++ */ ++ entity->start = st->vtime; ++ st->wsum += entity->weight; ++ bfq_get_entity(entity); ++ ++ BUG_ON(entity->on_st); ++ entity->on_st = 1; ++ } ++ ++ st = __bfq_entity_update_weight_prio(st, entity); ++ bfq_calc_finish(entity, entity->budget); ++ bfq_active_insert(st, entity); ++} ++ ++/** ++ * bfq_activate_entity - activate an entity and its ancestors if necessary. ++ * @entity: the entity to activate. ++ * ++ * Activate @entity and all the entities on the path from it to the root. ++ */ ++static void bfq_activate_entity(struct bfq_entity *entity) ++{ ++ struct bfq_sched_data *sd; ++ ++ for_each_entity(entity) { ++ __bfq_activate_entity(entity); ++ ++ sd = entity->sched_data; ++ if (!bfq_update_next_in_service(sd)) ++ /* ++ * No need to propagate the activation to the ++ * upper entities, as they will be updated when ++ * the in-service entity is rescheduled. ++ */ ++ break; ++ } ++} ++ ++/** ++ * __bfq_deactivate_entity - deactivate an entity from its service tree. ++ * @entity: the entity to deactivate. ++ * @requeue: if false, the entity will not be put into the idle tree. ++ * ++ * Deactivate an entity, independently from its previous state. If the ++ * entity was not on a service tree just return, otherwise if it is on ++ * any scheduler tree, extract it from that tree, and if necessary ++ * and if the caller did not specify @requeue, put it on the idle tree. ++ * ++ * Return %1 if the caller should update the entity hierarchy, i.e., ++ * if the entity was in service or if it was the next_in_service for ++ * its sched_data; return %0 otherwise. ++ */ ++static int __bfq_deactivate_entity(struct bfq_entity *entity, int requeue) ++{ ++ struct bfq_sched_data *sd = entity->sched_data; ++ struct bfq_service_tree *st = bfq_entity_service_tree(entity); ++ int was_in_service = entity == sd->in_service_entity; ++ int ret = 0; ++ ++ if (!entity->on_st) ++ return 0; ++ ++ BUG_ON(was_in_service && entity->tree != NULL); ++ ++ if (was_in_service) { ++ bfq_calc_finish(entity, entity->service); ++ sd->in_service_entity = NULL; ++ } else if (entity->tree == &st->active) ++ bfq_active_extract(st, entity); ++ else if (entity->tree == &st->idle) ++ bfq_idle_extract(st, entity); ++ else if (entity->tree != NULL) ++ BUG(); ++ ++ if (was_in_service || sd->next_in_service == entity) ++ ret = bfq_update_next_in_service(sd); ++ ++ if (!requeue || !bfq_gt(entity->finish, st->vtime)) ++ bfq_forget_entity(st, entity); ++ else ++ bfq_idle_insert(st, entity); ++ ++ BUG_ON(sd->in_service_entity == entity); ++ BUG_ON(sd->next_in_service == entity); ++ ++ return ret; ++} ++ ++/** ++ * bfq_deactivate_entity - deactivate an entity. ++ * @entity: the entity to deactivate. ++ * @requeue: true if the entity can be put on the idle tree ++ */ ++static void bfq_deactivate_entity(struct bfq_entity *entity, int requeue) ++{ ++ struct bfq_sched_data *sd; ++ struct bfq_entity *parent; ++ ++ for_each_entity_safe(entity, parent) { ++ sd = entity->sched_data; ++ ++ if (!__bfq_deactivate_entity(entity, requeue)) ++ /* ++ * The parent entity is still backlogged, and ++ * we don't need to update it as it is still ++ * in service. ++ */ ++ break; ++ ++ if (sd->next_in_service != NULL) ++ /* ++ * The parent entity is still backlogged and ++ * the budgets on the path towards the root ++ * need to be updated. ++ */ ++ goto update; ++ ++ /* ++ * If we reach there the parent is no more backlogged and ++ * we want to propagate the dequeue upwards. ++ */ ++ requeue = 1; ++ } ++ ++ return; ++ ++update: ++ entity = parent; ++ for_each_entity(entity) { ++ __bfq_activate_entity(entity); ++ ++ sd = entity->sched_data; ++ if (!bfq_update_next_in_service(sd)) ++ break; ++ } ++} ++ ++/** ++ * bfq_update_vtime - update vtime if necessary. ++ * @st: the service tree to act upon. ++ * ++ * If necessary update the service tree vtime to have at least one ++ * eligible entity, skipping to its start time. Assumes that the ++ * active tree of the device is not empty. ++ * ++ * NOTE: this hierarchical implementation updates vtimes quite often, ++ * we may end up with reactivated processes getting timestamps after a ++ * vtime skip done because we needed a ->first_active entity on some ++ * intermediate node. ++ */ ++static void bfq_update_vtime(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *entry; ++ struct rb_node *node = st->active.rb_node; ++ ++ entry = rb_entry(node, struct bfq_entity, rb_node); ++ if (bfq_gt(entry->min_start, st->vtime)) { ++ st->vtime = entry->min_start; ++ bfq_forget_idle(st); ++ } ++} ++ ++/** ++ * bfq_first_active_entity - find the eligible entity with ++ * the smallest finish time ++ * @st: the service tree to select from. ++ * ++ * This function searches the first schedulable entity, starting from the ++ * root of the tree and going on the left every time on this side there is ++ * a subtree with at least one eligible (start >= vtime) entity. The path on ++ * the right is followed only if a) the left subtree contains no eligible ++ * entities and b) no eligible entity has been found yet. ++ */ ++static struct bfq_entity *bfq_first_active_entity(struct bfq_service_tree *st) ++{ ++ struct bfq_entity *entry, *first = NULL; ++ struct rb_node *node = st->active.rb_node; ++ ++ while (node != NULL) { ++ entry = rb_entry(node, struct bfq_entity, rb_node); ++left: ++ if (!bfq_gt(entry->start, st->vtime)) ++ first = entry; ++ ++ BUG_ON(bfq_gt(entry->min_start, st->vtime)); ++ ++ if (node->rb_left != NULL) { ++ entry = rb_entry(node->rb_left, ++ struct bfq_entity, rb_node); ++ if (!bfq_gt(entry->min_start, st->vtime)) { ++ node = node->rb_left; ++ goto left; ++ } ++ } ++ if (first != NULL) ++ break; ++ node = node->rb_right; ++ } ++ ++ BUG_ON(first == NULL && !RB_EMPTY_ROOT(&st->active)); ++ return first; ++} ++ ++/** ++ * __bfq_lookup_next_entity - return the first eligible entity in @st. ++ * @st: the service tree. ++ * ++ * Update the virtual time in @st and return the first eligible entity ++ * it contains. ++ */ ++static struct bfq_entity *__bfq_lookup_next_entity(struct bfq_service_tree *st, ++ bool force) ++{ ++ struct bfq_entity *entity, *new_next_in_service = NULL; ++ ++ if (RB_EMPTY_ROOT(&st->active)) ++ return NULL; ++ ++ bfq_update_vtime(st); ++ entity = bfq_first_active_entity(st); ++ BUG_ON(bfq_gt(entity->start, st->vtime)); ++ ++ /* ++ * If the chosen entity does not match with the sched_data's ++ * next_in_service and we are forcedly serving the IDLE priority ++ * class tree, bubble up budget update. ++ */ ++ if (unlikely(force && entity != entity->sched_data->next_in_service)) { ++ new_next_in_service = entity; ++ for_each_entity(new_next_in_service) ++ bfq_update_budget(new_next_in_service); ++ } ++ ++ return entity; ++} ++ ++/** ++ * bfq_lookup_next_entity - return the first eligible entity in @sd. ++ * @sd: the sched_data. ++ * @extract: if true the returned entity will be also extracted from @sd. ++ * ++ * NOTE: since we cache the next_in_service entity at each level of the ++ * hierarchy, the complexity of the lookup can be decreased with ++ * absolutely no effort just returning the cached next_in_service value; ++ * we prefer to do full lookups to test the consistency of * the data ++ * structures. ++ */ ++static struct bfq_entity *bfq_lookup_next_entity(struct bfq_sched_data *sd, ++ int extract, ++ struct bfq_data *bfqd) ++{ ++ struct bfq_service_tree *st = sd->service_tree; ++ struct bfq_entity *entity; ++ int i = 0; ++ ++ BUG_ON(sd->in_service_entity != NULL); ++ ++ if (bfqd != NULL && ++ jiffies - bfqd->bfq_class_idle_last_service > BFQ_CL_IDLE_TIMEOUT) { ++ entity = __bfq_lookup_next_entity(st + BFQ_IOPRIO_CLASSES - 1, ++ true); ++ if (entity != NULL) { ++ i = BFQ_IOPRIO_CLASSES - 1; ++ bfqd->bfq_class_idle_last_service = jiffies; ++ sd->next_in_service = entity; ++ } ++ } ++ for (; i < BFQ_IOPRIO_CLASSES; i++) { ++ entity = __bfq_lookup_next_entity(st + i, false); ++ if (entity != NULL) { ++ if (extract) { ++ bfq_check_next_in_service(sd, entity); ++ bfq_active_extract(st + i, entity); ++ sd->in_service_entity = entity; ++ sd->next_in_service = NULL; ++ } ++ break; ++ } ++ } ++ ++ return entity; ++} ++ ++/* ++ * Get next queue for service. ++ */ ++static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd) ++{ ++ struct bfq_entity *entity = NULL; ++ struct bfq_sched_data *sd; ++ struct bfq_queue *bfqq; ++ ++ BUG_ON(bfqd->in_service_queue != NULL); ++ ++ if (bfqd->busy_queues == 0) ++ return NULL; ++ ++ sd = &bfqd->root_group->sched_data; ++ for (; sd != NULL; sd = entity->my_sched_data) { ++ entity = bfq_lookup_next_entity(sd, 1, bfqd); ++ BUG_ON(entity == NULL); ++ entity->service = 0; ++ } ++ ++ bfqq = bfq_entity_to_bfqq(entity); ++ BUG_ON(bfqq == NULL); ++ ++ return bfqq; ++} ++ ++/* ++ * Forced extraction of the given queue. ++ */ ++static void bfq_get_next_queue_forced(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity; ++ struct bfq_sched_data *sd; ++ ++ BUG_ON(bfqd->in_service_queue != NULL); ++ ++ entity = &bfqq->entity; ++ /* ++ * Bubble up extraction/update from the leaf to the root. ++ */ ++ for_each_entity(entity) { ++ sd = entity->sched_data; ++ bfq_update_budget(entity); ++ bfq_update_vtime(bfq_entity_service_tree(entity)); ++ bfq_active_extract(bfq_entity_service_tree(entity), entity); ++ sd->in_service_entity = entity; ++ sd->next_in_service = NULL; ++ entity->service = 0; ++ } ++ ++ return; ++} ++ ++static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd) ++{ ++ if (bfqd->in_service_bic != NULL) { ++ put_io_context(bfqd->in_service_bic->icq.ioc); ++ bfqd->in_service_bic = NULL; ++ } ++ ++ bfqd->in_service_queue = NULL; ++ del_timer(&bfqd->idle_slice_timer); ++} ++ ++static void bfq_deactivate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ int requeue) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ if (bfqq == bfqd->in_service_queue) ++ __bfq_bfqd_reset_in_service(bfqd); ++ ++ bfq_deactivate_entity(entity, requeue); ++} ++ ++static void bfq_activate_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ struct bfq_entity *entity = &bfqq->entity; ++ ++ bfq_activate_entity(entity); ++} ++ ++/* ++ * Called when the bfqq no longer has requests pending, remove it from ++ * the service tree. ++ */ ++static void bfq_del_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ int requeue) ++{ ++ BUG_ON(!bfq_bfqq_busy(bfqq)); ++ BUG_ON(!RB_EMPTY_ROOT(&bfqq->sort_list)); ++ ++ bfq_log_bfqq(bfqd, bfqq, "del from busy"); ++ ++ bfq_clear_bfqq_busy(bfqq); ++ ++ BUG_ON(bfqd->busy_queues == 0); ++ bfqd->busy_queues--; ++ ++ if (!bfqq->dispatched) { ++ bfq_weights_tree_remove(bfqd, &bfqq->entity, ++ &bfqd->queue_weights_tree); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ BUG_ON(!bfqd->busy_in_flight_queues); ++ bfqd->busy_in_flight_queues--; ++ if (bfq_bfqq_constantly_seeky(bfqq)) { ++ BUG_ON(!bfqd-> ++ const_seeky_busy_in_flight_queues); ++ bfqd->const_seeky_busy_in_flight_queues--; ++ } ++ } ++ } ++ if (bfqq->wr_coeff > 1) ++ bfqd->wr_busy_queues--; ++ ++ bfq_deactivate_bfqq(bfqd, bfqq, requeue); ++} ++ ++/* ++ * Called when an inactive queue receives a new request. ++ */ ++static void bfq_add_bfqq_busy(struct bfq_data *bfqd, struct bfq_queue *bfqq) ++{ ++ BUG_ON(bfq_bfqq_busy(bfqq)); ++ BUG_ON(bfqq == bfqd->in_service_queue); ++ ++ bfq_log_bfqq(bfqd, bfqq, "add to busy"); ++ ++ bfq_activate_bfqq(bfqd, bfqq); ++ ++ bfq_mark_bfqq_busy(bfqq); ++ bfqd->busy_queues++; ++ ++ if (!bfqq->dispatched) { ++ if (bfqq->wr_coeff == 1) ++ bfq_weights_tree_add(bfqd, &bfqq->entity, ++ &bfqd->queue_weights_tree); ++ if (!blk_queue_nonrot(bfqd->queue)) { ++ bfqd->busy_in_flight_queues++; ++ if (bfq_bfqq_constantly_seeky(bfqq)) ++ bfqd->const_seeky_busy_in_flight_queues++; ++ } ++ } ++ if (bfqq->wr_coeff > 1) ++ bfqd->wr_busy_queues++; ++} +diff --git a/block/bfq.h b/block/bfq.h +new file mode 100644 +index 0000000..3c5d85e +--- /dev/null ++++ b/block/bfq.h +@@ -0,0 +1,775 @@ ++/* ++ * BFQ-v7r7 for 3.19.0: data structures and common functions prototypes. ++ * ++ * Based on ideas and code from CFQ: ++ * Copyright (C) 2003 Jens Axboe ++ * ++ * Copyright (C) 2008 Fabio Checconi ++ * Paolo Valente ++ * ++ * Copyright (C) 2010 Paolo Valente ++ */ ++ ++#ifndef _BFQ_H ++#define _BFQ_H ++ ++#include ++#include ++#include ++#include ++ ++#define BFQ_IOPRIO_CLASSES 3 ++#define BFQ_CL_IDLE_TIMEOUT (HZ/5) ++ ++#define BFQ_MIN_WEIGHT 1 ++#define BFQ_MAX_WEIGHT 1000 ++ ++#define BFQ_DEFAULT_QUEUE_IOPRIO 4 ++ ++#define BFQ_DEFAULT_GRP_WEIGHT 10 ++#define BFQ_DEFAULT_GRP_IOPRIO 0 ++#define BFQ_DEFAULT_GRP_CLASS IOPRIO_CLASS_BE ++ ++struct bfq_entity; ++ ++/** ++ * struct bfq_service_tree - per ioprio_class service tree. ++ * @active: tree for active entities (i.e., those backlogged). ++ * @idle: tree for idle entities (i.e., those not backlogged, with V <= F_i). ++ * @first_idle: idle entity with minimum F_i. ++ * @last_idle: idle entity with maximum F_i. ++ * @vtime: scheduler virtual time. ++ * @wsum: scheduler weight sum; active and idle entities contribute to it. ++ * ++ * Each service tree represents a B-WF2Q+ scheduler on its own. Each ++ * ioprio_class has its own independent scheduler, and so its own ++ * bfq_service_tree. All the fields are protected by the queue lock ++ * of the containing bfqd. ++ */ ++struct bfq_service_tree { ++ struct rb_root active; ++ struct rb_root idle; ++ ++ struct bfq_entity *first_idle; ++ struct bfq_entity *last_idle; ++ ++ u64 vtime; ++ unsigned long wsum; ++}; ++ ++/** ++ * struct bfq_sched_data - multi-class scheduler. ++ * @in_service_entity: entity in service. ++ * @next_in_service: head-of-the-line entity in the scheduler. ++ * @service_tree: array of service trees, one per ioprio_class. ++ * ++ * bfq_sched_data is the basic scheduler queue. It supports three ++ * ioprio_classes, and can be used either as a toplevel queue or as ++ * an intermediate queue on a hierarchical setup. ++ * @next_in_service points to the active entity of the sched_data ++ * service trees that will be scheduled next. ++ * ++ * The supported ioprio_classes are the same as in CFQ, in descending ++ * priority order, IOPRIO_CLASS_RT, IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE. ++ * Requests from higher priority queues are served before all the ++ * requests from lower priority queues; among requests of the same ++ * queue requests are served according to B-WF2Q+. ++ * All the fields are protected by the queue lock of the containing bfqd. ++ */ ++struct bfq_sched_data { ++ struct bfq_entity *in_service_entity; ++ struct bfq_entity *next_in_service; ++ struct bfq_service_tree service_tree[BFQ_IOPRIO_CLASSES]; ++}; ++ ++/** ++ * struct bfq_weight_counter - counter of the number of all active entities ++ * with a given weight. ++ * @weight: weight of the entities that this counter refers to. ++ * @num_active: number of active entities with this weight. ++ * @weights_node: weights tree member (see bfq_data's @queue_weights_tree ++ * and @group_weights_tree). ++ */ ++struct bfq_weight_counter { ++ short int weight; ++ unsigned int num_active; ++ struct rb_node weights_node; ++}; ++ ++/** ++ * struct bfq_entity - schedulable entity. ++ * @rb_node: service_tree member. ++ * @weight_counter: pointer to the weight counter associated with this entity. ++ * @on_st: flag, true if the entity is on a tree (either the active or ++ * the idle one of its service_tree). ++ * @finish: B-WF2Q+ finish timestamp (aka F_i). ++ * @start: B-WF2Q+ start timestamp (aka S_i). ++ * @tree: tree the entity is enqueued into; %NULL if not on a tree. ++ * @min_start: minimum start time of the (active) subtree rooted at ++ * this entity; used for O(log N) lookups into active trees. ++ * @service: service received during the last round of service. ++ * @budget: budget used to calculate F_i; F_i = S_i + @budget / @weight. ++ * @weight: weight of the queue ++ * @parent: parent entity, for hierarchical scheduling. ++ * @my_sched_data: for non-leaf nodes in the cgroup hierarchy, the ++ * associated scheduler queue, %NULL on leaf nodes. ++ * @sched_data: the scheduler queue this entity belongs to. ++ * @ioprio: the ioprio in use. ++ * @new_weight: when a weight change is requested, the new weight value. ++ * @orig_weight: original weight, used to implement weight boosting ++ * @new_ioprio: when an ioprio change is requested, the new ioprio value. ++ * @ioprio_class: the ioprio_class in use. ++ * @new_ioprio_class: when an ioprio_class change is requested, the new ++ * ioprio_class value. ++ * @ioprio_changed: flag, true when the user requested a weight, ioprio or ++ * ioprio_class change. ++ * ++ * A bfq_entity is used to represent either a bfq_queue (leaf node in the ++ * cgroup hierarchy) or a bfq_group into the upper level scheduler. Each ++ * entity belongs to the sched_data of the parent group in the cgroup ++ * hierarchy. Non-leaf entities have also their own sched_data, stored ++ * in @my_sched_data. ++ * ++ * Each entity stores independently its priority values; this would ++ * allow different weights on different devices, but this ++ * functionality is not exported to userspace by now. Priorities and ++ * weights are updated lazily, first storing the new values into the ++ * new_* fields, then setting the @ioprio_changed flag. As soon as ++ * there is a transition in the entity state that allows the priority ++ * update to take place the effective and the requested priority ++ * values are synchronized. ++ * ++ * Unless cgroups are used, the weight value is calculated from the ++ * ioprio to export the same interface as CFQ. When dealing with ++ * ``well-behaved'' queues (i.e., queues that do not spend too much ++ * time to consume their budget and have true sequential behavior, and ++ * when there are no external factors breaking anticipation) the ++ * relative weights at each level of the cgroups hierarchy should be ++ * guaranteed. All the fields are protected by the queue lock of the ++ * containing bfqd. ++ */ ++struct bfq_entity { ++ struct rb_node rb_node; ++ struct bfq_weight_counter *weight_counter; ++ ++ int on_st; ++ ++ u64 finish; ++ u64 start; ++ ++ struct rb_root *tree; ++ ++ u64 min_start; ++ ++ unsigned long service, budget; ++ unsigned short weight, new_weight; ++ unsigned short orig_weight; ++ ++ struct bfq_entity *parent; ++ ++ struct bfq_sched_data *my_sched_data; ++ struct bfq_sched_data *sched_data; ++ ++ unsigned short ioprio, new_ioprio; ++ unsigned short ioprio_class, new_ioprio_class; ++ ++ int ioprio_changed; ++}; ++ ++struct bfq_group; ++ ++/** ++ * struct bfq_queue - leaf schedulable entity. ++ * @ref: reference counter. ++ * @bfqd: parent bfq_data. ++ * @new_bfqq: shared bfq_queue if queue is cooperating with ++ * one or more other queues. ++ * @pos_node: request-position tree member (see bfq_data's @rq_pos_tree). ++ * @pos_root: request-position tree root (see bfq_data's @rq_pos_tree). ++ * @sort_list: sorted list of pending requests. ++ * @next_rq: if fifo isn't expired, next request to serve. ++ * @queued: nr of requests queued in @sort_list. ++ * @allocated: currently allocated requests. ++ * @meta_pending: pending metadata requests. ++ * @fifo: fifo list of requests in sort_list. ++ * @entity: entity representing this queue in the scheduler. ++ * @max_budget: maximum budget allowed from the feedback mechanism. ++ * @budget_timeout: budget expiration (in jiffies). ++ * @dispatched: number of requests on the dispatch list or inside driver. ++ * @flags: status flags. ++ * @bfqq_list: node for active/idle bfqq list inside our bfqd. ++ * @burst_list_node: node for the device's burst list. ++ * @seek_samples: number of seeks sampled ++ * @seek_total: sum of the distances of the seeks sampled ++ * @seek_mean: mean seek distance ++ * @last_request_pos: position of the last request enqueued ++ * @requests_within_timer: number of consecutive pairs of request completion ++ * and arrival, such that the queue becomes idle ++ * after the completion, but the next request arrives ++ * within an idle time slice; used only if the queue's ++ * IO_bound has been cleared. ++ * @pid: pid of the process owning the queue, used for logging purposes. ++ * @last_wr_start_finish: start time of the current weight-raising period if ++ * the @bfq-queue is being weight-raised, otherwise ++ * finish time of the last weight-raising period ++ * @wr_cur_max_time: current max raising time for this queue ++ * @soft_rt_next_start: minimum time instant such that, only if a new ++ * request is enqueued after this time instant in an ++ * idle @bfq_queue with no outstanding requests, then ++ * the task associated with the queue it is deemed as ++ * soft real-time (see the comments to the function ++ * bfq_bfqq_softrt_next_start()). ++ * @last_idle_bklogged: time of the last transition of the @bfq_queue from ++ * idle to backlogged ++ * @service_from_backlogged: cumulative service received from the @bfq_queue ++ * since the last transition from idle to ++ * backlogged ++ * ++ * A bfq_queue is a leaf request queue; it can be associated with an io_context ++ * or more, if it is async or shared between cooperating processes. @cgroup ++ * holds a reference to the cgroup, to be sure that it does not disappear while ++ * a bfqq still references it (mostly to avoid races between request issuing and ++ * task migration followed by cgroup destruction). ++ * All the fields are protected by the queue lock of the containing bfqd. ++ */ ++struct bfq_queue { ++ atomic_t ref; ++ struct bfq_data *bfqd; ++ ++ /* fields for cooperating queues handling */ ++ struct bfq_queue *new_bfqq; ++ struct rb_node pos_node; ++ struct rb_root *pos_root; ++ ++ struct rb_root sort_list; ++ struct request *next_rq; ++ int queued[2]; ++ int allocated[2]; ++ int meta_pending; ++ struct list_head fifo; ++ ++ struct bfq_entity entity; ++ ++ unsigned long max_budget; ++ unsigned long budget_timeout; ++ ++ int dispatched; ++ ++ unsigned int flags; ++ ++ struct list_head bfqq_list; ++ ++ struct hlist_node burst_list_node; ++ ++ unsigned int seek_samples; ++ u64 seek_total; ++ sector_t seek_mean; ++ sector_t last_request_pos; ++ ++ unsigned int requests_within_timer; ++ ++ pid_t pid; ++ ++ /* weight-raising fields */ ++ unsigned long wr_cur_max_time; ++ unsigned long soft_rt_next_start; ++ unsigned long last_wr_start_finish; ++ unsigned int wr_coeff; ++ unsigned long last_idle_bklogged; ++ unsigned long service_from_backlogged; ++}; ++ ++/** ++ * struct bfq_ttime - per process thinktime stats. ++ * @ttime_total: total process thinktime ++ * @ttime_samples: number of thinktime samples ++ * @ttime_mean: average process thinktime ++ */ ++struct bfq_ttime { ++ unsigned long last_end_request; ++ ++ unsigned long ttime_total; ++ unsigned long ttime_samples; ++ unsigned long ttime_mean; ++}; ++ ++/** ++ * struct bfq_io_cq - per (request_queue, io_context) structure. ++ * @icq: associated io_cq structure ++ * @bfqq: array of two process queues, the sync and the async ++ * @ttime: associated @bfq_ttime struct ++ */ ++struct bfq_io_cq { ++ struct io_cq icq; /* must be the first member */ ++ struct bfq_queue *bfqq[2]; ++ struct bfq_ttime ttime; ++ int ioprio; ++}; ++ ++enum bfq_device_speed { ++ BFQ_BFQD_FAST, ++ BFQ_BFQD_SLOW, ++}; ++ ++/** ++ * struct bfq_data - per device data structure. ++ * @queue: request queue for the managed device. ++ * @root_group: root bfq_group for the device. ++ * @rq_pos_tree: rbtree sorted by next_request position, used when ++ * determining if two or more queues have interleaving ++ * requests (see bfq_close_cooperator()). ++ * @active_numerous_groups: number of bfq_groups containing more than one ++ * active @bfq_entity. ++ * @queue_weights_tree: rbtree of weight counters of @bfq_queues, sorted by ++ * weight. Used to keep track of whether all @bfq_queues ++ * have the same weight. The tree contains one counter ++ * for each distinct weight associated to some active ++ * and not weight-raised @bfq_queue (see the comments to ++ * the functions bfq_weights_tree_[add|remove] for ++ * further details). ++ * @group_weights_tree: rbtree of non-queue @bfq_entity weight counters, sorted ++ * by weight. Used to keep track of whether all ++ * @bfq_groups have the same weight. The tree contains ++ * one counter for each distinct weight associated to ++ * some active @bfq_group (see the comments to the ++ * functions bfq_weights_tree_[add|remove] for further ++ * details). ++ * @busy_queues: number of bfq_queues containing requests (including the ++ * queue in service, even if it is idling). ++ * @busy_in_flight_queues: number of @bfq_queues containing pending or ++ * in-flight requests, plus the @bfq_queue in ++ * service, even if idle but waiting for the ++ * possible arrival of its next sync request. This ++ * field is updated only if the device is rotational, ++ * but used only if the device is also NCQ-capable. ++ * The reason why the field is updated also for non- ++ * NCQ-capable rotational devices is related to the ++ * fact that the value of @hw_tag may be set also ++ * later than when busy_in_flight_queues may need to ++ * be incremented for the first time(s). Taking also ++ * this possibility into account, to avoid unbalanced ++ * increments/decrements, would imply more overhead ++ * than just updating busy_in_flight_queues ++ * regardless of the value of @hw_tag. ++ * @const_seeky_busy_in_flight_queues: number of constantly-seeky @bfq_queues ++ * (that is, seeky queues that expired ++ * for budget timeout at least once) ++ * containing pending or in-flight ++ * requests, including the in-service ++ * @bfq_queue if constantly seeky. This ++ * field is updated only if the device ++ * is rotational, but used only if the ++ * device is also NCQ-capable (see the ++ * comments to @busy_in_flight_queues). ++ * @wr_busy_queues: number of weight-raised busy @bfq_queues. ++ * @queued: number of queued requests. ++ * @rq_in_driver: number of requests dispatched and waiting for completion. ++ * @sync_flight: number of sync requests in the driver. ++ * @max_rq_in_driver: max number of reqs in driver in the last ++ * @hw_tag_samples completed requests. ++ * @hw_tag_samples: nr of samples used to calculate hw_tag. ++ * @hw_tag: flag set to one if the driver is showing a queueing behavior. ++ * @budgets_assigned: number of budgets assigned. ++ * @idle_slice_timer: timer set when idling for the next sequential request ++ * from the queue in service. ++ * @unplug_work: delayed work to restart dispatching on the request queue. ++ * @in_service_queue: bfq_queue in service. ++ * @in_service_bic: bfq_io_cq (bic) associated with the @in_service_queue. ++ * @last_position: on-disk position of the last served request. ++ * @last_budget_start: beginning of the last budget. ++ * @last_idling_start: beginning of the last idle slice. ++ * @peak_rate: peak transfer rate observed for a budget. ++ * @peak_rate_samples: number of samples used to calculate @peak_rate. ++ * @bfq_max_budget: maximum budget allotted to a bfq_queue before ++ * rescheduling. ++ * @group_list: list of all the bfq_groups active on the device. ++ * @active_list: list of all the bfq_queues active on the device. ++ * @idle_list: list of all the bfq_queues idle on the device. ++ * @bfq_quantum: max number of requests dispatched per dispatch round. ++ * @bfq_fifo_expire: timeout for async/sync requests; when it expires ++ * requests are served in fifo order. ++ * @bfq_back_penalty: weight of backward seeks wrt forward ones. ++ * @bfq_back_max: maximum allowed backward seek. ++ * @bfq_slice_idle: maximum idling time. ++ * @bfq_user_max_budget: user-configured max budget value ++ * (0 for auto-tuning). ++ * @bfq_max_budget_async_rq: maximum budget (in nr of requests) allotted to ++ * async queues. ++ * @bfq_timeout: timeout for bfq_queues to consume their budget; used to ++ * to prevent seeky queues to impose long latencies to well ++ * behaved ones (this also implies that seeky queues cannot ++ * receive guarantees in the service domain; after a timeout ++ * they are charged for the whole allocated budget, to try ++ * to preserve a behavior reasonably fair among them, but ++ * without service-domain guarantees). ++ * @bfq_coop_thresh: number of queue merges after which a @bfq_queue is ++ * no more granted any weight-raising. ++ * @bfq_failed_cooperations: number of consecutive failed cooperation ++ * chances after which weight-raising is restored ++ * to a queue subject to more than bfq_coop_thresh ++ * queue merges. ++ * @bfq_requests_within_timer: number of consecutive requests that must be ++ * issued within the idle time slice to set ++ * again idling to a queue which was marked as ++ * non-I/O-bound (see the definition of the ++ * IO_bound flag for further details). ++ * @last_ins_in_burst: last time at which a queue entered the current ++ * burst of queues being activated shortly after ++ * each other; for more details about this and the ++ * following parameters related to a burst of ++ * activations, see the comments to the function ++ * @bfq_handle_burst. ++ * @bfq_burst_interval: reference time interval used to decide whether a ++ * queue has been activated shortly after ++ * @last_ins_in_burst. ++ * @burst_size: number of queues in the current burst of queue activations. ++ * @bfq_large_burst_thresh: maximum burst size above which the current ++ * queue-activation burst is deemed as 'large'. ++ * @large_burst: true if a large queue-activation burst is in progress. ++ * @burst_list: head of the burst list (as for the above fields, more details ++ * in the comments to the function bfq_handle_burst). ++ * @low_latency: if set to true, low-latency heuristics are enabled. ++ * @bfq_wr_coeff: maximum factor by which the weight of a weight-raised ++ * queue is multiplied. ++ * @bfq_wr_max_time: maximum duration of a weight-raising period (jiffies). ++ * @bfq_wr_rt_max_time: maximum duration for soft real-time processes. ++ * @bfq_wr_min_idle_time: minimum idle period after which weight-raising ++ * may be reactivated for a queue (in jiffies). ++ * @bfq_wr_min_inter_arr_async: minimum period between request arrivals ++ * after which weight-raising may be ++ * reactivated for an already busy queue ++ * (in jiffies). ++ * @bfq_wr_max_softrt_rate: max service-rate for a soft real-time queue, ++ * sectors per seconds. ++ * @RT_prod: cached value of the product R*T used for computing the maximum ++ * duration of the weight raising automatically. ++ * @device_speed: device-speed class for the low-latency heuristic. ++ * @oom_bfqq: fallback dummy bfqq for extreme OOM conditions. ++ * ++ * All the fields are protected by the @queue lock. ++ */ ++struct bfq_data { ++ struct request_queue *queue; ++ ++ struct bfq_group *root_group; ++ struct rb_root rq_pos_tree; ++ ++#ifdef CONFIG_CGROUP_BFQIO ++ int active_numerous_groups; ++#endif ++ ++ struct rb_root queue_weights_tree; ++ struct rb_root group_weights_tree; ++ ++ int busy_queues; ++ int busy_in_flight_queues; ++ int const_seeky_busy_in_flight_queues; ++ int wr_busy_queues; ++ int queued; ++ int rq_in_driver; ++ int sync_flight; ++ ++ int max_rq_in_driver; ++ int hw_tag_samples; ++ int hw_tag; ++ ++ int budgets_assigned; ++ ++ struct timer_list idle_slice_timer; ++ struct work_struct unplug_work; ++ ++ struct bfq_queue *in_service_queue; ++ struct bfq_io_cq *in_service_bic; ++ ++ sector_t last_position; ++ ++ ktime_t last_budget_start; ++ ktime_t last_idling_start; ++ int peak_rate_samples; ++ u64 peak_rate; ++ unsigned long bfq_max_budget; ++ ++ struct hlist_head group_list; ++ struct list_head active_list; ++ struct list_head idle_list; ++ ++ unsigned int bfq_quantum; ++ unsigned int bfq_fifo_expire[2]; ++ unsigned int bfq_back_penalty; ++ unsigned int bfq_back_max; ++ unsigned int bfq_slice_idle; ++ u64 bfq_class_idle_last_service; ++ ++ unsigned int bfq_user_max_budget; ++ unsigned int bfq_max_budget_async_rq; ++ unsigned int bfq_timeout[2]; ++ ++ unsigned int bfq_coop_thresh; ++ unsigned int bfq_failed_cooperations; ++ unsigned int bfq_requests_within_timer; ++ ++ unsigned long last_ins_in_burst; ++ unsigned long bfq_burst_interval; ++ int burst_size; ++ unsigned long bfq_large_burst_thresh; ++ bool large_burst; ++ struct hlist_head burst_list; ++ ++ bool low_latency; ++ ++ /* parameters of the low_latency heuristics */ ++ unsigned int bfq_wr_coeff; ++ unsigned int bfq_wr_max_time; ++ unsigned int bfq_wr_rt_max_time; ++ unsigned int bfq_wr_min_idle_time; ++ unsigned long bfq_wr_min_inter_arr_async; ++ unsigned int bfq_wr_max_softrt_rate; ++ u64 RT_prod; ++ enum bfq_device_speed device_speed; ++ ++ struct bfq_queue oom_bfqq; ++}; ++ ++enum bfqq_state_flags { ++ BFQ_BFQQ_FLAG_busy = 0, /* has requests or is in service */ ++ BFQ_BFQQ_FLAG_wait_request, /* waiting for a request */ ++ BFQ_BFQQ_FLAG_must_alloc, /* must be allowed rq alloc */ ++ BFQ_BFQQ_FLAG_fifo_expire, /* FIFO checked in this slice */ ++ BFQ_BFQQ_FLAG_idle_window, /* slice idling enabled */ ++ BFQ_BFQQ_FLAG_prio_changed, /* task priority has changed */ ++ BFQ_BFQQ_FLAG_sync, /* synchronous queue */ ++ BFQ_BFQQ_FLAG_budget_new, /* no completion with this budget */ ++ BFQ_BFQQ_FLAG_IO_bound, /* ++ * bfqq has timed-out at least once ++ * having consumed at most 2/10 of ++ * its budget ++ */ ++ BFQ_BFQQ_FLAG_in_large_burst, /* ++ * bfqq activated in a large burst, ++ * see comments to bfq_handle_burst. ++ */ ++ BFQ_BFQQ_FLAG_constantly_seeky, /* ++ * bfqq has proved to be slow and ++ * seeky until budget timeout ++ */ ++ BFQ_BFQQ_FLAG_softrt_update, /* ++ * may need softrt-next-start ++ * update ++ */ ++ BFQ_BFQQ_FLAG_coop, /* bfqq is shared */ ++ BFQ_BFQQ_FLAG_split_coop, /* shared bfqq will be splitted */ ++}; ++ ++#define BFQ_BFQQ_FNS(name) \ ++static inline void bfq_mark_bfqq_##name(struct bfq_queue *bfqq) \ ++{ \ ++ (bfqq)->flags |= (1 << BFQ_BFQQ_FLAG_##name); \ ++} \ ++static inline void bfq_clear_bfqq_##name(struct bfq_queue *bfqq) \ ++{ \ ++ (bfqq)->flags &= ~(1 << BFQ_BFQQ_FLAG_##name); \ ++} \ ++static inline int bfq_bfqq_##name(const struct bfq_queue *bfqq) \ ++{ \ ++ return ((bfqq)->flags & (1 << BFQ_BFQQ_FLAG_##name)) != 0; \ ++} ++ ++BFQ_BFQQ_FNS(busy); ++BFQ_BFQQ_FNS(wait_request); ++BFQ_BFQQ_FNS(must_alloc); ++BFQ_BFQQ_FNS(fifo_expire); ++BFQ_BFQQ_FNS(idle_window); ++BFQ_BFQQ_FNS(prio_changed); ++BFQ_BFQQ_FNS(sync); ++BFQ_BFQQ_FNS(budget_new); ++BFQ_BFQQ_FNS(IO_bound); ++BFQ_BFQQ_FNS(in_large_burst); ++BFQ_BFQQ_FNS(constantly_seeky); ++BFQ_BFQQ_FNS(coop); ++BFQ_BFQQ_FNS(split_coop); ++BFQ_BFQQ_FNS(softrt_update); ++#undef BFQ_BFQQ_FNS ++ ++/* Logging facilities. */ ++#define bfq_log_bfqq(bfqd, bfqq, fmt, args...) \ ++ blk_add_trace_msg((bfqd)->queue, "bfq%d " fmt, (bfqq)->pid, ##args) ++ ++#define bfq_log(bfqd, fmt, args...) \ ++ blk_add_trace_msg((bfqd)->queue, "bfq " fmt, ##args) ++ ++/* Expiration reasons. */ ++enum bfqq_expiration { ++ BFQ_BFQQ_TOO_IDLE = 0, /* ++ * queue has been idling for ++ * too long ++ */ ++ BFQ_BFQQ_BUDGET_TIMEOUT, /* budget took too long to be used */ ++ BFQ_BFQQ_BUDGET_EXHAUSTED, /* budget consumed */ ++ BFQ_BFQQ_NO_MORE_REQUESTS, /* the queue has no more requests */ ++}; ++ ++#ifdef CONFIG_CGROUP_BFQIO ++/** ++ * struct bfq_group - per (device, cgroup) data structure. ++ * @entity: schedulable entity to insert into the parent group sched_data. ++ * @sched_data: own sched_data, to contain child entities (they may be ++ * both bfq_queues and bfq_groups). ++ * @group_node: node to be inserted into the bfqio_cgroup->group_data ++ * list of the containing cgroup's bfqio_cgroup. ++ * @bfqd_node: node to be inserted into the @bfqd->group_list list ++ * of the groups active on the same device; used for cleanup. ++ * @bfqd: the bfq_data for the device this group acts upon. ++ * @async_bfqq: array of async queues for all the tasks belonging to ++ * the group, one queue per ioprio value per ioprio_class, ++ * except for the idle class that has only one queue. ++ * @async_idle_bfqq: async queue for the idle class (ioprio is ignored). ++ * @my_entity: pointer to @entity, %NULL for the toplevel group; used ++ * to avoid too many special cases during group creation/ ++ * migration. ++ * @active_entities: number of active entities belonging to the group; ++ * unused for the root group. Used to know whether there ++ * are groups with more than one active @bfq_entity ++ * (see the comments to the function ++ * bfq_bfqq_must_not_expire()). ++ * ++ * Each (device, cgroup) pair has its own bfq_group, i.e., for each cgroup ++ * there is a set of bfq_groups, each one collecting the lower-level ++ * entities belonging to the group that are acting on the same device. ++ * ++ * Locking works as follows: ++ * o @group_node is protected by the bfqio_cgroup lock, and is accessed ++ * via RCU from its readers. ++ * o @bfqd is protected by the queue lock, RCU is used to access it ++ * from the readers. ++ * o All the other fields are protected by the @bfqd queue lock. ++ */ ++struct bfq_group { ++ struct bfq_entity entity; ++ struct bfq_sched_data sched_data; ++ ++ struct hlist_node group_node; ++ struct hlist_node bfqd_node; ++ ++ void *bfqd; ++ ++ struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR]; ++ struct bfq_queue *async_idle_bfqq; ++ ++ struct bfq_entity *my_entity; ++ ++ int active_entities; ++}; ++ ++/** ++ * struct bfqio_cgroup - bfq cgroup data structure. ++ * @css: subsystem state for bfq in the containing cgroup. ++ * @online: flag marked when the subsystem is inserted. ++ * @weight: cgroup weight. ++ * @ioprio: cgroup ioprio. ++ * @ioprio_class: cgroup ioprio_class. ++ * @lock: spinlock that protects @ioprio, @ioprio_class and @group_data. ++ * @group_data: list containing the bfq_group belonging to this cgroup. ++ * ++ * @group_data is accessed using RCU, with @lock protecting the updates, ++ * @ioprio and @ioprio_class are protected by @lock. ++ */ ++struct bfqio_cgroup { ++ struct cgroup_subsys_state css; ++ bool online; ++ ++ unsigned short weight, ioprio, ioprio_class; ++ ++ spinlock_t lock; ++ struct hlist_head group_data; ++}; ++#else ++struct bfq_group { ++ struct bfq_sched_data sched_data; ++ ++ struct bfq_queue *async_bfqq[2][IOPRIO_BE_NR]; ++ struct bfq_queue *async_idle_bfqq; ++}; ++#endif ++ ++static inline struct bfq_service_tree * ++bfq_entity_service_tree(struct bfq_entity *entity) ++{ ++ struct bfq_sched_data *sched_data = entity->sched_data; ++ unsigned int idx = entity->ioprio_class - 1; ++ ++ BUG_ON(idx >= BFQ_IOPRIO_CLASSES); ++ BUG_ON(sched_data == NULL); ++ ++ return sched_data->service_tree + idx; ++} ++ ++static inline struct bfq_queue *bic_to_bfqq(struct bfq_io_cq *bic, ++ bool is_sync) ++{ ++ return bic->bfqq[is_sync]; ++} ++ ++static inline void bic_set_bfqq(struct bfq_io_cq *bic, ++ struct bfq_queue *bfqq, bool is_sync) ++{ ++ bic->bfqq[is_sync] = bfqq; ++} ++ ++static inline struct bfq_data *bic_to_bfqd(struct bfq_io_cq *bic) ++{ ++ return bic->icq.q->elevator->elevator_data; ++} ++ ++/** ++ * bfq_get_bfqd_locked - get a lock to a bfqd using a RCU protected pointer. ++ * @ptr: a pointer to a bfqd. ++ * @flags: storage for the flags to be saved. ++ * ++ * This function allows bfqg->bfqd to be protected by the ++ * queue lock of the bfqd they reference; the pointer is dereferenced ++ * under RCU, so the storage for bfqd is assured to be safe as long ++ * as the RCU read side critical section does not end. After the ++ * bfqd->queue->queue_lock is taken the pointer is rechecked, to be ++ * sure that no other writer accessed it. If we raced with a writer, ++ * the function returns NULL, with the queue unlocked, otherwise it ++ * returns the dereferenced pointer, with the queue locked. ++ */ ++static inline struct bfq_data *bfq_get_bfqd_locked(void **ptr, ++ unsigned long *flags) ++{ ++ struct bfq_data *bfqd; ++ ++ rcu_read_lock(); ++ bfqd = rcu_dereference(*(struct bfq_data **)ptr); ++ ++ if (bfqd != NULL) { ++ spin_lock_irqsave(bfqd->queue->queue_lock, *flags); ++ if (*ptr == bfqd) ++ goto out; ++ spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags); ++ } ++ ++ bfqd = NULL; ++out: ++ rcu_read_unlock(); ++ return bfqd; ++} ++ ++static inline void bfq_put_bfqd_unlock(struct bfq_data *bfqd, ++ unsigned long *flags) ++{ ++ spin_unlock_irqrestore(bfqd->queue->queue_lock, *flags); ++} ++ ++static void bfq_changed_ioprio(struct bfq_io_cq *bic); ++static void bfq_put_queue(struct bfq_queue *bfqq); ++static void bfq_dispatch_insert(struct request_queue *q, struct request *rq); ++static struct bfq_queue *bfq_get_queue(struct bfq_data *bfqd, ++ struct bfq_group *bfqg, int is_sync, ++ struct bfq_io_cq *bic, gfp_t gfp_mask); ++static void bfq_end_wr_async_queues(struct bfq_data *bfqd, ++ struct bfq_group *bfqg); ++static void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg); ++static void bfq_exit_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq); ++ ++#endif /* _BFQ_H */ +-- +2.3.0 + diff --git a/kernel/kernel/files/patches/gentoo/5003_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r7-for-3.19.0.patch b/kernel/kernel/files/patches/gentoo/5003_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r7-for-3.19.0.patch new file mode 100644 index 00000000..b2e83e40 --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/5003_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r7-for-3.19.0.patch @@ -0,0 +1,1222 @@ +From 8308a96c0ba080015eb1c58a1bfbfbf1fee80fd6 Mon Sep 17 00:00:00 2001 +From: Mauro Andreolini +Date: Thu, 18 Dec 2014 21:32:08 +0100 +Subject: [PATCH 3/3] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r7 for + 3.19.0 + +A set of processes may happen to perform interleaved reads, i.e.,requests +whose union would give rise to a sequential read pattern. There are two +typical cases: in the first case, processes read fixed-size chunks of +data at a fixed distance from each other, while in the second case processes +may read variable-size chunks at variable distances. The latter case occurs +for example with QEMU, which splits the I/O generated by the guest into +multiple chunks, and lets these chunks be served by a pool of cooperating +processes, iteratively assigning the next chunk of I/O to the first +available process. CFQ uses actual queue merging for the first type of +rocesses, whereas it uses preemption to get a sequential read pattern out +of the read requests performed by the second type of processes. In the end +it uses two different mechanisms to achieve the same goal: boosting the +throughput with interleaved I/O. + +This patch introduces Early Queue Merge (EQM), a unified mechanism to get a +sequential read pattern with both types of processes. The main idea is +checking newly arrived requests against the next request of the active queue +both in case of actual request insert and in case of request merge. By doing +so, both the types of processes can be handled by just merging their queues. +EQM is then simpler and more compact than the pair of mechanisms used in +CFQ. + +Finally, EQM also preserves the typical low-latency properties of BFQ, by +properly restoring the weight-raising state of a queue when it gets back to +a non-merged state. + +Signed-off-by: Mauro Andreolini +Signed-off-by: Arianna Avanzini +Signed-off-by: Paolo Valente +--- + block/bfq-iosched.c | 751 +++++++++++++++++++++++++++++++++++++--------------- + block/bfq-sched.c | 28 -- + block/bfq.h | 54 +++- + 3 files changed, 581 insertions(+), 252 deletions(-) + +diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c +index 97ee934..328f33c 100644 +--- a/block/bfq-iosched.c ++++ b/block/bfq-iosched.c +@@ -571,6 +571,57 @@ static inline unsigned int bfq_wr_duration(struct bfq_data *bfqd) + return dur; + } + ++static inline unsigned ++bfq_bfqq_cooperations(struct bfq_queue *bfqq) ++{ ++ return bfqq->bic ? bfqq->bic->cooperations : 0; ++} ++ ++static inline void ++bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_io_cq *bic) ++{ ++ if (bic->saved_idle_window) ++ bfq_mark_bfqq_idle_window(bfqq); ++ else ++ bfq_clear_bfqq_idle_window(bfqq); ++ if (bic->saved_IO_bound) ++ bfq_mark_bfqq_IO_bound(bfqq); ++ else ++ bfq_clear_bfqq_IO_bound(bfqq); ++ /* Assuming that the flag in_large_burst is already correctly set */ ++ if (bic->wr_time_left && bfqq->bfqd->low_latency && ++ !bfq_bfqq_in_large_burst(bfqq) && ++ bic->cooperations < bfqq->bfqd->bfq_coop_thresh) { ++ /* ++ * Start a weight raising period with the duration given by ++ * the raising_time_left snapshot. ++ */ ++ if (bfq_bfqq_busy(bfqq)) ++ bfqq->bfqd->wr_busy_queues++; ++ bfqq->wr_coeff = bfqq->bfqd->bfq_wr_coeff; ++ bfqq->wr_cur_max_time = bic->wr_time_left; ++ bfqq->last_wr_start_finish = jiffies; ++ bfqq->entity.ioprio_changed = 1; ++ } ++ /* ++ * Clear wr_time_left to prevent bfq_bfqq_save_state() from ++ * getting confused about the queue's need of a weight-raising ++ * period. ++ */ ++ bic->wr_time_left = 0; ++} ++ ++/* Must be called with the queue_lock held. */ ++static int bfqq_process_refs(struct bfq_queue *bfqq) ++{ ++ int process_refs, io_refs; ++ ++ io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE]; ++ process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st; ++ BUG_ON(process_refs < 0); ++ return process_refs; ++} ++ + /* Empty burst list and add just bfqq (see comments to bfq_handle_burst) */ + static inline void bfq_reset_burst_list(struct bfq_data *bfqd, + struct bfq_queue *bfqq) +@@ -815,7 +866,7 @@ static void bfq_add_request(struct request *rq) + bfq_rq_pos_tree_add(bfqd, bfqq); + + if (!bfq_bfqq_busy(bfqq)) { +- bool soft_rt, ++ bool soft_rt, coop_or_in_burst, + idle_for_long_time = time_is_before_jiffies( + bfqq->budget_timeout + + bfqd->bfq_wr_min_idle_time); +@@ -839,11 +890,12 @@ static void bfq_add_request(struct request *rq) + bfqd->last_ins_in_burst = jiffies; + } + ++ coop_or_in_burst = bfq_bfqq_in_large_burst(bfqq) || ++ bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh; + soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && +- !bfq_bfqq_in_large_burst(bfqq) && ++ !coop_or_in_burst && + time_is_before_jiffies(bfqq->soft_rt_next_start); +- interactive = !bfq_bfqq_in_large_burst(bfqq) && +- idle_for_long_time; ++ interactive = !coop_or_in_burst && idle_for_long_time; + entity->budget = max_t(unsigned long, bfqq->max_budget, + bfq_serv_to_charge(next_rq, bfqq)); + +@@ -862,11 +914,20 @@ static void bfq_add_request(struct request *rq) + if (!bfqd->low_latency) + goto add_bfqq_busy; + ++ if (bfq_bfqq_just_split(bfqq)) ++ goto set_ioprio_changed; ++ + /* +- * If the queue is not being boosted and has been idle +- * for enough time, start a weight-raising period ++ * If the queue: ++ * - is not being boosted, ++ * - has been idle for enough time, ++ * - is not a sync queue or is linked to a bfq_io_cq (it is ++ * shared "for its nature" or it is not shared and its ++ * requests have not been redirected to a shared queue) ++ * start a weight-raising period. + */ +- if (old_wr_coeff == 1 && (interactive || soft_rt)) { ++ if (old_wr_coeff == 1 && (interactive || soft_rt) && ++ (!bfq_bfqq_sync(bfqq) || bfqq->bic != NULL)) { + bfqq->wr_coeff = bfqd->bfq_wr_coeff; + if (interactive) + bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); +@@ -880,7 +941,7 @@ static void bfq_add_request(struct request *rq) + } else if (old_wr_coeff > 1) { + if (interactive) + bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); +- else if (bfq_bfqq_in_large_burst(bfqq) || ++ else if (coop_or_in_burst || + (bfqq->wr_cur_max_time == + bfqd->bfq_wr_rt_max_time && + !soft_rt)) { +@@ -899,18 +960,18 @@ static void bfq_add_request(struct request *rq) + /* + * + * The remaining weight-raising time is lower +- * than bfqd->bfq_wr_rt_max_time, which +- * means that the application is enjoying +- * weight raising either because deemed soft- +- * rt in the near past, or because deemed +- * interactive a long ago. In both cases, +- * resetting now the current remaining weight- +- * raising time for the application to the +- * weight-raising duration for soft rt +- * applications would not cause any latency +- * increase for the application (as the new +- * duration would be higher than the remaining +- * time). ++ * than bfqd->bfq_wr_rt_max_time, which means ++ * that the application is enjoying weight ++ * raising either because deemed soft-rt in ++ * the near past, or because deemed interactive ++ * a long ago. ++ * In both cases, resetting now the current ++ * remaining weight-raising time for the ++ * application to the weight-raising duration ++ * for soft rt applications would not cause any ++ * latency increase for the application (as the ++ * new duration would be higher than the ++ * remaining time). + * + * In addition, the application is now meeting + * the requirements for being deemed soft rt. +@@ -945,6 +1006,7 @@ static void bfq_add_request(struct request *rq) + bfqd->bfq_wr_rt_max_time; + } + } ++set_ioprio_changed: + if (old_wr_coeff != bfqq->wr_coeff) + entity->ioprio_changed = 1; + add_bfqq_busy: +@@ -1156,90 +1218,35 @@ static void bfq_end_wr(struct bfq_data *bfqd) + spin_unlock_irq(bfqd->queue->queue_lock); + } + +-static int bfq_allow_merge(struct request_queue *q, struct request *rq, +- struct bio *bio) ++static inline sector_t bfq_io_struct_pos(void *io_struct, bool request) + { +- struct bfq_data *bfqd = q->elevator->elevator_data; +- struct bfq_io_cq *bic; +- struct bfq_queue *bfqq; +- +- /* +- * Disallow merge of a sync bio into an async request. +- */ +- if (bfq_bio_sync(bio) && !rq_is_sync(rq)) +- return 0; +- +- /* +- * Lookup the bfqq that this bio will be queued with. Allow +- * merge only if rq is queued there. +- * Queue lock is held here. +- */ +- bic = bfq_bic_lookup(bfqd, current->io_context); +- if (bic == NULL) +- return 0; +- +- bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio)); +- return bfqq == RQ_BFQQ(rq); +-} +- +-static void __bfq_set_in_service_queue(struct bfq_data *bfqd, +- struct bfq_queue *bfqq) +-{ +- if (bfqq != NULL) { +- bfq_mark_bfqq_must_alloc(bfqq); +- bfq_mark_bfqq_budget_new(bfqq); +- bfq_clear_bfqq_fifo_expire(bfqq); +- +- bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8; +- +- bfq_log_bfqq(bfqd, bfqq, +- "set_in_service_queue, cur-budget = %lu", +- bfqq->entity.budget); +- } +- +- bfqd->in_service_queue = bfqq; +-} +- +-/* +- * Get and set a new queue for service. +- */ +-static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd, +- struct bfq_queue *bfqq) +-{ +- if (!bfqq) +- bfqq = bfq_get_next_queue(bfqd); ++ if (request) ++ return blk_rq_pos(io_struct); + else +- bfq_get_next_queue_forced(bfqd, bfqq); +- +- __bfq_set_in_service_queue(bfqd, bfqq); +- return bfqq; ++ return ((struct bio *)io_struct)->bi_iter.bi_sector; + } + +-static inline sector_t bfq_dist_from_last(struct bfq_data *bfqd, +- struct request *rq) ++static inline sector_t bfq_dist_from(sector_t pos1, ++ sector_t pos2) + { +- if (blk_rq_pos(rq) >= bfqd->last_position) +- return blk_rq_pos(rq) - bfqd->last_position; ++ if (pos1 >= pos2) ++ return pos1 - pos2; + else +- return bfqd->last_position - blk_rq_pos(rq); ++ return pos2 - pos1; + } + +-/* +- * Return true if bfqq has no request pending and rq is close enough to +- * bfqd->last_position, or if rq is closer to bfqd->last_position than +- * bfqq->next_rq +- */ +-static inline int bfq_rq_close(struct bfq_data *bfqd, struct request *rq) ++static inline int bfq_rq_close_to_sector(void *io_struct, bool request, ++ sector_t sector) + { +- return bfq_dist_from_last(bfqd, rq) <= BFQQ_SEEK_THR; ++ return bfq_dist_from(bfq_io_struct_pos(io_struct, request), sector) <= ++ BFQQ_SEEK_THR; + } + +-static struct bfq_queue *bfqq_close(struct bfq_data *bfqd) ++static struct bfq_queue *bfqq_close(struct bfq_data *bfqd, sector_t sector) + { + struct rb_root *root = &bfqd->rq_pos_tree; + struct rb_node *parent, *node; + struct bfq_queue *__bfqq; +- sector_t sector = bfqd->last_position; + + if (RB_EMPTY_ROOT(root)) + return NULL; +@@ -1258,7 +1265,7 @@ static struct bfq_queue *bfqq_close(struct bfq_data *bfqd) + * next_request position). + */ + __bfqq = rb_entry(parent, struct bfq_queue, pos_node); +- if (bfq_rq_close(bfqd, __bfqq->next_rq)) ++ if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector)) + return __bfqq; + + if (blk_rq_pos(__bfqq->next_rq) < sector) +@@ -1269,7 +1276,7 @@ static struct bfq_queue *bfqq_close(struct bfq_data *bfqd) + return NULL; + + __bfqq = rb_entry(node, struct bfq_queue, pos_node); +- if (bfq_rq_close(bfqd, __bfqq->next_rq)) ++ if (bfq_rq_close_to_sector(__bfqq->next_rq, true, sector)) + return __bfqq; + + return NULL; +@@ -1278,14 +1285,12 @@ static struct bfq_queue *bfqq_close(struct bfq_data *bfqd) + /* + * bfqd - obvious + * cur_bfqq - passed in so that we don't decide that the current queue +- * is closely cooperating with itself. +- * +- * We are assuming that cur_bfqq has dispatched at least one request, +- * and that bfqd->last_position reflects a position on the disk associated +- * with the I/O issued by cur_bfqq. ++ * is closely cooperating with itself ++ * sector - used as a reference point to search for a close queue + */ + static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd, +- struct bfq_queue *cur_bfqq) ++ struct bfq_queue *cur_bfqq, ++ sector_t sector) + { + struct bfq_queue *bfqq; + +@@ -1305,7 +1310,7 @@ static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd, + * working closely on the same area of the disk. In that case, + * we can group them together and don't waste time idling. + */ +- bfqq = bfqq_close(bfqd); ++ bfqq = bfqq_close(bfqd, sector); + if (bfqq == NULL || bfqq == cur_bfqq) + return NULL; + +@@ -1332,6 +1337,315 @@ static struct bfq_queue *bfq_close_cooperator(struct bfq_data *bfqd, + return bfqq; + } + ++static struct bfq_queue * ++bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) ++{ ++ int process_refs, new_process_refs; ++ struct bfq_queue *__bfqq; ++ ++ /* ++ * If there are no process references on the new_bfqq, then it is ++ * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain ++ * may have dropped their last reference (not just their last process ++ * reference). ++ */ ++ if (!bfqq_process_refs(new_bfqq)) ++ return NULL; ++ ++ /* Avoid a circular list and skip interim queue merges. */ ++ while ((__bfqq = new_bfqq->new_bfqq)) { ++ if (__bfqq == bfqq) ++ return NULL; ++ new_bfqq = __bfqq; ++ } ++ ++ process_refs = bfqq_process_refs(bfqq); ++ new_process_refs = bfqq_process_refs(new_bfqq); ++ /* ++ * If the process for the bfqq has gone away, there is no ++ * sense in merging the queues. ++ */ ++ if (process_refs == 0 || new_process_refs == 0) ++ return NULL; ++ ++ bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d", ++ new_bfqq->pid); ++ ++ /* ++ * Merging is just a redirection: the requests of the process ++ * owning one of the two queues are redirected to the other queue. ++ * The latter queue, in its turn, is set as shared if this is the ++ * first time that the requests of some process are redirected to ++ * it. ++ * ++ * We redirect bfqq to new_bfqq and not the opposite, because we ++ * are in the context of the process owning bfqq, hence we have ++ * the io_cq of this process. So we can immediately configure this ++ * io_cq to redirect the requests of the process to new_bfqq. ++ * ++ * NOTE, even if new_bfqq coincides with the in-service queue, the ++ * io_cq of new_bfqq is not available, because, if the in-service ++ * queue is shared, bfqd->in_service_bic may not point to the ++ * io_cq of the in-service queue. ++ * Redirecting the requests of the process owning bfqq to the ++ * currently in-service queue is in any case the best option, as ++ * we feed the in-service queue with new requests close to the ++ * last request served and, by doing so, hopefully increase the ++ * throughput. ++ */ ++ bfqq->new_bfqq = new_bfqq; ++ atomic_add(process_refs, &new_bfqq->ref); ++ return new_bfqq; ++} ++ ++/* ++ * Attempt to schedule a merge of bfqq with the currently in-service queue ++ * or with a close queue among the scheduled queues. ++ * Return NULL if no merge was scheduled, a pointer to the shared bfq_queue ++ * structure otherwise. ++ * ++ * The OOM queue is not allowed to participate to cooperation: in fact, since ++ * the requests temporarily redirected to the OOM queue could be redirected ++ * again to dedicated queues at any time, the state needed to correctly ++ * handle merging with the OOM queue would be quite complex and expensive ++ * to maintain. Besides, in such a critical condition as an out of memory, ++ * the benefits of queue merging may be little relevant, or even negligible. ++ */ ++static struct bfq_queue * ++bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, ++ void *io_struct, bool request) ++{ ++ struct bfq_queue *in_service_bfqq, *new_bfqq; ++ ++ if (bfqq->new_bfqq) ++ return bfqq->new_bfqq; ++ ++ if (!io_struct || unlikely(bfqq == &bfqd->oom_bfqq)) ++ return NULL; ++ ++ in_service_bfqq = bfqd->in_service_queue; ++ ++ if (in_service_bfqq == NULL || in_service_bfqq == bfqq || ++ !bfqd->in_service_bic || ++ unlikely(in_service_bfqq == &bfqd->oom_bfqq)) ++ goto check_scheduled; ++ ++ if (bfq_class_idle(in_service_bfqq) || bfq_class_idle(bfqq)) ++ goto check_scheduled; ++ ++ if (bfq_class_rt(in_service_bfqq) != bfq_class_rt(bfqq)) ++ goto check_scheduled; ++ ++ if (in_service_bfqq->entity.parent != bfqq->entity.parent) ++ goto check_scheduled; ++ ++ if (bfq_rq_close_to_sector(io_struct, request, bfqd->last_position) && ++ bfq_bfqq_sync(in_service_bfqq) && bfq_bfqq_sync(bfqq)) { ++ new_bfqq = bfq_setup_merge(bfqq, in_service_bfqq); ++ if (new_bfqq != NULL) ++ return new_bfqq; /* Merge with in-service queue */ ++ } ++ ++ /* ++ * Check whether there is a cooperator among currently scheduled ++ * queues. The only thing we need is that the bio/request is not ++ * NULL, as we need it to establish whether a cooperator exists. ++ */ ++check_scheduled: ++ new_bfqq = bfq_close_cooperator(bfqd, bfqq, ++ bfq_io_struct_pos(io_struct, request)); ++ if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq)) ++ return bfq_setup_merge(bfqq, new_bfqq); ++ ++ return NULL; ++} ++ ++static inline void ++bfq_bfqq_save_state(struct bfq_queue *bfqq) ++{ ++ /* ++ * If bfqq->bic == NULL, the queue is already shared or its requests ++ * have already been redirected to a shared queue; both idle window ++ * and weight raising state have already been saved. Do nothing. ++ */ ++ if (bfqq->bic == NULL) ++ return; ++ if (bfqq->bic->wr_time_left) ++ /* ++ * This is the queue of a just-started process, and would ++ * deserve weight raising: we set wr_time_left to the full ++ * weight-raising duration to trigger weight-raising when ++ * and if the queue is split and the first request of the ++ * queue is enqueued. ++ */ ++ bfqq->bic->wr_time_left = bfq_wr_duration(bfqq->bfqd); ++ else if (bfqq->wr_coeff > 1) { ++ unsigned long wr_duration = ++ jiffies - bfqq->last_wr_start_finish; ++ /* ++ * It may happen that a queue's weight raising period lasts ++ * longer than its wr_cur_max_time, as weight raising is ++ * handled only when a request is enqueued or dispatched (it ++ * does not use any timer). If the weight raising period is ++ * about to end, don't save it. ++ */ ++ if (bfqq->wr_cur_max_time <= wr_duration) ++ bfqq->bic->wr_time_left = 0; ++ else ++ bfqq->bic->wr_time_left = ++ bfqq->wr_cur_max_time - wr_duration; ++ /* ++ * The bfq_queue is becoming shared or the requests of the ++ * process owning the queue are being redirected to a shared ++ * queue. Stop the weight raising period of the queue, as in ++ * both cases it should not be owned by an interactive or ++ * soft real-time application. ++ */ ++ bfq_bfqq_end_wr(bfqq); ++ } else ++ bfqq->bic->wr_time_left = 0; ++ bfqq->bic->saved_idle_window = bfq_bfqq_idle_window(bfqq); ++ bfqq->bic->saved_IO_bound = bfq_bfqq_IO_bound(bfqq); ++ bfqq->bic->saved_in_large_burst = bfq_bfqq_in_large_burst(bfqq); ++ bfqq->bic->was_in_burst_list = !hlist_unhashed(&bfqq->burst_list_node); ++ bfqq->bic->cooperations++; ++ bfqq->bic->failed_cooperations = 0; ++} ++ ++static inline void ++bfq_get_bic_reference(struct bfq_queue *bfqq) ++{ ++ /* ++ * If bfqq->bic has a non-NULL value, the bic to which it belongs ++ * is about to begin using a shared bfq_queue. ++ */ ++ if (bfqq->bic) ++ atomic_long_inc(&bfqq->bic->icq.ioc->refcount); ++} ++ ++static void ++bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic, ++ struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) ++{ ++ bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu", ++ (long unsigned)new_bfqq->pid); ++ /* Save weight raising and idle window of the merged queues */ ++ bfq_bfqq_save_state(bfqq); ++ bfq_bfqq_save_state(new_bfqq); ++ if (bfq_bfqq_IO_bound(bfqq)) ++ bfq_mark_bfqq_IO_bound(new_bfqq); ++ bfq_clear_bfqq_IO_bound(bfqq); ++ /* ++ * Grab a reference to the bic, to prevent it from being destroyed ++ * before being possibly touched by a bfq_split_bfqq(). ++ */ ++ bfq_get_bic_reference(bfqq); ++ bfq_get_bic_reference(new_bfqq); ++ /* ++ * Merge queues (that is, let bic redirect its requests to new_bfqq) ++ */ ++ bic_set_bfqq(bic, new_bfqq, 1); ++ bfq_mark_bfqq_coop(new_bfqq); ++ /* ++ * new_bfqq now belongs to at least two bics (it is a shared queue): ++ * set new_bfqq->bic to NULL. bfqq either: ++ * - does not belong to any bic any more, and hence bfqq->bic must ++ * be set to NULL, or ++ * - is a queue whose owning bics have already been redirected to a ++ * different queue, hence the queue is destined to not belong to ++ * any bic soon and bfqq->bic is already NULL (therefore the next ++ * assignment causes no harm). ++ */ ++ new_bfqq->bic = NULL; ++ bfqq->bic = NULL; ++ bfq_put_queue(bfqq); ++} ++ ++static inline void bfq_bfqq_increase_failed_cooperations(struct bfq_queue *bfqq) ++{ ++ struct bfq_io_cq *bic = bfqq->bic; ++ struct bfq_data *bfqd = bfqq->bfqd; ++ ++ if (bic && bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh) { ++ bic->failed_cooperations++; ++ if (bic->failed_cooperations >= bfqd->bfq_failed_cooperations) ++ bic->cooperations = 0; ++ } ++} ++ ++static int bfq_allow_merge(struct request_queue *q, struct request *rq, ++ struct bio *bio) ++{ ++ struct bfq_data *bfqd = q->elevator->elevator_data; ++ struct bfq_io_cq *bic; ++ struct bfq_queue *bfqq, *new_bfqq; ++ ++ /* ++ * Disallow merge of a sync bio into an async request. ++ */ ++ if (bfq_bio_sync(bio) && !rq_is_sync(rq)) ++ return 0; ++ ++ /* ++ * Lookup the bfqq that this bio will be queued with. Allow ++ * merge only if rq is queued there. ++ * Queue lock is held here. ++ */ ++ bic = bfq_bic_lookup(bfqd, current->io_context); ++ if (bic == NULL) ++ return 0; ++ ++ bfqq = bic_to_bfqq(bic, bfq_bio_sync(bio)); ++ /* ++ * We take advantage of this function to perform an early merge ++ * of the queues of possible cooperating processes. ++ */ ++ if (bfqq != NULL) { ++ new_bfqq = bfq_setup_cooperator(bfqd, bfqq, bio, false); ++ if (new_bfqq != NULL) { ++ bfq_merge_bfqqs(bfqd, bic, bfqq, new_bfqq); ++ /* ++ * If we get here, the bio will be queued in the ++ * shared queue, i.e., new_bfqq, so use new_bfqq ++ * to decide whether bio and rq can be merged. ++ */ ++ bfqq = new_bfqq; ++ } else ++ bfq_bfqq_increase_failed_cooperations(bfqq); ++ } ++ ++ return bfqq == RQ_BFQQ(rq); ++} ++ ++static void __bfq_set_in_service_queue(struct bfq_data *bfqd, ++ struct bfq_queue *bfqq) ++{ ++ if (bfqq != NULL) { ++ bfq_mark_bfqq_must_alloc(bfqq); ++ bfq_mark_bfqq_budget_new(bfqq); ++ bfq_clear_bfqq_fifo_expire(bfqq); ++ ++ bfqd->budgets_assigned = (bfqd->budgets_assigned*7 + 256) / 8; ++ ++ bfq_log_bfqq(bfqd, bfqq, ++ "set_in_service_queue, cur-budget = %lu", ++ bfqq->entity.budget); ++ } ++ ++ bfqd->in_service_queue = bfqq; ++} ++ ++/* ++ * Get and set a new queue for service. ++ */ ++static struct bfq_queue *bfq_set_in_service_queue(struct bfq_data *bfqd) ++{ ++ struct bfq_queue *bfqq = bfq_get_next_queue(bfqd); ++ ++ __bfq_set_in_service_queue(bfqd, bfqq); ++ return bfqq; ++} ++ + /* + * If enough samples have been computed, return the current max budget + * stored in bfqd, which is dynamically updated according to the +@@ -1475,61 +1789,6 @@ static struct request *bfq_check_fifo(struct bfq_queue *bfqq) + return rq; + } + +-/* Must be called with the queue_lock held. */ +-static int bfqq_process_refs(struct bfq_queue *bfqq) +-{ +- int process_refs, io_refs; +- +- io_refs = bfqq->allocated[READ] + bfqq->allocated[WRITE]; +- process_refs = atomic_read(&bfqq->ref) - io_refs - bfqq->entity.on_st; +- BUG_ON(process_refs < 0); +- return process_refs; +-} +- +-static void bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) +-{ +- int process_refs, new_process_refs; +- struct bfq_queue *__bfqq; +- +- /* +- * If there are no process references on the new_bfqq, then it is +- * unsafe to follow the ->new_bfqq chain as other bfqq's in the chain +- * may have dropped their last reference (not just their last process +- * reference). +- */ +- if (!bfqq_process_refs(new_bfqq)) +- return; +- +- /* Avoid a circular list and skip interim queue merges. */ +- while ((__bfqq = new_bfqq->new_bfqq)) { +- if (__bfqq == bfqq) +- return; +- new_bfqq = __bfqq; +- } +- +- process_refs = bfqq_process_refs(bfqq); +- new_process_refs = bfqq_process_refs(new_bfqq); +- /* +- * If the process for the bfqq has gone away, there is no +- * sense in merging the queues. +- */ +- if (process_refs == 0 || new_process_refs == 0) +- return; +- +- /* +- * Merge in the direction of the lesser amount of work. +- */ +- if (new_process_refs >= process_refs) { +- bfqq->new_bfqq = new_bfqq; +- atomic_add(process_refs, &new_bfqq->ref); +- } else { +- new_bfqq->new_bfqq = bfqq; +- atomic_add(new_process_refs, &bfqq->ref); +- } +- bfq_log_bfqq(bfqq->bfqd, bfqq, "scheduling merge with queue %d", +- new_bfqq->pid); +-} +- + static inline unsigned long bfq_bfqq_budget_left(struct bfq_queue *bfqq) + { + struct bfq_entity *entity = &bfqq->entity; +@@ -2263,7 +2522,7 @@ static inline bool bfq_bfqq_must_idle(struct bfq_queue *bfqq) + */ + static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) + { +- struct bfq_queue *bfqq, *new_bfqq = NULL; ++ struct bfq_queue *bfqq; + struct request *next_rq; + enum bfqq_expiration reason = BFQ_BFQQ_BUDGET_TIMEOUT; + +@@ -2273,17 +2532,6 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) + + bfq_log_bfqq(bfqd, bfqq, "select_queue: already in-service queue"); + +- /* +- * If another queue has a request waiting within our mean seek +- * distance, let it run. The expire code will check for close +- * cooperators and put the close queue at the front of the +- * service tree. If possible, merge the expiring queue with the +- * new bfqq. +- */ +- new_bfqq = bfq_close_cooperator(bfqd, bfqq); +- if (new_bfqq != NULL && bfqq->new_bfqq == NULL) +- bfq_setup_merge(bfqq, new_bfqq); +- + if (bfq_may_expire_for_budg_timeout(bfqq) && + !timer_pending(&bfqd->idle_slice_timer) && + !bfq_bfqq_must_idle(bfqq)) +@@ -2322,10 +2570,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) + bfq_clear_bfqq_wait_request(bfqq); + del_timer(&bfqd->idle_slice_timer); + } +- if (new_bfqq == NULL) +- goto keep_queue; +- else +- goto expire; ++ goto keep_queue; + } + } + +@@ -2334,40 +2579,30 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) + * in flight (possibly waiting for a completion) or is idling for a + * new request, then keep it. + */ +- if (new_bfqq == NULL && (timer_pending(&bfqd->idle_slice_timer) || +- (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq)))) { ++ if (timer_pending(&bfqd->idle_slice_timer) || ++ (bfqq->dispatched != 0 && bfq_bfqq_must_not_expire(bfqq))) { + bfqq = NULL; + goto keep_queue; +- } else if (new_bfqq != NULL && timer_pending(&bfqd->idle_slice_timer)) { +- /* +- * Expiring the queue because there is a close cooperator, +- * cancel timer. +- */ +- bfq_clear_bfqq_wait_request(bfqq); +- del_timer(&bfqd->idle_slice_timer); + } + + reason = BFQ_BFQQ_NO_MORE_REQUESTS; + expire: + bfq_bfqq_expire(bfqd, bfqq, 0, reason); + new_queue: +- bfqq = bfq_set_in_service_queue(bfqd, new_bfqq); ++ bfqq = bfq_set_in_service_queue(bfqd); + bfq_log(bfqd, "select_queue: new queue %d returned", + bfqq != NULL ? bfqq->pid : 0); + keep_queue: + return bfqq; + } + +-static void bfq_update_wr_data(struct bfq_data *bfqd, +- struct bfq_queue *bfqq) ++static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq) + { +- if (bfqq->wr_coeff > 1) { /* queue is being boosted */ +- struct bfq_entity *entity = &bfqq->entity; +- ++ struct bfq_entity *entity = &bfqq->entity; ++ if (bfqq->wr_coeff > 1) { /* queue is being weight-raised */ + bfq_log_bfqq(bfqd, bfqq, + "raising period dur %u/%u msec, old coeff %u, w %d(%d)", +- jiffies_to_msecs(jiffies - +- bfqq->last_wr_start_finish), ++ jiffies_to_msecs(jiffies - bfqq->last_wr_start_finish), + jiffies_to_msecs(bfqq->wr_cur_max_time), + bfqq->wr_coeff, + bfqq->entity.weight, bfqq->entity.orig_weight); +@@ -2376,12 +2611,16 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, + entity->orig_weight * bfqq->wr_coeff); + if (entity->ioprio_changed) + bfq_log_bfqq(bfqd, bfqq, "WARN: pending prio change"); ++ + /* + * If the queue was activated in a burst, or + * too much time has elapsed from the beginning +- * of this weight-raising, then end weight raising. ++ * of this weight-raising period, or the queue has ++ * exceeded the acceptable number of cooperations, ++ * then end weight raising. + */ + if (bfq_bfqq_in_large_burst(bfqq) || ++ bfq_bfqq_cooperations(bfqq) >= bfqd->bfq_coop_thresh || + time_is_before_jiffies(bfqq->last_wr_start_finish + + bfqq->wr_cur_max_time)) { + bfqq->last_wr_start_finish = jiffies; +@@ -2390,11 +2629,13 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, + bfqq->last_wr_start_finish, + jiffies_to_msecs(bfqq->wr_cur_max_time)); + bfq_bfqq_end_wr(bfqq); +- __bfq_entity_update_weight_prio( +- bfq_entity_service_tree(entity), +- entity); + } + } ++ /* Update weight both if it must be raised and if it must be lowered */ ++ if ((entity->weight > entity->orig_weight) != (bfqq->wr_coeff > 1)) ++ __bfq_entity_update_weight_prio( ++ bfq_entity_service_tree(entity), ++ entity); + } + + /* +@@ -2642,6 +2883,25 @@ static inline void bfq_init_icq(struct io_cq *icq) + struct bfq_io_cq *bic = icq_to_bic(icq); + + bic->ttime.last_end_request = jiffies; ++ /* ++ * A newly created bic indicates that the process has just ++ * started doing I/O, and is probably mapping into memory its ++ * executable and libraries: it definitely needs weight raising. ++ * There is however the possibility that the process performs, ++ * for a while, I/O close to some other process. EQM intercepts ++ * this behavior and may merge the queue corresponding to the ++ * process with some other queue, BEFORE the weight of the queue ++ * is raised. Merged queues are not weight-raised (they are assumed ++ * to belong to processes that benefit only from high throughput). ++ * If the merge is basically the consequence of an accident, then ++ * the queue will be split soon and will get back its old weight. ++ * It is then important to write down somewhere that this queue ++ * does need weight raising, even if it did not make it to get its ++ * weight raised before being merged. To this purpose, we overload ++ * the field raising_time_left and assign 1 to it, to mark the queue ++ * as needing weight raising. ++ */ ++ bic->wr_time_left = 1; + } + + static void bfq_exit_icq(struct io_cq *icq) +@@ -2655,6 +2915,13 @@ static void bfq_exit_icq(struct io_cq *icq) + } + + if (bic->bfqq[BLK_RW_SYNC]) { ++ /* ++ * If the bic is using a shared queue, put the reference ++ * taken on the io_context when the bic started using a ++ * shared bfq_queue. ++ */ ++ if (bfq_bfqq_coop(bic->bfqq[BLK_RW_SYNC])) ++ put_io_context(icq->ioc); + bfq_exit_bfqq(bfqd, bic->bfqq[BLK_RW_SYNC]); + bic->bfqq[BLK_RW_SYNC] = NULL; + } +@@ -2950,6 +3217,10 @@ static void bfq_update_idle_window(struct bfq_data *bfqd, + if (!bfq_bfqq_sync(bfqq) || bfq_class_idle(bfqq)) + return; + ++ /* Idle window just restored, statistics are meaningless. */ ++ if (bfq_bfqq_just_split(bfqq)) ++ return; ++ + enable_idle = bfq_bfqq_idle_window(bfqq); + + if (atomic_read(&bic->icq.ioc->active_ref) == 0 || +@@ -2997,6 +3268,7 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq, + if (bfqq->entity.service > bfq_max_budget(bfqd) / 8 || + !BFQQ_SEEKY(bfqq)) + bfq_update_idle_window(bfqd, bfqq, bic); ++ bfq_clear_bfqq_just_split(bfqq); + + bfq_log_bfqq(bfqd, bfqq, + "rq_enqueued: idle_window=%d (seeky %d, mean %llu)", +@@ -3057,13 +3329,49 @@ static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq, + static void bfq_insert_request(struct request_queue *q, struct request *rq) + { + struct bfq_data *bfqd = q->elevator->elevator_data; +- struct bfq_queue *bfqq = RQ_BFQQ(rq); ++ struct bfq_queue *bfqq = RQ_BFQQ(rq), *new_bfqq; + + assert_spin_locked(bfqd->queue->queue_lock); ++ ++ /* ++ * An unplug may trigger a requeue of a request from the device ++ * driver: make sure we are in process context while trying to ++ * merge two bfq_queues. ++ */ ++ if (!in_interrupt()) { ++ new_bfqq = bfq_setup_cooperator(bfqd, bfqq, rq, true); ++ if (new_bfqq != NULL) { ++ if (bic_to_bfqq(RQ_BIC(rq), 1) != bfqq) ++ new_bfqq = bic_to_bfqq(RQ_BIC(rq), 1); ++ /* ++ * Release the request's reference to the old bfqq ++ * and make sure one is taken to the shared queue. ++ */ ++ new_bfqq->allocated[rq_data_dir(rq)]++; ++ bfqq->allocated[rq_data_dir(rq)]--; ++ atomic_inc(&new_bfqq->ref); ++ bfq_put_queue(bfqq); ++ if (bic_to_bfqq(RQ_BIC(rq), 1) == bfqq) ++ bfq_merge_bfqqs(bfqd, RQ_BIC(rq), ++ bfqq, new_bfqq); ++ rq->elv.priv[1] = new_bfqq; ++ bfqq = new_bfqq; ++ } else ++ bfq_bfqq_increase_failed_cooperations(bfqq); ++ } ++ + bfq_init_prio_data(bfqq, RQ_BIC(rq)); + + bfq_add_request(rq); + ++ /* ++ * Here a newly-created bfq_queue has already started a weight-raising ++ * period: clear raising_time_left to prevent bfq_bfqq_save_state() ++ * from assigning it a full weight-raising period. See the detailed ++ * comments about this field in bfq_init_icq(). ++ */ ++ if (bfqq->bic != NULL) ++ bfqq->bic->wr_time_left = 0; + rq->fifo_time = jiffies + bfqd->bfq_fifo_expire[rq_is_sync(rq)]; + list_add_tail(&rq->queuelist, &bfqq->fifo); + +@@ -3228,18 +3536,6 @@ static void bfq_put_request(struct request *rq) + } + } + +-static struct bfq_queue * +-bfq_merge_bfqqs(struct bfq_data *bfqd, struct bfq_io_cq *bic, +- struct bfq_queue *bfqq) +-{ +- bfq_log_bfqq(bfqd, bfqq, "merging with queue %lu", +- (long unsigned)bfqq->new_bfqq->pid); +- bic_set_bfqq(bic, bfqq->new_bfqq, 1); +- bfq_mark_bfqq_coop(bfqq->new_bfqq); +- bfq_put_queue(bfqq); +- return bic_to_bfqq(bic, 1); +-} +- + /* + * Returns NULL if a new bfqq should be allocated, or the old bfqq if this + * was the last process referring to said bfqq. +@@ -3248,6 +3544,9 @@ static struct bfq_queue * + bfq_split_bfqq(struct bfq_io_cq *bic, struct bfq_queue *bfqq) + { + bfq_log_bfqq(bfqq->bfqd, bfqq, "splitting queue"); ++ ++ put_io_context(bic->icq.ioc); ++ + if (bfqq_process_refs(bfqq) == 1) { + bfqq->pid = current->pid; + bfq_clear_bfqq_coop(bfqq); +@@ -3276,6 +3575,7 @@ static int bfq_set_request(struct request_queue *q, struct request *rq, + struct bfq_queue *bfqq; + struct bfq_group *bfqg; + unsigned long flags; ++ bool split = false; + + might_sleep_if(gfp_mask & __GFP_WAIT); + +@@ -3293,25 +3593,26 @@ new_queue: + if (bfqq == NULL || bfqq == &bfqd->oom_bfqq) { + bfqq = bfq_get_queue(bfqd, bfqg, is_sync, bic, gfp_mask); + bic_set_bfqq(bic, bfqq, is_sync); ++ if (split && is_sync) { ++ if ((bic->was_in_burst_list && bfqd->large_burst) || ++ bic->saved_in_large_burst) ++ bfq_mark_bfqq_in_large_burst(bfqq); ++ else { ++ bfq_clear_bfqq_in_large_burst(bfqq); ++ if (bic->was_in_burst_list) ++ hlist_add_head(&bfqq->burst_list_node, ++ &bfqd->burst_list); ++ } ++ } + } else { +- /* +- * If the queue was seeky for too long, break it apart. +- */ ++ /* If the queue was seeky for too long, break it apart. */ + if (bfq_bfqq_coop(bfqq) && bfq_bfqq_split_coop(bfqq)) { + bfq_log_bfqq(bfqd, bfqq, "breaking apart bfqq"); + bfqq = bfq_split_bfqq(bic, bfqq); ++ split = true; + if (!bfqq) + goto new_queue; + } +- +- /* +- * Check to see if this queue is scheduled to merge with +- * another closely cooperating queue. The merging of queues +- * happens here as it must be done in process context. +- * The reference on new_bfqq was taken in merge_bfqqs. +- */ +- if (bfqq->new_bfqq != NULL) +- bfqq = bfq_merge_bfqqs(bfqd, bic, bfqq); + } + + bfqq->allocated[rw]++; +@@ -3322,6 +3623,26 @@ new_queue: + rq->elv.priv[0] = bic; + rq->elv.priv[1] = bfqq; + ++ /* ++ * If a bfq_queue has only one process reference, it is owned ++ * by only one bfq_io_cq: we can set the bic field of the ++ * bfq_queue to the address of that structure. Also, if the ++ * queue has just been split, mark a flag so that the ++ * information is available to the other scheduler hooks. ++ */ ++ if (likely(bfqq != &bfqd->oom_bfqq) && bfqq_process_refs(bfqq) == 1) { ++ bfqq->bic = bic; ++ if (split) { ++ bfq_mark_bfqq_just_split(bfqq); ++ /* ++ * If the queue has just been split from a shared ++ * queue, restore the idle window and the possible ++ * weight raising period. ++ */ ++ bfq_bfqq_resume_state(bfqq, bic); ++ } ++ } ++ + spin_unlock_irqrestore(q->queue_lock, flags); + + return 0; +diff --git a/block/bfq-sched.c b/block/bfq-sched.c +index 2931563..6764a7e 100644 +--- a/block/bfq-sched.c ++++ b/block/bfq-sched.c +@@ -1091,34 +1091,6 @@ static struct bfq_queue *bfq_get_next_queue(struct bfq_data *bfqd) + return bfqq; + } + +-/* +- * Forced extraction of the given queue. +- */ +-static void bfq_get_next_queue_forced(struct bfq_data *bfqd, +- struct bfq_queue *bfqq) +-{ +- struct bfq_entity *entity; +- struct bfq_sched_data *sd; +- +- BUG_ON(bfqd->in_service_queue != NULL); +- +- entity = &bfqq->entity; +- /* +- * Bubble up extraction/update from the leaf to the root. +- */ +- for_each_entity(entity) { +- sd = entity->sched_data; +- bfq_update_budget(entity); +- bfq_update_vtime(bfq_entity_service_tree(entity)); +- bfq_active_extract(bfq_entity_service_tree(entity), entity); +- sd->in_service_entity = entity; +- sd->next_in_service = NULL; +- entity->service = 0; +- } +- +- return; +-} +- + static void __bfq_bfqd_reset_in_service(struct bfq_data *bfqd) + { + if (bfqd->in_service_bic != NULL) { +diff --git a/block/bfq.h b/block/bfq.h +index 3c5d85e..5ced336 100644 +--- a/block/bfq.h ++++ b/block/bfq.h +@@ -218,18 +218,21 @@ struct bfq_group; + * idle @bfq_queue with no outstanding requests, then + * the task associated with the queue it is deemed as + * soft real-time (see the comments to the function +- * bfq_bfqq_softrt_next_start()). ++ * bfq_bfqq_softrt_next_start()) + * @last_idle_bklogged: time of the last transition of the @bfq_queue from + * idle to backlogged + * @service_from_backlogged: cumulative service received from the @bfq_queue + * since the last transition from idle to + * backlogged ++ * @bic: pointer to the bfq_io_cq owning the bfq_queue, set to %NULL if the ++ * queue is shared + * +- * A bfq_queue is a leaf request queue; it can be associated with an io_context +- * or more, if it is async or shared between cooperating processes. @cgroup +- * holds a reference to the cgroup, to be sure that it does not disappear while +- * a bfqq still references it (mostly to avoid races between request issuing and +- * task migration followed by cgroup destruction). ++ * A bfq_queue is a leaf request queue; it can be associated with an ++ * io_context or more, if it is async or shared between cooperating ++ * processes. @cgroup holds a reference to the cgroup, to be sure that it ++ * does not disappear while a bfqq still references it (mostly to avoid ++ * races between request issuing and task migration followed by cgroup ++ * destruction). + * All the fields are protected by the queue lock of the containing bfqd. + */ + struct bfq_queue { +@@ -269,6 +272,7 @@ struct bfq_queue { + unsigned int requests_within_timer; + + pid_t pid; ++ struct bfq_io_cq *bic; + + /* weight-raising fields */ + unsigned long wr_cur_max_time; +@@ -298,12 +302,42 @@ struct bfq_ttime { + * @icq: associated io_cq structure + * @bfqq: array of two process queues, the sync and the async + * @ttime: associated @bfq_ttime struct ++ * @wr_time_left: snapshot of the time left before weight raising ends ++ * for the sync queue associated to this process; this ++ * snapshot is taken to remember this value while the weight ++ * raising is suspended because the queue is merged with a ++ * shared queue, and is used to set @raising_cur_max_time ++ * when the queue is split from the shared queue and its ++ * weight is raised again ++ * @saved_idle_window: same purpose as the previous field for the idle ++ * window ++ * @saved_IO_bound: same purpose as the previous two fields for the I/O ++ * bound classification of a queue ++ * @saved_in_large_burst: same purpose as the previous fields for the ++ * value of the field keeping the queue's belonging ++ * to a large burst ++ * @was_in_burst_list: true if the queue belonged to a burst list ++ * before its merge with another cooperating queue ++ * @cooperations: counter of consecutive successful queue merges underwent ++ * by any of the process' @bfq_queues ++ * @failed_cooperations: counter of consecutive failed queue merges of any ++ * of the process' @bfq_queues + */ + struct bfq_io_cq { + struct io_cq icq; /* must be the first member */ + struct bfq_queue *bfqq[2]; + struct bfq_ttime ttime; + int ioprio; ++ ++ unsigned int wr_time_left; ++ bool saved_idle_window; ++ bool saved_IO_bound; ++ ++ bool saved_in_large_burst; ++ bool was_in_burst_list; ++ ++ unsigned int cooperations; ++ unsigned int failed_cooperations; + }; + + enum bfq_device_speed { +@@ -539,7 +573,7 @@ enum bfqq_state_flags { + BFQ_BFQQ_FLAG_prio_changed, /* task priority has changed */ + BFQ_BFQQ_FLAG_sync, /* synchronous queue */ + BFQ_BFQQ_FLAG_budget_new, /* no completion with this budget */ +- BFQ_BFQQ_FLAG_IO_bound, /* ++ BFQ_BFQQ_FLAG_IO_bound, /* + * bfqq has timed-out at least once + * having consumed at most 2/10 of + * its budget +@@ -552,12 +586,13 @@ enum bfqq_state_flags { + * bfqq has proved to be slow and + * seeky until budget timeout + */ +- BFQ_BFQQ_FLAG_softrt_update, /* ++ BFQ_BFQQ_FLAG_softrt_update, /* + * may need softrt-next-start + * update + */ + BFQ_BFQQ_FLAG_coop, /* bfqq is shared */ +- BFQ_BFQQ_FLAG_split_coop, /* shared bfqq will be splitted */ ++ BFQ_BFQQ_FLAG_split_coop, /* shared bfqq will be split */ ++ BFQ_BFQQ_FLAG_just_split, /* queue has just been split */ + }; + + #define BFQ_BFQQ_FNS(name) \ +@@ -587,6 +622,7 @@ BFQ_BFQQ_FNS(in_large_burst); + BFQ_BFQQ_FNS(constantly_seeky); + BFQ_BFQQ_FNS(coop); + BFQ_BFQQ_FNS(split_coop); ++BFQ_BFQQ_FNS(just_split); + BFQ_BFQQ_FNS(softrt_update); + #undef BFQ_BFQQ_FNS + +-- +2.3.0 + diff --git a/kernel/kernel/files/patches/gentoo/5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch b/kernel/kernel/files/patches/gentoo/5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch new file mode 100644 index 00000000..f931f75f --- /dev/null +++ b/kernel/kernel/files/patches/gentoo/5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch @@ -0,0 +1,387 @@ +WARNING - this version of the patch works with version 4.9+ of gcc and with +kernel version 3.15.x+ and should NOT be applied when compiling on older +versions due to name changes of the flags with the 4.9 release of gcc. +Use the older version of this patch hosted on the same github for older +versions of gcc. For example: + +corei7 --> nehalem +corei7-avx --> sandybridge +core-avx-i --> ivybridge +core-avx2 --> haswell + +For more, see: https://gcc.gnu.org/gcc-4.9/changes.html + +It also changes 'atom' to 'bonnell' in accordance with the gcc v4.9 changes. +Note that upstream is using the deprecated 'match=atom' flags when I believe it +should use the newer 'march=bonnell' flag for atom processors. + +I have made that change to this patch set as well. See the following kernel +bug report to see if I'm right: https://bugzilla.kernel.org/show_bug.cgi?id=77461 + +This patch will expand the number of microarchitectures to include new +processors including: AMD K10-family, AMD Family 10h (Barcelona), AMD Family +14h (Bobcat), AMD Family 15h (Bulldozer), AMD Family 15h (Piledriver), AMD +Family 16h (Jaguar), Intel 1st Gen Core i3/i5/i7 (Nehalem), Intel 1.5 Gen Core +i3/i5/i7 (Westmere), Intel 2nd Gen Core i3/i5/i7 (Sandybridge), Intel 3rd Gen +Core i3/i5/i7 (Ivybridge), Intel 4th Gen Core i3/i5/i7 (Haswell), and Intel 5th +Gen Core i3/i5/i7 (Broadwell). It also offers the compiler the 'native' flag. + +Small but real speed increases are measurable using a make endpoint comparing +a generic kernel to one built with one of the respective microarchs. + +See the following experimental evidence supporting this statement: +https://github.com/graysky2/kernel_gcc_patch + +REQUIREMENTS +linux version >=3.15 +gcc version >=4.9 + +--- a/arch/x86/include/asm/module.h 2014-08-03 18:25:02.000000000 -0400 ++++ b/arch/x86/include/asm/module.h 2014-09-13 09:37:16.721385247 -0400 +@@ -15,6 +15,20 @@ + #define MODULE_PROC_FAMILY "586MMX " + #elif defined CONFIG_MCORE2 + #define MODULE_PROC_FAMILY "CORE2 " ++#elif defined CONFIG_MNATIVE ++#define MODULE_PROC_FAMILY "NATIVE " ++#elif defined CONFIG_MNEHALEM ++#define MODULE_PROC_FAMILY "NEHALEM " ++#elif defined CONFIG_MWESTMERE ++#define MODULE_PROC_FAMILY "WESTMERE " ++#elif defined CONFIG_MSANDYBRIDGE ++#define MODULE_PROC_FAMILY "SANDYBRIDGE " ++#elif defined CONFIG_MIVYBRIDGE ++#define MODULE_PROC_FAMILY "IVYBRIDGE " ++#elif defined CONFIG_MHASWELL ++#define MODULE_PROC_FAMILY "HASWELL " ++#elif defined CONFIG_MBROADWELL ++#define MODULE_PROC_FAMILY "BROADWELL " + #elif defined CONFIG_MATOM + #define MODULE_PROC_FAMILY "ATOM " + #elif defined CONFIG_M686 +@@ -33,6 +47,20 @@ + #define MODULE_PROC_FAMILY "K7 " + #elif defined CONFIG_MK8 + #define MODULE_PROC_FAMILY "K8 " ++#elif defined CONFIG_MK8SSE3 ++#define MODULE_PROC_FAMILY "K8SSE3 " ++#elif defined CONFIG_MK10 ++#define MODULE_PROC_FAMILY "K10 " ++#elif defined CONFIG_MBARCELONA ++#define MODULE_PROC_FAMILY "BARCELONA " ++#elif defined CONFIG_MBOBCAT ++#define MODULE_PROC_FAMILY "BOBCAT " ++#elif defined CONFIG_MBULLDOZER ++#define MODULE_PROC_FAMILY "BULLDOZER " ++#elif defined CONFIG_MPILEDRIVER ++#define MODULE_PROC_FAMILY "PILEDRIVER " ++#elif defined CONFIG_MJAGUAR ++#define MODULE_PROC_FAMILY "JAGUAR " + #elif defined CONFIG_MELAN + #define MODULE_PROC_FAMILY "ELAN " + #elif defined CONFIG_MCRUSOE +--- a/arch/x86/Kconfig.cpu 2014-08-03 18:25:02.000000000 -0400 ++++ b/arch/x86/Kconfig.cpu 2014-09-13 09:37:16.721385247 -0400 +@@ -137,9 +137,8 @@ config MPENTIUM4 + -Paxville + -Dempsey + +- + config MK6 +- bool "K6/K6-II/K6-III" ++ bool "AMD K6/K6-II/K6-III" + depends on X86_32 + ---help--- + Select this for an AMD K6-family processor. Enables use of +@@ -147,7 +146,7 @@ config MK6 + flags to GCC. + + config MK7 +- bool "Athlon/Duron/K7" ++ bool "AMD Athlon/Duron/K7" + depends on X86_32 + ---help--- + Select this for an AMD Athlon K7-family processor. Enables use of +@@ -155,12 +154,62 @@ config MK7 + flags to GCC. + + config MK8 +- bool "Opteron/Athlon64/Hammer/K8" ++ bool "AMD Opteron/Athlon64/Hammer/K8" + ---help--- + Select this for an AMD Opteron or Athlon64 Hammer-family processor. + Enables use of some extended instructions, and passes appropriate + optimization flags to GCC. + ++config MK8SSE3 ++ bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3" ++ ---help--- ++ Select this for improved AMD Opteron or Athlon64 Hammer-family processors. ++ Enables use of some extended instructions, and passes appropriate ++ optimization flags to GCC. ++ ++config MK10 ++ bool "AMD 61xx/7x50/PhenomX3/X4/II/K10" ++ ---help--- ++ Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50, ++ Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor. ++ Enables use of some extended instructions, and passes appropriate ++ optimization flags to GCC. ++ ++config MBARCELONA ++ bool "AMD Barcelona" ++ ---help--- ++ Select this for AMD Barcelona and newer processors. ++ ++ Enables -march=barcelona ++ ++config MBOBCAT ++ bool "AMD Bobcat" ++ ---help--- ++ Select this for AMD Bobcat processors. ++ ++ Enables -march=btver1 ++ ++config MBULLDOZER ++ bool "AMD Bulldozer" ++ ---help--- ++ Select this for AMD Bulldozer processors. ++ ++ Enables -march=bdver1 ++ ++config MPILEDRIVER ++ bool "AMD Piledriver" ++ ---help--- ++ Select this for AMD Piledriver processors. ++ ++ Enables -march=bdver2 ++ ++config MJAGUAR ++ bool "AMD Jaguar" ++ ---help--- ++ Select this for AMD Jaguar processors. ++ ++ Enables -march=btver2 ++ + config MCRUSOE + bool "Crusoe" + depends on X86_32 +@@ -251,8 +300,17 @@ config MPSC + using the cpu family field + in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one. + ++config MATOM ++ bool "Intel Atom" ++ ---help--- ++ ++ Select this for the Intel Atom platform. Intel Atom CPUs have an ++ in-order pipelining architecture and thus can benefit from ++ accordingly optimized code. Use a recent GCC with specific Atom ++ support in order to fully benefit from selecting this option. ++ + config MCORE2 +- bool "Core 2/newer Xeon" ++ bool "Intel Core 2" + ---help--- + + Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and +@@ -260,14 +318,55 @@ config MCORE2 + family in /proc/cpuinfo. Newer ones have 6 and older ones 15 + (not a typo) + +-config MATOM +- bool "Intel Atom" ++ Enables -march=core2 ++ ++config MNEHALEM ++ bool "Intel Nehalem" + ---help--- + +- Select this for the Intel Atom platform. Intel Atom CPUs have an +- in-order pipelining architecture and thus can benefit from +- accordingly optimized code. Use a recent GCC with specific Atom +- support in order to fully benefit from selecting this option. ++ Select this for 1st Gen Core processors in the Nehalem family. ++ ++ Enables -march=nehalem ++ ++config MWESTMERE ++ bool "Intel Westmere" ++ ---help--- ++ ++ Select this for the Intel Westmere formerly Nehalem-C family. ++ ++ Enables -march=westmere ++ ++config MSANDYBRIDGE ++ bool "Intel Sandy Bridge" ++ ---help--- ++ ++ Select this for 2nd Gen Core processors in the Sandy Bridge family. ++ ++ Enables -march=sandybridge ++ ++config MIVYBRIDGE ++ bool "Intel Ivy Bridge" ++ ---help--- ++ ++ Select this for 3rd Gen Core processors in the Ivy Bridge family. ++ ++ Enables -march=ivybridge ++ ++config MHASWELL ++ bool "Intel Haswell" ++ ---help--- ++ ++ Select this for 4th Gen Core processors in the Haswell family. ++ ++ Enables -march=haswell ++ ++config MBROADWELL ++ bool "Intel Broadwell" ++ ---help--- ++ ++ Select this for 5th Gen Core processors in the Broadwell family. ++ ++ Enables -march=broadwell + + config GENERIC_CPU + bool "Generic-x86-64" +@@ -276,6 +375,19 @@ config GENERIC_CPU + Generic x86-64 CPU. + Run equally well on all x86-64 CPUs. + ++config MNATIVE ++ bool "Native optimizations autodetected by GCC" ++ ---help--- ++ ++ GCC 4.2 and above support -march=native, which automatically detects ++ the optimum settings to use based on your processor. -march=native ++ also detects and applies additional settings beyond -march specific ++ to your CPU, (eg. -msse4). Unless you have a specific reason not to ++ (e.g. distcc cross-compiling), you should probably be using ++ -march=native rather than anything listed below. ++ ++ Enables -march=native ++ + endchoice + + config X86_GENERIC +@@ -300,7 +412,7 @@ config X86_INTERNODE_CACHE_SHIFT + config X86_L1_CACHE_SHIFT + int + default "7" if MPENTIUM4 || MPSC +- default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU ++ default "6" if MK7 || MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MPENTIUMM || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || BROADWELL || MNATIVE || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU + default "4" if MELAN || M486 || MGEODEGX1 + default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX + +@@ -331,11 +443,11 @@ config X86_ALIGNMENT_16 + + config X86_INTEL_USERCOPY + def_bool y +- depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2 ++ depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK8SSE3 || MK7 || MEFFICEON || MCORE2 || MK10 || MBARCELONA || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE + + config X86_USE_PPRO_CHECKSUM + def_bool y +- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM ++ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MK10 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MATOM || MNATIVE + + config X86_USE_3DNOW + def_bool y +@@ -359,17 +471,17 @@ config X86_P6_NOP + + config X86_TSC + def_bool y +- depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64 ++ depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MK8SSE3 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MNATIVE || MATOM) || X86_64 + + config X86_CMPXCHG64 + def_bool y +- depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM ++ depends on X86_PAE || X86_64 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM || MNATIVE + + # this should be set for all -march=.. options where the compiler + # generates cmov. + config X86_CMOV + def_bool y +- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) ++ depends on (MK8 || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MBULLDOZER || MPILEDRIVER || MJAGUAR || MK7 || MCORE2 || MNEHALEM || MWESTMERE || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MNATIVE || MATOM || MGEODE_LX) + + config X86_MINIMUM_CPU_FAMILY + int +--- a/arch/x86/Makefile 2014-08-03 18:25:02.000000000 -0400 ++++ b/arch/x86/Makefile 2014-09-13 09:37:16.721385247 -0400 +@@ -92,13 +92,33 @@ else + KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3) + + # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu) ++ cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native) + cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8) ++ cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-mtune=k8) ++ cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10) ++ cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona) ++ cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1) ++ cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1) ++ cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2) ++ cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2) + cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona) + + cflags-$(CONFIG_MCORE2) += \ +- $(call cc-option,-march=core2,$(call cc-option,-mtune=generic)) +- cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom) \ +- $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) ++ $(call cc-option,-march=core2,$(call cc-option,-mtune=core2)) ++ cflags-$(CONFIG_MNEHALEM) += \ ++ $(call cc-option,-march=nehalem,$(call cc-option,-mtune=nehalem)) ++ cflags-$(CONFIG_MWESTMERE) += \ ++ $(call cc-option,-march=westmere,$(call cc-option,-mtune=westmere)) ++ cflags-$(CONFIG_MSANDYBRIDGE) += \ ++ $(call cc-option,-march=sandybridge,$(call cc-option,-mtune=sandybridge)) ++ cflags-$(CONFIG_MIVYBRIDGE) += \ ++ $(call cc-option,-march=ivybridge,$(call cc-option,-mtune=ivybridge)) ++ cflags-$(CONFIG_MHASWELL) += \ ++ $(call cc-option,-march=haswell,$(call cc-option,-mtune=haswell)) ++ cflags-$(CONFIG_MBROADWELL) += \ ++ $(call cc-option,-march=broadwell,$(call cc-option,-mtune=broadwell)) ++ cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell) \ ++ $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic)) + cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic) + KBUILD_CFLAGS += $(cflags-y) + +--- a/arch/x86/Makefile_32.cpu 2014-08-03 18:25:02.000000000 -0400 ++++ b/arch/x86/Makefile_32.cpu 2014-09-13 09:37:16.721385247 -0400 +@@ -23,7 +23,15 @@ cflags-$(CONFIG_MK6) += -march=k6 + # Please note, that patches that add -march=athlon-xp and friends are pointless. + # They make zero difference whatsosever to performance at this time. + cflags-$(CONFIG_MK7) += -march=athlon ++cflags-$(CONFIG_MNATIVE) += $(call cc-option,-march=native) + cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8,-march=athlon) ++cflags-$(CONFIG_MK8SSE3) += $(call cc-option,-march=k8-sse3,-march=athlon) ++cflags-$(CONFIG_MK10) += $(call cc-option,-march=amdfam10,-march=athlon) ++cflags-$(CONFIG_MBARCELONA) += $(call cc-option,-march=barcelona,-march=athlon) ++cflags-$(CONFIG_MBOBCAT) += $(call cc-option,-march=btver1,-march=athlon) ++cflags-$(CONFIG_MBULLDOZER) += $(call cc-option,-march=bdver1,-march=athlon) ++cflags-$(CONFIG_MPILEDRIVER) += $(call cc-option,-march=bdver2,-march=athlon) ++cflags-$(CONFIG_MJAGUAR) += $(call cc-option,-march=btver2,-march=athlon) + cflags-$(CONFIG_MCRUSOE) += -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0 + cflags-$(CONFIG_MEFFICEON) += -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0 + cflags-$(CONFIG_MWINCHIPC6) += $(call cc-option,-march=winchip-c6,-march=i586) +@@ -32,8 +40,14 @@ cflags-$(CONFIG_MCYRIXIII) += $(call cc- + cflags-$(CONFIG_MVIAC3_2) += $(call cc-option,-march=c3-2,-march=i686) + cflags-$(CONFIG_MVIAC7) += -march=i686 + cflags-$(CONFIG_MCORE2) += -march=i686 $(call tune,core2) +-cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom,$(call cc-option,-march=core2,-march=i686)) \ +- $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) ++cflags-$(CONFIG_MNEHALEM) += -march=i686 $(call tune,nehalem) ++cflags-$(CONFIG_MWESTMERE) += -march=i686 $(call tune,westmere) ++cflags-$(CONFIG_MSANDYBRIDGE) += -march=i686 $(call tune,sandybridge) ++cflags-$(CONFIG_MIVYBRIDGE) += -march=i686 $(call tune,ivybridge) ++cflags-$(CONFIG_MHASWELL) += -march=i686 $(call tune,haswell) ++cflags-$(CONFIG_MBROADWELL) += -march=i686 $(call tune,broadwell) ++cflags-$(CONFIG_MATOM) += $(call cc-option,-march=bonnell,$(call cc-option,-march=core2,-march=i686)) \ ++ $(call cc-option,-mtune=bonnell,$(call cc-option,-mtune=generic)) + + # AMD Elan support + cflags-$(CONFIG_MELAN) += -march=i486 diff --git a/kernel/kernel/files/patches/linux/patch-3.17.4.xz b/kernel/kernel/files/patches/linux/patch-3.17.4.xz new file mode 100644 index 00000000..32871fba Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.17.4.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.18.1.xz b/kernel/kernel/files/patches/linux/patch-3.18.1.xz new file mode 100644 index 00000000..48ce7dfb Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.18.1.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.18.3.xz b/kernel/kernel/files/patches/linux/patch-3.18.3.xz new file mode 100644 index 00000000..f1c3bfc7 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.18.3.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.1.xz b/kernel/kernel/files/patches/linux/patch-3.19.1.xz new file mode 100644 index 00000000..105dd15e Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.1.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.2.xz b/kernel/kernel/files/patches/linux/patch-3.19.2.xz new file mode 100644 index 00000000..6dd9defd Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.2.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.3.xz b/kernel/kernel/files/patches/linux/patch-3.19.3.xz new file mode 100644 index 00000000..2b27eb0f Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.3.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.4.xz b/kernel/kernel/files/patches/linux/patch-3.19.4.xz new file mode 100644 index 00000000..ec0a8590 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.4.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.5.xz b/kernel/kernel/files/patches/linux/patch-3.19.5.xz new file mode 100644 index 00000000..f34c2516 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.5.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.6.xz b/kernel/kernel/files/patches/linux/patch-3.19.6.xz new file mode 100644 index 00000000..f55c450a Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.6.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-3.19.8.xz b/kernel/kernel/files/patches/linux/patch-3.19.8.xz new file mode 100644 index 00000000..b160f834 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-3.19.8.xz differ diff --git a/kernel/kernel/files/patches/linux/patch-4.0.3.gz b/kernel/kernel/files/patches/linux/patch-4.0.3.gz new file mode 100644 index 00000000..8dc18612 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.0.3.gz differ diff --git a/kernel/kernel/files/patches/mageia/3rd-3rdparty-1.0-tree.patch b/kernel/kernel/files/patches/mageia/3rd-3rdparty-1.0-tree.patch new file mode 100644 index 00000000..233389b4 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-3rdparty-1.0-tree.patch @@ -0,0 +1,181 @@ + + 3rdparty/mkbuild.pl | 92 +++++++++++++++++++++++++++++++++++++++++++++ + Documentation/3rdparty.txt | 76 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 168 insertions(+) + +diff -Nurp linux-2.6.37/3rdparty/mkbuild.pl linux-2.6.37.3rdparty/3rdparty/mkbuild.pl +--- linux-2.6.37/3rdparty/mkbuild.pl 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/mkbuild.pl 2004-04-23 14:59:03.000000000 +0300 +@@ -0,0 +1,92 @@ ++#!/usr/bin/perl -w ++# ++# Version 1.0 ++# ++# Copyright 2001 Jeff Garzik ++# Copyright 2002 Juan Quintela ++# Copyright 2003 Nicolas Planel ++# ++# This software may be used and distributed according to the terms ++# of the GNU General Public License, incorporated herein by reference. ++# ++# ++# Run "mkbuild.pl" ++# ++# This program generates the following files ++# Makefile ++# Makefile.drivers ++# Config.in ++# using the information in the subdirs of this directory. ++# ++# subdirs need to have: ++# a Config.in file ++# a Makefile with a O_TARGET/L_TARGET targets ++# The config.in should set a CONFIG_ to m/y. ++ ++use strict; ++ ++opendir(THISDIR, "."); ++# get dirs without . and .. garbage ++my (@modules) = grep(!/\.\.?$/,grep(-d, readdir(THISDIR))); ++closedir(THISDIR); ++ ++generate_kconfig(@modules); ++generate_makefile(@modules); ++exit(0); ++ ++########################################################################## ++ ++sub generate_makefile { ++ my (@modules) = @_; ++ ++ local *F; ++ open F, "> Makefile" or die "Cannot create new Makefile: $!\n"; ++ print F <<'EOM'; ++# ++# THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT. ++# ++ ++EOM ++ printf F "obj- := 3rdparty.o # Dummy rule to force built-in.o to be made\n"; ++ printf F "obj-\$(%s) += %s\n", to_CONFIG($_), $_ . '/' foreach @modules; ++} ++ ++sub generate_kconfig { ++ my (@modules) = @_; ++ ++ local *F; ++ open F, "> Kconfig" or die "Cannot create Kconfig: $!\n"; ++ print F <<"EOM"; ++# ++# THIS IS AN AUTOMATICALLY GENERATED FILE. DO NOT EDIT. ++# ++ ++menu "Unofficial 3rd party kernel additions" ++ ++EOM ++ ++ foreach (@modules) { ++ die "No Kconfig in $_.\n" if ! -r "$_/Kconfig"; ++ print F "source 3rdparty/$_/Kconfig\n"; ++ } ++ print F "\n\nendmenu\n"; ++} ++ ++sub to_CONFIG { ++ local $_ = $_[0]; ++ tr/a-z/A-Z/; ++ s/[\-\. ]/_/g; ++ "CONFIG_$_"; ++} ++ ++sub find_target { ++ my ($module_dir) = @_; ++ ++ local *F; ++ open(F, "$module_dir/Makefile") or die "$module_dir/Makefile: $!\n"; ++ while () { ++ chomp; ++ return $1 if (/[LO]_TARGET.*:=\s+(\S+)/); ++ } ++} ++ +diff -Nurp linux-2.6.37/Documentation/3rdparty.txt linux-2.6.37.3rdparty/Documentation/3rdparty.txt +--- linux-2.6.37/Documentation/3rdparty.txt 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/Documentation/3rdparty.txt 2003-11-22 01:07:26.000000000 +0200 +@@ -0,0 +1,76 @@ ++ ++Third-Party Kernel Source Module Support, or ++an easy way to add modules to your kernel build. ++ ++ ++ ++Vendors quite often add additional drivers and features to the kernel ++which require nothing more than modifying Kconfig, Makefile, and ++adding one or more files to a sub-directory. As a single discrete task, ++this is not a problem. However, using patches to add modules to the ++kernel very often results in patch conflicts, resulting in needless time ++wastage as developers regenerate an otherwise working kernel patch. ++ ++This is designed as a solution to these problems. It is NOT designed as ++a replacement for the kernel build system, but merely as a tool for ++vendors and system administrators to ease the pain of patch management. ++ ++The key feature of this system is the distinct lack of patches. Drivers ++are installed via unpacking a tarball. ++ ++ ++ ++Adding a directory to the build (usually from a tarball) ++-------------------------------------------------------- ++If a directory exists inside the 3rdparty sub-directory that contains a ++proper Makefile, it can be added to the build. It also needs a ++Kconfig file. ++ ++ cd /usr/src/linux-2.4.3/3rdparty ++ bzcat /tmp/my-driver2.tar.bz2 | tar xf - # creates "my2" dir ++ ++ ++Limitations ++----------- ++There are some limitations to this system. This system is only ++designed to support a very common case. If you find yourself running ++into limitations (kernel build experts can spot them right off), ++then you should probably be patching the kernel instead of using ++mkbuild.pl for that particular module. ++ ++FIXME: actually list the limitations ++ ++ ++ ++Other notes ++----------- ++Link order is controlled by the order of mkbuild.pl executions. ++ ++"make mrproper" will erase Makefile.meta, and empty Kconfig, Makefile, ++and Makefile.drivers. ++ ++IMPORTANT NOTE: Because this feature modifies the kernel's makefiles and ++configuration system, you MUST complete all mkbuild.pl runs before ++running any "make" command. ++ ++Building in the 3rdparty dir ++---------------------------- ++ ++If you use modules that: ++ - are contained in one subdir with the name of the module ++ - has a Makefile ++ - has a Kconfig file ++ ++The system calls the ./mkbuild.pl script. It will search for ++subdirectories, and will try to build each of them as a module. ++Things to note: ++ ++ The dependencies will be done in a module called: ++ ++ 3rdparty// ++ ++depending of CONFIG_. ++ ++ is the value of O_TARGET/L_TARGET. ++ ++ diff --git a/kernel/kernel/files/patches/mageia/3rd-3rdparty-merge.patch b/kernel/kernel/files/patches/mageia/3rd-3rdparty-merge.patch new file mode 100644 index 00000000..4d9cc095 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-3rdparty-merge.patch @@ -0,0 +1,175 @@ + +Include 3rdparty directory into the main build-system. + +Original author is unknown. +(Was either Juan Quintela or Jeff Garzik) + +Signed-off-by: Luiz Fernando N. Capitulino +Signed-off-by: Herton Ronaldo Krzesinski +Signed-off-by: Thomas Backlund + + Makefile | 2 +- + arch/alpha/Kconfig | 1 + + arch/ia64/Kconfig | 2 ++ + arch/mips/Kconfig | 2 ++ + arch/powerpc/Kconfig | 2 ++ + arch/sparc/Kconfig | 2 ++ + arch/x86/Kconfig | 2 ++ + scripts/kconfig/Makefile | 31 +++++++++++++++++-------------- + 8 files changed, 29 insertions(+), 15 deletions(-) + +diff -Nurp linux-3.18-rc6/arch/alpha/Kconfig linux-3.18-rc6-3rdparty/arch/alpha/Kconfig +--- linux-3.18-rc6/arch/alpha/Kconfig 2014-10-05 22:23:04.000000000 +0300 ++++ linux-3.18-rc6-3rdparty/arch/alpha/Kconfig 2014-11-29 21:42:38.015594440 +0200 +@@ -746,3 +746,4 @@ source "crypto/Kconfig" + + source "lib/Kconfig" + ++source "3rdparty/Kconfig" +diff -Nurp linux-3.18-rc6/arch/ia64/Kconfig linux-3.18-rc6-3rdparty/arch/ia64/Kconfig +--- linux-3.18-rc6/arch/ia64/Kconfig 2014-10-05 22:23:04.000000000 +0300 ++++ linux-3.18-rc6-3rdparty/arch/ia64/Kconfig 2014-11-29 21:42:38.015594440 +0200 +@@ -646,3 +646,5 @@ source "lib/Kconfig" + + config IOMMU_HELPER + def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) ++ ++source "3rdparty/Kconfig" +diff -Nurp linux-3.18-rc6/arch/mips/Kconfig linux-3.18-rc6-3rdparty/arch/mips/Kconfig +--- linux-3.18-rc6/arch/mips/Kconfig 2014-11-29 21:37:34.434802374 +0200 ++++ linux-3.18-rc6-3rdparty/arch/mips/Kconfig 2014-11-29 21:42:38.015594440 +0200 +@@ -2709,3 +2709,5 @@ source "crypto/Kconfig" + source "lib/Kconfig" + + source "arch/mips/kvm/Kconfig" ++ ++source "3rdparty/Kconfig" +diff -Nurp linux-3.18-rc6/arch/powerpc/Kconfig linux-3.18-rc6-3rdparty/arch/powerpc/Kconfig +--- linux-3.18-rc6/arch/powerpc/Kconfig 2014-11-29 21:37:34.446802445 +0200 ++++ linux-3.18-rc6-3rdparty/arch/powerpc/Kconfig 2014-11-29 21:42:38.016594446 +0200 +@@ -1081,3 +1081,5 @@ config PPC_LIB_RHEAP + bool + + source "arch/powerpc/kvm/Kconfig" ++ ++source "3rdparty/Kconfig" +diff -Nurp linux-3.18-rc6/arch/sparc/Kconfig linux-3.18-rc6-3rdparty/arch/sparc/Kconfig +--- linux-3.18-rc6/arch/sparc/Kconfig 2014-11-29 21:37:34.478802634 +0200 ++++ linux-3.18-rc6-3rdparty/arch/sparc/Kconfig 2014-11-29 21:42:38.016594446 +0200 +@@ -562,3 +562,5 @@ source "security/Kconfig" + source "crypto/Kconfig" + + source "lib/Kconfig" ++ ++source "3rdparty/Kconfig" +diff -Nurp linux-3.18-rc6/arch/x86/Kconfig linux-3.18-rc6-3rdparty/arch/x86/Kconfig +--- linux-3.18-rc6/arch/x86/Kconfig 2014-11-29 21:37:34.488802693 +0200 ++++ linux-3.18-rc6-3rdparty/arch/x86/Kconfig 2014-11-29 21:42:38.016594446 +0200 +@@ -2509,3 +2509,5 @@ source "crypto/Kconfig" + source "arch/x86/kvm/Kconfig" + + source "lib/Kconfig" ++ ++source "3rdparty/Kconfig" +diff -Nurp linux-3.18-rc6/Makefile linux-3.18-rc6-3rdparty/Makefile +--- linux-3.18-rc6/Makefile 2014-11-29 21:37:34.352801890 +0200 ++++ linux-3.18-rc6-3rdparty/Makefile 2014-11-29 21:42:38.016594446 +0200 +@@ -556,7 +556,7 @@ scripts: scripts_basic include/config/au + + # Objects we will link into vmlinux / subdirs we need to visit + init-y := init/ +-drivers-y := drivers/ sound/ firmware/ ++drivers-y := drivers/ sound/ firmware/ 3rdparty/ + net-y := net/ + libs-y := lib/ + core-y := usr/ +diff -Nurp linux-3.18-rc6/scripts/kconfig/Makefile linux-3.18-rc6-3rdparty/scripts/kconfig/Makefile +--- linux-3.18-rc6/scripts/kconfig/Makefile 2014-11-29 21:37:35.487808590 +0200 ++++ linux-3.18-rc6-3rdparty/scripts/kconfig/Makefile 2014-11-29 21:46:48.227071462 +0200 +@@ -14,29 +14,29 @@ endif + # We need this, in case the user has it in its environment + unexport CONFIG_ + +-xconfig: $(obj)/qconf ++xconfig: $(obj)/qconf 3rdparty/Makefile + $< $(Kconfig) + +-gconfig: $(obj)/gconf ++gconfig: $(obj)/gconf 3rdparty/Makefile + $< $(Kconfig) + +-menuconfig: $(obj)/mconf ++menuconfig: $(obj)/mconf 3rdparty/Makefile + $< $(Kconfig) + +-config: $(obj)/conf ++config: $(obj)/conf 3rdparty/Makefile + $< --oldaskconfig $(Kconfig) + +-nconfig: $(obj)/nconf ++nconfig: $(obj)/nconf 3rdparty/Makefile + $< $(Kconfig) + +-oldconfig: $(obj)/conf ++oldconfig: $(obj)/conf 3rdparty/Makefile + $< --$@ $(Kconfig) + +-silentoldconfig: $(obj)/conf ++silentoldconfig: $(obj)/conf 3rdparty/Makefile + $(Q)mkdir -p include/config include/generated + $< --$@ $(Kconfig) + +-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf ++localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 3rdparty/Makefile + $(Q)mkdir -p include/config include/generated + $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config + $(Q)if [ -f .config ]; then \ +@@ -76,24 +76,24 @@ update-po-config: $(obj)/kxgettext $(obj + + PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig + +-allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf ++allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf 3rdparty/Makefile + $< --$@ $(Kconfig) + + PHONY += listnewconfig olddefconfig oldnoconfig savedefconfig defconfig + +-listnewconfig olddefconfig: $(obj)/conf ++listnewconfig olddefconfig: $(obj)/conf 3rdparty/Makefile + $< --$@ $(Kconfig) + + # oldnoconfig is an alias of olddefconfig, because people already are dependent + # on its behavior(sets new symbols to their default value but not 'n') with the + # counter-intuitive name. +-oldnoconfig: $(obj)/conf ++oldnoconfig: $(obj)/conf 3rdparty/Makefile + $< --olddefconfig $(Kconfig) + +-savedefconfig: $(obj)/conf ++savedefconfig: $(obj)/conf 3rdparty/Makefile + $< --$@=defconfig $(Kconfig) + +-defconfig: $(obj)/conf ++defconfig: $(obj)/conf 3rdparty/Makefile + ifeq ($(KBUILD_DEFCONFIG),) + $< --defconfig $(Kconfig) + else +@@ -101,7 +101,7 @@ else + $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) + endif + +-%_defconfig: $(obj)/conf ++%_defconfig: $(obj)/conf 3rdparty/Makefile + $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) + + configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config) +@@ -178,6 +178,9 @@ gconf-objs := gconf.o zconf.tab.o + + hostprogs-y := conf nconf mconf kxgettext qconf gconf + ++3rdparty/Makefile: ++ pushd $(srctree)/3rdparty ; $(PERL) ./mkbuild.pl ; popd ++ + clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck + clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h + clean-files += config.pot linux.pot diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-0.5.35.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-0.5.35.patch new file mode 100644 index 00000000..5d61570f --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-0.5.35.patch @@ -0,0 +1,4212 @@ + 3rdparty/acerhk/AUTHORS | 1 + 3rdparty/acerhk/COPYING | 340 ++++ + 3rdparty/acerhk/INSTALL | 109 + + 3rdparty/acerhk/Makefile | 65 + 3rdparty/acerhk/NEWS | 16 + 3rdparty/acerhk/README | 215 ++ + 3rdparty/acerhk/acerhk.c | 2999 ++++++++++++++++++++++++++++++++++++++++ + 3rdparty/acerhk/acerhk.h | 91 + + 3rdparty/acerhk/doc/FAQ | 150 ++ + 3rdparty/acerhk/doc/IOCTL | 61 + 3rdparty/acerhk/doc/acertm.def | 56 + 3rdparty/acerhk/doc/keycodes | 26 + 3rdparty/acerhk/doc/md95400.def | 14 + 13 files changed, 4143 insertions(+) +diff -Nurp linux-2.6.37/3rdparty/acerhk/acerhk.c linux-2.6.37.3rdparty/3rdparty/acerhk/acerhk.c +--- linux-2.6.37/3rdparty/acerhk/acerhk.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/acerhk.c 2007-02-10 17:46:23.000000000 +0200 +@@ -0,0 +1,2999 @@ ++/********************************************************************* ++ * Filename: acerhk.c ++ * Version: 0.5 ++ * ++ * Copyright (C) 2002-2006, Olaf Tauber (olaf-tauber@versanet.de) ++ * ++ * Description: kernel driver for Acer Travelmate and similar ++ * laptops special keys ++ * Author: Olaf Tauber ++ * Created at: Mon Apr 29 22:16:42 2002 ++ * Modified at: Mon Oct 16 21:36:44 2006 ++ * Modified by: Olaf Tauber ++ * Modified at: Thu Nov 24 13:03:01 2005 ++ * Modified by: Antonio Cuni ++ * Modified at: Wed Oct 27 19:47:11 CEST 2004 ++ * Modified by: Joachim Fenkes ++ * ++ * 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., 59 Temple Place, ++ * Suite 330, Boston, MA 02111-1307 USA ++ * ++ * ++ */ ++ ++#ifndef AUTOCONF_INCLUDED ++#include ++#endif ++ ++/* This driver is heavily dependent on the architecture, don't let ++ * anyone without an X86 machine use it. On laptops with AMD64 ++ * architecture this driver is only useable in 32 bit mode. ++ */ ++#ifdef CONFIG_X86 ++ ++#include ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ++#define KERNEL26 ++#include ++#else ++#include ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) ++#define STATIC_INPUT_DEV ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "acerhk.h" ++ ++/* #define ACERDEBUG */ ++/* #define DUMMYHW */ ++ ++#define ACERHK_VERSION "0.5.35" ++#define MODULE_NAME "acerhk" ++ ++/* maximum number of polling loops, adjust it if needed to values between ++ * 1 and 32 ++ */ ++#define MAX_POLLING_LOOPS 16U ++ ++/* maximum length for model string */ ++#define ACERHK_MODEL_STRLEN 16 ++/* size of mapped areas */ ++#define AREA_SIZE 0xffff ++/* needed for colussi algorithm */ ++#define XSIZE 20 ++ ++/* Module parameters */ ++static int poll=1; ++static int autowlan; ++static int usedritek=1; ++static int wlan_state=-1; ++static int bluetooth_state=-1; ++static int verbose; ++static unsigned int force_series; ++#ifdef KERNEL26 ++module_param(poll, int, 0444); ++module_param(autowlan, int, 0444); ++module_param(usedritek, int, 0444); ++module_param(verbose, int, 0444); ++module_param(wlan_state, int, 0444); ++module_param(bluetooth_state, int, 0444); ++module_param(force_series, uint, 0444); ++#else ++MODULE_PARM(poll, "i"); ++MODULE_PARM(autowlan, "i"); ++MODULE_PARM(wlan_state, "i"); ++MODULE_PARM(bluetooth_state, "i"); ++MODULE_PARM(usedritek, "i"); ++MODULE_PARM(verbose, "i"); ++MODULE_PARM(force_series, "i"); ++#endif ++MODULE_PARM_DESC(poll, "start polling timer"); ++MODULE_PARM_DESC(autowlan, "automatic switching of wlan hardware"); ++MODULE_PARM_DESC(wlan_state, "(assumed) initial state of WLAN LED/hardware"); ++MODULE_PARM_DESC(bluetooth_state, "(assumed) initial state of Bluetooth LED/hardware"); ++MODULE_PARM_DESC(usedritek, "enable dritek keyboard extension"); ++MODULE_PARM_DESC(verbose, "output additional information"); ++MODULE_PARM_DESC(force_series, "force laptop series, skip autodetection"); ++ ++/* input device */ ++static struct input_dev *acerhk_input_dev_ptr; ++#ifdef STATIC_INPUT_DEV ++static struct input_dev acerhk_input_dev; ++#endif ++ ++/* mapped IO area from 0xf0000 */ ++static void *reg1; ++/* mapped IO area from 0xe0000 */ ++static void *reg2; ++/* Pointer to mapped area at 0x400 on 520 series */ ++static void *preg400; ++/* location of IO routine in mapped area */ ++static unsigned int bios_routine; ++/* index of CMOS port to get key event */ ++static unsigned int cmos_index; ++/* function for bios call */ ++static bios_call call_bios; ++/* address of model string */ ++static char *acerhk_model_addr; ++/* copied string, maximum length 16 ('TravelMate xxx') */ ++static char acerhk_model_string[ACERHK_MODEL_STRLEN]; ++/* type of hardware access */ ++static t_acer_type acerhk_type; ++/* travelmate series */ ++static unsigned int acerhk_series; ++/* supported features for this model */ ++static unsigned int acerhk_model_features; ++/* map of acer key codes to acer key names */ ++static unsigned char acerhk_key2name[0xff]; ++/* map of acer key names to key events */ ++static t_map_name2event acerhk_name2event; ++/* timer for polling key presses */ ++static struct timer_list acerhk_timer_poll; ++/* polling active */ ++static int acerhk_polling_state; ++/* polling delay */ ++static unsigned acerhk_polling_delay = HZ/5; ++/* wlan hardware toggle */ ++static int acerhk_wlan_state; ++/* bluetooth hardware toggle */ ++static int acerhk_bluetooth_state; ++ ++/* bluetooth blinking state; added by Antonio Cuni ++ possible values: ++ -1: blinking disabled (default) ++ 0: blinking enabled, led currently off ++ 1: blinking enabled, led currently on ++*/ ++static int acerhk_blueled_blinking = -1; ++/* delay between two changes of state, in jiffies */ ++static unsigned acerhk_blueled_blinking_delay; ++/* timer for blinking */ ++static struct timer_list acerhk_timer_blinking; ++ ++/* function prototypes */ ++static void start_polling(void); ++static void stop_polling(void); ++ ++/* Added by Antonio Cuni */ ++static void start_blinking(void); ++static void stop_blinking(void); ++ ++/* {{{ Experimental use of dritek keyboard extension */ ++ ++#define EC_STATUS_REG 0x66 /* Status register of EC (R) */ ++#define EC_CNTL_REG 0x66 /* Controller command register of EC (W) */ ++#define EC_DATA_REG 0x62 /* EC data register (R/W) */ ++ ++#ifdef KERNEL26 ++ ++#include ++ ++#define KBD_STATUS_REG 0x64 /* Status register (R) */ ++#define KBD_CNTL_REG 0x64 /* Controller command register (W) */ ++#define KBD_DATA_REG 0x60 /* Keyboard data register (R/W) */ ++ ++#else ++ ++#ifndef KEY_MEDIA ++#define KEY_MEDIA 226 ++#endif ++ ++#define preempt_disable() do { } while (0) ++#define preempt_enable_no_resched() do { } while (0) ++#define preempt_enable() do { } while (0) ++#define preempt_check_resched() do { } while (0) ++#include ++ ++#endif ++ ++static inline int my_i8042_read_status(void) ++{ ++ return inb(KBD_STATUS_REG); ++} ++static int my_i8042_wait_write(void) ++{ ++ int i = 0; ++ while ((my_i8042_read_status() & 0x02) && (i < 10000)) { ++ udelay(50); ++ i++; ++ } ++ return -(i == 10000); ++} ++static void send_kbd_cmd(unsigned char cmd, unsigned char val) ++{ ++ if (usedritek) { ++ preempt_disable(); ++ if (!my_i8042_wait_write()) ++ outb(cmd, KBD_CNTL_REG); ++ if (!my_i8042_wait_write()) ++ outb(val, KBD_DATA_REG); ++ preempt_enable_no_resched(); ++ } else { ++ printk(KERN_INFO"acerhk: request for accessing EC ignored\n" ++ KERN_INFO"acerhk: Use of dritek keyboard extension not enabled, use module\n" ++ KERN_INFO"acerhk: parameter usedritek=1 to do that (possibly dangerous)\n"); ++ } ++} ++#ifdef ACERDEBUG ++static inline int my_i8042_read_ecstatus(void) ++{ ++ return inb(EC_STATUS_REG); ++} ++static int my_i8042_wait_ecwrite(void) ++{ ++ int i = 0; ++ while ((my_i8042_read_ecstatus() & 0x02) && (i < 10000)) { ++ udelay(50); ++ i++; ++ } ++ return -(i == 10000); ++} ++static void send_ec_cmd(unsigned char cmd, unsigned char val) ++{ ++ if (usedritek) { ++ preempt_disable(); ++ if (!my_i8042_wait_ecwrite()) ++ outb(cmd, EC_CNTL_REG); ++ if (!my_i8042_wait_ecwrite()) ++ outb(val, EC_DATA_REG); ++ preempt_enable_no_resched(); ++ } else { ++ printk(KERN_INFO"acerhk: request for accessing EC ignored\n" ++ KERN_INFO"acerhk: Use of dritek keyboard extension not enabled, use module\n" ++ KERN_INFO"acerhk: parameter usedritek=1 to do that (possibly dangerous)\n"); ++ } ++} ++#endif ++#ifdef ACERDEBUG ++static void enable_mute_led_ec(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling mute led via EC\n"); ++ send_kbd_cmd(0x59, 0x94); ++} ++static void disable_mute_led_ec(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling mute led via EC\n"); ++ send_kbd_cmd(0x59, 0x95); ++} ++static void enable_dmm_function(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling WLAN via EC variant 2\n"); ++ send_kbd_cmd(0x45, 0xd3); ++} ++#endif ++static void enable_wlan_ec_1(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling WLAN via EC variant 1\n"); ++ send_kbd_cmd(0xe7, 0x01); ++ acerhk_wlan_state = 1; ++} ++static void disable_wlan_ec_1(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling WLAN via EC variant 1\n"); ++ send_kbd_cmd(0xe7, 0x00); ++ acerhk_wlan_state = 0; ++} ++static void enable_bluetooth_ec_1(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling Bluetooth via EC variant 1\n"); ++ send_kbd_cmd(0xe7, 0x03); ++ acerhk_bluetooth_state = 1; ++} ++static void disable_bluetooth_ec_1(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling Bluetooth via EC variant 1\n"); ++ send_kbd_cmd(0xe7, 0x02); ++ acerhk_bluetooth_state = 0; ++} ++static void enable_wlan_ec_2(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling WLAN via EC variant 2\n"); ++ send_kbd_cmd(0x45, acerhk_bluetooth_state ? 0xa2 : 0xa0); ++ acerhk_wlan_state = 1; ++} ++static void disable_wlan_ec_2(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling WLAN via EC variant 2\n"); ++ send_kbd_cmd(0x45, acerhk_bluetooth_state ? 0xa1 : 0xa3); ++ acerhk_wlan_state = 0; ++} ++static void enable_bluetooth_ec_2(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling Bluetooth via EC variant 2\n"); ++ send_kbd_cmd(0x45, acerhk_wlan_state ? 0xa2 : 0xa1); ++ acerhk_bluetooth_state = 1; ++} ++static void disable_bluetooth_ec_2(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling Bluetooth via EC variant 2\n"); ++ send_kbd_cmd(0x45, acerhk_wlan_state ? 0xa0 : 0xa3); ++ acerhk_bluetooth_state = 0; ++} ++#ifdef ACERDEBUG ++static void enable_wireless_ec(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling wireless hardware\n"); ++ if (usedritek) { ++ preempt_disable(); ++ if (!my_i8042_wait_ecwrite()) ++ outb(0x4d, EC_CNTL_REG); ++ if (!my_i8042_wait_ecwrite()) ++ outb(0xd2, EC_DATA_REG); ++ if (!my_i8042_wait_ecwrite()) ++ outb(0x01, EC_DATA_REG); ++ preempt_enable_no_resched(); ++ } ++ acerhk_wlan_state = 1; ++} ++static void disable_wireless_ec(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling wireless hardware\n"); ++ if (usedritek) { ++ preempt_disable(); ++ if (!my_i8042_wait_ecwrite()) ++ outb(0x4d, EC_CNTL_REG); ++ if (!my_i8042_wait_ecwrite()) ++ outb(0xd2, EC_DATA_REG); ++ if (!my_i8042_wait_ecwrite()) ++ outb(0x00, EC_DATA_REG); ++ preempt_enable_no_resched(); ++ } ++ acerhk_wlan_state = 0; ++} ++#endif ++static void enable_dritek_keyboard(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling dritek keyboard extension\n"); ++ send_kbd_cmd(0x59, 0x90); ++} ++static void disable_dritek_keyboard(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling dritek keyboard extension\n"); ++ send_kbd_cmd(0x59, 0x91); ++} ++static void enable_mail_led_ec_1(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling mail led via EC variant 1\n"); ++ send_kbd_cmd(0xe8, 0x01); ++} ++static void disable_mail_led_ec_1(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling mail led via EC variant 1\n"); ++ send_kbd_cmd(0xe8, 0x00); ++} ++ ++static void enable_mail_led_ec_2(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling mail led via EC variant 2\n"); ++ send_kbd_cmd(0x59, 0x92); ++} ++static void disable_mail_led_ec_2(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling mail led via EC variant 2\n"); ++ send_kbd_cmd(0x59, 0x93); ++} ++static void enable_mail_led_ec_3(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: enabling mail led via EC variant 3\n"); ++ if (usedritek) { ++ preempt_disable(); ++ if (!my_i8042_wait_write()) ++ outl(0x80008894, 0xCF8); ++ if (!my_i8042_wait_write()) ++ outw(0xC061, 0xCFC); ++ preempt_enable_no_resched(); ++ } ++} ++static void disable_mail_led_ec_3(void) ++{ ++ if (verbose) ++ printk(KERN_INFO "acerhk: disabling mail led via EC variant 3\n"); ++ if (usedritek) { ++ preempt_disable(); ++ if (!my_i8042_wait_write()) ++ outl(0x80008894, 0xCF8); ++ if (!my_i8042_wait_write()) ++ outw(0xC060, 0xCFC); ++ preempt_enable_no_resched(); ++ } ++} ++ ++/* }}} */ ++ ++/* {{{ string search functions */ ++ ++/* This is the Colussi algorithm, the code is taken from ++ http://www-igm.univ-mlv.fr/~lecroq/string ++*/ ++int preColussi(char *x, int m, int *h, int *next, int *shift) ++{ ++ int i, k, nd, q, r, s; ++ int hmax[XSIZE], kmin[XSIZE], nhd0[XSIZE], rmin[XSIZE]; ++ /* Computation of hmax */ ++ i = k = 1; ++ do { ++ while (x[i] == x[i - k]) ++ i++; ++ hmax[k] = i; ++ q = k + 1; ++ while (hmax[q - k] + k < i) { ++ hmax[q] = hmax[q - k] + k; ++ q++; ++ } ++ k = q; ++ if (k == i + 1) ++ i = k; ++ } while (k <= m); /* Computation of kmin */ ++ memset(kmin, 0, m*sizeof(int)); ++ r = 0; ++ for (i = m; i >= 1; --i) ++ if (hmax[i] < m) ++ kmin[hmax[i]] = i; /* Computation of rmin */ ++ for (i = m - 1; i >= 0; --i) { ++ if (hmax[i + 1] == m) ++ r = i + 1; ++ if (kmin[i] == 0) ++ rmin[i] = r; ++ else ++ rmin[i] = 0; ++ } /* Computation of h */ ++ s = -1; ++ r = m; ++ for (i = 0; i < m; ++i) ++ if (kmin[i] == 0) ++ h[--r] = i; ++ else ++ h[++s] = i; ++ nd = s; /* Computation of shift */ ++ for (i = 0; i <= nd; ++i) ++ shift[i] = kmin[h[i]]; ++ for (i = nd + 1; i < m; ++i) ++ shift[i] = rmin[h[i]]; ++ shift[m] = rmin[0]; /* Computation of nhd0 */ ++ s = 0; ++ for (i = 0; i < m; ++i) { ++ nhd0[i] = s; ++ if (kmin[i] > 0) ++ ++s; ++ } /* Computation of next */ ++ for (i = 0; i <= nd; ++i) ++ next[i] = nhd0[h[i] - kmin[h[i]]]; ++ for (i = nd + 1; i < m; ++i) ++ next[i] = nhd0[m - rmin[h[i]]]; ++ next[m] = nhd0[m - rmin[h[m - 1]]]; return(nd); ++} ++ ++int COLUSSI(char *x, int m, char *y, int n) { ++ int i, j, last, nd, ++ h[XSIZE], next[XSIZE], shift[XSIZE]; /* Processing */ ++ int match_pos; /* position of first match */ ++ nd = preColussi(x, m, h, next, shift); /* Searching */ ++ i = j = 0; ++ last = -1; ++ match_pos = -1; ++ while ( (match_pos == -1) ++ && (j <= n - m) ) { ++ while (i < m && last < j + h[i] && ++ x[h[i]] == y[j + h[i]]) ++ i++; ++ if (i >= m || last >= j + h[i]) { ++ /* Match found, bail out */ ++ match_pos = j; ++ i = m; ++ } ++ if (i > nd) ++ last = j + m - 1; ++ j += shift[i]; ++ i = next[i]; ++ } ++ return match_pos; ++} ++ ++/* }}} */ ++ ++/* {{{ hardware access functions */ ++ ++/* call_bios_ ++ * ++ * call request handler in mapped system rom ++ * ++ * the request is handed over via all 6 general purpose registers, results are ++ * taken from them and copied back to buf ++ */ ++static asmlinkage void call_bios_6xx(struct register_buffer *buf) ++{ ++ if (bios_routine) { ++ local_irq_disable(); ++ __asm__ __volatile__( ++ "movl %1,%%edx\n\t" ++ "pusha\n\t" ++ "movl %%edx,%%ebp\n\t" ++ "movl (%%ebp),%%eax\n\t" ++ "movl 4(%%ebp),%%ebx\n\t" ++ "movl 8(%%ebp),%%ecx\n\t" ++ "movl 12(%%ebp),%%edx\n\t" ++ "movl 16(%%ebp),%%edi\n\t" ++ "movl 20(%%ebp),%%esi\n\t" ++ "pushl %%ebp\n\t" ++ "call *%0\n\t" ++ "popl %%ebp\n\t" ++ "movl %%eax, (%%ebp)\n\t" ++ "movl %%ebx, 4(%%ebp)\n\t" ++ "movl %%ecx, 8(%%ebp)\n\t" ++ "movl %%edx, 12(%%ebp)\n\t" ++ "movl %%edi, 16(%%ebp)\n\t" ++ "movl %%esi, 20(%%ebp)\n\t" ++ "popa\n\t" ++ : ++ :"m" (bios_routine), "m" (buf) ++ :"%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi", "%ebp" ++ ); ++ local_irq_enable(); ++ } ++} ++ ++static asmlinkage void call_bios_52x(struct register_buffer *buf) ++{ ++ if (bios_routine) { ++ local_irq_disable(); ++ __asm__ __volatile__( ++ "movl %2,%%edx\n\t" ++ "pusha\n\t" ++ "movl %%edx,%%ebp\n\t" ++ "movl (%%ebp),%%eax\n\t" ++ "movl 4(%%ebp),%%ebx\n\t" ++ "movl 8(%%ebp),%%ecx\n\t" ++ "movl 12(%%ebp),%%edx\n\t" ++ "movl 16(%%ebp),%%edi\n\t" ++ "movl 20(%%ebp),%%esi\n\t" ++ "pushl %%ebp\n\t" ++ "movl %1, %%ebp\n\t" ++ "call *%0\n\t" ++ "popl %%ebp\n\t" ++ "movl %%eax, (%%ebp)\n\t" ++ "movl %%ebx, 4(%%ebp)\n\t" ++ "movl %%ecx, 8(%%ebp)\n\t" ++ "movl %%edx, 12(%%ebp)\n\t" ++ "movl %%edi, 16(%%ebp)\n\t" ++ "movl %%esi, 20(%%ebp)\n\t" ++ "popa\n\t" ++ : ++ :"m" (bios_routine), "m" (preg400), "m" (buf) ++ :"%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi", "%ebp" ++ ); ++ local_irq_enable(); ++ } ++} ++ ++#define PRINT_BUFFER(x) \ ++ printk(KERN_INFO"acerhk: eax=0x%x ebx=0x%x ecx=0x%x edx=0x%x\n" \ ++ "acerhk: edi=0x%x esi=0x%x ebp=0x%x\n", \ ++ x.eax, x.ebx, x.ecx, x.edx, x.edi, x.esi, x.ebp); ++ ++/* get_fnkey_event ++ * ++ * gets the first (oldest) key id from the queue of events ++ * ++ * return value: id of key ++ */ ++static int get_fnkey_event(void) ++{ ++ struct register_buffer regs; ++ regs.eax = 0x9610; ++ regs.ebx = 0x61C; ++ /* clear other registers, some models need this */ ++ regs.ecx = 0; ++ regs.edx = 0; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ return regs.eax & 0xffff; ++} ++ ++/* get_thermal_event ++ * ++ * does what? ++ * ++ * return value: event ? ++ */ ++static int get_thermal_event(void) ++{ ++ struct register_buffer regs; ++ if (acerhk_model_features & TM_F_THERMAL) { ++ regs.eax = 0x9612; ++ regs.ebx = 0x12e; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: thermal event = 0x%x\n", regs.eax); ++ } else { ++ regs.eax = 0x00; ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: thermal event not supported\n"); ++ } ++ return regs.eax & 0xffff; ++} ++ ++#ifdef ACERDEBUG ++/* pbutton_fct ++ * ++ * does what? ++ * ++ * return value: ? ++ */ ++static int pbutton_fct(void) ++{ ++ struct register_buffer regs; ++ if (acerhk_model_features & TM_F_PBUTTON) { ++ regs.eax = 0x9612; ++ regs.ebx = 0x10b; ++ regs.ecx = 0x2; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: pbutton = 0x%x\n", regs.eax); ++ } else { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: pbutton function not supported\n"); ++ regs.eax = 0x00; ++ } ++ return regs.eax & 0xffff; ++} ++#endif ++ ++/* wbutton_fct_1 ++ * ++ * turn on installed Bluetooth hardware together with the corresponding LED ++ * ++ * val: 0 turns off the LED ++ * 1 turns the LED to green/blue ++ * ++ * return value: ? ++ */ ++static int wbutton_fct_1(int val) ++{ ++ struct register_buffer regs; ++ if (acerhk_model_features & TM_F_WBUTTON) { ++ acerhk_bluetooth_state = val; ++ regs.eax = 0x9610; ++ regs.ebx = ((val & 0xff) << 8) | 0x34; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: wbutton1 = 0x%x\n", regs.eax); ++ } else { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: wbutton function 1 not supported\n"); ++ regs.eax = 0x00; ++ } ++ return regs.eax & 0xffff; ++} ++ ++/* wbutton_fct_2 ++ * ++ * turn on installed WLAN hardware together with the corresponding LED ++ * ++ * val: 0 turns off the LED ++ * 1 turns the LED to orange ++ * ++ * return value: ? ++ */ ++static int wbutton_fct_2(int val) ++{ ++ struct register_buffer regs; ++ if (acerhk_model_features & TM_F_WBUTTON) { ++ acerhk_wlan_state = val; ++ regs.eax = 0x9610; ++ regs.ebx = ((val & 0xff) << 8) | 0x35; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: wbutton2 = 0x%x\n", regs.eax); ++ } else { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: wbutton function 2 not supported\n"); ++ regs.eax = 0x00; ++ } ++ return regs.eax & 0xffff; ++} ++ ++/* get_cmos_index ++ * ++ * gets index of CMOS port from ROM. The number of events is monitored ++ * in this port. ++ * ++ * return value: index of CMOS port ++ */ ++static int get_cmos_index(void) ++{ ++ struct register_buffer regs; ++ regs.eax = 0x9610; ++ regs.ebx = 0x51C; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ cmos_index = regs.ecx & 0xff; ++ if (verbose) ++ printk(KERN_INFO"acerhk: cmos index set to 0x%x\n", cmos_index); ++ return cmos_index; ++} ++ ++/* get_nr_events ++ * ++ * gets the number of cached events (keys pressed) in queue. Up to 31 events ++ * are cached. ++ * ++ * return value: number of events in queue ++ */ ++static int get_nr_events(void) ++{ ++ unsigned long flags; ++ unsigned char c = 0; ++ ++ spin_lock_irqsave (&rtc_lock, flags); ++#ifndef DUMMYHW ++ if (cmos_index) ++ c = CMOS_READ(cmos_index); ++ else if (verbose > 3) ++ printk(KERN_INFO"acerhk: get_nr_events - no valid cmos index set\n"); ++#endif ++ spin_unlock_irqrestore (&rtc_lock, flags); ++ return c; ++} ++ ++/* set_mail_led ++ * ++ * change state of mail led ++ * ++ * val: 0 - switch led off ++ * 1 - switch led on (blinking) ++ * ++ * return value: 1 - action succesfull (val valid) ++ * 0 - no action taken (val invalid) ++ */ ++static int set_mail_led(int val) ++{ ++ struct register_buffer regs; ++ if (acerhk_model_features & TM_F_MAIL_LED) { ++ regs.eax = 0x9610; ++ regs.ebx = ((val & 0xff) << 8) | 0x31; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: mail led set to = 0x%x\n", val); ++ } else if (acerhk_model_features & TM_F_MAIL_LED_EC) { ++ if (val == 1) ++ enable_mail_led_ec_1(); ++ else if (val == 0) ++ disable_mail_led_ec_1(); ++ } else if (acerhk_model_features & TM_F_MAIL_LED_EC2) { ++ if (val == 1) ++ enable_mail_led_ec_2(); ++ else if (val == 0) ++ disable_mail_led_ec_2(); ++ } else if (acerhk_model_features & TM_F_MAIL_LED_EC3) { ++ if (val == 1) ++ enable_mail_led_ec_3(); ++ else if (val == 0) ++ disable_mail_led_ec_3(); ++ } else { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: mail led not supported\n"); ++ regs.eax = 0x00; ++ } ++ return regs.eax & 0xffff; ++} ++ ++/* launch_connect ++ * ++ * does what? ++ * val: 1 - only known value from windows driver ++ */ ++static int launch_connect(int val) ++{ ++ struct register_buffer regs; ++ if (acerhk_model_features & TM_F_CONNECT) { ++ regs.eax = 0x9610; ++ regs.ebx = ((val & 0xff) << 8) | 0x2e; ++ preempt_disable(); ++ call_bios(®s); ++ preempt_enable_no_resched(); ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: connect(%d) = 0x%x\n", val, regs.eax); ++ } else { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: connect not supported\n"); ++ regs.eax = 0x00; ++ } ++ return regs.eax & 0xffff; ++} ++ ++/* }}} */ ++ ++/* {{{ hardware probing */ ++ ++static struct proc_dir_entry *proc_acer_dir; ++ ++static unsigned int __init find_hk_area(void) ++{ ++ int offset, sig; ++ unsigned int fkt; ++ fkt = 0; ++ sig = -1; /* offset to signature in io area */ ++ /* Look for signature, start at 0xf0000, search until 0xffff0 */ ++ for (offset = 0;offset < 0xfffd; offset += 16) { ++ if (readl(reg1 + offset) == 0x30552142) { ++ sig = offset; ++ offset = 0xffff; ++ } ++ } ++ if (sig < 0) ++ printk(KERN_WARNING"acerhk: could not find request handler, possibly not all functions available\n"); ++ else { ++ /* compute location of bios routine */ ++ fkt = readl(reg1 + sig + 5); ++ /* adjust fkt to address of mapped IO area */ ++ if (fkt >= 0xf0000) ++ fkt = (unsigned int)reg1 + fkt - 0xf0000; ++ else if (fkt >= 0xe0000) ++ fkt = (unsigned int)reg1 + fkt - 0xe0000; ++ else ++ fkt = 0; ++ } ++ return fkt; ++} ++ ++static void print_features(void) ++{ ++ int i; ++ printk(KERN_INFO"acerhk: supported keys:"); ++ for (i = 0; i < 255; i++) { ++ switch (acerhk_key2name[i]) { ++ case k_help: printk(" help"); break; ++ case k_setup: printk(" setup"); break; ++ case k_p1: printk(" p1"); break; ++ case k_p2: printk(" p2"); break; ++ case k_p3: printk(" p3"); break; ++ case k_www: printk(" www"); break; ++ case k_mail: printk(" mail"); break; ++ case k_wireless: printk(" wireless"); break; ++ case k_power: printk(" power"); break; ++ case k_mute: printk(" mute"); break; ++ case k_volup: printk(" volup"); break; ++ case k_voldn: printk(" voldn"); break; ++ case k_res: printk(" res"); break; ++ case k_close: printk(" close"); break; ++ case k_open: printk(" open"); break; ++ case k_wireless2: printk(" wireless2"); break; ++ case k_play: printk(" play"); break; ++ case k_stop: printk(" stop"); break; ++ case k_prev: printk(" prev"); break; ++ case k_next: printk(" next"); break; ++ case k_display: printk(" display"); break; ++ default: break; ++ } ++ } ++ printk("\n"); ++ if (acerhk_model_features & TM_F_MUTE_LED_EC) ++ printk(KERN_INFO"acerhk: mute led is supported\n"); ++ if (acerhk_model_features & TM_F_MAIL_LED) ++ printk(KERN_INFO"acerhk: mail led is supported\n"); ++ else if (acerhk_model_features & TM_F_MAIL_LED_EC) ++ printk(KERN_INFO"acerhk: mail led (EC) is supported\n"); ++ else if (acerhk_model_features & TM_F_MAIL_LED_EC2) ++ printk(KERN_INFO"acerhk: mail led (EC2) is supported\n"); ++ else if (acerhk_model_features & TM_F_MAIL_LED_EC3) ++ printk(KERN_INFO"acerhk: mail led (EC3) is supported\n"); ++ if (acerhk_model_features & TM_F_WLAN_EC1) ++ printk(KERN_INFO"acerhk: wlan control (EC1) is supported\n"); ++ else if (acerhk_model_features & TM_F_WLAN_EC2) ++ printk(KERN_INFO"acerhk: wlan control (EC2) is supported\n"); ++ if (acerhk_model_features & TM_F_BLUE_EC1) ++ printk(KERN_INFO"acerhk: bluetooth control (EC1) is supported\n"); ++ else if (acerhk_model_features & TM_F_BLUE_EC2) ++ printk(KERN_INFO"acerhk: bluetooth control (EC2) is supported\n"); ++ printk(KERN_INFO"acerhk: supported functions:"); ++ if (acerhk_model_features & TM_F_CONNECT) ++ printk(" connect"); ++ if (acerhk_model_features & TM_F_THERMAL) ++ printk(" thermal"); ++ if (acerhk_model_features & TM_F_PBUTTON) ++ printk(" pbutton"); ++ if (acerhk_model_features & TM_F_WBUTTON) ++ printk(" wbutton"); ++ printk("\n"); ++} ++ ++static void __init setup_keymap_model(unsigned int series) ++{ ++ /* clear mapping keycode -> keyname, */ ++ memset(&acerhk_key2name[0], k_none, sizeof(acerhk_key2name)); ++ /* first set the common keys, namely FnF1 and FnF2, */ ++ acerhk_key2name[1] = k_help; ++ acerhk_key2name[2] = k_setup; ++ /* then set known keycodes according to model */ ++ switch (series) { ++ case 110: ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[3] = k_power; ++ acerhk_key2name[8] = k_mute; ++ acerhk_key2name[32] = k_volup; ++ acerhk_key2name[33] = k_voldn; ++ /* C110 generates 2 extra codes when opening/closing the lid */ ++ acerhk_key2name[74] = k_close; ++ acerhk_key2name[75] = k_open; ++ break; ++ case 300: /* treat C300 like C100 with Bluetooth button */ ++ acerhk_key2name[68] = k_wireless2; ++ case 100: ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[49] = k_www; ++ acerhk_key2name[54] = k_mail; ++ acerhk_key2name[3] = k_power; ++ acerhk_key2name[8] = k_mute; ++ acerhk_key2name[32] = k_volup; ++ acerhk_key2name[33] = k_voldn; ++ break; ++ default: ++ /* only the two common keys are supported */ ++ break; ++ case 210: ++ acerhk_key2name[19] = k_p1; ++ acerhk_key2name[20] = k_p2; ++ acerhk_key2name[17] = k_www; ++ acerhk_key2name[18] = k_mail; ++ break; ++ case 220: ++ case 260: /* 260 with same keys? */ ++ acerhk_key2name[49] = k_p1; ++ acerhk_key2name[19] = k_p2; ++ acerhk_key2name[18] = k_www; ++ acerhk_key2name[17] = k_mail; ++ break; ++ case 230: ++ case 280: /* 280 with same keys? */ ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ break; ++ case 1500: ++ acerhk_key2name[0x49] = k_setup; ++ acerhk_key2name[0x36] = k_www; ++ acerhk_key2name[0x31] = k_mail; ++ acerhk_key2name[0x11] = k_p1; ++ acerhk_key2name[0x12] = k_p2; ++ acerhk_key2name[0x30] = k_wireless; ++ acerhk_key2name[0x44] = k_wireless2; ++ acerhk_key2name[0x03] = k_power; ++ break; ++ case 240: ++ acerhk_key2name[0x31] = k_www; ++ acerhk_key2name[0x36] = k_mail; ++ acerhk_key2name[0x11] = k_p1; ++ acerhk_key2name[0x12] = k_p2; ++ acerhk_key2name[0x44] = k_wireless; ++ acerhk_key2name[0x30] = k_wireless2; ++ acerhk_key2name[0x03] = k_power; ++ acerhk_key2name[0x08] = k_mute; ++ // acerhk_key2name[] = k_volup; ++ // acerhk_key2name[] = k_voldn; ++ break; ++ case 2900: ++ acerhk_key2name[0x31] = k_mail; /* with led */ ++ acerhk_key2name[0x36] = k_www; ++ acerhk_key2name[0x11] = k_p1; ++ acerhk_key2name[0x12] = k_p2; ++ acerhk_key2name[0x30] = k_wireless; /* wireless, with led, related with autowlan=1 */ ++ break; ++ case 250: /* enriqueg@altern.org */ ++ /* TravelMate 254LMi_DT manual common for 240/250 series, but key order ++ differ from 240 already present on acerhk driver */ ++ /* TravelMate 254LMi_DT: 6 buttons: left to right: mail, www, p1, p2, bluetooth, wireless */ ++ acerhk_key2name[0x31] = k_mail; /* with led */ ++ acerhk_key2name[0x36] = k_www; ++ acerhk_key2name[0x11] = k_p1; ++ acerhk_key2name[0x12] = k_p2; ++ acerhk_key2name[0x44] = k_wireless2; /* bluetooth, hw optional */ ++ acerhk_key2name[0x30] = k_wireless; /* wireless, with led, related with autowlan=1 */ ++ acerhk_key2name[0x03] = k_power; /* Fn+F3 */ ++ acerhk_key2name[0x08] = k_mute; /* Fn+F8 */ ++ break; ++ case 380: ++ /* TM 380 has same codes as TM 370, with an additional one */ ++ acerhk_key2name[0x03] = k_power; ++ case 370: ++ acerhk_key2name[0x30] = k_wireless; ++ acerhk_key2name[0x11] = k_p1; ++ acerhk_key2name[0x12] = k_p2; ++ acerhk_key2name[0x13] = k_p3; ++ acerhk_key2name[0x36] = k_www; ++ acerhk_key2name[0x31] = k_mail; ++ break; ++ case 360: ++ /* 360 series has the same layout as 350, with an ++ additional wireless key */ ++ acerhk_key2name[64] = k_wireless; ++ case 350: ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[20] = k_p3; ++ acerhk_key2name[21] = k_www; ++ acerhk_key2name[19] = k_mail; ++ break; ++ case 520: ++ acerhk_key2name[19] = k_p1; ++ acerhk_key2name[20] = k_p2; ++ acerhk_key2name[17] = k_www; ++ acerhk_key2name[18] = k_mail; ++ break; ++ case 610: ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[19] = k_p3; ++ acerhk_key2name[21] = k_www; ++ acerhk_key2name[20] = k_mail; ++ acerhk_key2name[64] = k_wireless; ++ break; ++ case 630: ++ /* 630 has all keys of 620 plus one */ ++ acerhk_key2name[8] = k_mute; ++ case 620: ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[19] = k_p3; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[3] = k_power; ++ acerhk_key2name[32] = k_volup; ++ acerhk_key2name[33] = k_voldn; ++ break; ++ case 290: ++ case 420: ++ case 430: ++ case 530: ++ case 540: ++ case 650: ++ case 660: ++ case 800: ++ case 1450: ++ case 2300: ++ case 2350: ++ case 4000: ++ case 4050: ++ case 6000: ++ case 8000: ++ case 4100: ++ case 4150: ++ case 4500: ++ case 4600: ++ case 4650: ++ case 1680: ++ case 1690: ++ /* keys are handled by dritek EC */ ++ acerhk_key2name[1] = k_none; ++ acerhk_key2name[2] = k_none; ++ break; ++ case 1300: ++ case 1310: ++ case 1350: ++ case 1360: ++ case 1400: ++ case 1700: ++ case 1800: ++ case 2000: ++ case 2010: ++ case 2020: ++ /* Aspire 13xx series laptops use dritek hardware, no ++ acerhk-mapping needed ++ VolUp and VolDown are managed as normal keys ++ 1300/1310 series should have P1, P2, Mail, WWW, Mute buttons ++ 1353 has bluetooth, wifi, p1, p2, www, mail, help, setup, power ++ and mute ++ Aspire 1400/1450/Ferrari use dritek EC, too ++ 1450 should have bluetooth, wifi, p1, p2, www, mail, help, ++ setup, power and mute ++ Aspire 1700 uses dritek EC, too ++ 1700 should have bluetooth, wifi, p1, p2, www, mail, help, ++ setup, power and mute ++ need the MM-buttons Activation? (forward, shuffle, ...) ++ 2000 hast lots of MM buttons ++ 2010 should have bluetooth, wifi, p1, p2, www, mail, help, ++ setup, power and mute ++ */ ++ acerhk_key2name[1] = k_none; ++ acerhk_key2name[2] = k_none; ++ break; ++ case 1600: ++ /* Aspire 1600 has acer keycode 0x49 for FnF2 */ ++ acerhk_key2name[73] = k_setup; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[19] = k_p3; ++ acerhk_key2name[3] = k_power; ++ acerhk_key2name[8] = k_mute; ++ /* VolUp and VolDown keys doesn't seem to be managed as special keys ++ but as normal keys ! */ ++ break; ++ case 5020: /* Aspire 5020 has 0x6a for Fn+F2 */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[106] = k_setup; ++ acerhk_key2name[3] = k_power; ++ acerhk_key2name[5] = k_display; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[68] = k_wireless2; ++ break; ++ case 2410: /* TM 2410 is very similar to Aspire 5020, but has 0x6s for Fn-F3 */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[106] = k_setup; ++ acerhk_key2name[109] = k_power; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[68] = k_wireless2; ++ break; ++ case 40100: ++ /* Medion MD40100, 4 keys */ ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[55] = k_res; ++ break; ++ case 96500: ++ case 95400: ++ /* Medion MD95400, many keys */ ++ acerhk_key2name[49] = k_mail; /* 1 */ ++ acerhk_key2name[54] = k_www; /* 2 */ ++ acerhk_key2name[48] = k_wireless; /* 3 */ ++ acerhk_key2name[68] = k_wireless2; /* 4 (Bluetooth) */ ++ ++ acerhk_key2name[17] = k_p1; /* 5 */ ++ acerhk_key2name[18] = k_p2; /* 6 */ ++ acerhk_key2name[36] = k_play; /* 7 */ ++ acerhk_key2name[37] = k_stop; /* 8 */ ++ acerhk_key2name[34] = k_prev; /* 9 */ ++ acerhk_key2name[35] = k_next; /* 10 */ ++ acerhk_key2name[33] = k_voldn; /* 11 */ ++ acerhk_key2name[32] = k_volup; /* 12 */ ++ acerhk_key2name[38] = k_p3; /* 13 */ ++ acerhk_key2name[8] = k_mute; /* 14 */ ++ ++ acerhk_key2name[1] = k_help; /* FN+F1 (Help) */ ++ acerhk_key2name[5] = k_display; /* FN+F3 (Display switch) */ ++ acerhk_key2name[6] = k_res; /* FN+F4 (Display ein/ausschalten) */ ++ break; ++ case 42200: ++ /* Medion MD42200, 7 keys, no setup */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[5] = k_display; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ break; ++ case 9783: ++ /* Medion MD9783, 6 keys + info, no setup */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[19] = k_p3; ++ acerhk_key2name[8] = k_mute; ++ break; ++ case 7400: ++ /* Amilo Pro V2000 does not have Help and Setup key (?) ++ Amilo M 7400 has Help key, disabling only setup ++ */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ break; ++ case 1559: ++ acerhk_key2name[6] = k_display; /* FN+F4 (Display ein/ausschalten) */ ++ case 1555: ++ /* AOpen (Ahtec Signal 1555M) is similar to FS Amilo M */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[48] = k_wireless; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[34] = k_prev; ++ acerhk_key2name[35] = k_next; ++ acerhk_key2name[36] = k_play; ++ acerhk_key2name[37] = k_stop; ++ break; ++ case 6800: ++ case 7820: ++ /* Amilo D does not have Setup key */ ++ acerhk_key2name[2] = k_none; ++ acerhk_key2name[49] = k_mail; ++ acerhk_key2name[54] = k_www; ++ acerhk_key2name[17] = k_p1; ++ acerhk_key2name[18] = k_p2; ++ acerhk_key2name[19] = k_p3; ++ acerhk_key2name[8] = k_mute; ++ break; ++ } ++} ++ ++static void __init setup_model_features(unsigned int series) ++{ ++ switch (series) { ++ case 200: ++ case 210: ++ case 520: ++ /* nothing special */ ++ acerhk_model_features = 0; ++ acerhk_type = TM_old; ++ break; ++ case 220: ++ case 230: ++ case 260: ++ case 280: ++ case 360: ++ case 40100: /* Medion MD40100 */ ++ case 95400: /* Medion MD95400 */ ++ case 96500: /* Medion MD96500 */ ++ /* all special functions, no mail led */ ++ acerhk_model_features = 0x00f00000; ++ acerhk_type = TM_new; ++ break; ++ case 42200: /* Medion MD42200 */ ++ /* has WLAN button, should call connect() */ ++ acerhk_model_features = TM_F_WBUTTON | TM_F_CONNECT; ++ acerhk_type = TM_old; ++ break; ++ case 9783: /* Medion MD9783 */ ++ /* only email led */ ++ acerhk_model_features = TM_F_MAIL_LED; ++ acerhk_type = TM_new; ++ break; ++ case 1600: ++ acerhk_type = TM_new; ++ /* Do Aspire 1600 series have special functions or not ? I enable ++ them, perhaps it helps with problems Francois Valenduc has */ ++ acerhk_model_features = 0x00f00000; ++ break; ++ case 300: ++ case 100: ++ case 110: ++ case 240: ++ case 350: ++ case 610: ++ case 620: ++ case 630: ++ /* all special functions, mail led */ ++ acerhk_model_features = TM_F_MAIL_LED | 0x00f00000; ++ acerhk_type = TM_new; ++ break; ++ case 370: ++ case 380: ++ case 2410: ++ case 2900: /* Medion MD2900 */ ++ case 2100: /* TM 2100 uses same driver as 5020 */ ++ case 5020: /* Aspire 5020 is still old hardware */ ++ acerhk_model_features = TM_F_MAIL_LED | TM_F_CONNECT| TM_F_WBUTTON; ++ acerhk_type = TM_new; ++ break; ++ case 7400: ++ case 1555: ++ case 1559: ++ /* all special functions for Fujitsu-Siemens Amilo M7400, Pro V2000; AOpen */ ++ acerhk_model_features = 0x00f00000; ++ acerhk_type = TM_new; ++ break; ++ case 6800: ++ case 7820: ++ /* mail led and all special functions for FS Amilo D */ ++ acerhk_model_features = TM_F_MAIL_LED | 0x00f00000; ++ acerhk_type = TM_new; ++ break; ++ case 2350: ++ case 4050: ++ acerhk_wlan_state = 1; // Default state is on ++ case 290: ++ /* no special functions, wireless hardware controlled by EC */ ++ acerhk_model_features = TM_F_WLAN_EC2 | TM_F_BLUE_EC2; ++ acerhk_type = TM_dritek; ++ break; ++ case 650: ++ case 1300: ++ case 1310: ++ case 1400: ++ case 1700: ++ /* all special functions, wireless hardware can be controlled */ ++ acerhk_model_features = 0x00f00000; ++ acerhk_type = TM_dritek; ++ break; ++ case 4100: ++ case 4600: ++ case 1680: ++ case 1690: /* Aspire 1680/1690 should be similar to TM 4100/4600 */ ++ /* mail led, wireless and bluetooth controlled the old way, but keys are ++ controlled by normal keyboard controller, so mark as dritek and ++ deactivate dritek use */ ++ acerhk_model_features = TM_F_MAIL_LED | TM_F_WBUTTON; ++ acerhk_type = TM_dritek; ++ usedritek=0; ++ break; ++ case 660: ++ case 800: ++ /* all special functions, mail led */ ++ acerhk_model_features = TM_F_MAIL_LED | 0x00f00000; ++ acerhk_type = TM_dritek; ++ break; ++ case 1350: ++ case 1360: ++ /* mail led, handled by EC, wireless HW is not (yet) controllable ? */ ++ acerhk_model_features = TM_F_MAIL_LED_EC|TM_F_WLAN_EC1; ++ acerhk_type = TM_dritek; ++ break; ++ case 1450: ++ /* Bluetooth/Wlan led, Mail led handled by EC (variant 3) */ ++ acerhk_model_features = TM_F_MAIL_LED_EC3|TM_F_WBUTTON; ++ acerhk_type = TM_dritek; ++ break; ++ case 1500: ++ /* Bluetooth/Wlan led */ ++ acerhk_model_features = TM_F_WBUTTON; ++ acerhk_type = TM_new; ++ break; ++ case 420: ++ case 430: ++ /* all functions and dritek EC, mail LED is handled by EC, second ++ variant. An additional led is available, mute. (really?) ++ */ ++ acerhk_type = TM_dritek; ++ acerhk_model_features = TM_F_MUTE_LED_EC|TM_F_MAIL_LED_EC2; ++ break; ++ case 2300: ++ case 4000: ++ case 4500: ++ /* wireless hardware, hopefully under control of my driver */ ++ acerhk_type = TM_dritek; ++ acerhk_model_features = TM_F_BLUE_EC1|TM_F_WLAN_EC1; ++ break; ++ case 3200: ++ /* test, if this model uses old style wlan control */ ++ acerhk_model_features = TM_F_WBUTTON; ++ acerhk_type = TM_dritek; ++ break; ++ case 6000: ++ case 8000: ++ /* 6000 and 8000 have wireless hardware, but I don't know how to handle, ++ so I choose no features */ ++ acerhk_type = TM_dritek; ++ break; ++ case 530: ++ case 540: ++ case 2000: ++ /* No features (?) dritek EC, mail LED is handled by EC but ++ different from other Aspire series */ ++ acerhk_type = TM_dritek; ++ acerhk_model_features = TM_F_MAIL_LED_EC2; ++ break; ++ case 4150: ++ case 4650: ++ /* Dritek EC, bluetooth, wifi, mail */ ++ /* According to Andreas Stumpfl his TM 4652LMi does also work as series ++ 3200, which might mean that the BIOS function accesses the EC */ ++ acerhk_type = TM_dritek; ++ acerhk_model_features = TM_F_MAIL_LED_EC2 | TM_F_WLAN_EC2 | TM_F_BLUE_EC2; ++ break; ++ case 1800: ++ case 2010: ++ case 2020: ++ /* Dritek EC, bluetooth, wifi, mail */ ++ acerhk_type = TM_dritek; ++ acerhk_model_features = TM_F_MAIL_LED_EC2 | TM_F_WLAN_EC2 | TM_F_BLUE_EC2; ++ acerhk_wlan_state = 1; // Default state is on ++ break; ++ case 250: /* enriqueg@altern.org */ ++ /* TravelMate254LMi_DT : mail led, bluetooth (button present, hw optional), wifi (with led) */ ++ acerhk_model_features = TM_F_MAIL_LED| ++ TM_F_WBUTTON ; ++ acerhk_type = TM_new; ++ acerhk_wlan_state = 0; //Initial state is off on 254LMi_DT ++ break; ++ default: ++ /* nothing special */ ++ acerhk_model_features = 0; ++ acerhk_type = TM_unknown; ++ break; ++ } ++ /* set the correct bios call function according to type */ ++ if ((acerhk_type == TM_new) || (acerhk_type == TM_dritek)) { ++ call_bios = call_bios_6xx; ++ if (verbose > 2) ++ printk(KERN_INFO"acerhk: using call_bios_6xx mode\n"); ++ } else { ++ call_bios = call_bios_52x; ++ if (verbose > 2) ++ printk(KERN_INFO"acerhk: using call_bios_52x mode\n"); ++ } ++ /* remove key file on dritek hardware */ ++ if (acerhk_type == TM_dritek) { ++ remove_proc_entry("key", proc_acer_dir); ++ } ++ /* setup available keys */ ++ setup_keymap_model(acerhk_series); ++ if (verbose > 1) ++ print_features(); ++} ++ ++static unsigned int __init determine_laptop_series(char * str) ++{ ++ /* 0 means unknown series, handled like TM 200 */ ++ unsigned int series = 0; ++ if (strncmp(str, "TravelMate ", 11) == 0) { ++ switch (str[11]) { ++ case 'C': ++ if (str[12] == '1') { ++ if (str[13] == '0') { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates TM C100 series\n"); ++ series = 100; ++ } else if (str[13] == '1') { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates TM C110 series\n"); ++ series = 110; ++ } ++ } else if (str[12] == '3') { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates TM C300 series\n"); ++ series = 300; ++ } ++ break; ++ case 'F': ++ if (str[12] == '4') { ++ series = 230; ++ } ++ break; ++ case '2': ++ if (str[14] == '0') { ++ /* newer Travelmate 2xxx series */ ++ switch (str[12]) { ++ case '0': ++ case '5': ++ series = 2000; // 2000 and 2500 are the same ++ break; ++ case '1': ++ if (str[13] == '0') ++ series = 2100; ++ break; ++ case '2': ++ case '7': ++ series = 2200; // 2200 and 2700 are the same ++ break; ++ case '3': ++ if (str[13] == '0') ++ series = 4000; // 2300 is the same as 4000 ++ else if (str[13] == '5') ++ series = 4050; // 2350 is the same as 4050 ++ break; ++ case '4': ++ if (str[13] == '1') ++ series = 2410; ++ break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 2xxx series\n"); ++ break; ++ } ++ } else { ++ /* older Travelmate 2xx series */ ++ switch (str[12]) { ++ case '0': series = 200; break; ++ case '1': series = 210; break; ++ case '2': series = 220; break; ++ case '4': series = 240; break; ++ case '5': series = 250; break; /* enriqueg@altern.org */ ++ case '6': series = 260; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 2xx series\n"); ++ break; ++ } ++ } ++ break; ++ case '3': ++ switch (str[12]) { ++ case '0': series = 3200; break; /* TM 3000 works like TM 3200 */ ++ /* Travelmate 3xx series */ ++ case '5': series = 350; break; ++ case '6': series = 360; break; ++ case '7': series = 370; break; ++ case '8': series = 380; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 3xx series\n"); ++ break; ++ } ++ break; ++ case '4': ++ if ( (strnlen(str, ACERHK_MODEL_STRLEN-1) == 15) && ++ (str[14] == '0') ) { /* Travelmate 4xxx series */ ++ switch (str[12]) { ++ case '0': /* 4000 and 4500 are the same */ ++ case '5': ++ series = 4000; ++ break; ++ case '1': ++ case '6': /* 4100 and 4600 are the same */ ++ series = 4100; ++ break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 4xxx series\n"); ++ break; ++ } ++ } else { /* Travelmate 4xx series */ ++ switch (str[12]) { ++ case '2': series = 420; break; ++ case '3': series = 430; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 4xx series\n"); ++ break; ++ } ++ } ++ break; ++ case '5': /* Travelmate 5xx series */ ++ if (str[12] == '2') ++ series = 520; ++ else if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 5xx series\n"); ++ break; ++ case '6': /* older Travelmate 6xx series */ ++ switch (str[12]) { ++ case '1': series = 610; break; ++ case '2': series = 620; break; ++ case '3': series = 630; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM 6xx series\n"); ++ break; ++ } ++ break; ++ default: ++ printk(KERN_INFO"acerhk: model string indicates unknown TM xxx series\n"); ++ break; ++ } ++ if (series && verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates TM %d series\n", series); ++ } ++ /* newer Travelmate series do not have a space after 'TravelMate' */ ++ else if (strncmp(str, "TravelMate", 10) == 0) { ++ switch (str[10]) { ++ case '2': ++ if (str[11] == '9') { ++ series = 290; ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM2xx series\n"); ++ } ++ break; ++ case '3': ++ if (str[11] == '2' && str[14] == '3') { ++ // TM 3200 uses "TravelMate32003" ++ series = 3200; ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM3xxx series\n"); ++ } ++ break; ++ case '4': ++ switch (str[11]) { ++ case '3': series = 430; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM4xx series\n"); ++ break; ++ } ++ break; ++ case '5': ++ switch (str[11]) { ++ case '3': series = 530; break; ++ case '4': series = 540; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM5xx series\n"); ++ break; ++ } ++ break; ++ case '6': ++ switch (str[11]) { ++ case '5': series = 650; break; ++ case '6': series = 660; break; ++ case '0': ++ if (strncmp(str, "TravelMate60003", 15) == 0) { ++ series = 6000; break; ++ } ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM6xx series\n"); ++ break; ++ } ++ break; ++ case '8': ++ if (strncmp(str, "TravelMate80003", 15) == 0) { ++ series = 8000; ++ } else if (str[11] == '0') { ++ series = 800; ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown TM8xx series\n"); ++ } ++ break; ++ default: ++ printk(KERN_INFO"acerhk: model string indicates unknown TMxxx series\n"); ++ break; ++ } ++ if (series && verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates TM%d series\n", series); ++ } ++ else if (strncmp(str, "Aspire ", 7) == 0) { ++ switch(str[7]) { ++ case '1': /* Aspire 1xxx series */ ++ switch(str[8]) { ++ case '3': /* Aspire 13xx series */ ++ switch (str[9]) { ++ case '0': series = 1300; break; ++ case '1': series = 1310; break; ++ case '5': series = 1350; break; ++ case '6': series = 1360; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 13xx series\n"); ++ break; ++ } ++ break; ++ case '4': /* Aspire 14xx series */ ++ switch (str[9]) { ++ case '0': series = 1400; break; ++ case '5': series = 1450; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 14xx series\n"); ++ break; ++ } ++ break; ++ case '5': series = 1500; break; ++ case '6': /* Aspire 14xx series */ ++ switch (str[9]) { ++ case '0': series = 1600; break; ++ case '8': ++ case '9': series = 1680; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 16xx series\n"); ++ break; ++ } ++ break; ++ case '7': series = 1700; break; ++ case '8': series = 1800; break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 1xxx series\n"); ++ break; ++ } ++ break; ++ case '2': /* Aspire 2xxx series */ ++ if (str[8] == '0') { ++ switch (str[9]) { ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 20xx series\n"); ++ break; ++ case '0': series = 2000; break; ++ case '1': series = 2010; break; ++ case '2': series = 2020; break; ++ } ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 2xxx series\n"); ++ } ++ break; ++ case '3': /* Aspire 3xxx series */ ++ if (str[8] == '0') { ++ switch (str[9]) { ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 30xx series\n"); ++ break; ++ case '2': series = 5020; break; /* Aspire 3020/5020 are identical */ ++ } ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 3xxx series\n"); ++ } ++ break; ++ case '5': /* Aspire 5xxx series */ ++ if (str[8] == '0') { ++ switch (str[9]) { ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 50xx series\n"); ++ break; ++ case '2': series = 5020; break; ++ } ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire 5xxx series\n"); ++ } ++ break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Aspire series\n"); ++ break; ++ } ++ if (series && verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates Aspire %d series\n", series); ++ } ++ else if (strncmp(str, "Extensa ", 8) == 0) { ++ /* Extensa series */ ++ switch (str[8]) { ++ case '3': ++ switch (str[9]) { ++ case '0': ++ series = 3000; break; ++ default: break; ++ } ++ break; ++ default: break; ++ } ++ if (series && verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates Extensa %d series\n", series); ++ else if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown Extensa series\n"); ++ } ++ else if (strncmp(str, "Amilo ", 6) == 0) { ++ switch (str[6]) { ++ case 'D': /* complete string is "Amilo D-Series", there seems to be no model number */ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates FS Amilo D series\n"); ++ /* this is the model number of my Amilo */ ++ series = 7820; ++ break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown FS Amilo XX series\n"); ++ series = 7820; ++ } ++ } ++ else if (strncmp(str, "AMILO ", 6) == 0) { ++ switch (str[6]) { ++ case 'D': /* AMILO D 6800 P4-2000 */ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates FS AMILO D series\n"); ++ series = 6800; ++ break; ++ case 'M': ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates FS AMILO M(7400) series\n"); ++ series = 7400; ++ break; ++ case 'P': ++ /* it is assumed, that 'AMILO P' appears only on Amilo Pro Series */ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates FS AMILO Pro (V2000) series\n"); ++ series = 7400; ++ break; ++ default: ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates unknown FS AMILO XX series\n"); ++ series = 6800; ++ } ++ } ++ else if (strncmp(str, "MEDIONPC", 8) == 0) { ++ uint medionmodel; ++ if ((medionmodel = COLUSSI("WIM 2040", 4, reg1, AREA_SIZE)) >= 0) { ++ printk(KERN_INFO"acerhk: found Medion model string:'%s'\n", (char*)reg1+medionmodel); ++ series = 96500; ++ } else { ++ if ((medionmodel = COLUSSI("MD 9", 4, reg1, AREA_SIZE)) >= 0) { ++ printk(KERN_INFO"acerhk: found Medion model string:'%s'\n", (char*)reg1+medionmodel); ++ } ++ series = 95400; ++ } ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates a medion MD %d\n", series); ++ } ++ else if (strncmp(str, "MEDIONNB", 8) == 0) { ++ /* Search for the Product string of the MD9783. */ ++ if (COLUSSI("MD 42200", 8, reg1, AREA_SIZE) >= 0) { ++ if (verbose>1) ++ printk(KERN_INFO"acerhk: model string indicates a Medion MD 42200\n"); ++ series = 42200; ++ } else if (COLUSSI("MD 9783", 7, reg1, AREA_SIZE) >= 0){ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates a medion MD 9783\n"); ++ series = 9783; ++ } else if (COLUSSI("WIM 2000", 7, reg1, AREA_SIZE) >= 0){ ++ if (verbose>1) ++ printk(KERN_INFO"acerhk: model string indicates a Medion MD 2900\n"); ++ series = 2900; ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates a medion MD40100\n"); ++ series = 40100; ++ } ++ } else if (strncmp(str, "AOpen", 5) == 0) { ++ if (strncmp(str, "AOpen*EzRestore", 15) == 0) { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates a AOpen 1559\n"); ++ series = 1559; ++ } else { ++ /* Unless I know of other models no further differentiation, ++ although there is a second part of the model string */ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates a AOpen\n"); ++ series = 1555; ++ } ++ } else if (strncmp(str, "CL56", 4) == 0) { ++ /* Unless I know of other models no further differentiation, ++ although there are strings with more numbers ("CL561" on a Compal ++ CL56/Zepto 4200, reported by Stian B. Barmen) ++ It has the same functions as Acer Aspire 2010 ++ */ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates a Compal CL56 (or similar)\n"); ++ series = 2010; ++ } else if (strncmp(str, "Geneva2", 7) == 0) { ++ /* This might be an Aspire 9110 which is very similar to 4650 */ ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates an Aspire 9110\n"); ++ series = 4650; ++ } else { ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: model string indicates no supported hardware\n"); ++ } ++ return (series); ++} ++ ++static void __init probe_model(void) { ++ int offset; /* offset from beginning of reg1 to Model string */ ++ if (verbose) ++ printk(KERN_INFO"acerhk: start search for model string at %p\n", reg1); ++ /* first we look for Travelmate, if it isn't one we try to identify other ++ laptops, such as Medion or Aspire */ ++ offset = COLUSSI("Travel", 6, reg1, AREA_SIZE); ++ /* Try to detect Aspire laptops */ ++ if (offset < 0) ++ offset = COLUSSI("Aspire", 6, reg1, AREA_SIZE); ++ /* Try to detect Extensa laptops */ ++ if (offset < 0) ++ offset = COLUSSI("Extensa", 7, reg1, AREA_SIZE); ++ /* Try to detect Medion laptops */ ++ if (offset < 0) ++ offset = COLUSSI("MEDION", 6, reg1, AREA_SIZE); ++ /* Try to detect AOpen laptops */ ++ if (offset < 0) ++ offset = COLUSSI("AOpen", 5, reg1, AREA_SIZE); ++ /* Try to detect Fujitsu Siemens Amilo laptops */ ++ if (offset < 0) ++ offset = COLUSSI("Amilo", 5, reg1, AREA_SIZE); ++ if (offset < 0) ++ offset = COLUSSI("AMILO", 5, reg1, AREA_SIZE); ++ /* Try to detect Compal */ ++ if (offset < 0) ++ offset = COLUSSI("CL56", 4, reg1, AREA_SIZE); ++ /* That might be an Aspire 9110 */ ++ if (offset < 0) ++ offset = COLUSSI("Geneva2", 7, reg1, AREA_SIZE); ++ if (offset >= 0) { ++ acerhk_model_addr = reg1 + offset; ++ /* copy the string, but not more than 15 characters */ ++ strncpy(acerhk_model_string, acerhk_model_addr, ACERHK_MODEL_STRLEN-1); ++ if (verbose) ++ printk(KERN_INFO"acerhk: found model string '%s' at %p\n", ++ acerhk_model_string, acerhk_model_addr); ++ if (bios_routine && verbose > 2) ++ printk(KERN_INFO"acerhk: offset from model string to function address: 0x%lx\n", ++ bios_routine - (unsigned long)acerhk_model_addr); ++ acerhk_series = determine_laptop_series(acerhk_model_string); ++ } else { ++ printk(KERN_WARNING"acerhk: Could not find model string, will assume type 200 series\n"); ++ acerhk_series = 200; ++ } ++} ++ ++/* }}} */ ++ ++/* {{{ key polling and translation */ ++ ++static void print_mapping(void) ++{ ++ printk(KERN_INFO"acerhk: key mapping:\n"); ++ printk("acerhk: help 0x%x\n", acerhk_name2event[k_help]); ++ printk("acerhk: setup 0x%x\n", acerhk_name2event[k_setup]); ++ printk("acerhk: p1 0x%x\n", acerhk_name2event[k_p1]); ++ printk("acerhk: p2 0x%x\n", acerhk_name2event[k_p2]); ++ printk("acerhk: p3 0x%x\n", acerhk_name2event[k_p3]); ++ printk("acerhk: www 0x%x\n", acerhk_name2event[k_www]); ++ printk("acerhk: mail 0x%x\n", acerhk_name2event[k_mail]); ++ printk("acerhk: wireless 0x%x\n", acerhk_name2event[k_wireless]); ++ printk("acerhk: power 0x%x\n", acerhk_name2event[k_power]); ++ printk("acerhk: mute 0x%x\n", acerhk_name2event[k_mute]); ++ printk("acerhk: volup 0x%x\n", acerhk_name2event[k_volup]); ++ printk("acerhk: voldn 0x%x\n", acerhk_name2event[k_voldn]); ++ printk("acerhk: res 0x%x\n", acerhk_name2event[k_res]); ++ printk("acerhk: close 0x%x\n", acerhk_name2event[k_close]); ++ printk("acerhk: open 0x%x\n", acerhk_name2event[k_open]); ++ printk("acerhk: wireless2 0x%x\n", acerhk_name2event[k_wireless2]); ++ printk("acerhk: play 0x%x\n", acerhk_name2event[k_play]); ++ printk("acerhk: stop 0x%x\n", acerhk_name2event[k_stop]); ++ printk("acerhk: prev 0x%x\n", acerhk_name2event[k_prev]); ++ printk("acerhk: next 0x%x\n", acerhk_name2event[k_next]); ++ printk("acerhk: display 0x%x\n", acerhk_name2event[k_display]); ++} ++ ++static void set_keymap_name(t_key_names name, unsigned int key) ++{ ++ acerhk_name2event[name] = key; ++} ++ ++static void init_keymap_input(void) ++{ ++ /* these values for input keys are chosen to match the key names on the ++ actual Acer laptop */ ++ set_keymap_name(k_none, KEY_RESERVED); ++ set_keymap_name(k_help, KEY_HELP); ++ set_keymap_name(k_setup, KEY_CONFIG); ++ set_keymap_name(k_p1, KEY_PROG1); ++ set_keymap_name(k_p2, KEY_PROG2); ++ set_keymap_name(k_p3, KEY_PROG3); ++ set_keymap_name(k_www, KEY_WWW); ++ set_keymap_name(k_mail, KEY_MAIL); ++ set_keymap_name(k_wireless, KEY_XFER); ++ set_keymap_name(k_power, KEY_POWER); ++ set_keymap_name(k_mute, KEY_MUTE); ++ set_keymap_name(k_volup, KEY_VOLUMEUP); ++ set_keymap_name(k_voldn, KEY_VOLUMEDOWN); ++ set_keymap_name(k_res, KEY_CONFIG); ++ set_keymap_name(k_close, KEY_CLOSE); ++ set_keymap_name(k_open, KEY_OPEN); ++ /* I am not really happy with the selections for wireless and wireless2, ++ but coffee looks good. Michal Veselenyi proposed this value */ ++ set_keymap_name(k_wireless2, KEY_COFFEE); ++ set_keymap_name(k_play, KEY_PLAYPAUSE); ++ set_keymap_name(k_stop, KEY_STOPCD); ++ set_keymap_name(k_prev, KEY_PREVIOUSSONG); ++ set_keymap_name(k_next, KEY_NEXTSONG); ++ set_keymap_name(k_display, KEY_MEDIA); /* also not happy with this */ ++ if (verbose > 1) ++ print_mapping(); ++} ++ ++static int filter_idle_value(int keycode) ++{ ++ int validkey = 0; ++ if (keycode != 0x0 && ++ keycode != 0x9610 && ++ keycode != 0xc100 && /* Francois Valenduc, Aspire 1601 LC */ ++ keycode != 0x8610 && ++ keycode != 0x861 && ++ keycode != 0x8650 && ++ keycode != 0x865) ++ validkey = keycode; ++ if (verbose > 4 && !validkey) ++ printk(KERN_INFO"acerhk: throw away idle value 0x%x\n", keycode); ++ return validkey; ++} ++ ++static void send_key_event(t_key_names key) ++{ ++ unsigned int input_key; ++ if (key != k_none) { ++ /* convert key name to kernel keycode */ ++ input_key = acerhk_name2event[key]; ++ if (verbose > 2) ++ printk(KERN_INFO"acerhk: translated acer key name 0x%x to input key 0x%x\n", ++ key, input_key); ++ /* send press and release together, as there is no such event from acer as 'release' */ ++ input_report_key(acerhk_input_dev_ptr, input_key, 1); ++ input_report_key(acerhk_input_dev_ptr, input_key, 0); ++ } ++} ++ ++static t_key_names transl8_key_code(int keycode) ++{ ++ t_key_names keyname = k_none; ++ /* first filter out idle values */ ++ if ( (keycode = filter_idle_value(keycode)) ) { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: received key code 0x%x\n", keycode); ++ /* translate keycode to key name */ ++ if (keycode >= 0 && keycode <= 255) ++ keyname = acerhk_key2name[keycode]; ++ else { ++ if (verbose > 3) ++ printk(KERN_INFO"acerhk: keycode 0x%x too big, will use only 8 bits\n", keycode); ++ /* use only lower 8 bits of value to distinguish keys */ ++ keyname = acerhk_key2name[keycode&0xff]; ++ } ++ /* produce some log information for higher verbosity levels */ ++ if (keyname != k_none && verbose > 2) ++ printk(KERN_INFO"acerhk: translated acer key code 0x%x to key name 0x%x\n", ++ keycode, keyname); ++ else if (keyname == k_none && verbose > 3) ++ printk(KERN_INFO"acerhk: translated acer key code 0x%x to no key\n", ++ keycode); ++ if (autowlan) { ++ /* if automatic switching of wlan hardware is enabled, do it here ++ on wireless key press */ ++ if (keyname == k_wireless2) { ++ if (acerhk_bluetooth_state) ++ wbutton_fct_1(0); ++ else ++ wbutton_fct_1(1); ++ } ++ if (keyname == k_wireless) { ++ if (acerhk_wlan_state) ++ wbutton_fct_2(0); ++ else ++ wbutton_fct_2(1); ++ } ++ } ++ } ++ return keyname; ++} ++ ++/* polling timer handler */ ++static void acerhk_poll_event(unsigned long save_size) ++{ ++#ifndef DUMMYHW ++ unsigned int max = MAX_POLLING_LOOPS; ++ /* make sure not to loop more then 32 times */ ++ if (!max || max > 32) ++ max = 32; ++ if (acerhk_type != TM_dritek) { ++ while (get_nr_events() && max--) { ++ send_key_event(transl8_key_code(get_fnkey_event())); ++ } ++ } else { ++ send_key_event(transl8_key_code(get_fnkey_event())); ++ } ++#endif ++ acerhk_timer_poll.expires = jiffies + acerhk_polling_delay; ++ add_timer(&acerhk_timer_poll); ++} ++ ++/* blinking timer handler; added by Antonio Cuni */ ++static void acerhk_blink_event(unsigned long not_used) ++{ ++ if (acerhk_blueled_blinking != -1) { ++ acerhk_blueled_blinking = !acerhk_blueled_blinking; ++#ifndef DUMMYHW ++ wbutton_fct_1(acerhk_blueled_blinking); ++#endif ++ acerhk_timer_blinking.expires = jiffies + acerhk_blueled_blinking_delay; ++ add_timer(&acerhk_timer_blinking); ++ } ++ else ++ printk(KERN_WARNING "acerhk: blinking event called, but blinking not active\n"); ++} ++ ++static void init_input(void) ++{ ++ int i; ++ ++#ifndef KERNEL26 ++ /* request keyboard input module */ ++ request_module("keybdev"); ++ if (verbose > 3) ++ printk(KERN_INFO"requested keyboard input driver\n"); ++#endif ++ ++#ifndef STATIC_INPUT_DEV ++ /* allocate acerhk input device */ ++ acerhk_input_dev_ptr=input_allocate_device(); ++ /* enter some name */ ++ acerhk_input_dev_ptr->name = "Acer hotkey driver"; ++#else ++ acerhk_input_dev_ptr=&acerhk_input_dev; ++#endif ++ ++ /* some laptops have a mail led, should I announce it here? */ ++ acerhk_input_dev_ptr->evbit[0] = BIT(EV_KEY); ++ /* announce keys to input system ++ * the generated keys can be changed on runtime, ++ * but to publish those changes the device needs to ++ * get reconnected (I dont't know any other way) ++ * Therefore I enable all possible keys */ ++ for (i = KEY_RESERVED; i < BTN_MISC; i++) ++ set_bit(i, acerhk_input_dev_ptr->keybit); ++ /* set mapping keyname -> input event */ ++ init_keymap_input(); ++ if (verbose) ++ printk(KERN_INFO"acerhk: registered input device\n"); ++ input_register_device(acerhk_input_dev_ptr); ++ init_timer(&acerhk_timer_poll); ++ acerhk_polling_state = 0; ++} ++ ++static void stop_polling(void) ++{ ++ if (acerhk_polling_state == 1) { ++ del_timer(&acerhk_timer_poll); ++ if (verbose) ++ printk(KERN_INFO"acerhk: key polling stopped\n"); ++ acerhk_polling_state = 0; ++ } else ++ if (verbose) ++ printk(KERN_INFO"acerhk: key polling not active\n"); ++} ++ ++static void start_polling(void) ++{ ++ if (acerhk_polling_state != 1) { ++ acerhk_timer_poll.function = acerhk_poll_event; ++ acerhk_timer_poll.expires = jiffies + acerhk_polling_delay; ++ acerhk_timer_poll.data = get_nr_events(); ++ add_timer(&acerhk_timer_poll); ++ acerhk_polling_state = 1; ++ if (acerhk_type == TM_dritek) { ++ printk(KERN_INFO"acerhk: Your hardware does not need polling enabled for hotkeys to work, " ++ "you can safely disable polling by using the module parameter poll=0 (unless you " ++ "want to play around with the driver and see if there are buttons which need polling).\n"); ++ } ++ if (verbose) ++ printk(KERN_INFO"acerhk: starting key polling, every %d ms\n", acerhk_polling_delay); ++ } else ++ if (verbose) ++ printk(KERN_INFO"acerhk: key polling already active\n"); ++} ++ ++/* addedd by Antonio Cuni */ ++static void start_blinking(void) ++{ ++ if (acerhk_blueled_blinking == -1) { ++ // blinking was disabled... enable it! ++ acerhk_timer_blinking.function = acerhk_blink_event; ++ acerhk_timer_blinking.expires = jiffies + acerhk_blueled_blinking_delay; ++ acerhk_timer_blinking.data = 0; // not used ++ add_timer(&acerhk_timer_blinking); ++ acerhk_blueled_blinking = 0; ++ if (verbose) ++ printk(KERN_INFO "acerhk: starting blueled blinking\n"); ++ } else ++ if (verbose) ++ printk(KERN_INFO "acerhk: blueled already blinking\n"); ++} ++ ++/* Added by Antonio Cuni */ ++static void stop_blinking(void) ++{ ++ if (acerhk_blueled_blinking != -1) { ++ del_timer(&acerhk_timer_blinking); ++ if (verbose) ++ printk(KERN_INFO "acerhk: blueled blinking stopped\n"); ++ acerhk_blueled_blinking = -1; ++ } ++} ++ ++static void release_input(void) ++{ ++ stop_polling(); ++ input_unregister_device(acerhk_input_dev_ptr); ++} ++ ++/* }}} */ ++ ++/* {{{ procfs functions */ ++ ++#ifndef CONFIG_PROC_FS ++ ++static int acerhk_proc_init(void) ++{ ++ return 1; ++} ++#else ++ ++/* This macro frees the machine specific function from bounds checking and ++ * things like that... */ ++#define PRINT_PROC(fmt,args...) \ ++ do { \ ++ *len += sprintf( buffer+*len, fmt, ##args ); \ ++ if (*begin + *len > offset + size) \ ++ return( 0 ); \ ++ if (*begin + *len < offset) { \ ++ *begin += *len; \ ++ *len = 0; \ ++ } \ ++ } while(0) ++ ++static int pc_proc_infos( char *buffer, int *len, ++ off_t *begin, off_t offset, int size ) ++{ ++ PRINT_PROC( "Acer hotkeys version %s\n", ACERHK_VERSION); ++ PRINT_PROC( "Model(Type)\t: %s(", acerhk_model_string); ++ switch(acerhk_type) { ++ default: ++ PRINT_PROC( "unknown)\n"); ++ break; ++ case TM_old: ++ PRINT_PROC( "old)\n"); ++ break; ++ case TM_new: ++ PRINT_PROC( "new)\n"); ++ break; ++ case TM_dritek: ++ PRINT_PROC( "Dritek)\n"); ++ break; ++ } ++ if (bios_routine != 0) { ++ PRINT_PROC( "request handler\t: 0x%x\n", bios_routine); ++ if (cmos_index) { ++ PRINT_PROC( "CMOS index\t: 0x%x\n", cmos_index); ++ PRINT_PROC( "events pending\t: %u\n", get_nr_events()); ++ } else { ++ PRINT_PROC( "CMOS index\t: not available\n"); ++ } ++ if (acerhk_polling_state == 1) ++ PRINT_PROC( "kernel polling\t: active\n"); ++ else ++ PRINT_PROC( "kernel polling\t: inactive\n"); ++ PRINT_PROC( "autoswitch wlan\t: "); ++ if (autowlan == 1) ++ PRINT_PROC( "enabled\n"); ++ else ++ PRINT_PROC( "disabled\n"); ++ } else { ++ PRINT_PROC( "request handler\t: not found\n"); ++ PRINT_PROC( "kernel polling\t: not possible\n"); ++ } ++ /* model specific infos */ ++ if (acerhk_type == TM_dritek) { ++ PRINT_PROC( "use of Dritek EC: "); ++ if (usedritek) ++ PRINT_PROC( "enabled\n"); ++ else ++ PRINT_PROC( "disabled\n"); ++ } ++ if (acerhk_type == TM_old) ++ PRINT_PROC( "preg400\t\t: 0x%p\n", preg400); ++ return (1); ++} ++ ++static int acerhk_proc_info( char *buffer, char **start, off_t offset, ++ int size, int *eof, void *data ) ++{ ++ int len = 0; ++ off_t begin = 0; ++ ++ *eof = pc_proc_infos( buffer, &len, &begin, offset, size ); ++ ++ if (offset >= begin + len) ++ return( 0 ); ++ *start = buffer + (offset - begin); ++ return( size < begin + len - offset ? size : begin + len - offset ); ++ ++} ++ ++static int acerhk_proc_key( char *buffer, char **start, off_t offset, ++ int size, int *eof, void *data ) ++{ ++ if (size >= 5 && offset == 0) { ++ if (acerhk_type == TM_dritek || acerhk_polling_state == 1) { ++ snprintf(buffer+offset, size, "n/a\n"); ++ } else { ++ snprintf(buffer+offset, size, "0x%02x\n", filter_idle_value(get_fnkey_event())); ++ } ++ *eof = 1; ++ return 5; ++ } ++ *eof = 1; ++ return 0; ++} ++ ++static int acerhk_proc_led(struct file* file, const char* buffer, ++ unsigned long count, void* data) ++{ ++ char str[4]; ++ int len; ++ if (count > 4) ++ len = 4; ++ else ++ len = count; ++ if (copy_from_user(str, buffer, len)) ++ return -EFAULT; ++ str[3] = '\0'; ++ if ( ( (len >= 2) && (!strncmp(str, "on", 2) || !strncmp(str, "an", 2)) ) ++ || str[0] == '1') ++ set_mail_led(1); ++ else ++ set_mail_led(0); ++ return len; ++} ++ ++static int acerhk_proc_wirelessled(struct file* file, const char* buffer, ++ unsigned long count, void* data) ++{ ++ char str[4]; ++ int len; ++ if (count > 4) ++ len = 4; ++ else ++ len = count; ++ if (copy_from_user(str, buffer, len)) ++ return -EFAULT; ++ str[3] = '\0'; ++ if ( ( (len >= 2) && (!strncmp(str, "on", 2) || !strncmp(str, "an", 2)) ) ++ || str[0] == '1') { ++ if (acerhk_model_features & TM_F_WLAN_EC1) ++ enable_wlan_ec_1(); ++ else if (acerhk_model_features & TM_F_WLAN_EC2) ++ enable_wlan_ec_2(); ++ else ++ wbutton_fct_2(1); ++ } ++ else { ++ if (acerhk_model_features & TM_F_WLAN_EC1) ++ disable_wlan_ec_1(); ++ else if (acerhk_model_features & TM_F_WLAN_EC2) ++ disable_wlan_ec_2(); ++ else ++ wbutton_fct_2(0); ++ } ++ return len; ++} ++ ++ ++/* Modified by Antonio Cuni: added support for blinking ++ possible values: ++ - off, 0: led always off ++ - on, an, 1: led alway on ++ - n (a number): led blinking; n is the delay between ++ two changes of state, in jiffies; n must ++ be > 50, to prevent the user from overloading ++ the kernel. ++ ++ */ ++static int acerhk_proc_blueled(struct file* file, const char* buffer, ++ unsigned long count, void* data) ++{ ++ const int MAXLEN=11; ++ char str[MAXLEN]; ++ int len; ++ int isNumber; ++ ++ if (count > MAXLEN) ++ len = MAXLEN; ++ else ++ len = count; ++ if (copy_from_user(str, buffer, len)) ++ return -EFAULT; ++ str[MAXLEN - 1] = '\0'; ++ ++ /* try to parse a number */ ++ isNumber = sscanf(str, "%u", &acerhk_blueled_blinking_delay); ++ /* if the delay is 0, turn off the led */ ++ if (isNumber && acerhk_blueled_blinking_delay != 0 && acerhk_blueled_blinking_delay != 1) { ++ if (acerhk_blueled_blinking_delay < 50) ++ printk(KERN_INFO"acerhk: blinking request rejected. The delay must be > 50.\n"); ++ else { ++ if (verbose) ++ printk(KERN_INFO"acerhk: blinking delay set to %u.\n", acerhk_blueled_blinking_delay); ++ start_blinking(); ++ } ++ } else if (acerhk_blueled_blinking_delay == 1 || !strncmp(str, "on", 2) || !strncmp(str, "an", 2)) { ++ stop_blinking(); ++ if (acerhk_model_features & TM_F_BLUE_EC1) ++ enable_bluetooth_ec_1(); ++ else if (acerhk_model_features & TM_F_BLUE_EC2) ++ enable_bluetooth_ec_2(); ++ else ++ wbutton_fct_1(1); ++ } else { ++ /* it's 0 or everything else */ ++ stop_blinking(); ++ if (acerhk_model_features & TM_F_BLUE_EC1) ++ disable_bluetooth_ec_1(); ++ else if (acerhk_model_features & TM_F_BLUE_EC2) ++ disable_bluetooth_ec_2(); ++ else ++ wbutton_fct_1(0); ++ } ++ return len; ++} ++ ++#ifdef ACERDEBUG ++static void do_debug(const char* buffer, unsigned long len) ++{ ++ unsigned int h, i; ++ switch (buffer[0]) { ++ case 'b': ++ /* test WLAN on TM 4001 */ ++ switch (buffer[1]) { ++ case '0': ++ disable_wlan_ec_1(); ++ break; ++ case '1': ++ default: ++ enable_wlan_ec_1(); ++ } ++ break; ++ case 'B': ++ /* test BLUETOOTH on TM 4001 */ ++ switch (buffer[1]) { ++ case '0': ++ disable_bluetooth_ec_1(); ++ break; ++ case '1': ++ default: ++ enable_bluetooth_ec_1(); ++ } ++ break; ++ case 'D': ++ /* test "DMM Function Enabled" entry of TM 4150/4650 */ ++ enable_dmm_function(); ++ break; ++ case 'i': ++ case '1': ++#ifndef KERNEL26 ++ MOD_INC_USE_COUNT; ++#endif ++ break; ++ case 'e': ++ switch (buffer[1]) { ++ case '1': ++ start_polling(); ++ break; ++ default: ++ stop_polling(); ++ } ++ break; ++ case 'k': ++ for (i = 0; i <= 255;i++) { ++ input_report_key(acerhk_input_dev_ptr, i, 1); ++ input_report_key(acerhk_input_dev_ptr, i, 0); ++ } ++ break; ++ case 'm': ++ /* set mapping key names -> input events */ ++ sscanf(&buffer[2],"%x", &i); ++ h = buffer[1] - '0' + 1; ++ printk("acerhk: key name %x maps to %x\n", h, i); ++ acerhk_name2event[h] = i; ++ break; ++ case 'M': ++ /* test mute LED on dritek hardware */ ++ switch (buffer[1]) { ++ case '0': ++ disable_mute_led_ec(); ++ break; ++ case '1': ++ default: ++ enable_mute_led_ec(); ++ } ++ break; ++ case 'p': ++ printk("acerhk: pbutton = 0x%x\n", pbutton_fct()); ++ break; ++ case 's': ++ /* send key event to test the key translation in input system */ ++ sscanf(&buffer[1],"%x", &h); ++ printk("acerhk: sending key event 0x%x\n", h); ++ input_report_key(acerhk_input_dev_ptr, h, 1); ++ input_report_key(acerhk_input_dev_ptr, h, 0); ++ break; ++ case 'S': ++ /* simulate key codes to test the key translation in acerhk */ ++ sscanf(&buffer[1],"%x", &h); ++ send_key_event(transl8_key_code(h)); ++ break; ++ case 't': ++ printk("acerhk: thermal event = 0x%x\n", get_thermal_event()); ++ break; ++ case 'w': ++ /* test the wbutton functions, someone really needs to have another look ++ at the windows driver */ ++ switch (buffer[1]) { ++ case '2': ++ printk("acerhk: wbutton_2(%d) = 0x%x\n", buffer[2]-'0', wbutton_fct_2(buffer[2]-'0')); ++ break; ++ case '1': ++ default: ++ printk("acerhk: wbutton_1(%d) = 0x%x\n", buffer[2]-'0', wbutton_fct_1(buffer[2]-'0')); ++ } ++ break; ++ case 'W': ++ /* test wireless HW/LED on some models using dritek hardware */ ++ switch (buffer[1]) { ++ case '0': ++ disable_wireless_ec(); ++ break; ++ case '1': ++ default: ++ enable_wireless_ec(); ++ } ++ break; ++ case 'v': ++ verbose = buffer[1]-'0'; ++ printk("acerhk: verbosity level changed to %d\n", verbose); ++ break; ++ case 'd': ++ case '0': ++ default: ++#ifndef KERNEL26 ++ MOD_DEC_USE_COUNT; ++#endif ++ break; ++ } ++} ++ ++static int acerhk_proc_debug(struct file* file, const char* buffer, ++ unsigned long count, void* data) ++{ ++ char str[5]; ++ int len; ++ if (count > 5) ++ len = 5; ++ else ++ len = count; ++ if (copy_from_user(str, buffer, len)) ++ return -EFAULT; ++ str[4] = '\0'; ++ do_debug(str, len); ++ return len; ++} ++#endif ++ ++static int acerhk_proc_init(void) ++{ ++ int retval; ++ struct proc_dir_entry *entry; ++ /* create own directory */ ++ proc_acer_dir = proc_mkdir("driver/acerhk", NULL); ++ if (proc_acer_dir == NULL) { ++ retval = 0; ++ printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n"); ++ } ++ else { ++ proc_acer_dir->owner = THIS_MODULE; ++ /* now create several files, first general info ... */ ++ entry = create_proc_read_entry("info", ++ 0444, proc_acer_dir, acerhk_proc_info, NULL); ++ if (entry == NULL) { ++ printk(KERN_INFO"acerhk: cannot create info file\n"); ++ remove_proc_entry("driver/acerhk", NULL); ++ retval = 0; ++ } else { ++ entry->owner = THIS_MODULE; ++ /* ... last pressed key ... */ ++ entry = create_proc_read_entry("key", ++ 0444, proc_acer_dir, acerhk_proc_key, NULL); ++ if (entry == NULL) { ++ printk(KERN_INFO"acerhk: cannot create key file\n"); ++ remove_proc_entry("info", proc_acer_dir); ++ remove_proc_entry("driver/acerhk", NULL); ++ retval = 0; ++ } else { ++ entry->owner = THIS_MODULE; ++ /* ... and led control file */ ++ entry = create_proc_entry("led", 0222, proc_acer_dir); ++ if (entry == NULL) { ++ printk(KERN_INFO"acerhk: cannot create LED file\n"); ++ remove_proc_entry("info", proc_acer_dir); ++ remove_proc_entry("key", proc_acer_dir); ++ remove_proc_entry("driver/acerhk", NULL); ++ retval = 0; ++ } ++ else { ++ entry->write_proc = acerhk_proc_led; ++ entry->owner = THIS_MODULE; ++ /* ... and wireless led controll file */ ++ entry = create_proc_entry("wirelessled", 0222, proc_acer_dir); ++ if (entry == NULL) { ++ printk(KERN_INFO"acerhk: cannot create wirelessled file\n"); ++ remove_proc_entry("info", proc_acer_dir); ++ remove_proc_entry("key", proc_acer_dir); ++ remove_proc_entry("led", proc_acer_dir); ++ remove_proc_entry("driver/acerhk", NULL); ++ retval = 0; ++ } ++ else { ++ entry->write_proc = acerhk_proc_wirelessled; ++ entry->owner = THIS_MODULE; ++ /* ... and bluetooth led controll file */ ++ entry = create_proc_entry("blueled", 0222, proc_acer_dir); ++ if (entry == NULL) { ++ printk(KERN_INFO"acerhk: cannot create blueled file\n"); ++ remove_proc_entry("info", proc_acer_dir); ++ remove_proc_entry("key", proc_acer_dir); ++ remove_proc_entry("led", proc_acer_dir); ++ remove_proc_entry("wirelessled", proc_acer_dir); ++ remove_proc_entry("driver/acerhk", NULL); ++ retval = 0; ++ } else { ++ entry->write_proc = acerhk_proc_blueled; ++ entry->owner = THIS_MODULE; ++ retval = 1; ++#ifdef ACERDEBUG ++ /* add extra file for debugging purposes */ ++ entry = create_proc_entry("debug", 0222, proc_acer_dir); ++ if (entry == NULL) { ++ printk(KERN_INFO"acerhk: cannot create debug file\n"); ++ remove_proc_entry("info", proc_acer_dir); ++ remove_proc_entry("key", proc_acer_dir); ++ remove_proc_entry("led", proc_acer_dir); ++ remove_proc_entry("wirelessled", proc_acer_dir); ++ remove_proc_entry("blueled", proc_acer_dir); ++ remove_proc_entry("driver/acerhk", NULL); ++ retval = 0; ++ } ++ else { ++ entry->write_proc = acerhk_proc_debug; ++ entry->owner = THIS_MODULE; ++ retval = 1; ++ } ++#endif ++ } ++ } ++ } ++ } ++ } ++ } ++ return retval; ++} ++ ++static void acerhk_proc_cleanup(void) ++{ ++ if (proc_acer_dir) { ++ remove_proc_entry("info", proc_acer_dir); ++ /* On dritek type hardware key file is already removed */ ++ if (acerhk_type != TM_dritek) ++ remove_proc_entry("key", proc_acer_dir); ++ remove_proc_entry("led", proc_acer_dir); ++ remove_proc_entry("wirelessled", proc_acer_dir); ++ remove_proc_entry("blueled", proc_acer_dir); ++#ifdef ACERDEBUG ++ remove_proc_entry("debug", proc_acer_dir); ++#endif ++ remove_proc_entry("driver/acerhk", NULL); ++ proc_acer_dir = NULL; ++ } ++} ++ ++#endif /* CONFIG_PROC_FS */ ++ ++/* }}} */ ++ ++/* {{{ file operations */ ++ ++static int acerhk_ioctl( struct inode *inode, struct file *file, ++ unsigned int cmd, unsigned long arg ) ++{ ++ int retval; ++ switch( cmd ) { ++ case ACERHK_GET_KEYCOUNT: ++ { ++ char nr; ++ nr = get_nr_events(); ++ put_user(nr, (char*)arg); ++ retval = 0; ++ break; ++ } ++ case ACERHK_GET_KEYID: ++ { ++ char id; ++ id = get_fnkey_event(); ++ put_user(id, (char*)arg); ++ retval = 0; ++ break; ++ } ++ case ACERHK_CONNECT: ++ launch_connect(1); ++ retval = 0; ++ break; ++ case ACERHK_START_POLLING: ++ start_polling(); ++ retval = 0; ++ break; ++ case ACERHK_STOP_POLLING: ++ stop_polling(); ++ retval = 0; ++ break; ++ case ACERHK_DISCONNECT: ++ launch_connect(0); ++ retval = 0; ++ break; ++ case ACERHK_GET_THERMAL_EVENT: ++ { ++ short event; ++ event = get_thermal_event(); ++ put_user(event, (short*)arg); ++ retval = 0; ++ break; ++ } ++ case ACERHK_MAIL_LED_OFF: ++ set_mail_led(0); ++ retval = 0; ++ break; ++ case ACERHK_MAIL_LED_ON: ++ set_mail_led(1); ++ retval = 0; ++ break; ++ case ACERHK_GET_KEY_MAP: ++ if (copy_to_user((t_map_name2event*)arg, &acerhk_name2event, sizeof(acerhk_name2event))) ++ retval = -EFAULT; ++ else ++ retval = 0; ++ break; ++ case ACERHK_SET_KEY_MAP: ++ if (copy_from_user(&acerhk_name2event, (t_map_name2event*)arg, sizeof(acerhk_name2event))) ++ retval = -EFAULT; ++ else { ++ if (verbose) { ++ printk(KERN_INFO"acerhk: changed key mapping\n"); ++ print_mapping(); ++ } ++ retval = 0; ++ } ++ break; ++ default: ++ retval = -EINVAL; ++ } ++ return retval; ++} ++ ++#ifdef ACERDEBUG ++static ssize_t acerhk_write (struct file* file, const char* buffer, size_t length, loff_t* offset) ++{ ++ if (length) ++ do_debug(buffer, length); ++ return length; ++} ++#endif ++ ++static int acerhk_open( struct inode *inode, struct file *file ) ++{ ++ return 0; ++} ++ ++static int acerhk_release( struct inode *inode, struct file *file ) ++{ ++ return 0; ++} ++ ++static struct file_operations acerhk_fops = { ++ owner: THIS_MODULE, ++ ioctl: acerhk_ioctl, ++ open: acerhk_open, ++#ifdef ACERDEBUG ++ write: acerhk_write, ++#endif ++ release: acerhk_release, ++}; ++ ++static struct miscdevice acerhk_dev = { ++ MISC_DYNAMIC_MINOR, ++ "acerhk", ++ &acerhk_fops ++}; ++ ++/* }}} */ ++ ++static void __init model_init(void) ++{ ++ /* set callroutine, features and keymap for model */ ++ setup_model_features(acerhk_series); ++ /* override initial state of wireless hardware if specified by module options */ ++ if (wlan_state >= 0) acerhk_wlan_state = wlan_state; ++ if (bluetooth_state >= 0) acerhk_bluetooth_state = bluetooth_state; ++ /* Launch connect only if available */ ++ if (acerhk_model_features & TM_F_CONNECT) { ++ if (verbose) ++ printk(KERN_INFO"acerhk: Model type %d, calling launch_connect(1)\n", ++ acerhk_type); ++ launch_connect(1); ++ } ++ if ( acerhk_type != TM_dritek ) { ++ get_cmos_index(); ++ } ++ if ( acerhk_type == TM_dritek ) { ++ enable_dritek_keyboard(); ++ } ++ /* added by Antonio Cuni */ ++ init_timer(&acerhk_timer_blinking); ++} ++ ++ ++static void __exit acerhk_cleanup_module (void); ++static int __init acerhk_init(void) ++{ ++ int ret; ++ ++ ret = misc_register( &acerhk_dev ); ++ if (ret) { ++ printk(KERN_ERR "acerhk: can't misc_register on minor=%d\n", ACERHK_MINOR); ++ ret = -EAGAIN; ++ } ++ else if (!acerhk_proc_init()) { ++ printk(KERN_ERR "acerhk: can't create procfs entries\n"); ++ ret = -ENOMEM; ++ misc_deregister( &acerhk_dev ); ++ } ++ else { ++ reg1 = ioremap(0xf0000, 0xffff); ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: area from 0xf000 to 0xffff mapped to %p\n", reg1); ++ reg2 = ioremap(0xe0000, 0xffff); ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: area from 0xe000 to 0xffff mapped to %p\n", reg2); ++ /* the area 0x400 is used as data area by earlier (520) series */ ++ preg400 = ioremap(0x400, 0xfff); ++ if (verbose > 1) ++ printk(KERN_INFO"acerhk: area from 0x400 to 0x13ff mapped to %p\n", preg400); ++ /* attach to input system */ ++ init_input(); ++ memset(acerhk_model_string, 0x00, ACERHK_MODEL_STRLEN); ++#ifdef DUMMYHW ++ acerhk_model_addr = (void*)0x12345678; ++ /* copy the string, but not more than 15 characters */ ++ strncpy(acerhk_model_string, "TravelmateDummy", ACERHK_MODEL_STRLEN-1); ++ /* set callroutine for model */ ++ if (force_series) ++ acerhk_series = force_series; ++ else ++ acerhk_series = 2000; ++ setup_model_features(acerhk_series); ++ printk(KERN_INFO "Acer Travelmate hotkey driver v" ACERHK_VERSION " dummy\n"); ++ if ( acerhk_type == TM_dritek ) ++ enable_dritek_keyboard(); ++ if (poll) ++ start_polling(); ++ init_timer(&acerhk_timer_blinking); ++#else ++ bios_routine = find_hk_area(); ++ if (!force_series) ++ probe_model(); ++ else { ++ if (verbose) ++ printk(KERN_INFO"acerhk: forced laptop series to %d\n", force_series); ++ acerhk_series = force_series; ++ } ++ /* do model specific initialization */ ++ model_init(); ++ /* Without a bios routine we cannot do anything except on dritek ++ type HW, unload on other types */ ++ if (bios_routine || (acerhk_type == TM_dritek)) { ++ ret = 0; ++ if (verbose && bios_routine) ++ printk(KERN_INFO"acerhk: bios routine found at 0x%x\n", bios_routine); ++ printk(KERN_INFO "Acer Travelmate hotkey driver v" ACERHK_VERSION "\n"); ++ /* If automatic switching of wlan is wanted but polling is disabled, ++ automatically enable it */ ++ if (!poll && autowlan) { ++ printk(KERN_INFO "Automatic switching of wireless hardware needs polling, enabling it\n"); ++ poll = 1; ++ } ++ /* start automatic polling of key presses if wanted and bios routine found */ ++ if (poll && bios_routine) ++ start_polling(); ++ } else { ++ printk(KERN_ERR "acerhk: can't find bios routine, cannot do anything for you, sorry!\n"); ++ ret = -ENOMEM; ++ acerhk_cleanup_module(); ++ } ++#endif ++ } ++ return ret; ++} ++ ++static void __exit acerhk_cleanup_module (void) ++{ ++ acerhk_proc_cleanup(); ++ stop_blinking(); ++ if (reg1) ++ iounmap(reg1); ++ if (reg2) ++ iounmap(reg2); ++ if (preg400) ++ iounmap(preg400); ++ release_input(); ++ misc_deregister( &acerhk_dev ); ++ if ( acerhk_type == TM_dritek ) { ++ disable_dritek_keyboard(); ++ } ++ if (verbose > 2) ++ printk(KERN_INFO "acerhk: unloaded\n"); ++} ++ ++module_init(acerhk_init); ++module_exit(acerhk_cleanup_module); ++ ++MODULE_AUTHOR("Olaf Tauber"); ++MODULE_DESCRIPTION("AcerHotkeys extra buttons keyboard driver"); ++MODULE_LICENSE("GPL"); ++ ++#ifndef KERNEL26 ++EXPORT_NO_SYMBOLS; ++#endif ++ ++#else ++#error This driver is only available for X86 architecture ++#endif ++/* ++ * Local variables: ++ * c-indent-level: 4 ++ * tab-width: 4 ++ * End: ++ */ ++ +diff -Nurp linux-2.6.37/3rdparty/acerhk/acerhk.h linux-2.6.37.3rdparty/3rdparty/acerhk/acerhk.h +--- linux-2.6.37/3rdparty/acerhk/acerhk.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/acerhk.h 2005-06-17 00:10:12.000000000 +0300 +@@ -0,0 +1,91 @@ ++#ifndef __ACERHK_H__ ++#define __ACERHK_H__ ++ ++#include ++ ++#define ACERHK_MINOR MISC_DYNAMIC_MINOR ++ ++#define ACERHK_GET_KEYCOUNT _IOR('p', 0x01, char) /* Get number of cached key presses */ ++#define ACERHK_GET_KEYID _IOR('p', 0x02, char) /* Get first key in queue */ ++#define ACERHK_CONNECT _IO('p', 0x03) /* ? */ ++#define ACERHK_DISCONNECT _IO('p', 0x04) /* ? */ ++#define ACERHK_GET_THERMAL_EVENT _IOR('p', 0x05, short) /* ? */ ++#define ACERHK_MAIL_LED_OFF _IO('p', 0x10) /* switch mail LED off */ ++#define ACERHK_MAIL_LED_ON _IO('p', 0x11) /* switch mail LED on (blinking) */ ++#define ACERHK_START_POLLING _IO('p', 0x12) /* poll keys in kernel, send real key events */ ++#define ACERHK_STOP_POLLING _IO('p', 0x13) /* stop key polling in kernel */ ++#define ACERHK_GET_KEY_MAP _IOR('p', 0x20, int) /* Get mapping of key names to key events, */ ++#define ACERHK_SET_KEY_MAP _IOW('p', 0x21, int) /* Set mapping of key names to key events */ ++ ++/* all possible keys (known to me) */ ++typedef enum e_key_names { ++ k_none = 0, ++ k_help = 1, /* Fn+F1 */ ++ k_setup = 2, /* Fn+F2 */ ++ k_p1 = 3, ++ k_p2 = 4, ++ k_p3 = 5, ++ k_www = 6, ++ k_mail = 7, ++ k_wireless = 8, ++ k_power = 9, /* Fn+F3 */ ++ k_mute = 10, /* Fn+F8 */ ++ k_volup = 11, /* Fn+Up */ ++ k_voldn = 12, /* Fn+Down */ ++ k_res = 13, /* resolution change on Medion MD 40100 */ ++ k_close = 14, /* if lid is closed in tablet mode */ ++ k_open = 15, /* if lid is opend in tablet mode */ ++ k_wireless2 = 16, /* second wireless button on TM 243LC */ ++ k_play = 17, /* Play/Pause found on AOpen */ ++ k_stop = 18, /* Stop/Eject found on AOpen */ ++ k_prev = 19, /* Prev found on AOpen */ ++ k_next = 20, /* Next found on AOpen */ ++ k_display = 21 /* Change internal/external display on MD 42200 */ ++} t_key_names; ++#define NR_KEY_NAMES 22 ++typedef unsigned int t_map_name2event[NR_KEY_NAMES]; ++ ++#ifdef __KERNEL__ ++ ++/* available features */ ++#define TM_F_WLAN_EC1 0x00000010 ++#define TM_F_BLUE_EC1 0x00000020 ++#define TM_F_WLAN_EC2 0x00000040 ++#define TM_F_BLUE_EC2 0x00000080 ++#define TM_F_MUTE_LED_EC 0x00001000 ++#define TM_F_MAIL_LED 0x00010000 ++#define TM_F_MAIL_LED_EC 0x00020000 ++#define TM_F_MAIL_LED_EC2 0x00040000 ++#define TM_F_MAIL_LED_EC3 0x00080000 ++ ++#define TM_F_CONNECT 0x00100000 ++#define TM_F_THERMAL 0x00200000 ++#define TM_F_PBUTTON 0x00400000 ++#define TM_F_WBUTTON 0x00800000 ++ ++typedef enum acer_type { ++ TM_unknown, ++ /* 200, 210, 520, 600 and 730 series, Medion MD42200 */ ++ TM_old, ++ /* C100, C110, 220, 230, 240, 260, 350, 360, 610, 620, 630, 740 series ++ Medion MD40100, Aspire 1600, FS Amilo */ ++ TM_new, ++ /* Aspire 13xx, 14xx, 1700, TM 290, 650, 660, 800 */ ++ TM_dritek ++} t_acer_type; ++ ++struct register_buffer { ++ unsigned int eax; ++ unsigned int ebx; ++ unsigned int ecx; ++ unsigned int edx; ++ unsigned int edi; ++ unsigned int esi; ++ unsigned int ebp; ++}; ++ ++typedef asmlinkage void (*bios_call) (struct register_buffer *); ++ ++#endif ++ ++#endif +diff -Nurp linux-2.6.37/3rdparty/acerhk/AUTHORS linux-2.6.37.3rdparty/3rdparty/acerhk/AUTHORS +--- linux-2.6.37/3rdparty/acerhk/AUTHORS 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/AUTHORS 2006-11-10 00:02:55.000000000 +0200 +@@ -0,0 +1 @@ ++Olaf Tauber +\ Ingen nyrad vid filslut +diff -Nurp linux-2.6.37/3rdparty/acerhk/COPYING linux-2.6.37.3rdparty/3rdparty/acerhk/COPYING +--- linux-2.6.37/3rdparty/acerhk/COPYING 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/COPYING 2002-05-08 22:01:52.000000000 +0300 +@@ -0,0 +1,340 @@ ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 ++ ++ Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++License is intended to guarantee your freedom to share and change free ++software--to make sure the software is free for all its users. This ++General Public License applies to most of the Free Software ++Foundation's software and to any other program whose authors commit to ++using it. (Some other Free Software Foundation software is covered by ++the GNU Library General Public License instead.) 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 ++this service 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 make restrictions that forbid ++anyone to deny you these rights or to ask you to surrender the rights. ++These restrictions translate to certain responsibilities for you if you ++distribute copies of the software, or if you modify it. ++ ++ For example, if you distribute copies of such a program, whether ++gratis or for a fee, you must give the recipients all the rights that ++you have. 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. ++ ++ We protect your rights with two steps: (1) copyright the software, and ++(2) offer you this license which gives you legal permission to copy, ++distribute and/or modify the software. ++ ++ Also, for each author's protection and ours, we want to make certain ++that everyone understands that there is no warranty for this free ++software. If the software is modified by someone else and passed on, we ++want its recipients to know that what they have is not the original, so ++that any problems introduced by others will not reflect on the original ++authors' reputations. ++ ++ Finally, any free program is threatened constantly by software ++patents. We wish to avoid the danger that redistributors of a free ++program will individually obtain patent licenses, in effect making the ++program proprietary. To prevent this, we have made it clear that any ++patent must be licensed for everyone's free use or not licensed at all. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. ++ ++ GNU GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License applies to any program or other work which contains ++a notice placed by the copyright holder saying it may be distributed ++under the terms of this General Public License. The "Program", below, ++refers to any such program or work, and a "work based on the Program" ++means either the Program or any derivative work under copyright law: ++that is to say, a work containing the Program or a portion of it, ++either verbatim or with modifications and/or translated into another ++language. (Hereinafter, translation is included without limitation in ++the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running the Program is not restricted, and the output from the Program ++is covered only if its contents constitute a work based on the ++Program (independent of having been made by running the Program). ++Whether that is true depends on what the Program does. ++ ++ 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the ++notices that refer to this License and to the absence of any warranty; ++and give any other recipients of the Program a copy of this License ++along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and ++you may at your option offer warranty protection in exchange for a fee. ++ ++ 2. You may modify your copy or copies of the Program or any portion ++of it, thus forming a work based on the Program, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any ++ part thereof, to be licensed as a whole at no charge to all third ++ parties under the terms of this License. ++ ++ c) If the modified program normally reads commands interactively ++ when run, you must cause it, when started running for such ++ interactive use in the most ordinary way, to print or display an ++ announcement including an appropriate copyright notice and a ++ notice that there is no warranty (or else, saying that you provide ++ a warranty) and that users may redistribute the program under ++ these conditions, and telling the user how to view a copy of this ++ License. (Exception: if the Program itself is interactive but ++ does not normally print such an announcement, your work based on ++ the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Program, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Program, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program ++with the Program (or with a work based on the Program) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may copy and distribute the Program (or a work based on it, ++under Section 2) in object code or executable form under the terms of ++Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable ++ source code, which must be distributed under the terms of Sections ++ 1 and 2 above on a medium customarily used for software interchange; or, ++ ++ b) Accompany it with a written offer, valid for at least three ++ years, to give any third party, for a charge no more than your ++ cost of physically performing source distribution, a complete ++ machine-readable copy of the corresponding source code, to be ++ distributed under the terms of Sections 1 and 2 above on a medium ++ customarily used for software interchange; or, ++ ++ c) Accompany it with the information you received as to the offer ++ to distribute corresponding source code. (This alternative is ++ allowed only for noncommercial distribution and only if you ++ received the program in object code or executable form with such ++ an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for ++making modifications to it. For an executable work, complete source ++code means all the source code for all modules it contains, plus any ++associated interface definition files, plus the scripts used to ++control compilation and installation of the executable. However, as a ++special exception, the source code distributed need not include ++anything that is normally distributed (in either source or binary ++form) with the major components (compiler, kernel, and so on) of the ++operating system on which the executable runs, unless that component ++itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering ++access to copy from a designated place, then offering equivalent ++access to copy the source code from the same place counts as ++distribution of the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 4. You may not copy, modify, sublicense, or distribute the Program ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense or distribute the Program is ++void, and will automatically terminate your rights under this License. ++However, parties who have received copies, or rights, from you under ++this License will not have their licenses terminated so long as such ++parties remain in full compliance. ++ ++ 5. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Program or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Program (or any work based on the ++Program), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Program or works based on it. ++ ++ 6. Each time you redistribute the Program (or any work based on the ++Program), the recipient automatically receives a license from the ++original licensor to copy, distribute or modify the Program subject to ++these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties to ++this License. ++ ++ 7. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++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 ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Program at all. For example, if a patent ++license would not permit royalty-free redistribution of the Program by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under ++any particular circumstance, the balance of the section is intended to ++apply and the section as a whole is intended to apply in other ++circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system, which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 8. If the distribution and/or use of the Program is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Program under this License ++may add an explicit geographical distribution limitation excluding ++those countries, so that distribution is permitted only in or among ++countries not thus excluded. In such case, this License incorporates ++the limitation as if written in the body of this License. ++ ++ 9. The Free Software Foundation may publish revised and/or new versions ++of the 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 a version number of this License which applies to it and "any ++later version", you have the option of following the terms and conditions ++either of that version or of any later version published by the Free ++Software Foundation. If the Program does not specify a version number of ++this License, you may choose any version ever published by the Free Software ++Foundation. ++ ++ 10. If you wish to incorporate parts of the Program into other free ++programs whose distribution conditions are different, write to the author ++to ask for permission. For software which is copyrighted by the Free ++Software Foundation, write to the Free Software Foundation; we sometimes ++make exceptions for this. Our decision will be guided by the two goals ++of preserving the free status of all derivatives of our free software and ++of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. ++ ++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++REDISTRIBUTE 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. ++ ++ 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 ++convey the exclusion of warranty; and each file should have at least ++the "copyright" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) 19yy ++ ++ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this ++when it starts in an interactive mode: ++ ++ Gnomovision version 69, Copyright (C) 19yy name of author ++ Gnomovision 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, the commands you use may ++be called something other than `show w' and `show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++ `Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++ , 1 April 1989 ++ Ty Coon, President of Vice ++ ++This 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 Library General ++Public License instead of this License. +diff -Nurp linux-2.6.37/3rdparty/acerhk/doc/acertm.def linux-2.6.37.3rdparty/3rdparty/acerhk/doc/acertm.def +--- linux-2.6.37/3rdparty/acerhk/doc/acertm.def 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/doc/acertm.def 2003-08-24 19:46:37.000000000 +0300 +@@ -0,0 +1,56 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ Konfiguration ++ ++ Mute/Unmute ++ Lauter ++ Leiser ++ ++ Terminal ++ XEmacs ++ Play/Pause ++ Play/Pause ++ ++ ++ ++ +diff -Nurp linux-2.6.37/3rdparty/acerhk/doc/FAQ linux-2.6.37.3rdparty/3rdparty/acerhk/doc/FAQ +--- linux-2.6.37/3rdparty/acerhk/doc/FAQ 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/doc/FAQ 2005-11-10 19:45:33.000000000 +0200 +@@ -0,0 +1,150 @@ ++****************************************************************************** ++ ++Q: I have a (non Acer) notebook which is not recognized by your driver but I ++think it should. What information do you need? ++ ++A: If it is a non-Acer laptop I would like to know, what makes you think that ++your laptop would work with my driver. A windows driver/utility package of the ++name "LaunchManager" or "EasyButton" is a good hint. If it is clear that your ++hardware is okay, I need the string with your model name from BIOS. Please ++don't ask me how to do it. To find out which functions of your laptop the ++driver will support, it is best, if you can tell me where to get this ++"LaunchManager" or "EasyButton" package. ++If it is a model from 2003 or newer then chances are good that it's a dritek ++type one. In this case try the option "force_series=6000" to at least enable ++the keys. ++ ++****************************************************************************** ++ ++Q: Why can't I activate my wireless hardware on Acer TM 420/430/6000/8000 ...? ++ ++A: On many newer laptops (Dritek type) I do not now how to do this, ++sorry. Someone would need to find out how windows does it. Volunteers? ++ ++****************************************************************************** ++ ++Q: I know that wireless hardware is supported on my Aspire 1690/TravelMate4600, ++but I cannot get it to work, why? ++ ++A: On these model (and similar) the wireless hardware is controlled on two ++different levels. One is controlled by acerhk's xxxled file, the other level ++is controlled by the key itself. To actually activate the hardware you need to ++write '1' to the xxled file and you need to press the corresponding button. ++Example: ++echo 1 > /proc/driver/acerhk/wirelessled ++ ++ ++****************************************************************************** ++ ++Q: Why do I always get 0x00 from /proc/driver/acerhk/key? ++ ++A1: Check the type of your laptop if /proc/driver/acerhk/info. If it is ++"Dritek", you cannot read the keys from the driver. Starting from version ++0.5.17 you get "n/a" out of the key file in this case. ++A2: If you have polling enabled (default) you will almost always read 0x00 ++from this file. This is because in every polling cycle it is checked for key ++events and if there is one, it is instantly translated and sent to the kernel ++input system. Starting with version 0.5.20 you get "n/a" out of the key file ++in this case. ++ ++****************************************************************************** ++ ++Q: When I press a key, nothing happens. Why are they not working? ++ ++A: Most keys won't do anything by themself. If nothing happens, that is ++because no programm knows what to do with the new keys. You need to assign ++actions to them, use the hotkey manager of your desktop to do that. If ++using Gnome, you find it under desktop settings - keyboard shortcuts. ++ ++****************************************************************************** ++ ++Q: The driver works for my laptop, but not all of the keys are working. What ++can I do? ++ ++A: There are some keys/key combinations which generate an ACPI event, ++e.g. Fn+F4 on some models or the lid button. ++If you have a different laptop than the one which got detected (or you used ++"force_series=xxx" anyway), then it is possible that the mapping acerhk uses ++to translate the codes from the buttons to key events is wrong. ++In this case, load the driver with "verbose=4" and press the buttons which do ++not work. Then look for messages from acerhk of the form "translated acer key ++code xxx to no key". Note these codes together with the button they belong to ++and send me this list along with the model name of your laptop. ++If you do not see a usable name in /proc/driver/acerhk/info please try the ++tools dmidecode/biosdecode/vpddecode to find this name. ++ ++****************************************************************************** ++Q: I press the wireless key but the hardware doesn't get activated, what's wrong? ++ ++A: The driver is only on older models (non-Dritek type) able to read ++keypresses by itself and toggle the hardware/LED automatically (with option ++autowlan=1). On Dritek type models this must be done by writing the desired ++value to one of the wireless files in the proc filesystem. In most ++cases this would be /proc/drivers/acerhk/wirelessled to control wlan ++hardware (blueled for Bluetooth hardware): ++ ++echo 1 > /proc/driver/acerhk/wirelessled ++ ++But you could use a hotkey manager to do that automatically when you press the ++button. In this case be aware that on some models the button generates ++different key events according to the actual state of the wireless hardware. ++ ++****************************************************************************** ++ ++Q: My keys do not work, I only get kernel messages of the form: ++atkbd.c: Unknown key pressed (translated set 2, code 0xf4 on isa0060/serio0). ++atkbd.c: Use 'setkeycodes e074 ' to make it known. ++ ++A: Press each of the buttons and note the mentioned ++code for it (e074 in this example). You should get a list like this: ++P1 e074 ++P2 e075 ++... ++If you are finished with it, look into /usr/include/linux/input.h, using ++your favourite text viewer/editor. Search for "KEY_STOP". You should see ++the following line in the file: ++ ++#define KEY_STOP 128 ++ ++After it many more lines with equal #defines should be visible. Look for ++key names which best match the names of your buttons, e.g. KEY_PROG1, ++KEY_WWW and so on. Note the numbers assigned to the names, for KEY_STOP ++this would be 128, for KEY_PROG1 148. ++Now you have a list with three items per entry, your button, a code ++from the kernel messages and a corresponding number from the file ++linux.h: ++P1 e074 148 ++P2 e075 149 ++... ++For each line in this list, issue the setkeycodes command as mentioned ++in the kernel message: ++setkeycodes e074 148 ++setkeycodes e075 149 ++... ++After doing that, the keys should be available for your hotkey manager. ++ ++****************************************************************************** ++ ++Q: My WLAN hardware gets activated through /proc/driver/acerhk/wirelessled, ++but the LED is not working. Why not? ++ ++A: Try if adding the option "led=1" to your wireless module helps. For the ++ipw2200 driver it works, as Didier CLERC found out: ++ ++ I have to load the module "ipw2200" with the option "led=1", then ++ the wifi button blinks until a network is detected. ++ ++****************************************************************************** ++ ++Q: I have an unsupported laptop, but the driver works when I force the series ++to a type like 610 or 2100. Only my buttons doesn't get recognized, why? ++ ++A: On models of the type TM_new (like TravelMate 600, 2100 and many other, see ++acerhk.c, function setup_model_features for details) the buttons use different ++codes on different models. Therefore the driver needs to know these codes. You ++can get them if you load the driver with verbose=4, press the buttons and key ++combinations (Fn+xx) you are interested in and look for kernel messages of the ++form "acerhk: translated acer key code 0xnn to ...". Write down the key code ++for each button/key combination and send them to me so I can patch the ++driver. I also need your model string to make autodetection work, so include ++/proc/driver/acerk/info. +\ Ingen nyrad vid filslut +diff -Nurp linux-2.6.37/3rdparty/acerhk/doc/IOCTL linux-2.6.37.3rdparty/3rdparty/acerhk/doc/IOCTL +--- linux-2.6.37/3rdparty/acerhk/doc/IOCTL 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/doc/IOCTL 2004-01-31 22:38:17.000000000 +0200 +@@ -0,0 +1,61 @@ ++Documentation of possible IOCTLs used by acerhk +++++++++++++++++++++++++++++++++++++++++++++++++ ++ ++ACERHK_GET_KEYCOUNT ++ Read the number of unread key presses in queue ++ Parameter: pointer to char ++ ++ACERHK_GET_KEYID ++ Read the code of the first key press (oldest) in queue ++ Parameter: pointer to char ++ ++ACERHK_CONNECT ++ Don't know what it does, used in windows driver ++ ++ACERHK_DISCONNECT ++ Don't know what it does, used in windows driver ++ ++ACERHK_GET_THERMAL_EVENT ++ Don't know what it does, used in windows driver ++ Parameter: pointer to short ++ ++ACERHK_MAIL_LED_OFF ++ Switch off the LED of the mail button(if available) ++ ++ACERHK_MAIL_LED_ON ++ Switch on the LED of the mail button (if available) ++ ++ACERHK_START_POLLING ++ Start polling (and translation to key events) in kernel ++ ++ACERHK_STOP_POLLING ++ Stop polling in kernel ++ ++ACERHK_GET_KEY_MAP ++ Get mapping of key names to key events ++ Parameter: pointer to t_map_name2event ++ ++ACERHK_SET_KEY_MAP ++ Set mapping of key names to key events ++ Parameter: pointer to t_map_name2event ++ ++IOCTLs used by windows driver +++++++++++++++++++++++++++++++ ++device name: ++\DosDevices\HOTKEY ++\Device\HOTKEY ++ ++ ++630 series: ++0x222404 ++ Get CMOS index ++0x222408 ++ ACERHK_GET_KEYCOUNT ++0x22240C ++ ACERHK_GET_KEYID ++0x222410 ++ ACERHK_MAIL_LED_OFF/ACERHK_MAIL_LED_ON ++0x222414 ++ ACERHK_CONNECT/ACERHK_DISCONNECT ++0x222418 ++ ACERHK_GET_THERMAL_EVENT +diff -Nurp linux-2.6.37/3rdparty/acerhk/doc/keycodes linux-2.6.37.3rdparty/3rdparty/acerhk/doc/keycodes +--- linux-2.6.37/3rdparty/acerhk/doc/keycodes 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/doc/keycodes 2004-04-18 20:42:59.000000000 +0300 +@@ -0,0 +1,26 @@ ++standard X keycodes with older (acerhk controlled) hardware from Acer ++********************************************************************* ++help (Fn+F1) 226 ++setup (Fn+F2) 129 ++p1 153 ++p2 144 ++p3 171 ++www 178 ++mail 236 ++wireless 147 ++power (Fn+F3) 222 ++mute (Fn+F8) 166 ++volup (Fn+Up) 158 ++voldn (Fn+Down) 165 ++ ++standard X keycodes with newer (acerhk activated) hardware from Dritek ++********************************************************************** ++help (Fn+F1) 226 ++setup (Fn+F2) 129 ++p1 153 ++p2 144 ++www 178 ++mail 236 ++volup (Fn+Up) 176 ++voldn (Fn+Down) 174 ++mute (Fn+F8) 160 +diff -Nurp linux-2.6.37/3rdparty/acerhk/doc/md95400.def linux-2.6.37.3rdparty/3rdparty/acerhk/doc/md95400.def +--- linux-2.6.37/3rdparty/acerhk/doc/md95400.def 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/doc/md95400.def 2005-03-01 22:46:53.000000000 +0200 +@@ -0,0 +1,14 @@ ++ ++ ++ ++Mail ++Web ++Play/Pause ++Stop ++Previous ++Next ++Leiser ++Lauter ++ ++ ++ +diff -Nurp linux-2.6.37/3rdparty/acerhk/INSTALL linux-2.6.37.3rdparty/3rdparty/acerhk/INSTALL +--- linux-2.6.37/3rdparty/acerhk/INSTALL 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/INSTALL 2005-12-07 14:27:16.000000000 +0200 +@@ -0,0 +1,109 @@ ++Installation ++************ ++ ++1. You need the kernel sources (or kernel headers for your kernel) ++installed to compile the driver. ++ ++2. Your kernel needs loadable module support with version information for ++modules enabled. Usage of procfs is highly recommended. ++If you want the driver to generate regular keyboard events using ++kernel version 2.4 you need the input system of the kernel enabled ++(Input core support AND keyboard support). In kernel version 2.6 all ++needed functionality should be available by default. ++ ++In most cases you can skip the next step, the Makefile tries do determine ++the correct directory on its own. Change KERNELSRC only if the autodetection ++does not work for you. Otherwise proceed directly with step 4. ++ ++3. Before you compile the driver, change KERNELSRC in the makefile to your ++path to the kernel build environment. If you are using a self compiled kernel, ++point it to the root of your sources. If you are using a packaged kernel of ++your distribution, install the package with kernel headers ++(Debian:kernel-headers) and point KERNELSRC to where the headers and config ++files are located. If you are using Debian, this ++would be "/lib/modules//build". ++ ++4. Do: ++ make ++to compile the driver. If you run into problems because of the makefile not ++recognizing your kernel version correctly, try this: ++ make acerhk.o - kernel version 2.4 ++ make acerhk.ko - kernel version 2.6 ++ ++5. Do: ++ make install ++to automatically copy the driver into the kernel module library. If you've ++done so, proceed directly with step 8. If you want to install the module ++binary yourself (because you want a different location), use steps 6 and 7 ++instead. ++ ++6. Copy the created file "acerhk.o" ("acerhk.ko" with version 2.6) to your ++kernel modules path. In Debian this could be ++"/lib/modules//kernel/drivers/extra/". ++ ++7. Update module dependencies: depmod -a ++ ++8. Try loading the module with: ++ insmod/modprobe acerhk ++If it succeeds - congratulations! If you have procfs enabled, you can try the ++following to test the driver: ++ ++Non-Dritek models: ++Press one of the special keys and after that: ++ cat /proc/driver/acerhk/key ++to read the (hexadezimal) code of the key pressed. It should ++be different from 0x00. ++(Note: You mustn't have the polling feature enabled for this to work, so load ++ the module with poll=0) ++ ++Dritek-models: ++Press one of the special keys and look for the generated key with "xev". If ++there is none, then you should see at least kernel messages about using ++setkeycodes. ++ ++If your notebook has a mail led you can try this: ++ echo on > /proc/driver/acerhk/led ++This should sete the mail led to blinking mode. ++ echo off > /proc/driver/acerhk/led ++turns it off again. ++See README for further usage information. ++ ++If the module didn't load look into your kernel messages what went wrong. If ++you see something like the following lines: ++ acerhk: could not find request handler ++ acerhk: can't find ROM area ++ acerhk: unloaded ++then your hardware is not recognized. See README for supported models. If it ++won't work on your notebook, please contact me and I will see if I can fix ++that. ++ ++Integrating the driver into kernel tree version 2.6 ++*************************************************** ++ ++If you want the driver to fully integrate into the kernel tree of version 2.6 ++proceed as follows: ++1. Copy the acerhk directory into the source tree, for instance ++ /usr/src/linux/drivers/misc/acerhk ++2. Include the driver directory in the config files. Add to the Kconfig ++file of the parent directory(/usr/src/linux/drivers/misc/Kconfig): ++ ++config ACERHK ++ tristate "Acerhk driver" ++ depends on EXPERIMENTAL ++ ---help--- ++ This is an experimental acer keyboard driver for ++ acer laptops ++ ++3. Include the acer directory in it's parents ++Makefile(/usr/src/linux/drivers/misc/Makefile): ++ ++obj-$(CONFIG_ACERHK) += acerhk/ ++ ++4. In this case you also need to activate the misc drivers first ++(/usr/src/linux/drivers/Kconfig): ++ ++source "drivers/misc/Kconfig" ++ ++If that's done, you should be able to select the driver from the configuration ++programm and build the module. ++ +diff -Nurp linux-2.6.37/3rdparty/acerhk/Makefile linux-2.6.37.3rdparty/3rdparty/acerhk/Makefile +--- linux-2.6.37/3rdparty/acerhk/Makefile 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/Makefile 2006-08-16 19:11:08.000000000 +0300 +@@ -0,0 +1,65 @@ ++# change KERNELSRC to the location of your kernel build tree only if ++# autodetection does not work ++#KERNELSRC=/usr/src/linux ++KERNELSRC?=/lib/modules/`uname -r`/build ++# Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases ++KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h)) ++KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3) ++ ++# next line is for kernel 2.6, if you integrate the driver in the kernel tree ++# /usr/src/linux/drivers/acerhk - or something similar ++# don't forget to add the following line to the parent dir's Makefile: ++# (/usr/src/linux/drivers/Makefile) ++# obj-m += acerhk/ ++CONFIG_ACERHK?=m ++obj-$(CONFIG_ACERHK) += acerhk.o ++ ++CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe ++INCLUDE=-I$(KERNELSRC)/include ++ ++ifeq ($(KERNELMAJOR), 2.6) ++TARGET := acerhk.ko ++else ++TARGET := acerhk.o ++endif ++ ++SOURCE := acerhk.c ++ ++all: $(TARGET) ++ ++help: ++ @echo Possible targets: ++ @echo -e all\\t- default target, builds kernel module ++ @echo -e install\\t- copies module binary to /lib/modules/$(KERNELVERSION)/extra/ ++ @echo -e clean\\t- removes all binaries and temporary files ++ ++# this target is only for me, don't use it yourself (Olaf) ++export: ++ sh export.sh ++ ++acerhk.ko: $(SOURCE) acerhk.h ++ $(MAKE) -C $(KERNELSRC) SUBDIRS=$(PWD) modules ++ ++acerhk.o: $(SOURCE) acerhk.h ++ $(CC) $(INCLUDE) $(CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE) ++ ++asm: $(SOURCE) ++ifeq ($(KERNELMAJOR), 2.6) ++ $(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE) ++else ++ $(CC) $(INCLUDE) $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE) ++endif ++ ++clean: ++ rm -f *~ *.o *.s *.ko .acerhk* *.mod.c ++ ++load: $(TARGET) ++ insmod $(TARGET) ++ ++unload: ++ rmmod acerhk ++ ++install: $(TARGET) ++ mkdir -p /lib/modules/$(KERNELVERSION)/extra ++ cp -v $(TARGET) /lib/modules/$(KERNELVERSION)/extra/ ++ depmod -a +diff -Nurp linux-2.6.37/3rdparty/acerhk/NEWS linux-2.6.37.3rdparty/3rdparty/acerhk/NEWS +--- linux-2.6.37/3rdparty/acerhk/NEWS 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/NEWS 2003-02-28 02:47:18.000000000 +0200 +@@ -0,0 +1,16 @@ ++2003-02-28 Version 0.5.0 ++ completely changed key polling/translation ++ support for more series ++2002-07-06 Version 0.4.2 ++ added debug functionality ++ bugfix with 520/210 ++2002-06-24 Version 0.4.1 ++ added support for TM 210 series ++ removed nvram dependency ++2002-06-15 Version 0.4 ++ added model recognition ++ added kernel polling an key event generation ++ added support for 520 series ++ ++2002-04-29 Version 0.3 ++ Initial release +\ Ingen nyrad vid filslut +diff -Nurp linux-2.6.37/3rdparty/acerhk/README linux-2.6.37.3rdparty/3rdparty/acerhk/README +--- linux-2.6.37/3rdparty/acerhk/README 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/acerhk/README 2006-11-10 00:01:46.000000000 +0200 +@@ -0,0 +1,215 @@ ++ ++What is this driver good for? ++***************************** ++ ++This driver will give access to the special keys on notebooks of the ++Acer Travelmate series, which are not handled by the keyboard ++driver. ++It also works on notebooks from other manufacturers (some Medion, ++Fujitsu-Siemens, ...). ++ ++It also has some other related functionality (depending on the model): ++- controlling LEDs (Mail, Wireless) ++- enable/disable wireless hardware ++ ++Usage ++***** ++ ++The driver provides a device /dev/misc/acerhk where you can access all ++functions through IOCTL's, look into acerhk.h for their definitions. ++I use devfs and don't care about the minor number. You may want to change ++ACERHK_MINOR in acerhk.h. ++If you don't use devfs you need to create the device node. The device uses ++major 10 (misc character devices), the minor is chosen by the kernel (if ++ACERHK_MINOR equals MISC_DYNAMIC_MINOR) or by yourself (any other value). ++Use something like ++ mknod /dev/acerhk c 10 123 ++to create the device node. ++You can also use most functions through procfs. You will find some files in ++/proc/driver/acerhk: ++ led - write "on" or "off" to set the mail led state ++ key - read it to get a key press, only useful on non-dritek models ++ and only if polling is disabled ++ This file exists only on non-dritek models ++ info - some information about the driver, including the number of ++ pending keys ++ wirelessled - write "on" or "off" to set the led state and enable ++ wlan hardware ++ On some laptops you need to load the ipw2200 (others ++ too?) with option "led=1" to make the led work. ++ blueled - write "on" or "off" to set the led state and enable ++ bluetooth hardware ++ write a value n >= 50 to let the led blink every n jiffies ++ Do not use blinking mode where not only the led but also the ++ bluetooth hardware is controlled! ++ ++Probably the best way to use the driver is to let it poll for the keys itself ++and generate real key events. this is the normal case when loading the module ++without an additional parameter : ++ ++ modprobe acerhk ++ ++or you can use the ioctl as specified in acerhk.h to control the polling. If ++your kernel has keyboard input support you will get real key events when ++pressing the special keys. ++You can then use whatever software you like to make use of those keys, ++i.e. 'hotkeys' or Linux Easy Access Keyboard 'lineakd'. I prefer hotkeys, just ++in case anyone is interested, you can find a sample configuration for this ++programm in doc/acertm.def. ++Gnome >= 2.4 has built in support for multimedia keys (acme), that's ++what I use now. ++ ++Have a look at ++ http://mmkc.sourceforge.net/ ++ ++Note: If you have one of the newer models using dritek hardware you don't need ++polling (nor the file /proc/driver/acerhk/key) to use your buttons. On this ++hardware the driver only needs to send a special command to the keyboard ++controller to make them work. The actual key presses are then handled by the ++normal keyboard driver of the kernel. You can switch of polling by ++loading the module with poll=0. It saves you precious cpu time. ++ ++ ++Module parameters ++***************** ++name values meaning ++autowlan 0,1 disable(default)/enable automatic switching of wlan hardware ++ on wireless keypress, only useful for older (no ++ dritek-hardware) models, works only will poll=1 ++poll 0,1 disable/enable(default) kernel polling of key events ++verbose 0-4 verbosity level, see below ++usedritek 0,1 disable/enable(default) use of dritek hardware on newer ++ series, needed to activate the keys on such models ++force_series set this to the laptop series number you want the driver to ++ assume, skip autodetection (look at function ++ setup_model_features() for possible values) ++ ++Debugging ++********* ++ ++You can make the the driver be more verbose. To do this, add the following ++parameter when loading the module: ++ ++ verbose= ++ ++n is an integer, 0 (default) means no additional information while increasing ++values provide an increasing amount of information. Currently 3 is maximum, ++bigger values will have the same effect as 3. The existing verbosity levels ++will generate information about: ++ Level Information ++ 1 state changes and variable initialization ++ 2 model probing ++ 3 key translation, only known keys ++ 4 key translation, also unknown keys ++ 5 misc. information (idle values) ++ ++If you have rather serious problems you can activate debugging functionality ++in the driver. To do this, uncomment the '#define ACERDEBUG' in acerhk.c. You ++will find a new file in /proc/driver/acerhk, named 'debug'. You cannot read ++from this file, but you can write commands consisting of up to 4 digits. The ++first one specifies the action, while the latter can give additional ++parameters. Implemented are: ++ 'd' decrement module usage counter ++ 'i' increment module usage counter ++ ++ 'p' call function pbutton_fct() ++ 't' call function get_thermal_event() ++ 'w1x' call function wbutton_fct_1() with parameter x (0-9) ++ 'w2x' call function wbutton_fct_2() with parameter x (0-9) ++ ++ 'vx' change verbosity level to x (0-9) ++ ++ 'mxyy' set mapping of key name x to key event yy (hex) ++ 'sxx' send key event xx (hex) to input system ++ 'Sxx' simulate acer key press with code xx (hex) ++ ++ 'e0' stop kernel polling ++ 'e1' start kernel polling ++ ++Example: ++ ++1) echo d > /proc/driver/acerhk/debug ++ ++will decrement the usage counter, very useful if a program using the driver ++segfaulted. This way you can still unload the driver. ++ ++2) echo v4 > /proc/driver/acerhk/debug ++ ++will set the verbosity level to maximum. ++ ++Keycodes ++******** ++ ++see doc/keycodes ++Also see http://bernd-wurst.de/linux/tm800.php#mmkeys (only in german) ++ ++If you have one of the newer models with the dritek hardware, use kernel 2.6 ++and get (after enabling it) kernel messages of the form: ++ ++ atkbd.c: Unknown key pressed (translated set 2, code 0xf4 on ++ isa0060/serio0). ++ atkbd.c: Use 'setkeycodes e074 ' to make it known. ++ ++then you should do exactly what your told. In this case you could do ++ ++ setkeycodes e074 158 ++ ++to map the button with scancode e074 (hex) to keycode 158 (decimal). To find ++out the scancodes of the buttons either look into the kernel log or into the ++file MMKEYBD.CFG of the windows launch manager package. There you should find ++lines like this: ++ ++Key 1 = 1,E0,74,E0,F4,F500,P1 ++ ** ** ** ++ ++The important information is marked in the example above. The numbers give the ++scancode produced by the button which's name is given last. ++The keycode you give as parameter to setkeycodes is one out of the header file ++linux/input.h, in the example above the one for KEY_BACK. ++Important note: I received mails from a number of people where setkeycodes ++rejected keycodes above a certain value. This is caused by an outdated version ++of setkeycodes, use a more recent one. ++To ease the setup of keymappings for the newer series I will try to include ++setup scripts for the different notebook series. If I have enough time to ++spare I will perhaps expand the driver itself do to that. ++ ++How does it work? ++***************** ++ ++The driver is based on the windows Me for series 610 driver and ++resembles its structure and functionality. ++Key presses are events, which are stored in a FIFO queue with 31 ++entries. You can access the event count via CMOS nvram, but the access to ++the actual queue (and other functionality like switching the mail led) is ++done through calling a system ROM function. ++Upon loading the driver looks for this function, if it cannot find it, ++loading aborts. ++Newer Dritek Hardware: ++Button handling is done entirely by the EC (embbedded/environment ++controller) which behaves like an extended keyboard controller. My ++driver only enables/disables this extension. ++ ++ ++Credits ++******* ++ ++Leif Jensen, whose driver inspired me to do the probing stuff ++http://www.math.columbia.edu/~jensen/linux/acertm/ ++ ++Thanks to all who contributed patches to this driver or who just tried it out ++on their laptops, without them it wouldn't support anything else but my ++TM 613. ++ ++Contact ++******* ++ ++If you have problems with the driver, please include the following information: ++1. name of your laptop (e.g. Acer TM 4001) ++2. content of /proc/driver/acerhk/info, if available ++3. kernel output after loading the module with verbose=2 ++ ++Email: Olaf Tauber ++ ++The latest version can be found here: ++ ++http://www.informatik.hu-berlin.de/~tauber/acerhk diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-2.6.36-buildfix.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-2.6.36-buildfix.patch new file mode 100644 index 00000000..47a71053 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-2.6.36-buildfix.patch @@ -0,0 +1,20 @@ +--- linux-2.6.35/3rdparty/acerhk/acerhk.c.orig 2010-10-03 12:50:33.000000000 +0000 ++++ linux-2.6.35/3rdparty/acerhk/acerhk.c 2010-10-03 13:13:22.093868410 +0000 +@@ -2730,7 +2730,7 @@ static void acerhk_proc_cleanup(void) + + /* {{{ file operations */ + +-static int acerhk_ioctl( struct inode *inode, struct file *file, ++static long acerhk_ioctl( struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg ) + { + int retval; +@@ -2827,7 +2827,7 @@ static int acerhk_release( struct inode + + static struct file_operations acerhk_fops = { + owner: THIS_MODULE, +- ioctl: acerhk_ioctl, ++ unlocked_ioctl: acerhk_ioctl, + open: acerhk_open, + #ifdef ACERDEBUG + write: acerhk_write, diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-extra-cflags.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-extra-cflags.patch new file mode 100644 index 00000000..7971c699 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-extra-cflags.patch @@ -0,0 +1,33 @@ +CFLAGS use isn't allowed anymore with 2.6.24, we must use EXTRA_CFLAGS +in its place + +Signed-off-by: Herton Ronaldo Krzesinski + +--- linux-2.6.23/3rdparty/acerhk/Makefile.orig 2007-11-08 21:32:43.000000000 -0200 ++++ linux-2.6.23/3rdparty/acerhk/Makefile 2007-11-08 21:33:28.000000000 -0200 +@@ -14,7 +14,7 @@ + CONFIG_ACERHK?=m + obj-$(CONFIG_ACERHK) += acerhk.o + +-CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe ++EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe + INCLUDE=-I$(KERNELSRC)/include + + ifeq ($(KERNELMAJOR), 2.6) +@@ -41,13 +41,13 @@ acerhk.ko: $(SOURCE) acerhk.h + $(MAKE) -C $(KERNELSRC) SUBDIRS=$(PWD) modules + + acerhk.o: $(SOURCE) acerhk.h +- $(CC) $(INCLUDE) $(CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE) ++ $(CC) $(INCLUDE) $(EXTRA_CFLAGS) -DMODVERSIONS -DMODULE -D__KERNEL__ -o $(TARGET) $(SOURCE) + + asm: $(SOURCE) + ifeq ($(KERNELMAJOR), 2.6) +- $(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE) ++ $(CC) $(INCLUDE) $(INCLUDE)/asm-i386/mach-default $(EXTRA_CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE) + else +- $(CC) $(INCLUDE) $(CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE) ++ $(CC) $(INCLUDE) $(EXTRA_CFLAGS) -fverbose-asm -S -DMODVERSIONS -DMODULE -D__KERNEL__ $(SOURCE) + endif + + clean: diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-fix-build-with-function-tracer.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-fix-build-with-function-tracer.patch new file mode 100644 index 00000000..c8d000b5 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-fix-build-with-function-tracer.patch @@ -0,0 +1,22 @@ +Fix acerhk build with FUNCTION_TRACER enabled. + +Signed-off-by: Herton Ronaldo Krzesinski +--- + 3rdparty/acerhk/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff -p -up linux-2.6.31/3rdparty/acerhk/Makefile.orig linux-2.6.31/3rdparty/acerhk/Makefile +--- linux-2.6.31/3rdparty/acerhk/Makefile.orig 2009-10-02 16:39:06.000000000 -0300 ++++ linux-2.6.31/3rdparty/acerhk/Makefile 2009-10-02 16:45:13.000000000 -0300 +@@ -14,7 +14,10 @@ + CONFIG_ACERHK?=m + obj-$(CONFIG_ACERHK) += acerhk.o + +-EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe ++CFLAGS_acerhk.o += -c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe ++ifdef CONFIG_FUNCTION_TRACER ++CFLAGS_REMOVE_acerhk.o = -pg ++endif + INCLUDE=-I$(KERNELSRC)/include + + ifeq ($(KERNELMAJOR), 2.6) diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-fix-include.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-fix-include.patch new file mode 100644 index 00000000..cba26984 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-fix-include.patch @@ -0,0 +1,23 @@ + +AUTOCONF_INCLUDED is not defined anymore in 2.6.38, so old include got exposed. + +Fix by removing the offending bits. + +Signed-off-by: Thomas Backlund + + 3rdparty/acerhk/acerhk.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- linux-2.6.38/3rdparty/acerhk/acerhk.c.orig 2011-03-20 13:57:32.000000000 +0200 ++++ linux-2.6.38/3rdparty/acerhk/acerhk.c 2011-03-20 15:00:45.768659568 +0200 +@@ -35,10 +35,6 @@ + * + */ + +-#ifndef AUTOCONF_INCLUDED +-#include +-#endif +- + /* This driver is heavily dependent on the architecture, don't let + * anyone without an X86 machine use it. On laptops with AMD64 + * architecture this driver is only useable in 32 bit mode. diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-kbuild.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-kbuild.patch new file mode 100644 index 00000000..f0c419ad --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-kbuild.patch @@ -0,0 +1,37 @@ +Fix Makefile and add Kconfig for the acerhk driver +--- + 3rdparty/acerhk/Kconfig | 8 8 + 0 - 0 ! + 3rdparty/acerhk/Makefile | 6 3 + 3 - 0 ! + 2 files changed, 11 insertions(+), 3 deletions(-) + +Index: linux-2.6.21/3rdparty/acerhk/Makefile +=================================================================== +--- linux-2.6.21.orig/3rdparty/acerhk/Makefile 2007-05-15 15:34:48.000000000 +0200 ++++ linux-2.6.21/3rdparty/acerhk/Makefile 2007-05-15 15:37:17.000000000 +0200 +@@ -1,10 +1,10 @@ + # change KERNELSRC to the location of your kernel build tree only if + # autodetection does not work + #KERNELSRC=/usr/src/linux +-KERNELSRC?=/lib/modules/`uname -r`/build ++#KERNELSRC?=/lib/modules/`uname -r`/build + # Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases +-KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h)) +-KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3) ++#KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h)) ++#KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3) + + # next line is for kernel 2.6, if you integrate the driver in the kernel tree + # /usr/src/linux/drivers/acerhk - or something similar +Index: linux-2.6.21/3rdparty/acerhk/Kconfig +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.21/3rdparty/acerhk/Kconfig 2007-05-15 15:39:30.000000000 +0200 +@@ -0,0 +1,8 @@ ++config ACERHK ++ tristate "Acerhk driver" ++ depends on EXPERIMENTAL && X86 ++ ---help--- ++ This is an experimental acer keyboard driver for ++ acer laptops. If you have a notebook with a ipw2X00 ++ wireless card, it allows you to turn off the rf_kill ++ diff --git a/kernel/kernel/files/patches/mageia/3rd-acerhk-proc_dir_entry-owner.patch b/kernel/kernel/files/patches/mageia/3rd-acerhk-proc_dir_entry-owner.patch new file mode 100644 index 00000000..e5821d46 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-acerhk-proc_dir_entry-owner.patch @@ -0,0 +1,67 @@ +Updated for owner removal from struct proc_dir_entry (2.6.30) + +Signed-off-by: Herton Ronaldo Krzesinski + +--- + 3rdparty/acerhk/acerhk.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff -p -up linux-2.6.29/3rdparty/acerhk/acerhk.c.orig linux-2.6.29/3rdparty/acerhk/acerhk.c +--- linux-2.6.29/3rdparty/acerhk/acerhk.c.orig 2009-05-22 02:42:44.000000000 -0300 ++++ linux-2.6.29/3rdparty/acerhk/acerhk.c 2009-05-22 02:43:45.000000000 -0300 +@@ -2626,7 +2626,6 @@ static int acerhk_proc_init(void) + printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n"); + } + else { +- proc_acer_dir->owner = THIS_MODULE; + /* now create several files, first general info ... */ + entry = create_proc_read_entry("info", + 0444, proc_acer_dir, acerhk_proc_info, NULL); +@@ -2635,7 +2634,6 @@ static int acerhk_proc_init(void) + remove_proc_entry("driver/acerhk", NULL); + retval = 0; + } else { +- entry->owner = THIS_MODULE; + /* ... last pressed key ... */ + entry = create_proc_read_entry("key", + 0444, proc_acer_dir, acerhk_proc_key, NULL); +@@ -2645,7 +2643,6 @@ static int acerhk_proc_init(void) + remove_proc_entry("driver/acerhk", NULL); + retval = 0; + } else { +- entry->owner = THIS_MODULE; + /* ... and led control file */ + entry = create_proc_entry("led", 0222, proc_acer_dir); + if (entry == NULL) { +@@ -2657,7 +2654,6 @@ static int acerhk_proc_init(void) + } + else { + entry->write_proc = acerhk_proc_led; +- entry->owner = THIS_MODULE; + /* ... and wireless led controll file */ + entry = create_proc_entry("wirelessled", 0222, proc_acer_dir); + if (entry == NULL) { +@@ -2670,7 +2666,6 @@ static int acerhk_proc_init(void) + } + else { + entry->write_proc = acerhk_proc_wirelessled; +- entry->owner = THIS_MODULE; + /* ... and bluetooth led controll file */ + entry = create_proc_entry("blueled", 0222, proc_acer_dir); + if (entry == NULL) { +@@ -2683,7 +2678,6 @@ static int acerhk_proc_init(void) + retval = 0; + } else { + entry->write_proc = acerhk_proc_blueled; +- entry->owner = THIS_MODULE; + retval = 1; + #ifdef ACERDEBUG + /* add extra file for debugging purposes */ +@@ -2700,7 +2694,6 @@ static int acerhk_proc_init(void) + } + else { + entry->write_proc = acerhk_proc_debug; +- entry->owner = THIS_MODULE; + retval = 1; + } + #endif diff --git a/kernel/kernel/files/patches/mageia/3rd-aes2501-kbuild.patch b/kernel/kernel/files/patches/mageia/3rd-aes2501-kbuild.patch new file mode 100644 index 00000000..1dcf8fa0 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-aes2501-kbuild.patch @@ -0,0 +1,47 @@ +Fix Makefile and add Kconfig for the aes2501 driver. + +Signed-off-by: Herton Ronaldo Krzesinski + +--- + linux-2.6.23/3rdparty/aes2501/Kconfig | 10 ++++++++++ + linux-2.6.23/3rdparty/aes2501/Makefile | 19 +------------------ + 2 files changed, 11 insertions(+), 18 deletions(-) + +diff -p -up linux-2.6.23/3rdparty/aes2501/Kconfig.orig linux-2.6.23/3rdparty/aes2501/Kconfig +--- linux-2.6.23/3rdparty/aes2501/Kconfig.orig 2008-01-13 23:14:47.000000000 -0200 ++++ linux-2.6.23/3rdparty/aes2501/Kconfig 2008-01-13 23:35:21.000000000 -0200 +@@ -0,0 +1,10 @@ ++config AES2501 ++ tristate "AuthenTec AES2501 Fingerprint Sensor Driver" ++ depends on USB ++ default m ++ ---help--- ++ Say Y here if you have a AuthenTec AES2501 Fingerprint ++ Sensor device. ++ ++ To compile this driver as a module, choose M here: the ++ module will be called aes2501. +diff -p -up linux-2.6.23/3rdparty/aes2501/Makefile.orig linux-2.6.23/3rdparty/aes2501/Makefile +--- linux-2.6.23/3rdparty/aes2501/Makefile.orig 2008-01-13 23:14:36.000000000 -0200 ++++ linux-2.6.23/3rdparty/aes2501/Makefile 2008-01-13 23:21:33.000000000 -0200 +@@ -1,19 +1,2 @@ +- +-obj-m := aes2501.o +- +-KERNELDIR ?= /lib/modules/$(shell uname -r)/build +- +-PWD := $(shell pwd) +- +-all: usertest +- $(MAKE) -C $(KERNELDIR) M=$(PWD) +- +-usertest: +- gcc -I. -o usertest usertest.c +- +-clean: +- rm -f *.o *~ aes2501.ko aes2501.mod.c Module.symvers usertest +- rm -rf .tmp_versions +- rm -f .*.cmd +- ++obj-$(CONFIG_AES2501) := aes2501.o + diff --git a/kernel/kernel/files/patches/mageia/3rd-aes2501-r19.patch b/kernel/kernel/files/patches/mageia/3rd-aes2501-r19.patch new file mode 100644 index 00000000..a5f95e79 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-aes2501-r19.patch @@ -0,0 +1,2356 @@ + 3rdparty/aes2501/ChangeLog | 95 ++ + 3rdparty/aes2501/Makefile | 19 + 3rdparty/aes2501/aes2501.c | 1629 ++++++++++++++++++++++++++++++++++++++++ + 3rdparty/aes2501/aes2501.h | 40 + 3rdparty/aes2501/aes2501_regs.h | 464 +++++++++++ + 3rdparty/aes2501/usertest.c | 78 + + 6 files changed, 2325 insertions(+) +diff -Nurp linux-2.6.37/3rdparty/aes2501/aes2501.c linux-2.6.37.3rdparty/3rdparty/aes2501/aes2501.c +--- linux-2.6.37/3rdparty/aes2501/aes2501.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/aes2501/aes2501.c 2008-01-14 03:07:30.000000000 +0200 +@@ -0,0 +1,1629 @@ ++ ++/* ++ * aes2501.c -- AuthenTec AES2501 Fingerprint Sensor Driver for Linux ++ * ++ * Maintainer: Cyrille Bagard ++ * ++ * Copyright (C) 2007 Cyrille Bagard ++ * ++ * This file is part of the AES2501 driver. ++ * ++ * the AES2501 driver 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. ++ * ++ * the AES2501 driver 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 the AES2501 driver; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++#include "aes2501.h" ++#include "aes2501_regs.h" ++ ++ ++static int major = 0; ++ ++module_param(major, int, 0); ++MODULE_PARM_DESC(major, "major number"); ++ ++ ++//#define DEBUG ++ ++ ++#define PRINTK_INFO(fmt, arg...) printk(KERN_INFO "aes2501: " fmt, ## arg) ++ ++#define PRINTK_CRIT(fmt, arg...) printk(KERN_CRIT "aes2501: " fmt, ## arg) ++ ++#define PRINTK_DBG(fmt, arg...) printk(KERN_DEBUG "aes2501: " fmt, ## arg) ++ ++ ++static struct workqueue_struct *comm_queue; ++ ++ ++static char *finger_print = NULL; ++static size_t finger_print_len; ++ ++ ++ ++static DECLARE_WAIT_QUEUE_HEAD(wq); ++static int flag = 0; ++ ++ ++ ++struct usb_aes2501 *_dev; ++ ++ ++ ++ ++ ++ ++struct aes2501 { ++ ++ struct usb_device *udev; ++ ++ int temp; ++ ++ unsigned char *int_in_buffer; ++ struct urb *int_in_urb; ++ ++}; ++ ++ ++/* ++#define VENDOR_ID 0x08f7 ++#define PRODUCT_ID 0x0002 ++*/ ++ ++#define VENDOR_ID 0x08ff ++#define PRODUCT_ID 0x2580 ++ ++ ++/* Table of devices that work with this driver */ ++ ++static struct usb_device_id id_table [] = { ++ { USB_DEVICE(VENDOR_ID, PRODUCT_ID) }, ++ { } ++}; ++ ++MODULE_DEVICE_TABLE(usb, id_table); ++ ++ ++/* Get a minor range for your devices from the usb maintainer */ ++#define USB_AES2501_MINOR_BASE 192 ++ ++ ++ ++#define WRITES_IN_FLIGHT 8 /* ??? */ ++ ++ ++ ++enum AES2501_Status { ++ ++ AESS_INIT_DONE, ++ AESS_IS_SCANNING, ++ ++ AESS_COUNT ++ ++}; ++ ++ ++#define BULK_OUT_BUFFER_SIZE 32 ++ ++ ++/* Read a register value from a dump sent by the device. */ ++static int read_register_value(const uint8_t *, Aes2501Registers); ++ ++/* Tells if a finger motion is still detected. */ ++static int sum_histogram_values(const uint8_t *, uint8_t); ++ ++ ++/* Structure to hold all device specific stuff */ ++struct usb_aes2501 { ++ ++ struct usb_device *udev; /* the usb device for this device */ ++ struct usb_interface *interface; /* the interface for this device */ ++ struct semaphore limit_sem; /* limiting the number of writes in progress */ ++ unsigned char *bulk_in_buffer; /* the buffer to receive data */ ++ size_t bulk_in_size; /* the size of the receive buffer */ ++ __u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */ ++ uint8_t bulk_out_buffer[BULK_OUT_BUFFER_SIZE]; /* the buffer to send data (32 / 8 = 4) */ ++ size_t bulk_out_buffer_used; /* the quantity of buffered data to send */ ++ __u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */ ++ struct kref kref; ++ struct mutex io_mutex; /* synchronize I/O with disconnect */ ++ ++ DECLARE_BITMAP(status, AESS_COUNT); /* Information about what has been set / is running */ ++ ++ struct work_struct scan_work; ++ uint8_t stop_scan; /* Flag to stop finger detecting during module removal */ ++}; ++ ++ ++#define to_aes2501_dev(r) container_of(r, struct usb_aes2501, kref) ++ ++static struct usb_driver aes2501_driver; ++ ++static void aes2501_delete(struct kref *kref) ++{ ++ struct usb_aes2501 *dev; ++ ++ dev = to_aes2501_dev(kref); ++ ++ usb_put_dev(dev->udev); ++ kfree(dev->bulk_in_buffer); ++ kfree(dev); ++ ++} ++ ++ ++static int aes2501_open(struct inode *inode, struct file *file); ++/* ++struct usb_aes2501 *_dev; ++static int aes2501_open(struct inode *inode, struct file *file) ++{ ++ printk(KERN_INFO "Plop !\n"); ++ ++ ++ ++ return 0; ++} ++*/ ++ ++static ssize_t aes2501_read(struct file *file, char *buffer, size_t count, loff_t *ppos) ++{ ++ int read_len; ++ ++ //printk(KERN_INFO "aes2501_read ! got %d -> need (%d ; %d)\n", finger_print_len, *ppos, count); ++ ++ if (flag == 0) ++ printk(KERN_INFO "Process %i (%s) is going to sleep\n", current->pid, current->comm); ++ ++ wait_event_interruptible(wq, flag == 1); ++ ++ if (signal_pending(current)) ++ return -ERESTARTSYS; ++ ++ if (finger_print_len == 0) ++ return -ENODATA; ++ ++ if (unlikely((*ppos < 0) || (loff_t)(*ppos + count) < 0)) ++ return -EINVAL; ++ ++ if (*ppos + count > finger_print_len) ++ read_len = finger_print_len - *ppos; ++ else read_len = count; ++ ++ if (read_len > 0) ++ { ++ if (!access_ok(VERIFY_WRITE, buffer, read_len)) ++ return -EFAULT; ++ ++ read_len -= copy_to_user(buffer, finger_print + *ppos, read_len); ++ *ppos += read_len; ++ ++ } ++ ++ /* !!!! */ ++ else flag = 0; ++ ++ return read_len; ++ ++} ++ ++ ++ ++static int detect_finger_on_aes2501(struct usb_aes2501 *dev); ++ ++static void do_scanning(struct work_struct *work); ++ ++ ++// ioctl - I/O control ++static int aes2501_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ struct usb_aes2501 *dev; ++ int retval; ++ ++ dev = _dev; ++ ++ ++ printk(KERN_INFO "Get IOCtl :: cmd = %d vs %d\n", cmd, (AES2501_IOC_TEST)); ++ ++ switch (cmd) { ++ ++ case AES2501_IOC_TEST: ++ ++#if defined(_arch_um__) || !(LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)) ++ INIT_WORK(&dev->scan_work, do_scanning); ++#else ++ INIT_WORK(&dev->scan_work, do_scanning, NULL); ++#endif ++ ++ retval = queue_work(comm_queue, &dev->scan_work); ++ ++ ++ } ++ ++ ++ ++ return 0; ++ ++ ++#if 0 ++ int retval = 0; ++ switch ( cmd ) { ++ case CASE1:/* for writing data to arg */ ++ if (copy_from_user(&data, (int *)arg, sizeof(int))) ++ return -EFAULT; ++ break; ++ case CASE2:/* for reading data from arg */ ++ if (copy_to_user((int *)arg, &data, sizeof(int))) ++ return -EFAULT; ++ break; ++ default: ++ retval = -EINVAL; ++ } ++ return retval; ++#endif ++} ++ ++ ++ ++static const struct file_operations aes2501_fops = { ++ .owner = THIS_MODULE, ++ .read = aes2501_read,/* ++ .write = aes2501_write,*/ ++ .open = aes2501_open,/* ++ .release = skel_release,*/ ++ .ioctl = aes2501_ioctl ++}; ++ ++ ++ ++/* ++static int send_data_to_aes2501(struct usb_aes2501 *dev, unsigned char *buffer, int len) ++{ ++#ifdef DEBUG ++ int i; ++#endif ++ int bytes_written; ++ int ret; ++ ++#ifdef DEBUG ++ printk(KERN_INFO "\n:: OUT :: len=%d\n", len); ++ ++ for (i = 0; i < len; i++) ++ { ++ if (i > 0 && i % 16 == 0) ++ printk("\n"); ++ if (i % 16 == 0) ++ printk(KERN_INFO " %05x: ", i); ++ ++ if (i % 8 == 0) ++ printk(" "); ++ ++ printk("%02x ", buffer[i]); ++ ++ } ++ ++ printk("\n"); ++#endif ++ ++ ret = usb_bulk_msg(dev->udev, ++ usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr), ++ buffer, ++ len, ++ &bytes_written, 4000); ++ ++ if (ret < 0) ++ PRINTK_CRIT("error while sending data: %d\n", ret); ++ ++ if (bytes_written != len) ++ printk(KERN_INFO "did not write all ! %d vs %d\n", bytes_written, len); ++ ++ return ret; ++ ++} ++*/ ++ ++static int flush_aes2501_bulk_out(struct usb_aes2501 *dev) ++{ ++ int ret; ++ int bytes_written; ++ ++ ret = 0; ++ ++ if (dev->bulk_out_buffer_used > 0) { ++ ++ ret = usb_bulk_msg(dev->udev, ++ usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr), ++ dev->bulk_out_buffer, ++ dev->bulk_out_buffer_used, ++ &bytes_written, 4000); ++ ++ if (ret < 0) ++ PRINTK_CRIT("error while sending data: %d\n", ret); ++ ++ else if (bytes_written != dev->bulk_out_buffer_used) ++ { ++ printk(KERN_INFO "did not write all ! %d vs %d\n", bytes_written, dev->bulk_out_buffer_used); ++ /*ret = ... */ ++ } ++ ++ dev->bulk_out_buffer_used = 0; ++ ++ } ++ ++ return ret; ++ ++} ++ ++ ++static int write_aes2501_register(struct usb_aes2501 *dev, uint8_t reg, uint8_t data) ++{ ++ int ret; ++ ++ if (dev->bulk_out_buffer_used == BULK_OUT_BUFFER_SIZE) ++ ret = flush_aes2501_bulk_out(dev); ++ else ++ ret = 0; ++ ++ dev->bulk_out_buffer[dev->bulk_out_buffer_used++] = reg; ++ dev->bulk_out_buffer[dev->bulk_out_buffer_used++] = data; ++ ++ return ret; ++ ++} ++ ++ ++static int recv_data_to_aes2501(struct usb_aes2501 *dev, unsigned char *buffer, int len) ++{ ++ int bytes_read; ++ int ret; ++#ifdef DEBUG ++ int i; ++#endif ++ ++ ret = usb_bulk_msg(dev->udev, ++ usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr), ++ buffer, ++ len, ++ &bytes_read, 4000); ++ ++ if (ret < 0) ++ PRINTK_CRIT("error while sending data: %d\n", ret); ++ ++ if (bytes_read != len) ++ printk(KERN_INFO "did not read all ! %d vs %d\n", bytes_read, len); ++ ++#ifdef DEBUG ++ if (ret == 0) ++ { ++ printk(KERN_INFO "\n:: IN :: len=%d\n", len); ++ ++ for (i = 0; i < len; i++) ++ { ++ if (i > 0 && i % 16 == 0) ++ printk("\n"); ++ if (i % 16 == 0) ++ printk(KERN_INFO " %05x: ", i); ++ ++ if (i % 8 == 0) ++ printk(" "); ++ ++ printk("%02x ", buffer[i]); ++ ++ } ++ ++ printk("\n"); ++ ++ } ++#endif ++ ++ return ret; ++ ++} ++ ++ ++ ++static int standby_aes2501(struct usb_aes2501 *dev) ++{ ++ ++ //unsigned char cmd[] = "\xac\x01\xad\x1a\x81\x02"; ++ ++ ++ unsigned char buffer[4]; ++ ++ ++ ++ ++ printk(KERN_INFO ">> Standby aes2501 !\n"); ++ ++ ++ //msleep(800); ++ ++ write_aes2501_register(dev, AES2501_REG_TREGC, AES2501_TREGC_ENABLE); ++ write_aes2501_register(dev, AES2501_REG_TREGD, 0x1a); ++ ++ flush_aes2501_bulk_out(dev); ++ ++ /** ++ * TODO: ++ * - lire ici les deux octets. ++ * - voir pour inverser les commandes. ++ */ ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL2, 0x02/* AES2501_CTRL2_READ_REGS ??? */); ++ flush_aes2501_bulk_out(dev); ++ ++ //send_data_to_aes2501(dev, cmd, 6); ++ recv_data_to_aes2501(dev, buffer, 2); ++ ++ ++ ++ printk(KERN_INFO " %02x %02x\n", buffer[0], buffer[1]); ++ ++ ++ if ((buffer[1] & AES2501_STAT_SCAN) == buffer[1]) ++ { ++ PRINTK_DBG("scan state: "); ++ ++ switch (buffer[1]) ++ { ++ case STATE_WAITING_FOR_FINGER: ++ printk("'Waiting for finger'\n"); ++ break; ++ case STATE_FINGER_SETTLING_DELAY: ++ printk("'In Finger settling delay'\n"); ++ break; ++ case STATE_POWER_UP_DELAY: ++ printk("'In power up delay'\n"); ++ break; ++ case STATE_WAITING_TO_START_SCAN: ++ printk("'Waiting to start image scan'\n"); ++ break; ++ case STATE_PRELOADING_SUBARRAY_0: ++ printk("'Pre-loading subarray 0'\n"); ++ break; ++ case STATE_SETUP_FOR_ROW_ADVANCE: ++ printk("'Setup for row advance'\n"); ++ break; ++ case STATE_WAITING_FOR_ROW_ADVANCE: ++ printk("'Waiting for row advance'\n"); ++ break; ++ case STATE_PRELOADING_COL_0: ++ printk("'Pre-loading column 0'\n"); ++ break; ++ case STATE_SETUP_FOR_COL_ADVANCE: ++ printk("'Setup for column advance'\n"); ++ break; ++ case STATE_WAITING_FOR_COL_ADVANCE: ++ printk("'Waiting for column advance'\n"); ++ break; ++ case STATE_WAITING_FOR_SCAN_START: ++ printk("'Waiting for scan start'\n"); ++ break; ++ case STATE_WAITING_FOR_SCAN_END: ++ printk("'Waiting for scan end'\n"); ++ break; ++ case STATE_WAITING_FOR_ROW_SETUP: ++ printk("'Waiting for row setup'\n"); ++ break; ++ case STATE_WAITING_FOR_COL_TIME: ++ printk("'Waiting for one column time (depends on scan rate)'\n"); ++ break; ++ case STATE_WAITING_FOR_QUEUED_DATA: ++ printk("'Waiting for queued data transmission to be completed'\n"); ++ break; ++ case STATE_WAIT_FOR_128_US: ++ printk("'Wait for 128 us'\n"); ++ break; ++ default: ++ printk("none (?!)\n"); ++ break; ++ ++ } ++ ++ } ++ ++ if (buffer[1] & AES2501_STAT_ERROR) ++ PRINTK_DBG("got serial interface framing error\n"); ++ ++ if (buffer[1] & AES2501_STAT_PAUSED) ++ PRINTK_DBG("scan was paused due to input buffer full\n"); ++ ++ if (buffer[1] & AES2501_STAT_RESET) ++ PRINTK_DBG("master reset input has been asserted\n"); ++ ++ ++ ++ ++ return 0; ++ ++ ++} ++ ++ ++ ++ ++static int setup_aes2501(struct usb_aes2501 *dev) ++{ ++ //unsigned char patch_msg[] = "\x80\x01"; ++ ++ ++ //unsigned char cmd[] = "\x80\x01\x81\x02"; ++ ++ //unsigned char cmd_00[] = "\xb0\x27"; ++ //unsigned char cmd_01[] = "\x80\x01\x82\x40"; ++ //unsigned char cmd_02[] = "\xff\x00"; ++ //unsigned char cmd_03[] = "\x80\x01\x82\x40\x83\x00\x88\x02\x89\x10\x8a\x05\x8c\x00\x8e\x13\x91\x44\x92\x34\x95\x16\x96\x16\x97\x18\xa1\x70\xa2\x02\xa7\x00\xac\x01\xad\x1a\x80\x04\x81\x04\xb4\x00";/*42*/ ++ //unsigned char cmd_04[] = "\x80\x01\x82\x40"; ++ ++ //unsigned char cmd2[] = "\x80\x01\xa8\x41\x82\x42\x83\x53\x80\x04\x81\x02";/*12*/ ++ ++ //unsigned char cmd3_00[] = "\xff\x00"; ++ //unsigned char cmd3_01[] = "\x80\x01\xa8\x41\x82\x42\x83\x53\x80\x04\x81\x02";/*12*/ ++ ++ //unsigned char cmd4[] = "\x80\x01\x82\x40\xb0\x27\x94\x0a\x80\x04\x83\x45\xa8\x41";/*14*/ ++ ++ //unsigned char cmd5_00[] = "\xb0\x27"; ++ //unsigned char cmd5_01[] = "\x80\x01\x82\x40"; ++ //unsigned char cmd5_02[] = "\xff\x00"; ++ //unsigned char cmd5_03[] = "\x80\x02"; ++ //unsigned char cmd5_04[] = "\x81\x02"; ++ ++ ++ int i; ++ ++ unsigned char buffer[128]; ++ ++ ++ /* To be sure the device will respond */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ //send_data_to_aes2501(dev, patch_msg, 2); ++ flush_aes2501_bulk_out(dev);/* ... */ ++ ++ printk(KERN_INFO ">> Setting up aes2501 !\n"); ++ ++ /* Part 1 */ ++ ++ printk(KERN_INFO " -- part 1 --\n"); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_READ_REGS); ++ flush_aes2501_bulk_out(dev); ++ ++ //send_data_to_aes2501(dev, cmd, 4); ++ recv_data_to_aes2501(dev, buffer, 126); ++ ++ ++ ++ //send_data_to_aes2501(dev, cmd_00, 2); ++ ++ write_aes2501_register(dev, 0xb0, 0x27);/* Reserved */ ++ ++ ++ ++ //send_data_to_aes2501(dev, cmd_01, 4); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ ++ for (i = 0; i <= 10; i++) ++ { ++ //msleep(200); ++ //send_data_to_aes2501(dev, cmd_02, 2); ++ write_aes2501_register(dev, 0xff, 0x00);/* Reserved */ ++ } ++ ++ //msleep(100); ++ ++ ++ //send_data_to_aes2501(dev, cmd_03, 42); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_DETCTRL, AES2501_DETCTRL_DRATE_CONTINUOUS | AES2501_DETCTRL_SDELAY_31_MS); ++ write_aes2501_register(dev, AES2501_REG_COLSCAN, AES2501_COLSCAN_SRATE_128_US); ++ write_aes2501_register(dev, AES2501_REG_MEASDRV, AES2501_MEASDRV_MDRIVE_0_325 | AES2501_MEASDRV_MEASURE_SQUARE); ++ write_aes2501_register(dev, AES2501_REG_MEASFREQ, AES2501_MEASFREQ_2M); ++ write_aes2501_register(dev, AES2501_REG_DEMODPHASE1, DEMODPHASE_NONE);/* Default */ ++ write_aes2501_register(dev, AES2501_REG_DEMODPHASE2, DEMODPHASE_NONE); ++ write_aes2501_register(dev, AES2501_REG_CHANGAIN, AES2501_CHANGAIN_STAGE2_4X | AES2501_CHANGAIN_STAGE1_16X); ++ write_aes2501_register(dev, AES2501_REG_ADREFHI, 0x44); ++ write_aes2501_register(dev, AES2501_REG_ADREFLO, 0x34); ++ write_aes2501_register(dev, AES2501_REG_STRTCOL, 0x16); ++ write_aes2501_register(dev, AES2501_REG_ENDCOL, 0x16); ++ write_aes2501_register(dev, AES2501_REG_DATFMT, AES2501_DATFMT_BIN_IMG | 0x08);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_TREG1, 0x70);/* Reserved + 0xXX */ ++ write_aes2501_register(dev, 0xa2, 0x02);/* Reserved */ ++ write_aes2501_register(dev, 0xa7, 0x00);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_TREGC, AES2501_TREGC_ENABLE); ++ write_aes2501_register(dev, AES2501_REG_TREGD, 0x1a); ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_REG_UPDATE); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_SET_ONE_SHOT); ++ write_aes2501_register(dev, AES2501_REG_LPONT, AES2501_LPONT_MIN_VALUE); ++ ++ ++ flush_aes2501_bulk_out(dev); ++ ++ recv_data_to_aes2501(dev, buffer, 20); ++ ++ ++ ++ //send_data_to_aes2501(dev, cmd_04, 4); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ ++ /* Part 2 */ ++ ++ printk(KERN_INFO " -- part 2 --\n"); ++ ++ //msleep(100); ++ ++ //send_data_to_aes2501(dev, cmd2, 12); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_AUTOCALOFFSET, 0x41); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x42);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_DETCTRL, 0x53);/* Cumul ??? */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_REG_UPDATE); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_READ_REGS); ++ ++ ++ ++ ++ flush_aes2501_bulk_out(dev); ++ ++ ++ recv_data_to_aes2501(dev, buffer, 126); ++ ++ /* Part 3 */ ++ ++ printk(KERN_INFO " -- part 3 --\n"); ++ ++ i = 0; ++ ++ printk(KERN_INFO " reg 0xaf = 0x%x\n", buffer[0x5f]); ++ while (buffer[0x5f] == 0x6b) ++ { ++ //msleep(200); ++ ++ ++ //send_data_to_aes2501(dev, cmd3_00, 2); ++ write_aes2501_register(dev, 0xff, 0x00);/* Reserved */ ++ ++ //msleep(80); ++ ++ //send_data_to_aes2501(dev, cmd3_01, 12); ++ ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_AUTOCALOFFSET, 0x41); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x42);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_DETCTRL, 0x53);/* Cumul ??? */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_REG_UPDATE); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_READ_REGS); ++ ++ flush_aes2501_bulk_out(dev); ++ ++ ++ ++ ++ recv_data_to_aes2501(dev, buffer, 126); ++ ++ printk(KERN_INFO " +reg 0xaf = 0x%x\n", buffer[0x5f]); ++ ++ if (++i == 13) break; ++ ++ } ++ ++ ++ ++ ++ ++ /* Part 4 */ ++ ++ printk(KERN_INFO " -- part 4 --\n"); ++ ++ //send_data_to_aes2501(dev, cmd4, 14); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ write_aes2501_register(dev, 0xb0, 0x27);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_ENDROW, 0x0a); ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_REG_UPDATE); ++ write_aes2501_register(dev, AES2501_REG_DETCTRL, 0x45);/* ???? */ ++ write_aes2501_register(dev, AES2501_REG_AUTOCALOFFSET, 0x41); ++ ++ ++ ++ ++ ++ ++ /* ... */ ++ ++ ++/* ++ for (i = 0; i < 126; i += 10) ++ { ++ printk(KERN_INFO " %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", ++ buffer[i + 0], buffer[i + 1], buffer[i + 2], buffer[i + 3], buffer[i + 4], ++ buffer[i + 5], buffer[i + 6], buffer[i + 7], buffer[i + 8], buffer[i + 9]); ++ ++ if (i % 20 == 0) ++ printk(KERN_INFO "\n "); ++ ++ } ++ ++ printk(KERN_INFO "\n"); ++*/ ++ ++ ++ ++ /* Part 5 */ ++ ++ printk(KERN_INFO " -- part 5 --\n"); ++ ++ //send_data_to_aes2501(dev, cmd5_00, 2); ++ ++ write_aes2501_register(dev, 0xb0, 0x27);/* Reserved */ ++ ++ //send_data_to_aes2501(dev, cmd5_01, 4); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ ++ //msleep(200); ++ ++ ++ //send_data_to_aes2501(dev, cmd5_02, 2); ++ //send_data_to_aes2501(dev, cmd5_01, 4); ++ //send_data_to_aes2501(dev, cmd5_01, 4); ++ ++ write_aes2501_register(dev, 0xff, 0x00);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ ++ ++ ++ //msleep(50); ++ ++ //send_data_to_aes2501(dev, cmd5_01, 4); ++ //send_data_to_aes2501(dev, cmd5_01, 4); ++ //send_data_to_aes2501(dev, cmd5_01, 4); ++ //send_data_to_aes2501(dev, cmd5_03, 2); ++ //send_data_to_aes2501(dev, cmd5_03, 2); ++ //send_data_to_aes2501(dev, cmd5_04, 2); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* ??? */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_SCAN_RESET); ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_SCAN_RESET); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_READ_REGS); ++ flush_aes2501_bulk_out(dev); ++ ++ ++ recv_data_to_aes2501(dev, buffer, 126); ++ ++ ++ ++ ++ ++ return 0; ++ ++} ++ ++static int detect_finger_on_aes2501(struct usb_aes2501 *dev) ++{ ++ //uint8_t cmd1[] = "\x80\x01\x82\x40"; ++ //uint8_t cmd2[] = "\x80\x01\x82\x40\x83\x00\x88\x02\x89\x10\x8a\x05\x8c\x00\x8e\x13\x91\x44\x92\x34\x95\x16\x96\x16\x97\x18\xa1\x70\xa2\x02\xa7\x00\xac\x01\xad\x1a\x80\x04\x81\x04\xb4\x00";/*42*/ ++ ++ ++ unsigned char buffer[22]; ++ unsigned i, sum; ++ ++ //send_data_to_aes2501(dev, cmd1, 4); ++ ++ //msleep(30); ++ ++ ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_DETCTRL, AES2501_DETCTRL_DRATE_CONTINUOUS | AES2501_DETCTRL_SDELAY_31_MS); ++ write_aes2501_register(dev, AES2501_REG_COLSCAN, AES2501_COLSCAN_SRATE_128_US);/* not the faster ??? */ ++ write_aes2501_register(dev, AES2501_REG_MEASDRV, AES2501_MEASDRV_MDRIVE_0_325 | AES2501_MEASDRV_MEASURE_SQUARE); ++ write_aes2501_register(dev, AES2501_REG_MEASFREQ, AES2501_MEASFREQ_2M); ++ write_aes2501_register(dev, AES2501_REG_DEMODPHASE1, DEMODPHASE_NONE);/* Default */ ++ write_aes2501_register(dev, AES2501_REG_DEMODPHASE2, DEMODPHASE_NONE); ++ write_aes2501_register(dev, AES2501_REG_CHANGAIN, AES2501_CHANGAIN_STAGE2_4X | AES2501_CHANGAIN_STAGE1_16X); ++ write_aes2501_register(dev, AES2501_REG_ADREFHI, 0x44); ++ write_aes2501_register(dev, AES2501_REG_ADREFLO, 0x34); ++ write_aes2501_register(dev, AES2501_REG_STRTCOL, 0x16); ++ write_aes2501_register(dev, AES2501_REG_ENDCOL, 0x16); ++ write_aes2501_register(dev, AES2501_REG_DATFMT, AES2501_DATFMT_BIN_IMG | 0x08); ++ write_aes2501_register(dev, AES2501_REG_TREG1, 0x70);/* Reserved + 0xXX */ ++ write_aes2501_register(dev, 0xa2, 0x02);/* Reserved */ ++ write_aes2501_register(dev, 0xa7, 0x00);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_TREGC, AES2501_TREGC_ENABLE); ++ write_aes2501_register(dev, AES2501_REG_TREGD, 0x1a); ++ ++ flush_aes2501_bulk_out(dev); ++ ++ /** ++ * TODO: ++ * - lire ici les deux octets. ++ * - voir pour inverser les commandes. ++ */ ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_REG_UPDATE); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_SET_ONE_SHOT); ++ write_aes2501_register(dev, AES2501_REG_LPONT, AES2501_LPONT_MIN_VALUE); ++ ++ flush_aes2501_bulk_out(dev); ++ ++ ++ //send_data_to_aes2501(dev, cmd2, 42); ++ ++ recv_data_to_aes2501(dev, buffer, 20); ++ ++ ++ /* One column is returned here but I don't know which one. ++ Maybe an average over the whole sensor area. */ ++ sum = 0; ++ for (i = 1; i != 9; i++) { ++ sum += (buffer[i] & 0xf) + (buffer[i] >> 4); ++ } ++ ++ ++ //printk(KERN_INFO "===finger=== sum = %d vs %d\n", sum, 20); ++ ++ ++ /* ++ return (sum > aes->fingerTh1); ++ */ ++ ++ return sum > 20; ++ ++} ++ ++ ++static unsigned read_fingerprint_on_aes2501(struct usb_aes2501 *dev, void *raw_, unsigned maxstrip) ++{ ++ //unsigned char patch_msg[] = "\x80\x01"; ++ ++ /* 8e xx = set gain */ ++ //uint8_t cmd1_00[] = "0x80\x01\x82\x40"; ++ //uint8_t cmd1_01[] = "0x80\x01\x82\x40\x83\x00\x88\x02\x8c\x7c\x89\x10\x8d\x24\x9b\x00\x9c\x6c\x9d\x09\x9e\x54\x9f\x78\xa2\x02\xa7\x00\xb6\x26\xb7\x1a\x80\x04\x98\x23\x95\x10\x96\x1f\x8e\x00\x91\x70\x92\x20\x81\x04\xb4\x00";/*50*/ ++ ++ //uint8_t cmd2[] = "\x98\x23\x95\x10\x96\x1f\x8e\x03\x91\x70\x92\x20\x81\x04";/*14*/ ++ ++ //uint8_t cmd3[] = "\x98\x22\x95\x00\x96\x2f\x8e\x03\x91\x5b\x92\x20\x81\x04";/*14*/ ++ ++ uint8_t buf[1705]; ++ uint8_t *raw = (uint8_t *) raw_; ++ unsigned nstrips; ++ ++ int threshold; ++ int sum; ++ ++ ++ //send_data_to_aes2501(dev, patch_msg, 2); ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ flush_aes2501_bulk_out(dev); ++ ++ ++ ++ //send_data_to_aes2501(dev, cmd1_00, 4); ++ ++ ++ //send_data_to_aes2501(dev, cmd1_01, 50); ++ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_MASTER_RESET); ++ write_aes2501_register(dev, AES2501_REG_EXCITCTRL, 0x40);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_DETCTRL, AES2501_DETCTRL_SDELAY_31_MS | AES2501_DETCTRL_DRATE_CONTINUOUS); ++ write_aes2501_register(dev, AES2501_REG_COLSCAN, AES2501_COLSCAN_SRATE_128_US); ++ write_aes2501_register(dev, AES2501_REG_DEMODPHASE2, 0x7c);/* ... */ ++ write_aes2501_register(dev, AES2501_REG_MEASDRV, AES2501_MEASDRV_MEASURE_SQUARE | AES2501_MEASDRV_MDRIVE_0_325); ++ write_aes2501_register(dev, AES2501_REG_DEMODPHASE1, 0x24);/* ... */ ++ write_aes2501_register(dev, AES2501_REG_CHWORD1, 0x00);/* Challenge Word */ ++ write_aes2501_register(dev, AES2501_REG_CHWORD2, 0x6c);/* Challenge Word */ ++ write_aes2501_register(dev, AES2501_REG_CHWORD3, 0x09);/* Challenge Word */ ++ write_aes2501_register(dev, AES2501_REG_CHWORD4, 0x54);/* Challenge Word */ ++ write_aes2501_register(dev, AES2501_REG_CHWORD5, 0x78);/* Challenge Word */ ++ write_aes2501_register(dev, 0xa2, 0x02);/* Reserved */ ++ write_aes2501_register(dev, 0xa7, 0x00);/* Reserved */ ++ write_aes2501_register(dev, 0xb6, 0x26);/* Reserved */ ++ write_aes2501_register(dev, 0xb7, 0x1a);/* Reserved */ ++ write_aes2501_register(dev, AES2501_REG_CTRL1, AES2501_CTRL1_REG_UPDATE); ++ write_aes2501_register(dev, AES2501_REG_IMAGCTRL, AES2501_IMAGCTRL_TST_REG_ENABLE | AES2501_IMAGCTRL_HISTO_DATA_ENABLE | AES2501_IMAGCTRL_IMG_DATA_DISABLE); ++ write_aes2501_register(dev, AES2501_REG_STRTCOL, 0x10); ++ write_aes2501_register(dev, AES2501_REG_ENDCOL, 0x1f); ++ write_aes2501_register(dev, AES2501_REG_CHANGAIN, AES2501_CHANGAIN_STAGE1_2X | AES2501_CHANGAIN_STAGE2_2X); ++ write_aes2501_register(dev, AES2501_REG_ADREFHI, 0x70); ++ write_aes2501_register(dev, AES2501_REG_ADREFLO, 0x20); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_SET_ONE_SHOT); ++ write_aes2501_register(dev, AES2501_REG_LPONT, AES2501_LPONT_MIN_VALUE); ++ ++ ///////recv_data_to_aes2501(dev, buf, 159); ++ /* TODO: calibration e.g setting gain (0x8e xx) */ ++ ++ ++ ++ ++ //send_data_to_aes2501(dev, cmd2, 14); ++ ++ ++ ++ write_aes2501_register(dev, AES2501_REG_IMAGCTRL, AES2501_IMAGCTRL_TST_REG_ENABLE | AES2501_IMAGCTRL_HISTO_DATA_ENABLE | AES2501_IMAGCTRL_IMG_DATA_DISABLE); ++ write_aes2501_register(dev, AES2501_REG_STRTCOL, 0x10); ++ write_aes2501_register(dev, AES2501_REG_ENDCOL, 0x1f); ++ write_aes2501_register(dev, AES2501_REG_CHANGAIN, AES2501_CHANGAIN_STAGE1_16X); ++ write_aes2501_register(dev, AES2501_REG_ADREFHI, 0x70); ++ write_aes2501_register(dev, AES2501_REG_ADREFLO, 0x20); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_SET_ONE_SHOT); ++ ++ flush_aes2501_bulk_out(dev); ++ ++ ++ recv_data_to_aes2501(dev, buf, 159); ++ ++ nstrips = 0; ++ do { ++ printk(KERN_INFO "-start-\n"); ++ /* Timing in this loop is critical. It decides how fast you can move your finger. ++ If one loop takes tl second, the maximum speed is: ++ (16/500 * 25.4) / tl [mm per sec] ++ */ ++ //send_data_to_aes2501(dev, cmd3, 14); ++ ++ write_aes2501_register(dev, AES2501_REG_IMAGCTRL, AES2501_IMAGCTRL_TST_REG_ENABLE | AES2501_IMAGCTRL_HISTO_DATA_ENABLE); ++ write_aes2501_register(dev, AES2501_REG_STRTCOL, 0x00); ++ write_aes2501_register(dev, AES2501_REG_ENDCOL, 0x2f); ++ write_aes2501_register(dev, AES2501_REG_CHANGAIN, AES2501_CHANGAIN_STAGE1_16X); ++ write_aes2501_register(dev, AES2501_REG_ADREFHI, 0x5b); ++ write_aes2501_register(dev, AES2501_REG_ADREFLO, 0x20); ++ write_aes2501_register(dev, AES2501_REG_CTRL2, AES2501_CTRL2_SET_ONE_SHOT); ++ ++ flush_aes2501_bulk_out(dev); ++ ++ ++ ++ recv_data_to_aes2501(dev, buf, 1705); ++ memcpy(raw, buf+1, 192*8); ++ raw += 192*8; ++ ++ printk(KERN_INFO "-end of copy-\n"); ++ ++ ++ threshold = read_register_value((buf + 1 + 192*8 + 1 + 16*2 + 1 + 8), _AES2501_REG_DATFMT); ++ /*if (threshold < 0) ++ return threshold;*/ ++ ++ threshold &= 0x0f; ++ ++ sum = sum_histogram_values((buf + 1 + 192*8), threshold); ++ /*if (threshold < 0) ++ return threshold;*/ ++ ++ nstrips++; ++ printk(KERN_INFO "-end- %d vs %d\n", nstrips, maxstrip); ++ } while (sum > 0 && nstrips < maxstrip); ++ printk(KERN_INFO "nstrips = %u\n", nstrips); ++ if (nstrips == maxstrip) ++ printk(KERN_INFO "nstrips == %u, swiping the finger too slowly?\n", maxstrip); ++ return nstrips; ++} ++ ++ ++ ++/** ++ * Read a register value from a dump sent by the device. ++ * @data: list of couples . ++ * @target: index of the register to process. ++ * @return: -EILSEQ,-EINVAL if error, value > 0 if a finger is here. ++ */ ++int read_register_value(const uint8_t *data, Aes2501Registers target) ++{ ++ int result; ++ uint8_t offset; ++ ++ if (*data == FIRST_AES2501_REG) ++ { ++ offset = target; ++ ++ if (!(FIRST_AES2501_REG <= offset && offset <= LAST_AES2501_REG)) ++ result = -EINVAL; ++ ++ else ++ { ++ offset -= FIRST_AES2501_REG; ++ offset *= 2; ++ ++ result = data[++offset]; ++ ++ } ++ ++ } ++ else result = -EILSEQ; ++ ++ return result; ++ ++} ++ ++ ++/** ++ * Tells if a finger motion is still detected. ++ * @data: start point of data to handle, preceded by 0xde. ++ * @threshold: index of values set to 1 by the device. ++ * @return: -EILSEQ,-EINVAL if error, value > 0 if a finger is here. ++ * ++ * Histograms always are a 16-uint16_t long message, where ++ * histogram[i] = number of pixels of value i. ++ */ ++int sum_histogram_values(const uint8_t *data, uint8_t threshold) ++{ ++ int result; ++ uint16_t *histogram; ++ uint8_t i; ++ ++ if (*data == 0xde) ++ { ++ if (threshold > 0x0f) ++ result = -EINVAL; ++ ++ else ++ { ++ result = 0; ++ histogram = (uint16_t *)(data + 1); ++ ++ for (i = threshold; i < 16; i++) ++ result += histogram[i]; ++ ++ } ++ ++ } ++ else result = -EILSEQ; ++ ++ return result; ++ ++} ++ ++ ++ ++/********************************************************** ++ ** Image processing ++ **********************************************************/ ++ ++/* This function finds overlapping parts of two frames ++ * Based on calculating normalized hamming distance ++ * between two frames ++ */ ++ ++static unsigned find_overlap(const uint8_t *first_frame, ++ const uint8_t *second_frame, ++ uint32_t frame_height, ++ uint32_t frame_width, ++ uint32_t *min_error) ++{ ++ uint32_t dy, i; ++ uint32_t error, not_overlapped_height = 0; ++ *min_error = 255 * frame_height * frame_width; ++ for (dy = 0; dy < frame_height; dy++) { ++ /* Calculating difference (error) between parts of frames */ ++ error = 0; ++ for (i = 0; i < frame_width * (frame_height - dy); i++) { ++ /* Using ? operator to avoid abs function */ ++ error += first_frame[i] > second_frame[i] ? ++ (first_frame[i] - second_frame[i]) : ++ (second_frame[i] - first_frame[i]); ++ } ++ ++ /* Normalizing error */ ++ error *= 15; ++ error /= i; ++ if (error < *min_error) { ++ *min_error = error; ++ not_overlapped_height = dy; ++ } ++ first_frame += frame_width; ++ } ++ ++ return not_overlapped_height; ++} ++ ++ ++/* This function assembles frames to single image, returns image height ++ * TODO: add Doxygen comments ++ */ ++static unsigned assemble(const uint8_t *input, /* Raw data received from device */ ++ uint8_t *output, /* Output buffer */ ++ uint32_t frame_height, /* Height of each frame */ ++ uint32_t frame_width, /* Width of each frame */ ++ uint32_t frames_count, /* Frames count */ ++ /*int overlap, */ ++ uint8_t reversed, ++ uint32_t *errors_sum ++ ) ++{ ++ uint8_t *assembled = output; ++ uint32_t frame, column, row, image_height = frame_height; ++ uint32_t error, not_overlapped; ++ ++ *errors_sum = 0; ++ ++ if (frames_count < 1) return 0; ++ ++ /* Rotating given data by 90 degrees ++ * Taken from document describing aes2501 image format ++ * TODO: move reversing detection here */ ++ if (reversed) { ++ output += (frames_count - 1) * frame_width * frame_height; ++ } ++ ++ for (frame = 0; frame < frames_count; frame++) { ++ for (column = 0; column < frame_width; column++) { ++ for (row = 0; row < (frame_height / 2); row++) { ++ output[frame_width * ( 2 * row) + column] = *input & 0x0F; ++ output[frame_width * ( 2 * row + 1) + column] = *input >> 4; ++ input++; ++ } ++ } ++ ++ if (reversed) { ++ output -= frame_width * frame_height; ++ } ++ else { ++ output += frame_width * frame_height; ++ } ++ } ++ ++ /* Detecting where frames overlaped */ ++ output = assembled; ++ for (frame = 1; frame < frames_count; frame++) ++ { ++ output += frame_width * frame_height; ++ not_overlapped = find_overlap(assembled, output, frame_height, frame_width, &error); ++ *errors_sum += error; ++ image_height += not_overlapped; ++ assembled += frame_width * not_overlapped; ++ memcpy(assembled, output, frame_width * frame_height); ++ } ++ ++ return image_height; ++} ++ ++ ++ ++static void store_new_aes2501_pnm(const uint8_t *data, unsigned int width, unsigned int height) ++{ ++ char header[20]; ++ __kernel_size_t header_len; ++ int i; ++ char *iter; ++ ++ sprintf(header, "P5\n%u %u\n255\n", width, height); ++ header_len = strlen(header); ++ ++ finger_print_len = header_len + width * height; ++ finger_print = kzalloc(finger_print_len, GFP_KERNEL); ++ ++ memcpy(finger_print, header, header_len); ++ ++ for (i = 0, iter = &finger_print[header_len]; i < width * height; i++, iter++) ++ *iter = (data[i] << 4) + 0x0f; ++ ++} ++ ++ ++ ++static void do_scanning(struct work_struct *work) ++{ ++ struct usb_aes2501 *dev; ++ ++ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ ++ ++ uint8_t *raw, *cooked; ++ unsigned swidth = 192; ++ unsigned sheight = 16; ++ unsigned maxstrip = 150; ++ unsigned nstrips, height, mindiff_sum, mindiff_sum_r; ++ ++ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ ++ ++ dev = container_of(work, struct usb_aes2501, scan_work); ++ ++ ++ ++ ++ ++ ++ setup_aes2501(dev); ++ ++ while (!detect_finger_on_aes2501(dev)) ++ { ++ if (dev->stop_scan) ++ { ++ PRINTK_INFO("aborting scan due to module removal\n"); ++ return; ++ } ++ }; ++ ++ /* We don't need physical continuity of allocated memory */ ++ raw = (uint8_t *)vmalloc((3 * maxstrip * sheight * swidth) / 2); ++ if (raw == NULL) ++ { ++ PRINTK_CRIT("failed to allocate memory\n"); ++ return; ++ } ++ ++ cooked = raw + (maxstrip * sheight * swidth)/2; ++ ++ ++ ++ printk(KERN_INFO "Raw is 0x%p\n", raw); ++ ++ ++ printk(KERN_INFO "Scanning...\n"); ++ nstrips = read_fingerprint_on_aes2501(dev, raw, maxstrip); ++ ++ printk(KERN_INFO "Assembling...\n"); ++ ++ ++ height = assemble(raw, cooked, 16, 192, nstrips, 0, &mindiff_sum); ++ height = assemble(raw, cooked, 16, 192, nstrips, 1, &mindiff_sum_r); ++ ++ ++ printk(KERN_INFO "Mindiff normal: %d, mindiff reversed: %d\n", mindiff_sum, mindiff_sum_r); ++ ++ if (mindiff_sum_r < mindiff_sum) ++ { ++ PRINTK_INFO("reversed image detected\n"); ++ } ++ else ++ { ++ height = assemble(raw, cooked, 16, 192, nstrips, 0, &mindiff_sum); ++ } ++ ++ printk(KERN_INFO "First height :: %d\n", height); ++ ++#if 0 ++ if (height < 100) { ++ /* It was a "touch", not a finger scan. */ ++ printk(KERN_INFO "Was only a 'touch' ;( [%d]\n", height); ++ /*break;*/ ++ } ++ else ++ ++ { ++ //store_new_aes2501_pnm(cooked, swidth, height); ++ height = assemble(raw, cooked, nstrips, 1, sensor_reversed); ++ printk(KERN_INFO "Second height :: %d\n", height); ++ store_new_aes2501_pnm(cooked, swidth, height); ++ } ++#endif ++ store_new_aes2501_pnm(cooked, swidth, height); ++ standby_aes2501(dev); ++ ++ vfree(raw); ++ ++ flag = 1; ++ wake_up_interruptible(&wq); ++ ++ ++} ++ ++ ++static int aes2501_open(struct inode *inode, struct file *file) ++{ ++ struct usb_aes2501 *dev; ++ ++ //return 0; ++ ++ ++ dev = _dev; ++ ++ printk(KERN_INFO "Plop !\n"); ++ ++ ++ return 0; ++} ++ ++ ++ ++ ++ ++ ++/* ++ * usb class driver info in order to get a minor number from the usb core, ++ * and to have the device registered with the driver core ++ */ ++static struct usb_class_driver aes2501_class = { ++ .name = "aes2501%d", ++ .fops = &aes2501_fops, ++ .minor_base = USB_AES2501_MINOR_BASE, ++}; ++ ++static int aes2501_probe(struct usb_interface *interface, const struct usb_device_id *id) ++{ ++ int retval; ++ struct usb_aes2501 *dev; ++ struct usb_host_interface *iface_desc; ++ __u8 i; ++ struct usb_endpoint_descriptor *endpoint; ++ __u16 buffer_size; ++ ++ ++ ++#if 0 ++ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ ++ ++ uint8_t *raw, *cooked; ++ unsigned swidth = 192; ++ unsigned sheight = 16; ++ unsigned maxstrip = 150; ++ unsigned nstrips, height; ++ ++ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ ++ ++ ++ raw = (uint8_t *)__get_free_page(GFP_KERNEL);//kmalloc((3 * maxstrip * sheight * swidth) / 2, GFP_KERNEL); ++ cooked = raw + (maxstrip * sheight * swidth)/2; ++#endif ++ ++ printk(KERN_INFO "aes2501 probe !\n"); ++ ++ ++ retval = -ENOMEM; ++ ++ /* Allocate memory for our device state and initialize it */ ++ ++ dev = kzalloc(sizeof(*dev), GFP_KERNEL); ++ if (dev == NULL) ++ { ++ PRINTK_CRIT("out of memory\n"); ++ goto error; ++ } ++ ++ _dev = dev; ++ ++ dev->stop_scan = 0; ++ ++ kref_init(&dev->kref); ++ sema_init(&dev->limit_sem, WRITES_IN_FLIGHT); ++ mutex_init(&dev->io_mutex); ++ ++ dev->udev = usb_get_dev(interface_to_usbdev(interface)); ++ dev->interface = interface; ++ ++ printk(KERN_INFO "num_altsetting == %d\n", interface->num_altsetting); ++ ++ /** ++ * Set up the endpoint information. ++ * Use only the first bulk-in and bulk-out endpoints. ++ */ ++ ++ iface_desc = interface->cur_altsetting; ++ ++ printk(KERN_INFO "BULK COUNT %d\n", iface_desc->desc.bNumEndpoints); ++ ++ for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) ++ { ++ endpoint = &iface_desc->endpoint[i].desc; ++ ++ if (!dev->bulk_in_endpointAddr && /*usb_endpoint_is_bulk_in(endpoint))*/ ++ ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) ++ == USB_DIR_IN) && ++ ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ++ == USB_ENDPOINT_XFER_BULK)) ++ { ++ /* We found a bulk in endpoint */ ++ buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); ++ dev->bulk_in_size = buffer_size; ++ dev->bulk_in_endpointAddr = endpoint->bEndpointAddress; ++ dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); ++ ++ printk(KERN_INFO "BULK IN %d ; size = %d\n", i, buffer_size); ++ ++ if (dev->bulk_in_buffer == NULL) ++ { ++ PRINTK_CRIT("could not allocate bulk_in_buffer\n"); ++ goto error; ++ } ++ ++ } ++ ++ if (!dev->bulk_out_endpointAddr && /*usb_endpoint_is_bulk_out(endpoint))*/ ++ ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) ++ == USB_DIR_OUT) && ++ ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ++ == USB_ENDPOINT_XFER_BULK)) ++ { ++ printk(KERN_INFO "BULK OUT %d\n", i); ++ ++ /* We found a bulk out endpoint */ ++ dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; ++ } ++ ++ } ++ ++ if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) ++ { ++ PRINTK_CRIT("could not find both bulk-in and bulk-out endpoints\n"); ++ goto error; ++ } ++ ++/* ++ dev->once_tasklet = kzalloc(sizeof(*dev->once_tasklet), GFP_KERNEL); ++ if (dev->once_tasklet == NULL) ++ { ++ PRINTK_CRIT("out of memory\n"); ++ goto error; ++ } ++*/ ++ /* Save our data pointer in this interface device */ ++ usb_set_intfdata(interface, dev); ++ ++ /* We can register the device now, as it is ready */ ++ retval = usb_register_dev(interface, &aes2501_class); ++ if (retval) { ++ /* something prevented us from registering this driver */ ++ PRINTK_CRIT("not able to get a minor for this device\n"); ++ usb_set_intfdata(interface, NULL); ++ goto error; ++ } ++ ++ /* Let the user know what node this device is now attached to */ ++ PRINTK_INFO("device now attached to aes2501-%d\n", interface->minor); ++ ++#if 0 ++ setup_aes2501(dev); ++ ++ while (!detect_finger_on_aes2501(dev)); ++ ++ ++ printk(KERN_INFO "Raw is 0x%p\n", raw); ++ ++ ++ printk(KERN_INFO "Scanning...\n"); ++ nstrips = read_fingerprint_on_aes2501(dev, raw, maxstrip); ++ ++ printk(KERN_INFO "Assembling...\n"); ++ ++ height = assemble(raw, cooked, nstrips, 1); ++ if (height < 100) { ++ /* It was a "touch", not a finger scan. */ ++ printk(KERN_INFO "Was only a 'touch' ;(\n"); ++ /*break;*/ ++ } ++ else ++ { ++ store_new_aes2501_pnm(cooked, swidth, height); ++ height = assemble(raw, cooked, nstrips, 0); ++ store_new_aes2501_pnm(cooked, swidth, height); ++ } ++ ++ standby_aes2501(dev); ++#endif ++ ++ return 0; ++ ++error: ++ if (dev != NULL) ++ kref_put(&dev->kref, aes2501_delete); ++ ++ return retval; ++ ++} ++ ++ ++static void aes2501_disconnect(struct usb_interface *interface) ++{ ++ int minor; ++ struct usb_aes2501 *dev; ++ ++ minor = interface->minor; ++ ++ /* Prevent aes2501_open() from racing aes2501_disconnect() */ ++ lock_kernel(); ++ ++ dev = usb_get_intfdata(interface); ++ usb_set_intfdata(interface, NULL); ++ ++ /* Give back our minor */ ++ usb_deregister_dev(interface, &aes2501_class); ++ ++ /* Prevent more I/O from starting */ ++ mutex_lock(&dev->io_mutex); ++ dev->interface = NULL; ++ mutex_unlock(&dev->io_mutex); ++ ++ unlock_kernel(); ++ ++ /* Decrement our usage count */ ++ kref_put(&dev->kref, aes2501_delete); ++ ++ PRINTK_INFO("aes2501 device #%d now disconnected\n", minor); ++ ++ ++ ++ ++ printk(KERN_INFO "aes2501 disconnect !\n"); ++ ++ ++} ++ ++ ++static struct usb_driver aes2501_driver = { ++ .name = "aes2501", ++ .probe = aes2501_probe, ++ .disconnect = aes2501_disconnect, ++ .id_table = id_table, ++}; ++ ++ ++static int __init aes2501_init(void) ++{ ++ int retval; ++ ++ comm_queue = create_singlethread_workqueue("aes2501"); ++ if (comm_queue == NULL) { ++ PRINTK_CRIT("could not create work queue\n"); ++ return -ENOMEM; ++ } ++ ++ retval = usb_register(&aes2501_driver); ++ if (retval == -EINVAL) ++ { ++ printk(KERN_ERR "usb_register failed. Error number %d\n", retval); ++ destroy_workqueue(comm_queue); ++ return retval; ++ } ++ ++ return 0; ++ ++} ++ ++static void __exit aes2501_exit(void) ++{ ++ _dev->stop_scan = 1; ++ destroy_workqueue(comm_queue); ++ usb_deregister(&aes2501_driver); ++} ++ ++module_init(aes2501_init); ++module_exit(aes2501_exit); ++ ++MODULE_AUTHOR("Cyrille Bagard"); ++MODULE_DESCRIPTION("AES 2501 fingerprint scanner driver"); ++MODULE_LICENSE("GPL"); +diff -Nurp linux-2.6.37/3rdparty/aes2501/aes2501.h linux-2.6.37.3rdparty/3rdparty/aes2501/aes2501.h +--- linux-2.6.37/3rdparty/aes2501/aes2501.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/aes2501/aes2501.h 2008-01-14 03:07:30.000000000 +0200 +@@ -0,0 +1,40 @@ ++ ++/* ++ * aes2501.h -- AuthenTec AES2501 Fingerprint Sensor Driver for Linux ++ * ++ * Maintainer: Cyrille Bagard ++ * ++ * Copyright (C) 2007 Cyrille Bagard ++ * ++ * This file is part of the AES2501 driver. ++ * ++ * the AES2501 driver 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. ++ * ++ * the AES2501 driver 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 the AES2501 driver; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++ ++#ifndef __AES2501_H ++#define __AES2501_H ++ ++ ++#define AES2501_IOC_MAGIC 'N' ++ ++ ++#define AES2501_IOC_TEST _IOW(AES2501_IOC_MAGIC, 1, int) ++ ++ ++ ++ ++#endif /* __AES2501_H */ +diff -Nurp linux-2.6.37/3rdparty/aes2501/aes2501_regs.h linux-2.6.37.3rdparty/3rdparty/aes2501/aes2501_regs.h +--- linux-2.6.37/3rdparty/aes2501/aes2501_regs.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/aes2501/aes2501_regs.h 2008-01-14 03:07:30.000000000 +0200 +@@ -0,0 +1,464 @@ ++ ++/* ++ * aes2501_regs.h -- AuthenTec AES2501 Fingerprint Sensor Driver for Linux ++ * ++ * Maintainer: Cyrille Bagard ++ * ++ * Copyright (C) 2007 Cyrille Bagard ++ * ++ * This file is part of the AES2501 driver. ++ * ++ * the AES2501 driver 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. ++ * ++ * the AES2501 driver 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 the AES2501 driver; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++ ++#ifndef __AES2501_REGS_H ++#define __AES2501_REGS_H ++ ++ ++ ++/* ++ * AES2501 Control Register 1 (CTRL1) ++ */ ++ ++#define AES2501_REG_CTRL1 0x80 ++ ++#define AES2501_CTRL1_MASTER_RESET 0x01 /* Master reset, same as Power On Reset */ ++#define AES2501_CTRL1_SCAN_RESET 0x02 /* Scan reset: stop and restart the scan sequencer */ ++#define AES2501_CTRL1_REG_UPDATE 0x04 /* 1 = continuously updated, 0 = updated prior to starting a scan */ ++ ++ ++/* ++ * AES2501 Control Register 2 (CTRL2) ++ */ ++ ++#define AES2501_REG_CTRL2 0x81 ++ ++#define AES2501_CTRL2_CONTINUOUS 0x01 /* 1 = continuous scans, 0 = single scans */ ++#define AES2501_CTRL2_READ_REGS 0x02 /* Read the current state of the local registers in the Sensor IC */ ++#define AES2501_CTRL2_SET_ONE_SHOT 0x04 /* Set the one-shot flip-flop */ ++#define AES2501_CTRL2_CLR_ONE_SHOT 0x08 /* Clear the one-shot flip-flop */ ++#define AES2501_CTRL2_READ_ID 0x10 /* Read the ID register of the chip */ ++ ++ ++/* ++ * AES2501 Excitation Common Control Register (EXCITCTRL) ++ */ ++ ++#define AES2501_REG_EXCITCTRL 0x82 ++ ++#define AES2501_EXCITCTRL_LO_PWR 0x01 /* If set, enable detection in sleep/suspend mode */ ++#define AES2501_EXCITCTRL_AUTO_CAL 0x02 /* If set, perform finger detection calibration */ ++#define AES2501_EXCITCTRL_SGC_ENABLE 0x04 /* ??? */ ++#define AES2501_EXCITCTRL_SGC_RESTART 0x08 /* ??? */ ++ ++#define AES2501_EXCITCTRL_EXCIT_SQR 0x20 /* Select the (1=square | 0=sine) wave finger drive signal */ ++#define AES2501_EXCITCTRL_EXCIT_BOOST 0x10 /* TODO: understand this part */ ++ ++ ++/* ++ * AES2501 Detect Control Register (DETCTRL) ++ */ ++ ++#define AES2501_REG_DETCTRL 0x83 ++ ++enum aes2501_detection_rate { ++ ++ AES2501_DETCTRL_DRATE_CONTINUOUS = 0x00, /* Detection cycles occur continuously */ ++ AES2501_DETCTRL_DRATE_16_MS = 0x01, /* Detection cycles occur every 16.62 ms */ ++ AES2501_DETCTRL_DRATE_31_MS = 0x02, /* Detection cycles occur every 31.24 ms */ ++ AES2501_DETCTRL_DRATE_62_MS = 0x03, /* Detection cycles occur every 62.50 ms */ ++ AES2501_DETCTRL_DRATE_125_MS = 0x04, /* Detection cycles occur every 125.0 ms */ ++ AES2501_DETCTRL_DRATE_250_MS = 0x05, /* Detection cycles occur every 250.0 ms */ ++ AES2501_DETCTRL_DRATE_500_MS = 0x06, /* Detection cycles occur every 500.0 ms */ ++ AES2501_DETCTRL_DRATE_1_S = 0x07 /* Detection cycles occur every 1 s */ ++ ++}; ++ ++enum aes2501_settling_delay { ++ ++ AES2501_DETCTRL_SDELAY_31_MS = 0x00, /* 31.25 ms */ ++ AES2501_DETCTRL_SSDELAY_62_MS = 0x10, /* 62.5 ms */ ++ AES2501_DETCTRL_SSDELAY_125_MS = 0x20, /* 125 ms */ ++ AES2501_DETCTRL_SSDELAY_250_MS = 0x30 /* 250 ms */ ++ ++}; ++ ++ ++ ++ ++ ++/* ++ * AES2501 Column Scan Rate Register (COLSCAN) ++ */ ++ ++#define AES2501_REG_COLSCAN 0x88 ++ ++enum aes2501_col_scan_rate { ++ ++ AES2501_COLSCAN_SRATE_32_US = 0x00, /* 32 us */ ++ AES2501_COLSCAN_SRATE_64_US = 0x01, /* 64 us */ ++ AES2501_COLSCAN_SRATE_128_US = 0x02, /* 128 us */ ++ AES2501_COLSCAN_SRATE_256_US = 0x03, /* 256 us */ ++ AES2501_COLSCAN_SRATE_512_US = 0x04, /* 512 us */ ++ AES2501_COLSCAN_SRATE_1024_US = 0x05, /* 1024 us */ ++ AES2501_COLSCAN_SRATE_2048_US = 0x06, /* 2048 us */ ++ ++}; ++ ++ ++/* ++ * AES2501 Measure Drive Register (MEASDRV) ++ */ ++ ++#define AES2501_REG_MEASDRV 0x89 ++ ++enum aes2501_mesure_drive { ++ ++ AES2501_MEASDRV_MDRIVE_0_325 = 0x00, /* 0.325 Vpp */ ++ AES2501_MEASDRV_MDRIVE_0_65 = 0x01, /* 0.65 Vpp */ ++ AES2501_MEASDRV_MDRIVE_1_3 = 0x02, /* 1.3 Vpp */ ++ AES2501_MEASDRV_MDRIVE_2_6 = 0x03 /* 2.6 Vpp */ ++ ++}; ++ ++#define AES2501_MEASDRV_SQUARE 0x20 /* Select (1=square | 0=sine) wave drive during measure */ ++#define AES2501_MEASDRV_MEASURE_SQUARE 0x10 /* 0 = use mesure drive setting, 1 = when sine wave is selected */ ++ ++ ++/* ++ * AES2501 Measure Frequency Register (MEASFREQ) ++ */ ++ ++#define AES2501_REG_MEASFREQ 0x8a ++ ++enum aes2501_measure_freq { ++ ++ AES2501_MEASFREQ_125K = 0x01, /* 125 kHz */ ++ AES2501_MEASFREQ_250K = 0x02, /* 250 kHz */ ++ AES2501_MEASFREQ_500K = 0x03, /* 500 kHz */ ++ AES2501_MEASFREQ_1M = 0x04, /* 1 MHz */ ++ AES2501_MEASFREQ_2M = 0x05 /* 2 MHz */ ++ ++}; ++ ++ ++ ++ ++/* ++ * AES2501 Demod Phase 2 Register (DEMODPHASE2) ++ */ ++ ++#define AES2501_REG_DEMODPHASE2 0x8c ++ ++#define DEMODPHASE_NONE 0x00 ++ ++#define DEMODPHASE_180_00 0x40 /* 180 degrees */ ++#define DEMODPHASE_2_81 0x01 /* 2.8125 degrees */ ++ ++ ++/* ++ * AES2501 Demod Phase 1 Register (DEMODPHASE1) ++ */ ++ ++#define AES2501_REG_DEMODPHASE1 0x8d ++ ++#define DEMODPHASE_1_40 0x40 /* 1.40625 degrees */ ++#define DEMODPHASE_0_02 0x01 /* 0.02197256 degrees */ ++ ++ ++/* ++ * AES2501 Channel Gain Register (CHANGAIN) ++ */ ++ ++#define AES2501_REG_CHANGAIN 0x8e ++ ++enum aes2501_sensor_gain1 { ++ ++ AES2501_CHANGAIN_STAGE1_2X = 0x00, /* 2x */ ++ AES2501_CHANGAIN_STAGE1_4X = 0x01, /* 4x */ ++ AES2501_CHANGAIN_STAGE1_8X = 0x02, /* 8x */ ++ AES2501_CHANGAIN_STAGE1_16X = 0x03 /* 16x */ ++ ++}; ++ ++enum aes2501_sensor_gain2 { ++ ++ AES2501_CHANGAIN_STAGE2_2X = 0x00, /* 2x */ ++ AES2501_CHANGAIN_STAGE2_4X = 0x10, /* 4x */ ++ AES2501_CHANGAIN_STAGE2_8X = 0x20, /* 8x */ ++ AES2501_CHANGAIN_STAGE2_16X = 0x30 /* 16x */ ++ ++}; ++ ++ ++ ++/* ++ * AES2501 A/D Reference High Register (ADREFHI) ++ */ ++ ++#define AES2501_REG_ADREFHI 0x91 ++ ++ ++/* ++ * AES2501 A/D Reference Low Register (ADREFLO) ++ */ ++ ++#define AES2501_REG_ADREFLO 0x92 ++ ++ ++/* ++ * AES2501 Start Row Register (STRTROW) ++ */ ++ ++#define AES2501_REG_STRTROW 0x93 ++ ++ ++/* ++ * AES2501 End Row Register (ENDROW) ++ */ ++ ++#define AES2501_REG_ENDROW 0x94 ++ ++ ++/* ++ * AES2501 Start Column Register (STRTCOL) ++ */ ++ ++#define AES2501_REG_STRTCOL 0x95 ++ ++ ++/* ++ * AES2501 End Column Register (ENDCOL) ++ */ ++ ++#define AES2501_REG_ENDCOL 0x96 ++ ++ ++/* ++ * AES2501 Data Format Register (DATFMT) ++ */ ++ ++#define AES2501_REG_DATFMT 0x97 ++ ++#define AES2501_DATFMT_EIGHT 0x40 /* 1 = 8-bit data, 0 = 4-bit data */ ++#define AES2501_DATFMT_LOW_RES 0x20 /* TODO: understand this part */ ++#define AES2501_DATFMT_BIN_IMG 0x10 /* TODO: understand this part */ ++ ++/* TODO: Threshold */ ++ ++ ++/* ++ * AES2501 Image Data Control Register (IMAGCTRL) ++ */ ++ ++#define AES2501_REG_IMAGCTRL 0x98 ++ ++#define AES2501_IMAGCTRL_IMG_DATA_DISABLE 0x01 /* If set, image data message and authentication message are not returned when imaging */ ++#define AES2501_IMAGCTRL_HISTO_DATA_ENABLE 0x02 /* if set, send histogram message when imaging */ ++#define AES2501_IMAGCTRL_HISTO_EACH_ROW 0x04 /* A histo message is sent at the end of (1=each row | 0 = scanning) */ ++#define AES2501_IMAGCTRL_HISTO_FULL_ARRAY 0x08 /* 1 = full image array, 0 = 64x64 center */ ++#define AES2501_IMAGCTRL_REG_FIRST 0x10 /* Registers are returned (1=before | 0=after) image data */ ++#define AES2501_IMAGCTRL_TST_REG_ENABLE 0x20 /* If set, Test Registers are returned with register messages */ ++ ++ ++ ++ ++ ++ ++ ++ ++/* ++ * AES2501 Status Register (STAT) ++ */ ++ ++#define AES2501_REG_STAT 0x9a ++ ++#define AES2501_STAT_SCAN 0x0f /* Scan state */ ++#define AES2501_STAT_ERROR 0x10 /* Framing error */ ++#define AES2501_STAT_PAUSED 0x20 /* Scan paused */ ++#define AES2501_STAT_RESET 0x40 /* Reset occurred */ ++ ++enum aes2501_scan_state { ++ ++ STATE_WAITING_FOR_FINGER = 0x00, /* Waiting for finger */ ++ STATE_FINGER_SETTLING_DELAY = 0x01, /* In Finger settling delay */ ++ STATE_POWER_UP_DELAY = 0x02, /* In power up delay */ ++ STATE_WAITING_TO_START_SCAN = 0x03, /* Waiting to start image scan */ ++ STATE_PRELOADING_SUBARRAY_0 = 0x04, /* Pre-loading subarray 0 */ ++ STATE_SETUP_FOR_ROW_ADVANCE = 0x05, /* Setup for row advance */ ++ STATE_WAITING_FOR_ROW_ADVANCE = 0x06, /* Waiting for row advance */ ++ STATE_PRELOADING_COL_0 = 0x07, /* Pre-loading column 0 */ ++ STATE_SETUP_FOR_COL_ADVANCE = 0x08, /* Setup for column advance */ ++ STATE_WAITING_FOR_COL_ADVANCE = 0x09, /* Waiting for column advance */ ++ STATE_WAITING_FOR_SCAN_START = 0x0a, /* Waiting for scan start */ ++ STATE_WAITING_FOR_SCAN_END = 0x0b, /* Waiting for scan end */ ++ STATE_WAITING_FOR_ROW_SETUP = 0x0c, /* Waiting for row setup */ ++ STATE_WAITING_FOR_COL_TIME = 0x0d, /* Waiting for one column time (depends on scan rate) */ ++ STATE_WAITING_FOR_QUEUED_DATA = 0x0e, /* Waiting for queued data transmission to be completed */ ++ STATE_WAIT_FOR_128_US = 0x0f /* Wait for 128 us */ ++ ++}; ++ ++ ++/* ++ * AES2501 Challenge Word 1 Register (CHWORD1) ++ */ ++ ++#define AES2501_REG_CHWORD1 0x9b ++ ++#define AES2501_CHWORD1_IS_FINGER 0x01 /* If set, finger is present */ ++ ++ ++/* ++ * AES2501 Challenge Word 2 Register (CHWORD2) ++ */ ++ ++#define AES2501_REG_CHWORD2 0x9c ++ ++ ++/* ++ * AES2501 Challenge Word 3 Register (CHWORD3) ++ */ ++ ++#define AES2501_REG_CHWORD3 0x9d ++ ++ ++/* ++ * AES2501 Challenge Word 4 Register (CHWORD4) ++ */ ++ ++#define AES2501_REG_CHWORD4 0x9e ++ ++ ++/* ++ * AES2501 Challenge Word 5 Register (CHWORD5) ++ */ ++ ++#define AES2501_REG_CHWORD5 0x9f ++ ++ ++ ++ ++ ++/* ++ * AES2501 Test Register 1 (TREG1) ++ */ ++ ++#define AES2501_REG_TREG1 0xa1 ++ ++#define AES2501_TREG1_SBIAS_UNLCK 0x10 /* 1 = unlock the controlling of sense amp bias, 0 = sense amp bias changes */ ++ ++enum aes2501_sense_amp_bias { ++ ++ AES2501_TREG1_SAMP_BIAS_2_UA = 0x00, /* 2.5 uA */ ++ AES2501_TREG1_SAMP_BIAS_5_UA = 0x01, /* 5 uA */ ++ AES2501_TREG1_SAMP_BIAS_8_UA = 0x02, /* 8 uA */ ++ AES2501_TREG1_SAMP_BIAS_10_UA = 0x03 /* 10 uA */ ++ ++}; ++ ++ ++ ++ ++/* ++ * AES2501 Auto-Calibration Offset Register (AUTOCALOFFSET) ++ */ ++ ++#define AES2501_REG_AUTOCALOFFSET 0xa8 ++ ++ ++ ++ ++ ++/* ++ * AES2501 Test Register C (TREGC) ++ */ ++ ++#define AES2501_REG_TREGC 0xac ++ ++#define AES2501_TREGC_ENABLE 0x01 /* Enable the reading of the register in TREGD */ ++ ++ ++/* ++ * AES2501 Test Register D (TREGD) ++ */ ++ ++#define AES2501_REG_TREGD 0xad ++ ++ ++ ++ ++ ++/* ++ * AES2501 Low Power Oscillator On Time Register (LPONT) ++ */ ++ ++#define AES2501_REG_LPONT 0xb4 ++ ++/* ++ * This register sets the low power oscillator on time. ++ * Units are roughly equivalent to milliseconds. ++ */ ++ ++#define AES2501_LPONT_MIN_VALUE 0x00 /* 0 ms */ ++#define AES2501_LPONT_MAX_VALUE 0x1f /* About 16 ms */ ++ ++ ++ ++#define ENUM_REG(reg) _ ## reg = reg ++ ++typedef enum _Aes2501Registers ++{ ++ ENUM_REG(AES2501_REG_CTRL1), ++ ENUM_REG(AES2501_REG_CTRL2), ++ ENUM_REG(AES2501_REG_EXCITCTRL), ++ ENUM_REG(AES2501_REG_DETCTRL), ++ ENUM_REG(AES2501_REG_COLSCAN), ++ ENUM_REG(AES2501_REG_MEASDRV), ++ ENUM_REG(AES2501_REG_MEASFREQ), ++ ENUM_REG(AES2501_REG_DEMODPHASE2), ++ ENUM_REG(AES2501_REG_DEMODPHASE1), ++ ENUM_REG(AES2501_REG_CHANGAIN), ++ ENUM_REG(AES2501_REG_ADREFHI), ++ ENUM_REG(AES2501_REG_ADREFLO), ++ ENUM_REG(AES2501_REG_STRTROW), ++ ENUM_REG(AES2501_REG_ENDROW), ++ ENUM_REG(AES2501_REG_STRTCOL), ++ ENUM_REG(AES2501_REG_ENDCOL), ++ ENUM_REG(AES2501_REG_DATFMT), ++ ENUM_REG(AES2501_REG_IMAGCTRL), ++ ENUM_REG(AES2501_REG_STAT), ++ ENUM_REG(AES2501_REG_CHWORD1), ++ ENUM_REG(AES2501_REG_CHWORD2), ++ ENUM_REG(AES2501_REG_CHWORD3), ++ ENUM_REG(AES2501_REG_CHWORD4), ++ ENUM_REG(AES2501_REG_CHWORD5), ++ ENUM_REG(AES2501_REG_TREG1), ++ ENUM_REG(AES2501_REG_AUTOCALOFFSET), ++ ENUM_REG(AES2501_REG_TREGC), ++ ENUM_REG(AES2501_REG_TREGD), ++ ENUM_REG(AES2501_REG_LPONT) ++ ++} Aes2501Registers; ++ ++ ++#define FIRST_AES2501_REG 0x80 ++#define LAST_AES2501_REG 0x9f ++ ++ ++ ++#endif /* __AES2501_REGS_H */ +diff -Nurp linux-2.6.37/3rdparty/aes2501/ChangeLog linux-2.6.37.3rdparty/3rdparty/aes2501/ChangeLog +--- linux-2.6.37/3rdparty/aes2501/ChangeLog 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/aes2501/ChangeLog 2008-01-14 03:07:30.000000000 +0200 +@@ -0,0 +1,95 @@ ++2007-11-05 Cyrille Bagard ++ ++ * aes2501.c: ++ Apply Vasily Khoruzhick's new patch: rewrite image processing functions. ++ Thus, there should be no more significant common points with aes2501-wy. ++ ++2007-11-05 Cyrille Bagard ++ ++ * aes2501.c: ++ In order to respect the license of aes2501-wy, on which this driver is ++ based, begin to rewrite some functions. Thus, better handle histograms. ++ One more strip is often processed, but that is more logical like this. ++ ++ * aes2501_regs.h: ++ Enumerate all used registers for convenience. ++ ++2007-11-03 Cyrille Bagard ++ ++ * aes2501.c: ++ Clean the code. Take care of signals when processes are awaking. ++ Apply Vasily Khoruzhick's new patch: autodetect picture reversing needs ++ and fix kernel oops in case of module removal. ++ ++ * Makefile: ++ Remove hidden files and clean the rules. KERNELDIR has to be overrided ++ from the sheel if needed now. ++ ++2007-10-29 Cyrille Bagard ++ ++ * aes2501.c: ++ Apply Vasily Khoruzhick's patch and thus increase the resulting pictures ++ quality. Many thanks to him ! ++ ++ * Makefile: ++ Add two new rules: usertest and clean. ++ ++ * usertest.c: ++ Initial commit. ++ ++2007-08-27 Cyrille Bagard ++ ++ * aes2501.c: ++ Make INIT_WORK macro working with 2.6.20+ kernels. Many thanks to ++ Miguel Gea Milvaques for the patch ! ++ ++2007-06-13 Cyrille Bagard ++ ++ * aes2501.c: ++ * aes2501_regs.h: ++ Complete translation of all binary communications using well documented ++ registers and values (as often as possible). ++ ++2007-06-13 Cyrille Bagard ++ ++ * aes2501.c: ++ Increase communication speed by buffering bulk out. Output data ++ need to be flushed at the end now. ++ ++2007-06-13 Cyrille Bagard ++ ++ * aes2501.c: ++ * aes2501_regs.h: ++ Translate binary data used in finger detection. Some register values ++ still need to be understood. Note: some hex values are reserved bits ++ in registers. ++ ++2007-06-12 Cyrille Bagard ++ ++ * aes2501.c: ++ Begin the binary translation: the "standby" function now uses understood ++ instructions and prints debug status information if needed. CTRL2 register ++ value needs to be checked. ++ ++ * aes2501_regs.h: ++ Define the interesting hex values for the following registers: ++ CTRL2, STAT, TREGC and TREGD. ++ ++2007-06-12 Cyrille Bagard ++ ++ * aes2501.c: ++ Clean the driver a little bit by removing old piece of code to handle ++ a character device in the old way. ++ ++2007-06-12 Cyrille Bagard ++ ++ * aes2501.c: ++ Use an own work queue. Scanning now starts with the AES2501_IOC_TEST ++ ioctl command. Reading the /dev entry blocks until data is available. ++ ++2007-06-12 Cyrille Bagard ++ ++ * aes2501.c: ++ * aes2501.h: ++ * Makefile: ++ Initial [crappy] commit. +diff -Nurp linux-2.6.37/3rdparty/aes2501/Makefile linux-2.6.37.3rdparty/3rdparty/aes2501/Makefile +--- linux-2.6.37/3rdparty/aes2501/Makefile 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/aes2501/Makefile 2008-01-14 03:07:30.000000000 +0200 +@@ -0,0 +1,19 @@ ++ ++obj-m := aes2501.o ++ ++KERNELDIR ?= /lib/modules/$(shell uname -r)/build ++ ++PWD := $(shell pwd) ++ ++all: usertest ++ $(MAKE) -C $(KERNELDIR) M=$(PWD) ++ ++usertest: ++ gcc -I. -o usertest usertest.c ++ ++clean: ++ rm -f *.o *~ aes2501.ko aes2501.mod.c Module.symvers usertest ++ rm -rf .tmp_versions ++ rm -f .*.cmd ++ ++ +diff -Nurp linux-2.6.37/3rdparty/aes2501/usertest.c linux-2.6.37.3rdparty/3rdparty/aes2501/usertest.c +--- linux-2.6.37/3rdparty/aes2501/usertest.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/aes2501/usertest.c 2008-01-14 03:07:30.000000000 +0200 +@@ -0,0 +1,78 @@ ++/** ++ * AES2501 Device Driver ++ * Userspace test program ++ * ++ * Compile with: ++ * gcc -I. -o usertest usertest.c ++ */ ++ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++#define BUFFER_SIZE 256 ++ ++ ++int main(int argc, char *argv[]) ++{ ++ int fd_in; ++ int fd_out; ++ char buffer[BUFFER_SIZE]; ++ size_t len; ++ ++ fd_in = -1; ++ fd_out = -1; ++ ++ ++ int data, rdata; ++ ++ ++ ++ fd_in = open("/dev/aes2501", O_RDONLY); ++ if (fd_in == -1) { ++ perror("open() -- "); ++ goto err; ++ } ++ ++ fd_out = open("/root/pic.pnm", O_CREAT | O_WRONLY); ++ if (fd_out == -1) { ++ perror("open() -- "); ++ goto err; ++ } ++ ++ ++ ++ data = 0x55555555; ++ ioctl(fd_in, AES2501_IOC_TEST, data); ++ //ioctl(fd_in, CASE2, &rdata); ++ ++ printf("IOCTL test: written: '%x' - received: '%x'\n", data, rdata); ++ ++ ++ ++ ++ /* Write the fingerprint */ ++ while ((len = read(fd_in, buffer, BUFFER_SIZE)) > 0) ++ write(fd_out, buffer, len); ++ ++ close(fd_in); ++ close(fd_out); ++ ++ return EXIT_SUCCESS; ++ ++ err: ++ ++ if (fd_in != -1) ++ close(fd_in); ++ ++ if (fd_out != -1) ++ close(fd_out); ++ ++ return EXIT_FAILURE; ++ ++} diff --git a/kernel/kernel/files/patches/mageia/3rd-aes2501-rmmod-oops-fix.patch b/kernel/kernel/files/patches/mageia/3rd-aes2501-rmmod-oops-fix.patch new file mode 100644 index 00000000..f11cc2e5 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-aes2501-rmmod-oops-fix.patch @@ -0,0 +1,21 @@ +Prevent oops on module removal when we don't have the device available. + +Signed-off-by: Herton Ronaldo Krzesinski + +--- + linux-2.6.23/3rdparty/aes2501/aes2501.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff -p -up linux-2.6.23/3rdparty/aes2501/aes2501.c.orig linux-2.6.23/3rdparty/aes2501/aes2501.c +--- linux-2.6.23/3rdparty/aes2501/aes2501.c.orig 2008-01-13 23:37:38.000000000 -0200 ++++ linux-2.6.23/3rdparty/aes2501/aes2501.c 2008-01-13 23:38:26.000000000 -0200 +@@ -1616,7 +1616,8 @@ static int __init aes2501_init(void) + + static void __exit aes2501_exit(void) + { +- _dev->stop_scan = 1; ++ if (_dev) ++ _dev->stop_scan = 1; + destroy_workqueue(comm_queue); + usb_deregister(&aes2501_driver); + } diff --git a/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-1.59.patch b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-1.59.patch new file mode 100644 index 00000000..63ccc093 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-1.59.patch @@ -0,0 +1,26399 @@ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/crt.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/crt.c +--- linux-3.12.2/3rdparty/ndiswrapper/crt.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/crt.c 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,589 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ntoskernel.h" ++#include "crt_exports.h" ++ ++#ifdef CONFIG_X86_64 ++/* Windows long is 32-bit, so strip single 'l' in integer formats */ ++static void strip_l_modifier(char *str) ++{ ++ char *ptr = str; ++ int in_format = 0; ++ char *lptr = NULL; ++ char last = 0; ++ char *end_ptr; ++ char *wptr; ++ ++ /* Replace single 'l' inside integer formats with '\0' */ ++ for (ptr = str; *ptr; ptr++) { ++ if (!in_format) { ++ if (*ptr == '%') ++ in_format = 1; ++ last = *ptr; ++ continue; ++ } ++ switch (*ptr) { ++ case 'd': ++ case 'i': ++ case 'o': ++ case 'u': ++ case 'x': ++ case 'X': ++ case 'p': ++ case 'n': ++ case 'm': ++ if (lptr) { ++ *lptr = '\0'; ++ lptr = NULL; ++ } ++ in_format = 0; ++ break; ++ case 'c': ++ case 'C': ++ case 's': ++ case 'S': ++ case 'f': ++ case 'e': ++ case 'E': ++ case 'g': ++ case 'G': ++ case 'a': ++ case 'A': ++ lptr = NULL; ++ in_format = 0; ++ break; ++ case '%': ++ lptr = NULL; ++ if (last == '%') ++ in_format = 0; ++ else ++ in_format = 1; /* ignore previous junk */ ++ break; ++ case 'l': ++ if (last == 'l') ++ lptr = NULL; ++ else ++ lptr = ptr; ++ break; ++ default: ++ break; ++ } ++ last = *ptr; ++ } ++ ++ /* Purge zeroes from the resulting string */ ++ end_ptr = ptr; ++ wptr = str; ++ for (ptr = str; ptr < end_ptr; ptr++) ++ if (*ptr != 0) ++ *(wptr++) = *ptr; ++ *wptr = 0; ++} ++ ++/* ++ * va_list on x86_64 Linux is designed to allow passing arguments in registers ++ * even to variadic functions. va_list is a structure holding pointers to the ++ * register save area, which holds the arguments passed in registers, and to ++ * the stack, which may have the arguments that did not fit the registers. ++ * va_list also holds offsets in the register save area for the next general ++ * purpose and floating point registers that the next va_arg() would fetch. ++ * ++ * Unlike Linux, the Windows va_list is just a pointer to the stack. No ++ * arguments are passed in the registers. That's why we construct the Linux ++ * va_list so that the register save area is never used. For that goal, we set ++ * the offsets to the maximal allowed values, meaning that the arguments passed ++ * in the registers have been exhausted. The values are 48 for general purpose ++ * registers (6 registers, 8 bytes each) and 304 for floating point registers ++ * (16 registers, 16 bytes each, on top of general purpose register). ++ */ ++ ++struct x86_64_va_list { ++ int gp_offset; ++ int fp_offset; ++ void *overflow_arg_area; ++ void *reg_save_area; ++}; ++ ++#define VA_LIST_DECL(_args) \ ++ va_list _args##new; \ ++ struct x86_64_va_list *_args##x; ++#define VA_LIST_PREP(_args) \ ++do { \ ++ _args##x = (struct x86_64_va_list *)&_args##new; \ ++ _args##x->gp_offset = 6 * 8; /* GP registers exhausted */ \ ++ _args##x->fp_offset = 6 * 8 + 16 * 16; /* FP registers exhausted */ \ ++ _args##x->overflow_arg_area = (void *)_args; \ ++ _args##x->reg_save_area = NULL; \ ++} while (0) ++#define VA_LIST_CONV(_args) (_args##new) ++#define VA_LIST_FREE(_args) ++#define FMT_DECL(_fmt) \ ++ char *_fmt##copy; \ ++ int _fmt##len; ++#define FMT_PREP(_fmt) \ ++do { \ ++ _fmt##len = strlen(format) + 1; \ ++ _fmt##copy = kmalloc(_fmt##len, irql_gfp()); \ ++ if (_fmt##copy) { \ ++ memcpy(_fmt##copy, format, _fmt##len); \ ++ strip_l_modifier(_fmt##copy); \ ++ } \ ++} while (0) ++#define FMT_CONV(_fmt) (_fmt##copy ? _fmt##copy : format) ++#define FMT_FREE(_fmt) kfree(_fmt##copy) ++ ++#else /* !CONFIG_X86_64 */ ++ ++#define VA_LIST_DECL(_args) ++#define VA_LIST_PREP(_args) ++#define VA_LIST_CONV(_args) (_args) ++#define VA_LIST_FREE(_args) ++#define FMT_DECL(_fmt) ++#define FMT_PREP(_fmt) ++#define FMT_CONV(_fmt) (format) ++#define FMT_FREE(_fmt) ++ ++#endif /* !CONFIG_X86_64 */ ++ ++__attribute__((format(printf, 2, 3))) ++noregparm INT WIN_FUNC(_win_sprintf,12) ++ (char *buf, const char *format, ...) ++{ ++ va_list args; ++ int res; ++ FMT_DECL(format) ++ ++ FMT_PREP(format); ++ va_start(args, format); ++ res = vsprintf(buf, FMT_CONV(format), args); ++ va_end(args); ++ FMT_FREE(format); ++ ++ TRACE2("buf: %p: %s", buf, buf); ++ return res; ++} ++ ++noregparm INT WIN_FUNC(swprintf,12) ++ (wchar_t *buf, const wchar_t *format, ...) ++{ ++ TODO(); ++ EXIT2(return 0); ++} ++ ++noregparm INT WIN_FUNC(_win_vsprintf,3) ++ (char *str, const char *format, va_list ap) ++{ ++ INT i; ++ VA_LIST_DECL(ap) ++ FMT_DECL(format) ++ ++ VA_LIST_PREP(ap); ++ FMT_PREP(format); ++ ++ i = vsprintf(str, FMT_CONV(format), VA_LIST_CONV(ap)); ++ TRACE2("str: %p: %s", str, str); ++ ++ FMT_FREE(format); ++ VA_LIST_FREE(ap); ++ EXIT2(return i); ++} ++ ++__attribute__((format(printf, 3, 4))) ++noregparm INT WIN_FUNC(_win_snprintf,12) ++ (char *buf, SIZE_T count, const char *format, ...) ++{ ++ va_list args; ++ int res; ++ FMT_DECL(format) ++ ++ FMT_PREP(format); ++ va_start(args, format); ++ res = vsnprintf(buf, count, FMT_CONV(format), args); ++ va_end(args); ++ TRACE2("buf: %p: %s", buf, buf); ++ ++ FMT_FREE(format); ++ return res; ++} ++ ++__attribute__((format(printf, 3, 4))) ++noregparm INT WIN_FUNC(_win__snprintf,12) ++ (char *buf, SIZE_T count, const char *format, ...) ++{ ++ va_list args; ++ int res; ++ FMT_DECL(format) ++ ++ FMT_PREP(format); ++ va_start(args, format); ++ res = vsnprintf(buf, count, FMT_CONV(format), args); ++ va_end(args); ++ TRACE2("buf: %p: %s", buf, buf); ++ ++ FMT_FREE(format); ++ return res; ++} ++ ++noregparm INT WIN_FUNC(_win_vsnprintf,4) ++ (char *str, SIZE_T size, const char *format, va_list ap) ++{ ++ INT i; ++ VA_LIST_DECL(ap) ++ FMT_DECL(format) ++ ++ VA_LIST_PREP(ap); ++ FMT_PREP(format); ++ ++ i = vsnprintf(str, size, FMT_CONV(format), VA_LIST_CONV(ap)); ++ TRACE2("str: %p: %s", str, str); ++ ++ FMT_FREE(format); ++ VA_LIST_FREE(ap); ++ EXIT2(return i); ++} ++ ++noregparm INT WIN_FUNC(_win__vsnprintf,4) ++ (char *str, SIZE_T size, const char *format, va_list ap) ++{ ++ INT i; ++ VA_LIST_DECL(ap) ++ FMT_DECL(format) ++ ++ VA_LIST_PREP(ap); ++ FMT_PREP(format); ++ ++ i = vsnprintf(str, size, FMT_CONV(format), VA_LIST_CONV(ap)); ++ TRACE2("str: %p: %s", str, str); ++ ++ FMT_FREE(format); ++ VA_LIST_FREE(ap); ++ EXIT2(return i); ++} ++ ++noregparm INT WIN_FUNC(_win__vsnwprintf,4) ++ (wchar_t *str, SIZE_T size, const wchar_t *format, va_list ap) ++{ ++ int ret; ++ ++ TODO(); /* format expansion not implemented */ ++ _win_wcsncpy(str, format, size); ++ ret = _win_wcslen(format); ++ if (ret >= size) ++ ret = -1; ++ return ret; ++} ++ ++noregparm char *WIN_FUNC(_win_strncpy,3) ++ (char *dst, char *src, SIZE_T n) ++{ ++ return strncpy(dst, src, n); ++} ++ ++noregparm SIZE_T WIN_FUNC(_win_strlen,1) ++ (const char *s) ++{ ++ return strlen(s); ++} ++ ++noregparm INT WIN_FUNC(_win_strncmp,3) ++ (const char *s1, const char *s2, SIZE_T n) ++{ ++ return strncmp(s1, s2, n); ++} ++ ++noregparm INT WIN_FUNC(_win_strcmp,2) ++ (const char *s1, const char *s2) ++{ ++ return strcmp(s1, s2); ++} ++ ++noregparm INT WIN_FUNC(_win_stricmp,2) ++ (const char *s1, const char *s2) ++{ ++ return stricmp(s1, s2); ++} ++ ++noregparm char *WIN_FUNC(_win_strncat,3) ++ (char *dest, const char *src, SIZE_T n) ++{ ++ return strncat(dest, src, n); ++} ++ ++noregparm INT WIN_FUNC(_win_wcscmp,2) ++ (const wchar_t *s1, const wchar_t *s2) ++{ ++ while (*s1 && *s1 == *s2) { ++ s1++; ++ s2++; ++ } ++ return *s1 - *s2; ++} ++ ++noregparm INT WIN_FUNC(_win_wcsicmp,2) ++ (const wchar_t *s1, const wchar_t *s2) ++{ ++ while (*s1 && tolower((char)*s1) == tolower((char)*s2)) { ++ s1++; ++ s2++; ++ } ++ return tolower((char)*s1) - tolower((char)*s2); ++} ++ ++noregparm SIZE_T WIN_FUNC(_win_wcslen,1) ++ (const wchar_t *s) ++{ ++ const wchar_t *t = s; ++ while (*t) ++ t++; ++ return t - s; ++} ++ ++noregparm wchar_t *WIN_FUNC(_win_wcsncpy,3) ++ (wchar_t *dest, const wchar_t *src, SIZE_T n) ++{ ++ const wchar_t *s; ++ wchar_t *d; ++ s = src + n; ++ d = dest; ++ while (src < s && (*d++ = *src++)) ++ ; ++ if (s > src) ++ memset(d, 0, (s - src) * sizeof(wchar_t)); ++ return dest; ++} ++ ++noregparm wchar_t *WIN_FUNC(_win_wcscpy,2) ++ (wchar_t *dest, const wchar_t *src) ++{ ++ wchar_t *d = dest; ++ while ((*d++ = *src++)) ++ ; ++ return dest; ++} ++ ++noregparm wchar_t *WIN_FUNC(_win_wcscat,2) ++ (wchar_t *dest, const wchar_t *src) ++{ ++ wchar_t *d; ++ d = dest; ++ while (*d) ++ d++; ++ while ((*d++ = *src++)) ++ ; ++ return dest; ++} ++ ++noregparm INT WIN_FUNC(_win_towupper,1) ++ (wchar_t c) ++{ ++ return toupper(c); ++} ++ ++noregparm INT WIN_FUNC(_win_towlower,1) ++ (wchar_t c) ++{ ++ return tolower(c); ++} ++ ++noregparm INT WIN_FUNC(_win_tolower,1) ++ (INT c) ++{ ++ return tolower(c); ++} ++ ++noregparm INT WIN_FUNC(_win_toupper,1) ++ (INT c) ++{ ++ return toupper(c); ++} ++ ++noregparm void *WIN_FUNC(_win_strcpy,2) ++ (void *to, const void *from) ++{ ++ return strcpy(to, from); ++} ++ ++noregparm char *WIN_FUNC(_win_strstr,2) ++ (const char *s1, const char *s2) ++{ ++ return strstr(s1, s2); ++} ++ ++noregparm char *WIN_FUNC(_win_strchr,2) ++ (const char *s, int c) ++{ ++ return strchr(s, c); ++} ++ ++noregparm char *WIN_FUNC(_win_strrchr,2) ++ (const char *s, int c) ++{ ++ return strrchr(s, c); ++} ++ ++noregparm void *WIN_FUNC(_win_memmove,3) ++ (void *to, void *from, SIZE_T count) ++{ ++ return memmove(to, from, count); ++} ++ ++noregparm void *WIN_FUNC(_win_memchr,3) ++ (const void *s, INT c, SIZE_T n) ++{ ++ return memchr(s, c, n); ++} ++ ++noregparm void *WIN_FUNC(_win_memcpy,3) ++ (void *to, const void *from, SIZE_T n) ++{ ++ return memcpy(to, from, n); ++} ++ ++noregparm void *WIN_FUNC(_win_memset,3) ++ (void *s, char c, SIZE_T count) ++{ ++ return memset(s, c, count); ++} ++ ++noregparm int WIN_FUNC(_win_memcmp,3) ++ (void *s1, void *s2, SIZE_T n) ++{ ++ return memcmp(s1, s2, n); ++} ++ ++noregparm void WIN_FUNC(_win_srand,1) ++ (UINT seed) ++{ ++ net_srandom(seed); ++} ++ ++noregparm int WIN_FUNC(rand,0) ++ (void) ++{ ++ char buf[6]; ++ int i, n; ++ ++ get_random_bytes(buf, sizeof(buf)); ++ for (n = i = 0; i < sizeof(buf); i++) ++ n += buf[i]; ++ return n; ++} ++ ++noregparm int WIN_FUNC(_win_atoi,1) ++ (const char *ptr) ++{ ++ int i = simple_strtol(ptr, NULL, 10); ++ return i; ++} ++ ++noregparm int WIN_FUNC(_win_isdigit,1) ++ (int c) ++{ ++ return isdigit(c); ++} ++ ++noregparm int WIN_FUNC(_win_isprint,1) ++ (int c) ++{ ++ return isprint(c); ++} ++ ++wstdcall s64 WIN_FUNC(_alldiv,2) ++ (s64 a, s64 b) ++{ ++ return a / b; ++} ++ ++wstdcall u64 WIN_FUNC(_aulldiv,2) ++ (u64 a, u64 b) ++{ ++ return a / b; ++} ++ ++wstdcall s64 WIN_FUNC(_allmul,2) ++ (s64 a, s64 b) ++{ ++ return a * b; ++} ++ ++wstdcall u64 WIN_FUNC(_aullmul,2) ++ (u64 a, u64 b) ++{ ++ return a * b; ++} ++ ++wstdcall s64 WIN_FUNC(_allrem,2) ++ (s64 a, s64 b) ++{ ++ return a % b; ++} ++ ++wstdcall u64 WIN_FUNC(_aullrem,2) ++ (u64 a, u64 b) ++{ ++ return a % b; ++} ++ ++regparm3 s64 WIN_FUNC(_allshl,2) ++ (s64 a, u8 b) ++{ ++ return a << b; ++} ++ ++regparm3 u64 WIN_FUNC(_aullshl,2) ++ (u64 a, u8 b) ++{ ++ return a << b; ++} ++ ++regparm3 s64 WIN_FUNC(_allshr,2) ++ (s64 a, u8 b) ++{ ++ return a >> b; ++} ++ ++regparm3 u64 WIN_FUNC(_aullshr,2) ++ (u64 a, u8 b) ++{ ++ return a >> b; ++} ++ ++int stricmp(const char *s1, const char *s2) ++{ ++ while (*s1 && tolower(*s1) == tolower(*s2)) { ++ s1++; ++ s2++; ++ } ++ return *s1 - *s2; ++} ++ ++void dump_bytes(const char *ctx, const u8 *from, int len) ++{ ++ int i, j; ++ u8 *buf; ++ ++ buf = kmalloc(len * 3 + 1, irql_gfp()); ++ if (!buf) { ++ ERROR("couldn't allocate memory"); ++ return; ++ } ++ for (i = j = 0; i < len; i++, j += 3) { ++ sprintf(&buf[j], "%02x ", from[i]); ++ } ++ buf[j] = 0; ++ printk(KERN_DEBUG "%s: %p: %s\n", ctx, from, buf); ++ kfree(buf); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/divdi3.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/divdi3.c +--- linux-3.12.2/3rdparty/ndiswrapper/divdi3.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/divdi3.c 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,329 @@ ++/* 64-bit multiplication and division ++ Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003 ++ Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include ++#include ++ ++#if BITS_PER_LONG != 32 ++#error This is for 32-bit targets only ++#endif ++ ++typedef unsigned int UQItype __attribute__ ((mode (QI))); ++typedef int SItype __attribute__ ((mode (SI))); ++typedef unsigned int USItype __attribute__ ((mode (SI))); ++typedef int DItype __attribute__ ((mode (DI))); ++typedef unsigned int UDItype __attribute__ ((mode (DI))); ++#define Wtype SItype ++#define HWtype SItype ++#define DWtype DItype ++#define UWtype USItype ++#define UHWtype USItype ++#define UDWtype UDItype ++#define W_TYPE_SIZE 32 ++ ++#include "longlong.h" ++ ++#if defined(__BIG_ENDIAN) ++struct DWstruct { Wtype high, low;}; ++#elif defined(__LITTLE_ENDIAN) ++struct DWstruct { Wtype low, high;}; ++#else ++#error Unhandled endianity ++#endif ++typedef union { struct DWstruct s; DWtype ll; } DWunion; ++ ++/* Prototypes of exported functions. */ ++extern DWtype __divdi3 (DWtype u, DWtype v); ++extern DWtype __moddi3 (DWtype u, DWtype v); ++extern UDWtype __udivdi3 (UDWtype u, UDWtype v); ++extern UDWtype __umoddi3 (UDWtype u, UDWtype v); ++ ++static UDWtype ++__udivmoddi4 (UDWtype n, UDWtype d, UDWtype *rp) ++{ ++ DWunion ww; ++ DWunion nn, dd; ++ DWunion rr; ++ UWtype d0, d1, n0, n1, n2; ++ UWtype q0, q1; ++ UWtype b, bm; ++ ++ nn.ll = n; ++ dd.ll = d; ++ ++ d0 = dd.s.low; ++ d1 = dd.s.high; ++ n0 = nn.s.low; ++ n1 = nn.s.high; ++ ++#if !UDIV_NEEDS_NORMALIZATION ++ if (d1 == 0) ++ { ++ if (d0 > n1) ++ { ++ /* 0q = nn / 0D */ ++ ++ udiv_qrnnd (q0, n0, n1, n0, d0); ++ q1 = 0; ++ ++ /* Remainder in n0. */ ++ } ++ else ++ { ++ /* qq = NN / 0d */ ++ ++ if (d0 == 0) ++ d0 = 1 / d0; /* Divide intentionally by zero. */ ++ ++ udiv_qrnnd (q1, n1, 0, n1, d0); ++ udiv_qrnnd (q0, n0, n1, n0, d0); ++ ++ /* Remainder in n0. */ ++ } ++ ++ if (rp != NULL) ++ { ++ rr.s.low = n0; ++ rr.s.high = 0; ++ *rp = rr.ll; ++ } ++ } ++ ++#else /* UDIV_NEEDS_NORMALIZATION */ ++ ++ if (d1 == 0) ++ { ++ if (d0 > n1) ++ { ++ /* 0q = nn / 0D */ ++ ++ count_leading_zeros (bm, d0); ++ ++ if (bm != 0) ++ { ++ /* Normalize, i.e. make the most significant bit of the ++ denominator set. */ ++ ++ d0 = d0 << bm; ++ n1 = (n1 << bm) | (n0 >> (W_TYPE_SIZE - bm)); ++ n0 = n0 << bm; ++ } ++ ++ udiv_qrnnd (q0, n0, n1, n0, d0); ++ q1 = 0; ++ ++ /* Remainder in n0 >> bm. */ ++ } ++ else ++ { ++ /* qq = NN / 0d */ ++ ++ if (d0 == 0) ++ d0 = 1 / d0; /* Divide intentionally by zero. */ ++ ++ count_leading_zeros (bm, d0); ++ ++ if (bm == 0) ++ { ++ /* From (n1 >= d0) /\ (the most significant bit of d0 is set), ++ conclude (the most significant bit of n1 is set) /\ (the ++ leading quotient digit q1 = 1). ++ ++ This special case is necessary, not an optimization. ++ (Shifts counts of W_TYPE_SIZE are undefined.) */ ++ ++ n1 -= d0; ++ q1 = 1; ++ } ++ else ++ { ++ /* Normalize. */ ++ ++ b = W_TYPE_SIZE - bm; ++ ++ d0 = d0 << bm; ++ n2 = n1 >> b; ++ n1 = (n1 << bm) | (n0 >> b); ++ n0 = n0 << bm; ++ ++ udiv_qrnnd (q1, n1, n2, n1, d0); ++ } ++ ++ /* n1 != d0... */ ++ ++ udiv_qrnnd (q0, n0, n1, n0, d0); ++ ++ /* Remainder in n0 >> bm. */ ++ } ++ ++ if (rp != NULL) ++ { ++ rr.s.low = n0 >> bm; ++ rr.s.high = 0; ++ *rp = rr.ll; ++ } ++ } ++#endif /* UDIV_NEEDS_NORMALIZATION */ ++ ++ else ++ { ++ if (d1 > n1) ++ { ++ /* 00 = nn / DD */ ++ ++ q0 = 0; ++ q1 = 0; ++ ++ /* Remainder in n1n0. */ ++ if (rp != NULL) ++ { ++ rr.s.low = n0; ++ rr.s.high = n1; ++ *rp = rr.ll; ++ } ++ } ++ else ++ { ++ /* 0q = NN / dd */ ++ ++ count_leading_zeros (bm, d1); ++ if (bm == 0) ++ { ++ /* From (n1 >= d1) /\ (the most significant bit of d1 is set), ++ conclude (the most significant bit of n1 is set) /\ (the ++ quotient digit q0 = 0 or 1). ++ ++ This special case is necessary, not an optimization. */ ++ ++ /* The condition on the next line takes advantage of that ++ n1 >= d1 (true due to program flow). */ ++ if (n1 > d1 || n0 >= d0) ++ { ++ q0 = 1; ++ sub_ddmmss (n1, n0, n1, n0, d1, d0); ++ } ++ else ++ q0 = 0; ++ ++ q1 = 0; ++ ++ if (rp != NULL) ++ { ++ rr.s.low = n0; ++ rr.s.high = n1; ++ *rp = rr.ll; ++ } ++ } ++ else ++ { ++ UWtype m1, m0; ++ /* Normalize. */ ++ ++ b = W_TYPE_SIZE - bm; ++ ++ d1 = (d1 << bm) | (d0 >> b); ++ d0 = d0 << bm; ++ n2 = n1 >> b; ++ n1 = (n1 << bm) | (n0 >> b); ++ n0 = n0 << bm; ++ ++ udiv_qrnnd (q0, n1, n2, n1, d1); ++ umul_ppmm (m1, m0, q0, d0); ++ ++ if (m1 > n1 || (m1 == n1 && m0 > n0)) ++ { ++ q0--; ++ sub_ddmmss (m1, m0, m1, m0, d1, d0); ++ } ++ ++ q1 = 0; ++ ++ /* Remainder in (n1n0 - m1m0) >> bm. */ ++ if (rp != NULL) ++ { ++ sub_ddmmss (n1, n0, n1, n0, m1, m0); ++ rr.s.low = (n1 << b) | (n0 >> bm); ++ rr.s.high = n1 >> bm; ++ *rp = rr.ll; ++ } ++ } ++ } ++ } ++ ++ ww.s.low = q0; ++ ww.s.high = q1; ++ return ww.ll; ++} ++ ++DWtype ++__divdi3 (DWtype u, DWtype v) ++{ ++ Wtype c = 0; ++ DWtype w; ++ ++ if (u < 0) ++ { ++ c = ~c; ++ u = -u; ++ } ++ if (v < 0) ++ { ++ c = ~c; ++ v = -v; ++ } ++ w = __udivmoddi4 (u, v, NULL); ++ if (c) ++ w = -w; ++ return w; ++} ++ ++DWtype ++__moddi3 (DWtype u, DWtype v) ++{ ++ Wtype c = 0; ++ DWtype w; ++ ++ if (u < 0) ++ { ++ c = ~c; ++ u = -u; ++ } ++ if (v < 0) ++ v = -v; ++ __udivmoddi4 (u, v, &w); ++ if (c) ++ w = -w; ++ return w; ++} ++ ++UDWtype ++__udivdi3 (UDWtype u, UDWtype v) ++{ ++ return __udivmoddi4 (u, v, NULL); ++} ++ ++UDWtype ++__umoddi3 (UDWtype u, UDWtype v) ++{ ++ UDWtype w; ++ ++ __udivmoddi4 (u, v, &w); ++ return w; ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/hal.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/hal.c +--- linux-3.12.2/3rdparty/ndiswrapper/hal.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/hal.c 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,157 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ntoskernel.h" ++#include "hal_exports.h" ++ ++wstdcall void WIN_FUNC(WRITE_PORT_ULONG,2) ++ (ULONG_PTR port, ULONG value) ++{ ++ outl(value, port); ++} ++ ++wstdcall ULONG WIN_FUNC(READ_PORT_ULONG,1) ++ (ULONG_PTR port) ++{ ++ return inl(port); ++} ++ ++wstdcall void WIN_FUNC(WRITE_PORT_USHORT,2) ++ (ULONG_PTR port, USHORT value) ++{ ++ outw(value, port); ++} ++ ++wstdcall USHORT WIN_FUNC(READ_PORT_USHORT,1) ++ (ULONG_PTR port) ++{ ++ return inw(port); ++} ++ ++wstdcall void WIN_FUNC(WRITE_PORT_UCHAR,2) ++ (ULONG_PTR port, UCHAR value) ++{ ++ outb(value, port); ++} ++ ++wstdcall UCHAR WIN_FUNC(READ_PORT_UCHAR,1) ++ (ULONG_PTR port) ++{ ++ return inb(port); ++} ++ ++wstdcall void WIN_FUNC(WRITE_PORT_BUFFER_USHORT,3) ++ (ULONG_PTR port, USHORT *buf, ULONG count) ++{ ++ outsw(port, buf, count); ++} ++ ++wstdcall void WIN_FUNC(READ_PORT_BUFFER_USHORT,3) ++ (ULONG_PTR port, USHORT *buf, ULONG count) ++{ ++ insw(port, buf, count); ++} ++ ++wstdcall void WIN_FUNC(WRITE_PORT_BUFFER_ULONG,3) ++ (ULONG_PTR port, ULONG *buf, ULONG count) ++{ ++ outsl(port, buf, count); ++} ++ ++wstdcall void WIN_FUNC(READ_PORT_BUFFER_ULONG,3) ++ (ULONG_PTR port, ULONG *buf, ULONG count) ++{ ++ insl(port, buf, count); ++} ++ ++wstdcall USHORT WIN_FUNC(READ_REGISTER_USHORT,1) ++ (void __iomem *reg) ++{ ++ return readw(reg); ++} ++ ++wstdcall void WIN_FUNC(WRITE_REGISTER_ULONG,2) ++ (void __iomem *reg, UINT val) ++{ ++ writel(val, reg); ++} ++ ++wstdcall void WIN_FUNC(WRITE_REGISTER_USHORT,2) ++ (void __iomem *reg, USHORT val) ++{ ++ writew(val, reg); ++} ++ ++wstdcall void WIN_FUNC(WRITE_REGISTER_UCHAR,2) ++ (void __iomem *reg, UCHAR val) ++{ ++ writeb(val, reg); ++} ++ ++wstdcall void WIN_FUNC(KeStallExecutionProcessor,1) ++ (ULONG usecs) ++{ ++ udelay(usecs); ++} ++ ++wstdcall KIRQL WIN_FUNC(KeGetCurrentIrql,0) ++ (void) ++{ ++ return current_irql(); ++} ++ ++wfastcall KIRQL WIN_FUNC(KfRaiseIrql,1) ++ (KIRQL newirql) ++{ ++ return raise_irql(newirql); ++} ++ ++wfastcall void WIN_FUNC(KfLowerIrql,1) ++ (KIRQL oldirql) ++{ ++ lower_irql(oldirql); ++} ++ ++wfastcall KIRQL WIN_FUNC(KfAcquireSpinLock,1) ++ (NT_SPIN_LOCK *lock) ++{ ++ return nt_spin_lock_irql(lock, DISPATCH_LEVEL); ++} ++ ++wfastcall void WIN_FUNC(KfReleaseSpinLock,2) ++ (NT_SPIN_LOCK *lock, KIRQL oldirql) ++{ ++ nt_spin_unlock_irql(lock, oldirql); ++} ++ ++wfastcall void WIN_FUNC(KefAcquireSpinLockAtDpcLevel,1) ++ (NT_SPIN_LOCK *lock) ++{ ++#ifdef DEBUG_IRQL ++ if (current_irql() != DISPATCH_LEVEL) ++ ERROR("irql != DISPATCH_LEVEL"); ++#endif ++ nt_spin_lock(lock); ++} ++ ++wfastcall void WIN_FUNC(KefReleaseSpinLockFromDpcLevel,1) ++ (NT_SPIN_LOCK *lock) ++{ ++#ifdef DEBUG_IRQL ++ if (current_irql() != DISPATCH_LEVEL) ++ ERROR("irql != DISPATCH_LEVEL"); ++#endif ++ nt_spin_unlock(lock); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.c +--- linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.c 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,2001 @@ ++ /* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#include "iw_ndis.h" ++#include "wrapndis.h" ++ ++#ifdef CONFIG_WIRELESS_EXT ++ ++static int freq_chan[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442, ++ 2447, 2452, 2457, 2462, 2467, 2472, 2484 }; ++ ++static const char *network_names[] = {"IEEE 802.11FH", "IEEE 802.11b", ++ "IEEE 802.11a", "IEEE 802.11g", "Auto"}; ++ ++static int set_essid(struct ndis_device *wnd, const char *ssid, int ssid_len) ++{ ++ NDIS_STATUS res; ++ struct ndis_essid req; ++ ++ if (ssid_len > NDIS_ESSID_MAX_SIZE) ++ return -EINVAL; ++ ++ memset(&req, 0, sizeof(req)); ++ req.length = ssid_len; ++ if (ssid_len) ++ memcpy(&req.essid, ssid, ssid_len); ++ ++ res = mp_set(wnd, OID_802_11_SSID, &req, sizeof(req)); ++ if (res) { ++ WARNING("setting essid failed (%08X)", res); ++ EXIT2(return -EINVAL); ++ } ++ memcpy(&wnd->essid, &req, sizeof(req)); ++ EXIT2(return 0); ++} ++ ++static int set_iw_auth_mode(struct ndis_device *wnd, int wpa_version, ++ int auth_80211_alg) ++{ ++ NDIS_STATUS res; ++ ULONG auth_mode; ++ ++ ENTER2("%d, %d", wpa_version, auth_80211_alg); ++ if (wpa_version & IW_AUTH_WPA_VERSION_WPA2) { ++ if (wnd->iw_auth_key_mgmt & IW_AUTH_KEY_MGMT_802_1X) ++ auth_mode = Ndis802_11AuthModeWPA2; ++ else ++ auth_mode = Ndis802_11AuthModeWPA2PSK; ++ } else if (wpa_version & IW_AUTH_WPA_VERSION_WPA) { ++ if (wnd->iw_auth_key_mgmt & IW_AUTH_KEY_MGMT_802_1X) ++ auth_mode = Ndis802_11AuthModeWPA; ++ else if (wnd->iw_auth_key_mgmt & IW_AUTH_KEY_MGMT_PSK) ++ auth_mode = Ndis802_11AuthModeWPAPSK; ++ else ++ auth_mode = Ndis802_11AuthModeWPANone; ++ } else if (auth_80211_alg & IW_AUTH_ALG_SHARED_KEY) { ++ if (auth_80211_alg & IW_AUTH_ALG_OPEN_SYSTEM) ++ auth_mode = Ndis802_11AuthModeAutoSwitch; ++ else ++ auth_mode = Ndis802_11AuthModeShared; ++ } else ++ auth_mode = Ndis802_11AuthModeOpen; ++ ++ res = mp_set_int(wnd, OID_802_11_AUTHENTICATION_MODE, auth_mode); ++ if (res) { ++ WARNING("setting auth mode to %u failed (%08X)", ++ auth_mode, res); ++ if (res == NDIS_STATUS_INVALID_DATA) ++ EXIT2(return -EINVAL); ++ return -EOPNOTSUPP; ++ } ++ wnd->iw_auth_wpa_version = wpa_version; ++ wnd->iw_auth_80211_alg = auth_80211_alg; ++ EXIT2(return 0); ++} ++ ++static int set_auth_mode(struct ndis_device *wnd) ++{ ++ return set_iw_auth_mode(wnd, wnd->iw_auth_wpa_version, ++ wnd->iw_auth_80211_alg); ++} ++ ++static enum ndis_priv_filter ndis_priv_mode(struct ndis_device *wnd) ++{ ++ if (wnd->iw_auth_wpa_version & IW_AUTH_WPA_VERSION_WPA2 || ++ wnd->iw_auth_wpa_version & IW_AUTH_WPA_VERSION_WPA) ++ return Ndis802_11PrivFilter8021xWEP; ++ else ++ return Ndis802_11PrivFilterAcceptAll; ++} ++ ++static int set_priv_filter(struct ndis_device *wnd) ++{ ++ NDIS_STATUS res; ++ ULONG flags; ++ ++ flags = ndis_priv_mode(wnd); ++ ENTER2("filter: %d", flags); ++ res = mp_set_int(wnd, OID_802_11_PRIVACY_FILTER, flags); ++ if (res) ++ TRACE2("setting privacy filter to %d failed (%08X)", ++ flags, res); ++ EXIT2(return 0); ++} ++ ++static int set_encr_mode(struct ndis_device *wnd) ++{ ++ return set_iw_encr_mode(wnd, wnd->iw_auth_cipher_pairwise, ++ wnd->iw_auth_cipher_group); ++} ++ ++static int set_assoc_params(struct ndis_device *wnd) ++{ ++ TRACE2("wpa_version=0x%x auth_alg=0x%x key_mgmt=0x%x " ++ "cipher_pairwise=0x%x cipher_group=0x%x", ++ wnd->iw_auth_wpa_version, wnd->iw_auth_80211_alg, ++ wnd->iw_auth_key_mgmt, wnd->iw_auth_cipher_pairwise, ++ wnd->iw_auth_cipher_group); ++ set_auth_mode(wnd); ++ set_priv_filter(wnd); ++ set_encr_mode(wnd); ++ return 0; ++} ++ ++static int iw_set_essid(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ int length; ++ ++ ENTER2(""); ++ /* there is no way to turn off essid other than to set to ++ * random bytes; instead, we use off to mean any */ ++ if (wrqu->essid.flags) { ++ length = wrqu->essid.length; ++ /* Strip '\0' appended by wireless extensions 19 and older */ ++ if (length > 0 && extra[length - 1] == '\0') ++ length--; ++ TRACE2("%d", length); ++ if (length <= 0 || length > NDIS_ESSID_MAX_SIZE) ++ EXIT2(return -EINVAL); ++ } else ++ length = 0; ++ ++ set_assoc_params(wnd); ++ ++ if (set_essid(wnd, extra, length)) ++ EXIT2(return -EINVAL); ++ ++ EXIT2(return 0); ++} ++ ++static int iw_get_essid(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ struct ndis_essid req; ++ ++ ENTER2(""); ++ memset(&req, 0, sizeof(req)); ++ res = mp_query(wnd, OID_802_11_SSID, &req, sizeof(req)); ++ if (res) { ++ WARNING("getting essid failed (%08X)", res); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ memcpy(extra, req.essid, req.length); ++ if (req.length > 0) ++ wrqu->essid.flags = 1; ++ else ++ wrqu->essid.flags = 0; ++ wrqu->essid.length = req.length; ++ EXIT2(return 0); ++} ++ ++/* index must be 0 - N, as per NDIS */ ++static int add_wep_key(struct ndis_device *wnd, char *key, int key_len, ++ int index) ++{ ++ struct ndis_encr_key ndis_key; ++ NDIS_STATUS res; ++ ++ ENTER2("key index: %d, length: %d", index, key_len); ++ if (key_len <= 0 || key_len > NDIS_ENCODING_TOKEN_MAX) { ++ WARNING("invalid key length (%d)", key_len); ++ EXIT2(return -EINVAL); ++ } ++ if (index < 0 || index >= MAX_ENCR_KEYS) { ++ WARNING("invalid key index (%d)", index); ++ EXIT2(return -EINVAL); ++ } ++ ndis_key.struct_size = sizeof(ndis_key); ++ ndis_key.length = key_len; ++ memcpy(&ndis_key.key, key, key_len); ++ ndis_key.index = index; ++ ++ if (index == wnd->encr_info.tx_key_index) { ++ ndis_key.index |= (1 << 31); ++ res = set_iw_encr_mode(wnd, IW_AUTH_CIPHER_WEP104, ++ IW_AUTH_CIPHER_NONE); ++ if (res) ++ WARNING("encryption couldn't be enabled (%08X)", res); ++ } ++ TRACE2("key %d: " MACSTRSEP, index, MAC2STR(key)); ++ res = mp_set(wnd, OID_802_11_ADD_WEP, &ndis_key, sizeof(ndis_key)); ++ if (res) { ++ WARNING("adding encryption key %d failed (%08X)", ++ index+1, res); ++ EXIT2(return -EINVAL); ++ } ++ ++ /* Atheros driver messes up ndis_key during ADD_WEP, so ++ * don't rely on that; instead use info in key and key_len */ ++ wnd->encr_info.keys[index].length = key_len; ++ memcpy(&wnd->encr_info.keys[index].key, key, key_len); ++ ++ EXIT2(return 0); ++} ++ ++static int set_infra_mode(struct ndis_device *wnd, ++ enum ndis_infrastructure_mode mode) ++{ ++ NDIS_STATUS res; ++ unsigned int i; ++ ++ ENTER2("%d", mode); ++ res = mp_query_int(wnd, OID_802_11_INFRASTRUCTURE_MODE, ++ &wnd->infrastructure_mode); ++ if (res != NDIS_STATUS_SUCCESS) { ++ WARNING("getting operating mode failed (%08X)", res); ++ EXIT2(return -EINVAL); ++ } ++ if (wnd->infrastructure_mode == mode) ++ EXIT2(return 0); ++ res = mp_set_int(wnd, OID_802_11_INFRASTRUCTURE_MODE, mode); ++ if (res) { ++ WARNING("setting operating mode to %d failed (%08X)", ++ mode, res); ++ EXIT2(return -EINVAL); ++ } ++ /* NDIS drivers clear keys when infrastructure mode is ++ * changed. But Linux tools assume otherwise. So set the ++ * keys */ ++ if (wnd->iw_auth_key_mgmt == 0 || ++ wnd->iw_auth_key_mgmt == IW_AUTH_KEY_MGMT_802_1X) { ++ for (i = 0; i < MAX_ENCR_KEYS; i++) { ++ if (wnd->encr_info.keys[i].length > 0) ++ add_wep_key(wnd, wnd->encr_info.keys[i].key, ++ wnd->encr_info.keys[i].length, i); ++ } ++ } ++ wnd->infrastructure_mode = mode; ++ EXIT2(return 0); ++} ++ ++static int iw_set_infra_mode(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ enum ndis_infrastructure_mode ndis_mode; ++ ++ ENTER2("%d", wrqu->mode); ++ switch (wrqu->mode) { ++ case IW_MODE_ADHOC: ++ ndis_mode = Ndis802_11IBSS; ++ break; ++ case IW_MODE_INFRA: ++ ndis_mode = Ndis802_11Infrastructure; ++ break; ++ case IW_MODE_AUTO: ++ ndis_mode = Ndis802_11AutoUnknown; ++ break; ++ default: ++ EXIT2(return -EINVAL); ++ } ++ ++ if (set_infra_mode(wnd, ndis_mode)) ++ EXIT2(return -EINVAL); ++ ++ EXIT2(return 0); ++} ++ ++static int iw_get_infra_mode(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ int ndis_mode, iw_mode; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_query_int(wnd, OID_802_11_INFRASTRUCTURE_MODE, &ndis_mode); ++ if (res) { ++ WARNING("getting operating mode failed (%08X)", res); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ ++ switch (ndis_mode) { ++ case Ndis802_11IBSS: ++ iw_mode = IW_MODE_ADHOC; ++ break; ++ case Ndis802_11Infrastructure: ++ iw_mode = IW_MODE_INFRA; ++ break; ++ case Ndis802_11AutoUnknown: ++ iw_mode = IW_MODE_AUTO; ++ break; ++ default: ++ ERROR("invalid operating mode (%u)", ndis_mode); ++ EXIT2(return -EINVAL); ++ } ++ wrqu->mode = iw_mode; ++ EXIT2(return 0); ++} ++ ++static const char *network_type_to_name(int net_type) ++{ ++ if (net_type >= 0 && net_type < ARRAY_SIZE(network_names)) ++ return network_names[net_type]; ++ else ++ return network_names[ARRAY_SIZE(network_names) - 1]; ++} ++ ++static int iw_get_network_type(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ unsigned int network_type; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_query_int(wnd, OID_802_11_NETWORK_TYPE_IN_USE, ++ &network_type); ++ if (res) { ++ WARNING("getting network type failed: %08X", res); ++ network_type = -1; ++ } ++ strncpy(wrqu->name, network_type_to_name(network_type), ++ sizeof(wrqu->name) - 1); ++ wrqu->name[sizeof(wrqu->name)-1] = 0; ++ return 0; ++} ++ ++static int iw_get_freq(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ struct ndis_configuration req; ++ ++ ENTER2(""); ++ memset(&req, 0, sizeof(req)); ++ res = mp_query(wnd, OID_802_11_CONFIGURATION, &req, sizeof(req)); ++ if (res) { ++ WARNING("getting configuration failed (%08X)", res); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ ++ memset(&(wrqu->freq), 0, sizeof(struct iw_freq)); ++ ++ /* see comment in wireless.h above the "struct iw_freq" ++ definition for an explanation of this if ++ NOTE: 1000000 is due to the kHz ++ */ ++ if (req.ds_config > 1000000) { ++ wrqu->freq.m = req.ds_config / 10; ++ wrqu->freq.e = 1; ++ } ++ else ++ wrqu->freq.m = req.ds_config; ++ ++ /* convert from kHz to Hz */ ++ wrqu->freq.e += 3; ++ ++ return 0; ++} ++ ++static int iw_set_freq(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ struct ndis_configuration req; ++ ++ ENTER2(""); ++ /* this OID is valid only when not associated */ ++ if (netif_carrier_ok(wnd->net_dev)) ++ EXIT2(return 0); ++ memset(&req, 0, sizeof(req)); ++ res = mp_query(wnd, OID_802_11_CONFIGURATION, &req, sizeof(req)); ++ if (res) { ++ WARNING("getting configuration failed (%08X)", res); ++ EXIT2(return 0); ++ } ++ ++ if (wrqu->freq.m < 1000 && wrqu->freq.e == 0) { ++ if (wrqu->freq.m >= 1 && wrqu->freq.m <= ARRAY_SIZE(freq_chan)) ++ req.ds_config = freq_chan[wrqu->freq.m - 1] * 1000; ++ else ++ return -EINVAL; ++ } else { ++ int i; ++ req.ds_config = wrqu->freq.m; ++ for (i = wrqu->freq.e; i > 0; i--) ++ req.ds_config *= 10; ++ req.ds_config /= 1000; ++ } ++ res = mp_set(wnd, OID_802_11_CONFIGURATION, &req, sizeof(req)); ++ if (res) ++ WARNING("setting configuration failed (%08X)", res); ++ return 0; ++} ++ ++static int iw_get_tx_power(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ndis_tx_power_level ndis_power; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_query(wnd, OID_802_11_TX_POWER_LEVEL, ++ &ndis_power, sizeof(ndis_power)); ++ if (res) ++ return -EOPNOTSUPP; ++ wrqu->txpower.flags = IW_TXPOW_MWATT; ++ wrqu->txpower.disabled = 0; ++ wrqu->txpower.fixed = 0; ++ wrqu->txpower.value = ndis_power; ++ return 0; ++} ++ ++static int iw_set_tx_power(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ndis_tx_power_level ndis_power; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ if (wrqu->txpower.disabled) ++ ndis_power = 0; ++ else { ++ if (wrqu->txpower.flags == IW_TXPOW_MWATT) ++ ndis_power = wrqu->txpower.value; ++ else { // wrqu->txpower.flags == IW_TXPOW_DBM ++ if (wrqu->txpower.value > 20) ++ ndis_power = 128; ++ else if (wrqu->txpower.value < -43) ++ ndis_power = 127; ++ else { ++ signed char tmp; ++ tmp = wrqu->txpower.value; ++ tmp = -12 - tmp; ++ tmp <<= 2; ++ ndis_power = (unsigned char)tmp; ++ } ++ } ++ } ++ TRACE2("%d", ndis_power); ++ res = mp_set(wnd, OID_802_11_TX_POWER_LEVEL, ++ &ndis_power, sizeof(ndis_power)); ++ if (res) ++ EXIT2(return -EOPNOTSUPP); ++ if (ndis_power == 0) ++ res = disassociate(wnd, 0); ++ EXIT2(return 0); ++} ++ ++static int iw_get_bitrate(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ULONG ndis_rate; ++ int res; ++ ++ ENTER2(""); ++ res = mp_query(wnd, OID_GEN_LINK_SPEED, &ndis_rate, sizeof(ndis_rate)); ++ if (res) { ++ WARNING("getting bitrate failed (%08X)", res); ++ ndis_rate = 0; ++ } ++ ++ wrqu->bitrate.value = ndis_rate * 100; ++ return 0; ++} ++ ++static int iw_set_bitrate(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ int i, n; ++ NDIS_STATUS res; ++ UCHAR rates[NDIS_MAX_RATES_EX]; ++ ++ ENTER2(""); ++ if (wrqu->bitrate.fixed == 0) ++ EXIT2(return 0); ++ ++ res = mp_query_info(wnd, OID_802_11_SUPPORTED_RATES, &rates, ++ sizeof(rates), &n, NULL); ++ if (res) { ++ WARNING("getting bit rate failed (%08X)", res); ++ EXIT2(return 0); ++ } ++ for (i = 0; i < n; i++) { ++ if (rates[i] & 0x80) ++ continue; ++ if ((rates[i] & 0x7f) * 500000 > wrqu->bitrate.value) { ++ TRACE2("setting rate %d to 0", ++ (rates[i] & 0x7f) * 500000); ++ rates[i] = 0; ++ } ++ } ++ ++ res = mp_set(wnd, OID_802_11_DESIRED_RATES, &rates, n); ++ if (res) { ++ WARNING("setting bit rate failed (%08X)", res); ++ EXIT2(return 0); ++ } ++ ++ return 0; ++} ++ ++static int iw_set_dummy(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ /* Do nothing. Used for ioctls that are not implemented. */ ++ return 0; ++} ++ ++static int iw_get_rts_threshold(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ndis_rts_threshold threshold; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_query(wnd, OID_802_11_RTS_THRESHOLD, ++ &threshold, sizeof(threshold)); ++ if (res) ++ return -EOPNOTSUPP; ++ ++ wrqu->rts.value = threshold; ++ return 0; ++} ++ ++static int iw_set_rts_threshold(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ndis_rts_threshold threshold; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ threshold = wrqu->rts.value; ++ res = mp_set(wnd, OID_802_11_RTS_THRESHOLD, ++ &threshold, sizeof(threshold)); ++ if (res == NDIS_STATUS_INVALID_DATA) ++ return -EINVAL; ++ if (res) ++ return -EOPNOTSUPP; ++ ++ return 0; ++} ++ ++static int iw_get_frag_threshold(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ndis_fragmentation_threshold frag_threshold; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_query(wnd, OID_802_11_FRAGMENTATION_THRESHOLD, ++ &frag_threshold, sizeof(frag_threshold)); ++ if (res) ++ return -ENOTSUPP; ++ ++ wrqu->frag.value = frag_threshold; ++ return 0; ++} ++ ++static int iw_set_frag_threshold(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ndis_rts_threshold threshold; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ threshold = wrqu->frag.value; ++ res = mp_set(wnd, OID_802_11_FRAGMENTATION_THRESHOLD, ++ &threshold, sizeof(threshold)); ++ if (res == NDIS_STATUS_INVALID_DATA) ++ return -EINVAL; ++ if (res) ++ return -EOPNOTSUPP; ++ return 0; ++} ++ ++int get_ap_address(struct ndis_device *wnd, mac_address ap_addr) ++{ ++ NDIS_STATUS res; ++ ++ res = mp_query(wnd, OID_802_11_BSSID, ap_addr, ETH_ALEN); ++ TRACE2(MACSTRSEP, MAC2STR(ap_addr)); ++ if (res) { ++ TRACE2("res: %08X", res); ++ memset(ap_addr, 0x0, ETH_ALEN); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ EXIT2(return 0); ++} ++ ++static int iw_get_ap_address(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ mac_address ap_addr; ++ ++ ENTER2(""); ++ get_ap_address(wnd, ap_addr); ++ memcpy(wrqu->ap_addr.sa_data, ap_addr, ETH_ALEN); ++ wrqu->ap_addr.sa_family = ARPHRD_ETHER; ++ EXIT2(return 0); ++} ++ ++static int iw_set_ap_address(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ mac_address ap_addr; ++ ++ ENTER2(""); ++ memcpy(ap_addr, wrqu->ap_addr.sa_data, ETH_ALEN); ++ TRACE2(MACSTRSEP, MAC2STR(ap_addr)); ++ res = mp_set(wnd, OID_802_11_BSSID, ap_addr, ETH_ALEN); ++ /* user apps may set ap's mac address, which is not required; ++ * they may fail to work if this function fails, so return ++ * success */ ++ if (res) ++ WARNING("setting AP mac address failed (%08X)", res); ++ ++ EXIT2(return 0); ++} ++ ++int set_ndis_auth_mode(struct ndis_device *wnd, ULONG auth_mode) ++{ ++ NDIS_STATUS res; ++ ++ ENTER2("%d", auth_mode); ++ res = mp_set_int(wnd, OID_802_11_AUTHENTICATION_MODE, auth_mode); ++ if (res) { ++ WARNING("setting auth mode to %u failed (%08X)", ++ auth_mode, res); ++ if (res == NDIS_STATUS_INVALID_DATA) ++ EXIT2(return -EINVAL); ++ return -EOPNOTSUPP; ++ } ++ switch (auth_mode) { ++ case Ndis802_11AuthModeWPA: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_WPA; ++ wnd->iw_auth_key_mgmt = IW_AUTH_KEY_MGMT_802_1X; ++ break; ++ case Ndis802_11AuthModeWPAPSK: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_WPA; ++ wnd->iw_auth_key_mgmt = IW_AUTH_KEY_MGMT_PSK; ++ case Ndis802_11AuthModeWPANone: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_DISABLED; ++ wnd->iw_auth_key_mgmt = IW_AUTH_KEY_MGMT_PSK; ++ break; ++ case Ndis802_11AuthModeWPA2: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_WPA2; ++ wnd->iw_auth_key_mgmt = IW_AUTH_KEY_MGMT_802_1X; ++ break; ++ case Ndis802_11AuthModeWPA2PSK: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_WPA2; ++ wnd->iw_auth_key_mgmt = IW_AUTH_KEY_MGMT_PSK; ++ break; ++ case Ndis802_11AuthModeOpen: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_DISABLED; ++ wnd->iw_auth_80211_alg = IW_AUTH_ALG_OPEN_SYSTEM; ++ break; ++ case Ndis802_11AuthModeShared: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_DISABLED; ++ wnd->iw_auth_80211_alg = IW_AUTH_ALG_SHARED_KEY; ++ break; ++ case Ndis802_11AuthModeAutoSwitch: ++ wnd->iw_auth_wpa_version = IW_AUTH_WPA_VERSION_DISABLED; ++ wnd->iw_auth_80211_alg = IW_AUTH_ALG_SHARED_KEY; ++ wnd->iw_auth_80211_alg |= IW_AUTH_ALG_OPEN_SYSTEM; ++ break; ++ default: ++ WARNING("invalid authentication algorithm: %d", auth_mode); ++ break; ++ } ++ EXIT2(return 0); ++} ++ ++int get_ndis_auth_mode(struct ndis_device *wnd) ++{ ++ ULONG mode; ++ NDIS_STATUS res; ++ ++ res = mp_query_int(wnd, OID_802_11_AUTHENTICATION_MODE, &mode); ++ if (res) { ++ WARNING("getting authentication mode failed (%08X)", res); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ TRACE2("%d", mode); ++ return mode; ++} ++ ++int set_iw_encr_mode(struct ndis_device *wnd, int cipher_pairwise, ++ int cipher_groupwise) ++{ ++ NDIS_STATUS res; ++ ULONG ndis_mode; ++ ++ ENTER2("%d, %d", cipher_pairwise, cipher_groupwise); ++ if (cipher_pairwise & IW_AUTH_CIPHER_CCMP) ++ ndis_mode = Ndis802_11Encryption3Enabled; ++ else if (cipher_pairwise & IW_AUTH_CIPHER_TKIP) ++ ndis_mode = Ndis802_11Encryption2Enabled; ++ else if (cipher_pairwise & ++ (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104)) ++ ndis_mode = Ndis802_11Encryption1Enabled; ++ else if (cipher_groupwise & IW_AUTH_CIPHER_CCMP) ++ ndis_mode = Ndis802_11Encryption3Enabled; ++ else if (cipher_groupwise & IW_AUTH_CIPHER_TKIP) ++ ndis_mode = Ndis802_11Encryption2Enabled; ++ else ++ ndis_mode = Ndis802_11EncryptionDisabled; ++ ++ res = mp_set_int(wnd, OID_802_11_ENCRYPTION_STATUS, ndis_mode); ++ if (res) { ++ WARNING("setting encryption mode to %u failed (%08X)", ++ ndis_mode, res); ++ if (res == NDIS_STATUS_INVALID_DATA) ++ EXIT2(return -EINVAL); ++ return -EOPNOTSUPP; ++ } ++ wnd->iw_auth_cipher_pairwise = cipher_pairwise; ++ wnd->iw_auth_cipher_group = cipher_groupwise; ++ EXIT2(return 0); ++} ++ ++int get_ndis_encr_mode(struct ndis_device *wnd) ++{ ++ ULONG mode; ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &mode); ++ if (res) { ++ WARNING("getting encryption status failed (%08X)", res); ++ EXIT2(return -EOPNOTSUPP); ++ } else ++ EXIT2(return mode); ++} ++ ++static int iw_get_encr(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ int index, mode; ++ struct encr_info *encr_info = &wnd->encr_info; ++ ++ ENTER2("wnd = %p", wnd); ++ wrqu->data.length = 0; ++ extra[0] = 0; ++ ++ index = (wrqu->encoding.flags & IW_ENCODE_INDEX); ++ TRACE2("index = %u", index); ++ if (index > 0) ++ index--; ++ else ++ index = encr_info->tx_key_index; ++ ++ if (index < 0 || index >= MAX_ENCR_KEYS) { ++ WARNING("encryption index out of range (%u)", index); ++ EXIT2(return -EINVAL); ++ } ++ ++ if (index != encr_info->tx_key_index) { ++ if (encr_info->keys[index].length > 0) { ++ wrqu->data.flags |= IW_ENCODE_ENABLED; ++ wrqu->data.length = encr_info->keys[index].length; ++ memcpy(extra, encr_info->keys[index].key, ++ encr_info->keys[index].length); ++ } ++ else ++ wrqu->data.flags |= IW_ENCODE_DISABLED; ++ ++ EXIT2(return 0); ++ } ++ ++ /* transmit key */ ++ mode = get_ndis_encr_mode(wnd); ++ if (mode < 0) ++ EXIT2(return -EOPNOTSUPP); ++ ++ if (mode == Ndis802_11EncryptionDisabled || ++ mode == Ndis802_11EncryptionNotSupported) ++ wrqu->data.flags |= IW_ENCODE_DISABLED; ++ else { ++ if (mode == Ndis802_11Encryption1KeyAbsent || ++ mode == Ndis802_11Encryption2KeyAbsent || ++ mode == Ndis802_11Encryption3KeyAbsent) ++ wrqu->data.flags |= IW_ENCODE_NOKEY; ++ else { ++ wrqu->data.flags |= IW_ENCODE_ENABLED; ++ wrqu->encoding.flags |= index+1; ++ wrqu->data.length = encr_info->keys[index].length; ++ memcpy(extra, encr_info->keys[index].key, ++ encr_info->keys[index].length); ++ } ++ } ++ mode = get_ndis_auth_mode(wnd); ++ if (mode < 0) ++ EXIT2(return -EOPNOTSUPP); ++ ++ if (mode == Ndis802_11AuthModeOpen) ++ wrqu->data.flags |= IW_ENCODE_OPEN; ++ else if (mode == Ndis802_11AuthModeAutoSwitch) ++ wrqu->data.flags |= IW_ENCODE_RESTRICTED; ++ else // Ndis802_11AuthModeAutoSwitch, Ndis802_11AuthModeWPA etc. ++ wrqu->data.flags |= IW_ENCODE_RESTRICTED; ++ ++ EXIT2(return 0); ++} ++ ++/* remove_key is for both wep and wpa */ ++static int remove_key(struct ndis_device *wnd, int index, ++ mac_address bssid) ++{ ++ NDIS_STATUS res; ++ if (wnd->encr_info.keys[index].length == 0) ++ EXIT2(return 0); ++ wnd->encr_info.keys[index].length = 0; ++ memset(&wnd->encr_info.keys[index].key, 0, ++ sizeof(wnd->encr_info.keys[index].length)); ++ if (wnd->iw_auth_cipher_pairwise == IW_AUTH_CIPHER_TKIP || ++ wnd->iw_auth_cipher_pairwise == IW_AUTH_CIPHER_CCMP || ++ wnd->iw_auth_cipher_group == IW_AUTH_CIPHER_TKIP || ++ wnd->iw_auth_cipher_group == IW_AUTH_CIPHER_CCMP) { ++ struct ndis_remove_key rmkey; ++ rmkey.struct_size = sizeof(rmkey); ++ rmkey.index = index; ++ if (bssid) { ++ /* pairwise key */ ++ if (memcmp(bssid, "\xff\xff\xff\xff\xff\xff", ++ ETH_ALEN) != 0) ++ rmkey.index |= (1 << 30); ++ memcpy(rmkey.bssid, bssid, sizeof(rmkey.bssid)); ++ } else ++ memset(rmkey.bssid, 0xff, sizeof(rmkey.bssid)); ++ if (mp_set(wnd, OID_802_11_REMOVE_KEY, &rmkey, sizeof(rmkey))) ++ EXIT2(return -EINVAL); ++ } else { ++ ndis_key_index keyindex = index; ++ res = mp_set_int(wnd, OID_802_11_REMOVE_WEP, keyindex); ++ if (res) { ++ WARNING("removing encryption key %d failed (%08X)", ++ keyindex, res); ++ EXIT2(return -EINVAL); ++ } ++ } ++ /* if it is transmit key, disable encryption */ ++ if (index == wnd->encr_info.tx_key_index) { ++ res = set_iw_encr_mode(wnd, IW_AUTH_CIPHER_NONE, ++ IW_AUTH_CIPHER_NONE); ++ if (res) ++ WARNING("changing encr status failed (%08X)", res); ++ } ++ TRACE2("key %d removed", index); ++ EXIT2(return 0); ++} ++ ++static int iw_set_wep(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ unsigned int index, key_len; ++ struct encr_info *encr_info = &wnd->encr_info; ++ unsigned char *key; ++ ++ ENTER2(""); ++ index = (wrqu->encoding.flags & IW_ENCODE_INDEX); ++ TRACE2("index = %u", index); ++ ++ /* iwconfig gives index as 1 - N */ ++ if (index > 0) ++ index--; ++ else ++ index = encr_info->tx_key_index; ++ ++ if (index >= MAX_ENCR_KEYS) { ++ WARNING("encryption index out of range (%u)", index); ++ EXIT2(return -EINVAL); ++ } ++ ++ /* remove key if disabled */ ++ if (wrqu->data.flags & IW_ENCODE_DISABLED) { ++ if (remove_key(wnd, index, NULL)) ++ EXIT2(return -EINVAL); ++ else ++ EXIT2(return 0); ++ } ++ ++ /* global encryption state (for all keys) */ ++ if (wrqu->data.flags & IW_ENCODE_OPEN) ++ res = set_ndis_auth_mode(wnd, Ndis802_11AuthModeOpen); ++ else // if (wrqu->data.flags & IW_ENCODE_RESTRICTED) ++ res = set_ndis_auth_mode(wnd, Ndis802_11AuthModeShared); ++ if (res) { ++ WARNING("setting authentication mode failed (%08X)", res); ++ EXIT2(return -EINVAL); ++ } ++ ++ TRACE2("key length: %d", wrqu->data.length); ++ ++ if (wrqu->data.length > 0) { ++ key_len = wrqu->data.length; ++ key = extra; ++ } else { // must be set as tx key ++ if (encr_info->keys[index].length == 0) { ++ WARNING("key %d is not set", index+1); ++ EXIT2(return -EINVAL); ++ } ++ key_len = encr_info->keys[index].length; ++ key = encr_info->keys[index].key; ++ encr_info->tx_key_index = index; ++ } ++ ++ if (add_wep_key(wnd, key, key_len, index)) ++ EXIT2(return -EINVAL); ++ ++ if (index == encr_info->tx_key_index) { ++ /* if transmit key is at index other than 0, some ++ * drivers, at least Atheros and TI, want another ++ * (global) non-transmit key to be set; don't know why */ ++ if (index != 0) { ++ int i; ++ for (i = 0; i < MAX_ENCR_KEYS; i++) ++ if (i != index && ++ encr_info->keys[i].length != 0) ++ break; ++ if (i == MAX_ENCR_KEYS) { ++ if (index == 0) ++ i = index + 1; ++ else ++ i = index - 1; ++ if (add_wep_key(wnd, key, key_len, i)) ++ WARNING("couldn't add broadcast key" ++ " at %d", i); ++ } ++ } ++ /* ndis drivers want essid to be set after setting encr */ ++ set_essid(wnd, wnd->essid.essid, wnd->essid.length); ++ } ++ EXIT2(return 0); ++} ++ ++static int iw_set_nick(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ if (wrqu->data.length >= sizeof(wnd->nick)) ++ return -EINVAL; ++ memcpy(wnd->nick, extra, wrqu->data.length); ++ wnd->nick[wrqu->data.length] = 0; ++ return 0; ++} ++ ++static int iw_get_nick(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ wrqu->data.length = strlen(wnd->nick); ++ memcpy(extra, wnd->nick, wrqu->data.length); ++ return 0; ++} ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT) ++#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e) ++#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e) ++#define iwe_stream_add_value(a, b, c, d, e, f) \ ++ iwe_stream_add_value(b, c, d, e, f) ++#define iwe_stream_lcp_len(a) IW_EV_LCP_LEN ++#endif ++ ++static char *ndis_translate_scan(struct net_device *dev, ++ struct iw_request_info *info, char *event, ++ char *end_buf, void *item) ++{ ++ struct iw_event iwe; ++ char *current_val; ++ char *ret; ++ int i, nrates; ++ unsigned char custom_str[64]; ++ struct ndis_wlan_bssid *bssid; ++ struct ndis_wlan_bssid_ex *bssid_ex; ++ int extended; ++ ++ ENTER2("%p, %p", event, item); ++ bssid = item; ++ bssid_ex = item; ++ extended = (bssid->length > offsetof(struct ndis_wlan_bssid_ex, var)); ++ ++ /* add mac address */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = SIOCGIWAP; ++ iwe.u.ap_addr.sa_family = ARPHRD_ETHER; ++ iwe.len = IW_EV_ADDR_LEN; ++ memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN); ++ ret = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_ADDR_LEN); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add essid */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = SIOCGIWESSID; ++ iwe.u.data.length = bssid->ssid.length; ++ if (iwe.u.data.length > IW_ESSID_MAX_SIZE) ++ iwe.u.data.length = IW_ESSID_MAX_SIZE; ++ iwe.u.data.flags = 1; ++ iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; ++ ret = iwe_stream_add_point(info, event, end_buf, &iwe, ++ bssid->ssid.essid); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add protocol name */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = SIOCGIWNAME; ++ strncpy(iwe.u.name, network_type_to_name(bssid->net_type), IFNAMSIZ); ++ ret = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_CHAR_LEN); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add mode */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = SIOCGIWMODE; ++ if (bssid->mode == Ndis802_11IBSS) ++ iwe.u.mode = IW_MODE_ADHOC; ++ else if (bssid->mode == Ndis802_11Infrastructure) ++ iwe.u.mode = IW_MODE_MASTER; ++ else // if (bssid->mode == Ndis802_11AutoUnknown) ++ iwe.u.mode = IW_MODE_AUTO; ++ ret = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_UINT_LEN); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add freq */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = SIOCGIWFREQ; ++ iwe.u.freq.m = bssid->config.ds_config; ++ if (bssid->config.ds_config > 1000000) { ++ iwe.u.freq.m = bssid->config.ds_config / 10; ++ iwe.u.freq.e = 1; ++ } ++ else ++ iwe.u.freq.m = bssid->config.ds_config; ++ /* convert from kHz to Hz */ ++ iwe.u.freq.e += 3; ++ iwe.len = IW_EV_FREQ_LEN; ++ ret = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_FREQ_LEN); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add qual */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = IWEVQUAL; ++ i = 100 * (bssid->rssi - WL_NOISE) / (WL_SIGMAX - WL_NOISE); ++ if (i < 0) ++ i = 0; ++ else if (i > 100) ++ i = 100; ++ iwe.u.qual.level = bssid->rssi; ++ iwe.u.qual.noise = WL_NOISE; ++ iwe.u.qual.qual = i; ++ iwe.len = IW_EV_QUAL_LEN; ++ ret = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_QUAL_LEN); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add key info */ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = SIOCGIWENCODE; ++ if (bssid->privacy == Ndis802_11PrivFilterAcceptAll) ++ iwe.u.data.flags = IW_ENCODE_DISABLED; ++ else ++ iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; ++ iwe.u.data.length = 0; ++ iwe.len = IW_EV_POINT_LEN; ++ ret = iwe_stream_add_point(info, event, end_buf, &iwe, ++ bssid->ssid.essid); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ /* add rate */ ++ memset(&iwe, 0, sizeof(iwe)); ++ current_val = event + iwe_stream_lcp_len(info); ++ iwe.cmd = SIOCGIWRATE; ++ if (extended) ++ nrates = ARRAY_SIZE(bssid->rates); ++ else ++ nrates = ARRAY_SIZE(bssid_ex->rates_ex); ++ for (i = 0; i < nrates; i++) { ++ if (bssid_ex->rates_ex[i] & 0x7f) { ++ iwe.u.bitrate.value = ((bssid->rates[i] & 0x7f) * ++ 500000); ++ ret = iwe_stream_add_value(info, event, current_val, ++ end_buf, &iwe, ++ IW_EV_PARAM_LEN); ++ if (ret == current_val) ++ return NULL; ++ current_val = ret; ++ } ++ } ++ ++ if ((current_val - event) > iwe_stream_lcp_len(info)) ++ event = current_val; ++ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = IWEVCUSTOM; ++ sprintf(custom_str, "bcn_int=%d", bssid->config.beacon_period); ++ iwe.u.data.length = strlen(custom_str); ++ ret = iwe_stream_add_point(info, event, end_buf, &iwe, custom_str); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = IWEVCUSTOM; ++ sprintf(custom_str, "atim=%u", bssid->config.atim_window); ++ iwe.u.data.length = strlen(custom_str); ++ ret = iwe_stream_add_point(info, event, end_buf, &iwe, custom_str); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ ++ TRACE2("%d, %zu", bssid->length, sizeof(*bssid)); ++ if (extended) { ++ struct ndis_variable_ies *iep = bssid_ex->var; ++ unsigned char *end = (unsigned char *)&bssid_ex->fixed + ++ bssid_ex->ie_length; ++ ++ while (&iep->length < end && &iep->data[iep->length] <= end) { ++ unsigned char ielen = iep->length + 2; ++ ++ memset(&iwe, 0, sizeof(iwe)); ++ iwe.cmd = IWEVGENIE; ++ iwe.u.data.length = ielen; ++ ret = iwe_stream_add_point(info, event, end_buf, &iwe, ++ (char *)iep); ++ if (ret == event) ++ return NULL; ++ event = ret; ++ iep = (typeof(iep))&iep->data[iep->length]; ++ } ++ } ++ TRACE2("event = %p, current_val = %p", event, current_val); ++ EXIT2(return event); ++} ++ ++static int set_scan(struct ndis_device *wnd) ++{ ++ NDIS_STATUS res; ++ ++ ENTER2(""); ++ res = mp_set(wnd, OID_802_11_BSSID_LIST_SCAN, NULL, 0); ++ if (res) { ++ WARNING("scanning failed (%08X)", res); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ wnd->scan_timestamp = jiffies; ++ EXIT2(return 0); ++} ++ ++static int iw_set_scan(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ return set_scan(wnd); ++} ++ ++static int iw_get_scan(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ unsigned int i, buf_len, needed, data_len; ++ NDIS_STATUS res; ++ struct ndis_bssid_list *bssid_list = NULL; ++ char *event = extra; ++ struct ndis_wlan_bssid *cur_item; ++ ++ ENTER2(""); ++ if (time_before(jiffies, wnd->scan_timestamp + 3 * HZ)) ++ return -EAGAIN; ++ /* try with space for a few scan items */ ++ buf_len = sizeof(ULONG) + offsetof(struct ndis_wlan_bssid_ex, var) * 8; ++ ++ /* Try many times, as the needed space may grow between queries */ ++ for (i = 0; i < 10; i++) { ++ bssid_list = kzalloc(buf_len, GFP_KERNEL); ++ if (!bssid_list) { ++ ERROR("couldn't allocate %u bytes for scan results", ++ buf_len); ++ return -ENOMEM; ++ } ++ ++ needed = 0; ++ data_len = 0; ++ res = mp_query_info(wnd, OID_802_11_BSSID_LIST, bssid_list, ++ buf_len, &data_len, &needed); ++ TRACE2("try %d: given %d bytes, needed %d, written %d", ++ i, buf_len, needed, data_len); ++ if (needed <= buf_len) ++ break; ++ kfree(bssid_list); ++ buf_len = needed; ++ } ++ if (res) { ++ WARNING("getting BSSID list failed (%08X)", res); ++ kfree(bssid_list); ++ EXIT2(return -EOPNOTSUPP); ++ } ++ ++ /* some drivers don't set bssid_list->num_items to 0 if ++ OID_802_11_BSSID_LIST returns no items (prism54 driver, e.g.,) */ ++ TRACE2("items: %d", bssid_list->num_items); ++ cur_item = &bssid_list->bssid[0]; ++ for (i = 0; i < bssid_list->num_items; i++) { ++ TRACE2("item %d: len %d, remaining data %d", ++ i, cur_item->length, data_len); ++ /* drop truncated items */ ++ if (cur_item->length > data_len) ++ break; ++ event = ndis_translate_scan(dev, info, event, ++ extra + wrqu->data.length, ++ cur_item); ++ if (!event) { ++ kfree(bssid_list); ++ return -E2BIG; ++ } ++ data_len -= cur_item->length; ++ cur_item = (struct ndis_wlan_bssid *)((char *)cur_item + ++ cur_item->length); ++ } ++ wrqu->data.length = event - extra; ++ wrqu->data.flags = 0; ++ kfree(bssid_list); ++ EXIT2(return 0); ++} ++ ++static int iw_set_power_mode(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ enum ndis_power power_mode; ++ ++ if (wrqu->power.disabled == 1) ++ power_mode = NDIS_POWER_OFF; ++ else if (wrqu->power.flags & IW_POWER_MIN) ++ power_mode = NDIS_POWER_MIN; ++ else // if (wrqu->power.flags & IW_POWER_MAX) ++ power_mode = NDIS_POWER_MAX; ++ ++ TRACE2("%d", power_mode); ++ res = mp_set(wnd, OID_802_11_POWER_MODE, ++ &power_mode, sizeof(power_mode)); ++ if (res) ++ WARNING("setting power mode failed (%08X)", res); ++ return 0; ++} ++ ++static int iw_get_power_mode(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ enum ndis_power power_mode; ++ ++ ENTER2(""); ++ res = mp_query(wnd, OID_802_11_POWER_MODE, ++ &power_mode, sizeof(power_mode)); ++ if (res) ++ return -ENOTSUPP; ++ ++ if (power_mode == NDIS_POWER_OFF) ++ wrqu->power.disabled = 1; ++ else { ++ if (wrqu->power.flags != 0) ++ return 0; ++ wrqu->power.flags |= IW_POWER_ALL_R; ++ wrqu->power.flags |= IW_POWER_TIMEOUT; ++ wrqu->power.value = 0; ++ wrqu->power.disabled = 0; ++ ++ if (power_mode == NDIS_POWER_MIN) ++ wrqu->power.flags |= IW_POWER_MIN; ++ else // if (power_mode == NDIS_POWER_MAX) ++ wrqu->power.flags |= IW_POWER_MAX; ++ } ++ return 0; ++} ++ ++static int iw_get_sensitivity(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ ndis_rssi rssi_trigger; ++ ++ ENTER2(""); ++ res = mp_query(wnd, OID_802_11_RSSI_TRIGGER, ++ &rssi_trigger, sizeof(rssi_trigger)); ++ if (res) ++ return -EOPNOTSUPP; ++ wrqu->param.value = rssi_trigger; ++ wrqu->param.disabled = (rssi_trigger == 0); ++ wrqu->param.fixed = 1; ++ return 0; ++} ++ ++static int iw_set_sensitivity(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ ndis_rssi rssi_trigger; ++ ++ ENTER2(""); ++ if (wrqu->param.disabled) ++ rssi_trigger = 0; ++ else ++ rssi_trigger = wrqu->param.value; ++ res = mp_set(wnd, OID_802_11_RSSI_TRIGGER, ++ &rssi_trigger, sizeof(rssi_trigger)); ++ if (res == NDIS_STATUS_INVALID_DATA) ++ return -EINVAL; ++ if (res) ++ return -EOPNOTSUPP; ++ return 0; ++} ++ ++static int iw_get_ndis_stats(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ struct iw_statistics *stats = &wnd->iw_stats; ++ memcpy(&wrqu->qual, &stats->qual, sizeof(stats->qual)); ++ return 0; ++} ++ ++static int iw_get_range(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct iw_range *range = (struct iw_range *)extra; ++ struct iw_point *data = &wrqu->data; ++ struct ndis_device *wnd = netdev_priv(dev); ++ unsigned int i, n; ++ NDIS_STATUS res; ++ UCHAR rates[NDIS_MAX_RATES_EX]; ++ ndis_tx_power_level tx_power; ++ ++ ENTER2(""); ++ data->length = sizeof(struct iw_range); ++ memset(range, 0, sizeof(struct iw_range)); ++ ++ range->txpower_capa = IW_TXPOW_MWATT; ++ range->num_txpower = 0; ++ ++ res = mp_query(wnd, OID_802_11_TX_POWER_LEVEL, ++ &tx_power, sizeof(tx_power)); ++ if (!res) { ++ range->num_txpower = 1; ++ range->txpower[0] = tx_power; ++ } ++ ++ range->we_version_compiled = WIRELESS_EXT; ++ range->we_version_source = 19; ++ ++ range->retry_capa = IW_RETRY_LIMIT; ++ range->retry_flags = IW_RETRY_LIMIT; ++ range->min_retry = 0; ++ range->max_retry = 255; ++ ++ range->num_channels = 1; ++ ++ range->max_qual.qual = 100; ++ range->max_qual.level = 154; ++ range->max_qual.noise = 154; ++ range->sensitivity = 3; ++ ++ range->max_encoding_tokens = 4; ++ range->num_encoding_sizes = 2; ++ range->encoding_size[0] = 5; ++ range->encoding_size[1] = 13; ++ ++ range->num_bitrates = 0; ++ memset(&rates, 0, sizeof(rates)); ++ res = mp_query_info(wnd, OID_802_11_SUPPORTED_RATES, ++ &rates, sizeof(rates), &n, NULL); ++ if (res) ++ WARNING("getting bit rates failed: %08X", res); ++ else { ++ for (i = 0; i < n && range->num_bitrates < IW_MAX_BITRATES; i++) ++ if (rates[i] & 0x80) ++ continue; ++ else if (rates[i] & 0x7f) { ++ range->bitrate[range->num_bitrates] = ++ (rates[i] & 0x7f) * 500000; ++ range->num_bitrates++; ++ } ++ } ++ ++ range->num_channels = ARRAY_SIZE(freq_chan); ++ ++ for (i = 0; i < ARRAY_SIZE(freq_chan) && i < IW_MAX_FREQUENCIES; i++) { ++ range->freq[i].i = i + 1; ++ range->freq[i].m = freq_chan[i] * 100000; ++ range->freq[i].e = 1; ++ } ++ range->num_frequency = i; ++ ++ range->min_rts = 0; ++ range->max_rts = 2347; ++ range->min_frag = 256; ++ range->max_frag = 2346; ++ ++ /* Event capability (kernel + driver) */ ++ range->event_capa[0] = (IW_EVENT_CAPA_K_0 | ++ IW_EVENT_CAPA_MASK(SIOCGIWTHRSPY) | ++ IW_EVENT_CAPA_MASK(SIOCGIWAP) | ++ IW_EVENT_CAPA_MASK(SIOCGIWSCAN)); ++ range->event_capa[1] = IW_EVENT_CAPA_K_1; ++ range->event_capa[4] = (IW_EVENT_CAPA_MASK(IWEVTXDROP) | ++ IW_EVENT_CAPA_MASK(IWEVCUSTOM) | ++ IW_EVENT_CAPA_MASK(IWEVREGISTERED) | ++ IW_EVENT_CAPA_MASK(IWEVEXPIRED)); ++ ++ range->enc_capa = 0; ++ ++ if (test_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr)) ++ range->enc_capa |= IW_ENC_CAPA_CIPHER_TKIP; ++ if (test_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr)) ++ range->enc_capa |= IW_ENC_CAPA_CIPHER_CCMP; ++ ++ if (test_bit(Ndis802_11AuthModeWPA, &wnd->capa.auth) || ++ test_bit(Ndis802_11AuthModeWPAPSK, &wnd->capa.auth)) ++ range->enc_capa |= IW_ENC_CAPA_WPA; ++ if (test_bit(Ndis802_11AuthModeWPA2, &wnd->capa.auth) || ++ test_bit(Ndis802_11AuthModeWPA2PSK, &wnd->capa.auth)) ++ range->enc_capa |= IW_ENC_CAPA_WPA2; ++ ++ return 0; ++} ++ ++void set_default_iw_params(struct ndis_device *wnd) ++{ ++ wnd->iw_auth_key_mgmt = 0; ++ wnd->iw_auth_wpa_version = 0; ++ set_infra_mode(wnd, Ndis802_11Infrastructure); ++ set_ndis_auth_mode(wnd, Ndis802_11AuthModeOpen); ++ set_priv_filter(wnd); ++ set_iw_encr_mode(wnd, IW_AUTH_CIPHER_NONE, IW_AUTH_CIPHER_NONE); ++} ++ ++static int deauthenticate(struct ndis_device *wnd) ++{ ++ int ret; ++ ++ ENTER2(""); ++ ret = disassociate(wnd, 1); ++ set_default_iw_params(wnd); ++ EXIT2(return ret); ++} ++ ++NDIS_STATUS disassociate(struct ndis_device *wnd, int reset_ssid) ++{ ++ NDIS_STATUS res; ++ u8 buf[NDIS_ESSID_MAX_SIZE]; ++ int i; ++ ++ TRACE2(""); ++ res = mp_set(wnd, OID_802_11_DISASSOCIATE, NULL, 0); ++ /* disassociate causes radio to be turned off; if reset_ssid ++ * is given, set ssid to random to enable radio */ ++ if (reset_ssid) { ++ get_random_bytes(buf, sizeof(buf)); ++ for (i = 0; i < sizeof(buf); i++) ++ buf[i] = 'a' + (buf[i] % 26); ++ set_essid(wnd, buf, sizeof(buf)); ++ } ++ return res; ++} ++ ++static int iw_set_mlme(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ struct iw_mlme *mlme = (struct iw_mlme *)extra; ++ ++ ENTER2(""); ++ switch (mlme->cmd) { ++ case IW_MLME_DEAUTH: ++ return deauthenticate(wnd); ++ case IW_MLME_DISASSOC: ++ TRACE2("cmd=%d reason_code=%d", mlme->cmd, mlme->reason_code); ++ return disassociate(wnd, 1); ++ default: ++ return -EOPNOTSUPP; ++ } ++ ++ return 0; ++} ++ ++static int iw_set_genie(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ /* ++ * NDIS drivers do not allow IEs to be configured; this is ++ * done by the driver based on other configuration. Return 0 ++ * to avoid causing issues with user space programs that ++ * expect this function to succeed. ++ */ ++ return 0; ++} ++ ++static int iw_set_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ TRACE2("index=%d value=%d", wrqu->param.flags & IW_AUTH_INDEX, ++ wrqu->param.value); ++ switch (wrqu->param.flags & IW_AUTH_INDEX) { ++ case IW_AUTH_WPA_VERSION: ++ wnd->iw_auth_wpa_version = wrqu->param.value; ++ break; ++ case IW_AUTH_CIPHER_PAIRWISE: ++ wnd->iw_auth_cipher_pairwise = wrqu->param.value; ++ break; ++ case IW_AUTH_CIPHER_GROUP: ++ wnd->iw_auth_cipher_group = wrqu->param.value; ++ break; ++ case IW_AUTH_KEY_MGMT: ++ wnd->iw_auth_key_mgmt = wrqu->param.value; ++ break; ++ case IW_AUTH_80211_AUTH_ALG: ++ wnd->iw_auth_80211_alg = wrqu->param.value; ++ break; ++ case IW_AUTH_WPA_ENABLED: ++ if (wrqu->param.value) ++ deauthenticate(wnd); ++ break; ++#ifdef IW_AUTH_MFP ++ case IW_AUTH_MFP: ++ if (wrqu->param.value == IW_AUTH_MFP_DISABLED || ++ wrqu->param.value == IW_AUTH_MFP_OPTIONAL) ++ break; ++ WARNING("MFP not implemented"); ++ return -EOPNOTSUPP; ++#endif ++ case IW_AUTH_TKIP_COUNTERMEASURES: ++ case IW_AUTH_DROP_UNENCRYPTED: ++ case IW_AUTH_RX_UNENCRYPTED_EAPOL: ++ case IW_AUTH_PRIVACY_INVOKED: ++ TRACE2("%d not implemented: %d", ++ wrqu->param.flags & IW_AUTH_INDEX, wrqu->param.value); ++ break; ++ default: ++ WARNING("invalid cmd %d", wrqu->param.flags & IW_AUTH_INDEX); ++ return -EOPNOTSUPP; ++ } ++ return 0; ++} ++ ++static int iw_get_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ ENTER2("index=%d", wrqu->param.flags & IW_AUTH_INDEX); ++ switch (wrqu->param.flags & IW_AUTH_INDEX) { ++ case IW_AUTH_WPA_VERSION: ++ wrqu->param.value = wnd->iw_auth_wpa_version; ++ break; ++ case IW_AUTH_CIPHER_PAIRWISE: ++ wrqu->param.value = wnd->iw_auth_cipher_pairwise; ++ break; ++ case IW_AUTH_CIPHER_GROUP: ++ wrqu->param.value = wnd->iw_auth_cipher_group; ++ break; ++ case IW_AUTH_KEY_MGMT: ++ wrqu->param.value = wnd->iw_auth_key_mgmt; ++ break; ++ case IW_AUTH_80211_AUTH_ALG: ++ wrqu->param.value = wnd->iw_auth_80211_alg; ++ break; ++ default: ++ WARNING("invalid cmd %d", wrqu->param.flags & IW_AUTH_INDEX); ++ return -EOPNOTSUPP; ++ } ++ return 0; ++} ++ ++static int iw_set_encodeext(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; ++ struct ndis_device *wnd = netdev_priv(dev); ++ struct ndis_add_key ndis_key; ++ int i, keyidx; ++ NDIS_STATUS res; ++ u8 *addr; ++ ++ keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX; ++ ENTER2("%d", keyidx); ++ if (keyidx) ++ keyidx--; ++ else ++ keyidx = wnd->encr_info.tx_key_index; ++ ++ if (keyidx < 0 || keyidx >= MAX_ENCR_KEYS) ++ return -EINVAL; ++ ++ if (ext->alg == WPA_ALG_WEP) { ++ if (!test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr)) ++ EXIT2(return -1); ++ if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) ++ wnd->encr_info.tx_key_index = keyidx; ++ if (add_wep_key(wnd, ext->key, ext->key_len, keyidx)) ++ EXIT2(return -1); ++ else ++ EXIT2(return 0); ++ } ++ if ((wrqu->encoding.flags & IW_ENCODE_DISABLED) || ++ ext->alg == IW_ENCODE_ALG_NONE || ext->key_len == 0) ++ EXIT2(return remove_key(wnd, keyidx, ndis_key.bssid)); ++ ++ if (ext->key_len > sizeof(ndis_key.key)) { ++ TRACE2("incorrect key length (%u)", ext->key_len); ++ EXIT2(return -1); ++ } ++ ++ memset(&ndis_key, 0, sizeof(ndis_key)); ++ ++ ndis_key.struct_size = ++ sizeof(ndis_key) - sizeof(ndis_key.key) + ext->key_len; ++ ndis_key.length = ext->key_len; ++ ndis_key.index = keyidx; ++ ++ if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) { ++ for (i = 0; i < 6; i++) ++ ndis_key.rsc |= (((u64)ext->rx_seq[i]) << (i * 8)); ++ TRACE2("0x%llx", ndis_key.rsc); ++ ndis_key.index |= 1 << 29; ++ } ++ ++ addr = ext->addr.sa_data; ++ if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { ++ /* group key */ ++ if (wnd->infrastructure_mode == Ndis802_11IBSS) ++ memset(ndis_key.bssid, 0xff, ETH_ALEN); ++ else ++ get_ap_address(wnd, ndis_key.bssid); ++ } else { ++ /* pairwise key */ ++ ndis_key.index |= (1 << 30); ++ memcpy(ndis_key.bssid, addr, ETH_ALEN); ++ } ++ TRACE2(MACSTRSEP, MAC2STR(ndis_key.bssid)); ++ ++ if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) ++ ndis_key.index |= (1 << 31); ++ ++ if (ext->alg == IW_ENCODE_ALG_TKIP && ext->key_len == 32) { ++ /* wpa_supplicant gives us the Michael MIC RX/TX keys in ++ * different order than NDIS spec, so swap the order here. */ ++ memcpy(ndis_key.key, ext->key, 16); ++ memcpy(ndis_key.key + 16, ext->key + 24, 8); ++ memcpy(ndis_key.key + 24, ext->key + 16, 8); ++ } else ++ memcpy(ndis_key.key, ext->key, ext->key_len); ++ ++ res = mp_set(wnd, OID_802_11_ADD_KEY, &ndis_key, ndis_key.struct_size); ++ if (res) { ++ TRACE2("adding key failed (%08X), %u", ++ res, ndis_key.struct_size); ++ EXIT2(return -1); ++ } ++ wnd->encr_info.keys[keyidx].length = ext->key_len; ++ memcpy(&wnd->encr_info.keys[keyidx].key, ndis_key.key, ext->key_len); ++ if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) ++ wnd->encr_info.tx_key_index = keyidx; ++ TRACE2("key %d added", keyidx); ++ ++ EXIT2(return 0); ++} ++ ++static int iw_get_encodeext(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ /* struct iw_encode_ext *ext = (struct iw_encode_ext *) extra; */ ++ /* TODO */ ++ ENTER2(""); ++ return 0; ++} ++ ++static int iw_set_pmksa(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct iw_pmksa *pmksa = (struct iw_pmksa *)extra; ++ struct ndis_pmkid pmkid; ++ NDIS_STATUS res; ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ /* TODO: must keep local list of PMKIDs since NDIS drivers ++ * expect that all PMKID entries are included whenever a new ++ * one is added. */ ++ ++ ENTER2("%d", pmksa->cmd); ++ if ((pmksa->cmd == IW_PMKSA_ADD || pmksa->cmd == IW_PMKSA_REMOVE) && ++ (!(wnd->iw_auth_wpa_version & IW_AUTH_WPA_VERSION_WPA2))) ++ EXIT2(return -EOPNOTSUPP); ++ ++ memset(&pmkid, 0, sizeof(pmkid)); ++ if (pmksa->cmd == IW_PMKSA_ADD) { ++ pmkid.bssid_info_count = 1; ++ memcpy(pmkid.bssid_info[0].bssid, pmksa->bssid.sa_data, ++ ETH_ALEN); ++ memcpy(pmkid.bssid_info[0].pmkid, pmksa->pmkid, IW_PMKID_LEN); ++ } ++ pmkid.length = sizeof(pmkid); ++ ++ res = mp_set(wnd, OID_802_11_PMKID, &pmkid, pmkid.length); ++ if (res == NDIS_STATUS_FAILURE) ++ EXIT2(return -EOPNOTSUPP); ++ TRACE2("OID_802_11_PMKID -> %d", res); ++ if (res) ++ return -EINVAL; ++ ++ return 0; ++} ++ ++#define WEXT(id) [id - SIOCIWFIRST] ++ ++static const iw_handler ndis_handler[] = { ++ WEXT(SIOCGIWNAME) = iw_get_network_type, ++ WEXT(SIOCSIWESSID) = iw_set_essid, ++ WEXT(SIOCGIWESSID) = iw_get_essid, ++ WEXT(SIOCSIWMODE) = iw_set_infra_mode, ++ WEXT(SIOCGIWMODE) = iw_get_infra_mode, ++ WEXT(SIOCGIWFREQ) = iw_get_freq, ++ WEXT(SIOCSIWFREQ) = iw_set_freq, ++ WEXT(SIOCGIWTXPOW) = iw_get_tx_power, ++ WEXT(SIOCSIWTXPOW) = iw_set_tx_power, ++ WEXT(SIOCGIWRATE) = iw_get_bitrate, ++ WEXT(SIOCSIWRATE) = iw_set_bitrate, ++ WEXT(SIOCGIWRTS) = iw_get_rts_threshold, ++ WEXT(SIOCSIWRTS) = iw_set_rts_threshold, ++ WEXT(SIOCGIWFRAG) = iw_get_frag_threshold, ++ WEXT(SIOCSIWFRAG) = iw_set_frag_threshold, ++ WEXT(SIOCGIWAP) = iw_get_ap_address, ++ WEXT(SIOCSIWAP) = iw_set_ap_address, ++ WEXT(SIOCSIWENCODE) = iw_set_wep, ++ WEXT(SIOCGIWENCODE) = iw_get_encr, ++ WEXT(SIOCSIWSCAN) = iw_set_scan, ++ WEXT(SIOCGIWSCAN) = iw_get_scan, ++ WEXT(SIOCGIWPOWER) = iw_get_power_mode, ++ WEXT(SIOCSIWPOWER) = iw_set_power_mode, ++ WEXT(SIOCGIWRANGE) = iw_get_range, ++ WEXT(SIOCGIWSTATS) = iw_get_ndis_stats, ++ WEXT(SIOCGIWSENS) = iw_get_sensitivity, ++ WEXT(SIOCSIWSENS) = iw_set_sensitivity, ++ WEXT(SIOCGIWNICKN) = iw_get_nick, ++ WEXT(SIOCSIWNICKN) = iw_set_nick, ++ WEXT(SIOCSIWCOMMIT) = iw_set_dummy, ++ WEXT(SIOCSIWMLME) = iw_set_mlme, ++ WEXT(SIOCSIWGENIE) = iw_set_genie, ++ WEXT(SIOCSIWAUTH) = iw_set_auth, ++ WEXT(SIOCGIWAUTH) = iw_get_auth, ++ WEXT(SIOCSIWENCODEEXT) = iw_set_encodeext, ++ WEXT(SIOCGIWENCODEEXT) = iw_get_encodeext, ++ WEXT(SIOCSIWPMKSA) = iw_set_pmksa, ++}; ++ ++/* private ioctl's */ ++ ++static int priv_reset(struct net_device *dev, struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ int res; ++ ENTER2(""); ++ res = mp_reset(netdev_priv(dev)); ++ if (res) { ++ WARNING("reset failed: %08X", res); ++ return -EOPNOTSUPP; ++ } ++ return 0; ++} ++ ++static int priv_deauthenticate(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ int res; ++ ENTER2(""); ++ res = deauthenticate(netdev_priv(dev)); ++ return res; ++} ++ ++static int priv_power_profile(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ struct miniport *mp; ++ ULONG profile_inf; ++ ++ ENTER2(""); ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ if (!mp->pnp_event_notify) ++ EXIT2(return -EOPNOTSUPP); ++ ++ /* 1 for AC and 0 for Battery */ ++ if (wrqu->param.value) ++ profile_inf = NdisPowerProfileAcOnLine; ++ else ++ profile_inf = NdisPowerProfileBattery; ++ ++ LIN2WIN4(mp->pnp_event_notify, wnd->nmb->mp_ctx, ++ NdisDevicePnPEventPowerProfileChanged, ++ &profile_inf, sizeof(profile_inf)); ++ EXIT2(return 0); ++} ++ ++static int priv_network_type(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ enum network_type network_type; ++ NDIS_STATUS res; ++ char type; ++ ++ ENTER2(""); ++ type = wrqu->param.value; ++ if (type == 'f') ++ network_type = Ndis802_11FH; ++ else if (type == 'b') ++ network_type = Ndis802_11DS; ++ else if (type == 'a') ++ network_type = Ndis802_11OFDM5; ++ else if (type == 'g' || type == 'n') ++ network_type = Ndis802_11OFDM24; ++ else ++ network_type = Ndis802_11Automode; ++ ++ res = mp_set_int(wnd, OID_802_11_NETWORK_TYPE_IN_USE, network_type); ++ if (res) { ++ WARNING("setting network type to %d failed (%08X)", ++ network_type, res); ++ EXIT2(return -EINVAL); ++ } ++ ++ EXIT2(return 0); ++} ++ ++static int priv_media_stream_mode(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ NDIS_STATUS res; ++ int mode; ++ ++ ENTER2(""); ++ if (wrqu->param.value > 0) ++ mode = Ndis802_11MediaStreamOn; ++ else ++ mode = Ndis802_11MediaStreamOff; ++ res = mp_set_int(wnd, OID_802_11_MEDIA_STREAM_MODE, mode); ++ if (res) { ++ WARNING("oid failed (%08X)", res); ++ EXIT2(return -EINVAL); ++ } ++ EXIT2(return 0); ++} ++ ++static int priv_reload_defaults(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, char *extra) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ int res; ++ ENTER2(""); ++ res = mp_set_int(wnd, OID_802_11_RELOAD_DEFAULTS, ++ Ndis802_11ReloadWEPKeys); ++ if (res) { ++ WARNING("reloading defaults failed: %08X", res); ++ return -EOPNOTSUPP; ++ } ++ return 0; ++} ++ ++static const struct iw_priv_args priv_args[] = { ++ {PRIV_RESET, 0, 0, "ndis_reset"}, ++ {PRIV_POWER_PROFILE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, ++ "power_profile"}, ++ {PRIV_DEAUTHENTICATE, 0, 0, "deauthenticate"}, ++ {PRIV_NETWORK_TYPE, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 1, 0, ++ "network_type"}, ++ {PRIV_MEDIA_STREAM_MODE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, ++ "media_stream"}, ++ ++ {PRIV_RELOAD_DEFAULTS, 0, 0, "reload_defaults"}, ++}; ++ ++#define WEPRIV(id) [id - SIOCIWFIRSTPRIV] ++ ++static const iw_handler priv_handler[] = { ++ WEPRIV(PRIV_RESET) = priv_reset, ++ WEPRIV(PRIV_POWER_PROFILE) = priv_power_profile, ++ WEPRIV(PRIV_DEAUTHENTICATE) = priv_deauthenticate, ++ WEPRIV(PRIV_NETWORK_TYPE) = priv_network_type, ++ WEPRIV(PRIV_MEDIA_STREAM_MODE) = priv_media_stream_mode, ++ WEPRIV(PRIV_RELOAD_DEFAULTS) = priv_reload_defaults, ++}; ++ ++const struct iw_handler_def ndis_handler_def = { ++ .num_standard = ARRAY_SIZE(ndis_handler), ++ .num_private = ARRAY_SIZE(priv_handler), ++ .num_private_args = ARRAY_SIZE(priv_args), ++ ++ .standard = (iw_handler *)ndis_handler, ++ .private = (iw_handler *)priv_handler, ++ .private_args = (struct iw_priv_args *)priv_args, ++ .get_wireless_stats = get_iw_stats, ++}; ++ ++#endif +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.h +--- linux-3.12.2/3rdparty/ndiswrapper/iw_ndis.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/iw_ndis.h 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,194 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _IW_NDIS_H_ ++#define _IW_NDIS_H_ ++ ++#include "ndis.h" ++ ++#define WL_NOISE -96 /* typical noise level in dBm */ ++#define WL_SIGMAX -32 /* typical maximum signal level in dBm */ ++ ++struct ndis_encr_key { ++ ULONG struct_size; ++ ULONG index; ++ ULONG length; ++ UCHAR key[NDIS_ENCODING_TOKEN_MAX]; ++}; ++ ++struct ndis_add_key { ++ ULONG struct_size; ++ ndis_key_index index; ++ ULONG length; ++ mac_address bssid; ++ UCHAR pad[6]; ++ ndis_key_rsc rsc; ++ UCHAR key[NDIS_ENCODING_TOKEN_MAX]; ++}; ++ ++struct ndis_remove_key { ++ ULONG struct_size; ++ ndis_key_index index; ++ mac_address bssid; ++}; ++ ++struct ndis_fixed_ies { ++ UCHAR time_stamp[8]; ++ USHORT beacon_interval; ++ USHORT capa; ++}; ++ ++struct ndis_variable_ies { ++ UCHAR elem_id; ++ UCHAR length; ++ UCHAR data[]; ++}; ++ ++enum ndis_reload_defaults { Ndis802_11ReloadWEPKeys }; ++ ++struct ndis_assoc_info { ++ ULONG length; ++ USHORT req_ies; ++ struct req_ie { ++ USHORT capa; ++ USHORT listen_interval; ++ mac_address cur_ap_address; ++ } req_ie; ++ ULONG req_ie_length; ++ ULONG offset_req_ies; ++ USHORT resp_ies; ++ struct resp_ie { ++ USHORT capa; ++ USHORT status_code; ++ USHORT assoc_id; ++ } resp_ie; ++ ULONG resp_ie_length; ++ ULONG offset_resp_ies; ++}; ++ ++struct ndis_configuration_fh { ++ ULONG length; ++ ULONG hop_pattern; ++ ULONG hop_set; ++ ULONG dwell_time; ++}; ++ ++struct ndis_configuration { ++ ULONG length; ++ ULONG beacon_period; ++ ULONG atim_window; ++ ULONG ds_config; ++ struct ndis_configuration_fh fh_config; ++}; ++ ++struct ndis_wlan_bssid { ++ ULONG length; ++ mac_address mac; ++ UCHAR reserved[2]; ++ struct ndis_essid ssid; ++ ULONG privacy; ++ ndis_rssi rssi; ++ UINT net_type; ++ struct ndis_configuration config; ++ UINT mode; ++ UCHAR rates[NDIS_MAX_RATES]; ++}; ++ ++struct ndis_wlan_bssid_ex { ++ ULONG length; ++ mac_address mac; ++ UCHAR reserved[2]; ++ struct ndis_essid ssid; ++ ULONG privacy; ++ ndis_rssi rssi; ++ UINT net_type; ++ struct ndis_configuration config; ++ UINT mode; ++ UCHAR rates_ex[NDIS_MAX_RATES_EX]; ++ ULONG ie_length; ++ struct ndis_fixed_ies fixed; ++ struct ndis_variable_ies var[]; ++}; ++ ++/* we use bssid_list as bssid_list_ex also */ ++struct ndis_bssid_list { ++ ULONG num_items; ++ struct ndis_wlan_bssid bssid[1]; ++}; ++ ++enum ndis_priv_filter { ++ Ndis802_11PrivFilterAcceptAll, Ndis802_11PrivFilter8021xWEP ++}; ++ ++enum network_type { ++ Ndis802_11FH, Ndis802_11DS, Ndis802_11OFDM5, Ndis802_11OFDM24, ++ /* MSDN site uses Ndis802_11Automode, which is not mentioned ++ * in DDK, so add one and assign it to ++ * Ndis802_11NetworkTypeMax */ ++ Ndis802_11Automode, Ndis802_11NetworkTypeMax = Ndis802_11Automode ++}; ++ ++struct network_type_list { ++ ULONG num; ++ enum network_type types[1]; ++}; ++ ++enum ndis_power { ++ NDIS_POWER_OFF = 0, NDIS_POWER_MAX, NDIS_POWER_MIN, ++}; ++ ++struct ndis_auth_req { ++ ULONG length; ++ mac_address bssid; ++ ULONG flags; ++}; ++ ++struct ndis_bssid_info { ++ mac_address bssid; ++ UCHAR pmkid[IW_PMKID_LEN]; ++}; ++ ++struct ndis_pmkid { ++ ULONG length; ++ ULONG bssid_info_count; ++ struct ndis_bssid_info bssid_info[1]; ++}; ++ ++int get_ap_address(struct ndis_device *wnd, mac_address mac); ++int set_ndis_auth_mode(struct ndis_device *wnd, ULONG auth_mode); ++int get_ndis_encr_mode(struct ndis_device *wnd); ++int set_iw_encr_mode(struct ndis_device *wnd, int cipher_pairwise, ++ int cipher_groupwise); ++int get_ndis_auth_mode(struct ndis_device *wnd); ++NDIS_STATUS disassociate(struct ndis_device *wnd, int reset_ssid); ++void set_default_iw_params(struct ndis_device *wnd); ++extern const struct iw_handler_def ndis_handler_def; ++ ++#define PRIV_RESET SIOCIWFIRSTPRIV+16 ++#define PRIV_POWER_PROFILE SIOCIWFIRSTPRIV+17 ++#define PRIV_NETWORK_TYPE SIOCIWFIRSTPRIV+18 ++#define PRIV_DEAUTHENTICATE SIOCIWFIRSTPRIV+19 ++#define PRIV_MEDIA_STREAM_MODE SIOCIWFIRSTPRIV+20 ++#define PRIV_RELOAD_DEFAULTS SIOCIWFIRSTPRIV+23 ++ ++/* these have to match what is in wpa_supplicant */ ++ ++enum wpa_alg { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP }; ++enum wpa_cipher { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP, ++ CIPHER_WEP104 }; ++enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE, ++ KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE }; ++ ++#endif // IW_NDIS_H +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.h +--- linux-3.12.2/3rdparty/ndiswrapper/lin2win.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.h 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (C) 2006 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifdef CONFIG_X86_64 ++ ++u64 lin2win0(void *func); ++u64 lin2win1(void *func, u64 arg1); ++u64 lin2win2(void *func, u64 arg1, u64 arg2); ++u64 lin2win3(void *func, u64 arg1, u64 arg2, u64 arg3); ++u64 lin2win4(void *func, u64 arg1, u64 arg2, u64 arg3, u64 arg4); ++u64 lin2win5(void *func, u64 arg1, u64 arg2, u64 arg3, u64 arg4, u64 arg5); ++u64 lin2win6(void *func, u64 arg1, u64 arg2, u64 arg3, u64 arg4, u64 arg5, ++ u64 arg6); ++ ++#define LIN2WIN0(func) \ ++({ \ ++ if (0) \ ++ func(); \ ++ lin2win0(func); \ ++}) ++ ++#define LIN2WIN1(func, arg1) \ ++({ \ ++ if (0) \ ++ func(arg1); \ ++ lin2win1(func, (u64)arg1); \ ++}) ++ ++#define LIN2WIN2(func, arg1, arg2) \ ++({ \ ++ if (0) \ ++ func(arg1, arg2); \ ++ lin2win2(func, (u64)arg1, (u64)arg2); \ ++}) ++ ++#define LIN2WIN3(func, arg1, arg2, arg3) \ ++({ \ ++ if (0) \ ++ func(arg1, arg2, arg3); \ ++ lin2win3(func, (u64)arg1, (u64)arg2, (u64)arg3); \ ++}) ++ ++#define LIN2WIN4(func, arg1, arg2, arg3, arg4) \ ++({ \ ++ if (0) \ ++ func(arg1, arg2, arg3, arg4); \ ++ lin2win4(func, (u64)arg1, (u64)arg2, (u64)arg3, (u64)arg4); \ ++}) ++ ++#define LIN2WIN5(func, arg1, arg2, arg3, arg4, arg5) \ ++({ \ ++ if (0) \ ++ func(arg1, arg2, arg3, arg4, arg5); \ ++ lin2win5(func, (u64)arg1, (u64)arg2, (u64)arg3, (u64)arg4, \ ++ (u64)arg5); \ ++}) ++ ++#define LIN2WIN6(func, arg1, arg2, arg3, arg4, arg5, arg6) \ ++({ \ ++ if (0) \ ++ func(arg1, arg2, arg3, arg4, arg5, arg6); \ ++ lin2win6(func, (u64)arg1, (u64)arg2, (u64)arg3, (u64)arg4, \ ++ (u64)arg5, (u64)arg6); \ ++}) ++ ++#else // CONFIG_X86_64 ++ ++#define LIN2WIN1(func, arg1) \ ++({ \ ++ TRACE6("calling %p", func); \ ++ func(arg1); \ ++}) ++#define LIN2WIN2(func, arg1, arg2) \ ++({ \ ++ TRACE6("calling %p", func); \ ++ func(arg1, arg2); \ ++}) ++#define LIN2WIN3(func, arg1, arg2, arg3) \ ++({ \ ++ TRACE6("calling %p", func); \ ++ func(arg1, arg2, arg3); \ ++}) ++#define LIN2WIN4(func, arg1, arg2, arg3, arg4) \ ++({ \ ++ TRACE6("calling %p", func); \ ++ func(arg1, arg2, arg3, arg4); \ ++}) ++#define LIN2WIN5(func, arg1, arg2, arg3, arg4, arg5) \ ++({ \ ++ TRACE6("calling %p", func); \ ++ func(arg1, arg2, arg3, arg4, arg5); \ ++}) ++#define LIN2WIN6(func, arg1, arg2, arg3, arg4, arg5, arg6) \ ++({ \ ++ TRACE6("calling %p", func); \ ++ func(arg1, arg2, arg3, arg4, arg5, arg6); \ ++}) ++ ++#endif // CONFIG_X86_64 +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/lin2win.S linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.S +--- linux-3.12.2/3rdparty/ndiswrapper/lin2win.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/lin2win.S 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,138 @@ ++/* ++ * Copyright (C) 2011 Pavel Roskin ++ * ++ * 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. ++ * ++ */ ++ ++#include ++ ++ .text ++ ++#define WORD_BYTES 8 ++#define LINUX_REG_ARGS 6 ++#define WINDOWS_REG_ARGS 4 ++ ++/* %rbp is saved to create a stack frame, which can help with debugging */ ++#define SAVED_REGS 1 ++ ++/* ++ * When calling a Windows function, stack space is allocated for at least 4 ++ * arguments even if the number of arguments is less than 4. The value of ++ * true is -1 in assembler, so we multiply it by another true value. ++ */ ++#define stack_args(argc) \ ++ (WINDOWS_REG_ARGS + \ ++ (0 < 1) * (argc > WINDOWS_REG_ARGS) * (argc - WINDOWS_REG_ARGS)) ++ ++/* Full required change of stack pointer, in words */ ++#define stack_words_raw(argc) (stack_args(argc) + SAVED_REGS + 1) ++ ++/* Full actual change of stack pointer, in words (must be even) */ ++#define stack_words_aligned(argc) ((stack_words_raw(argc) + 1) & ~1) ++ ++/* Space allocated for Linux arguments on stack */ ++#define stack_space(argc) \ ++ ((stack_words_aligned(argc) - SAVED_REGS - 1) * WORD_BYTES) ++ ++/* ++ * lin2win_win_arg(N) gives the address of the Nth Windows argument on our ++ * stack frame. %rsp points to the first argument. The Nth argument is ++ * therefore at ((N - 1) * 8)(%rsp). ++ * ++ * Don't call with N less than 5! ++ */ ++#define lin2win_win_arg(n) ((n - 1) * WORD_BYTES)(%rsp) ++ ++/* ++ * lin2win_lin_arg(N, ARGC) gives the address of the Nth Linux argument after ++ * the stack has been prepared for a Windows function call with ARGC arguments. ++ * ++ * When called from Linux, the Nth argument is at ((N - 6) * 8)(%rsp). We add ++ * the allocated stack space and saved registers to compensate for %rsp change. ++ * ++ * Don't call with N less than 7! ++ */ ++#define lin2win_lin_arg(n, argc) \ ++ (stack_space(argc) + \ ++ (SAVED_REGS + n - LINUX_REG_ARGS) * WORD_BYTES)(%rsp) ++ ++/* ++ * lin2win(func, winarg1, winarg2, ...) ++ * Call Windows FUNC function with ARGC arguments WINARG1, WINARG2, ... ++ * We get (ARGC + 1) arguments. ++ */ ++.macro lin2win name, argc ++ .type \name, @function ++ ENTRY(\name) ++ ++ /* Create a call frame - it's optional, but good for debugging */ ++ .cfi_startproc ++ push %rbp ++ .cfi_def_cfa %rsp, 2 * WORD_BYTES ++ .cfi_offset %rbp, -2 * WORD_BYTES ++ mov %rsp, %rbp ++ .cfi_def_cfa %rbp, 2 * WORD_BYTES ++ ++ /* Allocate space for Windows arguments */ ++ sub $stack_space(\argc), %rsp ++ ++ /* arg7 to winarg6 */ ++ .if (\argc >= 6) ++ mov lin2win_lin_arg(7, \argc), %r11 ++ mov %r11, lin2win_win_arg(6) ++ .endif ++ ++ /* arg6 to winarg5 */ ++ .if (\argc >= 5) ++ mov %r9, lin2win_win_arg(5) ++ .endif ++ ++ /* arg5 to winarg4 */ ++ .if (\argc >= 4) ++ mov %r8, %r9 ++ .endif ++ ++ /* arg4 to winarg3 */ ++ .if (\argc >= 3) ++ mov %rcx, %r8 ++ .endif ++ ++ /* arg3 to winarg2 - nothing needed, both are in %rdx */ ++ ++ /* arg2 to winarg1 */ ++ .if (\argc >= 1) ++ mov %rsi, %rcx ++ .endif ++ ++ /* Call function (arg1) */ ++ call *%rdi ++ ++ /* Reclaim space for Windows arguments */ ++ add $stack_space(\argc), %rsp ++ ++ /* Return to the caller */ ++ leave ++ .cfi_def_cfa %rsp, WORD_BYTES ++ .cfi_restore %rbp ++ ret ++ .cfi_endproc ++ .size \name, (. - \name) ++.endm ++ ++/* Define lin2winN functions */ ++lin2win lin2win0, 0 ++lin2win lin2win1, 1 ++lin2win lin2win2, 2 ++lin2win lin2win3, 3 ++lin2win lin2win4, 4 ++lin2win lin2win5, 5 ++lin2win lin2win6, 6 +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.c +--- linux-3.12.2/3rdparty/ndiswrapper/loader.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.c 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,967 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ndis.h" ++#include "loader.h" ++#include "wrapndis.h" ++#include "pnp.h" ++ ++#include ++#include ++#include ++#include ++ ++/* ++ Network adapter: ClassGuid = {4d36e972-e325-11ce-bfc1-08002be10318} ++ Network client: ClassGuid = {4d36e973-e325-11ce-bfc1-08002be10318} ++ PCMCIA adapter: ClassGuid = {4d36e977-e325-11ce-bfc1-08002be10318} ++ USB: ClassGuid = {36fc9e60-c465-11cf-8056-444553540000} ++*/ ++ ++/* the indices used here must match macros WRAP_NDIS_DEVICE etc. */ ++static struct guid class_guids[] = { ++ /* Network */ ++ { .data1 = 0x4d36e972, .data2 = 0xe325, .data3 = 0x11ce }, ++ /* USB WDM */ ++ { .data1 = 0x36fc9e60, .data2 = 0xc465, .data3 = 0x11cf }, ++ /* Bluetooth */ ++ { .data1 = 0xe0cbf06c, .data2 = 0xcd8b, .data3 = 0x4647 }, ++ /* ivtcorporation.com's bluetooth device claims this is ++ * bluetooth guid */ ++ { .data1 = 0xf12d3cf8, .data2 = 0xb11d, .data3 = 0x457e}, ++}; ++ ++struct mutex loader_mutex; ++static struct completion loader_complete; ++ ++static struct nt_list wrap_devices; ++static struct nt_list wrap_drivers; ++ ++static int wrap_device_type(int data1) ++{ ++ int i; ++ for (i = 0; i < ARRAY_SIZE(class_guids); i++) ++ if (data1 == class_guids[i].data1) ++ return i; ++ ERROR("unknown device: 0x%x\n", data1); ++ return -1; ++} ++ ++/* load driver for given device, if not already loaded */ ++struct wrap_driver *load_wrap_driver(struct wrap_device *wd) ++{ ++ int ret; ++ struct nt_list *cur; ++ struct wrap_driver *wrap_driver; ++ ++ ENTER1("device: %04X:%04X:%04X:%04X", wd->vendor, wd->device, ++ wd->subvendor, wd->subdevice); ++ mutex_lock(&loader_mutex); ++ wrap_driver = NULL; ++ nt_list_for_each(cur, &wrap_drivers) { ++ wrap_driver = container_of(cur, struct wrap_driver, list); ++ if (!stricmp(wrap_driver->name, wd->driver_name)) { ++ TRACE1("driver %s already loaded", wrap_driver->name); ++ break; ++ } else ++ wrap_driver = NULL; ++ } ++ mutex_unlock(&loader_mutex); ++ ++ if (!wrap_driver) { ++ char *argv[] = {"loadndisdriver", WRAP_CMD_LOAD_DRIVER, ++#if DEBUG >= 1 ++ "1", ++#else ++ "0", ++#endif ++ UTILS_VERSION, wd->driver_name, ++ wd->conf_file_name, NULL}; ++ char *env[] = {NULL}; ++ ++ TRACE1("loading driver %s", wd->driver_name); ++ mutex_lock(&loader_mutex); ++ reinit_completion(&loader_complete); ++ ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, ++ UMH_WAIT_PROC); ++ if (ret) { ++ mutex_unlock(&loader_mutex); ++ ERROR("couldn't load driver %s; check system log " ++ "for messages from 'loadndisdriver'", ++ wd->driver_name); ++ EXIT1(return NULL); ++ } ++ wait_for_completion(&loader_complete); ++ TRACE1("%s", wd->driver_name); ++ wrap_driver = NULL; ++ nt_list_for_each(cur, &wrap_drivers) { ++ wrap_driver = container_of(cur, struct wrap_driver, ++ list); ++ if (!stricmp(wrap_driver->name, wd->driver_name)) { ++ wd->driver = wrap_driver; ++ break; ++ } else ++ wrap_driver = NULL; ++ } ++ mutex_unlock(&loader_mutex); ++ if (wrap_driver) ++ TRACE1("driver %s is loaded", wrap_driver->name); ++ else ++ ERROR("couldn't load driver '%s'", wd->driver_name); ++ } ++ EXIT1(return wrap_driver); ++} ++ ++/* load the driver files from userspace. */ ++static int load_sys_files(struct wrap_driver *driver, ++ struct load_driver *load_driver) ++{ ++ int i, err; ++ ++ TRACE1("num_pe_images = %d", load_driver->num_sys_files); ++ TRACE1("loading driver: %s", load_driver->name); ++ strncpy(driver->name, load_driver->name, sizeof(driver->name)); ++ driver->name[sizeof(driver->name)-1] = 0; ++ TRACE1("driver: %s", driver->name); ++ err = 0; ++ driver->num_pe_images = 0; ++ for (i = 0; i < load_driver->num_sys_files; i++) { ++ struct pe_image *pe_image; ++ pe_image = &driver->pe_images[driver->num_pe_images]; ++ ++ strncpy(pe_image->name, load_driver->sys_files[i].name, ++ sizeof(pe_image->name)); ++ pe_image->name[sizeof(pe_image->name)-1] = 0; ++ TRACE1("image size: %zu bytes", load_driver->sys_files[i].size); ++ ++#ifdef CONFIG_X86_64 ++#ifdef PAGE_KERNEL_EXECUTABLE ++ pe_image->image = ++ __vmalloc(load_driver->sys_files[i].size, ++ GFP_KERNEL | __GFP_HIGHMEM, ++ PAGE_KERNEL_EXECUTABLE); ++#elif defined PAGE_KERNEL_EXEC ++ pe_image->image = ++ __vmalloc(load_driver->sys_files[i].size, ++ GFP_KERNEL | __GFP_HIGHMEM, ++ PAGE_KERNEL_EXEC); ++#else ++#error x86_64 should have either PAGE_KERNEL_EXECUTABLE or PAGE_KERNEL_EXEC ++#endif ++#else ++ /* hate to play with kernel macros, but PAGE_KERNEL_EXEC is ++ * not available to modules! */ ++#ifdef cpu_has_nx ++ if (cpu_has_nx) ++ pe_image->image = ++ __vmalloc(load_driver->sys_files[i].size, ++ GFP_KERNEL | __GFP_HIGHMEM, ++ __pgprot(__PAGE_KERNEL & ~_PAGE_NX)); ++ else ++ pe_image->image = ++ vmalloc(load_driver->sys_files[i].size); ++#else ++ pe_image->image = ++ vmalloc(load_driver->sys_files[i].size); ++#endif ++#endif ++ if (!pe_image->image) { ++ ERROR("couldn't allocate memory"); ++ err = -ENOMEM; ++ break; ++ } ++ TRACE1("image is at %p", pe_image->image); ++ ++ if (copy_from_user(pe_image->image, ++ load_driver->sys_files[i].data, ++ load_driver->sys_files[i].size)) { ++ ERROR("couldn't load file %s", ++ load_driver->sys_files[i].name); ++ err = -EFAULT; ++ break; ++ } ++ pe_image->size = load_driver->sys_files[i].size; ++ driver->num_pe_images++; ++ } ++ ++ if (!err && link_pe_images(driver->pe_images, driver->num_pe_images)) { ++ ERROR("couldn't prepare driver '%s'", load_driver->name); ++ err = -EINVAL; ++ } ++ ++ if (driver->num_pe_images < load_driver->num_sys_files || err) { ++ for (i = 0; i < driver->num_pe_images; i++) ++ if (driver->pe_images[i].image) ++ vfree(driver->pe_images[i].image); ++ driver->num_pe_images = 0; ++ EXIT1(return err); ++ } else ++ EXIT1(return 0); ++} ++ ++struct wrap_bin_file *get_bin_file(char *bin_file_name) ++{ ++ int i = 0; ++ struct wrap_driver *driver, *cur; ++ ++ ENTER1("%s", bin_file_name); ++ mutex_lock(&loader_mutex); ++ driver = NULL; ++ nt_list_for_each_entry(cur, &wrap_drivers, list) { ++ for (i = 0; i < cur->num_bin_files; i++) ++ if (!stricmp(cur->bin_files[i].name, bin_file_name)) { ++ driver = cur; ++ break; ++ } ++ if (driver) ++ break; ++ } ++ mutex_unlock(&loader_mutex); ++ if (!driver) { ++ TRACE1("couldn't find bin file '%s'", bin_file_name); ++ return NULL; ++ } ++ ++ if (!driver->bin_files[i].data) { ++ char *argv[] = {"loadndisdriver", WRAP_CMD_LOAD_BIN_FILE, ++#if DEBUG >= 1 ++ "1", ++#else ++ "0", ++#endif ++ UTILS_VERSION, driver->name, ++ driver->bin_files[i].name, NULL}; ++ char *env[] = {NULL}; ++ int ret; ++ ++ TRACE1("loading bin file %s/%s", driver->name, ++ driver->bin_files[i].name); ++ mutex_lock(&loader_mutex); ++ reinit_completion(&loader_complete); ++ ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, ++ UMH_WAIT_PROC); ++ if (ret) { ++ mutex_unlock(&loader_mutex); ++ ERROR("couldn't load file %s/%s; check system log " ++ "for messages from 'loadndisdriver' (%d)", ++ driver->name, driver->bin_files[i].name, ret); ++ EXIT1(return NULL); ++ } ++ wait_for_completion(&loader_complete); ++ mutex_unlock(&loader_mutex); ++ if (!driver->bin_files[i].data) { ++ WARNING("couldn't load binary file %s", ++ driver->bin_files[i].name); ++ EXIT1(return NULL); ++ } ++ } ++ EXIT2(return &(driver->bin_files[i])); ++} ++ ++/* called with loader_mutex down */ ++static int add_bin_file(struct load_driver_file *driver_file) ++{ ++ struct wrap_driver *driver, *cur; ++ struct wrap_bin_file *bin_file; ++ int i = 0; ++ ++ driver = NULL; ++ nt_list_for_each_entry(cur, &wrap_drivers, list) { ++ for (i = 0; i < cur->num_bin_files; i++) ++ if (!stricmp(cur->bin_files[i].name, ++ driver_file->name)) { ++ driver = cur; ++ break; ++ } ++ if (driver) ++ break; ++ } ++ if (!driver) { ++ ERROR("couldn't find %s", driver_file->name); ++ return -EINVAL; ++ } ++ bin_file = &driver->bin_files[i]; ++ strncpy(bin_file->name, driver_file->name, sizeof(bin_file->name)); ++ bin_file->name[sizeof(bin_file->name)-1] = 0; ++ bin_file->data = vmalloc(driver_file->size); ++ if (!bin_file->data) { ++ ERROR("couldn't allocate memory"); ++ return -ENOMEM; ++ } ++ bin_file->size = driver_file->size; ++ if (copy_from_user(bin_file->data, driver_file->data, bin_file->size)) { ++ ERROR("couldn't copy data"); ++ free_bin_file(bin_file); ++ return -EFAULT; ++ } ++ return 0; ++} ++ ++void free_bin_file(struct wrap_bin_file *bin_file) ++{ ++ TRACE2("unloading %s", bin_file->name); ++ if (bin_file->data) ++ vfree(bin_file->data); ++ bin_file->data = NULL; ++ bin_file->size = 0; ++ EXIT2(return); ++} ++ ++/* load firmware files from userspace */ ++static int load_bin_files_info(struct wrap_driver *driver, ++ struct load_driver *load_driver) ++{ ++ struct wrap_bin_file *bin_files; ++ int i; ++ ++ ENTER1("%s, %d", load_driver->name, load_driver->num_bin_files); ++ driver->num_bin_files = 0; ++ driver->bin_files = NULL; ++ if (load_driver->num_bin_files == 0) ++ EXIT1(return 0); ++ bin_files = kzalloc(load_driver->num_bin_files * sizeof(*bin_files), ++ GFP_KERNEL); ++ if (!bin_files) { ++ ERROR("couldn't allocate memory"); ++ EXIT1(return -ENOMEM); ++ } ++ ++ for (i = 0; i < load_driver->num_bin_files; i++) { ++ strncpy(bin_files[i].name, load_driver->bin_files[i].name, ++ sizeof(bin_files[i].name)); ++ bin_files[i].name[sizeof(bin_files[i].name)-1] = 0; ++ TRACE2("loaded bin file %s", bin_files[i].name); ++ } ++ driver->num_bin_files = load_driver->num_bin_files; ++ driver->bin_files = bin_files; ++ EXIT1(return 0); ++} ++ ++/* load settings for a device. called with loader_mutex down */ ++static int load_settings(struct wrap_driver *wrap_driver, ++ struct load_driver *load_driver) ++{ ++ int i, num_settings; ++ ++ ENTER1("%p, %p", wrap_driver, load_driver); ++ ++ num_settings = 0; ++ for (i = 0; i < load_driver->num_settings; i++) { ++ struct load_device_setting *load_setting = ++ &load_driver->settings[i]; ++ struct wrap_device_setting *setting; ++ ULONG data1; ++ ++ setting = kzalloc(sizeof(*setting), GFP_KERNEL); ++ if (!setting) { ++ ERROR("couldn't allocate memory"); ++ break; ++ } ++ strncpy(setting->name, load_setting->name, ++ sizeof(setting->name)); ++ setting->name[sizeof(setting->name)-1] = 0; ++ strncpy(setting->value, load_setting->value, ++ sizeof(setting->value)); ++ setting->value[sizeof(setting->value)-1] = 0; ++ TRACE2("%p: %s=%s", setting, setting->name, setting->value); ++ ++ if (strcmp(setting->name, "driver_version") == 0) { ++ strncpy(wrap_driver->version, setting->value, ++ sizeof(wrap_driver->version)); ++ wrap_driver->version[sizeof(wrap_driver->version)-1] = 0; ++ } else if (strcmp(setting->name, "class_guid") == 0 && ++ sscanf(setting->value, "%x", &data1) == 1) { ++ wrap_driver->dev_type = wrap_device_type(data1); ++ if (wrap_driver->dev_type < 0) { ++ WARNING("unknown guid: %x", data1); ++ wrap_driver->dev_type = 0; ++ } ++ } ++ InsertTailList(&wrap_driver->settings, &setting->list); ++ num_settings++; ++ } ++ /* it is not a fatal error if some settings couldn't be loaded */ ++ if (num_settings > 0) ++ EXIT1(return 0); ++ else ++ EXIT1(return -EINVAL); ++} ++ ++void unload_wrap_device(struct wrap_device *wd) ++{ ++ struct nt_list *cur; ++ ENTER1("unloading device %p (%04X:%04X:%04X:%04X), driver %s", wd, ++ wd->vendor, wd->device, wd->subvendor, wd->subdevice, ++ wd->driver_name); ++ mutex_lock(&loader_mutex); ++ while ((cur = RemoveHeadList(&wd->settings))) { ++ struct wrap_device_setting *setting; ++ setting = container_of(cur, struct wrap_device_setting, list); ++ kfree(setting); ++ } ++ RemoveEntryList(&wd->list); ++ mutex_unlock(&loader_mutex); ++ kfree(wd); ++ EXIT1(return); ++} ++ ++/* should be called with loader_mutex down */ ++void unload_wrap_driver(struct wrap_driver *driver) ++{ ++ int i; ++ struct driver_object *drv_obj; ++ struct nt_list *cur, *next; ++ ++ ENTER1("unloading driver: %s (%p)", driver->name, driver); ++ TRACE1("freeing %d images", driver->num_pe_images); ++ drv_obj = driver->drv_obj; ++ for (i = 0; i < driver->num_pe_images; i++) ++ if (driver->pe_images[i].image) { ++ TRACE1("freeing image at %p", ++ driver->pe_images[i].image); ++ vfree(driver->pe_images[i].image); ++ } ++ ++ TRACE1("freeing %d bin files", driver->num_bin_files); ++ for (i = 0; i < driver->num_bin_files; i++) { ++ TRACE1("freeing image at %p", driver->bin_files[i].data); ++ if (driver->bin_files[i].data) ++ vfree(driver->bin_files[i].data); ++ } ++ kfree(driver->bin_files); ++ RtlFreeUnicodeString(&drv_obj->name); ++ RemoveEntryList(&driver->list); ++ nt_list_for_each_safe(cur, next, &driver->settings) { ++ struct wrap_device_setting *setting; ++ struct ndis_configuration_parameter *param; ++ ++ setting = container_of(cur, struct wrap_device_setting, list); ++ TRACE2("%p", setting); ++ param = setting->encoded; ++ if (param) { ++ TRACE2("%p", param); ++ if (param->type == NdisParameterString) ++ RtlFreeUnicodeString(¶m->data.string); ++ ExFreePool(param); ++ } ++ kfree(setting); ++ } ++ /* this frees driver */ ++ free_custom_extensions(drv_obj->drv_ext); ++ kfree(drv_obj->drv_ext); ++ TRACE1("drv_obj: %p", drv_obj); ++ ++ EXIT1(return); ++} ++ ++/* call the entry point of the driver */ ++static int start_wrap_driver(struct wrap_driver *driver) ++{ ++ int i; ++ NTSTATUS ret, res; ++ struct driver_object *drv_obj; ++ typeof(driver->pe_images[0].entry) entry; ++ ++ ENTER1("%s", driver->name); ++ drv_obj = driver->drv_obj; ++ for (ret = res = 0, i = 0; i < driver->num_pe_images; i++) ++ /* dlls are already started by loader */ ++ if (driver->pe_images[i].type == IMAGE_FILE_EXECUTABLE_IMAGE) { ++ entry = driver->pe_images[i].entry; ++ drv_obj->start = driver->pe_images[i].entry; ++ drv_obj->driver_size = driver->pe_images[i].size; ++ TRACE1("entry: %p, %p, drv_obj: %p", ++ entry, *entry, drv_obj); ++ res = LIN2WIN2(entry, drv_obj, &drv_obj->name); ++ ret |= res; ++ TRACE1("entry returns %08X", res); ++ break; ++ } ++ if (ret) { ++ ERROR("driver initialization failed: %08X", ret); ++ RtlFreeUnicodeString(&drv_obj->name); ++ /* this frees ndis_driver */ ++ free_custom_extensions(drv_obj->drv_ext); ++ kfree(drv_obj->drv_ext); ++ TRACE1("drv_obj: %p", drv_obj); ++ ObDereferenceObject(drv_obj); ++ EXIT1(return -EINVAL); ++ } ++ EXIT1(return 0); ++} ++ ++/* ++ * add driver to list of loaded driver but make sure this driver is ++ * not loaded before. called with loader_mutex down ++ */ ++static int add_wrap_driver(struct wrap_driver *driver) ++{ ++ struct wrap_driver *tmp; ++ ++ ENTER1("name: %s", driver->name); ++ nt_list_for_each_entry(tmp, &wrap_drivers, list) { ++ if (stricmp(tmp->name, driver->name) == 0) { ++ ERROR("cannot add duplicate driver"); ++ EXIT1(return -EBUSY); ++ } ++ } ++ InsertHeadList(&wrap_drivers, &driver->list); ++ EXIT1(return 0); ++} ++ ++/* load a driver from userspace and initialize it. called with ++ * loader_mutex down */ ++static int load_user_space_driver(struct load_driver *load_driver) ++{ ++ struct driver_object *drv_obj; ++ struct ansi_string ansi_reg; ++ struct wrap_driver *wrap_driver = NULL; ++ ++ ENTER1("%p", load_driver); ++ drv_obj = allocate_object(sizeof(*drv_obj), OBJECT_TYPE_DRIVER, NULL); ++ if (!drv_obj) { ++ ERROR("couldn't allocate memory"); ++ EXIT1(return -ENOMEM); ++ } ++ TRACE1("drv_obj: %p", drv_obj); ++ drv_obj->drv_ext = kzalloc(sizeof(*(drv_obj->drv_ext)), GFP_KERNEL); ++ if (!drv_obj->drv_ext) { ++ ERROR("couldn't allocate memory"); ++ ObDereferenceObject(drv_obj); ++ EXIT1(return -ENOMEM); ++ } ++ InitializeListHead(&drv_obj->drv_ext->custom_ext); ++ if (IoAllocateDriverObjectExtension(drv_obj, ++ (void *)WRAP_DRIVER_CLIENT_ID, ++ sizeof(*wrap_driver), ++ (void **)&wrap_driver) != ++ STATUS_SUCCESS) ++ EXIT1(return -ENOMEM); ++ TRACE1("driver: %p", wrap_driver); ++ memset(wrap_driver, 0, sizeof(*wrap_driver)); ++ InitializeListHead(&wrap_driver->list); ++ InitializeListHead(&wrap_driver->settings); ++ wrap_driver->drv_obj = drv_obj; ++ RtlInitAnsiString(&ansi_reg, "/tmp"); ++ if (RtlAnsiStringToUnicodeString(&drv_obj->name, &ansi_reg, TRUE) != ++ STATUS_SUCCESS) { ++ ERROR("couldn't initialize registry path"); ++ free_custom_extensions(drv_obj->drv_ext); ++ kfree(drv_obj->drv_ext); ++ TRACE1("drv_obj: %p", drv_obj); ++ ObDereferenceObject(drv_obj); ++ EXIT1(return -EINVAL); ++ } ++ strncpy(wrap_driver->name, load_driver->name, sizeof(wrap_driver->name)); ++ wrap_driver->name[sizeof(wrap_driver->name)-1] = 0; ++ if (load_sys_files(wrap_driver, load_driver) || ++ load_bin_files_info(wrap_driver, load_driver) || ++ load_settings(wrap_driver, load_driver) || ++ start_wrap_driver(wrap_driver) || ++ add_wrap_driver(wrap_driver)) { ++ unload_wrap_driver(wrap_driver); ++ ObDereferenceObject(drv_obj); ++ EXIT1(return -EINVAL); ++ } else { ++ printk(KERN_INFO "%s: driver %s (%s) loaded\n", ++ DRIVER_NAME, wrap_driver->name, wrap_driver->version); ++ add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE); ++ EXIT1(return 0); ++ } ++} ++ ++static struct pci_device_id wrap_pci_id_table[] = { ++ { ++ .vendor = PCI_ANY_ID, ++ .device = PCI_ANY_ID, ++ .subvendor = PCI_ANY_ID, ++ .subdevice = PCI_ANY_ID, ++ .class = 0, ++ .class_mask = 0, ++ .driver_data = 0 ++ } ++}; ++ ++static struct pci_driver wrap_pci_driver = { ++ .name = DRIVER_NAME, ++ .id_table = wrap_pci_id_table, ++ .probe = wrap_pnp_start_pci_device, ++ .remove = wrap_pnp_remove_pci_device, ++ .suspend = wrap_pnp_suspend_pci_device, ++ .resume = wrap_pnp_resume_pci_device, ++}; ++ ++#ifdef ENABLE_USB ++static struct usb_device_id wrap_usb_id_table[] = { ++ { ++ .driver_info = 1 ++ }, ++}; ++ ++static struct usb_driver wrap_usb_driver = { ++ .name = DRIVER_NAME, ++ .id_table = wrap_usb_id_table, ++ .probe = wrap_pnp_start_usb_device, ++ .disconnect = wrap_pnp_remove_usb_device, ++ .suspend = wrap_pnp_suspend_usb_device, ++ .resume = wrap_pnp_resume_usb_device, ++}; ++#endif ++ ++/* register drivers for pci and usb */ ++static void register_devices(void) ++{ ++ int res; ++ ++ res = pci_register_driver(&wrap_pci_driver); ++ if (res < 0) { ++ ERROR("couldn't register pci driver: %d", res); ++ wrap_pci_driver.name = NULL; ++ } ++ ++#ifdef ENABLE_USB ++ res = usb_register(&wrap_usb_driver); ++ if (res < 0) { ++ ERROR("couldn't register usb driver: %d", res); ++ wrap_usb_driver.name = NULL; ++ } ++#endif ++ EXIT1(return); ++} ++ ++static void unregister_devices(void) ++{ ++ struct nt_list *cur, *next; ++ ++ mutex_lock(&loader_mutex); ++ nt_list_for_each_safe(cur, next, &wrap_devices) { ++ struct wrap_device *wd; ++ wd = container_of(cur, struct wrap_device, list); ++ set_bit(HW_DISABLED, &wd->hw_status); ++ } ++ mutex_unlock(&loader_mutex); ++ ++ if (wrap_pci_driver.name) ++ pci_unregister_driver(&wrap_pci_driver); ++#ifdef ENABLE_USB ++ if (wrap_usb_driver.name) ++ usb_deregister(&wrap_usb_driver); ++#endif ++} ++ ++struct wrap_device *load_wrap_device(struct load_device *load_device) ++{ ++ int ret; ++ struct nt_list *cur; ++ struct wrap_device *wd = NULL; ++ char vendor[5], device[5], subvendor[5], subdevice[5], bus[5]; ++ ++ ENTER1("%04x, %04x, %04x, %04x", load_device->vendor, ++ load_device->device, load_device->subvendor, ++ load_device->subdevice); ++ if (sprintf(vendor, "%04x", load_device->vendor) == 4 && ++ sprintf(device, "%04x", load_device->device) == 4 && ++ sprintf(subvendor, "%04x", load_device->subvendor) == 4 && ++ sprintf(subdevice, "%04x", load_device->subdevice) == 4 && ++ sprintf(bus, "%04x", load_device->bus) == 4) { ++ char *argv[] = {"loadndisdriver", WRAP_CMD_LOAD_DEVICE, ++#if DEBUG >= 1 ++ "1", ++#else ++ "0", ++#endif ++ UTILS_VERSION, vendor, device, ++ subvendor, subdevice, bus, NULL}; ++ char *env[] = {NULL}; ++ TRACE2("%s, %s, %s, %s, %s", vendor, device, ++ subvendor, subdevice, bus); ++ mutex_lock(&loader_mutex); ++ reinit_completion(&loader_complete); ++ ret = call_usermodehelper("/sbin/loadndisdriver", argv, env, ++ UMH_WAIT_PROC); ++ if (ret) { ++ mutex_unlock(&loader_mutex); ++ TRACE1("couldn't load device %04x:%04x; check system " ++ "log for messages from 'loadndisdriver'", ++ load_device->vendor, load_device->device); ++ EXIT1(return NULL); ++ } ++ wait_for_completion(&loader_complete); ++ wd = NULL; ++ nt_list_for_each(cur, &wrap_devices) { ++ wd = container_of(cur, struct wrap_device, list); ++ TRACE2("%p, %04x, %04x, %04x, %04x", wd, wd->vendor, ++ wd->device, wd->subvendor, wd->subdevice); ++ if (wd->vendor == load_device->vendor && ++ wd->device == load_device->device) ++ break; ++ else ++ wd = NULL; ++ } ++ mutex_unlock(&loader_mutex); ++ } else ++ wd = NULL; ++ EXIT1(return wd); ++} ++ ++struct wrap_device *get_wrap_device(void *dev, int bus) ++{ ++ struct nt_list *cur; ++ struct wrap_device *wd; ++ ++ mutex_lock(&loader_mutex); ++ wd = NULL; ++ nt_list_for_each(cur, &wrap_devices) { ++ wd = container_of(cur, struct wrap_device, list); ++ if (bus == WRAP_PCI_BUS && ++ wrap_is_pci_bus(wd->dev_bus) && wd->pci.pdev == dev) ++ break; ++ else if (bus == WRAP_USB_BUS && ++ wrap_is_usb_bus(wd->dev_bus) && wd->usb.udev == dev) ++ break; ++ else ++ wd = NULL; ++ } ++ mutex_unlock(&loader_mutex); ++ return wd; ++} ++ ++/* called with loader_mutex is down */ ++static long wrapper_ioctl(struct file *file, unsigned int cmd, ++ unsigned long arg) ++{ ++ struct load_driver *load_driver; ++ struct load_device load_device; ++ struct load_driver_file load_bin_file; ++ int ret; ++ void __user *addr = (void __user *)arg; ++ ++ ENTER1("cmd: 0x%x", cmd); ++ ++ ret = 0; ++ switch (cmd) { ++ case WRAP_IOCTL_LOAD_DEVICE: ++ if (copy_from_user(&load_device, addr, sizeof(load_device))) { ++ ret = -EFAULT; ++ break; ++ } ++ TRACE2("%04x, %04x, %04x, %04x", load_device.vendor, ++ load_device.device, load_device.subvendor, ++ load_device.subdevice); ++ if (load_device.vendor) { ++ struct wrap_device *wd; ++ wd = kzalloc(sizeof(*wd), GFP_KERNEL); ++ if (!wd) { ++ ret = -ENOMEM; ++ break; ++ } ++ InitializeListHead(&wd->settings); ++ wd->dev_bus = WRAP_BUS(load_device.bus); ++ wd->vendor = load_device.vendor; ++ wd->device = load_device.device; ++ wd->subvendor = load_device.subvendor; ++ wd->subdevice = load_device.subdevice; ++ strncpy(wd->conf_file_name, load_device.conf_file_name, ++ sizeof(wd->conf_file_name)); ++ wd->conf_file_name[sizeof(wd->conf_file_name)-1] = 0; ++ strncpy(wd->driver_name, load_device.driver_name, ++ sizeof(wd->driver_name)); ++ wd->driver_name[sizeof(wd->driver_name)-1] = 0; ++ InsertHeadList(&wrap_devices, &wd->list); ++ ret = 0; ++ } else ++ ret = -EINVAL; ++ break; ++ case WRAP_IOCTL_LOAD_DRIVER: ++ TRACE1("loading driver at %p", addr); ++ load_driver = vmalloc(sizeof(*load_driver)); ++ if (!load_driver) { ++ ret = -ENOMEM; ++ break; ++ } ++ if (copy_from_user(load_driver, addr, sizeof(*load_driver))) ++ ret = -EFAULT; ++ else ++ ret = load_user_space_driver(load_driver); ++ vfree(load_driver); ++ break; ++ case WRAP_IOCTL_LOAD_BIN_FILE: ++ if (copy_from_user(&load_bin_file, addr, sizeof(load_bin_file))) ++ ret = -EFAULT; ++ else ++ ret = add_bin_file(&load_bin_file); ++ break; ++ default: ++ ERROR("unknown ioctl 0x%x", cmd); ++ ret = -EINVAL; ++ break; ++ } ++ complete(&loader_complete); ++ EXIT1(return ret); ++} ++ ++#ifdef CONFIG_COMPAT ++static int copy_load_driver_file32(struct load_driver_file *k, ++ struct load_driver_file32 __user *u) ++{ ++ u32 data; ++ ++ if (copy_from_user(&k->driver_name, &u->driver_name, ++ sizeof(u->driver_name) + sizeof(u->name))) ++ return -EFAULT; ++ ++ if (get_user(k->size, &u->size)) ++ return -EFAULT; ++ if (get_user(data, &u->data)) ++ return -EFAULT; ++ ++ k->data = (void __user *)(unsigned long)data; ++ return 0; ++} ++ ++static int copy_load_driver32(struct load_driver *k, ++ struct load_driver32 __user *u) ++{ ++ int i; ++ ++ if (copy_from_user(&k->name, &u->name, ++ sizeof(u->name) + sizeof(u->conf_file_name))) ++ return -EFAULT; ++ ++ if (get_user(k->num_sys_files, &u->num_sys_files)) ++ return -EFAULT; ++ ++ for (i = 0; i < k->num_sys_files; i++) ++ if (copy_load_driver_file32(&k->sys_files[i], &u->sys_files[i])) ++ return -EFAULT; ++ ++ if (get_user(k->num_settings, &u->num_settings)) ++ return -EFAULT; ++ ++ if (copy_from_user(&k->settings, &u->settings, ++ sizeof(u->settings[0]) * k->num_settings)) ++ return -EFAULT; ++ ++ if (get_user(k->num_bin_files, &u->num_bin_files)) ++ return -EFAULT; ++ ++ for (i = 0; i < k->num_bin_files; i++) ++ if (copy_load_driver_file32(&k->bin_files[i], &u->bin_files[i])) ++ return -EFAULT; ++ ++ return 0; ++} ++ ++static long wrapper_ioctl_compat(struct file *file, unsigned int cmd, ++ unsigned long arg) ++{ ++ int ret = 0; ++ void __user *addr = (void __user *)arg; ++ struct load_driver *kdriver; ++ struct load_driver32 __user *udriver = addr; ++ struct load_driver_file kfile; ++ struct load_driver_file32 __user *ufile = addr; ++ ++ ENTER1("cmd: 0x%x", cmd); ++ ++ switch (cmd) { ++ case WRAP_IOCTL_LOAD_DEVICE32: ++ return wrapper_ioctl(file, WRAP_IOCTL_LOAD_DEVICE, arg); ++ case WRAP_IOCTL_LOAD_DRIVER32: ++ TRACE1("loading driver at %p", addr); ++ kdriver = vmalloc(sizeof(*kdriver)); ++ if (!kdriver) { ++ ret = -ENOMEM; ++ break; ++ } ++ ++ ret = copy_load_driver32(kdriver, udriver); ++ if (!ret) ++ ret = load_user_space_driver(kdriver); ++ ++ vfree(kdriver); ++ break; ++ case WRAP_IOCTL_LOAD_BIN_FILE32: ++ ret = copy_load_driver_file32(&kfile, ufile); ++ if (ret) ++ break; ++ ++ ret = add_bin_file(&kfile); ++ break; ++ default: ++ ERROR("unknown ioctl 0x%x", cmd); ++ ret = -EINVAL; ++ break; ++ } ++ complete(&loader_complete); ++ EXIT1(return ret); ++} ++#endif ++ ++static int wrapper_ioctl_release(struct inode *inode, struct file *file) ++{ ++ ENTER1(""); ++ complete(&loader_complete); ++ return 0; ++} ++ ++static struct file_operations wrapper_fops = { ++ .owner = THIS_MODULE, ++ .unlocked_ioctl = wrapper_ioctl, ++#ifdef CONFIG_COMPAT ++ .compat_ioctl = wrapper_ioctl_compat, ++#endif ++ .release = wrapper_ioctl_release, ++}; ++ ++static struct miscdevice wrapper_misc = { ++ .name = DRIVER_NAME, ++ .minor = MISC_DYNAMIC_MINOR, ++ .fops = &wrapper_fops ++}; ++ ++int loader_init(void) ++{ ++ int err; ++ ++ InitializeListHead(&wrap_drivers); ++ InitializeListHead(&wrap_devices); ++ mutex_init(&loader_mutex); ++ init_completion(&loader_complete); ++ if ((err = misc_register(&wrapper_misc)) < 0) { ++ ERROR("couldn't register module (%d)", err); ++ unregister_devices(); ++ EXIT1(return err); ++ } ++ register_devices(); ++ EXIT1(return 0); ++} ++ ++void loader_exit(void) ++{ ++ struct nt_list *cur, *next; ++ ++ ENTER1(""); ++ misc_deregister(&wrapper_misc); ++ unregister_devices(); ++ mutex_lock(&loader_mutex); ++ nt_list_for_each_safe(cur, next, &wrap_drivers) { ++ struct wrap_driver *driver; ++ driver = container_of(cur, struct wrap_driver, list); ++ unload_wrap_driver(driver); ++ } ++ mutex_unlock(&loader_mutex); ++ EXIT1(return); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/loader.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.h +--- linux-3.12.2/3rdparty/ndiswrapper/loader.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/loader.h 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,108 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _LOADER_H_ ++#define _LOADER_H_ ++ ++#include "ndiswrapper.h" ++ ++#ifndef __KERNEL__ ++#define __user ++#endif ++ ++struct load_driver_file { ++ char driver_name[MAX_DRIVER_NAME_LEN]; ++ char name[MAX_DRIVER_NAME_LEN]; ++ size_t size; ++ void __user *data; ++}; ++ ++struct load_device_setting { ++ char name[MAX_SETTING_NAME_LEN]; ++ char value[MAX_SETTING_VALUE_LEN]; ++}; ++ ++struct load_device { ++ int bus; ++ int vendor; ++ int device; ++ int subvendor; ++ int subdevice; ++ char conf_file_name[MAX_DRIVER_NAME_LEN]; ++ char driver_name[MAX_DRIVER_NAME_LEN]; ++}; ++ ++struct load_driver { ++ char name[MAX_DRIVER_NAME_LEN]; ++ char conf_file_name[MAX_DRIVER_NAME_LEN]; ++ unsigned int num_sys_files; ++ struct load_driver_file sys_files[MAX_DRIVER_PE_IMAGES]; ++ unsigned int num_settings; ++ struct load_device_setting settings[MAX_DEVICE_SETTINGS]; ++ unsigned int num_bin_files; ++ struct load_driver_file bin_files[MAX_DRIVER_BIN_FILES]; ++}; ++ ++#define WRAP_IOCTL_LOAD_DEVICE _IOW(('N' + 'd' + 'i' + 'S'), 0, \ ++ struct load_device *) ++#define WRAP_IOCTL_LOAD_DRIVER _IOW(('N' + 'd' + 'i' + 'S'), 1, \ ++ struct load_driver *) ++#define WRAP_IOCTL_LOAD_BIN_FILE _IOW(('N' + 'd' + 'i' + 'S'), 2, \ ++ struct load_driver_file *) ++ ++#ifdef CONFIG_COMPAT ++struct load_driver_file32 { ++ char driver_name[MAX_DRIVER_NAME_LEN]; ++ char name[MAX_DRIVER_NAME_LEN]; ++ u32 size; ++ u32 data; ++}; ++ ++struct load_driver32 { ++ char name[MAX_DRIVER_NAME_LEN]; ++ char conf_file_name[MAX_DRIVER_NAME_LEN]; ++ u32 num_sys_files; ++ struct load_driver_file32 sys_files[MAX_DRIVER_PE_IMAGES]; ++ u32 num_settings; ++ struct load_device_setting settings[MAX_DEVICE_SETTINGS]; ++ u32 num_bin_files; ++ struct load_driver_file32 bin_files[MAX_DRIVER_BIN_FILES]; ++} __packed; ++ ++#define WRAP_IOCTL_LOAD_DEVICE32 _IOW(('N' + 'd' + 'i' + 'S'), 0, u32) ++#define WRAP_IOCTL_LOAD_DRIVER32 _IOW(('N' + 'd' + 'i' + 'S'), 1, u32) ++#define WRAP_IOCTL_LOAD_BIN_FILE32 _IOW(('N' + 'd' + 'i' + 'S'), 2, u32) ++#endif ++ ++#define WRAP_CMD_LOAD_DEVICE "load_device" ++#define WRAP_CMD_LOAD_DRIVER "load_driver" ++#define WRAP_CMD_LOAD_BIN_FILE "load_bin_file" ++ ++int loader_init(void); ++void loader_exit(void); ++ ++#ifdef __KERNEL__ ++struct wrap_device *load_wrap_device(struct load_device *load_device); ++struct wrap_driver *load_wrap_driver(struct wrap_device *device); ++struct wrap_bin_file *get_bin_file(char *bin_file_name); ++void free_bin_file(struct wrap_bin_file *bin_file); ++void unload_wrap_driver(struct wrap_driver *driver); ++void unload_wrap_device(struct wrap_device *wd); ++struct wrap_device *get_wrap_device(void *dev, int bus_type); ++ ++extern struct mutex loader_mutex; ++#endif ++ ++#endif /* LOADER_H */ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/longlong.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/longlong.h +--- linux-3.12.2/3rdparty/ndiswrapper/longlong.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/longlong.h 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,1333 @@ ++/* longlong.h -- definitions for mixed size 32/64 bit arithmetic. ++ Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000 ++ Free Software Foundation, Inc. ++ ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++/* You have to define the following before including this file: ++ ++ UWtype -- An unsigned type, default type for operations (typically a "word") ++ UHWtype -- An unsigned type, at least half the size of UWtype. ++ UDWtype -- An unsigned type, at least twice as large a UWtype ++ W_TYPE_SIZE -- size in bits of UWtype ++ ++ UQItype -- Unsigned 8 bit type. ++ SItype, USItype -- Signed and unsigned 32 bit types. ++ DItype, UDItype -- Signed and unsigned 64 bit types. ++ ++ On a 32 bit machine UWtype should typically be USItype; ++ on a 64 bit machine, UWtype should typically be UDItype. ++*/ ++ ++#define __BITS4 (W_TYPE_SIZE / 4) ++#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) ++#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) ++#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2)) ++ ++#ifndef W_TYPE_SIZE ++#define W_TYPE_SIZE 32 ++#define UWtype USItype ++#define UHWtype USItype ++#define UDWtype UDItype ++#endif ++ ++/* Define auxiliary asm macros. ++ ++ 1) umul_ppmm(high_prod, low_prod, multipler, multiplicand) multiplies two ++ UWtype integers MULTIPLER and MULTIPLICAND, and generates a two UWtype ++ word product in HIGH_PROD and LOW_PROD. ++ ++ 2) __umulsidi3(a,b) multiplies two UWtype integers A and B, and returns a ++ UDWtype product. This is just a variant of umul_ppmm. ++ ++ 3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator, ++ denominator) divides a UDWtype, composed by the UWtype integers ++ HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient ++ in QUOTIENT and the remainder in REMAINDER. HIGH_NUMERATOR must be less ++ than DENOMINATOR for correct operation. If, in addition, the most ++ significant bit of DENOMINATOR must be 1, then the pre-processor symbol ++ UDIV_NEEDS_NORMALIZATION is defined to 1. ++ ++ 4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator, ++ denominator). Like udiv_qrnnd but the numbers are signed. The quotient ++ is rounded towards 0. ++ ++ 5) count_leading_zeros(count, x) counts the number of zero-bits from the ++ msb to the first nonzero bit in the UWtype X. This is the number of ++ steps X needs to be shifted left to set the msb. Undefined for X == 0, ++ unless the symbol COUNT_LEADING_ZEROS_0 is defined to some value. ++ ++ 6) count_trailing_zeros(count, x) like count_leading_zeros, but counts ++ from the least significant end. ++ ++ 7) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1, ++ high_addend_2, low_addend_2) adds two UWtype integers, composed by ++ HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2 ++ respectively. The result is placed in HIGH_SUM and LOW_SUM. Overflow ++ (i.e. carry out) is not stored anywhere, and is lost. ++ ++ 8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend, ++ high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers, ++ composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and ++ LOW_SUBTRAHEND_2 respectively. The result is placed in HIGH_DIFFERENCE ++ and LOW_DIFFERENCE. Overflow (i.e. carry out) is not stored anywhere, ++ and is lost. ++ ++ If any of these macros are left undefined for a particular CPU, ++ C macros are used. */ ++ ++/* The CPUs come in alphabetical order below. ++ ++ Please add support for more CPUs here, or improve the current support ++ for the CPUs below! ++ (E.g. WE32100, IBM360.) */ ++ ++#if defined (__GNUC__) && !defined (NO_ASM) ++ ++/* We sometimes need to clobber "cc" with gcc2, but that would not be ++ understood by gcc1. Use cpp to avoid major code duplication. */ ++#if __GNUC__ < 2 ++#define __CLOBBER_CC ++#define __AND_CLOBBER_CC ++#else /* __GNUC__ >= 2 */ ++#define __CLOBBER_CC : "cc" ++#define __AND_CLOBBER_CC , "cc" ++#endif /* __GNUC__ < 2 */ ++ ++#if defined (__alpha) && W_TYPE_SIZE == 64 ++#define umul_ppmm(ph, pl, m0, m1) \ ++ do { \ ++ UDItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("umulh %r1,%2,%0" \ ++ : "=r" ((UDItype) ph) \ ++ : "%rJ" (__m0), \ ++ "rI" (__m1)); \ ++ (pl) = __m0 * __m1; \ ++ } while (0) ++#define UMUL_TIME 46 ++#ifndef LONGLONG_STANDALONE ++#define udiv_qrnnd(q, r, n1, n0, d) \ ++ do { UDItype __r; \ ++ (q) = __udiv_qrnnd (&__r, (n1), (n0), (d)); \ ++ (r) = __r; \ ++ } while (0) ++extern UDItype __udiv_qrnnd (UDItype *, UDItype, UDItype, UDItype); ++#define UDIV_TIME 220 ++#endif /* LONGLONG_STANDALONE */ ++#ifdef __alpha_cix__ ++#define count_leading_zeros(COUNT,X) \ ++ __asm__("ctlz %1,%0" : "=r"(COUNT) : "r"(X)) ++#define count_trailing_zeros(COUNT,X) \ ++ __asm__("cttz %1,%0" : "=r"(COUNT) : "r"(X)) ++#define COUNT_LEADING_ZEROS_0 64 ++#else ++extern const UQItype __clz_tab[]; ++#define count_leading_zeros(COUNT,X) \ ++ do { \ ++ UDItype __xr = (X), __t, __a; \ ++ __asm__("cmpbge $31,%1,%0" : "=r"(__t) : "r"(__xr)); \ ++ __a = __clz_tab[__t ^ 0xff] - 1; \ ++ __asm__("extbl %1,%2,%0" : "=r"(__t) : "r"(__xr), "r"(__a)); \ ++ (COUNT) = 64 - (__clz_tab[__t] + __a*8); \ ++ } while (0) ++#define count_trailing_zeros(COUNT,X) \ ++ do { \ ++ UDItype __xr = (X), __t, __a; \ ++ __asm__("cmpbge $31,%1,%0" : "=r"(__t) : "r"(__xr)); \ ++ __t = ~__t & -~__t; \ ++ __a = ((__t & 0xCC) != 0) * 2; \ ++ __a += ((__t & 0xF0) != 0) * 4; \ ++ __a += ((__t & 0xAA) != 0); \ ++ __asm__("extbl %1,%2,%0" : "=r"(__t) : "r"(__xr), "r"(__a)); \ ++ __a <<= 3; \ ++ __t &= -__t; \ ++ __a += ((__t & 0xCC) != 0) * 2; \ ++ __a += ((__t & 0xF0) != 0) * 4; \ ++ __a += ((__t & 0xAA) != 0); \ ++ (COUNT) = __a; \ ++ } while (0) ++#endif /* __alpha_cix__ */ ++#endif /* __alpha */ ++ ++#if defined (__arc__) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("add.f %1, %4, %5\n\tadc %0, %2, %3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%r" ((USItype) (ah)), \ ++ "rIJ" ((USItype) (bh)), \ ++ "%r" ((USItype) (al)), \ ++ "rIJ" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("sub.f %1, %4, %5\n\tsbc %0, %2, %3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "r" ((USItype) (ah)), \ ++ "rIJ" ((USItype) (bh)), \ ++ "r" ((USItype) (al)), \ ++ "rIJ" ((USItype) (bl))) ++/* Call libgcc routine. */ ++#define umul_ppmm(w1, w0, u, v) \ ++do { \ ++ DWunion __w; \ ++ __w.ll = __umulsidi3 (u, v); \ ++ w1 = __w.s.high; \ ++ w0 = __w.s.low; \ ++} while (0) ++#define __umulsidi3 __umulsidi3 ++UDItype __umulsidi3 (USItype, USItype); ++#endif ++ ++#if defined (__arm__) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("adds %1, %4, %5\n\tadc %0, %2, %3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%r" ((USItype) (ah)), \ ++ "rI" ((USItype) (bh)), \ ++ "%r" ((USItype) (al)), \ ++ "rI" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("subs %1, %4, %5\n\tsbc %0, %2, %3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "r" ((USItype) (ah)), \ ++ "rI" ((USItype) (bh)), \ ++ "r" ((USItype) (al)), \ ++ "rI" ((USItype) (bl))) ++#define umul_ppmm(xh, xl, a, b) \ ++{register USItype __t0, __t1, __t2; \ ++ __asm__ ("%@ Inlined umul_ppmm\n" \ ++ " mov %2, %5, lsr #16\n" \ ++ " mov %0, %6, lsr #16\n" \ ++ " bic %3, %5, %2, lsl #16\n" \ ++ " bic %4, %6, %0, lsl #16\n" \ ++ " mul %1, %3, %4\n" \ ++ " mul %4, %2, %4\n" \ ++ " mul %3, %0, %3\n" \ ++ " mul %0, %2, %0\n" \ ++ " adds %3, %4, %3\n" \ ++ " addcs %0, %0, #65536\n" \ ++ " adds %1, %1, %3, lsl #16\n" \ ++ " adc %0, %0, %3, lsr #16" \ ++ : "=&r" ((USItype) (xh)), \ ++ "=r" ((USItype) (xl)), \ ++ "=&r" (__t0), "=&r" (__t1), "=r" (__t2) \ ++ : "r" ((USItype) (a)), \ ++ "r" ((USItype) (b)));} ++#define UMUL_TIME 20 ++#define UDIV_TIME 100 ++#endif /* __arm__ */ ++ ++#if defined (__hppa) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("add %4,%5,%1\n\taddc %2,%3,%0" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%rM" ((USItype) (ah)), \ ++ "rM" ((USItype) (bh)), \ ++ "%rM" ((USItype) (al)), \ ++ "rM" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("sub %4,%5,%1\n\tsubb %2,%3,%0" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "rM" ((USItype) (ah)), \ ++ "rM" ((USItype) (bh)), \ ++ "rM" ((USItype) (al)), \ ++ "rM" ((USItype) (bl))) ++#if defined (_PA_RISC1_1) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ union \ ++ { \ ++ UDItype __f; \ ++ struct {USItype __w1, __w0;} __w1w0; \ ++ } __t; \ ++ __asm__ ("xmpyu %1,%2,%0" \ ++ : "=x" (__t.__f) \ ++ : "x" ((USItype) (u)), \ ++ "x" ((USItype) (v))); \ ++ (w1) = __t.__w1w0.__w1; \ ++ (w0) = __t.__w1w0.__w0; \ ++ } while (0) ++#define UMUL_TIME 8 ++#else ++#define UMUL_TIME 30 ++#endif ++#define UDIV_TIME 40 ++#define count_leading_zeros(count, x) \ ++ do { \ ++ USItype __tmp; \ ++ __asm__ ( \ ++ "ldi 1,%0\n" \ ++" extru,= %1,15,16,%%r0 ; Bits 31..16 zero?\n" \ ++" extru,tr %1,15,16,%1 ; No. Shift down, skip add.\n"\ ++" ldo 16(%0),%0 ; Yes. Perform add.\n" \ ++" extru,= %1,23,8,%%r0 ; Bits 15..8 zero?\n" \ ++" extru,tr %1,23,8,%1 ; No. Shift down, skip add.\n"\ ++" ldo 8(%0),%0 ; Yes. Perform add.\n" \ ++" extru,= %1,27,4,%%r0 ; Bits 7..4 zero?\n" \ ++" extru,tr %1,27,4,%1 ; No. Shift down, skip add.\n"\ ++" ldo 4(%0),%0 ; Yes. Perform add.\n" \ ++" extru,= %1,29,2,%%r0 ; Bits 3..2 zero?\n" \ ++" extru,tr %1,29,2,%1 ; No. Shift down, skip add.\n"\ ++" ldo 2(%0),%0 ; Yes. Perform add.\n" \ ++" extru %1,30,1,%1 ; Extract bit 1.\n" \ ++" sub %0,%1,%0 ; Subtract it.\n" \ ++ : "=r" (count), "=r" (__tmp) : "1" (x)); \ ++ } while (0) ++#endif ++ ++#if (defined (__i370__) || defined (__mvs__)) && W_TYPE_SIZE == 32 ++#define umul_ppmm(xh, xl, m0, m1) \ ++ do { \ ++ union {UDItype __ll; \ ++ struct {USItype __h, __l;} __i; \ ++ } __xx; \ ++ USItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("mr %0,%3" \ ++ : "=r" (__xx.__i.__h), \ ++ "=r" (__xx.__i.__l) \ ++ : "%1" (__m0), \ ++ "r" (__m1)); \ ++ (xh) = __xx.__i.__h; (xl) = __xx.__i.__l; \ ++ (xh) += ((((SItype) __m0 >> 31) & __m1) \ ++ + (((SItype) __m1 >> 31) & __m0)); \ ++ } while (0) ++#define smul_ppmm(xh, xl, m0, m1) \ ++ do { \ ++ union {DItype __ll; \ ++ struct {USItype __h, __l;} __i; \ ++ } __xx; \ ++ __asm__ ("mr %0,%3" \ ++ : "=r" (__xx.__i.__h), \ ++ "=r" (__xx.__i.__l) \ ++ : "%1" (m0), \ ++ "r" (m1)); \ ++ (xh) = __xx.__i.__h; (xl) = __xx.__i.__l; \ ++ } while (0) ++#define sdiv_qrnnd(q, r, n1, n0, d) \ ++ do { \ ++ union {DItype __ll; \ ++ struct {USItype __h, __l;} __i; \ ++ } __xx; \ ++ __xx.__i.__h = n1; __xx.__i.__l = n0; \ ++ __asm__ ("dr %0,%2" \ ++ : "=r" (__xx.__ll) \ ++ : "0" (__xx.__ll), "r" (d)); \ ++ (q) = __xx.__i.__l; (r) = __xx.__i.__h; \ ++ } while (0) ++#endif ++ ++#if (defined (__i386__) || defined (__i486__)) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("addl %5,%1\n\tadcl %3,%0" \ ++ : "=r" (sh), \ ++ "=&r" (sl) \ ++ : "%0" ((USItype) (ah)), \ ++ "g" ((USItype) (bh)), \ ++ "%1" ((USItype) (al)), \ ++ "g" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("subl %5,%1\n\tsbbl %3,%0" \ ++ : "=r" (sh), \ ++ "=&r" (sl) \ ++ : "0" ((USItype) (ah)), \ ++ "g" ((USItype) (bh)), \ ++ "1" ((USItype) (al)), \ ++ "g" ((USItype) (bl))) ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ("mull %3" \ ++ : "=a" (w0), \ ++ "=d" (w1) \ ++ : "%0" ((USItype) (u)), \ ++ "rm" ((USItype) (v))) ++#define udiv_qrnnd(q, r, n1, n0, dv) \ ++ __asm__ ("divl %4" \ ++ : "=a" (q), \ ++ "=d" (r) \ ++ : "0" ((USItype) (n0)), \ ++ "1" ((USItype) (n1)), \ ++ "rm" ((USItype) (dv))) ++#define count_leading_zeros(count, x) \ ++ do { \ ++ USItype __cbtmp; \ ++ __asm__ ("bsrl %1,%0" \ ++ : "=r" (__cbtmp) : "rm" ((USItype) (x))); \ ++ (count) = __cbtmp ^ 31; \ ++ } while (0) ++#define count_trailing_zeros(count, x) \ ++ __asm__ ("bsfl %1,%0" : "=r" (count) : "rm" ((USItype)(x))) ++#define UMUL_TIME 40 ++#define UDIV_TIME 40 ++#endif /* 80x86 */ ++ ++#if defined (__i960__) && W_TYPE_SIZE == 32 ++#define umul_ppmm(w1, w0, u, v) \ ++ ({union {UDItype __ll; \ ++ struct {USItype __l, __h;} __i; \ ++ } __xx; \ ++ __asm__ ("emul %2,%1,%0" \ ++ : "=d" (__xx.__ll) \ ++ : "%dI" ((USItype) (u)), \ ++ "dI" ((USItype) (v))); \ ++ (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;}) ++#define __umulsidi3(u, v) \ ++ ({UDItype __w; \ ++ __asm__ ("emul %2,%1,%0" \ ++ : "=d" (__w) \ ++ : "%dI" ((USItype) (u)), \ ++ "dI" ((USItype) (v))); \ ++ __w; }) ++#endif /* __i960__ */ ++ ++#if defined (__M32R__) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ /* The cmp clears the condition bit. */ \ ++ __asm__ ("cmp %0,%0\n\taddx %%5,%1\n\taddx %%3,%0" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%0" ((USItype) (ah)), \ ++ "r" ((USItype) (bh)), \ ++ "%1" ((USItype) (al)), \ ++ "r" ((USItype) (bl)) \ ++ : "cbit") ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ /* The cmp clears the condition bit. */ \ ++ __asm__ ("cmp %0,%0\n\tsubx %5,%1\n\tsubx %3,%0" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "0" ((USItype) (ah)), \ ++ "r" ((USItype) (bh)), \ ++ "1" ((USItype) (al)), \ ++ "r" ((USItype) (bl)) \ ++ : "cbit") ++#endif /* __M32R__ */ ++ ++#if defined (__mc68000__) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("add%.l %5,%1\n\taddx%.l %3,%0" \ ++ : "=d" ((USItype) (sh)), \ ++ "=&d" ((USItype) (sl)) \ ++ : "%0" ((USItype) (ah)), \ ++ "d" ((USItype) (bh)), \ ++ "%1" ((USItype) (al)), \ ++ "g" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("sub%.l %5,%1\n\tsubx%.l %3,%0" \ ++ : "=d" ((USItype) (sh)), \ ++ "=&d" ((USItype) (sl)) \ ++ : "0" ((USItype) (ah)), \ ++ "d" ((USItype) (bh)), \ ++ "1" ((USItype) (al)), \ ++ "g" ((USItype) (bl))) ++ ++/* The '020, '030, '040 and CPU32 have 32x32->64 and 64/32->32q-32r. */ ++#if defined (__mc68020__) || defined(mc68020) \ ++ || defined(__mc68030__) || defined(mc68030) \ ++ || defined(__mc68040__) || defined(mc68040) \ ++ || defined(__mcpu32__) || defined(mcpu32) ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ("mulu%.l %3,%1:%0" \ ++ : "=d" ((USItype) (w0)), \ ++ "=d" ((USItype) (w1)) \ ++ : "%0" ((USItype) (u)), \ ++ "dmi" ((USItype) (v))) ++#define UMUL_TIME 45 ++#define udiv_qrnnd(q, r, n1, n0, d) \ ++ __asm__ ("divu%.l %4,%1:%0" \ ++ : "=d" ((USItype) (q)), \ ++ "=d" ((USItype) (r)) \ ++ : "0" ((USItype) (n0)), \ ++ "1" ((USItype) (n1)), \ ++ "dmi" ((USItype) (d))) ++#define UDIV_TIME 90 ++#define sdiv_qrnnd(q, r, n1, n0, d) \ ++ __asm__ ("divs%.l %4,%1:%0" \ ++ : "=d" ((USItype) (q)), \ ++ "=d" ((USItype) (r)) \ ++ : "0" ((USItype) (n0)), \ ++ "1" ((USItype) (n1)), \ ++ "dmi" ((USItype) (d))) ++ ++#else /* not mc68020 */ ++#if !defined(__mcf5200__) ++/* %/ inserts REGISTER_PREFIX, %# inserts IMMEDIATE_PREFIX. */ ++#define umul_ppmm(xh, xl, a, b) \ ++ __asm__ ("| Inlined umul_ppmm\n" \ ++ " move%.l %2,%/d0\n" \ ++ " move%.l %3,%/d1\n" \ ++ " move%.l %/d0,%/d2\n" \ ++ " swap %/d0\n" \ ++ " move%.l %/d1,%/d3\n" \ ++ " swap %/d1\n" \ ++ " move%.w %/d2,%/d4\n" \ ++ " mulu %/d3,%/d4\n" \ ++ " mulu %/d1,%/d2\n" \ ++ " mulu %/d0,%/d3\n" \ ++ " mulu %/d0,%/d1\n" \ ++ " move%.l %/d4,%/d0\n" \ ++ " eor%.w %/d0,%/d0\n" \ ++ " swap %/d0\n" \ ++ " add%.l %/d0,%/d2\n" \ ++ " add%.l %/d3,%/d2\n" \ ++ " jcc 1f\n" \ ++ " add%.l %#65536,%/d1\n" \ ++ "1: swap %/d2\n" \ ++ " moveq %#0,%/d0\n" \ ++ " move%.w %/d2,%/d0\n" \ ++ " move%.w %/d4,%/d2\n" \ ++ " move%.l %/d2,%1\n" \ ++ " add%.l %/d1,%/d0\n" \ ++ " move%.l %/d0,%0" \ ++ : "=g" ((USItype) (xh)), \ ++ "=g" ((USItype) (xl)) \ ++ : "g" ((USItype) (a)), \ ++ "g" ((USItype) (b)) \ ++ : "d0", "d1", "d2", "d3", "d4") ++#define UMUL_TIME 100 ++#define UDIV_TIME 400 ++#endif /* not mcf5200 */ ++#endif /* not mc68020 */ ++ ++/* The '020, '030, '040 and '060 have bitfield insns. */ ++#if defined (__mc68020__) || defined(mc68020) \ ++ || defined(__mc68030__) || defined(mc68030) \ ++ || defined(__mc68040__) || defined(mc68040) \ ++ || defined(__mc68060__) || defined(mc68060) ++#define count_leading_zeros(count, x) \ ++ __asm__ ("bfffo %1{%b2:%b2},%0" \ ++ : "=d" ((USItype) (count)) \ ++ : "od" ((USItype) (x)), "n" (0)) ++#endif ++#endif /* mc68000 */ ++ ++#if defined (__m88000__) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("addu.co %1,%r4,%r5\n\taddu.ci %0,%r2,%r3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%rJ" ((USItype) (ah)), \ ++ "rJ" ((USItype) (bh)), \ ++ "%rJ" ((USItype) (al)), \ ++ "rJ" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("subu.co %1,%r4,%r5\n\tsubu.ci %0,%r2,%r3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "rJ" ((USItype) (ah)), \ ++ "rJ" ((USItype) (bh)), \ ++ "rJ" ((USItype) (al)), \ ++ "rJ" ((USItype) (bl))) ++#define count_leading_zeros(count, x) \ ++ do { \ ++ USItype __cbtmp; \ ++ __asm__ ("ff1 %0,%1" \ ++ : "=r" (__cbtmp) \ ++ : "r" ((USItype) (x))); \ ++ (count) = __cbtmp ^ 31; \ ++ } while (0) ++#define COUNT_LEADING_ZEROS_0 63 /* sic */ ++#if defined (__mc88110__) ++#define umul_ppmm(wh, wl, u, v) \ ++ do { \ ++ union {UDItype __ll; \ ++ struct {USItype __h, __l;} __i; \ ++ } __xx; \ ++ __asm__ ("mulu.d %0,%1,%2" \ ++ : "=r" (__xx.__ll) \ ++ : "r" ((USItype) (u)), \ ++ "r" ((USItype) (v))); \ ++ (wh) = __xx.__i.__h; \ ++ (wl) = __xx.__i.__l; \ ++ } while (0) ++#define udiv_qrnnd(q, r, n1, n0, d) \ ++ ({union {UDItype __ll; \ ++ struct {USItype __h, __l;} __i; \ ++ } __xx; \ ++ USItype __q; \ ++ __xx.__i.__h = (n1); __xx.__i.__l = (n0); \ ++ __asm__ ("divu.d %0,%1,%2" \ ++ : "=r" (__q) \ ++ : "r" (__xx.__ll), \ ++ "r" ((USItype) (d))); \ ++ (r) = (n0) - __q * (d); (q) = __q; }) ++#define UMUL_TIME 5 ++#define UDIV_TIME 25 ++#else ++#define UMUL_TIME 17 ++#define UDIV_TIME 150 ++#endif /* __mc88110__ */ ++#endif /* __m88000__ */ ++ ++#if defined (__mips__) && W_TYPE_SIZE == 32 ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ("multu %2,%3" \ ++ : "=l" ((USItype) (w0)), \ ++ "=h" ((USItype) (w1)) \ ++ : "d" ((USItype) (u)), \ ++ "d" ((USItype) (v))) ++#define UMUL_TIME 10 ++#define UDIV_TIME 100 ++#endif /* __mips__ */ ++ ++#if defined (__ns32000__) && W_TYPE_SIZE == 32 ++#define umul_ppmm(w1, w0, u, v) \ ++ ({union {UDItype __ll; \ ++ struct {USItype __l, __h;} __i; \ ++ } __xx; \ ++ __asm__ ("meid %2,%0" \ ++ : "=g" (__xx.__ll) \ ++ : "%0" ((USItype) (u)), \ ++ "g" ((USItype) (v))); \ ++ (w1) = __xx.__i.__h; (w0) = __xx.__i.__l;}) ++#define __umulsidi3(u, v) \ ++ ({UDItype __w; \ ++ __asm__ ("meid %2,%0" \ ++ : "=g" (__w) \ ++ : "%0" ((USItype) (u)), \ ++ "g" ((USItype) (v))); \ ++ __w; }) ++#define udiv_qrnnd(q, r, n1, n0, d) \ ++ ({union {UDItype __ll; \ ++ struct {USItype __l, __h;} __i; \ ++ } __xx; \ ++ __xx.__i.__h = (n1); __xx.__i.__l = (n0); \ ++ __asm__ ("deid %2,%0" \ ++ : "=g" (__xx.__ll) \ ++ : "0" (__xx.__ll), \ ++ "g" ((USItype) (d))); \ ++ (r) = __xx.__i.__l; (q) = __xx.__i.__h; }) ++#define count_trailing_zeros(count,x) \ ++ do { \ ++ __asm__ ("ffsd %2,%0" \ ++ : "=r" ((USItype) (count)) \ ++ : "0" ((USItype) 0), \ ++ "r" ((USItype) (x))); \ ++ } while (0) ++#endif /* __ns32000__ */ ++ ++/* FIXME: We should test _IBMR2 here when we add assembly support for the ++ system vendor compilers. ++ FIXME: What's needed for gcc PowerPC VxWorks? __vxworks__ is not good ++ enough, since that hits ARM and m68k too. */ ++#if (defined (_ARCH_PPC) /* AIX */ \ ++ || defined (_ARCH_PWR) /* AIX */ \ ++ || defined (_ARCH_COM) /* AIX */ \ ++ || defined (__powerpc__) /* gcc */ \ ++ || defined (__POWERPC__) /* BEOS */ \ ++ || defined (__ppc__) /* Darwin */ \ ++ || defined (PPC) /* GNU/Linux, SysV */ \ ++ ) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ do { \ ++ if (__builtin_constant_p (bh) && (bh) == 0) \ ++ __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\ ++ else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0) \ ++ __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\ ++ else \ ++ __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3" \ ++ : "=r" (sh), "=&r" (sl) \ ++ : "%r" (ah), "r" (bh), "%r" (al), "rI" (bl)); \ ++ } while (0) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ do { \ ++ if (__builtin_constant_p (ah) && (ah) == 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\ ++ else if (__builtin_constant_p (ah) && (ah) == ~(USItype) 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\ ++ else if (__builtin_constant_p (bh) && (bh) == 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\ ++ else if (__builtin_constant_p (bh) && (bh) == ~(USItype) 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\ ++ else \ ++ __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2" \ ++ : "=r" (sh), "=&r" (sl) \ ++ : "r" (ah), "r" (bh), "rI" (al), "r" (bl)); \ ++ } while (0) ++#define count_leading_zeros(count, x) \ ++ __asm__ ("{cntlz|cntlzw} %0,%1" : "=r" (count) : "r" (x)) ++#define COUNT_LEADING_ZEROS_0 32 ++#if defined (_ARCH_PPC) || defined (__powerpc__) || defined (__POWERPC__) \ ++ || defined (__ppc__) || defined (PPC) || defined (__vxworks__) ++#define umul_ppmm(ph, pl, m0, m1) \ ++ do { \ ++ USItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("mulhwu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ ++ (pl) = __m0 * __m1; \ ++ } while (0) ++#define UMUL_TIME 15 ++#define smul_ppmm(ph, pl, m0, m1) \ ++ do { \ ++ SItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("mulhw %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ ++ (pl) = __m0 * __m1; \ ++ } while (0) ++#define SMUL_TIME 14 ++#define UDIV_TIME 120 ++#elif defined (_ARCH_PWR) ++#define UMUL_TIME 8 ++#define smul_ppmm(xh, xl, m0, m1) \ ++ __asm__ ("mul %0,%2,%3" : "=r" (xh), "=q" (xl) : "r" (m0), "r" (m1)) ++#define SMUL_TIME 4 ++#define sdiv_qrnnd(q, r, nh, nl, d) \ ++ __asm__ ("div %0,%2,%4" : "=r" (q), "=q" (r) : "r" (nh), "1" (nl), "r" (d)) ++#define UDIV_TIME 100 ++#endif ++#endif /* 32-bit POWER architecture variants. */ ++ ++/* We should test _IBMR2 here when we add assembly support for the system ++ vendor compilers. */ ++#if (defined (_ARCH_PPC64) || defined (__powerpc64__)) && W_TYPE_SIZE == 64 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ do { \ ++ if (__builtin_constant_p (bh) && (bh) == 0) \ ++ __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\ ++ else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0) \ ++ __asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "%r" (al), "rI" (bl));\ ++ else \ ++ __asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3" \ ++ : "=r" (sh), "=&r" (sl) \ ++ : "%r" (ah), "r" (bh), "%r" (al), "rI" (bl)); \ ++ } while (0) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ do { \ ++ if (__builtin_constant_p (ah) && (ah) == 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\ ++ else if (__builtin_constant_p (ah) && (ah) == ~(UDItype) 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (bh), "rI" (al), "r" (bl));\ ++ else if (__builtin_constant_p (bh) && (bh) == 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\ ++ else if (__builtin_constant_p (bh) && (bh) == ~(UDItype) 0) \ ++ __asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2" \ ++ : "=r" (sh), "=&r" (sl) : "r" (ah), "rI" (al), "r" (bl));\ ++ else \ ++ __asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2" \ ++ : "=r" (sh), "=&r" (sl) \ ++ : "r" (ah), "r" (bh), "rI" (al), "r" (bl)); \ ++ } while (0) ++#define count_leading_zeros(count, x) \ ++ __asm__ ("cntlzd %0,%1" : "=r" (count) : "r" (x)) ++#define COUNT_LEADING_ZEROS_0 64 ++#define umul_ppmm(ph, pl, m0, m1) \ ++ do { \ ++ UDItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("mulhdu %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ ++ (pl) = __m0 * __m1; \ ++ } while (0) ++#define UMUL_TIME 15 ++#define smul_ppmm(ph, pl, m0, m1) \ ++ do { \ ++ DItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("mulhd %0,%1,%2" : "=r" (ph) : "%r" (m0), "r" (m1)); \ ++ (pl) = __m0 * __m1; \ ++ } while (0) ++#define SMUL_TIME 14 /* ??? */ ++#define UDIV_TIME 120 /* ??? */ ++#endif /* 64-bit PowerPC. */ ++ ++#if defined (__ibm032__) /* RT/ROMP */ && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("a %1,%5\n\tae %0,%3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%0" ((USItype) (ah)), \ ++ "r" ((USItype) (bh)), \ ++ "%1" ((USItype) (al)), \ ++ "r" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("s %1,%5\n\tse %0,%3" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "0" ((USItype) (ah)), \ ++ "r" ((USItype) (bh)), \ ++ "1" ((USItype) (al)), \ ++ "r" ((USItype) (bl))) ++#define umul_ppmm(ph, pl, m0, m1) \ ++ do { \ ++ USItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ( \ ++ "s r2,r2\n" \ ++" mts r10,%2\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" m r2,%3\n" \ ++" cas %0,r2,r0\n" \ ++" mfs r10,%1" \ ++ : "=r" ((USItype) (ph)), \ ++ "=r" ((USItype) (pl)) \ ++ : "%r" (__m0), \ ++ "r" (__m1) \ ++ : "r2"); \ ++ (ph) += ((((SItype) __m0 >> 31) & __m1) \ ++ + (((SItype) __m1 >> 31) & __m0)); \ ++ } while (0) ++#define UMUL_TIME 20 ++#define UDIV_TIME 200 ++#define count_leading_zeros(count, x) \ ++ do { \ ++ if ((x) >= 0x10000) \ ++ __asm__ ("clz %0,%1" \ ++ : "=r" ((USItype) (count)) \ ++ : "r" ((USItype) (x) >> 16)); \ ++ else \ ++ { \ ++ __asm__ ("clz %0,%1" \ ++ : "=r" ((USItype) (count)) \ ++ : "r" ((USItype) (x))); \ ++ (count) += 16; \ ++ } \ ++ } while (0) ++#endif ++ ++#if defined (__sh2__) && W_TYPE_SIZE == 32 ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ( \ ++ "dmulu.l %2,%3\n\tsts macl,%1\n\tsts mach,%0" \ ++ : "=r" ((USItype)(w1)), \ ++ "=r" ((USItype)(w0)) \ ++ : "r" ((USItype)(u)), \ ++ "r" ((USItype)(v)) \ ++ : "macl", "mach") ++#define UMUL_TIME 5 ++#endif ++ ++#if defined (__SH5__) && __SHMEDIA__ && W_TYPE_SIZE == 32 ++#define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v) ++#define count_leading_zeros(count, x) \ ++ do \ ++ { \ ++ UDItype x_ = (USItype)(x); \ ++ SItype c_; \ ++ \ ++ __asm__ ("nsb %1, %0" : "=r" (c_) : "r" (x_)); \ ++ (count) = c_ - 31; \ ++ } \ ++ while (0) ++#define COUNT_LEADING_ZEROS_0 32 ++#endif ++ ++#if defined (__sparc__) && !defined (__arch64__) && !defined (__sparcv9) \ ++ && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("addcc %r4,%5,%1\n\taddx %r2,%3,%0" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "%rJ" ((USItype) (ah)), \ ++ "rI" ((USItype) (bh)), \ ++ "%rJ" ((USItype) (al)), \ ++ "rI" ((USItype) (bl)) \ ++ __CLOBBER_CC) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("subcc %r4,%5,%1\n\tsubx %r2,%3,%0" \ ++ : "=r" ((USItype) (sh)), \ ++ "=&r" ((USItype) (sl)) \ ++ : "rJ" ((USItype) (ah)), \ ++ "rI" ((USItype) (bh)), \ ++ "rJ" ((USItype) (al)), \ ++ "rI" ((USItype) (bl)) \ ++ __CLOBBER_CC) ++#if defined (__sparc_v8__) ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ("umul %2,%3,%1;rd %%y,%0" \ ++ : "=r" ((USItype) (w1)), \ ++ "=r" ((USItype) (w0)) \ ++ : "r" ((USItype) (u)), \ ++ "r" ((USItype) (v))) ++#define udiv_qrnnd(__q, __r, __n1, __n0, __d) \ ++ __asm__ ("mov %2,%%y;nop;nop;nop;udiv %3,%4,%0;umul %0,%4,%1;sub %3,%1,%1"\ ++ : "=&r" ((USItype) (__q)), \ ++ "=&r" ((USItype) (__r)) \ ++ : "r" ((USItype) (__n1)), \ ++ "r" ((USItype) (__n0)), \ ++ "r" ((USItype) (__d))) ++#else ++#if defined (__sparclite__) ++/* This has hardware multiply but not divide. It also has two additional ++ instructions scan (ffs from high bit) and divscc. */ ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ("umul %2,%3,%1;rd %%y,%0" \ ++ : "=r" ((USItype) (w1)), \ ++ "=r" ((USItype) (w0)) \ ++ : "r" ((USItype) (u)), \ ++ "r" ((USItype) (v))) ++#define udiv_qrnnd(q, r, n1, n0, d) \ ++ __asm__ ("! Inlined udiv_qrnnd\n" \ ++" wr %%g0,%2,%%y ! Not a delayed write for sparclite\n" \ ++" tst %%g0\n" \ ++" divscc %3,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%%g1\n" \ ++" divscc %%g1,%4,%0\n" \ ++" rd %%y,%1\n" \ ++" bl,a 1f\n" \ ++" add %1,%4,%1\n" \ ++"1: ! End of inline udiv_qrnnd" \ ++ : "=r" ((USItype) (q)), \ ++ "=r" ((USItype) (r)) \ ++ : "r" ((USItype) (n1)), \ ++ "r" ((USItype) (n0)), \ ++ "rI" ((USItype) (d)) \ ++ : "g1" __AND_CLOBBER_CC) ++#define UDIV_TIME 37 ++#define count_leading_zeros(count, x) \ ++ do { \ ++ __asm__ ("scan %1,1,%0" \ ++ : "=r" ((USItype) (count)) \ ++ : "r" ((USItype) (x))); \ ++ } while (0) ++/* Early sparclites return 63 for an argument of 0, but they warn that future ++ implementations might change this. Therefore, leave COUNT_LEADING_ZEROS_0 ++ undefined. */ ++#else ++/* SPARC without integer multiplication and divide instructions. ++ (i.e. at least Sun4/20,40,60,65,75,110,260,280,330,360,380,470,490) */ ++#define umul_ppmm(w1, w0, u, v) \ ++ __asm__ ("! Inlined umul_ppmm\n" \ ++" wr %%g0,%2,%%y ! SPARC has 0-3 delay insn after a wr\n"\ ++" sra %3,31,%%o5 ! Don't move this insn\n" \ ++" and %2,%%o5,%%o5 ! Don't move this insn\n" \ ++" andcc %%g0,0,%%g1 ! Don't move this insn\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,%3,%%g1\n" \ ++" mulscc %%g1,0,%%g1\n" \ ++" add %%g1,%%o5,%0\n" \ ++" rd %%y,%1" \ ++ : "=r" ((USItype) (w1)), \ ++ "=r" ((USItype) (w0)) \ ++ : "%rI" ((USItype) (u)), \ ++ "r" ((USItype) (v)) \ ++ : "g1", "o5" __AND_CLOBBER_CC) ++#define UMUL_TIME 39 /* 39 instructions */ ++/* It's quite necessary to add this much assembler for the sparc. ++ The default udiv_qrnnd (in C) is more than 10 times slower! */ ++#define udiv_qrnnd(__q, __r, __n1, __n0, __d) \ ++ __asm__ ("! Inlined udiv_qrnnd\n" \ ++" mov 32,%%g1\n" \ ++" subcc %1,%2,%%g0\n" \ ++"1: bcs 5f\n" \ ++" addxcc %0,%0,%0 ! shift n1n0 and a q-bit in lsb\n" \ ++" sub %1,%2,%1 ! this kills msb of n\n" \ ++" addx %1,%1,%1 ! so this can't give carry\n" \ ++" subcc %%g1,1,%%g1\n" \ ++"2: bne 1b\n" \ ++" subcc %1,%2,%%g0\n" \ ++" bcs 3f\n" \ ++" addxcc %0,%0,%0 ! shift n1n0 and a q-bit in lsb\n" \ ++" b 3f\n" \ ++" sub %1,%2,%1 ! this kills msb of n\n" \ ++"4: sub %1,%2,%1\n" \ ++"5: addxcc %1,%1,%1\n" \ ++" bcc 2b\n" \ ++" subcc %%g1,1,%%g1\n" \ ++"! Got carry from n. Subtract next step to cancel this carry.\n" \ ++" bne 4b\n" \ ++" addcc %0,%0,%0 ! shift n1n0 and a 0-bit in lsb\n" \ ++" sub %1,%2,%1\n" \ ++"3: xnor %0,0,%0\n" \ ++" ! End of inline udiv_qrnnd" \ ++ : "=&r" ((USItype) (__q)), \ ++ "=&r" ((USItype) (__r)) \ ++ : "r" ((USItype) (__d)), \ ++ "1" ((USItype) (__n1)), \ ++ "0" ((USItype) (__n0)) : "g1" __AND_CLOBBER_CC) ++#define UDIV_TIME (3+7*32) /* 7 instructions/iteration. 32 iterations. */ ++#endif /* __sparclite__ */ ++#endif /* __sparc_v8__ */ ++#endif /* sparc32 */ ++ ++#if ((defined (__sparc__) && defined (__arch64__)) || defined (__sparcv9)) \ ++ && W_TYPE_SIZE == 64 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("addcc %r4,%5,%1\n\t" \ ++ "add %r2,%3,%0\n\t" \ ++ "bcs,a,pn %%xcc, 1f\n\t" \ ++ "add %0, 1, %0\n" \ ++ "1:" \ ++ : "=r" ((UDItype)(sh)), \ ++ "=&r" ((UDItype)(sl)) \ ++ : "%rJ" ((UDItype)(ah)), \ ++ "rI" ((UDItype)(bh)), \ ++ "%rJ" ((UDItype)(al)), \ ++ "rI" ((UDItype)(bl)) \ ++ __CLOBBER_CC) ++ ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("subcc %r4,%5,%1\n\t" \ ++ "sub %r2,%3,%0\n\t" \ ++ "bcs,a,pn %%xcc, 1f\n\t" \ ++ "sub %0, 1, %0\n\t" \ ++ "1:" \ ++ : "=r" ((UDItype)(sh)), \ ++ "=&r" ((UDItype)(sl)) \ ++ : "rJ" ((UDItype)(ah)), \ ++ "rI" ((UDItype)(bh)), \ ++ "rJ" ((UDItype)(al)), \ ++ "rI" ((UDItype)(bl)) \ ++ __CLOBBER_CC) ++ ++#define umul_ppmm(wh, wl, u, v) \ ++ do { \ ++ UDItype tmp1, tmp2, tmp3, tmp4; \ ++ __asm__ __volatile__ ( \ ++ "srl %7,0,%3\n\t" \ ++ "mulx %3,%6,%1\n\t" \ ++ "srlx %6,32,%2\n\t" \ ++ "mulx %2,%3,%4\n\t" \ ++ "sllx %4,32,%5\n\t" \ ++ "srl %6,0,%3\n\t" \ ++ "sub %1,%5,%5\n\t" \ ++ "srlx %5,32,%5\n\t" \ ++ "addcc %4,%5,%4\n\t" \ ++ "srlx %7,32,%5\n\t" \ ++ "mulx %3,%5,%3\n\t" \ ++ "mulx %2,%5,%5\n\t" \ ++ "sethi %%hi(0x80000000),%2\n\t" \ ++ "addcc %4,%3,%4\n\t" \ ++ "srlx %4,32,%4\n\t" \ ++ "add %2,%2,%2\n\t" \ ++ "movcc %%xcc,%%g0,%2\n\t" \ ++ "addcc %5,%4,%5\n\t" \ ++ "sllx %3,32,%3\n\t" \ ++ "add %1,%3,%1\n\t" \ ++ "add %5,%2,%0" \ ++ : "=r" ((UDItype)(wh)), \ ++ "=&r" ((UDItype)(wl)), \ ++ "=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3), "=&r" (tmp4) \ ++ : "r" ((UDItype)(u)), \ ++ "r" ((UDItype)(v)) \ ++ __CLOBBER_CC); \ ++ } while (0) ++#define UMUL_TIME 96 ++#define UDIV_TIME 230 ++#endif /* sparc64 */ ++ ++#if defined (__vax__) && W_TYPE_SIZE == 32 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("addl2 %5,%1\n\tadwc %3,%0" \ ++ : "=g" ((USItype) (sh)), \ ++ "=&g" ((USItype) (sl)) \ ++ : "%0" ((USItype) (ah)), \ ++ "g" ((USItype) (bh)), \ ++ "%1" ((USItype) (al)), \ ++ "g" ((USItype) (bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("subl2 %5,%1\n\tsbwc %3,%0" \ ++ : "=g" ((USItype) (sh)), \ ++ "=&g" ((USItype) (sl)) \ ++ : "0" ((USItype) (ah)), \ ++ "g" ((USItype) (bh)), \ ++ "1" ((USItype) (al)), \ ++ "g" ((USItype) (bl))) ++#define umul_ppmm(xh, xl, m0, m1) \ ++ do { \ ++ union { \ ++ UDItype __ll; \ ++ struct {USItype __l, __h;} __i; \ ++ } __xx; \ ++ USItype __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("emul %1,%2,$0,%0" \ ++ : "=r" (__xx.__ll) \ ++ : "g" (__m0), \ ++ "g" (__m1)); \ ++ (xh) = __xx.__i.__h; \ ++ (xl) = __xx.__i.__l; \ ++ (xh) += ((((SItype) __m0 >> 31) & __m1) \ ++ + (((SItype) __m1 >> 31) & __m0)); \ ++ } while (0) ++#define sdiv_qrnnd(q, r, n1, n0, d) \ ++ do { \ ++ union {DItype __ll; \ ++ struct {SItype __l, __h;} __i; \ ++ } __xx; \ ++ __xx.__i.__h = n1; __xx.__i.__l = n0; \ ++ __asm__ ("ediv %3,%2,%0,%1" \ ++ : "=g" (q), "=g" (r) \ ++ : "g" (__xx.__ll), "g" (d)); \ ++ } while (0) ++#endif /* __vax__ */ ++ ++#if defined (__z8000__) && W_TYPE_SIZE == 16 ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("add %H1,%H5\n\tadc %H0,%H3" \ ++ : "=r" ((unsigned int)(sh)), \ ++ "=&r" ((unsigned int)(sl)) \ ++ : "%0" ((unsigned int)(ah)), \ ++ "r" ((unsigned int)(bh)), \ ++ "%1" ((unsigned int)(al)), \ ++ "rQR" ((unsigned int)(bl))) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ __asm__ ("sub %H1,%H5\n\tsbc %H0,%H3" \ ++ : "=r" ((unsigned int)(sh)), \ ++ "=&r" ((unsigned int)(sl)) \ ++ : "0" ((unsigned int)(ah)), \ ++ "r" ((unsigned int)(bh)), \ ++ "1" ((unsigned int)(al)), \ ++ "rQR" ((unsigned int)(bl))) ++#define umul_ppmm(xh, xl, m0, m1) \ ++ do { \ ++ union {long int __ll; \ ++ struct {unsigned int __h, __l;} __i; \ ++ } __xx; \ ++ unsigned int __m0 = (m0), __m1 = (m1); \ ++ __asm__ ("mult %S0,%H3" \ ++ : "=r" (__xx.__i.__h), \ ++ "=r" (__xx.__i.__l) \ ++ : "%1" (__m0), \ ++ "rQR" (__m1)); \ ++ (xh) = __xx.__i.__h; (xl) = __xx.__i.__l; \ ++ (xh) += ((((signed int) __m0 >> 15) & __m1) \ ++ + (((signed int) __m1 >> 15) & __m0)); \ ++ } while (0) ++#endif /* __z8000__ */ ++ ++#endif /* __GNUC__ */ ++ ++/* If this machine has no inline assembler, use C macros. */ ++ ++#if !defined (add_ssaaaa) ++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ ++ do { \ ++ UWtype __x; \ ++ __x = (al) + (bl); \ ++ (sh) = (ah) + (bh) + (__x < (al)); \ ++ (sl) = __x; \ ++ } while (0) ++#endif ++ ++#if !defined (sub_ddmmss) ++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ ++ do { \ ++ UWtype __x; \ ++ __x = (al) - (bl); \ ++ (sh) = (ah) - (bh) - (__x > (al)); \ ++ (sl) = __x; \ ++ } while (0) ++#endif ++ ++#if !defined (umul_ppmm) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ UWtype __x0, __x1, __x2, __x3; \ ++ UHWtype __ul, __vl, __uh, __vh; \ ++ \ ++ __ul = __ll_lowpart (u); \ ++ __uh = __ll_highpart (u); \ ++ __vl = __ll_lowpart (v); \ ++ __vh = __ll_highpart (v); \ ++ \ ++ __x0 = (UWtype) __ul * __vl; \ ++ __x1 = (UWtype) __ul * __vh; \ ++ __x2 = (UWtype) __uh * __vl; \ ++ __x3 = (UWtype) __uh * __vh; \ ++ \ ++ __x1 += __ll_highpart (__x0);/* this can't give carry */ \ ++ __x1 += __x2; /* but this indeed can */ \ ++ if (__x1 < __x2) /* did we get it? */ \ ++ __x3 += __ll_B; /* yes, add it in the proper pos. */ \ ++ \ ++ (w1) = __x3 + __ll_highpart (__x1); \ ++ (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0); \ ++ } while (0) ++#endif ++ ++#if !defined (__umulsidi3) ++#define __umulsidi3(u, v) \ ++ ({DWunion __w; \ ++ umul_ppmm (__w.s.high, __w.s.low, u, v); \ ++ __w.ll; }) ++#endif ++ ++/* Define this unconditionally, so it can be used for debugging. */ ++#define __udiv_qrnnd_c(q, r, n1, n0, d) \ ++ do { \ ++ UWtype __d1, __d0, __q1, __q0; \ ++ UWtype __r1, __r0, __m; \ ++ __d1 = __ll_highpart (d); \ ++ __d0 = __ll_lowpart (d); \ ++ \ ++ __r1 = (n1) % __d1; \ ++ __q1 = (n1) / __d1; \ ++ __m = (UWtype) __q1 * __d0; \ ++ __r1 = __r1 * __ll_B | __ll_highpart (n0); \ ++ if (__r1 < __m) \ ++ { \ ++ __q1--, __r1 += (d); \ ++ if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\ ++ if (__r1 < __m) \ ++ __q1--, __r1 += (d); \ ++ } \ ++ __r1 -= __m; \ ++ \ ++ __r0 = __r1 % __d1; \ ++ __q0 = __r1 / __d1; \ ++ __m = (UWtype) __q0 * __d0; \ ++ __r0 = __r0 * __ll_B | __ll_lowpart (n0); \ ++ if (__r0 < __m) \ ++ { \ ++ __q0--, __r0 += (d); \ ++ if (__r0 >= (d)) \ ++ if (__r0 < __m) \ ++ __q0--, __r0 += (d); \ ++ } \ ++ __r0 -= __m; \ ++ \ ++ (q) = (UWtype) __q1 * __ll_B | __q0; \ ++ (r) = __r0; \ ++ } while (0) ++ ++/* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through ++ __udiv_w_sdiv (defined in libgcc or elsewhere). */ ++#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd) ++#define udiv_qrnnd(q, r, nh, nl, d) \ ++ do { \ ++ USItype __r; \ ++ (q) = __udiv_w_sdiv (&__r, nh, nl, d); \ ++ (r) = __r; \ ++ } while (0) ++#endif ++ ++/* If udiv_qrnnd was not defined for this processor, use __udiv_qrnnd_c. */ ++#if !defined (udiv_qrnnd) ++#define UDIV_NEEDS_NORMALIZATION 1 ++#define udiv_qrnnd __udiv_qrnnd_c ++#endif ++ ++#if !defined (count_leading_zeros) ++extern const UQItype __clz_tab[]; ++#define count_leading_zeros(count, x) \ ++ do { \ ++ UWtype __xr = (x); \ ++ UWtype __a; \ ++ \ ++ if (W_TYPE_SIZE <= 32) \ ++ { \ ++ __a = __xr < ((UWtype)1<<2*__BITS4) \ ++ ? (__xr < ((UWtype)1<<__BITS4) ? 0 : __BITS4) \ ++ : (__xr < ((UWtype)1<<3*__BITS4) ? 2*__BITS4 : 3*__BITS4); \ ++ } \ ++ else \ ++ { \ ++ for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8) \ ++ if (((__xr >> __a) & 0xff) != 0) \ ++ break; \ ++ } \ ++ \ ++ (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a); \ ++ } while (0) ++#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE ++#endif ++ ++#if !defined (count_trailing_zeros) ++/* Define count_trailing_zeros using count_leading_zeros. The latter might be ++ defined in asm, but if it is not, the C version above is good enough. */ ++#define count_trailing_zeros(count, x) \ ++ do { \ ++ UWtype __ctz_x = (x); \ ++ UWtype __ctz_c; \ ++ count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x); \ ++ (count) = W_TYPE_SIZE - 1 - __ctz_c; \ ++ } while (0) ++#endif ++ ++#ifndef UDIV_NEEDS_NORMALIZATION ++#define UDIV_NEEDS_NORMALIZATION 0 ++#endif +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/Makefile linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile +--- linux-3.12.2/3rdparty/ndiswrapper/Makefile 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile 2013-11-28 21:42:10.000000000 +0200 +@@ -0,0 +1,213 @@ ++# Name of the module ++MODNAME = ndiswrapper ++ ++DISTFILES = \ ++ Makefile crt.c divdi3.c hal.c iw_ndis.c iw_ndis.h lin2win.S lin2win.h \ ++ loader.c loader.h longlong.h mkexport.sh mkstubs.sh ndis.c ndis.h \ ++ ndiswrapper.h ntoskernel.c ntoskernel.h ntoskernel_io.c pe_linker.c \ ++ pe_linker.h pnp.c pnp.h proc.c rtl.c usb.c usb.h win2lin_stubs.S \ ++ winnt_types.h workqueue.c wrapmem.c wrapmem.h wrapndis.c wrapndis.h \ ++ wrapper.c wrapper.h ++ ++# By default, we try to compile the modules for the currently running ++# kernel. But it's the first approximation, as we will re-read the ++# version from the kernel sources. ++KVERS_UNAME ?= $(shell uname -r) ++ ++# KBUILD is the path to the Linux kernel build tree. It is usually the ++# same as the kernel source tree, except when the kernel was compiled in ++# a separate directory. ++KBUILD ?= $(shell readlink -f /lib/modules/$(KVERS_UNAME)/build) ++ ++ifeq (,$(KBUILD)) ++$(error Kernel build tree not found - please set KBUILD to configured kernel) ++endif ++ ++KCONFIG := $(KBUILD)/.config ++ifeq (,$(wildcard $(KCONFIG))) ++$(error No .config found in $(KBUILD), please set KBUILD to configured kernel) ++endif ++ ++ifneq (,$(wildcard $(KBUILD)/include/linux/version.h)) ++ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h)) ++$(error Multiple copies of version.h found, please clean your build tree) ++endif ++endif ++ ++# Kernel Makefile doesn't always know the exact kernel version, so we ++# get it from the kernel headers instead and pass it to make. ++VERSION_H := $(KBUILD)/include/generated/utsrelease.h ++ifeq (,$(wildcard $(VERSION_H))) ++VERSION_H := $(KBUILD)/include/linux/utsrelease.h ++endif ++ifeq (,$(wildcard $(VERSION_H))) ++VERSION_H := $(KBUILD)/include/linux/version.h ++endif ++ifeq (,$(wildcard $(VERSION_H))) ++$(error Please run 'make modules_prepare' in $(KBUILD)) ++endif ++ ++KVERS := $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' $(VERSION_H)) ++ ++ifeq (,$(KVERS)) ++$(error Cannot find UTS_RELEASE in $(VERSION_H), please report) ++endif ++ ++INST_DIR = /lib/modules/$(KVERS)/misc ++ ++SRC_DIR=$(shell pwd) ++ ++include $(KCONFIG) ++ ++# returns of structs and unions in registers when possible, like Windows ++EXTRA_CFLAGS += -freg-struct-return ++ ++# to produce debug trace, add option "DEBUG=" where is 1 to 6 ++ifdef DEBUG ++EXTRA_CFLAGS += -DDEBUG=$(DEBUG) -g ++endif ++ ++# to debug timers, add option "TIMER_DEBUG=1" ++ifdef TIMER_DEBUG ++EXTRA_CFLAGS += -DTIMER_DEBUG ++endif ++ ++# to debug event layer, add option "EVENT_DEBUG=1" ++ifdef EVENT_DEBUG ++EXTRA_CFLAGS += -DEVENT_DEBUG ++endif ++ ++# to debug USB layer, add option "USB_DEBUG=1" ++ifdef USB_DEBUG ++EXTRA_CFLAGS += -DUSB_DEBUG ++endif ++ ++# to debug I/O layer, add option "IO_DEBUG=1" ++ifdef IO_DEBUG ++EXTRA_CFLAGS += -DIO_DEBUG ++endif ++ ++# to debug worker threads, add option "WORK_DEBUG=1" ++ifdef WORK_DEBUG ++EXTRA_CFLAGS += -DWORK_DEBUG ++endif ++ ++# to debug memory allocation, add option "ALLOC_DEBUG=" where is 1 or 2 ++ifdef ALLOC_DEBUG ++EXTRA_CFLAGS += -DALLOC_DEBUG=$(ALLOC_DEBUG) ++endif ++ ++OBJS = crt.o hal.o iw_ndis.o loader.o ndis.o ntoskernel.o ntoskernel_io.o \ ++ pe_linker.o pnp.o proc.o rtl.o wrapmem.o wrapndis.o wrapper.o ++ ++EXPORT_SRCS = crt.c hal.c ndis.c ntoskernel.c ntoskernel_io.c rtl.c ++ ++STUB_SRCS = crt.c hal.c ndis.c ntoskernel.c ntoskernel_io.c \ ++ pnp.c rtl.c wrapndis.c ++ ++ ++# By default, USB layer is compiled in if USB support is in kernel; ++# to disable USB support in ndiswrapper even if USB support is in kernel, ++# add option "DISABLE_USB=1" ++ifndef DISABLE_USB ++ifeq ($(CONFIG_USB),y) ++ENABLE_USB = 1 ++endif ++ifeq ($(CONFIG_USB),m) ++ENABLE_USB = 1 ++endif ++endif ++ ++ifdef ENABLE_USB ++EXPORT_SRCS += usb.c ++STUB_SRCS += usb.c ++OBJS += usb.o ++EXTRA_CFLAGS += -DENABLE_USB ++endif ++ ++ifdef WRAP_WQ ++EXTRA_CFLAGS += -DWRAP_WQ ++OBJS += workqueue.o ++endif ++ ++ ++all: config_check modules ++ ++# generate exports symbol table from C files ++quiet_cmd_mkexport = MKEXPORT $@ ++cmd_mkexport = $(SHELL) $(obj)/mkexport.sh $< $@ ++ ++extra-y += $(EXPORT_SRCS:.c=_exports.h) ++%_exports.h: %.c $(obj)/mkexport.sh FORCE ++ $(call if_changed,mkexport) ++ ++$(addprefix $(obj)/,$(EXPORT_SRCS:.c=.o)): %.o: %_exports.h ++ ++ifeq ($(CONFIG_X86_64),y) ++quiet_cmd_mkstubs = MKSTUBS $@ ++cmd_mkstubs = $(SHELL) $(obj)/mkstubs.sh $(addprefix $(src)/,$(STUB_SRCS)) >$@ ++ ++extra-y += win2lin_stubs.h ++$(obj)/win2lin_stubs.h: $(addprefix $(src)/,$(STUB_SRCS)) FORCE ++ $(call if_changed,mkstubs) ++ ++$(obj)/win2lin_stubs.o: $(obj)/win2lin_stubs.h ++OBJS += win2lin_stubs.o lin2win.o ++else ++OBJS += divdi3.o ++endif ++ ++MODULE := $(MODNAME).ko ++obj-m := $(MODNAME).o ++ ++$(MODNAME)-objs := $(OBJS) ++ ++ ++config_check: ++ @if [ -z "$(CONFIG_WIRELESS_EXT)$(CONFIG_NET_RADIO)" ]; then \ ++ echo; echo; \ ++ echo "*** WARNING: This kernel lacks wireless extensions."; \ ++ echo "Wireless drivers will not work properly."; \ ++ echo; echo; \ ++ fi ++ @if [ -z "$(CONFIG_X86_64)" ] && [ -n "$(CONFIG_4KSTACKS)" ]; then \ ++ echo; echo; \ ++ echo "*** WARNING: This kernel uses 4K stack size option"; \ ++ echo "(CONFIG_4KSTACKS); many Windows drivers will not work"; \ ++ echo "with this option enabled. Disable CONFIG_4KSTACKS"; \ ++ echo "in kernel's .config file, recompile and install kernel"; \ ++ echo; echo; \ ++ fi ++ ++modules: ++ $(MAKE) -C $(KBUILD) M=$(SRC_DIR) ++ ++$(MODULE): ++ $(MAKE) modules ++ ++clean: ++ rm -f *.o *.ko .*.cmd *.mod.c *.symvers modules.order *~ .\#* ++ rm -f *_exports.h win2lin_stubs.h ++ rm -rf .tmp_versions ++ ++install: config_check $(MODULE) ++ @/sbin/modinfo $(MODULE) | grep -q "^vermagic: *$(KVERS) " || \ ++ { echo "$(MODULE)" is not for Linux $(KVERS); exit 1; } ++ mkdir -p -m 755 $(DESTDIR)$(INST_DIR) ++ install -m 0644 $(MODULE) $(DESTDIR)$(INST_DIR) ++ifndef DESTDIR ++ -/sbin/depmod -a $(KVERS) ++endif ++ ++uninstall: ++ rm -f $(DESTDIR)$(INST_DIR)/$(MODULE) ++ifndef DESTDIR ++ -/sbin/depmod -a $(KVERS) ++endif ++ ++dist: ++ @for file in $(DISTFILES); do \ ++ cp $$file $(distdir)/$$file || exit 1; \ ++ done ++ ++.PHONY: all modules clean install config_check dist +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkexport.sh +--- linux-3.12.2/3rdparty/ndiswrapper/mkexport.sh 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkexport.sh 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,42 @@ ++#! /bin/sh ++ ++# Generate exports symbol table from C files ++ ++input="$1" ++output="$2" ++exports=$(basename "$output" .h) ++exec >"$output" ++ ++echo "/* automatically generated from src */"; ++ ++sed -n -e '/^\(wstdcall\|wfastcall\|noregparm\|regparm3\|__attribute__\)/{ ++:more ++N ++s/\([^{]\)$/\1/ ++t more ++s/\n{$/;/ ++p ++}' $input ++ ++echo "#ifdef CONFIG_X86_64"; ++ ++sed -n \ ++ -e 's/.*WIN_FUNC(\([^\,]\+\) *\, *\([0-9]\+\)).*/'\ ++'WIN_FUNC_DECL(\1, \2)/p' \ ++ -e 's/.*WIN_FUNC_PTR(\([^\,]\+\) *\, *\([0-9]\+\)).*/'\ ++'WIN_FUNC_DECL(\1, \2)/p' $input | sort -u ++ ++echo "#endif" ++echo "extern struct wrap_export $exports[];" ++echo "struct wrap_export $exports[] = {" ++ ++sed -n \ ++ -e 's/.*WIN_FUNC(_win_\([^\,]\+\) *\, *\([0-9]\+\)).*/'\ ++' WIN_WIN_SYMBOL(\1, \2),/p' \ ++ -e 's/.*WIN_FUNC(\([^\,]\+\) *\, *\([0-9]\+\)).*/'\ ++' WIN_SYMBOL(\1, \2),/p' \ ++ -e 's/.*WIN_SYMBOL_MAP(\("[^"]\+"\)[ ,\n]\+\([^)]\+\)).*/'\ ++' {\1, (generic_func)\2},/p' $input | sort -u ++ ++echo " {NULL, NULL}" ++echo "};" +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkstubs.sh +--- linux-3.12.2/3rdparty/ndiswrapper/mkstubs.sh 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/mkstubs.sh 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,12 @@ ++#! /bin/sh ++ ++for file in "$@"; do ++ echo ++ echo "# automatically generated from $file" ++ sed -n \ ++ -e 's/.*WIN_FUNC(\([^\,]\+\) *\, *\([0-9]\+\)).*/\ ++ win2lin(\1, \2)/p' \ ++ -e 's/.*WIN_FUNC_PTR(\([^\,]\+\) *\, *\([0-9]\+\)).*/\ ++ win2lin(\1, \2)/p' \ ++ $file | sed -e 's/[ \t ]\+//' | sort -u; \ ++done +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.c +--- linux-3.12.2/3rdparty/ndiswrapper/ndis.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,3025 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ndis.h" ++#include "iw_ndis.h" ++#include "wrapndis.h" ++#include "pnp.h" ++#include "loader.h" ++#include ++#include ++#include "ndis_exports.h" ++ ++#define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE ++#define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE ++ ++static struct work_struct ndis_work; ++static struct nt_list ndis_work_list; ++static spinlock_t ndis_work_list_lock; ++ ++struct workqueue_struct *ndis_wq; ++ ++static void *ndis_get_routine_address(char *name); ++ ++wstdcall void WIN_FUNC(NdisInitializeWrapper,4) ++ (void **driver_handle, struct driver_object *driver, ++ struct unicode_string *reg_path, void *unused) ++{ ++ ENTER1("handle: %p, driver: %p", driver_handle, driver); ++ *driver_handle = driver; ++ EXIT1(return); ++} ++ ++wstdcall void WIN_FUNC(NdisTerminateWrapper,2) ++ (struct device_object *dev_obj, void *system_specific) ++{ ++ EXIT1(return); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMRegisterMiniport,3) ++ (struct driver_object *drv_obj, struct miniport *mp, UINT length) ++{ ++ int min_length; ++ struct wrap_driver *wrap_driver; ++ struct ndis_driver *ndis_driver; ++ ++ min_length = ((char *)&mp->co_create_vc) - ((char *)mp); ++ ++ ENTER1("%p %p %d", drv_obj, mp, length); ++ ++ if (mp->major_version < 4) { ++ ERROR("Driver is using ndis version %d which is too old.", ++ mp->major_version); ++ EXIT1(return NDIS_STATUS_BAD_VERSION); ++ } ++ ++ if (length < min_length) { ++ ERROR("Characteristics length %d is too small", length); ++ EXIT1(return NDIS_STATUS_BAD_CHARACTERISTICS); ++ } ++ ++ TRACE1("%d.%d, %d, %u", mp->major_version, mp->minor_version, length, ++ (u32)sizeof(struct miniport)); ++ wrap_driver = IoGetDriverObjectExtension(drv_obj, ++ (void *)WRAP_DRIVER_CLIENT_ID); ++ if (!wrap_driver) { ++ ERROR("couldn't get wrap_driver"); ++ EXIT1(return NDIS_STATUS_RESOURCES); ++ } ++ if (IoAllocateDriverObjectExtension( ++ drv_obj, (void *)NDIS_DRIVER_CLIENT_ID, ++ sizeof(*ndis_driver), (void **)&ndis_driver) != ++ STATUS_SUCCESS) ++ EXIT1(return NDIS_STATUS_RESOURCES); ++ wrap_driver->ndis_driver = ndis_driver; ++ TRACE1("driver: %p", ndis_driver); ++ memcpy(&ndis_driver->mp, mp, min_t(int, sizeof(*mp), length)); ++ ++ DBG_BLOCK(2) { ++ int i; ++ void **func; ++ char *mp_funcs[] = { ++ "queryinfo", "reconfig", "reset", "send", "setinfo", ++ "tx_data", "return_packet", "send_packets", ++ "alloc_complete", "co_create_vc", "co_delete_vc", ++ "co_activate_vc", "co_deactivate_vc", ++ "co_send_packets", "co_request", "cancel_send_packets", ++ "pnp_event_notify", "shutdown", ++ }; ++ func = (void **)&ndis_driver->mp.queryinfo; ++ for (i = 0; i < ARRAY_SIZE(mp_funcs); i++) ++ TRACE0("function '%s' is at %p", mp_funcs[i], func[i]); ++ } ++ EXIT1(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMRegisterDevice,6) ++ (struct driver_object *drv_obj, struct unicode_string *dev_name, ++ struct unicode_string *link, void **funcs, ++ struct device_object **dev_obj, void **dev_obj_handle) ++{ ++ NTSTATUS status; ++ struct device_object *tmp; ++ int i; ++ ++ ENTER1("%p, %p, %p", drv_obj, dev_name, link); ++ status = IoCreateDevice(drv_obj, 0, dev_name, FILE_DEVICE_NETWORK, 0, ++ FALSE, &tmp); ++ ++ if (status != STATUS_SUCCESS) ++ EXIT1(return NDIS_STATUS_RESOURCES); ++ if (link) ++ status = IoCreateSymbolicLink(link, dev_name); ++ if (status != STATUS_SUCCESS) { ++ IoDeleteDevice(tmp); ++ EXIT1(return NDIS_STATUS_RESOURCES); ++ } ++ ++ *dev_obj = tmp; ++ *dev_obj_handle = *dev_obj; ++ for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) ++ if (funcs[i] && i != IRP_MJ_PNP && i != IRP_MJ_POWER) { ++ drv_obj->major_func[i] = funcs[i]; ++ TRACE1("mj_fn for 0x%x is at %p", i, funcs[i]); ++ } ++ EXIT1(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMDeregisterDevice,1) ++ (struct device_object *dev_obj) ++{ ++ ENTER2("%p", dev_obj); ++ IoDeleteDevice(dev_obj); ++ return NDIS_STATUS_SUCCESS; ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisAllocateMemoryWithTag,3) ++ (void **dest, UINT length, ULONG tag) ++{ ++ void *addr; ++ ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ addr = ExAllocatePoolWithTag(NonPagedPool, length, tag); ++ TRACE4("%p", addr); ++ if (addr) { ++ *dest = addr; ++ EXIT4(return NDIS_STATUS_SUCCESS); ++ } else ++ EXIT4(return NDIS_STATUS_FAILURE); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisAllocateMemory,4) ++ (void **dest, UINT length, UINT flags, NDIS_PHY_ADDRESS highest_address) ++{ ++ return NdisAllocateMemoryWithTag(dest, length, 0); ++} ++ ++/* length_tag is either length or tag, depending on if ++ * NdisAllocateMemory or NdisAllocateMemoryTag is used to allocate ++ * memory */ ++wstdcall void WIN_FUNC(NdisFreeMemory,3) ++ (void *addr, UINT length_tag, UINT flags) ++{ ++ TRACE4("%p", addr); ++ ExFreePool(addr); ++} ++ ++noregparm void WIN_FUNC(NdisWriteErrorLogEntry,12) ++ (struct driver_object *drv_obj, ULONG error, ULONG count, ...) ++{ ++ va_list args; ++ int i; ++ ULONG code; ++ ++ va_start(args, count); ++ ERROR("log: %08X, count: %d, return_address: %p", ++ error, count, __builtin_return_address(0)); ++ for (i = 0; i < count; i++) { ++ code = va_arg(args, ULONG); ++ ERROR("code: 0x%x", code); ++ } ++ va_end(args); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisOpenConfiguration,3) ++ (NDIS_STATUS *status, struct ndis_mp_block **conf_handle, ++ struct ndis_mp_block *handle) ++{ ++ ENTER2("%p", conf_handle); ++ *conf_handle = handle; ++ *status = NDIS_STATUS_SUCCESS; ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisOpenProtocolConfiguration,3) ++ (NDIS_STATUS *status, void **confhandle, ++ struct unicode_string *section) ++{ ++ ENTER2("%p", confhandle); ++ *status = NDIS_STATUS_SUCCESS; ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisOpenConfigurationKeyByName,4) ++ (NDIS_STATUS *status, void *handle, ++ struct unicode_string *key, void **subkeyhandle) ++{ ++ struct ansi_string ansi; ++ ENTER2(""); ++ if (RtlUnicodeStringToAnsiString(&ansi, key, TRUE) == STATUS_SUCCESS) { ++ TRACE2("%s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ *subkeyhandle = handle; ++ *status = NDIS_STATUS_SUCCESS; ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisOpenConfigurationKeyByIndex,5) ++ (NDIS_STATUS *status, void *handle, ULONG index, ++ struct unicode_string *key, void **subkeyhandle) ++{ ++ ENTER2("%u", index); ++// *subkeyhandle = handle; ++ *status = NDIS_STATUS_FAILURE; ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisCloseConfiguration,1) ++ (void *handle) ++{ ++ /* instead of freeing all configuration parameters as we are ++ * supposed to do here, we free them when the device is ++ * removed */ ++ ENTER2("%p", handle); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisOpenFile,5) ++ (NDIS_STATUS *status, struct wrap_bin_file **file, ++ UINT *filelength, struct unicode_string *filename, ++ NDIS_PHY_ADDRESS highest_address) ++{ ++ struct ansi_string ansi; ++ struct wrap_bin_file *bin_file; ++ ++ ENTER2("%p, %d, %llx, %p", status, *filelength, highest_address, *file); ++ if (RtlUnicodeStringToAnsiString(&ansi, filename, TRUE) != ++ STATUS_SUCCESS) { ++ *status = NDIS_STATUS_RESOURCES; ++ EXIT2(return); ++ } ++ TRACE2("%s", ansi.buf); ++ bin_file = get_bin_file(ansi.buf); ++ if (bin_file) { ++ *file = bin_file; ++ *filelength = bin_file->size; ++ *status = NDIS_STATUS_SUCCESS; ++ } else ++ *status = NDIS_STATUS_FILE_NOT_FOUND; ++ ++ RtlFreeAnsiString(&ansi); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMapFile,3) ++ (NDIS_STATUS *status, void **mappedbuffer, struct wrap_bin_file *file) ++{ ++ ENTER2("%p", file); ++ ++ if (!file) { ++ *status = NDIS_STATUS_ALREADY_MAPPED; ++ EXIT2(return); ++ } ++ ++ *status = NDIS_STATUS_SUCCESS; ++ *mappedbuffer = file->data; ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisUnmapFile,1) ++ (struct wrap_bin_file *file) ++{ ++ ENTER2("%p", file); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisCloseFile,1) ++ (struct wrap_bin_file *file) ++{ ++ ENTER2("%p", file); ++ free_bin_file(file); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisGetSystemUpTime,1) ++ (ULONG *ms) ++{ ++ *ms = 1000 * jiffies / HZ; ++ EXIT5(return); ++} ++ ++wstdcall ULONG WIN_FUNC(NDIS_BUFFER_TO_SPAN_PAGES,1) ++ (ndis_buffer *buffer) ++{ ++ ULONG n, length; ++ ++ if (buffer == NULL) ++ EXIT2(return 0); ++ if (MmGetMdlByteCount(buffer) == 0) ++ EXIT2(return 1); ++ ++ length = MmGetMdlByteCount(buffer); ++ n = SPAN_PAGES(MmGetMdlVirtualAddress(buffer), length); ++ TRACE4("%p, %p, %d, %d", buffer->startva, buffer->mappedsystemva, ++ length, n); ++ EXIT3(return n); ++} ++ ++wstdcall void WIN_FUNC(NdisGetBufferPhysicalArraySize,2) ++ (ndis_buffer *buffer, UINT *arraysize) ++{ ++ ENTER3("%p", buffer); ++ *arraysize = NDIS_BUFFER_TO_SPAN_PAGES(buffer); ++ EXIT3(return); ++} ++ ++static struct ndis_configuration_parameter * ++ndis_encode_setting(struct wrap_device_setting *setting, ++ enum ndis_parameter_type type) ++{ ++ struct ansi_string ansi; ++ struct ndis_configuration_parameter *param; ++ ++ param = setting->encoded; ++ if (param) { ++ if (param->type == type) ++ EXIT2(return param); ++ if (param->type == NdisParameterString) ++ RtlFreeUnicodeString(¶m->data.string); ++ setting->encoded = NULL; ++ } else ++ param = ExAllocatePoolWithTag(NonPagedPool, sizeof(*param), 0); ++ if (!param) { ++ ERROR("couldn't allocate memory"); ++ return NULL; ++ } ++ switch (type) { ++ case NdisParameterInteger: ++ param->data.integer = simple_strtol(setting->value, NULL, 0); ++ TRACE2("0x%x", param->data.integer); ++ break; ++ case NdisParameterHexInteger: ++ param->data.integer = simple_strtol(setting->value, NULL, 16); ++ TRACE2("0x%x", param->data.integer); ++ break; ++ case NdisParameterString: ++ RtlInitAnsiString(&ansi, setting->value); ++ TRACE2("'%s'", ansi.buf); ++ if (RtlAnsiStringToUnicodeString(¶m->data.string, ++ &ansi, TRUE)) { ++ ExFreePool(param); ++ EXIT2(return NULL); ++ } ++ break; ++ case NdisParameterBinary: ++ param->data.integer = simple_strtol(setting->value, NULL, 2); ++ TRACE2("0x%x", param->data.integer); ++ break; ++ default: ++ ERROR("unknown type: %d", type); ++ ExFreePool(param); ++ return NULL; ++ } ++ param->type = type; ++ setting->encoded = param; ++ EXIT2(return param); ++} ++ ++static int ndis_decode_setting(struct wrap_device_setting *setting, ++ struct ndis_configuration_parameter *param) ++{ ++ struct ansi_string ansi; ++ struct ndis_configuration_parameter *prev; ++ ++ ENTER2("%p, %p", setting, param); ++ prev = setting->encoded; ++ if (prev && prev->type == NdisParameterString) { ++ RtlFreeUnicodeString(&prev->data.string); ++ setting->encoded = NULL; ++ } ++ switch (param->type) { ++ case NdisParameterInteger: ++ snprintf(setting->value, MAX_SETTING_VALUE_LEN, "%u", ++ param->data.integer); ++ break; ++ case NdisParameterHexInteger: ++ snprintf(setting->value, MAX_SETTING_VALUE_LEN, "%x", ++ param->data.integer); ++ break; ++ case NdisParameterString: ++ ansi.buf = setting->value; ++ ansi.max_length = MAX_SETTING_VALUE_LEN; ++ if ((RtlUnicodeStringToAnsiString(&ansi, ¶m->data.string, ++ FALSE) != STATUS_SUCCESS) ++ || ansi.length >= MAX_SETTING_VALUE_LEN) { ++ EXIT1(return -1); ++ } ++ if (ansi.length == ansi.max_length) ++ ansi.length--; ++ setting->value[ansi.length] = 0; ++ break; ++ default: ++ TRACE2("unknown setting type: %d", param->type); ++ return -1; ++ } ++ TRACE2("setting changed %s='%s', %d", setting->name, setting->value, ++ ansi.length); ++ return 0; ++} ++ ++static int read_setting(struct nt_list *setting_list, char *keyname, int length, ++ struct ndis_configuration_parameter **param, ++ enum ndis_parameter_type type) ++{ ++ struct wrap_device_setting *setting; ++ mutex_lock(&loader_mutex); ++ nt_list_for_each_entry(setting, setting_list, list) { ++ if (strnicmp(keyname, setting->name, length) == 0) { ++ TRACE2("setting %s='%s'", keyname, setting->value); ++ mutex_unlock(&loader_mutex); ++ *param = ndis_encode_setting(setting, type); ++ if (*param) ++ EXIT2(return 0); ++ else ++ EXIT2(return -1); ++ } ++ } ++ mutex_unlock(&loader_mutex); ++ EXIT2(return -1); ++} ++ ++wstdcall void WIN_FUNC(NdisReadConfiguration,5) ++ (NDIS_STATUS *status, struct ndis_configuration_parameter **param, ++ struct ndis_mp_block *nmb, struct unicode_string *key, ++ enum ndis_parameter_type type) ++{ ++ struct ansi_string ansi; ++ int ret; ++ ++ ENTER2("nmb: %p", nmb); ++ ret = RtlUnicodeStringToAnsiString(&ansi, key, TRUE); ++ if (ret != STATUS_SUCCESS || ansi.buf == NULL) { ++ *param = NULL; ++ *status = NDIS_STATUS_FAILURE; ++ RtlFreeAnsiString(&ansi); ++ EXIT2(return); ++ } ++ TRACE2("%d, %s", type, ansi.buf); ++ ++ if (read_setting(&nmb->wnd->wd->settings, ansi.buf, ++ ansi.length, param, type) == 0 || ++ read_setting(&nmb->wnd->wd->driver->settings, ansi.buf, ++ ansi.length, param, type) == 0) ++ *status = NDIS_STATUS_SUCCESS; ++ else { ++ TRACE2("setting %s not found (type:%d)", ansi.buf, type); ++ *status = NDIS_STATUS_FAILURE; ++ } ++ RtlFreeAnsiString(&ansi); ++ EXIT2(return); ++ ++} ++ ++wstdcall void WIN_FUNC(NdisWriteConfiguration,4) ++ (NDIS_STATUS *status, struct ndis_mp_block *nmb, ++ struct unicode_string *key, struct ndis_configuration_parameter *param) ++{ ++ struct ansi_string ansi; ++ char *keyname; ++ struct wrap_device_setting *setting; ++ ++ ENTER2("nmb: %p", nmb); ++ if (RtlUnicodeStringToAnsiString(&ansi, key, TRUE)) { ++ *status = NDIS_STATUS_FAILURE; ++ EXIT2(return); ++ } ++ keyname = ansi.buf; ++ TRACE2("%s", keyname); ++ ++ mutex_lock(&loader_mutex); ++ nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) { ++ if (strnicmp(keyname, setting->name, ansi.length) == 0) { ++ mutex_unlock(&loader_mutex); ++ if (ndis_decode_setting(setting, param)) ++ *status = NDIS_STATUS_FAILURE; ++ else ++ *status = NDIS_STATUS_SUCCESS; ++ RtlFreeAnsiString(&ansi); ++ EXIT2(return); ++ } ++ } ++ mutex_unlock(&loader_mutex); ++ setting = kzalloc(sizeof(*setting), GFP_KERNEL); ++ if (setting) { ++ if (ansi.length == ansi.max_length) ++ ansi.length--; ++ memcpy(setting->name, keyname, ansi.length); ++ setting->name[ansi.length] = 0; ++ if (ndis_decode_setting(setting, param)) ++ *status = NDIS_STATUS_FAILURE; ++ else { ++ *status = NDIS_STATUS_SUCCESS; ++ mutex_lock(&loader_mutex); ++ InsertTailList(&nmb->wnd->wd->settings, &setting->list); ++ mutex_unlock(&loader_mutex); ++ } ++ } else ++ *status = NDIS_STATUS_RESOURCES; ++ ++ RtlFreeAnsiString(&ansi); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisReadNetworkAddress,4) ++ (NDIS_STATUS *status, void **addr, UINT *len, ++ struct ndis_mp_block *nmb) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct ndis_configuration_parameter *param; ++ struct unicode_string key; ++ struct ansi_string ansi; ++ typeof(wnd->mac) mac; ++ int i, ret; ++ ++ ENTER2("%p", nmb); ++ RtlInitAnsiString(&ansi, "NetworkAddress"); ++ *status = NDIS_STATUS_FAILURE; ++ if (RtlAnsiStringToUnicodeString(&key, &ansi, TRUE) != STATUS_SUCCESS) ++ EXIT1(return); ++ ++ NdisReadConfiguration(&ret, ¶m, nmb, &key, NdisParameterString); ++ RtlFreeUnicodeString(&key); ++ if (ret != NDIS_STATUS_SUCCESS) ++ EXIT1(return); ++ ret = RtlUnicodeStringToAnsiString(&ansi, ¶m->data.string, TRUE); ++ if (ret != STATUS_SUCCESS) ++ EXIT1(return); ++ ++ i = 0; ++ if (ansi.length >= 2 * sizeof(mac)) { ++ for (i = 0; i < sizeof(mac); i++) { ++ char c[3]; ++ int x; ++ c[0] = ansi.buf[i*2]; ++ c[1] = ansi.buf[i*2+1]; ++ c[2] = 0; ++ ret = sscanf(c, "%x", &x); ++ if (ret != 1) ++ break; ++ mac[i] = x; ++ } ++ } ++ TRACE2("%s, %d, " MACSTR, ansi.buf, i, MAC2STR(mac)); ++ RtlFreeAnsiString(&ansi); ++ if (i == sizeof(mac)) { ++ memcpy(wnd->mac, mac, sizeof(wnd->mac)); ++ *len = sizeof(mac); ++ *addr = wnd->mac; ++ *status = NDIS_STATUS_SUCCESS; ++ } ++ EXIT1(return); ++} ++ ++wstdcall void WIN_FUNC(NdisInitializeString,2) ++ (struct unicode_string *dest, UCHAR *src) ++{ ++ struct ansi_string ansi; ++ ++ ENTER2(""); ++ if (src == NULL) { ++ dest->length = dest->max_length = 0; ++ dest->buf = NULL; ++ } else { ++ RtlInitAnsiString(&ansi, src); ++ /* the string is freed with NdisFreeMemory */ ++ RtlAnsiStringToUnicodeString(dest, &ansi, TRUE); ++ } ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisInitAnsiString,2) ++ (struct ansi_string *dst, CHAR *src) ++{ ++ RtlInitAnsiString(dst, src); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisInitUnicodeString,2) ++ (struct unicode_string *dest, const wchar_t *src) ++{ ++ RtlInitUnicodeString(dest, src); ++ return; ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisAnsiStringToUnicodeString,2) ++ (struct unicode_string *dst, struct ansi_string *src) ++{ ++ ENTER2(""); ++ if (dst == NULL || src == NULL) ++ EXIT2(return NDIS_STATUS_FAILURE); ++ if (RtlAnsiStringToUnicodeString(dst, src, FALSE) == STATUS_SUCCESS) ++ return NDIS_STATUS_SUCCESS; ++ else ++ return NDIS_STATUS_FAILURE; ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisUnicodeStringToAnsiString,2) ++ (struct ansi_string *dst, struct unicode_string *src) ++{ ++ ENTER2(""); ++ if (dst == NULL || src == NULL) ++ EXIT2(return NDIS_STATUS_FAILURE); ++ if (RtlUnicodeStringToAnsiString(dst, src, FALSE) == STATUS_SUCCESS) ++ return NDIS_STATUS_SUCCESS; ++ else ++ return NDIS_STATUS_FAILURE; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(NdisUpcaseUnicodeString,2) ++ (struct unicode_string *dst, struct unicode_string *src) ++{ ++ EXIT2(return RtlUpcaseUnicodeString(dst, src, FALSE)); ++} ++ ++wstdcall void WIN_FUNC(NdisMSetAttributesEx,5) ++ (struct ndis_mp_block *nmb, void *mp_ctx, ++ UINT hangcheck_interval, UINT attributes, ULONG adaptertype) ++{ ++ struct ndis_device *wnd; ++ ++ ENTER1("%p, %p, %d, %08x, %d", nmb, mp_ctx, hangcheck_interval, ++ attributes, adaptertype); ++ wnd = nmb->wnd; ++ nmb->mp_ctx = mp_ctx; ++ wnd->attributes = attributes; ++ ++ if ((attributes & NDIS_ATTRIBUTE_BUS_MASTER) && ++ wrap_is_pci_bus(wnd->wd->dev_bus)) ++ pci_set_master(wnd->wd->pci.pdev); ++ ++ if (hangcheck_interval > 0) ++ wnd->hangcheck_interval = 2 * hangcheck_interval * HZ; ++ else ++ wnd->hangcheck_interval = 2 * HZ; ++ ++ EXIT1(return); ++} ++ ++wstdcall ULONG WIN_FUNC(NdisReadPciSlotInformation,5) ++ (struct ndis_mp_block *nmb, ULONG slot, ++ ULONG offset, char *buf, ULONG len) ++{ ++ struct wrap_device *wd = nmb->wnd->wd; ++ ULONG i; ++ if (!wrap_is_pci_bus(wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return 0; ++ } ++ for (i = 0; i < len; i++) ++ if (pci_read_config_byte(wd->pci.pdev, offset + i, &buf[i]) != ++ PCIBIOS_SUCCESSFUL) ++ break; ++ DBG_BLOCK(2) { ++ if (i != len) ++ WARNING("%u, %u", i, len); ++ } ++ return i; ++} ++ ++wstdcall ULONG WIN_FUNC(NdisImmediateReadPciSlotInformation,5) ++ (struct ndis_mp_block *nmb, ULONG slot, ++ ULONG offset, char *buf, ULONG len) ++{ ++ return NdisReadPciSlotInformation(nmb, slot, offset, buf, len); ++} ++ ++wstdcall ULONG WIN_FUNC(NdisWritePciSlotInformation,5) ++ (struct ndis_mp_block *nmb, ULONG slot, ++ ULONG offset, char *buf, ULONG len) ++{ ++ struct wrap_device *wd = nmb->wnd->wd; ++ ULONG i; ++ if (!wrap_is_pci_bus(wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return 0; ++ } ++ for (i = 0; i < len; i++) ++ if (pci_write_config_byte(wd->pci.pdev, offset + i, buf[i]) != ++ PCIBIOS_SUCCESSFUL) ++ break; ++ DBG_BLOCK(2) { ++ if (i != len) ++ WARNING("%u, %u", i, len); ++ } ++ return i; ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMRegisterIoPortRange,4) ++ (void **virt, struct ndis_mp_block *nmb, UINT start, UINT len) ++{ ++ ENTER3("%08x %08x", start, len); ++ *virt = (void *)(ULONG_PTR)start; ++ return NDIS_STATUS_SUCCESS; ++} ++ ++wstdcall void WIN_FUNC(NdisMDeregisterIoPortRange,4) ++ (struct ndis_mp_block *nmb, UINT start, UINT len, void* virt) ++{ ++ ENTER1("%08x %08x", start, len); ++} ++ ++wstdcall void WIN_FUNC(NdisReadPortUchar,3) ++ (struct ndis_mp_block *nmb, ULONG port, char *data) ++{ ++ *data = inb(port); ++} ++ ++wstdcall void WIN_FUNC(NdisImmediateReadPortUchar,3) ++ (struct ndis_mp_block *nmb, ULONG port, char *data) ++{ ++ *data = inb(port); ++} ++ ++wstdcall void WIN_FUNC(NdisWritePortUchar,3) ++ (struct ndis_mp_block *nmb, ULONG port, char data) ++{ ++ outb(data, port); ++} ++ ++wstdcall void WIN_FUNC(NdisImmediateWritePortUchar,3) ++ (struct ndis_mp_block *nmb, ULONG port, char data) ++{ ++ outb(data, port); ++} ++ ++wstdcall void WIN_FUNC(NdisMQueryAdapterResources,4) ++ (NDIS_STATUS *status, struct ndis_mp_block *nmb, ++ NDIS_RESOURCE_LIST *resource_list, UINT *size) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ NDIS_RESOURCE_LIST *list; ++ UINT resource_length; ++ ++ list = &wnd->wd->resource_list->list->partial_resource_list; ++ resource_length = sizeof(struct cm_partial_resource_list) + ++ sizeof(struct cm_partial_resource_descriptor) * ++ (list->count - 1); ++ TRACE2("%p, %p,%d (%d), %p %d %d", wnd, resource_list, *size, ++ resource_length, &list->partial_descriptors[list->count-1], ++ list->partial_descriptors[list->count-1].u.interrupt.level, ++ list->partial_descriptors[list->count-1].u.interrupt.vector); ++ if (*size < sizeof(*list)) { ++ *size = resource_length; ++ *status = NDIS_STATUS_BUFFER_TOO_SHORT; ++ } else { ++ ULONG count; ++ if (*size >= resource_length) { ++ *size = resource_length; ++ count = list->count; ++ } else { ++ UINT n = sizeof(*list); ++ count = 1; ++ while (count++ < list->count && n < *size) ++ n += sizeof(list->partial_descriptors); ++ *size = n; ++ } ++ memcpy(resource_list, list, *size); ++ resource_list->count = count; ++ *status = NDIS_STATUS_SUCCESS; ++ } ++ EXIT2(return); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMPciAssignResources,3) ++ (struct ndis_mp_block *nmb, ULONG slot_number, ++ NDIS_RESOURCE_LIST **resources) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ++ ENTER2("%p, %p", wnd, wnd->wd->resource_list); ++ *resources = &wnd->wd->resource_list->list->partial_resource_list; ++ EXIT2(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMMapIoSpace,4) ++ (void __iomem **virt, struct ndis_mp_block *nmb, ++ NDIS_PHY_ADDRESS phy_addr, UINT len) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ++ ENTER2("%llx, %d", phy_addr, len); ++ *virt = MmMapIoSpace(phy_addr, len, MmCached); ++ if (*virt == NULL) { ++ ERROR("ioremap failed"); ++ EXIT2(return NDIS_STATUS_FAILURE); ++ } ++ wnd->mem_start = phy_addr; ++ wnd->mem_end = phy_addr + len; ++ TRACE2("%p", *virt); ++ EXIT2(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(NdisMUnmapIoSpace,3) ++ (struct ndis_mp_block *nmb, void __iomem *virt, UINT len) ++{ ++ ENTER2("%p, %d", virt, len); ++ MmUnmapIoSpace(virt, len); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisAllocateSpinLock,1) ++ (struct ndis_spinlock *lock) ++{ ++ TRACE4("lock %p, %p", lock, &lock->klock); ++ KeInitializeSpinLock(&lock->klock); ++ lock->irql = PASSIVE_LEVEL; ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisFreeSpinLock,1) ++ (struct ndis_spinlock *lock) ++{ ++ TRACE4("lock %p, %p", lock, &lock->klock); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisAcquireSpinLock,1) ++ (struct ndis_spinlock *lock) ++{ ++ ENTER6("lock %p, %p", lock, &lock->klock); ++// assert_irql(_irql_ <= DISPATCH_LEVEL); ++ lock->irql = nt_spin_lock_irql(&lock->klock, DISPATCH_LEVEL); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisReleaseSpinLock,1) ++ (struct ndis_spinlock *lock) ++{ ++ ENTER6("lock %p, %p", lock, &lock->klock); ++// assert_irql(_irql_ == DISPATCH_LEVEL); ++ nt_spin_unlock_irql(&lock->klock, lock->irql); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisDprAcquireSpinLock,1) ++ (struct ndis_spinlock *lock) ++{ ++ ENTER6("lock %p", &lock->klock); ++// assert_irql(_irql_ == DISPATCH_LEVEL); ++ nt_spin_lock(&lock->klock); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisDprReleaseSpinLock,1) ++ (struct ndis_spinlock *lock) ++{ ++ ENTER6("lock %p", &lock->klock); ++// assert_irql(_irql_ == DISPATCH_LEVEL); ++ nt_spin_unlock(&lock->klock); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisInitializeReadWriteLock,1) ++ (struct ndis_rw_lock *rw_lock) ++{ ++ ENTER3("%p", rw_lock); ++ memset(rw_lock, 0, sizeof(*rw_lock)); ++ KeInitializeSpinLock(&rw_lock->klock); ++ return; ++} ++ ++/* read/write locks are implemented in a rather simplistic way - we ++ * should probably use Linux's rw_lock implementation */ ++ ++wstdcall void WIN_FUNC(NdisAcquireReadWriteLock,3) ++ (struct ndis_rw_lock *rw_lock, BOOLEAN write, ++ struct lock_state *lock_state) ++{ ++ if (write) { ++ while (1) { ++ if (cmpxchg(&rw_lock->count, 0, -1) == 0) ++ return; ++ while (rw_lock->count) ++ cpu_relax(); ++ } ++ return; ++ } ++ while (1) { ++ typeof(rw_lock->count) count; ++ while ((count = rw_lock->count) < 0) ++ cpu_relax(); ++ if (cmpxchg(&rw_lock->count, count, count + 1) == count) ++ return; ++ } ++} ++ ++wstdcall void WIN_FUNC(NdisReleaseReadWriteLock,2) ++ (struct ndis_rw_lock *rw_lock, struct lock_state *lock_state) ++{ ++ if (rw_lock->count > 0) ++ pre_atomic_add(rw_lock->count, -1); ++ else if (rw_lock->count == -1) ++ rw_lock->count = 0; ++ else ++ WARNING("invalid state: %d", rw_lock->count); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMAllocateMapRegisters,5) ++ (struct ndis_mp_block *nmb, UINT dmachan, ++ NDIS_DMA_SIZE dmasize, ULONG basemap, ULONG max_buf_size) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ++ ENTER2("%p, %d %d %d %d", wnd, dmachan, dmasize, basemap, max_buf_size); ++ if (!wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return NDIS_STATUS_NOT_SUPPORTED; ++ } ++ if (wnd->dma_map_count > 0) { ++ WARNING("%s: map registers already allocated: %u", ++ wnd->net_dev->name, wnd->dma_map_count); ++ EXIT2(return NDIS_STATUS_RESOURCES); ++ } ++ if (dmasize == NDIS_DMA_24BITS) { ++ if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(24)) || ++ pci_set_consistent_dma_mask(wnd->wd->pci.pdev, ++ DMA_BIT_MASK(24))) ++ WARNING("setting dma mask failed"); ++ } else if (dmasize == NDIS_DMA_32BITS) { ++ /* consistent dma is in low 32-bits by default */ ++ if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(32))) ++ WARNING("setting dma mask failed"); ++#ifdef CONFIG_X86_64 ++ } else if (dmasize == NDIS_DMA_64BITS) { ++ if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(64)) || ++ pci_set_consistent_dma_mask(wnd->wd->pci.pdev, ++ DMA_BIT_MASK(64))) ++ WARNING("setting dma mask failed"); ++ else ++ wnd->net_dev->features |= NETIF_F_HIGHDMA; ++#endif ++ } else { ++ ERROR("dmasize %d not supported", dmasize); ++ EXIT2(return NDIS_STATUS_NOT_SUPPORTED); ++ } ++ /* since memory for buffer is allocated with kmalloc, buffer ++ * is physically contiguous, so entire map will fit in one ++ * register */ ++ if (basemap > 64) { ++ WARNING("Windows driver %s requesting too many (%u) " ++ "map registers", wnd->wd->driver->name, basemap); ++ /* As per NDIS, NDIS_STATUS_RESOURCES should be ++ * returned, but with that Atheros PCI driver fails - ++ * for now tolerate it */ ++// EXIT2(return NDIS_STATUS_RESOURCES); ++ } ++ ++ wnd->dma_map_addr = kzalloc(basemap * sizeof(*(wnd->dma_map_addr)), ++ GFP_KERNEL); ++ if (!wnd->dma_map_addr) ++ EXIT2(return NDIS_STATUS_RESOURCES); ++ wnd->dma_map_count = basemap; ++ TRACE2("%u", wnd->dma_map_count); ++ EXIT2(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(NdisMFreeMapRegisters,1) ++ (struct ndis_mp_block *nmb) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ int i; ++ ++ ENTER2("wnd: %p", wnd); ++ if (wnd->dma_map_addr) { ++ for (i = 0; i < wnd->dma_map_count; i++) { ++ if (wnd->dma_map_addr[i]) ++ WARNING("%s: dma addr 0x%llx not freed by " ++ "Windows driver", wnd->net_dev->name, ++ (unsigned long long)wnd->dma_map_addr[i]); ++ } ++ kfree(wnd->dma_map_addr); ++ wnd->dma_map_addr = NULL; ++ } else ++ WARNING("map registers already freed?"); ++ wnd->dma_map_count = 0; ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMStartBufferPhysicalMapping,6) ++ (struct ndis_mp_block *nmb, ndis_buffer *buf, ++ ULONG index, BOOLEAN write_to_dev, ++ struct ndis_phy_addr_unit *phy_addr_array, UINT *array_size) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ++ ENTER3("%p, %p, %u, %u", wnd, buf, index, wnd->dma_map_count); ++ if (!wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return; ++ } ++ if (unlikely(wnd->sg_dma_size || !write_to_dev || ++ index >= wnd->dma_map_count)) { ++ WARNING("invalid request: %d, %d, %d, %d", wnd->sg_dma_size, ++ write_to_dev, index, wnd->dma_map_count); ++ phy_addr_array[0].phy_addr = 0; ++ phy_addr_array[0].length = 0; ++ *array_size = 0; ++ return; ++ } ++ if (wnd->dma_map_addr[index]) { ++ TRACE2("buffer %p at %d is already mapped: %llx", buf, index, ++ (unsigned long long)wnd->dma_map_addr[index]); ++// *array_size = 1; ++ return; ++ } ++ TRACE3("%p, %p, %u", buf, MmGetSystemAddressForMdl(buf), ++ MmGetMdlByteCount(buf)); ++ DBG_BLOCK(4) { ++ dump_bytes(__func__, MmGetSystemAddressForMdl(buf), ++ MmGetMdlByteCount(buf)); ++ } ++ wnd->dma_map_addr[index] = ++ PCI_DMA_MAP_SINGLE(wnd->wd->pci.pdev, ++ MmGetSystemAddressForMdl(buf), ++ MmGetMdlByteCount(buf), PCI_DMA_TODEVICE); ++ phy_addr_array[0].phy_addr = wnd->dma_map_addr[index]; ++ phy_addr_array[0].length = MmGetMdlByteCount(buf); ++ TRACE4("%llx, %d, %d", phy_addr_array[0].phy_addr, ++ phy_addr_array[0].length, index); ++ *array_size = 1; ++} ++ ++wstdcall void WIN_FUNC(NdisMCompleteBufferPhysicalMapping,3) ++ (struct ndis_mp_block *nmb, ndis_buffer *buf, ULONG index) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ++ ENTER3("%p, %p %u (%u)", wnd, buf, index, wnd->dma_map_count); ++ ++ if (!wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return; ++ } ++ if (unlikely(wnd->sg_dma_size)) ++ WARNING("buffer %p may have been unmapped already", buf); ++ if (index >= wnd->dma_map_count) { ++ ERROR("invalid map register (%u >= %u)", ++ index, wnd->dma_map_count); ++ return; ++ } ++ TRACE4("%llx", (unsigned long long)wnd->dma_map_addr[index]); ++ if (wnd->dma_map_addr[index]) { ++ PCI_DMA_UNMAP_SINGLE(wnd->wd->pci.pdev, wnd->dma_map_addr[index], ++ MmGetMdlByteCount(buf), PCI_DMA_TODEVICE); ++ wnd->dma_map_addr[index] = 0; ++ } else ++ WARNING("map registers at %u not used", index); ++} ++ ++wstdcall void WIN_FUNC(NdisMAllocateSharedMemory,5) ++ (struct ndis_mp_block *nmb, ULONG size, ++ BOOLEAN cached, void **virt, NDIS_PHY_ADDRESS *phys) ++{ ++ dma_addr_t dma_addr; ++ struct wrap_device *wd = nmb->wnd->wd; ++ ++ ENTER3("size: %u, cached: %d", size, cached); ++ if (!wrap_is_pci_bus(wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return; ++ } ++ *virt = PCI_DMA_ALLOC_COHERENT(wd->pci.pdev, size, &dma_addr); ++ if (*virt) ++ *phys = dma_addr; ++ else ++ WARNING("couldn't allocate %d bytes of %scached DMA memory", ++ size, cached ? "" : "un-"); ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMFreeSharedMemory,5) ++ (struct ndis_mp_block *nmb, ULONG size, BOOLEAN cached, ++ void *virt, NDIS_PHY_ADDRESS addr) ++{ ++ struct wrap_device *wd = nmb->wnd->wd; ++ ENTER3("%p, %llx, %u", virt, addr, size); ++ if (!wrap_is_pci_bus(wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return; ++ } ++ PCI_DMA_FREE_COHERENT(wd->pci.pdev, size, virt, addr); ++ EXIT3(return); ++} ++ ++wstdcall void alloc_shared_memory_async(void *arg1, void *arg2) ++{ ++ struct ndis_device *wnd; ++ struct alloc_shared_mem *alloc_shared_mem; ++ struct miniport *mp; ++ void *virt; ++ NDIS_PHY_ADDRESS phys; ++ KIRQL irql; ++ ++ wnd = arg1; ++ alloc_shared_mem = arg2; ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ NdisMAllocateSharedMemory(wnd->nmb, alloc_shared_mem->size, ++ alloc_shared_mem->cached, &virt, &phys); ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ LIN2WIN5(mp->alloc_complete, wnd->nmb, virt, ++ &phys, alloc_shared_mem->size, alloc_shared_mem->ctx); ++ serialize_unlock_irql(wnd, irql); ++ kfree(alloc_shared_mem); ++} ++WIN_FUNC_DECL(alloc_shared_memory_async,2) ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMAllocateSharedMemoryAsync,4) ++ (struct ndis_mp_block *nmb, ULONG size, BOOLEAN cached, void *ctx) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct alloc_shared_mem *alloc_shared_mem; ++ ++ ENTER3("wnd: %p", wnd); ++ alloc_shared_mem = kmalloc(sizeof(*alloc_shared_mem), irql_gfp()); ++ if (!alloc_shared_mem) { ++ WARNING("couldn't allocate memory"); ++ return NDIS_STATUS_FAILURE; ++ } ++ ++ alloc_shared_mem->size = size; ++ alloc_shared_mem->cached = cached; ++ alloc_shared_mem->ctx = ctx; ++ if (schedule_ntos_work_item(WIN_FUNC_PTR(alloc_shared_memory_async,2), ++ wnd, alloc_shared_mem)) ++ EXIT3(return NDIS_STATUS_FAILURE); ++ EXIT3(return NDIS_STATUS_PENDING); ++} ++ ++/* Some drivers allocate NDIS_BUFFER (aka MDL) very often; instead of ++ * allocating and freeing with kernel functions, we chain them into ++ * ndis_buffer_pool. When an MDL is freed, it is added to the list of ++ * free MDLs. When allocated, we first check if there is one in free ++ * list and if so just return it; otherwise, we allocate a new one and ++ * return that. This reduces memory fragmentation. Windows DDK says ++ * that the driver itself shouldn't check what is returned in ++ * pool_handle, presumably because buffer pools are not used in ++ * XP. However, as long as driver follows rest of the semantics - that ++ * it should indicate maximum number of MDLs used with num_descr and ++ * pass the same pool_handle in other buffer functions, this should ++ * work. Sadly, though, NdisFreeBuffer doesn't pass the pool_handle, ++ * so we use 'process' field of MDL to store pool_handle. */ ++ ++wstdcall void WIN_FUNC(NdisAllocateBufferPool,3) ++ (NDIS_STATUS *status, struct ndis_buffer_pool **pool_handle, ++ UINT num_descr) ++{ ++ struct ndis_buffer_pool *pool; ++ ++ ENTER1("buffers: %d", num_descr); ++ pool = kmalloc(sizeof(*pool), irql_gfp()); ++ if (!pool) { ++ *status = NDIS_STATUS_RESOURCES; ++ EXIT3(return); ++ } ++ spin_lock_init(&pool->lock); ++ pool->max_descr = num_descr; ++ pool->num_allocated_descr = 0; ++ pool->free_descr = NULL; ++ *pool_handle = pool; ++ *status = NDIS_STATUS_SUCCESS; ++ TRACE1("pool: %p, num_descr: %d", pool, num_descr); ++ EXIT1(return); ++} ++ ++wstdcall void WIN_FUNC(NdisAllocateBuffer,5) ++ (NDIS_STATUS *status, ndis_buffer **buffer, ++ struct ndis_buffer_pool *pool, void *virt, UINT length) ++{ ++ ndis_buffer *descr; ++ ++ ENTER4("pool: %p (%d)", pool, pool->num_allocated_descr); ++ /* NDIS drivers should call this at DISPATCH_LEVEL, but ++ * alloc_tx_packet calls at SOFT_IRQL */ ++ assert_irql(_irql_ <= SOFT_LEVEL); ++ if (!pool) { ++ *status = NDIS_STATUS_FAILURE; ++ *buffer = NULL; ++ EXIT4(return); ++ } ++ spin_lock_bh(&pool->lock); ++ if ((descr = pool->free_descr)) ++ pool->free_descr = descr->next; ++ spin_unlock_bh(&pool->lock); ++ if (descr) { ++ typeof(descr->flags) flags; ++ flags = descr->flags; ++ memset(descr, 0, sizeof(*descr)); ++ MmInitializeMdl(descr, virt, length); ++ if (flags & MDL_CACHE_ALLOCATED) ++ descr->flags |= MDL_CACHE_ALLOCATED; ++ } else { ++ if (pool->num_allocated_descr > pool->max_descr) { ++ TRACE2("pool %p is full: %d(%d)", pool, ++ pool->num_allocated_descr, pool->max_descr); ++#ifndef ALLOW_POOL_OVERFLOW ++ *status = NDIS_STATUS_FAILURE; ++ *buffer = NULL; ++ return; ++#endif ++ } ++ descr = allocate_init_mdl(virt, length); ++ if (!descr) { ++ WARNING("couldn't allocate buffer"); ++ *status = NDIS_STATUS_FAILURE; ++ *buffer = NULL; ++ EXIT4(return); ++ } ++ TRACE4("buffer %p for %p, %d", descr, virt, length); ++ atomic_inc_var(pool->num_allocated_descr); ++ } ++ /* TODO: make sure this mdl can map given buffer */ ++ MmBuildMdlForNonPagedPool(descr); ++// descr->flags |= MDL_ALLOCATED_FIXED_SIZE | ++// MDL_MAPPED_TO_SYSTEM_VA | MDL_PAGES_LOCKED; ++ descr->pool = pool; ++ *buffer = descr; ++ *status = NDIS_STATUS_SUCCESS; ++ TRACE4("buffer: %p", descr); ++ EXIT4(return); ++} ++ ++wstdcall void WIN_FUNC(NdisFreeBuffer,1) ++ (ndis_buffer *buffer) ++{ ++ struct ndis_buffer_pool *pool; ++ ++ ENTER4("%p", buffer); ++ if (!buffer || !buffer->pool) { ++ ERROR("invalid buffer"); ++ EXIT4(return); ++ } ++ pool = buffer->pool; ++ if (pool->num_allocated_descr > MAX_ALLOCATED_NDIS_BUFFERS) { ++ /* NB NB NB: set mdl's 'pool' field to NULL before ++ * calling free_mdl; otherwise free_mdl calls ++ * NdisFreeBuffer back */ ++ atomic_dec_var(pool->num_allocated_descr); ++ buffer->pool = NULL; ++ free_mdl(buffer); ++ } else { ++ spin_lock_bh(&pool->lock); ++ buffer->next = pool->free_descr; ++ pool->free_descr = buffer; ++ spin_unlock_bh(&pool->lock); ++ } ++ EXIT4(return); ++} ++ ++wstdcall void WIN_FUNC(NdisFreeBufferPool,1) ++ (struct ndis_buffer_pool *pool) ++{ ++ ndis_buffer *cur, *next; ++ ++ TRACE3("pool: %p", pool); ++ if (!pool) { ++ WARNING("invalid pool"); ++ EXIT3(return); ++ } ++ spin_lock_bh(&pool->lock); ++ cur = pool->free_descr; ++ while (cur) { ++ next = cur->next; ++ cur->pool = NULL; ++ free_mdl(cur); ++ cur = next; ++ } ++ spin_unlock_bh(&pool->lock); ++ kfree(pool); ++ pool = NULL; ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisAdjustBufferLength,2) ++ (ndis_buffer *buffer, UINT length) ++{ ++ ENTER4("%p, %d", buffer, length); ++ buffer->bytecount = length; ++} ++ ++wstdcall void WIN_FUNC(NdisQueryBuffer,3) ++ (ndis_buffer *buffer, void **virt, UINT *length) ++{ ++ ENTER4("buffer: %p", buffer); ++ if (virt) ++ *virt = MmGetSystemAddressForMdl(buffer); ++ *length = MmGetMdlByteCount(buffer); ++ TRACE4("%p, %u", virt ? *virt : NULL, *length); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisQueryBufferSafe,4) ++ (ndis_buffer *buffer, void **virt, UINT *length, ++ enum mm_page_priority priority) ++{ ++ ENTER4("%p, %p, %p, %d", buffer, virt, length, priority); ++ if (virt) ++ *virt = MmGetSystemAddressForMdlSafe(buffer, priority); ++ *length = MmGetMdlByteCount(buffer); ++ TRACE4("%p, %u", virt ? *virt : NULL, *length); ++} ++ ++wstdcall void *WIN_FUNC(NdisBufferVirtualAddress,1) ++ (ndis_buffer *buffer) ++{ ++ ENTER3("%p", buffer); ++ return MmGetSystemAddressForMdl(buffer); ++} ++ ++wstdcall ULONG WIN_FUNC(NdisBufferLength,1) ++ (ndis_buffer *buffer) ++{ ++ ENTER3("%p", buffer); ++ return MmGetMdlByteCount(buffer); ++} ++ ++wstdcall void WIN_FUNC(NdisQueryBufferOffset,3) ++ (ndis_buffer *buffer, UINT *offset, UINT *length) ++{ ++ ENTER3("%p", buffer); ++ *offset = MmGetMdlByteOffset(buffer); ++ *length = MmGetMdlByteCount(buffer); ++ TRACE3("%d, %d", *offset, *length); ++} ++ ++wstdcall void WIN_FUNC(NdisUnchainBufferAtBack,2) ++ (struct ndis_packet *packet, ndis_buffer **buffer) ++{ ++ ndis_buffer *b, *btail; ++ ++ ENTER3("%p", packet); ++ b = packet->private.buffer_head; ++ if (!b) { ++ /* no buffer in packet */ ++ *buffer = NULL; ++ EXIT3(return); ++ } ++ btail = packet->private.buffer_tail; ++ *buffer = btail; ++ if (b == btail) { ++ /* one buffer in packet */ ++ packet->private.buffer_head = NULL; ++ packet->private.buffer_tail = NULL; ++ } else { ++ while (b->next != btail) ++ b = b->next; ++ packet->private.buffer_tail = b; ++ b->next = NULL; ++ } ++ packet->private.valid_counts = FALSE; ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisUnchainBufferAtFront,2) ++ (struct ndis_packet *packet, ndis_buffer **buffer) ++{ ++ ENTER3("%p", packet); ++ if (packet->private.buffer_head == NULL) { ++ /* no buffer in packet */ ++ *buffer = NULL; ++ EXIT3(return); ++ } ++ ++ *buffer = packet->private.buffer_head; ++ if (packet->private.buffer_head == packet->private.buffer_tail) { ++ /* one buffer in packet */ ++ packet->private.buffer_head = NULL; ++ packet->private.buffer_tail = NULL; ++ } else ++ packet->private.buffer_head = (*buffer)->next; ++ ++ packet->private.valid_counts = FALSE; ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisGetFirstBufferFromPacketSafe,6) ++ (struct ndis_packet *packet, ndis_buffer **first_buffer, ++ void **first_buffer_va, UINT *first_buffer_length, ++ UINT *total_buffer_length, enum mm_page_priority priority) ++{ ++ ndis_buffer *b = packet->private.buffer_head; ++ ++ ENTER3("%p(%p)", packet, b); ++ *first_buffer = b; ++ if (b) { ++ *first_buffer_va = MmGetSystemAddressForMdlSafe(b, priority); ++ *first_buffer_length = *total_buffer_length = ++ MmGetMdlByteCount(b); ++ for (b = b->next; b; b = b->next) ++ *total_buffer_length += MmGetMdlByteCount(b); ++ } else { ++ *first_buffer_va = NULL; ++ *first_buffer_length = 0; ++ *total_buffer_length = 0; ++ } ++ TRACE3("%p, %d, %d", *first_buffer_va, *first_buffer_length, ++ *total_buffer_length); ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisGetFirstBufferFromPacket,6) ++ (struct ndis_packet *packet, ndis_buffer **first_buffer, ++ void **first_buffer_va, UINT *first_buffer_length, ++ UINT *total_buffer_length, enum mm_page_priority priority) ++{ ++ NdisGetFirstBufferFromPacketSafe(packet, first_buffer, ++ first_buffer_va, first_buffer_length, ++ total_buffer_length, ++ NormalPagePriority); ++} ++ ++wstdcall void WIN_FUNC(NdisAllocatePacketPoolEx,5) ++ (NDIS_STATUS *status, struct ndis_packet_pool **pool_handle, ++ UINT num_descr, UINT overflowsize, UINT proto_rsvd_length) ++{ ++ struct ndis_packet_pool *pool; ++ ++ ENTER3("buffers: %d, length: %d", num_descr, proto_rsvd_length); ++ pool = kzalloc(sizeof(*pool), irql_gfp()); ++ if (!pool) { ++ *status = NDIS_STATUS_RESOURCES; ++ EXIT3(return); ++ } ++ spin_lock_init(&pool->lock); ++ pool->max_descr = num_descr; ++ pool->num_allocated_descr = 0; ++ pool->num_used_descr = 0; ++ pool->free_descr = NULL; ++ pool->proto_rsvd_length = proto_rsvd_length; ++ *pool_handle = pool; ++ *status = NDIS_STATUS_SUCCESS; ++ TRACE3("pool: %p", pool); ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisAllocatePacketPool,4) ++ (NDIS_STATUS *status, struct ndis_packet_pool **pool_handle, ++ UINT num_descr, UINT proto_rsvd_length) ++{ ++ NdisAllocatePacketPoolEx(status, pool_handle, num_descr, 0, ++ proto_rsvd_length); ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisFreePacketPool,1) ++ (struct ndis_packet_pool *pool) ++{ ++ struct ndis_packet *packet, *next; ++ ++ ENTER3("pool: %p", pool); ++ if (!pool) { ++ WARNING("invalid pool"); ++ EXIT3(return); ++ } ++ spin_lock_bh(&pool->lock); ++ packet = pool->free_descr; ++ while (packet) { ++ next = (struct ndis_packet *)packet->reserved[0]; ++ kfree(packet); ++ packet = next; ++ } ++ pool->num_allocated_descr = 0; ++ pool->num_used_descr = 0; ++ pool->free_descr = NULL; ++ spin_unlock_bh(&pool->lock); ++ kfree(pool); ++ EXIT3(return); ++} ++ ++wstdcall UINT WIN_FUNC(NdisPacketPoolUsage,1) ++ (struct ndis_packet_pool *pool) ++{ ++ EXIT4(return pool->num_used_descr); ++} ++ ++wstdcall void WIN_FUNC(NdisAllocatePacket,3) ++ (NDIS_STATUS *status, struct ndis_packet **ndis_packet, ++ struct ndis_packet_pool *pool) ++{ ++ struct ndis_packet *packet; ++ int packet_length; ++ ++ ENTER4("pool: %p", pool); ++ if (!pool) { ++ *status = NDIS_STATUS_RESOURCES; ++ *ndis_packet = NULL; ++ EXIT4(return); ++ } ++ assert_irql(_irql_ <= SOFT_LEVEL); ++ if (pool->num_used_descr > pool->max_descr) { ++ TRACE3("pool %p is full: %d(%d)", pool, ++ pool->num_used_descr, pool->max_descr); ++#ifndef ALLOW_POOL_OVERFLOW ++ *status = NDIS_STATUS_RESOURCES; ++ *ndis_packet = NULL; ++ return; ++#endif ++ } ++ /* packet has space for 1 byte in protocol_reserved field */ ++ packet_length = sizeof(*packet) - 1 + pool->proto_rsvd_length + ++ sizeof(struct ndis_packet_oob_data); ++ spin_lock_bh(&pool->lock); ++ if ((packet = pool->free_descr)) ++ pool->free_descr = (void *)packet->reserved[0]; ++ spin_unlock_bh(&pool->lock); ++ if (!packet) { ++ packet = kmalloc(packet_length, irql_gfp()); ++ if (!packet) { ++ WARNING("couldn't allocate packet"); ++ *status = NDIS_STATUS_RESOURCES; ++ *ndis_packet = NULL; ++ return; ++ } ++ atomic_inc_var(pool->num_allocated_descr); ++ } ++ TRACE4("%p, %p", pool, packet); ++ atomic_inc_var(pool->num_used_descr); ++ memset(packet, 0, packet_length); ++ packet->private.oob_offset = ++ packet_length - sizeof(struct ndis_packet_oob_data); ++ packet->private.packet_flags = fPACKET_ALLOCATED_BY_NDIS; ++ packet->private.pool = pool; ++ *ndis_packet = packet; ++ *status = NDIS_STATUS_SUCCESS; ++ EXIT4(return); ++} ++ ++wstdcall void WIN_FUNC(NdisDprAllocatePacket,3) ++ (NDIS_STATUS *status, struct ndis_packet **packet, ++ struct ndis_packet_pool *pool) ++{ ++ NdisAllocatePacket(status, packet, pool); ++} ++ ++wstdcall void WIN_FUNC(NdisFreePacket,1) ++ (struct ndis_packet *packet) ++{ ++ struct ndis_packet_pool *pool; ++ ++ ENTER4("%p, %p", packet, packet->private.pool); ++ pool = packet->private.pool; ++ if (!pool) { ++ ERROR("invalid pool %p", packet); ++ EXIT4(return); ++ } ++ assert((int)pool->num_used_descr > 0); ++ atomic_dec_var(pool->num_used_descr); ++ if (packet->reserved[1]) { ++ TRACE3("%p, %p", packet, (void *)packet->reserved[1]); ++ kfree((void *)packet->reserved[1]); ++ packet->reserved[1] = 0; ++ } ++ if (pool->num_allocated_descr > MAX_ALLOCATED_NDIS_PACKETS) { ++ TRACE3("%p", pool); ++ atomic_dec_var(pool->num_allocated_descr); ++ kfree(packet); ++ } else { ++ TRACE4("%p, %p, %p", pool, packet, pool->free_descr); ++ spin_lock_bh(&pool->lock); ++ packet->reserved[0] = ++ (typeof(packet->reserved[0]))pool->free_descr; ++ pool->free_descr = packet; ++ spin_unlock_bh(&pool->lock); ++ } ++ EXIT4(return); ++} ++ ++wstdcall struct ndis_packet_stack *WIN_FUNC(NdisIMGetCurrentPacketStack,2) ++ (struct ndis_packet *packet, BOOLEAN *stacks_remain) ++{ ++ struct ndis_packet_stack *stack; ++ ++ if (!packet->reserved[1]) { ++ stack = kzalloc(2 * sizeof(*stack), irql_gfp()); ++ TRACE3("%p, %p", packet, stack); ++ packet->reserved[1] = (typeof(packet->reserved[1]))stack; ++ } else { ++ stack = (void *)packet->reserved[1];; ++ if (xchg(&stack->ndis_reserved[0], 1)) { ++ stack++; ++ if (xchg(&stack->ndis_reserved[0], 1)) ++ stack = NULL; ++ } ++ TRACE3("%p", stack); ++ } ++ if (stack) ++ *stacks_remain = TRUE; ++ else ++ *stacks_remain = FALSE; ++ ++ EXIT3(return stack); ++} ++ ++wstdcall void WIN_FUNC(NdisCopyFromPacketToPacketSafe,7) ++ (struct ndis_packet *dst, UINT dst_offset, UINT num_to_copy, ++ struct ndis_packet *src, UINT src_offset, UINT *num_copied, ++ enum mm_page_priority priority) ++{ ++ UINT dst_n, src_n, n, left; ++ ndis_buffer *dst_buf; ++ ndis_buffer *src_buf; ++ ++ ENTER4(""); ++ if (!dst || !src) { ++ *num_copied = 0; ++ EXIT4(return); ++ } ++ ++ dst_buf = dst->private.buffer_head; ++ src_buf = src->private.buffer_head; ++ ++ if (!dst_buf || !src_buf) { ++ *num_copied = 0; ++ EXIT4(return); ++ } ++ dst_n = MmGetMdlByteCount(dst_buf) - dst_offset; ++ src_n = MmGetMdlByteCount(src_buf) - src_offset; ++ ++ n = min(src_n, dst_n); ++ n = min(n, num_to_copy); ++ memcpy(MmGetSystemAddressForMdl(dst_buf) + dst_offset, ++ MmGetSystemAddressForMdl(src_buf) + src_offset, n); ++ ++ left = num_to_copy - n; ++ while (left > 0) { ++ src_offset += n; ++ dst_offset += n; ++ dst_n -= n; ++ src_n -= n; ++ if (dst_n == 0) { ++ dst_buf = dst_buf->next; ++ if (!dst_buf) ++ break; ++ dst_n = MmGetMdlByteCount(dst_buf); ++ dst_offset = 0; ++ } ++ if (src_n == 0) { ++ src_buf = src_buf->next; ++ if (!src_buf) ++ break; ++ src_n = MmGetMdlByteCount(src_buf); ++ src_offset = 0; ++ } ++ ++ n = min(src_n, dst_n); ++ n = min(n, left); ++ memcpy(MmGetSystemAddressForMdl(dst_buf) + dst_offset, ++ MmGetSystemAddressForMdl(src_buf) + src_offset, n); ++ left -= n; ++ } ++ *num_copied = num_to_copy - left; ++ EXIT4(return); ++} ++ ++wstdcall void WIN_FUNC(NdisCopyFromPacketToPacket,6) ++ (struct ndis_packet *dst, UINT dst_offset, UINT num_to_copy, ++ struct ndis_packet *src, UINT src_offset, UINT *num_copied) ++{ ++ NdisCopyFromPacketToPacketSafe(dst, dst_offset, num_to_copy, ++ src, src_offset, num_copied, ++ NormalPagePriority); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisIMCopySendPerPacketInfo,2) ++ (struct ndis_packet *dst, struct ndis_packet *src) ++{ ++ struct ndis_packet_oob_data *dst_oob, *src_oob; ++ dst_oob = NDIS_PACKET_OOB_DATA(dst); ++ src_oob = NDIS_PACKET_OOB_DATA(src); ++ memcpy(&dst_oob->ext, &src_oob->ext, sizeof(dst_oob->ext)); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisSend,3) ++ (NDIS_STATUS *status, struct ndis_mp_block *nmb, ++ struct ndis_packet *packet) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct miniport *mp; ++ KIRQL irql; ++ ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ if (mp->send_packets) { ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ LIN2WIN3(mp->send_packets, wnd->nmb->mp_ctx, &packet, 1); ++ serialize_unlock_irql(wnd, irql); ++ if (deserialized_driver(wnd)) ++ *status = NDIS_STATUS_PENDING; ++ else { ++ struct ndis_packet_oob_data *oob_data; ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ *status = oob_data->status; ++ switch (*status) { ++ case NDIS_STATUS_SUCCESS: ++ free_tx_packet(wnd, packet, *status); ++ break; ++ case NDIS_STATUS_PENDING: ++ break; ++ case NDIS_STATUS_RESOURCES: ++ wnd->tx_ok = 0; ++ break; ++ case NDIS_STATUS_FAILURE: ++ default: ++ free_tx_packet(wnd, packet, *status); ++ break; ++ } ++ } ++ } else { ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ *status = LIN2WIN3(mp->send, wnd->nmb->mp_ctx, packet, 0); ++ serialize_unlock_irql(wnd, irql); ++ switch (*status) { ++ case NDIS_STATUS_SUCCESS: ++ free_tx_packet(wnd, packet, *status); ++ break; ++ case NDIS_STATUS_PENDING: ++ break; ++ case NDIS_STATUS_RESOURCES: ++ wnd->tx_ok = 0; ++ break; ++ case NDIS_STATUS_FAILURE: ++ default: ++ free_tx_packet(wnd, packet, *status); ++ break; ++ } ++ } ++ EXIT3(return); ++} ++ ++/* called for serialized drivers only */ ++wstdcall void mp_timer_dpc(struct kdpc *kdpc, void *ctx, void *arg1, void *arg2) ++{ ++ struct ndis_mp_timer *timer; ++ struct ndis_mp_block *nmb; ++ ++ timer = ctx; ++ TIMERENTER("%p, %p, %p, %p", timer, timer->func, timer->ctx, timer->nmb); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ nmb = timer->nmb; ++ serialize_lock(nmb->wnd); ++ LIN2WIN4(timer->func, NULL, timer->ctx, NULL, NULL); ++ serialize_unlock(nmb->wnd); ++ TIMEREXIT(return); ++} ++WIN_FUNC_DECL(mp_timer_dpc,4) ++ ++wstdcall void WIN_FUNC(NdisMInitializeTimer,4) ++ (struct ndis_mp_timer *timer, struct ndis_mp_block *nmb, ++ DPC func, void *ctx) ++{ ++ TIMERENTER("%p, %p, %p, %p", timer, func, ctx, nmb); ++ assert_irql(_irql_ == PASSIVE_LEVEL); ++ timer->func = func; ++ timer->ctx = ctx; ++ timer->nmb = nmb; ++ if (deserialized_driver(nmb->wnd)) ++ KeInitializeDpc(&timer->kdpc, func, ctx); ++ else ++ KeInitializeDpc(&timer->kdpc, WIN_FUNC_PTR(mp_timer_dpc,4), ++ timer); ++ wrap_init_timer(&timer->nt_timer, NotificationTimer, nmb); ++ TIMEREXIT(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMSetPeriodicTimer,2) ++ (struct ndis_mp_timer *timer, UINT period_ms) ++{ ++ unsigned long expires = MSEC_TO_HZ(period_ms); ++ ++ TIMERENTER("%p, %u, %ld", timer, period_ms, expires); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ wrap_set_timer(&timer->nt_timer, expires, expires, &timer->kdpc); ++ TIMEREXIT(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMCancelTimer,2) ++ (struct ndis_mp_timer *timer, BOOLEAN *canceled) ++{ ++ TIMERENTER("%p", timer); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ *canceled = KeCancelTimer(&timer->nt_timer); ++ TIMERTRACE("%d", *canceled); ++ return; ++} ++ ++wstdcall void WIN_FUNC(NdisInitializeTimer,3) ++ (struct ndis_timer *timer, void *func, void *ctx) ++{ ++ TIMERENTER("%p, %p, %p", timer, func, ctx); ++ assert_irql(_irql_ == PASSIVE_LEVEL); ++ KeInitializeDpc(&timer->kdpc, func, ctx); ++ wrap_init_timer(&timer->nt_timer, NotificationTimer, NULL); ++ TIMEREXIT(return); ++} ++ ++/* NdisMSetTimer is a macro that calls NdisSetTimer with ++ * ndis_mp_timer typecast to ndis_timer */ ++ ++wstdcall void WIN_FUNC(NdisSetTimer,2) ++ (struct ndis_timer *timer, UINT duetime_ms) ++{ ++ unsigned long expires = MSEC_TO_HZ(duetime_ms); ++ ++ TIMERENTER("%p, %p, %u, %ld", timer, timer->nt_timer.wrap_timer, ++ duetime_ms, expires); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ wrap_set_timer(&timer->nt_timer, expires, 0, &timer->kdpc); ++ TIMEREXIT(return); ++} ++ ++wstdcall void WIN_FUNC(NdisCancelTimer,2) ++ (struct ndis_timer *timer, BOOLEAN *canceled) ++{ ++ TIMERENTER("%p", timer); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ *canceled = KeCancelTimer(&timer->nt_timer); ++ TIMEREXIT(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMRegisterAdapterShutdownHandler,3) ++ (struct ndis_mp_block *nmb, void *ctx, void *func) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ENTER1("%p", func); ++ wnd->wd->driver->ndis_driver->mp.shutdown = func; ++ wnd->shutdown_ctx = ctx; ++} ++ ++wstdcall void WIN_FUNC(NdisMDeregisterAdapterShutdownHandler,1) ++ (struct ndis_mp_block *nmb) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ wnd->wd->driver->ndis_driver->mp.shutdown = NULL; ++ wnd->shutdown_ctx = NULL; ++} ++ ++/* TODO: rt61 (serialized) driver doesn't want MiniportEnableInterrupt ++ * to be called in irq handler, but mrv800c (deserialized) driver ++ * wants. NDIS is confusing about when to call MiniportEnableInterrupt ++ * For now, handle these cases with two separate irq handlers based on ++ * observation of these two drivers. However, it is likely not ++ * correct. */ ++wstdcall void deserialized_irq_handler(struct kdpc *kdpc, void *ctx, ++ void *arg1, void *arg2) ++{ ++ struct ndis_device *wnd = ctx; ++ ndis_interrupt_handler irq_handler = arg1; ++ struct miniport *mp = arg2; ++ ++ TRACE6("%p", irq_handler); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ LIN2WIN1(irq_handler, wnd->nmb->mp_ctx); ++ if (mp->enable_interrupt) ++ LIN2WIN1(mp->enable_interrupt, wnd->nmb->mp_ctx); ++ EXIT6(return); ++} ++WIN_FUNC_DECL(deserialized_irq_handler,4) ++ ++wstdcall void serialized_irq_handler(struct kdpc *kdpc, void *ctx, ++ void *arg1, void *arg2) ++{ ++ struct ndis_device *wnd = ctx; ++ ndis_interrupt_handler irq_handler = arg1; ++ ++ TRACE6("%p, %p, %p", wnd, irq_handler, arg2); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ serialize_lock(wnd); ++ LIN2WIN1(irq_handler, arg2); ++ serialize_unlock(wnd); ++ EXIT6(return); ++} ++WIN_FUNC_DECL(serialized_irq_handler,4) ++ ++wstdcall BOOLEAN ndis_isr(struct kinterrupt *kinterrupt, void *ctx) ++{ ++ struct ndis_mp_interrupt *mp_interrupt = ctx; ++ struct ndis_device *wnd = mp_interrupt->nmb->wnd; ++ BOOLEAN recognized = TRUE, queue_handler = TRUE; ++ ++ TRACE6("%p", wnd); ++ /* kernel may call ISR when registering interrupt, in ++ * the same context if DEBUG_SHIRQ is enabled */ ++ assert_irql(_irql_ == DIRQL || _irql_ == PASSIVE_LEVEL); ++ if (mp_interrupt->shared) ++ LIN2WIN3(mp_interrupt->isr, &recognized, &queue_handler, ++ wnd->nmb->mp_ctx); ++ else { ++ struct miniport *mp; ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ LIN2WIN1(mp->disable_interrupt, wnd->nmb->mp_ctx); ++ /* it is not shared interrupt, so handler must be called */ ++ recognized = queue_handler = TRUE; ++ } ++ if (recognized) { ++ if (queue_handler) { ++ TRACE5("%p", &wnd->irq_kdpc); ++ queue_kdpc(&wnd->irq_kdpc); ++ } ++ EXIT6(return TRUE); ++ } ++ EXIT6(return FALSE); ++} ++WIN_FUNC_DECL(ndis_isr,2) ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMRegisterInterrupt,7) ++ (struct ndis_mp_interrupt *mp_interrupt, ++ struct ndis_mp_block *nmb, UINT vector, UINT level, ++ BOOLEAN req_isr, BOOLEAN shared, enum kinterrupt_mode mode) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct miniport *mp; ++ ++ ENTER1("%p, vector:%d, level:%d, req_isr:%d, shared:%d, mode:%d", ++ mp_interrupt, vector, level, req_isr, shared, mode); ++ ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ nt_spin_lock_init(&mp_interrupt->lock); ++ mp_interrupt->irq = vector; ++ mp_interrupt->isr = mp->isr; ++ mp_interrupt->mp_dpc = mp->handle_interrupt; ++ mp_interrupt->nmb = nmb; ++ mp_interrupt->req_isr = req_isr; ++ if (shared && !req_isr) ++ WARNING("shared but dynamic interrupt!"); ++ mp_interrupt->shared = shared; ++ wnd->mp_interrupt = mp_interrupt; ++ if (mp->enable_interrupt) ++ mp_interrupt->enable = TRUE; ++ else ++ mp_interrupt->enable = FALSE; ++ ++ if (deserialized_driver(wnd)) { ++ KeInitializeDpc(&wnd->irq_kdpc, ++ WIN_FUNC_PTR(deserialized_irq_handler,4), ++ nmb->wnd); ++ wnd->irq_kdpc.arg1 = mp->handle_interrupt; ++ wnd->irq_kdpc.arg2 = mp; ++ TRACE2("%p, %p, %p, %p", wnd->irq_kdpc.arg1, wnd->irq_kdpc.arg2, ++ nmb->wnd, nmb->mp_ctx); ++ } else { ++ KeInitializeDpc(&wnd->irq_kdpc, ++ WIN_FUNC_PTR(serialized_irq_handler,4), ++ nmb->wnd); ++ wnd->irq_kdpc.arg1 = mp->handle_interrupt; ++ wnd->irq_kdpc.arg2 = nmb->mp_ctx; ++ TRACE2("%p, %p, %p", wnd->irq_kdpc.arg1, wnd->irq_kdpc.arg2, ++ nmb->wnd); ++ } ++ ++ if (IoConnectInterrupt(&mp_interrupt->kinterrupt, ++ WIN_FUNC_PTR(ndis_isr,2), mp_interrupt, NULL, ++ vector, DIRQL, DIRQL, mode, shared, 0, FALSE) != ++ STATUS_SUCCESS) { ++ printk(KERN_WARNING "%s: request for IRQ %d failed\n", ++ DRIVER_NAME, vector); ++ return NDIS_STATUS_RESOURCES; ++ } ++ printk(KERN_INFO "%s: using IRQ %d\n", DRIVER_NAME, vector); ++ EXIT1(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(NdisMDeregisterInterrupt,1) ++ (struct ndis_mp_interrupt *mp_interrupt) ++{ ++ struct ndis_mp_block *nmb; ++ ++ ENTER1("%p", mp_interrupt); ++ nmb = xchg(&mp_interrupt->nmb, NULL); ++ TRACE1("%p", nmb); ++ if (!nmb) { ++ WARNING("interrupt already freed?"); ++ return; ++ } ++ nmb->wnd->mp_interrupt = NULL; ++ if (dequeue_kdpc(&nmb->wnd->irq_kdpc)) ++ TRACE2("interrupt kdpc was pending"); ++ flush_workqueue(wrapndis_wq); ++ IoDisconnectInterrupt(mp_interrupt->kinterrupt); ++ EXIT1(return); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(NdisMSynchronizeWithInterrupt,3) ++ (struct ndis_mp_interrupt *mp_interrupt, ++ PKSYNCHRONIZE_ROUTINE sync_func, void *ctx) ++{ ++ return KeSynchronizeExecution(mp_interrupt->kinterrupt, sync_func, ctx); ++} ++ ++/* called via function pointer; but 64-bit RNDIS driver calls directly */ ++wstdcall void WIN_FUNC(NdisMIndicateStatus,4) ++ (struct ndis_mp_block *nmb, NDIS_STATUS status, void *buf, UINT len) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct ndis_status_indication *si; ++ ++ ENTER2("status=0x%x len=%d", status, len); ++ switch (status) { ++ case NDIS_STATUS_MEDIA_CONNECT: ++ set_media_state(wnd, NdisMediaStateConnected); ++ break; ++ case NDIS_STATUS_MEDIA_DISCONNECT: ++ set_media_state(wnd, NdisMediaStateDisconnected); ++ break; ++ case NDIS_STATUS_MEDIA_SPECIFIC_INDICATION: ++ if (!buf) ++ break; ++ si = buf; ++ TRACE2("status_type=%d", si->status_type); ++ switch (si->status_type) { ++ case Ndis802_11StatusType_MediaStreamMode: ++ break; ++#ifdef CONFIG_WIRELESS_EXT ++ case Ndis802_11StatusType_Authentication: ++ buf = (char *)buf + sizeof(*si); ++ len -= sizeof(*si); ++ while (len > 0) { ++ int pairwise_error = 0, group_error = 0; ++ struct ndis_auth_req *auth_req = ++ (struct ndis_auth_req *)buf; ++ TRACE1(MACSTRSEP, MAC2STR(auth_req->bssid)); ++ if (auth_req->flags & 0x01) ++ TRACE2("reauth request"); ++ if (auth_req->flags & 0x02) ++ TRACE2("key update request"); ++ if (auth_req->flags & 0x06) { ++ pairwise_error = 1; ++ TRACE2("pairwise_error"); ++ } ++ if (auth_req->flags & 0x0E) { ++ group_error = 1; ++ TRACE2("group_error"); ++ } ++ if (pairwise_error || group_error) { ++ union iwreq_data wrqu; ++ struct iw_michaelmicfailure micfailure; ++ ++ memset(&micfailure, 0, sizeof(micfailure)); ++ if (pairwise_error) ++ micfailure.flags |= ++ IW_MICFAILURE_PAIRWISE; ++ if (group_error) ++ micfailure.flags |= ++ IW_MICFAILURE_GROUP; ++ memcpy(micfailure.src_addr.sa_data, ++ auth_req->bssid, ETH_ALEN); ++ memset(&wrqu, 0, sizeof(wrqu)); ++ wrqu.data.length = sizeof(micfailure); ++ wireless_send_event(wnd->net_dev, ++ IWEVMICHAELMICFAILURE, ++ &wrqu, (u8 *)&micfailure); ++ } ++ len -= auth_req->length; ++ buf = (char *)buf + auth_req->length; ++ } ++ break; ++ case Ndis802_11StatusType_PMKID_CandidateList: ++ { ++ u8 *end; ++ unsigned long i; ++ struct ndis_pmkid_candidate_list *cand; ++ ++ cand = buf + sizeof(struct ndis_status_indication); ++ if (len < sizeof(struct ndis_status_indication) + ++ sizeof(struct ndis_pmkid_candidate_list) || ++ cand->version != 1) { ++ WARNING("unrecognized PMKID ignored"); ++ EXIT1(return); ++ } ++ ++ end = (u8 *)buf + len; ++ TRACE2("PMKID ver %d num_cand %d", ++ cand->version, cand->num_candidates); ++ for (i = 0; i < cand->num_candidates; i++) { ++ struct iw_pmkid_cand pcand; ++ union iwreq_data wrqu; ++ struct ndis_pmkid_candidate *c = ++ &cand->candidates[i]; ++ if ((u8 *)(c + 1) > end) { ++ TRACE2("truncated PMKID"); ++ break; ++ } ++ TRACE2("%ld: " MACSTRSEP " 0x%x", ++ i, MAC2STR(c->bssid), c->flags); ++ memset(&pcand, 0, sizeof(pcand)); ++ if (c->flags & 0x01) ++ pcand.flags |= IW_PMKID_CAND_PREAUTH; ++ pcand.index = i; ++ memcpy(pcand.bssid.sa_data, c->bssid, ETH_ALEN); ++ ++ memset(&wrqu, 0, sizeof(wrqu)); ++ wrqu.data.length = sizeof(pcand); ++ wireless_send_event(wnd->net_dev, IWEVPMKIDCAND, ++ &wrqu, (u8 *)&pcand); ++ } ++ break; ++ } ++ case Ndis802_11StatusType_RadioState: ++ { ++ struct ndis_radio_status_indication *radio_status = buf; ++ if (radio_status->radio_state == ++ Ndis802_11RadioStatusOn) ++ INFO("radio is turned on"); ++ else if (radio_status->radio_state == ++ Ndis802_11RadioStatusHardwareOff) ++ INFO("radio is turned off by hardware"); ++ else if (radio_status->radio_state == ++ Ndis802_11RadioStatusSoftwareOff) ++ INFO("radio is turned off by software"); ++ break; ++ } ++#endif ++ default: ++ /* is this RSSI indication? */ ++ TRACE2("unknown indication: %x", si->status_type); ++ break; ++ } ++ break; ++ default: ++ TRACE2("unknown status: %08X", status); ++ break; ++ } ++ ++ EXIT2(return); ++} ++ ++/* called via function pointer; but 64-bit RNDIS driver calls directly */ ++wstdcall void WIN_FUNC(NdisMIndicateStatusComplete,1) ++ (struct ndis_mp_block *nmb) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ENTER2("%p", wnd); ++ if (wnd->tx_ok) ++ queue_work(wrapndis_wq, &wnd->tx_work); ++} ++ ++/* called via function pointer */ ++wstdcall void NdisMSendComplete(struct ndis_mp_block *nmb, ++ struct ndis_packet *packet, NDIS_STATUS status) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ENTER4("%p, %08X", packet, status); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ if (deserialized_driver(wnd)) ++ free_tx_packet(wnd, packet, status); ++ else { ++ struct ndis_packet_oob_data *oob_data; ++ NDIS_STATUS pkt_status; ++ TRACE3("%p, %08x", packet, status); ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ switch ((pkt_status = xchg(&oob_data->status, status))) { ++ case NDIS_STATUS_NOT_RECOGNIZED: ++ free_tx_packet(wnd, packet, status); ++ break; ++ case NDIS_STATUS_PENDING: ++ case 0: ++ break; ++ default: ++ WARNING("%p: invalid status: %08X", packet, pkt_status); ++ break; ++ } ++ /* In case a serialized driver has earlier requested a ++ * pause by returning NDIS_STATUS_RESOURCES during ++ * MiniportSend(Packets), wakeup tx worker now. ++ */ ++ if (xchg(&wnd->tx_ok, 1) == 0) { ++ TRACE3("%d, %d", wnd->tx_ring_start, wnd->tx_ring_end); ++ queue_work(wrapndis_wq, &wnd->tx_work); ++ } ++ } ++ EXIT3(return); ++} ++ ++/* called via function pointer */ ++wstdcall void NdisMSendResourcesAvailable(struct ndis_mp_block *nmb) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ENTER3("%d, %d", wnd->tx_ring_start, wnd->tx_ring_end); ++ wnd->tx_ok = 1; ++ queue_work(wrapndis_wq, &wnd->tx_work); ++ EXIT3(return); ++} ++ ++wstdcall void return_packet(void *arg1, void *arg2) ++{ ++ struct ndis_device *wnd; ++ struct ndis_packet *packet; ++ struct miniport *mp; ++ KIRQL irql; ++ ++ wnd = arg1; ++ packet = arg2; ++ ENTER4("%p, %p", wnd, packet); ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ LIN2WIN2(mp->return_packet, wnd->nmb->mp_ctx, packet); ++ serialize_unlock_irql(wnd, irql); ++ EXIT4(return); ++} ++WIN_FUNC_DECL(return_packet,2) ++ ++/* called via function pointer */ ++wstdcall void NdisMIndicateReceivePacket(struct ndis_mp_block *nmb, ++ struct ndis_packet **packets, ++ UINT nr_packets) ++{ ++ struct ndis_device *wnd; ++ ndis_buffer *buffer; ++ struct ndis_packet *packet; ++ struct sk_buff *skb; ++ ULONG i, length, total_length; ++ struct ndis_packet_oob_data *oob_data; ++ void *virt; ++ struct ndis_tcp_ip_checksum_packet_info csum; ++ ++ ENTER3("%p, %d", nmb, nr_packets); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ wnd = nmb->wnd; ++ for (i = 0; i < nr_packets; i++) { ++ packet = packets[i]; ++ if (!packet) { ++ WARNING("empty packet ignored"); ++ continue; ++ } ++ wnd->net_dev->last_rx = jiffies; ++ /* get total number of bytes in packet */ ++ NdisGetFirstBufferFromPacketSafe(packet, &buffer, &virt, ++ &length, &total_length, ++ NormalPagePriority); ++ TRACE3("%d, %d", length, total_length); ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ TRACE3("0x%x, 0x%x, %llu", packet->private.flags, ++ packet->private.packet_flags, oob_data->time_rxed); ++ skb = dev_alloc_skb(total_length); ++ if (skb) { ++ while (buffer) { ++ memcpy_skb(skb, MmGetSystemAddressForMdl(buffer), ++ MmGetMdlByteCount(buffer)); ++ buffer = buffer->next; ++ } ++ skb->dev = wnd->net_dev; ++ skb->protocol = eth_type_trans(skb, wnd->net_dev); ++ pre_atomic_add(wnd->net_stats.rx_bytes, total_length); ++ atomic_inc_var(wnd->net_stats.rx_packets); ++ csum.value = (typeof(csum.value))(ULONG_PTR) ++ oob_data->ext.info[TcpIpChecksumPacketInfo]; ++ TRACE3("0x%05x", csum.value); ++ if (wnd->rx_csum.value && ++ (csum.rx.tcp_succeeded || csum.rx.udp_succeeded || ++ csum.rx.ip_succeeded)) ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ else ++ skb->ip_summed = CHECKSUM_NONE; ++ ++ if (in_interrupt()) ++ netif_rx(skb); ++ else ++ netif_rx_ni(skb); ++ } else { ++ WARNING("couldn't allocate skb; packet dropped"); ++ atomic_inc_var(wnd->net_stats.rx_dropped); ++ } ++ ++ /* serialized drivers check the status upon return ++ * from this function */ ++ if (!deserialized_driver(wnd)) { ++ oob_data->status = NDIS_STATUS_SUCCESS; ++ continue; ++ } ++ ++ /* if a deserialized driver sets ++ * NDIS_STATUS_RESOURCES, then it reclaims the packet ++ * upon return from this function */ ++ if (oob_data->status == NDIS_STATUS_RESOURCES) ++ continue; ++ ++ assert(oob_data->status == NDIS_STATUS_SUCCESS); ++ /* deserialized driver doesn't check the status upon ++ * return from this function; we need to call ++ * MiniportReturnPacket later for this packet. Calling ++ * MiniportReturnPacket from here is not correct - the ++ * driver doesn't expect it (at least Centrino driver ++ * crashes) */ ++ schedule_ntos_work_item(WIN_FUNC_PTR(return_packet,2), ++ wnd, packet); ++ } ++ EXIT3(return); ++} ++ ++/* called via function pointer (by NdisMEthIndicateReceive macro); the ++ * first argument is nmb->eth_db */ ++wstdcall void EthRxIndicateHandler(struct ndis_mp_block *nmb, void *rx_ctx, ++ char *header1, char *header, UINT header_size, ++ void *look_ahead, UINT look_ahead_size, ++ UINT packet_size) ++{ ++ struct sk_buff *skb = NULL; ++ struct ndis_device *wnd; ++ unsigned int skb_size = 0; ++ KIRQL irql; ++ struct ndis_packet_oob_data *oob_data; ++ ++ ENTER3("nmb = %p, rx_ctx = %p, buf = %p, size = %d, buf = %p, " ++ "size = %d, packet = %d", nmb, rx_ctx, header, header_size, ++ look_ahead, look_ahead_size, packet_size); ++ ++ wnd = nmb->wnd; ++ TRACE3("wnd = %p", wnd); ++ if (!wnd) { ++ ERROR("nmb is NULL"); ++ EXIT3(return); ++ } ++ wnd->net_dev->last_rx = jiffies; ++ ++ if (look_ahead_size < packet_size) { ++ struct ndis_packet *packet; ++ struct miniport *mp; ++ unsigned int bytes_txed; ++ NDIS_STATUS res; ++ ++ NdisAllocatePacket(&res, &packet, wnd->tx_packet_pool); ++ if (res != NDIS_STATUS_SUCCESS) { ++ atomic_inc_var(wnd->net_stats.rx_dropped); ++ EXIT3(return); ++ } ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ res = LIN2WIN6(mp->tx_data, packet, &bytes_txed, nmb, ++ rx_ctx, look_ahead_size, packet_size); ++ serialize_unlock_irql(wnd, irql); ++ TRACE3("%d, %d, %d", header_size, look_ahead_size, bytes_txed); ++ if (res == NDIS_STATUS_SUCCESS) { ++ ndis_buffer *buffer; ++ struct ndis_tcp_ip_checksum_packet_info csum; ++ skb = dev_alloc_skb(header_size + look_ahead_size + ++ bytes_txed); ++ if (!skb) { ++ ERROR("couldn't allocate skb; packet dropped"); ++ atomic_inc_var(wnd->net_stats.rx_dropped); ++ NdisFreePacket(packet); ++ return; ++ } ++ memcpy_skb(skb, header, header_size); ++ memcpy_skb(skb, look_ahead, look_ahead_size); ++ buffer = packet->private.buffer_head; ++ while (buffer) { ++ memcpy_skb(skb, ++ MmGetSystemAddressForMdl(buffer), ++ MmGetMdlByteCount(buffer)); ++ buffer = buffer->next; ++ } ++ skb_size = header_size + look_ahead_size + bytes_txed; ++ csum.value = (typeof(csum.value))(ULONG_PTR) ++ oob_data->ext.info[TcpIpChecksumPacketInfo]; ++ TRACE3("0x%05x", csum.value); ++ if (wnd->rx_csum.value && ++ (csum.rx.tcp_succeeded || csum.rx.udp_succeeded)) ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ else ++ skb->ip_summed = CHECKSUM_NONE; ++ NdisFreePacket(packet); ++ } else if (res == NDIS_STATUS_PENDING) { ++ /* driver will call td_complete */ ++ oob_data->look_ahead = kmalloc(look_ahead_size, ++ GFP_ATOMIC); ++ if (!oob_data->look_ahead) { ++ NdisFreePacket(packet); ++ ERROR("packet dropped"); ++ atomic_inc_var(wnd->net_stats.rx_dropped); ++ EXIT3(return); ++ } ++ assert(sizeof(oob_data->header) == header_size); ++ memcpy(oob_data->header, header, ++ sizeof(oob_data->header)); ++ memcpy(oob_data->look_ahead, look_ahead, ++ look_ahead_size); ++ oob_data->look_ahead_size = look_ahead_size; ++ EXIT3(return); ++ } else { ++ WARNING("packet dropped: %08X", res); ++ atomic_inc_var(wnd->net_stats.rx_dropped); ++ NdisFreePacket(packet); ++ EXIT3(return); ++ } ++ } else { ++ skb_size = header_size + packet_size; ++ skb = dev_alloc_skb(skb_size); ++ if (skb) { ++ memcpy_skb(skb, header, header_size); ++ memcpy_skb(skb, look_ahead, packet_size); ++ } ++ } ++ ++ if (skb) { ++ skb->dev = wnd->net_dev; ++ skb->protocol = eth_type_trans(skb, wnd->net_dev); ++ pre_atomic_add(wnd->net_stats.rx_bytes, skb_size); ++ atomic_inc_var(wnd->net_stats.rx_packets); ++ if (in_interrupt()) ++ netif_rx(skb); ++ else ++ netif_rx_ni(skb); ++ } ++ ++ EXIT3(return); ++} ++ ++/* called via function pointer */ ++wstdcall void NdisMTransferDataComplete(struct ndis_mp_block *nmb, ++ struct ndis_packet *packet, ++ NDIS_STATUS status, UINT bytes_txed) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct sk_buff *skb; ++ unsigned int skb_size; ++ struct ndis_packet_oob_data *oob_data; ++ ndis_buffer *buffer; ++ struct ndis_tcp_ip_checksum_packet_info csum; ++ ++ ENTER3("wnd = %p, packet = %p, bytes_txed = %d", ++ wnd, packet, bytes_txed); ++ if (!packet) { ++ WARNING("illegal packet"); ++ EXIT3(return); ++ } ++ wnd->net_dev->last_rx = jiffies; ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ skb_size = sizeof(oob_data->header) + oob_data->look_ahead_size + ++ bytes_txed; ++ skb = dev_alloc_skb(skb_size); ++ if (!skb) { ++ kfree(oob_data->look_ahead); ++ NdisFreePacket(packet); ++ ERROR("couldn't allocate skb; packet dropped"); ++ atomic_inc_var(wnd->net_stats.rx_dropped); ++ EXIT3(return); ++ } ++ memcpy_skb(skb, oob_data->header, sizeof(oob_data->header)); ++ memcpy_skb(skb, oob_data->look_ahead, oob_data->look_ahead_size); ++ buffer = packet->private.buffer_head; ++ while (buffer) { ++ memcpy_skb(skb, MmGetSystemAddressForMdl(buffer), ++ MmGetMdlByteCount(buffer)); ++ buffer = buffer->next; ++ } ++ kfree(oob_data->look_ahead); ++ NdisFreePacket(packet); ++ skb->dev = wnd->net_dev; ++ skb->protocol = eth_type_trans(skb, wnd->net_dev); ++ pre_atomic_add(wnd->net_stats.rx_bytes, skb_size); ++ atomic_inc_var(wnd->net_stats.rx_packets); ++ ++ csum.value = (typeof(csum.value))(ULONG_PTR) ++ oob_data->ext.info[TcpIpChecksumPacketInfo]; ++ TRACE3("0x%05x", csum.value); ++ if (wnd->rx_csum.value && ++ (csum.rx.tcp_succeeded || csum.rx.udp_succeeded)) ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ else ++ skb->ip_summed = CHECKSUM_NONE; ++ ++ if (in_interrupt()) ++ netif_rx(skb); ++ else ++ netif_rx_ni(skb); ++} ++ ++/* called via function pointer */ ++wstdcall void EthRxComplete(struct ndis_mp_block *nmb) ++{ ++ TRACE3(""); ++} ++ ++/* called via function pointer */ ++wstdcall void NdisMQueryInformationComplete(struct ndis_mp_block *nmb, ++ NDIS_STATUS status) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ typeof(wnd->ndis_req_task) task; ++ ++ ENTER2("nmb: %p, wnd: %p, %08X", nmb, wnd, status); ++ wnd->ndis_req_status = status; ++ wnd->ndis_req_done = 1; ++ if ((task = xchg(&wnd->ndis_req_task, NULL))) ++ wake_up_process(task); ++ else ++ WARNING("invalid task"); ++ EXIT2(return); ++} ++ ++/* called via function pointer */ ++wstdcall void NdisMSetInformationComplete(struct ndis_mp_block *nmb, ++ NDIS_STATUS status) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ typeof(wnd->ndis_req_task) task; ++ ++ ENTER2("status = %08X", status); ++ wnd->ndis_req_status = status; ++ wnd->ndis_req_done = 1; ++ if ((task = xchg(&wnd->ndis_req_task, NULL))) ++ wake_up_process(task); ++ else ++ WARNING("invalid task"); ++ EXIT2(return); ++} ++ ++/* called via function pointer */ ++wstdcall void NdisMResetComplete(struct ndis_mp_block *nmb, ++ NDIS_STATUS status, BOOLEAN address_reset) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ typeof(wnd->ndis_req_task) task; ++ ++ ENTER2("status: %08X, %u", status, address_reset); ++ wnd->ndis_req_status = status; ++ wnd->ndis_req_done = address_reset + 1; ++ if ((task = xchg(&wnd->ndis_req_task, NULL))) ++ wake_up_process(task); ++ else ++ WARNING("invalid task"); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMSleep,1) ++ (ULONG us) ++{ ++ unsigned long delay; ++ ++ ENTER4("%p: us: %u", current, us); ++ delay = USEC_TO_HZ(us); ++ sleep_hz(delay); ++ TRACE4("%p: done", current); ++} ++ ++wstdcall void WIN_FUNC(NdisGetCurrentSystemTime,1) ++ (LARGE_INTEGER *time) ++{ ++ *time = ticks_1601(); ++ TRACE5("%llu, %lu", *time, jiffies); ++} ++ ++wstdcall LONG WIN_FUNC(NdisInterlockedDecrement,1) ++ (LONG *val) ++{ ++ return InterlockedDecrement(val); ++} ++ ++wstdcall LONG WIN_FUNC(NdisInterlockedIncrement,1) ++ (LONG *val) ++{ ++ return InterlockedIncrement(val); ++} ++ ++wstdcall struct nt_list *WIN_FUNC(NdisInterlockedInsertHeadList,3) ++ (struct nt_list *head, struct nt_list *entry, ++ struct ndis_spinlock *lock) ++{ ++ return ExInterlockedInsertHeadList(head, entry, &lock->klock); ++} ++ ++wstdcall struct nt_list *WIN_FUNC(NdisInterlockedInsertTailList,3) ++ (struct nt_list *head, struct nt_list *entry, ++ struct ndis_spinlock *lock) ++{ ++ return ExInterlockedInsertTailList(head, entry, &lock->klock); ++} ++ ++wstdcall struct nt_list *WIN_FUNC(NdisInterlockedRemoveHeadList,2) ++ (struct nt_list *head, struct ndis_spinlock *lock) ++{ ++ return ExInterlockedRemoveHeadList(head, &lock->klock); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMInitializeScatterGatherDma,3) ++ (struct ndis_mp_block *nmb, BOOLEAN dma64_supported, ULONG max_phy_map) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ ENTER2("dma64_supported=%d, maxtransfer=%u", dma64_supported, ++ max_phy_map); ++ if (!wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ ERROR("used on a non-PCI device"); ++ return NDIS_STATUS_NOT_SUPPORTED; ++ } ++#ifdef CONFIG_X86_64 ++ if (!dma64_supported) { ++ TRACE1("64-bit DMA size is not supported"); ++ if (pci_set_dma_mask(wnd->wd->pci.pdev, DMA_BIT_MASK(32)) || ++ pci_set_consistent_dma_mask(wnd->wd->pci.pdev, ++ DMA_BIT_MASK(32))) ++ WARNING("setting dma mask failed"); ++ } ++#endif ++ if ((wnd->attributes & NDIS_ATTRIBUTE_BUS_MASTER) && ++ wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ wnd->sg_dma_size = max_phy_map; ++ return NDIS_STATUS_SUCCESS; ++ } else ++ EXIT1(return NDIS_STATUS_NOT_SUPPORTED); ++} ++ ++wstdcall ULONG WIN_FUNC(NdisMGetDmaAlignment,1) ++ (struct ndis_mp_block *nmb) ++{ ++ ENTER3(""); ++ return dma_get_cache_alignment(); ++} ++ ++wstdcall CHAR WIN_FUNC(NdisSystemProcessorCount,0) ++ (void) ++{ ++ return num_online_cpus(); ++} ++ ++wstdcall void WIN_FUNC(NdisGetCurrentProcessorCounts,3) ++ (ULONG *idle, ULONG *kernel_user, ULONG *index) ++{ ++ int cpu = smp_processor_id(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) ++ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE]; ++ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] + ++ kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; ++#else ++ *idle = kstat_cpu(cpu).cpustat.idle; ++ *kernel_user = kstat_cpu(cpu).cpustat.system + ++ kstat_cpu(cpu).cpustat.user; ++#endif ++ *index = cpu; ++} ++ ++wstdcall void WIN_FUNC(NdisInitializeEvent,1) ++ (struct ndis_event *ndis_event) ++{ ++ EVENTENTER("%p", ndis_event); ++ KeInitializeEvent(&ndis_event->nt_event, NotificationEvent, 0); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(NdisWaitEvent,2) ++ (struct ndis_event *ndis_event, UINT ms) ++{ ++ LARGE_INTEGER ticks; ++ NTSTATUS res; ++ ++ EVENTENTER("%p %u", ndis_event, ms); ++ ticks = -((LARGE_INTEGER)ms * TICKSPERMSEC); ++ res = KeWaitForSingleObject(&ndis_event->nt_event, 0, 0, TRUE, ++ ms == 0 ? NULL : &ticks); ++ if (res == STATUS_SUCCESS) ++ EXIT3(return TRUE); ++ else ++ EXIT3(return FALSE); ++} ++ ++wstdcall void WIN_FUNC(NdisSetEvent,1) ++ (struct ndis_event *ndis_event) ++{ ++ EVENTENTER("%p", ndis_event); ++ KeSetEvent(&ndis_event->nt_event, 0, 0); ++} ++ ++wstdcall void WIN_FUNC(NdisResetEvent,1) ++ (struct ndis_event *ndis_event) ++{ ++ EVENTENTER("%p", ndis_event); ++ KeResetEvent(&ndis_event->nt_event); ++} ++ ++static void ndis_worker(struct work_struct *dummy) ++{ ++ struct nt_list *ent; ++ struct ndis_work_item *ndis_work_item; ++ ++ WORKENTER(""); ++ while (1) { ++ spin_lock_bh(&ndis_work_list_lock); ++ ent = RemoveHeadList(&ndis_work_list); ++ spin_unlock_bh(&ndis_work_list_lock); ++ if (!ent) ++ break; ++ ndis_work_item = container_of(ent, struct ndis_work_item, list); ++ WORKTRACE("%p: %p, %p", ndis_work_item, ++ ndis_work_item->func, ndis_work_item->ctx); ++ LIN2WIN2(ndis_work_item->func, ndis_work_item, ++ ndis_work_item->ctx); ++ WORKTRACE("%p done", ndis_work_item); ++ } ++ WORKEXIT(return); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisScheduleWorkItem,1) ++ (struct ndis_work_item *ndis_work_item) ++{ ++ ENTER3("%p", ndis_work_item); ++ spin_lock_bh(&ndis_work_list_lock); ++ InsertTailList(&ndis_work_list, &ndis_work_item->list); ++ spin_unlock_bh(&ndis_work_list_lock); ++ WORKTRACE("scheduling %p", ndis_work_item); ++ queue_work(ndis_wq, &ndis_work); ++ EXIT3(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(NdisMGetDeviceProperty,6) ++ (struct ndis_mp_block *nmb, void **phy_dev, void **func_dev, ++ void **next_dev, void **alloc_res, void**trans_res) ++{ ++ ENTER2("nmb: %p, phy_dev = %p, func_dev = %p, next_dev = %p, " ++ "alloc_res = %p, trans_res = %p", nmb, phy_dev, func_dev, ++ next_dev, alloc_res, trans_res); ++ if (phy_dev) ++ *phy_dev = nmb->pdo; ++ if (func_dev) ++ *func_dev = nmb->fdo; ++ if (next_dev) ++ *next_dev = nmb->next_device; ++} ++ ++wstdcall void WIN_FUNC(NdisMRegisterUnloadHandler,2) ++ (struct driver_object *drv_obj, void *unload) ++{ ++ if (drv_obj) ++ drv_obj->unload = unload; ++ return; ++} ++ ++wstdcall UINT WIN_FUNC(NdisGetVersion,0) ++ (void) ++{ ++ return 0x00050001; ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMQueryAdapterInstanceName,2) ++ (struct unicode_string *name, struct ndis_mp_block *nmb) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ struct ansi_string ansi; ++ ++ if (wrap_is_pci_bus(wnd->wd->dev_bus)) ++ RtlInitAnsiString(&ansi, "PCI Ethernet Adapter"); ++ else ++ RtlInitAnsiString(&ansi, "USB Ethernet Adapter"); ++ ++ if (RtlAnsiStringToUnicodeString(name, &ansi, TRUE)) ++ EXIT2(return NDIS_STATUS_RESOURCES); ++ else ++ EXIT2(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisWriteEventLogEntry,7) ++ (void *handle, NDIS_STATUS code, ULONG value, USHORT n, ++ void *strings, ULONG datasize, void *data) ++{ ++ TRACE1("0x%x, 0x%x, %u, %u", code, value, n, datasize); ++ return NDIS_STATUS_SUCCESS; ++} ++ ++wstdcall void *WIN_FUNC(NdisGetRoutineAddress,1) ++ (struct unicode_string *unicode_string) ++{ ++ struct ansi_string ansi_string; ++ void *address; ++ ++ if (RtlUnicodeStringToAnsiString(&ansi_string, unicode_string, TRUE) != ++ STATUS_SUCCESS) ++ EXIT1(return NULL); ++ INFO("%s", ansi_string.buf); ++ address = ndis_get_routine_address(ansi_string.buf); ++ RtlFreeAnsiString(&ansi_string); ++ return address; ++} ++ ++wstdcall ULONG WIN_FUNC(NdisReadPcmciaAttributeMemory,4) ++ (struct ndis_mp_block *nmb, ULONG offset, void *buffer, ++ ULONG length) ++{ ++ TODO(); ++ return 0; ++} ++ ++wstdcall ULONG WIN_FUNC(NdisWritePcmciaAttributeMemory,4) ++ (struct ndis_mp_block *nmb, ULONG offset, void *buffer, ++ ULONG length) ++{ ++ TODO(); ++ return 0; ++} ++ ++wstdcall void WIN_FUNC(NdisMCoIndicateReceivePacket,3) ++ (struct ndis_mp_block *nmb, struct ndis_packet **packets, ++ UINT nr_packets) ++{ ++ ENTER3("nmb = %p", nmb); ++ NdisMIndicateReceivePacket(nmb, packets, nr_packets); ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMCoSendComplete,3) ++ (NDIS_STATUS status, struct ndis_mp_block *nmb, ++ struct ndis_packet *packet) ++{ ++ ENTER3("%08x", status); ++ NdisMSendComplete(nmb, packet, status); ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(NdisMCoRequestComplete,3) ++ (NDIS_STATUS status, struct ndis_mp_block *nmb, ++ struct ndis_request *ndis_request) ++{ ++ struct ndis_device *wnd = nmb->wnd; ++ typeof(wnd->ndis_req_task) task; ++ ++ ENTER3("%08X", status); ++ wnd->ndis_req_status = status; ++ wnd->ndis_req_done = 1; ++ if ((task = xchg(&wnd->ndis_req_task, NULL))) ++ wake_up_process(task); ++ else ++ WARNING("invalid task"); ++ EXIT3(return); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisIMNotifiyPnPEvent,2) ++ (struct ndis_mp_block *nmb, struct net_pnp_event *event) ++{ ++ ENTER2("%p, %d", nmb, event->code); ++ /* NdisWrapper never calls protocol's pnp event notifier, so ++ * nothing to do here */ ++ EXIT2(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(NdisCompletePnPEvent,3) ++ (NDIS_STATUS status, void *handle, struct net_pnp_event *event) ++{ ++ ENTER2("%d, %p, %d", status, handle, event->code); ++ /* NdisWrapper never calls protocol's pnp event notifier, so ++ * nothing to do here */ ++ EXIT2(return); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMSetMiniportSecondary,2) ++ (struct ndis_mp_block *nmb2, struct ndis_mp_block *nmb1) ++{ ++ ENTER3("%p, %p", nmb1, nmb2); ++ TODO(); ++ EXIT3(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMPromoteMiniport,1) ++ (struct ndis_mp_block *nmb) ++{ ++ ENTER3("%p", nmb); ++ TODO(); ++ EXIT3(return NDIS_STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(NdisMCoActivateVcComplete,3) ++ (NDIS_STATUS status, void *handle, void *params) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(NdisMCoDeactivateVcComplete,2) ++ (NDIS_STATUS status, void *handle) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(NdisMRemoveMiniport,1) ++ (void *handle) ++{ ++ TODO(); ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMOpenLog,3) ++ (struct ndis_device *wnd, UINT size, void *handle) ++{ ++ if (size >= sizeof(int)) ++ *((int *)handle) = 42; ++ return NDIS_STATUS_SUCCESS; ++} ++ ++wstdcall NDIS_STATUS WIN_FUNC(NdisMWriteLogData,3) ++ (void *handle, char *buffer, UINT buffer_size) ++{ ++ TODO(); ++ return NDIS_STATUS_SUCCESS; ++} ++ ++wstdcall void WIN_FUNC(NdisMFlushLog,1) ++ (void *handle) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(NdisMCloseLog,1) ++ (void *handle) ++{ ++ TODO(); ++} ++ ++static void *ndis_get_routine_address(char *name) ++{ ++ int i; ++ ENTER2("%p", name); ++ for (i = 0; i < ARRAY_SIZE(ndis_exports); i++) { ++ if (strcmp(name, ndis_exports[i].name) == 0) { ++ TRACE2("%p", ndis_exports[i].func); ++ return ndis_exports[i].func; ++ } ++ } ++ EXIT2(return NULL); ++} ++ ++/* ndis_init_device is called for each device */ ++int ndis_init_device(struct ndis_device *wnd) ++{ ++ struct ndis_mp_block *nmb = wnd->nmb; ++ ++ KeInitializeSpinLock(&nmb->lock); ++ wnd->mp_interrupt = NULL; ++ wnd->wrap_timer_slist.next = NULL; ++ if (wnd->wd->driver->ndis_driver) ++ wnd->wd->driver->ndis_driver->mp.shutdown = NULL; ++ ++ nmb->filterdbs.eth_db = nmb; ++ nmb->filterdbs.tr_db = nmb; ++ nmb->filterdbs.fddi_db = nmb; ++ nmb->filterdbs.arc_db = nmb; ++ ++ nmb->rx_packet = WIN_FUNC_PTR(NdisMIndicateReceivePacket,3); ++ nmb->send_complete = WIN_FUNC_PTR(NdisMSendComplete,3); ++ nmb->send_resource_avail = WIN_FUNC_PTR(NdisMSendResourcesAvailable,1); ++ nmb->status = WIN_FUNC_PTR(NdisMIndicateStatus,4); ++ nmb->status_complete = WIN_FUNC_PTR(NdisMIndicateStatusComplete,1); ++ nmb->queryinfo_complete = WIN_FUNC_PTR(NdisMQueryInformationComplete,2); ++ nmb->setinfo_complete = WIN_FUNC_PTR(NdisMSetInformationComplete,2); ++ nmb->reset_complete = WIN_FUNC_PTR(NdisMResetComplete,3); ++ nmb->eth_rx_indicate = WIN_FUNC_PTR(EthRxIndicateHandler,8); ++ nmb->eth_rx_complete = WIN_FUNC_PTR(EthRxComplete,1); ++ nmb->td_complete = WIN_FUNC_PTR(NdisMTransferDataComplete,4); ++ return 0; ++} ++ ++/* ndis_exit_device is called for each device */ ++void ndis_exit_device(struct ndis_device *wnd) ++{ ++ struct wrap_device_setting *setting; ++ ENTER2("%p", wnd); ++ mutex_lock(&loader_mutex); ++ nt_list_for_each_entry(setting, &wnd->wd->settings, list) { ++ struct ndis_configuration_parameter *param; ++ param = setting->encoded; ++ if (param) { ++ if (param->type == NdisParameterString) ++ RtlFreeUnicodeString(¶m->data.string); ++ ExFreePool(param); ++ setting->encoded = NULL; ++ } ++ } ++ mutex_unlock(&loader_mutex); ++} ++ ++/* ndis_init is called once when module is loaded */ ++int ndis_init(void) ++{ ++ InitializeListHead(&ndis_work_list); ++ spin_lock_init(&ndis_work_list_lock); ++ INIT_WORK(&ndis_work, ndis_worker); ++ ++ ndis_wq = create_singlethread_workqueue("ndis_wq"); ++ if (!ndis_wq) { ++ WARNING("couldn't create worker thread"); ++ EXIT1(return -ENOMEM); ++ } ++ ++ TRACE1("ndis_wq: %p", ndis_wq); ++ return 0; ++} ++ ++/* ndis_exit is called once when module is removed */ ++void ndis_exit(void) ++{ ++ ENTER1(""); ++ if (ndis_wq) ++ destroy_workqueue(ndis_wq); ++ EXIT1(return); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.h +--- linux-3.12.2/3rdparty/ndiswrapper/ndis.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndis.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,1309 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _NDIS_H_ ++#define _NDIS_H_ ++ ++#include "ntoskernel.h" ++ ++//#define ALLOW_POOL_OVERFLOW 1 ++ ++#define NDIS_DMA_24BITS 0 ++#define NDIS_DMA_32BITS 1 ++#define NDIS_DMA_64BITS 2 ++ ++#ifdef CONFIG_X86_64 ++#define MAXIMUM_PROCESSORS 64 ++#else ++#define MAXIMUM_PROCESSORS 32 ++#endif ++ ++typedef UINT NDIS_STATUS; ++typedef UCHAR NDIS_DMA_SIZE; ++typedef LONG ndis_rssi; ++typedef ULONG ndis_key_index; ++typedef ULONG ndis_tx_power_level; ++typedef ULONGULONG ndis_key_rsc; ++typedef UCHAR mac_address[ETH_ALEN]; ++typedef ULONG ndis_fragmentation_threshold; ++typedef ULONG ndis_rts_threshold; ++typedef ULONG ndis_antenna; ++typedef ULONG ndis_oid; ++ ++typedef uint64_t NDIS_PHY_ADDRESS; ++ ++struct ndis_sg_element { ++ PHYSICAL_ADDRESS address; ++ ULONG length; ++ ULONG_PTR reserved; ++}; ++ ++struct ndis_sg_list { ++ ULONG nent; ++ ULONG_PTR reserved; ++ struct ndis_sg_element elements[]; ++}; ++ ++/* when sending packets, ndiswrapper associates exactly one sg element ++ * in sg list */ ++struct wrap_tx_sg_list { ++ ULONG nent; ++ ULONG_PTR reserved; ++ struct ndis_sg_element elements[1]; ++}; ++ ++struct ndis_phy_addr_unit { ++ NDIS_PHY_ADDRESS phy_addr; ++ UINT length; ++}; ++ ++typedef struct mdl ndis_buffer; ++ ++struct ndis_buffer_pool { ++ ndis_buffer *free_descr; ++// NT_SPIN_LOCK lock; ++ spinlock_t lock; ++ UINT max_descr; ++ UINT num_allocated_descr; ++}; ++ ++#define NDIS_PROTOCOL_ID_DEFAULT 0x00 ++#define NDIS_PROTOCOL_ID_TCP_IP 0x02 ++#define NDIS_PROTOCOL_ID_IPX 0x06 ++#define NDIS_PROTOCOL_ID_NBF 0x07 ++#define NDIS_PROTOCOL_ID_MAX 0x0F ++#define NDIS_PROTOCOL_ID_MASK 0x0F ++ ++#define fPACKET_WRAPPER_RESERVED 0x3F ++#define fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO 0x40 ++#define fPACKET_ALLOCATED_BY_NDIS 0x80 ++ ++#define PROTOCOL_RESERVED_SIZE_IN_PACKET (4 * sizeof(void *)) ++ ++struct transport_header_offset { ++ USHORT protocol_type; ++ USHORT header_offset; ++}; ++ ++struct ndis_network_address { ++ USHORT length; ++ USHORT type; ++ UCHAR address[1]; ++}; ++ ++struct ndis_network_address_list { ++ LONG count; ++ USHORT type; ++ struct ndis_network_address address[1]; ++}; ++ ++struct ndis_tcp_ip_checksum_packet_info { ++ union { ++ struct { ++ ULONG v4:1; ++ ULONG v6:1; ++ ULONG tcp:1; ++ ULONG udp:1; ++ ULONG ip:1; ++ } tx; ++ struct { ++ ULONG tcp_failed:1; ++ ULONG udp_failed:1; ++ ULONG ip_failed:1; ++ ULONG tcp_succeeded:1; ++ ULONG udp_succeeded:1; ++ ULONG ip_succeeded:1; ++ ULONG loopback:1; ++ } rx; ++ ULONG value; ++ }; ++}; ++ ++enum ndis_task { ++ TcpIpChecksumNdisTask, IpSecNdisTask, TcpLargeSendNdisTask, MaxNdisTask ++}; ++ ++enum ndis_encapsulation { ++ UNSPECIFIED_Encapsulation, NULL_Encapsulation, ++ IEEE_802_3_Encapsulation, IEEE_802_5_Encapsulation, ++ LLC_SNAP_ROUTED_Encapsulation, LLC_SNAP_BRIDGED_Encapsulation ++}; ++ ++#define NDIS_TASK_OFFLOAD_VERSION 1 ++ ++struct ndis_encapsulation_format { ++ enum ndis_encapsulation encap; ++ struct { ++ ULONG fixed_header_size:1; ++ ULONG reserved:31; ++ } flags; ++ ULONG header_size; ++}; ++ ++struct ndis_task_offload_header { ++ ULONG version; ++ ULONG size; ++ ULONG reserved; ++ ULONG offset_first_task; ++ struct ndis_encapsulation_format encap_format; ++}; ++ ++struct ndis_task_offload { ++ ULONG version; ++ ULONG size; ++ enum ndis_task task; ++ ULONG offset_next_task; ++ ULONG task_buf_length; ++ UCHAR task_buf[1]; ++}; ++ ++struct v4_checksum { ++ union { ++ struct { ++ ULONG ip_opts:1; ++ ULONG tcp_opts:1; ++ ULONG tcp_csum:1; ++ ULONG udp_csum:1; ++ ULONG ip_csum:1; ++ }; ++ ULONG value; ++ }; ++}; ++ ++struct v6_checksum { ++ ULONG ip_supported:1; ++ ULONG tcp_supported:1; ++ ULONG tcp_csum:1; ++ ULONG udp_csum:1; ++}; ++ ++struct ndis_task_tcp_ip_checksum { ++ struct v4_checksum v4_tx; ++ struct v4_checksum v4_rx; ++ struct v6_checksum v6_tx; ++ struct v6_checksum v6_rx; ++}; ++ ++struct ndis_task_tcp_large_send { ++ ULONG version; ++ ULONG max_size; ++ ULONG min_seg_count; ++ BOOLEAN tcp_opts; ++ BOOLEAN ip_opts; ++}; ++ ++struct ndis_packet; ++ ++struct ndis_packet_pool { ++ struct ndis_packet *free_descr; ++// NT_SPIN_LOCK lock; ++ spinlock_t lock; ++ UINT max_descr; ++ UINT num_allocated_descr; ++ UINT num_used_descr; ++ UINT proto_rsvd_length; ++}; ++ ++struct ndis_packet_stack { ++ ULONG_PTR IM_reserved[2]; ++ ULONG_PTR ndis_reserved[4]; ++}; ++ ++enum ndis_per_packet_info { ++ TcpIpChecksumPacketInfo, IpSecPacketInfo, TcpLargeSendPacketInfo, ++ ClassificationHandlePacketInfo, NdisReserved, ++ ScatterGatherListPacketInfo, Ieee8021QInfo, OriginalPacketInfo, ++ PacketCancelId, MaxPerPacketInfo ++}; ++ ++struct ndis_packet_extension { ++ void *info[MaxPerPacketInfo]; ++}; ++ ++struct ndis_packet_private { ++ UINT nr_pages; ++ UINT len; ++ ndis_buffer *buffer_head; ++ ndis_buffer *buffer_tail; ++ struct ndis_packet_pool *pool; ++ UINT count; ++ ULONG flags; ++ BOOLEAN valid_counts; ++ UCHAR packet_flags; ++ USHORT oob_offset; ++}; ++ ++struct ndis_packet { ++ struct ndis_packet_private private; ++ /* for use by miniport */ ++ union { ++ /* for connectionless mininports */ ++ struct { ++ UCHAR miniport_reserved[2 * sizeof(void *)]; ++ UCHAR wrapper_reserved[2 * sizeof(void *)]; ++ } cl_reserved; ++ /* for deserialized miniports */ ++ struct { ++ UCHAR miniport_reserved_ex[3 * sizeof(void *)]; ++ UCHAR wrapper_reserved_ex[sizeof(void *)]; ++ } deserialized_reserved; ++ struct { ++ UCHAR mac_reserved[4 * sizeof(void *)]; ++ } mac_reserved; ++ }; ++ ULONG_PTR reserved[2]; ++ UCHAR protocol_reserved[1]; ++}; ++ ++/* OOB data */ ++struct ndis_packet_oob_data { ++ union { ++ ULONGLONG time_to_tx; ++ ULONGLONG time_txed; ++ }; ++ ULONGLONG time_rxed; ++ UINT header_size; ++ UINT media_size; ++ void *media; ++ NDIS_STATUS status; ++ ++ /* ndiswrapper specific info; extension should be right after ++ * ndis's oob_data */ ++ struct ndis_packet_extension ext; ++ union { ++ /* used for tx only */ ++ struct { ++ struct sk_buff *tx_skb; ++ union { ++ struct wrap_tx_sg_list wrap_tx_sg_list; ++ struct ndis_sg_list *tx_sg_list; ++ }; ++ }; ++ /* used for rx only */ ++ struct { ++ unsigned char header[ETH_HLEN]; ++ unsigned char *look_ahead; ++ UINT look_ahead_size; ++ }; ++ }; ++}; ++ ++#define NDIS_PACKET_OOB_DATA(packet) \ ++ (struct ndis_packet_oob_data *)(((void *)(packet)) + \ ++ (packet)->private.oob_offset) ++ ++enum ndis_device_pnp_event { ++ NdisDevicePnPEventQueryRemoved, NdisDevicePnPEventRemoved, ++ NdisDevicePnPEventSurpriseRemoved, NdisDevicePnPEventQueryStopped, ++ NdisDevicePnPEventStopped, NdisDevicePnPEventPowerProfileChanged, ++ NdisDevicePnPEventMaximum ++}; ++ ++enum ndis_request_type { ++ NdisRequestQueryInformation, NdisRequestSetInformation, ++ NdisRequestQueryStatistics, NdisRequestOpen, NdisRequestClose, ++ NdisRequestSend, NdisRequestTransferData, NdisRequestReset, ++ NdisRequestGeneric1, NdisRequestGeneric2, NdisRequestGeneric3, ++ NdisRequestGeneric4 ++}; ++ ++struct ndis_request { ++ mac_address mac; ++ enum ndis_request_type request_type; ++ union data { ++ struct query_info { ++ UINT oid; ++ void *buf; ++ UINT buf_len; ++ UINT written; ++ UINT needed; ++ } query_info; ++ struct set_info { ++ UINT oid; ++ void *buf; ++ UINT buf_len; ++ UINT written; ++ UINT needed; ++ } set_info; ++ } data; ++}; ++ ++enum ndis_medium { ++ NdisMedium802_3, NdisMedium802_5, NdisMediumFddi, NdisMediumWan, ++ NdisMediumLocalTalk, NdisMediumDix, NdisMediumArcnetRaw, ++ NdisMediumArcnet878_2, NdisMediumAtm, NdisMediumWirelessWan, ++ NdisMediumIrda, NdisMediumBpc, NdisMediumCoWan, ++ NdisMedium1394, NdisMediumMax ++}; ++ ++enum ndis_physical_medium { ++ NdisPhysicalMediumUnspecified, NdisPhysicalMediumWirelessLan, ++ NdisPhysicalMediumCableModem, NdisPhysicalMediumPhoneLine, ++ NdisPhysicalMediumPowerLine, NdisPhysicalMediumDSL, ++ NdisPhysicalMediumFibreChannel, NdisPhysicalMedium1394, ++ NdisPhysicalMediumWirelessWan, NdisPhysicalMediumMax ++}; ++ ++enum ndis_power_state { ++ NdisDeviceStateUnspecified = 0, ++ NdisDeviceStateD0, NdisDeviceStateD1, NdisDeviceStateD2, ++ NdisDeviceStateD3, NdisDeviceStateMaximum ++}; ++ ++enum ndis_power_profile { ++ NdisPowerProfileBattery, NdisPowerProfileAcOnLine ++}; ++ ++struct ndis_pm_wakeup_capabilities { ++ enum ndis_power_state min_magic_packet_wakeup; ++ enum ndis_power_state min_pattern_wakeup; ++ enum ndis_power_state min_link_change_wakeup; ++}; ++ ++#define NDIS_PNP_WAKE_UP_MAGIC_PACKET 0x00000001 ++#define NDIS_PNP_WAKE_UP_PATTERN_MATCH 0x00000002 ++#define NDIS_PNP_WAKE_UP_LINK_CHANGE 0x00000004 ++ ++enum net_pnp_event_code { ++ NetEventSetPower, NetEventQueryPower, NetEventQueryRemoveDevice, ++ NetEventCancelRemoveDevice, NetEventReconfigure, NetEventBindList, ++ NetEventBindsComplete, NetEventPnPCapabilities, NetEventMaximum ++}; ++ ++struct net_pnp_event { ++ enum net_pnp_event_code code; ++ void *buf; ++ ULONG buf_length; ++ ULONG_PTR ndis_reserved[4]; ++ ULONG_PTR transport_reserved[4]; ++ ULONG_PTR tdi_reserved[4]; ++ ULONG_PTR tdi_client_reserved[4]; ++}; ++ ++struct ndis_pnp_capabilities { ++ ULONG flags; ++ struct ndis_pm_wakeup_capabilities wakeup; ++}; ++ ++typedef void (*ndis_isr_handler)(BOOLEAN *recognized, BOOLEAN *queue_handler, ++ void *handle) wstdcall; ++typedef void (*ndis_interrupt_handler)(void *ctx) wstdcall; ++ ++struct miniport { ++ /* NDIS 3.0 */ ++ UCHAR major_version; ++ UCHAR minor_version; ++ USHORT filler; ++ UINT reserved; ++ BOOLEAN (*hangcheck)(void *ctx) wstdcall; ++ void (*disable_interrupt)(void *ctx) wstdcall; ++ void (*enable_interrupt)(void *ctx) wstdcall; ++ void (*mp_halt)(void *ctx) wstdcall; ++ ndis_interrupt_handler handle_interrupt; ++ NDIS_STATUS (*init)(NDIS_STATUS *error_status, UINT *medium_index, ++ enum ndis_medium medium[], UINT medium_array_size, ++ void *handle, void *conf_handle) wstdcall; ++ ndis_isr_handler isr; ++ NDIS_STATUS (*queryinfo)(void *ctx, ndis_oid oid, void *buffer, ++ ULONG buflen, ULONG *written, ++ ULONG *needed) wstdcall; ++ void *reconfig; ++ NDIS_STATUS (*reset)(BOOLEAN *reset_address, void *ctx) wstdcall; ++ NDIS_STATUS (*send)(void *ctx, struct ndis_packet *packet, ++ UINT flags) wstdcall; ++ NDIS_STATUS (*setinfo)(void *ctx, ndis_oid oid, void *buffer, ++ ULONG buflen, ULONG *written, ++ ULONG *needed) wstdcall; ++ NDIS_STATUS (*tx_data)(struct ndis_packet *ndis_packet, ++ UINT *bytes_txed, void *mp_ctx, void *rx_ctx, ++ UINT offset, UINT bytes_to_tx) wstdcall; ++ /* NDIS 4.0 extensions */ ++ void (*return_packet)(void *ctx, void *packet) wstdcall; ++ void (*send_packets)(void *ctx, struct ndis_packet **packets, ++ INT nr_of_packets) wstdcall; ++ void (*alloc_complete)(void *handle, void *virt, ++ NDIS_PHY_ADDRESS *phys, ++ ULONG size, void *ctx) wstdcall; ++ /* NDIS 5.0 extensions */ ++ NDIS_STATUS (*co_create_vc)(void *ctx, void *vc_handle, ++ void *vc_ctx) wstdcall; ++ NDIS_STATUS (*co_delete_vc)(void *vc_ctx) wstdcall; ++ NDIS_STATUS (*co_activate_vc)(void *vc_ctx, void *call_params) wstdcall; ++ NDIS_STATUS (*co_deactivate_vc)(void *vc_ctx) wstdcall; ++ NDIS_STATUS (*co_send_packets)(void *vc_ctx, void **packets, ++ UINT nr_of_packets) wstdcall; ++ NDIS_STATUS (*co_request)(void *ctx, void *vc_ctx, UINT *req) wstdcall; ++ /* NDIS 5.1 extensions */ ++ void (*cancel_send_packets)(void *ctx, void *id) wstdcall; ++ void (*pnp_event_notify)(void *ctx, enum ndis_device_pnp_event event, ++ void *inf_buf, ULONG inf_buf_len) wstdcall; ++ void (*shutdown)(void *ctx) wstdcall; ++ void *reserved1; ++ void *reserved2; ++ void *reserved3; ++ void *reserved4; ++}; ++ ++struct ndis_spinlock { ++ NT_SPIN_LOCK klock; ++ KIRQL irql; ++}; ++ ++union ndis_rw_lock_refcount { ++ UCHAR cache_line[16]; ++}; ++ ++struct ndis_rw_lock { ++ union { ++ struct { ++ NT_SPIN_LOCK klock; ++ void *context; ++ }; ++ UCHAR reserved[16]; ++ }; ++ union { ++ union ndis_rw_lock_refcount ref_count[MAXIMUM_PROCESSORS]; ++ /* ndiswrapper specific */ ++ volatile int count; ++ }; ++}; ++ ++struct lock_state { ++ USHORT state; ++ KIRQL irql; ++}; ++ ++struct ndis_work_item; ++typedef void (*NDIS_PROC)(struct ndis_work_item *, void *) wstdcall; ++ ++struct ndis_work_item { ++ void *ctx; ++ NDIS_PROC func; ++ union { ++ UCHAR reserved[8 * sizeof(void *)]; ++ /* ndiswrapper specific */ ++ struct nt_list list; ++ }; ++}; ++ ++struct alloc_shared_mem { ++ void *ctx; ++ ULONG size; ++ BOOLEAN cached; ++}; ++ ++struct ndis_mp_block; ++ ++/* this is opaque to drivers, so we can use it as we please */ ++struct ndis_mp_interrupt { ++ struct kinterrupt *kinterrupt; ++ NT_SPIN_LOCK lock; ++ union { ++ void *reserved; ++ unsigned int irq; ++ }; ++ ndis_isr_handler isr; ++ ndis_interrupt_handler mp_dpc; ++ struct kdpc intr_dpc; ++ struct ndis_mp_block *nmb; ++ UCHAR dpc_count; ++ BOOLEAN enable; ++ struct nt_event dpc_completed_event; ++ BOOLEAN shared; ++ BOOLEAN req_isr; ++}; ++ ++struct ndis_binary_data { ++ USHORT len; ++ void *buf; ++}; ++ ++enum ndis_parameter_type { ++ NdisParameterInteger, NdisParameterHexInteger, ++ NdisParameterString, NdisParameterMultiString, NdisParameterBinary, ++}; ++ ++typedef struct unicode_string NDIS_STRING; ++ ++struct ndis_configuration_parameter { ++ enum ndis_parameter_type type; ++ union { ++ ULONG integer; ++ NDIS_STRING string; ++ } data; ++}; ++ ++struct ndis_driver { ++ struct miniport mp; ++}; ++ ++/* IDs used to store extensions in driver_object's custom extension */ ++#define NDIS_DRIVER_CLIENT_ID 10 ++ ++struct ndis_wireless_stats { ++ ULONG length; ++ LARGE_INTEGER tx_frag; ++ LARGE_INTEGER tx_multi_frag; ++ LARGE_INTEGER failed; ++ LARGE_INTEGER retry; ++ LARGE_INTEGER multi_retry; ++ LARGE_INTEGER rtss_succ; ++ LARGE_INTEGER rtss_fail; ++ LARGE_INTEGER ack_fail; ++ LARGE_INTEGER frame_dup; ++ LARGE_INTEGER rx_frag; ++ LARGE_INTEGER rx_multi_frag; ++ LARGE_INTEGER fcs_err; ++ LARGE_INTEGER tkip_local_mic_failures; ++ LARGE_INTEGER tkip_icv_errors; ++ LARGE_INTEGER tkip_counter_measures_invoked; ++ LARGE_INTEGER tkip_replays; ++ LARGE_INTEGER ccmp_format_errors; ++ LARGE_INTEGER ccmp_replays; ++ LARGE_INTEGER ccmp_decrypt_errors; ++ LARGE_INTEGER fourway_handshake_failures; ++ LARGE_INTEGER wep_undecryptable_count; ++ LARGE_INTEGER wep_icv_errorcount; ++ LARGE_INTEGER decrypt_success_count; ++ LARGE_INTEGER decrypt_failure_count; ++}; ++ ++enum ndis_status_type { ++ Ndis802_11StatusType_Authentication, ++ Ndis802_11StatusType_MediaStreamMode, ++ Ndis802_11StatusType_PMKID_CandidateList, ++ Ndis802_11StatusType_RadioState, ++}; ++ ++struct ndis_status_indication { ++ enum ndis_status_type status_type; ++}; ++ ++enum ndis_radio_status { ++ Ndis802_11RadioStatusOn, Ndis802_11RadioStatusHardwareOff, ++ Ndis802_11RadioStatusSoftwareOff, ++}; ++ ++struct ndis_radio_status_indication ++{ ++ enum ndis_status_type status_type; ++ enum ndis_radio_status radio_state; ++}; ++ ++enum ndis_media_state { ++ NdisMediaStateConnected, ++ NdisMediaStateDisconnected, ++}; ++ ++enum ndis_media_stream_mode { ++ Ndis802_11MediaStreamOff, Ndis802_11MediaStreamOn ++}; ++ ++enum wrapper_work { ++ LINK_STATUS_OFF, LINK_STATUS_ON, SET_MULTICAST_LIST, COLLECT_IW_STATS, ++ HANGCHECK, NETIF_WAKEQ, ++}; ++ ++struct encr_info { ++ struct encr_key { ++ ULONG length; ++ UCHAR key[NDIS_ENCODING_TOKEN_MAX]; ++ } keys[MAX_ENCR_KEYS]; ++ unsigned short tx_key_index; ++}; ++ ++struct ndis_essid { ++ ULONG length; ++ UCHAR essid[NDIS_ESSID_MAX_SIZE]; ++}; ++ ++enum ndis_infrastructure_mode { ++ Ndis802_11IBSS, Ndis802_11Infrastructure, Ndis802_11AutoUnknown, ++ Ndis802_11InfrastructureMax ++}; ++ ++enum authentication_mode { ++ Ndis802_11AuthModeOpen, Ndis802_11AuthModeShared, ++ Ndis802_11AuthModeAutoSwitch, Ndis802_11AuthModeWPA, ++ Ndis802_11AuthModeWPAPSK, Ndis802_11AuthModeWPANone, ++ Ndis802_11AuthModeWPA2, Ndis802_11AuthModeWPA2PSK, ++ Ndis802_11AuthModeMax ++}; ++ ++enum encryption_status { ++ Ndis802_11WEPEnabled, ++ Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, ++ Ndis802_11WEPDisabled, ++ Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, ++ Ndis802_11WEPKeyAbsent, ++ Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, ++ Ndis802_11WEPNotSupported, ++ Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, ++ Ndis802_11Encryption2Enabled, Ndis802_11Encryption2KeyAbsent, ++ Ndis802_11Encryption3Enabled, Ndis802_11Encryption3KeyAbsent ++}; ++ ++struct ndis_auth_encr_pair { ++ enum authentication_mode auth_mode; ++ enum encryption_status encr_mode; ++}; ++ ++struct ndis_capability { ++ ULONG length; ++ ULONG version; ++ ULONG num_PMKIDs; ++ ULONG num_auth_encr_pair; ++ struct ndis_auth_encr_pair auth_encr_pair[1]; ++}; ++ ++struct ndis_guid { ++ struct guid guid; ++ union { ++ ndis_oid oid; ++ NDIS_STATUS status; ++ }; ++ ULONG size; ++ ULONG flags; ++}; ++ ++struct ndis_timer { ++ struct nt_timer nt_timer; ++ struct kdpc kdpc; ++}; ++ ++struct ndis_mp_timer { ++ struct nt_timer nt_timer; ++ struct kdpc kdpc; ++ DPC func; ++ void *ctx; ++ struct ndis_mp_block *nmb; ++ struct ndis_mp_timer *next; ++}; ++ ++typedef struct cm_partial_resource_list NDIS_RESOURCE_LIST; ++ ++struct ndis_event { ++ struct nt_event nt_event; ++}; ++ ++struct ndis_bind_paths { ++ UINT number; ++ struct unicode_string paths[1]; ++}; ++ ++struct ndis_reference { ++ NT_SPIN_LOCK lock; ++ USHORT ref_count; ++ BOOLEAN closing; ++}; ++ ++struct ndis_filterdbs { ++ union { ++ void *eth_db; ++ void *null_db; ++ }; ++ void *tr_db; ++ void *fddi_db; ++ void *arc_db; ++}; ++ ++enum ndis_interface_type { ++ NdisInterfaceInternal, NdisInterfaceIsa, NdisInterfaceEisa, ++ NdisInterfaceMca, NdisInterfaceTurboChannel, NdisInterfacePci, ++ NdisInterfacePcMcia, ++}; ++ ++struct auth_encr_capa { ++ unsigned long auth; ++ unsigned long encr; ++}; ++ ++struct ndis_pmkid_candidate { ++ mac_address bssid; ++ DWORD flags; ++}; ++ ++struct ndis_pmkid_candidate_list { ++ ULONG version; ++ ULONG num_candidates; ++ struct ndis_pmkid_candidate candidates[1]; ++}; ++ ++/* ++ * This struct contains function pointers that the drivers references ++ * directly via macros, so it's important that they are at the correct ++ * position. ++ */ ++struct ndis_mp_block { ++ void *signature; ++ struct ndis_mp_block *next; ++ struct driver_object *drv_obj; ++ void *mp_ctx; ++ struct unicode_string name; ++ struct ndis_bind_paths *bindpaths; ++ void *openqueue; ++ struct ndis_reference reference; ++ void *device_ctx; ++ UCHAR padding; ++ UCHAR lock_acquired; ++ UCHAR pmode_opens; ++ UCHAR assigned_cpu; ++ NT_SPIN_LOCK lock; ++ enum ndis_request_type *mediarequest; ++ struct ndis_mp_interrupt *interrupt; ++ ULONG flags; ++ ULONG pnp_flags; ++ struct nt_list packet_list; ++ struct ndis_packet *first_pending_tx_packet; ++ struct ndis_packet *return_packet_queue; ++ ULONG request_buffer; ++ void *set_mcast_buffer; ++ struct ndis_mp_block *primary_mp; ++ void *wrapper_ctx; ++ void *bus_data_ctx; ++ ULONG pnp_capa; ++ void *resources; ++ struct ndis_timer wakeup_dpc_timer; ++ struct unicode_string basename; ++ struct unicode_string symlink_name; ++ ULONG ndis_hangcheck_interval; ++ USHORT hangcheck_ticks; ++ USHORT hangcheck_tick; ++ NDIS_STATUS ndis_reset_status; ++ void *resetopen; ++ struct ndis_filterdbs filterdbs; ++ void *rx_packet; ++ void *send_complete; ++ void *send_resource_avail; ++ void *reset_complete; ++ ++ enum ndis_medium media_type; ++ ULONG bus_number; ++ enum ndis_interface_type bus_type; ++ enum ndis_interface_type adapter_type; ++ struct device_object *fdo; ++ struct device_object *pdo; ++ struct device_object *next_device; ++ void *mapreg; ++ void *call_mgraflist; ++ void *mp_thread; ++ void *setinfobuf; ++ USHORT setinfo_buf_len; ++ USHORT max_send_pkts; ++ NDIS_STATUS fake_status; ++ void *lock_handler; ++ struct unicode_string *adapter_instance_name; ++ void *timer_queue; ++ UINT mac_options; ++ void *pending_req; ++ UINT max_long_addrs; ++ UINT max_short_addrs; ++ UINT cur_lookahead; ++ UINT max_lookahead; ++ ++ ndis_interrupt_handler irq_bh; ++ void *disable_intr; ++ void *enable_intr; ++ void *send_pkts; ++ void *deferred_send; ++ void *eth_rx_indicate; ++ void *tr_rx_indicate; ++ void *fddi_rx_indicate; ++ void *eth_rx_complete; ++ void *tr_rx_complete; ++ void *fddi_rx_complete; ++ ++ void *status; ++ void *status_complete; ++ void *td_complete; ++ ++ void *queryinfo_complete; ++ void *setinfo_complete; ++ void *wan_tx_complete; ++ void *wan_rx; ++ void *wan_rx_complete; ++ /* ndiswrapper specific */ ++ struct ndis_device *wnd; ++}; ++ ++struct ndis_device { ++ struct ndis_mp_block *nmb; ++ struct wrap_device *wd; ++ struct net_device *net_dev; ++ void *shutdown_ctx; ++ struct ndis_mp_interrupt *mp_interrupt; ++ struct kdpc irq_kdpc; ++ unsigned long mem_start; ++ unsigned long mem_end; ++ ++ struct net_device_stats net_stats; ++ struct iw_statistics iw_stats; ++ BOOLEAN iw_stats_enabled; ++ struct ndis_wireless_stats ndis_stats; ++ ++ struct work_struct tx_work; ++ struct ndis_packet *tx_ring[TX_RING_SIZE]; ++ u8 tx_ring_start; ++ u8 tx_ring_end; ++ u8 is_tx_ring_full; ++ u8 tx_ok; ++ spinlock_t tx_ring_lock; ++ struct mutex tx_ring_mutex; ++ unsigned int max_tx_packets; ++ struct mutex ndis_req_mutex; ++ struct task_struct *ndis_req_task; ++ int ndis_req_done; ++ NDIS_STATUS ndis_req_status; ++ ULONG packet_filter; ++ ++ ULONG sg_dma_size; ++ ULONG dma_map_count; ++ dma_addr_t *dma_map_addr; ++ ++ int hangcheck_interval; ++ struct timer_list hangcheck_timer; ++ int iw_stats_interval; ++ struct timer_list iw_stats_timer; ++ unsigned long scan_timestamp; ++ struct encr_info encr_info; ++ char nick[IW_ESSID_MAX_SIZE + 1]; ++ struct ndis_essid essid; ++ struct auth_encr_capa capa; ++ enum ndis_infrastructure_mode infrastructure_mode; ++ int max_pmkids; ++ int num_pmkids; ++ struct ndis_pmkid *pmkids; ++ mac_address mac; ++ struct proc_dir_entry *procfs_iface; ++ ++ struct work_struct ndis_work; ++ unsigned long ndis_pending_work; ++ UINT attributes; ++ int iw_auth_wpa_version; ++ int iw_auth_cipher_pairwise; ++ int iw_auth_cipher_group; ++ int iw_auth_key_mgmt; ++ int iw_auth_80211_alg; ++ struct ndis_packet_pool *tx_packet_pool; ++ struct ndis_buffer_pool *tx_buffer_pool; ++ int multicast_size; ++ struct v4_checksum rx_csum; ++ struct v4_checksum tx_csum; ++ enum ndis_physical_medium physical_medium; ++ ULONG ndis_wolopts; ++ struct nt_slist wrap_timer_slist; ++ int drv_ndis_version; ++ struct ndis_pnp_capabilities pnp_capa; ++}; ++ ++BOOLEAN ndis_isr(struct kinterrupt *kinterrupt, void *ctx) wstdcall; ++ ++int ndis_init(void); ++void ndis_exit(void); ++int ndis_init_device(struct ndis_device *wnd); ++void ndis_exit_device(struct ndis_device *wnd); ++ ++int wrap_procfs_add_ndis_device(struct ndis_device *wnd); ++void wrap_procfs_remove_ndis_device(struct ndis_device *wnd); ++ ++void NdisAllocatePacketPoolEx(NDIS_STATUS *status, ++ struct ndis_packet_pool **pool_handle, ++ UINT num_descr, UINT overflowsize, ++ UINT proto_rsvd_length) wstdcall; ++void NdisFreePacketPool(struct ndis_packet_pool *pool) wstdcall; ++void NdisAllocatePacket(NDIS_STATUS *status, struct ndis_packet **packet, ++ struct ndis_packet_pool *pool) wstdcall; ++void NdisFreePacket(struct ndis_packet *descr) wstdcall; ++void NdisAllocateBufferPool(NDIS_STATUS *status, ++ struct ndis_buffer_pool **pool_handle, ++ UINT num_descr) wstdcall; ++void NdisFreeBufferPool(struct ndis_buffer_pool *pool) wstdcall; ++void NdisAllocateBuffer(NDIS_STATUS *status, ndis_buffer **buffer, ++ struct ndis_buffer_pool *pool, void *virt, ++ UINT length) wstdcall; ++void NdisFreeBuffer(ndis_buffer *descr) wstdcall; ++void NdisMIndicateReceivePacket(struct ndis_mp_block *nmb, ++ struct ndis_packet **packets, ++ UINT nr_packets) wstdcall; ++void NdisMSendComplete(struct ndis_mp_block *nmb, struct ndis_packet *packet, ++ NDIS_STATUS status) wstdcall; ++void NdisMSendResourcesAvailable(struct ndis_mp_block *nmb) wstdcall; ++void NdisMIndicateStatus(struct ndis_mp_block *nmb, ++ NDIS_STATUS status, void *buf, UINT len) wstdcall; ++void NdisMIndicateStatusComplete(struct ndis_mp_block *nmb) wstdcall; ++void NdisMQueryInformationComplete(struct ndis_mp_block *nmb, ++ NDIS_STATUS status) wstdcall; ++void NdisMSetInformationComplete(struct ndis_mp_block *nmb, ++ NDIS_STATUS status) wstdcall; ++void NdisMResetComplete(struct ndis_mp_block *nmb, NDIS_STATUS status, ++ BOOLEAN address_reset) wstdcall; ++ULONG NDIS_BUFFER_TO_SPAN_PAGES(ndis_buffer *buffer) wstdcall; ++BOOLEAN NdisWaitEvent(struct ndis_event *event, UINT timeout) wstdcall; ++void NdisSetEvent(struct ndis_event *event) wstdcall; ++void NdisMDeregisterInterrupt(struct ndis_mp_interrupt *mp_interrupt) wstdcall; ++void EthRxIndicateHandler(struct ndis_mp_block *nmb, void *rx_ctx, ++ char *header1, char *header, UINT header_size, ++ void *look_ahead, UINT look_ahead_size, ++ UINT packet_size) wstdcall; ++void EthRxComplete(struct ndis_mp_block *nmb) wstdcall; ++void NdisMTransferDataComplete(struct ndis_mp_block *nmb, ++ struct ndis_packet *packet, NDIS_STATUS status, ++ UINT bytes_txed) wstdcall; ++void NdisWriteConfiguration(NDIS_STATUS *status, struct ndis_mp_block *nmb, ++ struct unicode_string *key, ++ struct ndis_configuration_parameter *param) wstdcall; ++void NdisReadConfiguration(NDIS_STATUS *status, ++ struct ndis_configuration_parameter **param, ++ struct ndis_mp_block *nmb, ++ struct unicode_string *key, ++ enum ndis_parameter_type type) wstdcall; ++ ++/* Required OIDs */ ++#define OID_GEN_SUPPORTED_LIST 0x00010101 ++#define OID_GEN_HARDWARE_STATUS 0x00010102 ++#define OID_GEN_MEDIA_SUPPORTED 0x00010103 ++#define OID_GEN_MEDIA_IN_USE 0x00010104 ++#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 ++#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 ++#define OID_GEN_LINK_SPEED 0x00010107 ++#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 ++#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 ++#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A ++#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B ++#define OID_GEN_VENDOR_ID 0x0001010C ++#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D ++#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E ++#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F ++#define OID_GEN_DRIVER_VERSION 0x00010110 ++#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 ++#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 ++#define OID_GEN_MAC_OPTIONS 0x00010113 ++#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 ++#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 ++#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116 ++#define OID_GEN_SUPPORTED_GUIDS 0x00010117 ++#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118 /* Set only */ ++#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119 /* Set only */ ++#define OID_GEN_MACHINE_NAME 0x0001021A ++#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B /* Set only */ ++#define OID_GEN_VLAN_ID 0x0001021C ++ ++/* Optional OIDs. */ ++#define OID_GEN_MEDIA_CAPABILITIES 0x00010201 ++#define OID_GEN_PHYSICAL_MEDIUM 0x00010202 ++ ++/* Required statistics OIDs. */ ++#define OID_GEN_XMIT_OK 0x00020101 ++#define OID_GEN_RCV_OK 0x00020102 ++#define OID_GEN_XMIT_ERROR 0x00020103 ++#define OID_GEN_RCV_ERROR 0x00020104 ++#define OID_GEN_RCV_NO_BUFFER 0x00020105 ++ ++/* Optional OID statistics */ ++#define OID_GEN_DIRECTED_BYTES_XMIT 0x00020201 ++#define OID_GEN_DIRECTED_FRAMES_XMIT 0x00020202 ++#define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203 ++#define OID_GEN_MULTICAST_FRAMES_XMIT 0x00020204 ++#define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205 ++#define OID_GEN_BROADCAST_FRAMES_XMIT 0x00020206 ++#define OID_GEN_DIRECTED_BYTES_RCV 0x00020207 ++#define OID_GEN_DIRECTED_FRAMES_RCV 0x00020208 ++#define OID_GEN_MULTICAST_BYTES_RCV 0x00020209 ++#define OID_GEN_MULTICAST_FRAMES_RCV 0x0002020A ++#define OID_GEN_BROADCAST_BYTES_RCV 0x0002020B ++#define OID_GEN_BROADCAST_FRAMES_RCV 0x0002020C ++#define OID_GEN_RCV_CRC_ERROR 0x0002020D ++#define OID_GEN_TRANSMIT_QUEUE_LENGTH 0x0002020E ++#define OID_GEN_GET_TIME_CAPS 0x0002020F ++#define OID_GEN_GET_NETCARD_TIME 0x00020210 ++#define OID_GEN_NETCARD_LOAD 0x00020211 ++#define OID_GEN_DEVICE_PROFILE 0x00020212 ++ ++/* 802.3 (ethernet) OIDs */ ++#define OID_802_3_PERMANENT_ADDRESS 0x01010101 ++#define OID_802_3_CURRENT_ADDRESS 0x01010102 ++#define OID_802_3_MULTICAST_LIST 0x01010103 ++#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 ++#define OID_802_3_MAC_OPTIONS 0x01010105 ++#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001 ++#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 ++#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 ++#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 ++#define OID_802_3_XMIT_DEFERRED 0x01020201 ++#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 ++#define OID_802_3_RCV_OVERRUN 0x01020203 ++#define OID_802_3_XMIT_UNDERRUN 0x01020204 ++#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 ++#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 ++#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 ++ ++/* PnP and power management OIDs */ ++#define OID_PNP_CAPABILITIES 0xFD010100 ++#define OID_PNP_SET_POWER 0xFD010101 ++#define OID_PNP_QUERY_POWER 0xFD010102 ++#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 ++#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 ++#define OID_PNP_WAKE_UP_PATTERN_LIST 0xFD010105 ++#define OID_PNP_ENABLE_WAKE_UP 0xFD010106 ++ ++/* PnP/PM Statistics (Optional). */ ++#define OID_PNP_WAKE_UP_OK 0xFD020200 ++#define OID_PNP_WAKE_UP_ERROR 0xFD020201 ++ ++/* The following bits are defined for OID_PNP_ENABLE_WAKE_UP */ ++#define NDIS_PNP_WAKE_UP_MAGIC_PACKET 0x00000001 ++#define NDIS_PNP_WAKE_UP_PATTERN_MATCH 0x00000002 ++#define NDIS_PNP_WAKE_UP_LINK_CHANGE 0x00000004 ++ ++/* 802.11 OIDs */ ++#define OID_802_11_BSSID 0x0D010101 ++#define OID_802_11_SSID 0x0D010102 ++#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0D010203 ++#define OID_802_11_NETWORK_TYPE_IN_USE 0x0D010204 ++#define OID_802_11_TX_POWER_LEVEL 0x0D010205 ++#define OID_802_11_RSSI 0x0D010206 ++#define OID_802_11_RSSI_TRIGGER 0x0D010207 ++#define OID_802_11_INFRASTRUCTURE_MODE 0x0D010108 ++#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0D010209 ++#define OID_802_11_RTS_THRESHOLD 0x0D01020A ++#define OID_802_11_NUMBER_OF_ANTENNAS 0x0D01020B ++#define OID_802_11_RX_ANTENNA_SELECTED 0x0D01020C ++#define OID_802_11_TX_ANTENNA_SELECTED 0x0D01020D ++#define OID_802_11_SUPPORTED_RATES 0x0D01020E ++#define OID_802_11_DESIRED_RATES 0x0D010210 ++#define OID_802_11_CONFIGURATION 0x0D010211 ++#define OID_802_11_STATISTICS 0x0D020212 ++#define OID_802_11_ADD_WEP 0x0D010113 ++#define OID_802_11_REMOVE_WEP 0x0D010114 ++#define OID_802_11_DISASSOCIATE 0x0D010115 ++#define OID_802_11_POWER_MODE 0x0D010216 ++#define OID_802_11_BSSID_LIST 0x0D010217 ++#define OID_802_11_AUTHENTICATION_MODE 0x0D010118 ++#define OID_802_11_PRIVACY_FILTER 0x0D010119 ++#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A ++#define OID_802_11_WEP_STATUS 0x0D01011B ++#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS ++#define OID_802_11_RELOAD_DEFAULTS 0x0D01011C ++#define OID_802_11_ADD_KEY 0x0D01011D ++#define OID_802_11_REMOVE_KEY 0x0D01011E ++#define OID_802_11_ASSOCIATION_INFORMATION 0x0D01011F ++#define OID_802_11_TEST 0x0D010120 ++#define OID_802_11_MEDIA_STREAM_MODE 0x0D010121 ++#define OID_802_11_CAPABILITY 0x0D010122 ++#define OID_802_11_PMKID 0x0D010123 ++ ++#define NDIS_STATUS_SUCCESS 0 ++#define NDIS_STATUS_PENDING 0x00000103 ++#define NDIS_STATUS_NOT_RECOGNIZED 0x00010001 ++#define NDIS_STATUS_NOT_COPIED 0x00010002 ++#define NDIS_STATUS_NOT_ACCEPTED 0x00010003 ++#define NDIS_STATUS_CALL_ACTIVE 0x00010007 ++#define NDIS_STATUS_ONLINE 0x40010003 ++#define NDIS_STATUS_RESET_START 0x40010004 ++#define NDIS_STATUS_RESET_END 0x40010005 ++#define NDIS_STATUS_RING_STATUS 0x40010006 ++#define NDIS_STATUS_CLOSED 0x40010007 ++#define NDIS_STATUS_WAN_LINE_UP 0x40010008 ++#define NDIS_STATUS_WAN_LINE_DOWN 0x40010009 ++#define NDIS_STATUS_WAN_FRAGMENT 0x4001000A ++#define NDIS_STATUS_MEDIA_CONNECT 0x4001000B ++#define NDIS_STATUS_MEDIA_DISCONNECT 0x4001000C ++#define NDIS_STATUS_HARDWARE_LINE_UP 0x4001000D ++#define NDIS_STATUS_HARDWARE_LINE_DOWN 0x4001000E ++#define NDIS_STATUS_INTERFACE_UP 0x4001000F ++#define NDIS_STATUS_INTERFACE_DOWN 0x40010010 ++#define NDIS_STATUS_MEDIA_BUSY 0x40010011 ++#define NDIS_STATUS_MEDIA_SPECIFIC_INDICATION 0x40010012 ++#define NDIS_STATUS_WW_INDICATION NDIS_STATUS_MEDIA_SPECIFIC_INDICATION ++#define NDIS_STATUS_LINK_SPEED_CHANGE 0x40010013 ++#define NDIS_STATUS_WAN_GET_STATS 0x40010014 ++#define NDIS_STATUS_WAN_CO_FRAGMENT 0x40010015 ++#define NDIS_STATUS_WAN_CO_LINKPARAMS 0x40010016 ++#define NDIS_STATUS_NOT_RESETTABLE 0x80010001 ++#define NDIS_STATUS_SOFT_ERRORS 0x80010003 ++#define NDIS_STATUS_HARD_ERRORS 0x80010004 ++#define NDIS_STATUS_BUFFER_OVERFLOW 0x80000005 ++#define NDIS_STATUS_FAILURE 0xC0000001 ++#define NDIS_STATUS_INVALID_PARAMETER 0xC000000D ++#define NDIS_STATUS_RESOURCES 0xC000009A ++#define NDIS_STATUS_CLOSING 0xC0010002 ++#define NDIS_STATUS_BAD_VERSION 0xC0010004 ++#define NDIS_STATUS_BAD_CHARACTERISTICS 0xC0010005 ++#define NDIS_STATUS_ADAPTER_NOT_FOUND 0xC0010006 ++#define NDIS_STATUS_OPEN_FAILED 0xC0010007 ++#define NDIS_STATUS_DEVICE_FAILED 0xC0010008 ++#define NDIS_STATUS_MULTICAST_FULL 0xC0010009 ++#define NDIS_STATUS_MULTICAST_EXISTS 0xC001000A ++#define NDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B ++#define NDIS_STATUS_REQUEST_ABORTED 0xC001000C ++#define NDIS_STATUS_RESET_IN_PROGRESS 0xC001000D ++#define NDIS_STATUS_CLOSING_INDICATING 0xC001000E ++#define NDIS_STATUS_BAD_VERSION 0xC0010004 ++#define NDIS_STATUS_NOT_SUPPORTED 0xC00000BB ++#define NDIS_STATUS_INVALID_PACKET 0xC001000F ++#define NDIS_STATUS_OPEN_LIST_FULL 0xC0010010 ++#define NDIS_STATUS_ADAPTER_NOT_READY 0xC0010011 ++#define NDIS_STATUS_ADAPTER_NOT_OPEN 0xC0010012 ++#define NDIS_STATUS_NOT_INDICATING 0xC0010013 ++#define NDIS_STATUS_INVALID_LENGTH 0xC0010014 ++#define NDIS_STATUS_INVALID_DATA 0xC0010015 ++#define NDIS_STATUS_BUFFER_TOO_SHORT 0xC0010016 ++#define NDIS_STATUS_INVALID_OID 0xC0010017 ++#define NDIS_STATUS_ADAPTER_REMOVED 0xC0010018 ++#define NDIS_STATUS_UNSUPPORTED_MEDIA 0xC0010019 ++#define NDIS_STATUS_GROUP_ADDRESS_IN_USE 0xC001001A ++#define NDIS_STATUS_FILE_NOT_FOUND 0xC001001B ++#define NDIS_STATUS_ERROR_READING_FILE 0xC001001C ++#define NDIS_STATUS_ALREADY_MAPPED 0xC001001D ++#define NDIS_STATUS_RESOURCE_CONFLICT 0xC001001E ++#define NDIS_STATUS_NO_CABLE 0xC001001F ++#define NDIS_STATUS_INVALID_SAP 0xC0010020 ++#define NDIS_STATUS_SAP_IN_USE 0xC0010021 ++#define NDIS_STATUS_INVALID_ADDRESS 0xC0010022 ++#define NDIS_STATUS_VC_NOT_ACTIVATED 0xC0010023 ++#define NDIS_STATUS_DEST_OUT_OF_ORDER 0xC0010024 ++#define NDIS_STATUS_VC_NOT_AVAILABLE 0xC0010025 ++#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE 0xC0010026 ++#define NDIS_STATUS_INCOMPATABLE_QOS 0xC0010027 ++#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED 0xC0010028 ++#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION 0xC0010029 ++#define NDIS_STATUS_TOKEN_RING_OPEN_ERROR 0xC0011000 ++#define NDIS_STATUS_INVALID_DEVICE_REQUEST 0xC0000010 ++#define NDIS_STATUS_NETWORK_UNREACHABLE 0xC000023C ++ ++/* Event codes */ ++ ++#define EVENT_NDIS_RESOURCE_CONFLICT 0xC0001388 ++#define EVENT_NDIS_OUT_OF_RESOURCE 0xC0001389 ++#define EVENT_NDIS_HARDWARE_FAILURE 0xC000138A ++#define EVENT_NDIS_ADAPTER_NOT_FOUND 0xC000138B ++#define EVENT_NDIS_INTERRUPT_CONNECT 0xC000138C ++#define EVENT_NDIS_DRIVER_FAILURE 0xC000138D ++#define EVENT_NDIS_BAD_VERSION 0xC000138E ++#define EVENT_NDIS_TIMEOUT 0x8000138F ++#define EVENT_NDIS_NETWORK_ADDRESS 0xC0001390 ++#define EVENT_NDIS_UNSUPPORTED_CONFIGURATION 0xC0001391 ++#define EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER 0xC0001392 ++#define EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER 0xC0001393 ++#define EVENT_NDIS_BAD_IO_BASE_ADDRESS 0xC0001394 ++#define EVENT_NDIS_RECEIVE_SPACE_SMALL 0x40001395 ++#define EVENT_NDIS_ADAPTER_DISABLED 0x80001396 ++#define EVENT_NDIS_IO_PORT_CONFLICT 0x80001397 ++#define EVENT_NDIS_PORT_OR_DMA_CONFLICT 0x80001398 ++#define EVENT_NDIS_MEMORY_CONFLICT 0x80001399 ++#define EVENT_NDIS_INTERRUPT_CONFLICT 0x8000139A ++#define EVENT_NDIS_DMA_CONFLICT 0x8000139B ++#define EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR 0xC000139C ++#define EVENT_NDIS_MAXRECEIVES_ERROR 0x8000139D ++#define EVENT_NDIS_MAXTRANSMITS_ERROR 0x8000139E ++#define EVENT_NDIS_MAXFRAMESIZE_ERROR 0x8000139F ++#define EVENT_NDIS_MAXINTERNALBUFS_ERROR 0x800013A0 ++#define EVENT_NDIS_MAXMULTICAST_ERROR 0x800013A1 ++#define EVENT_NDIS_PRODUCTID_ERROR 0x800013A2 ++#define EVENT_NDIS_LOBE_FAILUE_ERROR 0x800013A3 ++#define EVENT_NDIS_SIGNAL_LOSS_ERROR 0x800013A4 ++#define EVENT_NDIS_REMOVE_RECEIVED_ERROR 0x800013A5 ++#define EVENT_NDIS_TOKEN_RING_CORRECTION 0x400013A6 ++#define EVENT_NDIS_ADAPTER_CHECK_ERROR 0xC00013A7 ++#define EVENT_NDIS_RESET_FAILURE_ERROR 0x800013A8 ++#define EVENT_NDIS_CABLE_DISCONNECTED_ERROR 0x800013A9 ++#define EVENT_NDIS_RESET_FAILURE_CORRECTION 0x800013AA ++ ++/* packet filter bits used by NDIS_OID_PACKET_FILTER */ ++#define NDIS_PACKET_TYPE_DIRECTED 0x00000001 ++#define NDIS_PACKET_TYPE_MULTICAST 0x00000002 ++#define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004 ++#define NDIS_PACKET_TYPE_BROADCAST 0x00000008 ++#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010 ++#define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020 ++#define NDIS_PACKET_TYPE_SMT 0x00000040 ++#define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080 ++#define NDIS_PACKET_TYPE_GROUP 0x00001000 ++#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00002000 ++#define NDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 ++#define NDIS_PACKET_TYPE_MAC_FRAME 0x00008000 ++ ++/* memory allocation flags */ ++#define NDIS_MEMORY_CONTIGUOUS 0x00000001 ++#define NDIS_MEMORY_NONCACHED 0x00000002 ++ ++/* Attribute flags to NdisMSetAtrributesEx */ ++#define NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT 0x00000001 ++#define NDIS_ATTRIBUTE_IGNORE_REQUEST_TIMEOUT 0x00000002 ++#define NDIS_ATTRIBUTE_IGNORE_TOKEN_RING_ERRORS 0x00000004 ++#define NDIS_ATTRIBUTE_BUS_MASTER 0x00000008 ++#define NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER 0x00000010 ++#define NDIS_ATTRIBUTE_DESERIALIZE 0x00000020 ++#define NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND 0x00000040 ++#define NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK 0x00000080 ++#define NDIS_ATTRIBUTE_NOT_CO_NDIS 0x00000100 ++#define NDIS_ATTRIBUTE_USES_SAFE_BUFFER_APIS 0x00000200 ++ ++#define OID_TCP_TASK_OFFLOAD 0xFC010201 ++ ++#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001 ++#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED 0x00000002 ++#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND 0x00000004 ++#define NDIS_MAC_OPTION_NO_LOOPBACK 0x00000008 ++#define NDIS_MAC_OPTION_FULL_DUPLEX 0x00000010 ++#define NDIS_MAC_OPTION_EOTX_INDICATION 0x00000020 ++#define NDIS_MAC_OPTION_8021P_PRIORITY 0x00000040 ++#define NDIS_MAC_OPTION_SUPPORTS_MAC_ADDRESS_OVERWRITE 0x00000080 ++#define NDIS_MAC_OPTION_RECEIVE_AT_DPC 0x00000100 ++#define NDIS_MAC_OPTION_8021Q_VLAN 0x00000200 ++#define NDIS_MAC_OPTION_RESERVED 0x80000000 ++ ++#define deserialized_driver(wnd) (wnd->attributes & NDIS_ATTRIBUTE_DESERIALIZE) ++ ++static inline void serialize_lock(struct ndis_device *wnd) ++{ ++ nt_spin_lock(&wnd->nmb->lock); ++} ++ ++static inline void serialize_unlock(struct ndis_device *wnd) ++{ ++ nt_spin_unlock(&wnd->nmb->lock); ++} ++ ++static inline KIRQL serialize_lock_irql(struct ndis_device *wnd) ++{ ++ if (deserialized_driver(wnd)) ++ return raise_irql(DISPATCH_LEVEL); ++ else ++ return nt_spin_lock_irql(&wnd->nmb->lock, DISPATCH_LEVEL); ++} ++ ++static inline void serialize_unlock_irql(struct ndis_device *wnd, ++ KIRQL irql) ++{ ++ if (deserialized_driver(wnd)) ++ lower_irql(irql); ++ else ++ nt_spin_unlock_irql(&wnd->nmb->lock, irql); ++} ++ ++static inline void if_serialize_lock(struct ndis_device *wnd) ++{ ++ if (!deserialized_driver(wnd)) ++ nt_spin_lock(&wnd->nmb->lock); ++} ++ ++static inline void if_serialize_unlock(struct ndis_device *wnd) ++{ ++ if (!deserialized_driver(wnd)) ++ nt_spin_unlock(&wnd->nmb->lock); ++} ++ ++#endif /* NDIS_H */ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndiswrapper.h +--- linux-3.12.2/3rdparty/ndiswrapper/ndiswrapper.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ndiswrapper.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,219 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _NDISWRAPPER_H_ ++#define _NDISWRAPPER_H_ ++ ++#define DRIVER_VERSION "1.59" ++#define UTILS_VERSION "1.9" ++ ++#define DRIVER_NAME "ndiswrapper" ++#define DRIVER_CONFIG_DIR "/etc/ndiswrapper" ++ ++#define NDIS_ESSID_MAX_SIZE 32 ++#define NDIS_ENCODING_TOKEN_MAX 32 ++#define MAX_ENCR_KEYS 4 ++#define TX_RING_SIZE 16 ++#define NDIS_MAX_RATES 8 ++#define NDIS_MAX_RATES_EX 16 ++ ++#define WRAP_PCI_BUS 5 ++#define WRAP_PCMCIA_BUS 8 ++/* some USB devices, e.g., DWL-G120 have BusType as 0 */ ++#define WRAP_INTERNAL_BUS 0 ++/* documentation at msdn says 15 is PNP bus, but inf files from all ++ * vendors say 15 is USB; which is correct? */ ++#define WRAP_USB_BUS 15 ++ ++/* NDIS device must be 0, for compatibility with old versions of ++ * ndiswrapper where device type for NDIS drivers is 0 */ ++#define WRAP_NDIS_DEVICE 0 ++#define WRAP_USB_DEVICE 1 ++#define WRAP_BLUETOOTH_DEVICE1 2 ++#define WRAP_BLUETOOTH_DEVICE2 3 ++ ++#define WRAP_DEVICE_BUS(dev, bus) ((dev) << 8 | (bus)) ++#define WRAP_BUS(dev_bus) ((dev_bus) & 0x000FF) ++#define WRAP_DEVICE(dev_bus) ((dev_bus) >> 8) ++ ++#define MAX_DRIVER_NAME_LEN 32 ++#define MAX_VERSION_STRING_LEN 64 ++#define MAX_SETTING_NAME_LEN 128 ++#define MAX_SETTING_VALUE_LEN 256 ++ ++#define MAX_DRIVER_PE_IMAGES 4 ++#define MAX_DRIVER_BIN_FILES 5 ++#define MAX_DEVICE_SETTINGS 512 ++ ++#define MAX_ALLOCATED_URBS 15 ++ ++#define DEV_ANY_ID -1 ++ ++#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5] ++#define MACSTRSEP "%02x:%02x:%02x:%02x:%02x:%02x" ++#define MACSTR "%02x%02x%02x%02x%02x%02x" ++#define MACINTADR(a) (int*)&((a)[0]), (int*)&((a)[1]), (int*)&((a)[2]), \ ++ (int*)&((a)[3]), (int*)&((a)[4]), (int*)&((a)[5]) ++ ++#ifdef __KERNEL__ ++/* DEBUG macros */ ++ ++#define MSG(level, fmt, ...) \ ++ printk(level DRIVER_NAME " (%s:%d): " fmt "\n", \ ++ __func__, __LINE__ , ## __VA_ARGS__) ++ ++#define WARNING(fmt, ...) MSG(KERN_WARNING, fmt, ## __VA_ARGS__) ++#define ERROR(fmt, ...) MSG(KERN_ERR, fmt , ## __VA_ARGS__) ++#define INFO(fmt, ...) MSG(KERN_INFO, fmt , ## __VA_ARGS__) ++#define TODO() WARNING("not fully implemented (yet)") ++ ++#define TRACE(level, fmt, ...) \ ++do { \ ++ if (debug >= level) \ ++ printk(KERN_INFO "%s (%s:%d): " fmt "\n", DRIVER_NAME, \ ++ __func__, __LINE__ , ## __VA_ARGS__); \ ++} while (0) ++#define TRACE0(fmt, ...) TRACE(0, fmt , ## __VA_ARGS__) ++ ++extern int debug; ++ ++#ifndef DEBUG ++#define DEBUG 0 ++#endif ++ ++/* for a block of code */ ++#if DEBUG >= 1 ++#define DBG_BLOCK(level) if (debug >= level) ++#else ++#define DBG_BLOCK(level) while (0) ++#endif ++ ++#if DEBUG >= 1 ++#define TRACE1(fmt, ...) TRACE(1, fmt , ## __VA_ARGS__) ++#else ++#define TRACE1(fmt, ...) do { } while (0) ++#endif ++ ++#if DEBUG >= 2 ++#define TRACE2(fmt, ...) TRACE(2, fmt , ## __VA_ARGS__) ++#else ++#define TRACE2(fmt, ...) do { } while (0) ++#endif ++ ++#if DEBUG >= 3 ++#define TRACE3(fmt, ...) TRACE(3, fmt , ## __VA_ARGS__) ++#else ++#define TRACE3(fmt, ...) do { } while (0) ++#endif ++ ++#if DEBUG >= 4 ++#define TRACE4(fmt, ...) TRACE(4, fmt , ## __VA_ARGS__) ++#else ++#define TRACE4(fmt, ...) do { } while (0) ++#endif ++ ++#if DEBUG >= 5 ++#define TRACE5(fmt, ...) TRACE(5, fmt , ## __VA_ARGS__) ++#else ++#define TRACE5(fmt, ...) do { } while (0) ++#endif ++ ++#if DEBUG >= 6 ++#define TRACE6(fmt, ...) TRACE(6, fmt , ## __VA_ARGS__) ++#else ++#define TRACE6(fmt, ...) do { } while (0) ++#endif ++ ++#define ENTER0(fmt, ...) TRACE0("Enter " fmt , ## __VA_ARGS__) ++#define ENTER1(fmt, ...) TRACE1("Enter " fmt , ## __VA_ARGS__) ++#define ENTER2(fmt, ...) TRACE2("Enter " fmt , ## __VA_ARGS__) ++#define ENTER3(fmt, ...) TRACE3("Enter " fmt , ## __VA_ARGS__) ++#define ENTER4(fmt, ...) TRACE4("Enter " fmt , ## __VA_ARGS__) ++#define ENTER5(fmt, ...) TRACE5("Enter " fmt , ## __VA_ARGS__) ++#define ENTER6(fmt, ...) TRACE6("Enter " fmt , ## __VA_ARGS__) ++ ++#define EXIT0(stmt) do { TRACE0("Exit"); stmt; } while (0) ++#define EXIT1(stmt) do { TRACE1("Exit"); stmt; } while (0) ++#define EXIT2(stmt) do { TRACE2("Exit"); stmt; } while (0) ++#define EXIT3(stmt) do { TRACE3("Exit"); stmt; } while (0) ++#define EXIT4(stmt) do { TRACE4("Exit"); stmt; } while (0) ++#define EXIT5(stmt) do { TRACE5("Exit"); stmt; } while (0) ++#define EXIT6(stmt) do { TRACE6("Exit"); stmt; } while (0) ++ ++#if defined(USB_DEBUG) ++#define USBTRACE TRACE0 ++#define USBENTER ENTER0 ++#define USBEXIT EXIT0 ++#else ++#define USBTRACE(fmt, ...) do { } while (0) ++#define USBENTER(fmt, ...) ++#define USBEXIT(stmt) stmt ++#endif ++ ++#if defined(EVENT_DEBUG) ++#define EVENTTRACE TRACE0 ++#define EVENTENTER ENTER0 ++#define EVENTEXIT EXIT0 ++#else ++#define EVENTTRACE(fmt, ...) do { } while (0) ++#define EVENTENTER(fmt, ...) ++#define EVENTEXIT(stmt) stmt ++#endif ++ ++#if defined(TIMER_DEBUG) ++#define TIMERTRACE TRACE0 ++#define TIMERENTER ENTER0 ++#define TIMEREXIT EXIT0 ++#else ++#define TIMERTRACE(fmt, ...) do { } while (0) ++#define TIMERENTER(fmt, ...) ++#define TIMEREXIT(stmt) stmt ++#endif ++ ++#if defined(IO_DEBUG) ++#define IOTRACE TRACE0 ++#define IOENTER ENTER0 ++#define IOEXIT EXIT0 ++#else ++#define IOTRACE(fmt, ...) do { } while (0) ++#define IOENTER(fmt, ...) ++#define IOEXIT(stmt) stmt ++#endif ++ ++#if defined(WORK_DEBUG) ++#define WORKTRACE TRACE0 ++#define WORKENTER ENTER0 ++#define WORKEXIT EXIT0 ++#else ++#define WORKTRACE(fmt, ...) do { } while (0) ++#define WORKENTER(fmt, ...) ++#define WORKEXIT(stmt) stmt ++#endif ++ ++#if DEBUG >= 1 ++#define assert(expr) \ ++do { \ ++ if (!(expr)) { \ ++ ERROR("assertion '%s' failed", #expr); \ ++ dump_stack(); \ ++ } \ ++} while (0) ++#else ++#define assert(expr) do { } while (0) ++#endif ++ ++#endif // __KERNEL__ ++ ++#endif // NDISWRAPPER_H +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.c +--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,2677 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ntoskernel.h" ++#include "ndis.h" ++#include "usb.h" ++#include "pnp.h" ++#include "loader.h" ++#include "ntoskernel_exports.h" ++ ++/* MDLs describe a range of virtual address with an array of physical ++ * pages right after the header. For different ranges of virtual ++ * addresses, the number of entries of physical pages may be different ++ * (depending on number of entries required). If we want to allocate ++ * MDLs from a pool, the size has to be constant. So we assume that ++ * maximum range used by a driver is MDL_CACHE_PAGES; if a driver ++ * requests an MDL for a bigger region, we allocate it with kmalloc; ++ * otherwise, we allocate from the pool */ ++ ++#define MDL_CACHE_PAGES 3 ++#define MDL_CACHE_SIZE (sizeof(struct mdl) + \ ++ (sizeof(PFN_NUMBER) * MDL_CACHE_PAGES)) ++struct wrap_mdl { ++ struct nt_list list; ++ struct mdl mdl[0]; ++}; ++ ++/* everything here is for all drivers/devices - not per driver/device */ ++static spinlock_t dispatcher_lock; ++spinlock_t ntoskernel_lock; ++static void *mdl_cache; ++static struct nt_list wrap_mdl_list; ++ ++static struct work_struct kdpc_work; ++static void kdpc_worker(struct work_struct *dummy); ++ ++static struct nt_list kdpc_list; ++static spinlock_t kdpc_list_lock; ++ ++static struct nt_list callback_objects; ++ ++struct nt_list object_list; ++ ++struct bus_driver { ++ struct nt_list list; ++ char name[MAX_DRIVER_NAME_LEN]; ++ struct driver_object drv_obj; ++}; ++ ++static struct nt_list bus_driver_list; ++ ++static struct work_struct ntos_work; ++static struct nt_list ntos_work_list; ++static spinlock_t ntos_work_lock; ++static void ntos_work_worker(struct work_struct *dummy); ++spinlock_t irp_cancel_lock; ++static NT_SPIN_LOCK nt_list_lock; ++static struct nt_slist wrap_timer_slist; ++CCHAR cpu_count; ++ ++/* compute ticks (100ns) since 1601 until when system booted into ++ * wrap_ticks_to_boot */ ++u64 wrap_ticks_to_boot; ++ ++#if defined(CONFIG_X86_64) ++static struct timer_list shared_data_timer; ++struct kuser_shared_data kuser_shared_data; ++static void update_user_shared_data_proc(unsigned long data); ++#endif ++ ++WIN_SYMBOL_MAP("KeTickCount", &jiffies) ++WIN_SYMBOL_MAP("KeNumberProcessors", &cpu_count) ++WIN_SYMBOL_MAP("NlsMbCodePageTag", FALSE) ++ ++struct workqueue_struct *ntos_wq; ++ ++#ifdef WRAP_PREEMPT ++DEFINE_PER_CPU(struct irql_info, irql_info); ++#endif ++ ++#if defined(CONFIG_X86_64) ++static void update_user_shared_data_proc(unsigned long data) ++{ ++ /* timer is supposed to be scheduled every 10ms, but bigger ++ * intervals seem to work (tried up to 50ms) */ ++ *((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601(); ++ *((ULONG64 *)&kuser_shared_data.interrupt_time) = ++ jiffies * TICKSPERSEC / HZ; ++ *((ULONG64 *)&kuser_shared_data.tick) = jiffies; ++ ++ mod_timer(&shared_data_timer, jiffies + MSEC_TO_HZ(30)); ++} ++#endif ++ ++void *allocate_object(ULONG size, enum common_object_type type, ++ struct unicode_string *name) ++{ ++ struct common_object_header *hdr; ++ void *body; ++ ++ /* we pad header as prefix to body */ ++ hdr = ExAllocatePoolWithTag(NonPagedPool, OBJECT_SIZE(size), 0); ++ if (!hdr) { ++ WARNING("couldn't allocate memory"); ++ return NULL; ++ } ++ memset(hdr, 0, OBJECT_SIZE(size)); ++ if (name) { ++ hdr->name.buf = ExAllocatePoolWithTag(NonPagedPool, ++ name->max_length, 0); ++ if (!hdr->name.buf) { ++ ExFreePool(hdr); ++ return NULL; ++ } ++ memcpy(hdr->name.buf, name->buf, name->max_length); ++ hdr->name.length = name->length; ++ hdr->name.max_length = name->max_length; ++ } ++ hdr->type = type; ++ hdr->ref_count = 1; ++ spin_lock_bh(&ntoskernel_lock); ++ /* threads are looked up often (in KeWaitForXXX), so optimize ++ * for fast lookups of threads */ ++ if (type == OBJECT_TYPE_NT_THREAD) ++ InsertHeadList(&object_list, &hdr->list); ++ else ++ InsertTailList(&object_list, &hdr->list); ++ spin_unlock_bh(&ntoskernel_lock); ++ body = HEADER_TO_OBJECT(hdr); ++ TRACE3("allocated hdr: %p, body: %p", hdr, body); ++ return body; ++} ++ ++static void free_object(void *object) ++{ ++ struct common_object_header *hdr; ++ ++ hdr = OBJECT_TO_HEADER(object); ++ spin_lock_bh(&ntoskernel_lock); ++ RemoveEntryList(&hdr->list); ++ spin_unlock_bh(&ntoskernel_lock); ++ TRACE3("freed hdr: %p, body: %p", hdr, object); ++ if (hdr->name.buf) ++ ExFreePool(hdr->name.buf); ++ ExFreePool(hdr); ++} ++ ++static int add_bus_driver(const char *name) ++{ ++ struct bus_driver *bus_driver; ++ ++ bus_driver = kzalloc(sizeof(*bus_driver), GFP_KERNEL); ++ if (!bus_driver) { ++ ERROR("couldn't allocate memory"); ++ return -ENOMEM; ++ } ++ strncpy(bus_driver->name, name, sizeof(bus_driver->name)); ++ bus_driver->name[sizeof(bus_driver->name)-1] = 0; ++ spin_lock_bh(&ntoskernel_lock); ++ InsertTailList(&bus_driver_list, &bus_driver->list); ++ spin_unlock_bh(&ntoskernel_lock); ++ TRACE1("bus driver %s is at %p", name, &bus_driver->drv_obj); ++ return STATUS_SUCCESS; ++} ++ ++struct driver_object *find_bus_driver(const char *name) ++{ ++ struct bus_driver *bus_driver; ++ struct driver_object *drv_obj; ++ ++ spin_lock_bh(&ntoskernel_lock); ++ drv_obj = NULL; ++ nt_list_for_each_entry(bus_driver, &bus_driver_list, list) { ++ if (strcmp(bus_driver->name, name) == 0) { ++ drv_obj = &bus_driver->drv_obj; ++ break; ++ } ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ return drv_obj; ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExfInterlockedInsertHeadList,3) ++ (struct nt_list *head, struct nt_list *entry, NT_SPIN_LOCK *lock) ++{ ++ struct nt_list *first; ++ unsigned long flags; ++ ++ ENTER5("head = %p, entry = %p", head, entry); ++ nt_spin_lock_irqsave(lock, flags); ++ first = InsertHeadList(head, entry); ++ nt_spin_unlock_irqrestore(lock, flags); ++ TRACE5("head = %p, old = %p", head, first); ++ return first; ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExInterlockedInsertHeadList,3) ++ (struct nt_list *head, struct nt_list *entry, NT_SPIN_LOCK *lock) ++{ ++ ENTER5("%p", head); ++ return ExfInterlockedInsertHeadList(head, entry, lock); ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExfInterlockedInsertTailList,3) ++ (struct nt_list *head, struct nt_list *entry, NT_SPIN_LOCK *lock) ++{ ++ struct nt_list *last; ++ unsigned long flags; ++ ++ ENTER5("head = %p, entry = %p", head, entry); ++ nt_spin_lock_irqsave(lock, flags); ++ last = InsertTailList(head, entry); ++ nt_spin_unlock_irqrestore(lock, flags); ++ TRACE5("head = %p, old = %p", head, last); ++ return last; ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExInterlockedInsertTailList,3) ++ (struct nt_list *head, struct nt_list *entry, NT_SPIN_LOCK *lock) ++{ ++ ENTER5("%p", head); ++ return ExfInterlockedInsertTailList(head, entry, lock); ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExfInterlockedRemoveHeadList,2) ++ (struct nt_list *head, NT_SPIN_LOCK *lock) ++{ ++ struct nt_list *ret; ++ unsigned long flags; ++ ++ ENTER5("head = %p", head); ++ nt_spin_lock_irqsave(lock, flags); ++ ret = RemoveHeadList(head); ++ nt_spin_unlock_irqrestore(lock, flags); ++ TRACE5("head = %p, ret = %p", head, ret); ++ return ret; ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExInterlockedRemoveHeadList,2) ++ (struct nt_list *head, NT_SPIN_LOCK *lock) ++{ ++ ENTER5("%p", head); ++ return ExfInterlockedRemoveHeadList(head, lock); ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExfInterlockedRemoveTailList,2) ++ (struct nt_list *head, NT_SPIN_LOCK *lock) ++{ ++ struct nt_list *ret; ++ unsigned long flags; ++ ++ ENTER5("head = %p", head); ++ nt_spin_lock_irqsave(lock, flags); ++ ret = RemoveTailList(head); ++ nt_spin_unlock_irqrestore(lock, flags); ++ TRACE5("head = %p, ret = %p", head, ret); ++ return ret; ++} ++ ++wfastcall struct nt_list *WIN_FUNC(ExInterlockedRemoveTailList,2) ++ (struct nt_list *head, NT_SPIN_LOCK *lock) ++{ ++ ENTER5("%p", head); ++ return ExfInterlockedRemoveTailList(head, lock); ++} ++ ++wfastcall void WIN_FUNC(InitializeSListHead,1) ++ (nt_slist_header *head) ++{ ++ memset(head, 0, sizeof(*head)); ++} ++ ++wfastcall struct nt_slist *WIN_FUNC(ExInterlockedPushEntrySList,3) ++ (nt_slist_header *head, struct nt_slist *entry, NT_SPIN_LOCK *lock) ++{ ++ struct nt_slist *ret; ++ ++ ret = PushEntrySList(head, entry, lock); ++ return ret; ++} ++ ++wstdcall struct nt_slist *WIN_FUNC(ExpInterlockedPushEntrySList,2) ++ (nt_slist_header *head, struct nt_slist *entry) ++{ ++ struct nt_slist *ret; ++ ++ ret = PushEntrySList(head, entry, &nt_list_lock); ++ return ret; ++} ++ ++wfastcall struct nt_slist *WIN_FUNC(InterlockedPushEntrySList,2) ++ (nt_slist_header *head, struct nt_slist *entry) ++{ ++ struct nt_slist *ret; ++ ++ ret = PushEntrySList(head, entry, &nt_list_lock); ++ return ret; ++} ++ ++wfastcall struct nt_slist *WIN_FUNC(ExInterlockedPopEntrySList,2) ++ (nt_slist_header *head, NT_SPIN_LOCK *lock) ++{ ++ struct nt_slist *ret; ++ ++ ret = PopEntrySList(head, lock); ++ return ret; ++} ++ ++wstdcall struct nt_slist *WIN_FUNC(ExpInterlockedPopEntrySList,1) ++ (nt_slist_header *head) ++{ ++ struct nt_slist *ret; ++ ++ ret = PopEntrySList(head, &nt_list_lock); ++ return ret; ++} ++ ++wfastcall struct nt_slist *WIN_FUNC(InterlockedPopEntrySList,1) ++ (nt_slist_header *head) ++{ ++ struct nt_slist *ret; ++ ++ ret = PopEntrySList(head, &nt_list_lock); ++ return ret; ++} ++ ++wstdcall USHORT WIN_FUNC(ExQueryDepthSList,1) ++ (nt_slist_header *head) ++{ ++ USHORT depth; ++ ENTER5("%p", head); ++ depth = head->depth; ++ TRACE5("%d, %p", depth, head->next); ++ return depth; ++} ++ ++wfastcall LONG WIN_FUNC(InterlockedIncrement,1) ++ (LONG volatile *val) ++{ ++ return post_atomic_add(*val, 1); ++} ++ ++wfastcall LONG WIN_FUNC(InterlockedDecrement,1) ++ (LONG volatile *val) ++{ ++ return post_atomic_add(*val, -1); ++} ++ ++wfastcall LONG WIN_FUNC(InterlockedExchange,2) ++ (LONG volatile *target, LONG val) ++{ ++ return xchg(target, val); ++} ++ ++wfastcall LONG WIN_FUNC(InterlockedCompareExchange,3) ++ (LONG volatile *dest, LONG new, LONG old) ++{ ++ return cmpxchg(dest, old, new); ++} ++ ++wfastcall void WIN_FUNC(ExInterlockedAddLargeStatistic,2) ++ (LARGE_INTEGER volatile *plint, ULONG n) ++{ ++ unsigned long flags; ++ ++ local_irq_save(flags); ++#ifdef CONFIG_X86_64 ++ __asm__ __volatile__( ++ "\n" ++ LOCK_PREFIX "add %1, %0\n\t" ++ : "+m" (*plint) ++ : "r" (n)); ++#else ++ __asm__ __volatile__( ++ "1:\t" ++ " movl %1, %%ebx\n\t" ++ " movl %%edx, %%ecx\n\t" ++ " addl %%eax, %%ebx\n\t" ++ " adcl $0, %%ecx\n\t" ++ LOCK_PREFIX "cmpxchg8b %0\n\t" ++ " jnz 1b\n\t" ++ : "+m" (*plint) ++ : "m" (n), "A" (*plint) ++ : "ebx", "ecx"); ++#endif ++ local_irq_restore(flags); ++} ++ ++static void initialize_object(struct dispatcher_header *dh, enum dh_type type, ++ int state) ++{ ++ memset(dh, 0, sizeof(*dh)); ++ set_object_type(dh, type); ++ dh->signal_state = state; ++ InitializeListHead(&dh->wait_blocks); ++} ++ ++static void timer_proc(unsigned long data) ++{ ++ struct wrap_timer *wrap_timer = (struct wrap_timer *)data; ++ struct nt_timer *nt_timer; ++ struct kdpc *kdpc; ++ ++ nt_timer = wrap_timer->nt_timer; ++ TIMERENTER("%p(%p), %lu", wrap_timer, nt_timer, jiffies); ++#ifdef TIMER_DEBUG ++ BUG_ON(wrap_timer->wrap_timer_magic != WRAP_TIMER_MAGIC); ++ BUG_ON(nt_timer->wrap_timer_magic != WRAP_TIMER_MAGIC); ++#endif ++ KeSetEvent((struct nt_event *)nt_timer, 0, FALSE); ++ if (wrap_timer->repeat) ++ mod_timer(&wrap_timer->timer, jiffies + wrap_timer->repeat); ++ kdpc = nt_timer->kdpc; ++ if (kdpc) ++ queue_kdpc(kdpc); ++ TIMEREXIT(return); ++} ++ ++void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type, ++ struct ndis_mp_block *nmb) ++{ ++ struct wrap_timer *wrap_timer; ++ ++ /* TODO: if a timer is initialized more than once, we allocate ++ * memory for wrap_timer more than once for the same nt_timer, ++ * wasting memory. We can check if nt_timer->wrap_timer_magic is ++ * set and not allocate, but it is not guaranteed always to be ++ * safe */ ++ TIMERENTER("%p", nt_timer); ++ /* we allocate memory for wrap_timer behind driver's back and ++ * there is no NDIS/DDK function where this memory can be ++ * freed, so we use slack_kmalloc so it gets freed when driver ++ * is unloaded */ ++ if (nmb) ++ wrap_timer = kzalloc(sizeof(*wrap_timer), irql_gfp()); ++ else ++ wrap_timer = slack_kzalloc(sizeof(*wrap_timer)); ++ if (!wrap_timer) { ++ ERROR("couldn't allocate memory for timer"); ++ return; ++ } ++ ++ init_timer(&wrap_timer->timer); ++ wrap_timer->timer.data = (unsigned long)wrap_timer; ++ wrap_timer->timer.function = timer_proc; ++ wrap_timer->nt_timer = nt_timer; ++#ifdef TIMER_DEBUG ++ wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC; ++#endif ++ nt_timer->wrap_timer = wrap_timer; ++ nt_timer->kdpc = NULL; ++ initialize_object(&nt_timer->dh, (enum dh_type)type, 0); ++ nt_timer->wrap_timer_magic = WRAP_TIMER_MAGIC; ++ TIMERTRACE("timer %p (%p)", wrap_timer, nt_timer); ++ spin_lock_bh(&ntoskernel_lock); ++ if (nmb) { ++ wrap_timer->slist.next = nmb->wnd->wrap_timer_slist.next; ++ nmb->wnd->wrap_timer_slist.next = &wrap_timer->slist; ++ } else { ++ wrap_timer->slist.next = wrap_timer_slist.next; ++ wrap_timer_slist.next = &wrap_timer->slist; ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ TIMEREXIT(return); ++} ++ ++wstdcall void WIN_FUNC(KeInitializeTimerEx,2) ++ (struct nt_timer *nt_timer, enum timer_type type) ++{ ++ TIMERENTER("%p", nt_timer); ++ wrap_init_timer(nt_timer, type, NULL); ++} ++ ++wstdcall void WIN_FUNC(KeInitializeTimer,1) ++ (struct nt_timer *nt_timer) ++{ ++ TIMERENTER("%p", nt_timer); ++ wrap_init_timer(nt_timer, NotificationTimer, NULL); ++} ++ ++/* expires and repeat are in HZ */ ++BOOLEAN wrap_set_timer(struct nt_timer *nt_timer, unsigned long expires_hz, ++ unsigned long repeat_hz, struct kdpc *kdpc) ++{ ++ struct wrap_timer *wrap_timer; ++ ++ TIMERENTER("%p, %lu, %lu, %p, %lu", ++ nt_timer, expires_hz, repeat_hz, kdpc, jiffies); ++ ++ wrap_timer = nt_timer->wrap_timer; ++ TIMERTRACE("%p", wrap_timer); ++#ifdef TIMER_DEBUG ++ if (wrap_timer->nt_timer != nt_timer) ++ WARNING("bad timers: %p, %p, %p", wrap_timer, nt_timer, ++ wrap_timer->nt_timer); ++ if (nt_timer->wrap_timer_magic != WRAP_TIMER_MAGIC) { ++ WARNING("buggy Windows timer didn't initialize timer %p", ++ nt_timer); ++ return FALSE; ++ } ++ if (wrap_timer->wrap_timer_magic != WRAP_TIMER_MAGIC) { ++ WARNING("timer %p is not initialized (%lx)?", ++ wrap_timer, wrap_timer->wrap_timer_magic); ++ wrap_timer->wrap_timer_magic = WRAP_TIMER_MAGIC; ++ } ++#endif ++ KeClearEvent((struct nt_event *)nt_timer); ++ nt_timer->kdpc = kdpc; ++ wrap_timer->repeat = repeat_hz; ++ if (mod_timer(&wrap_timer->timer, jiffies + expires_hz)) ++ TIMEREXIT(return TRUE); ++ else ++ TIMEREXIT(return FALSE); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeSetTimerEx,4) ++ (struct nt_timer *nt_timer, LARGE_INTEGER duetime_ticks, ++ LONG period_ms, struct kdpc *kdpc) ++{ ++ unsigned long expires_hz, repeat_hz; ++ ++ TIMERENTER("%p, %lld, %d", nt_timer, duetime_ticks, period_ms); ++ expires_hz = SYSTEM_TIME_TO_HZ(duetime_ticks); ++ repeat_hz = MSEC_TO_HZ(period_ms); ++ return wrap_set_timer(nt_timer, expires_hz, repeat_hz, kdpc); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeSetTimer,3) ++ (struct nt_timer *nt_timer, LARGE_INTEGER duetime_ticks, ++ struct kdpc *kdpc) ++{ ++ TIMERENTER("%p, %lld, %p", nt_timer, duetime_ticks, kdpc); ++ return KeSetTimerEx(nt_timer, duetime_ticks, 0, kdpc); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeCancelTimer,1) ++ (struct nt_timer *nt_timer) ++{ ++ struct wrap_timer *wrap_timer; ++ int ret; ++ ++ TIMERENTER("%p", nt_timer); ++ wrap_timer = nt_timer->wrap_timer; ++ if (!wrap_timer) { ++ ERROR("invalid wrap_timer"); ++ return TRUE; ++ } ++#ifdef TIMER_DEBUG ++ BUG_ON(wrap_timer->wrap_timer_magic != WRAP_TIMER_MAGIC); ++#endif ++ /* disable timer before deleting so if it is periodic timer, it ++ * won't be re-armed after deleting */ ++ wrap_timer->repeat = 0; ++ ret = del_timer_sync(&wrap_timer->timer); ++ /* the documentation for KeCancelTimer suggests the DPC is ++ * deqeued, but actually DPC is left to run */ ++ if (ret) ++ TIMEREXIT(return TRUE); ++ else ++ TIMEREXIT(return FALSE); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeReadStateTimer,1) ++ (struct nt_timer *nt_timer) ++{ ++ if (nt_timer->dh.signal_state) ++ return TRUE; ++ else ++ return FALSE; ++} ++ ++wstdcall void WIN_FUNC(KeInitializeDpc,3) ++ (struct kdpc *kdpc, void *func, void *ctx) ++{ ++ ENTER3("%p, %p, %p", kdpc, func, ctx); ++ memset(kdpc, 0, sizeof(*kdpc)); ++ kdpc->func = func; ++ kdpc->ctx = ctx; ++ InitializeListHead(&kdpc->list); ++} ++ ++static void kdpc_worker(struct work_struct *dummy) ++{ ++ struct nt_list *entry; ++ struct kdpc *kdpc; ++ unsigned long flags; ++ KIRQL irql; ++ ++ WORKENTER(""); ++ irql = raise_irql(DISPATCH_LEVEL); ++ while (1) { ++ spin_lock_irqsave(&kdpc_list_lock, flags); ++ entry = RemoveHeadList(&kdpc_list); ++ if (entry) { ++ kdpc = container_of(entry, struct kdpc, list); ++ assert(kdpc->queued); ++ kdpc->queued = 0; ++ } else ++ kdpc = NULL; ++ spin_unlock_irqrestore(&kdpc_list_lock, flags); ++ if (!kdpc) ++ break; ++ WORKTRACE("%p, %p, %p, %p, %p", kdpc, kdpc->func, kdpc->ctx, ++ kdpc->arg1, kdpc->arg2); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ LIN2WIN4(kdpc->func, kdpc, kdpc->ctx, kdpc->arg1, kdpc->arg2); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ } ++ lower_irql(irql); ++ WORKEXIT(return); ++} ++ ++wstdcall void WIN_FUNC(KeFlushQueuedDpcs,0) ++ (void) ++{ ++ kdpc_worker(NULL); ++} ++ ++BOOLEAN queue_kdpc(struct kdpc *kdpc) ++{ ++ BOOLEAN ret; ++ unsigned long flags; ++ ++ WORKENTER("%p", kdpc); ++ spin_lock_irqsave(&kdpc_list_lock, flags); ++ if (kdpc->queued) ++ ret = FALSE; ++ else { ++ if (unlikely(kdpc->importance == HighImportance)) ++ InsertHeadList(&kdpc_list, &kdpc->list); ++ else ++ InsertTailList(&kdpc_list, &kdpc->list); ++ kdpc->queued = 1; ++ ret = TRUE; ++ } ++ spin_unlock_irqrestore(&kdpc_list_lock, flags); ++ if (ret == TRUE) ++ queue_work(ntos_wq, &kdpc_work); ++ WORKTRACE("%d", ret); ++ return ret; ++} ++ ++BOOLEAN dequeue_kdpc(struct kdpc *kdpc) ++{ ++ BOOLEAN ret; ++ unsigned long flags; ++ ++ WORKENTER("%p", kdpc); ++ spin_lock_irqsave(&kdpc_list_lock, flags); ++ if (kdpc->queued) { ++ RemoveEntryList(&kdpc->list); ++ kdpc->queued = 0; ++ ret = TRUE; ++ } else ++ ret = FALSE; ++ spin_unlock_irqrestore(&kdpc_list_lock, flags); ++ WORKTRACE("%d", ret); ++ return ret; ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeInsertQueueDpc,3) ++ (struct kdpc *kdpc, void *arg1, void *arg2) ++{ ++ WORKENTER("%p, %p, %p", kdpc, arg1, arg2); ++ kdpc->arg1 = arg1; ++ kdpc->arg2 = arg2; ++ return queue_kdpc(kdpc); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeRemoveQueueDpc,1) ++ (struct kdpc *kdpc) ++{ ++ return dequeue_kdpc(kdpc); ++} ++ ++wstdcall void WIN_FUNC(KeSetImportanceDpc,2) ++ (struct kdpc *kdpc, enum kdpc_importance importance) ++{ ++ kdpc->importance = importance; ++} ++ ++static void ntos_work_worker(struct work_struct *dummy) ++{ ++ struct ntos_work_item *ntos_work_item; ++ struct nt_list *cur; ++ ++ while (1) { ++ spin_lock_bh(&ntos_work_lock); ++ cur = RemoveHeadList(&ntos_work_list); ++ spin_unlock_bh(&ntos_work_lock); ++ if (!cur) ++ break; ++ ntos_work_item = container_of(cur, struct ntos_work_item, list); ++ WORKTRACE("%p: executing %p, %p, %p", current, ++ ntos_work_item->func, ntos_work_item->arg1, ++ ntos_work_item->arg2); ++ LIN2WIN2(ntos_work_item->func, ntos_work_item->arg1, ++ ntos_work_item->arg2); ++ kfree(ntos_work_item); ++ } ++ WORKEXIT(return); ++} ++ ++int schedule_ntos_work_item(NTOS_WORK_FUNC func, void *arg1, void *arg2) ++{ ++ struct ntos_work_item *ntos_work_item; ++ ++ WORKENTER("adding work: %p, %p, %p", func, arg1, arg2); ++ ntos_work_item = kmalloc(sizeof(*ntos_work_item), irql_gfp()); ++ if (!ntos_work_item) { ++ ERROR("couldn't allocate memory"); ++ return -ENOMEM; ++ } ++ ntos_work_item->func = func; ++ ntos_work_item->arg1 = arg1; ++ ntos_work_item->arg2 = arg2; ++ spin_lock_bh(&ntos_work_lock); ++ InsertTailList(&ntos_work_list, &ntos_work_item->list); ++ spin_unlock_bh(&ntos_work_lock); ++ queue_work(ntos_wq, &ntos_work); ++ WORKEXIT(return 0); ++} ++ ++wstdcall void WIN_FUNC(KeInitializeSpinLock,1) ++ (NT_SPIN_LOCK *lock) ++{ ++ ENTER6("%p", lock); ++ nt_spin_lock_init(lock); ++} ++ ++wstdcall void WIN_FUNC(KeAcquireSpinLock,2) ++ (NT_SPIN_LOCK *lock, KIRQL *irql) ++{ ++ ENTER6("%p", lock); ++ *irql = nt_spin_lock_irql(lock, DISPATCH_LEVEL); ++} ++ ++wstdcall void WIN_FUNC(KeReleaseSpinLock,2) ++ (NT_SPIN_LOCK *lock, KIRQL oldirql) ++{ ++ ENTER6("%p", lock); ++ nt_spin_unlock_irql(lock, oldirql); ++} ++ ++wstdcall void WIN_FUNC(KeAcquireSpinLockAtDpcLevel,1) ++ (NT_SPIN_LOCK *lock) ++{ ++ ENTER6("%p", lock); ++ nt_spin_lock(lock); ++} ++ ++wstdcall void WIN_FUNC(KeReleaseSpinLockFromDpcLevel,1) ++ (NT_SPIN_LOCK *lock) ++{ ++ ENTER6("%p", lock); ++ nt_spin_unlock(lock); ++} ++ ++wstdcall void WIN_FUNC(KeRaiseIrql,2) ++ (KIRQL newirql, KIRQL *oldirql) ++{ ++ ENTER6("%d", newirql); ++ *oldirql = raise_irql(newirql); ++} ++ ++wstdcall KIRQL WIN_FUNC(KeRaiseIrqlToDpcLevel,0) ++ (void) ++{ ++ return raise_irql(DISPATCH_LEVEL); ++} ++ ++wstdcall void WIN_FUNC(KeLowerIrql,1) ++ (KIRQL irql) ++{ ++ ENTER6("%d", irql); ++ lower_irql(irql); ++} ++ ++wstdcall KIRQL WIN_FUNC(KeAcquireSpinLockRaiseToDpc,1) ++ (NT_SPIN_LOCK *lock) ++{ ++ ENTER6("%p", lock); ++ return nt_spin_lock_irql(lock, DISPATCH_LEVEL); ++} ++ ++wstdcall void *WIN_FUNC(ExAllocatePoolWithTag,3) ++ (enum pool_type pool_type, SIZE_T size, ULONG tag) ++{ ++ void *addr; ++ ++ ENTER4("pool_type: %d, size: %zu, tag: 0x%x", pool_type, size, tag); ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ if (size < PAGE_SIZE) ++ addr = kmalloc(size, irql_gfp()); ++ else { ++ if (irql_gfp() & GFP_ATOMIC) { ++ addr = __vmalloc(size, GFP_ATOMIC | __GFP_HIGHMEM, ++ PAGE_KERNEL); ++ TRACE1("%p, %zu", addr, size); ++ } else { ++ addr = vmalloc(size); ++ TRACE1("%p, %zu", addr, size); ++ } ++ } ++ DBG_BLOCK(1) { ++ if (addr) ++ TRACE4("addr: %p, %zu", addr, size); ++ else ++ TRACE1("failed: %zu", size); ++ } ++ return addr; ++} ++WIN_FUNC_DECL(ExAllocatePoolWithTag,3) ++ ++wstdcall void WIN_FUNC(ExFreePoolWithTag,2) ++ (void *addr, ULONG tag) ++{ ++ TRACE4("%p", addr); ++ if ((unsigned long)addr < VMALLOC_START || ++ (unsigned long)addr >= VMALLOC_END) ++ kfree(addr); ++ else ++ vfree(addr); ++ ++ EXIT4(return); ++} ++ ++wstdcall void WIN_FUNC(ExFreePool,1) ++ (void *addr) ++{ ++ ExFreePoolWithTag(addr, 0); ++} ++WIN_FUNC_DECL(ExFreePool,1) ++ ++wstdcall void WIN_FUNC(ExInitializeNPagedLookasideList,7) ++ (struct npaged_lookaside_list *lookaside, ++ LOOKASIDE_ALLOC_FUNC *alloc_func, LOOKASIDE_FREE_FUNC *free_func, ++ ULONG flags, SIZE_T size, ULONG tag, USHORT depth) ++{ ++ ENTER3("lookaside: %p, size: %zu, flags: %u, head: %p, " ++ "alloc: %p, free: %p", lookaside, size, flags, ++ lookaside, alloc_func, free_func); ++ ++ memset(lookaside, 0, sizeof(*lookaside)); ++ ++ lookaside->size = size; ++ lookaside->tag = tag; ++ lookaside->depth = 4; ++ lookaside->maxdepth = 256; ++ lookaside->pool_type = NonPagedPool; ++ ++ if (alloc_func) ++ lookaside->alloc_func = alloc_func; ++ else ++ lookaside->alloc_func = WIN_FUNC_PTR(ExAllocatePoolWithTag,3); ++ if (free_func) ++ lookaside->free_func = free_func; ++ else ++ lookaside->free_func = WIN_FUNC_PTR(ExFreePool,1); ++ ++#ifndef CONFIG_X86_64 ++ nt_spin_lock_init(&lookaside->obsolete); ++#endif ++ EXIT3(return); ++} ++ ++wstdcall void WIN_FUNC(ExDeleteNPagedLookasideList,1) ++ (struct npaged_lookaside_list *lookaside) ++{ ++ struct nt_slist *entry; ++ ++ ENTER3("lookaside = %p", lookaside); ++ while ((entry = ExpInterlockedPopEntrySList(&lookaside->head))) ++ LIN2WIN1(lookaside->free_func, entry); ++ EXIT3(return); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ExCreateCallback,4) ++ (struct callback_object **object, struct object_attributes *attributes, ++ BOOLEAN create, BOOLEAN allow_multiple_callbacks) ++{ ++ struct callback_object *obj; ++ ++ ENTER2(""); ++ spin_lock_bh(&ntoskernel_lock); ++ nt_list_for_each_entry(obj, &callback_objects, callback_funcs) { ++ if (obj->attributes == attributes) { ++ spin_unlock_bh(&ntoskernel_lock); ++ *object = obj; ++ return STATUS_SUCCESS; ++ } ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ obj = allocate_object(sizeof(struct callback_object), ++ OBJECT_TYPE_CALLBACK, NULL); ++ if (!obj) ++ EXIT2(return STATUS_INSUFFICIENT_RESOURCES); ++ InitializeListHead(&obj->callback_funcs); ++ nt_spin_lock_init(&obj->lock); ++ obj->allow_multiple_callbacks = allow_multiple_callbacks; ++ obj->attributes = attributes; ++ *object = obj; ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall void *WIN_FUNC(ExRegisterCallback,3) ++ (struct callback_object *object, PCALLBACK_FUNCTION func, void *context) ++{ ++ struct callback_func *callback; ++ KIRQL irql; ++ ++ ENTER2(""); ++ irql = nt_spin_lock_irql(&object->lock, DISPATCH_LEVEL); ++ if (object->allow_multiple_callbacks == FALSE && ++ !IsListEmpty(&object->callback_funcs)) { ++ nt_spin_unlock_irql(&object->lock, irql); ++ EXIT2(return NULL); ++ } ++ nt_spin_unlock_irql(&object->lock, irql); ++ callback = kmalloc(sizeof(*callback), GFP_KERNEL); ++ if (!callback) { ++ ERROR("couldn't allocate memory"); ++ return NULL; ++ } ++ callback->func = func; ++ callback->context = context; ++ callback->object = object; ++ irql = nt_spin_lock_irql(&object->lock, DISPATCH_LEVEL); ++ InsertTailList(&object->callback_funcs, &callback->list); ++ nt_spin_unlock_irql(&object->lock, irql); ++ EXIT2(return callback); ++} ++ ++wstdcall void WIN_FUNC(ExUnregisterCallback,1) ++ (struct callback_func *callback) ++{ ++ struct callback_object *object; ++ KIRQL irql; ++ ++ ENTER3("%p", callback); ++ if (!callback) ++ return; ++ object = callback->object; ++ irql = nt_spin_lock_irql(&object->lock, DISPATCH_LEVEL); ++ RemoveEntryList(&callback->list); ++ nt_spin_unlock_irql(&object->lock, irql); ++ kfree(callback); ++ return; ++} ++ ++wstdcall void WIN_FUNC(ExNotifyCallback,3) ++ (struct callback_object *object, void *arg1, void *arg2) ++{ ++ struct callback_func *callback; ++ KIRQL irql; ++ ++ ENTER3("%p", object); ++ irql = nt_spin_lock_irql(&object->lock, DISPATCH_LEVEL); ++ nt_list_for_each_entry(callback, &object->callback_funcs, list) { ++ LIN2WIN3(callback->func, callback->context, arg1, arg2); ++ } ++ nt_spin_unlock_irql(&object->lock, irql); ++ return; ++} ++ ++/* check and set signaled state; should be called with dispatcher_lock held */ ++/* @grab indicates if the event should be grabbed or checked ++ * - note that a semaphore may stay in signaled state for multiple ++ * 'grabs' if the count is > 1 */ ++static int grab_object(struct dispatcher_header *dh, ++ struct task_struct *thread, int grab) ++{ ++ EVENTTRACE("%p, %p, %d, %d", dh, thread, grab, dh->signal_state); ++ if (unlikely(is_mutex_object(dh))) { ++ struct nt_mutex *nt_mutex; ++ nt_mutex = container_of(dh, struct nt_mutex, dh); ++ EVENTTRACE("%p, %p, %d, %p, %d", nt_mutex, ++ nt_mutex->owner_thread, dh->signal_state, ++ thread, grab); ++ /* either no thread owns the mutex or this thread owns ++ * it */ ++ assert(dh->signal_state == 1 && nt_mutex->owner_thread == NULL); ++ assert(dh->signal_state < 1 && nt_mutex->owner_thread != NULL); ++ if ((dh->signal_state == 1 && nt_mutex->owner_thread == NULL) || ++ nt_mutex->owner_thread == thread) { ++ if (grab) { ++ dh->signal_state--; ++ nt_mutex->owner_thread = thread; ++ } ++ EVENTEXIT(return 1); ++ } ++ } else if (dh->signal_state > 0) { ++ /* to grab, decrement signal_state for synchronization ++ * or semaphore objects */ ++ if (grab && (is_synch_object(dh) || is_semaphore_object(dh))) ++ dh->signal_state--; ++ EVENTEXIT(return 1); ++ } ++ EVENTEXIT(return 0); ++} ++ ++/* this function should be called holding dispatcher_lock */ ++static void object_signaled(struct dispatcher_header *dh) ++{ ++ struct nt_list *cur, *next; ++ struct wait_block *wb; ++ ++ EVENTENTER("%p", dh); ++ nt_list_for_each_safe(cur, next, &dh->wait_blocks) { ++ wb = container_of(cur, struct wait_block, list); ++ assert(wb->thread != NULL); ++ assert(wb->object == NULL); ++ if (!grab_object(dh, wb->thread, 1)) ++ continue; ++ EVENTTRACE("%p (%p): waking %p", dh, wb, wb->thread); ++ RemoveEntryList(cur); ++ wb->object = dh; ++ *(wb->wait_done) = 1; ++ wake_up_process(wb->thread); ++ } ++ EVENTEXIT(return); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(KeWaitForMultipleObjects,8) ++ (ULONG count, void *object[], enum wait_type wait_type, ++ KWAIT_REASON wait_reason, KPROCESSOR_MODE wait_mode, ++ BOOLEAN alertable, LARGE_INTEGER *timeout, ++ struct wait_block *wait_block_array) ++{ ++ int i, res = 0, wait_count, wait_done; ++ typeof(jiffies) wait_hz = 0; ++ struct wait_block *wb, wb_array[THREAD_WAIT_OBJECTS]; ++ struct dispatcher_header *dh; ++ KIRQL irql = current_irql(); ++ ++ EVENTENTER("%p, %d, %u, %p", current, count, wait_type, timeout); ++ ++ if (count > MAX_WAIT_OBJECTS || ++ (count > THREAD_WAIT_OBJECTS && wait_block_array == NULL)) ++ EVENTEXIT(return STATUS_INVALID_PARAMETER); ++ ++ if (wait_block_array == NULL) ++ wb = wb_array; ++ else ++ wb = wait_block_array; ++ ++ /* If *timeout == 0: In the case of WaitAny, if an object can ++ * be grabbed (object is in signaled state), grab and ++ * return. In the case of WaitAll, we have to first make sure ++ * all objects can be grabbed. If any/some of them can't be ++ * grabbed, either we return STATUS_TIMEOUT or wait for them, ++ * depending on how to satisfy wait. If all of them can be ++ * grabbed, we will grab them in the next loop below */ ++ ++ spin_lock_bh(&dispatcher_lock); ++ for (i = wait_count = 0; i < count; i++) { ++ dh = object[i]; ++ EVENTTRACE("%p: event %p (%d)", current, dh, dh->signal_state); ++ /* wait_type == 1 for WaitAny, 0 for WaitAll */ ++ if (grab_object(dh, current, wait_type)) { ++ if (wait_type == WaitAny) { ++ spin_unlock_bh(&dispatcher_lock); ++ EVENTEXIT(return STATUS_WAIT_0 + i); ++ } ++ } else { ++ EVENTTRACE("%p: wait for %p", current, dh); ++ wait_count++; ++ } ++ } ++ ++ if (timeout && *timeout == 0 && wait_count) { ++ spin_unlock_bh(&dispatcher_lock); ++ EVENTEXIT(return STATUS_TIMEOUT); ++ } ++ ++ /* get the list of objects the thread needs to wait on and add ++ * the thread on the wait list for each such object */ ++ /* if *timeout == 0, this step will grab all the objects */ ++ wait_done = 0; ++ for (i = 0; i < count; i++) { ++ dh = object[i]; ++ EVENTTRACE("%p: event %p (%d)", current, dh, dh->signal_state); ++ wb[i].object = NULL; ++ if (grab_object(dh, current, 1)) { ++ EVENTTRACE("%p: no wait for %p (%d)", ++ current, dh, dh->signal_state); ++ /* mark that we are not waiting on this object */ ++ wb[i].thread = NULL; ++ } else { ++ wb[i].wait_done = &wait_done; ++ wb[i].thread = current; ++ EVENTTRACE("%p: wait for %p", current, dh); ++ InsertTailList(&dh->wait_blocks, &wb[i].list); ++ } ++ } ++ spin_unlock_bh(&dispatcher_lock); ++ if (wait_count == 0) ++ EVENTEXIT(return STATUS_SUCCESS); ++ ++ assert(timeout == NULL || *timeout != 0); ++ if (timeout == NULL) ++ wait_hz = 0; ++ else ++ wait_hz = SYSTEM_TIME_TO_HZ(*timeout); ++ ++ if (irql >= DISPATCH_LEVEL) { ++ WARNING("attempt to wait with irql %d", irql); ++ EVENTEXIT(return STATUS_INVALID_PARAMETER); ++ } ++ EVENTTRACE("%p: sleep for %ld on %p", current, wait_hz, &wait_done); ++ /* we don't honor 'alertable' - according to description for ++ * this, even if waiting in non-alertable state, thread may be ++ * alerted in some circumstances */ ++ while (wait_count) { ++ res = wait_condition(wait_done, wait_hz, TASK_INTERRUPTIBLE); ++ spin_lock_bh(&dispatcher_lock); ++ EVENTTRACE("%p woke up: %d, %d", current, res, wait_done); ++ /* the event may have been set by the time ++ * wrap_wait_event returned and spinlock obtained, so ++ * don't rely on value of 'res' - check event status */ ++ if (!wait_done) { ++ assert(res <= 0); ++ /* timed out or interrupted; remove from wait list */ ++ for (i = 0; i < count; i++) { ++ if (!wb[i].thread) ++ continue; ++ EVENTTRACE("%p: timedout, dequeue %p (%p)", ++ current, object[i], wb[i].object); ++ assert(wb[i].object == NULL); ++ RemoveEntryList(&wb[i].list); ++ } ++ spin_unlock_bh(&dispatcher_lock); ++ if (res < 0) ++ EVENTEXIT(return STATUS_ALERTED); ++ else ++ EVENTEXIT(return STATUS_TIMEOUT); ++ } ++ assert(res > 0); ++ /* woken because object(s) signaled */ ++ for (i = 0; wait_count && i < count; i++) { ++ if (!wb[i].thread || !wb[i].object) ++ continue; ++ DBG_BLOCK(1) { ++ if (wb[i].object != object[i]) { ++ EVENTTRACE("oops %p != %p", ++ wb[i].object, object[i]); ++ continue; ++ } ++ } ++ wait_count--; ++ if (wait_type == WaitAny) { ++ int j; ++ /* done; remove from rest of wait list */ ++ for (j = i + 1; j < count; j++) { ++ if (wb[j].thread && !wb[j].object) ++ RemoveEntryList(&wb[j].list); ++ } ++ spin_unlock_bh(&dispatcher_lock); ++ EVENTEXIT(return STATUS_WAIT_0 + i); ++ } ++ } ++ wait_done = 0; ++ spin_unlock_bh(&dispatcher_lock); ++ if (wait_count == 0) ++ EVENTEXIT(return STATUS_SUCCESS); ++ ++ /* this thread is still waiting for more objects, so ++ * let it wait for remaining time and those objects */ ++ if (timeout) ++ wait_hz = res; ++ else ++ wait_hz = 0; ++ } ++ /* should never reach here, but compiler wants return value */ ++ ERROR("%p: wait_hz: %ld", current, wait_hz); ++ EVENTEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(KeWaitForSingleObject,5) ++ (void *object, KWAIT_REASON wait_reason, KPROCESSOR_MODE wait_mode, ++ BOOLEAN alertable, LARGE_INTEGER *timeout) ++{ ++ return KeWaitForMultipleObjects(1, &object, WaitAny, wait_reason, ++ wait_mode, alertable, timeout, NULL); ++} ++ ++wstdcall void WIN_FUNC(KeInitializeEvent,3) ++ (struct nt_event *nt_event, enum event_type type, BOOLEAN state) ++{ ++ EVENTENTER("event = %p, type = %d, state = %d", nt_event, type, state); ++ initialize_object(&nt_event->dh, (enum dh_type)type, state); ++ EVENTEXIT(return); ++} ++ ++wstdcall LONG WIN_FUNC(KeSetEvent,3) ++ (struct nt_event *nt_event, KPRIORITY incr, BOOLEAN wait) ++{ ++ LONG old_state; ++ ++ EVENTENTER("%p, %d", nt_event, nt_event->dh.type); ++ if (wait == TRUE) ++ WARNING("wait = %d, not yet implemented", wait); ++ spin_lock_bh(&dispatcher_lock); ++ old_state = nt_event->dh.signal_state; ++ nt_event->dh.signal_state = 1; ++ if (old_state == 0) ++ object_signaled(&nt_event->dh); ++ spin_unlock_bh(&dispatcher_lock); ++ EVENTEXIT(return old_state); ++} ++ ++wstdcall void WIN_FUNC(KeClearEvent,1) ++ (struct nt_event *nt_event) ++{ ++ EVENTENTER("%p", nt_event); ++ nt_event->dh.signal_state = 0; ++ EVENTEXIT(return); ++} ++ ++wstdcall LONG WIN_FUNC(KeResetEvent,1) ++ (struct nt_event *nt_event) ++{ ++ LONG old_state; ++ ++ EVENTENTER("%p", nt_event); ++ old_state = xchg(&nt_event->dh.signal_state, 0); ++ EVENTEXIT(return old_state); ++} ++ ++wstdcall LONG WIN_FUNC(KeReadStateEvent,1) ++ (struct nt_event *nt_event) ++{ ++ LONG state; ++ ++ state = nt_event->dh.signal_state; ++ EVENTTRACE("%d", state); ++ return state; ++} ++ ++wstdcall void WIN_FUNC(KeInitializeMutex,2) ++ (struct nt_mutex *mutex, ULONG level) ++{ ++ EVENTENTER("%p", mutex); ++ initialize_object(&mutex->dh, MutexObject, 1); ++ mutex->dh.size = sizeof(*mutex); ++ InitializeListHead(&mutex->list); ++ mutex->abandoned = FALSE; ++ mutex->apc_disable = 1; ++ mutex->owner_thread = NULL; ++ EVENTEXIT(return); ++} ++ ++wstdcall LONG WIN_FUNC(KeReleaseMutex,2) ++ (struct nt_mutex *mutex, BOOLEAN wait) ++{ ++ LONG ret; ++ struct task_struct *thread; ++ ++ EVENTENTER("%p, %d, %p", mutex, wait, current); ++ if (wait == TRUE) ++ WARNING("wait: %d", wait); ++ thread = current; ++ spin_lock_bh(&dispatcher_lock); ++ EVENTTRACE("%p, %p, %p, %d", mutex, thread, mutex->owner_thread, ++ mutex->dh.signal_state); ++ if ((mutex->owner_thread == thread) && (mutex->dh.signal_state <= 0)) { ++ ret = mutex->dh.signal_state++; ++ if (ret == 0) { ++ mutex->owner_thread = NULL; ++ object_signaled(&mutex->dh); ++ } ++ } else { ++ ret = STATUS_MUTANT_NOT_OWNED; ++ WARNING("invalid mutex: %p, %p, %p", mutex, mutex->owner_thread, ++ thread); ++ } ++ EVENTTRACE("%p, %p, %p, %d", mutex, thread, mutex->owner_thread, ++ mutex->dh.signal_state); ++ spin_unlock_bh(&dispatcher_lock); ++ EVENTEXIT(return ret); ++} ++ ++wstdcall void WIN_FUNC(KeInitializeSemaphore,3) ++ (struct nt_semaphore *semaphore, LONG count, LONG limit) ++{ ++ EVENTENTER("%p: %d", semaphore, count); ++ /* if limit > 1, we need to satisfy as many waits (until count ++ * becomes 0); so we keep decrementing count every time a wait ++ * is satisfied */ ++ initialize_object(&semaphore->dh, SemaphoreObject, count); ++ semaphore->dh.size = sizeof(*semaphore); ++ semaphore->limit = limit; ++ EVENTEXIT(return); ++} ++ ++wstdcall LONG WIN_FUNC(KeReleaseSemaphore,4) ++ (struct nt_semaphore *semaphore, KPRIORITY incr, LONG adjustment, ++ BOOLEAN wait) ++{ ++ LONG ret; ++ ++ EVENTENTER("%p", semaphore); ++ spin_lock_bh(&dispatcher_lock); ++ ret = semaphore->dh.signal_state; ++ assert(ret >= 0); ++ if (semaphore->dh.signal_state + adjustment <= semaphore->limit) ++ semaphore->dh.signal_state += adjustment; ++ else { ++ WARNING("releasing %d over limit %d", adjustment, ++ semaphore->limit); ++ semaphore->dh.signal_state = semaphore->limit; ++ } ++ if (semaphore->dh.signal_state > 0) ++ object_signaled(&semaphore->dh); ++ spin_unlock_bh(&dispatcher_lock); ++ EVENTEXIT(return ret); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(KeDelayExecutionThread,3) ++ (KPROCESSOR_MODE wait_mode, BOOLEAN alertable, LARGE_INTEGER *interval) ++{ ++ int res; ++ long timeout; ++ ++ if (wait_mode != 0) ++ ERROR("invalid wait_mode %d", wait_mode); ++ ++ timeout = SYSTEM_TIME_TO_HZ(*interval); ++ EVENTTRACE("%p, %lld, %ld", current, *interval, timeout); ++ if (timeout <= 0) ++ EVENTEXIT(return STATUS_SUCCESS); ++ ++ if (alertable) ++ set_current_state(TASK_INTERRUPTIBLE); ++ else ++ set_current_state(TASK_UNINTERRUPTIBLE); ++ ++ res = schedule_timeout(timeout); ++ EVENTTRACE("%p, %d", current, res); ++ if (res == 0) ++ EVENTEXIT(return STATUS_SUCCESS); ++ else ++ EVENTEXIT(return STATUS_ALERTED); ++} ++ ++wstdcall ULONGLONG WIN_FUNC(KeQueryInterruptTime,0) ++ (void) ++{ ++ EXIT5(return jiffies * TICKSPERJIFFY); ++} ++ ++wstdcall ULONG WIN_FUNC(KeQueryTimeIncrement,0) ++ (void) ++{ ++ EXIT5(return TICKSPERSEC / HZ); ++} ++ ++wstdcall void WIN_FUNC(KeQuerySystemTime,1) ++ (LARGE_INTEGER *time) ++{ ++ *time = ticks_1601(); ++ TRACE5("%llu, %lu", *time, jiffies); ++} ++ ++wstdcall void WIN_FUNC(KeQueryTickCount,1) ++ (LARGE_INTEGER *count) ++{ ++ *count = jiffies; ++} ++ ++wstdcall LARGE_INTEGER WIN_FUNC(KeQueryPerformanceCounter,1) ++ (LARGE_INTEGER *counter) ++{ ++ if (counter) ++ *counter = HZ; ++ return jiffies; ++} ++ ++wstdcall KAFFINITY WIN_FUNC(KeQueryActiveProcessors,0) ++ (void) ++{ ++ int i, n; ++ KAFFINITY bits = 0; ++ n = num_online_cpus(); ++ for (i = 0; i < n; i++) ++ bits = (bits << 1) | 1; ++ return bits; ++} ++ ++struct nt_thread *get_current_nt_thread(void) ++{ ++ struct task_struct *task = current; ++ struct nt_thread *thread; ++ struct common_object_header *header; ++ ++ TRACE6("task: %p", task); ++ thread = NULL; ++ spin_lock_bh(&ntoskernel_lock); ++ nt_list_for_each_entry(header, &object_list, list) { ++ TRACE6("%p, %d", header, header->type); ++ if (header->type != OBJECT_TYPE_NT_THREAD) ++ break; ++ thread = HEADER_TO_OBJECT(header); ++ TRACE6("%p, %p", thread, thread->task); ++ if (thread->task == task) ++ break; ++ else ++ thread = NULL; ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ if (thread == NULL) ++ TRACE4("couldn't find thread for task %p, %d", task, task->pid); ++ TRACE6("%p", thread); ++ return thread; ++} ++ ++static struct task_struct *get_nt_thread_task(struct nt_thread *thread) ++{ ++ struct task_struct *task; ++ struct common_object_header *header; ++ ++ TRACE6("%p", thread); ++ task = NULL; ++ spin_lock_bh(&ntoskernel_lock); ++ nt_list_for_each_entry(header, &object_list, list) { ++ TRACE6("%p, %d", header, header->type); ++ if (header->type != OBJECT_TYPE_NT_THREAD) ++ break; ++ if (thread == HEADER_TO_OBJECT(header)) { ++ task = thread->task; ++ break; ++ } ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ if (task == NULL) ++ TRACE2("%p: couldn't find task for %p", current, thread); ++ return task; ++} ++ ++static struct nt_thread *create_nt_thread(struct task_struct *task) ++{ ++ struct nt_thread *thread; ++ thread = allocate_object(sizeof(*thread), OBJECT_TYPE_NT_THREAD, NULL); ++ if (!thread) { ++ ERROR("couldn't allocate thread object"); ++ EXIT2(return NULL); ++ } ++ thread->task = task; ++ if (task) ++ thread->pid = task->pid; ++ else ++ thread->pid = 0; ++ nt_spin_lock_init(&thread->lock); ++ InitializeListHead(&thread->irps); ++ initialize_object(&thread->dh, ThreadObject, 0); ++ thread->dh.size = sizeof(*thread); ++ thread->prio = LOW_PRIORITY; ++ return thread; ++} ++ ++wstdcall struct nt_thread *WIN_FUNC(KeGetCurrentThread,0) ++ (void) ++{ ++ struct nt_thread *thread = get_current_nt_thread(); ++ TRACE2("%p, %p", thread, current); ++ return thread; ++} ++ ++wstdcall KPRIORITY WIN_FUNC(KeQueryPriorityThread,1) ++ (struct nt_thread *thread) ++{ ++ KPRIORITY prio; ++ struct task_struct *task; ++ ++ TRACE2("%p", thread); ++#ifdef CONFIG_X86_64 ++ /* sis163u driver for amd64 passes 0x1f from thread created by ++ * PsCreateSystemThread - no idea what is 0x1f */ ++ if (thread == (void *)0x1f) ++ thread = get_current_nt_thread(); ++#endif ++ if (!thread) { ++ TRACE2("invalid thread"); ++ EXIT2(return LOW_REALTIME_PRIORITY); ++ } ++ task = get_nt_thread_task(thread); ++ if (!task) { ++ TRACE2("couldn't find task for thread: %p", thread); ++ EXIT2(return LOW_REALTIME_PRIORITY); ++ } ++ ++ prio = thread->prio; ++ ++ TRACE2("%d", prio); ++ return prio; ++} ++ ++wstdcall KPRIORITY WIN_FUNC(KeSetPriorityThread,2) ++ (struct nt_thread *thread, KPRIORITY prio) ++{ ++ KPRIORITY old_prio; ++ struct task_struct *task; ++ ++ TRACE2("thread: %p, priority = %u", thread, prio); ++#ifdef CONFIG_X86_64 ++ if (thread == (void *)0x1f) ++ thread = get_current_nt_thread(); ++#endif ++ if (!thread) { ++ TRACE2("invalid thread"); ++ EXIT2(return LOW_REALTIME_PRIORITY); ++ } ++ task = get_nt_thread_task(thread); ++ if (!task) { ++ TRACE2("couldn't find task for thread: %p", thread); ++ EXIT2(return LOW_REALTIME_PRIORITY); ++ } ++ ++ old_prio = thread->prio; ++ thread->prio = prio; ++ ++ TRACE2("%d, %d", old_prio, thread->prio); ++ return old_prio; ++} ++ ++struct thread_trampoline { ++ void (*func)(void *) wstdcall; ++ void *ctx; ++ struct nt_thread *thread; ++ struct completion started; ++}; ++ ++static int ntdriver_thread(void *data) ++{ ++ struct thread_trampoline *thread_tramp = data; ++ /* yes, a tramp! */ ++ typeof(thread_tramp->func) func = thread_tramp->func; ++ typeof(thread_tramp->ctx) ctx = thread_tramp->ctx; ++ ++ thread_tramp->thread->task = current; ++ thread_tramp->thread->pid = current->pid; ++ TRACE2("thread: %p, task: %p (%d)", thread_tramp->thread, ++ current, current->pid); ++ complete(&thread_tramp->started); ++ ++#ifdef PF_NOFREEZE ++ current->flags |= PF_NOFREEZE; ++#endif ++ strncpy(current->comm, "ntdriver", sizeof(current->comm)); ++ current->comm[sizeof(current->comm)-1] = 0; ++ LIN2WIN1(func, ctx); ++ ERROR("task: %p", current); ++ return 0; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(PsCreateSystemThread,7) ++ (void **handle, ULONG access, void *obj_attr, void *process, ++ void *client_id, void (*func)(void *) wstdcall, void *ctx) ++{ ++ struct thread_trampoline thread_tramp; ++ ++ ENTER2("handle = %p, access = %u, obj_attr = %p, process = %p, " ++ "client_id = %p, func = %p, context = %p", handle, access, ++ obj_attr, process, client_id, func, ctx); ++ ++ thread_tramp.thread = create_nt_thread(NULL); ++ if (!thread_tramp.thread) { ++ ERROR("couldn't allocate thread object"); ++ EXIT2(return STATUS_RESOURCES); ++ } ++ TRACE2("thread: %p", thread_tramp.thread); ++ thread_tramp.func = func; ++ thread_tramp.ctx = ctx; ++ init_completion(&thread_tramp.started); ++ ++ thread_tramp.thread->task = kthread_run(ntdriver_thread, ++ &thread_tramp, "ntdriver"); ++ if (IS_ERR(thread_tramp.thread->task)) { ++ free_object(thread_tramp.thread); ++ EXIT2(return STATUS_FAILURE); ++ } ++ TRACE2("created task: %p", thread_tramp.thread->task); ++ ++ wait_for_completion(&thread_tramp.started); ++ *handle = OBJECT_TO_HEADER(thread_tramp.thread); ++ TRACE2("created thread: %p, %p", thread_tramp.thread, *handle); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(PsTerminateSystemThread,1) ++ (NTSTATUS status) ++{ ++ struct nt_thread *thread; ++ ++ TRACE2("%p, %08X", current, status); ++ thread = get_current_nt_thread(); ++ TRACE2("%p", thread); ++ if (thread) { ++ KeSetEvent((struct nt_event *)&thread->dh, 0, FALSE); ++ while (1) { ++ struct nt_list *ent; ++ struct irp *irp; ++ KIRQL irql; ++ irql = nt_spin_lock_irql(&thread->lock, DISPATCH_LEVEL); ++ ent = RemoveHeadList(&thread->irps); ++ nt_spin_unlock_irql(&thread->lock, irql); ++ if (!ent) ++ break; ++ irp = container_of(ent, struct irp, thread_list); ++ IOTRACE("%p", irp); ++ IoCancelIrp(irp); ++ } ++ /* the driver may later query this status with ++ * ZwQueryInformationThread */ ++ thread->status = status; ++ } else ++ ERROR("couldn't find thread for task: %p", current); ++ ++ complete_and_exit(NULL, status); ++ ERROR("oops: %p, %d", thread->task, thread->pid); ++ return STATUS_FAILURE; ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeRemoveEntryDeviceQueue,2) ++ (struct kdevice_queue *dev_queue, struct kdevice_queue_entry *entry) ++{ ++ struct kdevice_queue_entry *e; ++ KIRQL irql; ++ ++ irql = nt_spin_lock_irql(&dev_queue->lock, DISPATCH_LEVEL); ++ nt_list_for_each_entry(e, &dev_queue->list, list) { ++ if (e == entry) { ++ RemoveEntryList(&e->list); ++ nt_spin_unlock_irql(&dev_queue->lock, irql); ++ return TRUE; ++ } ++ } ++ nt_spin_unlock_irql(&dev_queue->lock, irql); ++ return FALSE; ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeSynchronizeExecution,3) ++ (struct kinterrupt *interrupt, PKSYNCHRONIZE_ROUTINE synch_routine, ++ void *ctx) ++{ ++ BOOLEAN ret; ++ unsigned long flags; ++ ++ nt_spin_lock_irqsave(interrupt->actual_lock, flags); ++ ret = LIN2WIN1(synch_routine, ctx); ++ nt_spin_unlock_irqrestore(interrupt->actual_lock, flags); ++ TRACE6("%d", ret); ++ return ret; ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeRegisterBugCheckReasonCallback,4) ++ (void *callback_record, void *callback_routine, UINT reason, ++ char *component) ++{ ++ TRACE1("callback_record: %p, callback_routine: %p, reason: %d, " ++ "component: %s", callback_record, callback_routine, reason, ++ component); ++ TODO(); ++ return FALSE; ++} ++ ++wstdcall BOOLEAN WIN_FUNC(KeDeregisterBugCheckReasonCallback,1) ++ (void *callback_record) ++{ ++ TRACE1("callback_record: %p", callback_record); ++ TODO(); ++ return TRUE; ++} ++ ++wstdcall void *WIN_FUNC(MmAllocateContiguousMemorySpecifyCache,5) ++ (SIZE_T size, PHYSICAL_ADDRESS lowest, PHYSICAL_ADDRESS highest, ++ PHYSICAL_ADDRESS boundary, enum memory_caching_type cache_type) ++{ ++ void *addr; ++ gfp_t flags; ++ ++ ENTER2("%zu, 0x%llx, 0x%llx, 0x%llx, %d", size, lowest, ++ highest, boundary, cache_type); ++ flags = irql_gfp(); ++ addr = wrap_get_free_pages(flags, size); ++ TRACE2("%p, %zu, 0x%x", addr, size, flags); ++ if (addr && ((virt_to_phys(addr) + size) <= highest)) ++ EXIT2(return addr); ++#ifdef CONFIG_X86_64 ++ /* GFP_DMA is really only 16MB even on x86-64, but there is no ++ * other zone available */ ++ if (highest <= DMA_BIT_MASK(31)) ++ flags |= __GFP_DMA; ++ else if (highest <= DMA_BIT_MASK(32)) ++ flags |= __GFP_DMA32; ++#else ++ if (highest <= DMA_BIT_MASK(24)) ++ flags |= __GFP_DMA; ++ else if (highest > DMA_BIT_MASK(30)) ++ flags |= __GFP_HIGHMEM; ++#endif ++ if (addr) ++ free_pages((unsigned long)addr, get_order(size)); ++ addr = wrap_get_free_pages(flags, size); ++ TRACE2("%p, %zu, 0x%x", addr, size, flags); ++ return addr; ++} ++ ++wstdcall void WIN_FUNC(MmFreeContiguousMemorySpecifyCache,3) ++ (void *base, SIZE_T size, enum memory_caching_type cache_type) ++{ ++ TRACE2("%p, %zu", base, size); ++ free_pages((unsigned long)base, get_order(size)); ++} ++ ++wstdcall PHYSICAL_ADDRESS WIN_FUNC(MmGetPhysicalAddress,1) ++ (void *base) ++{ ++ unsigned long phy = virt_to_phys(base); ++ TRACE2("%p, %p", base, (void *)phy); ++ return phy; ++} ++ ++/* Atheros card with pciid 168C:0014 calls this function with 0xf0000 ++ * and 0xf6ef0 address, and then check for things that seem to be ++ * related to ACPI: "_SM_" and "_DMI_". This may be the hack they do ++ * to check if this card is installed in IBM thinkpads; we can ++ * probably get this device to work if we create a buffer with the ++ * strings as required by the driver and return virtual address for ++ * that address instead */ ++wstdcall void __iomem *WIN_FUNC(MmMapIoSpace,3) ++ (PHYSICAL_ADDRESS phys_addr, SIZE_T size, ++ enum memory_caching_type cache) ++{ ++ void __iomem *virt; ++ ENTER1("cache type: %d", cache); ++ if (cache == MmCached) ++ virt = ioremap(phys_addr, size); ++ else ++ virt = ioremap_nocache(phys_addr, size); ++ TRACE1("%llx, %zu, %p", phys_addr, size, virt); ++ return virt; ++} ++ ++wstdcall void WIN_FUNC(MmUnmapIoSpace,2) ++ (void __iomem *addr, SIZE_T size) ++{ ++ ENTER1("%p, %zu", addr, size); ++ iounmap(addr); ++ return; ++} ++ ++wstdcall ULONG WIN_FUNC(MmSizeOfMdl,2) ++ (void *base, ULONG length) ++{ ++ return sizeof(struct mdl) + ++ (sizeof(PFN_NUMBER) * SPAN_PAGES(base, length)); ++} ++ ++struct mdl *allocate_init_mdl(void *virt, ULONG length) ++{ ++ struct wrap_mdl *wrap_mdl; ++ struct mdl *mdl; ++ int mdl_size = MmSizeOfMdl(virt, length); ++ ++ if (mdl_size <= MDL_CACHE_SIZE) { ++ wrap_mdl = kmem_cache_alloc(mdl_cache, irql_gfp()); ++ if (!wrap_mdl) ++ return NULL; ++ spin_lock_bh(&dispatcher_lock); ++ InsertHeadList(&wrap_mdl_list, &wrap_mdl->list); ++ spin_unlock_bh(&dispatcher_lock); ++ mdl = wrap_mdl->mdl; ++ TRACE3("allocated mdl from cache: %p(%p), %p(%d)", ++ wrap_mdl, mdl, virt, length); ++ memset(mdl, 0, MDL_CACHE_SIZE); ++ MmInitializeMdl(mdl, virt, length); ++ /* mark the MDL as allocated from cache pool so when ++ * it is freed, we free it back to the pool */ ++ mdl->flags = MDL_ALLOCATED_FIXED_SIZE | MDL_CACHE_ALLOCATED; ++ } else { ++ wrap_mdl = ++ kmalloc(sizeof(*wrap_mdl) + mdl_size, irql_gfp()); ++ if (!wrap_mdl) ++ return NULL; ++ mdl = wrap_mdl->mdl; ++ TRACE3("allocated mdl from memory: %p(%p), %p(%d)", ++ wrap_mdl, mdl, virt, length); ++ spin_lock_bh(&dispatcher_lock); ++ InsertHeadList(&wrap_mdl_list, &wrap_mdl->list); ++ spin_unlock_bh(&dispatcher_lock); ++ memset(mdl, 0, mdl_size); ++ MmInitializeMdl(mdl, virt, length); ++ mdl->flags = MDL_ALLOCATED_FIXED_SIZE; ++ } ++ return mdl; ++} ++ ++void free_mdl(struct mdl *mdl) ++{ ++ /* A driver may allocate Mdl with NdisAllocateBuffer and free ++ * with IoFreeMdl (e.g., 64-bit Broadcom). Since we need to ++ * treat buffers allocated with Ndis calls differently, we ++ * must call NdisFreeBuffer if it is allocated with Ndis ++ * function. We set 'pool' field in Ndis functions. */ ++ if (!mdl) ++ return; ++ if (mdl->pool) ++ NdisFreeBuffer(mdl); ++ else { ++ struct wrap_mdl *wrap_mdl = (struct wrap_mdl *) ++ ((char *)mdl - offsetof(struct wrap_mdl, mdl)); ++ spin_lock_bh(&dispatcher_lock); ++ RemoveEntryList(&wrap_mdl->list); ++ spin_unlock_bh(&dispatcher_lock); ++ ++ if (mdl->flags & MDL_CACHE_ALLOCATED) { ++ TRACE3("freeing mdl cache: %p, %p, %p", ++ wrap_mdl, mdl, mdl->mappedsystemva); ++ kmem_cache_free(mdl_cache, wrap_mdl); ++ } else { ++ TRACE3("freeing mdl: %p, %p, %p", ++ wrap_mdl, mdl, mdl->mappedsystemva); ++ kfree(wrap_mdl); ++ } ++ } ++ return; ++} ++ ++wstdcall void WIN_FUNC(IoBuildPartialMdl,4) ++ (struct mdl *source, struct mdl *target, void *virt, ULONG length) ++{ ++ MmInitializeMdl(target, virt, length); ++ target->flags |= MDL_PARTIAL; ++} ++ ++wstdcall void WIN_FUNC(MmBuildMdlForNonPagedPool,1) ++ (struct mdl *mdl) ++{ ++ PFN_NUMBER *mdl_pages; ++ int i, n; ++ ++ ENTER4("%p", mdl); ++ /* already mapped */ ++// mdl->mappedsystemva = MmGetMdlVirtualAddress(mdl); ++ mdl->flags |= MDL_SOURCE_IS_NONPAGED_POOL; ++ TRACE4("%p, %p, %p, %d, %d", mdl, mdl->mappedsystemva, mdl->startva, ++ mdl->byteoffset, mdl->bytecount); ++ n = SPAN_PAGES(MmGetSystemAddressForMdl(mdl), MmGetMdlByteCount(mdl)); ++ if (n > MDL_CACHE_PAGES) ++ WARNING("%p, %d, %d", MmGetSystemAddressForMdl(mdl), ++ MmGetMdlByteCount(mdl), n); ++ mdl_pages = MmGetMdlPfnArray(mdl); ++ for (i = 0; i < n; i++) ++ mdl_pages[i] = (ULONG_PTR)mdl->startva + (i * PAGE_SIZE); ++ EXIT4(return); ++} ++ ++wstdcall void *WIN_FUNC(MmMapLockedPages,2) ++ (struct mdl *mdl, KPROCESSOR_MODE access_mode) ++{ ++ /* already mapped */ ++// mdl->mappedsystemva = MmGetMdlVirtualAddress(mdl); ++ mdl->flags |= MDL_MAPPED_TO_SYSTEM_VA; ++ /* what is the need for MDL_PARTIAL_HAS_BEEN_MAPPED? */ ++ if (mdl->flags & MDL_PARTIAL) ++ mdl->flags |= MDL_PARTIAL_HAS_BEEN_MAPPED; ++ return mdl->mappedsystemva; ++} ++ ++wstdcall void *WIN_FUNC(MmMapLockedPagesSpecifyCache,6) ++ (struct mdl *mdl, KPROCESSOR_MODE access_mode, ++ enum memory_caching_type cache_type, void *base_address, ++ ULONG bug_check, enum mm_page_priority priority) ++{ ++ return MmMapLockedPages(mdl, access_mode); ++} ++ ++wstdcall void WIN_FUNC(MmUnmapLockedPages,2) ++ (void *base, struct mdl *mdl) ++{ ++ mdl->flags &= ~MDL_MAPPED_TO_SYSTEM_VA; ++ return; ++} ++ ++wstdcall void WIN_FUNC(MmProbeAndLockPages,3) ++ (struct mdl *mdl, KPROCESSOR_MODE access_mode, ++ enum lock_operation operation) ++{ ++ /* already locked */ ++ mdl->flags |= MDL_PAGES_LOCKED; ++ return; ++} ++ ++wstdcall void WIN_FUNC(MmUnlockPages,1) ++ (struct mdl *mdl) ++{ ++ mdl->flags &= ~MDL_PAGES_LOCKED; ++ return; ++} ++ ++wstdcall BOOLEAN WIN_FUNC(MmIsAddressValid,1) ++ (void *virt_addr) ++{ ++ if (virt_addr_valid(virt_addr)) ++ return TRUE; ++ else ++ return FALSE; ++} ++ ++wstdcall void *WIN_FUNC(MmLockPagableDataSection,1) ++ (void *address) ++{ ++ return address; ++} ++ ++wstdcall void WIN_FUNC(MmUnlockPagableImageSection,1) ++ (void *handle) ++{ ++ return; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ObReferenceObjectByHandle,6) ++ (void *handle, ACCESS_MASK desired_access, void *obj_type, ++ KPROCESSOR_MODE access_mode, void **object, void *handle_info) ++{ ++ struct common_object_header *hdr; ++ ++ TRACE2("%p", handle); ++ hdr = HANDLE_TO_HEADER(handle); ++ atomic_inc_var(hdr->ref_count); ++ *object = HEADER_TO_OBJECT(hdr); ++ TRACE2("%p, %p, %d, %p", hdr, object, hdr->ref_count, *object); ++ return STATUS_SUCCESS; ++} ++ ++/* DDK doesn't say if return value should be before incrementing or ++ * after incrementing reference count, but according to #reactos ++ * developers, it should be return value after incrementing */ ++wfastcall LONG WIN_FUNC(ObfReferenceObject,1) ++ (void *object) ++{ ++ struct common_object_header *hdr; ++ LONG ret; ++ ++ hdr = OBJECT_TO_HEADER(object); ++ ret = post_atomic_add(hdr->ref_count, 1); ++ TRACE2("%p, %d, %p", hdr, hdr->ref_count, object); ++ return ret; ++} ++ ++static int dereference_object(void *object) ++{ ++ struct common_object_header *hdr; ++ int ref_count; ++ ++ ENTER2("object: %p", object); ++ hdr = OBJECT_TO_HEADER(object); ++ TRACE2("hdr: %p", hdr); ++ ref_count = post_atomic_add(hdr->ref_count, -1); ++ TRACE2("object: %p, %d", object, ref_count); ++ if (ref_count < 0) ++ ERROR("invalid object: %p (%d)", object, ref_count); ++ if (ref_count <= 0) { ++ free_object(object); ++ return 1; ++ } else ++ return 0; ++} ++ ++wfastcall void WIN_FUNC(ObfDereferenceObject,1) ++ (void *object) ++{ ++ TRACE2("%p", object); ++ dereference_object(object); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwCreateFile,11) ++ (void **handle, ACCESS_MASK access_mask, ++ struct object_attributes *obj_attr, struct io_status_block *iosb, ++ LARGE_INTEGER *size, ULONG file_attr, ULONG share_access, ++ ULONG create_disposition, ULONG create_options, void *ea_buffer, ++ ULONG ea_length) ++{ ++ struct common_object_header *coh; ++ struct file_object *fo; ++ struct ansi_string ansi; ++ struct wrap_bin_file *bin_file; ++ char *file_basename; ++ NTSTATUS status; ++ ++ spin_lock_bh(&ntoskernel_lock); ++ nt_list_for_each_entry(coh, &object_list, list) { ++ if (coh->type != OBJECT_TYPE_FILE) ++ continue; ++ /* TODO: check if file is opened in shared mode */ ++ if (!RtlCompareUnicodeString(&coh->name, obj_attr->name, TRUE)) { ++ fo = HEADER_TO_OBJECT(coh); ++ bin_file = fo->wrap_bin_file; ++ *handle = coh; ++ spin_unlock_bh(&ntoskernel_lock); ++ ObReferenceObject(fo); ++ iosb->status = FILE_OPENED; ++ iosb->info = bin_file->size; ++ EXIT2(return STATUS_SUCCESS); ++ } ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ ++ if (RtlUnicodeStringToAnsiString(&ansi, obj_attr->name, TRUE) != ++ STATUS_SUCCESS) ++ EXIT2(return STATUS_INSUFFICIENT_RESOURCES); ++ ++ file_basename = strrchr(ansi.buf, '\\'); ++ if (file_basename) ++ file_basename++; ++ else ++ file_basename = ansi.buf; ++ TRACE2("file: '%s', '%s'", ansi.buf, file_basename); ++ ++ fo = allocate_object(sizeof(struct file_object), OBJECT_TYPE_FILE, ++ obj_attr->name); ++ if (!fo) { ++ RtlFreeAnsiString(&ansi); ++ iosb->status = STATUS_INSUFFICIENT_RESOURCES; ++ iosb->info = 0; ++ EXIT2(return STATUS_FAILURE); ++ } ++ coh = OBJECT_TO_HEADER(fo); ++ bin_file = get_bin_file(file_basename); ++ if (bin_file) { ++ TRACE2("%s, %s", bin_file->name, file_basename); ++ fo->flags = FILE_OPENED; ++ } else if (access_mask & FILE_WRITE_DATA) { ++ bin_file = kzalloc(sizeof(*bin_file), GFP_KERNEL); ++ if (bin_file) { ++ strncpy(bin_file->name, file_basename, ++ sizeof(bin_file->name)); ++ bin_file->name[sizeof(bin_file->name)-1] = 0; ++ bin_file->data = vmalloc(*size); ++ if (bin_file->data) { ++ memset(bin_file->data, 0, *size); ++ bin_file->size = *size; ++ fo->flags = FILE_CREATED; ++ } else { ++ kfree(bin_file); ++ bin_file = NULL; ++ } ++ } ++ } else ++ bin_file = NULL; ++ ++ RtlFreeAnsiString(&ansi); ++ if (!bin_file) { ++ iosb->status = FILE_DOES_NOT_EXIST; ++ iosb->info = 0; ++ free_object(fo); ++ EXIT2(return STATUS_FAILURE); ++ } ++ ++ fo->wrap_bin_file = bin_file; ++ fo->current_byte_offset = 0; ++ if (access_mask & FILE_READ_DATA) ++ fo->read_access = TRUE; ++ if (access_mask & FILE_WRITE_DATA) ++ fo->write_access = TRUE; ++ iosb->status = FILE_OPENED; ++ iosb->info = bin_file->size; ++ *handle = coh; ++ TRACE2("handle: %p", *handle); ++ status = STATUS_SUCCESS; ++ EXIT2(return status); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwOpenFile,6) ++ (void **handle, ACCESS_MASK access_mask, ++ struct object_attributes *obj_attr, struct io_status_block *iosb, ++ ULONG share_access, ULONG open_options) ++{ ++ LARGE_INTEGER size; ++ return ZwCreateFile(handle, access_mask, obj_attr, iosb, &size, 0, ++ share_access, 0, open_options, NULL, 0); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwReadFile,9) ++ (void *handle, struct nt_event *event, void *apc_routine, ++ void *apc_context, struct io_status_block *iosb, void *buffer, ++ ULONG length, LARGE_INTEGER *byte_offset, ULONG *key) ++{ ++ struct file_object *fo; ++ struct common_object_header *coh; ++ ULONG count; ++ size_t offset; ++ struct wrap_bin_file *file; ++ ++ TRACE2("%p", handle); ++ coh = handle; ++ if (coh->type != OBJECT_TYPE_FILE) { ++ ERROR("handle %p is invalid: %d", handle, coh->type); ++ EXIT2(return STATUS_FAILURE); ++ } ++ fo = HANDLE_TO_OBJECT(coh); ++ file = fo->wrap_bin_file; ++ TRACE2("file: %s (%zu)", file->name, file->size); ++ spin_lock_bh(&ntoskernel_lock); ++ if (byte_offset) ++ offset = *byte_offset; ++ else ++ offset = fo->current_byte_offset; ++ count = min((size_t)length, file->size - offset); ++ TRACE2("count: %u, offset: %zu, length: %u", count, offset, length); ++ memcpy(buffer, ((void *)file->data) + offset, count); ++ fo->current_byte_offset = offset + count; ++ spin_unlock_bh(&ntoskernel_lock); ++ iosb->status = STATUS_SUCCESS; ++ iosb->info = count; ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwWriteFile,9) ++ (void *handle, struct nt_event *event, void *apc_routine, ++ void *apc_context, struct io_status_block *iosb, void *buffer, ++ ULONG length, LARGE_INTEGER *byte_offset, ULONG *key) ++{ ++ struct file_object *fo; ++ struct common_object_header *coh; ++ struct wrap_bin_file *file; ++ unsigned long offset; ++ ++ TRACE2("%p", handle); ++ coh = handle; ++ if (coh->type != OBJECT_TYPE_FILE) { ++ ERROR("handle %p is invalid: %d", handle, coh->type); ++ EXIT2(return STATUS_FAILURE); ++ } ++ fo = HANDLE_TO_OBJECT(coh); ++ file = fo->wrap_bin_file; ++ TRACE2("file: %zu, %u", file->size, length); ++ spin_lock_bh(&ntoskernel_lock); ++ if (byte_offset) ++ offset = *byte_offset; ++ else ++ offset = fo->current_byte_offset; ++ if (length + offset > file->size) { ++ WARNING("%lu, %zu", length + offset, file->size); ++ /* TODO: implement writing past end of current size */ ++ iosb->status = STATUS_FAILURE; ++ iosb->info = 0; ++ } else { ++ memcpy(file->data + offset, buffer, length); ++ iosb->status = STATUS_SUCCESS; ++ iosb->info = length; ++ fo->current_byte_offset = offset + length; ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ EXIT2(return iosb->status); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwClose,1) ++ (void *handle) ++{ ++ struct common_object_header *coh; ++ ++ TRACE2("%p", handle); ++ if (handle == NULL) { ++ TRACE1(""); ++ EXIT2(return STATUS_SUCCESS); ++ } ++ coh = handle; ++ if (coh->type == OBJECT_TYPE_FILE) { ++ struct file_object *fo; ++ struct wrap_bin_file *bin_file; ++ typeof(fo->flags) flags; ++ ++ fo = HANDLE_TO_OBJECT(handle); ++ flags = fo->flags; ++ bin_file = fo->wrap_bin_file; ++ if (dereference_object(fo)) { ++ if (flags == FILE_CREATED) { ++ vfree(bin_file->data); ++ kfree(bin_file); ++ } else ++ free_bin_file(bin_file); ++ } ++ } else if (coh->type == OBJECT_TYPE_NT_THREAD) { ++ struct nt_thread *thread = HANDLE_TO_OBJECT(handle); ++ TRACE2("thread: %p (%p)", thread, handle); ++ ObDereferenceObject(thread); ++ } else { ++ /* TODO: can we just dereference object here? */ ++ WARNING("closing handle 0x%x not implemented", coh->type); ++ } ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwQueryInformationFile,5) ++ (void *handle, struct io_status_block *iosb, void *info, ++ ULONG length, enum file_info_class class) ++{ ++ struct file_object *fo; ++ struct file_name_info *fni; ++ struct file_std_info *fsi; ++ struct wrap_bin_file *file; ++ struct common_object_header *coh; ++ ++ ENTER2("%p", handle); ++ coh = handle; ++ if (coh->type != OBJECT_TYPE_FILE) { ++ ERROR("handle %p is invalid: %d", coh, coh->type); ++ EXIT2(return STATUS_FAILURE); ++ } ++ fo = HANDLE_TO_OBJECT(handle); ++ TRACE2("fo: %p, %d", fo, class); ++ switch (class) { ++ case FileNameInformation: ++ fni = info; ++ fni->length = min(length, (typeof(length))coh->name.length); ++ memcpy(fni->name, coh->name.buf, fni->length); ++ iosb->status = STATUS_SUCCESS; ++ iosb->info = fni->length; ++ break; ++ case FileStandardInformation: ++ fsi = info; ++ file = fo->wrap_bin_file; ++ fsi->alloc_size = file->size; ++ fsi->eof = file->size; ++ fsi->num_links = 1; ++ fsi->delete_pending = FALSE; ++ fsi->dir = FALSE; ++ iosb->status = STATUS_SUCCESS; ++ iosb->info = 0; ++ break; ++ default: ++ WARNING("type %d not implemented yet", class); ++ iosb->status = STATUS_FAILURE; ++ iosb->info = 0; ++ break; ++ } ++ EXIT2(return iosb->status); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwOpenSection,3) ++ (void **handle, ACCESS_MASK access, struct object_attributes *obj_attrs) ++{ ++ INFO("%p, 0x%x, %d", obj_attrs, obj_attrs->attributes, access); ++ TODO(); ++ *handle = obj_attrs; ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwMapViewOfSection,10) ++ (void *secn_handle, void *process_handle, void **base_address, ++ ULONG zero_bits, SIZE_T commit_size, LARGE_INTEGER *secn_offset, ++ SIZE_T *view_size, enum section_inherit inherit, ULONG alloc_type, ++ ULONG protect) ++{ ++ INFO("%p, %p, %p", secn_handle, process_handle, base_address); ++ TODO(); ++ *base_address = (void *)0xdeadbeef; ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwUnmapViewOfSection,2) ++ (void *process_handle, void *base_address) ++{ ++ INFO("%p, %p", process_handle, base_address); ++ TODO(); ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwCreateKey,7) ++ (void **handle, ACCESS_MASK desired_access, ++ struct object_attributes *attr, ULONG title_index, ++ struct unicode_string *class, ULONG create_options, ++ ULONG *disposition) ++{ ++ struct ansi_string ansi; ++ if (RtlUnicodeStringToAnsiString(&ansi, attr->name, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE1("key: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ *handle = NULL; ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwOpenKey,3) ++ (void **handle, ACCESS_MASK desired_access, ++ struct object_attributes *attr) ++{ ++ struct ansi_string ansi; ++ if (RtlUnicodeStringToAnsiString(&ansi, attr->name, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE1("key: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ *handle = NULL; ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwSetValueKey,6) ++ (void *handle, struct unicode_string *name, ULONG title_index, ++ ULONG type, void *data, ULONG data_size) ++{ ++ struct ansi_string ansi; ++ if (RtlUnicodeStringToAnsiString(&ansi, name, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE1("key: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwQueryValueKey,6) ++ (void *handle, struct unicode_string *name, ++ enum key_value_information_class class, void *info, ++ ULONG length, ULONG *res_length) ++{ ++ struct ansi_string ansi; ++ if (RtlUnicodeStringToAnsiString(&ansi, name, TRUE) == STATUS_SUCCESS) { ++ TRACE1("key: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ TODO(); ++ return STATUS_INVALID_PARAMETER; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwDeleteKey,1) ++ (void *handle) ++{ ++ ENTER2("%p", handle); ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(ZwPowerInformation,5) ++ (INT info_level, void *in_buf, ULONG in_buf_len, void *out_buf, ++ ULONG out_buf_len) ++{ ++ INFO("%d, %u, %u", info_level, in_buf_len, out_buf_len); ++ TODO(); ++ return STATUS_ACCESS_DENIED; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(WmiSystemControl,4) ++ (struct wmilib_context *info, struct device_object *dev_obj, ++ struct irp *irp, void *irp_disposition) ++{ ++ TODO(); ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(WmiCompleteRequest,5) ++ (struct device_object *dev_obj, struct irp *irp, NTSTATUS status, ++ ULONG buffer_used, CCHAR priority_boost) ++{ ++ TODO(); ++ return STATUS_SUCCESS; ++} ++ ++noregparm NTSTATUS WIN_FUNC(WmiTraceMessage,12) ++ (void *tracehandle, ULONG message_flags, ++ void *message_guid, USHORT message_no, ...) ++{ ++ TODO(); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(WmiQueryTraceInformation,4) ++ (enum trace_information_class trace_info_class, void *trace_info, ++ ULONG *req_length, void *buf) ++{ ++ TODO(); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++/* this function can't be wstdcall as it takes variable number of args */ ++__attribute__((format(printf, 1, 2))) ++noregparm ULONG WIN_FUNC(DbgPrint,12) ++ (char *format, ...) ++{ ++#if DEBUG >= 1 ++ va_list args; ++ static char buf[100]; ++ ++ va_start(args, format); ++ vsnprintf(buf, sizeof(buf), format, args); ++ printk(KERN_DEBUG "%s (%s): %s", DRIVER_NAME, __func__, buf); ++ va_end(args); ++#endif ++ return STATUS_SUCCESS; ++} ++ ++__attribute__((format(printf, 3, 4))) ++noregparm ULONG WIN_FUNC(DbgPrintEx,12) ++ (ULONG component_id, ULONG severity, char *format, ...) ++{ ++#if DEBUG >= 1 ++ va_list args; ++ static char buf[100]; ++ ++ va_start(args, format); ++ vsnprintf(buf, sizeof(buf), format, args); ++ TRACE1("component_id: %d, severity: %d\n", component_id, severity); ++ printk(KERN_DEBUG "%s (%s): %s", DRIVER_NAME, __func__, buf); ++ va_end(args); ++#endif ++ return STATUS_SUCCESS; ++} ++ ++wstdcall void WIN_FUNC(KeBugCheck,1) ++ (ULONG code) ++{ ++ ERROR("Unrecoverable error reported by the driver"); ++ ERROR("code: 0x%x\n", code); ++ dump_stack(); ++ return; ++} ++ ++wstdcall void WIN_FUNC(KeBugCheckEx,5) ++ (ULONG code, ULONG_PTR param1, ULONG_PTR param2, ++ ULONG_PTR param3, ULONG_PTR param4) ++{ ++ ERROR("Unrecoverable error reported by the driver"); ++ ERROR("code: 0x%x, params: 0x%lx 0x%lx 0x%lx 0x%lx\n", code, param1, ++ param2, param3, param4); ++ dump_stack(); ++ return; ++} ++ ++wstdcall void WIN_FUNC(ExSystemTimeToLocalTime,2) ++ (LARGE_INTEGER *system_time, LARGE_INTEGER *local_time) ++{ ++ *local_time = *system_time; ++} ++ ++wstdcall ULONG WIN_FUNC(ExSetTimerResolution,2) ++ (ULONG time, BOOLEAN set) ++{ ++ /* why a driver should change system wide timer resolution is ++ * beyond me */ ++ return time; ++} ++ ++wstdcall void WIN_FUNC(DbgBreakPoint,0) ++ (void) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(_except_handler3,0) ++ (void) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(__C_specific_handler,0) ++ (void) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(_purecall,0) ++ (void) ++{ ++ TODO(); ++} ++ ++struct worker_init_struct { ++ struct work_struct work; ++ struct completion completion; ++ struct nt_thread *nt_thread; ++}; ++ ++int ntoskernel_init(void) ++{ ++ struct timeval now; ++ ++ spin_lock_init(&dispatcher_lock); ++ spin_lock_init(&ntoskernel_lock); ++ spin_lock_init(&ntos_work_lock); ++ spin_lock_init(&kdpc_list_lock); ++ spin_lock_init(&irp_cancel_lock); ++ InitializeListHead(&wrap_mdl_list); ++ InitializeListHead(&kdpc_list); ++ InitializeListHead(&callback_objects); ++ InitializeListHead(&bus_driver_list); ++ InitializeListHead(&object_list); ++ InitializeListHead(&ntos_work_list); ++ ++ nt_spin_lock_init(&nt_list_lock); ++ ++ INIT_WORK(&kdpc_work, kdpc_worker); ++ INIT_WORK(&ntos_work, ntos_work_worker); ++ wrap_timer_slist.next = NULL; ++ ++ do_gettimeofday(&now); ++ wrap_ticks_to_boot = TICKS_1601_TO_1970; ++ wrap_ticks_to_boot += (u64)now.tv_sec * TICKSPERSEC; ++ wrap_ticks_to_boot += now.tv_usec * 10; ++ wrap_ticks_to_boot -= jiffies * TICKSPERJIFFY; ++ TRACE2("%llu", wrap_ticks_to_boot); ++ ++ cpu_count = num_online_cpus(); ++ ++#ifdef WRAP_PREEMPT ++ do { ++ int cpu; ++ for_each_possible_cpu(cpu) { ++ struct irql_info *info; ++ info = &per_cpu(irql_info, cpu); ++ mutex_init(&(info->lock)); ++ info->task = NULL; ++ info->count = 0; ++#ifdef CONFIG_SMP ++ cpumask_setall(&info->cpus_allowed); ++#endif ++ } ++ } while (0); ++#endif ++ ++ ntos_wq = create_singlethread_workqueue("ntos_wq"); ++ if (!ntos_wq) { ++ WARNING("couldn't create ntos_wq thread"); ++ return -ENOMEM; ++ } ++ TRACE1("ntos_wq: %p", ntos_wq); ++ ++ if (add_bus_driver("PCI") ++#ifdef ENABLE_USB ++ || add_bus_driver("USB") ++#endif ++ ) { ++ ntoskernel_exit(); ++ return -ENOMEM; ++ } ++ mdl_cache = ++ wrap_kmem_cache_create(DRIVER_NAME "_mdl", ++ sizeof(struct wrap_mdl) + MDL_CACHE_SIZE, ++ 0, 0); ++ TRACE2("%p", mdl_cache); ++ if (!mdl_cache) { ++ ERROR("couldn't allocate MDL cache"); ++ ntoskernel_exit(); ++ return -ENOMEM; ++ } ++ ++#if defined(CONFIG_X86_64) ++ memset(&kuser_shared_data, 0, sizeof(kuser_shared_data)); ++ *((ULONG64 *)&kuser_shared_data.system_time) = ticks_1601(); ++ init_timer(&shared_data_timer); ++ shared_data_timer.function = update_user_shared_data_proc; ++ shared_data_timer.data = 0; ++#endif ++ return 0; ++} ++ ++int ntoskernel_init_device(struct wrap_device *wd) ++{ ++#if defined(CONFIG_X86_64) ++ if (kuser_shared_data.reserved1) ++ mod_timer(&shared_data_timer, jiffies + MSEC_TO_HZ(30)); ++#endif ++ return 0; ++} ++ ++void ntoskernel_exit_device(struct wrap_device *wd) ++{ ++ ENTER2(""); ++ ++ KeFlushQueuedDpcs(); ++ EXIT2(return); ++} ++ ++void ntoskernel_exit(void) ++{ ++ struct nt_list *cur; ++ ++ ENTER2(""); ++ ++ /* free kernel (Ke) timers */ ++ TRACE2("freeing timers"); ++ while (1) { ++ struct wrap_timer *wrap_timer; ++ struct nt_slist *slist; ++ ++ spin_lock_bh(&ntoskernel_lock); ++ if ((slist = wrap_timer_slist.next)) ++ wrap_timer_slist.next = slist->next; ++ spin_unlock_bh(&ntoskernel_lock); ++ TIMERTRACE("%p", slist); ++ if (!slist) ++ break; ++ wrap_timer = container_of(slist, struct wrap_timer, slist); ++ if (del_timer_sync(&wrap_timer->timer)) ++ WARNING("Buggy Windows driver left timer %p running", ++ wrap_timer->nt_timer); ++ memset(wrap_timer, 0, sizeof(*wrap_timer)); ++ slack_kfree(wrap_timer); ++ } ++ ++ TRACE2("freeing MDLs"); ++ if (mdl_cache) { ++ spin_lock_bh(&ntoskernel_lock); ++ if (!IsListEmpty(&wrap_mdl_list)) ++ ERROR("Windows driver didn't free all MDLs; " ++ "freeing them now"); ++ while ((cur = RemoveHeadList(&wrap_mdl_list))) { ++ struct wrap_mdl *wrap_mdl; ++ wrap_mdl = container_of(cur, struct wrap_mdl, list); ++ if (wrap_mdl->mdl->flags & MDL_CACHE_ALLOCATED) ++ kmem_cache_free(mdl_cache, wrap_mdl); ++ else ++ kfree(wrap_mdl); ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ kmem_cache_destroy(mdl_cache); ++ mdl_cache = NULL; ++ } ++ ++ TRACE2("freeing callbacks"); ++ spin_lock_bh(&ntoskernel_lock); ++ while ((cur = RemoveHeadList(&callback_objects))) { ++ struct callback_object *object; ++ struct nt_list *ent; ++ object = container_of(cur, struct callback_object, list); ++ while ((ent = RemoveHeadList(&object->callback_funcs))) { ++ struct callback_func *f; ++ f = container_of(ent, struct callback_func, list); ++ kfree(f); ++ } ++ kfree(object); ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ ++ spin_lock_bh(&ntoskernel_lock); ++ while ((cur = RemoveHeadList(&bus_driver_list))) { ++ struct bus_driver *bus_driver; ++ bus_driver = container_of(cur, struct bus_driver, list); ++ /* TODO: make sure all all drivers are shutdown/removed */ ++ kfree(bus_driver); ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ ++#if defined(CONFIG_X86_64) ++ del_timer_sync(&shared_data_timer); ++#endif ++ if (ntos_wq) ++ destroy_workqueue(ntos_wq); ++ ENTER2("freeing objects"); ++ spin_lock_bh(&ntoskernel_lock); ++ while ((cur = RemoveHeadList(&object_list))) { ++ struct common_object_header *hdr; ++ hdr = container_of(cur, struct common_object_header, list); ++ if (hdr->type == OBJECT_TYPE_NT_THREAD) ++ TRACE1("object %p(%d) was not freed, freeing it now", ++ HEADER_TO_OBJECT(hdr), hdr->type); ++ else ++ WARNING("object %p(%d) was not freed, freeing it now", ++ HEADER_TO_OBJECT(hdr), hdr->type); ++ ExFreePool(hdr); ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ ++ EXIT2(return); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.h +--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,1083 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _NTOSKERNEL_H_ ++#define _NTOSKERNEL_H_ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#if !defined(CONFIG_X86) && !defined(CONFIG_X86_64) ++#error "this module is for x86 or x86_64 architectures only" ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) ++#define gfp_t unsigned int __nocast ++ ++static inline void *_kzalloc(size_t size, gfp_t flags) ++{ ++ void *p = kmalloc(size, flags); ++ if (likely(p != NULL)) ++ memset(p, 0, size); ++ return p; ++} ++ ++#define kzalloc(size, flags) _kzalloc(size, flags) ++#endif ++ ++/* Interrupt backwards compatibility stuff */ ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) ++#ifndef IRQ_HANDLED ++#define IRQ_HANDLED ++#define IRQ_NONE ++#define irqreturn_t void ++#endif ++#endif /* Linux < 2.6.29 */ ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) ++#ifndef mutex_init ++#define mutex semaphore ++#define mutex_init(m) sema_init(m, 1) ++#define mutex_lock(m) down(m) ++#define mutex_trylock(m) (!down_trylock(m)) ++#define mutex_unlock(m) up(m) ++#define mutex_is_locked(m) (atomic_read(m.count) == 0) ++#endif ++#endif /* Linux < 2.6.16 */ ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) ++#define set_cpus_allowed_ptr(task, mask) set_cpus_allowed(task, *mask) ++#endif /* Linux < 2.6.26 */ ++ ++#ifdef CONFIG_SMP ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) ++#define cpumask_copy(dst, src) do { *dst = *src; } while (0) ++#define cpumask_equal(mask1, mask2) cpus_equal(*mask1, *mask2) ++#define cpumask_setall(mask) cpus_setall(*mask) ++static cpumask_t cpumasks[NR_CPUS]; ++#define cpumask_of(cpu) \ ++({ \ ++ cpumasks[cpu] = cpumask_of_cpu(cpu); \ ++ &cpumasks[cpu]; \ ++}) ++#endif /* Linux < 2.6.28 */ ++#endif /* CONFIG_SMP */ ++ ++#ifndef tsk_cpus_allowed ++#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) ++#endif ++ ++#ifndef __packed ++#define __packed __attribute__((packed)) ++#endif ++ ++/* pci functions in 2.6 kernels have problems allocating dma buffers, ++ * but seem to work fine with dma functions ++ */ ++#include ++ ++#define PCI_DMA_ALLOC_COHERENT(pci_dev,size,dma_handle) \ ++ dma_alloc_coherent(&pci_dev->dev,size,dma_handle, \ ++ GFP_KERNEL | __GFP_REPEAT) ++#define PCI_DMA_FREE_COHERENT(pci_dev,size,cpu_addr,dma_handle) \ ++ dma_free_coherent(&pci_dev->dev,size,cpu_addr,dma_handle) ++#define PCI_DMA_MAP_SINGLE(pci_dev,addr,size,direction) \ ++ dma_map_single(&pci_dev->dev,addr,size,direction) ++#define PCI_DMA_UNMAP_SINGLE(pci_dev,dma_handle,size,direction) \ ++ dma_unmap_single(&pci_dev->dev,dma_handle,size,direction) ++#define MAP_SG(pci_dev, sglist, nents, direction) \ ++ dma_map_sg(&pci_dev->dev, sglist, nents, direction) ++#define UNMAP_SG(pci_dev, sglist, nents, direction) \ ++ dma_unmap_sg(&pci_dev->dev, sglist, nents, direction) ++#define PCI_DMA_MAP_ERROR(dma_addr) dma_mapping_error(dma_addr) ++ ++ ++#if defined(CONFIG_NET_RADIO) && !defined(CONFIG_WIRELESS_EXT) ++#define CONFIG_WIRELESS_EXT ++#endif ++ ++#define prepare_wait_condition(task, var, value) \ ++do { \ ++ var = value; \ ++ task = current; \ ++ barrier(); \ ++} while (0) ++ ++/* Wait in wait_state (e.g., TASK_INTERRUPTIBLE) for condition to ++ * become true; timeout is either jiffies (> 0) to wait or 0 to wait ++ * forever. ++ * When timeout == 0, return value is ++ * > 0 if condition becomes true, or ++ * < 0 if signal is pending on the thread. ++ * When timeout > 0, return value is ++ * > 0 if condition becomes true before timeout, ++ * < 0 if signal is pending on the thread before timeout, or ++ * 0 if timedout (condition may have become true at the same time) ++ */ ++ ++#define wait_condition(condition, timeout, wait_state) \ ++({ \ ++ long ret = timeout ? timeout : 1; \ ++ while (1) { \ ++ if (signal_pending(current)) { \ ++ ret = -ERESTARTSYS; \ ++ break; \ ++ } \ ++ set_current_state(wait_state); \ ++ if (condition) { \ ++ __set_current_state(TASK_RUNNING); \ ++ break; \ ++ } \ ++ if (timeout) { \ ++ ret = schedule_timeout(ret); \ ++ if (!ret) \ ++ break; \ ++ } else \ ++ schedule(); \ ++ } \ ++ ret; \ ++}) ++ ++#ifdef WRAP_WQ ++ ++struct wrap_workqueue_struct; ++ ++struct wrap_work_struct { ++ struct list_head list; ++ void (*func)(struct wrap_work_struct *data); ++ void *data; ++ /* whether/on which thread scheduled */ ++ struct workqueue_thread *thread; ++}; ++ ++#define work_struct wrap_work_struct ++#define workqueue_struct wrap_workqueue_struct ++ ++#undef INIT_WORK ++#define INIT_WORK(work, pfunc) \ ++ do { \ ++ (work)->func = (pfunc); \ ++ (work)->data = (work); \ ++ (work)->thread = NULL; \ ++ } while (0) ++ ++#undef create_singlethread_workqueue ++#define create_singlethread_workqueue(wq) wrap_create_wq(wq, 1, 0) ++#undef create_workqueue ++#define create_workqueue(wq) wrap_create_wq(wq, 0, 0) ++#undef destroy_workqueue ++#define destroy_workqueue(wq) wrap_destroy_wq(wq) ++#undef queue_work ++#define queue_work(wq, work) wrap_queue_work(wq, work) ++#undef flush_workqueue ++#define flush_workqueue(wq) wrap_flush_wq(wq) ++ ++struct workqueue_struct *wrap_create_wq(const char *name, u8 singlethread, ++ u8 freeze); ++void wrap_destroy_wq(struct workqueue_struct *workq); ++int wrap_queue_work(struct workqueue_struct *workq, struct work_struct *work); ++void wrap_cancel_work(struct work_struct *work); ++void wrap_flush_wq(struct workqueue_struct *workq); ++ ++#else // WRAP_WQ ++ ++/* Compatibility for Linux before 2.6.20 where INIT_WORK takes 3 arguments */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) && \ ++ !defined(INIT_WORK_NAR) && \ ++ !defined(INIT_DELAYED_WORK_DEFERRABLE) ++typedef void (*compat_work_func_t)(void *work); ++typedef void (*work_func_t)(struct work_struct *work); ++static inline void (INIT_WORK)(struct work_struct *work, work_func_t func) ++{ ++ INIT_WORK(work, (compat_work_func_t)func, work); ++} ++#undef INIT_WORK ++#endif ++ ++#endif // WRAP_WQ ++ ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18) ++#define ISR_PT_REGS_PARAM_DECL ++#else ++#define ISR_PT_REGS_PARAM_DECL , struct pt_regs *regs ++#endif ++ ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16) ++#define for_each_possible_cpu(_cpu) for_each_cpu(_cpu) ++#endif ++ ++#ifndef CHECKSUM_PARTIAL ++#define CHECKSUM_PARTIAL CHECKSUM_HW ++#endif ++ ++#ifndef IRQF_SHARED ++#define IRQF_SHARED SA_SHIRQ ++#endif ++ ++#ifndef UMH_WAIT_PROC ++#define UMH_WAIT_PROC 1 ++#endif ++ ++#define memcpy_skb(skb, from, length) \ ++ memcpy(skb_put(skb, length), from, length) ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) ++#ifndef DMA_BIT_MASK ++#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ++#endif ++#endif ++ ++#ifndef __GFP_DMA32 ++#define __GFP_DMA32 GFP_DMA ++#endif ++ ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22) ++#define wrap_kmem_cache_create(name, size, align, flags) \ ++ kmem_cache_create(name, size, align, flags, NULL, NULL) ++#else ++#define wrap_kmem_cache_create(name, size, align, flags) \ ++ kmem_cache_create(name, size, align, flags, NULL) ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) ++#define netdev_mc_count(dev) ((dev)->mc_count) ++#define usb_alloc_coherent(dev, size, mem_flags, dma) (usb_buffer_alloc((dev), (size), (mem_flags), (dma))) ++#define usb_free_coherent(dev, size, addr, dma) (usb_buffer_free((dev), (size), (addr), (dma))) ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) ++#define daemonize(name, ...) do {} while (0) ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0) ++#define add_taint(flag, lockdep_ok) add_taint(flag) ++#endif ++ ++#include "winnt_types.h" ++#include "ndiswrapper.h" ++#include "pe_linker.h" ++#include "wrapmem.h" ++#include "lin2win.h" ++#include "loader.h" ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) ++static inline void netif_tx_lock(struct net_device *dev) ++{ ++ spin_lock(&dev->xmit_lock); ++} ++static inline void netif_tx_unlock(struct net_device *dev) ++{ ++ spin_unlock(&dev->xmit_lock); ++} ++static inline void netif_tx_lock_bh(struct net_device *dev) ++{ ++ spin_lock_bh(&dev->xmit_lock); ++} ++static inline void netif_tx_unlock_bh(struct net_device *dev) ++{ ++ spin_unlock_bh(&dev->xmit_lock); ++} ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++static inline void netif_poll_enable(struct net_device *dev) ++{ ++} ++static inline void netif_poll_disable(struct net_device *dev) ++{ ++} ++#endif ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) ++#define proc_net_root init_net.proc_net ++#else ++#define proc_net_root proc_net ++#endif ++ ++#if ((LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))) || \ ++ (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,42)) ++#ifndef skb_frag_page ++#define skb_frag_page(frag) ((frag)->page) ++#endif ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0) ++#define netdev_notifier_info_to_dev(x) ((struct net_device *)(x)) ++#endif ++ ++#ifdef INIT_COMPLETION ++static inline void reinit_completion(struct completion *x) ++{ ++ INIT_COMPLETION(*x); ++} ++#endif ++ ++/* TICK is 100ns */ ++#define TICKSPERSEC 10000000 ++#define TICKSPERMSEC 10000 ++#define SECSPERDAY 86400 ++#define TICKSPERJIFFY ((TICKSPERSEC + HZ - 1) / HZ) ++ ++#define int_div_round(x, y) (((x) + (y - 1)) / (y)) ++ ++/* 1601 to 1970 is 369 years plus 89 leap days */ ++#define SECS_1601_TO_1970 ((369 * 365 + 89) * (u64)SECSPERDAY) ++#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) ++ ++/* 100ns units to HZ; if sys_time is negative, relative to current ++ * clock, otherwise from year 1601 */ ++#define SYSTEM_TIME_TO_HZ(sys_time) \ ++ (((sys_time) <= 0) ? \ ++ int_div_round(((u64)HZ * (-(sys_time))), TICKSPERSEC) : \ ++ int_div_round(((s64)HZ * ((sys_time) - ticks_1601())), TICKSPERSEC)) ++ ++#define MSEC_TO_HZ(ms) int_div_round((ms * HZ), 1000) ++#define USEC_TO_HZ(us) int_div_round((us * HZ), 1000000) ++ ++extern u64 wrap_ticks_to_boot; ++ ++static inline u64 ticks_1601(void) ++{ ++ return wrap_ticks_to_boot + (u64)jiffies * TICKSPERJIFFY; ++} ++ ++typedef void (*generic_func)(void); ++ ++struct wrap_export { ++ const char *name; ++ generic_func func; ++}; ++ ++#ifdef CONFIG_X86_64 ++ ++#define WIN_SYMBOL(name, argc) \ ++ {#name, (generic_func) win2lin_ ## name ## _ ## argc} ++#define WIN_WIN_SYMBOL(name, argc) \ ++ {#name, (generic_func) win2lin__win_ ## name ## _ ## argc} ++#define WIN_FUNC_DECL(name, argc) \ ++ extern typeof(name) win2lin_ ## name ## _ ## argc; ++#define WIN_FUNC_PTR(name, argc) win2lin_ ## name ## _ ## argc ++ ++#else ++ ++#define WIN_SYMBOL(name, argc) {#name, (generic_func)name} ++#define WIN_WIN_SYMBOL(name, argc) {#name, (generic_func)_win_ ## name} ++#define WIN_FUNC_DECL(name, argc) ++#define WIN_FUNC_PTR(name, argc) name ++ ++#endif ++ ++#define WIN_FUNC(name, argc) (name) ++/* map name s to f - if f is different from s */ ++#define WIN_SYMBOL_MAP(s, f) ++ ++#define POOL_TAG(A, B, C, D) \ ++ ((ULONG)((A) + ((B) << 8) + ((C) << 16) + ((D) << 24))) ++ ++struct pe_image { ++ char name[MAX_DRIVER_NAME_LEN]; ++ UINT (*entry)(struct driver_object *, struct unicode_string *) wstdcall; ++ void *image; ++ int size; ++ int type; ++ ++ IMAGE_NT_HEADERS *nt_hdr; ++ IMAGE_OPTIONAL_HEADER *opt_hdr; ++}; ++ ++struct ndis_mp_block; ++ ++struct wrap_timer { ++ struct nt_slist slist; ++ struct timer_list timer; ++ struct nt_timer *nt_timer; ++ long repeat; ++#ifdef TIMER_DEBUG ++ unsigned long wrap_timer_magic; ++#endif ++}; ++ ++struct ntos_work_item { ++ struct nt_list list; ++ void *arg1; ++ void *arg2; ++ NTOS_WORK_FUNC func; ++}; ++ ++struct wrap_device_setting { ++ struct nt_list list; ++ char name[MAX_SETTING_NAME_LEN]; ++ char value[MAX_SETTING_VALUE_LEN]; ++ void *encoded; ++}; ++ ++struct wrap_bin_file { ++ char name[MAX_DRIVER_NAME_LEN]; ++ size_t size; ++ void *data; ++}; ++ ++#define WRAP_DRIVER_CLIENT_ID 1 ++ ++struct wrap_driver { ++ struct nt_list list; ++ struct driver_object *drv_obj; ++ char name[MAX_DRIVER_NAME_LEN]; ++ char version[MAX_SETTING_VALUE_LEN]; ++ unsigned short num_pe_images; ++ struct pe_image pe_images[MAX_DRIVER_PE_IMAGES]; ++ unsigned short num_bin_files; ++ struct wrap_bin_file *bin_files; ++ struct nt_list settings; ++ int dev_type; ++ struct ndis_driver *ndis_driver; ++}; ++ ++enum hw_status { ++ HW_INITIALIZED = 1, HW_SUSPENDED, HW_HALTED, HW_DISABLED, ++}; ++ ++struct wrap_device { ++ /* first part is (de)initialized once by loader */ ++ struct nt_list list; ++ int dev_bus; ++ int vendor; ++ int device; ++ int subvendor; ++ int subdevice; ++ char conf_file_name[MAX_DRIVER_NAME_LEN]; ++ char driver_name[MAX_DRIVER_NAME_LEN]; ++ struct wrap_driver *driver; ++ struct nt_list settings; ++ ++ /* rest should be (de)initialized when a device is ++ * (un)plugged */ ++ struct cm_resource_list *resource_list; ++ unsigned long hw_status; ++ struct device_object *pdo; ++ union { ++ struct { ++ struct pci_dev *pdev; ++ enum device_power_state wake_state; ++ } pci; ++ struct { ++ struct usb_device *udev; ++ struct usb_interface *intf; ++ int num_alloc_urbs; ++ struct nt_list wrap_urb_list; ++ } usb; ++ }; ++}; ++ ++#define wrap_is_pci_bus(dev_bus) \ ++ (WRAP_BUS(dev_bus) == WRAP_PCI_BUS || \ ++ WRAP_BUS(dev_bus) == WRAP_PCMCIA_BUS) ++#ifdef ENABLE_USB ++/* earlier versions of ndiswrapper used 0 as USB_BUS */ ++#define wrap_is_usb_bus(dev_bus) \ ++ (WRAP_BUS(dev_bus) == WRAP_USB_BUS || \ ++ WRAP_BUS(dev_bus) == WRAP_INTERNAL_BUS) ++#else ++#define wrap_is_usb_bus(dev_bus) 0 ++#endif ++#define wrap_is_bluetooth_device(dev_bus) \ ++ (WRAP_DEVICE(dev_bus) == WRAP_BLUETOOTH_DEVICE1 || \ ++ WRAP_DEVICE(dev_bus) == WRAP_BLUETOOTH_DEVICE2) ++ ++extern struct workqueue_struct *ntos_wq; ++extern struct workqueue_struct *ndis_wq; ++extern struct workqueue_struct *wrapndis_wq; ++ ++#define atomic_unary_op(var, size, oper) \ ++do { \ ++ if (size == 1) \ ++ __asm__ __volatile__( \ ++ LOCK_PREFIX oper "b %b0\n\t" : "+m" (var)); \ ++ else if (size == 2) \ ++ __asm__ __volatile__( \ ++ LOCK_PREFIX oper "w %w0\n\t" : "+m" (var)); \ ++ else if (size == 4) \ ++ __asm__ __volatile__( \ ++ LOCK_PREFIX oper "l %0\n\t" : "+m" (var)); \ ++ else if (size == 8) \ ++ __asm__ __volatile__( \ ++ LOCK_PREFIX oper "q %q0\n\t" : "+m" (var)); \ ++ else { \ ++ extern void _invalid_op_size_(void); \ ++ _invalid_op_size_(); \ ++ } \ ++} while (0) ++ ++#define atomic_inc_var_size(var, size) atomic_unary_op(var, size, "inc") ++ ++#define atomic_inc_var(var) atomic_inc_var_size(var, sizeof(var)) ++ ++#define atomic_dec_var_size(var, size) atomic_unary_op(var, size, "dec") ++ ++#define atomic_dec_var(var) atomic_dec_var_size(var, sizeof(var)) ++ ++#define pre_atomic_add(var, i) \ ++({ \ ++ typeof(var) pre; \ ++ __asm__ __volatile__( \ ++ LOCK_PREFIX "xadd %0, %1\n\t" \ ++ : "=r"(pre), "+m"(var) \ ++ : "0"(i)); \ ++ pre; \ ++}) ++ ++#define post_atomic_add(var, i) (pre_atomic_add(var, i) + i) ++ ++//#define DEBUG_IRQL 1 ++ ++#ifdef DEBUG_IRQL ++#define assert_irql(cond) \ ++do { \ ++ KIRQL _irql_ = current_irql(); \ ++ if (!(cond)) { \ ++ WARNING("assertion '%s' failed: %d", #cond, _irql_); \ ++ DBG_BLOCK(4) { \ ++ dump_stack(); \ ++ } \ ++ } \ ++} while (0) ++#else ++#define assert_irql(cond) do { } while (0) ++#endif ++ ++/* When preempt is enabled, we should preempt_disable to raise IRQL to ++ * DISPATCH_LEVEL, to be consistent with the semantics. However, using ++ * a mutex instead, so that only ndiswrapper threads run one at a time ++ * on a processor when at DISPATCH_LEVEL seems to be enough. So that ++ * is what we will use until we learn otherwise. If ++ * preempt_(en|dis)able is required for some reason, comment out ++ * following #define. */ ++ ++#define WRAP_PREEMPT 1 ++ ++#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PREEMPT_RT) ++#ifndef WRAP_PREEMPT ++#define WRAP_PREEMPT 1 ++#endif ++#endif ++ ++//#undef WRAP_PREEMPT ++ ++#ifdef WRAP_PREEMPT ++ ++struct irql_info { ++ int count; ++ struct mutex lock; ++#ifdef CONFIG_SMP ++ cpumask_t cpus_allowed; ++#endif ++ struct task_struct *task; ++}; ++ ++DECLARE_PER_CPU(struct irql_info, irql_info); ++ ++static inline KIRQL raise_irql(KIRQL newirql) ++{ ++ struct irql_info *info; ++ ++ assert(newirql == DISPATCH_LEVEL); ++ info = &get_cpu_var(irql_info); ++ if (info->task == current) { ++ assert(info->count > 0); ++ assert(mutex_is_locked(&info->lock)); ++#if defined(CONFIG_SMP) && DEBUG >= 1 ++ assert(cpumask_equal(tsk_cpus_allowed(current), ++ cpumask_of(smp_processor_id()))); ++#endif ++ info->count++; ++ put_cpu_var(irql_info); ++ return DISPATCH_LEVEL; ++ } ++ /* TODO: is this enough to pin down to current cpu? */ ++#ifdef CONFIG_SMP ++ assert(task_cpu(current) == smp_processor_id()); ++ cpumask_copy(&info->cpus_allowed, tsk_cpus_allowed(current)); ++ set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id())); ++#endif ++ put_cpu_var(irql_info); ++ mutex_lock(&info->lock); ++ assert(info->count == 0); ++ assert(info->task == NULL); ++ info->count = 1; ++ info->task = current; ++ return PASSIVE_LEVEL; ++} ++ ++static inline void lower_irql(KIRQL oldirql) ++{ ++ struct irql_info *info; ++ ++ assert(oldirql <= DISPATCH_LEVEL); ++ info = &get_cpu_var(irql_info); ++ assert(info->task == current); ++ assert(mutex_is_locked(&info->lock)); ++ assert(info->count > 0); ++ if (--info->count == 0) { ++ info->task = NULL; ++#ifdef CONFIG_SMP ++ set_cpus_allowed_ptr(current, &info->cpus_allowed); ++#endif ++ mutex_unlock(&info->lock); ++ } ++ put_cpu_var(irql_info); ++} ++ ++static inline KIRQL current_irql(void) ++{ ++ int count; ++ if (in_irq() || irqs_disabled()) ++ EXIT4(return DIRQL); ++ if (in_atomic() || in_interrupt()) ++ EXIT4(return SOFT_IRQL); ++ count = get_cpu_var(irql_info).count; ++ put_cpu_var(irql_info); ++ if (count) ++ EXIT6(return DISPATCH_LEVEL); ++ else ++ EXIT6(return PASSIVE_LEVEL); ++} ++ ++#else ++ ++static inline KIRQL current_irql(void) ++{ ++ if (in_irq() || irqs_disabled()) ++ EXIT4(return DIRQL); ++ if (in_interrupt()) ++ EXIT4(return SOFT_IRQL); ++ if (in_atomic()) ++ EXIT6(return DISPATCH_LEVEL); ++ else ++ EXIT6(return PASSIVE_LEVEL); ++} ++ ++static inline KIRQL raise_irql(KIRQL newirql) ++{ ++ KIRQL ret = in_atomic() ? DISPATCH_LEVEL : PASSIVE_LEVEL; ++ assert(newirql == DISPATCH_LEVEL); ++ assert(current_irql() <= DISPATCH_LEVEL); ++ preempt_disable(); ++ return ret; ++} ++ ++static inline void lower_irql(KIRQL oldirql) ++{ ++ assert(current_irql() == DISPATCH_LEVEL); ++ preempt_enable(); ++} ++ ++#endif ++ ++#define irql_gfp() (in_atomic() ? GFP_ATOMIC : GFP_KERNEL) ++ ++/* Windows spinlocks are of type ULONG_PTR which is not big enough to ++ * store Linux spinlocks; so we implement Windows spinlocks using ++ * ULONG_PTR space with our own functions/macros */ ++ ++/* Windows seems to use 0 for unlocked state of spinlock - if Linux ++ * convention of 1 for unlocked state is used, at least prism54 driver ++ * crashes */ ++ ++#define NT_SPIN_LOCK_UNLOCKED 0 ++#define NT_SPIN_LOCK_LOCKED 1 ++ ++static inline void nt_spin_lock_init(NT_SPIN_LOCK *lock) ++{ ++ *lock = NT_SPIN_LOCK_UNLOCKED; ++} ++ ++#ifdef CONFIG_SMP ++ ++static inline void nt_spin_lock(NT_SPIN_LOCK *lock) ++{ ++ while (1) { ++ unsigned long lockval = xchg(lock, NT_SPIN_LOCK_LOCKED); ++ ++ if (likely(lockval == NT_SPIN_LOCK_UNLOCKED)) ++ break; ++ if (unlikely(lockval > NT_SPIN_LOCK_LOCKED)) { ++ ERROR("bad spinlock: 0x%lx at %p", lockval, lock); ++ return; ++ } ++ /* "rep; nop" doesn't change cx register, it's a "pause" */ ++ __asm__ __volatile__("rep; nop"); ++ } ++} ++ ++static inline void nt_spin_unlock(NT_SPIN_LOCK *lock) ++{ ++ unsigned long lockval = xchg(lock, NT_SPIN_LOCK_UNLOCKED); ++ ++ if (likely(lockval == NT_SPIN_LOCK_LOCKED)) ++ return; ++ WARNING("unlocking unlocked spinlock: 0x%lx at %p", lockval, lock); ++} ++ ++#else // CONFIG_SMP ++ ++#define nt_spin_lock(lock) do { } while (0) ++ ++#define nt_spin_unlock(lock) do { } while (0) ++ ++#endif // CONFIG_SMP ++ ++/* When kernel would've disabled preempt (e.g., in interrupt ++ * handlers), we need to fake preempt so driver thinks it is running ++ * at right IRQL */ ++ ++/* raise IRQL to given (higher) IRQL if necessary before locking */ ++static inline KIRQL nt_spin_lock_irql(NT_SPIN_LOCK *lock, KIRQL newirql) ++{ ++ KIRQL oldirql = raise_irql(newirql); ++ nt_spin_lock(lock); ++ return oldirql; ++} ++ ++/* lower IRQL to given (lower) IRQL if necessary after unlocking */ ++static inline void nt_spin_unlock_irql(NT_SPIN_LOCK *lock, KIRQL oldirql) ++{ ++ nt_spin_unlock(lock); ++ lower_irql(oldirql); ++} ++ ++#define nt_spin_lock_irqsave(lock, flags) \ ++do { \ ++ local_irq_save(flags); \ ++ preempt_disable(); \ ++ nt_spin_lock(lock); \ ++} while (0) ++ ++#define nt_spin_unlock_irqrestore(lock, flags) \ ++do { \ ++ nt_spin_unlock(lock); \ ++ preempt_enable_no_resched(); \ ++ local_irq_restore(flags); \ ++ preempt_check_resched(); \ ++} while (0) ++ ++static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length) ++{ ++ return PAGE_ALIGN(((unsigned long)ptr & (PAGE_SIZE - 1)) + length) ++ >> PAGE_SHIFT; ++} ++ ++#ifdef CONFIG_X86_64 ++ ++/* TODO: can these be implemented without using spinlock? */ ++ ++static inline struct nt_slist *PushEntrySList(nt_slist_header *head, ++ struct nt_slist *entry, ++ NT_SPIN_LOCK *lock) ++{ ++ KIRQL irql = nt_spin_lock_irql(lock, DISPATCH_LEVEL); ++ entry->next = head->next; ++ head->next = entry; ++ head->depth++; ++ nt_spin_unlock_irql(lock, irql); ++ TRACE4("%p, %p, %p", head, entry, entry->next); ++ return entry->next; ++} ++ ++static inline struct nt_slist *PopEntrySList(nt_slist_header *head, ++ NT_SPIN_LOCK *lock) ++{ ++ struct nt_slist *entry; ++ KIRQL irql = nt_spin_lock_irql(lock, DISPATCH_LEVEL); ++ entry = head->next; ++ if (entry) { ++ head->next = entry->next; ++ head->depth--; ++ } ++ nt_spin_unlock_irql(lock, irql); ++ TRACE4("%p, %p", head, entry); ++ return entry; ++} ++ ++#else ++ ++#define u64_low_32(x) ((u32)x) ++#define u64_high_32(x) ((u32)(x >> 32)) ++ ++static inline u64 nt_cmpxchg8b(volatile u64 *ptr, u64 old, u64 new) ++{ ++ u64 prev; ++ ++ __asm__ __volatile__( ++ "\n" ++ LOCK_PREFIX "cmpxchg8b %0\n" ++ : "+m" (*ptr), "=A" (prev) ++ : "A" (old), "b" (u64_low_32(new)), "c" (u64_high_32(new))); ++ return prev; ++} ++ ++/* slist routines below update slist atomically - no need for ++ * spinlocks */ ++ ++static inline struct nt_slist *PushEntrySList(nt_slist_header *head, ++ struct nt_slist *entry, ++ NT_SPIN_LOCK *lock) ++{ ++ nt_slist_header old, new; ++ do { ++ old.align = head->align; ++ entry->next = old.next; ++ new.next = entry; ++ new.depth = old.depth + 1; ++ } while (nt_cmpxchg8b(&head->align, old.align, new.align) != old.align); ++ TRACE4("%p, %p, %p", head, entry, old.next); ++ return old.next; ++} ++ ++static inline struct nt_slist *PopEntrySList(nt_slist_header *head, ++ NT_SPIN_LOCK *lock) ++{ ++ struct nt_slist *entry; ++ nt_slist_header old, new; ++ do { ++ old.align = head->align; ++ entry = old.next; ++ if (!entry) ++ break; ++ new.next = entry->next; ++ new.depth = old.depth - 1; ++ } while (nt_cmpxchg8b(&head->align, old.align, new.align) != old.align); ++ TRACE4("%p, %p", head, entry); ++ return entry; ++} ++ ++#endif ++ ++#define sleep_hz(n) \ ++do { \ ++ set_current_state(TASK_INTERRUPTIBLE); \ ++ schedule_timeout(n); \ ++} while (0) ++ ++int ntoskernel_init(void); ++void ntoskernel_exit(void); ++int ntoskernel_init_device(struct wrap_device *wd); ++void ntoskernel_exit_device(struct wrap_device *wd); ++void *allocate_object(ULONG size, enum common_object_type type, ++ struct unicode_string *name); ++ ++#ifdef ENABLE_USB ++int usb_init(void); ++void usb_exit(void); ++#else ++static inline int usb_init(void) { return 0; } ++static inline void usb_exit(void) {} ++#endif ++int usb_init_device(struct wrap_device *wd); ++void usb_exit_device(struct wrap_device *wd); ++ ++int wrap_procfs_init(void); ++void wrap_procfs_remove(void); ++ ++int link_pe_images(struct pe_image *pe_image, unsigned short n); ++ ++int stricmp(const char *s1, const char *s2); ++void dump_bytes(const char *name, const u8 *from, int len); ++struct mdl *allocate_init_mdl(void *virt, ULONG length); ++void free_mdl(struct mdl *mdl); ++struct driver_object *find_bus_driver(const char *name); ++void free_custom_extensions(struct driver_extension *drv_obj_ext); ++struct nt_thread *get_current_nt_thread(void); ++u64 ticks_1601(void); ++int schedule_ntos_work_item(NTOS_WORK_FUNC func, void *arg1, void *arg2); ++void wrap_init_timer(struct nt_timer *nt_timer, enum timer_type type, ++ struct ndis_mp_block *nmb); ++BOOLEAN wrap_set_timer(struct nt_timer *nt_timer, unsigned long expires_hz, ++ unsigned long repeat_hz, struct kdpc *kdpc); ++ ++LONG InterlockedDecrement(LONG volatile *val) wfastcall; ++LONG InterlockedIncrement(LONG volatile *val) wfastcall; ++struct nt_list *ExInterlockedInsertHeadList ++ (struct nt_list *head, struct nt_list *entry, ++ NT_SPIN_LOCK *lock) wfastcall; ++struct nt_list *ExInterlockedInsertTailList ++ (struct nt_list *head, struct nt_list *entry, ++ NT_SPIN_LOCK *lock) wfastcall; ++struct nt_list *ExInterlockedRemoveHeadList ++ (struct nt_list *head, NT_SPIN_LOCK *lock) wfastcall; ++NTSTATUS IofCallDriver(struct device_object *dev_obj, struct irp *irp) wfastcall; ++KIRQL KfRaiseIrql(KIRQL newirql) wfastcall; ++void KfLowerIrql(KIRQL oldirql) wfastcall; ++KIRQL KfAcquireSpinLock(NT_SPIN_LOCK *lock) wfastcall; ++void KfReleaseSpinLock(NT_SPIN_LOCK *lock, KIRQL oldirql) wfastcall; ++void IofCompleteRequest(struct irp *irp, CHAR prio_boost) wfastcall; ++void KefReleaseSpinLockFromDpcLevel(NT_SPIN_LOCK *lock) wfastcall; ++ ++LONG ObfReferenceObject(void *object) wfastcall; ++void ObfDereferenceObject(void *object) wfastcall; ++ ++#define ObReferenceObject(object) ObfReferenceObject(object) ++#define ObDereferenceObject(object) ObfDereferenceObject(object) ++ ++/* prevent expansion of ExAllocatePoolWithTag macro */ ++void *(ExAllocatePoolWithTag)(enum pool_type pool_type, SIZE_T size, ++ ULONG tag) wstdcall; ++ ++void ExFreePool(void *p) wstdcall; ++ULONG MmSizeOfMdl(void *base, ULONG length) wstdcall; ++void __iomem *MmMapIoSpace(PHYSICAL_ADDRESS phys_addr, SIZE_T size, ++ enum memory_caching_type cache) wstdcall; ++void MmUnmapIoSpace(void __iomem *addr, SIZE_T size) wstdcall; ++void MmProbeAndLockPages(struct mdl *mdl, KPROCESSOR_MODE access_mode, ++ enum lock_operation operation) wstdcall; ++void MmUnlockPages(struct mdl *mdl) wstdcall; ++void KeInitializeEvent(struct nt_event *nt_event, ++ enum event_type type, BOOLEAN state) wstdcall; ++LONG KeSetEvent(struct nt_event *nt_event, KPRIORITY incr, ++ BOOLEAN wait) wstdcall; ++LONG KeResetEvent(struct nt_event *nt_event) wstdcall; ++BOOLEAN queue_kdpc(struct kdpc *kdpc); ++BOOLEAN dequeue_kdpc(struct kdpc *kdpc); ++ ++NTSTATUS IoConnectInterrupt(struct kinterrupt **kinterrupt, ++ PKSERVICE_ROUTINE service_routine, ++ void *service_context, NT_SPIN_LOCK *lock, ++ ULONG vector, KIRQL irql, KIRQL synch_irql, ++ enum kinterrupt_mode interrupt_mode, ++ BOOLEAN shareable, KAFFINITY processor_enable_mask, ++ BOOLEAN floating_save) wstdcall; ++void IoDisconnectInterrupt(struct kinterrupt *interrupt) wstdcall; ++BOOLEAN KeSynchronizeExecution(struct kinterrupt *interrupt, ++ PKSYNCHRONIZE_ROUTINE synch_routine, ++ void *ctx) wstdcall; ++ ++NTSTATUS KeWaitForSingleObject(void *object, KWAIT_REASON reason, ++ KPROCESSOR_MODE waitmode, BOOLEAN alertable, ++ LARGE_INTEGER *timeout) wstdcall; ++void MmBuildMdlForNonPagedPool(struct mdl *mdl) wstdcall; ++NTSTATUS IoCreateDevice(struct driver_object *driver, ULONG dev_ext_length, ++ struct unicode_string *dev_name, DEVICE_TYPE dev_type, ++ ULONG dev_chars, BOOLEAN exclusive, ++ struct device_object **dev_obj) wstdcall; ++NTSTATUS IoCreateSymbolicLink(struct unicode_string *link, ++ struct unicode_string *dev_name) wstdcall; ++void IoDeleteDevice(struct device_object *dev) wstdcall; ++void IoDetachDevice(struct device_object *topdev) wstdcall; ++struct device_object *IoGetAttachedDevice(struct device_object *dev) wstdcall; ++struct device_object *IoGetAttachedDeviceReference ++ (struct device_object *dev) wstdcall; ++NTSTATUS IoAllocateDriverObjectExtension ++ (struct driver_object *drv_obj, void *client_id, ULONG extlen, ++ void **ext) wstdcall; ++void *IoGetDriverObjectExtension(struct driver_object *drv, ++ void *client_id) wstdcall; ++struct device_object *IoAttachDeviceToDeviceStack ++ (struct device_object *src, struct device_object *dst) wstdcall; ++BOOLEAN IoCancelIrp(struct irp *irp) wstdcall; ++struct irp *IoBuildSynchronousFsdRequest ++ (ULONG major_func, struct device_object *dev_obj, void *buf, ++ ULONG length, LARGE_INTEGER *offset, struct nt_event *event, ++ struct io_status_block *status) wstdcall; ++ ++NTSTATUS IoPassIrpDown(struct device_object *dev_obj, struct irp *irp) wstdcall; ++WIN_FUNC_DECL(IoPassIrpDown,2); ++NTSTATUS IoSyncForwardIrp(struct device_object *dev_obj, ++ struct irp *irp) wstdcall; ++NTSTATUS IoAsyncForwardIrp(struct device_object *dev_obj, ++ struct irp *irp) wstdcall; ++NTSTATUS IoInvalidDeviceRequest(struct device_object *dev_obj, ++ struct irp *irp) wstdcall; ++ ++void KeInitializeSpinLock(NT_SPIN_LOCK *lock) wstdcall; ++void IoAcquireCancelSpinLock(KIRQL *irql) wstdcall; ++void IoReleaseCancelSpinLock(KIRQL irql) wstdcall; ++ ++NTSTATUS RtlUnicodeStringToAnsiString ++ (struct ansi_string *dst, const struct unicode_string *src, ++ BOOLEAN dup) wstdcall; ++NTSTATUS RtlAnsiStringToUnicodeString ++ (struct unicode_string *dst, const struct ansi_string *src, ++ BOOLEAN dup) wstdcall; ++void RtlInitAnsiString(struct ansi_string *dst, const char *src) wstdcall; ++void RtlInitUnicodeString(struct unicode_string *dest, ++ const wchar_t *src) wstdcall; ++void RtlFreeUnicodeString(struct unicode_string *string) wstdcall; ++void RtlFreeAnsiString(struct ansi_string *string) wstdcall; ++LONG RtlCompareUnicodeString(const struct unicode_string *s1, ++ const struct unicode_string *s2, ++ BOOLEAN case_insensitive) wstdcall; ++NTSTATUS RtlUpcaseUnicodeString(struct unicode_string *dst, ++ struct unicode_string *src, ++ BOOLEAN alloc) wstdcall; ++BOOLEAN KeCancelTimer(struct nt_timer *nt_timer) wstdcall; ++void KeInitializeDpc(struct kdpc *kdpc, void *func, void *ctx) wstdcall; ++ ++extern spinlock_t ntoskernel_lock; ++extern spinlock_t irp_cancel_lock; ++extern struct nt_list object_list; ++extern CCHAR cpu_count; ++#ifdef CONFIG_X86_64 ++extern struct kuser_shared_data kuser_shared_data; ++#endif ++ ++#define IoCompleteRequest(irp, prio) IofCompleteRequest(irp, prio) ++#define IoCallDriver(dev, irp) IofCallDriver(dev, irp) ++ ++#if defined(IO_DEBUG) ++#define DUMP_IRP(_irp) \ ++do { \ ++ struct io_stack_location *_irp_sl; \ ++ _irp_sl = IoGetCurrentIrpStackLocation(_irp); \ ++ IOTRACE("irp: %p, stack size: %d, cl: %d, sl: %p, dev_obj: %p, " \ ++ "mj_fn: %d, minor_fn: %d, nt_urb: %p, event: %p", \ ++ _irp, _irp->stack_count, (_irp)->current_location, \ ++ _irp_sl, _irp_sl->dev_obj, _irp_sl->major_fn, \ ++ _irp_sl->minor_fn, IRP_URB(_irp), \ ++ (_irp)->user_event); \ ++} while (0) ++#else ++#define DUMP_IRP(_irp) do { } while (0) ++#endif ++ ++#endif // _NTOSKERNEL_H_ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel_io.c +--- linux-3.12.2/3rdparty/ndiswrapper/ntoskernel_io.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/ntoskernel_io.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,1161 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ntoskernel.h" ++#include "ndis.h" ++#include "wrapndis.h" ++#include "usb.h" ++#include "loader.h" ++#include "ntoskernel_io_exports.h" ++ ++wstdcall void WIN_FUNC(IoAcquireCancelSpinLock,1) ++ (KIRQL *irql) __acquires(irql) ++{ ++ spin_lock_bh(&irp_cancel_lock); ++ *irql = 0; ++} ++ ++wstdcall void WIN_FUNC(IoReleaseCancelSpinLock,1) ++ (KIRQL irql) __releases(irql) ++{ ++ spin_unlock_bh(&irp_cancel_lock); ++} ++ ++wstdcall int WIN_FUNC(IoIsWdmVersionAvailable,2) ++ (UCHAR major, UCHAR minor) ++{ ++ IOENTER("%d, %x", major, minor); ++ if (major == 1 && ++ (minor == 0x30 || // Windows 2003 ++ minor == 0x20 || // Windows XP ++ minor == 0x10)) // Windows 2000 ++ IOEXIT(return TRUE); ++ IOEXIT(return FALSE); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(IoIs32bitProcess,1) ++ (struct irp *irp) ++{ ++#ifdef CONFIG_X86_64 ++ return FALSE; ++#else ++ return TRUE; ++#endif ++} ++ ++wstdcall void WIN_FUNC(IoInitializeIrp,3) ++ (struct irp *irp, USHORT size, CCHAR stack_count) ++{ ++ IOENTER("irp: %p, %d, %d", irp, size, stack_count); ++ ++ memset(irp, 0, size); ++ irp->size = size; ++ irp->stack_count = stack_count; ++ irp->current_location = stack_count; ++ IoGetCurrentIrpStackLocation(irp) = IRP_SL(irp, stack_count); ++ IOEXIT(return); ++} ++ ++wstdcall void WIN_FUNC(IoReuseIrp,2) ++ (struct irp *irp, NTSTATUS status) ++{ ++ IOENTER("%p, %d", irp, status); ++ if (irp) { ++ UCHAR alloc_flags; ++ ++ alloc_flags = irp->alloc_flags; ++ IoInitializeIrp(irp, irp->size, irp->stack_count); ++ irp->alloc_flags = alloc_flags; ++ irp->io_status.status = status; ++ } ++ IOEXIT(return); ++} ++ ++wstdcall struct irp *WIN_FUNC(IoAllocateIrp,2) ++ (char stack_count, BOOLEAN charge_quota) ++{ ++ struct irp *irp; ++ int irp_size; ++ ++ IOENTER("count: %d", stack_count); ++ stack_count++; ++ irp_size = IoSizeOfIrp(stack_count); ++ irp = kmalloc(irp_size, irql_gfp()); ++ if (irp) ++ IoInitializeIrp(irp, irp_size, stack_count); ++ IOTRACE("irp %p", irp); ++ IOEXIT(return irp); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(IoCancelIrp,1) ++ (struct irp *irp) ++{ ++ typeof(irp->cancel_routine) cancel_routine; ++ ++ /* NB: this function may be called at DISPATCH_LEVEL */ ++ IOTRACE("irp: %p", irp); ++ if (!irp) ++ return FALSE; ++ DUMP_IRP(irp); ++ IoAcquireCancelSpinLock(&irp->cancel_irql); ++ cancel_routine = xchg(&irp->cancel_routine, NULL); ++ IOTRACE("%p", cancel_routine); ++ irp->cancel = TRUE; ++ if (cancel_routine) { ++ struct device_object *dev_obj; ++ ++ if (irp->current_location >= 0 && ++ irp->current_location < irp->stack_count) ++ dev_obj = IoGetCurrentIrpStackLocation(irp)->dev_obj; ++ else ++ dev_obj = NULL; ++ IOTRACE("current_location: %d, dev_obj: %p", ++ irp->current_location, dev_obj); ++ /* cancel_routine will release the spin lock */ ++ __release(irp->cancel_irql); ++ LIN2WIN2(cancel_routine, dev_obj, irp); ++ /* in usb's cancel, irp->cancel is set to indicate ++ * status of cancel */ ++ IOEXIT(return xchg(&irp->cancel, TRUE)); ++ } else { ++ IOTRACE("irp %p already canceled", irp); ++ IoReleaseCancelSpinLock(irp->cancel_irql); ++ IOEXIT(return FALSE); ++ } ++} ++ ++wstdcall void IoQueueThreadIrp(struct irp *irp) ++{ ++ struct nt_thread *thread; ++ KIRQL irql; ++ ++ thread = get_current_nt_thread(); ++ if (thread) { ++ IOTRACE("thread: %p, task: %p", thread, thread->task); ++ irp->flags |= IRP_SYNCHRONOUS_API; ++ irql = nt_spin_lock_irql(&thread->lock, DISPATCH_LEVEL); ++ InsertTailList(&thread->irps, &irp->thread_list); ++ IoIrpThread(irp) = thread; ++ nt_spin_unlock_irql(&thread->lock, irql); ++ } else ++ IoIrpThread(irp) = NULL; ++} ++ ++wstdcall void IoDequeueThreadIrp(struct irp *irp) ++{ ++ struct nt_thread *thread; ++ KIRQL irql; ++ ++ thread = IoIrpThread(irp); ++ if (thread) { ++ irql = nt_spin_lock_irql(&thread->lock, DISPATCH_LEVEL); ++ RemoveEntryList(&irp->thread_list); ++ nt_spin_unlock_irql(&thread->lock, irql); ++ } ++} ++ ++wstdcall void WIN_FUNC(IoFreeIrp,1) ++ (struct irp *irp) ++{ ++ IOENTER("irp = %p", irp); ++ if (!irp) { ++ WARNING("irp is NULL"); ++ return; ++ } ++ ++ if (irp->flags & IRP_SYNCHRONOUS_API) ++ IoDequeueThreadIrp(irp); ++ IoCancelIrp(irp); ++ kfree(irp); ++ ++ IOEXIT(return); ++} ++ ++wstdcall struct irp *WIN_FUNC(IoBuildAsynchronousFsdRequest,6) ++ (ULONG major_fn, struct device_object *dev_obj, void *buffer, ++ ULONG length, LARGE_INTEGER *offset, ++ struct io_status_block *user_status) ++{ ++ struct irp *irp; ++ struct io_stack_location *irp_sl; ++ ++ IOENTER("%p", dev_obj); ++ if (!dev_obj) ++ IOEXIT(return NULL); ++ irp = IoAllocateIrp(dev_obj->stack_count, FALSE); ++ if (irp == NULL) { ++ WARNING("couldn't allocate irp"); ++ IOEXIT(return NULL); ++ } ++ ++ irp_sl = IoGetNextIrpStackLocation(irp); ++ irp_sl->major_fn = major_fn; ++ IOTRACE("major_fn: %d", major_fn); ++ irp_sl->minor_fn = 0; ++ irp_sl->flags = 0; ++ irp_sl->control = 0; ++ irp_sl->dev_obj = dev_obj; ++ irp_sl->file_obj = NULL; ++ irp_sl->completion_routine = NULL; ++ ++ if (dev_obj->flags & DO_DIRECT_IO) { ++ irp->mdl = IoAllocateMdl(buffer, length, FALSE, FALSE, irp); ++ if (irp->mdl == NULL) { ++ IoFreeIrp(irp); ++ return NULL; ++ } ++ MmProbeAndLockPages(irp->mdl, KernelMode, ++ major_fn == IRP_MJ_WRITE ? ++ IoReadAccess : IoWriteAccess); ++ IOTRACE("mdl: %p", irp->mdl); ++ } else if (dev_obj->flags & DO_BUFFERED_IO) { ++ irp->associated_irp.system_buffer = buffer; ++ irp->flags = IRP_BUFFERED_IO; ++ irp->mdl = NULL; ++ IOTRACE("buffer: %p", buffer); ++ } ++ if (major_fn == IRP_MJ_READ) { ++ irp_sl->params.read.length = length; ++ irp_sl->params.read.byte_offset = *offset; ++ } else if (major_fn == IRP_MJ_WRITE) { ++ irp_sl->params.write.length = length; ++ irp_sl->params.write.byte_offset = *offset; ++ } ++ irp->user_status = user_status; ++ IOTRACE("irp: %p", irp); ++ return irp; ++} ++ ++wstdcall struct irp *WIN_FUNC(IoBuildSynchronousFsdRequest,7) ++ (ULONG major_fn, struct device_object *dev_obj, void *buf, ++ ULONG length, LARGE_INTEGER *offset, struct nt_event *event, ++ struct io_status_block *user_status) ++{ ++ struct irp *irp; ++ ++ irp = IoBuildAsynchronousFsdRequest(major_fn, dev_obj, buf, length, ++ offset, user_status); ++ if (irp == NULL) ++ return NULL; ++ irp->user_event = event; ++ IoQueueThreadIrp(irp); ++ return irp; ++} ++ ++wstdcall struct irp *WIN_FUNC(IoBuildDeviceIoControlRequest,9) ++ (ULONG ioctl, struct device_object *dev_obj, ++ void *input_buf, ULONG input_buf_len, void *output_buf, ++ ULONG output_buf_len, BOOLEAN internal_ioctl, ++ struct nt_event *event, struct io_status_block *io_status) ++{ ++ struct irp *irp; ++ struct io_stack_location *irp_sl; ++ ULONG buf_len; ++ ++ IOENTER("%p, 0x%08x, %d", dev_obj, ioctl, internal_ioctl); ++ if (!dev_obj) ++ IOEXIT(return NULL); ++ irp = IoAllocateIrp(dev_obj->stack_count, FALSE); ++ if (irp == NULL) { ++ WARNING("couldn't allocate irp"); ++ return NULL; ++ } ++ irp_sl = IoGetNextIrpStackLocation(irp); ++ irp_sl->params.dev_ioctl.code = ioctl; ++ irp_sl->params.dev_ioctl.input_buf_len = input_buf_len; ++ irp_sl->params.dev_ioctl.output_buf_len = output_buf_len; ++ irp_sl->major_fn = (internal_ioctl) ? ++ IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; ++ IOTRACE("%d", IO_METHOD_FROM_CTL_CODE(ioctl)); ++ ++ switch (IO_METHOD_FROM_CTL_CODE(ioctl)) { ++ case METHOD_BUFFERED: ++ buf_len = max(input_buf_len, output_buf_len); ++ if (buf_len) { ++ irp->associated_irp.system_buffer = ++ ExAllocatePoolWithTag(NonPagedPool, buf_len, 0); ++ if (!irp->associated_irp.system_buffer) { ++ IoFreeIrp(irp); ++ IOEXIT(return NULL); ++ } ++ irp->associated_irp.system_buffer = input_buf; ++ if (input_buf) ++ memcpy(irp->associated_irp.system_buffer, ++ input_buf, input_buf_len); ++ irp->flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; ++ if (output_buf) ++ irp->flags = IRP_INPUT_OPERATION; ++ irp->user_buf = output_buf; ++ } else ++ irp->user_buf = NULL; ++ break; ++ case METHOD_IN_DIRECT: ++ case METHOD_OUT_DIRECT: ++ if (input_buf) { ++ irp->associated_irp.system_buffer = ++ ExAllocatePoolWithTag(NonPagedPool, ++ input_buf_len, 0); ++ if (!irp->associated_irp.system_buffer) { ++ IoFreeIrp(irp); ++ IOEXIT(return NULL); ++ } ++ memcpy(irp->associated_irp.system_buffer, ++ input_buf, input_buf_len); ++ irp->flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; ++ } ++ /* TODO: we are supposed to setup MDL, but USB layer ++ * doesn't use MDLs. Moreover, USB layer mirrors ++ * non-DMAable buffers, so no need to allocate ++ * DMAable buffer here */ ++ if (output_buf) { ++ irp->associated_irp.system_buffer = ++ ExAllocatePoolWithTag(NonPagedPool, ++ output_buf_len, 0); ++ if (!irp->associated_irp.system_buffer) { ++ IoFreeIrp(irp); ++ IOEXIT(return NULL); ++ } ++ irp->flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; ++ } ++ break; ++ case METHOD_NEITHER: ++ irp->user_buf = output_buf; ++ irp_sl->params.dev_ioctl.type3_input_buf = input_buf; ++ break; ++ } ++ ++ irp->user_status = io_status; ++ irp->user_event = event; ++ IoQueueThreadIrp(irp); ++ ++ IOTRACE("irp: %p", irp); ++ IOEXIT(return irp); ++} ++ ++wfastcall NTSTATUS WIN_FUNC(IofCallDriver,2) ++ (struct device_object *dev_obj, struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ NTSTATUS status; ++ driver_dispatch_t *major_func; ++ struct driver_object *drv_obj; ++ ++ if (irp->current_location <= 0) { ++ ERROR("invalid irp: %p, %d", irp, irp->current_location); ++ return STATUS_INVALID_PARAMETER; ++ } ++ IOTRACE("%p, %p, %p, %d, %d, %p", dev_obj, irp, dev_obj->drv_obj, ++ irp->current_location, irp->stack_count, ++ IoGetCurrentIrpStackLocation(irp)); ++ IoSetNextIrpStackLocation(irp); ++ DUMP_IRP(irp); ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ drv_obj = dev_obj->drv_obj; ++ irp_sl->dev_obj = dev_obj; ++ major_func = drv_obj->major_func[irp_sl->major_fn]; ++ IOTRACE("major_func: %p, dev_obj: %p", major_func, dev_obj); ++ if (major_func) ++ status = LIN2WIN2(major_func, dev_obj, irp); ++ else { ++ ERROR("major_function %d is not implemented", ++ irp_sl->major_fn); ++ status = STATUS_NOT_SUPPORTED; ++ } ++ IOEXIT(return status); ++} ++ ++wfastcall void WIN_FUNC(IofCompleteRequest,2) ++ (struct irp *irp, CHAR prio_boost) ++{ ++ struct io_stack_location *irp_sl; ++ ++#ifdef IO_DEBUG ++ DUMP_IRP(irp); ++ if (irp->io_status.status == STATUS_PENDING) { ++ ERROR("invalid irp: %p, STATUS_PENDING", irp); ++ return; ++ } ++ if (irp->current_location < 0 || ++ irp->current_location >= irp->stack_count) { ++ ERROR("invalid irp: %p, %d", irp, irp->current_location); ++ return; ++ } ++#endif ++ for (irp_sl = IoGetCurrentIrpStackLocation(irp); ++ irp->current_location < irp->stack_count; irp_sl++) { ++ struct device_object *dev_obj; ++ NTSTATUS status; ++ ++ DUMP_IRP(irp); ++ if (irp_sl->control & SL_PENDING_RETURNED) ++ irp->pending_returned = TRUE; ++ ++ /* current_location and dev_obj must be same as when ++ * driver called IoSetCompletionRoutine, which sets ++ * completion routine at next (lower) location, which ++ * is what we are going to call below; so we set ++ * current_location and dev_obj for the previous ++ * (higher) location */ ++ IoSkipCurrentIrpStackLocation(irp); ++ if (irp->current_location < irp->stack_count) ++ dev_obj = IoGetCurrentIrpStackLocation(irp)->dev_obj; ++ else ++ dev_obj = NULL; ++ ++ IOTRACE("%d, %d, %p", irp->current_location, irp->stack_count, ++ dev_obj); ++ if (irp_sl->completion_routine && ++ ((irp->io_status.status == STATUS_SUCCESS && ++ irp_sl->control & SL_INVOKE_ON_SUCCESS) || ++ (irp->io_status.status != STATUS_SUCCESS && ++ irp_sl->control & SL_INVOKE_ON_ERROR) || ++ (irp->cancel == TRUE && ++ irp_sl->control & SL_INVOKE_ON_CANCEL))) { ++ IOTRACE("calling completion_routine at: %p, %p", ++ irp_sl->completion_routine, irp_sl->context); ++ status = LIN2WIN3(irp_sl->completion_routine, ++ dev_obj, irp, irp_sl->context); ++ IOTRACE("status: %08X", status); ++ if (status == STATUS_MORE_PROCESSING_REQUIRED) ++ IOEXIT(return); ++ } else { ++ /* propagate pending status to next irp_sl */ ++ if (irp->pending_returned && ++ irp->current_location < irp->stack_count) ++ IoMarkIrpPending(irp); ++ } ++ } ++ ++ if (irp->user_status) { ++ irp->user_status->status = irp->io_status.status; ++ irp->user_status->info = irp->io_status.info; ++ } ++ ++ if (irp->user_event) { ++ IOTRACE("setting event %p", irp->user_event); ++ KeSetEvent(irp->user_event, prio_boost, FALSE); ++ } ++ ++ if (irp->associated_irp.system_buffer && ++ (irp->flags & IRP_DEALLOCATE_BUFFER)) ++ ExFreePool(irp->associated_irp.system_buffer); ++ else { ++ struct mdl *mdl; ++ while ((mdl = irp->mdl)) { ++ irp->mdl = mdl->next; ++ MmUnlockPages(mdl); ++ IoFreeMdl(mdl); ++ } ++ } ++ IOTRACE("freeing irp %p", irp); ++ IoFreeIrp(irp); ++ IOEXIT(return); ++} ++ ++wstdcall NTSTATUS IoPassIrpDown(struct device_object *dev_obj, struct irp *irp) ++{ ++ IoSkipCurrentIrpStackLocation(irp); ++ IOEXIT(return IoCallDriver(dev_obj, irp)); ++} ++ ++wstdcall NTSTATUS IoIrpSyncComplete(struct device_object *dev_obj, ++ struct irp *irp, void *context) ++{ ++ if (irp->pending_returned == TRUE) ++ KeSetEvent(context, IO_NO_INCREMENT, FALSE); ++ IOEXIT(return STATUS_MORE_PROCESSING_REQUIRED); ++} ++WIN_FUNC_DECL(IoIrpSyncComplete,3) ++ ++wstdcall NTSTATUS IoSyncForwardIrp(struct device_object *dev_obj, ++ struct irp *irp) ++{ ++ struct nt_event event; ++ NTSTATUS status; ++ ++ IoCopyCurrentIrpStackLocationToNext(irp); ++ KeInitializeEvent(&event, SynchronizationEvent, FALSE); ++ /* completion function is called as Windows function */ ++ IoSetCompletionRoutine(irp, WIN_FUNC_PTR(IoIrpSyncComplete,3), &event, ++ TRUE, TRUE, TRUE); ++ status = IoCallDriver(dev_obj, irp); ++ IOTRACE("%08X", status); ++ if (status == STATUS_PENDING) { ++ KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, ++ NULL); ++ status = irp->io_status.status; ++ } ++ IOTRACE("%08X", status); ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(IoSyncForwardIrp,2) ++ ++wstdcall NTSTATUS IoAsyncForwardIrp(struct device_object *dev_obj, ++ struct irp *irp) ++{ ++ NTSTATUS status; ++ ++ IoCopyCurrentIrpStackLocationToNext(irp); ++ status = IoCallDriver(dev_obj, irp); ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(IoAsyncForwardIrp,2) ++ ++wstdcall NTSTATUS IoInvalidDeviceRequest(struct device_object *dev_obj, ++ struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ NTSTATUS status; ++ ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ WARNING("%d:%d not implemented", irp_sl->major_fn, irp_sl->minor_fn); ++ irp->io_status.status = STATUS_SUCCESS; ++ irp->io_status.info = 0; ++ status = irp->io_status.status; ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(IoInvalidDeviceRequest,2) ++ ++static irqreturn_t io_irq_isr(int irq, void *data ISR_PT_REGS_PARAM_DECL) ++{ ++ struct kinterrupt *interrupt = data; ++ BOOLEAN ret; ++ ++#ifdef CONFIG_DEBUG_SHIRQ ++ if (!interrupt->u.enabled) ++ EXIT1(return IRQ_NONE); ++#endif ++ TRACE6("%p", interrupt); ++ nt_spin_lock(interrupt->actual_lock); ++ ret = LIN2WIN2(interrupt->isr, interrupt, interrupt->isr_ctx); ++ nt_spin_unlock(interrupt->actual_lock); ++ if (ret == TRUE) ++ EXIT6(return IRQ_HANDLED); ++ else ++ EXIT6(return IRQ_NONE); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoConnectInterrupt,11) ++ (struct kinterrupt **kinterrupt, PKSERVICE_ROUTINE isr, void *isr_ctx, ++ NT_SPIN_LOCK *lock, ULONG vector, KIRQL irql, KIRQL synch_irql, ++ enum kinterrupt_mode mode, BOOLEAN shared, KAFFINITY cpu_mask, ++ BOOLEAN save_fp) ++{ ++ struct kinterrupt *interrupt; ++ IOENTER(""); ++ interrupt = kzalloc(sizeof(*interrupt), GFP_KERNEL); ++ if (!interrupt) ++ IOEXIT(return STATUS_INSUFFICIENT_RESOURCES); ++ interrupt->vector = vector; ++ interrupt->cpu_mask = cpu_mask; ++ nt_spin_lock_init(&interrupt->lock); ++ if (lock) ++ interrupt->actual_lock = lock; ++ else ++ interrupt->actual_lock = &interrupt->lock; ++ interrupt->shared = shared; ++ interrupt->save_fp = save_fp; ++ interrupt->isr = isr; ++ interrupt->isr_ctx = isr_ctx; ++ InitializeListHead(&interrupt->list); ++ interrupt->irql = irql; ++ interrupt->synch_irql = synch_irql; ++ interrupt->mode = mode; ++ if (request_irq(vector, io_irq_isr, shared ? IRQF_SHARED : 0, ++ DRIVER_NAME, interrupt)) { ++ WARNING("request for irq %d failed", vector); ++ kfree(interrupt); ++ IOEXIT(return STATUS_INSUFFICIENT_RESOURCES); ++ } ++ *kinterrupt = interrupt; ++#ifdef CONFIG_DEBUG_SHIRQ ++ interrupt->u.enabled = 1; ++#endif ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(IoDisconnectInterrupt,1) ++ (struct kinterrupt *interrupt) ++{ ++#ifdef CONFIG_DEBUG_SHIRQ ++ interrupt->u.enabled = 0; ++#endif ++ free_irq(interrupt->vector, interrupt); ++ kfree(interrupt); ++} ++ ++wstdcall struct mdl *WIN_FUNC(IoAllocateMdl,5) ++ (void *virt, ULONG length, BOOLEAN second_buf, BOOLEAN charge_quota, ++ struct irp *irp) ++{ ++ struct mdl *mdl; ++ mdl = allocate_init_mdl(virt, length); ++ if (!mdl) ++ return NULL; ++ if (irp) { ++ if (second_buf == TRUE) { ++ struct mdl *last; ++ ++ last = irp->mdl; ++ while (last->next) ++ last = last->next; ++ last->next = mdl; ++ } else ++ irp->mdl = mdl; ++ } ++ IOTRACE("%p", mdl); ++ return mdl; ++} ++ ++wstdcall void WIN_FUNC(IoFreeMdl,1) ++ (struct mdl *mdl) ++{ ++ IOTRACE("%p", mdl); ++ free_mdl(mdl); ++} ++ ++wstdcall struct io_workitem *WIN_FUNC(IoAllocateWorkItem,1) ++ (struct device_object *dev_obj) ++{ ++ struct io_workitem *io_workitem; ++ ++ IOENTER("%p", dev_obj); ++ io_workitem = kmalloc(sizeof(*io_workitem), irql_gfp()); ++ if (!io_workitem) ++ IOEXIT(return NULL); ++ io_workitem->dev_obj = dev_obj; ++ IOEXIT(return io_workitem); ++} ++ ++wstdcall void WIN_FUNC(IoFreeWorkItem,1) ++ (struct io_workitem *io_workitem) ++{ ++ kfree(io_workitem); ++ IOEXIT(return); ++} ++ ++wstdcall void WIN_FUNC(IoQueueWorkItem,4) ++ (struct io_workitem *io_workitem, void *func, ++ enum work_queue_type queue_type, void *context) ++{ ++ IOENTER("%p, %p", io_workitem, io_workitem->dev_obj); ++ io_workitem->worker_routine = func; ++ io_workitem->context = context; ++ schedule_ntos_work_item(func, io_workitem->dev_obj, context); ++ IOEXIT(return); ++} ++ ++wstdcall void WIN_FUNC(ExQueueWorkItem,2) ++ (struct io_workitem *io_workitem, enum work_queue_type queue_type) ++{ ++ IOENTER("%p", io_workitem); ++ schedule_ntos_work_item(io_workitem->worker_routine, ++ io_workitem->dev_obj, io_workitem->context); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoAllocateDriverObjectExtension,4) ++ (struct driver_object *drv_obj, void *client_id, ULONG extlen, ++ void **ext) ++{ ++ struct custom_ext *ce; ++ ++ IOENTER("%p, %p", drv_obj, client_id); ++ ce = kmalloc(sizeof(*ce) + extlen, irql_gfp()); ++ if (ce == NULL) ++ return STATUS_INSUFFICIENT_RESOURCES; ++ ++ IOTRACE("custom_ext: %p", ce); ++ ce->client_id = client_id; ++ spin_lock_bh(&ntoskernel_lock); ++ InsertTailList(&drv_obj->drv_ext->custom_ext, &ce->list); ++ spin_unlock_bh(&ntoskernel_lock); ++ ++ *ext = (void *)ce + sizeof(*ce); ++ IOTRACE("ext: %p", *ext); ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall void *WIN_FUNC(IoGetDriverObjectExtension,2) ++ (struct driver_object *drv_obj, void *client_id) ++{ ++ struct custom_ext *ce; ++ void *ret; ++ ++ IOENTER("drv_obj: %p, client_id: %p", drv_obj, client_id); ++ ret = NULL; ++ spin_lock_bh(&ntoskernel_lock); ++ nt_list_for_each_entry(ce, &drv_obj->drv_ext->custom_ext, list) { ++ if (ce->client_id == client_id) { ++ ret = (void *)ce + sizeof(*ce); ++ break; ++ } ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ IOTRACE("ret: %p", ret); ++ return ret; ++} ++ ++void free_custom_extensions(struct driver_extension *drv_ext) ++{ ++ struct nt_list *ent; ++ ++ IOENTER("%p", drv_ext); ++ spin_lock_bh(&ntoskernel_lock); ++ while ((ent = RemoveHeadList(&drv_ext->custom_ext))) ++ kfree(ent); ++ spin_unlock_bh(&ntoskernel_lock); ++ IOEXIT(return); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoCreateDevice,7) ++ (struct driver_object *drv_obj, ULONG dev_ext_length, ++ struct unicode_string *dev_name, DEVICE_TYPE dev_type, ++ ULONG dev_chars, BOOLEAN exclusive, struct device_object **newdev) ++{ ++ struct device_object *dev; ++ struct dev_obj_ext *dev_obj_ext; ++ int size; ++ ++ IOENTER("%p, %u, %p", drv_obj, dev_ext_length, dev_name); ++ ++ size = sizeof(*dev) + dev_ext_length + sizeof(*dev_obj_ext); ++ dev = allocate_object(size, OBJECT_TYPE_DEVICE, dev_name); ++ if (!dev) ++ IOEXIT(return STATUS_INSUFFICIENT_RESOURCES); ++ if (dev_ext_length) ++ dev->dev_ext = dev + 1; ++ else ++ dev->dev_ext = NULL; ++ ++ dev_obj_ext = ((void *)(dev + 1)) + dev_ext_length; ++ dev_obj_ext->dev_obj = dev; ++ dev_obj_ext->size = 0; ++ dev_obj_ext->type = IO_TYPE_DEVICE; ++ dev->dev_obj_ext = dev_obj_ext; ++ ++ dev->type = dev_type; ++ dev->flags = 0; ++ dev->size = sizeof(*dev) + dev_ext_length; ++ dev->ref_count = 1; ++ dev->attached = NULL; ++ dev->stack_count = 1; ++ ++ dev->drv_obj = drv_obj; ++ dev->next = drv_obj->dev_obj; ++ drv_obj->dev_obj = dev; ++ ++ dev->align_req = 1; ++ dev->characteristics = dev_chars; ++ dev->io_timer = NULL; ++ KeInitializeEvent(&dev->lock, SynchronizationEvent, TRUE); ++ dev->vpb = NULL; ++ ++ IOTRACE("dev: %p, ext: %p", dev, dev->dev_ext); ++ *newdev = dev; ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoCreateUnprotectedSymbolicLink,2) ++ (struct unicode_string *link, struct unicode_string *dev_name) ++{ ++ struct ansi_string ansi; ++ ++ IOENTER("%p, %p", dev_name, link); ++ if (dev_name && (RtlUnicodeStringToAnsiString(&ansi, dev_name, TRUE) == ++ STATUS_SUCCESS)) { ++ IOTRACE("dev_name: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ if (link && (RtlUnicodeStringToAnsiString(&ansi, link, TRUE) == ++ STATUS_SUCCESS)) { ++ IOTRACE("link: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++// TODO(); ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoCreateSymbolicLink,2) ++ (struct unicode_string *link, struct unicode_string *dev_name) ++{ ++ IOEXIT(return IoCreateUnprotectedSymbolicLink(link, dev_name)); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoDeleteSymbolicLink,1) ++ (struct unicode_string *link) ++{ ++ struct ansi_string ansi; ++ ++ IOENTER("%p", link); ++ if (link && (RtlUnicodeStringToAnsiString(&ansi, link, TRUE) == ++ STATUS_SUCCESS)) { ++ IOTRACE("dev_name: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(IoDeleteDevice,1) ++ (struct device_object *dev) ++{ ++ IOENTER("%p", dev); ++ if (dev == NULL) ++ IOEXIT(return); ++ IOTRACE("drv_obj: %p", dev->drv_obj); ++ if (dev->drv_obj) { ++ struct device_object *prev; ++ ++ prev = dev->drv_obj->dev_obj; ++ IOTRACE("dev_obj: %p", prev); ++ if (prev == dev) ++ dev->drv_obj->dev_obj = dev->next; ++ else if (prev) { ++ while (prev->next != dev) ++ prev = prev->next; ++ prev->next = dev->next; ++ } ++ } ++ ObDereferenceObject(dev); ++ IOEXIT(return); ++} ++ ++wstdcall void WIN_FUNC(IoDetachDevice,1) ++ (struct device_object *tgt) ++{ ++ struct device_object *tail; ++ ++ IOENTER("%p", tgt); ++ if (!tgt) ++ IOEXIT(return); ++ tail = tgt->attached; ++ if (!tail) ++ IOEXIT(return); ++ IOTRACE("tail: %p", tail); ++ ++ spin_lock_bh(&ntoskernel_lock); ++ tgt->attached = tail->attached; ++ IOTRACE("attached:%p", tgt->attached); ++ for ( ; tail; tail = tail->attached) { ++ IOTRACE("tail:%p", tail); ++ tail->stack_count--; ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ IOEXIT(return); ++} ++ ++wstdcall struct device_object *WIN_FUNC(IoGetAttachedDevice,1) ++ (struct device_object *dev) ++{ ++ IOENTER("%p", dev); ++ if (!dev) ++ IOEXIT(return NULL); ++ spin_lock_bh(&ntoskernel_lock); ++ while (dev->attached) ++ dev = dev->attached; ++ spin_unlock_bh(&ntoskernel_lock); ++ IOEXIT(return dev); ++} ++ ++wstdcall struct device_object *WIN_FUNC(IoGetAttachedDeviceReference,1) ++ (struct device_object *dev) ++{ ++ IOENTER("%p", dev); ++ if (!dev) ++ IOEXIT(return NULL); ++ dev = IoGetAttachedDevice(dev); ++ ObReferenceObject(dev); ++ IOEXIT(return dev); ++} ++ ++wstdcall struct device_object *WIN_FUNC(IoAttachDeviceToDeviceStack,2) ++ (struct device_object *src, struct device_object *tgt) ++{ ++ struct device_object *attached; ++ struct dev_obj_ext *src_dev_ext; ++ ++ IOENTER("%p, %p", src, tgt); ++ attached = IoGetAttachedDevice(tgt); ++ IOTRACE("%p", attached); ++ src_dev_ext = src->dev_obj_ext; ++ spin_lock_bh(&ntoskernel_lock); ++ if (attached) ++ attached->attached = src; ++ src->attached = NULL; ++ src->stack_count = attached->stack_count + 1; ++ src_dev_ext->attached_to = attached; ++ spin_unlock_bh(&ntoskernel_lock); ++ IOTRACE("stack_count: %d -> %d", attached->stack_count, ++ src->stack_count); ++ IOEXIT(return attached); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoGetDeviceProperty,5) ++ (struct device_object *pdo, enum device_registry_property dev_property, ++ ULONG buffer_len, void *buffer, ULONG *result_len) ++{ ++ struct ansi_string ansi; ++ struct unicode_string unicode; ++ struct wrap_device *wd; ++ ULONG need; ++ ++ IOENTER("dev_obj = %p, dev_property = %d, buffer_len = %u, " ++ "buffer = %p, result_len = %p", pdo, dev_property, ++ buffer_len, buffer, result_len); ++ ++ wd = pdo->reserved; ++ switch (dev_property) { ++ case DevicePropertyDeviceDescription: ++ case DevicePropertyFriendlyName: ++ case DevicePropertyDriverKeyName: ++ if (wrap_is_pci_bus(wd->dev_bus)) ++ RtlInitAnsiString(&ansi, "PCI"); ++ else // if (wrap_is_usb_bus(wd->dev_bus)) ++ RtlInitAnsiString(&ansi, "USB"); ++ need = sizeof(wchar_t) * (ansi.max_length + 1); ++ if (buffer_len < need) { ++ *result_len = need; ++ IOEXIT(return STATUS_BUFFER_TOO_SMALL); ++ } ++ unicode.max_length = buffer_len; ++ unicode.buf = buffer; ++ if (RtlAnsiStringToUnicodeString(&unicode, &ansi, ++ FALSE) != STATUS_SUCCESS) { ++ *result_len = unicode.length; ++ IOEXIT(return STATUS_BUFFER_TOO_SMALL); ++ } ++ IOEXIT(return STATUS_SUCCESS); ++ default: ++ WARNING("%d not implemented", dev_property); ++ IOEXIT(return STATUS_INVALID_PARAMETER_2); ++ } ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoGetDeviceObjectPointer,4) ++ (struct unicode_string *name, ACCESS_MASK desired_access, ++ struct file_object *file_obj, struct device_object *dev_obj) ++{ ++ struct common_object_header *coh; ++ ++ dev_obj = NULL; ++ /* TODO: access is not checked and file_obj is filled with zeroes */ ++ spin_lock_bh(&ntoskernel_lock); ++ nt_list_for_each_entry(coh, &object_list, list) { ++ TRACE5("header: %p, type: %d", coh, coh->type); ++ if (coh->type != OBJECT_TYPE_DEVICE) ++ continue; ++ if (!RtlCompareUnicodeString(&coh->name, name, TRUE)) { ++ dev_obj = HEADER_TO_OBJECT(coh); ++ TRACE5("dev_obj: %p", dev_obj); ++ break; ++ } ++ } ++ spin_unlock_bh(&ntoskernel_lock); ++ if (dev_obj) { ++ memset(file_obj, 0, sizeof(*file_obj)); ++ WARNING("file_obj filled with zeroes"); ++ IOEXIT(return STATUS_SUCCESS); ++ } else ++ IOEXIT(return STATUS_OBJECT_NAME_INVALID); ++} ++ ++/* NOTE: Make sure to compile with -freg-struct-return, so gcc will ++ * return union in register, like Windows */ ++wstdcall union power_state WIN_FUNC(PoSetPowerState,3) ++ (struct device_object *dev_obj, enum power_state_type type, ++ union power_state state) ++{ ++ IOEXIT(return state); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(PoCallDriver,2) ++ (struct device_object *dev_obj, struct irp *irp) ++{ ++ return IoCallDriver(dev_obj, irp); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(PoRequestPowerIrp,6) ++ (struct device_object *dev_obj, UCHAR minor_fn, ++ union power_state power_state, void *completion_func, ++ void *context, struct irp **pirp) ++{ ++ struct irp *irp; ++ struct io_stack_location *irp_sl; ++ ++ TRACE1("%p, %d, %p", dev_obj, dev_obj->stack_count, dev_obj->drv_obj); ++ irp = IoAllocateIrp(dev_obj->stack_count, FALSE); ++ if (!irp) ++ return STATUS_INSUFFICIENT_RESOURCES; ++ irp_sl = IoGetNextIrpStackLocation(irp); ++ irp_sl->major_fn = IRP_MJ_POWER; ++ irp_sl->minor_fn = minor_fn; ++ if (minor_fn == IRP_MN_WAIT_WAKE) ++ irp_sl->params.power.type = SystemPowerState; ++ else ++ irp_sl->params.power.type = DevicePowerState; ++ irp_sl->params.power.state = power_state; ++ irp_sl->completion_routine = completion_func; ++ irp->io_status.status = STATUS_NOT_SUPPORTED; ++ *pirp = irp; ++ return PoCallDriver(dev_obj, irp); ++} ++ ++wstdcall void WIN_FUNC(PoStartNextPowerIrp,1) ++ (struct irp *irp) ++{ ++ IOENTER("irp = %p", irp); ++ IOEXIT(return); ++} ++ ++wstdcall void WIN_FUNC(IoInitializeRemoveLockEx,5) ++ (struct io_remove_lock *lock, ULONG alloc_tag, ULONG max_locked_min, ++ ULONG high_mark, ULONG lock_size) ++{ ++ TODO(); ++} ++ ++wstdcall void *WIN_FUNC(IoAllocateErrorLogEntry,2) ++ (void *io_object, UCHAR entry_size) ++{ ++ /* not implemented fully */ ++ void *ret = kmalloc(sizeof(struct io_error_log_packet) + entry_size, ++ irql_gfp()); ++ TRACE2("%p", ret); ++ if (ret) ++ return ret + sizeof(struct io_error_log_packet); ++ else ++ return NULL; ++} ++ ++wstdcall void WIN_FUNC(IoWriteErrorLogEntry,1) ++ (void *entry) ++{ ++ /* TODO: log error with codes and message */ ++ ERROR(""); ++} ++ ++wstdcall void WIN_FUNC(IoFreeErrorLogEntry,1) ++ (void *entry) ++{ ++ TRACE2("%p", entry); ++ kfree(entry - sizeof(struct io_error_log_packet)); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoAcquireRemoveLockEx,5) ++ (struct io_remove_lock *lock, void *tag, char *file, ULONG line, ++ ULONG lock_size) ++{ ++ TODO(); ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoReleaseRemoveLockEx,3) ++ (struct io_remove_lock *lock, void *tag, ULONG lock_size) ++{ ++ TODO(); ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoRegisterDeviceInterface,4) ++ (struct device_object *pdo, struct guid *guid_class, ++ struct unicode_string *reference, struct unicode_string *link) ++{ ++ struct ansi_string ansi; ++ ++ /* TODO: check if pdo is valid */ ++ RtlInitAnsiString(&ansi, "ndis"); ++ ENTER1("pdo: %p, ref: %p, link: %p, %x, %x, %x", pdo, reference, link, ++ guid_class->data1, guid_class->data2, guid_class->data3); ++ return RtlAnsiStringToUnicodeString(link, &ansi, TRUE); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoSetDeviceInterfaceState,2) ++ (struct unicode_string *link, BOOLEAN enable) ++{ ++ ENTER1("link: %p, enable: %d", link, enable); ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoOpenDeviceRegistryKey,4) ++ (struct device_object *dev_obj, ULONG type, ACCESS_MASK mask, ++ void **handle) ++{ ++ ENTER1("dev_obj: %p", dev_obj); ++ *handle = dev_obj; ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoWMIRegistrationControl,2) ++ (struct device_object *dev_obj, ULONG action) ++{ ++ ENTER2("%p, %d", dev_obj, action); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(IoInvalidateDeviceRelations,2) ++ (struct device_object *dev_obj, enum device_relation_type type) ++{ ++ INFO("%p, %d", dev_obj, type); ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(IoInvalidateDeviceState,1) ++ (struct device_object *pdo) ++{ ++ INFO("%p", pdo); ++ TODO(); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoRegisterPlugPlayNotification,7) ++ (UINT category, ULONG flags, void *data, struct driver_object *object, ++ void *callback, void *context, void **notification_entry) ++{ ++ TRACE2("category: %d, flags 0x%x, data: %p, object: %p, callback: %p, " ++ "context: %p, notification_entry: %p", category, flags, data, ++ object, callback, context, notification_entry); ++ TODO(); ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoUnregisterPlugPlayNotification,1) ++ (void *notification_entry) ++{ ++ TRACE2("%p", notification_entry); ++ TODO(); ++ IOEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoWMIOpenBlock,3) ++ (struct guid *guid, ULONG access, void *object) ++{ ++ TODO(); ++ IOEXIT(return STATUS_NOT_IMPLEMENTED); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(IoWMIQueryAllData,3) ++ (void *data_block_object, UINT *buffer_size, void *buffer) ++{ ++ TODO(); ++ IOEXIT(return STATUS_NOT_IMPLEMENTED); ++} ++ ++wstdcall void WIN_FUNC(IoGetStackLimits,2) ++ (ULONG_PTR *LowLimit, ULONG_PTR *HighLimit) ++{ ++ *LowLimit = (ULONG_PTR)&LowLimit & ~(THREAD_SIZE - 1); ++ *HighLimit = *LowLimit + THREAD_SIZE; ++ IOTRACE("LowLimit: 0x%lx, HighLimit: 0x%lx", *LowLimit, *HighLimit); ++ IOEXIT(return); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.c +--- linux-3.12.2/3rdparty/ndiswrapper/pe_linker.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,600 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifdef TEST_LOADER ++ ++#include "usr_linker.h" ++ ++#else ++ ++#include ++#include ++ ++//#define DEBUGLINKER 2 ++ ++#include "ntoskernel.h" ++ ++#endif ++ ++struct pe_exports { ++ char *dll; ++ char *name; ++ generic_func addr; ++}; ++ ++static struct pe_exports pe_exports[40]; ++static int num_pe_exports; ++ ++#define RVA2VA(image, rva, type) (type)(ULONG_PTR)((void *)image + rva) ++#define CHECK_SZ(a,b) { if (sizeof(a) != b) { \ ++ ERROR("%s is bad, got %zd, expected %d", \ ++ #a , sizeof(a), (b)); return -EINVAL; } } ++ ++#if defined(DEBUGLINKER) && DEBUGLINKER > 0 ++#define DBGLINKER(fmt, ...) printk(KERN_INFO "%s (%s:%d): " fmt "\n", \ ++ DRIVER_NAME, __func__, \ ++ __LINE__ , ## __VA_ARGS__); ++static const char *image_directory_name[] = { ++ "EXPORT", ++ "IMPORT", ++ "RESOURCE", ++ "EXCEPTION", ++ "SECURITY", ++ "BASERELOC", ++ "DEBUG", ++ "COPYRIGHT", ++ "GLOBALPTR", ++ "TLS", ++ "LOAD_CONFIG", ++ "BOUND_IMPORT", ++ "IAT", ++ "DELAY_IMPORT", ++ "COM_DESCRIPTOR" }; ++#else ++#define DBGLINKER(fmt, ...) do { } while (0) ++#endif ++ ++#ifndef TEST_LOADER ++extern struct wrap_export ntoskernel_exports[], ntoskernel_io_exports[], ++ ndis_exports[], crt_exports[], hal_exports[], rtl_exports[]; ++#ifdef ENABLE_USB ++extern struct wrap_export usb_exports[]; ++#endif ++ ++static int get_export(char *name, generic_func *func) ++{ ++ int i, j; ++ ++ struct wrap_export *exports[] = { ++ ntoskernel_exports, ++ ntoskernel_io_exports, ++ ndis_exports, ++ crt_exports, ++ hal_exports, ++ rtl_exports, ++#ifdef ENABLE_USB ++ usb_exports, ++#endif ++ }; ++ ++ for (j = 0; j < ARRAY_SIZE(exports); j++) ++ for (i = 0; exports[j][i].name != NULL; i++) ++ if (strcmp(exports[j][i].name, name) == 0) { ++ *func = exports[j][i].func; ++ return 0; ++ } ++ ++ for (i = 0; i < num_pe_exports; i++) ++ if (strcmp(pe_exports[i].name, name) == 0) { ++ *func = pe_exports[i].addr; ++ return 0; ++ } ++ ++ return -1; ++} ++#endif // TEST_LOADER ++ ++static void *get_dll_init(char *name) ++{ ++ int i; ++ for (i = 0; i < num_pe_exports; i++) ++ if ((strcmp(pe_exports[i].dll, name) == 0) && ++ (strcmp(pe_exports[i].name, "DllInitialize") == 0)) ++ return (void *)pe_exports[i].addr; ++ return NULL; ++} ++ ++/* ++ * Find and validate the coff header ++ * ++ */ ++static int check_nt_hdr(IMAGE_NT_HEADERS *nt_hdr) ++{ ++ int i; ++ WORD attr; ++ PIMAGE_OPTIONAL_HEADER opt_hdr; ++ ++ /* Validate the "PE\0\0" signature */ ++ if (nt_hdr->Signature != IMAGE_NT_SIGNATURE) { ++ ERROR("is this driver file? bad signature %08x", ++ nt_hdr->Signature); ++ return -EINVAL; ++ } ++ ++ opt_hdr = &nt_hdr->OptionalHeader; ++ /* Make sure Image is PE32 or PE32+ */ ++#ifdef CONFIG_X86_64 ++ if (opt_hdr->Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) { ++ ERROR("kernel is 64-bit, but Windows driver is not 64-bit;" ++ "bad magic: %04X", opt_hdr->Magic); ++ return -EINVAL; ++ } ++#else ++ if (opt_hdr->Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) { ++ ERROR("kernel is 32-bit, but Windows driver is not 32-bit;" ++ "bad magic: %04X", opt_hdr->Magic); ++ return -EINVAL; ++ } ++#endif ++ ++ /* Validate the image for the current architecture. */ ++#ifdef CONFIG_X86_64 ++ if (nt_hdr->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) { ++ ERROR("kernel is 64-bit, but Windows driver is not 64-bit;" ++ " (PE signature is %04X)", nt_hdr->FileHeader.Machine); ++ return -EINVAL; ++ } ++#else ++ if (nt_hdr->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) { ++ ERROR("kernel is 32-bit, but Windows driver is not 32-bit;" ++ " (PE signature is %04X)", nt_hdr->FileHeader.Machine); ++ return -EINVAL; ++ } ++#endif ++ ++ /* Must have attributes */ ++#ifdef CONFIG_X86_64 ++ attr = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_LARGE_ADDRESS_AWARE; ++#else ++ attr = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_32BIT_MACHINE; ++#endif ++ if ((nt_hdr->FileHeader.Characteristics & attr) != attr) ++ return -EINVAL; ++ ++ /* Must be relocatable */ ++ attr = IMAGE_FILE_RELOCS_STRIPPED; ++ if ((nt_hdr->FileHeader.Characteristics & attr)) ++ return -EINVAL; ++ ++ /* Make sure we have at least one section */ ++ if (nt_hdr->FileHeader.NumberOfSections == 0) ++ return -EINVAL; ++ ++ if (opt_hdr->SectionAlignment < opt_hdr->FileAlignment) { ++ ERROR("alignment mismatch: section: 0x%x, file: 0x%x", ++ opt_hdr->SectionAlignment, opt_hdr->FileAlignment); ++ return -EINVAL; ++ } ++ ++ DBGLINKER("number of datadictionary entries %d", ++ opt_hdr->NumberOfRvaAndSizes); ++ for (i = 0; i < opt_hdr->NumberOfRvaAndSizes; i++) { ++ DBGLINKER("datadirectory %s RVA:%X Size:%d", ++ (i <= IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) ? ++ image_directory_name[i] : "unknown", ++ opt_hdr->DataDirectory[i].VirtualAddress, ++ opt_hdr->DataDirectory[i].Size); ++ } ++ ++ if ((nt_hdr->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) ++ return IMAGE_FILE_EXECUTABLE_IMAGE; ++ if ((nt_hdr->FileHeader.Characteristics & IMAGE_FILE_DLL)) ++ return IMAGE_FILE_DLL; ++ return -EINVAL; ++} ++ ++static int import(void *image, IMAGE_IMPORT_DESCRIPTOR *dirent, char *dll) ++{ ++ ULONG_PTR *lookup_tbl, *address_tbl; ++ char *symname = NULL; ++ int i; ++ int ret = 0; ++ generic_func adr; ++ ++ lookup_tbl = RVA2VA(image, dirent->u.OriginalFirstThunk, ULONG_PTR *); ++ address_tbl = RVA2VA(image, dirent->FirstThunk, ULONG_PTR *); ++ ++ for (i = 0; lookup_tbl[i]; i++) { ++ if (IMAGE_SNAP_BY_ORDINAL(lookup_tbl[i])) { ++ ERROR("ordinal import not supported: %llu", ++ (uint64_t)lookup_tbl[i]); ++ return -1; ++ } ++ else { ++ symname = RVA2VA(image, ++ ((lookup_tbl[i] & ++ ~IMAGE_ORDINAL_FLAG) + 2), char *); ++ } ++ ++ if (get_export(symname, &adr) < 0) { ++ ERROR("unknown symbol: %s:'%s'", dll, symname); ++ ret = -1; ++ } else { ++ DBGLINKER("found symbol: %s:%s: addr: %p, rva = %llu", ++ dll, symname, adr, (uint64_t)address_tbl[i]); ++ address_tbl[i] = (ULONG_PTR)adr; ++ } ++ } ++ return ret; ++} ++ ++static int read_exports(struct pe_image *pe) ++{ ++ IMAGE_EXPORT_DIRECTORY *export_dir_table; ++ uint32_t *export_addr_table; ++ int i; ++ uint32_t *name_table; ++ PIMAGE_OPTIONAL_HEADER opt_hdr; ++ IMAGE_DATA_DIRECTORY *export_data_dir; ++ ++ opt_hdr = &pe->nt_hdr->OptionalHeader; ++ export_data_dir = ++ &opt_hdr->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; ++ ++ if (export_data_dir->Size == 0) { ++ DBGLINKER("no exports"); ++ return 0; ++ } ++ ++ export_dir_table = ++ RVA2VA(pe->image, export_data_dir->VirtualAddress, ++ IMAGE_EXPORT_DIRECTORY *); ++ ++ name_table = (unsigned int *)(pe->image + ++ export_dir_table->AddressOfNames); ++ export_addr_table = (uint32_t *) ++ (pe->image + export_dir_table->AddressOfFunctions); ++ ++ for (i = 0; i < export_dir_table->NumberOfNames; i++) { ++ ++ if (export_data_dir->VirtualAddress <= *export_addr_table || ++ *export_addr_table >= (export_data_dir->VirtualAddress + ++ export_data_dir->Size)) ++ DBGLINKER("forwarder rva"); ++ ++ DBGLINKER("export symbol: %s, at %p", ++ (char *)(pe->image + *name_table), ++ pe->image + *export_addr_table); ++ ++ pe_exports[num_pe_exports].dll = pe->name; ++ pe_exports[num_pe_exports].name = pe->image + *name_table; ++ pe_exports[num_pe_exports].addr = ++ pe->image + *export_addr_table; ++ ++ num_pe_exports++; ++ name_table++; ++ export_addr_table++; ++ } ++ return 0; ++} ++ ++static int fixup_imports(void *image, IMAGE_NT_HEADERS *nt_hdr) ++{ ++ int i; ++ char *name; ++ int ret = 0; ++ IMAGE_IMPORT_DESCRIPTOR *dirent; ++ IMAGE_DATA_DIRECTORY *import_data_dir; ++ PIMAGE_OPTIONAL_HEADER opt_hdr; ++ ++ opt_hdr = &nt_hdr->OptionalHeader; ++ import_data_dir = ++ &opt_hdr->DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]; ++ dirent = RVA2VA(image, import_data_dir->VirtualAddress, ++ IMAGE_IMPORT_DESCRIPTOR *); ++ ++ for (i = 0; dirent[i].Name; i++) { ++ name = RVA2VA(image, dirent[i].Name, char*); ++ ++ DBGLINKER("imports from dll: %s", name); ++ ret += import(image, &dirent[i], name); ++ } ++ return ret; ++} ++ ++static int fixup_reloc(void *image, IMAGE_NT_HEADERS *nt_hdr) ++{ ++ ULONG_PTR base; ++ ULONG_PTR size; ++ IMAGE_BASE_RELOCATION *fixup_block; ++ IMAGE_DATA_DIRECTORY *base_reloc_data_dir; ++ PIMAGE_OPTIONAL_HEADER opt_hdr; ++ ++ opt_hdr = &nt_hdr->OptionalHeader; ++ base = opt_hdr->ImageBase; ++ base_reloc_data_dir = ++ &opt_hdr->DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; ++ if (base_reloc_data_dir->Size == 0) ++ return 0; ++ ++ fixup_block = RVA2VA(image, base_reloc_data_dir->VirtualAddress, ++ IMAGE_BASE_RELOCATION *); ++ DBGLINKER("fixup_block=%p, image=%p", fixup_block, image); ++ DBGLINKER("fixup_block info: %x %d", ++ fixup_block->VirtualAddress, fixup_block->SizeOfBlock); ++ ++ while (fixup_block->SizeOfBlock) { ++ int i; ++ WORD fixup, offset; ++ ++ size = (fixup_block->SizeOfBlock - ++ sizeof(IMAGE_BASE_RELOCATION)) / sizeof(WORD); ++ DBGLINKER("found %llu relocations in this block", ++ (uint64_t)size); ++ ++ for (i = 0; i < size; i++) { ++ fixup = fixup_block->TypeOffset[i]; ++ offset = fixup & 0xfff; ++ switch ((fixup >> 12) & 0x0f) { ++ case IMAGE_REL_BASED_ABSOLUTE: ++ break; ++ ++ case IMAGE_REL_BASED_HIGHLOW: { ++ uint32_t addr; ++ uint32_t *loc = ++ RVA2VA(image, ++ fixup_block->VirtualAddress + ++ offset, uint32_t *); ++ addr = RVA2VA(image, (*loc - base), uint32_t); ++ DBGLINKER("relocation: *%p (Val:%X)= %X", ++ loc, *loc, addr); ++ *loc = addr; ++ } ++ break; ++ ++ case IMAGE_REL_BASED_DIR64: { ++ uint64_t addr; ++ uint64_t *loc = ++ RVA2VA(image, ++ fixup_block->VirtualAddress + ++ offset, uint64_t *); ++ addr = RVA2VA(image, (*loc - base), uint64_t); ++ DBGLINKER("relocation: *%p (Val:%llX)= %llx", ++ loc, *loc, addr); ++ *loc = addr; ++ } ++ break; ++ ++ default: ++ ERROR("unknown fixup: %08X", ++ (fixup >> 12) & 0x0f); ++ return -EOPNOTSUPP; ++ break; ++ } ++ } ++ DBGLINKER("finished relocating block"); ++ ++ fixup_block = (IMAGE_BASE_RELOCATION *) ++ ((void *)fixup_block + fixup_block->SizeOfBlock); ++ }; ++ DBGLINKER("done relocating all"); ++ ++ return 0; ++} ++ ++/* Expand the image in memory if necessary. The image on disk does not ++ * necessarily maps the image of the driver in memory, so we have to ++ * re-write it in order to fulfill the sections alignments. The ++ * advantage to do that is that rva_to_va becomes a simple ++ * addition. */ ++static int fix_pe_image(struct pe_image *pe) ++{ ++ void *image; ++ IMAGE_SECTION_HEADER *sect_hdr; ++ int i, sections; ++ int image_size; ++ ++ if (pe->size == pe->opt_hdr->SizeOfImage) { ++ /* Nothing to do */ ++ return 0; ++ } ++ ++ image_size = pe->opt_hdr->SizeOfImage; ++#ifdef CONFIG_X86_64 ++#ifdef PAGE_KERNEL_EXECUTABLE ++ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM, ++ PAGE_KERNEL_EXECUTABLE); ++#elif defined PAGE_KERNEL_EXEC ++ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM, ++ PAGE_KERNEL_EXEC); ++#else ++#error x86_64 should have either PAGE_KERNEL_EXECUTABLE or PAGE_KERNEL_EXEC ++#endif ++#else ++#ifdef cpu_has_nx ++ /* hate to play with kernel macros, but PAGE_KERNEL_EXEC is ++ * not available to modules! */ ++ if (cpu_has_nx) ++ image = __vmalloc(image_size, GFP_KERNEL | __GFP_HIGHMEM, ++ __pgprot(__PAGE_KERNEL & ~_PAGE_NX)); ++ else ++ image = vmalloc(image_size); ++#else ++ image = vmalloc(image_size); ++#endif ++#endif ++ if (image == NULL) { ++ ERROR("failed to allocate enough space for new image:" ++ " %d bytes", image_size); ++ return -ENOMEM; ++ } ++ memset(image, 0, image_size); ++ ++ /* Copy all the headers, ie everything before the first section. */ ++ ++ sections = pe->nt_hdr->FileHeader.NumberOfSections; ++ sect_hdr = IMAGE_FIRST_SECTION(pe->nt_hdr); ++ ++ DBGLINKER("copying headers: %u bytes", sect_hdr->PointerToRawData); ++ ++ memcpy(image, pe->image, sect_hdr->PointerToRawData); ++ ++ /* Copy all the sections */ ++ for (i = 0; i < sections; i++) { ++ DBGLINKER("Copy section %s from %x to %x", ++ sect_hdr->Name, sect_hdr->PointerToRawData, ++ sect_hdr->VirtualAddress); ++ if (sect_hdr->VirtualAddress+sect_hdr->SizeOfRawData > ++ image_size) { ++ ERROR("Invalid section %s in driver", sect_hdr->Name); ++ vfree(image); ++ return -EINVAL; ++ } ++ ++ memcpy(image+sect_hdr->VirtualAddress, ++ pe->image + sect_hdr->PointerToRawData, ++ sect_hdr->SizeOfRawData); ++ sect_hdr++; ++ } ++ ++ vfree(pe->image); ++ pe->image = image; ++ pe->size = image_size; ++ ++ /* Update our internal pointers */ ++ pe->nt_hdr = (IMAGE_NT_HEADERS *) ++ (pe->image + ((IMAGE_DOS_HEADER *)pe->image)->e_lfanew); ++ pe->opt_hdr = &pe->nt_hdr->OptionalHeader; ++ ++ DBGLINKER("set nt headers: nt_hdr=%p, opt_hdr=%p, image=%p", ++ pe->nt_hdr, pe->opt_hdr, pe->image); ++ ++ return 0; ++} ++ ++#if defined(CONFIG_X86_64) ++static void fix_user_shared_data_addr(char *driver, unsigned long length) ++{ ++ unsigned long i, n, max_addr, *addr; ++ ++ TRACE1("fixing KI_USER_SHARED_DATA address in the driver"); ++ n = length - sizeof(unsigned long); ++ max_addr = KI_USER_SHARED_DATA + sizeof(kuser_shared_data); ++ for (i = 0; i < n; i++) { ++ addr = (unsigned long *)(driver + i); ++ if (*addr >= KI_USER_SHARED_DATA && *addr < max_addr) { ++ *addr -= KI_USER_SHARED_DATA; ++ *addr += (unsigned long)&kuser_shared_data; ++ kuser_shared_data.reserved1 = 1; ++ } ++ } ++} ++#endif ++ ++int link_pe_images(struct pe_image *pe_image, unsigned short n) ++{ ++ int i; ++ struct pe_image *pe; ++ ++#if DEBUG >= 1 ++ /* Sanity checks */ ++ CHECK_SZ(IMAGE_SECTION_HEADER, IMAGE_SIZEOF_SECTION_HEADER); ++ CHECK_SZ(IMAGE_FILE_HEADER, IMAGE_SIZEOF_FILE_HEADER); ++ CHECK_SZ(IMAGE_OPTIONAL_HEADER, IMAGE_SIZEOF_NT_OPTIONAL_HEADER); ++ CHECK_SZ(IMAGE_NT_HEADERS, 4 + IMAGE_SIZEOF_FILE_HEADER + ++ IMAGE_SIZEOF_NT_OPTIONAL_HEADER); ++ CHECK_SZ(IMAGE_DOS_HEADER, 0x40); ++ CHECK_SZ(IMAGE_EXPORT_DIRECTORY, 40); ++ CHECK_SZ(IMAGE_BASE_RELOCATION, 8); ++ CHECK_SZ(IMAGE_IMPORT_DESCRIPTOR, 20); ++#endif ++ ++ for (i = 0; i < n; i++) { ++ IMAGE_DOS_HEADER *dos_hdr; ++ pe = &pe_image[i]; ++ dos_hdr = pe->image; ++ ++ if (pe->size < sizeof(IMAGE_DOS_HEADER)) { ++ TRACE1("image too small: %d", pe->size); ++ return -EINVAL; ++ } ++ ++ pe->nt_hdr = ++ (IMAGE_NT_HEADERS *)(pe->image + dos_hdr->e_lfanew); ++ pe->opt_hdr = &pe->nt_hdr->OptionalHeader; ++ ++ pe->type = check_nt_hdr(pe->nt_hdr); ++ if (pe->type <= 0) { ++ TRACE1("type <= 0"); ++ return -EINVAL; ++ } ++ ++ if (fix_pe_image(pe)) { ++ TRACE1("bad PE image"); ++ return -EINVAL; ++ } ++ ++ if (read_exports(pe)) { ++ TRACE1("read exports failed"); ++ return -EINVAL; ++ } ++ } ++ ++ for (i = 0; i < n; i++) { ++ pe = &pe_image[i]; ++ ++ if (fixup_reloc(pe->image, pe->nt_hdr)) { ++ TRACE1("fixup reloc failed"); ++ return -EINVAL; ++ } ++ if (fixup_imports(pe->image, pe->nt_hdr)) { ++ TRACE1("fixup imports failed"); ++ return -EINVAL; ++ } ++#if defined(CONFIG_X86_64) ++ fix_user_shared_data_addr(pe_image[i].image, pe_image[i].size); ++#endif ++ flush_icache_range((unsigned long)pe->image, pe->size); ++ ++ pe->entry = ++ RVA2VA(pe->image, ++ pe->opt_hdr->AddressOfEntryPoint, void *); ++ TRACE1("entry is at %p, rva at %08X", pe->entry, ++ pe->opt_hdr->AddressOfEntryPoint); ++ } ++ ++ for (i = 0; i < n; i++) { ++ pe = &pe_image[i]; ++ ++ if (pe->type == IMAGE_FILE_DLL) { ++ struct unicode_string ustring; ++ char *buf = "0/0t0m0p00"; ++ int (*dll_entry)(struct unicode_string *ustring) ++ wstdcall; ++ ++ memset(&ustring, 0, sizeof(ustring)); ++ ustring.buf = (wchar_t *)buf; ++ dll_entry = (void *)get_dll_init(pe->name); ++ ++ TRACE1("calling dll_init at %p", dll_entry); ++ if (!dll_entry || dll_entry(&ustring)) ++ ERROR("DLL initialize failed for %s", ++ pe->name); ++ } ++ else if (pe->type != IMAGE_FILE_EXECUTABLE_IMAGE) ++ ERROR("illegal image type: %d", pe->type); ++ } ++ return 0; ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.h +--- linux-3.12.2/3rdparty/ndiswrapper/pe_linker.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pe_linker.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,992 @@ ++/* ++ * This file is an excerpt of winnt.h from WINE, which bears the ++ * following copyright: ++ * ++ * Win32 definitions for Windows NT ++ * ++ * Copyright 1996 Alexandre Julliard ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++/* ++ * File formats definitions ++ */ ++typedef struct _IMAGE_DOS_HEADER { ++ WORD e_magic; /* 00: MZ Header signature */ ++ WORD e_cblp; /* 02: Bytes on last page of file */ ++ WORD e_cp; /* 04: Pages in file */ ++ WORD e_crlc; /* 06: Relocations */ ++ WORD e_cparhdr; /* 08: Size of header in paragraphs */ ++ WORD e_minalloc; /* 0a: Minimum extra paragraphs needed */ ++ WORD e_maxalloc; /* 0c: Maximum extra paragraphs needed */ ++ WORD e_ss; /* 0e: Initial (relative) SS value */ ++ WORD e_sp; /* 10: Initial SP value */ ++ WORD e_csum; /* 12: Checksum */ ++ WORD e_ip; /* 14: Initial IP value */ ++ WORD e_cs; /* 16: Initial (relative) CS value */ ++ WORD e_lfarlc; /* 18: File address of relocation table */ ++ WORD e_ovno; /* 1a: Overlay number */ ++ WORD e_res[4]; /* 1c: Reserved words */ ++ WORD e_oemid; /* 24: OEM identifier (for e_oeminfo) */ ++ WORD e_oeminfo; /* 26: OEM information; e_oemid specific */ ++ WORD e_res2[10]; /* 28: Reserved words */ ++ DWORD e_lfanew; /* 3c: Offset to extended header */ ++} IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER; ++ ++#define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */ ++#define IMAGE_OS2_SIGNATURE 0x454E /* NE */ ++#define IMAGE_OS2_SIGNATURE_LE 0x454C /* LE */ ++#define IMAGE_OS2_SIGNATURE_LX 0x584C /* LX */ ++#define IMAGE_VXD_SIGNATURE 0x454C /* LE */ ++#define IMAGE_NT_SIGNATURE 0x00004550 /* PE00 */ ++ ++/* ++ * This is the Windows executable (NE) header. ++ * the name IMAGE_OS2_HEADER is misleading, but in the SDK this way. ++ */ ++typedef struct ++{ ++ WORD ne_magic; /* 00 NE signature 'NE' */ ++ BYTE ne_ver; /* 02 Linker version number */ ++ BYTE ne_rev; /* 03 Linker revision number */ ++ WORD ne_enttab; /* 04 Offset to entry table relative to NE */ ++ WORD ne_cbenttab; /* 06 Length of entry table in bytes */ ++ LONG ne_crc; /* 08 Checksum */ ++ WORD ne_flags; /* 0c Flags about segments in this file */ ++ WORD ne_autodata; /* 0e Automatic data segment number */ ++ WORD ne_heap; /* 10 Initial size of local heap */ ++ WORD ne_stack; /* 12 Initial size of stack */ ++ DWORD ne_csip; /* 14 Initial CS:IP */ ++ DWORD ne_sssp; /* 18 Initial SS:SP */ ++ WORD ne_cseg; /* 1c # of entries in segment table */ ++ WORD ne_cmod; /* 1e # of entries in module reference tab. */ ++ WORD ne_cbnrestab; /* 20 Length of nonresident-name table */ ++ WORD ne_segtab; /* 22 Offset to segment table */ ++ WORD ne_rsrctab; /* 24 Offset to resource table */ ++ WORD ne_restab; /* 26 Offset to resident-name table */ ++ WORD ne_modtab; /* 28 Offset to module reference table */ ++ WORD ne_imptab; /* 2a Offset to imported name table */ ++ DWORD ne_nrestab; /* 2c Offset to nonresident-name table */ ++ WORD ne_cmovent; /* 30 # of movable entry points */ ++ WORD ne_align; /* 32 Logical sector alignment shift count */ ++ WORD ne_cres; /* 34 # of resource segments */ ++ BYTE ne_exetyp; /* 36 Flags indicating target OS */ ++ BYTE ne_flagsothers; /* 37 Additional information flags */ ++ WORD ne_pretthunks; /* 38 Offset to return thunks */ ++ WORD ne_psegrefbytes; /* 3a Offset to segment ref. bytes */ ++ WORD ne_swaparea; /* 3c Reserved by Microsoft */ ++ WORD ne_expver; /* 3e Expected Windows version number */ ++} IMAGE_OS2_HEADER, *PIMAGE_OS2_HEADER; ++ ++typedef struct _IMAGE_VXD_HEADER { ++ WORD e32_magic; ++ BYTE e32_border; ++ BYTE e32_worder; ++ DWORD e32_level; ++ WORD e32_cpu; ++ WORD e32_os; ++ DWORD e32_ver; ++ DWORD e32_mflags; ++ DWORD e32_mpages; ++ DWORD e32_startobj; ++ DWORD e32_eip; ++ DWORD e32_stackobj; ++ DWORD e32_esp; ++ DWORD e32_pagesize; ++ DWORD e32_lastpagesize; ++ DWORD e32_fixupsize; ++ DWORD e32_fixupsum; ++ DWORD e32_ldrsize; ++ DWORD e32_ldrsum; ++ DWORD e32_objtab; ++ DWORD e32_objcnt; ++ DWORD e32_objmap; ++ DWORD e32_itermap; ++ DWORD e32_rsrctab; ++ DWORD e32_rsrccnt; ++ DWORD e32_restab; ++ DWORD e32_enttab; ++ DWORD e32_dirtab; ++ DWORD e32_dircnt; ++ DWORD e32_fpagetab; ++ DWORD e32_frectab; ++ DWORD e32_impmod; ++ DWORD e32_impmodcnt; ++ DWORD e32_impproc; ++ DWORD e32_pagesum; ++ DWORD e32_datapage; ++ DWORD e32_preload; ++ DWORD e32_nrestab; ++ DWORD e32_cbnrestab; ++ DWORD e32_nressum; ++ DWORD e32_autodata; ++ DWORD e32_debuginfo; ++ DWORD e32_debuglen; ++ DWORD e32_instpreload; ++ DWORD e32_instdemand; ++ DWORD e32_heapsize; ++ BYTE e32_res3[12]; ++ DWORD e32_winresoff; ++ DWORD e32_winreslen; ++ WORD e32_devid; ++ WORD e32_ddkver; ++} IMAGE_VXD_HEADER, *PIMAGE_VXD_HEADER; ++ ++/* These defines describe the meanings of the bits in the ++ Characteristics field */ ++ ++#define IMAGE_FILE_RELOCS_STRIPPED 0x0001 /* No relocation info */ ++#define IMAGE_FILE_EXECUTABLE_IMAGE 0x0002 ++#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 ++#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 ++#define IMAGE_FILE_AGGRESIVE_WS_TRIM 0x0010 ++#define IMAGE_FILE_LARGE_ADDRESS_AWARE 0x0020 ++#define IMAGE_FILE_16BIT_MACHINE 0x0040 ++#define IMAGE_FILE_BYTES_REVERSED_LO 0x0080 ++#define IMAGE_FILE_32BIT_MACHINE 0x0100 ++#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 ++#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP 0x0400 ++#define IMAGE_FILE_NET_RUN_FROM_SWAP 0x0800 ++#define IMAGE_FILE_SYSTEM 0x1000 ++#define IMAGE_FILE_DLL 0x2000 ++#define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000 ++#define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 ++ ++/* These are the settings of the Machine field. */ ++#define IMAGE_FILE_MACHINE_UNKNOWN 0 ++#define IMAGE_FILE_MACHINE_I860 0x014d ++#define IMAGE_FILE_MACHINE_I386 0x014c ++#define IMAGE_FILE_MACHINE_R3000 0x0162 ++#define IMAGE_FILE_MACHINE_R4000 0x0166 ++#define IMAGE_FILE_MACHINE_R10000 0x0168 ++#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x0169 ++#define IMAGE_FILE_MACHINE_ALPHA 0x0184 ++#define IMAGE_FILE_MACHINE_SH3 0x01a2 ++#define IMAGE_FILE_MACHINE_SH3DSP 0x01a3 ++#define IMAGE_FILE_MACHINE_SH3E 0x01a4 ++#define IMAGE_FILE_MACHINE_SH4 0x01a6 ++#define IMAGE_FILE_MACHINE_SH5 0x01a8 ++#define IMAGE_FILE_MACHINE_ARM 0x01c0 ++#define IMAGE_FILE_MACHINE_THUMB 0x01c2 ++#define IMAGE_FILE_MACHINE_AM33 0x01d3 ++#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 ++#define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 ++#define IMAGE_FILE_MACHINE_IA64 0x0200 ++#define IMAGE_FILE_MACHINE_MIPS16 0x0266 ++#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 ++#define IMAGE_FILE_MACHINE_MIPSFPU 0x0366 ++#define IMAGE_FILE_MACHINE_MIPSFPU16 0x0466 ++#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 ++#define IMAGE_FILE_MACHINE_TRICORE 0x0520 ++#define IMAGE_FILE_MACHINE_CEF 0x0cef ++#define IMAGE_FILE_MACHINE_EBC 0x0ebc ++#define IMAGE_FILE_MACHINE_AMD64 0x8664 ++#define IMAGE_FILE_MACHINE_M32R 0x9041 ++#define IMAGE_FILE_MACHINE_CEE 0xc0ee ++ ++#define IMAGE_SIZEOF_FILE_HEADER 20 ++#define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56 ++#define IMAGE_SIZEOF_STD_OPTIONAL_HEADER 28 ++#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER32 224 ++#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER64 240 ++#define IMAGE_SIZEOF_SHORT_NAME 8 ++#define IMAGE_SIZEOF_SECTION_HEADER 40 ++#define IMAGE_SIZEOF_SYMBOL 18 ++#define IMAGE_SIZEOF_AUX_SYMBOL 18 ++#define IMAGE_SIZEOF_RELOCATION 10 ++#define IMAGE_SIZEOF_BASE_RELOCATION 8 ++#define IMAGE_SIZEOF_LINENUMBER 6 ++#define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60 ++ ++/* Possible Magic values */ ++#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b ++#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b ++#define IMAGE_ROM_OPTIONAL_HDR_MAGIC 0x0107 ++ ++#ifdef CONFIG_X86_64 ++#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER IMAGE_SIZEOF_NT_OPTIONAL_HEADER64 ++#define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC ++#else ++#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER IMAGE_SIZEOF_NT_OPTIONAL_HEADER32 ++#define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC ++#endif ++ ++/* These are indexes into the DataDirectory array */ ++#define IMAGE_FILE_EXPORT_DIRECTORY 0 ++#define IMAGE_FILE_IMPORT_DIRECTORY 1 ++#define IMAGE_FILE_RESOURCE_DIRECTORY 2 ++#define IMAGE_FILE_EXCEPTION_DIRECTORY 3 ++#define IMAGE_FILE_SECURITY_DIRECTORY 4 ++#define IMAGE_FILE_BASE_RELOCATION_TABLE 5 ++#define IMAGE_FILE_DEBUG_DIRECTORY 6 ++#define IMAGE_FILE_DESCRIPTION_STRING 7 ++#define IMAGE_FILE_MACHINE_VALUE 8 /* Mips */ ++#define IMAGE_FILE_THREAD_LOCAL_STORAGE 9 ++#define IMAGE_FILE_CALLBACK_DIRECTORY 10 ++ ++/* Directory Entries, indices into the DataDirectory array */ ++ ++#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 ++#define IMAGE_DIRECTORY_ENTRY_IMPORT 1 ++#define IMAGE_DIRECTORY_ENTRY_RESOURCE 2 ++#define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3 ++#define IMAGE_DIRECTORY_ENTRY_SECURITY 4 ++#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 ++#define IMAGE_DIRECTORY_ENTRY_DEBUG 6 ++#define IMAGE_DIRECTORY_ENTRY_COPYRIGHT 7 ++#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR 8 /* (MIPS GP) */ ++#define IMAGE_DIRECTORY_ENTRY_TLS 9 ++#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10 ++#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT 11 ++#define IMAGE_DIRECTORY_ENTRY_IAT 12 /* Import Address Table */ ++#define IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT 13 ++#define IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR 14 ++ ++/* Subsystem Values */ ++ ++#define IMAGE_SUBSYSTEM_UNKNOWN 0 ++#define IMAGE_SUBSYSTEM_NATIVE 1 ++#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 /* Windows GUI subsystem */ ++#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 /* Windows character subsystem */ ++#define IMAGE_SUBSYSTEM_OS2_CUI 5 ++#define IMAGE_SUBSYSTEM_POSIX_CUI 7 ++#define IMAGE_SUBSYSTEM_NATIVE_WINDOWS 8 /* native Win9x driver */ ++#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9 /* Windows CE subsystem */ ++#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 ++#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 ++#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 ++#define IMAGE_SUBSYSTEM_EFI_ROM 13 ++#define IMAGE_SUBSYSTEM_XBOX 14 ++ ++typedef struct _IMAGE_FILE_HEADER { ++ WORD Machine; ++ WORD NumberOfSections; ++ DWORD TimeDateStamp; ++ DWORD PointerToSymbolTable; ++ DWORD NumberOfSymbols; ++ WORD SizeOfOptionalHeader; ++ WORD Characteristics; ++} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; ++ ++typedef struct _IMAGE_DATA_DIRECTORY { ++ DWORD VirtualAddress; ++ DWORD Size; ++} IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY; ++ ++#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 ++ ++typedef struct _IMAGE_OPTIONAL_HEADER32 { ++ ++ /* Standard fields */ ++ ++ WORD Magic; ++ BYTE MajorLinkerVersion; ++ BYTE MinorLinkerVersion; ++ DWORD SizeOfCode; ++ DWORD SizeOfInitializedData; ++ DWORD SizeOfUninitializedData; ++ DWORD AddressOfEntryPoint; ++ DWORD BaseOfCode; ++ DWORD BaseOfData; ++ ++ /* NT additional fields */ ++ DWORD ImageBase; ++ DWORD SectionAlignment; ++ DWORD FileAlignment; ++ WORD MajorOperatingSystemVersion; ++ WORD MinorOperatingSystemVersion; ++ WORD MajorImageVersion; ++ WORD MinorImageVersion; ++ WORD MajorSubsystemVersion; ++ WORD MinorSubsystemVersion; ++ DWORD Win32VersionValue; ++ DWORD SizeOfImage; ++ DWORD SizeOfHeaders; ++ DWORD CheckSum; ++ WORD Subsystem; ++ WORD DllCharacteristics; ++ DWORD SizeOfStackReserve; ++ DWORD SizeOfStackCommit; ++ DWORD SizeOfHeapReserve; ++ DWORD SizeOfHeapCommit; ++ DWORD LoaderFlags; ++ DWORD NumberOfRvaAndSizes; ++ IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; ++} IMAGE_OPTIONAL_HEADER32, *PIMAGE_OPTIONAL_HEADER32; ++ ++typedef struct _IMAGE_OPTIONAL_HEADER64 { ++ ++ /* Standard fields */ ++ ++ WORD Magic; ++ BYTE MajorLinkerVersion; ++ BYTE MinorLinkerVersion; ++ DWORD SizeOfCode; ++ DWORD SizeOfInitializedData; ++ DWORD SizeOfUninitializedData; ++ DWORD AddressOfEntryPoint; ++ DWORD BaseOfCode; ++ ++ /* NT additional fields */ ++ ULONGLONG ImageBase; ++ DWORD SectionAlignment; ++ DWORD FileAlignment; ++ WORD MajorOperatingSystemVersion; ++ WORD MinorOperatingSystemVersion; ++ WORD MajorImageVersion; ++ WORD MinorImageVersion; ++ WORD MajorSubsystemVersion; ++ WORD MinorSubsystemVersion; ++ DWORD Win32VersionValue; ++ DWORD SizeOfImage; ++ DWORD SizeOfHeaders; ++ DWORD CheckSum; ++ WORD Subsystem; ++ WORD DllCharacteristics; ++ ULONGLONG SizeOfStackReserve; ++ ULONGLONG SizeOfStackCommit; ++ ULONGLONG SizeOfHeapReserve; ++ ULONGLONG SizeOfHeapCommit; ++ DWORD LoaderFlags; ++ DWORD NumberOfRvaAndSizes; ++ IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; ++} IMAGE_OPTIONAL_HEADER64, *PIMAGE_OPTIONAL_HEADER64; ++ ++#ifdef CONFIG_X86_64 ++typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; ++typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; ++#else ++typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; ++typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; ++#endif ++ ++typedef struct _IMAGE_NT_HEADERS32 { ++ DWORD Signature; /* "PE"\0\0 */ /* 0x00 */ ++ IMAGE_FILE_HEADER FileHeader; /* 0x04 */ ++ IMAGE_OPTIONAL_HEADER32 OptionalHeader; /* 0x18 */ ++} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; ++ ++typedef struct _IMAGE_NT_HEADERS64 { ++ DWORD Signature; /* "PE"\0\0 */ /* 0x00 */ ++ IMAGE_FILE_HEADER FileHeader; /* 0x04 */ ++ IMAGE_OPTIONAL_HEADER64 OptionalHeader; /* 0x18 */ ++} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64; ++ ++#ifdef CONFIG_X86_64 ++typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; ++typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; ++#else ++typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; ++typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; ++#endif ++ ++#define IMAGE_SIZEOF_SHORT_NAME 8 ++ ++typedef struct _IMAGE_SECTION_HEADER { ++ BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; ++ union { ++ DWORD PhysicalAddress; ++ DWORD VirtualSize; ++ } Misc; ++ DWORD VirtualAddress; ++ DWORD SizeOfRawData; ++ DWORD PointerToRawData; ++ DWORD PointerToRelocations; ++ DWORD PointerToLinenumbers; ++ WORD NumberOfRelocations; ++ WORD NumberOfLinenumbers; ++ DWORD Characteristics; ++} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER; ++ ++#define IMAGE_SIZEOF_SECTION_HEADER 40 ++ ++#define IMAGE_FIRST_SECTION(ntheader) \ ++((PIMAGE_SECTION_HEADER)((LPBYTE)&((PIMAGE_NT_HEADERS)(ntheader))->OptionalHeader + \ ++((PIMAGE_NT_HEADERS)(ntheader))->FileHeader.SizeOfOptionalHeader)) ++ ++/* These defines are for the Characteristics bitfield. */ ++/* #define IMAGE_SCN_TYPE_REG 0x00000000 - Reserved */ ++/* #define IMAGE_SCN_TYPE_DSECT 0x00000001 - Reserved */ ++/* #define IMAGE_SCN_TYPE_NOLOAD 0x00000002 - Reserved */ ++/* #define IMAGE_SCN_TYPE_GROUP 0x00000004 - Reserved */ ++#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 /* Reserved */ ++/* #define IMAGE_SCN_TYPE_COPY 0x00000010 - Reserved */ ++ ++#define IMAGE_SCN_CNT_CODE 0x00000020 ++#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 ++#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 ++ ++#define IMAGE_SCN_LNK_OTHER 0x00000100 ++#define IMAGE_SCN_LNK_INFO 0x00000200 ++/* #define IMAGE_SCN_TYPE_OVER 0x00000400 - Reserved */ ++#define IMAGE_SCN_LNK_REMOVE 0x00000800 ++#define IMAGE_SCN_LNK_COMDAT 0x00001000 ++ ++/* 0x00002000 - Reserved */ ++/* #define IMAGE_SCN_MEM_PROTECTED 0x00004000 - Obsolete */ ++#define IMAGE_SCN_MEM_FARDATA 0x00008000 ++ ++/* #define IMAGE_SCN_MEM_SYSHEAP 0x00010000 - Obsolete */ ++#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 ++#define IMAGE_SCN_MEM_16BIT 0x00020000 ++#define IMAGE_SCN_MEM_LOCKED 0x00040000 ++#define IMAGE_SCN_MEM_PRELOAD 0x00080000 ++ ++#define IMAGE_SCN_ALIGN_1BYTES 0x00100000 ++#define IMAGE_SCN_ALIGN_2BYTES 0x00200000 ++#define IMAGE_SCN_ALIGN_4BYTES 0x00300000 ++#define IMAGE_SCN_ALIGN_8BYTES 0x00400000 ++#define IMAGE_SCN_ALIGN_16BYTES 0x00500000 /* Default */ ++#define IMAGE_SCN_ALIGN_32BYTES 0x00600000 ++#define IMAGE_SCN_ALIGN_64BYTES 0x00700000 ++#define IMAGE_SCN_ALIGN_128BYTES 0x00800000 ++#define IMAGE_SCN_ALIGN_256BYTES 0x00900000 ++#define IMAGE_SCN_ALIGN_512BYTES 0x00A00000 ++#define IMAGE_SCN_ALIGN_1024BYTES 0x00B00000 ++#define IMAGE_SCN_ALIGN_2048BYTES 0x00C00000 ++#define IMAGE_SCN_ALIGN_4096BYTES 0x00D00000 ++#define IMAGE_SCN_ALIGN_8192BYTES 0x00E00000 ++/* 0x00F00000 - Unused */ ++#define IMAGE_SCN_ALIGN_MASK 0x00F00000 ++ ++#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 ++ ++ ++#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 ++#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 ++#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 ++#define IMAGE_SCN_MEM_SHARED 0x10000000 ++#define IMAGE_SCN_MEM_EXECUTE 0x20000000 ++#define IMAGE_SCN_MEM_READ 0x40000000 ++#define IMAGE_SCN_MEM_WRITE 0x80000000 ++ ++typedef struct _IMAGE_SYMBOL { ++ union { ++ BYTE ShortName[8]; ++ struct { ++ DWORD Short; ++ DWORD Long; ++ } Name; ++ DWORD LongName[2]; ++ } N; ++ DWORD Value; ++ SHORT SectionNumber; ++ WORD Type; ++ BYTE StorageClass; ++ BYTE NumberOfAuxSymbols; ++} IMAGE_SYMBOL; ++typedef IMAGE_SYMBOL *PIMAGE_SYMBOL; ++ ++#define IMAGE_SIZEOF_SYMBOL 18 ++ ++typedef struct _IMAGE_LINENUMBER { ++ union { ++ DWORD SymbolTableIndex; ++ DWORD VirtualAddress; ++ } Type; ++ WORD Linenumber; ++} IMAGE_LINENUMBER; ++typedef IMAGE_LINENUMBER *PIMAGE_LINENUMBER; ++ ++#define IMAGE_SIZEOF_LINENUMBER 6 ++ ++typedef union _IMAGE_AUX_SYMBOL { ++ struct { ++ DWORD TagIndex; ++ union { ++ struct { ++ WORD Linenumber; ++ WORD Size; ++ } LnSz; ++ DWORD TotalSize; ++ } Misc; ++ union { ++ struct { ++ DWORD PointerToLinenumber; ++ DWORD PointerToNextFunction; ++ } Function; ++ struct { ++ WORD Dimension[4]; ++ } Array; ++ } FcnAry; ++ WORD TvIndex; ++ } Sym; ++ struct { ++ BYTE Name[IMAGE_SIZEOF_SYMBOL]; ++ } File; ++ struct { ++ DWORD Length; ++ WORD NumberOfRelocations; ++ WORD NumberOfLinenumbers; ++ DWORD CheckSum; ++ SHORT Number; ++ BYTE Selection; ++ } Section; ++} IMAGE_AUX_SYMBOL; ++typedef IMAGE_AUX_SYMBOL *PIMAGE_AUX_SYMBOL; ++ ++#define IMAGE_SIZEOF_AUX_SYMBOL 18 ++ ++#define IMAGE_SYM_UNDEFINED (SHORT)0 ++#define IMAGE_SYM_ABSOLUTE (SHORT)-1 ++#define IMAGE_SYM_DEBUG (SHORT)-2 ++ ++#define IMAGE_SYM_TYPE_NULL 0x0000 ++#define IMAGE_SYM_TYPE_VOID 0x0001 ++#define IMAGE_SYM_TYPE_CHAR 0x0002 ++#define IMAGE_SYM_TYPE_SHORT 0x0003 ++#define IMAGE_SYM_TYPE_INT 0x0004 ++#define IMAGE_SYM_TYPE_LONG 0x0005 ++#define IMAGE_SYM_TYPE_FLOAT 0x0006 ++#define IMAGE_SYM_TYPE_DOUBLE 0x0007 ++#define IMAGE_SYM_TYPE_STRUCT 0x0008 ++#define IMAGE_SYM_TYPE_UNION 0x0009 ++#define IMAGE_SYM_TYPE_ENUM 0x000A ++#define IMAGE_SYM_TYPE_MOE 0x000B ++#define IMAGE_SYM_TYPE_BYTE 0x000C ++#define IMAGE_SYM_TYPE_WORD 0x000D ++#define IMAGE_SYM_TYPE_UINT 0x000E ++#define IMAGE_SYM_TYPE_DWORD 0x000F ++#define IMAGE_SYM_TYPE_PCODE 0x8000 ++ ++#define IMAGE_SYM_DTYPE_NULL 0 ++#define IMAGE_SYM_DTYPE_POINTER 1 ++#define IMAGE_SYM_DTYPE_FUNCTION 2 ++#define IMAGE_SYM_DTYPE_ARRAY 3 ++ ++#define IMAGE_SYM_CLASS_END_OF_FUNCTION (BYTE )-1 ++#define IMAGE_SYM_CLASS_NULL 0x0000 ++#define IMAGE_SYM_CLASS_AUTOMATIC 0x0001 ++#define IMAGE_SYM_CLASS_EXTERNAL 0x0002 ++#define IMAGE_SYM_CLASS_STATIC 0x0003 ++#define IMAGE_SYM_CLASS_REGISTER 0x0004 ++#define IMAGE_SYM_CLASS_EXTERNAL_DEF 0x0005 ++#define IMAGE_SYM_CLASS_LABEL 0x0006 ++#define IMAGE_SYM_CLASS_UNDEFINED_LABEL 0x0007 ++#define IMAGE_SYM_CLASS_MEMBER_OF_STRUCT 0x0008 ++#define IMAGE_SYM_CLASS_ARGUMENT 0x0009 ++#define IMAGE_SYM_CLASS_STRUCT_TAG 0x000A ++#define IMAGE_SYM_CLASS_MEMBER_OF_UNION 0x000B ++#define IMAGE_SYM_CLASS_UNION_TAG 0x000C ++#define IMAGE_SYM_CLASS_TYPE_DEFINITION 0x000D ++#define IMAGE_SYM_CLASS_UNDEFINED_STATIC 0x000E ++#define IMAGE_SYM_CLASS_ENUM_TAG 0x000F ++#define IMAGE_SYM_CLASS_MEMBER_OF_ENUM 0x0010 ++#define IMAGE_SYM_CLASS_REGISTER_PARAM 0x0011 ++#define IMAGE_SYM_CLASS_BIT_FIELD 0x0012 ++ ++#define IMAGE_SYM_CLASS_FAR_EXTERNAL 0x0044 ++#define IMAGE_SYM_CLASS_BLOCK 0x0064 ++#define IMAGE_SYM_CLASS_FUNCTION 0x0065 ++#define IMAGE_SYM_CLASS_END_OF_STRUCT 0x0066 ++#define IMAGE_SYM_CLASS_FILE 0x0067 ++#define IMAGE_SYM_CLASS_SECTION 0x0068 ++#define IMAGE_SYM_CLASS_WEAK_EXTERNAL 0x0069 ++ ++#define N_BTMASK 0x000F ++#define N_TMASK 0x0030 ++#define N_TMASK1 0x00C0 ++#define N_TMASK2 0x00F0 ++#define N_BTSHFT 4 ++#define N_TSHIFT 2 ++ ++#define BTYPE(x) ((x) & N_BTMASK) ++ ++#ifndef ISPTR ++#define ISPTR(x) (((x) & N_TMASK) == (IMAGE_SYM_DTYPE_POINTER << N_BTSHFT)) ++#endif ++ ++#ifndef ISFCN ++#define ISFCN(x) (((x) & N_TMASK) == (IMAGE_SYM_DTYPE_FUNCTION << N_BTSHFT)) ++#endif ++ ++#ifndef ISARY ++#define ISARY(x) (((x) & N_TMASK) == (IMAGE_SYM_DTYPE_ARRAY << N_BTSHFT)) ++#endif ++ ++#ifndef ISTAG ++#define ISTAG(x) ((x)==IMAGE_SYM_CLASS_STRUCT_TAG || (x)==IMAGE_SYM_CLASS_UNION_TAG || (x)==IMAGE_SYM_CLASS_ENUM_TAG) ++#endif ++ ++#ifndef INCREF ++#define INCREF(x) ((((x)&~N_BTMASK)<>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK)) ++#endif ++ ++#define IMAGE_COMDAT_SELECT_NODUPLICATES 1 ++#define IMAGE_COMDAT_SELECT_ANY 2 ++#define IMAGE_COMDAT_SELECT_SAME_SIZE 3 ++#define IMAGE_COMDAT_SELECT_EXACT_MATCH 4 ++#define IMAGE_COMDAT_SELECT_ASSOCIATIVE 5 ++#define IMAGE_COMDAT_SELECT_LARGEST 6 ++#define IMAGE_COMDAT_SELECT_NEWEST 7 ++ ++#define IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY 1 ++#define IMAGE_WEAK_EXTERN_SEARCH_LIBRARY 2 ++#define IMAGE_WEAK_EXTERN_SEARCH_ALIAS 3 ++ ++/* Export module directory */ ++ ++typedef struct _IMAGE_EXPORT_DIRECTORY { ++ DWORD Characteristics; ++ DWORD TimeDateStamp; ++ WORD MajorVersion; ++ WORD MinorVersion; ++ DWORD Name; ++ DWORD Base; ++ DWORD NumberOfFunctions; ++ DWORD NumberOfNames; ++ DWORD AddressOfFunctions; ++ DWORD AddressOfNames; ++ DWORD AddressOfNameOrdinals; ++} IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY; ++ ++/* Import name entry */ ++typedef struct _IMAGE_IMPORT_BY_NAME { ++ WORD Hint; ++ BYTE Name[1]; ++} IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME; ++ ++/* Import thunk */ ++typedef struct _IMAGE_THUNK_DATA32 { ++ union { ++ DWORD ForwarderString; ++ DWORD Function; ++ DWORD Ordinal; ++ DWORD AddressOfData; ++ } u1; ++} IMAGE_THUNK_DATA32,*PIMAGE_THUNK_DATA32; ++ ++typedef struct _IMAGE_THUNK_DATA64 { ++ union { ++ ULONGLONG ForwarderString; ++ ULONGLONG Function; ++ ULONGLONG Ordinal; ++ ULONGLONG AddressOfData; ++ } u1; ++} IMAGE_THUNK_DATA64,*PIMAGE_THUNK_DATA64; ++ ++#ifdef CONFIG_X86_64 ++typedef IMAGE_THUNK_DATA32 IMAGE_THUNK_DATA; ++typedef PIMAGE_THUNK_DATA32 PIMAGE_THUNK_DATA; ++#else ++typedef IMAGE_THUNK_DATA64 IMAGE_THUNK_DATA; ++typedef PIMAGE_THUNK_DATA64 PIMAGE_THUNK_DATA; ++#endif ++ ++/* Import module directory */ ++ ++typedef struct __packed _IMAGE_IMPORT_DESCRIPTOR { ++ union { ++ DWORD Characteristics; /* 0 for terminating null ++ * import descriptor */ ++ DWORD OriginalFirstThunk; /* RVA to original unbound ++ * IAT */ ++ } u; ++ DWORD TimeDateStamp; /* 0 if not bound, ++ * -1 if bound, and real date\time stamp ++ * in IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT ++ * (new BIND) ++ * otherwise date/time stamp of DLL bound to ++ * (Old BIND) ++ */ ++ DWORD ForwarderChain; /* -1 if no forwarders */ ++ DWORD Name; ++ /* RVA to IAT (if bound this IAT has actual addresses) */ ++ DWORD FirstThunk; ++} IMAGE_IMPORT_DESCRIPTOR,*PIMAGE_IMPORT_DESCRIPTOR; ++ ++#define IMAGE_ORDINAL_FLAG32 0x80000000 ++#define IMAGE_ORDINAL_FLAG64 0x8000000000000000UL ++#define IMAGE_SNAP_BY_ORDINAL32(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG32) != 0) ++#define IMAGE_SNAP_BY_ORDINAL64(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG64) != 0) ++#define IMAGE_ORDINAL(Ordinal) (Ordinal & 0xffff) ++ ++#ifdef CONFIG_X86_64 ++#define IMAGE_ORDINAL_FLAG IMAGE_ORDINAL_FLAG64 ++#define IMAGE_SNAP_BY_ORDINAL IMAGE_SNAP_BY_ORDINAL64 ++#else ++#define IMAGE_ORDINAL_FLAG IMAGE_ORDINAL_FLAG32 ++#define IMAGE_SNAP_BY_ORDINAL IMAGE_SNAP_BY_ORDINAL32 ++#endif ++ ++typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR ++{ ++ DWORD TimeDateStamp; ++ WORD OffsetModuleName; ++ WORD NumberOfModuleForwarderRefs; ++/* Array of zero or more IMAGE_BOUND_FORWARDER_REF follows */ ++} IMAGE_BOUND_IMPORT_DESCRIPTOR, *PIMAGE_BOUND_IMPORT_DESCRIPTOR; ++ ++typedef struct _IMAGE_BOUND_FORWARDER_REF ++{ ++ DWORD TimeDateStamp; ++ WORD OffsetModuleName; ++ WORD Reserved; ++} IMAGE_BOUND_FORWARDER_REF, *PIMAGE_BOUND_FORWARDER_REF; ++ ++typedef struct _IMAGE_BASE_RELOCATION ++{ ++ DWORD VirtualAddress; ++ DWORD SizeOfBlock; ++ WORD TypeOffset[0]; ++} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; ++ ++typedef struct _IMAGE_RELOCATION ++{ ++ union { ++ DWORD VirtualAddress; ++ DWORD RelocCount; ++ } DUMMYUNIONNAME; ++ DWORD SymbolTableIndex; ++ WORD Type; ++} IMAGE_RELOCATION, *PIMAGE_RELOCATION; ++ ++#define IMAGE_SIZEOF_RELOCATION 10 ++ ++/* generic relocation types */ ++#define IMAGE_REL_BASED_ABSOLUTE 0 ++#define IMAGE_REL_BASED_HIGH 1 ++#define IMAGE_REL_BASED_LOW 2 ++#define IMAGE_REL_BASED_HIGHLOW 3 ++#define IMAGE_REL_BASED_HIGHADJ 4 ++#define IMAGE_REL_BASED_MIPS_JMPADDR 5 ++#define IMAGE_REL_BASED_SECTION 6 ++#define IMAGE_REL_BASED_REL 7 ++#define IMAGE_REL_BASED_MIPS_JMPADDR16 9 ++#define IMAGE_REL_BASED_IA64_IMM64 9 /* yes, 9 too */ ++#define IMAGE_REL_BASED_DIR64 10 ++#define IMAGE_REL_BASED_HIGH3ADJ 11 ++ ++/* I386 relocation types */ ++#define IMAGE_REL_I386_ABSOLUTE 0 ++#define IMAGE_REL_I386_DIR16 1 ++#define IMAGE_REL_I386_REL16 2 ++#define IMAGE_REL_I386_DIR32 6 ++#define IMAGE_REL_I386_DIR32NB 7 ++#define IMAGE_REL_I386_SEG12 9 ++#define IMAGE_REL_I386_SECTION 10 ++#define IMAGE_REL_I386_SECREL 11 ++#define IMAGE_REL_I386_REL32 20 ++ ++/* MIPS relocation types */ ++#define IMAGE_REL_MIPS_ABSOLUTE 0x0000 ++#define IMAGE_REL_MIPS_REFHALF 0x0001 ++#define IMAGE_REL_MIPS_REFWORD 0x0002 ++#define IMAGE_REL_MIPS_JMPADDR 0x0003 ++#define IMAGE_REL_MIPS_REFHI 0x0004 ++#define IMAGE_REL_MIPS_REFLO 0x0005 ++#define IMAGE_REL_MIPS_GPREL 0x0006 ++#define IMAGE_REL_MIPS_LITERAL 0x0007 ++#define IMAGE_REL_MIPS_SECTION 0x000A ++#define IMAGE_REL_MIPS_SECREL 0x000B ++#define IMAGE_REL_MIPS_SECRELLO 0x000C ++#define IMAGE_REL_MIPS_SECRELHI 0x000D ++#define IMAGE_REL_MIPS_JMPADDR16 0x0010 ++#define IMAGE_REL_MIPS_REFWORDNB 0x0022 ++#define IMAGE_REL_MIPS_PAIR 0x0025 ++ ++/* ALPHA relocation types */ ++#define IMAGE_REL_ALPHA_ABSOLUTE 0x0000 ++#define IMAGE_REL_ALPHA_REFLONG 0x0001 ++#define IMAGE_REL_ALPHA_REFQUAD 0x0002 ++#define IMAGE_REL_ALPHA_GPREL 0x0003 ++#define IMAGE_REL_ALPHA_LITERAL 0x0004 ++#define IMAGE_REL_ALPHA_LITUSE 0x0005 ++#define IMAGE_REL_ALPHA_GPDISP 0x0006 ++#define IMAGE_REL_ALPHA_BRADDR 0x0007 ++#define IMAGE_REL_ALPHA_HINT 0x0008 ++#define IMAGE_REL_ALPHA_INLINE_REFLONG 0x0009 ++#define IMAGE_REL_ALPHA_REFHI 0x000A ++#define IMAGE_REL_ALPHA_REFLO 0x000B ++#define IMAGE_REL_ALPHA_PAIR 0x000C ++#define IMAGE_REL_ALPHA_MATCH 0x000D ++#define IMAGE_REL_ALPHA_SECTION 0x000E ++#define IMAGE_REL_ALPHA_SECREL 0x000F ++#define IMAGE_REL_ALPHA_REFLONGNB 0x0010 ++#define IMAGE_REL_ALPHA_SECRELLO 0x0011 ++#define IMAGE_REL_ALPHA_SECRELHI 0x0012 ++#define IMAGE_REL_ALPHA_REFQ3 0x0013 ++#define IMAGE_REL_ALPHA_REFQ2 0x0014 ++#define IMAGE_REL_ALPHA_REFQ1 0x0015 ++#define IMAGE_REL_ALPHA_GPRELLO 0x0016 ++#define IMAGE_REL_ALPHA_GPRELHI 0x0017 ++ ++/* PowerPC relocation types */ ++#define IMAGE_REL_PPC_ABSOLUTE 0x0000 ++#define IMAGE_REL_PPC_ADDR64 0x0001 ++#define IMAGE_REL_PPC_ADDR 0x0002 ++#define IMAGE_REL_PPC_ADDR24 0x0003 ++#define IMAGE_REL_PPC_ADDR16 0x0004 ++#define IMAGE_REL_PPC_ADDR14 0x0005 ++#define IMAGE_REL_PPC_REL24 0x0006 ++#define IMAGE_REL_PPC_REL14 0x0007 ++#define IMAGE_REL_PPC_TOCREL16 0x0008 ++#define IMAGE_REL_PPC_TOCREL14 0x0009 ++#define IMAGE_REL_PPC_ADDR32NB 0x000A ++#define IMAGE_REL_PPC_SECREL 0x000B ++#define IMAGE_REL_PPC_SECTION 0x000C ++#define IMAGE_REL_PPC_IFGLUE 0x000D ++#define IMAGE_REL_PPC_IMGLUE 0x000E ++#define IMAGE_REL_PPC_SECREL16 0x000F ++#define IMAGE_REL_PPC_REFHI 0x0010 ++#define IMAGE_REL_PPC_REFLO 0x0011 ++#define IMAGE_REL_PPC_PAIR 0x0012 ++#define IMAGE_REL_PPC_SECRELLO 0x0013 ++#define IMAGE_REL_PPC_SECRELHI 0x0014 ++#define IMAGE_REL_PPC_GPREL 0x0015 ++#define IMAGE_REL_PPC_TYPEMASK 0x00FF ++/* modifier bits */ ++#define IMAGE_REL_PPC_NEG 0x0100 ++#define IMAGE_REL_PPC_BRTAKEN 0x0200 ++#define IMAGE_REL_PPC_BRNTAKEN 0x0400 ++#define IMAGE_REL_PPC_TOCDEFN 0x0800 ++ ++/* SH3 ? relocation type */ ++#define IMAGE_REL_SH3_ABSOLUTE 0x0000 ++#define IMAGE_REL_SH3_DIRECT16 0x0001 ++#define IMAGE_REL_SH3_DIRECT 0x0002 ++#define IMAGE_REL_SH3_DIRECT8 0x0003 ++#define IMAGE_REL_SH3_DIRECT8_WORD 0x0004 ++#define IMAGE_REL_SH3_DIRECT8_LONG 0x0005 ++#define IMAGE_REL_SH3_DIRECT4 0x0006 ++#define IMAGE_REL_SH3_DIRECT4_WORD 0x0007 ++#define IMAGE_REL_SH3_DIRECT4_LONG 0x0008 ++#define IMAGE_REL_SH3_PCREL8_WORD 0x0009 ++#define IMAGE_REL_SH3_PCREL8_LONG 0x000A ++#define IMAGE_REL_SH3_PCREL12_WORD 0x000B ++#define IMAGE_REL_SH3_STARTOF_SECTION 0x000C ++#define IMAGE_REL_SH3_SIZEOF_SECTION 0x000D ++#define IMAGE_REL_SH3_SECTION 0x000E ++#define IMAGE_REL_SH3_SECREL 0x000F ++#define IMAGE_REL_SH3_DIRECT32_NB 0x0010 ++ ++/* ARM (Archimedes?) relocation types */ ++#define IMAGE_REL_ARM_ABSOLUTE 0x0000 ++#define IMAGE_REL_ARM_ADDR 0x0001 ++#define IMAGE_REL_ARM_ADDR32NB 0x0002 ++#define IMAGE_REL_ARM_BRANCH24 0x0003 ++#define IMAGE_REL_ARM_BRANCH11 0x0004 ++#define IMAGE_REL_ARM_SECTION 0x000E ++#define IMAGE_REL_ARM_SECREL 0x000F ++ ++/* IA64 relocation types */ ++#define IMAGE_REL_IA64_ABSOLUTE 0x0000 ++#define IMAGE_REL_IA64_IMM14 0x0001 ++#define IMAGE_REL_IA64_IMM22 0x0002 ++#define IMAGE_REL_IA64_IMM64 0x0003 ++#define IMAGE_REL_IA64_DIR 0x0004 ++#define IMAGE_REL_IA64_DIR64 0x0005 ++#define IMAGE_REL_IA64_PCREL21B 0x0006 ++#define IMAGE_REL_IA64_PCREL21M 0x0007 ++#define IMAGE_REL_IA64_PCREL21F 0x0008 ++#define IMAGE_REL_IA64_GPREL22 0x0009 ++#define IMAGE_REL_IA64_LTOFF22 0x000A ++#define IMAGE_REL_IA64_SECTION 0x000B ++#define IMAGE_REL_IA64_SECREL22 0x000C ++#define IMAGE_REL_IA64_SECREL64I 0x000D ++#define IMAGE_REL_IA64_SECREL 0x000E ++#define IMAGE_REL_IA64_LTOFF64 0x000F ++#define IMAGE_REL_IA64_DIR32NB 0x0010 ++#define IMAGE_REL_IA64_RESERVED_11 0x0011 ++#define IMAGE_REL_IA64_RESERVED_12 0x0012 ++#define IMAGE_REL_IA64_RESERVED_13 0x0013 ++#define IMAGE_REL_IA64_RESERVED_14 0x0014 ++#define IMAGE_REL_IA64_RESERVED_15 0x0015 ++#define IMAGE_REL_IA64_RESERVED_16 0x0016 ++#define IMAGE_REL_IA64_ADDEND 0x001F ++ ++/* archive format */ ++ ++#define IMAGE_ARCHIVE_START_SIZE 8 ++#define IMAGE_ARCHIVE_START "!\n" ++#define IMAGE_ARCHIVE_END "`\n" ++#define IMAGE_ARCHIVE_PAD "\n" ++#define IMAGE_ARCHIVE_LINKER_MEMBER "/ " ++#define IMAGE_ARCHIVE_LONGNAMES_MEMBER "// " ++ ++typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER ++{ ++ BYTE Name[16]; ++ BYTE Date[12]; ++ BYTE UserID[6]; ++ BYTE GroupID[6]; ++ BYTE Mode[8]; ++ BYTE Size[10]; ++ BYTE EndHeader[2]; ++} IMAGE_ARCHIVE_MEMBER_HEADER, *PIMAGE_ARCHIVE_MEMBER_HEADER; ++ ++#define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60 ++ ++/* ++ * Resource directory stuff ++ */ ++typedef struct _IMAGE_RESOURCE_DIRECTORY { ++ DWORD Characteristics; ++ DWORD TimeDateStamp; ++ WORD MajorVersion; ++ WORD MinorVersion; ++ WORD NumberOfNamedEntries; ++ WORD NumberOfIdEntries; ++ /* IMAGE_RESOURCE_DIRECTORY_ENTRY DirectoryEntries[]; */ ++} IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY; ++ ++#define IMAGE_RESOURCE_NAME_IS_STRING 0x80000000 ++#define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000 ++ ++typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { ++ union { ++ struct { ++#ifdef BITFIELDS_BIGENDIAN ++ unsigned NameIsString:1; ++ unsigned NameOffset:31; ++#else ++ unsigned NameOffset:31; ++ unsigned NameIsString:1; ++#endif ++ } DUMMYSTRUCTNAME1; ++ DWORD Name; ++ struct { ++#ifdef WORDS_BIGENDIAN ++ WORD __pad; ++ WORD Id; ++#else ++ WORD Id; ++ WORD __pad; ++#endif ++ } DUMMYSTRUCTNAME2; ++ } DUMMYUNIONNAME1; ++ union { ++ DWORD OffsetToData; ++ struct { ++#ifdef BITFIELDS_BIGENDIAN ++ unsigned DataIsDirectory:1; ++ unsigned OffsetToDirectory:31; ++#else ++ unsigned OffsetToDirectory:31; ++ unsigned DataIsDirectory:1; ++#endif ++ } DUMMYSTRUCTNAME3; ++ } DUMMYUNIONNAME2; ++} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY; ++ ++ ++typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING { ++ WORD Length; ++ CHAR NameString[ 1 ]; ++} IMAGE_RESOURCE_DIRECTORY_STRING,*PIMAGE_RESOURCE_DIRECTORY_STRING; +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.c +--- linux-3.12.2/3rdparty/ndiswrapper/pnp.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,697 @@ ++/* ++ * Copyright (C) 2005 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "usb.h" ++#include "pnp.h" ++#include "wrapndis.h" ++#include "loader.h" ++ ++/* Functions callable from the NDIS driver */ ++wstdcall NTSTATUS pdoDispatchDeviceControl(struct device_object *pdo, ++ struct irp *irp); ++wstdcall NTSTATUS pdoDispatchPnp(struct device_object *pdo, struct irp *irp); ++wstdcall NTSTATUS pdoDispatchPower(struct device_object *pdo, struct irp *irp); ++ ++static NTSTATUS start_pdo(struct device_object *pdo) ++{ ++ int i, ret, count, resources_size; ++ struct wrap_device *wd; ++ struct pci_dev *pdev; ++ struct cm_partial_resource_descriptor *entry; ++ struct cm_partial_resource_list *partial_resource_list; ++ ++ ENTER1("%p, %p", pdo, pdo->reserved); ++ wd = pdo->reserved; ++ if (ntoskernel_init_device(wd)) ++ EXIT1(return STATUS_FAILURE); ++ if (wrap_is_usb_bus(wd->dev_bus)) { ++ if (usb_init_device(wd)) { ++ ntoskernel_exit_device(wd); ++ EXIT1(return STATUS_FAILURE); ++ } ++ EXIT1(return STATUS_SUCCESS); ++ } ++ if (!wrap_is_pci_bus(wd->dev_bus)) ++ EXIT1(return STATUS_SUCCESS); ++ pdev = wd->pci.pdev; ++ ret = pci_enable_device(pdev); ++ if (ret) { ++ ERROR("couldn't enable PCI device: %x", ret); ++ return STATUS_FAILURE; ++ } ++ ret = pci_request_regions(pdev, DRIVER_NAME); ++ if (ret) { ++ ERROR("couldn't request PCI regions: %x", ret); ++ goto err_enable; ++ } ++ pci_set_power_state(pdev, PCI_D0); ++#ifdef CONFIG_X86_64 ++ /* 64-bit broadcom driver doesn't work if DMA is allocated ++ * from over 1GB */ ++ if (wd->vendor == 0x14e4) { ++ if (pci_set_dma_mask(pdev, DMA_BIT_MASK(30)) || ++ pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(30))) ++ WARNING("couldn't set DMA mask; this driver " ++ "may not work with more than 1GB RAM"); ++ } ++#endif ++ /* IRQ resource entry is filled in from pdev, instead of ++ * pci_resource macros */ ++ for (i = count = 0; pci_resource_start(pdev, i); i++) ++ if ((pci_resource_flags(pdev, i) & IORESOURCE_MEM) || ++ (pci_resource_flags(pdev, i) & IORESOURCE_IO)) ++ count++; ++ /* space for entry for IRQ is already in ++ * cm_partial_resource_list */ ++ resources_size = sizeof(struct cm_resource_list) + ++ sizeof(struct cm_partial_resource_descriptor) * count; ++ TRACE2("resources: %d, %d", count, resources_size); ++ wd->resource_list = kzalloc(resources_size, GFP_KERNEL); ++ if (!wd->resource_list) { ++ WARNING("couldn't allocate memory"); ++ goto err_regions; ++ } ++ wd->resource_list->count = 1; ++ wd->resource_list->list[0].interface_type = PCIBus; ++ /* bus_number is not used by WDM drivers */ ++ wd->resource_list->list[0].bus_number = pdev->bus->number; ++ ++ partial_resource_list = ++ &wd->resource_list->list->partial_resource_list; ++ partial_resource_list->version = 1; ++ partial_resource_list->revision = 1; ++ partial_resource_list->count = count + 1; ++ ++ for (i = count = 0; pci_resource_start(pdev, i); i++) { ++ entry = &partial_resource_list->partial_descriptors[count]; ++ TRACE2("%d", count); ++ if (pci_resource_flags(pdev, i) & IORESOURCE_MEM) { ++ entry->type = CmResourceTypeMemory; ++ entry->flags = CM_RESOURCE_MEMORY_READ_WRITE; ++ entry->share = CmResourceShareDeviceExclusive; ++ } else if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { ++ entry->type = CmResourceTypePort; ++ entry->flags = CM_RESOURCE_PORT_IO; ++ entry->share = CmResourceShareDeviceExclusive; ++#if 0 ++ } else if (pci_resource_flags(pdev, i) & IORESOURCE_DMA) { ++ /* it looks like no driver uses this resource */ ++ typeof(pci_resource_flags(pdev, 0)) flags; ++ entry->type = CmResourceTypeDma; ++ flags = pci_resource_flags(pdev, i); ++ if (flags & IORESOURCE_DMA_TYPEA) ++ entry->flags |= CM_RESOURCE_DMA_TYPE_A; ++ else if (flags & IORESOURCE_DMA_TYPEB) ++ entry->flags |= CM_RESOURCE_DMA_TYPE_B; ++ else if (flags & IORESOURCE_DMA_TYPEF) ++ entry->flags |= CM_RESOURCE_DMA_TYPE_F; ++ if (flags & IORESOURCE_DMA_8BIT) ++ entry->flags |= CM_RESOURCE_DMA_8; ++ else if (flags & IORESOURCE_DMA_16BIT) ++ entry->flags |= CM_RESOURCE_DMA_16; ++ /* what about 32bit DMA? */ ++ else if (flags & IORESOURCE_DMA_8AND16BIT) ++ entry->flags |= CM_RESOURCE_DMA_8_AND_16; ++ if (flags & IORESOURCE_DMA_MASTER) ++ entry->flags |= CM_RESOURCE_DMA_BUS_MASTER; ++ entry->u.dma.channel = pci_resource_start(pdev, i); ++ /* what should this be? */ ++ entry->u.dma.port = 1; ++#endif ++ } else ++ continue; ++ /* TODO: Add other resource types? */ ++ entry->u.generic.start = ++ (ULONG_PTR)pci_resource_start(pdev, i); ++ entry->u.generic.length = pci_resource_len(pdev, i); ++ count++; ++ } ++ ++ /* put IRQ resource at the end */ ++ entry = &partial_resource_list->partial_descriptors[count++]; ++ entry->type = CmResourceTypeInterrupt; ++ entry->flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; ++ /* we assume all devices use shared IRQ */ ++ entry->share = CmResourceShareShared; ++ /* as per documentation, interrupt level should be DIRQL, but ++ * examples from DDK as well some drivers, such as AR5211, ++ * RT8180L use interrupt level as interrupt vector also in ++ * NdisMRegisterInterrupt */ ++ entry->u.interrupt.level = pdev->irq; ++ entry->u.interrupt.vector = pdev->irq; ++ entry->u.interrupt.affinity = -1; ++ ++ TRACE2("resource list count %d, irq: %d", ++ partial_resource_list->count, pdev->irq); ++ pci_set_drvdata(pdev, wd); ++ EXIT1(return STATUS_SUCCESS); ++err_regions: ++ pci_release_regions(pdev); ++err_enable: ++ pci_disable_device(pdev); ++ wd->pci.pdev = NULL; ++ wd->pdo = NULL; ++ EXIT1(return STATUS_FAILURE); ++} ++ ++static void remove_pdo(struct device_object *pdo) ++{ ++ struct wrap_device *wd = pdo->reserved; ++ ++ ntoskernel_exit_device(wd); ++ if (wrap_is_pci_bus(wd->dev_bus)) { ++ struct pci_dev *pdev = wd->pci.pdev; ++ pci_release_regions(pdev); ++ pci_disable_device(pdev); ++ wd->pci.pdev = NULL; ++ pci_set_drvdata(pdev, NULL); ++ } else if (wrap_is_usb_bus(wd->dev_bus)) { ++ usb_exit_device(wd); ++ } ++ kfree(wd->resource_list); ++ wd->resource_list = NULL; ++ return; ++} ++ ++static NTSTATUS IoSendIrpTopDev(struct device_object *dev_obj, ULONG major_fn, ++ ULONG minor_fn, struct io_stack_location *sl) ++{ ++ NTSTATUS status; ++ struct nt_event event; ++ struct irp *irp; ++ struct io_stack_location *irp_sl; ++ struct device_object *top_dev = IoGetAttachedDeviceReference(dev_obj); ++ ++ KeInitializeEvent(&event, NotificationEvent, FALSE); ++ irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, top_dev, NULL, 0, NULL, ++ &event, NULL); ++ irp->io_status.status = STATUS_NOT_IMPLEMENTED; ++ irp->io_status.info = 0; ++ irp_sl = IoGetNextIrpStackLocation(irp); ++ if (sl) ++ memcpy(irp_sl, sl, sizeof(*irp_sl)); ++ irp_sl->major_fn = major_fn; ++ irp_sl->minor_fn = minor_fn; ++ status = IoCallDriver(top_dev, irp); ++ if (status == STATUS_PENDING) { ++ KeWaitForSingleObject(&event, Executive, KernelMode, ++ FALSE, NULL); ++ status = irp->io_status.status; ++ } ++ ObDereferenceObject(top_dev); ++ return status; ++} ++ ++wstdcall NTSTATUS pdoDispatchDeviceControl(struct device_object *pdo, ++ struct irp *irp) ++{ ++ NTSTATUS status; ++ struct wrap_device *wd = pdo->reserved; ++ ++ DUMP_IRP(irp); ++ (void)wd; ++ if (wrap_is_usb_bus(wd->dev_bus)) { ++ status = wrap_submit_irp(pdo, irp); ++ IOTRACE("status: %08X", status); ++ if (status != STATUS_PENDING) ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ } else { ++ status = irp->io_status.status = STATUS_NOT_IMPLEMENTED; ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ } ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(pdoDispatchDeviceControl,2) ++ ++wstdcall NTSTATUS pdoDispatchPnp(struct device_object *pdo, struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ NTSTATUS status; ++ struct wrap_device *wd = pdo->reserved; ++ ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ TRACE2("%p %d:%d", pdo, irp_sl->major_fn, irp_sl->minor_fn); ++ switch (irp_sl->minor_fn) { ++ case IRP_MN_START_DEVICE: ++ status = start_pdo(pdo); ++ break; ++ case IRP_MN_QUERY_STOP_DEVICE: ++ case IRP_MN_STOP_DEVICE: ++ case IRP_MN_QUERY_REMOVE_DEVICE: ++ status = STATUS_SUCCESS; ++ break; ++ case IRP_MN_REMOVE_DEVICE: ++ remove_pdo(pdo); ++ status = STATUS_SUCCESS; ++ break; ++ case IRP_MN_QUERY_INTERFACE: ++ if (wrap_is_usb_bus(wd->dev_bus)) ++ status = usb_query_interface(wd, irp_sl); ++ else ++ status = STATUS_NOT_IMPLEMENTED; ++ break; ++ default: ++ TRACE2("fn %d not implemented", irp_sl->minor_fn); ++ status = STATUS_SUCCESS; ++ break; ++ } ++ irp->io_status.status = status; ++ TRACE2("status: %08X", status); ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(pdoDispatchPnp,2) ++ ++wstdcall NTSTATUS pdoDispatchPower(struct device_object *pdo, struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ struct wrap_device *wd; ++ union power_state power_state; ++ struct pci_dev *pdev; ++ NTSTATUS status; ++ ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ wd = pdo->reserved; ++ TRACE2("pdo: %p, fn: %d:%d, wd: %p", ++ pdo, irp_sl->major_fn, irp_sl->minor_fn, wd); ++ switch (irp_sl->minor_fn) { ++ case IRP_MN_WAIT_WAKE: ++ /* TODO: this is not complete/correct */ ++ TRACE2("state: %d, completion: %p", ++ irp_sl->params.power.state.system_state, ++ irp_sl->completion_routine); ++ IoMarkIrpPending(irp); ++ status = STATUS_PENDING; ++ break; ++ case IRP_MN_SET_POWER: ++ power_state = irp_sl->params.power.state; ++ if (power_state.device_state == PowerDeviceD0) { ++ TRACE2("resuming %p", wd); ++ if (wrap_is_pci_bus(wd->dev_bus)) { ++ pdev = wd->pci.pdev; ++ pci_restore_state(pdev); ++ if (wd->pci.wake_state == PowerDeviceD3) { ++ pci_enable_wake(wd->pci.pdev, ++ PCI_D3hot, 0); ++ pci_enable_wake(wd->pci.pdev, ++ PCI_D3cold, 0); ++ } ++ pci_set_power_state(pdev, PCI_D0); ++ } else if (wrap_is_usb_bus(wd->dev_bus)) { ++ wrap_resume_urbs(wd); ++ } ++ } else { ++ TRACE2("suspending device %p", wd); ++ if (wrap_is_pci_bus(wd->dev_bus)) { ++ pdev = wd->pci.pdev; ++ pci_save_state(pdev); ++ TRACE2("%d", wd->pci.wake_state); ++ if (wd->pci.wake_state == PowerDeviceD3) { ++ pci_enable_wake(wd->pci.pdev, ++ PCI_D3hot, 1); ++ pci_enable_wake(wd->pci.pdev, ++ PCI_D3cold, 1); ++ } ++ pci_set_power_state(pdev, PCI_D3hot); ++ } else if (wrap_is_usb_bus(wd->dev_bus)) { ++ wrap_suspend_urbs(wd); ++ } ++ } ++ status = STATUS_SUCCESS; ++ break; ++ case IRP_MN_QUERY_POWER: ++ status = STATUS_SUCCESS; ++ break; ++ default: ++ TRACE2("fn %d not implemented", irp_sl->minor_fn); ++ status = STATUS_SUCCESS; ++ break; ++ } ++ irp->io_status.status = status; ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ return status; ++} ++WIN_FUNC_DECL(pdoDispatchPower,2) ++ ++static NTSTATUS pnp_set_device_power_state(struct wrap_device *wd, ++ enum device_power_state state) ++{ ++ NTSTATUS status; ++ struct device_object *pdo; ++ struct io_stack_location irp_sl; ++ ++ pdo = wd->pdo; ++ IOTRACE("%p, %p", pdo, IoGetAttachedDevice(pdo)); ++ memset(&irp_sl, 0, sizeof(irp_sl)); ++ irp_sl.params.power.state.device_state = state; ++ irp_sl.params.power.type = DevicePowerState; ++ if (state > PowerDeviceD0) { ++ status = IoSendIrpTopDev(pdo, IRP_MJ_POWER, IRP_MN_QUERY_POWER, ++ &irp_sl); ++ if (status != STATUS_SUCCESS) { ++ TRACE1("query of power to %d returns %08X", ++ state, status); ++ EXIT1(return status); ++ } ++ } ++ status = IoSendIrpTopDev(pdo, IRP_MJ_POWER, IRP_MN_SET_POWER, &irp_sl); ++ if (status != STATUS_SUCCESS) ++ WARNING("setting power to %d failed: %08X", state, status); ++ EXIT1(return status); ++} ++ ++static NTSTATUS pnp_start_device(struct wrap_device *wd) ++{ ++ struct device_object *fdo; ++ struct device_object *pdo; ++ struct io_stack_location irp_sl; ++ NTSTATUS status; ++ ++ pdo = wd->pdo; ++ /* TODO: for now we use same resources for both translated ++ * resources and raw resources */ ++ memset(&irp_sl, 0, sizeof(irp_sl)); ++ irp_sl.params.start_device.allocated_resources = ++ wd->resource_list; ++ irp_sl.params.start_device.allocated_resources_translated = ++ wd->resource_list; ++ status = IoSendIrpTopDev(pdo, IRP_MJ_PNP, IRP_MN_START_DEVICE, &irp_sl); ++ fdo = IoGetAttachedDevice(pdo); ++ fdo->drv_obj->drv_ext->count++; ++ if (status != STATUS_SUCCESS) ++ WARNING("Windows driver couldn't initialize the device (%08X)", ++ status); ++ EXIT1(return status); ++} ++ ++#if 0 ++static NTSTATUS pnp_stop_device(struct wrap_device *wd) ++{ ++ struct device_object *pdo; ++ NTSTATUS status; ++ ++ pdo = wd->pdo; ++ status = IoSendIrpTopDev(pdo, IRP_MJ_PNP, IRP_MN_QUERY_STOP_DEVICE, ++ NULL); ++ if (status != STATUS_SUCCESS) ++ WARNING("status: %08X", status); ++ /* for now we ignore query status */ ++ status = IoSendIrpTopDev(pdo, IRP_MJ_PNP, IRP_MN_STOP_DEVICE, NULL); ++ if (status != STATUS_SUCCESS) ++ WARNING("status: %08X", status); ++ if (status != STATUS_SUCCESS) ++ WARNING("status: %08X", status); ++ EXIT2(return status); ++} ++#endif ++ ++static NTSTATUS pnp_remove_device(struct wrap_device *wd) ++{ ++ struct device_object *pdo, *fdo; ++ struct driver_object *fdo_drv_obj; ++ NTSTATUS status; ++ ++ pdo = wd->pdo; ++ fdo = IoGetAttachedDevice(pdo); ++ fdo_drv_obj = fdo->drv_obj; ++ TRACE2("%p, %p, %p", pdo, fdo, fdo_drv_obj); ++ status = IoSendIrpTopDev(pdo, IRP_MJ_PNP, IRP_MN_QUERY_REMOVE_DEVICE, ++ NULL); ++ if (status != STATUS_SUCCESS) ++ WARNING("status: %08X", status); ++ ++ status = IoSendIrpTopDev(pdo, IRP_MJ_PNP, IRP_MN_REMOVE_DEVICE, NULL); ++ if (status != STATUS_SUCCESS) ++ WARNING("status: %08X", status); ++ /* TODO: should we use count in drv_ext or driver's Object ++ * header reference count to keep count of devices associated ++ * with a driver? */ ++ if (status == STATUS_SUCCESS) ++ fdo_drv_obj->drv_ext->count--; ++ TRACE1("count: %d", fdo_drv_obj->drv_ext->count); ++ if ((LONG)fdo_drv_obj->drv_ext->count < 0) ++ WARNING("wrong count: %d", fdo_drv_obj->drv_ext->count); ++ if (fdo_drv_obj->drv_ext->count == 0) { ++ struct wrap_driver *wrap_driver; ++ TRACE1("unloading driver: %p", fdo_drv_obj); ++ wrap_driver = ++ IoGetDriverObjectExtension(fdo_drv_obj, ++ (void *)WRAP_DRIVER_CLIENT_ID); ++ if (fdo_drv_obj->unload) ++ LIN2WIN1(fdo_drv_obj->unload, fdo_drv_obj); ++ if (wrap_driver) { ++ mutex_lock(&loader_mutex); ++ unload_wrap_driver(wrap_driver); ++ mutex_unlock(&loader_mutex); ++ } else ++ ERROR("couldn't get wrap_driver"); ++ ObDereferenceObject(fdo_drv_obj); ++ } ++ IoDeleteDevice(pdo); ++ unload_wrap_device(wd); ++ EXIT1(return status); ++} ++ ++WIN_FUNC_DECL(IoInvalidDeviceRequest,2) ++ ++static struct device_object *alloc_pdo(struct driver_object *drv_obj) ++{ ++ struct device_object *pdo; ++ NTSTATUS status; ++ int i; ++ struct ansi_string ansi_name; ++ struct unicode_string unicode_name; ++ ++ RtlInitAnsiString(&ansi_name, "NDISpdo"); ++ if (RtlAnsiStringToUnicodeString(&unicode_name, &ansi_name, TRUE) == ++ STATUS_SUCCESS) { ++ status = IoCreateDevice(drv_obj, 0, &unicode_name, ++ FILE_DEVICE_UNKNOWN, ++ FILE_AUTOGENERATED_DEVICE_NAME, ++ FALSE, &pdo); ++ RtlFreeUnicodeString(&unicode_name); ++ } else { ++ status = IoCreateDevice(drv_obj, 0, NULL, ++ FILE_DEVICE_UNKNOWN, ++ FILE_AUTOGENERATED_DEVICE_NAME, ++ FALSE, &pdo); ++ } ++ TRACE1("%p, %d, %p", drv_obj, status, pdo); ++ if (status != STATUS_SUCCESS) ++ return NULL; ++ /* dispatch routines are called as Windows functions */ ++ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) ++ drv_obj->major_func[i] = WIN_FUNC_PTR(IoInvalidDeviceRequest,2); ++ drv_obj->major_func[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ++ WIN_FUNC_PTR(pdoDispatchDeviceControl,2); ++ drv_obj->major_func[IRP_MJ_DEVICE_CONTROL] = ++ WIN_FUNC_PTR(pdoDispatchDeviceControl,2); ++ drv_obj->major_func[IRP_MJ_POWER] = WIN_FUNC_PTR(pdoDispatchPower,2); ++ drv_obj->major_func[IRP_MJ_PNP] = WIN_FUNC_PTR(pdoDispatchPnp,2); ++ return pdo; ++} ++ ++static int wrap_pnp_start_device(struct wrap_device *wd) ++{ ++ struct wrap_driver *driver; ++ struct device_object *pdo; ++ struct driver_object *pdo_drv_obj; ++ ++ ENTER1("wd: %p", wd); ++ ++ if (!((wrap_is_pci_bus(wd->dev_bus)) || ++ (wrap_is_usb_bus(wd->dev_bus)))) { ++ ERROR("bus type %d (%d) not supported", ++ WRAP_BUS(wd->dev_bus), wd->dev_bus); ++ EXIT1(return -EINVAL); ++ } ++ driver = load_wrap_driver(wd); ++ if (!driver) ++ return -ENODEV; ++ ++ wd->driver = driver; ++ wd->dev_bus = WRAP_DEVICE_BUS(driver->dev_type, WRAP_BUS(wd->dev_bus)); ++ TRACE1("dev type: %d, bus type: %d, %d", WRAP_DEVICE(wd->dev_bus), ++ WRAP_BUS(wd->dev_bus), wd->dev_bus); ++ TRACE1("%d, %d", driver->dev_type, wrap_is_usb_bus(wd->dev_bus)); ++ /* first create pdo */ ++ if (wrap_is_pci_bus(wd->dev_bus)) ++ pdo_drv_obj = find_bus_driver("PCI"); ++ else // if (wrap_is_usb_bus(wd->dev_bus)) ++ pdo_drv_obj = find_bus_driver("USB"); ++ if (!pdo_drv_obj) ++ return -EINVAL; ++ pdo = alloc_pdo(pdo_drv_obj); ++ if (!pdo) ++ return -ENOMEM; ++ wd->pdo = pdo; ++ pdo->reserved = wd; ++ if (WRAP_DEVICE(wd->dev_bus) == WRAP_NDIS_DEVICE) { ++ if (init_ndis_driver(driver->drv_obj)) { ++ IoDeleteDevice(pdo); ++ return -EINVAL; ++ } ++ } ++ TRACE1("%p", driver->drv_obj->drv_ext->add_device); ++ if (driver->drv_obj->drv_ext->add_device(driver->drv_obj, pdo) != ++ STATUS_SUCCESS) { ++ IoDeleteDevice(pdo); ++ return -ENOMEM; ++ } ++ if (pnp_start_device(wd) != STATUS_SUCCESS) { ++ /* TODO: we need proper cleanup, to deallocate memory, ++ * for example */ ++ pnp_remove_device(wd); ++ return -EINVAL; ++ } ++ return 0; ++} ++ ++int wrap_pnp_start_pci_device(struct pci_dev *pdev, ++ const struct pci_device_id *ent) ++{ ++ struct load_device load_device; ++ struct wrap_device *wd; ++ ++ ENTER1("called for %04x:%04x:%04x:%04x", pdev->vendor, pdev->device, ++ pdev->subsystem_vendor, pdev->subsystem_device); ++ ++ load_device.bus = WRAP_PCI_BUS; ++ load_device.vendor = pdev->vendor; ++ load_device.device = pdev->device; ++ load_device.subvendor = pdev->subsystem_vendor; ++ load_device.subdevice = pdev->subsystem_device; ++ wd = load_wrap_device(&load_device); ++ if (!wd) ++ EXIT1(return -ENODEV); ++ wd->pci.pdev = pdev; ++ return wrap_pnp_start_device(wd); ++} ++ ++void wrap_pnp_remove_pci_device(struct pci_dev *pdev) ++{ ++ struct wrap_device *wd; ++ ++ wd = (struct wrap_device *)pci_get_drvdata(pdev); ++ ENTER1("%p, %p", pdev, wd); ++ if (!wd) ++ EXIT1(return); ++ pnp_remove_device(wd); ++} ++ ++int wrap_pnp_suspend_pci_device(struct pci_dev *pdev, pm_message_t state) ++{ ++ struct wrap_device *wd; ++ ++ wd = (struct wrap_device *)pci_get_drvdata(pdev); ++ return pnp_set_device_power_state(wd, PowerDeviceD3); ++} ++ ++int wrap_pnp_resume_pci_device(struct pci_dev *pdev) ++{ ++ struct wrap_device *wd; ++ ++ wd = (struct wrap_device *)pci_get_drvdata(pdev); ++ return pnp_set_device_power_state(wd, PowerDeviceD0); ++} ++ ++#ifdef ENABLE_USB ++int wrap_pnp_start_usb_device(struct usb_interface *intf, ++ const struct usb_device_id *usb_id) ++{ ++ struct wrap_device *wd; ++ int ret; ++ struct usb_device *udev = interface_to_usbdev(intf); ++ ENTER1("%04x, %04x, %04x", udev->descriptor.idVendor, ++ udev->descriptor.idProduct, udev->descriptor.bDeviceClass); ++ ++ /* USB device (e.g., RNDIS) may have multiple interfaces; ++ initialize one interface only (is there a way to know which ++ of these interfaces is for network?) */ ++ ++ if ((wd = get_wrap_device(udev, WRAP_USB_BUS))) { ++ TRACE1("device already initialized: %p", wd); ++ usb_set_intfdata(intf, NULL); ++ ret = 0; ++ } else { ++ struct load_device load_device; ++ ++ load_device.bus = WRAP_USB_BUS; ++ load_device.vendor = le16_to_cpu(udev->descriptor.idVendor); ++ load_device.device = le16_to_cpu(udev->descriptor.idProduct); ++ load_device.subvendor = 0; ++ load_device.subdevice = 0; ++ wd = load_wrap_device(&load_device); ++ TRACE2("%p", wd); ++ if (wd) { ++ /* some devices (e.g., TI 4150, RNDIS) need ++ * full reset */ ++ ret = usb_reset_device(udev); ++ if (ret) ++ WARNING("reset failed: %d", ret); ++ usb_set_intfdata(intf, wd); ++ wd->usb.intf = intf; ++ wd->usb.udev = udev; ++ ret = wrap_pnp_start_device(wd); ++ } else ++ ret = -ENODEV; ++ } ++ ++ TRACE2("ret: %d", ret); ++ if (ret) ++ EXIT1(return ret); ++ else ++ return 0; ++} ++ ++void wrap_pnp_remove_usb_device(struct usb_interface *intf) ++{ ++ struct wrap_device *wd; ++ ++ wd = (struct wrap_device *)usb_get_intfdata(intf); ++ TRACE1("%p, %p", intf, wd); ++ if (wd == NULL) ++ EXIT1(return); ++ usb_set_intfdata(intf, NULL); ++ wd->usb.intf = NULL; ++ pnp_remove_device(wd); ++} ++ ++int wrap_pnp_suspend_usb_device(struct usb_interface *intf, pm_message_t state) ++{ ++ struct wrap_device *wd; ++ ++ wd = usb_get_intfdata(intf); ++ ENTER1("%p, %p", intf, wd); ++ if (!wd) ++ EXIT1(return 0); ++ if (pnp_set_device_power_state(wd, PowerDeviceD3)) ++ return -1; ++ return 0; ++} ++ ++int wrap_pnp_resume_usb_device(struct usb_interface *intf) ++{ ++ struct wrap_device *wd; ++ wd = usb_get_intfdata(intf); ++ ENTER1("%p, %p", intf, wd); ++ if (!wd) ++ EXIT1(return 0); ++ if (pnp_set_device_power_state(wd, PowerDeviceD0)) ++ return -1; ++ return 0; ++} ++ ++#endif // USB +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/pnp.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.h +--- linux-3.12.2/3rdparty/ndiswrapper/pnp.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/pnp.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,36 @@ ++/* ++ * Copyright (C) 2005 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _PNP_H_ ++#define _PNP_H_ ++ ++#include "ntoskernel.h" ++#include "ndis.h" ++#include "wrapndis.h" ++ ++int wrap_pnp_start_pci_device(struct pci_dev *pdev, ++ const struct pci_device_id *ent); ++void wrap_pnp_remove_pci_device(struct pci_dev *pdev); ++int wrap_pnp_suspend_pci_device(struct pci_dev *pdev, pm_message_t state); ++int wrap_pnp_resume_pci_device(struct pci_dev *pdev); ++ ++int wrap_pnp_start_usb_device(struct usb_interface *intf, ++ const struct usb_device_id *usb_id); ++void wrap_pnp_remove_usb_device(struct usb_interface *intf); ++int wrap_pnp_suspend_usb_device(struct usb_interface *intf, ++ pm_message_t state); ++int wrap_pnp_resume_usb_device(struct usb_interface *intf); ++ ++#endif +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/proc.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/proc.c +--- linux-3.12.2/3rdparty/ndiswrapper/proc.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/proc.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,588 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++#include ++#include ++#include ++#include ++ ++#include "ndis.h" ++#include "iw_ndis.h" ++#include "wrapndis.h" ++#include "pnp.h" ++#include "wrapper.h" ++ ++#define MAX_PROC_STR_LEN 32 ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) ++static kuid_t proc_kuid; ++static kgid_t proc_kgid; ++#else ++#define proc_kuid proc_uid ++#define proc_kgid proc_gid ++#define kuid_t uid_t ++#define kgid_t gid_t ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) ++static inline struct inode *file_inode(struct file *f) ++{ ++ return f->f_dentry->d_inode; ++} ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0) ++static inline struct inode *file_inode(struct file *f) ++{ ++ return f->f_path.dentry->d_inode; ++} ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) ++static inline void proc_set_user(struct proc_dir_entry *de, kuid_t uid, ++ kgid_t gid) ++{ ++ de->uid = uid; ++ de->gid = gid; ++} ++ ++static inline void proc_remove(struct proc_dir_entry *de) ++{ ++ if (de) ++ remove_proc_entry(de->name, de->parent); ++} ++ ++static inline void *PDE_DATA(const struct inode *inode) ++{ ++ return PDE(inode)->data; ++} ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) ++static inline struct proc_dir_entry *proc_create_data(const char *name, ++ umode_t mode, struct proc_dir_entry *parent, ++ struct file_operations *fops, void *data) ++{ ++ struct proc_dir_entry *de; ++ ++ de = create_proc_entry(name, mode, parent); ++ if (de) { ++ de->data = data; ++ de->proc_fops = fops; ++ } ++ ++ return de; ++} ++#endif ++ ++static int do_proc_make_entry(const char *name, umode_t mode, ++ struct proc_dir_entry *parent, ++ struct file_operations *fops, kuid_t uid, ++ kgid_t gid, struct ndis_device *wnd) ++{ ++ struct proc_dir_entry *de; ++ ++ de = proc_create_data(name, mode, parent, fops, wnd); ++ if (de == NULL) { ++ ERROR("couldn't create proc entry for '%s'", name); ++ return -ENOMEM; ++ } ++ proc_set_user(de, uid, gid); ++ return 0; ++} ++ ++#define PROC_DECLARE_RO(name) \ ++ static int proc_##name##_open(struct inode *inode, struct file *file) \ ++ { \ ++ return single_open(file, proc_##name##_read, PDE_DATA(inode)); \ ++ } \ ++ static struct file_operations name##_fops = { \ ++ .owner = THIS_MODULE, \ ++ .open = proc_##name##_open, \ ++ .read = seq_read, \ ++ .llseek = seq_lseek, \ ++ .release = single_release, \ ++ }; ++ ++#define PROC_DECLARE_RW(name) \ ++ static int proc_##name##_open(struct inode *inode, struct file *file) \ ++ { \ ++ return single_open(file, proc_##name##_read, PDE_DATA(inode)); \ ++ } \ ++ static struct file_operations name##_fops = { \ ++ .owner = THIS_MODULE, \ ++ .open = proc_##name##_open, \ ++ .read = seq_read, \ ++ .llseek = seq_lseek, \ ++ .release = single_release, \ ++ .write = proc_##name##_write, \ ++ }; ++ ++#define proc_make_entry_ro(name, parent, wnd) \ ++ do_proc_make_entry(#name, S_IFREG | S_IRUSR | S_IRGRP, parent, \ ++ &name##_fops, proc_kuid, proc_kgid, wnd) ++#define proc_make_entry_rw(name, parent, wnd) \ ++ do_proc_make_entry(#name, \ ++ S_IFREG | S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP, \ ++ parent, &name##_fops, proc_kuid, proc_kgid, wnd) ++ ++#define add_text(fmt, ...) seq_printf(sf, fmt, ##__VA_ARGS__) ++ ++static struct proc_dir_entry *wrap_procfs_entry; ++ ++static int proc_stats_read(struct seq_file *sf, void *v) ++{ ++ struct ndis_device *wnd = (struct ndis_device *)sf->private; ++ struct ndis_wireless_stats stats; ++ NDIS_STATUS res; ++ ndis_rssi rssi; ++ ++ res = mp_query(wnd, OID_802_11_RSSI, &rssi, sizeof(rssi)); ++ if (!res) ++ add_text("signal_level=%d dBm\n", (s32)rssi); ++ ++ res = mp_query(wnd, OID_802_11_STATISTICS, &stats, sizeof(stats)); ++ if (!res) { ++ add_text("tx_frames=%llu\n", stats.tx_frag); ++ add_text("tx_multicast_frames=%llu\n", stats.tx_multi_frag); ++ add_text("tx_failed=%llu\n", stats.failed); ++ add_text("tx_retry=%llu\n", stats.retry); ++ add_text("tx_multi_retry=%llu\n", stats.multi_retry); ++ add_text("tx_rtss_success=%llu\n", stats.rtss_succ); ++ add_text("tx_rtss_fail=%llu\n", stats.rtss_fail); ++ add_text("ack_fail=%llu\n", stats.ack_fail); ++ add_text("frame_duplicates=%llu\n", stats.frame_dup); ++ add_text("rx_frames=%llu\n", stats.rx_frag); ++ add_text("rx_multicast_frames=%llu\n", stats.rx_multi_frag); ++ add_text("fcs_errors=%llu\n", stats.fcs_err); ++ } ++ ++ return 0; ++} ++ ++PROC_DECLARE_RO(stats) ++ ++static int proc_encr_read(struct seq_file *sf, void *v) ++{ ++ struct ndis_device *wnd = (struct ndis_device *)sf->private; ++ int i, encr_status, auth_mode, infra_mode; ++ NDIS_STATUS res; ++ struct ndis_essid essid; ++ mac_address ap_address; ++ ++ res = mp_query(wnd, OID_802_11_BSSID, ++ &ap_address, sizeof(ap_address)); ++ if (res) ++ memset(ap_address, 0, ETH_ALEN); ++ add_text("ap_address=" MACSTRSEP "\n", MAC2STR(ap_address)); ++ ++ res = mp_query(wnd, OID_802_11_SSID, &essid, sizeof(essid)); ++ if (!res) ++ add_text("essid=%.*s\n", essid.length, essid.essid); ++ ++ res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &encr_status); ++ if (!res) { ++ typeof(&wnd->encr_info.keys[0]) tx_key; ++ add_text("tx_key=%u\n", wnd->encr_info.tx_key_index); ++ add_text("key="); ++ tx_key = &wnd->encr_info.keys[wnd->encr_info.tx_key_index]; ++ if (tx_key->length > 0) ++ for (i = 0; i < tx_key->length; i++) ++ add_text("%2.2X", tx_key->key[i]); ++ else ++ add_text("off"); ++ add_text("\n"); ++ add_text("encr_mode=%d\n", encr_status); ++ } ++ res = mp_query_int(wnd, OID_802_11_AUTHENTICATION_MODE, &auth_mode); ++ if (!res) ++ add_text("auth_mode=%d\n", auth_mode); ++ res = mp_query_int(wnd, OID_802_11_INFRASTRUCTURE_MODE, &infra_mode); ++ add_text("mode=%s\n", (infra_mode == Ndis802_11IBSS) ? "adhoc" : ++ (infra_mode == Ndis802_11Infrastructure) ? "managed" : "auto"); ++ ++ return 0; ++} ++ ++PROC_DECLARE_RO(encr) ++ ++static int proc_hw_read(struct seq_file *sf, void *v) ++{ ++ struct ndis_device *wnd = (struct ndis_device *)sf->private; ++ struct ndis_configuration config; ++ enum ndis_power power_mode; ++ NDIS_STATUS res; ++ ndis_tx_power_level tx_power; ++ ULONG bit_rate; ++ ndis_rts_threshold rts_threshold; ++ ndis_fragmentation_threshold frag_threshold; ++ ndis_antenna antenna; ++ ULONG packet_filter; ++ int n; ++ mac_address mac; ++ char *hw_status[] = {"ready", "initializing", "resetting", "closing", ++ "not ready"}; ++ ++ res = mp_query_int(wnd, OID_GEN_HARDWARE_STATUS, &n); ++ if (res == NDIS_STATUS_SUCCESS && n >= 0 && n < ARRAY_SIZE(hw_status)) ++ add_text("status=%s\n", hw_status[n]); ++ ++ res = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, mac, sizeof(mac)); ++ if (!res) ++ add_text("mac: " MACSTRSEP "\n", MAC2STR(mac)); ++ res = mp_query(wnd, OID_802_11_CONFIGURATION, &config, sizeof(config)); ++ if (!res) { ++ add_text("beacon_period=%u msec\n", config.beacon_period); ++ add_text("atim_window=%u msec\n", config.atim_window); ++ add_text("frequency=%u kHz\n", config.ds_config); ++ add_text("hop_pattern=%u\n", config.fh_config.hop_pattern); ++ add_text("hop_set=%u\n", config.fh_config.hop_set); ++ add_text("dwell_time=%u msec\n", config.fh_config.dwell_time); ++ } ++ ++ res = mp_query(wnd, OID_802_11_TX_POWER_LEVEL, ++ &tx_power, sizeof(tx_power)); ++ if (!res) ++ add_text("tx_power=%u mW\n", tx_power); ++ ++ res = mp_query(wnd, OID_GEN_LINK_SPEED, &bit_rate, sizeof(bit_rate)); ++ if (!res) ++ add_text("bit_rate=%u kBps\n", (u32)bit_rate / 10); ++ ++ res = mp_query(wnd, OID_802_11_RTS_THRESHOLD, ++ &rts_threshold, sizeof(rts_threshold)); ++ if (!res) ++ add_text("rts_threshold=%u bytes\n", rts_threshold); ++ ++ res = mp_query(wnd, OID_802_11_FRAGMENTATION_THRESHOLD, ++ &frag_threshold, sizeof(frag_threshold)); ++ if (!res) ++ add_text("frag_threshold=%u bytes\n", frag_threshold); ++ ++ res = mp_query_int(wnd, OID_802_11_POWER_MODE, &power_mode); ++ if (!res) ++ add_text("power_mode=%s\n", ++ (power_mode == NDIS_POWER_OFF) ? "always_on" : ++ (power_mode == NDIS_POWER_MAX) ? "max_savings" : ++ "min_savings"); ++ ++ res = mp_query(wnd, OID_802_11_NUMBER_OF_ANTENNAS, ++ &antenna, sizeof(antenna)); ++ if (!res) ++ add_text("num_antennas=%u\n", antenna); ++ ++ res = mp_query(wnd, OID_802_11_TX_ANTENNA_SELECTED, ++ &antenna, sizeof(antenna)); ++ if (!res) ++ add_text("tx_antenna=%u\n", antenna); ++ ++ res = mp_query(wnd, OID_802_11_RX_ANTENNA_SELECTED, ++ &antenna, sizeof(antenna)); ++ if (!res) ++ add_text("rx_antenna=%u\n", antenna); ++ ++ add_text("encryption_modes=%s%s%s%s%s%s%s\n", ++ test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr) ? ++ "WEP" : "none", ++ test_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr) ? ++ "; TKIP with WPA" : "", ++ test_bit(Ndis802_11AuthModeWPA2, &wnd->capa.auth) ? ++ ", WPA2" : "", ++ test_bit(Ndis802_11AuthModeWPA2PSK, &wnd->capa.auth) ? ++ ", WPA2PSK" : "", ++ test_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr) ? ++ "; AES/CCMP with WPA" : "", ++ test_bit(Ndis802_11AuthModeWPA2, &wnd->capa.auth) ? ++ ", WPA2" : "", ++ test_bit(Ndis802_11AuthModeWPA2PSK, &wnd->capa.auth) ? ++ ", WPA2PSK" : ""); ++ ++ res = mp_query_int(wnd, OID_GEN_CURRENT_PACKET_FILTER, &packet_filter); ++ if (!res) { ++ if (packet_filter != wnd->packet_filter) ++ WARNING("wrong packet_filter? 0x%08x, 0x%08x\n", ++ packet_filter, wnd->packet_filter); ++ add_text("packet_filter: 0x%08x\n", packet_filter); ++ } ++ ++ return 0; ++} ++ ++PROC_DECLARE_RO(hw) ++ ++static int proc_settings_read(struct seq_file *sf, void *v) ++{ ++ struct ndis_device *wnd = (struct ndis_device *)sf->private; ++ struct wrap_device_setting *setting; ++ ++ add_text("hangcheck_interval=%d\n", (hangcheck_interval == 0) ? ++ (wnd->hangcheck_interval / HZ) : -1); ++ ++ list_for_each_entry(setting, &wnd->wd->settings, list) { ++ add_text("%s=%s\n", setting->name, setting->value); ++ } ++ ++ list_for_each_entry(setting, &wnd->wd->driver->settings, list) { ++ add_text("%s=%s\n", setting->name, setting->value); ++ } ++ ++ return 0; ++} ++ ++static ssize_t proc_settings_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ndis_device *wnd = PDE_DATA(file_inode(file)); ++ char setting[MAX_PROC_STR_LEN], *p; ++ unsigned int i; ++ NDIS_STATUS res; ++ ++ if (count > MAX_PROC_STR_LEN) ++ return -EINVAL; ++ ++ memset(setting, 0, sizeof(setting)); ++ if (copy_from_user(setting, buf, count)) ++ return -EFAULT; ++ ++ if ((p = strchr(setting, '\n'))) ++ *p = 0; ++ ++ if ((p = strchr(setting, '='))) ++ *p = 0; ++ ++ if (!strcmp(setting, "hangcheck_interval")) { ++ if (!p) ++ return -EINVAL; ++ p++; ++ i = simple_strtol(p, NULL, 10); ++ hangcheck_del(wnd); ++ if (i > 0) { ++ wnd->hangcheck_interval = i * HZ; ++ hangcheck_add(wnd); ++ } ++ } else if (!strcmp(setting, "suspend")) { ++ if (!p) ++ return -EINVAL; ++ p++; ++ i = simple_strtol(p, NULL, 10); ++ if (i <= 0 || i > 3) ++ return -EINVAL; ++ i = -1; ++ if (wrap_is_pci_bus(wnd->wd->dev_bus)) ++ i = wrap_pnp_suspend_pci_device(wnd->wd->pci.pdev, ++ PMSG_SUSPEND); ++ else if (wrap_is_usb_bus(wnd->wd->dev_bus)) ++ i = wrap_pnp_suspend_usb_device(wnd->wd->usb.intf, ++ PMSG_SUSPEND); ++ if (i) ++ return -EINVAL; ++ } else if (!strcmp(setting, "resume")) { ++ i = -1; ++ if (wrap_is_pci_bus(wnd->wd->dev_bus)) ++ i = wrap_pnp_resume_pci_device(wnd->wd->pci.pdev); ++ else if (wrap_is_usb_bus(wnd->wd->dev_bus)) ++ i = wrap_pnp_resume_usb_device(wnd->wd->usb.intf); ++ if (i) ++ return -EINVAL; ++ } else if (!strcmp(setting, "stats_enabled")) { ++ if (!p) ++ return -EINVAL; ++ p++; ++ i = simple_strtol(p, NULL, 10); ++ if (i > 0) ++ wnd->iw_stats_enabled = TRUE; ++ else ++ wnd->iw_stats_enabled = FALSE; ++ } else if (!strcmp(setting, "packet_filter")) { ++ if (!p) ++ return -EINVAL; ++ p++; ++ i = simple_strtol(p, NULL, 10); ++ res = mp_set_int(wnd, OID_GEN_CURRENT_PACKET_FILTER, i); ++ if (res) ++ WARNING("setting packet_filter failed: %08X", res); ++ } else if (!strcmp(setting, "reinit")) { ++ if (ndis_reinit(wnd) != NDIS_STATUS_SUCCESS) ++ return -EFAULT; ++ } else { ++ struct ndis_configuration_parameter param; ++ struct unicode_string key; ++ struct ansi_string ansi; ++ ++ if (!p) ++ return -EINVAL; ++ p++; ++ RtlInitAnsiString(&ansi, p); ++ if (RtlAnsiStringToUnicodeString(¶m.data.string, &ansi, ++ TRUE) != STATUS_SUCCESS) ++ EXIT1(return -EFAULT); ++ param.type = NdisParameterString; ++ RtlInitAnsiString(&ansi, setting); ++ if (RtlAnsiStringToUnicodeString(&key, &ansi, ++ TRUE) != STATUS_SUCCESS) { ++ RtlFreeUnicodeString(¶m.data.string); ++ EXIT1(return -EINVAL); ++ } ++ NdisWriteConfiguration(&res, wnd->nmb, &key, ¶m); ++ RtlFreeUnicodeString(&key); ++ RtlFreeUnicodeString(¶m.data.string); ++ if (res != NDIS_STATUS_SUCCESS) ++ return -EFAULT; ++ } ++ return count; ++} ++ ++PROC_DECLARE_RW(settings) ++ ++int wrap_procfs_add_ndis_device(struct ndis_device *wnd) ++{ ++ int ret; ++ ++ if (wrap_procfs_entry == NULL) ++ return -ENOMEM; ++ ++ if (wnd->procfs_iface) { ++ ERROR("%s already registered?", wnd->net_dev->name); ++ return -EINVAL; ++ } ++ wnd->procfs_iface = proc_mkdir(wnd->net_dev->name, wrap_procfs_entry); ++ if (wnd->procfs_iface == NULL) { ++ ERROR("couldn't create proc directory"); ++ return -ENOMEM; ++ } ++ proc_set_user(wnd->procfs_iface, proc_kuid, proc_kgid); ++ ++ ret = proc_make_entry_ro(hw, wnd->procfs_iface, wnd); ++ if (ret) ++ goto err_hw; ++ ++ ret = proc_make_entry_ro(stats, wnd->procfs_iface, wnd); ++ if (ret) ++ goto err_stats; ++ ++ ret = proc_make_entry_ro(encr, wnd->procfs_iface, wnd); ++ if (ret) ++ goto err_encr; ++ ++ ret = proc_make_entry_rw(settings, wnd->procfs_iface, wnd); ++ if (ret) ++ goto err_settings; ++ ++ return 0; ++ ++err_settings: ++ remove_proc_entry("encr", wnd->procfs_iface); ++err_encr: ++ remove_proc_entry("stats", wnd->procfs_iface); ++err_stats: ++ remove_proc_entry("hw", wnd->procfs_iface); ++err_hw: ++ proc_remove(wnd->procfs_iface); ++ wnd->procfs_iface = NULL; ++ return -ENOMEM; ++} ++ ++void wrap_procfs_remove_ndis_device(struct ndis_device *wnd) ++{ ++ struct proc_dir_entry *procfs_iface = xchg(&wnd->procfs_iface, NULL); ++ ++ if (procfs_iface == NULL) ++ return; ++ remove_proc_entry("hw", procfs_iface); ++ remove_proc_entry("stats", procfs_iface); ++ remove_proc_entry("encr", procfs_iface); ++ remove_proc_entry("settings", procfs_iface); ++ if (wrap_procfs_entry) ++ proc_remove(procfs_iface); ++} ++ ++static int proc_debug_read(struct seq_file *sf, void *v) ++{ ++#if ALLOC_DEBUG ++ enum alloc_type type; ++#endif ++ ++ add_text("%d\n", debug); ++#if ALLOC_DEBUG ++ for (type = 0; type < ALLOC_TYPE_MAX; type++) ++ add_text("total size of allocations in %s: %d\n", ++ alloc_type_name[type], alloc_size(type)); ++#endif ++ return 0; ++} ++ ++static ssize_t proc_debug_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ int i; ++ char setting[MAX_PROC_STR_LEN], *p; ++ ++ if (count > MAX_PROC_STR_LEN) ++ return -EINVAL; ++ ++ memset(setting, 0, sizeof(setting)); ++ if (copy_from_user(setting, buf, count)) ++ return -EFAULT; ++ ++ if ((p = strchr(setting, '\n'))) ++ *p = 0; ++ ++ if ((p = strchr(setting, '='))) ++ *p = 0; ++ ++ i = simple_strtol(setting, NULL, 10); ++ if (i >= 0 && i < 10) ++ debug = i; ++ else ++ return -EINVAL; ++ return count; ++} ++ ++PROC_DECLARE_RW(debug) ++ ++int wrap_procfs_init(void) ++{ ++ int ret; ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) ++ struct user_namespace *ns = current_user_ns(); ++ proc_kuid = make_kuid(ns, proc_uid); ++ if (!uid_valid(proc_kuid)) { ++ ERROR("invalid UID\n"); ++ return -EINVAL; ++ } ++ proc_kgid = make_kgid(ns, proc_gid); ++ if (!gid_valid(proc_kgid)) { ++ ERROR("invalid GID\n"); ++ return -EINVAL; ++ } ++#endif ++ ++ wrap_procfs_entry = proc_mkdir(DRIVER_NAME, proc_net_root); ++ if (wrap_procfs_entry == NULL) { ++ ERROR("couldn't create procfs directory"); ++ return -ENOMEM; ++ } ++ proc_set_user(wrap_procfs_entry, proc_kuid, proc_kgid); ++ ++ ret = proc_make_entry_rw(debug, wrap_procfs_entry, NULL); ++ ++ return ret; ++} ++ ++void wrap_procfs_remove(void) ++{ ++ if (wrap_procfs_entry == NULL) ++ return; ++ remove_proc_entry("debug", wrap_procfs_entry); ++ proc_remove(wrap_procfs_entry); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/rtl.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/rtl.c +--- linux-3.12.2/3rdparty/ndiswrapper/rtl.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/rtl.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,715 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * Copyright (C) 2006-2007 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ntoskernel.h" ++#include "rtl_exports.h" ++ ++wstdcall SIZE_T WIN_FUNC(RtlCompareMemory,3) ++ (const void *a, const void *b, SIZE_T len) ++{ ++ size_t i; ++ char *x, *y; ++ ++ ENTER1("%p %p %zd", a, b, len); ++ x = (char *)a; ++ y = (char *)b; ++ /* MSDN says this should return number of bytes that compare as ++ * equal. This can be interpreted as either all bytes that are ++ * equal in 'len' bytes or that only until the bytes compare as ++ * not equal. Initially we had it the former way, but Realtek driver ++ * doesn't like it that way - it takes many attempts to associate ++ * with WPA. ReactOS returns the number of bytes that are equal ++ * before the first differing byte. ++ * According to lords at #reactos, that is the way it should be ++ * and that msdn is wrong about it! ++ */ ++ for (i = 0; i < len && x[i] == y[i]; i++) ++ ; ++ return i; ++} ++ ++wstdcall void WIN_FUNC(RtlCopyMemory,3) ++ (void *dst, const void *src, SIZE_T length) ++{ ++ memcpy(dst, src, length); ++} ++ ++wstdcall void WIN_FUNC(RtlZeroMemory,2) ++ (void *dst, SIZE_T length) ++{ ++ memset(dst, 0, length); ++} ++ ++wstdcall void WIN_FUNC(RtlSecureZeroMemory,2) ++ (void *dst, SIZE_T length) ++{ ++ memset(dst, 0, length); ++} ++ ++wstdcall void WIN_FUNC(RtlFillMemory,3) ++ (void *dest, SIZE_T length, UCHAR fill) ++{ ++ memset(dest, fill, length); ++} ++ ++wstdcall void WIN_FUNC(RtlMoveMemory,3) ++ (void *dest, const void *src, SIZE_T length) ++{ ++ memmove(dest, src, length); ++} ++ ++wstdcall LONG WIN_FUNC(RtlCompareString,3) ++ (const struct ansi_string *s1, const struct ansi_string *s2, ++ BOOLEAN case_insensitive) ++{ ++ unsigned int len; ++ LONG ret = 0; ++ const char *p1, *p2; ++ ++ ENTER2(""); ++ len = min(s1->length, s2->length); ++ p1 = s1->buf; ++ p2 = s2->buf; ++ if (case_insensitive) ++ while (!ret && len--) ++ ret = toupper(*p1++) - toupper(*p2++); ++ else ++ while (!ret && len--) ++ ret = *p1++ - *p2++; ++ if (!ret) ++ ret = s1->length - s2->length; ++ EXIT2(return ret); ++} ++ ++wstdcall LONG WIN_FUNC(RtlCompareUnicodeString,3) ++ (const struct unicode_string *s1, const struct unicode_string *s2, ++ BOOLEAN case_insensitive) ++{ ++ unsigned int len; ++ LONG ret = 0; ++ const wchar_t *p1, *p2; ++ ++ ENTER2(""); ++ ++ len = min(s1->length, s2->length) / sizeof(wchar_t); ++ p1 = s1->buf; ++ p2 = s2->buf; ++ if (case_insensitive) ++ while (!ret && len--) ++ ret = toupper((u8)*p1++) - toupper((u8)*p2++); ++ else ++ while (!ret && len--) ++ ret = (u8)*p1++ - (u8)*p2++; ++ if (!ret) ++ ret = s1->length - s2->length; ++ TRACE2("len: %d, ret: %d", len, ret); ++ EXIT2(return ret); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(RtlEqualString,3) ++ (const struct ansi_string *s1, const struct ansi_string *s2, ++ BOOLEAN case_insensitive) ++{ ++ ENTER1(""); ++ if (s1->length != s2->length) ++ return FALSE; ++ return !RtlCompareString(s1, s2, case_insensitive); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(RtlEqualUnicodeString,3) ++ (const struct unicode_string *s1, const struct unicode_string *s2, ++ BOOLEAN case_insensitive) ++{ ++ if (s1->length != s2->length) ++ return FALSE; ++ return !RtlCompareUnicodeString(s1, s2, case_insensitive); ++} ++ ++wstdcall void WIN_FUNC(RtlCopyUnicodeString,2) ++ (struct unicode_string *dst, struct unicode_string *src) ++{ ++ ENTER1("%p, %p", dst, src); ++ if (src && src->buf && dst->buf) { ++ dst->length = min(src->length, dst->max_length); ++ memcpy(dst->buf, src->buf, dst->length); ++ if (dst->length < dst->max_length) ++ dst->buf[dst->length / sizeof(dst->buf[0])] = 0; ++ } else ++ dst->length = 0; ++ EXIT1(return); ++} ++ ++wstdcall void WIN_FUNC(RtlCopyString,2) ++ (struct ansi_string *dst, struct ansi_string *src) ++{ ++ ENTER1("%p, %p", dst, src); ++ if (src && src->buf && dst->buf) { ++ dst->length = min(src->length, dst->max_length); ++ memcpy(dst->buf, src->buf, dst->length); ++ if (dst->length < dst->max_length) ++ dst->buf[dst->length] = 0; ++ } else ++ dst->length = 0; ++ EXIT1(return); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlAppendUnicodeToString,2) ++ (struct unicode_string *dst, wchar_t *src) ++{ ++ if (src) { ++ int len; ++ for (len = 0; src[len]; len++) ++ ; ++ if (dst->length + (len * sizeof(dst->buf[0])) > dst->max_length) ++ return STATUS_BUFFER_TOO_SMALL; ++ memcpy(&dst->buf[dst->length], src, len * sizeof(dst->buf[0])); ++ dst->length += len * sizeof(dst->buf[0]); ++ if (dst->max_length > dst->length) ++ dst->buf[dst->length / sizeof(dst->buf[0])] = 0; ++ } ++ return STATUS_SUCCESS; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlAppendUnicodeStringToString,2) ++ (struct unicode_string *dst, struct unicode_string *src) ++{ ++ if (dst->max_length < src->length + dst->length) ++ return STATUS_BUFFER_TOO_SMALL; ++ if (src->length) { ++ memcpy(&dst->buf[dst->length], src->buf, src->length); ++ dst->length += src->length; ++ if (dst->max_length > dst->length) ++ dst->buf[dst->length / sizeof(dst->buf[0])] = 0; ++ } ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall ULONG WIN_FUNC(RtlxAnsiStringToUnicodeSize,1) ++ (const struct ansi_string *string) ++{ ++ int i; ++ ++ for (i = 0; i < string->max_length && string->buf[i]; i++) ++ ; ++ return i * sizeof(wchar_t); ++} ++ ++wstdcall ULONG WIN_FUNC(RtlxUnicodeStringToAnsiSize,1) ++ (const struct unicode_string *string) ++{ ++ int i; ++ ++ for (i = 0; i < string->max_length && string->buf[i]; i++) ++ ; ++ return i; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlAnsiStringToUnicodeString,3) ++ (struct unicode_string *dst, const struct ansi_string *src, ++ BOOLEAN alloc) ++{ ++ int i, n; ++ ++ n = RtlxAnsiStringToUnicodeSize(src); ++ TRACE2("%d, %d, %d, %d, %p", n, dst->max_length, src->length, ++ src->max_length, src->buf); ++ if (alloc == TRUE) { ++#if 0 ++ if (n == 0) { ++ dst->length = dst->max_length = 0; ++ dst->buf = NULL; ++ EXIT2(return STATUS_SUCCESS); ++ } ++#endif ++ dst->max_length = n + sizeof(dst->buf[0]); ++ dst->buf = ExAllocatePoolWithTag(NonPagedPool, ++ dst->max_length, 0); ++ if (!dst->buf) { ++ dst->max_length = dst->length = 0; ++ EXIT2(return STATUS_NO_MEMORY); ++ } ++ } else if (dst->max_length < n) ++ EXIT2(return STATUS_BUFFER_TOO_SMALL); ++ ++ dst->length = n; ++ n /= sizeof(dst->buf[0]); ++ for (i = 0; i < n; i++) ++ dst->buf[i] = src->buf[i]; ++ if (i * sizeof(dst->buf[0]) < dst->max_length) ++ dst->buf[i] = 0; ++ TRACE2("dst: length: %d, max_length: %d, string: %p", ++ dst->length, dst->max_length, src->buf); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlUnicodeStringToAnsiString,3) ++ (struct ansi_string *dst, const struct unicode_string *src, ++ BOOLEAN alloc) ++{ ++ int i, n; ++ ++ n = RtlxUnicodeStringToAnsiSize(src); ++ TRACE2("%d, %d, %d, %d, %p", n, dst->max_length, src->length, ++ src->max_length, src->buf); ++ if (alloc == TRUE) { ++#if 0 ++ if (n == 0) { ++ dst->length = dst->max_length = 0; ++ dst->buf = NULL; ++ EXIT2(return STATUS_SUCCESS); ++ } ++#endif ++ dst->max_length = n + sizeof(dst->buf[0]); ++ dst->buf = ExAllocatePoolWithTag(NonPagedPool, ++ dst->max_length, 0); ++ if (!dst->buf) { ++ dst->max_length = dst->length = 0; ++ EXIT1(return STATUS_NO_MEMORY); ++ } ++ } else if (dst->max_length < n) ++ EXIT2(return STATUS_BUFFER_TOO_SMALL); ++ ++ dst->length = n; ++ for (i = 0; i < n; i++) ++ dst->buf[i] = src->buf[i]; ++ if (i < dst->max_length) ++ dst->buf[i] = 0; ++ TRACE2("string: %p, len: %d(%d)", dst->buf, dst->length, ++ dst->max_length); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlUnicodeStringToInteger,3) ++ (struct unicode_string *ustring, ULONG base, ULONG *value) ++{ ++ int i, sign = 1; ++ ULONG res; ++ typeof(ustring->buf) string; ++ ++ if (ustring->length == 0) { ++ *value = 0; ++ return STATUS_SUCCESS; ++ } ++ ++ string = ustring->buf; ++ i = 0; ++ while (i < (ustring->length / sizeof(*string)) && string[i] == ' ') ++ i++; ++ if (string[i] == '+') ++ i++; ++ else if (string[i] == '-') { ++ i++; ++ sign = -1; ++ } ++ if (base == 0) { ++ base = 10; ++ if (i <= ((ustring->length / sizeof(*string)) - 2) && ++ string[i] == '0') { ++ i++; ++ if (string[i] == 'b') { ++ base = 2; ++ i++; ++ } else if (string[i] == 'o') { ++ base = 8; ++ i++; ++ } else if (string[i] == 'x') { ++ base = 16; ++ i++; ++ } ++ } ++ } ++ if (!(base == 2 || base == 8 || base == 10 || base == 16)) ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ ++ for (res = 0; i < (ustring->length / sizeof(*string)); i++) { ++ int v; ++ if (isdigit((char)string[i])) ++ v = string[i] - '0'; ++ else if (isxdigit((char)string[i])) ++ v = tolower((char)string[i]) - 'a' + 10; ++ else ++ v = base; ++ if (v >= base) ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ res = res * base + v; ++ } ++ *value = sign * res; ++ EXIT3(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlCharToInteger,3) ++ (const char *string, ULONG base, ULONG *value) ++{ ++ int sign = 1; ++ ULONG res; ++ ++ if (!string || !value) ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ while (*string == ' ') ++ string++; ++ if (*string == '+') ++ string++; ++ else if (*string == '-') { ++ string++; ++ sign = -1; ++ } ++ if (base == 0) { ++ base = 10; ++ if (*string == '0') { ++ string++; ++ if (*string == 'b') { ++ base = 2; ++ string++; ++ } else if (*string == 'o') { ++ base = 8; ++ string++; ++ } else if (*string == 'x') { ++ base = 16; ++ string++; ++ } ++ } ++ } ++ if (!(base == 2 || base == 8 || base == 10 || base == 16)) ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ ++ for (res = 0; *string; string++) { ++ int v; ++ if (isdigit(*string)) ++ v = *string - '0'; ++ else if (isxdigit(*string)) ++ v = tolower(*string) - 'a' + 10; ++ else ++ v = base; ++ if (v >= base) ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ res = res * base + v; ++ } ++ *value = sign * res; ++ EXIT3(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlIntegerToUnicodeString,3) ++ (ULONG value, ULONG base, struct unicode_string *ustring) ++{ ++ typeof(ustring->buf) buf = ustring->buf; ++ int i; ++ ++ if (base == 0) ++ base = 10; ++ if (!(base == 2 || base == 8 || base == 10 || base == 16)) ++ return STATUS_INVALID_PARAMETER; ++ for (i = 0; value && i < ustring->max_length / sizeof(*buf); i++) { ++ int r; ++ r = value % base; ++ value /= base; ++ if (r < 10) ++ buf[i] = r + '0'; ++ else ++ buf[i] = r + 'a' - 10; ++ } ++ if (value) ++ return STATUS_BUFFER_OVERFLOW; ++ ustring->length = i * sizeof(*buf); ++ return STATUS_SUCCESS; ++} ++ ++wstdcall LARGE_INTEGER WIN_FUNC(RtlConvertUlongToLargeInteger,1) ++ (ULONG ul) ++{ ++ LARGE_INTEGER li = ul; ++ return li; ++} ++ ++wfastcall USHORT WIN_FUNC(RtlUshortByteSwap,1) ++ (USHORT src) ++{ ++ return __swab16(src); ++} ++ ++wfastcall ULONG WIN_FUNC(RtlUlongByteSwap,1) ++ (ULONG src) ++{ ++ /* ULONG is 32 bits for both 32-bit and 64-bit architectures */ ++ return __swab32(src); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlUpcaseUnicodeString,3) ++ (struct unicode_string *dst, struct unicode_string *src, BOOLEAN alloc) ++{ ++ USHORT i, n; ++ ++ if (alloc) { ++ dst->buf = ExAllocatePoolWithTag(NonPagedPool, src->length, 0); ++ if (dst->buf) ++ dst->max_length = src->length; ++ else ++ EXIT2(return STATUS_NO_MEMORY); ++ } else { ++ if (dst->max_length < src->length) ++ EXIT2(return STATUS_BUFFER_OVERFLOW); ++ } ++ ++ n = src->length / sizeof(src->buf[0]); ++ for (i = 0; i < n; i++) ++ dst->buf[i] = toupper(src->buf[i]); ++ ++ dst->length = src->length; ++ EXIT3(return STATUS_SUCCESS); ++} ++ ++wstdcall void WIN_FUNC(RtlInitUnicodeString,2) ++ (struct unicode_string *dst, const wchar_t *src) ++{ ++ ENTER2("%p", dst); ++ if (dst == NULL) ++ EXIT1(return); ++ if (src == NULL) { ++ dst->max_length = dst->length = 0; ++ dst->buf = NULL; ++ } else { ++ int i; ++ for (i = 0; (char)src[i]; i++) ++ ; ++ dst->buf = (typeof(dst->buf))src; ++ dst->length = i * sizeof(dst->buf[0]); ++ dst->max_length = (i + 1) * sizeof(dst->buf[0]); ++ } ++ EXIT1(return); ++} ++ ++wstdcall void WIN_FUNC(RtlInitAnsiString,2) ++ (struct ansi_string *dst, const char *src) ++{ ++ ENTER2("%p", dst); ++ if (dst == NULL) ++ EXIT2(return); ++ if (src == NULL) { ++ dst->max_length = dst->length = 0; ++ dst->buf = NULL; ++ } else { ++ int i; ++ for (i = 0; src[i]; i++) ++ ; ++ dst->buf = (typeof(dst->buf))src; ++ dst->length = i; ++ dst->max_length = i + 1; ++ } ++ TRACE2("%p", dst->buf); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(RtlInitString,2) ++ (struct ansi_string *dst, const char *src) ++{ ++ ENTER2("%p", dst); ++ RtlInitAnsiString(dst, src); ++ EXIT2(return); ++} ++ ++wstdcall void WIN_FUNC(RtlFreeUnicodeString,1) ++ (struct unicode_string *string) ++{ ++ ENTER2("%p", string); ++ if (string == NULL) ++ return; ++ if (string->buf) ++ ExFreePool(string->buf); ++ string->length = string->max_length = 0; ++ string->buf = NULL; ++ return; ++} ++ ++wstdcall void WIN_FUNC(RtlFreeAnsiString,1) ++ (struct ansi_string *string) ++{ ++ ENTER2("%p", string); ++ if (string == NULL) ++ return; ++ if (string->buf) ++ ExFreePool(string->buf); ++ string->length = string->max_length = 0; ++ string->buf = NULL; ++ return; ++} ++ ++/* guid string is of the form: {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ ++wstdcall NTSTATUS WIN_FUNC(RtlGUIDFromString,2) ++ (struct unicode_string *guid_string, struct guid *guid) ++{ ++ struct ansi_string ansi; ++ NTSTATUS ret; ++ int i, j, k, l, m; ++ ++ ret = RtlUnicodeStringToAnsiString(&ansi, guid_string, TRUE); ++ if (ret != STATUS_SUCCESS) ++ return ret; ++ if (ansi.length != 37 || ansi.buf[0] != '{' || ++ ansi.buf[36] != '}' || ansi.buf[9] != '-' || ++ ansi.buf[14] != '-' || ansi.buf[19] != '-' || ++ ansi.buf[24] != '-') { ++ RtlFreeAnsiString(&ansi); ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ } ++ memcpy(&guid->data4, &ansi.buf[29], sizeof(guid->data3)); ++ /* set end of data3 for scanf */ ++ ansi.buf[29] = 0; ++ if (sscanf(&ansi.buf[1], "%x", &i) == 1 && ++ sscanf(&ansi.buf[10], "%x", &j) == 1 && ++ sscanf(&ansi.buf[15], "%x", &k) == 1 && ++ sscanf(&ansi.buf[20], "%x", &l) == 1 && ++ sscanf(&ansi.buf[25], "%x", &m) == 1) { ++ guid->data1 = (i << 16) | (j < 8) | k; ++ guid->data2 = l; ++ guid->data3 = m; ++ ret = STATUS_SUCCESS; ++ } else ++ ret = STATUS_INVALID_PARAMETER; ++ RtlFreeAnsiString(&ansi); ++ return ret; ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlQueryRegistryValues,5) ++ (ULONG relative, wchar_t *path, struct rtl_query_registry_table *tbl, ++ void *context, void *env) ++{ ++ struct ansi_string ansi; ++ struct unicode_string unicode; ++ NTSTATUS status, ret; ++ static int i = 0; ++ ++ ENTER3("%x, %p", relative, tbl); ++// TODO(); ++ ++ RtlInitUnicodeString(&unicode, path); ++ if (RtlUnicodeStringToAnsiString(&ansi, &unicode, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE2("%s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ ret = STATUS_SUCCESS; ++ for (; tbl->name; tbl++) { ++ RtlInitUnicodeString(&unicode, tbl->name); ++ if (RtlUnicodeStringToAnsiString(&ansi, &unicode, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE2("name: %s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ TRACE2("flags: %08X", tbl->flags); ++ if (tbl->flags == RTL_QUERY_REGISTRY_DIRECT) { ++ TRACE2("type: %08X", tbl->def_type); ++ if (tbl->def_type == REG_DWORD) { ++ /* Atheros USB driver needs this, but ++ * don't know where and how to get its ++ * value */ ++ if (tbl->def_data) { ++ TRACE2("def_data: %x", ++ *(int *)tbl->def_data); ++ *(DWORD *)tbl->context = 0x5f292a + i++; ++// *(DWORD *)tbl->def_data; ++ } else ++ *(DWORD *)tbl->context = 0x2345dbe; ++ } ++ } else { ++ void *data; ++ ULONG type, length; ++ ++ if (!tbl->query_func) { ++ ERROR("oops: no query_func"); ++ ret = STATUS_INVALID_PARAMETER; ++ break; ++ } ++ if (tbl->flags & RTL_QUERY_REGISTRY_NOVALUE) { ++ data = NULL; ++ type = REG_NONE; ++ length = 0; ++ } else { ++ data = tbl->def_data; ++ type = tbl->def_type; ++ length = tbl->def_length;; ++ } ++ TRACE2("calling query_func: %p", tbl->query_func); ++ status = LIN2WIN6(tbl->query_func, tbl->name, type, ++ data, length, context, env); ++ TRACE2("status: %08X", status); ++ if (status) { ++ if (status == STATUS_BUFFER_TOO_SMALL) ++ ret = STATUS_BUFFER_TOO_SMALL; ++ else ++ EXIT2(return STATUS_INVALID_PARAMETER); ++ } ++ } ++ } ++ EXIT3(return ret); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlWriteRegistryValue,6) ++ (ULONG relative, wchar_t *path, wchar_t *name, ULONG type, ++ void *data, ULONG length) ++{ ++ struct ansi_string ansi; ++ struct unicode_string unicode; ++ ++ ENTER3("%d", relative); ++ TODO(); ++ ++ RtlInitUnicodeString(&unicode, path); ++ if (RtlUnicodeStringToAnsiString(&ansi, &unicode, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE2("%s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ RtlInitUnicodeString(&unicode, name); ++ if (RtlUnicodeStringToAnsiString(&ansi, &unicode, TRUE) == ++ STATUS_SUCCESS) { ++ TRACE2("%s", ansi.buf); ++ RtlFreeAnsiString(&ansi); ++ } ++ EXIT5(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS WIN_FUNC(RtlDeleteRegistryValue,3) ++ (ULONG relative, wchar_t *path, wchar_t *name) ++{ ++ return STATUS_SUCCESS; ++} ++ ++wstdcall void WIN_FUNC(RtlAssert,4) ++ (char *failed_assertion, char *file_name, ULONG line_num, char *message) ++{ ++ ERROR("assertion '%s' failed at %s line %d%s", ++ failed_assertion, file_name, line_num, message ? message : ""); ++ return; ++} ++ ++wstdcall void WIN_FUNC(RtlUnwind,0) ++ (void) ++{ ++ TODO(); ++} ++ ++wstdcall void WIN_FUNC(RtlRaiseException,1) ++ (void *exception_record) ++{ ++ TODO(); ++} ++ ++wstdcall BOOLEAN WIN_FUNC(RtlIsServicePackVersionInstalled,1) ++ (ULONG version) ++{ ++ /* Assume we have all service packs */ ++ TRACE1("version: %d", version); ++ return TRUE; ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.c +--- linux-3.12.2/3rdparty/ndiswrapper/usb.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,1496 @@ ++/* ++ * Copyright (C) 2004 Jan Kiszka ++ * Copyright (C) 2005 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ndis.h" ++#include "usb.h" ++#include "usb_exports.h" ++ ++#ifdef USB_DEBUG ++static unsigned int urb_id = 0; ++ ++#define DUMP_WRAP_URB(wrap_urb, dir) \ ++ USBTRACE("urb %p (%d) %s: buf: %p, len: %d, pipe: 0x%x, %d", \ ++ (wrap_urb)->urb, (wrap_urb)->id, \ ++ (dir == USB_DIR_OUT) ? "going down" : "coming back", \ ++ (wrap_urb)->urb->transfer_buffer, \ ++ (wrap_urb)->urb->transfer_buffer_length, \ ++ (wrap_urb)->urb->pipe, (wrap_urb)->urb->status) ++ ++#define DUMP_URB_BUFFER(urb, dir) \ ++ while (debug >= 2) { \ ++ int i; \ ++ char msg[20], *t; \ ++ if (!urb->transfer_buffer) \ ++ break; \ ++ if (!((usb_pipein(urb->pipe) && dir == USB_DIR_IN) || \ ++ (usb_pipeout(urb->pipe) && dir == USB_DIR_OUT))) \ ++ break; \ ++ t = msg; \ ++ t += sprintf(t, "%d: ", (urb)->actual_length); \ ++ for (i = 0; i < urb->actual_length && \ ++ t < &msg[sizeof(msg) - 4]; i++) \ ++ t += sprintf(t, "%02X ", \ ++ ((char *)urb->transfer_buffer)[i]); \ ++ *t = 0; \ ++ USBTRACE("%s", msg); \ ++ break; \ ++ } ++ ++#else ++ ++#define DUMP_WRAP_URB(wrap_urb, dir) (void)0 ++#define DUMP_URB_BUFFER(urb, dir) (void)0 ++ ++#endif ++ ++#define CUR_ALT_SETTING(intf) (intf)->cur_altsetting ++ ++#ifndef USB_CTRL_SET_TIMEOUT ++#define USB_CTRL_SET_TIMEOUT 5000 ++#endif ++ ++#ifndef USB_CTRL_GET_TIMEOUT ++#define USB_CTRL_GET_TIMEOUT 5000 ++#endif ++ ++#ifndef URB_NO_TRANSFER_DMA_MAP ++#define URB_NO_TRANSFER_DMA_MAP 0 ++#endif ++ ++/* wrap_urb->flags */ ++/* transfer_buffer for urb is allocated; free it in wrap_free_urb */ ++#define WRAP_URB_COPY_BUFFER 0x01 ++ ++static inline int wrap_cancel_urb(struct wrap_urb *wrap_urb) ++{ ++ int ret; ++ USBTRACE("%p, %p, %d", wrap_urb, wrap_urb->urb, wrap_urb->state); ++ if (wrap_urb->state != URB_SUBMITTED) ++ USBEXIT(return -1); ++ ret = usb_unlink_urb(wrap_urb->urb); ++ USBTRACE("ret: %d", ret); ++ if (ret == -EINPROGRESS) ++ return 0; ++ else { ++ WARNING("unlink failed: %d", ret); ++ return ret; ++ } ++} ++ ++#define URB_STATUS(wrap_urb) (wrap_urb->urb->status) ++ ++static struct nt_list wrap_urb_complete_list; ++static spinlock_t wrap_urb_complete_list_lock; ++ ++static struct work_struct wrap_urb_complete_work; ++static void wrap_urb_complete_worker(struct work_struct *dummy); ++ ++static void kill_all_urbs(struct wrap_device *wd, int complete) ++{ ++ struct nt_list *ent; ++ struct wrap_urb *wrap_urb; ++ KIRQL irql; ++ ++ USBTRACE("%d", wd->usb.num_alloc_urbs); ++ while (1) { ++ IoAcquireCancelSpinLock(&irql); ++ ent = RemoveHeadList(&wd->usb.wrap_urb_list); ++ IoReleaseCancelSpinLock(irql); ++ if (!ent) ++ break; ++ wrap_urb = container_of(ent, struct wrap_urb, list); ++ if (wrap_urb->state == URB_SUBMITTED) { ++ WARNING("Windows driver %s didn't free urb: %p", ++ wd->driver->name, wrap_urb->urb); ++ if (!complete) ++ wrap_urb->urb->complete = NULL; ++ usb_kill_urb(wrap_urb->urb); ++ } ++ USBTRACE("%p, %p", wrap_urb, wrap_urb->urb); ++ usb_free_urb(wrap_urb->urb); ++ kfree(wrap_urb); ++ } ++ wd->usb.num_alloc_urbs = 0; ++} ++ ++/* for a given Linux urb status code, return corresponding NT urb status */ ++static USBD_STATUS wrap_urb_status(int urb_status) ++{ ++ switch (urb_status) { ++ case 0: ++ return USBD_STATUS_SUCCESS; ++ case -EPROTO: ++ return USBD_STATUS_TIMEOUT; ++ case -EILSEQ: ++ return USBD_STATUS_CRC; ++ case -EPIPE: ++ return USBD_STATUS_INVALID_PIPE_HANDLE; ++ case -ECOMM: ++ return USBD_STATUS_DATA_OVERRUN; ++ case -ENOSR: ++ return USBD_STATUS_DATA_UNDERRUN; ++ case -EOVERFLOW: ++ return USBD_STATUS_BABBLE_DETECTED; ++ case -EREMOTEIO: ++ return USBD_STATUS_ERROR_SHORT_TRANSFER;; ++ case -ENODEV: ++ case -ESHUTDOWN: ++ case -ENOENT: ++ return USBD_STATUS_DEVICE_GONE; ++ case -ENOMEM: ++ return USBD_STATUS_NO_MEMORY; ++ case -EINVAL: ++ return USBD_STATUS_REQUEST_FAILED; ++ default: ++ return USBD_STATUS_NOT_SUPPORTED; ++ } ++} ++ ++/* for a given USBD_STATUS, return its corresponding NTSTATUS (for irp) */ ++static NTSTATUS nt_urb_irp_status(USBD_STATUS nt_urb_status) ++{ ++ switch (nt_urb_status) { ++ case USBD_STATUS_SUCCESS: ++ return STATUS_SUCCESS; ++ case USBD_STATUS_DEVICE_GONE: ++ return STATUS_DEVICE_REMOVED; ++ case USBD_STATUS_PENDING: ++ return STATUS_PENDING; ++ case USBD_STATUS_NOT_SUPPORTED: ++ return STATUS_NOT_IMPLEMENTED; ++ case USBD_STATUS_NO_MEMORY: ++ return STATUS_NO_MEMORY; ++ case USBD_STATUS_REQUEST_FAILED: ++ return STATUS_NOT_SUPPORTED; ++ default: ++ return STATUS_FAILURE; ++ } ++} ++ ++static void wrap_free_urb(struct urb *urb) ++{ ++ struct wrap_urb *wrap_urb = urb->context; ++ struct irp *irp = wrap_urb->irp; ++ struct wrap_device *wd = IRP_WRAP_DEVICE(irp); ++ ++ USBTRACE("freeing urb: %p", urb); ++ irp->cancel_routine = NULL; ++ IRP_WRAP_URB(irp) = NULL; ++ if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) { ++ USBTRACE("freeing DMA buffer for URB: %p %p", ++ urb, urb->transfer_buffer); ++ usb_free_coherent(wd->usb.udev, urb->transfer_buffer_length, ++ urb->transfer_buffer, urb->transfer_dma); ++ } ++ kfree(urb->setup_packet); ++ if (wd->usb.num_alloc_urbs > MAX_ALLOCATED_URBS) { ++ IoAcquireCancelSpinLock(&irp->cancel_irql); ++ RemoveEntryList(&wrap_urb->list); ++ wd->usb.num_alloc_urbs--; ++ IoReleaseCancelSpinLock(irp->cancel_irql); ++ usb_free_urb(urb); ++ kfree(wrap_urb); ++ } else { ++ wrap_urb->state = URB_FREE; ++ wrap_urb->flags = 0; ++ wrap_urb->irp = NULL; ++ } ++ return; ++} ++ ++void wrap_suspend_urbs(struct wrap_device *wd) ++{ ++ /* TODO: do we need to cancel urbs? */ ++ USBTRACE("%p, %d", wd, wd->usb.num_alloc_urbs); ++} ++ ++void wrap_resume_urbs(struct wrap_device *wd) ++{ ++ /* TODO: do we need to resubmit urbs? */ ++ USBTRACE("%p, %d", wd, wd->usb.num_alloc_urbs); ++} ++ ++wstdcall void wrap_cancel_irp(struct device_object *dev_obj, struct irp *irp) ++{ ++ struct urb *urb; ++ struct wrap_urb *wrap_urb = IRP_WRAP_URB(irp); ++ ++ /* NB: this function is called holding Cancel spinlock */ ++ USBENTER("irp: %p", irp); ++ urb = wrap_urb->urb; ++ USBTRACE("canceling urb %p", urb); ++ if (wrap_cancel_urb(IRP_WRAP_URB(irp))) { ++ irp->cancel = FALSE; ++ ERROR("urb %p can't be canceled: %d", urb, wrap_urb->state); ++ } else ++ USBTRACE("urb %p canceled", urb); ++ IoReleaseCancelSpinLock(irp->cancel_irql); ++ return; ++} ++WIN_FUNC_DECL(wrap_cancel_irp,2) ++ ++static struct urb *wrap_alloc_urb(struct irp *irp, unsigned int pipe, ++ void *buf, unsigned int buf_len) ++{ ++ struct urb *urb; ++ gfp_t alloc_flags; ++ struct wrap_urb *wrap_urb; ++ struct wrap_device *wd; ++ ++ USBENTER("irp: %p", irp); ++ wd = IRP_WRAP_DEVICE(irp); ++ ++ /* Don't interfere with URB cleanup by the kernel */ ++ if (test_bit(HW_DISABLED, &wd->hw_status)) ++ return NULL; ++ ++ alloc_flags = irql_gfp(); ++ IoAcquireCancelSpinLock(&irp->cancel_irql); ++ urb = NULL; ++ nt_list_for_each_entry(wrap_urb, &wd->usb.wrap_urb_list, list) { ++ if (cmpxchg(&wrap_urb->state, URB_FREE, ++ URB_ALLOCATED) == URB_FREE) { ++ urb = wrap_urb->urb; ++ /* Clean URB but keep the refcount */ ++ memset((char *)urb + sizeof(urb->kref), 0, ++ sizeof(*urb) - sizeof(urb->kref)); ++ break; ++ } ++ } ++ if (!urb) { ++ IoReleaseCancelSpinLock(irp->cancel_irql); ++ wrap_urb = kzalloc(sizeof(*wrap_urb), alloc_flags); ++ if (!wrap_urb) { ++ WARNING("couldn't allocate memory"); ++ return NULL; ++ } ++ urb = usb_alloc_urb(0, alloc_flags); ++ if (!urb) { ++ WARNING("couldn't allocate urb"); ++ kfree(wrap_urb); ++ return NULL; ++ } ++ IoAcquireCancelSpinLock(&irp->cancel_irql); ++ wrap_urb->urb = urb; ++ wrap_urb->state = URB_ALLOCATED; ++ InsertTailList(&wd->usb.wrap_urb_list, &wrap_urb->list); ++ wd->usb.num_alloc_urbs++; ++ } ++ ++#ifdef URB_ASYNC_UNLINK ++ urb->transfer_flags |= URB_ASYNC_UNLINK; ++#elif defined(USB_ASYNC_UNLINK) ++ urb->transfer_flags |= USB_ASYNC_UNLINK; ++#endif ++ urb->context = wrap_urb; ++ wrap_urb->irp = irp; ++ IRP_WRAP_URB(irp) = wrap_urb; ++ /* called as Windows function */ ++ irp->cancel_routine = WIN_FUNC_PTR(wrap_cancel_irp,2); ++ IoReleaseCancelSpinLock(irp->cancel_irql); ++ USBTRACE("urb: %p", urb); ++ ++ urb->transfer_buffer_length = buf_len; ++ if (buf_len && buf && (!virt_addr_valid(buf) ++#if defined(CONFIG_HIGHMEM) || defined(CONFIG_HIGHMEM4G) ++ || PageHighMem(virt_to_page(buf)) ++#endif ++ )) { ++ urb->transfer_buffer = ++ usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags, ++ &urb->transfer_dma); ++ if (!urb->transfer_buffer) { ++ WARNING("couldn't allocate dma buf"); ++ IoAcquireCancelSpinLock(&irp->cancel_irql); ++ irp->cancel_routine = NULL; ++ wrap_urb->state = URB_FREE; ++ wrap_urb->irp = NULL; ++ IRP_WRAP_URB(irp) = NULL; ++ IoReleaseCancelSpinLock(irp->cancel_irql); ++ return NULL; ++ } ++ if (urb->transfer_dma) ++ urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; ++ wrap_urb->flags |= WRAP_URB_COPY_BUFFER; ++ if (usb_pipeout(pipe)) ++ memcpy(urb->transfer_buffer, buf, buf_len); ++ USBTRACE("DMA buf for urb %p: %p", urb, urb->transfer_buffer); ++ } else ++ urb->transfer_buffer = buf; ++ return urb; ++} ++ ++static USBD_STATUS wrap_submit_urb(struct irp *irp) ++{ ++ int ret; ++ struct wrap_urb *wrap_urb = IRP_WRAP_URB(irp); ++ struct urb *urb = wrap_urb->urb; ++ union nt_urb *nt_urb = IRP_URB(irp); ++ ++#ifdef USB_DEBUG ++ if (wrap_urb->state != URB_ALLOCATED) { ++ ERROR("urb %p is in wrong state: %d", ++ urb, wrap_urb->state); ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_REQUEST_FAILED; ++ return NT_URB_STATUS(nt_urb); ++ } ++ wrap_urb->id = pre_atomic_add(urb_id, 1); ++#endif ++ DUMP_WRAP_URB(IRP_WRAP_URB(irp), USB_DIR_OUT); ++ irp->io_status.status = STATUS_PENDING; ++ irp->io_status.info = 0; ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_PENDING; ++ IoMarkIrpPending(irp); ++ DUMP_URB_BUFFER(urb, USB_DIR_OUT); ++ USBTRACE("%p", urb); ++ wrap_urb->state = URB_SUBMITTED; ++ ret = usb_submit_urb(urb, irql_gfp()); ++ if (ret) { ++ USBTRACE("ret: %d", ret); ++ wrap_free_urb(urb); ++ /* we assume that IRP was not in pending state before */ ++ IoUnmarkIrpPending(irp); ++ NT_URB_STATUS(nt_urb) = wrap_urb_status(ret); ++ USBEXIT(return NT_URB_STATUS(nt_urb)); ++ } else ++ USBEXIT(return USBD_STATUS_PENDING); ++} ++ ++static void wrap_urb_complete(struct urb *urb ISR_PT_REGS_PARAM_DECL) ++{ ++ struct irp *irp; ++ struct wrap_urb *wrap_urb; ++ ++ wrap_urb = urb->context; ++ USBTRACE("%p (%p) completed", wrap_urb, urb); ++ irp = wrap_urb->irp; ++ DUMP_WRAP_URB(wrap_urb, USB_DIR_IN); ++ irp->cancel_routine = NULL; ++#ifdef USB_DEBUG ++ if (wrap_urb->state != URB_SUBMITTED) { ++ WARNING("urb %p in wrong state: %d (%d)", urb, wrap_urb->state, ++ urb->status); ++ return; ++ } ++#endif ++ wrap_urb->state = URB_COMPLETED; ++ spin_lock(&wrap_urb_complete_list_lock); ++ InsertTailList(&wrap_urb_complete_list, &wrap_urb->complete_list); ++ spin_unlock(&wrap_urb_complete_list_lock); ++ queue_work(ntos_wq, &wrap_urb_complete_work); ++} ++ ++/* one worker for all devices */ ++static void wrap_urb_complete_worker(struct work_struct *dummy) ++{ ++ struct irp *irp; ++ struct urb *urb; ++ struct usbd_bulk_or_intr_transfer *bulk_int_tx; ++ struct usbd_vendor_or_class_request *vc_req; ++ union nt_urb *nt_urb; ++ struct wrap_urb *wrap_urb; ++ struct nt_list *ent; ++ unsigned long flags; ++ ++ USBENTER(""); ++ while (1) { ++ spin_lock_irqsave(&wrap_urb_complete_list_lock, flags); ++ ent = RemoveHeadList(&wrap_urb_complete_list); ++ spin_unlock_irqrestore(&wrap_urb_complete_list_lock, flags); ++ if (!ent) ++ break; ++ wrap_urb = container_of(ent, struct wrap_urb, complete_list); ++ urb = wrap_urb->urb; ++#ifdef USB_DEBUG ++ if (wrap_urb->state != URB_COMPLETED && ++ wrap_urb->state != URB_INT_UNLINKED) ++ WARNING("urb %p in wrong state: %d", ++ urb, wrap_urb->state); ++#endif ++ irp = wrap_urb->irp; ++ DUMP_IRP(irp); ++ nt_urb = IRP_URB(irp); ++ USBTRACE("urb: %p, nt_urb: %p, status: %d", ++ urb, nt_urb, urb->status); ++ switch (urb->status) { ++ case 0: ++ /* successfully transferred */ ++ irp->io_status.info = urb->actual_length; ++ if (nt_urb->header.function == ++ URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER) { ++ bulk_int_tx = &nt_urb->bulk_int_transfer; ++ bulk_int_tx->transfer_buffer_length = ++ urb->actual_length; ++ DUMP_URB_BUFFER(urb, USB_DIR_IN); ++ if ((wrap_urb->flags & WRAP_URB_COPY_BUFFER) && ++ usb_pipein(urb->pipe)) ++ memcpy(bulk_int_tx->transfer_buffer, ++ urb->transfer_buffer, ++ urb->actual_length); ++ } else { // vendor or class request ++ vc_req = &nt_urb->vendor_class_request; ++ vc_req->transfer_buffer_length = ++ urb->actual_length; ++ DUMP_URB_BUFFER(urb, USB_DIR_IN); ++ if ((wrap_urb->flags & WRAP_URB_COPY_BUFFER) && ++ usb_pipein(urb->pipe)) ++ memcpy(vc_req->transfer_buffer, ++ urb->transfer_buffer, ++ urb->actual_length); ++ } ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_SUCCESS; ++ irp->io_status.status = STATUS_SUCCESS; ++ break; ++ case -ENOENT: ++ case -ECONNRESET: ++ /* urb canceled */ ++ irp->io_status.info = 0; ++ TRACE2("urb %p canceled", urb); ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_SUCCESS; ++ irp->io_status.status = STATUS_CANCELLED; ++ break; ++ default: ++ TRACE2("irp: %p, urb: %p, status: %d/%d", ++ irp, urb, urb->status, wrap_urb->state); ++ irp->io_status.info = 0; ++ NT_URB_STATUS(nt_urb) = wrap_urb_status(urb->status); ++ irp->io_status.status = ++ nt_urb_irp_status(NT_URB_STATUS(nt_urb)); ++ break; ++ } ++ wrap_free_urb(urb); ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ } ++ USBEXIT(return); ++} ++ ++static USBD_STATUS wrap_bulk_or_intr_trans(struct irp *irp) ++{ ++ struct usb_endpoint_descriptor *pipe_handle; ++ struct urb *urb; ++ unsigned int pipe; ++ struct usbd_bulk_or_intr_transfer *bulk_int_tx; ++ USBD_STATUS status; ++ struct wrap_device *wd = IRP_WRAP_DEVICE(irp); ++ struct usb_device *udev = wd->usb.udev; ++ union nt_urb *nt_urb = IRP_URB(irp); ++ ++ bulk_int_tx = &nt_urb->bulk_int_transfer; ++ pipe_handle = bulk_int_tx->pipe_handle; ++ USBTRACE("flags: 0x%x, length: %u, buffer: %p, handle: %p", ++ bulk_int_tx->transfer_flags, ++ bulk_int_tx->transfer_buffer_length, ++ bulk_int_tx->transfer_buffer, pipe_handle); ++ ++ if (USBD_IS_BULK_PIPE(pipe_handle)) { ++ if (bulk_int_tx->transfer_flags & USBD_TRANSFER_DIRECTION_IN) ++ pipe = usb_rcvbulkpipe(udev, ++ pipe_handle->bEndpointAddress); ++ else ++ pipe = usb_sndbulkpipe(udev, ++ pipe_handle->bEndpointAddress); ++ } else { ++ if (bulk_int_tx->transfer_flags & USBD_TRANSFER_DIRECTION_IN) ++ pipe = usb_rcvintpipe(udev, ++ pipe_handle->bEndpointAddress); ++ else ++ pipe = usb_sndintpipe(udev, ++ pipe_handle->bEndpointAddress); ++ } ++ ++ DUMP_IRP(irp); ++ urb = wrap_alloc_urb(irp, pipe, bulk_int_tx->transfer_buffer, ++ bulk_int_tx->transfer_buffer_length); ++ if (!urb) { ++ ERROR("couldn't allocate urb"); ++ return USBD_STATUS_NO_MEMORY; ++ } ++ if (usb_pipein(pipe) && ++ (!(bulk_int_tx->transfer_flags & USBD_SHORT_TRANSFER_OK))) { ++ USBTRACE("short not ok"); ++ urb->transfer_flags |= URB_SHORT_NOT_OK; ++ } ++ if (usb_pipebulk(pipe)) { ++ usb_fill_bulk_urb(urb, udev, pipe, urb->transfer_buffer, ++ bulk_int_tx->transfer_buffer_length, ++ wrap_urb_complete, urb->context); ++ USBTRACE("submitting bulk urb %p on pipe 0x%x (ep 0x%x)", ++ urb, urb->pipe, pipe_handle->bEndpointAddress); ++ } else { ++ usb_fill_int_urb(urb, udev, pipe, urb->transfer_buffer, ++ bulk_int_tx->transfer_buffer_length, ++ wrap_urb_complete, urb->context, ++ pipe_handle->bInterval); ++ USBTRACE("submitting interrupt urb %p on pipe 0x%x (ep 0x%x), " ++ "intvl: %d", urb, urb->pipe, ++ pipe_handle->bEndpointAddress, pipe_handle->bInterval); ++ } ++ status = wrap_submit_urb(irp); ++ USBTRACE("status: %08X", status); ++ USBEXIT(return status); ++} ++ ++static USBD_STATUS wrap_vendor_or_class_req(struct irp *irp) ++{ ++ u8 req_type; ++ unsigned int pipe; ++ struct usbd_vendor_or_class_request *vc_req; ++ USBD_STATUS status; ++ struct urb *urb; ++ struct usb_ctrlrequest *dr; ++ struct wrap_device *wd = IRP_WRAP_DEVICE(irp); ++ struct usb_device *udev = wd->usb.udev; ++ union nt_urb *nt_urb = IRP_URB(irp); ++ ++ vc_req = &nt_urb->vendor_class_request; ++ USBTRACE("bits: %x, req: %x, val: %08x, index: %08x, flags: %x," ++ "buf: %p, len: %d", vc_req->reserved_bits, vc_req->request, ++ vc_req->value, vc_req->index, vc_req->transfer_flags, ++ vc_req->transfer_buffer, vc_req->transfer_buffer_length); ++ ++ USBTRACE("%x", nt_urb->header.function); ++ switch (nt_urb->header.function) { ++ case URB_FUNCTION_VENDOR_DEVICE: ++ req_type = USB_TYPE_VENDOR | USB_RECIP_DEVICE; ++ break; ++ case URB_FUNCTION_VENDOR_INTERFACE: ++ req_type = USB_TYPE_VENDOR | USB_RECIP_INTERFACE; ++ break; ++ case URB_FUNCTION_VENDOR_ENDPOINT: ++ req_type = USB_TYPE_VENDOR | USB_RECIP_ENDPOINT; ++ break; ++ case URB_FUNCTION_VENDOR_OTHER: ++ req_type = USB_TYPE_VENDOR | USB_RECIP_OTHER; ++ break; ++ case URB_FUNCTION_CLASS_DEVICE: ++ req_type = USB_TYPE_CLASS | USB_RECIP_DEVICE; ++ break; ++ case URB_FUNCTION_CLASS_INTERFACE: ++ req_type = USB_TYPE_CLASS | USB_RECIP_INTERFACE; ++ break; ++ case URB_FUNCTION_CLASS_ENDPOINT: ++ req_type = USB_TYPE_CLASS | USB_RECIP_ENDPOINT; ++ break; ++ case URB_FUNCTION_CLASS_OTHER: ++ req_type = USB_TYPE_CLASS | USB_RECIP_OTHER; ++ break; ++ default: ++ ERROR("unknown request type: %x", nt_urb->header.function); ++ req_type = 0; ++ break; ++ } ++ ++ req_type |= vc_req->reserved_bits; ++ USBTRACE("req type: %08x", req_type); ++ ++ if (vc_req->transfer_flags & USBD_TRANSFER_DIRECTION_IN) { ++ pipe = usb_rcvctrlpipe(udev, 0); ++ req_type |= USB_DIR_IN; ++ USBTRACE("pipe: %x, dir in", pipe); ++ } else { ++ pipe = usb_sndctrlpipe(udev, 0); ++ req_type |= USB_DIR_OUT; ++ USBTRACE("pipe: %x, dir out", pipe); ++ } ++ urb = wrap_alloc_urb(irp, pipe, vc_req->transfer_buffer, ++ vc_req->transfer_buffer_length); ++ if (!urb) { ++ ERROR("couldn't allocate urb"); ++ return USBD_STATUS_NO_MEMORY; ++ } ++ ++ if (usb_pipein(pipe) && ++ (!(vc_req->transfer_flags & USBD_SHORT_TRANSFER_OK))) { ++ USBTRACE("short not ok"); ++ urb->transfer_flags |= URB_SHORT_NOT_OK; ++ } ++ ++ dr = kzalloc(sizeof(*dr), irql_gfp()); ++ if (!dr) { ++ ERROR("couldn't allocate memory"); ++ wrap_free_urb(urb); ++ return USBD_STATUS_NO_MEMORY; ++ } ++ dr->bRequestType = req_type; ++ dr->bRequest = vc_req->request; ++ dr->wValue = cpu_to_le16(vc_req->value); ++ dr->wIndex = cpu_to_le16((u16)vc_req->index); ++ dr->wLength = cpu_to_le16((u16)urb->transfer_buffer_length); ++ ++ usb_fill_control_urb(urb, udev, pipe, (unsigned char *)dr, ++ urb->transfer_buffer, urb->transfer_buffer_length, ++ wrap_urb_complete, urb->context); ++ status = wrap_submit_urb(irp); ++ USBTRACE("status: %08X", status); ++ USBEXIT(return status); ++} ++ ++static USBD_STATUS wrap_reset_pipe(struct usb_device *udev, struct irp *irp) ++{ ++ int ret; ++ union nt_urb *nt_urb; ++ struct usb_endpoint_descriptor *pipe_handle; ++ unsigned int pipe1, pipe2; ++ ++ nt_urb = IRP_URB(irp); ++ pipe_handle = nt_urb->pipe_req.pipe_handle; ++ /* TODO: not clear if both directions should be cleared? */ ++ if (USBD_IS_BULK_PIPE(pipe_handle)) { ++ pipe1 = usb_rcvbulkpipe(udev, pipe_handle->bEndpointAddress); ++ pipe2 = usb_sndbulkpipe(udev, pipe_handle->bEndpointAddress); ++ } else if (USBD_IS_INT_PIPE(pipe_handle)) { ++ pipe1 = usb_rcvintpipe(udev, pipe_handle->bEndpointAddress); ++ pipe2 = pipe1; ++ } else { ++ WARNING("invalid pipe %d", pipe_handle->bEndpointAddress); ++ return USBD_STATUS_INVALID_PIPE_HANDLE; ++ } ++ USBTRACE("ep: %d, pipe: 0x%x", pipe_handle->bEndpointAddress, pipe1); ++ ret = usb_clear_halt(udev, pipe1); ++ if (ret) ++ USBTRACE("resetting pipe %d failed: %d", pipe1, ret); ++ if (pipe2 != pipe1) { ++ ret = usb_clear_halt(udev, pipe2); ++ if (ret) ++ USBTRACE("resetting pipe %d failed: %d", pipe2, ret); ++ } ++// return wrap_urb_status(ret); ++ return USBD_STATUS_SUCCESS; ++} ++ ++static USBD_STATUS wrap_abort_pipe(struct usb_device *udev, struct irp *irp) ++{ ++ union nt_urb *nt_urb; ++ struct usb_endpoint_descriptor *pipe_handle; ++ struct wrap_urb *wrap_urb; ++ struct wrap_device *wd; ++ KIRQL irql; ++ ++ wd = IRP_WRAP_DEVICE(irp); ++ nt_urb = IRP_URB(irp); ++ pipe_handle = nt_urb->pipe_req.pipe_handle; ++ USBENTER("%p, %x", irp, pipe_handle->bEndpointAddress); ++ IoAcquireCancelSpinLock(&irql); ++ nt_list_for_each_entry(wrap_urb, &wd->usb.wrap_urb_list, list) { ++ USBTRACE("%p, %p, %d, %x, %x", wrap_urb, wrap_urb->urb, ++ wrap_urb->state, wrap_urb->urb->pipe, ++ usb_pipeendpoint(wrap_urb->urb->pipe)); ++ /* for WG111T driver, urbs for endpoint 0 should also ++ * be canceled */ ++ if ((usb_pipeendpoint(wrap_urb->urb->pipe) == ++ pipe_handle->bEndpointAddress) || ++ (usb_pipeendpoint(wrap_urb->urb->pipe) == 0)) { ++ if (wrap_cancel_urb(wrap_urb) == 0) ++ USBTRACE("canceled wrap_urb: %p", wrap_urb); ++ } ++ } ++ IoReleaseCancelSpinLock(irql); ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_CANCELED; ++ USBEXIT(return USBD_STATUS_SUCCESS); ++} ++ ++static USBD_STATUS wrap_set_clear_feature(struct usb_device *udev, ++ struct irp *irp) ++{ ++ union nt_urb *nt_urb; ++ struct urb_control_feature_request *feat_req; ++ int ret = 0; ++ __u8 request, type; ++ __u16 feature; ++ ++ nt_urb = IRP_URB(irp); ++ feat_req = &nt_urb->feat_req; ++ feature = feat_req->feature_selector; ++ switch (nt_urb->header.function) { ++ case URB_FUNCTION_SET_FEATURE_TO_DEVICE: ++ request = USB_REQ_SET_FEATURE; ++ type = USB_DT_DEVICE; ++ break; ++ case URB_FUNCTION_SET_FEATURE_TO_INTERFACE: ++ request = USB_REQ_SET_FEATURE; ++ type = USB_DT_INTERFACE; ++ break; ++ case URB_FUNCTION_SET_FEATURE_TO_ENDPOINT: ++ request = USB_REQ_SET_FEATURE; ++ type = USB_DT_ENDPOINT; ++ break; ++ case URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE: ++ request = USB_REQ_CLEAR_FEATURE; ++ type = USB_DT_DEVICE; ++ break; ++ case URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE: ++ request = USB_REQ_CLEAR_FEATURE; ++ type = USB_DT_INTERFACE; ++ break; ++ case URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT: ++ request = USB_REQ_CLEAR_FEATURE; ++ type = USB_DT_ENDPOINT; ++ break; ++ default: ++ WARNING("invalid function: %x", nt_urb->header.function); ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_NOT_SUPPORTED; ++ return NT_URB_STATUS(nt_urb); ++ } ++ ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), request, type, ++ feature, feat_req->index, NULL, 0, 1000); ++ NT_URB_STATUS(nt_urb) = wrap_urb_status(ret); ++ USBEXIT(return NT_URB_STATUS(nt_urb)); ++} ++ ++static USBD_STATUS wrap_get_status_request(struct usb_device *udev, ++ struct irp *irp) ++{ ++ union nt_urb *nt_urb; ++ struct urb_control_get_status_request *status_req; ++ int ret = 0; ++ __u8 type; ++ ++ nt_urb = IRP_URB(irp); ++ status_req = &nt_urb->status_req; ++ switch (nt_urb->header.function) { ++ case URB_FUNCTION_GET_STATUS_FROM_DEVICE: ++ type = USB_RECIP_DEVICE; ++ break; ++ case URB_FUNCTION_GET_STATUS_FROM_INTERFACE: ++ type = USB_RECIP_INTERFACE; ++ break; ++ case URB_FUNCTION_GET_STATUS_FROM_ENDPOINT: ++ type = USB_RECIP_ENDPOINT; ++ break; ++ default: ++ WARNING("invalid function: %x", nt_urb->header.function); ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_NOT_SUPPORTED; ++ return NT_URB_STATUS(nt_urb); ++ } ++ assert(status_req->transfer_buffer_length == sizeof(u16)); ++ ret = usb_get_status(udev, type, status_req->index, ++ status_req->transfer_buffer); ++ if (ret >= 0) { ++ assert(ret <= status_req->transfer_buffer_length); ++ status_req->transfer_buffer_length = ret; ++ NT_URB_STATUS(nt_urb) = USBD_STATUS_SUCCESS; ++ } else ++ NT_URB_STATUS(nt_urb) = wrap_urb_status(ret); ++ USBEXIT(return NT_URB_STATUS(nt_urb)); ++} ++ ++static void set_intf_pipe_info(struct wrap_device *wd, ++ struct usb_interface *usb_intf, ++ struct usbd_interface_information *intf) ++{ ++ int i; ++ struct usb_endpoint_descriptor *ep; ++ struct usbd_pipe_information *pipe; ++ ++ for (i = 0; i < CUR_ALT_SETTING(usb_intf)->desc.bNumEndpoints; i++) { ++ ep = &(CUR_ALT_SETTING(usb_intf)->endpoint[i]).desc; ++ if (i >= intf->bNumEndpoints) { ++ ERROR("intf %p has only %d endpoints, " ++ "ignoring endpoints above %d", ++ intf, intf->bNumEndpoints, i); ++ break; ++ } ++ pipe = &intf->pipes[i]; ++ ++ if (pipe->flags & USBD_PF_CHANGE_MAX_PACKET) ++ USBTRACE("pkt_sz: %d: %d", pipe->wMaxPacketSize, ++ pipe->max_tx_size); ++ USBTRACE("driver wants max_tx_size to %d", ++ pipe->max_tx_size); ++ ++ pipe->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize); ++ pipe->bEndpointAddress = ep->bEndpointAddress; ++ pipe->type = ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; ++ if (pipe->type == UsbdPipeTypeInterrupt) { ++ /* Windows and Linux differ in how the ++ * bInterval is interpreted */ ++ /* for low speed: ++ interval (Windows) -> frames per ms (Linux) ++ 0 to 15 -> 8 ++ 16 to 35 -> 16 ++ 36 to 255 -> 32 ++ ++ for full speed: interval -> frames per ms ++ 1 -> 1 ++ 2 to 3 -> 2 ++ 4 to 7 -> 4 ++ 8 to 15 -> 8 ++ 16 to 31 -> 16 ++ 32 to 255 -> 32 ++ ++ for high speed: interval -> microframes ++ 1 -> 1 ++ 2 -> 2 ++ 3 -> 4 ++ 4 -> 8 ++ 5 -> 16 ++ 6 -> 32 ++ 7 to 255 -> 32 ++ */ ++ if (wd->usb.udev->speed == USB_SPEED_LOW) ++ pipe->bInterval = ep->bInterval + 5; ++ else if (wd->usb.udev->speed == USB_SPEED_FULL) ++ pipe->bInterval = ep->bInterval; ++ else { ++ int j, k; ++ for (j = k = 1; j < ep->bInterval; k++) ++ j *= 2; ++ pipe->bInterval = k; ++ } ++ } ++ pipe->handle = ep; ++ USBTRACE("%d: ep 0x%x, type %d, pkt_sz %d, intv %d (%d)," ++ "type: %d, handle %p", i, ep->bEndpointAddress, ++ ep->bmAttributes, pipe->wMaxPacketSize, ep->bInterval, ++ pipe->bInterval, pipe->type, pipe->handle); ++ } ++} ++ ++static USBD_STATUS wrap_select_configuration(struct wrap_device *wd, ++ union nt_urb *nt_urb, ++ struct irp *irp) ++{ ++ int i, ret; ++ struct usbd_select_configuration *sel_conf; ++ struct usb_device *udev; ++ struct usbd_interface_information *intf; ++ struct usb_config_descriptor *config; ++ struct usb_interface *usb_intf; ++ ++ udev = wd->usb.udev; ++ sel_conf = &nt_urb->select_conf; ++ config = sel_conf->config; ++ USBTRACE("%p", config); ++ if (config == NULL) { ++ kill_all_urbs(wd, 1); ++ ret = usb_reset_configuration(udev); ++ return wrap_urb_status(ret); ++ } ++ ++ USBTRACE("conf: %d, type: %d, length: %d, numif: %d, attr: %08x", ++ config->bConfigurationValue, config->bDescriptorType, ++ config->wTotalLength, config->bNumInterfaces, ++ config->bmAttributes); ++ ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ USB_REQ_SET_CONFIGURATION, 0, ++ config->bConfigurationValue, 0, ++ NULL, 0, USB_CTRL_SET_TIMEOUT); ++ if (ret < 0) { ++ ERROR("ret: %d", ret); ++ return wrap_urb_status(ret); ++ } ++ sel_conf->handle = udev->actconfig; ++ intf = &sel_conf->intf; ++ for (i = 0; i < config->bNumInterfaces && intf->bLength > 0; ++ i++, intf = (((void *)intf) + intf->bLength)) { ++ ++ USBTRACE("intf: %d, alt setting: %d", ++ intf->bInterfaceNumber, intf->bAlternateSetting); ++ ret = usb_set_interface(udev, intf->bInterfaceNumber, ++ intf->bAlternateSetting); ++ if (ret < 0) { ++ ERROR("failed with %d", ret); ++ return wrap_urb_status(ret); ++ } ++ usb_intf = usb_ifnum_to_if(udev, intf->bInterfaceNumber); ++ if (!usb_intf) { ++ ERROR("couldn't obtain ifnum"); ++ return USBD_STATUS_REQUEST_FAILED; ++ } ++ USBTRACE("intf: %p, num ep: %d", intf, intf->bNumEndpoints); ++ set_intf_pipe_info(wd, usb_intf, intf); ++ } ++ return USBD_STATUS_SUCCESS; ++} ++ ++static USBD_STATUS wrap_select_interface(struct wrap_device *wd, ++ union nt_urb *nt_urb, ++ struct irp *irp) ++{ ++ int ret; ++ struct usbd_select_interface *sel_intf; ++ struct usb_device *udev; ++ struct usbd_interface_information *intf; ++ struct usb_interface *usb_intf; ++ ++ udev = wd->usb.udev; ++ sel_intf = &nt_urb->select_intf; ++ intf = &sel_intf->intf; ++ ++ ret = usb_set_interface(udev, intf->bInterfaceNumber, ++ intf->bAlternateSetting); ++ if (ret < 0) { ++ ERROR("failed with %d", ret); ++ return wrap_urb_status(ret); ++ } ++ usb_intf = usb_ifnum_to_if(udev, intf->bInterfaceNumber); ++ if (!usb_intf) { ++ ERROR("couldn't get interface information"); ++ return USBD_STATUS_REQUEST_FAILED; ++ } ++ USBTRACE("intf: %p, num ep: %d", usb_intf, intf->bNumEndpoints); ++ set_intf_pipe_info(wd, usb_intf, intf); ++ return USBD_STATUS_SUCCESS; ++} ++ ++static int wrap_usb_get_string(struct usb_device *udev, unsigned short langid, ++ unsigned char index, void *buf, int size) ++{ ++ int i, ret; ++ /* if langid is 0, return array of languages supported in ++ * buf */ ++ for (i = 0; i < 3; i++) { ++ ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), ++ USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, ++ (USB_DT_STRING << 8) + index, langid, ++ buf, size, USB_CTRL_GET_TIMEOUT); ++ if (ret > 0 || ret == -EPIPE) ++ break; ++ } ++ return ret; ++} ++ ++static USBD_STATUS wrap_get_descriptor(struct wrap_device *wd, ++ union nt_urb *nt_urb, struct irp *irp) ++{ ++ struct usbd_control_descriptor_request *control_desc; ++ int ret = 0; ++ struct usb_device *udev; ++ ++ udev = wd->usb.udev; ++ control_desc = &nt_urb->control_desc; ++ USBTRACE("desctype = %d, descindex = %d, transfer_buffer = %p," ++ "transfer_buffer_length = %d", control_desc->desc_type, ++ control_desc->index, control_desc->transfer_buffer, ++ control_desc->transfer_buffer_length); ++ ++ if (control_desc->desc_type == USB_DT_STRING) { ++ USBTRACE("langid: %x", control_desc->language_id); ++ ret = wrap_usb_get_string(udev, control_desc->language_id, ++ control_desc->index, ++ control_desc->transfer_buffer, ++ control_desc->transfer_buffer_length); ++ } else { ++ ret = usb_get_descriptor(udev, control_desc->desc_type, ++ control_desc->index, ++ control_desc->transfer_buffer, ++ control_desc->transfer_buffer_length); ++ } ++ if (ret < 0) { ++ USBTRACE("request %d failed: %d", control_desc->desc_type, ret); ++ control_desc->transfer_buffer_length = 0; ++ return wrap_urb_status(ret); ++ } else { ++ USBTRACE("ret: %08x", ret); ++ control_desc->transfer_buffer_length = ret; ++ irp->io_status.info = ret; ++ return USBD_STATUS_SUCCESS; ++ } ++} ++ ++static USBD_STATUS wrap_process_nt_urb(struct irp *irp) ++{ ++ USBD_STATUS status; ++ struct wrap_device *wd = IRP_WRAP_DEVICE(irp); ++ struct usb_device *udev = wd->usb.udev; ++ union nt_urb *nt_urb = IRP_URB(irp); ++ ++ USBENTER("nt_urb = %p, irp = %p, length = %d, function = %x", ++ nt_urb, irp, nt_urb->header.length, nt_urb->header.function); ++ ++ if (test_bit(HW_DISABLED, &wd->hw_status)) { ++ status = USBD_STATUS_DEVICE_GONE; ++ NT_URB_STATUS(nt_urb) = status; ++ return status; ++ } ++ ++ DUMP_IRP(irp); ++ switch (nt_urb->header.function) { ++ /* bulk/int and vendor/class urbs are submitted to ++ * Linux USB core; if the call is successful, urb's ++ * completion worker will return IRP later */ ++ case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: ++ USBTRACE("submitting bulk/int irp: %p", irp); ++ status = wrap_bulk_or_intr_trans(irp); ++ break; ++ ++ case URB_FUNCTION_VENDOR_DEVICE: ++ case URB_FUNCTION_VENDOR_INTERFACE: ++ case URB_FUNCTION_VENDOR_ENDPOINT: ++ case URB_FUNCTION_VENDOR_OTHER: ++ case URB_FUNCTION_CLASS_DEVICE: ++ case URB_FUNCTION_CLASS_INTERFACE: ++ case URB_FUNCTION_CLASS_ENDPOINT: ++ case URB_FUNCTION_CLASS_OTHER: ++ USBTRACE("submitting vendor/class irp: %p", irp); ++ status = wrap_vendor_or_class_req(irp); ++ break; ++ ++ /* rest are synchronous */ ++ case URB_FUNCTION_SELECT_CONFIGURATION: ++ status = wrap_select_configuration(wd, nt_urb, irp); ++ NT_URB_STATUS(nt_urb) = status; ++ break; ++ ++ case URB_FUNCTION_SELECT_INTERFACE: ++ status = wrap_select_interface(wd, nt_urb, irp); ++ NT_URB_STATUS(nt_urb) = status; ++ break; ++ ++ case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: ++ status = wrap_get_descriptor(wd, nt_urb, irp); ++ NT_URB_STATUS(nt_urb) = status; ++ break; ++ ++ case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: ++ status = wrap_reset_pipe(udev, irp); ++ NT_URB_STATUS(nt_urb) = status; ++ break; ++ ++ case URB_FUNCTION_ABORT_PIPE: ++ status = wrap_abort_pipe(udev, irp); ++ break; ++ ++ case URB_FUNCTION_SET_FEATURE_TO_DEVICE: ++ case URB_FUNCTION_SET_FEATURE_TO_INTERFACE: ++ case URB_FUNCTION_SET_FEATURE_TO_ENDPOINT: ++ case URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE: ++ case URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE: ++ case URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT: ++ status = wrap_set_clear_feature(udev, irp); ++ break; ++ ++ case URB_FUNCTION_GET_STATUS_FROM_DEVICE: ++ case URB_FUNCTION_GET_STATUS_FROM_INTERFACE: ++ case URB_FUNCTION_GET_STATUS_FROM_ENDPOINT: ++ status = wrap_get_status_request(udev, irp); ++ break; ++ ++ default: ++ ERROR("function %x not implemented", nt_urb->header.function); ++ status = NT_URB_STATUS(nt_urb) = USBD_STATUS_NOT_SUPPORTED; ++ break; ++ } ++ USBTRACE("status: %08X", status); ++ return status; ++} ++ ++static USBD_STATUS wrap_reset_port(struct irp *irp) ++{ ++ int ret, lock = 0; ++ struct wrap_device *wd; ++ ++ wd = IRP_WRAP_DEVICE(irp); ++ USBENTER("%p, %p", wd, wd->usb.udev); ++ lock = usb_lock_device_for_reset(wd->usb.udev, wd->usb.intf); ++ if (lock < 0) { ++ WARNING("locking failed: %d", lock); ++// return wrap_urb_status(lock); ++ return USBD_STATUS_SUCCESS; ++ } ++ ret = usb_reset_device(wd->usb.udev); ++ if (ret < 0) ++ USBTRACE("reset failed: %d", ret); ++ /* TODO: should reconfigure? */ ++ if (lock) ++ usb_unlock_device(wd->usb.udev); ++// return wrap_urb_status(ret); ++ return USBD_STATUS_SUCCESS; ++} ++ ++static USBD_STATUS wrap_get_port_status(struct irp *irp) ++{ ++ struct wrap_device *wd; ++ ULONG *status; ++ enum usb_device_state state; ++ ++ wd = IRP_WRAP_DEVICE(irp); ++ USBENTER("%p, %p", wd, wd->usb.udev); ++ status = IoGetCurrentIrpStackLocation(irp)->params.others.arg1; ++ state = wd->usb.udev->state; ++ if (state != USB_STATE_NOTATTACHED && ++ state != USB_STATE_SUSPENDED) { ++ *status |= USBD_PORT_CONNECTED; ++ if (state == USB_STATE_CONFIGURED) ++ *status |= USBD_PORT_ENABLED; ++ } ++ USBTRACE("state: %d, *status: %08X", state, *status); ++ return USBD_STATUS_SUCCESS; ++} ++ ++NTSTATUS wrap_submit_irp(struct device_object *pdo, struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ struct wrap_device *wd; ++ USBD_STATUS status; ++ struct usbd_idle_callback *idle_callback; ++ ++ USBENTER("%p, %p", pdo, irp); ++ wd = pdo->reserved; ++ if (wd->usb.intf == NULL) { ++ USBTRACE("%p", irp); ++ irp->io_status.status = STATUS_DEVICE_REMOVED; ++ irp->io_status.info = 0; ++ USBEXIT(return STATUS_DEVICE_REMOVED); ++ } ++ IRP_WRAP_DEVICE(irp) = wd; ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ switch (irp_sl->params.dev_ioctl.code) { ++ case IOCTL_INTERNAL_USB_SUBMIT_URB: ++ status = wrap_process_nt_urb(irp); ++ break; ++ case IOCTL_INTERNAL_USB_RESET_PORT: ++ status = wrap_reset_port(irp); ++ break; ++ case IOCTL_INTERNAL_USB_GET_PORT_STATUS: ++ status = wrap_get_port_status(irp); ++ break; ++ case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: ++ idle_callback = irp_sl->params.dev_ioctl.type3_input_buf; ++ (void)idle_callback; ++ USBTRACE("suspend function: %p", idle_callback->callback); ++ status = USBD_STATUS_NOT_SUPPORTED; ++ break; ++ default: ++ ERROR("ioctl %08X NOT IMPLEMENTED", ++ irp_sl->params.dev_ioctl.code); ++ status = USBD_STATUS_NOT_SUPPORTED; ++ break; ++ } ++ ++ USBTRACE("status: %08X", status); ++ if (status == USBD_STATUS_PENDING) { ++ /* don't touch this IRP - it may have been already ++ * completed/returned */ ++ return STATUS_PENDING; ++ } else { ++ irp->io_status.status = nt_urb_irp_status(status); ++ if (status != USBD_STATUS_SUCCESS) ++ irp->io_status.info = 0; ++ USBEXIT(return irp->io_status.status); ++ } ++} ++ ++/* TODO: The example on msdn in reference section suggests that second ++ * argument should be an array of usbd_interface_information, but ++ * description and examples elsewhere suggest that it should be ++ * usbd_interface_list_entry structre. Which is correct? */ ++ ++wstdcall union nt_urb *WIN_FUNC(USBD_CreateConfigurationRequestEx,2) ++ (struct usb_config_descriptor *config, ++ struct usbd_interface_list_entry *intf_list) ++{ ++ int size, i, n; ++ struct usbd_interface_information *intf; ++ struct usbd_pipe_information *pipe; ++ struct usb_interface_descriptor *intf_desc; ++ struct usbd_select_configuration *select_conf; ++ ++ USBENTER("config = %p, intf_list = %p", config, intf_list); ++ ++ /* calculate size required; select_conf already has space for ++ * one intf structure */ ++ size = sizeof(*select_conf) - sizeof(*intf); ++ for (n = 0; n < config->bNumInterfaces; n++) { ++ i = intf_list[n].intf_desc->bNumEndpoints; ++ /* intf already has space for one pipe */ ++ size += sizeof(*intf) + (i - 1) * sizeof(*pipe); ++ } ++ /* don't use kmalloc - driver frees it with ExFreePool */ ++ select_conf = ExAllocatePoolWithTag(NonPagedPool, size, ++ POOL_TAG('L', 'U', 'S', 'B')); ++ if (!select_conf) { ++ WARNING("couldn't allocate memory"); ++ return NULL; ++ } ++ memset(select_conf, 0, size); ++ intf = &select_conf->intf; ++ select_conf->handle = config; ++ for (n = 0; n < config->bNumInterfaces && intf_list[n].intf_desc; n++) { ++ /* initialize 'intf' fields in intf_list so they point ++ * to appropriate entry; these may be read/written by ++ * driver after this function returns */ ++ intf_list[n].intf = intf; ++ intf_desc = intf_list[n].intf_desc; ++ ++ i = intf_desc->bNumEndpoints; ++ intf->bLength = sizeof(*intf) + (i - 1) * sizeof(*pipe); ++ ++ intf->bInterfaceNumber = intf_desc->bInterfaceNumber; ++ intf->bAlternateSetting = intf_desc->bAlternateSetting; ++ intf->bInterfaceClass = intf_desc->bInterfaceClass; ++ intf->bInterfaceSubClass = intf_desc->bInterfaceSubClass; ++ intf->bInterfaceProtocol = intf_desc->bInterfaceProtocol; ++ intf->bNumEndpoints = intf_desc->bNumEndpoints; ++ ++ pipe = &intf->pipes[0]; ++ for (i = 0; i < intf->bNumEndpoints; i++) { ++ memset(&pipe[i], 0, sizeof(*pipe)); ++ pipe[i].max_tx_size = ++ USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE; ++ } ++ intf->handle = intf_desc; ++ intf = (((void *)intf) + intf->bLength); ++ } ++ select_conf->header.function = URB_FUNCTION_SELECT_CONFIGURATION; ++ select_conf->header.length = size; ++ select_conf->config = config; ++ USBEXIT(return (union nt_urb *)select_conf); ++} ++ ++WIN_SYMBOL_MAP("_USBD_CreateConfigurationRequestEx@8", USBD_CreateConfigurationRequestEx) ++ ++wstdcall struct usb_interface_descriptor * ++WIN_FUNC(USBD_ParseConfigurationDescriptorEx,7) ++ (struct usb_config_descriptor *config, void *start, ++ LONG bInterfaceNumber, LONG bAlternateSetting, LONG bInterfaceClass, ++ LONG bInterfaceSubClass, LONG bInterfaceProtocol) ++{ ++ void *pos; ++ struct usb_interface_descriptor *intf; ++ ++ USBENTER("config = %p, start = %p, ifnum = %d, alt_setting = %d," ++ " class = %d, subclass = %d, proto = %d", config, start, ++ bInterfaceNumber, bAlternateSetting, bInterfaceClass, ++ bInterfaceSubClass, bInterfaceProtocol); ++ ++ for (pos = start; ++ pos < ((void *)config + le16_to_cpu(config->wTotalLength)); ++ pos += intf->bLength) { ++ ++ intf = pos; ++ ++ if ((intf->bDescriptorType == USB_DT_INTERFACE) && ++ ((bInterfaceNumber == -1) || ++ (intf->bInterfaceNumber == bInterfaceNumber)) && ++ ((bAlternateSetting == -1) || ++ (intf->bAlternateSetting == bAlternateSetting)) && ++ ((bInterfaceClass == -1) || ++ (intf->bInterfaceClass == bInterfaceClass)) && ++ ((bInterfaceSubClass == -1) || ++ (intf->bInterfaceSubClass == bInterfaceSubClass)) && ++ ((bInterfaceProtocol == -1) || ++ (intf->bInterfaceProtocol == bInterfaceProtocol))) { ++ USBTRACE("selected interface = %p", intf); ++ USBEXIT(return intf); ++ } ++ } ++ USBEXIT(return NULL); ++} ++ ++WIN_SYMBOL_MAP("_USBD_ParseConfigurationDescriptorEx@28", USBD_ParseConfigurationDescriptorEx) ++ ++wstdcall union nt_urb *WIN_FUNC(USBD_CreateConfigurationRequest,2) ++ (struct usb_config_descriptor *config, USHORT *size) ++{ ++ union nt_urb *nt_urb; ++ struct usbd_interface_list_entry intf_list[2]; ++ struct usb_interface_descriptor *intf_desc; ++ ++ USBENTER("config = %p, urb_size = %p", config, size); ++ ++ intf_desc = USBD_ParseConfigurationDescriptorEx(config, config, -1, -1, ++ -1, -1, -1); ++ intf_list[0].intf_desc = intf_desc; ++ intf_list[0].intf = NULL; ++ intf_list[1].intf_desc = NULL; ++ intf_list[1].intf = NULL; ++ nt_urb = USBD_CreateConfigurationRequestEx(config, intf_list); ++ if (!nt_urb) ++ return NULL; ++ ++ *size = nt_urb->select_conf.header.length; ++ USBEXIT(return nt_urb); ++} ++ ++wstdcall struct usb_interface_descriptor * ++WIN_FUNC(USBD_ParseConfigurationDescriptor,3) ++ (struct usb_config_descriptor *config, UCHAR bInterfaceNumber, ++ UCHAR bAlternateSetting) ++{ ++ return USBD_ParseConfigurationDescriptorEx(config, config, ++ bInterfaceNumber, ++ bAlternateSetting, ++ -1, -1, -1); ++} ++ ++wstdcall struct usb_descriptor_header *WIN_FUNC(USBD_ParseDescriptors,4) ++ (void *buf, ULONG length, struct usb_descriptor_header *descr, ++ LONG type) ++{ ++ while ((void *)descr < buf + length) { ++ if (descr->bDescriptorType == type) ++ return descr; ++ if (descr->bLength == 0) ++ break; ++ descr = (void *)descr + descr->bLength; ++ } ++ USBEXIT(return NULL); ++} ++ ++WIN_SYMBOL_MAP("_USBD_ParseDescriptors@16", USBD_ParseDescriptors) ++ ++wstdcall void WIN_FUNC(USBD_GetUSBDIVersion,1) ++ (struct usbd_version_info *version_info) ++{ ++ /* this function is obsolete in Windows XP */ ++ if (version_info) { ++ version_info->usbdi_version = USBDI_VERSION_XP; ++ /* TODO: how do we get this correctly? */ ++ version_info->supported_usb_version = 0x110; ++ } ++ USBEXIT(return); ++} ++ ++wstdcall void ++USBD_InterfaceGetUSBDIVersion(void *context, ++ struct usbd_version_info *version_info, ++ ULONG *hcd_capa) ++{ ++ struct wrap_device *wd = context; ++ ++ if (version_info) { ++ version_info->usbdi_version = USBDI_VERSION_XP; ++ if (wd->usb.udev->speed == USB_SPEED_HIGH) ++ version_info->supported_usb_version = 0x200; ++ else ++ version_info->supported_usb_version = 0x110; ++ } ++ *hcd_capa = USB_HCD_CAPS_SUPPORTS_RT_THREADS; ++ USBEXIT(return); ++} ++ ++wstdcall BOOLEAN USBD_InterfaceIsDeviceHighSpeed(void *context) ++{ ++ struct wrap_device *wd = context; ++ ++ USBTRACE("wd: %p", wd); ++ if (wd->usb.udev->speed == USB_SPEED_HIGH) ++ USBEXIT(return TRUE); ++ else ++ USBEXIT(return FALSE); ++} ++ ++wstdcall void USBD_InterfaceReference(void *context) ++{ ++ USBTRACE("%p", context); ++ TODO(); ++} ++ ++wstdcall void USBD_InterfaceDereference(void *context) ++{ ++ USBTRACE("%p", context); ++ TODO(); ++} ++ ++wstdcall NTSTATUS USBD_InterfaceQueryBusTime(void *context, ULONG *frame) ++{ ++ struct wrap_device *wd = context; ++ ++ *frame = usb_get_current_frame_number(wd->usb.udev); ++ USBEXIT(return STATUS_SUCCESS); ++} ++ ++wstdcall NTSTATUS USBD_InterfaceSubmitIsoOutUrb(void *context, ++ union nt_urb *nt_urb) ++{ ++ /* TODO: implement this */ ++ TODO(); ++ USBEXIT(return STATUS_NOT_IMPLEMENTED); ++} ++ ++wstdcall NTSTATUS ++USBD_InterfaceQueryBusInformation(void *context, ULONG level, void *buf, ++ ULONG *buf_length, ULONG *buf_actual_length) ++{ ++#if 0 ++ struct wrap_device *wd = context; ++ struct usb_bus *bus = wd->usb.udev->bus; ++ struct usb_bus_information_level *bus_info = buf; ++#endif ++ ++ TODO(); ++ USBEXIT(return STATUS_NOT_IMPLEMENTED); ++} ++ ++wstdcall NTSTATUS ++USBD_InterfaceLogEntry(void *context, ULONG driver_tag, ULONG enum_tag, ++ ULONG p1, ULONG p2) ++{ ++ ERROR("%p, %x, %x, %x, %x", context, driver_tag, enum_tag, p1, p2); ++ USBEXIT(return STATUS_SUCCESS); ++} ++ ++NTSTATUS ++usb_query_interface(struct wrap_device *wd, struct io_stack_location *irp_sl) ++{ ++ struct usbd_bus_interface_usbdi *intf = ++ (struct usbd_bus_interface_usbdi *) ++ irp_sl->params.query_intf.intf; ++ ++ TRACE2("type: %x, size: %d, version: %d", ++ irp_sl->params.query_intf.type->data1, ++ irp_sl->params.query_intf.size, ++ irp_sl->params.query_intf.version); ++ intf->Context = wd; ++ intf->InterfaceReference = ++ WIN_FUNC_PTR(USBD_InterfaceReference, 1); ++ intf->InterfaceDereference = ++ WIN_FUNC_PTR(USBD_InterfaceDereference, 1); ++ intf->GetUSBDIVersion = ++ WIN_FUNC_PTR(USBD_InterfaceGetUSBDIVersion, 3); ++ intf->QueryBusTime = ++ WIN_FUNC_PTR(USBD_InterfaceQueryBusTime, 2); ++ intf->SubmitIsoOutUrb = ++ WIN_FUNC_PTR(USBD_InterfaceSubmitIsoOutUrb, 2); ++ intf->QueryBusInformation = ++ WIN_FUNC_PTR(USBD_InterfaceQueryBusInformation, 5); ++ if (irp_sl->params.query_intf.version >= USB_BUSIF_USBDI_VERSION_1) ++ intf->IsDeviceHighSpeed = ++ WIN_FUNC_PTR(USBD_InterfaceIsDeviceHighSpeed, 1); ++ if (irp_sl->params.query_intf.version >= USB_BUSIF_USBDI_VERSION_2) ++ intf->LogEntry = WIN_FUNC_PTR(USBD_InterfaceLogEntry, 5); ++ return STATUS_SUCCESS; ++} ++ ++int usb_init(void) ++{ ++ InitializeListHead(&wrap_urb_complete_list); ++ spin_lock_init(&wrap_urb_complete_list_lock); ++ INIT_WORK(&wrap_urb_complete_work, wrap_urb_complete_worker); ++#ifdef USB_DEBUG ++ urb_id = 0; ++#endif ++ return 0; ++} ++ ++void usb_exit(void) ++{ ++ USBEXIT(return); ++} ++ ++int usb_init_device(struct wrap_device *wd) ++{ ++ InitializeListHead(&wd->usb.wrap_urb_list); ++ wd->usb.num_alloc_urbs = 0; ++ USBEXIT(return 0); ++} ++ ++void usb_exit_device(struct wrap_device *wd) ++{ ++ kill_all_urbs(wd, 0); ++ USBEXIT(return); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/usb.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.h +--- linux-3.12.2/3rdparty/ndiswrapper/usb.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/usb.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,360 @@ ++/* ++ * Copyright (C) 2004 Jan Kiszka ++ * Copyright (C) 2005 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _USB_H_ ++#define _USB_H_ ++ ++#include "ntoskernel.h" ++ ++#define IOCTL_INTERNAL_USB_SUBMIT_URB 0x00220003 ++#define IOCTL_INTERNAL_USB_RESET_PORT 0x00220007 ++#define IOCTL_INTERNAL_USB_GET_PORT_STATUS 0x00220013 ++#define IOCTL_INTERNAL_USB_CYCLE_PORT 0x0022001F ++#define IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION 0x00220027 ++ ++#define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 ++#define URB_FUNCTION_SELECT_INTERFACE 0x0001 ++#define URB_FUNCTION_ABORT_PIPE 0x0002 ++#define URB_FUNCTION_TAKE_FRAME_LENGTH_CONTROL 0x0003 ++#define URB_FUNCTION_RELEASE_FRAME_LENGTH_CONTROL 0x0004 ++#define URB_FUNCTION_GET_FRAME_LENGTH 0x0005 ++#define URB_FUNCTION_SET_FRAME_LENGTH 0x0006 ++#define URB_FUNCTION_GET_CURRENT_FRAME_NUMBER 0x0007 ++#define URB_FUNCTION_CONTROL_TRANSFER 0x0008 ++#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER 0x0009 ++#define URB_FUNCTION_ISOCH_TRANSFER 0x000A ++#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE 0x000B ++#define URB_FUNCTION_SET_DESCRIPTOR_TO_DEVICE 0x000C ++#define URB_FUNCTION_SET_FEATURE_TO_DEVICE 0x000D ++#define URB_FUNCTION_SET_FEATURE_TO_INTERFACE 0x000E ++#define URB_FUNCTION_SET_FEATURE_TO_ENDPOINT 0x000F ++#define URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE 0x0010 ++#define URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE 0x0011 ++#define URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT 0x0012 ++#define URB_FUNCTION_GET_STATUS_FROM_DEVICE 0x0013 ++#define URB_FUNCTION_GET_STATUS_FROM_INTERFACE 0x0014 ++#define URB_FUNCTION_GET_STATUS_FROM_ENDPOINT 0x0015 ++#define URB_FUNCTION_RESERVED_0X0016 0x0016 ++#define URB_FUNCTION_VENDOR_DEVICE 0x0017 ++#define URB_FUNCTION_VENDOR_INTERFACE 0x0018 ++#define URB_FUNCTION_VENDOR_ENDPOINT 0x0019 ++#define URB_FUNCTION_CLASS_DEVICE 0x001A ++#define URB_FUNCTION_CLASS_INTERFACE 0x001B ++#define URB_FUNCTION_CLASS_ENDPOINT 0x001C ++#define URB_FUNCTION_RESERVE_0X001D 0x001D ++#define URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL 0x001E ++#define URB_FUNCTION_CLASS_OTHER 0x001F ++#define URB_FUNCTION_VENDOR_OTHER 0x0020 ++#define URB_FUNCTION_GET_STATUS_FROM_OTHER 0x0021 ++#define URB_FUNCTION_CLEAR_FEATURE_TO_OTHER 0x0022 ++#define URB_FUNCTION_SET_FEATURE_TO_OTHER 0x0023 ++#define URB_FUNCTION_GET_DESCRIPTOR_FROM_ENDPOINT 0x0024 ++#define URB_FUNCTION_SET_DESCRIPTOR_TO_ENDPOINT 0x0025 ++#define URB_FUNCTION_GET_CONFIGURATION 0x0026 ++#define URB_FUNCTION_GET_INTERFACE 0x0027 ++#define URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE 0x0028 ++#define URB_FUNCTION_SET_DESCRIPTOR_TO_INTERFACE 0x0029 ++#define URB_FUNCTION_GET_MS_FEATURE_DESCRIPTOR 0x002A ++#define URB_FUNCTION_RESERVE_0X002B 0x002B ++#define URB_FUNCTION_RESERVE_0X002C 0x002C ++#define URB_FUNCTION_RESERVE_0X002D 0x002D ++#define URB_FUNCTION_RESERVE_0X002E 0x002E ++#define URB_FUNCTION_RESERVE_0X002F 0x002F ++// USB 2.0 calls start at 0x0030 ++#define URB_FUNCTION_SYNC_RESET_PIPE 0x0030 ++#define URB_FUNCTION_SYNC_CLEAR_STALL 0x0031 ++#define URB_FUNCTION_CONTROL_TRANSFER_EX 0x0032 ++ ++#define USBD_PF_CHANGE_MAX_PACKET 0x00000001 ++ ++#define USBD_TRANSFER_DIRECTION_OUT 0 ++#define USBD_TRANSFER_DIRECTION_IN 1 ++ ++#define USBD_SHORT_TRANSFER_OK 0x00000002 ++#define USBD_START_ISO_TRANSFER_ASAP 0x00000004 ++#define USBD_DEFAULT_PIPE_TRANSFER 0x00000008 ++ ++#define USBD_TRANSFER_DIRECTION(flags) \ ++ ((flags) & USBD_TRANSFER_DIRECTION_IN) ++ ++enum pipe_type {UsbdPipeTypeControl = USB_ENDPOINT_XFER_CONTROL, ++ UsbdPipeTypeIsochronous = USB_ENDPOINT_XFER_ISOC, ++ UsbdPipeTypeBulk = USB_ENDPOINT_XFER_BULK, ++ UsbdPipeTypeInterrupt = USB_ENDPOINT_XFER_INT}; ++ ++#define USBD_IS_BULK_PIPE(pipe_handle) \ ++ (((pipe_handle)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) \ ++ == USB_ENDPOINT_XFER_BULK) ++ ++#define USBD_IS_INT_PIPE(pipe_handle) \ ++ (((pipe_handle)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) \ ++ == USB_ENDPOINT_XFER_INT) ++ ++#define USBD_PORT_ENABLED 0x00000001 ++#define USBD_PORT_CONNECTED 0x00000002 ++ ++typedef LONG USBD_STATUS; ++ ++#define USBD_STATUS_SUCCESS 0x0 ++#define USBD_STATUS_PENDING 0x40000000 ++#define USBD_STATUS_CANCELED 0x00010000 ++ ++#define USBD_STATUS_CRC 0xC0000001 ++#define USBD_STATUS_BTSTUFF 0xC0000002 ++#define USBD_STATUS_DATA_TOGGLE_MISMATCH 0xC0000003 ++#define USBD_STATUS_STALL_PID 0xC0000004 ++#define USBD_STATUS_DEV_NOT_RESPONDING 0xC0000005 ++#define USBD_STATUS_PID_CHECK_FAILURE 0xC0000006 ++#define USBD_STATUS_UNEXPECTED_PID 0xC0000007 ++#define USBD_STATUS_DATA_OVERRUN 0xC0000008 ++#define USBD_STATUS_DATA_UNDERRUN 0xC0000009 ++#define USBD_STATUS_RESERVED1 0xC000000A ++#define USBD_STATUS_RESERVED2 0xC000000B ++#define USBD_STATUS_BUFFER_OVERRUN 0xC000000C ++#define USBD_STATUS_BUFFER_UNDERRUN 0xC000000D ++#define USBD_STATUS_NOT_ACCESSED 0xC000000F ++#define USBD_STATUS_FIFO 0xC0000010 ++#define USBD_STATUS_XACT_ERROR 0xC0000011 ++#define USBD_STATUS_BABBLE_DETECTED 0xC0000012 ++#define USBD_STATUS_DATA_BUFFER_ERROR 0xC0000013 ++ ++#define USBD_STATUS_NOT_SUPPORTED 0xC0000E00 ++#define USBD_STATUS_BUFFER_TOO_SMALL 0xC0003000 ++#define USBD_STATUS_TIMEOUT 0xC0006000 ++#define USBD_STATUS_DEVICE_GONE 0xC0007000 ++ ++#define USBD_STATUS_NO_MEMORY 0x80000100 ++#define USBD_STATUS_INVALID_URB_FUNCTION 0x80000200 ++#define USBD_STATUS_INVALID_PARAMETER 0x80000300 ++#define USBD_STATUS_REQUEST_FAILED 0x80000500 ++#define USBD_STATUS_INVALID_PIPE_HANDLE 0x80000600 ++#define USBD_STATUS_ERROR_SHORT_TRANSFER 0x80000900 ++ ++#define USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE PAGE_SIZE ++ ++struct urb_hcd_area { ++ void *reserved8[8]; ++}; ++ ++struct usbd_pipe_information { ++ USHORT wMaxPacketSize; ++ UCHAR bEndpointAddress; ++ UCHAR bInterval; ++ enum pipe_type type; ++ struct usb_endpoint_descriptor *handle; ++ ULONG max_tx_size; ++ ULONG flags; ++}; ++ ++struct usbd_interface_information { ++ USHORT bLength; ++ UCHAR bInterfaceNumber; ++ UCHAR bAlternateSetting; ++ UCHAR bInterfaceClass; ++ UCHAR bInterfaceSubClass; ++ UCHAR bInterfaceProtocol; ++ UCHAR reserved; ++ void *handle; ++ ULONG bNumEndpoints; ++ struct usbd_pipe_information pipes[1]; ++}; ++ ++struct usbd_interface_list_entry { ++ struct usb_interface_descriptor *intf_desc; ++ struct usbd_interface_information *intf; ++}; ++ ++struct nt_urb_header { ++ USHORT length; ++ USHORT function; ++ USBD_STATUS status; ++ void *usbd_dev_handle; ++ ULONG usbd_flags; ++}; ++ ++struct usbd_select_interface { ++ struct nt_urb_header header; ++ void *handle; ++ struct usbd_interface_information intf; ++}; ++ ++struct usbd_select_configuration { ++ struct nt_urb_header header; ++ struct usb_config_descriptor *config; ++ void *handle; ++ struct usbd_interface_information intf; ++}; ++ ++struct usbd_control_descriptor_request { ++ struct nt_urb_header header; ++ void *reserved; ++ ULONG reserved0; ++ ULONG transfer_buffer_length; ++ void *transfer_buffer; ++ struct mdl *mdl; ++ union nt_urb *urb_link; ++ struct urb_hcd_area hca; ++ USHORT reserved1; ++ UCHAR index; ++ UCHAR desc_type; ++ USHORT language_id; ++ USHORT reserved2; ++}; ++ ++struct usbd_bulk_or_intr_transfer { ++ struct nt_urb_header header; ++ struct usb_endpoint_descriptor *pipe_handle; ++ ULONG transfer_flags; ++ ULONG transfer_buffer_length; ++ void *transfer_buffer; ++ struct mdl *mdl; ++ union nt_urb *urb_link; ++ struct urb_hcd_area hca; ++}; ++ ++struct usbd_pipe_request { ++ struct nt_urb_header header; ++ struct usb_endpoint_descriptor *pipe_handle; ++}; ++ ++struct usbd_vendor_or_class_request { ++ struct nt_urb_header header; ++ void *reserved; ++ ULONG transfer_flags; ++ ULONG transfer_buffer_length; ++ void *transfer_buffer; ++ struct mdl *mdl; ++ union nt_urb *link; ++ struct urb_hcd_area hca; ++ UCHAR reserved_bits; ++ UCHAR request; ++ USHORT value; ++ USHORT index; ++ USHORT reserved1; ++}; ++ ++struct urb_control_feature_request { ++ struct nt_urb_header header; ++ void *reserved; ++ ULONG reserved2; ++ ULONG reserved3; ++ void *reserved4; ++ struct mdl *reserved5; ++ union nt_urb *link; ++ struct urb_hcd_area hca; ++ USHORT reserved0; ++ USHORT feature_selector; ++ USHORT index; ++ USHORT reserved1; ++}; ++ ++struct urb_control_get_status_request { ++ struct nt_urb_header header; ++ void *reserved; ++ ULONG reserved0; ++ ULONG transfer_buffer_length; ++ void *transfer_buffer; ++ struct mdl *mdl; ++ union nt_urb *link; ++ struct urb_hcd_area hca; ++ UCHAR reserved1[4]; ++ USHORT index; ++ USHORT reserved2; ++}; ++ ++struct usbd_iso_packet_desc { ++ ULONG offset; ++ ULONG length; ++ USBD_STATUS status; ++}; ++ ++struct usbd_isochronous_transfer { ++ struct nt_urb_header header; ++ struct usb_endpoint_descriptor *pipe_handle; ++ ULONG transfer_flags; ++ ULONG transfer_buffer_length; ++ void *transfer_buffer; ++ struct mdl *mdl; ++ union nt_urb *urb_link; ++ struct urb_hcd_area hca; ++ ULONG start_frame; ++ ULONG number_of_packets; ++ ULONG error_count; ++ struct usbd_iso_packet_desc iso_packet[1]; ++}; ++ ++union nt_urb { ++ struct nt_urb_header header; ++ struct usbd_select_interface select_intf; ++ struct usbd_select_configuration select_conf; ++ struct usbd_bulk_or_intr_transfer bulk_int_transfer; ++ struct usbd_control_descriptor_request control_desc; ++ struct usbd_vendor_or_class_request vendor_class_request; ++ struct usbd_isochronous_transfer isochronous; ++ struct usbd_pipe_request pipe_req; ++ struct urb_control_feature_request feat_req; ++ struct urb_control_get_status_request status_req; ++}; ++ ++struct usbd_bus_interface_usbdi { ++ USHORT Size; ++ USHORT Version; ++ void *Context; ++ void *InterfaceReference; ++ void *InterfaceDereference; ++ void *GetUSBDIVersion; ++ void *QueryBusTime; ++ void *SubmitIsoOutUrb; ++ void *QueryBusInformation; ++ /* version 1 and above have following field */ ++ void *IsDeviceHighSpeed; ++ /* version 2 (and above) have following field */ ++ void *LogEntry; ++}; ++ ++struct usbd_bus_information_level { ++ ULONG TotalBandwidth; ++ ULONG ConsumedBandwidth; ++ /* level 1 and above have following fields */ ++ ULONG ControllerNameLength; ++ wchar_t ControllerName[1]; ++}; ++ ++#define USBDI_VERSION_XP 0x00000500 // Windows XP ++#define USB_HCD_CAPS_SUPPORTS_RT_THREADS 0x00000001 ++#define USB_BUSIF_USBDI_VERSION_0 0x0000 ++#define USB_BUSIF_USBDI_VERSION_1 0x0001 ++#define USB_BUSIF_USBDI_VERSION_2 0x0002 ++ ++struct usbd_version_info { ++ ULONG usbdi_version; ++ ULONG supported_usb_version; ++}; ++ ++struct usbd_idle_callback { ++ void *callback; ++ void *context; ++}; ++ ++#define NT_URB_STATUS(nt_urb) ((nt_urb)->header.status) ++ ++NTSTATUS wrap_submit_irp(struct device_object *pdo, struct irp *irp); ++void wrap_suspend_urbs(struct wrap_device *wd); ++void wrap_resume_urbs(struct wrap_device *wd); ++NTSTATUS usb_query_interface(struct wrap_device *wd, ++ struct io_stack_location *irp_sl); ++ ++#endif /* USB_H */ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/win2lin_stubs.S +--- linux-3.12.2/3rdparty/ndiswrapper/win2lin_stubs.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/win2lin_stubs.S 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,253 @@ ++/* ++ * Copyright (C) 2005 Karl Vogel, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include ++ ++#ifdef CONFIG_X86_64 ++ ++/* ++# Windows <---> Linux register usage conversion when calling functions ++# V = Volatile ++# NV = Non Volatile (needs to be saved) ++# ++# Win Lin ++# --------------------------------------- ++# Rax Return V Return V ++# Rbx NV NV ++# Rcx Arg1 V Arg4 V ++# Rdx Arg2 V Arg3 V ++# Rsi NV Arg2 V ++# Rdi NV Arg1 V ++# Rsp NV NV ++# Rbp NV NV ++# R8 Arg3 V Arg5 V ++# R9 Arg4 V Arg6 V ++# R10 V V ++# R11 V V ++# R12 NV NV ++# R13 NV NV ++# R14 NV NV ++# R15 NV NV ++# ++# In addition, Linux uses %rax to indicate number of SSE registers used ++# when variadic functions are called. Since there is no way to obtain this ++# from Windows, for now, we just assume this is 0 (hence %rax is cleared). ++# ++# Windows pushes arguments 5 and higher onto stack in case of integer ++# variables and 4 and higher in case of floating point variables (passed ++# in SSE registers). ++ ++In a windows function, the stackframe/registers look like this: ++ ++# 0x0048 .... ++# 0x0040 arg8 ++# 0x0038 arg7 ++# 0x0030 arg6 ++# 0x0028 arg5 ++# 0x0020 shadow/spill space for arg4 ++# 0x0018 shadow/spill space for arg3 ++# 0x0010 shadow/spill space for arg2 ++# 0x0008 shadow/spill space for arg1 ++# 0x0000 ret ++ ++# register spill space is same irrespective of number of arguments - even ++# if Windows function takes less than 4 arguments, 32 bytes above return ++# address is reserved for the function ++ ++In Linux it should look like: ++ ++# 0x0018 .... ++# 0x0010 arg8 ++# 0x0008 arg7 ++# 0x0000 ret ++ ++*/ ++ ++ .text ++ ++#define LINUX_REG_ARGS 6 ++#define LOOP_THRESHOLD 9 ++#define WORD_BYTES 8 ++ ++/* ++ * %rsi and %rdi must be saved because they are not saved by Linux calls, but ++ * Windows callers expect them to be saved. %rbp is saved to create a stack ++ * frame, which can help with debugging. We need to reserve space for an odd ++ * number of registers anyway to keep 16-bit alignment of the stack (one more ++ * position is used by the return address). ++ */ ++#define SAVED_REGS 3 ++ ++/* ++ * When calling the Linux function, several registers are saved on the stack. ++ * When passing more than 6 arguments, arguments starting with argument 7 are ++ * pushed to the stack as well. ++ * ++ * We also need to allocate an additional word on the stack to keep it aligned ++ * to the 16-bit boundary if the number of saved arguments plus one (for the ++ * return address) is odd. ++ */ ++ ++/* ++ * Number of arguments we pass on stack to the Linux function. ++ * The value of true is -1 in assembler, so we multiply it by another true ++ * value. ++ */ ++#define stack_args(argc) \ ++ ((0 < 1) * (argc > LINUX_REG_ARGS) * (argc - LINUX_REG_ARGS)) ++ ++/* Full required change of stack pointer, in words */ ++#define stack_words_raw(argc) (stack_args(argc) + SAVED_REGS + 1) ++ ++/* Full actual change of stack pointer, in words (must be even) */ ++#define stack_words_aligned(argc) ((stack_words_raw(argc) + 1) & ~1) ++ ++/* Space allocated for Linux arguments on stack */ ++#define stack_space(argc) \ ++ ((stack_words_aligned(argc) - SAVED_REGS - 1) * WORD_BYTES) ++ ++/* ++ * win2lin_win_arg(N, ARGC) gives the address of the Windows argument N out of ++ * total ARGC after the stack has been prepared for the Linux function call. ++ * ++ * When called from Windows, the Nth argument is at (N * 8)(%rsp). We add the ++ * stack space allocated by the Linux function to compensate for %rsp change. ++ * ++ * Don't call with N less than 5! ++ */ ++#define win2lin_win_arg(n, argc) \ ++ ((n + SAVED_REGS) * WORD_BYTES + stack_space(argc))(%rsp) ++ ++/* ++ * win2lin_lin_arg(N) gives the address of the Nth Linux argument on the extra ++ * Linux stack frame. When more than 6 arguments are used, %rsp points to the ++ * 7th argument. The Nth argument is therefore at ((N - 7) * 8)(%rsp). ++ * ++ * Don't call with N less than 7! ++ */ ++#define win2lin_lin_arg(n) ((n - 1 - LINUX_REG_ARGS) * WORD_BYTES)(%rsp) ++ ++/* Declare function LONGNAME, call function SHORTNAME with ARGC arguments */ ++.macro win2linm longname, shortname, argc ++ .type \longname, @function ++ ENTRY(\longname) ++ ++ /* Create a call frame - it's optional, but good for debugging */ ++ .cfi_startproc ++ push %rbp ++ .cfi_def_cfa %rsp, 2 * WORD_BYTES ++ .cfi_offset %rbp, -2 * WORD_BYTES ++ mov %rsp, %rbp ++ .cfi_def_cfa %rbp, 2 * WORD_BYTES ++ ++ /* ++ * Registers %rdi and %rsi are volatile on Linux, but not on Windows, ++ * so save them on the stack. ++ */ ++ push %rsi ++ push %rdi ++ ++ /* Allocate extra stack space for arguments 7 and up */ ++ sub $stack_space(\argc), %rsp ++ ++ /* ++ * Copy arguments 7 and up. We do it early, before %rdi and %rsi ++ * are used for arguments 1 and 2, so we don't have to save them. ++ * We still need to save %rcx if using a string copy. ++ */ ++ .if (\argc < LOOP_THRESHOLD) ++ /* If a few arguments, copy them individually through %r11 */ ++ .if (\argc >= 7) ++ mov win2lin_win_arg(7, \argc), %r11 ++ mov %r11, win2lin_lin_arg(7) ++ .endif ++ .if (\argc >= 8) ++ mov win2lin_win_arg(8, \argc), %r11 ++ mov %r11, win2lin_lin_arg(8) ++ .endif ++ .else ++ /* If there are many arguments, copy them in a loop */ ++ /* Save arg1 to %r11 */ ++ mov %rcx, %r11 ++ /* Source and destination */ ++ lea win2lin_win_arg(LINUX_REG_ARGS + 1, \argc), %rsi ++ lea win2lin_lin_arg(LINUX_REG_ARGS + 1), %rdi ++ /* Number of arguments to copy (%ecx zero-extends to %rcx) */ ++ mov $(\argc - LINUX_REG_ARGS), %ecx ++ rep movsq ++ /* Restore arg1 directly to %rdi */ ++ mov %r11, %rdi ++ .endif ++ ++ /* ++ * Argument 1 - %rcx on Windows, %rdi on Linux ++ * Micro-optimization - if we used loop, arg1 is already in %rdi ++ */ ++ .if (\argc >= 1) && (\argc < LOOP_THRESHOLD) ++ mov %rcx, %rdi ++ .endif ++ ++ /* Argument 2 - %rdx on Windows, %rsi on Linux */ ++ .if (\argc >= 2) ++ mov %rdx, %rsi ++ .endif ++ ++ /* Argument 3 - %r8 on Windows, %rdx on Linux */ ++ .if (\argc >= 3) ++ mov %r8, %rdx ++ .endif ++ ++ /* Argument 4 - %r9 on Windows, %rcx on Linux */ ++ .if (\argc >= 4) ++ mov %r9, %rcx ++ .endif ++ ++ /* Argument 5 - first argument on stack on Windows, %r8 Linux */ ++ .if (\argc >= 5) ++ mov win2lin_win_arg(5, \argc), %r8 ++ .endif ++ ++ /* Argument 6 - second argument on stack on Windows, %r9 Linux */ ++ .if (\argc >= 6) ++ mov win2lin_win_arg(6, \argc), %r9 ++ .endif ++ ++ /* %rax on Linux is the number of arguments in SSE registers (zero) */ ++ xor %rax, %rax ++ ++ /* Call the function */ ++ call \shortname ++ ++ /* Free stack space for arguments 7 and up */ ++ add $stack_space(\argc), %rsp ++ ++ /* Restore saved registers */ ++ pop %rdi ++ pop %rsi ++ ++ /* Return to Windows code */ ++ leave ++ .cfi_def_cfa %rsp, WORD_BYTES ++ .cfi_restore %rbp ++ ret ++ .cfi_endproc ++ .size \longname, (. - \longname) ++.endm ++ ++#define win2lin(name, argc) win2linm win2lin_ ## name ## _ ## argc, name, argc ++ ++#include "win2lin_stubs.h" ++ ++#endif /* CONFIG_X86_64 */ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/winnt_types.h +--- linux-3.12.2/3rdparty/ndiswrapper/winnt_types.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/winnt_types.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,1701 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _WINNT_TYPES_H_ ++#define _WINNT_TYPES_H_ ++ ++#define TRUE 1 ++#define FALSE 0 ++ ++#define PASSIVE_LEVEL 0 ++#define APC_LEVEL 1 ++#define DISPATCH_LEVEL 2 ++#define DEVICE_LEVEL_BASE 4 ++ ++/* soft interrupts / bottom-half's are disabled at SOFT_IRQL */ ++#define SOFT_IRQL (DEVICE_LEVEL_BASE + 1) ++#define DIRQL (DEVICE_LEVEL_BASE + 2) ++ ++#define STATUS_WAIT_0 0 ++#define STATUS_SUCCESS 0 ++#define STATUS_ALERTED 0x00000101 ++#define STATUS_TIMEOUT 0x00000102 ++#define STATUS_PENDING 0x00000103 ++#define STATUS_FAILURE 0xC0000001 ++#define STATUS_NOT_IMPLEMENTED 0xC0000002 ++#define STATUS_INVALID_PARAMETER 0xC000000D ++#define STATUS_INVALID_DEVICE_REQUEST 0xC0000010 ++#define STATUS_MORE_PROCESSING_REQUIRED 0xC0000016 ++#define STATUS_ACCESS_DENIED 0xC0000022 ++#define STATUS_BUFFER_TOO_SMALL 0xC0000023 ++#define STATUS_OBJECT_NAME_INVALID 0xC0000023 ++#define STATUS_MUTANT_NOT_OWNED 0xC0000046 ++#define STATUS_RESOURCES 0xC000009A ++#define STATUS_DELETE_PENDING 0xC0000056 ++#define STATUS_INSUFFICIENT_RESOURCES 0xC000009A ++#define STATUS_NOT_SUPPORTED 0xC00000BB ++#define STATUS_INVALID_PARAMETER_2 0xC00000F0 ++#define STATUS_NO_MEMORY 0xC0000017 ++#define STATUS_CANCELLED 0xC0000120 ++#define STATUS_DEVICE_REMOVED 0xC00002B6 ++#define STATUS_DEVICE_NOT_CONNECTED 0xC000009D ++ ++#define STATUS_BUFFER_OVERFLOW 0x80000005 ++ ++#define SL_PENDING_RETURNED 0x01 ++#define SL_INVOKE_ON_CANCEL 0x20 ++#define SL_INVOKE_ON_SUCCESS 0x40 ++#define SL_INVOKE_ON_ERROR 0x80 ++ ++#define IRP_MJ_CREATE 0x00 ++#define IRP_MJ_CREATE_NAMED_PIPE 0x01 ++#define IRP_MJ_CLOSE 0x02 ++#define IRP_MJ_READ 0x03 ++#define IRP_MJ_WRITE 0x04 ++ ++#define IRP_MJ_DEVICE_CONTROL 0x0E ++#define IRP_MJ_INTERNAL_DEVICE_CONTROL 0x0F ++#define IRP_MJ_POWER 0x16 ++#define IRP_MJ_SYSTEM_CONTROL 0x0E ++#define IRP_MJ_PNP 0x1b ++#define IRP_MJ_MAXIMUM_FUNCTION 0x1b ++ ++#define IRP_MN_WAIT_WAKE 0x00 ++#define IRP_MN_POWER_SEQUENCE 0x01 ++#define IRP_MN_SET_POWER 0x02 ++#define IRP_MN_QUERY_POWER 0x03 ++ ++#define IRP_MN_REGINFO 0x08 ++#define IRP_MN_REGINFO_EX 0x0b ++ ++#define IRP_MN_START_DEVICE 0x00 ++#define IRP_MN_QUERY_REMOVE_DEVICE 0x01 ++#define IRP_MN_REMOVE_DEVICE 0x02 ++#define IRP_MN_CANCEL_REMOVE_DEVICE 0x03 ++#define IRP_MN_STOP_DEVICE 0x04 ++#define IRP_MN_QUERY_STOP_DEVICE 0x05 ++#define IRP_MN_CANCEL_STOP_DEVICE 0x06 ++#define IRP_MN_QUERY_DEVICE_RELATIONS 0x07 ++#define IRP_MN_QUERY_INTERFACE 0x08 ++ ++#define IRP_BUFFERED_IO 0x00000010 ++#define IRP_DEALLOCATE_BUFFER 0x00000020 ++#define IRP_INPUT_OPERATION 0x00000040 ++ ++#define IRP_DEFFER_IO_COMPLETION 0x00000800 ++ ++#define THREAD_WAIT_OBJECTS 3 ++#define MAX_WAIT_OBJECTS 64 ++ ++#define LOW_PRIORITY 0 ++#define LOW_REALTIME_PRIORITY 16 ++#define HIGH_PRIORITY 31 ++#define MAXIMUM_PRIORITY 32 ++ ++#define PROCESSOR_FEATURE_MAX 64 ++ ++#define IO_NO_INCREMENT 0 ++ ++#define WMIREG_ACTION_REGISTER 1 ++#define WMIREG_ACTION_DEREGISTER 2 ++#define WMIREG_ACTION_REREGISTER 3 ++#define WMIREG_ACTION_UPDATE_GUIDS 4 ++ ++#define WMIREGISTER 0 ++#define WMIUPDATE 1 ++ ++#ifdef CONFIG_X86_64 ++#define wstdcall ++#define wfastcall ++#define noregparm ++#define regparm3 ++ ++#define KI_USER_SHARED_DATA 0xfffff78000000000UL ++ ++#else ++ ++#define noregparm __attribute__((regparm(0))) ++#define regparm3 __attribute__((regparm(3))) ++#define wstdcall __attribute__((__stdcall__, regparm(0))) ++#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ > 3) || __GNUC__ > 3) ++#undef fastcall ++#define wfastcall __attribute__((fastcall)) ++#else ++#error "gcc 3.4 or newer should be used for compiling this module" ++#endif ++ ++#define KI_USER_SHARED_DATA 0xffdf0000 ++ ++#endif ++ ++typedef u8 BOOLEAN; ++typedef u8 BYTE; ++typedef u8 *LPBYTE; ++typedef s8 CHAR; ++typedef u8 UCHAR; ++typedef s16 SHORT; ++typedef u16 USHORT; ++typedef u16 WORD; ++typedef s32 INT; ++typedef u32 UINT; ++typedef u32 DWORD; ++typedef s32 LONG; ++typedef u32 ULONG; ++typedef s64 LONGLONG; ++typedef u64 ULONGLONG; ++typedef u64 ULONGULONG; ++typedef u64 ULONG64; ++ ++typedef CHAR CCHAR; ++typedef USHORT wchar_t; ++typedef SHORT CSHORT; ++typedef LONGLONG LARGE_INTEGER; ++ ++typedef LONG NTSTATUS; ++ ++typedef LONG KPRIORITY; ++typedef LARGE_INTEGER PHYSICAL_ADDRESS; ++typedef UCHAR KIRQL; ++typedef CHAR KPROCESSOR_MODE; ++ ++/* ULONG_PTR is 32 bits on 32-bit platforms and 64 bits on 64-bit ++ * platform, which is same as 'unsigned long' in Linux */ ++typedef unsigned long ULONG_PTR; ++ ++typedef size_t SIZE_T; ++typedef ULONG_PTR KAFFINITY; ++typedef ULONG ACCESS_MASK; ++ ++typedef ULONG_PTR PFN_NUMBER; ++typedef ULONG SECURITY_INFORMATION; ++ ++/* non-negative numbers indicate success */ ++#define NT_SUCCESS(status) ((NTSTATUS)(status) >= 0) ++ ++struct ansi_string { ++ USHORT length; ++ USHORT max_length; ++ char *buf; ++}; ++ ++struct unicode_string { ++ USHORT length; ++ USHORT max_length; ++ wchar_t *buf; ++}; ++ ++struct nt_slist { ++ struct nt_slist *next; ++}; ++ ++#ifdef CONFIG_X86_64 ++/* it is not clear how nt_slist_head is used to store pointer to ++ * slists and depth; here we assume 'align' field is used to store ++ * depth and 'region' field is used to store slist pointers */ ++struct nt_slist_head { ++ union { ++ USHORT depth; ++ ULONGLONG align; ++ }; ++ union { ++ ULONGLONG region; ++ struct nt_slist *next; ++ }; ++} __attribute__((aligned(16))); ++typedef struct nt_slist_head nt_slist_header; ++#else ++union nt_slist_head { ++ ULONGLONG align; ++ struct { ++ struct nt_slist *next; ++ USHORT depth; ++ USHORT sequence; ++ }; ++}; ++typedef union nt_slist_head nt_slist_header; ++#endif ++ ++struct nt_list { ++ struct nt_list *next; ++ struct nt_list *prev; ++}; ++ ++typedef ULONG_PTR NT_SPIN_LOCK; ++ ++enum kdpc_importance {LowImportance, MediumImportance, HighImportance}; ++ ++struct kdpc; ++typedef void (*DPC)(struct kdpc *kdpc, void *ctx, void *arg1, ++ void *arg2) wstdcall; ++struct kdpc { ++ SHORT type; ++ UCHAR nr_cpu; ++ UCHAR importance; ++ struct nt_list list; ++ DPC func; ++ void *ctx; ++ void *arg1; ++ void *arg2; ++ union { ++ NT_SPIN_LOCK *lock; ++ /* 'lock' is not used; 'queued' represents whether ++ * kdpc is queued or not */ ++ int queued; ++ }; ++}; ++ ++enum pool_type { ++ NonPagedPool, PagedPool, NonPagedPoolMustSucceed, DontUseThisType, ++ NonPagedPoolCacheAligned, PagedPoolCacheAligned, ++ NonPagedPoolCacheAlignedMustS, MaxPoolType, ++ NonPagedPoolSession = 32, ++ PagedPoolSession = NonPagedPoolSession + 1, ++ NonPagedPoolMustSucceedSession = PagedPoolSession + 1, ++ DontUseThisTypeSession = NonPagedPoolMustSucceedSession + 1, ++ NonPagedPoolCacheAlignedSession = DontUseThisTypeSession + 1, ++ PagedPoolCacheAlignedSession = NonPagedPoolCacheAlignedSession + 1, ++ NonPagedPoolCacheAlignedMustSSession = PagedPoolCacheAlignedSession + 1 ++}; ++ ++enum memory_caching_type_orig { ++ MmFrameBufferCached = 2 ++}; ++ ++enum memory_caching_type { ++ MmNonCached = FALSE, MmCached = TRUE, ++ MmWriteCombined = MmFrameBufferCached, MmHardwareCoherentCached, ++ MmNonCachedUnordered, MmUSWCCached, MmMaximumCacheType ++}; ++ ++enum lock_operation { ++ IoReadAccess, IoWriteAccess, IoModifyAccess ++}; ++ ++enum mode { ++ KernelMode, UserMode, MaximumMode ++}; ++ ++struct mdl { ++ struct mdl *next; ++ CSHORT size; ++ CSHORT flags; ++ /* NdisFreeBuffer doesn't pass pool, so we store pool in ++ * unused field 'process' */ ++ union { ++ void *process; ++ void *pool; ++ }; ++ void *mappedsystemva; ++ void *startva; ++ ULONG bytecount; ++ ULONG byteoffset; ++}; ++ ++#define MDL_MAPPED_TO_SYSTEM_VA 0x0001 ++#define MDL_PAGES_LOCKED 0x0002 ++#define MDL_SOURCE_IS_NONPAGED_POOL 0x0004 ++#define MDL_ALLOCATED_FIXED_SIZE 0x0008 ++#define MDL_PARTIAL 0x0010 ++#define MDL_PARTIAL_HAS_BEEN_MAPPED 0x0020 ++#define MDL_IO_PAGE_READ 0x0040 ++#define MDL_WRITE_OPERATION 0x0080 ++#define MDL_PARENT_MAPPED_SYSTEM_VA 0x0100 ++#define MDL_FREE_EXTRA_PTES 0x0200 ++#define MDL_IO_SPACE 0x0800 ++#define MDL_NETWORK_HEADER 0x1000 ++#define MDL_MAPPING_CAN_FAIL 0x2000 ++#define MDL_ALLOCATED_MUST_SUCCEED 0x4000 ++ ++#define MDL_POOL_ALLOCATED 0x0400 ++#define MDL_CACHE_ALLOCATED 0x8000 ++ ++#define PAGE_START(ptr) ((void *)((ULONG_PTR)(ptr) & ~(PAGE_SIZE - 1))) ++#define BYTE_OFFSET(ptr) ((ULONG)((ULONG_PTR)(ptr) & (PAGE_SIZE - 1))) ++ ++#define MmGetMdlByteCount(mdl) ((mdl)->bytecount) ++#define MmGetMdlVirtualAddress(mdl) ((mdl)->startva + (mdl)->byteoffset) ++#define MmGetMdlByteOffset(mdl) ((mdl)->byteoffset) ++#define MmGetSystemAddressForMdl(mdl) ((mdl)->mappedsystemva) ++#define MmGetSystemAddressForMdlSafe(mdl, priority) ((mdl)->mappedsystemva) ++#define MmGetMdlPfnArray(mdl) ((PFN_NUMBER *)(mdl + 1)) ++#define MmInitializeMdl(mdl, baseva, length) \ ++do { \ ++ (mdl)->next = NULL; \ ++ (mdl)->size = MmSizeOfMdl(baseva, length); \ ++ (mdl)->flags = 0; \ ++ (mdl)->startva = PAGE_START(baseva); \ ++ (mdl)->byteoffset = BYTE_OFFSET(baseva); \ ++ (mdl)->bytecount = length; \ ++ (mdl)->mappedsystemva = baseva; \ ++ TRACE4("%p %p %p %d %d", (mdl), baseva, (mdl)->startva, \ ++ (mdl)->byteoffset, length); \ ++} while (0) ++ ++struct kdevice_queue_entry { ++ struct nt_list list; ++ ULONG sort_key; ++ BOOLEAN inserted; ++}; ++ ++struct kdevice_queue { ++ USHORT type; ++ USHORT size; ++ struct nt_list list; ++ NT_SPIN_LOCK lock; ++ BOOLEAN busy; ++}; ++ ++struct wait_context_block { ++ struct kdevice_queue_entry wait_queue_entry; ++ void *device_routine; ++ void *device_context; ++ ULONG num_regs; ++ void *device_object; ++ void *current_irp; ++ void *buffer_chaining_dpc; ++}; ++ ++struct wait_block { ++ struct nt_list list; ++ struct task_struct *thread; ++ void *object; ++ int *wait_done; ++ USHORT wait_key; ++ USHORT wait_type; ++}; ++ ++struct dispatcher_header { ++ UCHAR type; ++ UCHAR absolute; ++ UCHAR size; ++ UCHAR inserted; ++ LONG signal_state; ++ struct nt_list wait_blocks; ++}; ++ ++enum event_type { ++ NotificationEvent, ++ SynchronizationEvent, ++}; ++ ++enum timer_type { ++ NotificationTimer = NotificationEvent, ++ SynchronizationTimer = SynchronizationEvent, ++}; ++ ++enum dh_type { ++ NotificationObject = NotificationEvent, ++ SynchronizationObject = SynchronizationEvent, ++ MutexObject, ++ SemaphoreObject, ++ ThreadObject, ++}; ++ ++enum wait_type { ++ WaitAll, WaitAny ++}; ++ ++/* objects that use dispatcher_header have it as the first field, so ++ * whenever we need to initialize dispatcher_header, we can convert ++ * that object into a nt_event and access dispatcher_header */ ++struct nt_event { ++ struct dispatcher_header dh; ++}; ++ ++struct wrap_timer; ++ ++#define WRAP_TIMER_MAGIC 47697249 ++ ++struct nt_timer { ++ struct dispatcher_header dh; ++ /* We can't fit Linux timer in this structure. Instead of ++ * padding the nt_timer structure, we replace due_time field ++ * with *wrap_timer and allocate memory for it when nt_timer is ++ * initialized */ ++ union { ++ ULONGLONG due_time; ++ struct wrap_timer *wrap_timer; ++ }; ++ struct nt_list nt_timer_list; ++ struct kdpc *kdpc; ++ union { ++ LONG period; ++ LONG wrap_timer_magic; ++ }; ++}; ++ ++struct nt_mutex { ++ struct dispatcher_header dh; ++ struct nt_list list; ++ struct task_struct *owner_thread; ++ BOOLEAN abandoned; ++ BOOLEAN apc_disable; ++}; ++ ++struct nt_semaphore { ++ struct dispatcher_header dh; ++ LONG limit; ++}; ++ ++struct nt_thread { ++ struct dispatcher_header dh; ++ /* the rest in Windows is a long structure; since this ++ * structure is opaque to drivers, we just define what we ++ * need */ ++ int pid; ++ NTSTATUS status; ++ struct task_struct *task; ++ struct nt_list irps; ++ NT_SPIN_LOCK lock; ++ KPRIORITY prio; ++}; ++ ++#define set_object_type(dh, type) ((dh)->type = (type)) ++#define is_notify_object(dh) ((dh)->type == NotificationObject) ++#define is_synch_object(dh) ((dh)->type == SynchronizationObject) ++#define is_mutex_object(dh) ((dh)->type == MutexObject) ++#define is_semaphore_object(dh) ((dh)->type == SemaphoreObject) ++#define is_nt_thread_object(dh) ((dh)->type == ThreadObject) ++ ++#define IO_TYPE_ADAPTER 1 ++#define IO_TYPE_CONTROLLER 2 ++#define IO_TYPE_DEVICE 3 ++#define IO_TYPE_DRIVER 4 ++#define IO_TYPE_FILE 5 ++#define IO_TYPE_IRP 6 ++#define IO_TYPE_DEVICE_OBJECT_EXTENSION 13 ++ ++struct irp; ++struct dev_obj_ext; ++struct driver_object; ++ ++struct device_object { ++ CSHORT type; ++ USHORT size; ++ LONG ref_count; ++ struct driver_object *drv_obj; ++ struct device_object *next; ++ struct device_object *attached; ++ struct irp *current_irp; ++ void *io_timer; ++ ULONG flags; ++ ULONG characteristics; ++ void *vpb; ++ void *dev_ext; ++ CCHAR stack_count; ++ union { ++ struct nt_list queue_list; ++ struct wait_context_block wcb; ++ } queue; ++ ULONG align_req; ++ struct kdevice_queue dev_queue; ++ struct kdpc dpc; ++ ULONG active_threads; ++ void *security_desc; ++ struct nt_event lock; ++ USHORT sector_size; ++ USHORT spare1; ++ struct dev_obj_ext *dev_obj_ext; ++ void *reserved; ++}; ++ ++struct dev_obj_ext { ++ CSHORT type; ++ CSHORT size; ++ struct device_object *dev_obj; ++ struct device_object *attached_to; ++}; ++ ++struct io_status_block { ++ union { ++ NTSTATUS status; ++ void *pointer; ++ }; ++ ULONG_PTR info; ++}; ++ ++#ifdef CONFIG_X86_64 ++struct io_status_block32 { ++ NTSTATUS status; ++ ULONG info; ++}; ++#endif ++ ++#define DEVICE_TYPE ULONG ++ ++struct driver_extension; ++ ++typedef NTSTATUS driver_dispatch_t(struct device_object *dev_obj, ++ struct irp *irp) wstdcall; ++ ++struct driver_object { ++ CSHORT type; ++ CSHORT size; ++ struct device_object *dev_obj; ++ ULONG flags; ++ void *start; ++ ULONG driver_size; ++ void *section; ++ struct driver_extension *drv_ext; ++ struct unicode_string name; ++ struct unicode_string *hardware_database; ++ void *fast_io_dispatch; ++ void *init; ++ void *start_io; ++ void (*unload)(struct driver_object *driver) wstdcall; ++ driver_dispatch_t *major_func[IRP_MJ_MAXIMUM_FUNCTION + 1]; ++}; ++ ++struct driver_extension { ++ struct driver_object *drv_obj; ++ NTSTATUS (*add_device)(struct driver_object *drv_obj, ++ struct device_object *dev_obj); ++ ULONG count; ++ struct unicode_string service_key_name; ++ struct nt_list custom_ext; ++}; ++ ++struct custom_ext { ++ struct nt_list list; ++ void *client_id; ++}; ++ ++struct wrap_bin_file; ++ ++struct file_object { ++ CSHORT type; ++ CSHORT size; ++ struct device_object *dev_obj; ++ void *volume_parameter_block; ++ void *fs_context; ++ void *fs_context2; ++ void *section_object_pointer; ++ void *private_cache_map; ++ NTSTATUS final_status; ++ union { ++ struct file_object *related_file_object; ++ struct wrap_bin_file *wrap_bin_file; ++ }; ++ BOOLEAN lock_operation; ++ BOOLEAN delete_pending; ++ BOOLEAN read_access; ++ BOOLEAN write_access; ++ BOOLEAN delete_access; ++ BOOLEAN shared_read; ++ BOOLEAN shared_write; ++ BOOLEAN shared_delete; ++ ULONG flags; ++ struct unicode_string _name_; ++ LARGE_INTEGER current_byte_offset; ++ ULONG waiters; ++ ULONG busy; ++ void *last_lock; ++ struct nt_event lock; ++ struct nt_event event; ++ void *completion_context; ++}; ++ ++#ifdef CONFIG_X86_64 ++#define POINTER_ALIGN __attribute__((aligned(8))) ++#else ++#define POINTER_ALIGN ++#endif ++ ++#define CACHE_ALIGN __attribute__((aligned(128))) ++ ++enum system_power_state { ++ PowerSystemUnspecified = 0, ++ PowerSystemWorking, PowerSystemSleeping1, PowerSystemSleeping2, ++ PowerSystemSleeping3, PowerSystemHibernate, PowerSystemShutdown, ++ PowerSystemMaximum, ++}; ++ ++enum device_power_state { ++ PowerDeviceUnspecified = 0, ++ PowerDeviceD0, PowerDeviceD1, PowerDeviceD2, PowerDeviceD3, ++ PowerDeviceMaximum, ++}; ++ ++union power_state { ++ enum system_power_state system_state; ++ enum device_power_state device_state; ++}; ++ ++enum power_state_type { ++ SystemPowerState = 0, DevicePowerState, ++}; ++ ++enum power_action { ++ PowerActionNone = 0, ++ PowerActionReserved, PowerActionSleep, PowerActionHibernate, ++ PowerActionShutdown, PowerActionShutdownReset, PowerActionShutdownOff, ++ PowerActionWarmEject, ++}; ++ ++struct guid { ++ ULONG data1; ++ USHORT data2; ++ USHORT data3; ++ UCHAR data4[8]; ++}; ++ ++struct nt_interface { ++ USHORT size; ++ USHORT version; ++ void *context; ++ void (*reference)(void *context) wstdcall; ++ void (*dereference)(void *context) wstdcall; ++}; ++ ++enum interface_type { ++ InterfaceTypeUndefined = -1, Internal, Isa, Eisa, MicroChannel, ++ TurboChannel, PCIBus, VMEBus, NuBus, PCMCIABus, CBus, MPIBus, ++ MPSABus, ProcessorInternal, InternalPowerBus, PNPISABus, ++ PNPBus, MaximumInterfaceType, ++}; ++ ++#define CmResourceTypeNull 0 ++#define CmResourceTypePort 1 ++#define CmResourceTypeInterrupt 2 ++#define CmResourceTypeMemory 3 ++#define CmResourceTypeDma 4 ++#define CmResourceTypeDeviceSpecific 5 ++#define CmResourceTypeBusNumber 6 ++#define CmResourceTypeMaximum 7 ++ ++#define CmResourceTypeNonArbitrated 128 ++#define CmResourceTypeConfigData 128 ++#define CmResourceTypeDevicePrivate 129 ++#define CmResourceTypePcCardConfig 130 ++#define CmResourceTypeMfCardConfig 131 ++ ++enum cm_share_disposition { ++ CmResourceShareUndetermined = 0, CmResourceShareDeviceExclusive, ++ CmResourceShareDriverExclusive, CmResourceShareShared ++}; ++ ++#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0 ++#define CM_RESOURCE_INTERRUPT_LATCHED 1 ++#define CM_RESOURCE_MEMORY_READ_WRITE 0x0000 ++#define CM_RESOURCE_MEMORY_READ_ONLY 0x0001 ++#define CM_RESOURCE_MEMORY_WRITE_ONLY 0x0002 ++#define CM_RESOURCE_MEMORY_PREFETCHABLE 0x0004 ++ ++#define CM_RESOURCE_MEMORY_COMBINEDWRITE 0x0008 ++#define CM_RESOURCE_MEMORY_24 0x0010 ++#define CM_RESOURCE_MEMORY_CACHEABLE 0x0020 ++ ++#define CM_RESOURCE_PORT_MEMORY 0x0000 ++#define CM_RESOURCE_PORT_IO 0x0001 ++#define CM_RESOURCE_PORT_10_BIT_DECODE 0x0004 ++#define CM_RESOURCE_PORT_12_BIT_DECODE 0x0008 ++#define CM_RESOURCE_PORT_16_BIT_DECODE 0x0010 ++#define CM_RESOURCE_PORT_POSITIVE_DECODE 0x0020 ++#define CM_RESOURCE_PORT_PASSIVE_DECODE 0x0040 ++#define CM_RESOURCE_PORT_WINDOW_DECODE 0x0080 ++ ++#define CM_RESOURCE_DMA_8 0x0000 ++#define CM_RESOURCE_DMA_16 0x0001 ++#define CM_RESOURCE_DMA_32 0x0002 ++#define CM_RESOURCE_DMA_8_AND_16 0x0004 ++#define CM_RESOURCE_DMA_BUS_MASTER 0x0008 ++#define CM_RESOURCE_DMA_TYPE_A 0x0010 ++#define CM_RESOURCE_DMA_TYPE_B 0x0020 ++#define CM_RESOURCE_DMA_TYPE_F 0x0040 ++ ++#define MAX_RESOURCES 20 ++ ++#pragma pack(push,4) ++struct cm_partial_resource_descriptor { ++ UCHAR type; ++ UCHAR share; ++ USHORT flags; ++ union { ++ struct { ++ PHYSICAL_ADDRESS start; ++ ULONG length; ++ } generic; ++ struct { ++ PHYSICAL_ADDRESS start; ++ ULONG length; ++ } port; ++ struct { ++ ULONG level; ++ ULONG vector; ++ KAFFINITY affinity; ++ } interrupt; ++ struct { ++ PHYSICAL_ADDRESS start; ++ ULONG length; ++ } memory; ++ struct { ++ ULONG channel; ++ ULONG port; ++ ULONG reserved1; ++ } dma; ++ struct { ++ ULONG data[3]; ++ } device_private; ++ struct { ++ ULONG start; ++ ULONG length; ++ ULONG reserved; ++ } bus_number; ++ struct { ++ ULONG data_size; ++ ULONG reserved1; ++ ULONG reserved2; ++ } device_specific_data; ++ } u; ++}; ++#pragma pack(pop) ++ ++struct cm_partial_resource_list { ++ USHORT version; ++ USHORT revision; ++ ULONG count; ++ struct cm_partial_resource_descriptor partial_descriptors[1]; ++}; ++ ++struct cm_full_resource_descriptor { ++ enum interface_type interface_type; ++ ULONG bus_number; ++ struct cm_partial_resource_list partial_resource_list; ++}; ++ ++struct cm_resource_list { ++ ULONG count; ++ struct cm_full_resource_descriptor list[1]; ++}; ++ ++enum file_info_class { ++ FileDirectoryInformation = 1, ++ FileBasicInformation = 4, ++ FileStandardInformation = 5, ++ FileNameInformation = 9, ++ FilePositionInformation = 14, ++ FileAlignmentInformation = 17, ++ FileNetworkOpenInformation = 34, ++ FileAttributeTagInformation = 35, ++ FileMaximumInformation = 41, ++}; ++ ++enum fs_info_class { ++ FileFsVolumeInformation = 1, ++ /* ... */ ++ FileFsMaximumInformation = 9, ++}; ++ ++enum device_relation_type { ++ BusRelations, EjectionRelations, PowerRelations, RemovalRelations, ++ TargetDeviceRelation, SingleBusRelations, ++}; ++ ++enum bus_query_id_type { ++ BusQueryDeviceID = 0, BusQueryHardwareIDs = 1, ++ BusQueryCompatibleIDs = 2, BusQueryInstanceID = 3, ++ BusQueryDeviceSerialNumber = 4, ++}; ++ ++enum device_text_type { ++ DeviceTextDescription = 0, DeviceTextLocationInformation = 1, ++}; ++ ++enum device_usage_notification_type { ++ DeviceUsageTypeUndefined, DeviceUsageTypePaging, ++ DeviceUsageTypeHibernation, DevbiceUsageTypeDumpFile, ++}; ++ ++#define METHOD_BUFFERED 0 ++#define METHOD_IN_DIRECT 1 ++#define METHOD_OUT_DIRECT 2 ++#define METHOD_NEITHER 3 ++ ++#define CTL_CODE(dev_type, func, method, access) \ ++ (((dev_type) << 16) | ((access) << 14) | ((func) << 2) | (method)) ++ ++#define IO_METHOD_FROM_CTL_CODE(code) (code & 0x3) ++ ++#ifndef CONFIG_X86_64 ++#pragma pack(push,4) ++#endif ++struct io_stack_location { ++ UCHAR major_fn; ++ UCHAR minor_fn; ++ UCHAR flags; ++ UCHAR control; ++ union { ++ struct { ++ void *security_context; ++ ULONG options; ++ USHORT POINTER_ALIGN file_attributes; ++ USHORT share_access; ++ ULONG POINTER_ALIGN ea_length; ++ } create; ++ struct { ++ ULONG length; ++ ULONG POINTER_ALIGN key; ++ LARGE_INTEGER byte_offset; ++ } read; ++ struct { ++ ULONG length; ++ ULONG POINTER_ALIGN key; ++ LARGE_INTEGER byte_offset; ++ } write; ++ struct { ++ ULONG length; ++ enum file_info_class POINTER_ALIGN file_info_class; ++ } query_file; ++ struct { ++ ULONG length; ++ enum file_info_class POINTER_ALIGN file_info_class; ++ struct file_object *file_object; ++ union { ++ struct { ++ BOOLEAN replace_if_exists; ++ BOOLEAN advance_only; ++ }; ++ ULONG cluster_count; ++ void *delete_handle; ++ }; ++ } set_file; ++ struct { ++ ULONG length; ++ enum fs_info_class POINTER_ALIGN fs_info_class; ++ } query_volume; ++ struct { ++ ULONG output_buf_len; ++ ULONG POINTER_ALIGN input_buf_len; ++ ULONG POINTER_ALIGN code; ++ void *type3_input_buf; ++ } dev_ioctl; ++ struct { ++ SECURITY_INFORMATION security_info; ++ ULONG POINTER_ALIGN length; ++ } query_security; ++ struct { ++ SECURITY_INFORMATION security_info; ++ void *security_descriptor; ++ } set_security; ++ struct { ++ void *vpb; ++ struct device_object *device_object; ++ } mount_volume; ++ struct { ++ void *vpb; ++ struct device_object *device_object; ++ } verify_volume; ++ struct { ++ void *srb; ++ } scsi; ++ struct { ++ enum device_relation_type type; ++ } query_device_relations; ++ struct { ++ const struct guid *type; ++ USHORT size; ++ USHORT version; ++ struct nt_interface *intf; ++ void *intf_data; ++ } query_intf; ++ struct { ++ void *capabilities; ++ } device_capabilities; ++ struct { ++ void *io_resource_requirement_list; ++ } filter_resource_requirements; ++ struct { ++ ULONG which_space; ++ void *buffer; ++ ULONG offset; ++ ULONG POINTER_ALIGN length; ++ } read_write_config; ++ struct { ++ BOOLEAN lock; ++ } set_lock; ++ struct { ++ enum bus_query_id_type id_type; ++ } query_id; ++ struct { ++ enum device_text_type device_text_type; ++ ULONG POINTER_ALIGN locale_id; ++ } query_device_text; ++ struct { ++ BOOLEAN in_path; ++ BOOLEAN reserved[3]; ++ enum device_usage_notification_type POINTER_ALIGN type; ++ } usage_notification; ++ struct { ++ enum system_power_state power_state; ++ } wait_wake; ++ struct { ++ void *power_sequence; ++ } power_sequence; ++ struct { ++ ULONG sys_context; ++ enum power_state_type POINTER_ALIGN type; ++ union power_state POINTER_ALIGN state; ++ enum power_action POINTER_ALIGN shutdown_type; ++ } power; ++ struct { ++ struct cm_resource_list *allocated_resources; ++ struct cm_resource_list *allocated_resources_translated; ++ } start_device; ++ struct { ++ ULONG_PTR provider_id; ++ void *data_path; ++ ULONG buf_len; ++ void *buf; ++ } wmi; ++ struct { ++ void *arg1; ++ void *arg2; ++ void *arg3; ++ void *arg4; ++ } others; ++ } params; ++ struct device_object *dev_obj; ++ struct file_object *file_obj; ++ NTSTATUS (*completion_routine)(struct device_object *, ++ struct irp *, void *) wstdcall; ++ void *context; ++}; ++#ifndef CONFIG_X86_64 ++#pragma pack(pop) ++#endif ++ ++struct kapc { ++ CSHORT type; ++ CSHORT size; ++ ULONG spare0; ++ struct nt_thread *thread; ++ struct nt_list list; ++ void *kernele_routine; ++ void *rundown_routine; ++ void *normal_routine; ++ void *normal_context; ++ void *sys_arg1; ++ void *sys_arg2; ++ CCHAR apc_state_index; ++ KPROCESSOR_MODE apc_mode; ++ BOOLEAN inserted; ++}; ++ ++#define IRP_NOCACHE 0x00000001 ++#define IRP_SYNCHRONOUS_API 0x00000004 ++#define IRP_ASSOCIATED_IRP 0x00000008 ++ ++enum urb_state { ++ URB_INVALID = 1, URB_ALLOCATED, URB_SUBMITTED, ++ URB_COMPLETED, URB_FREE, URB_SUSPEND, URB_INT_UNLINKED }; ++ ++struct wrap_urb { ++ struct nt_list list; ++ enum urb_state state; ++ struct nt_list complete_list; ++ unsigned int flags; ++ struct urb *urb; ++ struct irp *irp; ++#ifdef USB_DEBUG ++ unsigned int id; ++#endif ++}; ++ ++struct irp { ++ SHORT type; ++ USHORT size; ++ struct mdl *mdl; ++ ULONG flags; ++ union { ++ struct irp *master_irp; ++ LONG irp_count; ++ void *system_buffer; ++ } associated_irp; ++ struct nt_list thread_list; ++ struct io_status_block io_status; ++ KPROCESSOR_MODE requestor_mode; ++ BOOLEAN pending_returned; ++ CHAR stack_count; ++ CHAR current_location; ++ BOOLEAN cancel; ++ KIRQL cancel_irql; ++ CCHAR apc_env; ++ UCHAR alloc_flags; ++ struct io_status_block *user_status; ++ struct nt_event *user_event; ++ union { ++ struct { ++ void *user_apc_routine; ++ void *user_apc_context; ++ } async_params; ++ LARGE_INTEGER alloc_size; ++ } overlay; ++ void (*cancel_routine)(struct device_object *, struct irp *) wstdcall; ++ void *user_buf; ++ union { ++ struct { ++ union { ++ struct kdevice_queue_entry dev_q_entry; ++ struct { ++ void *driver_context[4]; ++ }; ++ }; ++ void *thread; ++ char *aux_buf; ++ struct { ++ struct nt_list list; ++ union { ++ struct io_stack_location *csl; ++ ULONG packet_type; ++ }; ++ }; ++ struct file_object *file_object; ++ } overlay; ++ union { ++ struct kapc apc; ++ /* space for apc is used for ndiswrapper ++ * specific fields */ ++ struct { ++ struct wrap_urb *wrap_urb; ++ struct wrap_device *wrap_device; ++ }; ++ }; ++ void *completion_key; ++ } tail; ++}; ++ ++#define IoSizeOfIrp(stack_count) \ ++ ((USHORT)(sizeof(struct irp) + \ ++ ((stack_count) * sizeof(struct io_stack_location)))) ++#define IoGetCurrentIrpStackLocation(irp) \ ++ (irp)->tail.overlay.csl ++#define IoGetNextIrpStackLocation(irp) \ ++ (IoGetCurrentIrpStackLocation(irp) - 1) ++#define IoGetPreviousIrpStackLocation(irp) \ ++ (IoGetCurrentIrpStackLocation(irp) + 1) ++ ++#define IoSetNextIrpStackLocation(irp) \ ++do { \ ++ KIRQL _irql_; \ ++ IoAcquireCancelSpinLock(&_irql_); \ ++ (irp)->current_location--; \ ++ IoGetCurrentIrpStackLocation(irp)--; \ ++ IoReleaseCancelSpinLock(_irql_); \ ++} while (0) ++ ++#define IoSkipCurrentIrpStackLocation(irp) \ ++do { \ ++ KIRQL _irql_; \ ++ IoAcquireCancelSpinLock(&_irql_); \ ++ (irp)->current_location++; \ ++ IoGetCurrentIrpStackLocation(irp)++; \ ++ IoReleaseCancelSpinLock(_irql_); \ ++} while (0) ++ ++static inline void ++IoCopyCurrentIrpStackLocationToNext(struct irp *irp) ++{ ++ struct io_stack_location *next; ++ next = IoGetNextIrpStackLocation(irp); ++ memcpy(next, IoGetCurrentIrpStackLocation(irp), ++ offsetof(struct io_stack_location, completion_routine)); ++ next->control = 0; ++} ++ ++static inline void ++IoSetCompletionRoutine(struct irp *irp, void *routine, void *context, ++ BOOLEAN success, BOOLEAN error, BOOLEAN cancel) ++{ ++ struct io_stack_location *irp_sl = IoGetNextIrpStackLocation(irp); ++ irp_sl->completion_routine = routine; ++ irp_sl->context = context; ++ irp_sl->control = 0; ++ if (success) ++ irp_sl->control |= SL_INVOKE_ON_SUCCESS; ++ if (error) ++ irp_sl->control |= SL_INVOKE_ON_ERROR; ++ if (cancel) ++ irp_sl->control |= SL_INVOKE_ON_CANCEL; ++} ++ ++#define IoMarkIrpPending(irp) \ ++ (IoGetCurrentIrpStackLocation((irp))->control |= SL_PENDING_RETURNED) ++#define IoUnmarkIrpPending(irp) \ ++ (IoGetCurrentIrpStackLocation((irp))->control &= ~SL_PENDING_RETURNED) ++ ++#define IRP_SL(irp, n) (((struct io_stack_location *)((irp) + 1)) + (n)) ++#define IRP_DRIVER_CONTEXT(irp) (irp)->tail.overlay.driver_context ++#define IoIrpThread(irp) ((irp)->tail.overlay.thread) ++ ++#define IRP_URB(irp) \ ++ (union nt_urb *)(IoGetCurrentIrpStackLocation(irp)->params.others.arg1) ++ ++#define IRP_WRAP_DEVICE(irp) (irp)->tail.wrap_device ++#define IRP_WRAP_URB(irp) (irp)->tail.wrap_urb ++ ++struct wmi_guid_reg_info { ++ struct guid *guid; ++ ULONG instance_count; ++ ULONG flags; ++}; ++ ++struct wmilib_context { ++ ULONG guid_count; ++ struct wmi_guid_reg_info *guid_list; ++ void *query_wmi_reg_info; ++ void *query_wmi_data_block; ++ void *set_wmi_data_block; ++ void *set_wmi_data_item; ++ void *execute_wmi_method; ++ void *wmi_function_control; ++}; ++ ++enum key_value_information_class { ++ KeyValueBasicInformation, KeyValueFullInformation, ++ KeyValuePartialInformation, KeyValueFullInformationAlign64, ++ KeyValuePartialInformationAlign64 ++}; ++ ++struct file_name_info { ++ ULONG length; ++ wchar_t *name; ++}; ++ ++struct file_std_info { ++ LARGE_INTEGER alloc_size; ++ LARGE_INTEGER eof; ++ ULONG num_links; ++ BOOLEAN delete_pending; ++ BOOLEAN dir; ++}; ++ ++enum nt_obj_type { ++ NT_OBJ_EVENT = 10, NT_OBJ_MUTEX, NT_OBJ_THREAD, NT_OBJ_TIMER, ++ NT_OBJ_SEMAPHORE, ++}; ++ ++enum common_object_type { ++ OBJECT_TYPE_NONE, OBJECT_TYPE_DEVICE, OBJECT_TYPE_DRIVER, ++ OBJECT_TYPE_NT_THREAD, OBJECT_TYPE_FILE, OBJECT_TYPE_CALLBACK, ++}; ++ ++struct common_object_header { ++ struct nt_list list; ++ enum common_object_type type; ++ UINT size; ++ UINT ref_count; ++ BOOLEAN close_in_process; ++ BOOLEAN permanent; ++ struct unicode_string name; ++}; ++ ++#define OBJECT_TO_HEADER(object) \ ++ (struct common_object_header *)((void *)(object) - \ ++ sizeof(struct common_object_header)) ++#define OBJECT_SIZE(size) \ ++ ((size) + sizeof(struct common_object_header)) ++#define HEADER_TO_OBJECT(hdr) \ ++ ((void *)(hdr) + sizeof(struct common_object_header)) ++#define HANDLE_TO_OBJECT(handle) HEADER_TO_OBJECT(handle) ++#define HANDLE_TO_HEADER(handle) (handle) ++ ++enum work_queue_type { ++ CriticalWorkQueue, DelayedWorkQueue, HyperCriticalWorkQueue, ++ MaximumWorkQueue ++}; ++ ++typedef void (*NTOS_WORK_FUNC)(void *arg1, void *arg2) wstdcall; ++ ++struct io_workitem { ++ enum work_queue_type type; ++ struct device_object *dev_obj; ++ NTOS_WORK_FUNC worker_routine; ++ void *context; ++}; ++ ++struct io_workitem_entry { ++ struct nt_list list; ++ struct io_workitem *io_workitem; ++}; ++ ++enum mm_page_priority { ++ LowPagePriority, NormalPagePriority = 16, HighPagePriority = 32 ++}; ++ ++enum kinterrupt_mode { ++ LevelSensitive, Latched ++}; ++ ++enum ntos_wait_reason { ++ Executive, FreePage, PageIn, PoolAllocation, DelayExecution, ++ Suspended, UserRequest, WrExecutive, WrFreePage, WrPageIn, ++ WrPoolAllocation, WrDelayExecution, WrSuspended, WrUserRequest, ++ WrEventPair, WrQueue, WrLpcReceive, WrLpcReply, WrVirtualMemory, ++ WrPageOut, WrRendezvous, Spare2, Spare3, Spare4, Spare5, Spare6, ++ WrKernel, MaximumWaitReason ++}; ++ ++typedef enum ntos_wait_reason KWAIT_REASON; ++ ++typedef void *LOOKASIDE_ALLOC_FUNC(enum pool_type pool_type, ++ SIZE_T size, ULONG tag) wstdcall; ++typedef void LOOKASIDE_FREE_FUNC(void *) wstdcall; ++ ++struct npaged_lookaside_list { ++ nt_slist_header head; ++ USHORT depth; ++ USHORT maxdepth; ++ ULONG totalallocs; ++ union { ++ ULONG allocmisses; ++ ULONG allochits; ++ } u1; ++ ULONG totalfrees; ++ union { ++ ULONG freemisses; ++ ULONG freehits; ++ } u2; ++ enum pool_type pool_type; ++ ULONG tag; ++ ULONG size; ++ LOOKASIDE_ALLOC_FUNC *alloc_func; ++ LOOKASIDE_FREE_FUNC *free_func; ++ struct nt_list list; ++ ULONG lasttotallocs; ++ union { ++ ULONG lastallocmisses; ++ ULONG lastallochits; ++ } u3; ++ ULONG pad[2]; ++#ifndef CONFIG_X86_64 ++ NT_SPIN_LOCK obsolete; ++#endif ++} ++#ifdef CONFIG_X86_64 ++CACHE_ALIGN ++#endif ++; ++ ++enum device_registry_property { ++ DevicePropertyDeviceDescription, DevicePropertyHardwareID, ++ DevicePropertyCompatibleIDs, DevicePropertyBootConfiguration, ++ DevicePropertyBootConfigurationTranslated, ++ DevicePropertyClassName, DevicePropertyClassGuid, ++ DevicePropertyDriverKeyName, DevicePropertyManufacturer, ++ DevicePropertyFriendlyName, DevicePropertyLocationInformation, ++ DevicePropertyPhysicalDeviceObjectName, DevicePropertyBusTypeGuid, ++ DevicePropertyLegacyBusType, DevicePropertyBusNumber, ++ DevicePropertyEnumeratorName, DevicePropertyAddress, ++ DevicePropertyUINumber, DevicePropertyInstallState, ++ DevicePropertyRemovalPolicy ++}; ++ ++enum trace_information_class { ++ TraceIdClass, TraceHandleClass, TraceEnableFlagsClass, ++ TraceEnableLevelClass, GlobalLoggerHandleClass, EventLoggerHandleClass, ++ AllLoggerHandlesClass, TraceHandleByNameClass ++}; ++ ++struct kinterrupt; ++typedef BOOLEAN (*PKSERVICE_ROUTINE)(struct kinterrupt *interrupt, ++ void *context) wstdcall; ++typedef BOOLEAN (*PKSYNCHRONIZE_ROUTINE)(void *context) wstdcall; ++ ++struct kinterrupt { ++ ULONG vector; ++ KAFFINITY cpu_mask; ++ NT_SPIN_LOCK lock; ++ NT_SPIN_LOCK *actual_lock; ++ BOOLEAN shared; ++ BOOLEAN save_fp; ++ union { ++ CHAR processor_number; ++#ifdef CONFIG_DEBUG_SHIRQ ++ CHAR enabled; ++#endif ++ } u; ++ PKSERVICE_ROUTINE isr; ++ void *isr_ctx; ++ struct nt_list list; ++ KIRQL irql; ++ KIRQL synch_irql; ++ enum kinterrupt_mode mode; ++}; ++ ++struct time_fields { ++ CSHORT year; ++ CSHORT month; ++ CSHORT day; ++ CSHORT hour; ++ CSHORT minute; ++ CSHORT second; ++ CSHORT milliseconds; ++ CSHORT weekday; ++}; ++ ++struct object_attributes { ++ ULONG length; ++ void *root_dir; ++ struct unicode_string *name; ++ ULONG attributes; ++ void *security_descr; ++ void *security_qos; ++}; ++ ++typedef void (*PCALLBACK_FUNCTION)(void *context, void *arg1, ++ void *arg2) wstdcall; ++ ++struct callback_object; ++struct callback_func { ++ PCALLBACK_FUNCTION func; ++ void *context; ++ struct nt_list list; ++ struct callback_object *object; ++}; ++ ++struct callback_object { ++ NT_SPIN_LOCK lock; ++ struct nt_list list; ++ struct nt_list callback_funcs; ++ BOOLEAN allow_multiple_callbacks; ++ struct object_attributes *attributes; ++}; ++ ++enum section_inherit { ++ ViewShare = 1, ViewUnmap = 2 ++}; ++ ++struct ksystem_time { ++ ULONG low_part; ++ LONG high1_time; ++ LONG high2_time; ++}; ++ ++enum nt_product_type { ++ nt_product_win_nt = 1, nt_product_lan_man_nt, nt_product_server ++}; ++ ++enum alt_arch_type { ++ arch_type_standard, arch_type_nex98x86, end_alternatives ++}; ++ ++struct kuser_shared_data { ++ ULONG tick_count; ++ ULONG tick_count_multiplier; ++ volatile struct ksystem_time interrupt_time; ++ volatile struct ksystem_time system_time; ++ volatile struct ksystem_time time_zone_bias; ++ USHORT image_number_low; ++ USHORT image_number_high; ++ wchar_t nt_system_root[260]; ++ ULONG max_stack_trace_depth; ++ ULONG crypto_exponent; ++ ULONG time_zone_id; ++ ULONG large_page_min; ++ ULONG reserved2[7]; ++ enum nt_product_type nt_product_type; ++ BOOLEAN product_type_is_valid; ++ ULONG nt_major_version; ++ ULONG nt_minor_version; ++ BOOLEAN processor_features[PROCESSOR_FEATURE_MAX]; ++ ULONG reserved1; ++ ULONG reserved3; ++ volatile LONG time_slip; ++ enum alt_arch_type alt_arch_type; ++ LARGE_INTEGER system_expiration_date; ++ ULONG suite_mask; ++ BOOLEAN kdbg_enabled; ++ volatile ULONG active_console; ++ volatile ULONG dismount_count; ++ ULONG com_plus_package; ++ ULONG last_system_rite_event_tick_count; ++ ULONG num_phys_pages; ++ BOOLEAN safe_boot_mode; ++ ULONG trace_log; ++ ULONGLONG fill0; ++ ULONGLONG sys_call[4]; ++ union { ++ volatile struct ksystem_time tick_count; ++ volatile ULONG64 tick_count_quad; ++ } tick; ++}; ++ ++#define REG_NONE (0) ++#define REG_SZ (1) ++#define REG_EXPAND_SZ (2) ++#define REG_BINARY (3) ++#define REG_DWORD (4) ++ ++#define RTL_REGISTRY_ABSOLUTE 0 ++#define RTL_REGISTRY_SERVICES 1 ++#define RTL_REGISTRY_CONTROL 2 ++#define RTL_REGISTRY_WINDOWS_NT 3 ++#define RTL_REGISTRY_DEVICEMAP 4 ++#define RTL_REGISTRY_USER 5 ++#define RTL_REGISTRY_MAXIMUM 6 ++#define RTL_REGISTRY_HANDLE 0x40000000 ++#define RTL_REGISTRY_OPTIONAL 0x80000000 ++ ++#define RTL_QUERY_REGISTRY_SUBKEY 0x00000001 ++#define RTL_QUERY_REGISTRY_TOPKEY 0x00000002 ++#define RTL_QUERY_REGISTRY_REQUIRED 0x00000004 ++#define RTL_QUERY_REGISTRY_NOVALUE 0x00000008 ++#define RTL_QUERY_REGISTRY_NOEXPAND 0x00000010 ++#define RTL_QUERY_REGISTRY_DIRECT 0x00000020 ++#define RTL_QUERY_REGISTRY_DELETE 0x00000040 ++ ++typedef NTSTATUS (*PRTL_QUERY_REGISTRY_ROUTINE)(wchar_t *name, ULONG type, ++ void *data, ULONG length, ++ void *context, ++ void *entry) wstdcall; ++ ++struct rtl_query_registry_table { ++ PRTL_QUERY_REGISTRY_ROUTINE query_func; ++ ULONG flags; ++ wchar_t *name; ++ void *context; ++ ULONG def_type; ++ void *def_data; ++ ULONG def_length; ++}; ++ ++struct io_remove_lock { ++ BOOLEAN removed; ++ BOOLEAN reserved[3]; ++ LONG io_count; ++ struct nt_event remove_event; ++}; ++ ++struct io_error_log_packet { ++ UCHAR major_fn_code; ++ UCHAR retry_count; ++ USHORT dump_data_size; ++ USHORT nr_of_strings; ++ USHORT string_offset; ++ USHORT event_category; ++ NTSTATUS error_code; ++ ULONG unique_error_value; ++ NTSTATUS final_status; ++ ULONG sequence_number; ++ ULONG io_control_code; ++ LARGE_INTEGER device_offset; ++ ULONG dump_data[1]; ++}; ++ ++/* some of the functions below are slightly different from DDK's ++ * implementation; e.g., Insert functions return appropriate ++ * pointer */ ++ ++/* instead of using Linux's lists, we implement list manipulation ++ * functions because nt_list is used by drivers and we don't want to ++ * worry about Linux's list being different from nt_list (right now ++ * they are same, but in future they could be different) */ ++ ++static inline void InitializeListHead(struct nt_list *head) ++{ ++ head->next = head->prev = head; ++} ++ ++static inline BOOLEAN IsListEmpty(struct nt_list *head) ++{ ++ if (head == head->next) ++ return TRUE; ++ else ++ return FALSE; ++} ++ ++static inline void RemoveEntryList(struct nt_list *entry) ++{ ++ entry->prev->next = entry->next; ++ entry->next->prev = entry->prev; ++} ++ ++static inline struct nt_list *RemoveHeadList(struct nt_list *head) ++{ ++ struct nt_list *entry; ++ ++ entry = head->next; ++ if (entry == head) ++ return NULL; ++ else { ++ RemoveEntryList(entry); ++ return entry; ++ } ++} ++ ++static inline struct nt_list *RemoveTailList(struct nt_list *head) ++{ ++ struct nt_list *entry; ++ ++ entry = head->prev; ++ if (entry == head) ++ return NULL; ++ else { ++ RemoveEntryList(entry); ++ return entry; ++ } ++} ++ ++static inline void InsertListEntry(struct nt_list *entry, struct nt_list *prev, ++ struct nt_list *next) ++{ ++ next->prev = entry; ++ entry->next = next; ++ entry->prev = prev; ++ prev->next = entry; ++} ++ ++static inline struct nt_list *InsertHeadList(struct nt_list *head, ++ struct nt_list *entry) ++{ ++ struct nt_list *ret; ++ ++ if (IsListEmpty(head)) ++ ret = NULL; ++ else ++ ret = head->next; ++ ++ InsertListEntry(entry, head, head->next); ++ return ret; ++} ++ ++static inline struct nt_list *InsertTailList(struct nt_list *head, ++ struct nt_list *entry) ++{ ++ struct nt_list *ret; ++ ++ if (IsListEmpty(head)) ++ ret = NULL; ++ else ++ ret = head->prev; ++ ++ InsertListEntry(entry, head->prev, head); ++ return ret; ++} ++ ++#define nt_list_for_each(pos, head) \ ++ for (pos = (head)->next; pos != (head); pos = pos->next) ++ ++#define nt_list_for_each_entry(pos, head, member) \ ++ for (pos = container_of((head)->next, typeof(*pos), member); \ ++ &pos->member != (head); \ ++ pos = container_of(pos->member.next, typeof(*pos), member)) ++ ++#define nt_list_for_each_safe(pos, n, head) \ ++ for (pos = (head)->next, n = pos->next; pos != (head); \ ++ pos = n, n = pos->next) ++ ++/* device object flags */ ++#define DO_VERIFY_VOLUME 0x00000002 ++#define DO_BUFFERED_IO 0x00000004 ++#define DO_EXCLUSIVE 0x00000008 ++#define DO_DIRECT_IO 0x00000010 ++#define DO_MAP_IO_BUFFER 0x00000020 ++#define DO_DEVICE_HAS_NAME 0x00000040 ++#define DO_DEVICE_INITIALIZING 0x00000080 ++#define DO_SYSTEM_BOOT_PARTITION 0x00000100 ++#define DO_LONG_TERM_REQUESTS 0x00000200 ++#define DO_NEVER_LAST_DEVICE 0x00000400 ++#define DO_SHUTDOWN_REGISTERED 0x00000800 ++#define DO_BUS_ENUMERATED_DEVICE 0x00001000 ++#define DO_POWER_PAGABLE 0x00002000 ++#define DO_POWER_INRUSH 0x00004000 ++#define DO_LOW_PRIORITY_FILESYSTEM 0x00010000 ++ ++/* Various supported device types (used with IoCreateDevice()) */ ++ ++#define FILE_DEVICE_BEEP 0x00000001 ++#define FILE_DEVICE_CD_ROM 0x00000002 ++#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 ++#define FILE_DEVICE_CONTROLLER 0x00000004 ++#define FILE_DEVICE_DATALINK 0x00000005 ++#define FILE_DEVICE_DFS 0x00000006 ++#define FILE_DEVICE_DISK 0x00000007 ++#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 ++#define FILE_DEVICE_FILE_SYSTEM 0x00000009 ++#define FILE_DEVICE_INPORT_PORT 0x0000000A ++#define FILE_DEVICE_KEYBOARD 0x0000000B ++#define FILE_DEVICE_MAILSLOT 0x0000000C ++#define FILE_DEVICE_MIDI_IN 0x0000000D ++#define FILE_DEVICE_MIDI_OUT 0x0000000E ++#define FILE_DEVICE_MOUSE 0x0000000F ++#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 ++#define FILE_DEVICE_NAMED_PIPE 0x00000011 ++#define FILE_DEVICE_NETWORK 0x00000012 ++#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 ++#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 ++#define FILE_DEVICE_NULL 0x00000015 ++#define FILE_DEVICE_PARALLEL_PORT 0x00000016 ++#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 ++#define FILE_DEVICE_PRINTER 0x00000018 ++#define FILE_DEVICE_SCANNER 0x00000019 ++#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001A ++#define FILE_DEVICE_SERIAL_PORT 0x0000001B ++#define FILE_DEVICE_SCREEN 0x0000001C ++#define FILE_DEVICE_SOUND 0x0000001D ++#define FILE_DEVICE_STREAMS 0x0000001E ++#define FILE_DEVICE_TAPE 0x0000001F ++#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 ++#define FILE_DEVICE_TRANSPORT 0x00000021 ++#define FILE_DEVICE_UNKNOWN 0x00000022 ++#define FILE_DEVICE_VIDEO 0x00000023 ++#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 ++#define FILE_DEVICE_WAVE_IN 0x00000025 ++#define FILE_DEVICE_WAVE_OUT 0x00000026 ++#define FILE_DEVICE_8042_PORT 0x00000027 ++#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 ++#define FILE_DEVICE_BATTERY 0x00000029 ++#define FILE_DEVICE_BUS_EXTENDER 0x0000002A ++#define FILE_DEVICE_MODEM 0x0000002B ++#define FILE_DEVICE_VDM 0x0000002C ++#define FILE_DEVICE_MASS_STORAGE 0x0000002D ++#define FILE_DEVICE_SMB 0x0000002E ++#define FILE_DEVICE_KS 0x0000002F ++#define FILE_DEVICE_CHANGER 0x00000030 ++#define FILE_DEVICE_SMARTCARD 0x00000031 ++#define FILE_DEVICE_ACPI 0x00000032 ++#define FILE_DEVICE_DVD 0x00000033 ++#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 ++#define FILE_DEVICE_DFS_FILE_SYSTEM 0x00000035 ++#define FILE_DEVICE_DFS_VOLUME 0x00000036 ++#define FILE_DEVICE_SERENUM 0x00000037 ++#define FILE_DEVICE_TERMSRV 0x00000038 ++#define FILE_DEVICE_KSEC 0x00000039 ++#define FILE_DEVICE_FIPS 0x0000003A ++ ++/* Device characteristics */ ++ ++#define FILE_REMOVABLE_MEDIA 0x00000001 ++#define FILE_READ_ONLY_DEVICE 0x00000002 ++#define FILE_FLOPPY_DISKETTE 0x00000004 ++#define FILE_WRITE_ONCE_MEDIA 0x00000008 ++#define FILE_REMOTE_DEVICE 0x00000010 ++#define FILE_DEVICE_IS_MOUNTED 0x00000020 ++#define FILE_VIRTUAL_VOLUME 0x00000040 ++#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 ++#define FILE_DEVICE_SECURE_OPEN 0x00000100 ++ ++#define FILE_READ_DATA 0x0001 ++#define FILE_WRITE_DATA 0x0002 ++ ++#define FILE_SUPERSEDED 0x00000000 ++#define FILE_OPENED 0x00000001 ++#define FILE_CREATED 0x00000002 ++#define FILE_OVERWRITTEN 0x00000003 ++#define FILE_EXISTS 0x00000004 ++#define FILE_DOES_NOT_EXIST 0x00000005 ++ ++ ++#endif /* WINNT_TYPES_H */ +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/workqueue.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/workqueue.c +--- linux-3.12.2/3rdparty/ndiswrapper/workqueue.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/workqueue.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,279 @@ ++/* ++ * Copyright (C) 2006 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ntoskernel.h" ++ ++struct workqueue_thread { ++ spinlock_t lock; ++ struct task_struct *task; ++ struct completion *completion; ++ char name[16]; ++ int pid; ++ /* whether any work_structs pending? <0 implies quit */ ++ s8 pending; ++ /* list of work_structs pending */ ++ struct list_head work_list; ++}; ++ ++struct workq_thread_data { ++ struct workqueue_struct *workq; ++ int index; ++}; ++ ++struct wrap_workqueue_struct { ++ u8 singlethread; ++ u8 qon; ++ int num_cpus; ++ struct workqueue_thread threads[0]; ++}; ++ ++static void wrap_destroy_wq_on(struct workqueue_struct *workq, int cpu); ++ ++static int workq_thread(void *data) ++{ ++ struct workq_thread_data *thread_data = data; ++ struct workqueue_thread *thread; ++ struct workqueue_struct *workq; ++ struct work_struct *work; ++ ++ workq = thread_data->workq; ++ thread = &workq->threads[thread_data->index]; ++ WORKTRACE("%p, %d, %p", workq, thread_data->index, thread); ++ strncpy(thread->name, current->comm, sizeof(thread->name)); ++ ++ daemonize(thread->name); ++ set_user_nice(current, -5); ++ ++ if (thread->task != current) { ++ WARNING("invalid task: %p, %p", thread->task, current); ++ thread->task = current; ++ } ++ thread->pid = current->pid; ++ complete(xchg(&thread->completion, NULL)); ++ WORKTRACE("%s (%d) started", thread->name, thread->pid); ++ while (1) { ++ if (wait_condition(thread->pending, 0, TASK_INTERRUPTIBLE) < 0) { ++ /* TODO: deal with signal */ ++ WARNING("signal not blocked?"); ++ flush_signals(current); ++ continue; ++ } ++ while (1) { ++ struct list_head *entry; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&thread->lock, flags); ++ if (list_empty(&thread->work_list)) { ++ struct completion *completion; ++ if (thread->pending < 0) { ++ spin_unlock_irqrestore(&thread->lock, ++ flags); ++ goto out; ++ } ++ thread->pending = 0; ++ completion = thread->completion; ++ thread->completion = NULL; ++ spin_unlock_irqrestore(&thread->lock, flags); ++ if (completion) ++ complete(completion); ++ break; ++ } ++ entry = thread->work_list.next; ++ work = list_entry(entry, struct work_struct, list); ++ if (xchg(&work->thread, NULL)) ++ list_del(entry); ++ else ++ work = NULL; ++ spin_unlock_irqrestore(&thread->lock, flags); ++ DBG_BLOCK(4) { ++ WORKTRACE("%p, %p", work, thread); ++ } ++ if (work) ++ work->func(work->data); ++ } ++ } ++ ++out: ++ WORKTRACE("%s exiting", thread->name); ++ thread->pid = 0; ++ return 0; ++} ++ ++static int wrap_queue_work_on(struct workqueue_struct *workq, ++ struct work_struct *work, int cpu) ++{ ++ struct workqueue_thread *thread = &workq->threads[cpu]; ++ unsigned long flags; ++ int ret; ++ ++ assert(thread->pid > 0); ++ DBG_BLOCK(4) { ++ WORKTRACE("%p, %d", workq, cpu); ++ } ++ spin_lock_irqsave(&thread->lock, flags); ++ if (work->thread) ++ ret = 0; ++ else { ++ work->thread = thread; ++ list_add_tail(&work->list, &thread->work_list); ++ thread->pending = 1; ++ wake_up_process(thread->task); ++ ret = 1; ++ } ++ spin_unlock_irqrestore(&thread->lock, flags); ++ return ret; ++} ++ ++int wrap_queue_work(struct workqueue_struct *workq, struct work_struct *work) ++{ ++ if (num_online_cpus() == 1 || workq->singlethread) ++ return wrap_queue_work_on(workq, work, 0); ++ else { ++ typeof(workq->qon) qon; ++ /* work is queued on threads in a round-robin fashion */ ++ do { ++ qon = workq->qon % workq->num_cpus; ++ atomic_inc_var(workq->qon); ++ } while (!workq->threads[qon].pid); ++ return wrap_queue_work_on(workq, work, qon); ++ } ++} ++ ++void wrap_cancel_work(struct work_struct *work) ++{ ++ struct workqueue_thread *thread; ++ unsigned long flags; ++ ++ WORKTRACE("%p", work); ++ if ((thread = xchg(&work->thread, NULL))) { ++ WORKTRACE("%p", thread); ++ spin_lock_irqsave(&thread->lock, flags); ++ list_del(&work->list); ++ spin_unlock_irqrestore(&thread->lock, flags); ++ } ++} ++ ++struct workqueue_struct *wrap_create_wq(const char *name, u8 singlethread, ++ u8 freeze) ++{ ++ struct completion started; ++ struct workqueue_struct *workq; ++ int i, n; ++ ++ if (singlethread) ++ n = 1; ++ else ++ n = num_online_cpus(); ++ workq = kzalloc(sizeof(*workq) + n * sizeof(workq->threads[0]), ++ GFP_KERNEL); ++ if (!workq) { ++ WARNING("couldn't allocate memory"); ++ return NULL; ++ } ++ WORKTRACE("%p", workq); ++ workq->singlethread = singlethread; ++ init_completion(&started); ++ for_each_online_cpu(i) { ++ struct workq_thread_data thread_data; ++ spin_lock_init(&workq->threads[i].lock); ++ INIT_LIST_HEAD(&workq->threads[i].work_list); ++ reinit_completion(&started); ++ workq->threads[i].completion = &started; ++ thread_data.workq = workq; ++ thread_data.index = i; ++ WORKTRACE("%p, %d, %p", workq, i, &workq->threads[i]); ++ workq->threads[i].task = ++ kthread_create(workq_thread, &thread_data, ++ "%s/%d", name, i); ++ if (IS_ERR(workq->threads[i].task)) { ++ int j; ++ for (j = 0; j < i; j++) ++ wrap_destroy_wq_on(workq, j); ++ kfree(workq); ++ WARNING("couldn't start thread %s", name); ++ return NULL; ++ } ++#ifdef PF_NOFREEZE ++ if (!freeze) ++ workq->threads[i].task->flags |= PF_NOFREEZE; ++#endif ++ kthread_bind(workq->threads[i].task, i); ++ workq->num_cpus = max(workq->num_cpus, i); ++ wake_up_process(workq->threads[i].task); ++ wait_for_completion(&started); ++ WORKTRACE("%s, %d: %p, %d", name, i, ++ workq, workq->threads[i].pid); ++ if (singlethread) ++ break; ++ } ++ workq->num_cpus++; ++ return workq; ++} ++ ++static void wrap_flush_wq_on(struct workqueue_struct *workq, int cpu) ++{ ++ struct workqueue_thread *thread = &workq->threads[cpu]; ++ struct completion done; ++ ++ WORKTRACE("%p: %d, %s", workq, cpu, thread->name); ++ init_completion(&done); ++ thread->completion = &done; ++ thread->pending = 1; ++ wake_up_process(thread->task); ++ wait_for_completion(&done); ++ return; ++} ++ ++void wrap_flush_wq(struct workqueue_struct *workq) ++{ ++ int i, n; ++ ++ WORKTRACE("%p", workq); ++ if (workq->singlethread) ++ n = 1; ++ else ++ n = num_online_cpus(); ++ for (i = 0; i < n; i++) ++ wrap_flush_wq_on(workq, i); ++} ++ ++static void wrap_destroy_wq_on(struct workqueue_struct *workq, int cpu) ++{ ++ struct workqueue_thread *thread = &workq->threads[cpu]; ++ ++ WORKTRACE("%p: %d, %s", workq, cpu, thread->name); ++ if (!thread->pid) ++ return; ++ thread->pending = -1; ++ wake_up_process(thread->task); ++ while (thread->pid) { ++ WORKTRACE("%d", thread->pid); ++ schedule(); ++ } ++} ++ ++void wrap_destroy_wq(struct workqueue_struct *workq) ++{ ++ int i, n; ++ ++ WORKTRACE("%p", workq); ++ if (workq->singlethread) ++ n = 1; ++ else ++ n = num_online_cpus(); ++ for (i = 0; i < n; i++) ++ wrap_destroy_wq_on(workq, i); ++ kfree(workq); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.c +--- linux-3.12.2/3rdparty/ndiswrapper/wrapmem.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,366 @@ ++/* ++ * Copyright (C) 2006 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#define _WRAPMEM_C_ ++ ++#include "ntoskernel.h" ++#include "wrapmem.h" ++ ++struct slack_alloc_info { ++ struct nt_list list; ++ size_t size; ++}; ++ ++#if ALLOC_DEBUG > 1 ++static struct nt_list allocs; ++#endif ++ ++static struct nt_list slack_allocs; ++static spinlock_t alloc_lock; ++ ++#if ALLOC_DEBUG ++const char *alloc_type_name[ALLOC_TYPE_MAX] = { ++ "kmalloc_atomic", ++ "kmalloc_nonatomic", ++ "vmalloc_atomic", ++ "vmalloc_nonatomic", ++ "kmalloc_slack", ++ "pages" ++}; ++ ++struct alloc_info { ++ enum alloc_type type; ++ size_t size; ++#if ALLOC_DEBUG > 1 ++ struct nt_list list; ++ const char *file; ++ int line; ++ ULONG tag; ++#endif ++}; ++ ++static atomic_t alloc_sizes[ALLOC_TYPE_MAX]; ++#endif ++ ++/* allocate memory and add it to list of allocated pointers; if a ++ * driver doesn't free this memory for any reason (buggy driver or we ++ * allocate space behind driver's back since we need more space than ++ * corresponding Windows structure provides etc.), this gets freed ++ * automatically when module is unloaded ++ */ ++void *slack_kmalloc(size_t size) ++{ ++ struct slack_alloc_info *info; ++ ++ ENTER4("size = %zu", size); ++ info = kmalloc(size + sizeof(*info), irql_gfp()); ++ if (!info) ++ return NULL; ++ info->size = size; ++ spin_lock_bh(&alloc_lock); ++ InsertTailList(&slack_allocs, &info->list); ++ spin_unlock_bh(&alloc_lock); ++#if ALLOC_DEBUG ++ atomic_add(size, &alloc_sizes[ALLOC_TYPE_SLACK]); ++#endif ++ TRACE4("%p, %p", info, info + 1); ++ EXIT4(return info + 1); ++} ++ ++/* free pointer and remove from list of allocated pointers */ ++void slack_kfree(void *ptr) ++{ ++ struct slack_alloc_info *info; ++ ++ ENTER4("%p", ptr); ++ info = ptr - sizeof(*info); ++ spin_lock_bh(&alloc_lock); ++ RemoveEntryList(&info->list); ++ spin_unlock_bh(&alloc_lock); ++#if ALLOC_DEBUG ++ atomic_sub(info->size, &alloc_sizes[ALLOC_TYPE_SLACK]); ++#endif ++ kfree(info); ++ EXIT4(return); ++} ++ ++void *slack_kzalloc(size_t size) ++{ ++ void *ptr = slack_kmalloc(size); ++ if (ptr) ++ memset(ptr, 0, size); ++ return ptr; ++} ++ ++#if ALLOC_DEBUG ++void *wrap_kmalloc(size_t size, gfp_t flags, const char *file, int line) ++{ ++ struct alloc_info *info; ++ ++ info = kmalloc(size + sizeof(*info), flags); ++ if (!info) ++ return NULL; ++ if (flags & GFP_ATOMIC) ++ info->type = ALLOC_TYPE_KMALLOC_ATOMIC; ++ else ++ info->type = ALLOC_TYPE_KMALLOC_NON_ATOMIC; ++ info->size = size; ++ atomic_add(size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ info->file = file; ++ info->line = line; ++ info->tag = 0; ++ spin_lock_bh(&alloc_lock); ++ InsertTailList(&allocs, &info->list); ++ spin_unlock_bh(&alloc_lock); ++#endif ++ TRACE4("%p", info + 1); ++ return info + 1; ++} ++ ++void *wrap_kzalloc(size_t size, gfp_t flags, const char *file, int line) ++{ ++ void *ptr = wrap_kmalloc(size, flags, file, line); ++ if (ptr) ++ memset(ptr, 0, size); ++ return ptr; ++} ++ ++void wrap_kfree(void *ptr) ++{ ++ struct alloc_info *info; ++ ++ TRACE4("%p", ptr); ++ if (!ptr) ++ return; ++ info = ptr - sizeof(*info); ++ atomic_sub(info->size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ spin_lock_bh(&alloc_lock); ++ RemoveEntryList(&info->list); ++ spin_unlock_bh(&alloc_lock); ++ if (!(info->type == ALLOC_TYPE_KMALLOC_ATOMIC || ++ info->type == ALLOC_TYPE_KMALLOC_NON_ATOMIC)) { ++ WARNING("invalid type: %d", info->type); ++ return; ++ } ++#endif ++ kfree(info); ++} ++ ++void *wrap_vmalloc(unsigned long size, const char *file, int line) ++{ ++ struct alloc_info *info; ++ ++ info = vmalloc(size + sizeof(*info)); ++ if (!info) ++ return NULL; ++ info->type = ALLOC_TYPE_VMALLOC_NON_ATOMIC; ++ info->size = size; ++ atomic_add(size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ info->file = file; ++ info->line = line; ++ info->tag = 0; ++ spin_lock_bh(&alloc_lock); ++ InsertTailList(&allocs, &info->list); ++ spin_unlock_bh(&alloc_lock); ++#endif ++ return info + 1; ++} ++ ++void *wrap__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot, ++ const char *file, int line) ++{ ++ struct alloc_info *info; ++ ++ info = __vmalloc(size + sizeof(*info), gfp_mask, prot); ++ if (!info) ++ return NULL; ++ if (gfp_mask & GFP_ATOMIC) ++ info->type = ALLOC_TYPE_VMALLOC_ATOMIC; ++ else ++ info->type = ALLOC_TYPE_VMALLOC_NON_ATOMIC; ++ info->size = size; ++ atomic_add(size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ info->file = file; ++ info->line = line; ++ info->tag = 0; ++ spin_lock_bh(&alloc_lock); ++ InsertTailList(&allocs, &info->list); ++ spin_unlock_bh(&alloc_lock); ++#endif ++ return info + 1; ++} ++ ++void wrap_vfree(void *ptr) ++{ ++ struct alloc_info *info; ++ ++ info = ptr - sizeof(*info); ++ atomic_sub(info->size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ spin_lock_bh(&alloc_lock); ++ RemoveEntryList(&info->list); ++ spin_unlock_bh(&alloc_lock); ++ if (!(info->type == ALLOC_TYPE_VMALLOC_ATOMIC || ++ info->type == ALLOC_TYPE_VMALLOC_NON_ATOMIC)) { ++ WARNING("invalid type: %d", info->type); ++ return; ++ } ++#endif ++ vfree(info); ++} ++ ++void *wrap_alloc_pages(gfp_t flags, unsigned int size, ++ const char *file, int line) ++{ ++ struct alloc_info *info; ++ ++ size += sizeof(*info); ++ info = (struct alloc_info *)__get_free_pages(flags, get_order(size)); ++ if (!info) ++ return NULL; ++ info->type = ALLOC_TYPE_PAGES; ++ info->size = size; ++ atomic_add(size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ info->file = file; ++ info->line = line; ++ info->tag = 0; ++ spin_lock_bh(&alloc_lock); ++ InsertTailList(&allocs, &info->list); ++ spin_unlock_bh(&alloc_lock); ++#endif ++ return info + 1; ++} ++ ++void wrap_free_pages(unsigned long ptr, int order) ++{ ++ struct alloc_info *info; ++ ++ info = (void *)ptr - sizeof(*info); ++ atomic_sub(info->size, &alloc_sizes[info->type]); ++#if ALLOC_DEBUG > 1 ++ spin_lock_bh(&alloc_lock); ++ RemoveEntryList(&info->list); ++ spin_unlock_bh(&alloc_lock); ++ if (info->type != ALLOC_TYPE_PAGES) { ++ WARNING("invalid type: %d", info->type); ++ return; ++ } ++#endif ++ free_pages((unsigned long)info, get_order(info->size)); ++} ++ ++#if ALLOC_DEBUG > 1 ++void *wrap_ExAllocatePoolWithTag(enum pool_type pool_type, SIZE_T size, ++ ULONG tag, const char *file, int line) ++{ ++ void *addr; ++ struct alloc_info *info; ++ ++ ENTER4("pool_type: %d, size: %zu, tag: %u", pool_type, size, tag); ++ addr = (ExAllocatePoolWithTag)(pool_type, size, tag); ++ if (!addr) ++ return NULL; ++ info = addr - sizeof(*info); ++ info->file = file; ++ info->line = line; ++ info->tag = tag; ++ EXIT4(return addr); ++} ++#endif ++ ++int alloc_size(enum alloc_type type) ++{ ++ if ((int)type >= 0 && type < ALLOC_TYPE_MAX) ++ return atomic_read(&alloc_sizes[type]); ++ else ++ return -EINVAL; ++} ++ ++#endif // ALLOC_DEBUG ++ ++int wrapmem_init(void) ++{ ++#if ALLOC_DEBUG > 1 ++ InitializeListHead(&allocs); ++#endif ++ InitializeListHead(&slack_allocs); ++ spin_lock_init(&alloc_lock); ++ return 0; ++} ++ ++void wrapmem_exit(void) ++{ ++#if ALLOC_DEBUG ++ enum alloc_type type; ++#endif ++ struct nt_list *ent; ++ ++ /* free all pointers on the slack list */ ++ while (1) { ++ struct slack_alloc_info *info; ++ spin_lock_bh(&alloc_lock); ++ ent = RemoveHeadList(&slack_allocs); ++ spin_unlock_bh(&alloc_lock); ++ if (!ent) ++ break; ++ info = container_of(ent, struct slack_alloc_info, list); ++#if ALLOC_DEBUG ++ atomic_sub(info->size, &alloc_sizes[ALLOC_TYPE_SLACK]); ++#endif ++ kfree(info); ++ } ++#if ALLOC_DEBUG ++ for (type = 0; type < ALLOC_TYPE_MAX; type++) { ++ int n = atomic_read(&alloc_sizes[type]); ++ if (n) ++ WARNING("%d bytes of memory in %s leaking", n, ++ alloc_type_name[type]); ++ } ++ ++#if ALLOC_DEBUG > 1 ++ while (1) { ++ struct alloc_info *info; ++ ++ spin_lock_bh(&alloc_lock); ++ ent = RemoveHeadList(&allocs); ++ spin_unlock_bh(&alloc_lock); ++ if (!ent) ++ break; ++ info = container_of(ent, struct alloc_info, list); ++ atomic_sub(info->size, &alloc_sizes[ALLOC_TYPE_SLACK]); ++ printk(KERN_DEBUG DRIVER_NAME ++ ": %s:%d leaked %zd bytes at %p (%s, tag 0x%08X)\n", ++ info->file, info->line, info->size, info + 1, ++ alloc_type_name[info->type], info->tag); ++ if (info->type == ALLOC_TYPE_KMALLOC_ATOMIC || ++ info->type == ALLOC_TYPE_KMALLOC_NON_ATOMIC) ++ kfree(info); ++ else if (info->type == ALLOC_TYPE_VMALLOC_ATOMIC || ++ info->type == ALLOC_TYPE_VMALLOC_NON_ATOMIC) ++ vfree(info); ++ else if (info->type == ALLOC_TYPE_PAGES) ++ free_pages((unsigned long)info, get_order(info->size)); ++ else ++ WARNING("invalid type: %d; not freed", info->type); ++ } ++#endif ++#endif ++ return; ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.h +--- linux-3.12.2/3rdparty/ndiswrapper/wrapmem.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapmem.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,97 @@ ++/* ++ * Copyright (C) 2006 Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _WRAPMEM_H_ ++#define _WRAPMEM_H_ ++ ++/* ++ * Set ALLOC_DEBUG to 1 to show information about memory used by both ++ * ndiswrapper and Windows driver in /proc/net/ndiswrapper/debug ++ * This will also show memory leaks (memory allocated but not freed) when ++ * ndiswrapper module is unloaded. ++ * ++ * Set ALLOC_DEBUG to 2 to see details about every leaking allocation. ++*/ ++ ++#ifndef ALLOC_DEBUG ++#define ALLOC_DEBUG 0 ++#endif ++ ++int wrapmem_init(void); ++void wrapmem_exit(void); ++void *slack_kmalloc(size_t size); ++void *slack_kzalloc(size_t size); ++void slack_kfree(void *ptr); ++ ++#if ALLOC_DEBUG ++enum alloc_type { ALLOC_TYPE_KMALLOC_ATOMIC, ++ ALLOC_TYPE_KMALLOC_NON_ATOMIC, ++ ALLOC_TYPE_VMALLOC_ATOMIC, ALLOC_TYPE_VMALLOC_NON_ATOMIC, ++ ALLOC_TYPE_SLACK, ALLOC_TYPE_PAGES, ALLOC_TYPE_MAX }; ++ ++extern const char *alloc_type_name[ALLOC_TYPE_MAX]; ++ ++void *wrap_kmalloc(size_t size, gfp_t flags, const char *file, int line); ++void *wrap_kzalloc(size_t size, gfp_t flags, const char *file, int line); ++void wrap_kfree(void *ptr); ++void *wrap_vmalloc(unsigned long size, const char *file, int line); ++void *wrap__vmalloc(unsigned long size, gfp_t flags, pgprot_t prot, ++ const char *file, int line); ++void wrap_vfree(void *ptr); ++void *wrap_alloc_pages(gfp_t flags, unsigned int size, ++ const char *file, int line); ++void wrap_free_pages(unsigned long ptr, int order); ++int alloc_size(enum alloc_type type); ++ ++#if ALLOC_DEBUG > 1 ++void *wrap_ExAllocatePoolWithTag(enum pool_type pool_type, SIZE_T size, ++ ULONG tag, const char *file, int line); ++#define ExAllocatePoolWithTag(pool_type, size, tag) \ ++ wrap_ExAllocatePoolWithTag(pool_type, size, tag, __FILE__, __LINE__) ++#endif ++ ++#ifndef _WRAPMEM_C_ ++#undef kmalloc ++#undef kzalloc ++#undef kfree ++#undef vmalloc ++#undef __vmalloc ++#undef vfree ++#define kmalloc(size, flags) \ ++ wrap_kmalloc(size, flags, __FILE__, __LINE__) ++#define kzalloc(size, flags) \ ++ wrap_kzalloc(size, flags, __FILE__, __LINE__) ++#define vmalloc(size) \ ++ wrap_vmalloc(size, __FILE__, __LINE__) ++#define __vmalloc(size, flags, prot) \ ++ wrap__vmalloc(size, flags, prot, __FILE__, __LINE__) ++#define kfree(ptr) wrap_kfree(ptr) ++#define vfree(ptr) wrap_vfree(ptr) ++ ++#define wrap_get_free_pages(flags, size) \ ++ wrap_alloc_pages(flags, size, __FILE__, __LINE__) ++#undef free_pages ++#define free_pages(ptr, order) wrap_free_pages(ptr, order) ++ ++#endif // _WRAPMEM_C_ ++ ++#else ++ ++#define wrap_get_free_pages(flags, size) \ ++ (void *)__get_free_pages(flags, get_order(size)) ++ ++#endif // ALLOC_DEBUG ++ ++#endif +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.c +--- linux-3.12.2/3rdparty/ndiswrapper/wrapndis.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,2186 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include "ndis.h" ++#include "iw_ndis.h" ++#include "pnp.h" ++#include "loader.h" ++#include "wrapndis.h" ++#include "wrapper.h" ++ ++/* Functions callable from the NDIS driver */ ++wstdcall NTSTATUS NdisDispatchDeviceControl(struct device_object *fdo, ++ struct irp *irp); ++wstdcall NTSTATUS NdisDispatchPnp(struct device_object *fdo, struct irp *irp); ++wstdcall NTSTATUS NdisDispatchPower(struct device_object *fdo, struct irp *irp); ++ ++struct workqueue_struct *wrapndis_wq; ++ ++static int set_packet_filter(struct ndis_device *wnd, ++ ULONG packet_filter); ++static void add_iw_stats_timer(struct ndis_device *wnd); ++static void del_iw_stats_timer(struct ndis_device *wnd); ++static NDIS_STATUS ndis_start_device(struct ndis_device *wnd); ++static int ndis_remove_device(struct ndis_device *wnd); ++static void set_multicast_list(struct ndis_device *wnd); ++static int ndis_net_dev_open(struct net_device *net_dev); ++static int ndis_net_dev_close(struct net_device *net_dev); ++ ++/* MiniportReset */ ++NDIS_STATUS mp_reset(struct ndis_device *wnd) ++{ ++ NDIS_STATUS res; ++ struct miniport *mp; ++ BOOLEAN reset_address; ++ KIRQL irql; ++ ++ ENTER2("wnd: %p", wnd); ++ mutex_lock(&wnd->tx_ring_mutex); ++ mutex_lock(&wnd->ndis_req_mutex); ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ prepare_wait_condition(wnd->ndis_req_task, wnd->ndis_req_done, 0); ++ WARNING("%s is being reset", wnd->net_dev->name); ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ res = LIN2WIN2(mp->reset, &reset_address, wnd->nmb->mp_ctx); ++ serialize_unlock_irql(wnd, irql); ++ ++ TRACE2("%08X, %08X", res, reset_address); ++ if (res == NDIS_STATUS_PENDING) { ++ /* wait for NdisMResetComplete */ ++ if (wait_condition((wnd->ndis_req_done > 0), 0, ++ TASK_INTERRUPTIBLE) < 0) ++ res = NDIS_STATUS_FAILURE; ++ else { ++ res = wnd->ndis_req_status; ++ reset_address = wnd->ndis_req_done - 1; ++ } ++ TRACE2("%08X, %08X", res, reset_address); ++ } ++ mutex_unlock(&wnd->ndis_req_mutex); ++ if (res == NDIS_STATUS_SUCCESS && reset_address) { ++ set_packet_filter(wnd, wnd->packet_filter); ++ set_multicast_list(wnd); ++ } ++ mutex_unlock(&wnd->tx_ring_mutex); ++ EXIT3(return res); ++} ++ ++/* MiniportRequest(Query/Set)Information */ ++NDIS_STATUS mp_request(enum ndis_request_type request, ++ struct ndis_device *wnd, ndis_oid oid, ++ void *buf, ULONG buflen, ULONG *written, ULONG *needed) ++{ ++ NDIS_STATUS res; ++ ULONG w, n; ++ struct miniport *mp; ++ KIRQL irql; ++ ++ mutex_lock(&wnd->ndis_req_mutex); ++ if (!written) ++ written = &w; ++ if (!needed) ++ needed = &n; ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ prepare_wait_condition(wnd->ndis_req_task, wnd->ndis_req_done, 0); ++ irql = serialize_lock_irql(wnd); ++ assert_irql(_irql_ == DISPATCH_LEVEL); ++ switch (request) { ++ case NdisRequestQueryInformation: ++ TRACE2("%p, %08X, %p", mp->queryinfo, oid, wnd->nmb->mp_ctx); ++ res = LIN2WIN6(mp->queryinfo, wnd->nmb->mp_ctx, oid, buf, ++ buflen, written, needed); ++ break; ++ case NdisRequestSetInformation: ++ TRACE2("%p, %08X, %p", mp->setinfo, oid, wnd->nmb->mp_ctx); ++ res = LIN2WIN6(mp->setinfo, wnd->nmb->mp_ctx, oid, buf, ++ buflen, written, needed); ++ break; ++ default: ++ WARNING("invalid request %d, %08X", request, oid); ++ res = NDIS_STATUS_NOT_SUPPORTED; ++ break; ++ } ++ serialize_unlock_irql(wnd, irql); ++ TRACE2("%08X, %08X", res, oid); ++ if (res == NDIS_STATUS_PENDING) { ++ /* wait for NdisMQueryInformationComplete */ ++ if (wait_condition((wnd->ndis_req_done > 0), 0, ++ TASK_INTERRUPTIBLE) < 0) ++ res = NDIS_STATUS_FAILURE; ++ else ++ res = wnd->ndis_req_status; ++ TRACE2("%08X, %08X", res, oid); ++ } ++ mutex_unlock(&wnd->ndis_req_mutex); ++ DBG_BLOCK(2) { ++ if (res || needed) ++ TRACE2("%08X, %d, %d, %d", res, buflen, *written, ++ *needed); ++ } ++ EXIT3(return res); ++} ++ ++/* MiniportPnPEventNotify */ ++static NDIS_STATUS mp_pnp_event(struct ndis_device *wnd, ++ enum ndis_device_pnp_event event, ++ ULONG power_profile) ++{ ++ struct miniport *mp; ++ ++ ENTER1("%p, %d", wnd, event); ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ if (!mp->pnp_event_notify) { ++ TRACE1("Windows driver %s doesn't support " ++ "MiniportPnpEventNotify", wnd->wd->driver->name); ++ return NDIS_STATUS_FAILURE; ++ } ++ /* RNDIS driver doesn't like to be notified if device is ++ * already halted */ ++ if (!test_bit(HW_INITIALIZED, &wnd->wd->hw_status)) ++ EXIT1(return NDIS_STATUS_SUCCESS); ++ switch (event) { ++ case NdisDevicePnPEventSurpriseRemoved: ++ TRACE1("%u, %p", ++ (wnd->attributes & NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK), ++ mp->pnp_event_notify); ++ if ((wnd->attributes & NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK) && ++ !test_bit(HW_DISABLED, &wnd->wd->hw_status) && ++ mp->pnp_event_notify) { ++ TRACE1("calling surprise_removed"); ++ LIN2WIN4(mp->pnp_event_notify, wnd->nmb->mp_ctx, ++ NdisDevicePnPEventSurpriseRemoved, NULL, 0); ++ } else ++ TRACE1("Windows driver %s doesn't support " ++ "MiniportPnpEventNotify for safe unplugging", ++ wnd->wd->driver->name); ++ return NDIS_STATUS_SUCCESS; ++ case NdisDevicePnPEventPowerProfileChanged: ++ if (power_profile) ++ power_profile = NdisPowerProfileAcOnLine; ++ LIN2WIN4(mp->pnp_event_notify, wnd->nmb->mp_ctx, ++ NdisDevicePnPEventPowerProfileChanged, ++ &power_profile, sizeof(power_profile)); ++ return NDIS_STATUS_SUCCESS; ++ default: ++ WARNING("event %d not yet implemented", event); ++ return NDIS_STATUS_SUCCESS; ++ } ++} ++ ++/* MiniportInitialize */ ++static NDIS_STATUS mp_init(struct ndis_device *wnd) ++{ ++ NDIS_STATUS error_status, status; ++ UINT medium_index; ++ enum ndis_medium medium_array[] = {NdisMedium802_3}; ++ struct miniport *mp; ++ ++ ENTER1("irql: %d", current_irql()); ++ if (test_bit(HW_INITIALIZED, &wnd->wd->hw_status)) { ++ WARNING("device %p already initialized!", wnd); ++ return NDIS_STATUS_FAILURE; ++ } ++ ++ if (!wnd->wd->driver->ndis_driver || ++ !wnd->wd->driver->ndis_driver->mp.init) { ++ WARNING("assuming WDM (non-NDIS) driver"); ++ EXIT1(return NDIS_STATUS_NOT_RECOGNIZED); ++ } ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ status = LIN2WIN6(mp->init, &error_status, &medium_index, medium_array, ++ ARRAY_SIZE(medium_array), wnd->nmb, wnd->nmb); ++ TRACE1("init returns: %08X, irql: %d", status, current_irql()); ++ if (status != NDIS_STATUS_SUCCESS) { ++ WARNING("couldn't initialize device: %08X", status); ++ EXIT1(return NDIS_STATUS_FAILURE); ++ } ++ ++ /* Wait a little to let card power up otherwise ifup might ++ * fail after boot */ ++ sleep_hz(HZ / 5); ++ status = mp_pnp_event(wnd, NdisDevicePnPEventPowerProfileChanged, ++ NdisPowerProfileAcOnLine); ++ if (status != NDIS_STATUS_SUCCESS) ++ TRACE1("setting power failed: %08X", status); ++ set_bit(HW_INITIALIZED, &wnd->wd->hw_status); ++ /* the description about NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND is ++ * misleading/confusing */ ++ status = mp_query(wnd, OID_PNP_CAPABILITIES, ++ &wnd->pnp_capa, sizeof(wnd->pnp_capa)); ++ if (status == NDIS_STATUS_SUCCESS) { ++ TRACE1("%d, %d", wnd->pnp_capa.wakeup.min_magic_packet_wakeup, ++ wnd->pnp_capa.wakeup.min_pattern_wakeup); ++ wnd->attributes |= NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND; ++ status = mp_query_int(wnd, OID_PNP_ENABLE_WAKE_UP, ++ &wnd->ndis_wolopts); ++ TRACE1("%08X, %x", status, wnd->ndis_wolopts); ++ } else if (status == NDIS_STATUS_NOT_SUPPORTED) ++ wnd->attributes &= ~NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND; ++ TRACE1("%d", wnd->pnp_capa.wakeup.min_magic_packet_wakeup); ++ /* although some NDIS drivers support suspend, Linux kernel ++ * has issues with suspending USB devices */ ++ if (wrap_is_usb_bus(wnd->wd->dev_bus)) { ++ wnd->attributes &= ~NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND; ++ wnd->ndis_wolopts = 0; ++ } ++ mp_set_int(wnd, OID_802_11_POWER_MODE, NDIS_POWER_OFF); ++ EXIT1(return NDIS_STATUS_SUCCESS); ++} ++ ++/* MiniportHalt */ ++static void mp_halt(struct ndis_device *wnd) ++{ ++ struct miniport *mp; ++ ++ ENTER1("%p", wnd); ++ if (!test_and_clear_bit(HW_INITIALIZED, &wnd->wd->hw_status)) { ++ WARNING("device %p is not initialized - not halting", wnd); ++ return; ++ } ++ hangcheck_del(wnd); ++ del_iw_stats_timer(wnd); ++#ifdef CONFIG_WIRELESS_EXT ++ if (wnd->physical_medium == NdisPhysicalMediumWirelessLan && ++ wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ mutex_unlock(&wnd->ndis_req_mutex); ++ disassociate(wnd, 0); ++ mutex_lock(&wnd->ndis_req_mutex); ++ } ++#endif ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ TRACE1("halt: %p", mp->mp_halt); ++ LIN2WIN1(mp->mp_halt, wnd->nmb->mp_ctx); ++ /* if a driver doesn't call NdisMDeregisterInterrupt during ++ * halt, deregister it now */ ++ if (wnd->mp_interrupt) ++ NdisMDeregisterInterrupt(wnd->mp_interrupt); ++ /* cancel any timers left by buggy windows driver; also free ++ * the memory for timers */ ++ while (1) { ++ struct nt_slist *slist; ++ struct wrap_timer *wrap_timer; ++ ++ spin_lock_bh(&ntoskernel_lock); ++ if ((slist = wnd->wrap_timer_slist.next)) ++ wnd->wrap_timer_slist.next = slist->next; ++ spin_unlock_bh(&ntoskernel_lock); ++ TIMERTRACE("%p", slist); ++ if (!slist) ++ break; ++ wrap_timer = container_of(slist, struct wrap_timer, slist); ++ wrap_timer->repeat = 0; ++ /* ktimer that this wrap_timer is associated to can't ++ * be touched, as it may have been freed by the driver ++ * already */ ++ if (del_timer_sync(&wrap_timer->timer)) ++ WARNING("Buggy Windows driver left timer %p " ++ "running", wrap_timer->nt_timer); ++ memset(wrap_timer, 0, sizeof(*wrap_timer)); ++ kfree(wrap_timer); ++ } ++ EXIT1(return); ++} ++ ++static NDIS_STATUS mp_set_power_state(struct ndis_device *wnd, ++ enum ndis_power_state state) ++{ ++ NDIS_STATUS status; ++ ++ TRACE1("%d", state); ++ if (state == NdisDeviceStateD0) { ++ status = NDIS_STATUS_SUCCESS; ++ mutex_unlock(&wnd->ndis_req_mutex); ++ if (test_and_clear_bit(HW_HALTED, &wnd->wd->hw_status)) { ++ status = mp_init(wnd); ++ if (status == NDIS_STATUS_SUCCESS) { ++ set_packet_filter(wnd, wnd->packet_filter); ++ set_multicast_list(wnd); ++ } ++ } else if (test_and_clear_bit(HW_SUSPENDED, ++ &wnd->wd->hw_status)) { ++ status = mp_set_int(wnd, OID_PNP_SET_POWER, state); ++ if (status != NDIS_STATUS_SUCCESS) ++ WARNING("%s: setting power to state %d failed? " ++ "%08X", wnd->net_dev->name, state, ++ status); ++ } else ++ return NDIS_STATUS_FAILURE; ++ ++ if (wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ pci_enable_wake(wnd->wd->pci.pdev, PCI_D3hot, 0); ++ pci_enable_wake(wnd->wd->pci.pdev, PCI_D3cold, 0); ++ } ++ if (status == NDIS_STATUS_SUCCESS) { ++ mutex_unlock(&wnd->tx_ring_mutex); ++ netif_device_attach(wnd->net_dev); ++ hangcheck_add(wnd); ++ add_iw_stats_timer(wnd); ++ } else ++ WARNING("%s: couldn't set power to state %d; device not" ++ " resumed", wnd->net_dev->name, state); ++ EXIT1(return status); ++ } else { ++ mutex_lock(&wnd->tx_ring_mutex); ++ netif_device_detach(wnd->net_dev); ++ hangcheck_del(wnd); ++ del_iw_stats_timer(wnd); ++ status = NDIS_STATUS_NOT_SUPPORTED; ++ if (wnd->attributes & NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND) { ++ status = mp_set_int(wnd, OID_PNP_ENABLE_WAKE_UP, ++ wnd->ndis_wolopts); ++ TRACE2("0x%x, 0x%x", status, wnd->ndis_wolopts); ++ if (status == NDIS_STATUS_SUCCESS && ++ wrap_is_pci_bus(wnd->wd->dev_bus)) { ++ if (wnd->ndis_wolopts) ++ wnd->wd->pci.wake_state = ++ PowerDeviceD3; ++ else ++ wnd->wd->pci.wake_state = ++ PowerDeviceUnspecified; ++ } else ++ WARNING("couldn't set wake-on-lan options: " ++ "0x%x, %08X", wnd->ndis_wolopts, status); ++ status = mp_set_int(wnd, OID_PNP_SET_POWER, state); ++ if (status == NDIS_STATUS_SUCCESS) ++ set_bit(HW_SUSPENDED, &wnd->wd->hw_status); ++ else ++ WARNING("suspend failed: %08X", status); ++ } ++ if (status != NDIS_STATUS_SUCCESS) { ++ WARNING("%s does not support power management; " ++ "halting the device", wnd->net_dev->name); ++ mp_halt(wnd); ++ set_bit(HW_HALTED, &wnd->wd->hw_status); ++ status = STATUS_SUCCESS; ++ } ++ mutex_lock(&wnd->ndis_req_mutex); ++ EXIT1(return status); ++ } ++} ++ ++static int ndis_set_mac_address(struct net_device *dev, void *p) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ struct sockaddr *addr = p; ++ struct ndis_configuration_parameter param; ++ struct unicode_string key; ++ struct ansi_string ansi; ++ NDIS_STATUS res; ++ unsigned char mac_string[2 * ETH_ALEN + 1]; ++ mac_address mac; ++ ++ memcpy(mac, addr->sa_data, sizeof(mac)); ++ memset(mac_string, 0, sizeof(mac_string)); ++ res = snprintf(mac_string, sizeof(mac_string), MACSTR, MAC2STR(mac)); ++ if (res != (sizeof(mac_string) - 1)) ++ EXIT1(return -EINVAL); ++ TRACE1("new mac: %s", mac_string); ++ ++ RtlInitAnsiString(&ansi, mac_string); ++ if (RtlAnsiStringToUnicodeString(¶m.data.string, &ansi, ++ TRUE) != STATUS_SUCCESS) ++ EXIT1(return -EINVAL); ++ ++ param.type = NdisParameterString; ++ RtlInitAnsiString(&ansi, "NetworkAddress"); ++ if (RtlAnsiStringToUnicodeString(&key, &ansi, TRUE) != STATUS_SUCCESS) { ++ RtlFreeUnicodeString(¶m.data.string); ++ EXIT1(return -EINVAL); ++ } ++ NdisWriteConfiguration(&res, wnd->nmb, &key, ¶m); ++ RtlFreeUnicodeString(&key); ++ RtlFreeUnicodeString(¶m.data.string); ++ ++ if (res != NDIS_STATUS_SUCCESS) ++ EXIT1(return -EFAULT); ++ if (ndis_reinit(wnd) == NDIS_STATUS_SUCCESS) { ++ res = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, ++ mac, sizeof(mac)); ++ if (res == NDIS_STATUS_SUCCESS) { ++ TRACE1("mac:" MACSTRSEP, MAC2STR(mac)); ++ memcpy(dev->dev_addr, mac, sizeof(mac)); ++ } else ++ ERROR("couldn't get mac address: %08X", res); ++ } ++ EXIT1(return 0); ++} ++ ++static int setup_tx_sg_list(struct ndis_device *wnd, struct sk_buff *skb, ++ struct ndis_packet_oob_data *oob_data) ++{ ++ struct ndis_sg_element *sg_element; ++ struct ndis_sg_list *sg_list; ++ int i; ++ ++ ENTER3("%p, %d", skb, skb_shinfo(skb)->nr_frags); ++ if (skb_shinfo(skb)->nr_frags <= 1) { ++ sg_element = &oob_data->wrap_tx_sg_list.elements[0]; ++ sg_element->address = ++ PCI_DMA_MAP_SINGLE(wnd->wd->pci.pdev, skb->data, ++ skb->len, PCI_DMA_TODEVICE); ++ sg_element->length = skb->len; ++ oob_data->wrap_tx_sg_list.nent = 1; ++ oob_data->ext.info[ScatterGatherListPacketInfo] = ++ &oob_data->wrap_tx_sg_list; ++ TRACE3("%llx, %u", sg_element->address, sg_element->length); ++ return 0; ++ } ++ sg_list = kmalloc(sizeof(*sg_list) + ++ (skb_shinfo(skb)->nr_frags + 1) * sizeof(*sg_element), ++ GFP_ATOMIC); ++ if (!sg_list) ++ return -ENOMEM; ++ sg_list->nent = skb_shinfo(skb)->nr_frags + 1; ++ TRACE3("%p, %d", sg_list, sg_list->nent); ++ sg_element = sg_list->elements; ++ sg_element->length = skb_headlen(skb); ++ sg_element->address = ++ PCI_DMA_MAP_SINGLE(wnd->wd->pci.pdev, skb->data, ++ skb_headlen(skb), PCI_DMA_TODEVICE); ++ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { ++ skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; ++ sg_element++; ++ sg_element->length = frag->size; ++ sg_element->address = ++ pci_map_page(wnd->wd->pci.pdev, skb_frag_page(frag), ++ frag->page_offset, frag->size, ++ PCI_DMA_TODEVICE); ++ TRACE3("%llx, %u", sg_element->address, sg_element->length); ++ } ++ oob_data->ext.info[ScatterGatherListPacketInfo] = sg_list; ++ return 0; ++} ++ ++static void free_tx_sg_list(struct ndis_device *wnd, ++ struct ndis_packet_oob_data *oob_data) ++{ ++ int i; ++ struct ndis_sg_element *sg_element; ++ struct ndis_sg_list *sg_list = ++ oob_data->ext.info[ScatterGatherListPacketInfo]; ++ sg_element = sg_list->elements; ++ TRACE3("%p, %d", sg_list, sg_list->nent); ++ PCI_DMA_UNMAP_SINGLE(wnd->wd->pci.pdev, sg_element->address, ++ sg_element->length, PCI_DMA_TODEVICE); ++ if (sg_list->nent == 1) ++ EXIT3(return); ++ for (i = 1; i < sg_list->nent; i++, sg_element++) { ++ TRACE3("%llx, %u", sg_element->address, sg_element->length); ++ pci_unmap_page(wnd->wd->pci.pdev, sg_element->address, ++ sg_element->length, PCI_DMA_TODEVICE); ++ } ++ TRACE3("%p", sg_list); ++ kfree(sg_list); ++} ++ ++static struct ndis_packet *alloc_tx_packet(struct ndis_device *wnd, ++ struct sk_buff *skb) ++{ ++ struct ndis_packet *packet; ++ ndis_buffer *buffer; ++ struct ndis_packet_oob_data *oob_data; ++ NDIS_STATUS status; ++ ++ NdisAllocatePacket(&status, &packet, wnd->tx_packet_pool); ++ if (status != NDIS_STATUS_SUCCESS) ++ return NULL; ++ NdisAllocateBuffer(&status, &buffer, wnd->tx_buffer_pool, ++ skb->data, skb->len); ++ if (status != NDIS_STATUS_SUCCESS) { ++ NdisFreePacket(packet); ++ return NULL; ++ } ++ packet->private.buffer_head = buffer; ++ packet->private.buffer_tail = buffer; ++ ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ oob_data->tx_skb = skb; ++ if (wnd->sg_dma_size) { ++ if (setup_tx_sg_list(wnd, skb, oob_data)) { ++ NdisFreeBuffer(buffer); ++ NdisFreePacket(packet); ++ return NULL; ++ } ++ } ++ if (skb->ip_summed == CHECKSUM_PARTIAL) { ++ struct ndis_tcp_ip_checksum_packet_info csum; ++ int protocol; ++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21) ++ protocol = ntohs(skb->protocol); ++#else ++ protocol = skb->nh.iph->protocol; ++#endif ++ csum.value = 0; ++ csum.tx.v4 = 1; ++ if (protocol == IPPROTO_TCP) ++ csum.tx.tcp = 1; ++ else if (protocol == IPPROTO_UDP) ++ csum.tx.udp = 1; ++// csum->tx.ip = 1; ++ packet->private.flags |= NDIS_PROTOCOL_ID_TCP_IP; ++ oob_data->ext.info[TcpIpChecksumPacketInfo] = ++ (void *)(ULONG_PTR)csum.value; ++ } ++ DBG_BLOCK(4) { ++ dump_bytes(__func__, skb->data, skb->len); ++ } ++ TRACE4("%p, %p, %p", packet, buffer, skb); ++ return packet; ++} ++ ++void free_tx_packet(struct ndis_device *wnd, struct ndis_packet *packet, ++ NDIS_STATUS status) ++{ ++ ndis_buffer *buffer; ++ struct ndis_packet_oob_data *oob_data; ++ struct sk_buff *skb; ++ struct ndis_packet_pool *pool; ++ ++ assert_irql(_irql_ <= DISPATCH_LEVEL); ++ assert(packet->private.packet_flags); ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ skb = oob_data->tx_skb; ++ buffer = packet->private.buffer_head; ++ TRACE4("%p, %p, %p, %08X", packet, buffer, skb, status); ++ if (status == NDIS_STATUS_SUCCESS) { ++ pre_atomic_add(wnd->net_stats.tx_bytes, packet->private.len); ++ atomic_inc_var(wnd->net_stats.tx_packets); ++ } else { ++ TRACE1("packet dropped: %08X", status); ++ atomic_inc_var(wnd->net_stats.tx_dropped); ++ } ++ if (wnd->sg_dma_size) ++ free_tx_sg_list(wnd, oob_data); ++ NdisFreeBuffer(buffer); ++ dev_kfree_skb_any(skb); ++ pool = packet->private.pool; ++ NdisFreePacket(packet); ++ if (netif_queue_stopped(wnd->net_dev) && ++ ((pool->max_descr - pool->num_used_descr) >= ++ (wnd->max_tx_packets / 4))) { ++ set_bit(NETIF_WAKEQ, &wnd->ndis_pending_work); ++ queue_work(wrapndis_wq, &wnd->ndis_work); ++ } ++ EXIT4(return); ++} ++ ++/* MiniportSend and MiniportSendPackets */ ++/* this function is called holding tx_ring_mutex. start and n are such ++ * that start + n < TX_RING_SIZE; i.e., packets don't wrap around ++ * ring */ ++static u8 mp_tx_packets(struct ndis_device *wnd, u8 start, u8 n) ++{ ++ NDIS_STATUS res; ++ struct miniport *mp; ++ struct ndis_packet *packet; ++ u8 sent; ++ KIRQL irql; ++ ++ ENTER3("%d, %d", start, n); ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ if (mp->send_packets) { ++ if (deserialized_driver(wnd)) { ++ LIN2WIN3(mp->send_packets, wnd->nmb->mp_ctx, ++ &wnd->tx_ring[start], n); ++ sent = n; ++ } else { ++ irql = serialize_lock_irql(wnd); ++ LIN2WIN3(mp->send_packets, wnd->nmb->mp_ctx, ++ &wnd->tx_ring[start], n); ++ serialize_unlock_irql(wnd, irql); ++ for (sent = 0; sent < n && wnd->tx_ok; sent++) { ++ struct ndis_packet_oob_data *oob_data; ++ packet = wnd->tx_ring[start + sent]; ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ switch ((res = ++ xchg(&oob_data->status, ++ NDIS_STATUS_NOT_RECOGNIZED))) { ++ case NDIS_STATUS_SUCCESS: ++ free_tx_packet(wnd, packet, ++ NDIS_STATUS_SUCCESS); ++ break; ++ case NDIS_STATUS_PENDING: ++ break; ++ case NDIS_STATUS_RESOURCES: ++ wnd->tx_ok = 0; ++ /* resubmit this packet and ++ * the rest when resources ++ * become available */ ++ sent--; ++ break; ++ case NDIS_STATUS_FAILURE: ++ free_tx_packet(wnd, packet, ++ NDIS_STATUS_FAILURE); ++ break; ++ default: ++ ERROR("%p: invalid status: %08X", ++ packet, res); ++ free_tx_packet(wnd, packet, ++ oob_data->status); ++ break; ++ } ++ TRACE3("%p, %d", packet, res); ++ } ++ } ++ TRACE3("sent: %d(%d)", sent, n); ++ } else { ++ for (sent = 0; sent < n && wnd->tx_ok; sent++) { ++ struct ndis_packet_oob_data *oob_data; ++ packet = wnd->tx_ring[start + sent]; ++ oob_data = NDIS_PACKET_OOB_DATA(packet); ++ oob_data->status = NDIS_STATUS_NOT_RECOGNIZED; ++ irql = serialize_lock_irql(wnd); ++ res = LIN2WIN3(mp->send, wnd->nmb->mp_ctx, ++ packet, packet->private.flags); ++ serialize_unlock_irql(wnd, irql); ++ switch (res) { ++ case NDIS_STATUS_SUCCESS: ++ free_tx_packet(wnd, packet, res); ++ break; ++ case NDIS_STATUS_PENDING: ++ break; ++ case NDIS_STATUS_RESOURCES: ++ wnd->tx_ok = 0; ++ /* resend this packet when resources ++ * become available */ ++ sent--; ++ break; ++ case NDIS_STATUS_FAILURE: ++ free_tx_packet(wnd, packet, res); ++ break; ++ default: ++ ERROR("packet %p: invalid status: %08X", ++ packet, res); ++ break; ++ } ++ } ++ } ++ EXIT3(return sent); ++} ++ ++static void tx_worker(struct work_struct *work) ++{ ++ struct ndis_device *wnd; ++ s8 n; ++ ++ wnd = container_of(work, struct ndis_device, tx_work); ++ ENTER3("tx_ok %d", wnd->tx_ok); ++ while (wnd->tx_ok) { ++ mutex_lock(&wnd->tx_ring_mutex); ++ spin_lock_bh(&wnd->tx_ring_lock); ++ n = wnd->tx_ring_end - wnd->tx_ring_start; ++ TRACE3("%d, %d, %d", wnd->tx_ring_start, wnd->tx_ring_end, n); ++ /* end == start if either ring is empty or full; in ++ * the latter case is_tx_ring_full is set */ ++ if (n == 0) { ++ if (wnd->is_tx_ring_full) ++ n = TX_RING_SIZE - wnd->tx_ring_start; ++ else { ++ spin_unlock_bh(&wnd->tx_ring_lock); ++ mutex_unlock(&wnd->tx_ring_mutex); ++ break; ++ } ++ } else if (n < 0) ++ n = TX_RING_SIZE - wnd->tx_ring_start; ++ spin_unlock_bh(&wnd->tx_ring_lock); ++ if (unlikely(n > wnd->max_tx_packets)) ++ n = wnd->max_tx_packets; ++ n = mp_tx_packets(wnd, wnd->tx_ring_start, n); ++ if (n) { ++ wnd->net_dev->trans_start = jiffies; ++ wnd->tx_ring_start = ++ (wnd->tx_ring_start + n) % TX_RING_SIZE; ++ wnd->is_tx_ring_full = 0; ++ } ++ mutex_unlock(&wnd->tx_ring_mutex); ++ TRACE3("%d, %d, %d", wnd->tx_ring_start, wnd->tx_ring_end, n); ++ } ++ EXIT3(return); ++} ++ ++static int tx_skbuff(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ struct ndis_packet *packet; ++ ++ packet = alloc_tx_packet(wnd, skb); ++ if (!packet) { ++ TRACE2("couldn't allocate packet"); ++ netif_tx_lock(dev); ++ netif_stop_queue(dev); ++ netif_tx_unlock(dev); ++ return NETDEV_TX_BUSY; ++ } ++ spin_lock(&wnd->tx_ring_lock); ++ wnd->tx_ring[wnd->tx_ring_end++] = packet; ++ if (wnd->tx_ring_end == TX_RING_SIZE) ++ wnd->tx_ring_end = 0; ++ if (wnd->tx_ring_end == wnd->tx_ring_start) { ++ netif_tx_lock(dev); ++ wnd->is_tx_ring_full = 1; ++ netif_stop_queue(dev); ++ netif_tx_unlock(dev); ++ } ++ spin_unlock(&wnd->tx_ring_lock); ++ TRACE4("ring: %d, %d", wnd->tx_ring_start, wnd->tx_ring_end); ++ queue_work(wrapndis_wq, &wnd->tx_work); ++ return NETDEV_TX_OK; ++} ++ ++static int set_packet_filter(struct ndis_device *wnd, ULONG packet_filter) ++{ ++ NDIS_STATUS res; ++ ++ while (1) { ++ res = mp_set_int(wnd, OID_GEN_CURRENT_PACKET_FILTER, ++ packet_filter); ++ if (res == NDIS_STATUS_SUCCESS) ++ break; ++ TRACE2("couldn't set filter 0x%08x", packet_filter); ++ /* NDIS_PACKET_TYPE_PROMISCUOUS may not work with 802.11 */ ++ if (packet_filter & NDIS_PACKET_TYPE_PROMISCUOUS) { ++ packet_filter &= ~NDIS_PACKET_TYPE_PROMISCUOUS; ++ continue; ++ } ++ if (packet_filter & NDIS_PACKET_TYPE_ALL_LOCAL) { ++ packet_filter &= ~NDIS_PACKET_TYPE_ALL_LOCAL; ++ continue; ++ } ++ if (packet_filter & NDIS_PACKET_TYPE_ALL_FUNCTIONAL) { ++ packet_filter &= ~NDIS_PACKET_TYPE_ALL_FUNCTIONAL; ++ continue; ++ } ++ if (packet_filter & NDIS_PACKET_TYPE_MULTICAST) { ++ packet_filter &= ~NDIS_PACKET_TYPE_MULTICAST; ++ packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST; ++ continue; ++ } ++ if (packet_filter & NDIS_PACKET_TYPE_ALL_MULTICAST) { ++ packet_filter &= ~NDIS_PACKET_TYPE_ALL_MULTICAST; ++ continue; ++ } ++ break; ++ } ++ ++ wnd->packet_filter = packet_filter; ++ res = mp_query_int(wnd, OID_GEN_CURRENT_PACKET_FILTER, &packet_filter); ++ if (packet_filter != wnd->packet_filter) { ++ WARNING("filter not set: 0x%08x, 0x%08x", ++ packet_filter, wnd->packet_filter); ++ wnd->packet_filter = packet_filter; ++ } ++ if (wnd->packet_filter) ++ EXIT3(return 0); ++ else ++ EXIT3(return -1); ++} ++ ++void set_media_state(struct ndis_device *wnd, enum ndis_media_state state) ++{ ++ struct net_device *net_dev = wnd->net_dev; ++ ++ ENTER2("state: 0x%x, carrier %d", state, netif_carrier_ok(net_dev)); ++ switch (state) { ++ case NdisMediaStateConnected: ++ if (netif_carrier_ok(net_dev)) ++ return; ++ netif_carrier_on(net_dev); ++ wnd->tx_ok = 1; ++ if (netif_queue_stopped(net_dev)) ++ netif_wake_queue(net_dev); ++ if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { ++ set_bit(LINK_STATUS_ON, &wnd->ndis_pending_work); ++ queue_work(wrapndis_wq, &wnd->ndis_work); ++ } ++ break; ++ case NdisMediaStateDisconnected: ++ if (!netif_carrier_ok(net_dev)) ++ return; ++ netif_carrier_off(net_dev); ++ netif_stop_queue(net_dev); ++ wnd->tx_ok = 0; ++ if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { ++ memset(&wnd->essid, 0, sizeof(wnd->essid)); ++ set_bit(LINK_STATUS_OFF, &wnd->ndis_pending_work); ++ queue_work(wrapndis_wq, &wnd->ndis_work); ++ } ++ break; ++ default: ++ WARNING("invalid media state: 0x%x", state); ++ break; ++ } ++} ++ ++static int ndis_net_dev_init(struct net_device *net_dev) ++{ ++ struct ndis_device *wnd = netdev_priv(net_dev); ++ ++ ENTER1("%p", wnd); ++ wrap_procfs_add_ndis_device(wnd); ++ EXIT1(return 0); ++} ++ ++static void ndis_net_dev_uninit(struct net_device *net_dev) ++{ ++ struct ndis_device *wnd = netdev_priv(net_dev); ++ ++ ENTER1("%p", wnd); ++ wrap_procfs_remove_ndis_device(wnd); ++ EXIT1(return); ++} ++ ++static int ndis_net_dev_open(struct net_device *net_dev) ++{ ++ int status, res; ++ struct ndis_device *wnd = netdev_priv(net_dev); ++ ++ ENTER1("%p", wnd); ++ res = mp_query_int(wnd, OID_GEN_MEDIA_CONNECT_STATUS, &status); ++ if (res == NDIS_STATUS_SUCCESS && status >= NdisMediaStateConnected && ++ status <= NdisMediaStateDisconnected) ++ set_media_state(wnd, status); ++ netif_start_queue(net_dev); ++ netif_poll_enable(net_dev); ++ EXIT1(return 0); ++} ++ ++static int ndis_net_dev_close(struct net_device *net_dev) ++{ ++ ENTER1("%p", netdev_priv(net_dev)); ++ netif_poll_disable(net_dev); ++ netif_tx_disable(net_dev); ++ EXIT1(return 0); ++} ++ ++static int ndis_change_mtu(struct net_device *net_dev, int mtu) ++{ ++ struct ndis_device *wnd = netdev_priv(net_dev); ++ int max; ++ ++ if (mtu < ETH_ZLEN) ++ return -EINVAL; ++ if (mp_query_int(wnd, OID_GEN_MAXIMUM_TOTAL_SIZE, &max) != ++ NDIS_STATUS_SUCCESS) ++ return -EOPNOTSUPP; ++ TRACE1("%d", max); ++ max -= ETH_HLEN; ++ if (max <= ETH_ZLEN) ++ return -EINVAL; ++ if (mtu + ETH_HLEN > max) ++ return -EINVAL; ++ net_dev->mtu = mtu; ++ return 0; ++} ++ ++#ifdef CONFIG_NET_POLL_CONTROLLER ++static void ndis_poll_controller(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ disable_irq(dev->irq); ++ ndis_isr(wnd->mp_interrupt->kinterrupt, wnd->mp_interrupt); ++ enable_irq(dev->irq); ++} ++#endif ++ ++/* called from BH context */ ++static struct net_device_stats *ndis_get_stats(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ return &wnd->net_stats; ++} ++ ++/* called from BH context */ ++static void ndis_set_multicast_list(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ set_bit(SET_MULTICAST_LIST, &wnd->ndis_pending_work); ++ queue_work(wrapndis_wq, &wnd->ndis_work); ++} ++ ++/* called from BH context */ ++struct iw_statistics *get_iw_stats(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ return &wnd->iw_stats; ++} ++ ++static void update_iw_stats(struct ndis_device *wnd) ++{ ++ struct iw_statistics *iw_stats = &wnd->iw_stats; ++ struct ndis_wireless_stats ndis_stats; ++ NDIS_STATUS res; ++ ndis_rssi rssi; ++ int qual; ++ ++ ENTER2("%p", wnd); ++ if (wnd->iw_stats_enabled == FALSE || !netif_carrier_ok(wnd->net_dev)) { ++ memset(iw_stats, 0, sizeof(*iw_stats)); ++ EXIT2(return); ++ } ++ res = mp_query(wnd, OID_802_11_RSSI, &rssi, sizeof(rssi)); ++ if (res == NDIS_STATUS_SUCCESS) ++ iw_stats->qual.level = rssi; ++ ++ qual = 100 * (rssi - WL_NOISE) / (WL_SIGMAX - WL_NOISE); ++ if (qual < 0) ++ qual = 0; ++ else if (qual > 100) ++ qual = 100; ++ ++ iw_stats->qual.noise = WL_NOISE; ++ iw_stats->qual.qual = qual; ++ ++ res = mp_query(wnd, OID_802_11_STATISTICS, ++ &ndis_stats, sizeof(ndis_stats)); ++ if (res != NDIS_STATUS_SUCCESS) ++ EXIT2(return); ++ iw_stats->discard.retries = (unsigned long)ndis_stats.retry + ++ (unsigned long)ndis_stats.multi_retry; ++ iw_stats->discard.misc = (unsigned long)ndis_stats.fcs_err + ++ (unsigned long)ndis_stats.rtss_fail + ++ (unsigned long)ndis_stats.ack_fail + ++ (unsigned long)ndis_stats.frame_dup; ++ ++ EXIT2(return); ++} ++ ++static void set_multicast_list(struct ndis_device *wnd) ++{ ++ struct net_device *net_dev; ++ ULONG packet_filter; ++ NDIS_STATUS res; ++ ++ net_dev = wnd->net_dev; ++ packet_filter = wnd->packet_filter; ++ ++ TRACE2("0x%08x", packet_filter); ++ if (net_dev->flags & IFF_PROMISC) { ++ packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS | ++ NDIS_PACKET_TYPE_ALL_LOCAL; ++ } else if (net_dev->flags & IFF_ALLMULTI || ++ netdev_mc_count(net_dev) > wnd->multicast_size) { ++ packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST; ++ TRACE2("0x%08x", packet_filter); ++ } else if (netdev_mc_count(net_dev) > 0) { ++ int i, size; ++ char *buf; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) ++ struct netdev_hw_addr *ha; ++#else ++ struct dev_mc_list *mclist; ++#endif ++ size = min(wnd->multicast_size, netdev_mc_count(net_dev)); ++ TRACE2("%d, %d", wnd->multicast_size, netdev_mc_count(net_dev)); ++ buf = kmalloc(size * ETH_ALEN, GFP_KERNEL); ++ if (!buf) { ++ WARNING("couldn't allocate memory"); ++ EXIT2(return); ++ } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) ++ i = 0; ++ netdev_for_each_mc_addr(ha, net_dev) { ++ if (i >= size) ++ break; ++ memcpy(buf + i * ETH_ALEN, ha->addr, ETH_ALEN); ++ TRACE2(MACSTRSEP, MAC2STR(ha->addr)); ++ i++; ++ } ++#else ++ mclist = net_dev->mc_list; ++ for (i = 0; i < size && mclist; mclist = mclist->next) { ++ if (mclist->dmi_addrlen != ETH_ALEN) ++ continue; ++ memcpy(buf + i * ETH_ALEN, mclist->dmi_addr, ETH_ALEN); ++ TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr)); ++ i++; ++ } ++#endif ++ res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN); ++ if (res == NDIS_STATUS_SUCCESS && i > 0) ++ packet_filter |= NDIS_PACKET_TYPE_MULTICAST; ++ else ++ packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST; ++ kfree(buf); ++ } ++ TRACE2("0x%08x", packet_filter); ++ res = set_packet_filter(wnd, packet_filter); ++ if (res) ++ TRACE1("couldn't set packet filter (%08X)", res); ++ EXIT2(return); ++} ++ ++static void link_status_off(struct ndis_device *wnd) ++{ ++#ifdef CONFIG_WIRELESS_EXT ++ union iwreq_data wrqu; ++ ++ memset(&wrqu, 0, sizeof(wrqu)); ++ wrqu.ap_addr.sa_family = ARPHRD_ETHER; ++ wireless_send_event(wnd->net_dev, SIOCGIWAP, &wrqu, NULL); ++#endif ++ EXIT2(return); ++} ++ ++static void link_status_on(struct ndis_device *wnd) ++{ ++#ifdef CONFIG_WIRELESS_EXT ++ struct ndis_assoc_info *ndis_assoc_info; ++ union iwreq_data wrqu; ++ NDIS_STATUS res; ++ const int assoc_size = sizeof(*ndis_assoc_info) + IW_CUSTOM_MAX + 32; ++#endif ++ ++ ENTER2(""); ++#ifdef CONFIG_WIRELESS_EXT ++ memset(&wrqu, 0, sizeof(wrqu)); ++ ndis_assoc_info = kzalloc(assoc_size, GFP_KERNEL); ++ if (!ndis_assoc_info) { ++ ERROR("couldn't allocate memory"); ++ goto send_assoc_event; ++ } ++ res = mp_query(wnd, OID_802_11_ASSOCIATION_INFORMATION, ++ ndis_assoc_info, assoc_size); ++ if (res) { ++ TRACE2("query assoc_info failed (%08X)", res); ++ kfree(ndis_assoc_info); ++ goto send_assoc_event; ++ } ++ TRACE2("%u, 0x%x, %u, 0x%x, %u", ndis_assoc_info->length, ++ ndis_assoc_info->req_ies, ndis_assoc_info->req_ie_length, ++ ndis_assoc_info->resp_ies, ndis_assoc_info->resp_ie_length); ++ if (ndis_assoc_info->req_ie_length > 0) { ++ wrqu.data.length = ndis_assoc_info->req_ie_length; ++ wireless_send_event(wnd->net_dev, IWEVASSOCREQIE, &wrqu, ++ ((char *)ndis_assoc_info) + ++ ndis_assoc_info->offset_req_ies); ++ } ++ if (ndis_assoc_info->resp_ie_length > 0) { ++ wrqu.data.length = ndis_assoc_info->resp_ie_length; ++ wireless_send_event(wnd->net_dev, IWEVASSOCRESPIE, &wrqu, ++ ((char *)ndis_assoc_info) + ++ ndis_assoc_info->offset_resp_ies); ++ } ++ kfree(ndis_assoc_info); ++ ++send_assoc_event: ++ get_ap_address(wnd, wrqu.ap_addr.sa_data); ++ wrqu.ap_addr.sa_family = ARPHRD_ETHER; ++ TRACE2(MACSTRSEP, MAC2STR(wrqu.ap_addr.sa_data)); ++ wireless_send_event(wnd->net_dev, SIOCGIWAP, &wrqu, NULL); ++#endif ++ EXIT2(return); ++} ++ ++static void iw_stats_timer_proc(unsigned long data) ++{ ++ struct ndis_device *wnd = (struct ndis_device *)data; ++ ++ ENTER2("%d", wnd->iw_stats_interval); ++ if (wnd->iw_stats_interval > 0) { ++ set_bit(COLLECT_IW_STATS, &wnd->ndis_pending_work); ++ queue_work(wrapndis_wq, &wnd->ndis_work); ++ } ++ mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval); ++} ++ ++static void add_iw_stats_timer(struct ndis_device *wnd) ++{ ++ if (wnd->physical_medium != NdisPhysicalMediumWirelessLan) ++ return; ++ if (wnd->iw_stats_interval < 0) ++ wnd->iw_stats_interval *= -1; ++ wnd->iw_stats_timer.data = (unsigned long)wnd; ++ wnd->iw_stats_timer.function = iw_stats_timer_proc; ++ mod_timer(&wnd->iw_stats_timer, jiffies + wnd->iw_stats_interval); ++} ++ ++static void del_iw_stats_timer(struct ndis_device *wnd) ++{ ++ ENTER2("%d", wnd->iw_stats_interval); ++ wnd->iw_stats_interval *= -1; ++ del_timer_sync(&wnd->iw_stats_timer); ++ EXIT2(return); ++} ++ ++static void hangcheck_proc(unsigned long data) ++{ ++ struct ndis_device *wnd = (struct ndis_device *)data; ++ ++ ENTER3("%d", wnd->hangcheck_interval); ++ if (wnd->hangcheck_interval > 0) { ++ set_bit(HANGCHECK, &wnd->ndis_pending_work); ++ queue_work(wrapndis_wq, &wnd->ndis_work); ++ } ++ mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval); ++ EXIT3(return); ++} ++ ++void hangcheck_add(struct ndis_device *wnd) ++{ ++ if (!wnd->wd->driver->ndis_driver->mp.hangcheck || ++ hangcheck_interval < 0) ++ EXIT2(return); ++ ++ if (hangcheck_interval > 0) ++ wnd->hangcheck_interval = hangcheck_interval * HZ; ++ if (wnd->hangcheck_interval < 0) ++ wnd->hangcheck_interval *= -1; ++ wnd->hangcheck_timer.data = (unsigned long)wnd; ++ wnd->hangcheck_timer.function = hangcheck_proc; ++ mod_timer(&wnd->hangcheck_timer, jiffies + wnd->hangcheck_interval); ++ EXIT2(return); ++} ++ ++void hangcheck_del(struct ndis_device *wnd) ++{ ++ ENTER2("%d", wnd->hangcheck_interval); ++ if (wnd->hangcheck_interval > 0) ++ wnd->hangcheck_interval *= -1; ++ del_timer_sync(&wnd->hangcheck_timer); ++ EXIT2(return); ++} ++ ++/* worker procedure to take care of setting/checking various states */ ++static void wrapndis_worker(struct work_struct *work) ++{ ++ struct ndis_device *wnd; ++ ++ wnd = container_of(work, struct ndis_device, ndis_work); ++ WORKTRACE("0x%lx", wnd->ndis_pending_work); ++ ++ if (test_and_clear_bit(NETIF_WAKEQ, &wnd->ndis_pending_work)) { ++ netif_tx_lock_bh(wnd->net_dev); ++ netif_wake_queue(wnd->net_dev); ++ netif_tx_unlock_bh(wnd->net_dev); ++ } ++ ++ if (test_and_clear_bit(LINK_STATUS_OFF, &wnd->ndis_pending_work)) ++ link_status_off(wnd); ++ ++ if (test_and_clear_bit(LINK_STATUS_ON, &wnd->ndis_pending_work)) ++ link_status_on(wnd); ++ ++ if (test_and_clear_bit(COLLECT_IW_STATS, &wnd->ndis_pending_work)) ++ update_iw_stats(wnd); ++ ++ if (test_and_clear_bit(SET_MULTICAST_LIST, ++ &wnd->ndis_pending_work)) ++ set_multicast_list(wnd); ++ ++ if (test_and_clear_bit(HANGCHECK, &wnd->ndis_pending_work)) { ++ struct miniport *mp; ++ BOOLEAN reset; ++ KIRQL irql; ++ ++ mp = &wnd->wd->driver->ndis_driver->mp; ++ irql = serialize_lock_irql(wnd); ++ reset = LIN2WIN1(mp->hangcheck, wnd->nmb->mp_ctx); ++ serialize_unlock_irql(wnd, irql); ++ if (reset) { ++ TRACE2("%s needs reset", wnd->net_dev->name); ++ mp_reset(wnd); ++ } ++ } ++ WORKEXIT(return); ++} ++ ++NDIS_STATUS ndis_reinit(struct ndis_device *wnd) ++{ ++ NDIS_STATUS status; ++ ++ wnd->attributes &= ~NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND; ++ status = mp_set_power_state(wnd, NdisDeviceStateD3); ++ if (status != NDIS_STATUS_SUCCESS) { ++ ERROR("halting device %s failed: %08X", wnd->net_dev->name, ++ status); ++ return status; ++ } ++ status = mp_set_power_state(wnd, NdisDeviceStateD0); ++ if (status != NDIS_STATUS_SUCCESS) ++ ERROR("starting device %s failed: %08X", wnd->net_dev->name, ++ status); ++ return status; ++} ++ ++#ifdef CONFIG_WIRELESS_EXT ++static void get_encryption_capa(struct ndis_device *wnd, char *buf, ++ const int buf_len) ++{ ++ int i, mode; ++ NDIS_STATUS res; ++ struct ndis_assoc_info ndis_assoc_info; ++ struct ndis_add_key ndis_key; ++ struct ndis_capability *c; ++ ++ ENTER1("%p", wnd); ++ /* set network type to g, b, or a, in that order */ ++ res = mp_query(wnd, OID_802_11_NETWORK_TYPES_SUPPORTED, buf, buf_len); ++ if (res == NDIS_STATUS_SUCCESS) { ++ struct network_type_list *net_types; ++ unsigned long types = 0; ++ net_types = (typeof(net_types))buf; ++ for (i = 0; i < net_types->num; i++) { ++ TRACE2("%d", net_types->types[i]); ++ set_bit(net_types->types[i], &types); ++ } ++ if (test_bit(Ndis802_11OFDM24, &types)) ++ mode = Ndis802_11OFDM24; ++ else if (test_bit(Ndis802_11DS, &types)) ++ mode = Ndis802_11DS; ++ else if (test_bit(Ndis802_11OFDM5, &types)) ++ mode = Ndis802_11OFDM5; ++ else ++ mode = Ndis802_11DS; ++ mp_set_int(wnd, OID_802_11_NETWORK_TYPE_IN_USE, mode); ++ } ++ /* check if WEP is supported */ ++ if (set_iw_encr_mode(wnd, IW_AUTH_CIPHER_WEP104, ++ IW_AUTH_CIPHER_NONE) == 0 && ++ get_ndis_encr_mode(wnd) == Ndis802_11Encryption1KeyAbsent) ++ set_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr); ++ ++ /* check if WPA is supported */ ++ if (set_ndis_auth_mode(wnd, Ndis802_11AuthModeWPA) == 0 && ++ get_ndis_auth_mode(wnd) == Ndis802_11AuthModeWPA) ++ set_bit(Ndis802_11AuthModeWPA, &wnd->capa.encr); ++ else ++ EXIT1(return); ++ ++ if (set_ndis_auth_mode(wnd, Ndis802_11AuthModeWPAPSK) == 0 && ++ get_ndis_auth_mode(wnd) == Ndis802_11AuthModeWPAPSK) ++ set_bit(Ndis802_11AuthModeWPAPSK, &wnd->capa.encr); ++ ++ /* check for highest encryption */ ++ mode = 0; ++ if (set_iw_encr_mode(wnd, IW_AUTH_CIPHER_CCMP, ++ IW_AUTH_CIPHER_NONE) == 0 && ++ (i = get_ndis_encr_mode(wnd)) > 0 && ++ (i == Ndis802_11Encryption3KeyAbsent || ++ i == Ndis802_11Encryption3Enabled)) ++ mode = Ndis802_11Encryption3Enabled; ++ else if (set_iw_encr_mode(wnd, IW_AUTH_CIPHER_TKIP, ++ IW_AUTH_CIPHER_NONE) == 0 && ++ (i = get_ndis_encr_mode(wnd)) > 0 && ++ (i == Ndis802_11Encryption2KeyAbsent || ++ i == Ndis802_11Encryption2Enabled)) ++ mode = Ndis802_11Encryption2Enabled; ++ else if (set_iw_encr_mode(wnd, IW_AUTH_CIPHER_WEP104, ++ IW_AUTH_CIPHER_NONE) == 0 && ++ (i = get_ndis_encr_mode(wnd)) > 0 && ++ (i == Ndis802_11Encryption1KeyAbsent || ++ i == Ndis802_11Encryption1Enabled)) ++ mode = Ndis802_11Encryption1Enabled; ++ ++ TRACE1("mode: %d", mode); ++ if (mode == 0) ++ EXIT1(return); ++ set_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr); ++ if (mode == Ndis802_11Encryption1Enabled) ++ EXIT1(return); ++ ++ ndis_key.length = 32; ++ ndis_key.index = 0xC0000001; ++ ndis_key.struct_size = sizeof(ndis_key); ++ res = mp_set(wnd, OID_802_11_ADD_KEY, &ndis_key, ndis_key.struct_size); ++ TRACE2("%08X, %zu", res, sizeof(ndis_key)); ++ if (res && res != NDIS_STATUS_INVALID_DATA) ++ EXIT1(return); ++ res = mp_query(wnd, OID_802_11_ASSOCIATION_INFORMATION, ++ &ndis_assoc_info, sizeof(ndis_assoc_info)); ++ TRACE1("%08X", res); ++ if (res == NDIS_STATUS_NOT_SUPPORTED) ++ EXIT1(return); ++ ++ set_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr); ++ if (mode == Ndis802_11Encryption3Enabled) ++ set_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr); ++ /* not all drivers support OID_802_11_CAPABILITY, so we don't ++ * know for sure if driver support WPA or WPAPSK; assume ++ * WPAPSK */ ++ set_bit(Ndis802_11AuthModeWPAPSK, &wnd->capa.auth); ++ wnd->max_pmkids = 1; ++ ++ memset(buf, 0, buf_len); ++ c = (struct ndis_capability *)buf; ++ res = mp_query(wnd, OID_802_11_CAPABILITY, buf, buf_len); ++ if (!(res == NDIS_STATUS_SUCCESS && c->version == 2)) ++ EXIT1(return); ++ wnd->max_pmkids = c->num_PMKIDs; ++ ++ for (i = 0; i < c->num_auth_encr_pair; i++) { ++ struct ndis_auth_encr_pair *ae; ++ ++ ae = &c->auth_encr_pair[i]; ++ if ((char *)(ae + 1) > buf + buf_len) ++ break; ++ switch (ae->auth_mode) { ++ case Ndis802_11AuthModeOpen: ++ case Ndis802_11AuthModeShared: ++ case Ndis802_11AuthModeWPA: ++ case Ndis802_11AuthModeWPAPSK: ++ case Ndis802_11AuthModeWPANone: ++ case Ndis802_11AuthModeWPA2: ++ case Ndis802_11AuthModeWPA2PSK: ++ set_bit(ae->auth_mode, &wnd->capa.auth); ++ break; ++ default: ++ WARNING("unknown auth_mode: %d", ae->auth_mode); ++ break; ++ } ++ switch (ae->encr_mode) { ++ case Ndis802_11EncryptionDisabled: ++ case Ndis802_11Encryption1Enabled: ++ case Ndis802_11Encryption2Enabled: ++ case Ndis802_11Encryption3Enabled: ++ set_bit(ae->encr_mode, &wnd->capa.encr); ++ break; ++ default: ++ WARNING("unknown encr_mode: %d", ae->encr_mode); ++ break; ++ } ++ } ++ EXIT1(return); ++} ++#endif ++ ++wstdcall NTSTATUS NdisDispatchDeviceControl(struct device_object *fdo, ++ struct irp *irp) ++{ ++ struct ndis_device *wnd; ++ ++ TRACE3("fdo: %p", fdo); ++ /* for now, we don't have anything interesting here, so pass it ++ * down to bus driver */ ++ wnd = fdo->reserved; ++ return IoPassIrpDown(wnd->nmb->pdo, irp); ++} ++WIN_FUNC_DECL(NdisDispatchDeviceControl,2) ++ ++wstdcall NTSTATUS NdisDispatchPower(struct device_object *fdo, struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ struct ndis_device *wnd; ++ enum ndis_power_state state; ++ NTSTATUS status; ++ NDIS_STATUS ndis_status; ++ ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ wnd = fdo->reserved; ++ IOTRACE("fdo: %p, fn: %d:%d, wnd: %p", fdo, irp_sl->major_fn, ++ irp_sl->minor_fn, wnd); ++ if ((irp_sl->params.power.type == SystemPowerState && ++ irp_sl->params.power.state.system_state > PowerSystemWorking) || ++ (irp_sl->params.power.type == DevicePowerState && ++ irp_sl->params.power.state.device_state > PowerDeviceD0)) ++ state = NdisDeviceStateD3; ++ else ++ state = NdisDeviceStateD0; ++ switch (irp_sl->minor_fn) { ++ case IRP_MN_SET_POWER: ++ if (state == NdisDeviceStateD0) { ++ status = IoSyncForwardIrp(wnd->nmb->pdo, irp); ++ if (status != STATUS_SUCCESS) ++ break; ++ ndis_status = mp_set_power_state(wnd, state); ++ if (ndis_status != NDIS_STATUS_SUCCESS) ++ WARNING("couldn't set power to %d: %08X", ++ state, ndis_status); ++ TRACE2("%s: device resumed", wnd->net_dev->name); ++ irp->io_status.status = status = STATUS_SUCCESS; ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ break; ++ } else { ++ ndis_status = mp_set_power_state(wnd, state); ++ /* TODO: handle error case */ ++ if (ndis_status != NDIS_STATUS_SUCCESS) ++ WARNING("setting power to %d failed: %08X", ++ state, ndis_status); ++ status = IoAsyncForwardIrp(wnd->nmb->pdo, irp); ++ } ++ break; ++ case IRP_MN_QUERY_POWER: ++ if (wnd->attributes & NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND) { ++ ndis_status = mp_query(wnd, OID_PNP_QUERY_POWER, ++ &state, sizeof(state)); ++ TRACE2("%d, %08X", state, ndis_status); ++ /* this OID must always succeed */ ++ if (ndis_status != NDIS_STATUS_SUCCESS) ++ TRACE1("query power returns %08X", ndis_status); ++ irp->io_status.status = STATUS_SUCCESS; ++ } else ++ irp->io_status.status = STATUS_SUCCESS; ++ status = IoPassIrpDown(wnd->nmb->pdo, irp); ++ break; ++ case IRP_MN_WAIT_WAKE: ++ case IRP_MN_POWER_SEQUENCE: ++ /* TODO: implement WAIT_WAKE */ ++ status = IoPassIrpDown(wnd->nmb->pdo, irp); ++ break; ++ default: ++ status = IoPassIrpDown(wnd->nmb->pdo, irp); ++ break; ++ } ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(NdisDispatchPower,2) ++ ++wstdcall NTSTATUS NdisDispatchPnp(struct device_object *fdo, struct irp *irp) ++{ ++ struct io_stack_location *irp_sl; ++ struct ndis_device *wnd; ++ struct device_object *pdo; ++ NTSTATUS status; ++ ++ IOTRACE("fdo: %p, irp: %p", fdo, irp); ++ irp_sl = IoGetCurrentIrpStackLocation(irp); ++ wnd = fdo->reserved; ++ pdo = wnd->nmb->pdo; ++ switch (irp_sl->minor_fn) { ++ case IRP_MN_START_DEVICE: ++ status = IoSyncForwardIrp(pdo, irp); ++ if (status != STATUS_SUCCESS) ++ break; ++ if (ndis_start_device(wnd) == NDIS_STATUS_SUCCESS) ++ status = STATUS_SUCCESS; ++ else ++ status = STATUS_FAILURE; ++ irp->io_status.status = status; ++ IoCompleteRequest(irp, IO_NO_INCREMENT); ++ break; ++ case IRP_MN_QUERY_STOP_DEVICE: ++ /* TODO: implement in NDIS */ ++ status = IoPassIrpDown(wnd->nmb->pdo, irp); ++ break; ++ case IRP_MN_STOP_DEVICE: ++ mp_halt(wnd); ++ irp->io_status.status = STATUS_SUCCESS; ++ status = IoAsyncForwardIrp(pdo, irp); ++ break; ++ case IRP_MN_REMOVE_DEVICE: ++ TRACE1("%s", wnd->net_dev->name); ++ mp_pnp_event(wnd, NdisDevicePnPEventSurpriseRemoved, 0); ++ if (ndis_remove_device(wnd)) { ++ status = STATUS_FAILURE; ++ break; ++ } ++ /* wnd is already freed */ ++ status = IoAsyncForwardIrp(pdo, irp); ++ IoDetachDevice(fdo); ++ IoDeleteDevice(fdo); ++ break; ++ default: ++ status = IoAsyncForwardIrp(pdo, irp); ++ break; ++ } ++ IOTRACE("status: %08X", status); ++ IOEXIT(return status); ++} ++WIN_FUNC_DECL(NdisDispatchPnp,2) ++ ++static void set_task_offload(struct ndis_device *wnd, void *buf, ++ const int buf_size) ++{ ++ struct ndis_task_offload_header *task_offload_header; ++ struct ndis_task_offload *task_offload; ++ struct ndis_task_tcp_ip_checksum *csum = NULL; ++ struct ndis_task_tcp_large_send *tso = NULL; ++ NDIS_STATUS status; ++ ++ memset(buf, 0, buf_size); ++ task_offload_header = buf; ++ task_offload_header->version = NDIS_TASK_OFFLOAD_VERSION; ++ task_offload_header->size = sizeof(*task_offload_header); ++ task_offload_header->encap_format.flags.fixed_header_size = 1; ++ task_offload_header->encap_format.header_size = sizeof(struct ethhdr); ++ task_offload_header->encap_format.encap = IEEE_802_3_Encapsulation; ++ status = mp_query(wnd, OID_TCP_TASK_OFFLOAD, buf, buf_size); ++ TRACE1("%08X", status); ++ if (status != NDIS_STATUS_SUCCESS) ++ EXIT1(return); ++ if (task_offload_header->offset_first_task == 0) ++ EXIT1(return); ++ task_offload = ((void *)task_offload_header + ++ task_offload_header->offset_first_task); ++ while (1) { ++ TRACE1("%d, %d", task_offload->version, task_offload->task); ++ switch (task_offload->task) { ++ case TcpIpChecksumNdisTask: ++ csum = (void *)task_offload->task_buf; ++ break; ++ case TcpLargeSendNdisTask: ++ tso = (void *)task_offload->task_buf; ++ break; ++ default: ++ TRACE1("%d", task_offload->task); ++ break; ++ } ++ if (task_offload->offset_next_task == 0) ++ break; ++ task_offload = (void *)task_offload + ++ task_offload->offset_next_task; ++ } ++ if (tso) ++ TRACE1("%u, %u, %d, %d", tso->max_size, tso->min_seg_count, ++ tso->tcp_opts, tso->ip_opts); ++ if (!csum) ++ EXIT1(return); ++ TRACE1("%08x, %08x", csum->v4_tx.value, csum->v4_rx.value); ++ task_offload_header->encap_format.flags.fixed_header_size = 1; ++ task_offload_header->encap_format.header_size = sizeof(struct ethhdr); ++ task_offload_header->offset_first_task = sizeof(*task_offload_header); ++ task_offload = ((void *)task_offload_header + ++ task_offload_header->offset_first_task); ++ task_offload->offset_next_task = 0; ++ task_offload->size = sizeof(*task_offload); ++ task_offload->task = TcpIpChecksumNdisTask; ++ memcpy(task_offload->task_buf, csum, sizeof(*csum)); ++ task_offload->task_buf_length = sizeof(*csum); ++ status = mp_set(wnd, OID_TCP_TASK_OFFLOAD, task_offload_header, ++ sizeof(*task_offload_header) + ++ sizeof(*task_offload) + sizeof(*csum)); ++ TRACE1("%08X", status); ++ if (status != NDIS_STATUS_SUCCESS) ++ EXIT2(return); ++ wnd->tx_csum = csum->v4_tx; ++ if (csum->v4_tx.tcp_csum && csum->v4_tx.udp_csum) { ++ if (csum->v4_tx.ip_csum) { ++ wnd->net_dev->features |= NETIF_F_HW_CSUM; ++ TRACE1("hw checksum enabled"); ++ } else { ++ wnd->net_dev->features |= NETIF_F_IP_CSUM; ++ TRACE1("IP checksum enabled"); ++ } ++ if (wnd->sg_dma_size) ++ wnd->net_dev->features |= NETIF_F_SG; ++ } ++ wnd->rx_csum = csum->v4_rx; ++ EXIT1(return); ++} ++ ++static void get_supported_oids(struct ndis_device *wnd) ++{ ++ NDIS_STATUS res; ++ int i, n, needed; ++ ndis_oid *oids; ++ ++ res = mp_query_info(wnd, OID_GEN_SUPPORTED_LIST, NULL, 0, NULL, ++ &needed); ++ if (!(res == NDIS_STATUS_BUFFER_TOO_SHORT || ++ res == NDIS_STATUS_INVALID_LENGTH)) ++ EXIT1(return); ++ oids = kmalloc(needed, GFP_KERNEL); ++ if (!oids) { ++ TRACE1("couldn't allocate memory"); ++ EXIT1(return); ++ } ++ res = mp_query(wnd, OID_GEN_SUPPORTED_LIST, oids, needed); ++ if (res) { ++ TRACE1("failed: %08X", res); ++ kfree(oids); ++ EXIT1(return); ++ } ++ for (i = 0, n = needed / sizeof(*oids); i < n; i++) { ++ TRACE1("oid: %08X", oids[i]); ++ /* if a wireless device didn't say so for ++ * OID_GEN_PHYSICAL_MEDIUM (they should, but in case) */ ++ if (wnd->physical_medium != NdisPhysicalMediumWirelessLan && ++ oids[i] == OID_802_11_SSID) ++ wnd->physical_medium = NdisPhysicalMediumWirelessLan; ++ } ++ kfree(oids); ++ EXIT1(return); ++} ++ ++static void ndis_get_drvinfo(struct net_device *dev, ++ struct ethtool_drvinfo *info) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 2); ++ strcat(info->driver, "+"); ++ strncat(info->driver, wnd->wd->driver->name, ++ sizeof(info->driver) - strlen(DRIVER_NAME) - 1); ++ strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 2); ++ strcat(info->version, "+"); ++ strncat(info->version, wnd->wd->driver->version, ++ sizeof(info->version) - strlen(DRIVER_VERSION) - 1); ++ if (wrap_is_pci_bus(wnd->wd->dev_bus)) ++ strncpy(info->bus_info, pci_name(wnd->wd->pci.pdev), ++ sizeof(info->bus_info) - 1); ++#ifdef ENABLE_USB ++ else ++ usb_make_path(wnd->wd->usb.udev, info->bus_info, ++ sizeof(info->bus_info) - 1); ++#endif ++ return; ++} ++ ++static u32 ndis_get_link(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ return netif_carrier_ok(wnd->net_dev); ++} ++ ++static void ndis_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ wol->supported = 0; ++ wol->wolopts = 0; ++ if (!(wnd->attributes & NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND)) ++ EXIT2(return); ++ if (!wrap_is_pci_bus(wnd->wd->dev_bus)) ++ EXIT2(return); ++ /* we always suspend to D3 */ ++ if (wnd->pnp_capa.wakeup.min_magic_packet_wakeup < NdisDeviceStateD3) ++ return; ++ wol->supported |= WAKE_MAGIC; ++ if (wnd->ndis_wolopts & NDIS_PNP_WAKE_UP_MAGIC_PACKET) ++ wol->wolopts |= WAKE_MAGIC; ++ return; ++} ++ ++static int ndis_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ if (!(wnd->attributes & NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND)) ++ return -EOPNOTSUPP; ++ if (wnd->pnp_capa.wakeup.min_magic_packet_wakeup < NdisDeviceStateD3) ++ EXIT2(return -EOPNOTSUPP); ++ TRACE2("0x%x", wol->wolopts); ++ if (wol->wolopts & WAKE_MAGIC) { ++ wnd->ndis_wolopts |= NDIS_PNP_WAKE_UP_MAGIC_PACKET; ++ if (wol->wolopts != WAKE_MAGIC) ++ WARNING("ignored wake-on-lan options: 0x%x", ++ wol->wolopts & ~WAKE_MAGIC); ++ } else if (!wol->wolopts) ++ wnd->ndis_wolopts = 0; ++ else ++ return -EOPNOTSUPP; ++ TRACE2("0x%x", wnd->ndis_wolopts); ++ return 0; ++} ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) ++static u32 ndis_get_tx_csum(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ if (wnd->tx_csum.tcp_csum && wnd->tx_csum.udp_csum) ++ return 1; ++ else ++ return 0; ++} ++ ++static u32 ndis_get_rx_csum(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ if (wnd->rx_csum.value) ++ return 1; ++ else ++ return 0; ++} ++ ++static int ndis_set_tx_csum(struct net_device *dev, u32 data) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ if (data && (wnd->tx_csum.value == 0)) ++ return -EOPNOTSUPP; ++ ++ if (wnd->tx_csum.ip_csum) ++ ethtool_op_set_tx_hw_csum(dev, data); ++ else ++ ethtool_op_set_tx_csum(dev, data); ++ return 0; ++} ++ ++static int ndis_set_rx_csum(struct net_device *dev, u32 data) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ ++ if (data && (wnd->tx_csum.value == 0)) ++ return -EOPNOTSUPP; ++ ++ /* TODO: enable/disable rx csum through NDIS */ ++ return 0; ++} ++ ++static u32 ndis_get_sg(struct net_device *dev) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ if (wnd->sg_dma_size) ++ return ethtool_op_get_sg(dev); ++ else ++ return 0; ++} ++ ++static int ndis_set_sg(struct net_device *dev, u32 data) ++{ ++ struct ndis_device *wnd = netdev_priv(dev); ++ if (wnd->sg_dma_size) ++ return ethtool_op_set_sg(dev, data); ++ else ++ return -EOPNOTSUPP; ++} ++#endif ++ ++static struct ethtool_ops ndis_ethtool_ops = { ++ .get_drvinfo = ndis_get_drvinfo, ++ .get_link = ndis_get_link, ++ .get_wol = ndis_get_wol, ++ .set_wol = ndis_set_wol, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) ++ .get_tx_csum = ndis_get_tx_csum, ++ .get_rx_csum = ndis_get_rx_csum, ++ .set_tx_csum = ndis_set_tx_csum, ++ .set_rx_csum = ndis_set_rx_csum, ++ .get_sg = ndis_get_sg, ++ .set_sg = ndis_set_sg, ++#endif ++}; ++ ++static int notifier_event(struct notifier_block *notifier, unsigned long event, ++ void *ptr) ++{ ++ struct net_device *net_dev = netdev_notifier_info_to_dev(ptr); ++ ++ ENTER2("0x%lx", event); ++ if (net_dev->ethtool_ops == &ndis_ethtool_ops ++ && event == NETDEV_CHANGENAME) { ++ struct ndis_device *wnd = netdev_priv(net_dev); ++ ++ /* called with rtnl lock held, so no need to lock */ ++ if (likely(wnd->procfs_iface)) { ++ printk(KERN_INFO "%s: interface renamed to '%s'\n", ++ DRIVER_NAME, net_dev->name); ++ wrap_procfs_remove_ndis_device(wnd); ++ wrap_procfs_add_ndis_device(wnd); ++ } ++ } ++ return NOTIFY_DONE; ++} ++ ++static struct notifier_block netdev_notifier = { ++ .notifier_call = notifier_event, ++}; ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) ++static const struct net_device_ops ndis_netdev_ops = { ++ .ndo_init = ndis_net_dev_init, ++ .ndo_uninit = ndis_net_dev_uninit, ++ .ndo_open = ndis_net_dev_open, ++ .ndo_stop = ndis_net_dev_close, ++ .ndo_start_xmit = tx_skbuff, ++ .ndo_change_mtu = ndis_change_mtu, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) ++ .ndo_set_rx_mode = ndis_set_multicast_list, ++#else ++ .ndo_set_multicast_list = ndis_set_multicast_list, ++#endif ++ .ndo_set_mac_address = ndis_set_mac_address, ++ .ndo_get_stats = ndis_get_stats, ++#ifdef CONFIG_NET_POLL_CONTROLLER ++ .ndo_poll_controller = ndis_poll_controller, ++#endif ++}; ++#endif ++ ++static NDIS_STATUS ndis_start_device(struct ndis_device *wnd) ++{ ++ struct wrap_device *wd; ++ struct net_device *net_dev; ++ NDIS_STATUS status; ++ char *buf; ++ const int buf_len = 256; ++ mac_address mac; ++ struct transport_header_offset *tx_header_offset; ++ int n; ++ ++ ENTER2("%d", in_atomic()); ++ status = mp_init(wnd); ++ if (status == NDIS_STATUS_NOT_RECOGNIZED) ++ EXIT1(return NDIS_STATUS_SUCCESS); ++ if (status != NDIS_STATUS_SUCCESS) ++ EXIT1(return status); ++ wd = wnd->wd; ++ net_dev = wnd->net_dev; ++ ++ get_supported_oids(wnd); ++ memset(mac, 0, sizeof(mac)); ++ status = mp_query(wnd, OID_802_3_CURRENT_ADDRESS, mac, sizeof(mac)); ++ if (memcmp(mac, "\x00\x00\x00\x00\x00\x00", sizeof(mac)) == 0) { ++ status = mp_query(wnd, OID_802_3_PERMANENT_ADDRESS, mac, ++ sizeof(mac)); ++ if (status != NDIS_STATUS_SUCCESS) { ++ ERROR("couldn't get mac address: %08X", status); ++ goto err_start; ++ } ++ } ++ TRACE1("mac:" MACSTRSEP, MAC2STR(mac)); ++ memcpy(net_dev->dev_addr, mac, ETH_ALEN); ++ ++ strncpy(net_dev->name, if_name, IFNAMSIZ - 1); ++ net_dev->name[IFNAMSIZ - 1] = 0; ++ ++ wnd->packet_filter = NDIS_PACKET_TYPE_DIRECTED | ++ NDIS_PACKET_TYPE_BROADCAST | NDIS_PACKET_TYPE_MULTICAST; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) ++ net_dev->netdev_ops = &ndis_netdev_ops; ++#else ++ net_dev->init = ndis_net_dev_init; ++ net_dev->uninit = ndis_net_dev_uninit; ++ net_dev->open = ndis_net_dev_open; ++ net_dev->hard_start_xmit = tx_skbuff; ++ net_dev->stop = ndis_net_dev_close; ++ net_dev->get_stats = ndis_get_stats; ++ net_dev->change_mtu = ndis_change_mtu; ++ net_dev->set_multicast_list = ndis_set_multicast_list; ++ net_dev->set_mac_address = ndis_set_mac_address; ++#ifdef CONFIG_NET_POLL_CONTROLLER ++ net_dev->poll_controller = ndis_poll_controller; ++#endif ++#endif ++#ifdef CONFIG_WIRELESS_EXT ++ if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { ++ net_dev->wireless_handlers = &ndis_handler_def; ++ } ++#endif ++ net_dev->ethtool_ops = &ndis_ethtool_ops; ++ if (wnd->mp_interrupt) ++ net_dev->irq = wnd->mp_interrupt->irq; ++ net_dev->mem_start = wnd->mem_start; ++ net_dev->mem_end = wnd->mem_end; ++ status = mp_query_int(wnd, OID_802_3_MAXIMUM_LIST_SIZE, ++ &wnd->multicast_size); ++ if (status != NDIS_STATUS_SUCCESS || wnd->multicast_size < 0) ++ wnd->multicast_size = 0; ++ if (wnd->multicast_size > 0) ++ net_dev->flags |= IFF_MULTICAST; ++ else ++ net_dev->flags &= ~IFF_MULTICAST; ++ ++ buf = kmalloc(buf_len, GFP_KERNEL); ++ if (!buf) { ++ WARNING("couldn't allocate memory"); ++ goto err_start; ++ } ++ ++ set_task_offload(wnd, buf, buf_len); ++#ifdef NETIF_F_LLTX ++ net_dev->features |= NETIF_F_LLTX; ++#endif ++ ++ if (register_netdev(net_dev)) { ++ ERROR("cannot register net device %s", net_dev->name); ++ goto err_register; ++ } ++ memset(buf, 0, buf_len); ++ status = mp_query(wnd, OID_GEN_VENDOR_DESCRIPTION, buf, buf_len); ++ if (status != NDIS_STATUS_SUCCESS) { ++ WARNING("couldn't get vendor information: 0x%x", status); ++ buf[0] = 0; ++ } ++ wnd->drv_ndis_version = n = 0; ++ mp_query_int(wnd, OID_GEN_DRIVER_VERSION, &wnd->drv_ndis_version); ++ mp_query_int(wnd, OID_GEN_VENDOR_DRIVER_VERSION, &n); ++ ++ printk(KERN_INFO "%s: ethernet device " MACSTRSEP " using %sNDIS " ++ "driver: %s, version: 0x%x, NDIS version: 0x%x, vendor: '%s', " ++ "%s\n", net_dev->name, MAC2STR(net_dev->dev_addr), ++ deserialized_driver(wnd) ? "" : "serialized ", ++ wd->driver->name, n, wnd->drv_ndis_version, buf, ++ wd->conf_file_name); ++ ++ if (deserialized_driver(wnd)) { ++ /* deserialized drivers don't have a limit, but we ++ * keep max at TX_RING_SIZE */ ++ wnd->max_tx_packets = TX_RING_SIZE; ++ } else { ++ status = mp_query_int(wnd, OID_GEN_MAXIMUM_SEND_PACKETS, ++ &wnd->max_tx_packets); ++ if (status != NDIS_STATUS_SUCCESS) ++ wnd->max_tx_packets = 1; ++ if (wnd->max_tx_packets > TX_RING_SIZE) ++ wnd->max_tx_packets = TX_RING_SIZE; ++ } ++ TRACE2("maximum send packets: %d", wnd->max_tx_packets); ++ NdisAllocatePacketPoolEx(&status, &wnd->tx_packet_pool, ++ wnd->max_tx_packets, 0, ++ PROTOCOL_RESERVED_SIZE_IN_PACKET); ++ if (status != NDIS_STATUS_SUCCESS) { ++ ERROR("couldn't allocate packet pool"); ++ goto packet_pool_err; ++ } ++ NdisAllocateBufferPool(&status, &wnd->tx_buffer_pool, ++ wnd->max_tx_packets + 4); ++ if (status != NDIS_STATUS_SUCCESS) { ++ ERROR("couldn't allocate buffer pool"); ++ goto buffer_pool_err; ++ } ++ TRACE1("pool: %p", wnd->tx_buffer_pool); ++ ++ if (mp_query_int(wnd, OID_GEN_MAXIMUM_TOTAL_SIZE, &n) == ++ NDIS_STATUS_SUCCESS && n > ETH_HLEN) ++ ndis_change_mtu(wnd->net_dev, n - ETH_HLEN); ++ ++ if (mp_query_int(wnd, OID_GEN_MAC_OPTIONS, &n) == NDIS_STATUS_SUCCESS) ++ TRACE2("mac options supported: 0x%x", n); ++ ++ tx_header_offset = (typeof(tx_header_offset))buf; ++ tx_header_offset->protocol_type = NDIS_PROTOCOL_ID_TCP_IP; ++ tx_header_offset->header_offset = sizeof(ETH_HLEN); ++ status = mp_set(wnd, OID_GEN_TRANSPORT_HEADER_OFFSET, ++ tx_header_offset, sizeof(*tx_header_offset)); ++ TRACE2("%08X", status); ++ ++ status = mp_query_int(wnd, OID_GEN_PHYSICAL_MEDIUM, ++ &wnd->physical_medium); ++ if (status != NDIS_STATUS_SUCCESS) ++ wnd->physical_medium = NdisPhysicalMediumUnspecified; ++ ++#ifdef CONFIG_WIRELESS_EXT ++ if (wnd->physical_medium == NdisPhysicalMediumWirelessLan) { ++ mp_set_int(wnd, OID_802_11_POWER_MODE, NDIS_POWER_OFF); ++ get_encryption_capa(wnd, buf, buf_len); ++ TRACE1("capabilities = %ld", wnd->capa.encr); ++ printk(KERN_INFO "%s: encryption modes supported: " ++ "%s%s%s%s%s%s%s\n", net_dev->name, ++ test_bit(Ndis802_11Encryption1Enabled, &wnd->capa.encr) ? ++ "WEP" : "none", ++ ++ test_bit(Ndis802_11Encryption2Enabled, &wnd->capa.encr) ? ++ "; TKIP with WPA" : "", ++ test_bit(Ndis802_11AuthModeWPA2, &wnd->capa.auth) ? ++ ", WPA2" : "", ++ test_bit(Ndis802_11AuthModeWPA2PSK, &wnd->capa.auth) ? ++ ", WPA2-PSK" : "", ++ ++ test_bit(Ndis802_11Encryption3Enabled, &wnd->capa.encr) ? ++ "; AES/CCMP with WPA" : "", ++ test_bit(Ndis802_11AuthModeWPA2, &wnd->capa.auth) ? ++ ", WPA2" : "", ++ test_bit(Ndis802_11AuthModeWPA2PSK, &wnd->capa.auth) ? ++ ", WPA2-PSK" : ""); ++ ++ set_default_iw_params(wnd); ++ } ++#endif ++ kfree(buf); ++ hangcheck_add(wnd); ++ add_iw_stats_timer(wnd); ++ EXIT1(return NDIS_STATUS_SUCCESS); ++ ++buffer_pool_err: ++ wnd->tx_buffer_pool = NULL; ++ if (wnd->tx_packet_pool) { ++ NdisFreePacketPool(wnd->tx_packet_pool); ++ wnd->tx_packet_pool = NULL; ++ } ++packet_pool_err: ++ unregister_netdev(net_dev); ++ wnd->max_tx_packets = 0; ++err_register: ++ kfree(buf); ++err_start: ++ mp_halt(wnd); ++ EXIT1(return NDIS_STATUS_FAILURE); ++} ++ ++static int ndis_remove_device(struct ndis_device *wnd) ++{ ++ s8 tx_pending; ++ int our_mutex; ++ ++ /* prevent setting essid during disassociation */ ++ memset(&wnd->essid, 0, sizeof(wnd->essid)); ++ wnd->tx_ok = 0; ++ netif_carrier_off(wnd->net_dev); ++ if (wnd->max_tx_packets) ++ unregister_netdev(wnd->net_dev); ++ /* if device is suspended, but resume failed, tx_ring_mutex ++ * may already be locked */ ++ our_mutex = mutex_trylock(&wnd->tx_ring_mutex); ++ if (!our_mutex) ++ WARNING("couldn't obtain tx_ring_mutex"); ++ spin_lock_bh(&wnd->tx_ring_lock); ++ tx_pending = wnd->tx_ring_end - wnd->tx_ring_start; ++ if (tx_pending < 0) ++ tx_pending += TX_RING_SIZE; ++ else if (tx_pending == 0 && wnd->is_tx_ring_full) ++ tx_pending = TX_RING_SIZE - 1; ++ wnd->is_tx_ring_full = 0; ++ /* throw away pending packets */ ++ while (tx_pending-- > 0) { ++ struct ndis_packet *packet; ++ ++ packet = wnd->tx_ring[wnd->tx_ring_start]; ++ free_tx_packet(wnd, packet, NDIS_STATUS_CLOSING); ++ wnd->tx_ring_start = (wnd->tx_ring_start + 1) % TX_RING_SIZE; ++ } ++ spin_unlock_bh(&wnd->tx_ring_lock); ++ if (our_mutex) ++ mutex_unlock(&wnd->tx_ring_mutex); ++ mp_halt(wnd); ++ ndis_exit_device(wnd); ++ ++ if (wnd->tx_packet_pool) { ++ NdisFreePacketPool(wnd->tx_packet_pool); ++ wnd->tx_packet_pool = NULL; ++ } ++ if (wnd->tx_buffer_pool) { ++ NdisFreeBufferPool(wnd->tx_buffer_pool); ++ wnd->tx_buffer_pool = NULL; ++ } ++ kfree(wnd->pmkids); ++ printk(KERN_INFO "%s: device %s removed\n", DRIVER_NAME, ++ wnd->net_dev->name); ++ kfree(wnd->nmb); ++ free_netdev(wnd->net_dev); ++ EXIT2(return 0); ++} ++ ++static NTSTATUS ndis_add_device(struct driver_object *drv_obj, ++ struct device_object *pdo) ++{ ++ struct device_object *fdo; ++ struct ndis_mp_block *nmb; ++ NTSTATUS status; ++ struct ndis_device *wnd; ++ struct net_device *net_dev; ++ struct wrap_device *wd; ++ unsigned long i; ++ ++ ENTER2("%p, %p", drv_obj, pdo); ++ if (strlen(if_name) >= IFNAMSIZ) { ++ ERROR("interface name '%s' is too long", if_name); ++ return STATUS_INVALID_PARAMETER; ++ } ++ net_dev = alloc_etherdev(sizeof(*wnd)); ++ if (!net_dev) { ++ ERROR("couldn't allocate device"); ++ return STATUS_RESOURCES; ++ } ++ wd = pdo->reserved; ++ if (wrap_is_pci_bus(wd->dev_bus)) ++ SET_NETDEV_DEV(net_dev, &wd->pci.pdev->dev); ++ if (wrap_is_usb_bus(wd->dev_bus)) ++ SET_NETDEV_DEV(net_dev, &wd->usb.intf->dev); ++ status = IoCreateDevice(drv_obj, 0, NULL, FILE_DEVICE_UNKNOWN, 0, ++ FALSE, &fdo); ++ if (status != STATUS_SUCCESS) { ++ free_netdev(net_dev); ++ EXIT2(return status); ++ } ++ wnd = netdev_priv(net_dev); ++ TRACE1("wnd: %p", wnd); ++ ++ nmb = kmalloc(sizeof(*nmb), GFP_KERNEL); ++ if (!nmb) { ++ WARNING("couldn't allocate memory"); ++ IoDeleteDevice(fdo); ++ free_netdev(net_dev); ++ return STATUS_RESOURCES; ++ } ++#if DEBUG >= 6 ++ /* poison nmb so if a driver accesses uninitialized pointers, we ++ * know what it is */ ++ for (i = 0; i < sizeof(*nmb) / sizeof(unsigned long); i++) ++ ((unsigned long *)nmb)[i] = i + 0x8a3fc1; ++#endif ++ ++ wnd->nmb = nmb; ++ nmb->wnd = wnd; ++ nmb->pdo = pdo; ++ wnd->wd = wd; ++ wnd->net_dev = net_dev; ++ fdo->reserved = wnd; ++ nmb->fdo = fdo; ++ if (ndis_init_device(wnd)) { ++ IoDeleteDevice(fdo); ++ kfree(nmb); ++ free_netdev(net_dev); ++ EXIT1(return STATUS_RESOURCES); ++ } ++ nmb->next_device = IoAttachDeviceToDeviceStack(fdo, pdo); ++ spin_lock_init(&wnd->tx_ring_lock); ++ mutex_init(&wnd->tx_ring_mutex); ++ mutex_init(&wnd->ndis_req_mutex); ++ wnd->ndis_req_done = 0; ++ INIT_WORK(&wnd->tx_work, tx_worker); ++ wnd->tx_ring_start = 0; ++ wnd->tx_ring_end = 0; ++ wnd->is_tx_ring_full = 0; ++ wnd->capa.encr = 0; ++ wnd->capa.auth = 0; ++ wnd->attributes = 0; ++ wnd->dma_map_count = 0; ++ wnd->dma_map_addr = NULL; ++ wnd->nick[0] = 0; ++ init_timer(&wnd->hangcheck_timer); ++ wnd->scan_timestamp = 0; ++ init_timer(&wnd->iw_stats_timer); ++ wnd->iw_stats_interval = 10 * HZ; ++ wnd->ndis_pending_work = 0; ++ memset(&wnd->essid, 0, sizeof(wnd->essid)); ++ memset(&wnd->encr_info, 0, sizeof(wnd->encr_info)); ++ wnd->infrastructure_mode = Ndis802_11Infrastructure; ++ INIT_WORK(&wnd->ndis_work, wrapndis_worker); ++ wnd->iw_stats_enabled = TRUE; ++ ++ TRACE1("nmb: %p, pdo: %p, fdo: %p, attached: %p, next: %p", ++ nmb, pdo, fdo, fdo->attached, nmb->next_device); ++ ++ /* dispatch routines are called as Windows functions */ ++ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) ++ drv_obj->major_func[i] = WIN_FUNC_PTR(IoPassIrpDown,2); ++ ++ drv_obj->major_func[IRP_MJ_PNP] = WIN_FUNC_PTR(NdisDispatchPnp,2); ++ drv_obj->major_func[IRP_MJ_POWER] = WIN_FUNC_PTR(NdisDispatchPower,2); ++ drv_obj->major_func[IRP_MJ_INTERNAL_DEVICE_CONTROL] = ++ WIN_FUNC_PTR(NdisDispatchDeviceControl,2); ++// drv_obj->major_func[IRP_MJ_DEVICE_CONTROL] = ++// WIN_FUNC_PTR(NdisDispatchDeviceControl,2); ++ EXIT2(return STATUS_SUCCESS); ++} ++ ++int init_ndis_driver(struct driver_object *drv_obj) ++{ ++ ENTER1("%p", drv_obj); ++ drv_obj->drv_ext->add_device = ndis_add_device; ++ return 0; ++} ++ ++int wrapndis_init(void) ++{ ++ wrapndis_wq = create_singlethread_workqueue("wrapndis_wq"); ++ if (!wrapndis_wq) ++ EXIT1(return -ENOMEM); ++ TRACE1("wrapndis_wq: %p", wrapndis_wq); ++ register_netdevice_notifier(&netdev_notifier); ++ return 0; ++} ++ ++void wrapndis_exit(void) ++{ ++ unregister_netdevice_notifier(&netdev_notifier); ++ if (wrapndis_wq) ++ destroy_workqueue(wrapndis_wq); ++} +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.h +--- linux-3.12.2/3rdparty/ndiswrapper/wrapndis.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapndis.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,86 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef _WRAPNDIS_H_ ++#define _WRAPNDIS_H_ ++ ++#include "ndis.h" ++#include "pnp.h" ++ ++int wrapndis_init(void); ++void wrapndis_exit(void); ++ ++NDIS_STATUS mp_reset(struct ndis_device *wnd); ++ ++NDIS_STATUS mp_request(enum ndis_request_type request, ++ struct ndis_device *wnd, ndis_oid oid, ++ void *buf, ULONG buflen, ULONG *written, ULONG *needed); ++ ++static inline NDIS_STATUS mp_query_info(struct ndis_device *wnd, ++ ndis_oid oid, void *buf, ULONG buflen, ++ ULONG *written, ULONG *needed) ++{ ++ return mp_request(NdisRequestQueryInformation, wnd, oid, ++ buf, buflen, written, needed); ++} ++ ++static inline NDIS_STATUS mp_set_info(struct ndis_device *wnd, ++ ndis_oid oid, void *buf, ULONG buflen, ++ ULONG *written, ULONG *needed) ++{ ++ return mp_request(NdisRequestSetInformation, wnd, oid, ++ buf, buflen, written, needed); ++} ++ ++static inline NDIS_STATUS mp_query(struct ndis_device *wnd, ndis_oid oid, ++ void *buf, ULONG buflen) ++{ ++ return mp_request(NdisRequestQueryInformation, wnd, oid, ++ buf, buflen, NULL, NULL); ++} ++ ++static inline NDIS_STATUS mp_query_int(struct ndis_device *wnd, ++ ndis_oid oid, ULONG *data) ++{ ++ return mp_request(NdisRequestQueryInformation, wnd, oid, ++ data, sizeof(ULONG), NULL, NULL); ++} ++ ++static inline NDIS_STATUS mp_set(struct ndis_device *wnd, ndis_oid oid, ++ void *buf, ULONG buflen) ++{ ++ return mp_request(NdisRequestSetInformation, wnd, oid, ++ buf, buflen, NULL, NULL); ++} ++ ++static inline NDIS_STATUS mp_set_int(struct ndis_device *wnd, ++ ndis_oid oid, ULONG data) ++{ ++ return mp_request(NdisRequestSetInformation, wnd, oid, ++ &data, sizeof(ULONG), NULL, NULL); ++} ++ ++void free_tx_packet(struct ndis_device *wnd, struct ndis_packet *packet, ++ NDIS_STATUS status); ++int init_ndis_driver(struct driver_object *drv_obj); ++NDIS_STATUS ndis_reinit(struct ndis_device *wnd); ++void set_media_state(struct ndis_device *wnd, enum ndis_media_state state); ++ ++void hangcheck_add(struct ndis_device *wnd); ++void hangcheck_del(struct ndis_device *wnd); ++ ++struct iw_statistics *get_iw_stats(struct net_device *dev); ++ ++#endif +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.c linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.c +--- linux-3.12.2/3rdparty/ndiswrapper/wrapper.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.c 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#include "ndis.h" ++#include "iw_ndis.h" ++#include "loader.h" ++#include "pnp.h" ++#include "wrapper.h" ++ ++char *if_name = "wlan%d"; ++int proc_uid, proc_gid; ++int hangcheck_interval; ++static char *utils_version = UTILS_VERSION; ++int debug = DEBUG; ++ ++module_param(if_name, charp, 0400); ++MODULE_PARM_DESC(if_name, "Network interface name or template " ++ "(default: wlan%d)"); ++module_param(proc_uid, int, 0600); ++MODULE_PARM_DESC(proc_uid, "The uid of the files created in /proc " ++ "(default: 0)."); ++module_param(proc_gid, int, 0600); ++MODULE_PARM_DESC(proc_gid, "The gid of the files created in /proc " ++ "(default: 0)."); ++module_param(debug, int, 0600); ++MODULE_PARM_DESC(debug, "debug level"); ++ ++/* 0 - default value provided by NDIS driver, ++ * positive value - force hangcheck interval to that many seconds ++ * negative value - disable hangcheck ++ */ ++module_param(hangcheck_interval, int, 0600); ++MODULE_PARM_DESC(hangcheck_interval, "The interval, in seconds, for checking" ++ " if driver is hung. (default: 0)"); ++ ++module_param(utils_version, charp, 0400); ++MODULE_PARM_DESC(utils_version, "Compatible version of utils " ++ "(read only: " UTILS_VERSION ")"); ++ ++MODULE_AUTHOR("ndiswrapper team "); ++#ifdef MODULE_DESCRIPTION ++MODULE_DESCRIPTION("NDIS wrapper driver"); ++#endif ++#ifdef MODULE_VERSION ++MODULE_VERSION(DRIVER_VERSION); ++#endif ++MODULE_LICENSE("GPL"); ++ ++static void module_cleanup(void) ++{ ++ loader_exit(); ++ usb_exit(); ++ wrap_procfs_remove(); ++ wrapndis_exit(); ++ ndis_exit(); ++ ntoskernel_exit(); ++ wrapmem_exit(); ++} ++ ++static int __init wrapper_init(void) ++{ ++#ifdef TAINT_OOT_MODULE ++ add_taint(TAINT_OOT_MODULE, LOCKDEP_NOW_UNRELIABLE); ++#endif ++ printk(KERN_INFO "%s version %s loaded (smp=%s, preempt=%s)\n", ++ DRIVER_NAME, DRIVER_VERSION, ++#ifdef CONFIG_SMP ++ "yes" ++#else ++ "no" ++#endif ++ , ++#ifdef CONFIG_PREEMPT_RT ++ "rt" ++#elif defined(CONFIG_PREEMPT) ++ "yes" ++#else ++ "no" ++#endif ++ ); ++ ++ if (wrapmem_init() || ntoskernel_init() || ndis_init() || ++ wrapndis_init() || usb_init() || wrap_procfs_init() || ++ loader_init()) { ++ module_cleanup(); ++ ERROR("%s: initialization failed", DRIVER_NAME); ++ return -EINVAL; ++ } ++ EXIT1(return 0); ++} ++ ++static void __exit wrapper_exit(void) ++{ ++ ENTER1(""); ++ module_cleanup(); ++} ++ ++module_init(wrapper_init); ++module_exit(wrapper_exit); +diff -Nurp linux-3.12.2/3rdparty/ndiswrapper/wrapper.h linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.h +--- linux-3.12.2/3rdparty/ndiswrapper/wrapper.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/wrapper.h 2013-11-28 21:42:11.000000000 +0200 +@@ -0,0 +1,24 @@ ++/* ++ * Copyright (C) 2003-2005 Pontus Fuchs, Giridhar Pemmasani ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef WRAPPER_H ++#define WRAPPER_H ++ ++extern char *if_name; ++extern int proc_uid; ++extern int proc_gid; ++extern int hangcheck_interval; ++ ++#endif /* WRAPPER_H */ diff --git a/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-Kconfig.patch b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-Kconfig.patch new file mode 100644 index 00000000..f7d26e62 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-Kconfig.patch @@ -0,0 +1,7 @@ +--- linux-2.6.24.orig/3rdparty/ndiswrapper/Kconfig 1969-12-31 21:00:00.000000000 -0300 ++++ linux-2.6.24/3rdparty/ndiswrapper/Kconfig 2007-11-26 15:11:31.000000000 -0200 +@@ -0,0 +1,4 @@ ++ ++config NDISWRAPPER ++ tristate "NDIS driver wrapper support" ++ depends on PCI && USB && !X86_64_XEN diff --git a/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch new file mode 100644 index 00000000..b44f4b29 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-Makefile-build-fix.patch @@ -0,0 +1,45 @@ +--- linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile.orig 2013-11-28 21:42:10.000000000 +0200 ++++ linux-3.12.2-ndiswrapper-1.59/3rdparty/ndiswrapper/Makefile 2013-11-30 21:41:19.550504380 +0200 +@@ -9,24 +9,10 @@ DISTFILES = \ + winnt_types.h workqueue.c wrapmem.c wrapmem.h wrapndis.c wrapndis.h \ + wrapper.c wrapper.h + +-# By default, we try to compile the modules for the currently running +-# kernel. But it's the first approximation, as we will re-read the +-# version from the kernel sources. +-KVERS_UNAME ?= $(shell uname -r) +- + # KBUILD is the path to the Linux kernel build tree. It is usually the + # same as the kernel source tree, except when the kernel was compiled in + # a separate directory. +-KBUILD ?= $(shell readlink -f /lib/modules/$(KVERS_UNAME)/build) +- +-ifeq (,$(KBUILD)) +-$(error Kernel build tree not found - please set KBUILD to configured kernel) +-endif +- +-KCONFIG := $(KBUILD)/.config +-ifeq (,$(wildcard $(KCONFIG))) +-$(error No .config found in $(KBUILD), please set KBUILD to configured kernel) +-endif ++KBUILD ?= $(srctree) + + ifneq (,$(wildcard $(KBUILD)/include/linux/version.h)) + ifneq (,$(wildcard $(KBUILD)/include/generated/uapi/linux/version.h)) +@@ -43,16 +29,9 @@ endif + ifeq (,$(wildcard $(VERSION_H))) + VERSION_H := $(KBUILD)/include/linux/version.h + endif +-ifeq (,$(wildcard $(VERSION_H))) +-$(error Please run 'make modules_prepare' in $(KBUILD)) +-endif + + KVERS := $(shell sed -ne 's/"//g;s/^\#define UTS_RELEASE //p' $(VERSION_H)) + +-ifeq (,$(KVERS)) +-$(error Cannot find UTS_RELEASE in $(VERSION_H), please report) +-endif +- + INST_DIR = /lib/modules/$(KVERS)/misc + + SRC_DIR=$(shell pwd) diff --git a/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-linux-3.14-buildfix.patch b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-linux-3.14-buildfix.patch new file mode 100644 index 00000000..6550b9f2 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-ndiswrapper-linux-3.14-buildfix.patch @@ -0,0 +1,33 @@ + +Fix build with kernel-3.14 + +Signed-off-by: Thomas Backlund + + 3rdparty/ndiswrapper/crt.c | 2 +- + 3rdparty/ndiswrapper/ntoskernel.h | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +--- linux/3rdparty/ndiswrapper/crt.c.orig 2014-04-26 19:10:55.000000000 +0300 ++++ linux/3rdparty/ndiswrapper/crt.c 2014-04-26 19:25:27.766116082 +0300 +@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3) + noregparm void WIN_FUNC(_win_srand,1) + (UINT seed) + { +- net_srandom(seed); ++ prandom_seed((__force u32) seed); + } + + noregparm int WIN_FUNC(rand,0) +--- linux/3rdparty/ndiswrapper/ntoskernel.h.orig 2014-04-26 19:42:32.000000000 +0300 ++++ linux/3rdparty/ndiswrapper/ntoskernel.h 2014-04-26 19:59:13.662522942 +0300 +@@ -798,9 +798,8 @@ do { \ + #define nt_spin_unlock_irqrestore(lock, flags) \ + do { \ + nt_spin_unlock(lock); \ +- preempt_enable_no_resched(); \ ++ preempt_enable(); \ + local_irq_restore(flags); \ +- preempt_check_resched(); \ + } while (0) + + static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length) diff --git a/kernel/kernel/files/patches/mageia/3rd-rfswitch-1.3.patch b/kernel/kernel/files/patches/mageia/3rd-rfswitch-1.3.patch new file mode 100644 index 00000000..e87bf7e0 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rfswitch-1.3.patch @@ -0,0 +1,978 @@ + 3rdparty/rfswitch/FILES | 6 + 3rdparty/rfswitch/ISSUES | 28 +++ + 3rdparty/rfswitch/Kconfig | 22 ++ + 3rdparty/rfswitch/LICENSE | 339 +++++++++++++++++++++++++++++++++++++++++++++ + 3rdparty/rfswitch/Makefile | 119 +++++++++++++++ + 3rdparty/rfswitch/README | 44 +++++ + 3rdparty/rfswitch/av5100.c | 174 +++++++++++++++++++++++ + 3rdparty/rfswitch/pbe5.c | 205 +++++++++++++++++++++++++++ + 8 files changed, 937 insertions(+) +diff -Nurp linux-2.6.37/3rdparty/rfswitch/av5100.c linux-2.6.37.3rdparty/3rdparty/rfswitch/av5100.c +--- linux-2.6.37/3rdparty/rfswitch/av5100.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/av5100.c 2008-03-28 05:25:28.000000000 +0200 +@@ -0,0 +1,174 @@ ++/******************************************************************************* ++ ++ Copyright(c) 2003 - 2004 Intel Corporation. All rights reserved. ++ ++ This program is free software; you can redistribute it and/or modify it ++ under the terms of version 2 of the GNU General Public License as ++ published by the Free Software Foundation. ++ ++ 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., 59 ++ Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ The full GNU General Public License is included in this distribution in the ++ file called LICENSE. ++ ++ Contact Information: ++ James P. Ketrenos ++ Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 ++ ++*******************************************************************************/ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++#define DRV_NAME "av5100" ++#define DRV_VERSION "1.3" ++#define DRV_DESCRIPTION "SW RF kill switch for Averatec 5100P" ++#define DRV_COPYRIGHT "Copyright(c) 2003-2004 Intel Corporation" ++ ++static int radio = 1; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++ ++MODULE_PARM(radio, "i"); ++ ++#else /* LINUX_VERSION_CODE < 2.6.0 */ ++ ++#include ++module_param(radio, int, 1); ++ ++#endif /* LINUX_VERSION_CODE < 2.6.0 */ ++ ++MODULE_PARM_DESC(radio, "controls state of radio (1=on, 0=off)"); ++ ++MODULE_DESCRIPTION(DRV_DESCRIPTION); ++MODULE_AUTHOR(DRV_COPYRIGHT); ++MODULE_LICENSE("GPL"); ++ ++#define AV5100_RADIO_ON (0xe0) ++#define AV5100_RADIO_OFF (0xe1) ++ ++static int av5100_radio = AV5100_RADIO_OFF; ++ ++static void av5100_set_radio(int state) ++{ ++ printk(KERN_INFO DRV_NAME ": Radio being turned %s\n", ++ (state == AV5100_RADIO_ON) ? "ON" : "OFF"); ++ outl(0x80020800, 0xcf8); ++ outb(0x6f, 0x0072); ++ outl(0x1800ffff, 0x1184); ++ outb(state, 0x00b2); ++ av5100_radio = state; ++} ++ ++ ++/* ++ * proc stuff ++ */ ++static struct proc_dir_entry *dir_base = NULL; ++ ++static int proc_set_radio(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ av5100_set_radio(buffer[0] == '0' ? AV5100_RADIO_OFF : AV5100_RADIO_ON); ++ ++ return count; ++} ++ ++static int proc_get_radio(char *page, char **start, off_t offset, ++ int count, int *eof, void *data) ++{ ++ int len = 0; ++ ++ len += snprintf(page, count, DRV_NAME ": %d\n", ++ av5100_radio == AV5100_RADIO_OFF ? 0 : 1); ++ ++ *eof = 1; ++ return len; ++} ++ ++ ++static void av5100_proc_cleanup(void) ++{ ++ if (dir_base) { ++ remove_proc_entry("radio", dir_base); ++ remove_proc_entry(DRV_NAME, &proc_root); ++ dir_base = NULL; ++ } ++} ++ ++ ++static int av5100_proc_init(void) ++{ ++ struct proc_dir_entry *ent; ++ int err = 0; ++ ++ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root); ++ if (dir_base == NULL) { ++ printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" ++ DRV_NAME "\n"); ++ err = -ENOMEM; ++ goto fail; ++ } ++ ++ ++ ent = create_proc_entry("radio", S_IFREG | S_IRUGO | S_IWUSR, ++ dir_base); ++ if (ent) { ++ ent->read_proc = proc_get_radio; ++ ent->write_proc = proc_set_radio; ++ } else { ++ printk(KERN_ERR ++ "Unable to initialize /proc/" DRV_NAME "/radio\n"); ++ err = -ENOMEM; ++ goto fail; ++ } ++ ++ return 0; ++ ++ fail: ++ av5100_proc_cleanup(); ++ return err; ++} ++ ++/* ++ * module stuff ++ */ ++static int __init av5100_init(void) ++{ ++ av5100_proc_init(); ++ ++ av5100_set_radio((radio == 1) ? AV5100_RADIO_ON : AV5100_RADIO_OFF); ++ ++ return 0; ++} ++ ++static void __exit av5100_exit(void) ++{ ++ av5100_set_radio(AV5100_RADIO_OFF); ++ ++ av5100_proc_cleanup(); ++} ++ ++module_init(av5100_init); ++module_exit(av5100_exit); ++ ++/* ++ 1 2 3 4 5 6 7 ++12345678901234567890123456789012345678901234567890123456789012345678901234567890 ++*/ +diff -Nurp linux-2.6.37/3rdparty/rfswitch/FILES linux-2.6.37.3rdparty/3rdparty/rfswitch/FILES +--- linux-2.6.37/3rdparty/rfswitch/FILES 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/FILES 2004-07-09 07:44:19.000000000 +0300 +@@ -0,0 +1,6 @@ ++Makefile Used for building on 2.4, 2.6, internally and exteranlly ++ ++FILES This file ++ ++av5100.c Averatec 5100P SW Switch Module ++pbe5.c Packard Bell Easynote SW Switch Module +diff -Nurp linux-2.6.37/3rdparty/rfswitch/ISSUES linux-2.6.37.3rdparty/3rdparty/rfswitch/ISSUES +--- linux-2.6.37/3rdparty/rfswitch/ISSUES 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/ISSUES 2004-07-09 07:43:22.000000000 +0300 +@@ -0,0 +1,28 @@ ++ ++ISSUES ++------------ ----- ----- ---- --- -- - ++ ++No packets! - RF kill switch ++ ++If the module loads, but no packets are transferred you may have a SW based ++radio kill switch. All laptops have some capability to disable the radio ++via a button or switch. On some laptops that switch is physically tied to the ++IPW2100; simply toggling the switch should enable the radio. ++ ++On other laptops, the switch is a button that when pressed requires some ++software driver to send some hardware command to some other piece of hardware ++on the laptop, that then controls the radio. The driver currently has support ++for the Averatec 5100P laptop's SW switch. Support will be added for other ++laptop vendors as we become aware of them and figure out how to enable the ++radio. ++ ++To know if the radio is being disabled via the RF switch, perform the following: ++ ++% cat /proc/net/ipw2100/eth1/state ++Radio is disabled by RF switch ++ ++If it says that, then your RF switch is currently disabling the radio. The ++driver doesn't currently support switching back to the on state if you have a ++physical RF switch (the radio may turn on and packets will work, but the proc ++entry won't be updated) ++ +diff -Nurp linux-2.6.37/3rdparty/rfswitch/Kconfig linux-2.6.37.3rdparty/3rdparty/rfswitch/Kconfig +--- linux-2.6.37/3rdparty/rfswitch/Kconfig 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/Kconfig 2008-05-27 23:39:10.000000000 +0300 +@@ -0,0 +1,22 @@ ++menu "RF Switch" ++ depends on EXPERIMENTAL ++ ++config RFSWITCH ++ tristate "RF Switch" ++ depends on EXPERIMENTAL ++ ++config AVERATEC_5100P ++ tristate "averatec 5100P driver" ++ depends on RFSWITCH ++ ---help--- ++ This is an experimental driver for the wireless switch ++ of some laptops (usefull with some ipw2x00 cards) ++ ++config PACKARDBELL_E5 ++ tristate "pbe5 driver" ++ depends on RFSWITCH ++ ---help--- ++ This is an experimental driver for the wireless switch ++ of some laptops (usefull with some ipw2x00 cards) ++ ++endmenu +diff -Nurp linux-2.6.37/3rdparty/rfswitch/LICENSE linux-2.6.37.3rdparty/3rdparty/rfswitch/LICENSE +--- linux-2.6.37/3rdparty/rfswitch/LICENSE 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/LICENSE 2004-07-09 07:43:22.000000000 +0300 +@@ -0,0 +1,339 @@ ++ ++"This software program is licensed subject to the GNU General Public License ++(GPL). Version 2, June 1991, available at ++" ++ ++GNU General Public License ++ ++Version 2, June 1991 ++ ++Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ++ ++Everyone is permitted to copy and distribute verbatim copies of this license ++document, but changing it is not allowed. ++ ++Preamble ++ ++The licenses for most software are designed to take away your freedom to ++share and change it. By contrast, the GNU General Public License is intended ++to guarantee your freedom to share and change free software--to make sure ++the software is free for all its users. This General Public License applies ++to most of the Free Software Foundation's software and to any other program ++whose authors commit to using it. (Some other Free Software Foundation ++software is covered by the GNU Library General Public License instead.) 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 this service 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 make restrictions that forbid anyone to ++deny you these rights or to ask you to surrender the rights. These ++restrictions translate to certain responsibilities for you if you distribute ++copies of the software, or if you modify it. ++ ++For example, if you distribute copies of such a program, whether gratis or ++for a fee, you must give the recipients all the rights that you have. 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. ++ ++We protect your rights with two steps: (1) copyright the software, and (2) ++offer you this license which gives you legal permission to copy, distribute ++and/or modify the software. ++ ++Also, for each author's protection and ours, we want to make certain that ++everyone understands that there is no warranty for this free software. If ++the software is modified by someone else and passed on, we want its ++recipients to know that what they have is not the original, so that any ++problems introduced by others will not reflect on the original authors' ++reputations. ++ ++Finally, any free program is threatened constantly by software patents. We ++wish to avoid the danger that redistributors of a free program will ++individually obtain patent licenses, in effect making the program ++proprietary. To prevent this, we have made it clear that any patent must be ++licensed for everyone's free use or not licensed at all. ++ ++The precise terms and conditions for copying, distribution and modification ++follow. ++ ++TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++0. This License applies to any program or other work which contains a notice ++ placed by the copyright holder saying it may be distributed under the ++ terms of this General Public License. The "Program", below, refers to any ++ such program or work, and a "work based on the Program" means either the ++ Program or any derivative work under copyright law: that is to say, a ++ work containing the Program or a portion of it, either verbatim or with ++ modifications and/or translated into another language. (Hereinafter, ++ translation is included without limitation in the term "modification".) ++ Each licensee is addressed as "you". ++ ++ Activities other than copying, distribution and modification are not ++ covered by this License; they are outside its scope. The act of running ++ the Program is not restricted, and the output from the Program is covered ++ only if its contents constitute a work based on the Program (independent ++ of having been made by running the Program). Whether that is true depends ++ on what the Program does. ++ ++1. You may copy and distribute 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 and ++ disclaimer of warranty; keep intact all the notices that refer to this ++ License and to the absence of any warranty; and give any other recipients ++ of the Program a copy of this License along with the Program. ++ ++ You may charge a fee for the physical act of transferring a copy, and you ++ may at your option offer warranty protection in exchange for a fee. ++ ++2. You may modify your copy or copies of the Program or any portion of it, ++ thus forming a work based on the Program, and copy and distribute such ++ modifications or work under the terms of Section 1 above, provided that ++ you also meet all of these conditions: ++ ++ * a) You must cause the modified files to carry prominent notices stating ++ that you changed the files and the date of any change. ++ ++ * b) You must cause any work that you distribute or publish, that in ++ whole or in part contains or is derived from the Program or any part ++ thereof, to be licensed as a whole at no charge to all third parties ++ under the terms of this License. ++ ++ * c) If the modified program normally reads commands interactively when ++ run, you must cause it, when started running for such interactive ++ use in the most ordinary way, to print or display an announcement ++ including an appropriate copyright notice and a notice that there is ++ no warranty (or else, saying that you provide a warranty) and that ++ users may redistribute the program under these conditions, and ++ telling the user how to view a copy of this License. (Exception: if ++ the Program itself is interactive but does not normally print such ++ an announcement, your work based on the Program is not required to ++ print an announcement.) ++ ++ These requirements apply to the modified work as a whole. If identifiable ++ sections of that work are not derived from the Program, and can be ++ reasonably considered independent and separate works in themselves, then ++ this License, and its terms, do not apply to those sections when you ++ distribute them as separate works. But when you distribute the same ++ sections as part of a whole which is a work based on the Program, the ++ distribution of the whole must be on the terms of this License, whose ++ permissions for other licensees extend to the entire whole, and thus to ++ each and every part regardless of who wrote it. ++ ++ Thus, it is not the intent of this section to claim rights or contest ++ your rights to work written entirely by you; rather, the intent is to ++ exercise the right to control the distribution of derivative or ++ collective works based on the Program. ++ ++ In addition, mere aggregation of another work not based on the Program ++ with the Program (or with a work based on the Program) on a volume of a ++ storage or distribution medium does not bring the other work under the ++ scope of this License. ++ ++3. You may copy and distribute the Program (or a work based on it, under ++ Section 2) in object code or executable form under the terms of Sections ++ 1 and 2 above provided that you also do one of the following: ++ ++ * a) Accompany it with the complete corresponding machine-readable source ++ code, which must be distributed under the terms of Sections 1 and 2 ++ above on a medium customarily used for software interchange; or, ++ ++ * b) Accompany it with a written offer, valid for at least three years, ++ to give any third party, for a charge no more than your cost of ++ physically performing source distribution, a complete machine- ++ readable copy of the corresponding source code, to be distributed ++ under the terms of Sections 1 and 2 above on a medium customarily ++ used for software interchange; or, ++ ++ * c) Accompany it with the information you received as to the offer to ++ distribute corresponding source code. (This alternative is allowed ++ only for noncommercial distribution and only if you received the ++ program in object code or executable form with such an offer, in ++ accord with Subsection b above.) ++ ++ The source code for a work means the preferred form of the work for ++ making modifications to it. For an executable work, complete source code ++ means all the source code for all modules it contains, plus any ++ associated interface definition files, plus the scripts used to control ++ compilation and installation of the executable. However, as a special ++ exception, the source code distributed need not include anything that is ++ normally distributed (in either source or binary form) with the major ++ components (compiler, kernel, and so on) of the operating system on which ++ the executable runs, unless that component itself accompanies the ++ executable. ++ ++ If distribution of executable or object code is made by offering access ++ to copy from a designated place, then offering equivalent access to copy ++ the source code from the same place counts as distribution of the source ++ code, even though third parties are not compelled to copy the source ++ along with the object code. ++ ++4. You may not copy, modify, sublicense, or distribute the Program except as ++ expressly provided under this License. Any attempt otherwise to copy, ++ modify, sublicense or distribute the Program is void, and will ++ automatically terminate your rights under this License. However, parties ++ who have received copies, or rights, from you under this License will not ++ have their licenses terminated so long as such parties remain in full ++ compliance. ++ ++5. You are not required to accept this License, since you have not signed ++ it. However, nothing else grants you permission to modify or distribute ++ the Program or its derivative works. These actions are prohibited by law ++ if you do not accept this License. Therefore, by modifying or ++ distributing the Program (or any work based on the Program), you ++ indicate your acceptance of this License to do so, and all its terms and ++ conditions for copying, distributing or modifying the Program or works ++ based on it. ++ ++6. Each time you redistribute the Program (or any work based on the ++ Program), the recipient automatically receives a license from the ++ original licensor to copy, distribute or modify the Program subject to ++ these terms and conditions. You may not impose any further restrictions ++ on the recipients' exercise of the rights granted herein. You are not ++ responsible for enforcing compliance by third parties to this License. ++ ++7. If, as a consequence of a court judgment or allegation of patent ++ infringement or for any other reason (not limited to patent issues), ++ 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 distribute ++ so as to satisfy simultaneously your obligations under this License and ++ any other pertinent obligations, then as a consequence you may not ++ distribute the Program at all. For example, if a patent license would ++ not permit royalty-free redistribution of the Program by all those who ++ receive copies directly or indirectly through you, then the only way you ++ could satisfy both it and this License would be to refrain entirely from ++ distribution of the Program. ++ ++ If any portion of this section is held invalid or unenforceable under any ++ particular circumstance, the balance of the section is intended to apply ++ and the section as a whole is intended to apply in other circumstances. ++ ++ It is not the purpose of this section to induce you to infringe any ++ patents or other property right claims or to contest validity of any ++ such claims; this section has the sole purpose of protecting the ++ integrity of the free software distribution system, which is implemented ++ by public license practices. Many people have made generous contributions ++ to the wide range of software distributed through that system in ++ reliance on consistent application of that system; it is up to the ++ author/donor to decide if he or she is willing to distribute software ++ through any other system and a licensee cannot impose that choice. ++ ++ This section is intended to make thoroughly clear what is believed to be ++ a consequence of the rest of this License. ++ ++8. If the distribution and/or use of the Program is restricted in certain ++ countries either by patents or by copyrighted interfaces, the original ++ copyright holder who places the Program under this License may add an ++ explicit geographical distribution limitation excluding those countries, ++ so that distribution is permitted only in or among countries not thus ++ excluded. In such case, this License incorporates the limitation as if ++ written in the body of this License. ++ ++9. The Free Software Foundation may publish revised and/or new versions of ++ the 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 a version number of this License which applies to it and "any ++ later version", you have the option of following the terms and ++ conditions either of that version or of any later version published by ++ the Free Software Foundation. If the Program does not specify a version ++ number of this License, you may choose any version ever published by the ++ Free Software Foundation. ++ ++10. If you wish to incorporate parts of the Program into other free programs ++ whose distribution conditions are different, write to the author to ask ++ for permission. For software which is copyrighted by the Free Software ++ Foundation, write to the Free Software Foundation; we sometimes make ++ exceptions for this. Our decision will be guided by the two goals of ++ preserving the free status of all derivatives of our free software and ++ of promoting the sharing and reuse of software generally. ++ ++ NO WARRANTY ++ ++11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. ++ ++12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ++ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ++ REDISTRIBUTE 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. ++ ++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 convey 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 an idea of what it does. ++Copyright (C) yyyy 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 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., 59 ++Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++If the program is interactive, make it output a short notice like this when ++it starts in an interactive mode: ++ ++Gnomovision version 69, Copyright (C) year name of author Gnomovision 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, the commands you use may be ++called something other than 'show w' and 'show c'; they could even be ++mouse-clicks or menu items--whatever suits your program. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a "copyright disclaimer" for the program, if ++necessary. Here is a sample; alter the names: ++ ++Yoyodyne, Inc., hereby disclaims all copyright interest in the program ++'Gnomovision' (which makes passes at compilers) written by James Hacker. ++ ++signature of Ty Coon, 1 April 1989 ++Ty Coon, President of Vice ++ ++This 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 Library General Public ++License instead of this License. +diff -Nurp linux-2.6.37/3rdparty/rfswitch/Makefile linux-2.6.37.3rdparty/3rdparty/rfswitch/Makefile +--- linux-2.6.37/3rdparty/rfswitch/Makefile 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/Makefile 2008-03-28 05:17:16.000000000 +0200 +@@ -0,0 +1,119 @@ ++# ++# Makefile for the SW RF Switch kernel modules ++# ++# NOTE: This make file can serve as both an external Makefile (launched ++# directly by the user), or as the sub-dir Makefile used by the kernel ++# build system. ++ ++ ++CONFIG_AVERATEC_5100P=m ++CONFIG_PACKARDBELL_E5=m ++ ++ ++ ++list-m := ++list-$(CONFIG_AVERATEC_5100P) += av5100 ++list-$(CONFIG_PACKARDBELL_E5) += pbe5 ++ ++ ++obj-$(CONFIG_AVERATEC_5100P) += av5100.o ++obj-$(CONFIG_PACKARDBELL_E5) += pbe5.o ++ ++# ++# Begin dual Makefile mode here. First we provide support for when we ++# are being invoked by the kernel build system ++# ++ifneq ($(KERNELRELEASE),) ++ ++ifneq ($(PATCHLEVEL),6) # If we are not on a 2.6, then do 2.4 specific things ++ ++O_TARGET := rfswitch.o ++ ++include $(TOPDIR)/Rules.make ++ ++endif # End if 2.4 specific settings ++ ++else ++# Here we begin the portion that is executed if the user invoked this Makefile ++# directly. ++ ++# KSRC should be set to the path to your sources ++# modules are installed into KMISC ++KVER := $(shell uname -r) ++KSRC := /lib/modules/$(KVER)/build ++KMISC := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ ++ ++# KSRC_OUTPUT should be overridden if you are using a 2.6 kernel that ++# has it's output sent elsewhere via KBUILD_OUTPUT= or O= ++KSRC_OUTPUT := $(KSRC) ++ ++# If we find Rules.make, we can assume we're using the old 2.4 style building ++OLDMAKE=$(wildcard $(KSRC)/Rules.make) ++PWD=$(shell pwd) ++ ++VERFILE := $(KSRC_OUTPUT)/include/linux/version.h ++KERNELRELEASE := $(shell \ ++ if [ -r $(VERFILE) ]; then \ ++ (cat $(VERFILE); echo UTS_RELEASE) | \ ++ $(CC) -I$(KSRC_OUTPUT) $(CFLAGS) -E - | \ ++ tail -n 1 | \ ++ xargs echo; \ ++ else \ ++ uname -r; \ ++ fi) ++ ++MODPATH := $(DESTDIR)/lib/modules/$(KERNELRELEASE) ++ ++all: modules ++ ++clean: ++ rm -f *.mod.c *.mod *.o *.ko .*.cmd .*.flags Modules.symvers ++ rm -rf $(PWD)/tmp ++ ++ ++ifeq ($(OLDMAKE),) ++ ++TMP=$(PWD)/tmp ++MODVERDIR=$(TMP)/.tmp_versions ++ ++modules: ++ifdef ($(KSRC_OUTPUT)/.tmp_versions) ++ mkdir -p $(MODVERDIR) ++ -cp $(KSRC_OUTPUT)/.tmp_versions/*.mod $(MODVERDIR) ++endif ++ifeq ($(KSRC),$(KSRC_OUTPUT)) # We're not outputting elsewhere ++ifdef ($(KSRC)/.tmp_versions) ++ -cp $(KSRC)/.tmp_versions/*.mod $(MODVERDIR) ++endif ++ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(MODVERDIR) modules ++else # We've got a kernel with seperate output, copy the config, and use O= ++ mkdir -p $(TMP) ++ cp $(KSRC_OUTPUT)/.config $(TMP) ++ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) MODVERDIR=$(MODVERDIR) O=$(PWD)/tmp modules ++endif ++ ++install: modules ++ install -d $(KMISC) ++ install -m 644 -c $(addsuffix .ko,$(list-m)) $(KMISC) ++ /sbin/depmod -a ++ ++ ++else # We're on 2.4, and things are slightly different ++ ++modules: ++ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) BUILD_DIR=$(PWD) modules ++ ++install: modules ++ install -d $(KMISC) ++ install -m 644 -c $(addsuffix .o,$(list-m)) $(KMISC) ++ /sbin/depmod -a ++ ++endif ++ ++uninstall: ++ cd $(KMISC) ++ rm -rf $(addsuffix .ko,$(list-m)) ++ cd - ++ /sbin/depmod -a ++ ++endif +diff -Nurp linux-2.6.37/3rdparty/rfswitch/pbe5.c linux-2.6.37.3rdparty/3rdparty/rfswitch/pbe5.c +--- linux-2.6.37/3rdparty/rfswitch/pbe5.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/pbe5.c 2008-03-28 05:25:16.000000000 +0200 +@@ -0,0 +1,205 @@ ++/******************************************************************************* ++ ++ This program is free software; you can redistribute it and/or modify it ++ under the terms of version 2 of the GNU General Public License as ++ published by the Free Software Foundation. ++ ++ 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., 59 ++ Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ ++ The full GNU General Public License is included in this distribution in the ++ file called LICENSE. ++ ++ Author: ++ Pedro Ramalhais ++ ++ Based on: ++ av5100.c from http://ipw2100.sourceforge.net/ ++ ++*******************************************************************************/ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_NAME "pbe5" ++#define DRV_VERSION "1.3" ++#define DRV_DESCRIPTION "SW RF kill switch for Packard Bell EasyNote E5" ++#define DRV_AUTHOR "Pedro Ramalhais" ++#define DRV_LICENSE "GPL" ++ ++static int radio = 1; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) ++ ++MODULE_PARM(radio, "i"); ++ ++#else /* LINUX_VERSION_CODE < 2.6.0 */ ++ ++#include ++module_param(radio, int, 1); ++ ++#endif /* LINUX_VERSION_CODE < 2.6.0 */ ++ ++MODULE_PARM_DESC(radio, "controls state of radio (1=on, 0=off)"); ++ ++MODULE_DESCRIPTION(DRV_DESCRIPTION); ++MODULE_AUTHOR(DRV_AUTHOR); ++MODULE_LICENSE(DRV_LICENSE); ++ ++/* ++ * NOTE: These values were obtained from disassembling the Icon.exe program ++ * installed in the Packard Bell EasyNote E5 laptop. The names were guessed, ++ * so don't rely on them. ++ */ ++#define PBE5_PORT_TOGGLE 0x0b3 ++#define PBE5_VALUE_TOGGLE_ON 0x01 ++#define PBE5_VALUE_TOGGLE_OFF 0x00 ++#define PBE5_PORT_APPLY 0x0b2 ++#define PBE5_VALUE_APPLY 0xef ++ ++// Some "booleans" =;-) ++#define PBE5_RADIO_OFF 0 ++#define PBE5_RADIO_ON 1 ++ ++static int pbe5_radio_status = PBE5_RADIO_ON; ++ ++unsigned char pbe5_get_radio(void) ++{ ++ unsigned char val = 0x00; ++ ++ val = inb(PBE5_PORT_TOGGLE); ++ ++ return val; ++} ++ ++static void pbe5_set_radio(int state_set) ++{ ++ pbe5_radio_status = pbe5_get_radio(); ++ ++ if (pbe5_radio_status != state_set) { ++ // Set the radio toggle register ++ outb(PBE5_VALUE_TOGGLE_ON, PBE5_PORT_TOGGLE); ++ // Commit the radio toggle register value ++ outb(PBE5_VALUE_APPLY, PBE5_PORT_APPLY); ++ // Update the radio status ++ pbe5_radio_status = pbe5_get_radio(); ++ ++ printk(KERN_INFO DRV_NAME ": Radio turned %s\n", ++ (state_set == PBE5_RADIO_ON) ? "ON" : "OFF"); ++ } else { ++ printk(KERN_INFO DRV_NAME ": Radio already %s\n", ++ (state_set == PBE5_RADIO_ON) ? "ON" : "OFF"); ++ } ++} ++ ++ ++/* ++ * proc stuff ++ */ ++static struct proc_dir_entry *dir_base = NULL; ++ ++static int proc_set_radio(struct file *file, const char *buffer, ++ unsigned long count, void *data) ++{ ++ pbe5_set_radio(buffer[0] == '0' ? PBE5_RADIO_OFF : PBE5_RADIO_ON); ++ ++ return count; ++} ++ ++static int proc_get_radio(char *page, char **start, off_t offset, ++ int count, int *eof, void *data) ++{ ++ int len = 0; ++ ++ len += snprintf(page, count, DRV_NAME ": %d\n", ++ pbe5_radio_status == PBE5_RADIO_OFF ? 0 : 1); ++ ++ *eof = 1; ++ return len; ++} ++ ++ ++static void pbe5_proc_cleanup(void) ++{ ++ if (dir_base) { ++ remove_proc_entry("radio", dir_base); ++ remove_proc_entry(DRV_NAME, &proc_root); ++ dir_base = NULL; ++ } ++} ++ ++ ++static int pbe5_proc_init(void) ++{ ++ struct proc_dir_entry *ent; ++ int err = 0; ++ ++ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root); ++ if (dir_base == NULL) { ++ printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" ++ DRV_NAME "\n"); ++ err = -ENOMEM; ++ goto fail; ++ } ++ ++ ++ ent = create_proc_entry("radio", S_IFREG | S_IRUGO | S_IWUSR, ++ dir_base); ++ if (ent) { ++ ent->read_proc = proc_get_radio; ++ ent->write_proc = proc_set_radio; ++ } else { ++ printk(KERN_ERR ++ "Unable to initialize /proc/" DRV_NAME "/radio\n"); ++ err = -ENOMEM; ++ goto fail; ++ } ++ ++ return 0; ++ ++ fail: ++ pbe5_proc_cleanup(); ++ return err; ++} ++ ++/* ++ * module stuff ++ */ ++static int __init pbe5_init(void) ++{ ++ pbe5_proc_init(); ++ ++ pbe5_set_radio((radio == 1) ? PBE5_RADIO_ON : PBE5_RADIO_OFF); ++ ++ return 0; ++} ++ ++static void __exit pbe5_exit(void) ++{ ++ pbe5_set_radio(PBE5_RADIO_OFF); ++ ++ pbe5_proc_cleanup(); ++} ++ ++module_init(pbe5_init); ++module_exit(pbe5_exit); ++ ++/* ++ 1 2 3 4 5 6 7 ++12345678901234567890123456789012345678901234567890123456789012345678901234567890 ++*/ +diff -Nurp linux-2.6.37/3rdparty/rfswitch/README linux-2.6.37.3rdparty/3rdparty/rfswitch/README +--- linux-2.6.37/3rdparty/rfswitch/README 1970-01-01 02:00:00.000000000 +0200 ++++ linux-2.6.37.3rdparty/3rdparty/rfswitch/README 2004-07-09 17:26:20.000000000 +0300 +@@ -0,0 +1,44 @@ ++Radio Kill Switch ++------------ ----- ----- ---- --- -- - ++Most laptops provide the ability for the user to physically disable the radio. ++Some vendors have implemented this as a physical switch that requires no ++software to turn the radio off and on. On other laptops, however, the switch ++is controlled through a button being pressed and a software driver then making ++calls to turn the radio off and on. This is referred to as a "software based ++RF kill switch" ++ ++Currently this project provides modules for controlling the software RF kill ++switch on the Averatec 5100P and Packard Bell EasyNote E5. The code may work ++on other laptops, but these are the only models on which it has been tested. ++ ++To determine if you have a system that might be compatible with one of the ++provided SW RF Kill switch modules, you can run: ++ ++ ++ To check for the Packard Bell (to use module pbe) -- ++ ++ % dd if=/dev/mem bs=1 skip=983040 count=65535 2>/dev/null | strings | egrep "NEW-PC|Insyde Software MobilePRO BIOS" ++ ++ To check for the Averatec (to use module av5100) -- ++ ++ % dd if=/dev/mem bs=1 skip=983040 count=65535 2>/dev/null | strings | egrep "AVERATEC" ++ ++If you have one of those laptop models you can imply loading the av5100/pbe5 ++module and the radio will be toggled on and off. In addition, you can turn ++the driver on and off by writing either a 1 or 0 to /proc/av5100/radio or ++/proc/pbe5/radio. If you automatically load the av5100/pbe5 module when your ++system boots, you may wish to use the radio module parameter to control the ++state of the radio upon loading: ++ ++ modprobe av5100 radio=0 ++ modprobe pbe5 radio=0 ++ ++results in the module loading with the radio turned off. You can then turn the ++radio on by: ++ ++ echo 1 > /proc/av5100/radio ++ echo 1 > /proc/pbe5/radio ++ ++If you have a SW RF kill switch and can not use one of the above modules, ++please join us on IRC (irc.freenode.net) on channel #ipw2100 and someone may ++be able to help. diff --git a/kernel/kernel/files/patches/mageia/3rd-rfswitch-3.0-buildfix.patch b/kernel/kernel/files/patches/mageia/3rd-rfswitch-3.0-buildfix.patch new file mode 100644 index 00000000..7bfc2c64 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rfswitch-3.0-buildfix.patch @@ -0,0 +1,19 @@ + +fix build with 3.0 + +Signed-off-by: Thomas Backlund + + 3rdparty/rfswitch/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +--- a/3rdparty/rfswitch/Makefile.orig 2011-07-15 02:37:27.000000000 +0300 ++++ a/3rdparty/rfswitch/Makefile 2011-07-15 13:47:10.463914526 +0300 +@@ -29,8 +29,6 @@ ifneq ($(PATCHLEVEL),6) # If we are not + + O_TARGET := rfswitch.o + +-include $(TOPDIR)/Rules.make +- + endif # End if 2.4 specific settings + + else diff --git a/kernel/kernel/files/patches/mageia/3rd-rfswitch-build-fix.patch b/kernel/kernel/files/patches/mageia/3rd-rfswitch-build-fix.patch new file mode 100644 index 00000000..ab1c279c --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rfswitch-build-fix.patch @@ -0,0 +1,51 @@ +Remove 'proc_root' usage + +Commit c74c120a21d87b0b6925ada5830d8cac21e852d9 (Linus's tree) removed +the export of 'proc_root' variable, because you can create on the proc's +root directory by passing NULL where you would pass 'proc_root'. + +Signed-off-by: Luiz Fernando N. Capitulino +Index: linux-2.6.25/3rdparty/rfswitch/av5100.c +=================================================================== +--- linux-2.6.25.orig/3rdparty/rfswitch/av5100.c ++++ linux-2.6.25/3rdparty/rfswitch/av5100.c +@@ -107,7 +107,7 @@ static void av5100_proc_cleanup(void) + { + if (dir_base) { + remove_proc_entry("radio", dir_base); +- remove_proc_entry(DRV_NAME, &proc_root); ++ remove_proc_entry(DRV_NAME, NULL); + dir_base = NULL; + } + } +@@ -118,7 +118,7 @@ static int av5100_proc_init(void) + struct proc_dir_entry *ent; + int err = 0; + +- dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root); ++ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, NULL); + if (dir_base == NULL) { + printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" + DRV_NAME "\n"); +Index: linux-2.6.25/3rdparty/rfswitch/pbe5.c +=================================================================== +--- linux-2.6.25.orig/3rdparty/rfswitch/pbe5.c ++++ linux-2.6.25/3rdparty/rfswitch/pbe5.c +@@ -138,7 +138,7 @@ static void pbe5_proc_cleanup(void) + { + if (dir_base) { + remove_proc_entry("radio", dir_base); +- remove_proc_entry(DRV_NAME, &proc_root); ++ remove_proc_entry(DRV_NAME, NULL); + dir_base = NULL; + } + } +@@ -149,7 +149,7 @@ static int pbe5_proc_init(void) + struct proc_dir_entry *ent; + int err = 0; + +- dir_base = create_proc_entry(DRV_NAME, S_IFDIR, &proc_root); ++ dir_base = create_proc_entry(DRV_NAME, S_IFDIR, NULL); + if (dir_base == NULL) { + printk(KERN_ERR DRV_NAME ": Unable to initialise /proc/" + DRV_NAME "\n"); diff --git a/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-buildfix.patch b/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-buildfix.patch new file mode 100644 index 00000000..61c96c46 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-buildfix.patch @@ -0,0 +1,23 @@ +From 842e61cb85813b1ed8a1646cbe6739950c0c9822 Mon Sep 17 00:00:00 2001 +From: Larry Finger +Date: Thu, 7 May 2015 19:08:17 +0000 +Subject: [PATCH] rtl8723bs: Fix Makefile to allow warnings + +Signed-off-by: Larry Finger +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git linux.old/3rdparty/rtl8723bs/Makefile linux/3rdparty/rtl8723bs/Makefile +index a4d9f45..4da73fa 100644 +--- linux.old/3rdparty/rtl8723bs/Makefile ++++ linux/3rdparty/rtl8723bs/Makefile +@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -O1 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall + #EXTRA_CFLAGS += -Wextra +-EXTRA_CFLAGS += -Werror ++#EXTRA_CFLAGS += -Werror + #EXTRA_CFLAGS += -pedantic + #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes + diff --git a/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-revert-4.0-changes.patch b/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-revert-4.0-changes.patch new file mode 100644 index 00000000..fbea7652 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-revert-4.0-changes.patch @@ -0,0 +1,73 @@ + +This reverts the parts of: + +commit 86fe2db84ba7b9a83b60323cd805198ff43136ec +Author: Bastien Nocera +Date: Fri Mar 20 18:28:08 2015 +0100 + + cfg80211: Update for newest mac80211 API + + +that breaks building with 3.19 series kernels. + + + +Signed-off-by: Thomas Backlund + + +diff -Nurp linux/3rdparty/rtl8723bs.rev/include/ioctl_cfg80211.h linux/3rdparty/rtl8723bs/include/ioctl_cfg80211.h +--- linux/3rdparty/rtl8723bs.rev/include/ioctl_cfg80211.h 2015-05-07 17:46:55.000000000 +0300 ++++ linux/3rdparty/rtl8723bs/include/ioctl_cfg80211.h 2015-05-10 14:55:44.744038033 +0300 +@@ -22,10 +22,6 @@ + + #include + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) +-#error This driver only works with kernel 4.0 +-#endif +- + struct rtw_wdev_invit_info { + u8 state; /* 0: req, 1:rep */ + u8 peer_mac[ETH_ALEN]; +diff -Nurp linux/3rdparty/rtl8723bs.rev/os_dep/ioctl_cfg80211.c linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c +--- linux/3rdparty/rtl8723bs.rev/os_dep/ioctl_cfg80211.c 2015-05-10 14:54:53.241616597 +0300 ++++ linux/3rdparty/rtl8723bs/os_dep/ioctl_cfg80211.c 2015-05-10 14:49:42.766354711 +0300 +@@ -1289,16 +1289,16 @@ static int cfg80211_rtw_get_station(stru + goto exit; + } + +- sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); ++ sinfo->filled |= STATION_INFO_SIGNAL; + sinfo->signal = translate_percentage_to_dbm(padapter->recvpriv.signal_strength); + +- sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE); ++ sinfo->filled |= STATION_INFO_TX_BITRATE; + sinfo->txrate.legacy = rtw_get_cur_max_rate(padapter); + +- sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS); ++ sinfo->filled |= STATION_INFO_RX_PACKETS; + sinfo->rx_packets = sta_rx_data_pkts(psta); + +- sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS); ++ sinfo->filled |= STATION_INFO_TX_PACKETS; + sinfo->tx_packets = psta->sta_stats.tx_pkts; + + } +@@ -2473,6 +2473,7 @@ void rtw_cfg80211_indicate_sta_assoc(_ad + ie_offset = _REASOCREQ_IE_OFFSET_; + + sinfo.filled = 0; ++ sinfo.filled = STATION_INFO_ASSOC_REQ_IES; + sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset; + sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset; + cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC); +@@ -3078,7 +3079,8 @@ static int cfg80211_rtw_dump_station(str + goto exit; + } + memcpy(mac, psta->hwaddr, ETH_ALEN); +- sinfo->filled = BIT(NL80211_STA_INFO_SIGNAL); ++ sinfo->filled = 0; ++ sinfo->filled |= STATION_INFO_SIGNAL; + sinfo->signal = psta->rssi; + + exit: diff --git a/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-updates.patch b/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-updates.patch new file mode 100644 index 00000000..a620e888 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/3rd-rtl8723bs-updates.patch @@ -0,0 +1,28991 @@ + +Updates / cleanups from: + +git://github.com/hadess/rtl8723bs.git + +Topmost commit: + +commit 8d329c00dba5d8805a738ecea2bddde8eb0e4945 +Author: Bastien Nocera +Date: Tue May 5 18:30:38 2015 +0200 + + ioctl_linux: Fix compiling with Wake-On-LAN support + + + +Signed-off-by: Thomas backlund + +diff -Nurp linux/3rdparty/rtl8723bs.old/core/rtw_ap.c linux/3rdparty/rtl8723bs/core/rtw_ap.c +--- linux/3rdparty/rtl8723bs.old/core/rtw_ap.c 2015-05-10 14:36:05.663667846 +0300 ++++ linux/3rdparty/rtl8723bs/core/rtw_ap.c 2015-05-07 17:46:55.000000000 +0300 +@@ -21,9 +21,6 @@ + + #include + +- +-#ifdef CONFIG_AP_MODE +- + extern unsigned char RTW_WPA_OUI[]; + extern unsigned char WMM_OUI[]; + extern unsigned char WPS_OUI[]; +@@ -32,7 +29,6 @@ extern unsigned char WFD_OUI[]; + + void init_mlme_ap_info(_adapter *padapter) + { +- struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + struct sta_priv *pstapriv = &padapter->stapriv; + struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; +@@ -71,9 +67,9 @@ void free_mlme_ap_info(_adapter *padapte + + //free bc/mc sta_info + psta = rtw_get_bcmc_stainfo(padapter); +- _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_lock_bh(&(pstapriv->sta_hash_lock)); + rtw_free_stainfo(padapter, psta); +- _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_unlock_bh(&(pstapriv->sta_hash_lock)); + } + + static void update_BCNTIM(_adapter *padapter) +@@ -191,7 +187,7 @@ static void update_BCNTIM(_adapter *pada + { + memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen); + +- rtw_mfree(pbackup_remainder_ie, remainder_ielen); ++ kfree(pbackup_remainder_ie); + } + + offset = (uint)(dst_ie - pie); +@@ -200,122 +196,6 @@ static void update_BCNTIM(_adapter *pada + } + } + +-void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) +-{ +- PNDIS_802_11_VARIABLE_IEs pIE; +- u8 bmatch = false; +- u8 *pie = pnetwork->IEs; +- u8 *p=NULL, *dst_ie=NULL, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; +- u32 i, offset, ielen, ie_offset, remainder_ielen = 0; +- +- for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;) +- { +- pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i); +- +- if (pIE->ElementID > index) +- { +- break; +- } +- else if(pIE->ElementID == index) // already exist the same IE +- { +- p = (u8 *)pIE; +- ielen = pIE->Length; +- bmatch = true; +- break; +- } +- +- p = (u8 *)pIE; +- ielen = pIE->Length; +- i += (pIE->Length + 2); +- } +- +- if (p != NULL && ielen>0) +- { +- ielen += 2; +- +- premainder_ie = p+ielen; +- +- ie_offset = (sint)(p -pie); +- +- remainder_ielen = pnetwork->IELength - ie_offset - ielen; +- +- if(bmatch) +- dst_ie = p; +- else +- dst_ie = (p+ielen); +- } +- +- if(dst_ie == NULL) +- return; +- +- if(remainder_ielen>0) +- { +- pbackup_remainder_ie = rtw_malloc(remainder_ielen); +- if(pbackup_remainder_ie && premainder_ie) +- memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); +- } +- +- *dst_ie++=index; +- *dst_ie++=len; +- +- memcpy(dst_ie, data, len); +- dst_ie+=len; +- +- //copy remainder IE +- if(pbackup_remainder_ie) +- { +- memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen); +- +- rtw_mfree(pbackup_remainder_ie, remainder_ielen); +- } +- +- offset = (uint)(dst_ie - pie); +- pnetwork->IELength = offset + remainder_ielen; +-} +- +-void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index) +-{ +- u8 *p, *dst_ie=NULL, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; +- uint offset, ielen, ie_offset, remainder_ielen = 0; +- u8 *pie = pnetwork->IEs; +- +- p = rtw_get_ie(pie + _FIXED_IE_LENGTH_, index, &ielen, pnetwork->IELength - _FIXED_IE_LENGTH_); +- if (p != NULL && ielen>0) +- { +- ielen += 2; +- +- premainder_ie = p+ielen; +- +- ie_offset = (sint)(p -pie); +- +- remainder_ielen = pnetwork->IELength - ie_offset - ielen; +- +- dst_ie = p; +- } +- else { +- return; +- } +- +- if(remainder_ielen>0) +- { +- pbackup_remainder_ie = rtw_malloc(remainder_ielen); +- if(pbackup_remainder_ie && premainder_ie) +- memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen); +- } +- +- //copy remainder IE +- if(pbackup_remainder_ie) +- { +- memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen); +- +- rtw_mfree(pbackup_remainder_ie, remainder_ielen); +- } +- +- offset = (uint)(dst_ie - pie); +- pnetwork->IELength = offset + remainder_ielen; +-} +- +- + u8 chk_sta_is_alive(struct sta_info *psta); + u8 chk_sta_is_alive(struct sta_info *psta) + { +@@ -349,19 +229,19 @@ void expire_timeout_chk(_adapter *padapt + int i; + + +- _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); ++ spin_lock_bh(&pstapriv->auth_list_lock); + + phead = &pstapriv->auth_list; + plist = get_next(phead); + + //check auth_queue + #ifdef DBG_EXPIRATION_CHK +- if (rtw_end_of_queue_search(phead, plist) == false) { ++ if (phead != plist) { + DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n" + , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt); + } + #endif +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + psta = LIST_CONTAINOR(plist, struct sta_info, auth_list); + +@@ -372,41 +252,41 @@ void expire_timeout_chk(_adapter *padapt + psta->expire_to--; + if (psta->expire_to == 0) + { +- rtw_list_delete(&psta->auth_list); ++ list_del_init(&psta->auth_list); + pstapriv->auth_list_cnt--; + + DBG_871X("auth expire %02X%02X%02X%02X%02X%02X\n", + psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]); + +- _exit_critical_bh(&pstapriv->auth_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->auth_list_lock); + +- _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_lock_bh(&(pstapriv->sta_hash_lock)); + rtw_free_stainfo(padapter, psta); +- _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_unlock_bh(&(pstapriv->sta_hash_lock)); + +- _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); ++ spin_lock_bh(&pstapriv->auth_list_lock); + } + } + + } + +- _exit_critical_bh(&pstapriv->auth_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->auth_list_lock); + psta = NULL; + + +- _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_lock_bh(&pstapriv->asoc_list_lock); + + phead = &pstapriv->asoc_list; + plist = get_next(phead); + + //check asoc_queue + #ifdef DBG_EXPIRATION_CHK +- if (rtw_end_of_queue_search(phead, plist) == false) { ++ if (phead != plist) { + DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n" + , FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt); + } + #endif +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + plist = get_next(plist); +@@ -417,14 +297,13 @@ void expire_timeout_chk(_adapter *padapt + if (chk_sta_is_alive(psta) || !psta->expire_to) { + psta->expire_to = pstapriv->expire_to; + psta->keep_alive_trycnt = 0; +- #ifdef CONFIG_TX_MCAST2UNI + psta->under_exist_checking = 0; +- #endif // CONFIG_TX_MCAST2UNI + } else { +- psta->expire_to--; ++ if (psta->expire_to > 0) ++ psta->expire_to--; + } + +- if (psta->expire_to <= 0) ++ if (psta->expire_to == 0) + { + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + +@@ -460,7 +339,7 @@ void expire_timeout_chk(_adapter *padapt + + continue; + } +- rtw_list_delete(&psta->asoc_list); ++ list_del_init(&psta->asoc_list); + pstapriv->asoc_list_cnt--; + DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); + updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING); +@@ -479,7 +358,7 @@ void expire_timeout_chk(_adapter *padapt + } + } + +- _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->asoc_list_lock); + + if (chk_alive_num) { + +@@ -521,13 +400,13 @@ if (chk_alive_num) { + + psta->keep_alive_trycnt = 0; + DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); +- _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); +- if (rtw_is_list_empty(&psta->asoc_list)==false) { +- rtw_list_delete(&psta->asoc_list); ++ spin_lock_bh(&pstapriv->asoc_list_lock); ++ if (list_empty(&psta->asoc_list)==false) { ++ list_del_init(&psta->asoc_list); + pstapriv->asoc_list_cnt--; + updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING); + } +- _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->asoc_list_lock); + + } + +@@ -544,13 +423,10 @@ void add_RATid(_adapter *padapter, struc + u8 rf_type; + unsigned char sta_band = 0, shortGIrate = false; + unsigned int tx_ra_bitmap=0; +- struct ht_priv *psta_ht = NULL; + struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; + +- if(psta) +- psta_ht = &psta->htpriv; +- else ++ if(!psta) + return; + + if(!(psta->state & _FW_LINKED)) +@@ -672,9 +548,9 @@ void update_bmc_sta(_adapter *padapter) + + rtw_sta_media_status_rpt(padapter, psta, 1); + +- _enter_critical_bh(&psta->lock, &irqL); ++ spin_lock_bh(&psta->lock); + psta->state = _FW_LINKED; +- _exit_critical_bh(&psta->lock, &irqL); ++ spin_unlock_bh(&psta->lock); + + } + else +@@ -815,9 +691,9 @@ void update_sta_info_apmode(_adapter *pa + //add_RATid(padapter, psta);//move to ap_sta_info_defer_update() + + +- _enter_critical_bh(&psta->lock, &irqL); ++ spin_lock_bh(&psta->lock); + psta->state |= _FW_LINKED; +- _exit_critical_bh(&psta->lock, &irqL); ++ spin_unlock_bh(&psta->lock); + + + } +@@ -826,7 +702,6 @@ static void update_ap_info(_adapter *pad + { + struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; +- struct security_priv *psecuritypriv = &padapter->securitypriv; + struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv; + +@@ -875,7 +750,6 @@ static void update_hw_ht_param(_adapter + { + unsigned char max_AMPDU_len; + unsigned char min_MPDU_spacing; +- struct registry_priv *pregpriv = &padapter->registrypriv; + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + +@@ -933,8 +807,7 @@ void start_bss_network(_adapter *padapte + WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network); + struct HT_info_element *pht_info=NULL; + u8 cbw40_enable=0; +- u8 change_band = false; +- ++ + //DBG_871X("%s\n", __FUNCTION__); + + bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod; +@@ -1114,15 +987,12 @@ int rtw_check_beacon_data(_adapter *pada + u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX]; + int supportRateNum = 0; + u8 OUI1[] = {0x00, 0x50, 0xf2,0x01}; +- u8 wps_oui[4]={0x0,0x50,0xf2,0x04}; + u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; + struct registry_priv *pregistrypriv = &padapter->registrypriv; + struct security_priv *psecuritypriv = &padapter->securitypriv; + struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; +- struct sta_priv *pstapriv = &padapter->stapriv; + u8 *ie = pbss_network->IEs; +- u8 vht_cap=false; + + /* SSID */ + /* Supported rates */ +@@ -1483,12 +1353,12 @@ int rtw_acl_add_sta(_adapter *padapter, + return (-1); + + +- _enter_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_lock_bh(&(pacl_node_q->lock)); + + phead = get_list_head(pacl_node_q); + plist = get_next(phead); + +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + plist = get_next(plist); +@@ -1504,14 +1374,14 @@ int rtw_acl_add_sta(_adapter *padapter, + } + } + +- _exit_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_unlock_bh(&(pacl_node_q->lock)); + + + if(added == true) + return ret; + + +- _enter_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_lock_bh(&(pacl_node_q->lock)); + + for(i=0; i< NUM_ACL; i++) + { +@@ -1519,13 +1389,13 @@ int rtw_acl_add_sta(_adapter *padapter, + + if(paclnode->valid == false) + { +- _rtw_init_listhead(&paclnode->list); ++ INIT_LIST_HEAD(&paclnode->list); + + memcpy(paclnode->addr, addr, ETH_ALEN); + + paclnode->valid = true; + +- rtw_list_insert_tail(&paclnode->list, get_list_head(pacl_node_q)); ++ list_add_tail(&paclnode->list, get_list_head(pacl_node_q)); + + pacl_list->num++; + +@@ -1535,7 +1405,7 @@ int rtw_acl_add_sta(_adapter *padapter, + + DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num); + +- _exit_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_unlock_bh(&(pacl_node_q->lock)); + + return ret; + } +@@ -1553,12 +1423,12 @@ int rtw_acl_remove_sta(_adapter *padapte + + DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); + +- _enter_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_lock_bh(&(pacl_node_q->lock)); + + phead = get_list_head(pacl_node_q); + plist = get_next(phead); + +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + plist = get_next(plist); +@@ -1569,14 +1439,14 @@ int rtw_acl_remove_sta(_adapter *padapte + { + paclnode->valid = false; + +- rtw_list_delete(&paclnode->list); ++ list_del_init(&paclnode->list); + + pacl_list->num--; + } + } + } + +- _exit_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_unlock_bh(&(pacl_node_q->lock)); + + DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num); + +@@ -1599,7 +1469,7 @@ u8 rtw_ap_set_pairwise_key(_adapter *pad + + psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm)); + if(psetstakey_para==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); ++ kfree((u8 *) ph2c); + res=_FAIL; + goto exit; + } +@@ -1639,7 +1509,7 @@ static int rtw_ap_set_key(_adapter *pada + } + psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm)); + if(psetkeyparm==NULL){ +- rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)pcmd); + res= _FAIL; + goto exit; + } +@@ -1678,7 +1548,7 @@ static int rtw_ap_set_key(_adapter *pada + pcmd->rspsz = 0; + + +- _rtw_init_listhead(&pcmd->list); ++ INIT_LIST_HEAD(&pcmd->list); + + res = rtw_enqueue_cmd(pcmdpriv, pcmd); + +@@ -1715,8 +1585,6 @@ int rtw_ap_set_wep_key(_adapter *padapte + return rtw_ap_set_key(padapter, key, alg, keyid, set_tx); + } + +-#ifdef CONFIG_NATIVEAP_MLME +- + static void update_bcn_fixed_ie(_adapter *padapter) + { + DBG_871X("%s\n", __FUNCTION__); +@@ -1838,7 +1706,7 @@ static void update_bcn_wps_ie(_adapter * + } + + if(pbackup_remainder_ie) +- rtw_mfree(pbackup_remainder_ie, remainder_ielen); ++ kfree(pbackup_remainder_ie); + + // deal with the case without set_tx_beacon_cmd() in update_beacon() + #if defined( CONFIG_INTERRUPT_BASED_TXBCN ) +@@ -1907,7 +1775,7 @@ void update_beacon(_adapter *padapter, u + if(false == pmlmeext->bstart_bss) + return; + +- _enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); ++ spin_lock_bh(&pmlmepriv->bcn_update_lock); + + switch(ie_id) + { +@@ -1959,7 +1827,7 @@ void update_beacon(_adapter *padapter, u + + pmlmepriv->update_bcn = true; + +- _exit_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); ++ spin_unlock_bh(&pmlmepriv->bcn_update_lock); + + #ifndef CONFIG_INTERRUPT_BASED_TXBCN + if(tx) +@@ -2064,13 +1932,13 @@ void associated_clients_update(_adapter + struct sta_info *psta=NULL; + struct sta_priv *pstapriv = &padapter->stapriv; + +- _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_lock_bh(&pstapriv->asoc_list_lock); + + phead = &pstapriv->asoc_list; + plist = get_next(phead); + + //check asoc_queue +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + +@@ -2079,7 +1947,7 @@ void associated_clients_update(_adapter + VCS_update(padapter, psta); + } + +- _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->asoc_list_lock); + + } + +@@ -2332,8 +2200,6 @@ u8 ap_free_sta(_adapter *padapter, struc + { + _irqL irqL; + u8 beacon_updated = false; +- struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +- struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + struct sta_priv *pstapriv = &padapter->stapriv; + + if(!psta) +@@ -2360,9 +2226,9 @@ u8 ap_free_sta(_adapter *padapter, struc + rtw_clearstakey_cmd(padapter, psta, true); + + +- _enter_critical_bh(&psta->lock, &irqL); ++ spin_lock_bh(&psta->lock); + psta->state &= ~_FW_LINKED; +- _exit_critical_bh(&psta->lock, &irqL); ++ spin_unlock_bh(&psta->lock); + + rtw_cfg80211_indicate_sta_disassoc(padapter, psta->hwaddr, reason); + +@@ -2370,52 +2236,15 @@ u8 ap_free_sta(_adapter *padapter, struc + + beacon_updated = bss_cap_update_on_sta_leave(padapter, psta); + +- _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_lock_bh(&(pstapriv->sta_hash_lock)); + rtw_free_stainfo(padapter, psta); +- _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_unlock_bh(&(pstapriv->sta_hash_lock)); + + + return beacon_updated; + + } + +-int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset) +-{ +- _irqL irqL; +- _list *phead, *plist; +- int ret=0; +- struct sta_info *psta = NULL; +- struct sta_priv *pstapriv = &padapter->stapriv; +- struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +- struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +- u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; +- +- if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) +- return ret; +- +- DBG_871X(FUNC_NDEV_FMT" with ch:%u, offset:%u\n", +- FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset); +- +- _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); +- phead = &pstapriv->asoc_list; +- plist = get_next(phead); +- +- /* for each sta in asoc_queue */ +- while ((rtw_end_of_queue_search(phead, plist)) == false) +- { +- psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); +- plist = get_next(plist); +- +- issue_action_spct_ch_switch(padapter, psta->hwaddr, new_ch, ch_offset); +- psta->expire_to = ((pstapriv->expire_to * 2) > 5) ? 5 : (pstapriv->expire_to * 2); +- } +- _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); +- +- issue_action_spct_ch_switch(padapter, bc_addr, new_ch, ch_offset); +- +- return ret; +-} +- + int rtw_sta_flush(_adapter *padapter) + { + _irqL irqL; +@@ -2433,25 +2262,25 @@ int rtw_sta_flush(_adapter *padapter) + return ret; + + +- _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_lock_bh(&pstapriv->asoc_list_lock); + phead = &pstapriv->asoc_list; + plist = get_next(phead); + + //free sta asoc_queue +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); + + plist = get_next(plist); + +- rtw_list_delete(&psta->asoc_list); ++ list_del_init(&psta->asoc_list); + pstapriv->asoc_list_cnt--; + +- //_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ //spin_unlock_bh(&pstapriv->asoc_list_lock); + ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); +- //_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ //spin_lock_bh(&pstapriv->asoc_list_lock); + } +- _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->asoc_list_lock); + + + issue_deauth(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); +@@ -2516,7 +2345,6 @@ void rtw_ap_restore_network(_adapter *pa + { + struct mlme_priv *mlmepriv = &padapter->mlmepriv; + struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +- struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + struct sta_priv * pstapriv = &padapter->stapriv; + struct sta_info *psta; + struct security_priv* psecuritypriv=&(padapter->securitypriv); +@@ -2539,12 +2367,12 @@ void rtw_ap_restore_network(_adapter *pa + rtw_set_key(padapter, psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0,false); + } + +- _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_lock_bh(&pstapriv->asoc_list_lock); + + phead = &pstapriv->asoc_list; + plist = get_next(phead); + +- while ((rtw_end_of_queue_search(phead, plist)) == false) { ++ while (phead != plist) { + int stainfo_offset; + + psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list); +@@ -2556,7 +2384,7 @@ void rtw_ap_restore_network(_adapter *pa + } + } + +- _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); ++ spin_unlock_bh(&pstapriv->asoc_list_lock); + + for (i = 0; i < chk_alive_num; i++) { + psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); +@@ -2619,12 +2447,12 @@ void start_ap_mode(_adapter *padapter) + + + //for ACL +- _rtw_init_listhead(&(pacl_list->acl_node_q.queue)); ++ INIT_LIST_HEAD(&(pacl_list->acl_node_q.queue)); + pacl_list->num = 0; + pacl_list->mode = 0; + for(i = 0; i < NUM_ACL; i++) + { +- _rtw_init_listhead(&pacl_list->aclnode[i].list); ++ INIT_LIST_HEAD(&pacl_list->aclnode[i].list); + pacl_list->aclnode[i].valid = false; + } + +@@ -2651,10 +2479,10 @@ void stop_ap_mode(_adapter *padapter) + padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; + + //for ACL +- _enter_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_lock_bh(&(pacl_node_q->lock)); + phead = get_list_head(pacl_node_q); + plist = get_next(phead); +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list); + plist = get_next(plist); +@@ -2663,12 +2491,12 @@ void stop_ap_mode(_adapter *padapter) + { + paclnode->valid = false; + +- rtw_list_delete(&paclnode->list); ++ list_del_init(&paclnode->list); + + pacl_list->num--; + } + } +- _exit_critical_bh(&(pacl_node_q->lock), &irqL); ++ spin_unlock_bh(&(pacl_node_q->lock)); + + DBG_871X("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num); + +@@ -2678,9 +2506,9 @@ void stop_ap_mode(_adapter *padapter) + rtw_free_all_stainfo(padapter); + + psta = rtw_get_bcmc_stainfo(padapter); +- _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_lock_bh(&(pstapriv->sta_hash_lock)); + rtw_free_stainfo(padapter, psta); +- _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL); ++ spin_unlock_bh(&(pstapriv->sta_hash_lock)); + + rtw_init_bcmc_stainfo(padapter); + +@@ -2688,8 +2516,3 @@ void stop_ap_mode(_adapter *padapter) + + rtw_btcoex_MediaStatusNotify(padapter, 0); //disconnect + } +- +-#endif //CONFIG_NATIVEAP_MLME +- +-#endif //CONFIG_AP_MODE +- +diff -Nurp linux/3rdparty/rtl8723bs.old/core/rtw_btcoex.c linux/3rdparty/rtl8723bs/core/rtw_btcoex.c +--- linux/3rdparty/rtl8723bs.old/core/rtw_btcoex.c 2015-05-10 14:36:05.663667846 +0300 ++++ linux/3rdparty/rtl8723bs/core/rtw_btcoex.c 2015-05-07 17:46:55.000000000 +0300 +@@ -108,16 +108,6 @@ void rtw_btcoex_HaltNotify(PADAPTER pada + hal_btcoex_HaltNotify(padapter); + } + +-void rtw_btcoex_SwitchBtTRxMask(PADAPTER padapter) +-{ +- hal_btcoex_SwitchBtTRxMask(padapter); +-} +- +-void rtw_btcoex_Switch(PADAPTER padapter, u8 enable) +-{ +- hal_btcoex_SetBTCoexist(padapter, enable); +-} +- + u8 rtw_btcoex_IsBtDisabled(PADAPTER padapter) + { + return hal_btcoex_IsBtDisabled(padapter); +@@ -137,15 +127,6 @@ s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(PAD + return coexctrl; + } + +-u32 rtw_btcoex_GetAMPDUSize(PADAPTER padapter) +-{ +- u32 size; +- +- size = hal_btcoex_GetAMPDUSize(padapter); +- +- return size; +-} +- + void rtw_btcoex_SetManualControl(PADAPTER padapter, u8 manual) + { + if (true == manual) +@@ -158,11 +139,6 @@ void rtw_btcoex_SetManualControl(PADAPTE + } + } + +-u8 rtw_btcoex_1Ant(PADAPTER padapter) +-{ +- return hal_btcoex_1Ant(padapter); +-} +- + u8 rtw_btcoex_IsBtControlLps(PADAPTER padapter) + { + return hal_btcoex_IsBtControlLps(padapter); +@@ -198,11 +174,6 @@ void rtw_btcoex_SetPGAntNum(PADAPTER pad + hal_btcoex_SetPgAntNum(padapter, antNum); + } + +-u8 rtw_btcoex_GetPGAntNum(PADAPTER padapter) +-{ +- return hal_btcoex_GetPgAntNum(padapter); +-} +- + void rtw_btcoex_SetSingleAntPath(PADAPTER padapter, u8 singleAntPath) + { + hal_btcoex_SetSingleAntPath(padapter, singleAntPath); +@@ -233,16 +204,6 @@ u32 rtw_btcoex_GetDBG(PADAPTER padapter, + return hal_btcoex_GetDBG(padapter, pStrBuf, bufSize); + } + +-u8 rtw_btcoex_IncreaseScanDeviceNum(PADAPTER padapter) +-{ +- return hal_btcoex_IncreaseScanDeviceNum(padapter); +-} +- +-u8 rtw_btcoex_IsBtLinkExist(PADAPTER padapter) +-{ +- return hal_btcoex_IsBtLinkExist(padapter); +-} +- + // ================================================== + // Below Functions are called by BT-Coex + // ================================================== +diff -Nurp linux/3rdparty/rtl8723bs.old/core/rtw_cmd.c linux/3rdparty/rtl8723bs/core/rtw_cmd.c +--- linux/3rdparty/rtl8723bs.old/core/rtw_cmd.c 2015-05-10 14:36:05.665667868 +0300 ++++ linux/3rdparty/rtl8723bs/core/rtw_cmd.c 2015-05-07 17:46:55.000000000 +0300 +@@ -255,10 +255,10 @@ _func_enter_; + void *c2h; + if ((c2h = rtw_cbuf_pop(pevtpriv->c2h_queue)) != NULL + && c2h != (void *)pevtpriv) { +- rtw_mfree(c2h, 16); ++ kfree(c2h); + } + } +- rtw_cbuf_free(pevtpriv->c2h_queue); ++ kfree(pevtpriv->c2h_queue); + + RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("-_rtw_free_evt_priv \n")); + +@@ -272,10 +272,10 @@ _func_enter_; + + if(pcmdpriv){ + if (pcmdpriv->cmd_allocated_buf) +- rtw_mfree(pcmdpriv->cmd_allocated_buf, MAX_CMDSZ + CMDBUFF_ALIGN_SZ); ++ kfree(pcmdpriv->cmd_allocated_buf); + + if (pcmdpriv->rsp_allocated_buf) +- rtw_mfree(pcmdpriv->rsp_allocated_buf, MAX_RSPSZ + 4); ++ kfree(pcmdpriv->rsp_allocated_buf); + + mutex_destroy(&pcmdpriv->sctx_mutex); + } +@@ -301,13 +301,13 @@ _func_enter_; + if (obj == NULL) + goto exit; + +- //_enter_critical_bh(&queue->lock, &irqL); +- _enter_critical(&queue->lock, &irqL); ++ //spin_lock_bh(&queue->lock); ++ spin_lock_irqsave(&queue->lock, irqL); + +- rtw_list_insert_tail(&obj->list, &queue->queue); ++ list_add_tail(&obj->list, &queue->queue); + +- //_exit_critical_bh(&queue->lock, &irqL); +- _exit_critical(&queue->lock, &irqL); ++ //spin_unlock_bh(&queue->lock); ++ spin_unlock_irqrestore(&queue->lock, irqL); + + exit: + +@@ -323,18 +323,18 @@ struct cmd_obj *_rtw_dequeue_cmd(_queue + + _func_enter_; + +- //_enter_critical_bh(&(queue->lock), &irqL); +- _enter_critical(&queue->lock, &irqL); +- if (rtw_is_list_empty(&(queue->queue))) ++ //spin_lock_bh(&(queue->lock)); ++ spin_lock_irqsave(&queue->lock, irqL); ++ if (list_empty(&(queue->queue))) + obj = NULL; + else + { + obj = LIST_CONTAINOR(get_next(&(queue->queue)), struct cmd_obj, list); +- rtw_list_delete(&obj->list); ++ list_del_init(&obj->list); + } + +- //_exit_critical_bh(&(queue->lock), &irqL); +- _exit_critical(&queue->lock, &irqL); ++ //spin_unlock_bh(&(queue->lock)); ++ spin_unlock_irqrestore(&queue->lock, irqL); + + _func_exit_; + +@@ -442,14 +442,6 @@ _func_exit_; + return cmd_obj; + } + +-void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv) +-{ +-_func_enter_; +- pcmdpriv->cmd_done_cnt++; +- //up(&(pcmdpriv->cmd_done_sema)); +-_func_exit_; +-} +- + void rtw_free_cmd_obj(struct cmd_obj *pcmd) + { + _func_enter_; +@@ -457,7 +449,7 @@ _func_enter_; + if((pcmd->cmdcode!=_JoinBss_CMD_) &&(pcmd->cmdcode!= _CreateBss_CMD_)) + { + //free parmbuf in cmd_obj +- rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz); ++ kfree((unsigned char*)pcmd->parmbuf); + } + + if(pcmd->rsp!=NULL) +@@ -465,12 +457,12 @@ _func_enter_; + if(pcmd->rspsz!= 0) + { + //free rsp in cmd_obj +- rtw_mfree((unsigned char*)pcmd->rsp, pcmd->rspsz); ++ kfree((unsigned char*)pcmd->rsp); + } + } + + //free cmd_obj +- rtw_mfree((unsigned char*)pcmd, sizeof(struct cmd_obj)); ++ kfree((unsigned char*)pcmd); + + _func_exit_; + } +@@ -533,7 +525,7 @@ _func_enter_; + break; + } + +- if(rtw_is_list_empty(&(pcmdpriv->cmd_queue.queue))) ++ if(list_empty(&(pcmdpriv->cmd_queue.queue))) + { + //DBG_871X("%s: cmd queue is empty!\n", __func__); + continue; +@@ -573,7 +565,7 @@ _next: + + memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz); + +- if(pcmd->cmdcode < (sizeof(wlancmds) /sizeof(struct cmd_hdl))) ++ if(pcmd->cmdcode < ARRAY_SIZE(wlancmds)) + { + cmd_hdl = wlancmds[pcmd->cmdcode].h2cfuns; + +@@ -594,18 +586,18 @@ _next: + + post_process: + +- _enter_critical_mutex(&(pcmd->padapter->cmdpriv.sctx_mutex), NULL); +- if (pcmd->sctx) { +- DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" pcmd->sctx\n", +- FUNC_ADPT_ARG(pcmd->padapter)); +- +- if (pcmd->res == H2C_SUCCESS) +- rtw_sctx_done(&pcmd->sctx); +- else +- rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_CMD_ERROR); ++ if (mutex_lock_interruptible(&(pcmd->padapter->cmdpriv.sctx_mutex)) == 0) { ++ if (pcmd->sctx) { ++ DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" pcmd->sctx\n", ++ FUNC_ADPT_ARG(pcmd->padapter)); ++ ++ if (pcmd->res == H2C_SUCCESS) ++ rtw_sctx_done(&pcmd->sctx); ++ else ++ rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_CMD_ERROR); ++ } ++ mutex_unlock(&(pcmd->padapter->cmdpriv.sctx_mutex)); + } +- _exit_critical_mutex(&(pcmd->padapter->cmdpriv.sctx_mutex), NULL); +- + + if((cmd_process_time = jiffies_to_msecs(jiffies - cmd_start_time)) > 1000) + { +@@ -627,7 +619,7 @@ post_process: + } + + //call callback function for post-processed +- if(pcmd->cmdcode < (sizeof(rtw_cmd_callback) /sizeof(struct _cmd_callback))) ++ if(pcmd->cmdcode < ARRAY_SIZE(rtw_cmd_callback)) + { + pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback; + if(pcmd_callback == NULL) +@@ -666,7 +658,7 @@ post_process: + if (pcmd->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) { + extra_parm = (struct drvextra_cmd_parm *)pcmd->parmbuf; + if(extra_parm->pbuf && extra_parm->size > 0) { +- rtw_mfree(extra_parm->pbuf, extra_parm->size); ++ kfree(extra_parm->pbuf); + } + } + +@@ -682,42 +674,6 @@ _func_exit_; + + } + +-u8 rtw_setstandby_cmd(_adapter *padapter, uint action) +-{ +- struct cmd_obj* ph2c; +- struct usb_suspend_parm* psetusbsuspend; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- +- u8 ret = _SUCCESS; +- +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if (ph2c == NULL) { +- ret = _FAIL; +- goto exit; +- } +- +- psetusbsuspend = (struct usb_suspend_parm*)rtw_zmalloc(sizeof(struct usb_suspend_parm)); +- if (psetusbsuspend == NULL) { +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- ret = _FAIL; +- goto exit; +- } +- +- psetusbsuspend->action = action; +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, psetusbsuspend, GEN_CMD_CODE(_SetUsbSuspend)); +- +- ret = rtw_enqueue_cmd(pcmdpriv, ph2c); +- +-exit: +- +-_func_exit_; +- +- return ret; +-} +- + /* + rtw_sitesurvey_cmd(~) + ### NOTE:#### (!!!!) +@@ -744,7 +700,7 @@ _func_enter_; + + psurveyPara = (struct sitesurvey_parm*)rtw_zmalloc(sizeof(struct sitesurvey_parm)); + if (psurveyPara == NULL) { +- rtw_mfree((unsigned char*) ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char*) ph2c); + return _FAIL; + } + +@@ -793,8 +749,6 @@ _func_enter_; + + pmlmepriv->scan_start_time = jiffies; + _set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT); +- +- rtw_led_control(padapter, LED_CTL_SITE_SURVEY); + } else { + _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); + } +@@ -821,7 +775,7 @@ _func_enter_; + + pbsetdataratepara = (struct setdatarate_parm*)rtw_zmalloc(sizeof(struct setdatarate_parm)); + if (pbsetdataratepara == NULL) { +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); ++ kfree((u8 *) ph2c); + res = _FAIL; + goto exit; + } +@@ -838,243 +792,17 @@ _func_exit_; + return res; + } + +-u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset) +-{ +- struct cmd_obj* ph2c; +- struct setbasicrate_parm* pssetbasicratepara; +- struct cmd_priv* pcmdpriv=&padapter->cmdpriv; +- u8 res = _SUCCESS; +- +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if (ph2c == NULL) { +- res= _FAIL; +- goto exit; +- } +- pssetbasicratepara = (struct setbasicrate_parm*)rtw_zmalloc(sizeof(struct setbasicrate_parm)); +- +- if (pssetbasicratepara == NULL) { +- rtw_mfree((u8*) ph2c, sizeof(struct cmd_obj)); +- res = _FAIL; +- goto exit; +- } +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, pssetbasicratepara, _SetBasicRate_CMD_); +- +- memcpy(pssetbasicratepara->basicrates, rateset, NumRates); +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +- +-_func_exit_; +- +- return res; +-} +- +- +-/* +-unsigned char rtw_setphy_cmd(unsigned char *adapter) +- +-1. be called only after rtw_update_registrypriv_dev_network( ~) or mp testing program +-2. for AdHoc/Ap mode or mp mode? +- +-*/ +-u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch) +-{ +- struct cmd_obj* ph2c; +- struct setphy_parm* psetphypara; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +-// struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +-// struct registry_priv* pregistry_priv = &padapter->registrypriv; +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- psetphypara = (struct setphy_parm*)rtw_zmalloc(sizeof(struct setphy_parm)); +- +- if(psetphypara==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, psetphypara, _SetPhy_CMD_); +- +- RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,("CH=%d, modem=%d", ch, modem)); +- +- psetphypara->modem = modem; +- psetphypara->rfchannel = ch; +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +-_func_exit_; +- return res; +-} +- +-u8 rtw_setbbreg_cmd(_adapter*padapter, u8 offset, u8 val) +-{ +- struct cmd_obj* ph2c; +- struct writeBB_parm* pwritebbparm; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +-_func_enter_; +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- pwritebbparm = (struct writeBB_parm*)rtw_zmalloc(sizeof(struct writeBB_parm)); +- +- if(pwritebbparm==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, pwritebbparm, GEN_CMD_CODE(_SetBBReg)); +- +- pwritebbparm->offset = offset; +- pwritebbparm->value = val; +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +-_func_exit_; +- return res; +-} +- +-u8 rtw_getbbreg_cmd(_adapter *padapter, u8 offset, u8 *pval) +-{ +- struct cmd_obj* ph2c; +- struct readBB_parm* prdbbparm; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +- +-_func_enter_; +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res=_FAIL; +- goto exit; +- } +- prdbbparm = (struct readBB_parm*)rtw_zmalloc(sizeof(struct readBB_parm)); +- +- if(prdbbparm ==NULL){ +- rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj)); +- return _FAIL; +- } +- +- _rtw_init_listhead(&ph2c->list); +- ph2c->cmdcode =GEN_CMD_CODE(_GetBBReg); +- ph2c->parmbuf = (unsigned char *)prdbbparm; +- ph2c->cmdsz = sizeof(struct readBB_parm); +- ph2c->rsp = pval; +- ph2c->rspsz = sizeof(struct readBB_rsp); +- +- prdbbparm ->offset = offset; +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +-_func_exit_; +- return res; +-} +- +-u8 rtw_setrfreg_cmd(_adapter *padapter, u8 offset, u32 val) +-{ +- struct cmd_obj* ph2c; +- struct writeRF_parm* pwriterfparm; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +-_func_enter_; +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- pwriterfparm = (struct writeRF_parm*)rtw_zmalloc(sizeof(struct writeRF_parm)); +- +- if(pwriterfparm==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, pwriterfparm, GEN_CMD_CODE(_SetRFReg)); +- +- pwriterfparm->offset = offset; +- pwriterfparm->value = val; +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +-_func_exit_; +- return res; +-} +- +-u8 rtw_getrfreg_cmd(_adapter *padapter, u8 offset, u8 *pval) +-{ +- struct cmd_obj* ph2c; +- struct readRF_parm* prdrfparm; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- +- prdrfparm = (struct readRF_parm*)rtw_zmalloc(sizeof(struct readRF_parm)); +- if(prdrfparm ==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- _rtw_init_listhead(&ph2c->list); +- ph2c->cmdcode =GEN_CMD_CODE(_GetRFReg); +- ph2c->parmbuf = (unsigned char *)prdrfparm; +- ph2c->cmdsz = sizeof(struct readRF_parm); +- ph2c->rsp = pval; +- ph2c->rspsz = sizeof(struct readRF_rsp); +- +- prdrfparm ->offset = offset; +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +- +-exit: +- +-_func_exit_; +- +- return res; +-} +- + void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) + { + _func_enter_; + + //rtw_free_cmd_obj(pcmd); +- rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz); +- rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj)); ++ kfree((unsigned char*) pcmd->parmbuf); ++ kfree((unsigned char*) pcmd); + + _func_exit_; + } + +-void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) +-{ +- _func_enter_; +- +- rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz); +- rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj)); +- +-_func_exit_; +-} +- + u8 rtw_createbss_cmd(_adapter *padapter) + { + struct cmd_obj* pcmd; +@@ -1085,8 +813,6 @@ u8 rtw_createbss_cmd(_adapter *padapter + + _func_enter_; + +- rtw_led_control(padapter, LED_CTL_START_TO_LINK); +- + if (pmlmepriv->assoc_ssid.SsidLength == 0){ + RT_TRACE(_module_rtl871x_cmd_c_,_drv_info_,(" createbss for Any SSid:%s\n",pmlmepriv->assoc_ssid.Ssid)); + } else { +@@ -1099,7 +825,7 @@ _func_enter_; + goto exit; + } + +- _rtw_init_listhead(&pcmd->list); ++ INIT_LIST_HEAD(&pcmd->list); + pcmd->cmdcode = _CreateBss_CMD_; + pcmd->parmbuf = (unsigned char *)pdev_network; + pcmd->cmdsz = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX*)pdev_network); +@@ -1117,36 +843,6 @@ _func_exit_; + return res; + } + +-u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz) +-{ +- struct cmd_obj* pcmd; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(pcmd==NULL){ +- res= _FAIL; +- goto exit; +- } +- +- _rtw_init_listhead(&pcmd->list); +- pcmd->cmdcode = GEN_CMD_CODE(_CreateBss); +- pcmd->parmbuf = pbss; +- pcmd->cmdsz = sz; +- pcmd->rsp = NULL; +- pcmd->rspsz = 0; +- +- res = rtw_enqueue_cmd(pcmdpriv, pcmd); +- +-exit: +- +-_func_exit_; +- +- return res; +-} +- + u8 rtw_startbss_cmd(_adapter *padapter, int flags) + { + struct cmd_obj* pcmd; +@@ -1167,7 +863,7 @@ _func_enter_; + goto exit; + } + +- _rtw_init_listhead(&pcmd->list); ++ INIT_LIST_HEAD(&pcmd->list); + pcmd->cmdcode = GEN_CMD_CODE(_CreateBss); + pcmd->parmbuf = NULL; + pcmd->cmdsz = 0; +@@ -1183,10 +879,11 @@ _func_enter_; + + if (res == _SUCCESS && (flags & RTW_CMDF_WAIT_ACK)) { + rtw_sctx_wait(&sctx, __func__); +- _enter_critical_mutex(&pcmdpriv->sctx_mutex, NULL); +- if (sctx.status == RTW_SCTX_SUBMITTED) +- pcmd->sctx = NULL; +- _exit_critical_mutex(&pcmdpriv->sctx_mutex, NULL); ++ if (mutex_lock_interruptible(&pcmdpriv->sctx_mutex) == 0) { ++ if (sctx.status == RTW_SCTX_SUBMITTED) ++ pcmd->sctx = NULL; ++ mutex_unlock(&pcmdpriv->sctx_mutex); ++ } + } + } + +@@ -1216,8 +913,6 @@ u8 rtw_joinbss_cmd(_adapter *padapter, + u8 *ptmp=NULL; + _func_enter_; + +- rtw_led_control(padapter, LED_CTL_START_TO_LINK); +- + if (pmlmepriv->assoc_ssid.SsidLength == 0){ + RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n")); + } else { +@@ -1267,7 +962,7 @@ _func_enter_; + if(psecnetwork==NULL) + { + if(pcmd !=NULL) +- rtw_mfree((unsigned char *)pcmd, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)pcmd); + + res=_FAIL; + +@@ -1348,7 +1043,7 @@ _func_enter_; + + pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion + +- _rtw_init_listhead(&pcmd->list); ++ INIT_LIST_HEAD(&pcmd->list); + pcmd->cmdcode = _JoinBss_CMD_;//GEN_CMD_CODE(_JoinBss) + pcmd->parmbuf = (unsigned char *)psecnetwork; + pcmd->rsp = NULL; +@@ -1387,7 +1082,7 @@ _func_enter_; + cmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(*cmdobj)); + if (cmdobj == NULL) { + res = _FAIL; +- rtw_mfree((u8 *)param, sizeof(*param)); ++ kfree((u8 *)param); + goto exit; + } + init_h2fwcmd_w_parm_no_rsp(cmdobj, param, _DisConnect_CMD_); +@@ -1396,7 +1091,7 @@ _func_enter_; + /* no need to enqueue, do the cmd hdl directly and free cmd parameter */ + if (H2C_SUCCESS != disconnect_hdl(padapter, (u8 *)param)) + res = _FAIL; +- rtw_mfree((u8 *)param, sizeof(*param)); ++ kfree((u8 *)param); + } + + exit: +@@ -1426,7 +1121,7 @@ _func_enter_; + if(enqueue){ + ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); + if(ph2c==NULL){ +- rtw_mfree((u8 *)psetop, sizeof(*psetop)); ++ kfree((u8 *)psetop); + res= _FAIL; + goto exit; + } +@@ -1436,7 +1131,7 @@ _func_enter_; + } + else{ + setopmode_hdl(padapter, (u8 *)psetop); +- rtw_mfree((u8 *)psetop, sizeof(*psetop)); ++ kfree((u8 *)psetop); + } + exit: + +@@ -1486,15 +1181,15 @@ _func_enter_; + { + ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); + if ( ph2c == NULL){ +- rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm)); ++ kfree((u8 *) psetstakey_para); + res= _FAIL; + goto exit; + } + + psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp)); + if(psetstakey_rsp == NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm)); ++ kfree((u8 *) ph2c); ++ kfree((u8 *) psetstakey_para); + res=_FAIL; + goto exit; + } +@@ -1506,7 +1201,7 @@ _func_enter_; + } + else{ + set_stakey_hdl(padapter, (u8 *)psetstakey_para); +- rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm)); ++ kfree((u8 *) psetstakey_para); + } + exit: + +@@ -1546,15 +1241,15 @@ _func_enter_; + + psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm)); + if(psetstakey_para==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); ++ kfree((u8 *) ph2c); + res=_FAIL; + goto exit; + } + + psetstakey_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_stakey_rsp)); + if(psetstakey_rsp == NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- rtw_mfree((u8 *) psetstakey_para, sizeof(struct set_stakey_parm)); ++ kfree((u8 *) ph2c); ++ kfree((u8 *) psetstakey_para); + res=_FAIL; + goto exit; + } +@@ -1578,123 +1273,6 @@ _func_exit_; + return res; + } + +-u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table) +-{ +- struct cmd_obj* ph2c; +- struct setratable_parm * psetrttblparm; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- psetrttblparm = (struct setratable_parm*)rtw_zmalloc(sizeof(struct setratable_parm)); +- +- if(psetrttblparm==NULL){ +- rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); +- +- memcpy(psetrttblparm,prate_table,sizeof(struct setratable_parm)); +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +-_func_exit_; +- return res; +- +-} +- +-u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval) +-{ +- struct cmd_obj* ph2c; +- struct getratable_parm * pgetrttblparm; +- struct cmd_priv *pcmdpriv=&padapter->cmdpriv; +- u8 res=_SUCCESS; +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- pgetrttblparm = (struct getratable_parm*)rtw_zmalloc(sizeof(struct getratable_parm)); +- +- if(pgetrttblparm==NULL){ +- rtw_mfree((unsigned char *) ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +-// init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); +- +- _rtw_init_listhead(&ph2c->list); +- ph2c->cmdcode =GEN_CMD_CODE(_GetRaTable); +- ph2c->parmbuf = (unsigned char *)pgetrttblparm; +- ph2c->cmdsz = sizeof(struct getratable_parm); +- ph2c->rsp = (u8*)pval; +- ph2c->rspsz = sizeof(struct getratable_rsp); +- +- pgetrttblparm ->rsvd = 0x0; +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +-_func_exit_; +- return res; +- +-} +- +-u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr) +-{ +- struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +- struct cmd_obj* ph2c; +- struct set_assocsta_parm *psetassocsta_para; +- struct set_stakey_rsp *psetassocsta_rsp = NULL; +- +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- +- psetassocsta_para = (struct set_assocsta_parm*)rtw_zmalloc(sizeof(struct set_assocsta_parm)); +- if(psetassocsta_para==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- res=_FAIL; +- goto exit; +- } +- +- psetassocsta_rsp = (struct set_stakey_rsp*)rtw_zmalloc(sizeof(struct set_assocsta_rsp)); +- if(psetassocsta_rsp==NULL){ +- rtw_mfree((u8 *) ph2c, sizeof(struct cmd_obj)); +- rtw_mfree((u8 *) psetassocsta_para, sizeof(struct set_assocsta_parm)); +- return _FAIL; +- } +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, psetassocsta_para, _SetAssocSta_CMD_); +- ph2c->rsp = (u8 *) psetassocsta_rsp; +- ph2c->rspsz = sizeof(struct set_assocsta_rsp); +- +- memcpy(psetassocsta_para->addr, mac_addr,ETH_ALEN); +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +- +-exit: +- +-_func_exit_; +- +- return res; +- } +- + u8 rtw_addbareq_cmd(_adapter*padapter, u8 tid, u8 *addr) + { + struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +@@ -1713,7 +1291,7 @@ _func_enter_; + + paddbareq_parm = (struct addBaReq_parm*)rtw_zmalloc(sizeof(struct addBaReq_parm)); + if(paddbareq_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -1752,7 +1330,7 @@ _func_enter_; + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -1793,7 +1371,7 @@ _func_enter_; + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -1835,7 +1413,7 @@ _func_enter_; + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -1858,61 +1436,6 @@ _func_exit_; + + } + +-u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue) +-{ +- struct cmd_obj *pcmdobj; +- struct set_ch_parm *set_ch_parm; +- struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +- +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- DBG_871X(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n", +- FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset); +- +- /* check input parameter */ +- +- /* prepare cmd parameter */ +- set_ch_parm = (struct set_ch_parm *)rtw_zmalloc(sizeof(*set_ch_parm)); +- if (set_ch_parm == NULL) { +- res= _FAIL; +- goto exit; +- } +- set_ch_parm->ch = ch; +- set_ch_parm->bw = bw; +- set_ch_parm->ch_offset = ch_offset; +- +- if (enqueue) { +- /* need enqueue, prepare cmd_obj and enqueue */ +- pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(pcmdobj == NULL){ +- rtw_mfree((u8 *)set_ch_parm, sizeof(*set_ch_parm)); +- res=_FAIL; +- goto exit; +- } +- +- init_h2fwcmd_w_parm_no_rsp(pcmdobj, set_ch_parm, GEN_CMD_CODE(_SetChannel)); +- res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); +- } else { +- /* no need to enqueue, do the cmd hdl directly and free cmd parameter */ +- if( H2C_SUCCESS !=set_ch_hdl(padapter, (u8 *)set_ch_parm) ) +- res = _FAIL; +- +- rtw_mfree((u8 *)set_ch_parm, sizeof(*set_ch_parm)); +- } +- +- /* do something based on res... */ +- +-exit: +- +- DBG_871X(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res); +- +-_func_exit_; +- +- return res; +-} +- + u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue, u8 swconfig) + { + struct cmd_obj* pcmdobj; +@@ -1951,7 +1474,7 @@ _func_enter_; + //need enqueue, prepare cmd_obj and enqueue + pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); + if(pcmdobj == NULL){ +- rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param)); ++ kfree((u8 *)setChannelPlan_param); + res=_FAIL; + goto exit; + } +@@ -1965,7 +1488,7 @@ _func_enter_; + if( H2C_SUCCESS !=set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param) ) + res = _FAIL; + +- rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param)); ++ kfree((u8 *)setChannelPlan_param); + } + + //do something based on res... +@@ -1979,92 +1502,6 @@ _func_exit_; + return res; + } + +-u8 rtw_led_blink_cmd(_adapter*padapter, void * pLed) +-{ +- struct cmd_obj* pcmdobj; +- struct LedBlink_param *ledBlink_param; +- struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +- +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_led_blink_cmd\n")); +- +- pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(pcmdobj == NULL){ +- res=_FAIL; +- goto exit; +- } +- +- ledBlink_param = (struct LedBlink_param *)rtw_zmalloc(sizeof(struct LedBlink_param)); +- if(ledBlink_param == NULL) { +- rtw_mfree((u8 *)pcmdobj, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- ledBlink_param->pLed=pLed; +- +- init_h2fwcmd_w_parm_no_rsp(pcmdobj, ledBlink_param, GEN_CMD_CODE(_LedBlink)); +- res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); +- +-exit: +- +-_func_exit_; +- +- return res; +-} +- +-u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no) +-{ +- struct cmd_obj* pcmdobj; +- struct SetChannelSwitch_param*setChannelSwitch_param; +- struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +- struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +- +- u8 res=_SUCCESS; +- +-_func_enter_; +- +- RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n")); +- +- pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(pcmdobj == NULL){ +- res=_FAIL; +- goto exit; +- } +- +- setChannelSwitch_param = (struct SetChannelSwitch_param *)rtw_zmalloc(sizeof(struct SetChannelSwitch_param)); +- if(setChannelSwitch_param == NULL) { +- rtw_mfree((u8 *)pcmdobj, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- setChannelSwitch_param->new_ch_no=new_ch_no; +- +- init_h2fwcmd_w_parm_no_rsp(pcmdobj, setChannelSwitch_param, GEN_CMD_CODE(_SetChannelSwitch)); +- res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); +- +-exit: +- +-_func_exit_; +- +- return res; +-} +- +-u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option) +-{ +- u8 res=_SUCCESS; +- +-_func_enter_; +- +-_func_exit_; +- +- return res; +-} +- + static void collect_traffic_statistics(_adapter *padapter) + { + struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); +@@ -2150,8 +1587,6 @@ u8 traffic_status_watchdog(_adapter *pad + TRAFFIC_PROTECT_PERIOD_MS, + link_detect->NumTxOkInPeriod, + link_detect->NumRxUnicastOkInPeriod); +- +- rtw_lock_traffic_suspend_timeout(TRAFFIC_PROTECT_PERIOD_MS); + } + #endif + +@@ -2250,12 +1685,10 @@ static void dynamic_chk_wk_hdl(_adapter + struct mlme_priv *pmlmepriv; + pmlmepriv = &(padapter->mlmepriv); + +-#ifdef CONFIG_AP_MODE + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) + { + expire_timeout_chk(padapter); + } +-#endif + + //for debug purpose + _linked_info_dump(padapter); +@@ -2370,7 +1803,7 @@ _func_enter_; + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -2418,7 +1851,7 @@ u8 rtw_dm_in_lps_wk_cmd(_adapter*padapte + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -2470,43 +1903,6 @@ static void rtw_lps_change_dtim_hdl(_ada + up(&pwrpriv->lock); + } + +-u8 rtw_lps_change_dtim_cmd(_adapter*padapter, u8 dtim) +-{ +- struct cmd_obj *ph2c; +- struct drvextra_cmd_parm *pdrvextra_cmd_parm; +- struct cmd_priv *pcmdpriv = &padapter->cmdpriv; +- u8 res = _SUCCESS; +- +- { +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if(ph2c==NULL){ +- res= _FAIL; +- goto exit; +- } +- +- pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); +- if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); +- res= _FAIL; +- goto exit; +- } +- +- pdrvextra_cmd_parm->ec_id = LPS_CHANGE_DTIM_CID; +- pdrvextra_cmd_parm->type = dtim; +- pdrvextra_cmd_parm->size = 0; +- pdrvextra_cmd_parm->pbuf = NULL; +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +- } +- +-exit: +- +- return res; +- +-} +- + static void rtw_dm_ra_mask_hdl(_adapter *padapter, struct sta_info *psta) + { + if (psta) { +@@ -2530,7 +1926,7 @@ u8 rtw_dm_ra_mask_wk_cmd(_adapter*padapt + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -2583,7 +1979,7 @@ _func_enter_; + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ppscmd, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ppscmd); + res= _FAIL; + goto exit; + } +@@ -2604,8 +2000,6 @@ _func_exit_; + + } + +-#ifdef CONFIG_AP_MODE +- + extern u32 g_wait_hiq_empty; + + static void rtw_chk_hi_queue_hdl(_adapter *padapter) +@@ -2666,7 +2060,7 @@ u8 rtw_chk_hi_queue_cmd(_adapter*padapte + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if(pdrvextra_cmd_parm==NULL){ +- rtw_mfree((unsigned char *)ph2c, sizeof(struct cmd_obj)); ++ kfree((unsigned char *)ph2c); + res= _FAIL; + goto exit; + } +@@ -2685,7 +2079,6 @@ exit: + return res; + + } +-#endif + + struct btinfo { + u8 cid; +@@ -2751,50 +2144,6 @@ static void rtw_btinfo_hdl(_adapter *ada + rtw_btcoex_BtInfoNotify(adapter ,len+1, &buf[1]); + } + +-u8 rtw_btinfo_cmd(_adapter *adapter, u8 *buf, u16 len) +-{ +- struct cmd_obj *ph2c; +- struct drvextra_cmd_parm *pdrvextra_cmd_parm; +- u8 *btinfo; +- struct cmd_priv *pcmdpriv = &adapter->cmdpriv; +- u8 res = _SUCCESS; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if (ph2c == NULL) { +- res = _FAIL; +- goto exit; +- } +- +- pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); +- if (pdrvextra_cmd_parm == NULL) { +- rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj)); +- res = _FAIL; +- goto exit; +- } +- +- btinfo = rtw_zmalloc(len); +- if (btinfo == NULL) { +- rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj)); +- rtw_mfree((u8*)pdrvextra_cmd_parm, sizeof(struct drvextra_cmd_parm)); +- res = _FAIL; +- goto exit; +- } +- +- pdrvextra_cmd_parm->ec_id = BTINFO_WK_CID; +- pdrvextra_cmd_parm->type = 0; +- pdrvextra_cmd_parm->size = len; +- pdrvextra_cmd_parm->pbuf = btinfo; +- +- memcpy(btinfo, buf, len); +- +- init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra)); +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +- +-exit: +- return res; +-} +- + u8 rtw_c2h_packet_wk_cmd(PADAPTER padapter, u8 *pbuf, u16 length) + { + struct cmd_obj *ph2c; +@@ -2810,7 +2159,7 @@ u8 rtw_c2h_packet_wk_cmd(PADAPTER padapt + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if (pdrvextra_cmd_parm == NULL) { +- rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj)); ++ kfree((u8*)ph2c); + res = _FAIL; + goto exit; + } +@@ -2845,7 +2194,7 @@ u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 + + pdrvextra_cmd_parm = (struct drvextra_cmd_parm*)rtw_zmalloc(sizeof(struct drvextra_cmd_parm)); + if (pdrvextra_cmd_parm == NULL) { +- rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj)); ++ kfree((u8*)ph2c); + res = _FAIL; + goto exit; + } +@@ -2864,42 +2213,6 @@ exit: + return res; + } + +-u8 rtw_run_in_thread_cmd(PADAPTER padapter, void (*func)(void*), void* context) +-{ +- struct cmd_priv *pcmdpriv; +- struct cmd_obj *ph2c; +- struct RunInThread_param *parm; +- s32 res = _SUCCESS; +- +-_func_enter_; +- +- pcmdpriv = &padapter->cmdpriv; +- +- ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); +- if (NULL == ph2c) { +- res = _FAIL; +- goto exit; +- } +- +- parm = (struct RunInThread_param*)rtw_zmalloc(sizeof(struct RunInThread_param)); +- if (NULL == parm) { +- rtw_mfree((u8*)ph2c, sizeof(struct cmd_obj)); +- res = _FAIL; +- goto exit; +- } +- +- parm->func = func; +- parm->context = context; +- init_h2fwcmd_w_parm_no_rsp(ph2c, parm, GEN_CMD_CODE(_RunInThreadCMD)); +- +- res = rtw_enqueue_cmd(pcmdpriv, ph2c); +-exit: +- +-_func_exit_; +- +- return res; +-} +- + static void c2h_wk_callback(_workitem *work) + { + struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk); +@@ -2916,7 +2229,7 @@ static void c2h_wk_callback(_workitem *w + } else if ((c2h_evt = (u8 *)rtw_malloc(16)) != NULL) { + /* This C2H event is not read, read & clear now */ + if (rtw_hal_c2h_evt_read(adapter, c2h_evt) != _SUCCESS) { +- rtw_mfree(c2h_evt, 16); ++ kfree(c2h_evt); + continue; + } + } +@@ -2926,14 +2239,14 @@ static void c2h_wk_callback(_workitem *w + continue; + + if (!rtw_hal_c2h_valid(adapter, c2h_evt)) { +- rtw_mfree(c2h_evt, 16); ++ kfree(c2h_evt); + continue; + } + + if (ccx_id_filter(c2h_evt) == true) { + /* Handle CCX report here */ + rtw_hal_c2h_handler(adapter, c2h_evt); +- rtw_mfree(c2h_evt, 16); ++ kfree(c2h_evt); + } else { + /* Enqueue into cmd_thread for others */ + rtw_c2h_wk_cmd(adapter, c2h_evt); +@@ -2969,11 +2282,9 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapt + case LPS_CHANGE_DTIM_CID: + rtw_lps_change_dtim_hdl(padapter, (u8)pdrvextra_cmd->type); + break; +-#ifdef CONFIG_AP_MODE + case CHECK_HIQ_WK_CID: + rtw_chk_hi_queue_hdl(padapter); + break; +-#endif //CONFIG_AP_MODE + #ifdef CONFIG_INTEL_WIDI + case INTEl_WIDI_WK_CID: + intel_widi_wk_hdl(padapter, pdrvextra_cmd->type, pdrvextra_cmd->pbuf); +@@ -3001,7 +2312,7 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapt + + if (pdrvextra_cmd->pbuf && pdrvextra_cmd->size>0) + { +- rtw_mfree(pdrvextra_cmd->pbuf, pdrvextra_cmd->size); ++ kfree(pdrvextra_cmd->pbuf); + } + + return H2C_SUCCESS; +@@ -3038,9 +2349,9 @@ _func_enter_; + + if (pcmd->res != H2C_SUCCESS) + { +- _enter_critical_bh(&pmlmepriv->lock, &irqL); ++ spin_lock_bh(&pmlmepriv->lock); + set_fwstate(pmlmepriv, _FW_LINKED); +- _exit_critical_bh(&pmlmepriv->lock, &irqL); ++ spin_unlock_bh(&pmlmepriv->lock); + + RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ***Error: disconnect_cmd_callback Fail ***\n.")); + +@@ -3100,7 +2411,7 @@ _func_enter_; + + _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); + +- _enter_critical_bh(&pmlmepriv->lock, &irqL); ++ spin_lock_bh(&pmlmepriv->lock); + + + if(check_fwstate(pmlmepriv, WIFI_AP_STATE) ) +@@ -3123,28 +2434,28 @@ _func_enter_; + _irqL irqL; + + pwlan = _rtw_alloc_network(pmlmepriv); +- _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ++ spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + if ( pwlan == NULL) + { + pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); + if( pwlan == NULL) + { + RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n Error: can't get pwlan in rtw_joinbss_event_callback \n")); +- _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ++ spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + goto createbss_cmd_fail; + } + pwlan->last_scanned = jiffies; + } + else + { +- rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); ++ list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); + } + + pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork); + memcpy(&(pwlan->network), pnetwork, pnetwork->Length); + //pwlan->fixed = true; + +- //rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); ++ //list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); + + // copy pdev_network information to pmlmepriv->cur_network + memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork))); +@@ -3154,14 +2465,14 @@ _func_enter_; + + _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + +- _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ++ spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + // we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) + + } + + createbss_cmd_fail: + +- _exit_critical_bh(&pmlmepriv->lock, &irqL); ++ spin_unlock_bh(&pmlmepriv->lock); + exit: + rtw_free_cmd_obj(pcmd); + +@@ -3214,28 +2525,16 @@ _func_enter_; + + psta->aid = psta->mac_id = passocsta_rsp->cam_id; + +- _enter_critical_bh(&pmlmepriv->lock, &irqL); ++ spin_lock_bh(&pmlmepriv->lock); + + if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)) + _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); + + set_fwstate(pmlmepriv, _FW_LINKED); +- _exit_critical_bh(&pmlmepriv->lock, &irqL); ++ spin_unlock_bh(&pmlmepriv->lock); + + exit: + rtw_free_cmd_obj(pcmd); + + _func_exit_; + } +- +-void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd); +-void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) +-{ +-_func_enter_; +- +- rtw_free_cmd_obj(pcmd); +- +-_func_exit_; +- +-} +- +diff -Nurp linux/3rdparty/rtl8723bs.old/core/rtw_debug.c linux/3rdparty/rtl8723bs/core/rtw_debug.c +--- linux/3rdparty/rtl8723bs.old/core/rtw_debug.c 2015-05-10 14:36:05.666667879 +0300 ++++ linux/3rdparty/rtl8723bs/core/rtw_debug.c 2015-05-07 17:46:55.000000000 +0300 +@@ -62,7 +62,7 @@ u32 GlobalDebugLevel = _drv_err_; + + void dump_drv_version(void *sel) + { +- DBG_871X_SEL_NL(sel, "%s %s\n", DRV_NAME, DRIVERVERSION); ++ DBG_871X_SEL_NL(sel, "%s %s\n", "rtl8723bs", DRIVERVERSION); + } + + void dump_log_level(void *sel) +@@ -309,7 +309,6 @@ int proc_get_mlmext_state(struct seq_fil + return 0; + } + +-#ifdef CONFIG_LAYER2_ROAMING + int proc_get_roam_flags(struct seq_file *m, void *v) + { + struct net_device *dev = m->private; +@@ -411,7 +410,6 @@ ssize_t proc_set_roam_tgt_addr(struct fi + + return count; + } +-#endif /* CONFIG_LAYER2_ROAMING */ + + int proc_get_qos_option(struct seq_file *m, void *v) + { +@@ -463,18 +461,19 @@ int proc_get_survey_info(struct seq_file + s16 notify_noise = 0; + u16 index = 0; + +- _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ++ spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); + phead = get_list_head(queue); ++ plist = phead ? get_next(phead) : NULL; + plist = get_next(phead); + if ((!phead) || (!plist)) { +- _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ++ spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + return 0; + } + + DBG_871X_SEL_NL(m, "%5s %-17s %3s %-3s %-4s %-4s %5s %s\n","index", "bssid", "ch", "RSSI", "SdBm", "Noise", "age", "ssid"); + while(1) + { +- if (rtw_end_of_queue_search(phead,plist)== true) ++ if (phead == plist) + break; + + pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); +@@ -504,7 +503,7 @@ int proc_get_survey_info(struct seq_file + pnetwork->network.Ssid.Ssid); + plist = get_next(plist); + } +- _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); ++ spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); + + return 0; + } +@@ -1325,9 +1324,6 @@ ssize_t proc_set_rssi_disp(struct file * + + } + +- +-#ifdef CONFIG_AP_MODE +- + int proc_get_all_sta_info(struct seq_file *m, void *v) + { + struct net_device *dev = m->private; +@@ -1341,14 +1337,14 @@ int proc_get_all_sta_info(struct seq_fil + + DBG_871X_SEL_NL(m, "sta_dz_bitmap=0x%x, tim_bitmap=0x%x\n", pstapriv->sta_dz_bitmap, pstapriv->tim_bitmap); + +- _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); ++ spin_lock_bh(&pstapriv->sta_hash_lock); + + for(i=0; i< NUM_STA; i++) + { + phead = &(pstapriv->sta_hash[i]); + plist = get_next(phead); + +- while ((rtw_end_of_queue_search(phead, plist)) == false) ++ while (phead != plist) + { + psta = LIST_CONTAINOR(plist, struct sta_info, hash_list); + +@@ -1394,12 +1390,10 @@ int proc_get_all_sta_info(struct seq_fil + + } + +- _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); ++ spin_unlock_bh(&pstapriv->sta_hash_lock); + + return 0; + } +- +-#endif + + int proc_get_btcoex_dbg(struct seq_file *m, void *v) + { +@@ -1497,7 +1491,7 @@ int proc_get_btcoex_info(struct seq_file + + DBG_871X_SEL(m, "%s\n", pbuf); + +- rtw_mfree(pbuf, bufsize); ++ kfree(pbuf); + + return 0; + } +diff -Nurp linux/3rdparty/rtl8723bs.old/core/rtw_eeprom.c linux/3rdparty/rtl8723bs/core/rtw_eeprom.c +--- linux/3rdparty/rtl8723bs.old/core/rtw_eeprom.c 2015-05-10 14:36:05.666667879 +0300 ++++ linux/3rdparty/rtl8723bs/core/rtw_eeprom.c 1970-01-01 02:00:00.000000000 +0200 +@@ -1,381 +0,0 @@ +-/****************************************************************************** +- * +- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. +- * +- * This program is free software; you can redistribute it and/or modify it +- * under the terms of version 2 of the GNU General Public License as +- * published by the Free Software Foundation. +- * +- * 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, USA +- * +- * +- ******************************************************************************/ +-#define _RTW_EEPROM_C_ +- +-#include +-#include +-#include +- +-void up_clk(_adapter* padapter, u16 *x) +-{ +-_func_enter_; +- *x = *x | _EESK; +- rtw_write8(padapter, EE_9346CR, (u8)*x); +- udelay(CLOCK_RATE); +- +-_func_exit_; +- +-} +- +-void down_clk(_adapter * padapter, u16 *x ) +-{ +-_func_enter_; +- *x = *x & ~_EESK; +- rtw_write8(padapter, EE_9346CR, (u8)*x); +- udelay(CLOCK_RATE); +-_func_exit_; +-} +- +-void shift_out_bits(_adapter * padapter, u16 data, u16 count) +-{ +- u16 x,mask; +-_func_enter_; +- +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- mask = 0x01 << (count - 1); +- x = rtw_read8(padapter, EE_9346CR); +- +- x &= ~(_EEDO | _EEDI); +- +- do +- { +- x &= ~_EEDI; +- if(data & mask) +- x |= _EEDI; +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- rtw_write8(padapter, EE_9346CR, (u8)x); +- udelay(CLOCK_RATE); +- up_clk(padapter, &x); +- down_clk(padapter, &x); +- mask = mask >> 1; +- } while(mask); +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- x &= ~_EEDI; +- rtw_write8(padapter, EE_9346CR, (u8)x); +-out: +-_func_exit_; +-} +- +-u16 shift_in_bits (_adapter * padapter) +-{ +- u16 x,d=0,i; +-_func_enter_; +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- x = rtw_read8(padapter, EE_9346CR); +- +- x &= ~( _EEDO | _EEDI); +- d = 0; +- +- for(i=0; i<16; i++) +- { +- d = d << 1; +- up_clk(padapter, &x); +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- x = rtw_read8(padapter, EE_9346CR); +- +- x &= ~(_EEDI); +- if(x & _EEDO) +- d |= 1; +- +- down_clk(padapter, &x); +- } +-out: +-_func_exit_; +- +- return d; +-} +- +-void standby(_adapter * padapter ) +-{ +- u8 x; +-_func_enter_; +- x = rtw_read8(padapter, EE_9346CR); +- +- x &= ~(_EECS | _EESK); +- rtw_write8(padapter, EE_9346CR,x); +- +- udelay(CLOCK_RATE); +- x |= _EECS; +- rtw_write8(padapter, EE_9346CR, x); +- udelay(CLOCK_RATE); +-_func_exit_; +-} +- +-u16 wait_eeprom_cmd_done(_adapter* padapter) +-{ +- u8 x; +- u16 i,res=false; +-_func_enter_; +- standby(padapter ); +- for (i=0; i<200; i++) +- { +- x = rtw_read8(padapter, EE_9346CR); +- if (x & _EEDO){ +- res=true; +- goto exit; +- } +- udelay(CLOCK_RATE); +- } +-exit: +-_func_exit_; +- return res; +-} +- +-void eeprom_clean(_adapter * padapter) +-{ +- u16 x; +-_func_enter_; +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- x = rtw_read8(padapter, EE_9346CR); +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- x &= ~(_EECS | _EEDI); +- rtw_write8(padapter, EE_9346CR, (u8)x); +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- up_clk(padapter, &x); +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- down_clk(padapter, &x); +-out: +-_func_exit_; +-} +- +-void eeprom_write16(_adapter * padapter, u16 reg, u16 data) +-{ +- u8 x; +- +-_func_enter_; +- +- x = rtw_read8(padapter, EE_9346CR); +- +- x &= ~(_EEDI | _EEDO | _EESK | _EEM0); +- x |= _EEM1 | _EECS; +- rtw_write8(padapter, EE_9346CR, x); +- +- shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5); +- +- if(padapter->EepromAddressSize==8) //CF+ and SDIO +- shift_out_bits(padapter, 0, 6); +- else //USB +- shift_out_bits(padapter, 0, 4); +- +- standby( padapter); +- +-// Commented out by rcnjko, 2004.0 +-// // Erase this particular word. Write the erase opcode and register +-// // number in that order. The opcode is 3bits in length; reg is 6 bits long. +-// shift_out_bits(Adapter, EEPROM_ERASE_OPCODE, 3); +-// shift_out_bits(Adapter, reg, Adapter->EepromAddressSize); +-// +-// if (wait_eeprom_cmd_done(Adapter ) == false) +-// { +-// return; +-// } +- +- +- standby(padapter ); +- +- // write the new word to the EEPROM +- +- // send the write opcode the EEPORM +- shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3); +- +- // select which word in the EEPROM that we are writing to. +- shift_out_bits(padapter, reg, padapter->EepromAddressSize); +- +- // write the data to the selected EEPROM word. +- shift_out_bits(padapter, data, 16); +- +- if (wait_eeprom_cmd_done(padapter ) == false) +- { +- +- goto exit; +- } +- +- standby(padapter ); +- +- shift_out_bits(padapter, EEPROM_EWDS_OPCODE, 5); +- shift_out_bits(padapter, reg, 4); +- +- eeprom_clean(padapter ); +-exit: +-_func_exit_; +- return; +-} +- +-u16 eeprom_read16(_adapter * padapter, u16 reg) //ReadEEprom +-{ +- +- u16 x; +- u16 data=0; +- +-_func_enter_; +- +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- // select EEPROM, reset bits, set _EECS +- x = rtw_read8(padapter, EE_9346CR); +- +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- +- x &= ~(_EEDI | _EEDO | _EESK | _EEM0); +- x |= _EEM1 | _EECS; +- rtw_write8(padapter, EE_9346CR, (unsigned char)x); +- +- // write the read opcode and register number in that order +- // The opcode is 3bits in length, reg is 6 bits long +- shift_out_bits(padapter, EEPROM_READ_OPCODE, 3); +- shift_out_bits(padapter, reg, padapter->EepromAddressSize); +- +- // Now read the data (16 bits) in from the selected EEPROM word +- data = shift_in_bits(padapter); +- +- eeprom_clean(padapter); +-out: +-_func_exit_; +- return data; +- +- +-} +- +- +- +- +-//From even offset +-void eeprom_read_sz(_adapter * padapter, u16 reg, u8* data, u32 sz) +-{ +- +- u16 x, data16; +- u32 i; +-_func_enter_; +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- // select EEPROM, reset bits, set _EECS +- x = rtw_read8(padapter, EE_9346CR); +- +- if(padapter->bSurpriseRemoved==true){ +- RT_TRACE(_module_rtl871x_eeprom_c_,_drv_err_,("padapter->bSurpriseRemoved==true")); +- goto out; +- } +- +- x &= ~(_EEDI | _EEDO | _EESK | _EEM0); +- x |= _EEM1 | _EECS; +- rtw_write8(padapter, EE_9346CR, (unsigned char)x); +- +- // write the read opcode and register number in that order +- // The opcode is 3bits in length, reg is 6 bits long +- shift_out_bits(padapter, EEPROM_READ_OPCODE, 3); +- shift_out_bits(padapter, reg, padapter->EepromAddressSize); +- +- +- for(i=0; i>8; +- } +- +- eeprom_clean(padapter); +-out: +-_func_exit_; +- +- +- +-} +- +- +-//addr_off : address offset of the entry in eeprom (not the tuple number of eeprom (reg); that is addr_off !=reg) +-u8 eeprom_read(_adapter * padapter, u32 addr_off, u8 sz, u8* rbuf) +-{ +- u8 quotient, remainder, addr_2align_odd; +- u16 reg, stmp , i=0, idx = 0; +-_func_enter_; +- reg = (u16)(addr_off >> 1); +- addr_2align_odd = (u8)(addr_off & 0x1); +- +- if(addr_2align_odd) //read that start at high part: e.g 1,3,5,7,9,... +- { +- stmp = eeprom_read16(padapter, reg); +- rbuf[idx++] = (u8) ((stmp>>8)&0xff); //return hogh-part of the short +- reg++; sz--; +- } +- +- quotient = sz >> 1; +- remainder = sz & 0x1; +- +- for( i=0 ; i < quotient; i++) +- { +- stmp = eeprom_read16(padapter, reg+i); +- rbuf[idx++] = (u8) (stmp&0xff); +- rbuf[idx++] = (u8) ((stmp>>8)&0xff); +- } +- +- reg = reg+i; +- if(remainder){ //end of read at lower part of short : 0,2,4,6,... +- stmp = eeprom_read16(padapter, reg); +- rbuf[idx] = (u8)(stmp & 0xff); +- } +-_func_exit_; +- return true; +-} +- +- +- +-void read_eeprom_content(_adapter * padapter) +-{ +- +-_func_enter_; +- +- +-_func_exit_; +-} +- +diff -Nurp linux/3rdparty/rtl8723bs.old/core/rtw_efuse.c linux/3rdparty/rtl8723bs/core/rtw_efuse.c +--- linux/3rdparty/rtl8723bs.old/core/rtw_efuse.c 2015-05-10 14:36:05.666667879 +0300 ++++ linux/3rdparty/rtl8723bs/core/rtw_efuse.c 2015-05-07 17:46:55.000000000 +0300 +@@ -121,18 +121,8 @@ Efuse_PowerSwitch( + pAdapter->HalFunc.EfusePowerSwitch(pAdapter, bWrite, PwrState); + } + +-void +-BTEfuse_PowerSwitch( +- IN PADAPTER pAdapter, +- IN u8 bWrite, +- IN u8 PwrState) +-{ +- if(pAdapter->HalFunc.BTEfusePowerSwitch) +- pAdapter->HalFunc.BTEfusePowerSwitch(pAdapter, bWrite, PwrState); +-} +- + /*----------------------------------------------------------------------------- +- * Function: efuse_GetCurrentSize ++ * Function: Efuse_GetCurrentSize + * + * Overview: Get current efuse size!!! + * +@@ -174,68 +164,6 @@ Efuse_CalculateWordCnts(IN u8 word_en) + + // + // Description: +-// Execute E-Fuse read byte operation. +-// Refered from SD1 Richard. +-// +-// Assumption: +-// 1. Boot from E-Fuse and successfully auto-load. +-// 2. PASSIVE_LEVEL (USB interface) +-// +-// Created by Roger, 2008.10.21. +-// +-void +-ReadEFuseByte( +- PADAPTER Adapter, +- u16 _offset, +- u8 *pbuf, +- IN bool bPseudoTest) +-{ +- u32 value32; +- u8 readbyte; +- u16 retry; +- +- if(bPseudoTest) +- { +- Efuse_Read1ByteFromFakeContent(Adapter, _offset, pbuf); +- return; +- } +- // <20130121, Kordan> For SMIC S55 EFUSE specificatoin. +- //0x34[11]: SW force PGMEN input of efuse to high. (for the bank selected by 0x34[9:8]) +- PHY_SetMacReg(Adapter, EFUSE_TEST, BIT11, 0); +- +- //Write Address +- rtw_write8(Adapter, EFUSE_CTRL+1, (_offset & 0xff)); +- readbyte = rtw_read8(Adapter, EFUSE_CTRL+2); +- rtw_write8(Adapter, EFUSE_CTRL+2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc)); +- +- //Write bit 32 0 +- readbyte = rtw_read8(Adapter, EFUSE_CTRL+3); +- rtw_write8(Adapter, EFUSE_CTRL+3, (readbyte & 0x7f)); +- +- //Check bit 32 read-ready +- retry = 0; +- value32 = rtw_read32(Adapter, EFUSE_CTRL); +- //while(!(((value32 >> 24) & 0xff) & 0x80) && (retry<10)) +- while(!(((value32 >> 24) & 0xff) & 0x80) && (retry<10000)) +- { +- value32 = rtw_read32(Adapter, EFUSE_CTRL); +- retry++; +- } +- +- // 20100205 Joseph: Add delay suggested by SD1 Victor. +- // This fix the problem that Efuse read error in high temperature condition. +- // Designer says that there shall be some delay after ready bit is set, or the +- // result will always stay on last data we read. +- udelay(50); +- value32 = rtw_read32(Adapter, EFUSE_CTRL); +- +- *pbuf = (u8)(value32 & 0xff); +- //DBG_871X("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,jiffies_to_msecs(jiffies - start)); +- +-} +- +-// +-// Description: + // 1. Execute E-Fuse read byte operation according as map offset and + // save to E-Fuse table. + // 2. Refered from SD1 Richard. +@@ -350,76 +278,6 @@ EFUSE_Read1Byte( + + }/* EFUSE_Read1Byte */ + +-/*----------------------------------------------------------------------------- +- * Function: EFUSE_Write1Byte +- * +- * Overview: Copy from WMAC fot EFUSE write 1 byte. +- * +- * Input: NONE +- * +- * Output: NONE +- * +- * Return: NONE +- * +- * Revised History: +- * When Who Remark +- * 09/23/2008 MHC Copy from WMAC. +- * +- *---------------------------------------------------------------------------*/ +- +-void +-EFUSE_Write1Byte( +- IN PADAPTER Adapter, +- IN u16 Address, +- IN u8 Value); +-void +-EFUSE_Write1Byte( +- IN PADAPTER Adapter, +- IN u16 Address, +- IN u8 Value) +-{ +- u8 Bytetemp = {0x00}; +- u8 temp = {0x00}; +- u32 k=0; +- u16 contentLen=0; +- +- //RT_TRACE(COMP_EFUSE, DBG_LOUD, ("Addr=%x Data =%x\n", Address, Value)); +- EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, false); +- +- if( Address < contentLen) //E-fuse 512Byte +- { +- rtw_write8(Adapter, EFUSE_CTRL, Value); +- +- //Write E-fuse Register address bit0~7 +- temp = Address & 0xFF; +- rtw_write8(Adapter, EFUSE_CTRL+1, temp); +- Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2); +- +- //Write E-fuse Register address bit8~9 +- temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC); +- rtw_write8(Adapter, EFUSE_CTRL+2, temp); +- +- //Write 0x30[31]=1 +- Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); +- temp = Bytetemp | 0x80; +- rtw_write8(Adapter, EFUSE_CTRL+3, temp); +- +- //Wait Write-ready (0x30[31]=0) +- Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); +- while(Bytetemp & 0x80) +- { +- Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3); +- k++; +- if(k==100) +- { +- k=0; +- break; +- } +- } +- } +-}/* EFUSE_Write1Byte */ +- +- + /* 11/16/2008 MH Read one byte from real Efuse. */ + u8 + efuse_OneByteRead( +@@ -642,289 +500,6 @@ Efuse_WordEnableDataWrite( IN PADAPTER p + return ret; + } + +-static u8 efuse_read8(PADAPTER padapter, u16 address, u8 *value) +-{ +- return efuse_OneByteRead(padapter,address, value, false); +-} +- +-static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value) +-{ +- return efuse_OneByteWrite(padapter,address, *value, false); +-} +- +-/* +- * read/wirte raw efuse data +- */ +-u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *data) +-{ +- int i = 0; +- u16 real_content_len = 0, max_available_size = 0; +- u8 res = _FAIL ; +- u8 (*rw8)(PADAPTER, u16, u8*); +- +- EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false); +- EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); +- +- if (start_addr > real_content_len) +- return _FAIL; +- +- if (true == bWrite) { +- if ((start_addr + cnts) > max_available_size) +- return _FAIL; +- rw8 = &efuse_write8; +- } else +- rw8 = &efuse_read8; +- +- Efuse_PowerSwitch(padapter, bWrite, true); +- +- // e-fuse one byte read / write +- for (i = 0; i < cnts; i++) { +- if (start_addr >= real_content_len) { +- res = _FAIL; +- break; +- } +- +- res = rw8(padapter, start_addr++, data++); +- if (_FAIL == res) break; +- } +- +- Efuse_PowerSwitch(padapter, bWrite, false); +- +- return res; +-} +-//------------------------------------------------------------------------------ +-u16 efuse_GetMaxSize(PADAPTER padapter) +-{ +- u16 max_size; +- EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false); +- return max_size; +-} +-//------------------------------------------------------------------------------ +-u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size) +-{ +- Efuse_PowerSwitch(padapter, false, true); +- *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, false); +- Efuse_PowerSwitch(padapter, false, false); +- +- return _SUCCESS; +-} +-//------------------------------------------------------------------------------ +-u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +-{ +- u16 mapLen=0; +- +- EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); +- +- if ((addr + cnts) > mapLen) +- return _FAIL; +- +- Efuse_PowerSwitch(padapter, false, true); +- +- efuse_ReadEFuse(padapter, EFUSE_WIFI, addr, cnts, data, false); +- +- Efuse_PowerSwitch(padapter, false, false); +- +- return _SUCCESS; +-} +- +-u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +-{ +- u16 mapLen=0; +- +- EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); +- +- if ((addr + cnts) > mapLen) +- return _FAIL; +- +- Efuse_PowerSwitch(padapter, false, true); +- +- efuse_ReadEFuse(padapter, EFUSE_BT, addr, cnts, data, false); +- +- Efuse_PowerSwitch(padapter, false, false); +- +- return _SUCCESS; +-} +-//------------------------------------------------------------------------------ +-u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +-{ +-#define RT_ASSERT_RET(expr) \ +- if(!(expr)) { \ +- printk( "Assertion failed! %s at ......\n", #expr); \ +- printk( " ......%s,%s,line=%d\n",__FILE__,__FUNCTION__,__LINE__); \ +- return _FAIL; \ +- } +- +- u8 offset, word_en; +- u8 *map; +- u8 newdata[PGPKT_DATA_SIZE]; +- s32 i, j, idx; +- u8 ret = _SUCCESS; +- u16 mapLen=0; +- EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); +- HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); +- +- EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false); +- +- if ((addr + cnts) > mapLen) +- return _FAIL; +- +- RT_ASSERT_RET(PGPKT_DATA_SIZE == 8); // have to be 8 byte alignment +- RT_ASSERT_RET((mapLen & 0x7) == 0); // have to be PGPKT_DATA_SIZE alignment for memcpy +- +- map = rtw_zmalloc(mapLen); +- if(map == NULL){ +- return _FAIL; +- } +- +- memset(map, 0xFF, mapLen); +- +- ret = rtw_efuse_map_read(padapter, 0, mapLen, map); +- if (ret == _FAIL) goto exit; +- +- Efuse_PowerSwitch(padapter, true, true); +- +- idx = 0; +- offset = (addr >> 3); +- while (idx < cnts) +- { +- word_en = 0xF; +- j = (addr + idx) & 0x7; +- memcpy(newdata, &map[offset << 3], PGPKT_DATA_SIZE); +- for (i = j; i> 1); +- newdata[i] = data[idx]; +- +- if( addr + idx == 0x8) +- { +- if (IS_C_CUT(pHalData->VersionID) || IS_B_CUT(pHalData->VersionID)) +- { +- if(pEEPROM->adjuseVoltageVal == 6) +- { +- newdata[i] = map[addr + idx]; +- DBG_8192C(" %s ,\n adjuseVoltageVal = %d ,newdata[%d] = %x \n",__func__,pEEPROM->adjuseVoltageVal,i,newdata[i]); +- } +- } +- } +- } +- } +- +- if (word_en != 0xF) { +- ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false); +- DBG_871X("offset=%x \n",offset); +- DBG_871X("word_en=%x \n",word_en); +- +- for(i=0;i mapLen) +- return _FAIL; +- +- RT_ASSERT_RET(PGPKT_DATA_SIZE == 8); // have to be 8 byte alignment +- RT_ASSERT_RET((mapLen & 0x7) == 0); // have to be PGPKT_DATA_SIZE alignment for memcpy +- +- map = rtw_zmalloc(mapLen); +- if(map == NULL){ +- return _FAIL; +- } +- +- ret = rtw_BT_efuse_map_read(padapter, 0, mapLen, map); +- if (ret == _FAIL) goto exit; +- DBG_871X("OFFSET\tVALUE(hex)\n"); +- for (i=0; i<1024; i+=16) // set 512 because the iwpriv's extra size have limit 0x7FF +- { +- DBG_871X("0x%03x\t", i); +- for (j=0; j<8; j++) { +- DBG_871X("%02X ", map[i+j]); +- } +- DBG_871X("\t"); +- for (; j<16; j++) { +- DBG_871X("%02X ", map[i+j]); +- } +- DBG_871X("\n"); +- } +- DBG_871X("\n"); +- Efuse_PowerSwitch(padapter, true, true); +- +- idx = 0; +- offset = (addr >> 3); +- while (idx < cnts) +- { +- word_en = 0xF; +- j = (addr + idx) & 0x7; +- memcpy(newdata, &map[offset << 3], PGPKT_DATA_SIZE); +- for (i = j; i> 1); +- newdata[i] = data[idx]; +- } +- } +- +- if (word_en != 0xF) { +- DBG_871X("offset=%x \n",offset); +- DBG_871X("word_en=%x \n",word_en); +- DBG_871X("%s: data=", __FUNCTION__); +- for(i=0;i + + + libffi + http://sourceware.org/libffi + + PisiLinux Community + admins@pisilinux.org + + BSD + library + system.base + A portable foreign function interface library + Yabancı işlev arayüzleri için taşınabilir bir kitaplık + The libffi library provides a portable, high level programming interface to various calling conventions. + libffi kitaplığı, çeşitli işlev çağırma konvansiyonları için taşınabilir ve yüksek düzeyli bir programlama arayüzü sunar. + ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz + system/base/libffi/pspec.xml + + + libffi + + /usr/lib/libffi.* + /usr/share/doc + + + + libffi-devel + Development files for libffi + libffi için geliştirme dosyaları + system.devel + + libffi + + + /usr/lib/libffi-* + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/info + /usr/share/man + + + + libffi-32bit + 32-bit shared libraries for libffi + libffi için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + libffi + + + /usr/lib32/libffi.* + /usr/lib32/libffi-* + + + + + 2014-12-02 + 3.2.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 3.0.13 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 3.0.13 + Version bump, clean libffi. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-17 + 3.0.12 + New Release + PisiLinux Community + admins@pisilinux.org + + + 2012-07-11 + 3.0.11 + First release + Erdem Artan + admins@pisilinux.org + + + + + + help2man + http://www.gnu.org/software/help2man + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + GNU utility to convert program --help output to a man page + Geleneksel --help çıktılarını man sayfalarına dönüştüren bir GNU yazılımı + Help2man is a tool which generate man page from help text of programs. + Help2man programların help çıktılarını man sayfalarına dönüştüren bir araçtır. + http://ftp.gnu.org/gnu/help2man/help2man-1.46.4.tar.xz + + perl-Locale-gettext + + system/base/help2man/pspec.xml + + + help2man + + perl-Locale-gettext + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/info + /usr/share/locale + /usr/share/man + + + + + 2015-02-12 + 1.46.4 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-05-11 + 1.41.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-14 + 1.41.1 + New release + PisiLinux Community + admins@pisilinux.org + + + 2011-09-07 + 1.40.4 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + polkit + http://www.freedesktop.org/wiki/Software/PolicyKit + + PisiLinux Community + admins@pisilinux.org + + LGPLv2+ + service + library + app:console + system.base + PolicyKit Authorization Framework + Sistem bileşenleri için erişim politikası servisi + polkit est un cadre de développement (framework) pour définir des politiques à appliquer à des composants du système ainsi que fournir à des parties du bureau la possibilité de les configurer. + polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged processes. + polkit, sistem genelindeki bileşenlerin ve masaüstü bileşenlerinin ayarlayabileceği şekilde ilkeler tanımlamak için araçlardan oluşur. + http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz + + pam-devel + dbus-devel + glib2-devel + expat-devel + dbus-glib-devel + spidermonkey-devel + intltool + + + disable-docs.patch + use-system-locale-in-gobject-api.diff + + system/base/polkit/pspec.xml + + + polkit-devel + Development headers for polkit + polkit geliştirme başlıkları + system.devel + + polkit + glib2-devel + + + /usr/include + /usr/lib/pkgconfig + + + + polkit + + pam + dbus + glib2 + expat + dbus-glib + spidermonkey + + + /etc + /usr/lib + /usr/libexec + /usr/bin + /usr/sbin + /usr/share/locale + /usr/share/polkit-1 + /usr/share/dbus-1 + /usr/share/gir-1.0 + /var/lib/polkit-1 + /lib/systemd + /usr/share/man + /usr/share/doc + + + man/pklocalauthority.8 + man/polkit.8 + man/polkitd.8 + man/pkaction.1 + man/pkcheck.1 + man/pkexec.1 + 70-desktop-policy.conf + + + + + 2015-05-08 + 0.112 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-06-10 + 0.112 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-05-11 + 0.112 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-01 + 0.112 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 0.111 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-11 + 0.110 + Güncellendi. + PisiLinux Community + admins@pisilinux.org + + + 2013-01-11 + 0.107 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + util-linux + http://userweb.kernel.org/~kzak/util-linux-ng/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + library + system.base + Divers utilitaires Linux utiles. + Various useful Linux utilities + Çeşitli kullanışlı Linux araçları + The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. + util-linux paketi, bir Linux sisteminin işlevsel olması için gerekli olan birçok düşük seviye sistem uygulamasını içerir. + https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz + + zlib-devel + eudev-devel + python-devel + shadow + ncurses-devel + libcap-ng-devel + glibc-32bit + + + upstream/util-linux-ng-2.21-login-lastlog.patch + + system/base/util-linux/pspec.xml + + + util-linux + + libutil-linux + zlib + perl + ncurses + eudev + libcap-ng + + + /etc + /bin + /sbin + /usr/bin + /usr/sbin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/misc + /usr/share/getopt + /usr/share/bash-completion/completions + /usr/share/locale + + + util-linux + + + + uuidd + Helper daemon to guarantee uniqueness of time-based UUIDs + Zaman tabanlı UUID'lerin benzersizliğini garantileyen sistem hizmeti + service + app:console + util.misc + + libutil-linux + + + /usr/bin/uuidgen + /usr/sbin/uuidd + /usr/lib/tmpfiles.d/uuidd.conf + /usr/share/man/man1/uuidgen.1 + /usr/share/man/man8/uuidd.8 + + + uuidd + + + uuidd.tmpfiles + + + + libutil-linux + util-linux runtime library + util-linux için kitaplıklar + library + + python + + + /lib + /usr/lib + /usr/share/man/man3/uuid* + /usr/share/man/man3/libblkid* + /usr/share/man/man8/blkid* + + + libblkid + libuuid + + + libblkid + libuuid + + + + libutil-linux-devel + libutil-linux header files + util-linux kitaplıkları için başlık dosyaları + header + system.devel + + libutil-linux + + + /usr/include/ + /usr/lib/pkgconfig/*.pc + + + libblkid-devel + libuuid-devel + + + libblkid-devel + libuuid-devel + + + + libutil-linux-32bit + 32-bit shared libraries for libutil-linux + util-linux için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + glibc-32bit + + + /usr/lib32/ + + + libblkid-32bit + libuuid-32bit + + + libblkid-32bit + libuuid-32bit + + + + + 2015-04-29 + 2.26.1 + Version bump, change pisi + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-04-01 + 2.26.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 2.24.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-08 + 2.24.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-20 + 2.24 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-27 + 2.22.2 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-07-26 + 2.22.2 + Release bump for rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2013-01-14 + 2.22.2 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-11-17 + 2.22.1 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + which + http://www.xs4all.nl/~carlo17/which/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Prints the location of specified executable in your path + Verilen komutun çalıştırma yolundaki önceliğe göre yerini gösterir + which, localise un programme dans le chemin de l'utilisateur. + which , Locates a program file in the user's path. + which, kullanıcı dizinindeki program dosyalarının yarini bulur. + which, findet eine Anwendungsdatei im Benutzerverzeichnis + mirrors://gnu/which/which-2.21.tar.gz + system/base/which/pspec.xml + + + which + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + + + + + 2015-04-06 + 2.21 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-05-11 + 2.20 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 2.20 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2010-10-11 + 2.20 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + json-c + http://oss.metaparadigm.com/json-c + + PisiLinux Community + admins@pisilinux.org + + MIT + library + system.base + A JSON implementation in C + C dilinde JSON gerçeklemesi + json-c implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. + json-c, C dilinde kolayca JSON nesneleri yaratılmasını sağlayan bir referans sayma modeli gerçekleyen bir kitaplıktır. + https://github.com/json-c/json-c/archive/json-c-0.12-20140410.tar.gz + + wno-werror.patch + + system/base/json-c/pspec.xml + + + json-c + + /usr/share/doc + /usr/share/man + /usr/lib + + + + json-c-devel + Development files for json-c + json-c için geliştirme dosyaları + system.devel + + json-c + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + json-c-32bit + 32-bit shared libraries for json-c + emul32 + emul32 + + glibc-32bit + + + /usr/lib32 + + + + + 2015-04-30 + 0.12 + Version bump and security update(CVE-2013-6371, CVE-2013-6370). + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 0.11 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 0.11 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-09 + 0.11 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-04-02 + 0.9 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + urlgrabber + http://urlgrabber.baseurl.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.base + High level cross-protocol url-grabber library for Python + Python için yüksek seviyeli, platform bağımsız bir url-grabber kütüphanesi + urlgrabber provides a clean library interface to protocol-independant file-access for Python programs + urlgrabber Python uygulamaları için protokol bağımsız dosya erişimi sağlayan temiz bir kütüphanedir. + http://urlgrabber.baseurl.org/download/urlgrabber-3.10.1.tar.gz + + python + + system/base/urlgrabber/pspec.xml + + + urlgrabber + + python + pycurl + + + /usr/lib + /usr/libexec + /usr/share/doc + + + + + 2014-05-11 + 3.10.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-10-28 + 3.10 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-03-12 + 3.9.1 + Fix pisi https issue + Pisi Linux Admins + marcin@pisilinux.org + + + 2010-10-11 + 3.9.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + readline + http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + Another cute console display library + Diğer bir şirin konsol gösterim kütüphanesi + La librairie GNU Readline fourni un ensemble de fonctions utilisables par des applications permettant aux utilisateurs d'éditer les lignes de commandes en cours de frappe. Les modes d'éditions Emacs et vi sont disponibles. La librairie Readline inclus des fonctions supplémentaires de mémorisation de la liste de commandes entrées précédemment, afin de le rappeler et éventuellement les rééditer, ainsi que l'expansion d'historiques de commandes précédentes à la mode csh. + The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands. + GNU Readline kütüphanesi uygulamalara sanki kullanıcılar kendileri yazıyormuş gibi komut satırı girişlerini düzenleme imkanı veren işlev setini sunar. Readline kütüphanesi daha önce girilmiş bir komut satırları listesini düzenleme, tekrar çağırma ve belki de bu satırları tekrar düzenleme ve csh tipi geçmiş bilgisi genişletmelerindeki önceki komutları yürütme imkanı sağlayan ek işlevler sağlar. + mirrors://gnu/readline/readline-6.3.tar.gz + + ncurses-devel + + + readline63-001.patch + readline63-002.patch + readline63-003.patch + + system/base/readline/pspec.xml + + + readline + + ncurses + + + /usr/lib + /usr/share/doc + /usr/share/man + /usr/share/info + + + + readline-devel + Development files for readline + readline için geliştirme dosyaları + system.devel + + glibc-32bit + + + readline + + + /usr/include + /usr/share/man/man3 + + + + readline-32bit + 32-bit shared libraries for readline + readline için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + ncurses-32bit + + + readline + ncurses-32bit + glibc-32bit + + + /usr/lib32 + + + + + 2014-05-11 + 6.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-05 + 6.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 6.2_004 + Clean readline. + Marcin Bojara + marcin@pisilinux.org + + + 2012-08-31 + 6.2 + First release + Erdem Artan + admins@pisilinux.org + + + + + + unzip + ftp://ftp.info-zip.org/pub/infozip/UnZip.html + + PisiLinux Community + admins@pisilinux.org + + Info-ZIP + app:console + system.base + Unzipper for pkzip-compressed files + pkzip ile sıkıştırılmış dosyalar için açıcı + Unzip nous permet d'extraires des archives compressées aux format .zip (également appelées "fichiers zip"). + UnZip enables us to extract archives compressed in .zip format (also called "zipfiles"). + UnZip, zip formatında sıkıştırılmış dosyaları açmamızı sağlar. + mirrors://sourceforge/infozip/unzip610b.zip + + unzip-6.0-attribs-overflow.patch + unzip-6.0-exec-shield.patch + unzip-6.0-close.patch + + system/base/unzip/pspec.xml + + + unzip + + /usr/bin + /usr/share/doc + /usr/share/man + + + + + 2014-05-11 + 610b + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 610b + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-01-14 + 610b + New release + PisiLinux Community + admins@pisilinux.org + + + 2010-10-11 + 6.0 + First release + Pisi Linux Admins + admins@pisilinux.org + + + snappy @@ -4937,6 +4034,7 @@ http://snappy.googlecode.com/files/snappy-1.1.1.tar.gz lzo-devel + zlib-devel snappy-unittest.patch @@ -4945,6 +4043,9 @@ snappy + + libgcc + /usr/lib /usr/share/doc @@ -4980,78 +4081,258 @@ - comar - http://www.pisilinux.org + bzip2 + http://www.bzip.org/ PisiLinux Community admins@pisilinux.org - GPLv2 - service + BZIP2 + app:console system.base - Manages system configuration - Sistem yapılandırmasını yönetir - Les programmes Pisi Linux sont mis sous forme de paquets à l'aide de petits scripts. Ces derniers les configure afin qu'ils s'intègrent entre eux et avec le système. Çomar est l'outil qui gère et exécute ces scripts. - Pisi Linux programs are packaged with small scripts which configures them to entegrate with system and each other. Çomar is the tool which manages and executes these scripts. - Pisi Linux yazılımları, birbirleri ve sistemle otomatik olarak uyum sağlayabilmek için yanlarında ufak programcıklar ile paketlenmektedir. Bu programcıkların yönetimi ve işletilmesi Çomar aracı tarafından yapılmaktadır. - Pisi Linux Programme werden mit einem kleinen Skript paketiert, welches sie konfiguriert, um die Integrität mit dem System und anderen Programmen sicherzustellen. Comar ist das Werkzeug, das diese Skripte verwaltet und ausführt. - http://source.pisilinux.org/1.0/comar-3.0.3.tar.bz2 - - dbus - python - + A high-quality data compressor + Yüksek kaliteli bir veri sıkıştırma uygulaması + bzip2 est un compresseur de données de très grand qualité. Il compresse typiquement les fichiers à un ratio entre 10 et 15% des meilleurs techniques disponibles (la famille des compresseurs statistiques de famille PPM) tout en étant environ deux fois plus rapide à la compression et six fois plus rapide à la décompression. + bzip2 is high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression. + bzip2 yüksek kaliteli bir veri sıkıştırma programıdır. Program genellikle dosyaları mümkün olan en iyi teknikler ile (PPM istatistiksel sıkıştırıcı ailesi) %10 - %15'e kadar sıkışıtırabilmektedir. Sıkıştırma işleminde iki kata kadar hızlı iken açma hızında yaklaşık altı kat daha hızlıdır. + bzip2 ist ein hochwertiger Daten-Kompressor. Es komprimiert Dateien üblicherweise auf 10% bis 15% der bestmöglichen Techniken (die PPM Familie der statistischen Kompressoren), während es ungefähr doppelt so schnell komprimiert und sechsfach schneller extrahiert + http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz - run_dir.patch - fix-flags.patch - update-system-manager-model.patch + bzip2-1.0.2-progress.patch + bzip2-1.0.4-bzip2recover.patch + bzip2-1.0.4-man-links.patch + bzip2-1.0.6-saneso.patch + manpath.patch - system/base/comar/pspec.xml + system/base/bzip2/pspec.xml - comar - - dbus - python - polkit - + bzip2 - /usr/bin - /usr/sbin - /etc - /usr/share/dbus-1/system-services - /usr/share/polkit-1/actions - /usr/share/doc/ - /var/db + /bin + /lib + /usr/lib + /usr/share/doc + /usr/share/man + /usr/include - - System.Package - - 2014-08-19 - 3.0.3 - Fix run dir path. - Marcin Bojara - marcin@pisilinux.org + 2014-09-30 + 1.0.6 + Rebuild,cleanup, enable tests. + Serdar Soytetir + kaptan@pisilinux.org 2014-05-11 - 3.0.3 + 1.0.6 Release bump. Marcin Bojara marcin@pisilinux.org - 2013-08-31 - 3.0.3 - Release bump, clean comar. + 2013-08-28 + 1.0.6 + Release bump,clean bzip2. Serdar Soytetir kaptan@pisilinux.org - 2011-05-18 - 3.0.3 + 2010-10-11 + 1.0.6 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + ntfs-3g + http://www.tuxera.com/community/ntfs-3g-download + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + LGPLv2+ + library + app:console + system.base + Userspace driver for NTFS read/write support + NTFS dosya sistemlerine okuma/yazma erişimi için bir sürücü + ntfs-3g allows regular users read/write access to NTFS filesystems. + ntfs-3g kullanıcıların NTFS biçimli disk bölümlerine hem okuma hem yazma erişimi yapabilmesine imkan veren bir sürücüdür. + http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2015.3.14.tgz + + ntfsprogs_destdir.patch + + system/base/ntfs-3g/pspec.xml + + + ntfs-3g + + fuse + glibc + + + /bin + /sbin + /lib + /usr/lib + /usr/include + /usr/lib/pkgconfig + /usr/share/doc/ntfs-3g + /usr/share/man/man8/mount* + /usr/share/man/man8/ntfs-3g* + + + + ntfsprogs + Userspace tools for NTFS filesystems + NTFS dosya sistemi için kullanıcı araçları + Userspace tools for NTFS filesystems. The goals of the Linux-NTFS project are to develop reliable and full-featured access to NTFS by the Linux kernel driver and to provide a wide collection of NTFS utilities. + NTFS dosya sistemi için kullanıcı araçları içerir. Bu araçların amacı Linux çekirdeğine NTFS dosya sistemlerine güvenilir ve tam erişim sağlayacak NTFS araçlarını sağlamaktır. + hardware.disk + + ntfs-3g + fuse + glibc + libutil-linux + + + /sbin/mkfs.ntfs + /usr/bin + /usr/sbin + /usr/share/doc/ntfsprogs + /usr/share/man/man8 + + + + + 2015-05-06 + 2015.3.14 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-12-13 + 2014.2.15 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 2013.1.13 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-30 + 2013.1.13 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-01-30 + 2013.1.13 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-14 + 0.0_2012.01.15 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + tcp-wrappers + http://ftp.porcupine.org/pub/security/index.html + + PisiLinux Community + admins@pisilinux.org + + BSD + app:console + system.base + TCP Wrappers + TCP Wrappers + Avec ce paquet, vous pouvez surveiller et filtrer les requêtes entrante pour les services réseaux SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK et autres. Il supporte à la fois les canaux de communication (sockets) de type 4.3BSD et TLI de type System V.4. + With this package you can monitor and filter incoming requests for the SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK, and other network services. It supports both 4.3BSD-style sockets and System V.4-style TLI. + Bu paket ile birlikte SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK ve diğer ağ servisleri için gelen istekleri izleyebilir ve süzebilirsiniz. Program 4.3BSD-tipi soketler ve System V.4-tipi TLI'ın ikisini de destekler. + http://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz + + sed + + + Makefile-Pisi.patch + tcp-wrappers-7.6-makefile.patch + tcp_wrappers-7.6-ldflags.patch + 01_all_redhat-bug11881.patch + 02_all_redhat-bug17795.patch + 03_all_wildcard.patch + 04_all_fixgethostbyname.patch + 07_all_sig.patch + 08_all_strerror.patch + 09_all_gcc-3.4.patch + 10_all_more-headers.patch + tcp-wrappers-7.6-ipv6-1.14.diff + tcp-wrappers-7.6-shared.patch + host.allow.example.patch + match-port.patch + + system/base/tcp-wrappers/pspec.xml + + + tcp-wrappers + + /usr/sbin + /usr/lib + /lib + /etc + /usr/share/man + /usr/share/doc + + + hosts.allow + hosts.deny + + + + tcp-wrappers-devel + Development files for tcp-wrappers + tcp-wrappers için geliştirme dosyaları + system.devel + + tcp-wrappers + + + /usr/include + /usr/share/man/man3 + + + + + 2014-05-11 + 7.6 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2010-10-11 + 7.6 First release Pisi Linux Admins admins@pisilinux.org @@ -5060,33 +4341,34 @@ - piksemel - http://pisilinux.org + plyvel + https://pypi.python.org/pypi/plyvel - PisiLinux Community - admins@pisilinux.org + Alihan Öztürk + alihan@pisilinux.org - GPLv2 - library + BSD + app:console system.base - Python binding for iksemel - iksemel için python desteği - Un analyseur XML simple, rapide, petit et robuste pour Python basé sur iksemel. - A simple, fast, small and robust XML parser for Python, based on iksemel. - Python için basit, hızlı, ufak ve sağlam bir XML ayrıştırıcısı, iksemel tabanlıdır. - http://source.pisilinux.org/1.0/piksemel-1.3.1.tar.gz + Plyvel, a fast and feature-rich Python interface to LevelDB. + Plyvel, LevelDB için, hızlı ve zengin özellikli Python arabirimi. + Plyvel has a rich feature set, high performance, and a friendly Pythonic API. + Plyvel zengin özelliklere sahip bir set, yüksek performanslı, ve kullanıcı dostu bir Pythonic API. + https://pypi.python.org/packages/source/p/plyvel/plyvel-0.8.tar.gz - python + cython + python-devel + leveldb-devel + python-setuptools - - symbol-visibility.patch - - system/base/piksemel/pspec.xml + system/base/plyvel/pspec.xml - piksemel + plyvel + libgcc python + leveldb /usr/lib @@ -5094,23 +4376,1867 @@ + + 2014-06-08 + 0.8 + Rebuild. + Aydın Demirel + aydin.demirel@pisilinux.org + + + 2014-06-01 + 0.8 + First release. + Alihan Öztürk + alihan@pisilinux.org + + + + + + dbus-python + http://dbus.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + AFL-2.1 + library + system.base + D-Bus Python bindings + D-Bus için Python bağlayıcıları + dbus-python provides a Python module which wraps the D-Bus programming API. + http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.0.tar.gz + + python-devel + python3 + dbus-devel + dbus-glib-devel + glib2-devel + libpcre-devel + + + suppress-warnings.patch + + system/base/dbus-python/pspec.xml + + + dbus-python-common + Common dbus-python files shared between dbus-python and dbus-python3 + + dbus + + + /usr/include + /usr/lib/pkgconfig + /usr/share/doc + + + + dbus-python + + dbus-python-common + python + dbus + glib2 + dbus-glib + + + /usr/lib/python2* + + + + dbus-python3 + D-Bus Python3 bindings + programming.language.python + + dbus-python-common + python3 + dbus + glib2 + dbus-glib + + + /usr/lib/python3* + + + + + 2015-04-01 + 1.2.0 + Release bump. + Kamil Atlı + suvarice@gmail.com + + + 2014-05-11 + 1.2.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 1.2.0 + rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-23 + 1.2.0 + Version bump. Remove dbus-devel from runtime dependencies. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-25 + 1.1.1 + Dep Fixed. + PisiLinux Community + admins@pisilinux.org + + + 2012-11-10 + 1.1.1 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + acl + http://acl.bestbits.at/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + LGPLv2.1 + app:console + library + system.base + Utilitaires, librairies et fichiers d'entête de liste de contrôle d'accès. + Access control list utilities + Erişim denetim listesi için çeşitli araçlar + acl contains the getfacl and setfacl utilities needed for manipulating access control lists along with the needed libraries. + acl erişim denetim listelerini yönetmeye yarayan getfacl ve setfacl araçlarıyla gerekli kütüphaneleri içeren bir pakettir. + http://download.savannah.gnu.org/releases-noredirect/acl/acl-2.2.52.src.tar.gz + + attr-devel + + system/base/acl/pspec.xml + + + acl + + attr + + + /bin + /lib + /usr/share/locale + /usr/share/doc + /usr/share/man + + + + acl-devel + Development files for acl + acl için geliştirme dosyaları + system.devel + + acl + + + /usr/include + /usr/share/man/man3 + + + + + 2015-03-15 + 2.2.52 + fix build deps. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-09-30 + 2.2.52 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + 2014-05-11 - 1.3.1 + 2.2.52 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-28 + 2.2.52 + Version bump, clean acl. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-06-04 + 2.2.51 + First release + Erdem Artan + admins@pisilinux.org + + + + + + gawk + http://www.gnu.org/software/gawk/gawk.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + GNU awk pattern-matching language + Metin işleme uygulaması olan awk'ın GNU versiyonu + L'outil awk interprète un langage de programmation spécifique permettant d'effectuer les tâches de modifications simples de données en quelques lignes de code. Il vous permet de faire des changements dans différents fichiers texte lorsqu'un certain patron apparaît ou d'extraire des données de fragments de lignes tout en laissant de côté le reste. Gawk est l'implémentation GNU d'awk. + The awk utility interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code. It helps you to make changes in various text files wherever certain patterns appear, or extract data from parts of certain lines while discarding the rest. Gawk is the GNU implementation of awk. + awk uygulaması az bir kod ile basit veri formatı düzenleme işlerinizi yapabilmenize olanak sağlayan özel amaçlı bir programlama dilidir. Uygulama birçok farklı metin dosyası içinde aradığınız parçaları bulup değiştirmenize veya diğer satırlardan ayırarak işlemenize yardımcı olur. Gawk programı awk'ın GNU sürümüdür. + http://ftp.gnu.org/gnu/gawk/gawk-4.1.1.tar.xz + + gettext-devel + + + gawk-4.1.1-sandbox_issue.patch + gawk-4.1.1-sigpipe.patch + + system/base/gawk/pspec.xml + + + gawk + + readline + gmp + mpfr + + + /usr/bin + /usr/libexec + /usr/lib/gawk + /usr/include + /usr/share/awk + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + + + + + 2014-05-11 + 4.1.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-03-10 + 4.1.0 + Release bump for update eror + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2014-01-05 + 4.1.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-26 + 4.0.2 + Fix dep, release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-14 + 4.0.2 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-08-23 + 4.01 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + baselayout + http://www.pisilinux.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + library + data + system.base + Filesystem baselayout + Dosya sisteminin temel planı + Ce paquet crée la hiérarchie du système de fichier principal de Pisi Linux. + baselayout creates the Pisi Linux Linux main filesystem hierarchy. + Bu paket, Pisi Linux dosya sisteminin temelini oluşturur. + http://source.pisilinux.org/1.0/baselayout-3.10.0.tar.gz + system/base/baselayout/pspec.xml + + + baselayout + + pypolkit + + + /bin + /sbin + /lib* + /etc + /etc/pisilinux-release + /media + /boot + /proc + /home + /mnt + /opt + /dev + /run + /sys + /srv + /tmp + /usr + /var + /usr/lib/tmpfiles.d/baselayout.conf + + + System.PackageHandler + System.Package + User.Manager + Network.Stack + + + baselayout.conf + services + protocols + sysctl.conf + pisilinux-release + start-stop-daemon.8 + + + + + 2015-03-04 + 3.10.0 + Release bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-07-16 + 3.10.0 + Add vboxusers + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-07-16 + 3.10.0 + Release Pisi Linux 1.0 + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 3.10.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-15 + 3.10.0 + Rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-19 + 3.10.0 + Update baselayout.conf + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-08 + 3.10.0 + Add baselayout.conf + Marcin Bojara + marcin@pisilinux.org + + + 2013-12-20 + 3.10.0 + Release Pisi Linux Rc2 + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-27 + 3.10.0 + Add gdm user and group, apply chmod 1777 to dev/shm aka run/shm. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-10 + 3.10.0 + Add shm dir to run, new archive. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-05 + 3.8.0 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 3.8.0 + release Izmir + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-03-24 + 3.8.0 + Pisi Linux changes. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-11 + 3.7.1 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + mingetty + ftp://ftp.suse.com/pub/projects/init/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + A compact getty program for virtual consoles only + Sadece sanal konsollar için yekpare bir getty programı + mingetty, est getty poids plume minimaliste à utiliser exclusivement sur les consoles virtuelles. + mingetty, is a lightweight, minimalist getty for use on virtual consoles only. + mingetty yalnızca sanal konsollar için tasarlanmış basit ve yalın getty uygulamasıdır. + http://sourceforge.net/projects/mingetty/files/mingetty/1.08/mingetty-1.08.tar.gz + + gettext + + + tr.patch + + system/base/mingetty/pspec.xml + + + mingetty + + glibc + + + /sbin + /usr/share/locale + /usr/share/man + /usr/share/doc + + + + + 2014-05-11 + 1.0.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-09 + 1.0.8 + Rebuild + Kamil Atlı + suvarice@gmail.com + + + 2012-08-23 + 1.0.8 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + attr + http://acl.bestbits.at/ + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2.1 + app:console + library + system.base + Utilities for managing filesystems extended attributes + Gelişkin öznitelikler araçları + attr offre des utilitaires qui servent à manipuler les attributs étendus des objects de système de fichier. + attr contains a set of tools for manipulating extended attributes on filesystem objects, in particular getfattr and setfattr. + attr dosya sistemi nesnelerinin özniteliklerini değiştirmek için gerekli bir dizi araç sunar. + http://download.savannah.gnu.org/releases-noredirect/attr/attr-2.4.47.src.tar.gz + system/base/attr/pspec.xml + + + attr + + /bin + /lib + /usr/share/locale + /usr/share/doc + /usr/share/man + + + + attr-devel + Development files for attr + attr için geliştirme dosyaları + system.devel + + attr + + + /usr/include + /usr/share/man/man3 + + + + attr-32bit + 32-bit shared libraries for attr + emul32 + emul32 + + glibc-32bit + + + glibc-32bit + attr + + + /lib32 + + + + + 2015-03-15 + 2.4.47 + fix build emul32. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-30 + 2.4.47 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 2.4.47 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-28 + 2.4.47 + Version bump, clean attr. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-24 + 2.4.46 + Add emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-04 + 2.4.46 + First release + Erdem Artan + admins@pisilinux.org + + + + + + texinfo + http://www.gnu.org/software/texinfo/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + system.base + programme et utilitaires GNU info. + The GNU info program and utilities + GNU info (bilgi) programı ve araçları + GNU Info Prgramm und Werkzeuge + Texinfo is a documentation system that can produce both online information and printed output from a single source file. The GNU Project uses the Texinfo file format for most of its documentation. + mirrors://gnu/texinfo/texinfo-5.2.tar.gz + + ncurses + + system/base/texinfo/pspec.xml + + + texinfo + + ncurses + + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/texinfo + /usr/share/texmf/tex/texinfo + /usr/share/locale + /usr/share/texmf/ + + + System.PackageHandler + + + + + 2014-05-25 + 5.2 + Release bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 5.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-22 + 5.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-09-05 + 4.13 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2010-10-11 + 4.13 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + libcap-ng + http://people.redhat.com/sgrubb/libcap-ng + + PisiLinux Community + admins@pisilinux.org + + LGPLv2+ + library + system.base + An alternate POSIX capabilities library + Alternatif bir POSIX yetenekleri kütüphanesi + libcap-ng is a library that makes using POSIX capabilities easier. + libcap-ng POSIX yeteneklerinin yönetimini kolaylaştıran bir kütüphanedir. + http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.3.tar.gz + + attr + python + + system/base/libcap-ng/pspec.xml + + + libcap-ng + + /usr/lib + /usr/share/doc + + + + python-libcap-ng + Python bindings for libcap-ng + Python için libcap-ng bağlayıcıları + programming.language.python + + libcap-ng + + + /usr/lib/python* + + + + libcap-ng-utils + Utilities to analyse the POSIX capabilities on running processes + Çalışan süreçlerin sahip olduğu POSIX yeteneklerini incelemeye yarayan araçlar + util.admin + + libcap-ng + + + /usr/bin + /usr/share/man/man8/* + + + + libcap-ng-devel + Development files for libcap-ng + libcap-ng için geliştirme dosyaları + system.devel + + libcap-ng + + + /usr/share/aclocal + /usr/include + /usr/lib/pkgconfig + /usr/share/man/man3 + + + + + 2014-05-11 + 0.7.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 0.7.3 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-11 + 0.7.3 + Güncellendi. + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 0.7 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + glib2 + http://www.gtk.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.base + La librairie GLib2 de routines C. + A library of handy utility functions + C programlama dili için glib kütüphanesi + glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system. + glib2, GTK+ ve GNOME gibi projelerin temelini oluşturan düşük seviyeli çekirdek kütüphanedir. C için veri yapıları, taşınabilirlik katmanları ve çeşitli çalışma zamanı işlevleri için arabirimler sunar. + mirrors://gnome/glib/2.44/glib-2.44.0.tar.xz + + libpcre-devel + zlib-devel + libffi-devel + + + revert-warn-glib-compile-schemas.patch + + system/base/glib2/pspec.xml + + + glib2 + + libpcre + zlib + libffi + + + /etc/profile.d + /usr/bin + /usr/lib + /usr/share/bash-completion/completions/ + /usr/share/locale + /usr/share/man + /usr/share/doc + /usr/share/glib-2.0 + /usr/share/systemtap + /usr/share/glib-2.0/schemas + + + System.PackageHandler + + + glib2.sh + glib2.csh + + + + glib2-devel + Development files for glib2 + glib2 için geliştirme dosyaları + system.devel + + glib2 + libpcre-devel + + + /usr/bin/gtester + /usr/bin/gtester-report + /usr/bin/gobject-query + /usr/bin/glib-genmarshal + /usr/bin/glib-gettextize + /usr/bin/glib-mkenums + /usr/include + /usr/lib/glib-2.0/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/aclocal + /usr/share/glib-2.0/schemas/gschema.dtd + /usr/share/glib-2.0/gettext + /usr/share/glib-2.0/gdb + /usr/share/gdb/auto-load/libglib-2.0.so.*-gdb.py* + /usr/share/gdb/auto-load/libgobject-2.0.so.*-gdb.py* + /usr/share/man/man3 + /usr/share/man/man1/glib-genmarshal.1 + /usr/share/man/man1/glib-gettextize.1 + /usr/share/man/man1/glib-mkenums.1 + /usr/share/man/man1/gobject-query.1 + /usr/share/man/man1/gtester-report.1 + /usr/share/man/man1/gtester.1 + + + + glib2-32bit + 32-bit shared libraries for glib2 + glib2 için 32-bit paylaşımlı kitaplıklar + emul32 + _emul32 + + libpcre-32bit + zlib-32bit + libffi-32bit + dbus-32bit + glibc-32bit + + + glib2 + libpcre-32bit + zlib-32bit + libffi-32bit + dbus-32bit + glibc-32bit + + + /usr/bin/32 + /usr/lib32 + + + System.PackageHandler + + + + glib2-docs + Documentation files for glib2 + Extensive documentation for developers wanting to use the GLib Library + + /usr/share/gtk-doc + + + + + 2015-04-08 + 2.44.0 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-10-01 + 2.42.0 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 2.40.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-15 + 2.40.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-03-29 + 2.38.2 + Minor version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 2.38.1 + Minor version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-10 + 2.38.0 + Bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-05 + 2.36.3 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-26 + 2.36.3 + Fix dep, release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-14 + 2.36.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-11 + 2.36.0 + add missing dep. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-05-16 + 2.36.0 + Path Fixed. + PisiLinux Community + admins@pisilinux.org + + + 2013-03-30 + 2.36.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-21 + 2.35.2 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + libxml2 + http://www.xmlsoft.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + system.base + Version 2 of the library to manipulate XML files + XML türü dosyaları işlemeye aracılık eden kütüphanenin 2. sürümü + Libxml2 est l'analyseur et la boîte à outils XML écrit en C pour le projet Gnome (mais utilisable en dehors de la plateforme Gnome). + Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform). + Libxml2, Gnome projesi için geliştirilmiş C dilinde XML ayrıştırıcısıdır. Gnome platformu olmadan da kullanılabilir. + ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz + + python-devel + xz-devel + zlib-devel + readline-devel + + + CVE-2014-0191.patch + + system/base/libxml2/pspec.xml + + + libxml2-docs + system.doc + + libxml2 + + + /usr/share/doc + + + + libxml2 + + xz + zlib + python + readline + + + /usr/bin + /usr/lib + /usr/share/man + + + + libxml2-devel + Development files for libxml2 + libxml2 için geliştirme dosyaları + system.devel + + libxml2 + + + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/include + /usr/share/aclocal + /usr/share/man/man3 + + + + libxml2-32bit + 32-bit shared libraries for libxml2 + libxml2 için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + xz-32bit + zlib-32bit + readline-32bit + glibc-32bit + + + libxml2 + xz-32bit + zlib-32bit + + + /usr/lib32 + + + + + 2014-07-06 + 2.9.1 + Security update(CVE-2014-0191). + Vedta Demir + vedat@pisilinux.org + + + 2014-05-24 + 2.9.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 2.9.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-11 + 2.9.0 + Fix dep,release bump, binary file goes to main package. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-31 + 2.9.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-26 + 2.9.0 + Fix dep,release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-22 + 2.9.0 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + tar + http://www.gnu.org/software/tar/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + app:console + system.base + A GNU file archiving program + GNU dosya arşivleme uygulaması + Le programme tar fournit la possibilité de manipuler des archives de type tar. Vous pouvez l'utiliser pour créer ou extraires des archives. Ajouter des fichiers à des archives existantes, les mettre à jour ou tout simplement lister leur contenu. + The GNU tar program saves many files together in one archive and can restore individual files (or all of the files) from that archive. + GNU tar birden fazla dosyayı tek bir arşiv dosyasında birleştiren ve daha sonra bu arşiv dosyasından geri çıkartabilen bir uygulamadır. + http://ftp.gnu.org/gnu/tar/tar-1.27.1.tar.xz + + tar.1 + + + gzip + bzip2 + gettext + ncompress + + system/base/tar/pspec.xml + + + tar + + acl + glibc + + + /bin + /sbin + /usr/share/doc + /usr/share/man + /usr/share/locale + /usr/share/info + + + + + 2014-05-11 + 1.27.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-23 + 1.27.1 + Version bump + Richard de Bruin + richdb@pisilinux.org + + + 2013-10-24 + 1.27 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-07-31 + 1.26 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-08-23 + 1.26 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + spidermonkey + http://www.mozilla.org/js/spidermonkey/ + + PisiLinux Community + admins@pisilinux.org + + NPL-1.1 + library + system.base + Stand-alone JavaScript C Library + Javascript C Kitaplığı + Spidermonkey est l'Implémentation C de Javascript par Mozilla. + Spidermonkey is Mozilla's C implementation of JavaScript. + Mozilla'nın Javascript'in C implementasyonu. + Spidermonkey es la implementación de JavaScript con C de Mozilla. + http://ftp.mozilla.org/pub/mozilla.org/js/mozjs17.0.0.tar.gz + + zlib-devel + nspr-devel + readline-devel + libffi-devel + + system/base/spidermonkey/pspec.xml + + + spidermonkey + + nspr + zlib + libgcc + readline + + + /usr/bin + /usr/lib + /usr/share/doc + + + + spidermonkey-devel + Development files for spidermonkey + spidermonkey için geliştirme dosyaları + system.devel + + spidermonkey + nspr-devel + + + /usr/include + /usr/lib/pkgconfig + /usr/bin/js17-config + + + + + 2015-05-08 + 17.0.0 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 17.0.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-30 + 17.0.0 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 17.0.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-28 + 1.8.5 + Move pc files to devel pack,rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-20 + 1.8.5 + Release bump for rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-20 + 1.8.5 + Cleanup package, bump for new build + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-20 + 1.8.5 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + libpcre + http://www.pcre.org/ + + PisiLinux Community + admins@pisilinux.org + + BSD + library + system.base + Perl-compatible regular expression library + Perl-uyumlu sıradan ifade kütüphanesi + La librairie PCRE (Expressions Régulières Compatible avec Perl) est un ensemble de fonctions implémentant la recherche de motifs de texte à l'aide d'expressions régulières utilisant la même syntaxe et la même sémantique que Perl5. + The PCRE (Perl Compatible Regular Expressions) library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. + PCRE kütüphanesi, Perl 5 programlama dili sözdizimi ve semantiği ile kalıp eşleştirme (pattern matching) görevini yürüten fonksiyonları barındırır. + http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.36.tar.bz2 + + readline-devel + + system/base/libpcre/pspec.xml + + + libpcre + + libgcc + readline + + + /usr/lib + /usr/share/man + /usr/share/doc + /usr/bin + + + + libpcre-devel + Development files for libpcre + libpcre için geliştirme dosyaları + system.devel + + libpcre + + + /usr/include + /usr/share/man/man3 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/doc/libpcre/html + /usr/bin/pcre-config + /usr/share/man/man1/pcre-config.1* + /usr/share/doc/libpcre/pcre-config.txt + + + + libpcre-32bit + 32-bit shared libraries for libpcre + libpcre için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + readline-32bit + glibc-32bit + + + libgcc + readline + libpcre + + + /usr/lib32 + + + + + 2015-01-25 + 8.36 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 8.34 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-03 + 8.34 + Version bump. + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-09-01 + 8.33 + Version bump, clean pcre. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 8.32 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-05-20 + 8.32 + adress fixed + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-02-16 + 8.32 + Update + Osman Erkan + osman.erkan@pisilinux.org + + + 2011-03-11 + 8.31 + First release + Erdem Artan + admins@pisilinux.org + + + + + + os-prober + http://joey.kitenet.net/code/os-prober/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + app:console + system.base + Utility to detect other OSes on a set of drives + Narzędzie do wykrywania innych systemów operacyjnych na dyskach + os-probe detects other OSes available on a system and outputs the results in a generic machine-readable format. Support for new OSes and Linux distributions can be added easily. + os-prober wykrywa inne systemy operacyjne dostępne na komputerze i przekazuje rezultaty w standardowym, odczytywalnym maszynowo, formacie. + http://http.debian.net/debian/pool/main/o/os-prober/os-prober_1.65.tar.xz + system/base/os-prober/pspec.xml + + + os-prober + + /usr/bin + /usr/lib + /var/lib/os-prober + /usr/share/os-prober + /usr/share/doc/os-prober + + + + + 2015-05-03 + 1.65 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.63 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-24 + 1.63 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-28 + 1.58 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-03 + 1.57 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + alternatives + http://git.fedorahosted.org/git/?p=chkconfig.git;a=summary + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Alternative management system + Alternatif yönetim sistemi + alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. Alternatives system determines the defaults when several programs fulfilling the same or similar functions to be installed on a single system at the same time. + alternatives, alternatives sisteminin parçası olan sembolik bağlantıları oluşturan, silen, yöneten ve bunlar hakkında bilgi gösteren araçtır. Alternatives sistemi, birbirine benzer ya da aynı işlevleri sunan programların aynı anda aynı sisteme kurulduğu zamanlarda öntanımlıları belirler. + https://git.fedorahosted.org/cgit/chkconfig.git/snapshot/chkconfig-1.3.62.tar.xz + + popt-devel + + system/base/alternatives/pspec.xml + + + alternatives + + /etc + /usr/sbin + /usr/share/locale + /usr/share/man + /usr/share/doc + /var + + + + + 2015-04-01 + 1.3.62 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 1.3.58 Release bump. Marcin Bojara marcin@pisilinux.org 2013-10-28 - 1.3.1 - rebuild - Pisi Linux Admins + 1.3.58 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-05-03 + 1.3.58 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + groff + http://www.gnu.org/software/groff/groff.html + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + BSD + MIT + app:console + system.base + S'occupe de la mise en forme de texte utilisé pour les pages de manuel + A document formatting system + Belge biçimlendirme sistemi + Text Formatierer für man pages + groff is a document formatting system. Groff takes standard text and formatting commands as input and produces formatted output. + groff bir belge biçimlendirme sistemidir. Groff standart metni ve biçimlendirme komutlarını alır ve biçimlendirilmiş çıktı oluşturur. + http://ftp.gnu.org/gnu/groff/groff-1.22.3.tar.gz + + texinfo + + + groff-1.19.2-man-unicode-dashes.patch + groff-1.22.3-parallel-mom.patch + + system/base/groff/pspec.xml + + + groff + + texinfo + libgcc + + + /etc + /usr/bin + /usr/lib + /usr/share/groff + + + + groff-doc + system.doc + + groff + + + /usr/share/doc + /usr/share/man + /usr/share/info + + + + + 2015-04-02 + 1.22.3 + Release bump, remove X builddep. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.22.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 1.22.2 + Rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-26 + 1.22.2 + Fix dep, release bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-02-16 + 1.22.2 + Updated + PisiLinux Community admins@pisilinux.org + + 2012-11-25 + 1.21 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + ncompress + http://ncompress.sourceforge.net + + PisiLinux Community + admins@pisilinux.org + + public-domain + app:console + system.base + Un autre outil de décompression de données pour compatibilité + Another uncompressor for compatibility + Bir başka sıkışmış dosya açma programı + Ein weiterer Nichtkompressor zu Kompatibilitätszwecken + The ncompress package contains the compress and uncompress file compression and decompression utilities, which are compatible with the original UNIX compress utility (.Z file extensions). These utilities can't handle gzipped (.gz file extensions) files, but gzip can handle compressed files. + mirrors://sourceforge/ncompress/ncompress-4.2.4.4.tar.gz + + ncompress-4.2.4-make.patch + ncompress-4.2.4-lfs2.patch + ncompress-2GB.patch + ncompress-4.2.4-endians.patch + + system/base/ncompress/pspec.xml + + + ncompress + + /usr/bin + /usr/share/man + + + + + 2014-05-11 + 4.2.4.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2011-12-20 + 4.2.4.4 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + pycurl + http://pycurl.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.base + Python cURL Module + Python cURL Modülü + PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program. + PycURL, python libcurl için python arayüzüdür. PycURL, URL tarafında tanımlanan nesneleri indirmek için bir python programı tarafından kullanılabilir. + http://pycurl.sourceforge.net/download/pycurl-7.19.3.1.tar.gz + + curl-devel + python-devel + openssl-devel + + system/base/pycurl/pspec.xml + + + pycurl + + curl + python + openssl + + + /usr/lib + /usr/share/doc + + + + + 2014-05-11 + 7.19.3.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-01 + 7.19.3.1 + Version bump. + Kamil Atlı + suvarice@gmail.com + + + 2013-12-19 + 7.19.0.2 + Rebuild + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-03-12 + 7.19.0.2 + Version bum. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-03-12 + 7.19.0 + Fix pisi https issue + Pisi Linux Admins + marcin@pisilinux.org + 2010-10-11 - 1.3.1 + 7.19.0 First release Pisi Linux Admins admins@pisilinux.org @@ -5196,61 +6322,306 @@ - unzip - ftp://ftp.info-zip.org/pub/infozip/UnZip.html + shadow + http://pkg-shadow.alioth.debian.org/ PisiLinux Community admins@pisilinux.org - Info-ZIP + BSD app:console system.base - Unzipper for pkzip-compressed files - pkzip ile sıkıştırılmış dosyalar için açıcı - Unzip nous permet d'extraires des archives compressées aux format .zip (également appelées "fichiers zip"). - UnZip enables us to extract archives compressed in .zip format (also called "zipfiles"). - UnZip, zip formatında sıkıştırılmış dosyaları açmamızı sağlar. - mirrors://sourceforge/infozip/unzip610b.zip + Utilities to deal with user accounts + Kullanıcı hesapları yönetimi için araçlar + Le paquet des utilitaires pour le fichier de mot de passe Shadow regroupe les programmes nécessaires à convertir les fichiers de mots de passe traditionnels V7*NIX au format de mot passe shadow SVR4 ainsi que d'autres outils destinés à la gestion des fichiers des groupes et de mots de passe (qui fonctionnent aussi bien pour les mots de passe shadow que non-shadow). + The Shadow password file utilities package includes programs necessary to convert traditional V7 *NIX password files to the SVR4 shadow password format, and additional tools to maintain password and group files (that work with both shadow and non-shadow passwords). + Shadow parola dosyası yardımcı uygulamalar paketi, geleneksel V7 *nix parola dosyalarını SVR4 shadow parola biçimine dönüştüren programlar ile parola ve grup dosyalarının bakımı için ilave araçlar içerir. + http://pkg-shadow.alioth.debian.org/releases/shadow-4.2.1.tar.xz + + pam-devel + gettext-devel + - unzip-6.0-attribs-overflow.patch - unzip-6.0-exec-shield.patch - unzip-6.0-close.patch + shadow-strncpy-usage.patch + xstrdup.patch - system/base/unzip/pspec.xml + system/base/shadow/pspec.xml - unzip + shadow + Utilitaires pour gérer les comptes utilisateurs + Kullanıcı hesaplarını düzenlemek için araçlar. + + acl + attr + pam + + /bin /usr/bin - /usr/share/doc + /sbin + /usr/sbin + /etc + /lib /usr/share/man + /usr/share/doc + /usr/share/info + /usr/share/locale + + securetty + default/useradd + pam.d/login + pam.d/other + pam.d/passwd + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/shadow + pam.d/su + pam.d/system-auth + login.defs + - + + 2015-04-01 + 4.2.1 + Version bump., remove build with audit + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + 2014-05-11 - 610b + 4.1.5.1 Release bump. Marcin Bojara marcin@pisilinux.org - + 2013-10-29 - 610b - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org + 4.1.5.1 + Rebuild without-libcrack, clean shadow, fix login defs. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-30 + 4.1.5.1 + Rebuild with-libcrack, clean shadow. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-26 + 4.1.5.1 + Release bump for rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-08-23 + 4.1.5.1 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + kbd + http://freshmeat.net/projects/kbd/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Keyboard and console utilities + Klavye ve konsol araçları + Le paquet kbd contient les fichiers de configuration de touches ainsi que divers utilitaires pour claviers compatible avec le noyau 1.1.54 et suivants. + The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later. + Kbd paketi, çekirdek sürüm 1.1.54 ve sonraki sürümlerle uyumlu anahtar tablo dosyaları ve klavye yardımcı uygulamaları içerir. + https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.2.tar.xz + http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2 + http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2 + http://source.pisilinux.org/1.0/ro_maps.tar.bz2 + + gettext + gzip + pam-devel + check-devel + + + mandriva/kbd-1.15-mandriva.patch + mandriva/kbd-1.15-tilde_twosuperior_french_kbd.patch + mandriva/kbd-1.12-data_thai.patch + mandriva/kbd-1.15-remove-unneeded-calls.patch + archlinux/fix-dvorak-es.patch + archlinux/fix-euro2.patch + pisilinux/unicode_start-default-font.patch + pisilinux/tr-keypad-comma.patch + pisilinux/tr-no-meta_space.patch + pisilinux/trq-capslock-fix.patch + pisilinux/currency.patch + pisilinux/trf-keymap-fixes.patch + pisilinux/trf-capslock-fix.patch + + system/base/kbd/pspec.xml + + + kbd + + pam + + + /bin + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/kbd/keymaps + /usr/share/kbd/locale + /usr/share/kbd/unimaps + /usr/share/kbd/consolefonts + /usr/share/kbd/consoletrans + + + pisilinux/lat5u-12.psf.gz + pisilinux/lat5u-14.psf.gz + pisilinux/lat5u-16.psf.gz + mandriva/mac-fr-ext_new.kmap.gz + + + + + 2015-05-08 + 2.0.2 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.15.5 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 1.15.5 + rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2013-07-26 + 1.15.5 + Fix dep, release bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-05-30 + 1.15.5 + Fix dep, release bump. + PisiLinux Community + admins@pisilinux.org 2013-01-14 - 610b + 1.15.5 New release PisiLinux Community admins@pisilinux.org + + 2012-08-23 + 1.15.2 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + vixie-cron + http://www.gentoo.org/ + + PisiLinux Community + admins@pisilinux.org + + as-is + service + system.base + Paul Vixie's cron daemon, a fully featured crond implementation + Tam teşekküllü bir crond uyarlaması + Vixie cron (Cron est un daemon qui lance des tâches planifiées) est une implémentation riche basée sur le cron SysV. Chaque utilisateur possède sa propre table de planification (ou crontab - la CRON TABle de Crontab) est un fichier qui contient le planning de cron) et a la possibilité de spécifier des variables d'environnement au sein de la table. + Vixie cron (Cron is a daemon that runs scheduled tasks.) is a full featured cron implementation based on SysV cron. Each user has his own crontab ( Crontab (CRON TABle) is a file which contains the schedule of cron) and is allowed to specify environment variables within that crontab. + Vixie-cron (cron, zamanlanmış görevleri çalıştıran dinleyici programdır.) SysV cron tabanlı tam sürüm cron uygulamasıdır. Her kullanıcı kendi crontab 'ına (crontab cron listesini içeren dosyadır.) sahiptir ve bu crontab içinde ortam değişkenlerini yazmasına müsade edilmiştir. + ftp://ftp.linux.org.tr/pub/gentoo/distfiles/vixie-cron-4.1.tar.bz2 + + sed + pam-devel + + + vixie-cron-4.1-gentoo-r4.patch.bz2 + crontab.5.diff + vixie-cron-4.1-commandline.patch + vixie-cron-4.1-pam.patch + vixie-cron-4.1-CAN-2005-1038.patch + CVE-2006-2607.patch + CVE-2007-1856.patch + + system/base/vixie-cron/pspec.xml + + + vixie-cron + + pam + comar-api + + + /usr/sbin + /usr/bin + /etc + /var/spool + /usr/share/doc + /usr/share/man + + + System.Package + System.Service + + + run-crons-0.3.1 + crontab + vixie-cron-4.1-cron.deny + cron.pam.d + + + + + 2015-05-04 + 4.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + 2010-10-11 - 6.0 + 4.1 First release Pisi Linux Admins admins@pisilinux.org @@ -5259,8 +6630,576 @@ - sysvinit - http://freshmeat.net/projects/sysvinit/ + leveldb + https://code.google.com/p/leveldb + + Alihan Öztürk + alihan@pisilinux.org + + BSD + app:console + system.base + A fast and lightweight key/value database library + Hızlı ve hafif bir anahtar/değer veri kütüphanesi + LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values. + LevelDB dize değerleri ile dize anahtarlarını eşleme sağlayan, Google'da yazılmış hızlı bir anahtar-değer depolama kütüphanesidir. + http://source.pisilinux.org/1.0/leveldb-e353fbc7ea81.tar.gz + + gperftools-devel + snappy-devel + + system/base/leveldb/pspec.xml + + + leveldb + + libgcc + snappy + gperftools + + + /usr/lib + /usr/share/doc + + + + leveldb-devel + + leveldb + + + /usr/include + + + + + 2014-06-02 + 1.17 + First release + Alihan Öztürk + alihan@pisilinux.org + + + + + + ca-certificates + http://packages.qa.debian.org/c/ca-certificates.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + MPL-1.1 + app:web + system.base + Common CA certificates + Common CA certificates + http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20141019.tar.xz + system/base/ca-certificates/pspec.xml + + + ca-certificates + + run-parts + + + /etc + /usr/share/man + /usr/sbin + /usr/share/ca-certificates + + + System.Package + + + + + 2015-01-10 + 20141019 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-01-10 + 20141019 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 20140325 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-01 + 20140325 + Version bump, fix installation. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-03-03 + 20130906 + First Release + PisiLinux Community + admins@pisilinux.org + + + + + + python + http://www.python.org/ + + PisiLinux Community + admins@pisilinux.org + + PSF-2.2 + app:console + system.base + An interpreted, interactive, object-orientated programming language + Nesneye yönelik bir programlama dili + Python est un langage de programmation dynamique orienté objet pouvant être utilisé pour différents types de développements logiciels. Il offre une intégration renforcée aussi bien avec les autres langages qu'avec des outils. Il est livré avec des librairies standards couvrant un large périmètre et peut être appris en quelques jours. + Python is a dynamic object-oriented programming language that can be used for many kinds of software development. It offers strong support for integration with other languages and tools, comes with extensive standard libraries, and can be learned in a few days. + Python, yazılım geliştirmenin birçok aşamasında kullanılabilen, dinamik nesne tabanlı bir programlama dilidir. Diğer programlama dilleriyle bütünleşme için sağlam bir destek sunar, kapsamlı standart kütüphanelerle sunulur ve birkaç günde öğrenilebilir. + http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz + + bzip2 + gdbm-devel + zlib-devel + expat-devel + libffi-devel + sqlite-devel + ncurses-devel + openssl-devel + readline-devel + + + pisilinux_platform.patch + add-pisilinux-to-search-path.patch + default-utf8.patch + disable-egginfo.patch + trfix_emaillib.patch + + system/base/python/pspec.xml + + + python + + noDelta + + + gdbm + zlib + bzip2 + expat + libffi + sqlite + ncurses + openssl + readline + + + /etc + /usr/bin + /usr/include/python2.7/pyconfig.h + /usr/lib + /usr/share/doc + /usr/share/man + + + System.PackageHandler + + + pythonstart + 04python + + + + python-devel + Development files for python + python için geliştirme dosyaları + system.devel + + python + + + /usr/include + /usr/lib/pkgconfig + + + + + 2014-12-12 + 2.7.9 + Version bump and security fixes. + Vedat Demir + vedat@pisilinux.org + + + 2014-07-05 + 2.7.8 + Version bump and security fixes. + Vedat Demir + vedat@pisilinux.org + + + 2014-06-02 + 2.7.7 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 2.7.6 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-25 + 2.7.6 + Add upstream patch. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-20 + 2.7.6 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-09-05 + 2.7.5 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 2.7.5 + Clean python. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-21 + 2.7.5 + Add some patches. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-16 + 2.7.5 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-07-11 + 2.7.3 + First release + Erdem Artan + admins@pisilinux.org + + + + + + python-psutil + https://github.com/giampaolo/psutil + + PisiLinux Community + admins@pisilinux.org + + BSD + library + system.base + A cross-platform process utilities module for Python + Platform bağımsız, süreçler hakkında bilgi sağlayan bir Python modülü + python-psutil is a module providing an interface for retrieving information on all running processes and system utilization (CPU, memory) in a portable way by using Python, implementing many functionalities offered by command line tools like ps, top, kill, lsof and netstat. + python-psutil, bütün çalışan süreçler ve sistem kullanımı (MİB - Merkezi İşlem Birim(CPU) ve hafıza gibi) hakkında bilgilere erişimek için arayüz sunan bir Python modülüdür. ps, top, kill, lsof, netstat gibi bir çok komut satırı araçlarının sunduğu işlevselliği sağlamaktadır. + https://github.com/giampaolo/psutil/archive/release-2.2.1.tar.gz + + python-devel + + system/base/python-psutil/pspec.xml + + + python-psutil + + python + + + /usr/lib + /usr/share/doc + + + + + 2015-04-12 + 2.2.1 + Version bump + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-11-19 + 1.1.3 + Version bump + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2012-11-16 + 0.6.1 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + gdbm + http://www.gnu.org/software/gdbm/gdbm.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + Standard GNU database libraries included for compatibility with Perl + Perl uyumlu standart GNU veritabanı kütüphaneleri + GNU dbm est un ensemble de routines de base de données utilisant extensivement les dictionnaires (hashing). Il fonctionne de manière similaire aux routines dbm UNIX standards. + GNU dbm is a set of database routines that use extensible hashing. It works similar to the standard UNIX dbm routines. + GNU dbm genişletilebilir hash yapabilen veritabanı işlevleri sağlar. Standart UNIX dbm uygulamaları ile aynı şekilde çalışır. + mirrors://gnu/gdbm/gdbm-1.11.tar.gz + + gdbm-1.10-zeroheaders.patch + + system/base/gdbm/pspec.xml + + + gdbm + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/locale + /usr/share/man + /usr/share/info + + + + gdbm-devel + Development files for gdbm + gdbm için geliştirme dosyaları + system.devel + + gdbm + + + /usr/include + + + + + 2014-05-11 + 1.11 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 1.11 + Version bump + PisiLinux Community + admins@pisilinux.org + + + 2013-08-29 + 1.10 + Clean gdbm. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-08-31 + 1.10 + First release + Erdem Artan + admins@pisilinux.org + + + + + + cpio + http://www.gnu.org/software/cpio/cpio.html + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + system.base + A file archival tool which can also read and write tar files + Tar ve cpio dosyaları içine yazıp okuyabilen bir dosya arşivleme uygulaması + GNU cpio permet de copier des fichiers du système dans une archive cpio ou tar et vice-versa. L'archive peut être un simple fichier sur le disque, une cassette magnétique, ou un tuyau unix (pipe). GNU cpio gère les formats d'archive suivant : binaire, ASCII ancien, ASCII nouveau, crc, binaire HPUX, ASCII ancien HPUX, tar ancien et tar POSIX.1. + GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe. GNU cpio supports the following archive formats: binary, old ASCII, new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. + GNU cpio dosyaları cpio veya tar arşivlerine kopyalamaya veya bu arşivlerden çıkarmak için tasarlanmıştır. Arşiv diskteki başka bir dosya, manyetik bir teyp veya bir boru sistemi olabilir. GNU cpio şu arşiv formatlarını destekler: ikili, eski ASCII, yeni ASCII, crc, HPUX ikili, HPUX eski ASCII, eski tar ve POSIX.1 tar. + mirrors://gnu/cpio/cpio-2.11.tar.bz2 + + cpio-2.7-svr4compat.patch + cpio-2.9-exitCode.patch + CVE-2010-0624-rpatelib-overflow.patch + + system/base/cpio/pspec.xml + + + cpio + + /bin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + + + + + 2014-05-11 + 2.11 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 2.11 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-08-24 + 2.11 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + expat + http://expat.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + as-is + library + system.base + librairies d'analyse XML + XML parsing libraries + XML ayrıştırıcı kütüphaneleri + XML Parser Bibliotheken + This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. + mirrors://sourceforge/expat/expat-2.1.0.tar.gz + + gnuconfig + glibc-devel + + system/base/expat/pspec.xml + + + expat + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man + + + + expat-devel + Development files for expat + expat için geliştirme dosyaları + system.devel + + glibc-32bit + + + expat + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/doc/expat/html + + + + expat-32bit + 32-bit shared libraries for expat + expat için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + expat + + + /usr/lib32 + + + + + 2014-05-11 + 2.1.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-27 + 2.1.0 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-01-21 + 2.1.0 + Remove patch which causing test error for perl-XML-Parser. + Marcin Bojara + marcin@pisilinux.org + + + 2011-03-01 + 2.1.0 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + net-tools + http://sites.inka.de/lina/linux/NetTools/ PisiLinux Community admins@pisilinux.org @@ -5268,65 +7207,742 @@ GPLv2 app:console system.base - Programs which control basic system processes - sysvinit package contains a group of utilities that control the very basic functions of your system. sysvinit contains the init program, the first program started by the Linux kernel when the system boots. - http://download.savannah.gnu.org/releases/sysvinit/sysvinit-2.88dsf.tar.bz2 + Standard Linux networking tools + Linux ağ araçları + net-tools est une collection de programmes représentant les outils réseau de base du système d'exploitation Linux. S'y trouvent arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route et slattach. + net-tools is a collection of programs that form the base set of the networking tools for the Linux operating system. It includes arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route and slattach. + Net-tools, Linux işletim sisteminde kullanılan ağ ile ilgili temel araçların bir birleşimidir. Arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route ve slattach programlarını içerir. + ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/net-tools-1.60.tar.bz2 - sysvinit-2.86-ctrlc.patch - sysvinit-2.78-man.patch - sysvinit-2.86-loginshell.patch - sysvinit-2.86-single.patch - sysvinit-2.88-quiet.patch - sysvinit-2.88-ipv6.patch - sysvinit-2.88-omit.patch - sysvinit-2.88-wall-maxlines.patch + 01_all_net-tools-1.60-2.6-compilefix.patch.bz2 + 02_all_net-tools-1.60-gcc34.patch.bz2 + 03_all_net-tools-1.60-cleanup-list-handling.patch.bz2 + 04_all_net-tools-1.60-get_name.patch.bz2 + 20_all_net-tools-1.54-ipvs.patch.bz2 + 21_all_net-tools-1.57-bug22040.patch.bz2 + 22_all_net-tools-1.60-manydevs.patch.bz2 + 23_all_net-tools-1.60-miiioctl.patch.bz2 + 24_all_net-tools-1.60-virtualname.patch.bz2 + 25_all_net-tools-1.60-cycle.patch.bz2 + 26_all_net-tools-1.60-overflow.patch.bz2 + 27_all_net-tools-1.60-netstat_ulong.patch.bz2 + 50_all_net-tools-1.60-multiline-string.patch.bz2 + 51_all_net-tools-1.60-man.patch.bz2 + 52_all_net-tools-1.60-numeric-ports.patch.bz2 + 53_all_net-tools-1.60-appletalk.patch.bz2 + 54_all_net-tools-1.60-wide.patch.bz2 + 55_all_net-tools-1.60-Makefile.patch.bz2 + 56_all_net-tools-1.60-ipv6-hostname.patch.bz2 + 57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2 + 60_all_net-tools-1.60-headers.patch.bz2 + net-tools-missing.patch + kernel_headers.patch + gcc-4.3.patch + large-buffer.patch - system/base/sysvinit/pspec.xml + system/base/net-tools/pspec.xml - sysvinit + net-tools + + comar + comar-api + /bin /sbin /usr/bin + /usr/sbin + /usr/share/doc /usr/share/man - /usr/include + /usr/share/locale + + + + + 2014-05-11 + 1.60 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-30 + 1.60 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-10-13 + 1.60 + First release + Erdem Artan + admins@pisilinux.org + + + + + + libunwind + http://www.nongnu.org/libunwind/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + system.base + Call chain tracer of a program + Yazılım çağrıları geri izleme aracı + libunwind is a portable and efficient C programming interface (API) to determine the call chain of a program. + libunwind bir yazılımın çağrı sıralamasını takip etmek için kullanılan, hızlı çalışan ve taşınabilir bir C programlama arabirimidir. + http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz + + xz-devel + + system/base/libunwind/pspec.xml + + + libunwind + + xz + + + /usr/lib + /usr/share/doc/libunwind + /usr/share/man + /usr/share/man/man3 - - System.Package - - sysvinit-tools - Tools used for process and utmp management - Süreç ve utmp yönetim araçları + libunwind-devel + Development files for libunwind + libunwind için geliştirme dosyaları + + libunwind + - /bin/mountpoint - /sbin/pidof - /sbin/killall5 - /sbin/sulogin - /usr/bin/wall - /usr/bin/last - /usr/bin/lastb - /usr/bin/mesg - /usr/bin/utmpdump - /usr/share/man/man1 - /usr/share/man/man8/killall5* - /usr/share/man/man8/pidof* - /usr/share/man/man8/sulogin* + /usr/include + /usr/lib/pkgconfig + + + + + 2015-01-30 + 1.1 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-20 + 1.1 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-07-27 + 1.1 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-02-16 + 1.1 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2011-12-09 + 1.0.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + libusb + http://libusb.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.base + Userspace access to USB devices + Project's main aim is to create a library for use by user level applications to access USB devices regardless of OS. + http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.19/libusb-1.0.19.tar.bz2 + + eudev-devel + + system/base/libusb/pspec.xml + + + libusb + + eudev + + + /usr/bin + /usr/lib + /usr/share/doc + + + libusbx + + + libusbx + + + + libusb-devel + Development files for libusb + system.devel + + libusb + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + libusbx-devel + + + libusbx-devel + + + + libusb-32bit + 32-bit shared libraries for libusb + emul32 + emul32 + + glibc-32bit + + + libusb + eudev-32bit + glibc-32bit + + + /usr/lib32 + + + libusbx-32bit + + + libusbx-32bit + + + + + 2014-04-30 + 1.0.19 + rename libusbx to libusb like upsteam + version bump to 19 + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-16 + 1.0.18 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-29 + 1.0.17 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-27 + 1.0.16 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-07-27 + 1.0.16 + Move .pc files to devel package + Fatih Turgel + hitaf@pisilinux.org + + + 2013-07-23 + 1.0.16 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-10-12 + 1.0.14 + First release + Erdem Artan + admins@pisilinux.org + + + + + + liblogging + http://www.liblogging.org + + Marcin Bojara + marcin@pisilinux.org + + BSD-2 + library + system.base + Easy to use, portable, open source library for system logging + Liblogging offers an enhanced replacement for the syslog() call, but retains its ease of use. + http://download.rsyslog.com/liblogging/liblogging-1.0.3.tar.gz + system/base/liblogging/pspec.xml + + + liblogging + + /usr/lib + /usr/bin + /usr/share/man + /usr/share/doc/liblogging + + + + liblogging-devel + Development files for liblogging + system.devel + + liblogging + + + /usr/include/liblogging/stdlog.h + /usr/lib/pkgconfig/liblogging-stdlog.pc 2014-05-11 - 2.88 + 1.0.3 Release bump. Marcin Bojara marcin@pisilinux.org - 2011-06-01 - 2.88 + 2014-03-30 + 1.0.3 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + python-pyliblzma + http://pypi.python.org/pypi/pyliblzma + + PisiLinux Community + admins@pisilinux.org + + LGPLv3 + library + system.base + Python bindings for lzma + Python için lzma bağlayıcıları + pyliblzma provides a python interface for the liblzma library to read/write data that has been compressed/decompressed with lzma utils. + pyliblzma, lzma araçlarıyla sıkıştırılmış verileri açmak ve lzma kitaplığı kullanarak veri sıkıştırmak için python programlama arayüzü sunan bir pakettir. + http://pypi.python.org/packages/source/p/pyliblzma/pyliblzma-0.5.3.tar.bz2 + + xz-devel + python-setuptools + python-devel + + system/base/python-pyliblzma/pspec.xml + + + python-pyliblzma + + xz + python + + + /usr/lib/python2* + /usr/share/doc + + + + + 2014-05-11 + 0.5.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 0.5.3 + rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 0.5.3 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2010-10-11 + 0.5.3 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + gperf + http://www.gnu.org/software/gperf/gperf.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + A perfect hash function generator + Mükemmel hash üreticisi + gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only. + gperf mükemmel hash fonksiyonu üretecidir. Verilen bir katar listesi için C ve C++ kodu biçiminde bir hash fonksiyonu ve hash tablosu üretir. + GNU gperf es un generador de perfect hash. Produce una función hash y una tabla hash a base de una lista de cadenas, en forma de código C o C++ , para revisar valores dependiendo de una cadena de entrada. La función de hash es perfecta, lo que quiere decir que no hay colisiones en la tabla de hash, y para la búsqueda en la tabla hash se necesita solamente una comparación. + mirrors://gnu/gperf/gperf-3.0.4.tar.gz + system/base/gperf/pspec.xml + + + gperf + + libgcc + + + /usr/bin + /usr/share/doc + /usr/share/info + /usr/share/man + + + + + 2014-05-11 + 3.0.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-24 + 3.0.4 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-07-26 + 3.0.4 + Fix dep,release bump. + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 3.0.4 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + psmisc + http://psmisc.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + A set of tools that use the proc filesystem + proc dosya sistemi kullanan bir araç takımı + PSmisc est une collection de petits utilitaires utilisant le système de fichier /proc, et assiste l'administrateur système dans ses tâches habituelles. + PSmisc is a collection of small utilities using /proc file system, and providing the system administrator with some help in common tasks. + PSmisc, /proc dosya sistemini kullanan küçük araçlar yardımıyla sistem yöneticisine bazı genel görevlerde yardımcı olmayı amaçlar. + PSmisc ist eine Sammlung von kleinen Anwendungen, die das /proc Dateisystem verwenden und dem System Administrator Hilfe für gängige Aufgaben bieten. + mirrors://sourceforge/psmisc/psmisc-22.21.tar.gz + + ncurses-devel + gettext + + + psmisc-fuser.patch + + system/base/psmisc/pspec.xml + + + psmisc + + ncurses + + + /bin + /usr/bin + /usr/share/man + /usr/share/doc + /usr/share/locale + + + + + 2015-05-03 + 22.21 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 22.20 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-14 + 22.20 + New version + Ertan Güven + ertan@pisilinux.org + + + 2012-08-24 + 22.19 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + libunistring + http://www.gnu.org/software/libunistring + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + LGPLv3 + library + system.base + Unicode string library + Unicode karakter dizisi kitaplığı + This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard. + Bu kitaplığı unicode standartına göre unicode ve C karakter dizilerinde değişiklik yapmak için kullanılabilecek fonksiyonlar sunar. + mirrors://gnu/libunistring/libunistring-0.9.3.tar.gz + system/base/libunistring/pspec.xml + + + libunistring + + /usr/lib + /usr/share/doc + /usr/share/info + + + + libunistring-devel + Development files for libunistring + libunistring için geliştirme dosyaları + system.devel + + libunistring + + + /usr/include + + + + + 2014-05-11 + 0.9.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-30 + 0.9.3 + Rebuild + Pisi Linux Admins + admins@pisilinux.org + + + 2011-02-10 + 0.9.3 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + nss-mdns + http://0pointer.de/lennart/projects/nss-mdns/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + Name Service Switch module + İsim servisi değiştirme modülü + Module d'échange de service de nom pour le DNS Multicast. + Name Service Switch module for Multicast DNS. + Çoklu gönderim yapan DNS'ler için isim servisi seçme modülü. + http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz + + nss-mdns-0.8-avahi-socket.patch + + system/base/nss-mdns/pspec.xml + + + nss-mdns + + /etc + /usr/lib + /usr/share/doc + + + mdns.allow + + + + + 2014-05-11 + 0.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 0.10 + Rebuild + Pisi Linux Admins + admins@pisilinux.org + + + 2010-10-11 + 0.10 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + sed + http://sed.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + GNU Stream Editor + GNU stream düzenleyici + Sed est un éditeur de flux. Un éditeur de flux est utilisé pour réaliser des opérations basiques de modification de texte sur un flux d'entrée (un fichier ou un tuyau unix). + Sed is a stream editor. A stream editor is used to perform basic text transformations on an input stream (a file or input from a pipeline). + Sed bir dosyadan veya standart girdiden (klavyeden) bilgi okur ve standart çıktıya (ekrana) okuduğu bilgileri kullanıcının belirlediği düzene sokarak yazar. + mirrors://gnu/sed/sed-4.2.2.tar.gz + + gettext-devel + + system/base/sed/pspec.xml + + + sed + + acl + + + /bin + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + + + + + 2014-05-11 + 4.2.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 4.2.2 + Clean sed. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-14 + 4.2.2 + Release bump for rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-14 + 4.2.2 + New release + PisiLinux Community + admins@pisilinux.org + + + 2010-10-11 + 4.2.1 First release Pisi Linux Admins admins@pisilinux.org @@ -5352,11 +7968,11 @@ udev ermöglicht Linux Benutzern ein dynamisches /dev Verzeichnis und beständige Gerätenamen http://www.freedesktop.org/software/systemd/systemd-214.tar.xz - glib2 + glib2-devel gperf acl-devel libkmod-devel - libblkid-devel + libutil-linux-devel system/base/udev/pspec.xml @@ -5366,7 +7982,7 @@ libudev acl libkmod - libblkid + libutil-linux util-linux @@ -5474,7 +8090,7 @@ emul32 libkmod-32bit - libblkid-32bit + libutil-linux-32bit libudev @@ -5503,7 +8119,7 @@ - 2014-07-01 + 2015-05-01 214 Version bump. Marcin Bojara @@ -5616,6 +8232,200 @@ + + + bc + http://www.gnu.org/software/bc + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Console-based calculator utility + Konsol temelli hesap makinesi + bc est un langage de calcul numérique à précision arbitraire qui peut être utilisé comme calculatrice. La syntaxe est similaire au C, avec quelques différences notables. Il supporte par exemple l'exécution interactive de commandes. + bc is an arbitrary precision numeric processing language and can be used as a calculator. Syntax is similar to C, but differs in many substantial areas. For example, it supports interactive execution of statements. + bc, herhangi bir keskinlikte sayısal işlemler yapmayı sağlayan bir programlama dilidir ve bir hesap makinesi olarak kullanılabilir. Sözdizimi C programlama diline benzer, ancak C'den birçok önemli farkları vardır. Örneğin, ifadelerin etkileşimli bir şekilde çalışmasına olanak tanır. + ftp://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2 + + flex + texinfo + readline-devel + + + fedora/bc-1.06.95-memleak.patch + fedora/bc-1.06-dc_ibase.patch + fedora/bc-1.06.95-matlib.patch + + system/base/bc/pspec.xml + + + bc + + readline + + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + + + + + 2014-05-11 + 1.06.95 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 1.06.95 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2011-01-02 + 1.06.95 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + bash + http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html + + Pisi Linux Admins + admins@pisilinux.org + + GPLv2 + app:console + system.base + The standard GNU Bourne again shell + GNU Bource again kabuğu + Bash est le Bourne Again SHell du projet GNU, une implémentation complête du POSIX IEEE et des spécifications d'interprétation de commande (shell) de l'Open Group, avec édition interactive de ligne de commande et des fonctionnalités à la csh tels que la substitution dans l'historique de commande. + Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, csh-like features such as history substitution. + Bash, IEEE POSIX ve Open Group'un interaktif komut satırı düzenleme, geçmiş komutları tamamlama gibi csh tipi özellikler gibi kabuk uygulamaları tariflerinin tam olarak uygulayan GNU Projesinin Bourne Again SHell kabuk programıdır. + mirrors://gnu/bash/bash-4.3.30.tar.gz + + ncurses-devel + + + official/bash43-031.tar.gz + official/bash43-032.tar.gz + official/bash43-033.tar.gz + fedora/bash-2.02-security.patch + fedora/bash-2.03-paths.patch + fedora/bash-2.03-profile.patch + fedora/bash-2.05a-interpreter.patch + fedora/bash-2.05b-debuginfo.patch + fedora/bash-2.05b-manso.patch + fedora/bash-2.05b-pgrp_sync.patch + fedora/bash-2.05b-readline-oom.patch + fedora/bash-2.05b-xcc.patch + fedora/bash-3.2-audit.patch + fedora/bash-3.2-ssh_source_bash.patch + fedora/bash-4.0-nobits.patch + fedora/bash-4.1-broken_pipe.patch + fedora/bash-4.1-defer-sigchld-trap.patch + fedora/bash-4.1-examples.patch + fedora/bash-4.2-coverity.patch + fedora/bash-4.2-manpage_trap.patch + fedora/bash-4.2-rc2-logout.patch + fedora/bash-4.2-size_type.patch + fedora/bash-bashbug.patch + fedora/bash-infotags.patch + fedora/bash-requires.patch + fedora/bash-setlocale.patch + fedora/bash-tty-tests.patch + + system/base/bash/pspec.xml + + + bash + + ncurses + + + /etc + /bin + /usr/bin + /usr/share/doc + /usr/share/info + /usr/share/man + /usr/share/locale + + + bashrc + command-not-found.sh + + + + + 2015-08-20 + 4.3_p33 + Update + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-10-13 + 4.3_p30 + Update + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-09-27 + 4.3_p26 + Update + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 4.3_p8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-03 + 4.3_p8 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-28 + 4.2_p45 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-11-24 + 4.2_p45 + Update + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-24 + 4.2_p39 + First release + Marcin Bojara + marcin@pisilinux.org + + + cracklib @@ -5706,6 +8516,2557 @@ + + + less + http://www.greenwoodsoftware.com/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + system.base + Excellent lecteur de fichier texte + Excellent text file viewer + Mükemmel bir metin görüntüleyici + Ausgezeichneter Textbetrachter + The less utility is a text file browser that resembles more, but has more capabilities. Less allows you to move backwards in the file as well as forwards. Since less doesn't have to read the entire input file before it starts, less starts up more quickly than text editors (for example, vi). + http://www.greenwoodsoftware.com/less/less-458.tar.gz + + ncurses-devel + + system/base/less/pspec.xml + + + less + + ncurses + + + /etc/env.d + /usr/bin + /usr/share/doc + /usr/share/man + + + lesspipe.sh + 70less + code2color + + + + + 2014-05-11 + 458 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-24 + 458 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2012-09-15 + 451 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + lsb-release + http://www.linuxbase.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + LSB version query program + LSB sürüm sorgulama aracı + lsb-release prints certain LSB (Linux Standard Base) and distribution information. + lsb-release bazı dağıtıma özel tanımlayıcı bilgileri ekrana basan bir terminal aracıdır. + mirrors://sourceforge/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz + + util-linux + + system/base/lsb-release/pspec.xml + + + lsb-release + + /usr/bin + /etc + /usr/share/man + /usr/share/doc + + + lsb-release + + + + + 2015-01-16 + 1.4 + Release Pisi Linux 1.2 + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-11-03 + 1.4 + Release Pisi Linux 1.1 + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-07-16 + 1.4 + Release Pisi Linux 1.0 + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 1.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-16 + 1.4 + Rc2 name Erdinc for Erdinç Gültekin. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-12-20 + 1.4 + Rc2 + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-20 + 1.4 + RC1 + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-08-11 + 1.4 + sueno + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2012-08-23 + 1.4 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + nettle + http://www.gnu.org + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.base + The Nettle package contains the low-level cryptographic library. + Nettle - biblioteka kryptograficzna. + The Nettle package contains the low-level cryptographic library that is designed to fit easily in many contexts. + ftp://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz + + gmp-devel + + system/base/nettle/pspec.xml + + + nettle + + gmp + + + /usr/bin + /usr/lib + /usr/share/info + /usr/share/doc + + + + nettle-devel + Nettle için geliştirme dosyaları + nettle için geliştirme dosyaları. + Pliki nagłówkowe biblioteki nettle. + + nettle + + + /usr/include + /usr/lib/pkgconfig/nettle.pc + /usr/lib/pkgconfig/hogweed.pc + /usr/lib32/pkgconfig/nettle.pc + /usr/lib32/pkgconfig/hogweed.pc + + + + nettle-32bit + 32-bit shared libraries for nettle + emul32 + emul32 + + gmp-32bit + glibc-32bit + + + nettle + glibc-32bit + gmp + + + /usr/lib32/ + + + + + 2014-05-11 + 2.7.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-28 + 2.7.1 + Version bump, clean nettle. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-26 + 2.6 + Move pc files to devel pack, rebuild. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-02-14 + 2.6 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-09-29 + 2.5 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + db + http://www.oracle.com/technology/products/berkeley-db/db/index.html + + PisiLinux Community + admins@pisilinux.org + + DB + app:console + system.base + Quatrième version de Berkeley DB + Oracle Berkeley DB + Oracle Berkeley DB + Ein einbettbares Datenbank Engine, dass die Entwickler mit schnellen, zuverlässigen und lokalen Persistenz unterstützt und null Administration erfordert. + The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. The Berkeley DB includes B+tree, Extended Linear Hashing, Fixed and Variable-length record access methods, transactions, locking, logging, shared memory caching, and database recovery. The Berkeley DB supports C, C++, Java, and Perl APIs. It is used by many applications, including Python and Perl, so this should be installed on all systems. + Berkeley DB geliştiricilere yerel süreklilik sağlayan ve herhangi bir ayar gerektirmeden (zero administration) kullanılan, hızlı ve gömülebilir bir veritabanı motorudur. + http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz + system/base/db/pspec.xml + + + db + + libgcc + + + /usr/bin + /usr/lib + /usr/sbin + + + db5 + + + + db-devel + Development files for db + + db + + + /usr/include + + + db5-devel + + + + db-docs + Documentation for db + system.doc + + db + + + /usr/share/doc + + + db5-docs + + + + + 2014-09-10 + 5.3.28 + Rebuild for component change. + Perl depends on db, so we need it in system.base. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-07-15 + 5.3.28 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 5.3.28 + Version bump + PisiLinux Community + admins@pisilinux.org + + + 2013-08-29 + 5.3.21 + Rename and clean db pack. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-26 + 5.3.21 + Fix dep, release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-08-31 + 5.3.21 + First release + Erdem Artan + admins@pisilinux.org + + + + + + fuse + http://fuse.sourceforge.net + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + Interface implémentée dans l'environnement utilisateur (userpace) pour les systèmes de fichier. + An interface for filesystems implemented in userspace + Kullanıcı düzeyinde dosya sistemi oluştumaya yarayan kitaplık + Una interfaz para sistemas de archivos implementados en el espacio de usuario + fuse is a backend allowing regular users to (un)mount filesystems for their own use. + FUSE, kullanıcıların kendileri için dosya sistemleri oluşturmasına, bağlamasına ve bağı koparmasına imkân veren bir arkauç kitaplıktır. + mirrors://sourceforge/project/fuse/fuse-2.X/2.9.3/fuse-2.9.3.tar.gz + + gettext-devel + + + skip_umount_test.patch + + system/base/fuse/pspec.xml + + + fuse + + glibc + + + /bin + /sbin + /usr/bin + /lib + /usr/share/doc + /usr/share/man + + + + fuse-devel + Development files for fuse + fuse için geliştirme dosyaları + system.devel + + fuse + + + /usr/include + /usr/lib/pkgconfig + + + + + 2014-05-11 + 2.9.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-24 + 2.9.3 + Rebuild + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-01-20 + 2.9.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-20-21 + 2.9.2 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + coreutils + http://www.gnu.org/software/coreutils/ + + Pisi Linux Admins + admins@pisilinux.org + + GPLv3+ + app:console + system.base + A set of basic GNU tools commonly used in shell scripts + Standart dosya, metin ve kabuk uygulamaları + Utilitaires standards GNU pour fichiers (chmod, cp, dd, dir, ls...), utilitaires texte (sort, tr, head, wc...) et utilitaires d'interpréteur de commande (shell) (whoami, who...) + GNU dosya uygulamaları (chmod, cp, dd, dir, ls...), sh uygulamaları (whoami, who,...) ve metin uygulamalarının (sort, tr, head, wc..) birlikteliğinden oluşmaktadır. + http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz + + acl-devel + attr-devel + perl + shadow + gettext-devel + ncurses-devel + texinfo + + + remove_am_silent_rules.patch + + system/base/coreutils/pspec.xml + + + coreutils + + acl + attr + gmp + libcap + + + /bin + /etc + /usr/bin + /usr/libexec + /usr/lib + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + + + + + 2015-04-01 + 8.23 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 8.22 + Rebuild, add patch. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-04-02 + 8.22 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 8.21 + Clean coreutils. + Serdar Soytetir + kaptanan@pisilinux.org + + + 2013-07-26 + 8.21 + Fix deps, release bump. + Serdar Soytetir + kaptanan@pisilinux.org + + + 2013-02-11 + 8.21 + Güncellendi. + PisiLinux Community + admins@pisilinux.org + + + 2012-08-31 + 8.19 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + gettext + http://www.gnu.org/software/gettext/gettext.html + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + app:console + library + system.base + GNU libraries and utilities for producing multi-lingual messages + Farklı dillerde ileti katalogları üretmek için gerekli GNU araçları ve kütüphaneleri + gettext est une librairie d'internationalisation GNU. + The GNU gettext package provides a set of tools and documentation for producing multi-lingual messages in programs. Tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs, a runtime library which supports the retrieval of translated messages, and stand-alone programs for handling the translatable and the already translated strings. Gettext provides an easy to use library and tools for creating, using, and modifying natural language catalogs and is a powerful and simple method for internationalizing programs. + gettext, uygulamalarda farklı dillerde iletiler kullanılmasını sağlayan yerelleştirme araçları ve kütüphanelerini içerir. + gettext ist eine GNU Bibliothek für Internationalisierung + http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.gz + + acl-devel + glib2-devel + ncurses + + system/base/gettext/pspec.xml + + + gettext-docs + system.doc + + gettext + + + /usr/share/doc/gettext/html + + + + gettext + + acl + glib2 + ncurses + libgcc + libunistring + libgomp + libxml2 + + + /usr/bin + /usr/lib + /usr/share/gettext + /usr/share/locale + /usr/share/info + /usr/share/man + /usr/share/doc + + + + gettext-devel + Development files for gettext + gettext için geliştirme dosyaları + system.devel + + gettext + + + /usr/share/aclocal + /usr/include + /usr/share/man/man3 + + + + + 2015-04-03 + 0.19.4 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-05-11 + 0.18.3.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 0.18.3.2 + Minor version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 0.18.3.1 + Version bump, clean gettext. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-11 + 0.18.2 + Fix dep, release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-11 + 0.18.2 + Güncellendi. + PisiLinux Community + admins@pisilinux.org + + + 2010-10-11 + 0.18.1.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + libcap + http://www.kernel.org/pub/linux/libs/security/linux-privs/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + BSD + library + system.base + capacités POSIX 1003.1e. + POSIX 1003.1e capabilities library + POSIX 1003.1e desteği + libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. + https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz + + attr-devel + pam-devel + + system/base/libcap/pspec.xml + + + libcap + + pam + attr + + + /sbin + /lib + /usr/lib + /usr/share/man + /usr/share/doc + /etc + + + + libcap-devel + Development files for libcap + libcap için geliştirme dosyaları + system.devel + + libcap + + + /usr/include + /usr/share/man/man3 + + + + libcap-32bit + 32-bit shared libraries for libcap + libcap için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + attr-32bit + glibc-32bit + + + glibc-32bit + attr-32bit + + + /usr/lib32 + + + + + 2015-03-16 + 2.24 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 2.24 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-03 + 2.24 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 2.22 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-01-24 + 2.22 + Use flags form pisi.conf, fix emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2012-10-01 + 2.22 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + timezone + ftp://elsie.nci.nih.gov/pub/ + + PisiLinux Community + admins@pisilinux.org + + BSD + public-domain + app:console + data + system.base + Timezone data files and tools + Zamandilimi veri dosyaları ve araçları + timezone includes timezone data files and tools to use them. Package contents are synchronized with glibc tree. + timezone zamandilimi veri dosyaları ve bu dosyaları kullanmak için gerekli araçları içerir. Paket içeriği glibc gelişim ağacından oluşturulmaktadır. + http://www.iana.org/time-zones/repository/releases/tzdata2015d.tar.gz + + perl + gawk + + + timezone-data-2015c-makefile.patch + + system/base/timezone/pspec.xml + + + timezone + + /usr/share/zoneinfo + + + + + 2015-05-09 + 2015d + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 2014b + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 2014b + Version bump. + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2012-09-27 + 0.0_20120927 + First release + Erdem Artan + admins@pisilinux.org + + + + + + ncurses + http://www.gnu.org/software/ncurses/ncurses.html + + PisiLinux Community + admins@pisilinux.org + + MIT + library + system.base + Console display library + Konsol görsel kütüphanesi + NCurses est une librairie de fonction gérant l'affichage des applications pour terminaux en mode caractères. La libraries NCurses défini de nombreuses fonctionalités telles le mouvement de la souris et du curseur, la disposition du clavier et l'affichage en couleur. + The NCurses is a library of functions that manage an application's display on character-cell terminals. The NCurses library defines many functions such as moving mouse and cursor, keyboard mapping and dispaying in color. + NCurses, bir uygulamanın karakter tabanlı uçbirimlerde görüntüleri üzerinde çalışabilmeyi sağlayan işlevler kütüphanesidir. Uygulama programları için imleci hareket ettirmek, pencereler oluşturmak, renkler üretmek, fare ile oynamak v.b. işlevler sağlamaktadır. + mirrors://gnu/ncurses/ncurses-5.9.tar.gz + + gnuconfig + + system/base/ncurses/pspec.xml + + + ncurses + + /etc + /lib + /usr/bin + /usr/lib + /usr/share/terminfo + /usr/share/tabset + /usr/share/man + /usr/share/doc + + + + ncurses-devel + Development files for ncurses + ncurses için geliştirme dosyaları + system.devel + + ncurses + + + /usr/include + /usr/lib/static + /usr/lib32/static + /usr/share/man/man3 + + + + ncurses-32bit + 32-bit shared libraries for ncurses + emul32 + _emul32 + + glibc-32bit + + + ncurses + + + /usr/lib32 + /usr/lib32/pkgconfig + + + + + 2014-09-14 + 5.9 + Fix build .pc files. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 5.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 5.9 + Rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 5.9_20121110 + Clean ncurses + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-11-14 + 5.9_20121110 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + time + ftp://prep.ai.mit.edu/pub/gnu/time + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + A GNU utility for monitoring a program's use of system resources + Bir programın sistem kaynak kullanımını izleyen GNU aracı + time utility runs another program, collects information about the resources used by that program while it is running, and displays the results. + time başka bir programı çalıştırarak o programın sistem kaynaklarını nasıl kullandığını izler ve topladığı bilgileri ekrana basar. + ftp://prep.ai.mit.edu/pub/gnu/time/time-1.7.tar.gz + + time-1.7-destdir.patch + + system/base/time/pspec.xml + + + time + + /usr/bin/ + /usr/share/info + + + + + 2014-05-11 + 1.7 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-01 + 1.7 + Clean time, add patches. + Serdar Soytetir + kaptan@pisilinux.org + + + 2010-10-11 + 1.7 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + file + http://www.darwinsys.com/file/ + + PisiLinux Community + admins@pisilinux.org + + as-is + app:console + system.base + Program to identify a file's format by scanning binary data for patterns + Dosya tipini belirlemek için kullanılan bir uygulamadır + Programme servant à identifiant le format d'un fichier en analysant les données binaires en cherchant des patrons connus. + Program to identify a file's format by scanning binary data for patterns. + İkili veri taraması kullanarak (dosya uzantısına bakmadan) dosya biçimini tanımlamaya yarayan bir uygulamadır. + ftp://ftp.astron.com/pub/file/file-5.22.tar.gz + + zlib + python-devel + + system/base/file/pspec.xml + + + file + + zlib + python + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man + /usr/share/misc + /usr/include + + + + + 2015-04-02 + 5.22 + Release bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 5.18 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 5.18 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 5.15 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-03-04 + 5.13 + Version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-16 + 5.12 + New Release + PisiLinux Community + admins@pisilinux.org + + + 2012-11-22 + 5.11 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + mudur + http://www.pisilinux.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Pisi Linux boot and initialization system + Pisi Linux açılış sistemi + Gère le montage de systèmes de fichier, le chargement de pilotes de périphérique, le démarrage des services système et d'autres tâches pendant les séquences de démarrage et d'arrêt de Pisi Linux. + mudur handles mounting of the filesystems, loading of the device drivers, starting of the system services, and other jobs during the Pisi Linux boot and shutdown sequences. + Pisi Linux açılış ve kapanışı sırasında, dosya sistemlerinin bağlanması, donanım sürücülerinin yüklenmesi, servislerin başlatılması gibi işleri yürütür. + http://source.pisilinux.org/1.0/mudur-4.4.0.tar.xz + + set_file_mode.patch + no_err-no_msg.patch + recreate_dir_if_new_uid_or_gid.patch + boot_option.patch + mount_cgroupfs.patch + + system/base/mudur/pspec.xml + + + mudur + + kbd + bash + dbus + kmod + eudev + comar + procps + python + rsyslog + sysvinit + coreutils + e2fsprogs + net-tools + baselayout + util-linux + wireless-tools + pisilinux-python + + + /etc/conf.d + /etc/mudur/services + /etc/init.d + /sbin + /bin + /usr/share/locale + + + System.PackageHandler + System.Service + System.Package + System.Settings + Disk.Manager + + + + + 2015-05-13 + 4.4.0 + fix issue #562, rebuild, depend new kbd and eudev, mount cgroups + Marcin Bojara + marcin@pisilinux.org + + + 2014-08-03 + 4.4.0 + Set mode for newly created files. + Marcin Bojara + marcin@pisilinux.org + + + 2014-06-11 + 4.4.0 + Recreate dir if uid or gid has been changed. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 4.4.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-06 + 4.4.0 + No error line in log file when tmpfiles created successfully. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-16 + 4.4.0 + Remove /dev/shm line from /etc/fstab. + Add mounting /run to fstab for fresh installed system. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 4.4.0 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-02-13 + 4.3.1 + Mount or remount tmpfs at /run. + Starts with kmod.conf and baselayout.conf at the begining. + Strip mudur_tmpfiles output. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-10 + 4.3.1 + Try to fix D-Bus start issue using cleanup_run. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-01-21 + 4.3.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-19 + 4.3.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 4.2.0 + rebuild + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-10 + 4.2.0 + Run udev after remount rootfs. + Fix /run/shm mode. + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-05 + 4.2.0 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-26 + 4.2.0 + Fix migration from /var/run to /run + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-15 + 4.2.0 + Fix default groups for /sbin/useradd + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-02 + 4.2.0 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + nspr + http://www.mozilla.org/projects/nspr/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + Netscape Portable Runtime + Netscape Taşınabilir Çalışma Zamanı + Netscape Portable Runtime (NSPR -- Exécutable Portable Netscape) fourni une API neutre au sens de la plate-forme pour les fonctions de niveau système ou de type libc. Cette API est utilisée au sein du client Mozilla ainsi que de nombreuses solutions logicielles de Netscape/AOL/iPlanet. + Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions. The API is used in the Mozilla client, many of Netscape/AOL/iPlanet's and other software offerings. + Netscape Taşınabilir çalışma Zamanı (NSPR) sistem seviyesindeki libc ve benzeri fonksiyonlar için platform bağımsız bir programlama arayüzü sunar. Bu arayüz, Mozilla istemcilerinde, Netscape/AOL/iPlanet'in diğer yazılımlarında kullanılmaktadır. + Netscape Portable Runtime (NSPR) provee un API independiente de la plataforma a nivel de sistema y funciones como libc. El API está usado en el cliente Mozilla, y muchos otros software de Netscape/AOL/iPlanet. + ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.8/src/nspr-4.10.8.tar.gz + + nspr.pc.in + generate-pc-config.sh + + system/base/nspr/pspec.xml + + + nspr + + /usr/lib + + + + nspr-devel + Development files for nspr + nspr için geliştirme dosyaları + system.devel + + nspr + + + /usr/include + /usr/lib/pkgconfig + /usr/bin + + + + + 2015-04-02 + 4.10.8 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-12-06 + 4.10.7 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-07-05 + 4.10.6 + Release bump. + PisiLinux Community + admins@pisilinux.org + + + 2014-05-11 + 4.10.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 4.10.4 + Version bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-11-18 + 4.10.2 + Version bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-10-23 + 4.10.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-07-18 + 4.10 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-17 + 4.9.6 + v.bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-01-14 + 4.9.5 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-11-25 + 4.9.4 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + libuser + https://fedorahosted.org/libuser + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + A user and group account administration library + Kullanıcı ve grup hesap yönetim kitaplığı + libuser implements a standardized interface for manipulating and administering user and group accounts. The library uses pluggable back-ends to interface to its data sources. + libuser kullanıcı ve grup hesaplarını yönetmek ve işlemek için standart bir arayüz sunar. Kitaplık, sağladığı arayüzün verilere erişimi için genişletilebilir arkauçlar kullanmaktadır. + https://fedorahosted.org/releases/l/i/libuser/libuser-0.61.tar.xz + + pam-devel + popt-devel + glib2-devel + python-devel + + + libuser-0.56.15-fix_blowfish.patch + libuser-0.56.9-fix-str-fmt.patch + + system/base/libuser/pspec.xml + + + libuser + + pam + popt + glib2 + python + + + /etc + /usr/share/man + /usr/share/doc + /usr/share/locale + /usr/bin + /usr/sbin + /usr/lib + + + + libuser-devel + Development files for libuser + libuser için geliştirme dosyaları + system.devel + + libuser + glib2-devel + + + /usr/include + /usr/lib/pkgconfig + + + + + 2015-04-07 + 0.61 + Version bump, build without-sasl + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 0.60 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 0.60 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-28 + 0.59 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-14 + 0.58.0 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 0.57.6 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + procps + http://procps.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Standard informational utilities and process-handling tools + Geleneksel bilgilendirme yardımcı programları ve süreç işleme araçları + procps est un paquet regroupant une multitude de petits utilitaires utiles donnant des informations concernant les process en utilisant le système de fichier /proc. Le paquet inclus les programmes ps, top, vmstat, w, kill, free, slabtop et skill. + procps is the package that has a bunch of small useful utilities that give information about processes using the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill. + Procps /proc dosya sistemini kullanarak çalışan süreçler hakkında bilgi vermeye yarayan bazı kullanışlı uygulamaları içeren bir pakettir. Paket ps, top, vmstat, w, kill, free, slabtop ve skill gibi uygulamaları içerir. + http://procps.sf.net/procps-3.2.8.tar.gz + + ncurses-devel + + + procps-3.2.5-proc-mount.patch + nohz.patch + procps-3.2.5-eof.diff + procps-3.2.2-top-termsize.patch + procps-3.2.2-w-simply-work.diff + procps-3.2.7-top.1.diff + pwdx-bufferoverflow.diff + procps-3.2.7-libselinux.patch + procps-3.2.7-ps-libselinux.patch + procps-3.2.7-misc.patch + procps-3.2.7-FAQ.patch + procps-3.2.7-noproc.patch + procps-3.2.7-pseudo.patch + procps-3.2.7-0x9b.patch + procps-3.2.7-sysctl-writeonly.patch + procps-3.2.7-top-rc.patch + procps-3.2.7-top-remcpu.patch + procps-3.2.7-top-env-vmsize.patch + procps-3.2.7-top-env-cpuloop.patch + procps-3.2.7-vmstat-cpusteal.patch + procps-3.2.7-longcmd.patch + procps-3.2.7-vmstat-pgpg.patch + procps-3.2.7-sysctl-ignore.patch + procps-3.2.7-top-sorthigh.path + procps-3.2.7-w-best.patch + procps-3.2.7-watch-unicode.patch + procps-3.2.7-ps-stime.patch + procps-3.2.7-ps-eip64.patch + procps-3.2.7-psman.patch + procps-3.2.7-top-cpu0.patch + procps-3.2.7-top-cpuint.patch + procps-3.2.7-top-manpage.patch + procps-3.2.7-top-clrscr.patch + procps-3.2.7-ps-man-fmt.patch + procps-3.2.7-vmstat-partstats-long.patch + procps-3.2.7-vmstat-header.patch + procps-3.2.7-slabtop-once.patch + procps-3.2.7-vmstat-timestamp.patch + procps-3.2.7-vmstat-timestamp-manpage.patch + procps-3.2.7-ps-cgroup.patch + procps-3.2.7-vmstat-partstats-reqwrites.patch + procps-3.2.7-free-hlmem.patch + procps-3.2.8-threads.patch + procps-enable-core.patch + procps-3.2.8-setlocale.patch + procps-pmap-smaps.patch + procps-3.2.8-vmstat-getopt.patch + procps-3.2.8-ps-cgroup-suppress-root-group.patch + procps-3.2.8-make.patch + procps-3.2.8-constructor-order.patch + + system/base/procps/pspec.xml + + + procps + + ncurses + + + /bin + /sbin + /lib + /usr/bin + /usr/share/doc + /usr/share/man + /usr/include + + + + + 2014-05-11 + 3.2.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2010-10-12 + 3.2.8 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + mailcap + http://git.fedorahosted.org/git/mailcap.git + + PisiLinux Community + admins@pisilinux.org + + MIT + public-domain + data + system.base + Helper application and MIME type associations for file types + Dosya türleri için yardımcı uygulama ve MIME türü ilişkilendirmeleri + mailcap file is used by the metamail program. Metamail reads the mailcap file to determine how it should display non-text or multimedia material. + mailcap dosyası metamail ve bazı diğer uygulamalar tarafından, metin olmayan dosyaların ya da çokluortam dosyalarının nasıl açılacağını keşfetmek için kullanılır. + https://fedorahosted.org/released/mailcap/mailcap-2.1.42.tar.xz + + extend-mailcap.patch + + system/base/mailcap/pspec.xml + + + mailcap + + /etc + /usr/share/doc + /usr/share/man + + + + + 2014-05-11 + 2.1.42 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 2.1.42 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2011-06-01 + 2.1.37 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + pisi + http://www.pisilinux.org/ + + Marcin Bojara + marcin@pisilinux.org + + GPLv2 + app:console + system.base + PISI is the package management system of Pisi Linux + PİSİ PiSi Linux'un paket yönetim sistemidir + PiSi – menadżer pakietów dla PiSi Linux. + PISI est gestionnaire de paquets moderne implémenté en Python.Ces principales fonctionnalités sont les suivantes : - Les paquets sources sont écrits en XML et en python - Implemente tout les fonctions à travers une API simple d'utilisation - Intègre aussi bien les fonctionnalités de bas niveaux que de haut niveau de gestion de paquets. + PISI is a modern package management system implemented in Python. Some of its main features are: package sources are written in XML and python, implements all functions through a simple-to-use API, integrates low-level and high-level package management features. + PİSİ Python'da yazılmış modern bir paket yöneticisidir. Bazı ana özellikleri: Paket kaynakları XML ve python kullanılarak yazılır, bütün işlevleri kullanması kolay bir API ile sağlar ve düşük ve yüksek seviyeli paket yönetim işlevlerini birleştirir. + PISI jest podstawowym narzędziem do instalacji, aktualizacji i usuwania pakietów. Obsługuje zależności dla poszczególnych pakietów, bibliotek i zadań ÇOMAR-a. Instalacja oprogramowania odbywa się w łatwy i przyjazny sposób. Do przechowywania informacji o pakietach wykorzystuje bazę Berkeley DP, co zapewnia większą stabilność i szybkość. + http://source.pisilinux.org/1.0/pisi-2.6.tar.xz + + pisi.conf-i686 + pisi.conf-x86_64 + + + comar + plyvel + python + gettext + intltool + leveldb-devel + + + initialize_filesdb_once.patch + no_clean_if_ignore_comar.patch + orphaned_pkgs.patch + improve_pisi_ix.patch + fix_emul32_flags.patch + pisi-2.6-pisitools.dopixmaps-add.patch + + system/base/pisi/pspec.xml + + + pisi + + tar + file + comar + plyvel + python + gettext + leveldb + piksemel + comar-api + urlgrabber + python-psutil + libunwind + python-pyliblzma + mudur + + + /usr/bin + /usr/sbin + /usr/lib/pardus/pisi + /usr/lib/pisilinux/pisi + /usr/share/locale + /usr/share/doc + /etc/pisi + /usr/share/mime/packages + /usr/lib/tmpfiles.d/pisi.conf + /run/lock/files.ldb/LOCK + /var/lib/pisi/info/files.ldb/LOCK + + + System.Package + System.Manager + + + mirrors.conf + sandbox.conf + pisi.xml + pkgconfig.py + tmpfiles.conf + qt5.py + + + + + 2015-05-04 + 2.6 + Add qt5 api + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-12-07 + 2.6 + Add new pisitools.dopixmaps + Osman Erkan + osman.erkan@pisilinux.org + + + 2014-09-15 + 2.6 + Add new pisi commands: list-orphaned and remove-orphaned. + Improve pisi index. + Marcin Bojara + marcin@pisilinux.org + + + 2014-08-04 + 2.6 + pisi search-file works without sudo now. + Marcin Bojara + marcin@pisilinux.org + + + 2014-07-25 + 2.6 + Rebuild for version number. + Aydın Demirel + aydin.demirel@pisilinux.org + + + 2014-06-24 + 2.6 + Add patch for initialize filesdb once. + Marcin Bojara + marcin@pisilinux.org + + + 2014-06-15 + 2.6 + Version bump. + revdep-rebuild rewritten in python. + Marcin Bojara + marcin@pisilinux.org + + + 2014-06-08 + 2.5 + Add case sensitive for 'pisi sr'. + Change install path. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-27 + 2.5 + Add patch level auto detection feature, + sha1sum for install.tar.xz file, + check sha1sum for upgrade. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 2.5 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 2.5 + Some improvements for buildfarm. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-04 + 2.5 + Handle error for file command. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-16 + 2.5 + Workaround for update espeak package. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 2.5 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-02-28 + 2.4 + Fix pisitools.dosed output. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-13 + 2.4 + Workaround for the case where old dir /a/b/c is replaced by file c in /a/b dir. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-12 + 2.4 + Fix stripping issues, in file info: LSB executable, LSB shared syntax. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 2.4 + Disable python_installation patch to check python upgrading breaks pisi or not. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 2.4 + Fix autocompletion for local uncompressed index file. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-21 + 2.4 + Fix upgrading python package. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-01 + 2.4 + Improve managing CFLAGS, CXXFLAGS and LDFLAGS, + export HOME=get.workDIR() as default. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-25 + 2.4 + Fix and improve kerneltools. + Avoid double slashes pisi error. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-11 + 2.4 + adjust takeback to new dir structure. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 2.4 + No capital letters in directory names. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-17 + 2.4 + Fix overwrite 64bit libs by 32bit for some packages + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-02 + 2.4 + Add sorting packages for pisi ix + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-15 + 2.4 + Add pisitools.flags() and pisitools.ldflags() + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-12 + 2.4 + Sandbox.conf edit. + PisiLinux Community + admins@pisilinux.org + + + 2013-03-20 + 2.4 + Add patch for speed up packaging process + Marcin Bojara + marcin@pisilinux.org + + + 2013-03-14 + 2.4 + Improve dosed + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-14 + 2.4 + Add assign-devel-and-doc-packages.patch. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-18 + 2.4 + First release. + Marcin Bojara + marcin@pisilinux.org + + + + + + wireless-tools + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + A collection of tools to configure wireless lan cards + Kablosuz ağ kartlarını yapılandırmak için kullanılan bir araç seti + Les outils sans fil (Wireless Tools ou WT) est un ensemble d'outils permettant de manipuler les extensions sans fil, c'est une interface de programmation d'application (API) générique permettant à un pilote d'exposer à l'espace utilisateur la configuration ainsi que des statistiques spécifiques aux LANs sans fil communs. Ils utilisent une interface textuelle assez rugueuse, mais ont pour objectif de couvrir la totalité de l'extension sans fil. + The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions, a generic application programming interface allowing a driver to expose to the user space configuration and statistics specific to common Wireless LANs. They use a textual interface and are rather crude, but aim to support the full Wireless Extension. + Wireless Extensions, sürücülerin bilinen kablosuz ağların ayarlarını yapmak ve istatistiklerini görüntülemek amacıyla kullandığı bir yazılım programlama arayüzüdür. Wireless Tools ise Wireless Extensions ayarlarını modifiye etmek için kullanılan araçları içeren bir pakettir. Grafik arayüzü bulunmaz, biraz da kabadır; ancak Wireless Extension'u tam olarak desteklemeyi hedefler. + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.30.pre9.tar.gz + + no-ldconfig.patch + wireless_tools.27-wireless-man-upd.patch + wireless-tools-29-makefile.patch + + system/base/wireless-tools/pspec.xml + + + wireless-tools + + comar + + + /sbin + /usr/lib + /usr/share/man + /usr/share/doc + + + + wireless-tools-devel + Development files for wireless-tools + wireless-tools için geliştirme dosyaları + system.devel + + wireless-tools + + + /usr/include + /usr/share/man/man3 + + + + + 2015-05-08 + 30 + Release bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 30 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 30 + Güncellendi. + PisiLinux Community + admins@pisilinux.org + + + 2013-02-11 + 30 + Güncellendi. + PisiLinux Community + admins@pisilinux.org + + + 2011-06-01 + 29 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + libee + http://www.libee.org/ + + Marcin Bojara + marcin@pisilinux.org + + LGPLv2.1 + library + system.base + An Event Expression Library inspired by CEE + Libee - An Event Expression Library inspired by CEE + http://www.libee.org/download/files/download/libee-0.4.1.tar.gz + + libestr-devel + + system/base/libee/pspec.xml + + + libee + + libestr + + + /usr/sbin + /usr/lib/libee.so* + /usr/share/doc/libee + + + + libee-devel + Development files for libestr + system.devel + + libee + + + /usr/include/libee + /usr/lib/pkgconfig/libee.pc + + + + + 2014-05-11 + 0.4.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 0.4.1 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-11-21 + 0.4.1 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + busybox + http://www.busybox.net + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + Statically linked binary providing simplified versions of system commands + Statik bağlanmış sistem komutları bütünü + busybox is a single binary which includes versions of a large number of system commands, including a shell. + busybox, kabuk da dahil olmak üzere çeşitli sistem komutlarını içeren tek bir çalıştırılabilir dosyadır. + http://busybox.net/downloads/busybox-1.22.1.tar.bz2 + + config + + + udhcp-rootpath-rq.patch + suppress-job-control-warning.patch + fix-include.patch + + system/base/busybox/pspec.xml + + + busybox + + /bin + + + + + 2014-05-11 + 1.22.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-03-29 + 1.22.1 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-14 + 1.21.0 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 1.20.2 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + lzo + http://www.oberhumer.com/opensource/lzo/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.base + An extremely fast compression and decompression library + Çok hızlı bir sıkıştırma/açma kütüphanesi + lzo is a library with very high compression and decompression speeds and very small memory usage. Provides low compression ratios but very high speeds. + lzo hızlı bir sıkıştırma/açma kütüphanesidir. Düşük sıkıştırma oranları verir fakat hem sıkıştırma hem açma işleminde bellek kullanımı çok düşüktür ve işlem hızı yüksektir. + http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz + system/base/lzo/pspec.xml + + + lzo + + /usr/lib + /usr/share/doc + + + + lzo-devel + Development files for lzo + lzo için geliştirme dosyaları + + lzo + + + /usr/include + + + + lzo-32bit + 32-bit shared libraries for lzo + emul32 + emul32 + + glibc-32bit + + + glibc-32bit + + + /usr/lib32 + + + + + 2015-04-12 + 2.09 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-07-03 + 2.08 + Version bump and security update (CVE-2014-4607). + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 2.06 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-28 + 2.06 + Clean lzo. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-23 + 2.06 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + libusb-compat + http://libusb.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.base + Userspace access to USB devices + Project's main aim is to create a library for use by user level applications to access USB devices regardless of OS. + mirrors://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2 + + libtool + libusb-devel + + system/base/libusb-compat/pspec.xml + + + libusb-compat + + libusb + + + /usr/lib + /usr/share/doc + + + + libusb-compat-devel + Development files for libusb + system.devel + + libusb-devel + libusb-compat + + + /usr/bin + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + libusb-compat-32bit + 32-bit shared libraries for libXt + emul32 + emul32 + + libusb-32bit + glibc-32bit + + + libusb-32bit + libusb + glibc-32bit + libusb-compat + + + /usr/lib32 + + + + + 2015-05-05 + 0.1.5 + Rebuild for libusbx libusb changes + Use auto-emul32, cleanup actions.py + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 0.1.5 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 0.1.5 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-07-21 + 0.1.4 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + dhcpcd + http://roy.marples.name/dhcpcd + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.base + A dhcp client only + DHCP protokolü için istemci + Un client daemon DHCP conforme aux RFC2131 et RFC1541. dhcpcd obtient une adresse IP ainsi que d'autres informations depuis le serveur DHCP correspondant, configure l'interface réseau automatiquement et essaie de renouveler le bail selont les RFC2131 et EFC1541 en fonction des options de la ligne de commande. + An RFC2131 and RFC1541 compliant DHCP client daemon. dhcpcd gets an IP address and other information from a corresponding DHCP server, configures the network interface automatically, and tries to renew the lease time according to RFC2131 or RFC1541 depending on the command line option. + RFC2131 ve RFC1541 uyumlu bir DHCP istemci servisi.dhcpcd ilgili bir DHCP sunucusundan bir IP adresi ve gerekli diğer bilgileri alır, ağ arayüzünü otomatik olarak yapılandırır ve RFC2131 veya RFC1541 komut satırı özelliğine bağlı olarak kiralama zamanını yenilemeyi dener. + http://ftp.osuosl.org/pub/blfs/conglomeration/dhcpcd/dhcpcd-6.8.1.tar.bz2 + system/base/dhcpcd/pspec.xml + + + dhcpcd + + /etc + /lib/dhcpcd + /usr/lib/dhcpcd/dev/udev.so + /sbin + /usr/share/doc + /usr/share/man + /var/lib/dhcpcd + + + + + 2015-05-03 + 6.8.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-02-03 + 6.7.1 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-05-11 + 6.3.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-03 + 6.3.2 + Version bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-10-31 + 6.0.5 + Really revert back to 6.0.5. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-28 + 6.0.5 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-01-14 + 5.6.7 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 5.6.1 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + findutils + http://www.gnu.org/software/findutils/findutils.html + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + app:console + system.base + GNU utilities to find files + Dosya bulmak için kullanılan GNU uygulamaları + Les utilitaires de recherche GNU sont les utilitaire de recherche de répertoire basique du système d'exploitation GNU. Ces programmes sont typiquement associés à d'autres programmes pour leur fournir une capacité de recherche de fichier et de répertoire puissante et modulaire à d'autres commandes. + The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. These programs are typically used in conjunction with other programs to provide modular and powerful directory search and file locating capabilities to other commands. + GNU Find Utilities GNU işletim sisteminin temel dizin arama uygulamalarıdır. Bu uygulamalar diğer komutlara başka programlar ile birlikte çalışarak modüler ve güçlü dizin ve dosya arama yetenekleri sunar. + http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz + + gettext-devel + + system/base/findutils/pspec.xml + + + findutils + + /usr/bin + /usr/lib/find + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + + + + + 2014-05-11 + 4.4.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-01 + 4.4.2 + Revert back to stable version, clean findutils. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-14 + 4.5.9 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + gperftools @@ -5800,267 +11161,586 @@ - nettle - http://www.gnu.org + openssl + http://www.openssl.org/ + + PisiLinux Community + admins@pisilinux.org + + as-is + app:console + library + system.base + Toolkit for SSL v2/v3 and TLS v1 + SSL v2/v3 ve TLS v1 için araç kiti + OpenSSL est un outil cryptographique implémentant une couche de communication sécurisée (SSL v2/v3) et une couche de transport sécurisée (TLS v1) + OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. + OpenSSL, Güvenlik Soketleri Katmanı (SSL v2/v3) ve Aktarım Katmanı Güvenliği (TLSv1) ağ protokolleri ile bu protokollerin gerektirdiği şifreleme standartlarını uygulayan bir şifreleme aracıdır. + OpenSSL ist ein Kryptographie Werkzeug, das die Netzwerkprotokolle Secure Sockets Layer (SSL v2/v3) und Transport Layer Security (TLS v1) sowie deren erforderliche zugehörige Kryptographie Standards implementiert. + ftp://ftp.openssl.org/source/openssl-1.0.2a.tar.gz + + openssl-1.0.0-beta4-ca-dir.patch + + + zlib-devel + xorg-util + perl + sed + + + openssl-1.0.0a-ldflags-norpath.patch + openssl-1.0.0-beta4-ca-dir.patch + openssl-1.0.0-beta5-enginesdir.patch + openssl-1.0.2-ipv6.patch + openssl-1.0.2-s_client-verify.patch + openssl-include.patch + openssl_fix_for_x32.patch + + system/base/openssl/pspec.xml + + + openssl + + zlib + ca-certificates + + + /etc + /usr/bin + /usr/lib + /usr/share/doc + + + System.Package + + + + openssl-devel + Development files for openssl + openssl için geliştirme dosyaları + system.devel + + openssl + + + /usr/include + /usr/share/man + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + openssl-32bit + 32-bit shared libraries for openssl + openssl için 32-bit paylaşımlı kitaplıklar + emul32 + _emul32 + + zlib-32bit + + + openssl + zlib-32bit + glibc-32bit + + + /usr/lib32 + + + + + 2015-04-11 + 1.0.2a + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-02-17 + 1.0.2 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-11-05 + 1.0.1j + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-06-05 + 1.0.1h + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 1.0.1g + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-09 + 1.0.1g + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-02-02 + 1.0.1f + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-28 + 1.0.1e + Clean openssl. + Serdar Soytetir + kaptan@pisilinux.org + + + security + 2013-01-14 + 1.0.1e + New release + PisiLinux Community + admins@pisilinux.org + + + security + 2012-08-31 + 1.0.1c + First release + Erdem Artan + admins@pisilinux.org + + + + + + kmod + http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + app:console + system.base + Linux kernel module management utilities + Linux kernel modülleri yönetim araçları + Linux kernel module management utilities + Linux kernel modülleri yönetim araçları + https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-20.tar.xz + + chrpath + xz-32bit + xz-devel + zlib-32bit + zlib-devel + kernel-module-headers + + + kmod-15-dynamic-kmod.patch + + system/base/kmod/pspec.xml + + + kmod + + xz + zlib + glibc + libkmod + + + /usr/bin + /bin + /sbin + /usr/share/man + /usr/share/doc + /etc + /usr/share/bash-completion/completions/kmod + + + Boot.Modules + System.PackageHandler + + + blacklist/blacklist.conf + blacklist/blacklist-firewire.conf + blacklist/blacklist-framebuffer.conf + blacklist/blacklist-watchdog.conf + modprobe.conf + depmod.conf + depmod-search.conf + + + + libkmod-devel + system.devel + + libkmod + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + libkmod + kmod libraries + + xz + zlib + + + /usr/lib + + + + libkmod-32bit + 32bit libraries of libkmod + emul32 + emul32 + + xz-32bit + zlib-32bit + glibc-32bit + + + /usr/lib32 + + + + + 2015-03-26 + 20 + Version bump,add patch and fix deps. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-11-18 + 19 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-23 + 17 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 16 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-21 + 16 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-05 + 15 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 15 + Version bump, clean kmod. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-20 + 14 + rebuild for kernel 3.10.9 + PisiLinux Community + admins@pisilinux.org + + + 2013-08-11 + 14 + rebuild for kernel 3.10.5 + PisiLinux Community + admins@pisilinux.org + + + 2013-07-27 + 14 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-07-04 + 14 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-14 + 13 + Version bump + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-22 + 12 + Version bump, add comar scripts + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-15 + 11 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + cryptsetup + https://gitlab.com/cryptsetup/cryptsetup + + Erdem Artan + admins@pisilinux.org + + GPLv2 + app:cli + system.base + Userspace setup tool for transparent encryption of block devices using dm-crypt + Şifreli dosya sistemleri yaratmak için bir araç + Userspace setup tool for transparent encryption of block devices using dm-crypt + cryptsetup device mapper kullanarak şifrelenmiş dosya sistemleri yaratmak için gerekli bir araçtır. + cryptsetup + https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-1.6.7.tar.xz + + device-mapper-devel + libgpg-error-devel + libgcrypt-devel + python-devel + libutil-linux-devel + popt-devel + popt + + system/base/cryptsetup/pspec.xml + + + cryptsetup + + libcryptsetup + popt + + + /sbin + /usr/share/man + /usr/share/locale + /usr/share/doc + + + + libcryptsetup + cryptsetup libraries + cryptsetup kütüphaneleri + + device-mapper + libgpg-error + libgcrypt + libutil-linux + + + /lib/libcryptsetup.so* + + + + libcryptsetup-devel + libcryptsetup devel files + libcryptsetup için geliştirme dosyaları + + libcryptsetup + + + /usr/include + /usr/lib/pkgconfig/libcryptsetup.pc + + + + python-pycryptsetup + Python backend for cryptsetup + cryptsetup Python bağlayıcısı + programming.language.python + + python + libcryptsetup + + + /usr/lib/python2.7/site-packages/pycryptsetup.so + + + + + 2015-04-30 + 1.6.7 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-04-01 + 1.6.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-03 + 1.6.4 + Version bump + PisiLinux Community + admins@pisilinux.org + + + 2014-03-06 + 1.6.0 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-07-26 + 1.6.0 + Fix dep, release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-15 + 1.6.0 + New version + Ertan Güven + ertan@pisilinux.org + + + 2012-10-05 + 1.5.0 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + libidn + http://www.gnu.org/software/libidn PisiLinux Community admins@pisilinux.org LGPLv2.1 + GPLv3 + app:console library - util.crypt - The Nettle package contains the low-level cryptographic library. - Nettle - biblioteka kryptograficzna. - The Nettle package contains the low-level cryptographic library that is designed to fit easily in many contexts. - ftp://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz - - gmp-devel - - system/base/nettle/pspec.xml + system.base + Internationalized Domain Names (IDN) implementation + Uluslararası Alan Adları (IDN) destek kütüphanesi + GNU Libidn est une implémentation de Stringprep, Punycode et des spécifications IDNA définies par le groupe de travail Internationalized Domain Names (IDN) de l'IETF servant pour les noms de domaines internationalisés. La librairie C est disponible sous la Licence Publique Générale Lesser. + GNU Libidn is an implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group, used for internationalized domain names. The C library is available under the GNU Lesser General Public License. + GNU Libidn, IETF Uluslararasılaştırılmış Domain Adları (IDN) çalışma grubu tarafından tanımlanmış Stringgrep, Punycode ve IDNA tariflerinin bir uygulamasıdır, uluslararası domain adlarının kullanımına olanak sağlar. C kütüphanesi GNU Lesser General Public License altında sağlanabilir. + http://ftp.gnu.org/gnu/libidn/libidn-1.28.tar.gz + system/base/libidn/pspec.xml - nettle - - gmp - + libidn /usr/bin - /usr/lib - /usr/share/info - /usr/share/doc - - - - nettle-devel - Nettle için geliştirme dosyaları - nettle için geliştirme dosyaları. - Pliki nagłówkowe biblioteki nettle. - - nettle - - - /usr/include - /usr/lib/pkgconfig/nettle.pc - /usr/lib/pkgconfig/hogweed.pc - /usr/lib32/pkgconfig/nettle.pc - /usr/lib32/pkgconfig/hogweed.pc - - - - nettle-32bit - 32-bit shared libraries for nettle - emul32 - emul32 - - gmp-32bit - - - nettle-devel - gmp-32bit - - - /usr/lib32/ - - - - - 2014-05-11 - 2.7.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-28 - 2.7.1 - Version bump, clean nettle. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-26 - 2.6 - Move pc files to devel pack, rebuild. - Erdinç Gültekin - erdincgultekin@pisilinux.org - - - 2013-02-14 - 2.6 - Version bump - Ertan Güven - ertan@pisilinux.org - - - 2012-09-29 - 2.5 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - mingetty - ftp://ftp.suse.com/pub/projects/init/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A compact getty program for virtual consoles only - Sadece sanal konsollar için yekpare bir getty programı - mingetty, est getty poids plume minimaliste à utiliser exclusivement sur les consoles virtuelles. - mingetty, is a lightweight, minimalist getty for use on virtual consoles only. - mingetty yalnızca sanal konsollar için tasarlanmış basit ve yalın getty uygulamasıdır. - http://sourceforge.net/projects/mingetty/files/mingetty/1.08/mingetty-1.08.tar.gz - - gettext - - - tr.patch - - system/base/mingetty/pspec.xml - - - mingetty - - glibc - - - /sbin + /usr/lib/libidn* + /usr/share/emacs /usr/share/locale - /usr/share/man + /usr/share/man/man1 + /usr/share/info /usr/share/doc - - - 2014-05-11 - 1.0.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-02-09 - 1.0.8 - Rebuild - Kamil Atlı - suvarice@gmail.com - - - 2012-08-23 - 1.0.8 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - libcap - http://www.kernel.org/pub/linux/libs/security/linux-privs/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - BSD - library - system.base - capacités POSIX 1003.1e. - POSIX 1003.1e capabilities library - POSIX 1003.1e desteği - libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities. - https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz - - attr-devel - pam - - system/base/libcap/pspec.xml - - libcap - - pam - attr - - - /sbin - /lib - /usr/lib - /usr/share/man - /usr/share/doc - /etc - - - - libcap-devel - Development files for libcap - libcap için geliştirme dosyaları + libidn-devel + Development files for libidn + libidn için geliştirme dosyaları system.devel + + glibc-32bit + - libcap + libidn /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig /usr/share/man/man3 - libcap-32bit - 32-bit shared libraries for libcap - libcap için 32-bit paylaşımlı kitaplıklar + libidn-32bit + 32-bit shared libraries for libidn + libidn için 32-bit paylaşımlı kitaplıklar emul32 emul32 - - attr-32bit - - libcap - attr-32bit + libidn - /usr/lib32 + /usr/lib32/libidn* - - 2014-05-11 - 2.24 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - 2014-04-03 - 2.24 - Version bump. + 2014-05-11 + 1.28 + Release bump. Marcin Bojara marcin@pisilinux.org 2013-10-29 - 2.22 - Rebuild + 1.28 + Version bump. Yusuf Aydemir yusuf.aydemir@pisilinux.org - 2013-01-24 - 2.22 - Use flags form pisi.conf, fix emul32 - Marcin Bojara - marcin@pisilinux.org + 2013-01-14 + 1.26 + New release + PisiLinux Community + admins@pisilinux.org - 2012-10-01 - 2.22 + 2012-08-23 + 1.25 First release PisiLinux Community admins@pisilinux.org @@ -6069,519 +11749,802 @@ - man-pages - http://www.win.tue.nl/~aeb/linux/man/ + zlib + http://www.gzip.org/zlib/ PisiLinux Community admins@pisilinux.org - GPLv2 - data:doc + ZLIB + library system.base - Une collection de pages de manuel Linux compréhensibles d'une certaine manière. - A somewhat comprehensive collection of Linux man pages - Kapsamlı Linux kılavuz dökümanları - A large collection of man pages (documentation) from the Linux Documentation Project (LDP). - http://ftp.kernel.org/pub/linux/docs/man-pages/man-pages-3.70.tar.xz - http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz - system/base/man-pages/pspec.xml + Librairie de compression/extraction standard + Standard (de)compression library + Standart sıkıştırma/açma kütüphanesi + Zlib is a general-purpose, patent-free, lossless data compression library which is used by many different programs. + mirrors://sourceforge/libpng/zlib-1.2.8.tar.xz + + dont-call-ldconfig.patch + + system/base/zlib/pspec.xml - man-pages + minizip + Library for manipulating files from a zip archive + zip arşivlerindeki dosyaları yönetmek için kitaplık + util.archive + minizip - man-db + zlib + /usr/lib/libminizip* + + + + minizip-devel + Development files for minizip + minizip için geliştirme dosyaları + util.archive + minizip + + minizip + zlib-devel + + + /usr/include/minizip + /usr/lib/pkgconfig/minizip.pc + + + + zlib + + /lib/libz.so* + /usr/lib/libz.so* /usr/share/doc /usr/share/man - - man1/getent.1 - man1/sprof.1 - + + + zlib-devel + Development files for zlib + zlib için geliştirme dosyaları + system.devel + + zlib + + + /usr/lib/pkgconfig/zlib.pc + /usr/lib32/pkgconfig + /usr/include/z*.h + /usr/share/man/man3 + /usr/share/doc/zlib/algorithm.txt + /usr/share/doc/zlib/example.c + + + + zlib-32bit + 32-bit shared libraries for zlib + zlib için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + glibc-32bit + + + glibc-32bit + zlib + + + /usr/lib32/libz.so* + - - 2014-07-13 - 3.70 - Version bump. - Vedat Demir - vedat@pisilinux.org - - + 2014-05-11 - 3.55 + 1.2.8 Release bump. Marcin Bojara marcin@pisilinux.org - - 2013-10-28 - 3.55 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - 2013-10-28 - 3.47 - Version bump. + 2013-08-27 + 1.2.8 + Clean zlib. Serdar Soytetir kaptan@pisilinux.org - 2013-03-04 - 3.47 + 2013-06-29 + 1.2.8 Version bump. - Serdar Soytetir - kaptan@pisilinux.org + Marcin Bojara + marcin@pisilinux.org - 2011-01-04 - 3.32 + 2012-06-03 + 1.2.7 First release - Pisi Linux Admins + Erdem Artan admins@pisilinux.org - readline - http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html + comar + http://www.pisilinux.org PisiLinux Community admins@pisilinux.org GPLv2 - library + service system.base - Another cute console display library - Diğer bir şirin konsol gösterim kütüphanesi - La librairie GNU Readline fourni un ensemble de fonctions utilisables par des applications permettant aux utilisateurs d'éditer les lignes de commandes en cours de frappe. Les modes d'éditions Emacs et vi sont disponibles. La librairie Readline inclus des fonctions supplémentaires de mémorisation de la liste de commandes entrées précédemment, afin de le rappeler et éventuellement les rééditer, ainsi que l'expansion d'historiques de commandes précédentes à la mode csh. - The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available. The Readline library includes additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands. - GNU Readline kütüphanesi uygulamalara sanki kullanıcılar kendileri yazıyormuş gibi komut satırı girişlerini düzenleme imkanı veren işlev setini sunar. Readline kütüphanesi daha önce girilmiş bir komut satırları listesini düzenleme, tekrar çağırma ve belki de bu satırları tekrar düzenleme ve csh tipi geçmiş bilgisi genişletmelerindeki önceki komutları yürütme imkanı sağlayan ek işlevler sağlar. - mirrors://gnu/readline/readline-6.3.tar.gz + Manages system configuration + Sistem yapılandırmasını yönetir + Les programmes Pisi Linux sont mis sous forme de paquets à l'aide de petits scripts. Ces derniers les configure afin qu'ils s'intègrent entre eux et avec le système. Çomar est l'outil qui gère et exécute ces scripts. + Pisi Linux programs are packaged with small scripts which configures them to entegrate with system and each other. Çomar is the tool which manages and executes these scripts. + Pisi Linux yazılımları, birbirleri ve sistemle otomatik olarak uyum sağlayabilmek için yanlarında ufak programcıklar ile paketlenmektedir. Bu programcıkların yönetimi ve işletilmesi Çomar aracı tarafından yapılmaktadır. + Pisi Linux Programme werden mit einem kleinen Skript paketiert, welches sie konfiguriert, um die Integrität mit dem System und anderen Programmen sicherzustellen. Comar ist das Werkzeug, das diese Skripte verwaltet und ausführt. + http://source.pisilinux.org/1.0/comar-3.0.3.tar.bz2 - ncurses-devel + dbus-devel + python-devel - readline63-001.patch - readline63-002.patch - readline63-003.patch + run_dir.patch + fix-flags.patch + update-system-manager-model.patch - system/base/readline/pspec.xml + system/base/comar/pspec.xml - readline + comar - ncurses + dbus + python + polkit - /usr/lib - /usr/share/doc - /usr/share/man - /usr/share/info - - - - readline-devel - Development files for readline - readline için geliştirme dosyaları - system.devel - - readline - - - /usr/include - /usr/share/man/man3 - - - - readline-32bit - 32-bit shared libraries for readline - readline için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - ncurses-32bit - - - readline - ncurses-32bit - - - /usr/lib32 + /usr/bin + /usr/sbin + /etc + /usr/share/dbus-1/system-services + /usr/share/polkit-1/actions + /usr/share/doc/ + /var/db + + System.Package + - 2014-05-11 - 6.3 - Release bump. + 2015-04-01 + 3.0.3 + Fix run dir path. Marcin Bojara marcin@pisilinux.org - 2014-04-05 - 6.3 - Version bump. + 2014-05-11 + 3.0.3 + Release bump. Marcin Bojara marcin@pisilinux.org 2013-08-31 - 6.2_004 - Clean readline. - Marcin Bojara - marcin@pisilinux.org + 3.0.3 + Release bump, clean comar. + Serdar Soytetir + kaptan@pisilinux.org - 2012-08-31 - 6.2 + 2011-05-18 + 3.0.3 First release - Erdem Artan + Pisi Linux Admins admins@pisilinux.org - lsb-release - http://www.linuxbase.org + rsyslog + http://www.rsyslog.com PisiLinux Community admins@pisilinux.org - GPLv2 - app:console + GPLv3+ + service system.base - LSB version query program - LSB sürüm sorgulama aracı - lsb-release prints certain LSB (Linux Standard Base) and distribution information. - lsb-release bazı dağıtıma özel tanımlayıcı bilgileri ekrana basan bir terminal aracıdır. - mirrors://sourceforge/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz - system/base/lsb-release/pspec.xml + Enhanced system logging and kernel message trapping daemons + Gelişmiş sistem günlükleme hizmeti + rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part, and fine grain output format control. It is quite compatible with stock sysklogd and can be used as a drop-in replacement. + rsyslog, çoklu iş parçacığı, MySQL, syslog/tcp, RFC 3195, izin verilen gönderici listesi, gelişmiş ileti filtreleme gibi özelliklere sahip gelişmiş bir sistem günlükleme hizmetidir. + http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.9.0.tar.gz + + zlib-devel + json-c-devel + libestr-devel + libgcrypt-devel + liblogging-devel + + system/base/rsyslog/pspec.xml - lsb-release + rsyslog + + zlib + json-c + libestr + libgcrypt + liblogging + - /usr/bin - /etc + /usr/bin/rsyslogd + /usr/lib/rsyslog /usr/share/man /usr/share/doc + /etc/logrotate.d + /etc/conf.d + /etc/rsyslog.d + /etc/rsyslog.conf + + System.Service + - lsb-release + rsyslog.logrotate + rsyslog.conf + 50-default.conf + rsyslog.sysconfig - - 2015-01-16 - 1.4 - Release Pisi Linux 1.2 - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-11-03 - 1.4 - Release Pisi Linux 1.1 - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - 2014-07-16 - 1.4 - Release Pisi Linux 1.0 - Serdar Soytetir - kaptan@pisilinux.org + 2015-05-05 + 8.9.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com 2014-05-11 - 1.4 + 7.6.3 Release bump. Marcin Bojara marcin@pisilinux.org - 2014-03-16 - 1.4 - Rc2 name Erdinc for Erdinç Gültekin. + 2014-03-30 + 7.6.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-13 + 7.2.5 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-07-26 + 7.2.5 + Release bump, fix dep. Serdar Soytetir kaptan@pisilinux.org + + 2013-01-14 + 7.2.5 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-11-21 + 7.2.3 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + v86d + http://dev.gentoo.org/~spock/projects/uvesafb/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + service + system.base + Userspace helper for uvesafb + uvesafb için kullanıcı uzayı yardımcısı + Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku + v86d is a userspace helper that runs x86 code in an emulated environment. It is used by the kernel framebuffer driver uvesafb. + v86d, öykünmüş bir ortamda x86 kodu çalıştıran yardımcı bir kullanıcı uzayı yardımcısıdır. Çekirdekteki uvesafb framebuffer sürücüsü tarafından kullanılır. + v86d to działający w przestrzeni użytkownika program pomocniczy uruchamiający kod x86. Jest wykorzystywany przez sterownik jądra Linuksa uvesafb. + http://source.pisilinux.org/1.0/v86d-0.1.10.tar.bz2 + system/base/v86d/pspec.xml + + + v86d + + /sbin + /usr/share/doc + + + + + 2014-05-11 + 0.1.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-29 + 0.1.10 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-12-19 + 0.1.10 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + libpipeline + http://libpipeline.nongnu.org + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + library + system.base + pipeline manipulation library + pipeline yönetim kitaplığı + libpipeline is a C library for manipulating pipelines of subprocesses in a flexible and convenient way. + libpipeline, alt-süreç girdi/çıktı hatlarını (pipeline) yönetmek için geliştirilmiş bir C kitaplığıdır. + http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.3.0.tar.gz + system/base/libpipeline/pspec.xml + + + libpipeline + + /usr/lib + /usr/share/doc + + + + libpipeline-devel + Development files for libpipeline + libpipeline için geliştirme dosyaları + system.devel + + libpipeline + + + /usr/include + /usr/lib/pkgconfig + /usr/share/man + + + + + 2014-05-11 + 1.3.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + - 2013-12-20 - 1.4 - Rc2 + 2014-03-29 + 1.3.0 + Version bump Serdar Soytetir kaptan@pisilinux.org - 2013-08-20 - 1.4 - RC1 - Erdinç Gültekin - erdincgultekin@pisilinux.org + 2013-10-24 + 1.2.4 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com - 2013-08-11 - 1.4 - sueno - Erdinç Gültekin - erdincgultekin@pisilinux.org + 2013-01-14 + 1.2.2 + New release + PisiLinux Community + admins@pisilinux.org - 2012-08-23 - 1.4 + 2011-12-16 + 1.2.0 First release - PisiLinux Community + Pisi Linux Admins admins@pisilinux.org - libusb - http://libusb.org/ + piksemel + http://pisilinux.org PisiLinux Community admins@pisilinux.org - LGPLv2.1 + GPLv2 library system.base - Userspace access to USB devices - Project's main aim is to create a library for use by user level applications to access USB devices regardless of OS. - http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.19/libusb-1.0.19.tar.bz2 + Python binding for iksemel + iksemel için python desteği + Un analyseur XML simple, rapide, petit et robuste pour Python basé sur iksemel. + A simple, fast, small and robust XML parser for Python, based on iksemel. + Python için basit, hızlı, ufak ve sağlam bir XML ayrıştırıcısı, iksemel tabanlıdır. + http://source.pisilinux.org/1.0/piksemel-1.3.1.tar.gz - libudev-devel + python-devel - system/base/libusb/pspec.xml + + symbol-visibility.patch + + system/base/piksemel/pspec.xml - libusb + piksemel - libudev + python + + + /usr/lib + /usr/share/doc + + + + + 2014-05-11 + 1.3.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 1.3.1 + rebuild + Pisi Linux Admins + admins@pisilinux.org + + + 2010-10-11 + 1.3.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + eudev + https://www.gentoo.org/proj/en/eudev/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + console + system.base + eudev is a fork of system-udev + eudev sistemd-udev uygulamasının çatalı + eudev is a fork of system-udev with the goal of obtaining better compatibility with existing software such as OpenRC and Upstart, older kernels, various toolchains and anything else required by users and various distributions. + eudev sistem-udev uygulamasının OpenRC, Upstart gibi başlangıç sistemleri ile uyumu için hazırlanmış çatalı + https://github.com/gentoo/eudev/archive/v3.0.tar.gz + + config.cache + + + glibc-devel + libkmod-devel + glib2-devel + libpcre-devel + gperf + + system/base/eudev/pspec.xml + + + eudev + + libkmod + glib2 + + + /bin + /sbin + /usr/bin + /usr/sbin + /lib/udev + /lib + /usr/lib + /etc + /usr/lib/tmpfiles.d/udev.conf + /run/udev + /lib/systemd + /etc/udev/rules.d + /lib/udev/rules.d + /usr/share/doc + /usr/share/man + + + udev + libudev + libgudev1 + + + udev + libudev + libgudev1 + + + System.Package + + + tmpfiles.conf + + + + eudev-devel + Development files for eudev + system.devel + + eudev + glib2-devel + + + /usr/include/ + /usr/lib/pkgconfig + /usr/share/pkgconfig + + + udev-devel + libudev-devel + libgudev1-devel + + + + eudev-32bit + 32-bit shared libraries for eudev + emul32 + emul32 + + glibc-32bit + libkmod-32bit + glib2-32bit + + + glibc-32bit + glib2-32bit + + + /lib32 + /usr/lib32 + + + libudev-32bit + libgudev1-32bit + + + libudev-32bit + libgudev1-32bit + + + + + 2015-05-11 + 3.0 + build emul32 and static too. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-03-29 + 3.0 + First release. + Ertuğrul Erata + ertugrulerata@gmail.com + + + + + + sqlite + http://www.sqlite.org/ + + PisiLinux Community + admins@pisilinux.org + + as-is + library + system.base + An SQL Database Engine in a C Library + Bir C kütüphanesi içindeki bir SQL veritabanı motoru + SQLite est une petite librairie C implémentant un moteur de base de données SQL auto-configurée, auto-suffisante, pouvant être embarquée. Gère des bases de données de tailles allant jusqu'à 2 téraOctets. + SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. Supports databases up to 2 terabytes in size. + SQLite hiçbir ayar gerektirmeyen, başka programların içine gömülebilir bir SQL veritabanı motorudur. 2 terabayta kadar büyüklükteki veritabanlarını tutabilir. + http://www.sqlite.org/2015/sqlite-autoconf-3080803.tar.gz + http://www.sqlite.org/2015/sqlite-doc-3080803.zip + + readline-devel + + system/base/sqlite/pspec.xml + + + sqlite + + readline /usr/bin /usr/lib /usr/share/doc + /usr/share/man - - libusbx - - - libusbx - - libusb-devel - Development files for libusb + sqlite-devel + Development files for sqlite + sqlite için geliştirme dosyaları system.devel - libusb + sqlite /usr/include /usr/lib/pkgconfig /usr/lib32/pkgconfig - - libusbx-devel - - - libusbx-devel - - libusb-32bit - 32-bit shared libraries for libusb + sqlite-32bit + 32-bit shared libraries for sqlite emul32 emul32 - libudev-32bit + glibc-32bit - libusb - libudev-32bit + sqlite + glibc-32bit /usr/lib32 - - libusbx-32bit - - - libusbx-32bit - + + + sqlite-tcl + + tcl-devel + + + sqlite + + + /usr/lib/sqlite3.8.8.3 + + + + sqlite-tcl-32bit + + glibc-32bit + + + sqlite + glibc-32bit + + + /usr/lib32/sqlite3.8.8.3/ + + + 2015-02-28 + 3.8.8.3 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2015-01-31 + 3.8.8.2 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2015-01-24 + 3.8.8.1 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-12-05 + 3.8.7.2 + Version bump. + Osman Erkan + osman.erkan@pisilinux.org + + + 2014-07-09 + 3.8.5 + Version bump. + Vedat Demir + vedat@pisilinux.org + - 2014-09-08 - 1.0.19 - rename libusbx to libusb like upsteam - version bump to 19 - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-16 - 1.0.18 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-29 - 1.0.17 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-27 - 1.0.16 - Move pc files to devel pack, rebuild - PisiLinux Community - admins@pisilinux.org - - - 2013-07-27 - 1.0.16 - Move .pc files to devel package - Fatih Turgel - hitaf@pisilinux.org - - - 2013-07-23 - 1.0.16 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-10-12 - 1.0.14 - First release - Erdem Artan - admins@pisilinux.org - - - - - - libxcb - http://xcb.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - The X protocol C-language Binding (XCB) - X protokolü için C dili bağlayıcısı (XCB) - The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility. - http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 - - libXau-devel - libXdmcp-devel - libxslt - xcb-proto - - system/base/libxcb/pspec.xml - - - libxcb - - libXau - libXdmcp - glibc - - - /usr/lib - /usr/share/man - /usr/share/doc - - - - libxcb-devel - Development files for libxcb - libxcb için geliştirme dosyaları - system.devel - - libxcb - - - /usr/include/xcb - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - pthread-stubs.pc - - - - libxcb-32bit - 32-bit shared libraries for libxcb - libxcb için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libXau-32bit - libXdmcp-32bit - - - libxcb - libXau-32bit - libXdmcp-32bit - - - /usr/lib32 - - - - - 2014-09-02 - 1.11 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - 2014-05-11 - 1.10 - Release bump. + 3.8.4.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-03-29 + 3.8.4.2 + Version bump. Marcin Bojara marcin@pisilinux.org - - 2014-03-07 - 1.10 + + 2013-10-28 + 3.8.1 Version bump. Yusuf Aydemir yusuf.aydemir@pisilinux.org - - 2013-10-08 - 1.9.1 - Rebuild. + + 2013-06-28 + 3.7.17 + Move pc files to devel pack, increase release no. Serdar Soytetir kaptan@pisilinux.org - - 2013-07-28 - 1.9.1 - Version bump. + + 2013-06-28 + 3.7.17 + Version bump Marcin Bojara marcin@pisilinux.org + + 2013-01-21 + 3.7.15.2 + bump + Erdinç Gültekin + admins@pisilinux.org + - 2012-11-18 - 1.9 + 2012-12-15 + 3.7.14 First release Erdinç Gültekin admins@pisilinux.org @@ -6590,61 +12553,490 @@ - nss-mdns - http://0pointer.de/lennart/projects/nss-mdns/ + pam + http://www.kernel.org/pub/linux/libs/pam/ PisiLinux Community admins@pisilinux.org - GPLv2 + PAM library system.base - Name Service Switch module - İsim servisi değiştirme modülü - Module d'échange de service de nom pour le DNS Multicast. - Name Service Switch module for Multicast DNS. - Çoklu gönderim yapan DNS'ler için isim servisi seçme modülü. - http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz + Modules d'Authentification en Greffon (Pluggable Authentication Modules) + Pluggable Authentication Modules + PAM - Eklenebilir Yetkilendirme Modülleri + PAM (Pluggable Authentication Modules) is a system security tool that allows system administrators to set authentication policy without having to recompile programs that handle authentication. + http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2 + + dlopen.sh + dlopen-test.sh + + + perl + gettext + cracklib + - nss-mdns-0.8-avahi-socket.patch + no-lib64.patch + nosex-libtirpc-underlinking.patch + pam-1.1.8-cve-2013-7041.patch + pam-1.1.8-cve-2014-2583.patch - system/base/nss-mdns/pspec.xml + system/base/pam/pspec.xml - nss-mdns + pam + + cracklib + /etc + /lib + /var/run/console /usr/lib + /sbin + /usr/sbin /usr/share/doc + /usr/share/man + /usr/share/locale + + System.Package + - mdns.allow + 90-nproc.conf + + pam-devel + Development files for pam + pam için geliştirme dosyaları + system.devel + + pam + + + /usr/include + /usr/share/man/man3 + + - + + 2015-04-01 + 1.1.8 + Rebuild, remove unused. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-06-10 + 1.1.8 + Add patch CVE. + Alihan Öztürk + alihan@pisilinux.org + + 2014-05-11 - 0.10 + 1.1.8 Release bump. Marcin Bojara marcin@pisilinux.org + + 2013-10-22 + 1.1.8 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-05-16 + 1.1.6 + Sandbox fixed. + PisiLinux Community + admins@pisilinux.org + - 2013-10-29 - 0.10 - Rebuild - Pisi Linux Admins + 2013-02-21 + 1.1.6 + Build with new automake, enable tests. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-13 + 1.1.6 + First release + Erdem Artan + admins@pisilinux.org + + + + + + curl + http://curl.haxx.se/ + + PisiLinux Community + admins@pisilinux.org + + MIT + X11 + app:console + library + system.base + Un client qui maîtrise tout ce qui concerne les URLs + A utility for getting files from remote servers + Uzak sunuculardan dosya indirmek için bir araç + Ein Client, der URLs versteht + curl is a command line tool for transferring data with URL syntax, supporting various protocols. + curl çeşitli protokolleri destekleyen, URL söz dizimini kullanarak uzak sunuculardan veri aktarmak için kullanılan bir komut satırı aracıdır. + http://curl.haxx.se/download/curl-7.42.1.tar.bz2 + + glibc-devel + zlib-devel + openssl-devel + libidn-devel + libssh2-devel + ca-certificates + + system/base/curl/pspec.xml + + + curl + + zlib + libidn + libssh2 + openssl + ca-certificates + + + /usr/bin + /usr/lib + /usr/share/doc/ + /usr/share/man/ + /usr/share/curl + + + curl-devel + + + + curl-devel + Development files for curl + curl için geliştirme dosyaları + system.devel + + curl + + + /usr/lib/pkgconfig + /usr/bin/curl-config + /usr/include/curl + /usr/share/aclocal + + + + + 2015-05-01 + 7.42.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-04-27 + 7.42.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-01-11 + 7.40.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-01-10 + 7.39.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-07-18 + 7.37.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-29 + 7.37.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 7.36 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 7.36 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-12-19 + 7.34.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-10-25 + 7.33.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-06-28 + 7.31.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-11 + 7.28.1 + Güncellendi. + PisiLinux Community admins@pisilinux.org - 2010-10-11 - 0.10 + 2012-08-23 + 7.27.0 First release - Pisi Linux Admins + PisiLinux Community admins@pisilinux.org + + + xz + http://tukaani.org/xz/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2+ + GPLv2+ + GPLv3 + app:console + library + system.base + XZ compression utilities + XZ sıkıştırma araçları + XZ Utils provide a general purpose data compression library and command line tools. The .xz format supports multiple compression algorithms, which are called "filters" in context of XZ Utils. The primary filter is currently LZMA2. + xz, genel amaçlı bir veri sıkıştırma kütüphanesi ve konut satırı araçları içerir. xz dosya biçimi filtre adı verilen sıkıştırma algoritmalarını destekler, öntanımlı filtre ise LZMA2 algoritmasıdır. + http://tukaani.org/xz/xz-5.2.1.tar.xz + system/base/xz/pspec.xml + + + xz + + /usr/bin + /usr/lib + /usr/share/man + /usr/share/doc + /usr/share/locale + + + + xz-devel + Development files for XZ + XZ için geliştirme dosyaları + system.devel + + xz + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + xz-32bit + 32bit shared libraries for xz + XZ için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + glibc-32bit + + + glibc-32bit + xz + + + /usr/lib32 + + + + + 2015-03-08 + 5.2.1 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-10-01 + 5.0.7 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 5.0.5 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-28 + 5.0.5 + Version bump, clean xz. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-26 + 5.0.4 + Move pc files to devel pack, increase release no. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-08-24 + 5.0.4 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + man-db + http://www.nongnu.org/man-db/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + GPLv3+ + app:console + data:doc + system.base + Application to read Linux man pages + Kapsamlı Linux kılavuzları + Man package consists of programs which is used to read most of the documentation available in linux system. For example, you can write "man nameoftheprogram" into the konsole or "man:nameoftheprogram" into the konqueror to get a detailed usage information for many programs. + man-db paketi Linux ile ilgili yazılmış dökümanların büyük çoğunluğunu okunması için gerekli programları sunar. Örneğin, konsola "man programadı" ya da konquerora "man:programadı" yazarak birçok program hakkında detaylı kullanım bilgisi alabilirsiniz. + http://download.savannah.gnu.org/releases/man-db/man-db-2.6.3.tar.xz + + less + gzip + groff + gdbm-devel + zlib-devel + gettext-devel + libpipeline-devel + + + man-db-2.5.9-sgr.patch + man-db-2.6.1-locale-fallback.patch + man-db-2.6.1-so-links.patch + man-db-2.6.1-wildcards.patch + man-db-2.6.2-invalid-cache.patch + man-db-2.6.3-overrides.patch + + system/base/man-db/pspec.xml + + + man-db + + gdbm + zlib + gettext + libpipeline + + + /etc + /usr/lib + /usr/bin + /usr/sbin + /usr/libexec + /usr/share/locale + /usr/share/doc + /usr/share/man + /var/cache + + + mandb.conf + mandb.cron.daily + + + + + 2014-05-11 + 2.6.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-03 + 2.6.3 + Rebuild for openjdk. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-28 + 2.6.3 + rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-03-04 + 2.6.3 + Add some patches, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-27 + 2.6.3 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + glibc @@ -6662,7 +13054,7 @@ Glibc, La librairie GNU X est utilisée comme la librairie C dans le système GNU et la plupart des système utilisant le noyau Linux. Elle définit les appels système et autres fonctionnalités du langage de programmation C. The GNU C library is used as the C library in the GNU system and most systems with the Linux kernel. It defines the system calls and other basic C programming language facilities. Glibc, GNU C kitaplığı, GNU sisteminde ve Linux dağıtımlarının büyük çoğunluğunda C programlama dili kütüphanesi olarak kullanılır. İçinde sistem çağrıları ve C programlama dili için temel fonksiyonları bulundurur. - http://ftp.gnu.org/gnu/libc/glibc-2.20.tar.xz + http://ftp.gnu.org/gnu/libc/glibc-2.21.tar.xz kernel-headers gettext @@ -6670,7 +13062,7 @@ locale-no-archive.patch - glibc-2.20-roundup.patch + glibc-2.21-roundup.patch system/base/glibc/pspec.xml @@ -6727,7 +13119,7 @@ system.base emul32 - glibc + glibc /etc/ld.so.conf.d/60-glibc-32bit.conf @@ -8239,6 +14631,13 @@ + + 2015-04-04 + 2.21 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + 2014-11-28 2.20 @@ -8314,4496 +14713,76 @@ - comar-api - http://www.pisilinux.org + nano + http://www.nano-editor.org/ PisiLinux Community admins@pisilinux.org - GPLv2 - library - system.base - Utility functions for Comar scripts - Çomar betikleri için yardımcı fonksiyonlar - Librairie utilitaire générique pour les opérations communes de scripts Comar. - Generic utility library for common Comar script operations. - Çomar betiklerinde sıkça yapılan ortak işlemler için yardımcı fonksiyonlar kitaplığı. - http://source.pisilinux.org/1.0/comar-api-2.4.9.tar.gz - - python - - - run_dir.patch - pisilinux.patch - add-stopdependencies.patch - - system/base/comar-api/pspec.xml - - - comar-api - - python - pisilinux-python - - - /usr/lib/pisilinux - /usr/lib/python2.7 - - - - - 2014-08-20 - 2.4.9 - Fix paths. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 2.4.9 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 2.4.9 - Release bump, clean comar-api. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-11-29 - 2.4.9 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - bash - http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html - - Pisi Linux Admins - admins@pisilinux.org - - GPLv2 + GPLv3 app:console system.base - The standard GNU Bourne again shell - GNU Bource again kabuğu - Bash est le Bourne Again SHell du projet GNU, une implémentation complête du POSIX IEEE et des spécifications d'interprétation de commande (shell) de l'Open Group, avec édition interactive de ligne de commande et des fonctionnalités à la csh tels que la substitution dans l'historique de commande. - Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, csh-like features such as history substitution. - Bash, IEEE POSIX ve Open Group'un interaktif komut satırı düzenleme, geçmiş komutları tamamlama gibi csh tipi özellikler gibi kabuk uygulamaları tariflerinin tam olarak uygulayan GNU Projesinin Bourne Again SHell kabuk programıdır. - mirrors://gnu/bash/bash-4.3.tar.gz + GNU GPL'd Pico clone with more functionality + Konsol ortamında kullanabileceğiniz bir metin düzenleyicidir. + Nano est un petit éditeur libre et convivial qui a pour but de remplacer Pico, l'éditeur par défaut inclus dans le paquet non-libre Pine. Plutôt que juste copier l'apparence et le ressenti de Pico, nan implémente également certaines fonctionnalité manquantes (ou désactivées par défaut), tel que "rechercher et remplacer" ou "allez à la ligne numéro". + Nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine package. Rather than just copying Pico's look and feel, nano also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number". + Nano özgür olmayan Pine paketinin içindeki metin düzenleme programı olan Pico'nun yerine geçme hedefini güden küçük, özgür ve kullanışlı bir metin düzenleme programıdır. Pico'nun görünüşünü ve işlevini kopyalamaktan çok, Nano aynı zamanda "ara ve değiştir" ve "satır numarasına git" gibi Pico'da olmayan (veya ön tanımlı olarak kapalı) bazı özellikleri sunar. + http://www.nano-editor.org/dist/v2.3/nano-2.3.5.tar.gz ncurses-devel - - - official/bash43-001.tar.gz - official/bash43-002.tar.gz - official/bash43-003.tar.gz - official/bash43-004.tar.gz - official/bash43-005.tar.gz - official/bash43-006.tar.gz - official/bash43-007.tar.gz - official/bash43-008.tar.gz - official/bash43-009.tar.gz - official/bash43-010.tar.gz - official/bash43-011.tar.gz - official/bash43-012.tar.gz - official/bash43-013.tar.gz - official/bash43-014.tar.gz - official/bash43-015.tar.gz - official/bash43-016.tar.gz - official/bash43-017.tar.gz - official/bash43-018.tar.gz - official/bash43-019.tar.gz - official/bash43-020.tar.gz - official/bash43-021.tar.gz - official/bash43-022.tar.gz - official/bash43-023.tar.gz - official/bash43-024.tar.gz - official/bash43-025.tar.gz - official/bash43-026.tar.gz - official/bash43-027.tar.gz - official/bash43-028.tar.gz - official/bash43-029.tar.gz - official/bash43-030.tar.gz - fedora/bash-2.02-security.patch - fedora/bash-2.03-paths.patch - fedora/bash-2.03-profile.patch - fedora/bash-2.05a-interpreter.patch - fedora/bash-2.05b-debuginfo.patch - fedora/bash-2.05b-manso.patch - fedora/bash-2.05b-pgrp_sync.patch - fedora/bash-2.05b-readline-oom.patch - fedora/bash-2.05b-xcc.patch - fedora/bash-3.2-audit.patch - fedora/bash-3.2-ssh_source_bash.patch - fedora/bash-4.0-nobits.patch - fedora/bash-4.1-broken_pipe.patch - fedora/bash-4.1-defer-sigchld-trap.patch - fedora/bash-4.1-examples.patch - fedora/bash-4.2-coverity.patch - fedora/bash-4.2-manpage_trap.patch - fedora/bash-4.2-rc2-logout.patch - fedora/bash-4.2-size_type.patch - fedora/bash-bashbug.patch - fedora/bash-infotags.patch - fedora/bash-requires.patch - fedora/bash-setlocale.patch - fedora/bash-tty-tests.patch - - system/base/bash/pspec.xml - - - bash - - ncurses - - - /etc - /bin - /usr/bin - /usr/share/doc - /usr/share/info - /usr/share/man - /usr/share/locale - - - bashrc - command-not-found.sh - - - - - 2014-10-13 - 4.3_p30 - Update - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-09-27 - 4.3_p26 - Update - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 4.3_p8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 4.3_p8 - Version bump - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-28 - 4.2_p45 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-11-24 - 4.2_p45 - Update - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-24 - 4.2_p39 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - gettext - http://www.gnu.org/software/gettext/gettext.html - - PisiLinux Community - admins@pisilinux.org - - GPLv3+ - app:console - library - system.base - GNU libraries and utilities for producing multi-lingual messages - Farklı dillerde ileti katalogları üretmek için gerekli GNU araçları ve kütüphaneleri - gettext est une librairie d'internationalisation GNU. - The GNU gettext package provides a set of tools and documentation for producing multi-lingual messages in programs. Tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs, a runtime library which supports the retrieval of translated messages, and stand-alone programs for handling the translatable and the already translated strings. Gettext provides an easy to use library and tools for creating, using, and modifying natural language catalogs and is a powerful and simple method for internationalizing programs. - gettext, uygulamalarda farklı dillerde iletiler kullanılmasını sağlayan yerelleştirme araçları ve kütüphanelerini içerir. - gettext ist eine GNU Bibliothek für Internationalisierung - http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.2.tar.gz - - acl-devel - glib2-devel - ncurses - - system/base/gettext/pspec.xml - - - gettext-docs - system.doc - - gettext - - - /usr/share/doc/gettext/html - - - - gettext - - acl - glib2 - ncurses - libgcc - libunistring - libgomp - libxml2 - - - /usr/bin - /usr/lib - /usr/share/gettext - /usr/share/locale - /usr/share/info - /usr/share/man - /usr/share/doc - - - - gettext-devel - Development files for gettext - gettext için geliştirme dosyaları - system.devel - - gettext - - - /usr/share/aclocal - /usr/include - /usr/share/man/man3 - - - - - 2014-05-11 - 0.18.3.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 0.18.3.2 - Minor version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-08-27 - 0.18.3.1 - Version bump, clean gettext. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-11 - 0.18.2 - Fix dep, release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-11 - 0.18.2 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2010-10-11 - 0.18.1.1 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - libX11 - http://www.x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - Librairie X11 de X.Org. - X.Org X11 library - X.Org X11 kitaplığı - X.Org X11 Bibliothek - Core X11 protocol client library. - mirrors://xorg/individual/lib/libX11-1.6.2.tar.bz2 - - libxcb-devel - xorg-proto - xtrans - - - fix-segfault.diff - fix-null-pointer.patch - - system/base/libX11/pspec.xml - - - libX11 - - libxcb - - - /usr/lib/libX11* - /usr/lib/X11 - /usr/share/X11 - /usr/share/doc/libX11 - - - - libX11-devel - Development files for X11 library - libX11 için geliştirme dosyaları - system.devel - - libX11 - libxcb-devel - xorg-proto - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man - - - - libX11-32bit - 32-bit shared libraries for libX11 - libX11 için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libxcb-32bit - - - libX11 - libxcb-32bit - - - /usr/lib32 - - - - - 2014-05-11 - 1.6.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-07 - 1.6.2 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-12 - 1.6.2 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-30 - 1.6.1 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-21 - 1.6.0 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-24 - 1.5.0 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - alternatives - http://git.fedorahosted.org/git/?p=chkconfig.git;a=summary - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Alternative management system - Alternatif yönetim sistemi - alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. Alternatives system determines the defaults when several programs fulfilling the same or similar functions to be installed on a single system at the same time. - alternatives, alternatives sisteminin parçası olan sembolik bağlantıları oluşturan, silen, yöneten ve bunlar hakkında bilgi gösteren araçtır. Alternatives sistemi, birbirine benzer ya da aynı işlevleri sunan programların aynı anda aynı sisteme kurulduğu zamanlarda öntanımlıları belirler. - https://git.fedorahosted.org/cgit/chkconfig.git/snapshot/chkconfig-1.3.62.tar.xz - system/base/alternatives/pspec.xml - - - alternatives - - /etc - /usr/sbin - /usr/share/locale - /usr/share/man - /usr/share/doc - /var - - - - - 2014-05-11 - 1.3.62 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 1.3.58 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 1.3.58 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-05-03 - 1.3.58 - First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - - - - pypolkit - http://www.pisilinux.org - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - Python binding of PolicyKit - PolicyKit için Python bağlayıcısı - pypolkit is a Python binding for the PolicyKit library. - pypolkit PolicyKit için geliştirilmiş bir Python bağlayıcısıdır. - http://source.pisilinux.org/1.0/pypolkit-1.0.2.tar.gz - - glib2 - python - polkit-devel - - system/base/pypolkit/pspec.xml - - - pypolkit - - glib2 - polkit - python - - - /usr/lib - /usr/share/doc - - - - - 2014-05-11 - 1.0.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-01 - 1.0.2 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-30 - 1.0.2 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-11-26 - 1.0.2 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - gzip - http://www.gnu.org/software/gzip - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - LGPLv2.1 - app:console - system.base - Standard GNU compressor - GNU dosya arşiv aracı - gzip (GNU zip) est un programme populaire de compression de donnée écrit pour le projet GNU. - gzip (GNU zip) is a popular data compression program written for the GNU project. - Gzip (GNU zip) GNU projesi için geliştirilmiş popüler bir veri sıkıştırma programıdır. - http://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.xz - system/base/gzip/pspec.xml - - - gzip - - /bin - /usr/share/doc - /usr/share/man - /usr/share/info - - - - - 2014-05-11 - 1.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 1.6 - Version bumm, clean gzip. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-23 - 1.5 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - curl - http://curl.haxx.se/ - - PisiLinux Community - admins@pisilinux.org - - MIT - X11 - app:console - library - system.base - Un client qui maîtrise tout ce qui concerne les URLs - A utility for getting files from remote servers - Uzak sunuculardan dosya indirmek için bir araç - Ein Client, der URLs versteht - curl is a command line tool for transferring data with URL syntax, supporting various protocols. - curl çeşitli protokolleri destekleyen, URL söz dizimini kullanarak uzak sunuculardan veri aktarmak için kullanılan bir komut satırı aracıdır. - http://curl.haxx.se/download/curl-7.40.0.tar.bz2 - - zlib-devel - openssl-devel - libidn-devel - libssh2-devel - ca-certificates - - system/base/curl/pspec.xml - - - curl - - zlib - libidn - libssh2 - openssl - ca-certificates - - - /usr/bin - /usr/lib - /usr/share/doc/ - /usr/share/man/ - /usr/share/curl - - - curl-devel - - - - curl-devel - Development files for curl - curl için geliştirme dosyaları - system.devel - - curl - - - /usr/lib/pkgconfig - /usr/bin/curl-config - /usr/include/curl - /usr/share/aclocal - - - - - 2015-01-11 - 7.40.0 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2015-01-10 - 7.39.0 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2014-07-18 - 7.37.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-29 - 7.37.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 7.36 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 7.36 - Version bump - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-12-19 - 7.34.0 - Version bump. - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2013-10-25 - 7.33.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-06-28 - 7.31.0 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-11 - 7.28.1 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 7.27.0 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - libXdmcp - http://x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - Librairie Xdmcp de X.Org. - X.Org Xdmcp library - X.Org Xdmcp kitaplığı. - X.Org Xdmcp Bibliothek - LibXdmcp is the X Display Manager Control Protocol library. - LibXdmcp, X Ekran Yöneticisi Denetim Protokolü kitaplığıdır. - http://xorg.freedesktop.org/archive/individual/lib/libXdmcp-1.1.1.tar.bz2 - system/base/libXdmcp/pspec.xml - - - libXdmcp - - /usr/lib - /usr/share/doc - - - - libXdmcp-devel - Development files for libXdmcp - libXdmcp için geliştirme dosyaları - system.devel - - libXdmcp - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/doc/*/*.xml - - - - libXdmcp-32bit - 32-bit shared libraries for libXdmcp - libXdmcp için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libXdmcp - - - /usr/lib32 - - - - - 2014-05-11 - 1.1.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-08 - 1.1.1 - Rebuild, clean actions.py. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-23 - 1.1.1 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - v86d - http://dev.gentoo.org/~spock/projects/uvesafb/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - service - system.base - Userspace helper for uvesafb - uvesafb için kullanıcı uzayı yardımcısı - Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku - v86d is a userspace helper that runs x86 code in an emulated environment. It is used by the kernel framebuffer driver uvesafb. - v86d, öykünmüş bir ortamda x86 kodu çalıştıran yardımcı bir kullanıcı uzayı yardımcısıdır. Çekirdekteki uvesafb framebuffer sürücüsü tarafından kullanılır. - v86d to działający w przestrzeni użytkownika program pomocniczy uruchamiający kod x86. Jest wykorzystywany przez sterownik jądra Linuksa uvesafb. - http://source.pisilinux.org/1.0/v86d-0.1.10.tar.bz2 - system/base/v86d/pspec.xml - - - v86d - - /sbin - /usr/share/doc - - - - - 2014-05-11 - 0.1.10 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 0.1.10 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-12-19 - 0.1.10 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - pciutils - http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Various utilities dealing with the PCI bus - PCI veriyolu işlevleri ile ilgili çeşitli programlar - Les utilitaires PCI sont une collection de programmes d'inspection et de manipulation de la configuration des périphériques PCI. - The PCI Utilities are a collection of programs for inspecting and manipulating configuration of PCI devices. - Pakette bulunan PCI araçları, PCI veriyolunu kullanan donanımlarınızın görüntülenmesi ve ayarlanması işlevini yürütür. - ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.2.1.tar.xz - - pci.ids - - - pciutils-nogz.patch - pciutils-remove-update-pciids.patch - makefile.patch - - system/base/pciutils/pspec.xml - - - pciutils - - /usr/sbin - /usr/lib - /usr/share/man - /usr/share/misc - - - - pciutils-devel - Development files for pciutils - pciutils için geliştirme dosyaları - system.devel - - pciutils - - - /usr/lib/pkgconfig - /usr/include - - - - - 2014-05-11 - 3.2.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 3.2.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-10-30 - 3.1.10 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-10-05 - 3.1.10 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - libestr - http://libestr.adiscon.com - - Marcin Bojara - marcin@pisilinux.org - - LGPLv2.1 - library - system.base - Library for some string essentials - libestr - some essentials for string handling (and a bit more) - http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz - system/base/libestr/pspec.xml - - - libestr - - /usr/lib/libestr.so* - /usr/share/doc/libestr - - - - libestr-devel - Development files for libestr - system.devel - - libestr - - - /usr/include/libestr.h - /usr/lib/pkgconfig/libestr.pc - - - - - 2014-05-11 - 0.1.9 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 0.1.9 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-11-21 - 0.1.4 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - coreutils - http://www.gnu.org/software/coreutils/ - - Pisi Linux Admins - admins@pisilinux.org - - GPLv3+ - app:console - system.base - A set of basic GNU tools commonly used in shell scripts - Standart dosya, metin ve kabuk uygulamaları - Utilitaires standards GNU pour fichiers (chmod, cp, dd, dir, ls...), utilitaires texte (sort, tr, head, wc...) et utilitaires d'interpréteur de commande (shell) (whoami, who...) - GNU dosya uygulamaları (chmod, cp, dd, dir, ls...), sh uygulamaları (whoami, who,...) ve metin uygulamalarının (sort, tr, head, wc..) birlikteliğinden oluşmaktadır. - http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz - - acl-devel - attr-devel - perl - shadow gettext-devel - ncurses-devel + slang - - remove_am_silent_rules.patch - - system/base/coreutils/pspec.xml + system/base/nano/pspec.xml - coreutils + nano - acl - attr - gmp - libcap + ncurses + file - /bin /etc - /usr/bin - /usr/libexec - /usr/lib - /usr/share/doc + /usr/share/locale + /usr/share/doc/nano /usr/share/man /usr/share/info - /usr/share/locale - - - - - 2014-12-12 - 8.23 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 8.22 - Rebuild, add patch. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-04-02 - 8.22 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 8.21 - Clean coreutils. - Serdar Soytetir - kaptanan@pisilinux.org - - - 2013-07-26 - 8.21 - Fix deps, release bump. - Serdar Soytetir - kaptanan@pisilinux.org - - - 2013-02-11 - 8.21 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2012-08-31 - 8.19 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - mkinitramfs - http://www.busybox.net - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A tool to create the initramfs image - initramfs image dosyası yaratmak için araç - Un outil pour créer les images initramfs - mkinitramfs contains a tool to create the initramfs image with busybox. - initramfs image dosyası yaratmak için araç - http://source.pisilinux.org/1.0/README.mkinitramfs - system/base/mkinitramfs/pspec.xml - - - mkinitramfs - - disktype - busybox - - - /etc - /sbin - /lib/initramfs - /usr/share/doc/mkinitramfs - - - System.PackageHandler - - - mkinitramfs - init - udhcpc.script - hotplug - profile.rc - initramfs.conf - - - - - 2014-05-11 - 1.0.7 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-10 - 1.0.7 - Fix probing LVM devices - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-10 - 1.0.7 - Disable mount tmpfs on /run - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-05 - 1.0.7 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-03 - 1.0.7 - Fix default plymouth theme name. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-17 - 1.0.7 - Fix resume path. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-13 - 1.0.7 - Change loopbackimage address and name. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-13 - 1.0.7 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - dnsmasq - http://www.thekelleys.org.uk/dnsmasq/doc.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - GPLv3 - service - system.base - Lightweight, easy to configure DNS forwarder and DHCP server - Hafif, kolay yapılandırılabilir DNS yönlendirici ve DHCP sunucu - dnsmasq is a DNS forwarder and DHCP server that can serve the names of local machines which are not in the global DNS. The DHCP server integrates with the DNS server and allows machines with DHCP-allocated addresses to appear in the DNS with names configured in each host. - dnsmasq, global DNS'te bulunmayan yerel makine isimlerini sunabilen bir DNS yönlendirici ve DHCP sunucudur. - http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.70.tar.xz - - dnsmasq.py - - - dbus - - system/base/dnsmasq/pspec.xml - - - dnsmasq - - dbus - - - /etc - /usr/sbin - /usr/lib - /usr/share - /usr/share/man - /usr/share/doc - /var/lib/dnsmasq - - - Network.Stack - System.Service - - - dnsmasq.conf - uk.org.thekelleys.dnsmasq.service - - - - - 2014-05-11 - 2.70 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-24 - 2.70 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2014-04-03 - 2.68 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-10-26 - 2.67 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-14 - 2.65 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 2.63 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - libpipeline - http://libpipeline.nongnu.org - - PisiLinux Community - admins@pisilinux.org - - GPLv3+ - library - system.base - pipeline manipulation library - pipeline yönetim kitaplığı - libpipeline is a C library for manipulating pipelines of subprocesses in a flexible and convenient way. - libpipeline, alt-süreç girdi/çıktı hatlarını (pipeline) yönetmek için geliştirilmiş bir C kitaplığıdır. - http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.3.0.tar.gz - system/base/libpipeline/pspec.xml - - - libpipeline - - /usr/lib - /usr/share/doc - - - - libpipeline-devel - Development files for libpipeline - libpipeline için geliştirme dosyaları - system.devel - - libpipeline - - - /usr/include - /usr/lib/pkgconfig - /usr/share/man - - - - - 2014-05-11 - 1.3.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 1.3.0 - Version bump - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-24 - 1.2.4 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2013-01-14 - 1.2.2 - New release - PisiLinux Community - admins@pisilinux.org - - - 2011-12-16 - 1.2.0 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - pisilinux-python - http://www.pisilinux.org - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - system.base - Python modules for Pisi Linux - PiSi Linux için Python modülleri - Python modules for Pisi Linux provides functions for common task, with the aim of easing development. - PiSi Linux için Python modülleri genel işler için fonksiyonlar sunarak geliştirme işini kolaylaştırmayı amaçlamaktadır. - Módulos Python para PiSi Linux facilitan funciones para tareas comunes, para simplificar el desarrollo. - http://source.pisilinux.org/1.0/pisilinux-python-0.4.8.tar.gz - - python - libX11-devel - - system/base/pisilinux-python/pspec.xml - - - pisilinux-python - - python - libX11 - - - /usr/lib - /usr/share/doc - /usr/share/locale - - - - - 2014-05-11 - 0.4.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-07 - 0.4.8 - Release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-04 - 0.4.8 - Release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-12-09 - 0.4.8 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - procps - http://procps.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Standard informational utilities and process-handling tools - Geleneksel bilgilendirme yardımcı programları ve süreç işleme araçları - procps est un paquet regroupant une multitude de petits utilitaires utiles donnant des informations concernant les process en utilisant le système de fichier /proc. Le paquet inclus les programmes ps, top, vmstat, w, kill, free, slabtop et skill. - procps is the package that has a bunch of small useful utilities that give information about processes using the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill. - Procps /proc dosya sistemini kullanarak çalışan süreçler hakkında bilgi vermeye yarayan bazı kullanışlı uygulamaları içeren bir pakettir. Paket ps, top, vmstat, w, kill, free, slabtop ve skill gibi uygulamaları içerir. - http://procps.sf.net/procps-3.2.8.tar.gz - - ncurses - - - procps-3.2.5-proc-mount.patch - nohz.patch - procps-3.2.5-eof.diff - procps-3.2.2-top-termsize.patch - procps-3.2.2-w-simply-work.diff - procps-3.2.7-top.1.diff - pwdx-bufferoverflow.diff - procps-3.2.7-libselinux.patch - procps-3.2.7-ps-libselinux.patch - procps-3.2.7-misc.patch - procps-3.2.7-FAQ.patch - procps-3.2.7-noproc.patch - procps-3.2.7-pseudo.patch - procps-3.2.7-0x9b.patch - procps-3.2.7-sysctl-writeonly.patch - procps-3.2.7-top-rc.patch - procps-3.2.7-top-remcpu.patch - procps-3.2.7-top-env-vmsize.patch - procps-3.2.7-top-env-cpuloop.patch - procps-3.2.7-vmstat-cpusteal.patch - procps-3.2.7-longcmd.patch - procps-3.2.7-vmstat-pgpg.patch - procps-3.2.7-sysctl-ignore.patch - procps-3.2.7-top-sorthigh.path - procps-3.2.7-w-best.patch - procps-3.2.7-watch-unicode.patch - procps-3.2.7-ps-stime.patch - procps-3.2.7-ps-eip64.patch - procps-3.2.7-psman.patch - procps-3.2.7-top-cpu0.patch - procps-3.2.7-top-cpuint.patch - procps-3.2.7-top-manpage.patch - procps-3.2.7-top-clrscr.patch - procps-3.2.7-ps-man-fmt.patch - procps-3.2.7-vmstat-partstats-long.patch - procps-3.2.7-vmstat-header.patch - procps-3.2.7-slabtop-once.patch - procps-3.2.7-vmstat-timestamp.patch - procps-3.2.7-vmstat-timestamp-manpage.patch - procps-3.2.7-ps-cgroup.patch - procps-3.2.7-vmstat-partstats-reqwrites.patch - procps-3.2.7-free-hlmem.patch - procps-3.2.8-threads.patch - procps-enable-core.patch - procps-3.2.8-setlocale.patch - procps-pmap-smaps.patch - procps-3.2.8-vmstat-getopt.patch - procps-3.2.8-ps-cgroup-suppress-root-group.patch - procps-3.2.8-make.patch - procps-3.2.8-constructor-order.patch - - system/base/procps/pspec.xml - - - procps - - ncurses - - - /bin - /sbin - /lib + /usr/share/nano /usr/bin - /usr/share/doc - /usr/share/man - /usr/include - - - - - 2014-05-11 - 3.2.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2010-10-12 - 3.2.8 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - urlgrabber - http://urlgrabber.baseurl.org/ - - PisiLinux Community - admins@pisilinux.org - - LGPLv2.1 - library - system.base - High level cross-protocol url-grabber library for Python - Python için yüksek seviyeli, platform bağımsız bir url-grabber kütüphanesi - urlgrabber provides a clean library interface to protocol-independant file-access for Python programs - urlgrabber Python uygulamaları için protokol bağımsız dosya erişimi sağlayan temiz bir kütüphanedir. - http://urlgrabber.baseurl.org/download/urlgrabber-3.10.1.tar.gz - - python - - system/base/urlgrabber/pspec.xml - - - urlgrabber - - python - pycurl - - - /usr/lib - /usr/libexec - /usr/share/doc + /bin - 2014-05-11 - 3.10.1 + 2014-07-11 + 2.3.5 Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com + Vedat Demir + vedat@pisilinux.org - 2013-10-28 - 3.10 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-03-12 - 3.9.1 - Fix pisi https issue - Pisi Linux Admins - marcin@pisilinux.org - - - 2010-10-11 - 3.9.1 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - cryptsetup - https://code.google.com/p/cryptsetup/ - - Erdem Artan - admins@pisilinux.org - - GPLv2 - app:cli - system.base - Userspace setup tool for transparent encryption of block devices using dm-crypt - Şifreli dosya sistemleri yaratmak için bir araç - Userspace setup tool for transparent encryption of block devices using dm-crypt - cryptsetup device mapper kullanarak şifrelenmiş dosya sistemleri yaratmak için gerekli bir araçtır. - cryptsetup - https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-1.6.4.tar.xz - - device-mapper-devel - libgpg-error-devel - libgcrypt-devel - - system/base/cryptsetup/pspec.xml - - - cryptsetup - - libcryptsetup - popt - - - /sbin - /usr/share/man - /usr/share/locale - /usr/share/doc - - - - libcryptsetup - cryptsetup libraries - cryptsetup kütüphaneleri - - device-mapper - libgpg-error - libgcrypt - libuuid - - - /lib/libcryptsetup.so* - - - - libcryptsetup-devel - libcryptsetup devel files - libcryptsetup için geliştirme dosyaları - - libcryptsetup - - - /usr/include - /usr/lib/pkgconfig/libcryptsetup.pc - - - - python-pycryptsetup - Python backend for cryptsetup - cryptsetup Python bağlayıcısı - programming.language.python - - python - libcryptsetup - - - /usr/lib/python2.7/site-packages/pycryptsetup.so - - - - 2014-05-11 - 1.6.4 + 2.3.1 Release bump. Marcin Bojara marcin@pisilinux.org - - 2014-04-03 - 1.6.4 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2014-03-06 - 1.6.0 - Rebuild Unused - Varol Maksutoğlu - waroi@pisilinux.org - - + 2013-07-26 - 1.6.0 + 2.3.1 Fix dep, release bump. Serdar Soytetir kaptan@pisilinux.org - - 2013-02-15 - 1.6.0 - New version - Ertan Güven - ertan@pisilinux.org - - 2012-10-05 - 1.5.0 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - leveldb - https://code.google.com/p/leveldb - - Alihan Öztürk - alihan@pisilinux.org - - BSD - app:console - system.base - A fast and lightweight key/value database library - Hızlı ve hafif bir anahtar/değer veri kütüphanesi - LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values. - LevelDB dize değerleri ile dize anahtarlarını eşleme sağlayan, Google'da yazılmış hızlı bir anahtar-değer depolama kütüphanesidir. - http://source.pisilinux.org/1.0/leveldb-e353fbc7ea81.tar.gz - - gperftools-devel - snappy-devel - - system/base/leveldb/pspec.xml - - - leveldb - - libgcc - snappy - gperftools - - - /usr/lib - /usr/share/doc - - - - leveldb-devel - - leveldb - - - /usr/include - - - - - 2014-06-02 - 1.17 - First release - Alihan Öztürk - alihan@pisilinux.org - - - - - - libffi - http://sourceware.org/libffi - - PisiLinux Community - admins@pisilinux.org - - BSD - library - system.base - A portable foreign function interface library - Yabancı işlev arayüzleri için taşınabilir bir kitaplık - The libffi library provides a portable, high level programming interface to various calling conventions. - libffi kitaplığı, çeşitli işlev çağırma konvansiyonları için taşınabilir ve yüksek düzeyli bir programlama arayüzü sunar. - ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz - system/base/libffi/pspec.xml - - - libffi - - /usr/lib/libffi.* - /usr/share/doc - - - - libffi-devel - Development files for libffi - libffi için geliştirme dosyaları - system.devel - - libffi - - - /usr/lib/libffi-* - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/info - /usr/share/man - - - - libffi-32bit - 32-bit shared libraries for libffi - libffi için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libffi - - - /usr/lib32/libffi.* - /usr/lib32/libffi-* - - - - - 2014-12-02 - 3.2.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 3.0.13 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 3.0.13 - Version bump, clean libffi. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-17 - 3.0.12 - New Release - PisiLinux Community - admins@pisilinux.org - - - 2012-07-11 - 3.0.11 - First release - Erdem Artan - admins@pisilinux.org - - - - - - man-db - http://www.nongnu.org/man-db/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2+ - GPLv3+ - app:console - data:doc - system.base - Application to read Linux man pages - Kapsamlı Linux kılavuzları - Man package consists of programs which is used to read most of the documentation available in linux system. For example, you can write "man nameoftheprogram" into the konsole or "man:nameoftheprogram" into the konqueror to get a detailed usage information for many programs. - man-db paketi Linux ile ilgili yazılmış dökümanların büyük çoğunluğunu okunması için gerekli programları sunar. Örneğin, konsola "man programadı" ya da konquerora "man:programadı" yazarak birçok program hakkında detaylı kullanım bilgisi alabilirsiniz. - http://download.savannah.gnu.org/releases/man-db/man-db-2.6.3.tar.xz - - less - gzip - groff - gdbm-devel - zlib-devel - gettext-devel - libpipeline-devel - - - man-db-2.5.9-sgr.patch - man-db-2.6.1-locale-fallback.patch - man-db-2.6.1-so-links.patch - man-db-2.6.1-wildcards.patch - man-db-2.6.2-invalid-cache.patch - man-db-2.6.3-overrides.patch - - system/base/man-db/pspec.xml - - - man-db - - gdbm - zlib - gettext - libpipeline - - - /etc - /usr/lib - /usr/bin - /usr/sbin - /usr/libexec - /usr/share/locale - /usr/share/doc - /usr/share/man - /var/cache - - - mandb.conf - mandb.cron.daily - - - - - 2014-05-11 - 2.6.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-03 - 2.6.3 - Rebuild for openjdk. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-28 - 2.6.3 - rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-03-04 - 2.6.3 - Add some patches, cleanup. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-09-27 - 2.6.3 - First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - - - - tcp-wrappers - http://ftp.porcupine.org/pub/security/index.html - - PisiLinux Community - admins@pisilinux.org - - BSD - app:console - system.base - TCP Wrappers - TCP Wrappers - Avec ce paquet, vous pouvez surveiller et filtrer les requêtes entrante pour les services réseaux SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK et autres. Il supporte à la fois les canaux de communication (sockets) de type 4.3BSD et TLI de type System V.4. - With this package you can monitor and filter incoming requests for the SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK, and other network services. It supports both 4.3BSD-style sockets and System V.4-style TLI. - Bu paket ile birlikte SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK ve diğer ağ servisleri için gelen istekleri izleyebilir ve süzebilirsiniz. Program 4.3BSD-tipi soketler ve System V.4-tipi TLI'ın ikisini de destekler. - http://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz - - sed - - - Makefile-Pisi.patch - tcp-wrappers-7.6-makefile.patch - tcp_wrappers-7.6-ldflags.patch - 01_all_redhat-bug11881.patch - 02_all_redhat-bug17795.patch - 03_all_wildcard.patch - 04_all_fixgethostbyname.patch - 07_all_sig.patch - 08_all_strerror.patch - 09_all_gcc-3.4.patch - 10_all_more-headers.patch - tcp-wrappers-7.6-ipv6-1.14.diff - tcp-wrappers-7.6-shared.patch - host.allow.example.patch - match-port.patch - - system/base/tcp-wrappers/pspec.xml - - - tcp-wrappers - - /usr/sbin - /usr/lib - /lib - /etc - /usr/share/man - /usr/share/doc - - - hosts.allow - hosts.deny - - - - tcp-wrappers-devel - Development files for tcp-wrappers - tcp-wrappers için geliştirme dosyaları - system.devel - - tcp-wrappers - - - /usr/include - /usr/share/man/man3 - - - - - 2014-05-11 - 7.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2010-10-11 - 7.6 + 2011-06-27 + 2.3.1 First release Pisi Linux Admins admins@pisilinux.org - - - help2man - http://www.gnu.org/software/help2man - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - GNU utility to convert program --help output to a man page - Geleneksel --help çıktılarını man sayfalarına dönüştüren bir GNU yazılımı - Help2man is a tool which generate man page from help text of programs. - Help2man programların help çıktılarını man sayfalarına dönüştüren bir araçtır. - http://ftp.gnu.org/gnu/help2man/help2man-1.46.4.tar.xz - - perl-Locale-gettext - - system/base/help2man/pspec.xml - - - help2man - - perl-Locale-gettext - - - /usr/bin - /usr/lib - /usr/share/doc - /usr/share/info - /usr/share/locale - /usr/share/man - - - - - 2015-02-12 - 1.46.4 - Version bump. - Hakan Yıldız - hknyldz93@gmail.com - - - 2014-05-11 - 1.41.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-01-14 - 1.41.1 - New release - PisiLinux Community - admins@pisilinux.org - - - 2011-09-07 - 1.40.4 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - python-pyliblzma - http://pypi.python.org/pypi/pyliblzma - - PisiLinux Community - admins@pisilinux.org - - LGPLv3 - library - system.base - Python bindings for lzma - Python için lzma bağlayıcıları - pyliblzma provides a python interface for the liblzma library to read/write data that has been compressed/decompressed with lzma utils. - pyliblzma, lzma araçlarıyla sıkıştırılmış verileri açmak ve lzma kitaplığı kullanarak veri sıkıştırmak için python programlama arayüzü sunan bir pakettir. - http://pypi.python.org/packages/source/p/pyliblzma/pyliblzma-0.5.3.tar.bz2 - - xz - - system/base/python-pyliblzma/pspec.xml - - - python-pyliblzma - - xz - python - - - /usr/lib/python2* - /usr/share/doc - - - - - 2014-05-11 - 0.5.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 0.5.3 - rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-28 - 0.5.3 - Fix deps. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-10-11 - 0.5.3 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - libidn - http://www.gnu.org/software/libidn - - PisiLinux Community - admins@pisilinux.org - - LGPLv2.1 - GPLv3 - app:console - library - system.base - Internationalized Domain Names (IDN) implementation - Uluslararası Alan Adları (IDN) destek kütüphanesi - GNU Libidn est une implémentation de Stringprep, Punycode et des spécifications IDNA définies par le groupe de travail Internationalized Domain Names (IDN) de l'IETF servant pour les noms de domaines internationalisés. La librairie C est disponible sous la Licence Publique Générale Lesser. - GNU Libidn is an implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group, used for internationalized domain names. The C library is available under the GNU Lesser General Public License. - GNU Libidn, IETF Uluslararasılaştırılmış Domain Adları (IDN) çalışma grubu tarafından tanımlanmış Stringgrep, Punycode ve IDNA tariflerinin bir uygulamasıdır, uluslararası domain adlarının kullanımına olanak sağlar. C kütüphanesi GNU Lesser General Public License altında sağlanabilir. - http://ftp.gnu.org/gnu/libidn/libidn-1.28.tar.gz - system/base/libidn/pspec.xml - - - libidn - - /usr/bin - /usr/lib/libidn* - /usr/share/emacs - /usr/share/locale - /usr/share/man/man1 - /usr/share/info - /usr/share/doc - - - - libidn-devel - Development files for libidn - libidn için geliştirme dosyaları - system.devel - - libidn - - - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man/man3 - - - - libidn-32bit - 32-bit shared libraries for libidn - libidn için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libidn - - - /usr/lib32/libidn* - - - - - 2014-05-11 - 1.28 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 1.28 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-01-14 - 1.26 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 1.25 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - popt - http://www.rpm5.org/ - - PisiLinux Community - admins@pisilinux.org - - as-is - app:console - library - system.base - Popt command line option parser - Popt komut satırında çalıştıran bir seçenek ayrıştırıcıdır. - La librairie popt existe essentiellement pour analyser des options de ligne de commande. Elle procure de nombreux avantages tels que l'absence de variables globales, la possibilité d'analyser un tableau arbitraire d'éléments de type argv, d'exécuter des filtres d'options extérieurs, la génération automaituqe des messages d'aide et d'utilisation ainsi qu'un méthode standard pour synonymes d'options. - The popt library exists essentially for parsing command line options with advantages such as there are no global variables, ability to parse an arbitrary array of argv-style elements, to exec external option filters, and automatic generation of help and usage messages, a standard method of option aliasing. - Popt, komut satırında seçenek ayrıştırma için gerekli bir kütüphanedir. Genel değişken olmaması, dağınık dizi bileşenlerini ayrıştırabilmesi, harici uygulama filtreleri kullanabilmesi, otomatik mesaj ve yardım dosyaları üretimi gibi başarılı özellikleri bulunur. - ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz - system/base/popt/pspec.xml - - - popt - - gettext - - - /usr/lib - /usr/share/doc - /usr/share/man - /usr/share/locale - - - - popt-devel - Development files for popt - popt için geliştirme dosyaları - system.devel - - popt - - - /usr/include/popt.h - /usr/share/man/man3 - /usr/lib/pkgconfig - - - - - 2014-05-11 - 1.16 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2010-10-11 - 1.16 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - lzo - http://www.oberhumer.com/opensource/lzo/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - system.base - An extremely fast compression and decompression library - Çok hızlı bir sıkıştırma/açma kütüphanesi - lzo is a library with very high compression and decompression speeds and very small memory usage. Provides low compression ratios but very high speeds. - lzo hızlı bir sıkıştırma/açma kütüphanesidir. Düşük sıkıştırma oranları verir fakat hem sıkıştırma hem açma işleminde bellek kullanımı çok düşüktür ve işlem hızı yüksektir. - http://www.oberhumer.com/opensource/lzo/download/lzo-2.08.tar.gz - system/base/lzo/pspec.xml - - - lzo - - /usr/lib - /usr/share/doc - - - - lzo-devel - Development files for lzo - lzo için geliştirme dosyaları - - lzo - - - /usr/include - - - - lzo-32bit - 32-bit shared libraries for lzo - emul32 - emul32 - - /usr/lib32 - - - - - 2014-07-03 - 2.08 - Version bump and security update (CVE-2014-4607). - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 2.06 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-28 - 2.06 - Clean lzo. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-10-23 - 2.06 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - libssh2 - http://www.libssh2.org/ - - PisiLinux Community - admins@pisilinux.org - - BSD - library - system.base - A library implementing the SSH2 protocol - SSH2 protokolü için kütüphane - libssh2 is a library implementing the SSH2 protocol as defined by Internet Drafts: SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS, and SECSH-PUBLICKEY. - libssh2, SECSH-TRANS, SECSH-USERAUTH, SECSH-CONNECTION, SECSH-ARCH, SECSH-FILEXFER, SECSH-DHGEX, SECSH-NUMBERS ve SECSH-PUBLICKEY gibi Internet Taslakları tarafından belirlenen SSH2 protokolü için geliştirilmiş bir kütüphanedir. - http://www.libssh2.org/download/libssh2-1.4.3.tar.gz - - openssl-devel - zlib-devel - - system/base/libssh2/pspec.xml - - - libssh2 - - openssl - zlib - - - /usr/lib - /usr/share/doc - - - - libssh2-devel - Development files for libssh2 - libssh2 için geliştirme dosyaları - system.devel - - libssh2 - - - /usr/include - /usr/lib/pkgconfig - /usr/share/man - - - - - 2014-05-11 - 1.4.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-15 - 1.4.3 - Version bump - Ertan Güven - ertan@pisilinux.org - - - 2012-06-12 - 1.4.2 - First release - Erdem Artan - admins@pisilinux.org - - - - - - liblogging - http://www.liblogging.org - - Marcin Bojara - marcin@pisilinux.org - - BSD-2 - library - system.base - Easy to use, portable, open source library for system logging - Liblogging offers an enhanced replacement for the syslog() call, but retains its ease of use. - http://download.rsyslog.com/liblogging/liblogging-1.0.3.tar.gz - system/base/liblogging/pspec.xml - - - liblogging - - /usr/lib - /usr/bin - /usr/share/man - /usr/share/doc/liblogging - - - - liblogging-devel - Development files for liblogging - system.devel - - liblogging - - - /usr/include/liblogging/stdlog.h - /usr/lib/pkgconfig/liblogging-stdlog.pc - - - - - 2014-05-11 - 1.0.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-30 - 1.0.3 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - miscfiles - http://freshmeat.net/projects/miscfiles/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - data - system.base - Fichiers divers. - Miscellaneous files - Çeşitli dosyalar - Verschiedene Dateien - miscfiles is a collection of data files for freely available information, like airport, country, currencies, city information, and codes. It also includes the Unicode character database. - miscfiles havalanı, ülke, para birimi, şehir bilgisi ve kodları gibi bir çok ulaşılabilir bilgiyi veri dosyaları halinde tutmaktadır. - http://ftp.gnu.org/gnu/miscfiles/miscfiles-1.5.tar.gz - system/base/miscfiles/pspec.xml - - - miscfiles - - /usr/share/doc - /usr/share/rfc - /usr/share/dict - /usr/share/misc - - - - - 2014-05-11 - 1.5 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-30 - 1.5 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-11-24 - 1.5 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - file - http://www.darwinsys.com/file/ - - PisiLinux Community - admins@pisilinux.org - - as-is - app:console - system.base - Program to identify a file's format by scanning binary data for patterns - Dosya tipini belirlemek için kullanılan bir uygulamadır - Programme servant à identifiant le format d'un fichier en analysant les données binaires en cherchant des patrons connus. - Program to identify a file's format by scanning binary data for patterns. - İkili veri taraması kullanarak (dosya uzantısına bakmadan) dosya biçimini tanımlamaya yarayan bir uygulamadır. - ftp://ftp.astron.com/pub/file/file-5.18.tar.gz - - zlib - python-devel - - - git_fixes.patch - - system/base/file/pspec.xml - - - file - - zlib - python - - - /usr/bin - /usr/lib - /usr/share/doc - /usr/share/man - /usr/share/misc - /usr/include - - - - - 2014-05-11 - 5.18 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 5.18 - Version bump - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-22 - 5.15 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-03-04 - 5.13 - Version bump - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-02-16 - 5.12 - New Release - PisiLinux Community - admins@pisilinux.org - - - 2012-11-22 - 5.11 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - biosdevname - http://linux.dell.com/biosdevname/ - - Serdar Soytetir - kaptan@pisilinux.org - - GPLv2 - app:gui - system.base - Biosdevname is a udev helper utility developed - Biosdevname is a udev helper utility developed by Dell and released under the GNU General Public License (GPL). It provides a consistent naming mechanism for network devices based on their physical location as suggested by the system BIOS. - http://linux.dell.com/biosdevname/biosdevname-0.6.0/biosdevname-0.6.0.tar.gz - - pciutils-devel - glibc-devel - - system/base/biosdevname/pspec.xml - - - biosdevname - - pciutils - glibc - - - /lib/udev/rules.d - /usr/sbin - /usr/share/doc - /usr/share/man - - - - - 2014-05-11 - 0.6.0 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 0.4.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-19 - 0.4.1 - Rebuild - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2012-10-05 - 0.4.1 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - pam - http://www.kernel.org/pub/linux/libs/pam/ - - PisiLinux Community - admins@pisilinux.org - - PAM - library - system.base - Modules d'Authentification en Greffon (Pluggable Authentication Modules) - Pluggable Authentication Modules - PAM - Eklenebilir Yetkilendirme Modülleri - PAM (Pluggable Authentication Modules) is a system security tool that allows system administrators to set authentication policy without having to recompile programs that handle authentication. - http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2 - - dlopen.sh - dlopen-test.sh - - - perl - gettext - cracklib - audit-devel - - - no-lib64.patch - nosex-libtirpc-underlinking.patch - pam-1.1.8-cve-2013-7041.patch - pam-1.1.8-cve-2014-2583.patch - - system/base/pam/pspec.xml - - - pam - - audit - cracklib - - - /etc - /lib - /var/run/console - /usr/lib - /sbin - /usr/sbin - /usr/share/doc - /usr/share/man - /usr/share/locale - - - System.Package - - - 90-nproc.conf - - - - pam-devel - Development files for pam - pam için geliştirme dosyaları - system.devel - - pam - - - /usr/include - /usr/share/man/man3 - - - - - 2014-06-10 - 1.1.8 - Add patch CVE. - Alihan Öztürk - alihan@pisilinux.org - - - 2014-05-11 - 1.1.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-22 - 1.1.8 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-05-16 - 1.1.6 - Sandbox fixed. - PisiLinux Community - admins@pisilinux.org - - - 2013-02-21 - 1.1.6 - Build with new automake, enable tests. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-09-13 - 1.1.6 - First release - Erdem Artan - admins@pisilinux.org - - - - - - sqlite - http://www.sqlite.org/ - - PisiLinux Community - admins@pisilinux.org - - as-is - library - system.base - An SQL Database Engine in a C Library - Bir C kütüphanesi içindeki bir SQL veritabanı motoru - SQLite est une petite librairie C implémentant un moteur de base de données SQL auto-configurée, auto-suffisante, pouvant être embarquée. Gère des bases de données de tailles allant jusqu'à 2 téraOctets. - SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. Supports databases up to 2 terabytes in size. - SQLite hiçbir ayar gerektirmeyen, başka programların içine gömülebilir bir SQL veritabanı motorudur. 2 terabayta kadar büyüklükteki veritabanlarını tutabilir. - http://www.sqlite.org/2014/sqlite-autoconf-3080702.tar.gz - - readline-devel - - system/base/sqlite/pspec.xml - - - sqlite - - readline - - - /usr/bin - /usr/lib - /usr/share/doc - /usr/share/man - - - - sqlite-devel - Development files for sqlite - sqlite için geliştirme dosyaları - system.devel - - sqlite - - - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - - sqlite-32bit - 32-bit shared libraries for sqlite - emul32 - emul32 - - sqlite - - - /usr/lib32 - - - - - 2015-01-31 - 3.8.8.2 - Version bump. - Hakan Yıldız - hknyldz93@gmail.com - - - 2015-01-24 - 3.8.8.1 - Version bump. - Hakan Yıldız - hknyldz93@gmail.com - - - 2014-12-05 - 3.8.7.2 - Version bump. - Osman Erkan - osman.erkan@pisilinux.org - - - 2014-07-09 - 3.8.5 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 3.8.4.3 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2014-03-29 - 3.8.4.2 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 3.8.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-06-28 - 3.7.17 - Move pc files to devel pack, increase release no. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-28 - 3.7.17 - Version bump - Marcin Bojara - marcin@pisilinux.org - - - 2013-01-21 - 3.7.15.2 - bump - Erdinç Gültekin - admins@pisilinux.org - - - 2012-12-15 - 3.7.14 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - kmod - http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary - - PisiLinux Community - admins@pisilinux.org - - GPLv2+ - app:console - system.base - Linux kernel module management utilities - Linux kernel modülleri yönetim araçları - Linux kernel module management utilities - Linux kernel modülleri yönetim araçları - ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-19.tar.xz - - chrpath - libxslt - - system/base/kmod/pspec.xml - - - kmod - - xz - zlib - glibc - libkmod - - - /usr/bin - /bin - /sbin - /usr/share/man - /usr/share/doc - /etc - /usr/share/bash-completion/completions/kmod - - - Boot.Modules - System.PackageHandler - - - blacklist/blacklist.conf - blacklist/blacklist-firewire.conf - blacklist/blacklist-framebuffer.conf - blacklist/blacklist-watchdog.conf - modprobe.conf - depmod.conf - - - - libkmod-devel - system.devel - - libkmod - - - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - - libkmod - kmod libraries - - xz - zlib - - - /usr/lib - - - - libkmod-32bit - 32bit libraries of libkmod - emul32 - emul32 - - xz-32bit - zlib-32bit - - - /usr/lib32 - - - - - 2014-11-18 - 19 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-23 - 17 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 16 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-21 - 16 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-05 - 15 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 15 - Version bump, clean kmod. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-20 - 14 - rebuild for kernel 3.10.9 - PisiLinux Community - admins@pisilinux.org - - - 2013-08-11 - 14 - rebuild for kernel 3.10.5 - PisiLinux Community - admins@pisilinux.org - - - 2013-07-27 - 14 - Move pc files to devel pack, rebuild - PisiLinux Community - admins@pisilinux.org - - - 2013-07-04 - 14 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-04-14 - 13 - Version bump - Marcin Bojara - marcin@pisilinux.org - - - 2013-01-22 - 12 - Version bump, add comar scripts - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-15 - 11 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - vixie-cron - http://www.gentoo.org/ - - PisiLinux Community - admins@pisilinux.org - - as-is - service - system.base - Paul Vixie's cron daemon, a fully featured crond implementation - Tam teşekküllü bir crond uyarlaması - Vixie cron (Cron est un daemon qui lance des tâches planifiées) est une implémentation riche basée sur le cron SysV. Chaque utilisateur possède sa propre table de planification (ou crontab - la CRON TABle de Crontab) est un fichier qui contient le planning de cron) et a la possibilité de spécifier des variables d'environnement au sein de la table. - Vixie cron (Cron is a daemon that runs scheduled tasks.) is a full featured cron implementation based on SysV cron. Each user has his own crontab ( Crontab (CRON TABle) is a file which contains the schedule of cron) and is allowed to specify environment variables within that crontab. - Vixie-cron (cron, zamanlanmış görevleri çalıştıran dinleyici programdır.) SysV cron tabanlı tam sürüm cron uygulamasıdır. Her kullanıcı kendi crontab 'ına (crontab cron listesini içeren dosyadır.) sahiptir ve bu crontab içinde ortam değişkenlerini yazmasına müsade edilmiştir. - ftp://ftp.linux.org.tr/pub/gentoo/distfiles/vixie-cron-4.1.tar.bz2 - - sed - pam - - - vixie-cron-4.1-gentoo-r4.patch.bz2 - crontab.5.diff - vixie-cron-4.1-commandline.patch - vixie-cron-4.1-pam.patch - vixie-cron-4.1-CAN-2005-1038.patch - CVE-2006-2607.patch - CVE-2007-1856.patch - - system/base/vixie-cron/pspec.xml - - - vixie-cron - - pam - comar-api - - - /usr/sbin - /usr/bin - /etc - /var/spool - /usr/share/doc - /usr/share/man - - - System.Package - System.Service - - - run-crons-0.3.1 - crontab - vixie-cron-4.1-cron.deny - cron.pam.d - - - - - 2014-05-11 - 4.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2010-10-11 - 4.1 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - expat - http://expat.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - as-is - library - system.base - librairies d'analyse XML - XML parsing libraries - XML ayrıştırıcı kütüphaneleri - XML Parser Bibliotheken - This is expat, the C library for parsing XML, written by James Clark. Expat is a stream oriented XML parser. This means that you register handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. - mirrors://sourceforge/expat/expat-2.1.0.tar.gz - - gnuconfig - - system/base/expat/pspec.xml - - - expat - - /usr/bin - /usr/lib - /usr/share/doc - /usr/share/man - - - - expat-devel - Development files for expat - expat için geliştirme dosyaları - system.devel - - expat - - - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/doc/expat/html - - - - expat-32bit - 32-bit shared libraries for expat - expat için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - expat - - - /usr/lib32 - - - - - 2014-05-11 - 2.1.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-27 - 2.1.0 - Move pc files to devel pack, rebuild - PisiLinux Community - admins@pisilinux.org - - - 2013-01-21 - 2.1.0 - Remove patch which causing test error for perl-XML-Parser. - Marcin Bojara - marcin@pisilinux.org - - - 2011-03-01 - 2.1.0 - First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - - - - less - http://www.greenwoodsoftware.com/ - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - app:console - system.base - Excellent lecteur de fichier texte - Excellent text file viewer - Mükemmel bir metin görüntüleyici - Ausgezeichneter Textbetrachter - The less utility is a text file browser that resembles more, but has more capabilities. Less allows you to move backwards in the file as well as forwards. Since less doesn't have to read the entire input file before it starts, less starts up more quickly than text editors (for example, vi). - http://www.greenwoodsoftware.com/less/less-458.tar.gz - - ncurses-devel - - system/base/less/pspec.xml - - - less - - ncurses - - - /etc/env.d - /usr/bin - /usr/share/doc - /usr/share/man - - - lesspipe.sh - 70less - code2color - - - - - 2014-05-11 - 458 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-24 - 458 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2012-09-15 - 451 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - perl - http://www.perl.org/ - - PisiLinux Community - admins@pisilinux.org - - Artistic - GPLv2 - app:console - system.base - Larry Wall's Practical Extraction and Reporting Language - Perl dili - Perl est un langage de programmation multi-plateforme stable. - Perl is a high-level programming language with roots in C, sed, awk and shell scripting. Perl is good at handling processes and files, and is especially good at handling text. Perl's hallmarks are practicality and efficiency. While it is used to do a lot of different things, Perl's most common applications are system administration utilities and web programming. A large proportion of the CGI scripts on the web are written in Perl. You need the perl package installed on your system so that your system can handle Perl scripts. - Perl kararlı, platform bağımsız programlama dilidir. - Perl ist eine stabile, plattformunabhängige Programmiersprache - http://www.cpan.org/src/5.0/perl-5.20.0.tar.bz2 - - db-devel - gdbm-devel - zlib-devel - - - perl-vutil-revert.patch - - system/base/perl/pspec.xml - - - perl-docs - Documentation files for perl - programming.language.perl - - /usr/share/doc/html - /usr/share/doc/perl/html - /usr/share/man/ - - - - perl - - db - gdbm - zlib - - - /usr/bin - /usr/lib - /usr/share/doc - - - Turkish.pm - - - - - 2014-09-10 - 5.20.0 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 5.18.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-08-28 - 5.18.1 - Version bump, clean perl. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-26 - 5.16.2 - Release bump, rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-19 - 5.16.2 - First release - PisiLinux Community - admins@pisilinux.org - - - 2012-09-06 - 5.16.1 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - texinfo - http://www.gnu.org/software/texinfo/ - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - app:console - system.base - programme et utilitaires GNU info. - The GNU info program and utilities - GNU info (bilgi) programı ve araçları - GNU Info Prgramm und Werkzeuge - Texinfo is a documentation system that can produce both online information and printed output from a single source file. The GNU Project uses the Texinfo file format for most of its documentation. - mirrors://gnu/texinfo/texinfo-5.2.tar.gz - - ncurses - - system/base/texinfo/pspec.xml - - - texinfo - - ncurses - - - /usr/bin - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/texinfo - /usr/share/texmf/tex/texinfo - /usr/share/locale - /usr/share/texmf/ - - - System.PackageHandler - - - - - 2014-05-25 - 5.2 - Release bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 5.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-22 - 5.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-09-05 - 4.13 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2010-10-11 - 4.13 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - spidermonkey - http://www.mozilla.org/js/spidermonkey/ - - PisiLinux Community - admins@pisilinux.org - - NPL-1.1 - library - system.base - Stand-alone JavaScript C Library - Javascript C Kitaplığı - Spidermonkey est l'Implémentation C de Javascript par Mozilla. - Spidermonkey is Mozilla's C implementation of JavaScript. - Mozilla'nın Javascript'in C implementasyonu. - Spidermonkey es la implementación de JavaScript con C de Mozilla. - http://ftp.mozilla.org/pub/mozilla.org/js/mozjs17.0.0.tar.gz - - zlib-devel - nspr-devel - readline-devel - - system/base/spidermonkey/pspec.xml - - - spidermonkey - - nspr - zlib - libgcc - readline - - - /usr/bin - /usr/lib - /usr/share/doc - - - - spidermonkey-devel - Development files for spidermonkey - spidermonkey için geliştirme dosyaları - system.devel - - spidermonkey - nspr-devel - - - /usr/include - /usr/lib/pkgconfig - /usr/bin/js17-config - - - - - 2014-05-11 - 17.0.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-30 - 17.0.0 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-28 - 17.0.0 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-28 - 1.8.5 - Move pc files to devel pack,rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-20 - 1.8.5 - Release bump for rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-20 - 1.8.5 - Cleanup package, bump for new build - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-09-20 - 1.8.5 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - mailcap - http://git.fedorahosted.org/git/mailcap.git - - PisiLinux Community - admins@pisilinux.org - - MIT - public-domain - data - system.base - Helper application and MIME type associations for file types - Dosya türleri için yardımcı uygulama ve MIME türü ilişkilendirmeleri - mailcap file is used by the metamail program. Metamail reads the mailcap file to determine how it should display non-text or multimedia material. - mailcap dosyası metamail ve bazı diğer uygulamalar tarafından, metin olmayan dosyaların ya da çokluortam dosyalarının nasıl açılacağını keşfetmek için kullanılır. - https://fedorahosted.org/released/mailcap/mailcap-2.1.42.tar.xz - - extend-mailcap.patch - - system/base/mailcap/pspec.xml - - - mailcap - - /etc - /usr/share/doc - /usr/share/man - - - - - 2014-05-11 - 2.1.42 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 2.1.42 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2011-06-01 - 2.1.37 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - attr - http://acl.bestbits.at/ - - Pisi Linux Admins - admins@pisilinux.org - - LGPLv2.1 - app:console - library - system.base - Utilities for managing filesystems extended attributes - Gelişkin öznitelikler araçları - attr offre des utilitaires qui servent à manipuler les attributs étendus des objects de système de fichier. - attr contains a set of tools for manipulating extended attributes on filesystem objects, in particular getfattr and setfattr. - attr dosya sistemi nesnelerinin özniteliklerini değiştirmek için gerekli bir dizi araç sunar. - http://download.savannah.gnu.org/releases-noredirect/attr/attr-2.4.47.src.tar.gz - system/base/attr/pspec.xml - - - attr - - /bin - /lib - /usr/share/locale - /usr/share/doc - /usr/share/man - - - - attr-devel - Development files for attr - attr için geliştirme dosyaları - system.devel - - attr - - - /usr/include - /usr/share/man/man3 - - - - attr-32bit - 32-bit shared libraries for attr - emul32 - emul32 - - attr - - - /lib32 - - - - - 2014-09-30 - 2.4.47 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 2.4.47 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-28 - 2.4.47 - Version bump, clean attr. - Marcin Bojara - marcin@pisilinux.org - - - 2013-01-24 - 2.4.46 - Add emul32 - Marcin Bojara - marcin@pisilinux.org - - - 2012-06-04 - 2.4.46 - First release - Erdem Artan - admins@pisilinux.org - - - - - - acl - http://acl.bestbits.at/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2+ - LGPLv2.1 - app:console - library - system.base - Utilitaires, librairies et fichiers d'entête de liste de contrôle d'accès. - Access control list utilities - Erişim denetim listesi için çeşitli araçlar - acl contains the getfacl and setfacl utilities needed for manipulating access control lists along with the needed libraries. - acl erişim denetim listelerini yönetmeye yarayan getfacl ve setfacl araçlarıyla gerekli kütüphaneleri içeren bir pakettir. - http://download.savannah.gnu.org/releases-noredirect/acl/acl-2.2.52.src.tar.gz - - attr - - system/base/acl/pspec.xml - - - acl - - attr - - - /bin - /lib - /usr/share/locale - /usr/share/doc - /usr/share/man - - - - acl-devel - Development files for acl - acl için geliştirme dosyaları - system.devel - - acl - - - /usr/include - /usr/share/man/man3 - - - - - 2014-09-30 - 2.2.52 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 2.2.52 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-28 - 2.2.52 - Version bump, clean acl. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-06-04 - 2.2.51 - First release - Erdem Artan - admins@pisilinux.org - - - - - - busybox - http://www.busybox.net - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Statically linked binary providing simplified versions of system commands - Statik bağlanmış sistem komutları bütünü - busybox is a single binary which includes versions of a large number of system commands, including a shell. - busybox, kabuk da dahil olmak üzere çeşitli sistem komutlarını içeren tek bir çalıştırılabilir dosyadır. - http://busybox.net/downloads/busybox-1.22.1.tar.bz2 - - config - - - udhcp-rootpath-rq.patch - suppress-job-control-warning.patch - fix-include.patch - - system/base/busybox/pspec.xml - - - busybox - - /bin - - - - - 2014-05-11 - 1.22.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-03-29 - 1.22.1 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-14 - 1.21.0 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 1.20.2 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - grep - http://www.gnu.org/software/grep/grep.html - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - app:console - system.base - GNU regular expression matcher - Grep düzenli ifade eşleme aracı - La commande grep recherche dans un ou plusieurs fichiers les lignes correspondant à un motif défini. Par défaut grep affiche les lignes éligibles. - The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines. - Grep komutu bir veya daha fazla verilen dosyada aranan parçayı bulmaya yarayan bir programdır. Ön tanımlı olarak grep eşleşen satırları çıktıya verir. - http://ftp.gnu.org/gnu/grep/grep-2.20.tar.xz - - gettext - libpcre-devel - - system/base/grep/pspec.xml - - - grep - - libpcre - - - /bin - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/locale - - - - - 2014-06-04 - 2.20 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 2.18 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 2.18 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2013-10-27 - 2.15 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-10-22 - 2.14 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-10-11 - 2.14 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - zlib - http://www.gzip.org/zlib/ - - PisiLinux Community - admins@pisilinux.org - - ZLIB - library - system.base - Librairie de compression/extraction standard - Standard (de)compression library - Standart sıkıştırma/açma kütüphanesi - Zlib is a general-purpose, patent-free, lossless data compression library which is used by many different programs. - mirrors://sourceforge/libpng/zlib-1.2.8.tar.xz - - dont-call-ldconfig.patch - - system/base/zlib/pspec.xml - - - minizip - Library for manipulating files from a zip archive - zip arşivlerindeki dosyaları yönetmek için kitaplık - util.archive - minizip - - zlib - - - /usr/lib/libminizip* - - - - minizip-devel - Development files for minizip - minizip için geliştirme dosyaları - util.archive - minizip - - minizip - zlib-devel - - - /usr/include/minizip - /usr/lib/pkgconfig/minizip.pc - - - - zlib - - /lib/libz.so* - /usr/lib/libz.so* - /usr/share/doc - /usr/share/man - - - - zlib-devel - Development files for zlib - zlib için geliştirme dosyaları - system.devel - - zlib - - - /usr/lib/pkgconfig/zlib.pc - /usr/lib32/pkgconfig - /usr/include/z*.h - /usr/share/man/man3 - /usr/share/doc/zlib/algorithm.txt - /usr/share/doc/zlib/example.c - - - - zlib-32bit - 32-bit shared libraries for zlib - zlib için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - zlib - - - /usr/lib32/libz.so* - - - - - 2014-05-11 - 1.2.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-27 - 1.2.8 - Clean zlib. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-29 - 1.2.8 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-06-03 - 1.2.7 - First release - Erdem Artan - admins@pisilinux.org - - - - - - kbd - http://freshmeat.net/projects/kbd/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Keyboard and console utilities - Klavye ve konsol araçları - Le paquet kbd contient les fichiers de configuration de touches ainsi que divers utilitaires pour claviers compatible avec le noyau 1.1.54 et suivants. - The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later. - Kbd paketi, çekirdek sürüm 1.1.54 ve sonraki sürümlerle uyumlu anahtar tablo dosyaları ve klavye yardımcı uygulamaları içerir. - ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.5.tar.gz - http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2 - http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2 - http://source.pisilinux.org/1.0/ro_maps.tar.bz2 - - gettext - gzip - - - kbd-1.15.5-loadkeys-parse.patch - mandriva/kbd-1.15-mandriva.patch - mandriva/kbd-1.15-tilde_twosuperior_french_kbd.patch - mandriva/kbd-1.12-data_thai.patch - mandriva/kbd-1.15-remove-unneeded-calls.patch - fedora/kbd-1.15-keycodes-man.patch - pisilinux/unicode_start-default-font.patch - pisilinux/tr-keypad-comma.patch - pisilinux/tr-no-meta_space.patch - pisilinux/trq-capslock-fix.patch - pisilinux/currency.patch - pisilinux/trf-keymap-fixes.patch - pisilinux/trf-capslock-fix.patch - - system/base/kbd/pspec.xml - - - kbd - - pam - - - /bin - /usr/bin - /usr/share/doc - /usr/share/man - /usr/share/keymaps - /usr/share/locale - /usr/share/unimaps - /usr/share/consolefonts - /usr/share/consoletrans - - - pisilinux/lat5u-12.psf.gz - pisilinux/lat5u-14.psf.gz - pisilinux/lat5u-16.psf.gz - mandriva/mac-fr-ext_new.kmap.gz - - - - - 2014-05-11 - 1.15.5 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 1.15.5 - rebuild. - PisiLinux Community - admins@pisilinux.org - - - 2013-07-26 - 1.15.5 - Fix dep, release bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-05-30 - 1.15.5 - Fix dep, release bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-01-14 - 1.15.5 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 1.15.2 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - tar - http://www.gnu.org/software/tar/ - - PisiLinux Community - admins@pisilinux.org - - GPLv3+ - app:console - system.base - A GNU file archiving program - GNU dosya arşivleme uygulaması - Le programme tar fournit la possibilité de manipuler des archives de type tar. Vous pouvez l'utiliser pour créer ou extraires des archives. Ajouter des fichiers à des archives existantes, les mettre à jour ou tout simplement lister leur contenu. - The GNU tar program saves many files together in one archive and can restore individual files (or all of the files) from that archive. - GNU tar birden fazla dosyayı tek bir arşiv dosyasında birleştiren ve daha sonra bu arşiv dosyasından geri çıkartabilen bir uygulamadır. - http://ftp.gnu.org/gnu/tar/tar-1.27.1.tar.xz - - tar.1 - - - gzip - bzip2 - gettext - ncompress - - system/base/tar/pspec.xml - - - tar - - acl - glibc - - - /bin - /sbin - /usr/share/doc - /usr/share/man - /usr/share/locale - /usr/share/info - - - - - 2014-05-11 - 1.27.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-11-23 - 1.27.1 - Version bump - Richard de Bruin - richdb@pisilinux.org - - - 2013-10-24 - 1.27 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2013-07-31 - 1.26 - Fix deps. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-23 - 1.26 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - bzip2 - http://www.bzip.org/ - - PisiLinux Community - admins@pisilinux.org - - BZIP2 - app:console - system.base - A high-quality data compressor - Yüksek kaliteli bir veri sıkıştırma uygulaması - bzip2 est un compresseur de données de très grand qualité. Il compresse typiquement les fichiers à un ratio entre 10 et 15% des meilleurs techniques disponibles (la famille des compresseurs statistiques de famille PPM) tout en étant environ deux fois plus rapide à la compression et six fois plus rapide à la décompression. - bzip2 is high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression. - bzip2 yüksek kaliteli bir veri sıkıştırma programıdır. Program genellikle dosyaları mümkün olan en iyi teknikler ile (PPM istatistiksel sıkıştırıcı ailesi) %10 - %15'e kadar sıkışıtırabilmektedir. Sıkıştırma işleminde iki kata kadar hızlı iken açma hızında yaklaşık altı kat daha hızlıdır. - bzip2 ist ein hochwertiger Daten-Kompressor. Es komprimiert Dateien üblicherweise auf 10% bis 15% der bestmöglichen Techniken (die PPM Familie der statistischen Kompressoren), während es ungefähr doppelt so schnell komprimiert und sechsfach schneller extrahiert - http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz - - bzip2-1.0.2-progress.patch - bzip2-1.0.4-bzip2recover.patch - bzip2-1.0.4-man-links.patch - bzip2-1.0.6-saneso.patch - manpath.patch - - system/base/bzip2/pspec.xml - - - bzip2 - - /bin - /lib - /usr/lib - /usr/share/doc - /usr/share/man - /usr/include - - - - - 2014-09-30 - 1.0.6 - Rebuild,cleanup, enable tests. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 1.0.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-28 - 1.0.6 - Release bump,clean bzip2. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-10-11 - 1.0.6 - First release - PisiLinux Community - admins@pisilinux.org - - - dbus @@ -12821,13 +14800,11 @@ D-Bus fourni à la fois un daemon système (pour les événements els que l'"ajout d'un nouveau périphérique" ou "file d'impression changée") et un daemon propre à chaque session utilisateur (pour les besoins généraux de communication entre processus utilisateurs). De plus, le bus de message est construit en se basant sur un framework (cadre de développement) de passage de message de un-vers-un pouvant être utilisé par n'importe quelles applications pour communiquer directement (sans passer par le daemon de bus de message). Pour l'instant les applications pouvant communiquer doivent être situées sur le même ordinateur, mais l'option TCP/IP est disponible et le support de processus distant est prévu. D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user-login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, but TCP/IP option is available and remote support planned. D-Bus, sistem ve kullanıcılar için olmak üzere iki tane artalan süreci (daemon) sunar. Mesaj yolu, bire bir mesaj geçiş araçları üzerine inşa edilmiştir. Bu sayede iki program birbiriyle bir mesaj yolu artalan süreci kullanmadan, direkt olarak haberleşebilir. Şu an için haberleşme araçları aynı bilgisayar üzerinde çalışabilmektedir, fakat TCP/IP ile uzaktan haberleşme de planlanmaktadır. - http://dbus.freedesktop.org/releases/dbus/dbus-1.9.10.tar.gz + http://dbus.freedesktop.org/releases/dbus/dbus-1.9.14.tar.gz expat-devel libX11-devel - doxygen libcap-ng-devel - xmlto system/base/dbus/pspec.xml @@ -12835,8 +14812,8 @@ dbus expat - libX11 libcap-ng + libX11 /etc/dbus-1 @@ -12858,13 +14835,24 @@ tmpfiles.conf + + dbus-x11 + x11.util + + libX11 + dbus + + + /usr/bin/dbus-launch + + dbus-devel Development files for dbus dbus için geliştirme dosyaları system.devel - dbus + dbus /usr/include @@ -12882,15 +14870,23 @@ emul32 expat-32bit + glibc-32bit - dbus + glibc-32bit /usr/lib32 + + 2015-05-11 + 1.9.14 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-02-15 1.9.10 @@ -12970,74 +14966,6 @@ - - - zip - http://www.info-zip.org/Zip.html - - PisiLinux Community - admins@pisilinux.org - - Info-ZIP - app:console - system.base - Info ZIP (encryption support) - ZIP programı (şifreleme desteği ile birlikte) - Zip est un outil de compression et d'archivage/packaging. Zip est utile pour distribuer un ensemble de fichier sous forme de paquets, et pour sauvegarder de l'espace disque en compressant temporairement les fichiers et répertoires inutilisés. - Zip is a compression and file packaging/archive utility. Zip is useful for packaging a set of files for distribution, for archiving files, and for saving disk space by temporarily compressing unused files or directories. - Zip bir sıkıştırma ve dosya paketleme/arşivleme uygulamasıdır. Zip dosyaları dağıtmak, arşivlemek ve kullanılmayan dosyaları ve dizinleri geçici olarak sıkıştırarak disk boşluğundan tasarruf için kullanılabilecek kullanışlı bir uygulamadır. - mirrors://sourceforge/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz - system/base/zip/pspec.xml - - - zip - - bzip2 - - - /usr/bin - /usr/share/doc - /usr/share/man - - - - - 2014-10-01 - 3.0 - Cleanup,rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 3.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 3.0 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-26 - 3.0 - Release bump for rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-10-11 - 3.0 - First release - Pisi Linux Admins - admins@pisilinux.org - - - libgpg-error @@ -13055,7 +14983,7 @@ GnuPG bileşenlerinin kullandığı hata değerleri için kitaplık libgpg-error is a library that defines common error values for all GnuPG components. libgpg-error, tüm GnuPG bileşenleri için ortak olan hata değerlerini tanımlayan bir kitaplıktır. - ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.12.tar.bz2 + ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.19.tar.bz2 system/base/libgpg-error/pspec.xml @@ -13064,6 +14992,8 @@ /usr/bin /usr/lib /usr/share/doc + /usr/share/info + /usr/share/man /usr/share/locale @@ -13073,10 +15003,10 @@ libgpg-error için geliştirme dosyaları system.devel - libgpg-error + libgpg-error - /usr/bin/*-config + /usr/bin/gpg-error-config /usr/include /usr/lib/pkgconfig /usr/lib32/pkgconfig @@ -13089,14 +15019,25 @@ libgpg-error için 32-bit paylaşımlı kitaplıklar emul32 emul32 + + glibc-32bit + - libgpg-error + libgpg-error + glibc-32bit /usr/lib32 + + 2015-04-13 + 1.19 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.12 @@ -13122,54 +15063,582 @@ - which - http://www.xs4all.nl/~carlo17/which/ + patch + http://www.gnu.org/software/patch/patch.html PisiLinux Community admins@pisilinux.org GPLv2 app:console - system.base - Prints the location of specified executable in your path - Verilen komutun çalıştırma yolundaki önceliğe göre yerini gösterir - which, localise un programme dans le chemin de l'utilisateur. - which , Locates a program file in the user's path. - which, kullanıcı dizinindeki program dosyalarının yarini bulur. - which, findet eine Anwendungsdatei im Benutzerverzeichnis - mirrors://gnu/which/which-2.20.tar.gz - - which-gentoo.patch - - system/base/which/pspec.xml + system.devel + Applies patch files + Yama dosyalarını uygular + Aplicación de archivos de parches + Permet d'appliquer un patch générer par la commande diff aux fichiers originels, obtenant ainsi les fichiers patchés. + Patch takes a patch file generated by diff command, and applies it to the original files, thus producing patched files. + Özgün dosyaları, diff komutu ile üretilmiş yama dosyasını uygulayarak, yeni biçimlerine çevirir. + Recibe una archivo de parche generado por el comando diff y lo aplica a los archivos originales, así produciendo archivos parcheados. + ftp://ftp.gnu.org/gnu/patch/patch-2.7.4.tar.xz + system/devel/patch/pspec.xml - which + patch + + attr + /usr/bin /usr/share/doc /usr/share/man + + + + + 2015-02-01 + 2.7.4 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-05-11 + 2.7.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 2.7.1 + Add patch. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 2.7.1 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-17 + 2.7.1 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-23 + 2.7 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + flex + http://flex.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + FLEX + app:console + system.devel + GNU lexical analyser generator + GNU sözcüksel analiz üreteci + Flex est un outil de génération d'analyseur (scanner). Un analyseur (également appelé tokenizer en anglais) est un programme qui repère les motifs lexicaux (ou lexème) dans du texte. + Flex is a tool for generating scanners. A scanner, sometimes called a tokenizer, is a program which recognizes lexical patterns in text + Flex, metin içindeki sözcüksel kalıpları tanıyan, analiz aracı üretecidir. + mirrors://sourceforge/flex/flex-2.5.39.tar.gz + + patch + + + flex-2.5.37-notex.patch + + system/devel/flex/pspec.xml + + + flex + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man /usr/share/info + /usr/include + /usr/share/locale + + + + + 2014-06-02 + 2.5.39 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-11 + 2.5.38 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 2.5.38 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-28 + 2.5.37 + Clean flex. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-18 + 2.5.37 + v.bump + PisiLinux Community + admins@pisilinux.org + + + 2012-07-14 + 2.5.35 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + xtrans + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + system.devel + Librairie trans de X.Org. + X.Org trans library + X.Org trans kitaplığı. + X.Org trans Bibliothek + xtrans includes a number of routines to make X implementations transport-independent. + xtrans, X gerçeklemelerini taşıma türünden bağımsız yapmak için kullanılan bazı yordamları içerir. + mirrors://xorg/individual/lib/xtrans-1.3.5.tar.bz2 + + util-macros + + system/devel/xtrans/pspec.xml + + + xtrans + + /usr/include/X11/Xtrans + /usr/share/aclocal + /usr/share/pkgconfig + + + + + 2015-05-05 + 1.3.5 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-07-11 + 1.3.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 1.3.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-05 + 1.3.3 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-01-17 + 1.3.2 + Version bump + Richard de Bruin + richdb@pisilinux.org + + + 2012-08-19 + 1.2.7 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + intltool + http://www.gnome.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.devel + Utility for internationalizing various kinds of data files + Çeşitli kaynak kod dosyalarından satırları ayıklamak için kullanılan betikler + Scripts d'extraction depuis divers fichiers sources de chaînes traduisibles. + intltool automatically extracts translatable strings from oaf, glade, bonobo ui, nautilus theme, .desktop files, etc. and puts them in the po files. + Çeşitli kaynak kod dosyalarından satırları ayıklamak için kullanılan betikler. + http://source.pisilinux.org/1.0/intltool-0.50.2.tar.gz + + perl + perl-XML-Parser + + system/devel/intltool/pspec.xml + + + intltool + + perl-XML-Parser + + + /usr/bin + /usr/share/aclocal + /usr/share/intltool + /usr/share/man + /usr/share/doc 2014-05-11 - 2.20 + 0.50.2 Release bump. Marcin Bojara marcin@pisilinux.org - 2013-10-28 - 2.20 - rebuild. + 2013-08-28 + 0.50.2 + Clean intltool. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-19 + 0.50.2 + First release Yusuf Aydemir yusuf.aydemir@pisilinux.org + + + + + cmake + http://www.cmake.org + + PisiLinux Community + admins@pisilinux.org + + BSD + app:console + system.devel + Cross-platform, open-source make system + Cmake, açık kaynak kodlu ve birden fazla platformda çalışan bir 'make' sistemidir. + CMake, système make open-source et multi-plateforme. CMake est utilisé pour contrôler le processus de compilation de logiciel en utilisant une plate-forme de fichiers de configuration simple et indépendante de compilateur. CMake génère des makefiles et un environnement de travail natifs pouvant être utilisés dans l'environnement du compilateur de votre choix. + CMake, the cross-platform, open-source make system. CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. + Cmake, açık kaynak kodlu ve birden fazla platformda çalışan bir 'make' sistemidir. Yazılım derleme sürecini kontrol etmek için kullanılan CMake, derleyici bağımsız yapılandırma dosyalarının oluşturulmasını sağlar. + http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz + + curl-devel + expat-devel + libarchive-devel + ncurses-devel + zlib-devel + + system/devel/cmake/pspec.xml + + + cmake + + curl + expat + libarchive + libgcc + ncurses + zlib + + + /usr/bin + /usr/share/cmake + /usr/share/aclocal/ + /usr/share/doc + /usr/share/man + + + + + 2015-04-17 + 3.2.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-04-04 + 3.2.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-02-27 + 3.1.3 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-12-17 + 3.0.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-08-23 + 3.0.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 2.8.12.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 2.8.12.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-12-11 + 2.8.12.1 + Fix finding freetype issue. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-11-24 + 2.8.12.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-23 + 2.8.12 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-08-28 + 2.8.11.2 + Clean cmake. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 2.8.10.2 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-17 + 2.8.10.2 + Version bump + Ertan Güven + ertan@pisilinux.org + - 2010-10-11 - 2.20 + 2012-12-01 + 2.8.10 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + pkgconfig + http://www.freedesktop.org/software/pkgconfig/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.devel + Package Config system that manages compile/link flags for libraries + Kütüphaneler için derleme bayraklarını yöneten bir paket yapılandırma sistemi + Sistema de configuración de paquetes que soporta banderas de compilación/link para librerías + Paquet de configuration système qui gère les fanions (flags) de compilation et chaînage (link) pour les librairies. Il aide à insérer les options adéquates dans la ligne de commande d'appel au compilateur. + Package Config system that manages compile/link flags for libraries. It helps you insert the correct compiler options on the command line. + Kütüphaneler için derleme bayraklarını yöneten, bir paket yapılandırma sistemi. Komut satırından, doğru derleme seçenekleri sunma olanağı sağlar + Sistema de configuración de paquetes que soporta banderas de compilación/link para librerías. Facilita la inserción de las opciones correctos de compilador en línea de comando + http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz + + gnuconfig + + system/devel/pkgconfig/pspec.xml + + + pkgconfig + + glib2 + + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/aclocal + /usr/share/pkgconfig + /usr/lib/pkgconfig + + + + + 2014-05-11 + 0.28 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-31 + 0.28 + Clean pkgconfig. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 0.28 + Fix deps. + PisiLinux Community + admins@pisilinux.org + + + 2013-02-18 + 0.28 + Fixed + PisiLinux Community + admins@pisilinux.org + + + 2012-09-15 + 0.27.1 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + libsigsegv + http://libsigsegv.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.devel + Une librairie pour gérer les erreurs de pagination en mode utilisateur. + A library for handling page faults in user mode + Oluşan bellek hatalarının kullanıcı kipinde işlenmesini sağlayan bir kitaplık + This is a library for handling page faults in user mode. A page fault occurs when a program tries to access to a region of memory that is currently not available. + libsigsegv, oluşan bellek hatalarının kullanıcı kipinde işlenmesini sağlayan bir kitaplıktır. + mirrors://gnu/libsigsegv/libsigsegv-2.10.tar.gz + system/devel/libsigsegv/pspec.xml + + + libsigsegv + + /usr/lib + /usr/share/doc + + + + libsigsegv-devel + Development files for libsigsegv + libsigsegv için geliştirme dosyaları + + libsigsegv + + + /usr/include + + + + + 2014-05-11 + 2.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-15 + 2.10 + Release bump + Burak Ertürk + burakerturk@pisilinux.org + + + 2013-10-22 + 2.10 + Rebuild. + Pisi Linux Admins + admins@pisilinux.org + + + 2011-12-09 + 2.10 First release Pisi Linux Admins admins@pisilinux.org @@ -13178,29 +15647,2915 @@ - disktype - http://disktype.sourceforge.net/ + gcc + http://gcc.gnu.org + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv3+ + LGPLv3+ + app:console + library + system.devel + The GNU Compiler Collection, includes C, C++, Objective-C and Fortran compilers + C/C++ ve Fortran derleyicisi + La collection de compilateurs GNU inclus des façades pour le C, C++, Objective-C, Fortran, hava et Ada ainsi que des librairies pour ces langages (libstdc++, libgcj...) + The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, as well as libraries for these languages + C, C++, Objective-C, Fortran programlama dilleri ile bu dillere ait kütüphaneleri içeren, GNU derleyici paketi + ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.2/gcc-4.9.2.tar.bz2 + + binutils + bison + gettext + ncurses + zlib + gnuconfig + patch + sed + texinfo + gmp + mpfr + libmpc + ppl + cloog + isl + elfutils + + + pisilinux/64.patch + gcc-4.9-isl-0.13-hack.patch + pisilinux/gcc-4.8-filename-output.patch + pisilinux/gcc_47_based-record_gcc_options.patch + + system/devel/gcc/pspec.xml + + + libquadmath + The GNU Fortran Compiler Quadmath Runtime Library + library + system.base + + /usr/lib/libquadmath.so* + /usr/lib/libquadmath.spec* + /usr/lib32/libquadmath.so* + /usr/lib32/libquadmath.spec* + /usr/share/info/libquadmath.info + + + + libgcc + Contains a shared library of support routines used by GCC's runtime, and thus by every program on the system + library + system.base + + /etc + /usr/lib/libstdc++.so* + /usr/lib/libgcc_s.so* + /usr/lib32/libstdc++.so* + /usr/lib32/libgcc_s.so* + /usr/share/gcc-* + /usr/share/gdb + + + + libgomp + Contains GCC shared support library which is needed for OpenMP 2.5 support + library + + /usr/lib/libgomp.so* + /usr/lib/libgomp.spec* + /usr/lib32/libgomp.so* + /usr/lib32/libgomp.spec* + /usr/share/info/libgomp.info + + + + libgfortran + Contains GCC shared support library for gfortran + library + + libquadmath + + + /usr/lib/libgfortran.so* + /usr/lib32/libgfortran.so* + + + + libobjc + Contains GCC shared support library for objc + library + + /usr/lib/libobjc.so* + /usr/lib32/libobjc.so* + + + + gcc-l10n + Contains available GCC localization files, includes also turkish translations + system.locale + + gcc + + + /usr/share/locale + + + + gcc + + gmp + isl + mpfr + cloog + libmpc + + + /lib + /usr/bin + /usr/lib + /usr/lib32 + /usr/libexec + /usr/include + /usr/share/man + /usr/share/info + + + gfilt + gSTLFilt.pl + + + + + 2014-11-28 + 4.9.2 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-12 + 4.9.1 + Rebuild for new glibc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-06 + 4.9.1 + Version bump, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 4.9.0 + Rebuild, add patch. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-04-28 + 4.9.0 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-04-01 + 4.8.2 + Rebuild for dependency changes. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-11-11 + 4.8.2 + backport ICE fix + http://gcc.gnu.org/bugzilla//show_bug.cgi?id=56710 - commit 3d1f8279 + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653 + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-22 + 4.8.2 + Cleanup, version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-14 + 4.8.1 + Rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-23 + 4.8.1 + Version bump, cleanup patches. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-10-14 + 4.7.2 + Cleanup package, add some patches. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-14 + 4.7.2 + First release + Erdem Artan + admins@pisilinux.org + + + + + + perl-XML-Parser + http://search.cpan.org/dist/XML-Parser/ + + PisiLinux Community + admins@pisilinux.org + + Artistic + library + system.devel + A Perl extension interface to James Clark's XML parser, expat + James Clark'ın XML ayırıştırıcısına bir Perl uzantısı arayüzü + Una extensión Perl al parseador XML de James Clark, expat + This module provides an interface to James Clark's XML parser, expat. As in expat, a single instance of the parser can only parse one document. Calls to parsestring after the first for a given instance will die. + Bu modül James Clark'ın XML ayrıştırıcısı expat için bir arayüz sağlar. Expat'ta olduğu gibi ayrıştırıcıdan türetilen her nesne sadece bir dosyayı ayrıştırabilir. + Este módulo facilita una interfaz al parser XML de James Clark, expat. Como en expat, una sola instancia del parser puede analizar solamente un documento. Llamadas a parsestring después del primero de una instancia determinada morirán. + mirrors://cpan/authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz + + expat-devel + perl + + system/devel/perl-XML-Parser/pspec.xml + + + perl-XML-Parser + + expat + perl + + + /usr/share/doc + /usr/lib + /usr/share/man + + + + + 2014-09-12 + 2.41 + Release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 2.41 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-28 + 2.41 + New release. + Serdar Soytetir + kaptan@pisilinux.org + + + 2011-12-09 + 2.41 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + python-setuptools + http://pypi.python.org/pypi/setuptools + + PisiLinux Community + admins@pisilinux.org + + PSF-2.2 + library + system.devel + Python setuptools + Python kurulum araçları + python-setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages. + python-setuptools, Python distutils'e yapılan, özellikle başka paketlere bağımlılığı olan Python paketlerini daha kolay oluşturmaya ve dağıtmaya yarayan iyileştirmeler koleksiyonudur. + http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz + system/devel/python-setuptools/pspec.xml + + + python-setuptools + + /usr/bin + /usr/lib/python* + /usr/share/doc + + + + + 2014-05-11 + 0.6.49 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-24 + 0.6.49 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-17 + 0.6.35 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-08-19 + 0.6.28 + First release + Ramazan Utku + admins@pisilinux.org + + + + + + gobject-introspection + http://live.gnome.org/GObjectIntrospection + + Pisi Linux Admins + admins@pisilinux.org + + LGPLv2+ + GPLv2+ + library + app:console + system.devel + Introspection system for GObject-based libraries + gobject-introspection can scan C header and source files in order to generate introspection typelib files. It also provides an API to examine typelib files, useful for creating language bindings among other things. + mirrors://gnome/gobject-introspection/1.44/gobject-introspection-1.44.0.tar.xz + + cairo-devel + python-devel + python-mako + glib2-devel + + system/devel/gobject-introspection/pspec.xml + + + gobject-introspection + + libffi + glib2 + + + /usr/lib/lib*.so* + /usr/lib/girepository-1.0/*.typelib + /usr/share/locale + /usr/share/doc + + + + gobject-introspection-devel + Development files for gobject-introspection + + gobject-introspection + + + /usr/include + /usr/lib/gobject-introspection + /usr/bin/g-ir-* + /usr/lib/pkgconfig + /usr/share/gir-1.0 + /usr/share/aclocal + /usr/share/gobject-introspection-1.0 + /usr/share/man + + + + + 2015-04-06 + 1.44.0 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-05-11 + 1.40.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-14 + 1.40.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-04-06 + 1.38.0 + Rebuild + Varol Maksutoğlu + waroi@pisilinux.org + + + 2014-02-01 + 1.38.0 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-10.12 + 1.38.0 + V.Bump + PisiLinux Community + admins@pisilinux.org + + + 2013-07-24 + 1.37.4 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-04-07 + 1.36.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-24 + 1.35.8 + V.Bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-02-04 + 1.35.4 + New version bump to 1.35.4. + Idris Kalp + admins@pisilinux.org + + + 2012-12-31 + 1.34.2 + First release + Idris Kalp + yaralikurt15@hotmail.com + + + + + + glpk + http://www.gnu.org/software/glpk/glpk.html + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2 + library + system.devel + GNU Linear Programming Kit + GNU Doğrusal Programlama Kiti + Le paquet GLPK (GNU Linear Programming Kit - Kit de Programmation Linéaire) a pour objectif de résoudre le problème de programmation linéaire (LP) de grande envergure, la programmation d'entiers mixés (MIP), et autres problèmes de la sorte. Il s'agit d'un ensemble de routines écrites en C ANSI et organisées de manière à former une librairie que l'on peut appeler. + The GLPK (GNU Linear Programming Kit) package is intended for solving large-scale linear programming (LP), mixed integer programming (MIP), and other related problems. It is a set of routines written in ANSI C and organized in the form of a callable library. + mirrors://gnu/glpk/glpk-4.55.tar.gz + system/devel/glpk/pspec.xml + + + glpk + + /usr/bin + /usr/lib + /usr/share/doc + + + + glpk-devel + Development files for glpk + glpk için geliştirme dosyaları + + glpk + + + /usr/include + + + + + 2014-09-06 + 4.55 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 4.54 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-02-27 + 4.52 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-08-28 + 4.52 + Version bump, clean glpk. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-18 + 4.48 + v.bump + PisiLinux Community + admins@pisilinux.org + + + 2012-08-16 + 4.47 + First release + Ramazan Utku + admins@pisilinux.org + + + + + + binutils + http://www.gnu.org/software/binutils/ + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2 + app:console + system.devel + Assembler and linker tools + Makine dili derleme ve bağlama araçları + Contient des commandes telles que as, ld, nm, objdump, ar, ranlib pour compiler du code assembleur en langage machine ainsi que pour chaîner (link) et manipuler les fichiers binaires objets. + Contains commands like as, ld, nm, objdump, ar, ranlib for compiling assembly code to the machine language, and for linking and manipulating the binary object files. + Assembly kodlarını makine diline derlemek, oluşan obje dosyalarını bağlamak ve ikili dosyalar üzerinde işlemler yapmak için kullanılan as, ld, nm, objdump, ar, ranlib gibi komutları içermektedir. + http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2 + + glibc-32bit + + + binutils-2.25-roundup.patch + + system/devel/binutils/pspec.xml + + + binutils + + zlib + + + /usr/bin + /usr/lib + /usr/include + /usr/share/info + /usr/share/man + + + + + 2015-03-09 + 2.25 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-11-28 + 2.24 + Fix CVE issues. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-12 + 2.24 + Rebuild for new glibc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-06 + 2.24 + Rebuild for new gcc, add pie and lto testsuite patch. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-14 + 2.24 + Add upstream patch. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-30 + 2.24 + Rebuild for new gcc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-03-29 + 2.24 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 2.23.2 + Back to 2.23.2, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-23 + 2.23.52.0.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-16 + 2.23.51.0.9 + New release. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-16 + 2.23.51.0.8 + New toolchain up. + Erdinç Gültekin + admins@pisilinux.org + + + + + + guile + http://www.gnu.org/software/guile/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + LGPLv2+ + app:console + library + system.devel + Interpréteur et librairie GNU Scheme. + GNU Scheme interpreter and library + GNU Scheme yorumlayıcısı ve kitaplığı + Język GNU Extension language. + GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library implementation of the Scheme programming language, written in C. GUILE provides a machine-independent execution platform that can be linked in as a library during the building of extensible programs. + mirrors://gnu/guile/guile-2.0.11.tar.xz + + gc-devel + gettext-devel + gmp-devel + + system/devel/guile/pspec.xml + + + guile + + gc + gmp + libffi + libtool-ltdl + libunistring + readline + + + /etc + /usr/share/doc + /usr/share/man + /usr/bin + /usr/share/info + /usr/lib/lib* + /usr/share/guile + /usr/share/emacs + /usr/share/gdb/auto-load + /usr/lib/guile/2.0 + + + + guile-devel + Development files for guile + guile için geliştirme dosyaları + Pliki nagłówkowe guile. + + guile + + + /usr/include + /usr/lib/pkgconfig + /usr/share/aclocal + /usr/bin/guile-snarf + /usr/bin/guile-config + + + + + 2014-11-30 + 2.0.11 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-24 + 2.0.11 + Rebuild for gcc. + PisiLinux Community + admins@pisilinux.org + + + 2014-05-11 + 2.0.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-25 + 2.0.9 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-08-27 + 2.0.9 + Clean guile. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-22 + 2.09 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-18 + 2.0.7 + v.bump + PisiLinux Community + admins@pisilinux.org + + + 2012-10-03 + 2.0.6 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + automake + http://www.gnu.org/software/automake/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2+ + app:console + system.devel + A tool for automatically generating Makefile.in files compliant with the GNU Coding Standards + Makefile.am yapılandırma dosyalarından Makefile.in dosyası üreten program + Automake est un outil de génération automatique de Makefiles compatibles avec les standards de Codage GNU. Vous aurez également besoin d'installer le paquet GNU AutoConf + Automake is a tool for automatically generating Makefile.in files compliant with the GNU Coding Standards. + Makefile.am yapılandırma dosyalarından GNU kodlama standartlarına uygun Makefile.in dosyası üreten program. Bununla birlikte Autoconf paketini de yüklemelisiniz. + mirrors://gnu/automake/automake-1.15.tar.xz + + perl + autoconf + gnuconfig + patch + + system/devel/automake/pspec.xml + + + automake + + perl + autoconf + + + /usr/bin + /usr/share/automake-* + /usr/share/aclocal-* + /usr/share/aclocal + /usr/share/info + /usr/share/doc + /usr/share/man + + + + + 2015-01-28 + 1.15 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-11-30 + 1.14 + Rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 1.14.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-30 + 1.14.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 1.14 + Clean automake. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-22 + 1.14 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-16 + 1.13.1 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-08-13 + 1.12.2 + First release + Ramazan Utku + admins@pisilinux.org + + + + + + btyacc + http://www.siber.com/btyacc + + PisiLinux Community + admins@pisilinux.org + + freedist + app:console + system.devel + Backtracking YACC - modified from Berkeley YACC + This is original Berkeley Yacc modified to better fit production environment (and to have less bugs, too). + http://www.siber.com/btyacc/btyacc-3-0.tar.gz + + btyacc-3.0-includes.patch + btyacc-3.0-makefile.patch + + system/devel/btyacc/pspec.xml + + + btyacc + + /usr/bin + /usr/share/man + /usr/share/doc + + + + + 2014-05-11 + 3.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-13 + 3.0 + Release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-15 + 3.0 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + libseccomp + http://sourceforge.net/projects/libseccomp/ + + Aydın Demirel + aydin.demirel@pisilinux.org + + LGPLv2.1 + app:library + system.devel + Enhanced seccomp library + Gelişmiş seccomp kütüphanesi + High level interface to the Linux Kernel's seccomp filter. + Linux Kernel'in seccomp süzgecine yüksek seviyeli arayüz + http://downloads.sourceforge.net/project/libseccomp/libseccomp-2.1.1/libseccomp-2.1.1.tar.gz + + glibc + + system/devel/libseccomp/pspec.xml + + + libseccomp + + /usr/bin + /usr/share/man + /usr/lib/* + + + + libseccomp-devel + + /usr/include + + + + + 2014-06-27 + 2.1.1 + First release + Aydın Demirel + aydin.demirel@pisilinux.org + + + + + + libtool + http://www.gnu.org/software/libtool/libtool.html + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2 + library + system.devel + A shared library tool for developers + Program geliştiriciler için ortak kütüphane aracı + Libtool est une librairie utilitaire partagée pour développeurs. + Libtool is a shared library tool for developers. + Libtool, program geliştiriciler için bir paylaşımlı kütüphane aracıdır. + mirrors://gnu/libtool/libtool-2.4.2.tar.xz + + gnuconfig + autoconf + automake + + system/devel/libtool/pspec.xml + + + libtool-ltdl + system.base + + /usr/lib + + + + libtool + + gnuconfig + + + /usr/bin + /lib + /usr/share/doc + /usr/share/info + /usr/share/man + /usr/include + /usr/share/libtool + /usr/share/aclocal + + + + libtool-ltdl-32bit + 32-bit shared libraries for libtool-ltdl + libtool için 32-bit paylaşımlı kitaplıklar + emul32 + emul32 + + libtool-ltdl + + + /usr/lib32 + + + + + 2014-11-28 + 2.4.2 + Rebuild for new gcc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-12 + 2.4.2 + Rebuild for new gcc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 2.4.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 2.4.2 + Clean libtool. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-07-14 + 2.4.2 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + autoconf + http://www.gnu.org/software/autoconf/autoconf.html + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + system.devel + Used to create autoconfiguration files + Used to create autoconfiguration files, Autoconf is an extensible package of m4 macros that produce shell scripts to automatically configure software source code packages. + mirrors://gnu/autoconf/autoconf-2.69.tar.xz + + texinfo + m4 + perl + + system/devel/autoconf/pspec.xml + + + autoconf + + texinfo + m4 + + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/autoconf + + + + + 2014-11-30 + 2.69 + Rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 2.69 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 2.69 + Clean autoconf. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-07-14 + 2.69 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + icecream + http://en.opensuse.org/Icecream + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + service + system.devel + Distributed C(++) compiling tool + Dağıtık C(++) derleme aracı + Herramienta de compilación C(++) distribuida + Icecream est un programme de compilation de code C/C++ distribuée sur plusieurs machines basé sur le code et les idées directrices de distcc. + Icecream is a program for distributed compiling of C/C++ code across several machines based on ideas and code by distcc. + Icecream; C/C++ kaynak kodunun, birden fazla makinede dağıtık olarak derlenmesi fikrine dayanan, "distcc" kodu temelinde yazılmış bir uygulamadır. + Icecream es un programa para compilación de código C/C++ distribuida en varios servidores, basado en ideas y código de distcc. + ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.1.tar.bz2 + + librsync-devel + + system/devel/icecream/pspec.xml + + + icecream + + librsync + libgcc + libcap-ng + + + /opt/icecream/sbin/iceccd + /opt/icecream/bin/icecc + /usr/libexec/icecc + /opt/icecream/lib + /opt/icecream/bin + /opt/icecream/include/ + /usr/share/doc + /usr/share/icecc + /usr/share/man + /lib/systemd/system/icecream-daemon.service + + + System.Service + + + icecream-daemon.service + + + + icecream-scheduler + Icecream scheduler which should only run on the master icecream node + + icecream + libgcc + + + /opt/icecream/sbin/icecc-scheduler + /lib/systemd/system/icecream-scheduler.service + + + System.Service + + + icecream-scheduler.service + + + + + 2014-05-11 + 1.0.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-22 + 1.0.1 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-24 + 1.0.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-18 + 0.9.98.3 + v.bump + PisiLinux Community + admins@pisilinux.org + + + 2012-10-09 + 0.9.7 + First release + Erdem Artan + admins@pisilinux.org + + + + + + libmpc + http://www.multiprecision.org/ + + Serdar Soytetir + kaptan@pisilinux.org + + LGPLv2.1 + library + system.devel + High precision and correct rounding library + Yüksek hassasiyet ve yuvarlama kitaplığı + libmpc is a library for arithmetic of complex numbers with arbitrarily high precision and correct rounding. + libmpc aritmetik kompleks sayılarla yüksek hassasiyette ve doğru yuvarlama ile işlem yapılmasını sağlayan bir kitaplıktır. + ftp://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz + + gmp-devel + mpfr-devel + + system/devel/libmpc/pspec.xml + + + libmpc + + gmp + mpfr + + + /usr/lib + /usr/share/doc/libmpc + /usr/share/info + + + + libmpc-devel + Development files for libmpc + libmpc için geliştirme dosyaları + + libmpc + + + /usr/include + + + + + 2015-03-08 + 1.0.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-09-06 + 1.0.2 + Rebuild with new mpfr for new gcc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 1.0.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-30 + 1.0.2 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 1.0.1 + Clean libpmc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-09 + 1.0.1 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + libarchive + http://code.google.com/p/libarchive/ + + PisiLinux Community + admins@pisilinux.org + + BSD + library + system.devel + Library for reading and writing streaming archives + Birçok farklı akış arşiv formatını yaratan ve okuyan programlama kitaplığı + libarchive includes a library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats. + libarchive, tar, cpio, zip, ISO ve diğer arşiv biçimlerini okumak ve yazmak için bir kitaplık ve komut satırı araçları içerir. + http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz + + acl-devel + attr-devel + bzip2 + libxml2-devel + openssl-devel + xz-devel + lzo-devel + zlib-devel + + system/devel/libarchive/pspec.xml + + + libarchive + + lzo + nettle + xz + acl + zlib + attr + bzip2 + libxml2 + + + /usr/lib + /usr/share/man + /usr/share/doc/libarchive + + + + libarchive-devel + Development files for libarchive + libarchive için geliştirme dosyaları + + libarchive + + + /usr/include + /usr/lib/pkgconfig + /usr/share/man/man3 + + + + + 2014-05-11 + 3.1.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-28 + 3.1.2 + unused fix. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-08-28 + 3.1.2 + Clean libarchive. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 3.1.2 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-18 + 3.1.2 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-08-19 + 3.0.4 + First release + Ramazan Utku + admins@pisilinux.org + + + + + + gmp + http://gmplib.org/ + + Serdar Soytetir + kaptan@pisilinux.org + + LGPLv3+ + library + system.devel + Arbitrary precision arithmetic library + İstenilen duyarlıkta çalışabilen aritmetik işlem kitaplığı + GMP est une librairie libre pour l'arithmétique à précision arbitraire, opérant sur : les entiers signés, les nombres rationnels et les nombres à virgule flottante. Il n'y a aucune limite pratique sur la précision des calculs exceptée celle impliquée par la mémoire présente sur la machine exécutant GMP. GMP est dotée d'un large panel de fonctions, dotées d'interfaces régulières. + GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There is no practical limit to the precision except the ones implied by the available memory in the machine GMP runs on. GMP has a rich set of functions, and the functions have a regular interface. + GMP işaretli tamsayılar, rasyonel ve ondalık sayılar üzerinde istenilen kadar duyarlı aritmetik işlemler yapan bir kitaplıktır. Yüklü olduğu makinenin hafıza sınırı dışında herhangi bir duyarlılık limiti yoktur. Zengin fonksiyonları ve düzenli bir arabirimi vardır. + GMP es una librería libre para aritmética con precisión arbitraria, operando con signed integers, números racionales, y punto flotante. Practicamente no hay límite de precisión excepto los de la memoria disponible en el equipo donde se está ejecutando GMP. GMP tiene un amplio conjunto de funciones y las funciones tienen una interfaz regular. + mirrors://gnu/gmp/gmp-6.0.0a.tar.xz + system/devel/gmp/pspec.xml + + + gmp + + libgcc + + + /usr/lib + /usr/share/doc + /usr/share/info + + + + gmp-devel + Development files for gmp + gmp için geliştirme dosyaları + + gmp + + + /usr/include + /usr/lib/*.a + + + + gmp-32bit + 32-bit shared libraries for gmp + emul32 + emul32 + + glibc-32bit + + + gmp + + + /usr/lib32 + + + + + 2014-09-06 + 6.0.0 + Rebuild with new options, fix version number. + Clean up actions.py, remove unneeded lines, we have auto-emul32 :) + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 6.0.0a + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-01 + 6.0.0a + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-22 + 5.1.3 + Minor version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 5.1.2 + Clean gmp. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-23 + 5.1.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-16 + 5.1.1 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-30 + 5.0.5 + First release + Erdem Artan + admins@pisilinux.org + + + + + + dietlibc + http://www.fefe.de/dietlibc + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.devel + A libc optimized for small size + Düşük boyut için optimize edilmiş C kütüphanesi + dietlibc is a libc that is optimized for small size. It can be used to create small statically linked binaries for Linux on various architectures. + dietlibc, düşük boyutlu olması için optimize edilmiş bir C kütüphanesidir. Farklı mimarilerde statik bağlanmış ve düşük boyutlu ikili dosyalar oluşturmak için kullanılabilir. + http://pkgs.fedoraproject.org/repo/pkgs/dietlibc/dietlibc-0.33.20120825.tar.xz/016865b8c40d40a57b2ddb5862f2e338/dietlibc-0.33.20120825.tar.xz + http://pkgs.fedoraproject.org/repo/pkgs/dietlibc/dietlibc-github-c3f1cf67fcc186bb859e64a085bf98aaa6182a82.patch.gz/734e14b59b7f017ae5843ee9b9b6d34e/dietlibc-github-c3f1cf67fcc186bb859e64a085bf98aaa6182a82.patch.gz + + dietlibc-0.33-biarch.patch + + system/devel/dietlibc/pspec.xml + + + dietlibc + + /usr/bin + /usr/lib/dietlibc/include + /usr/lib/dietlibc/lib-i386 + /usr/lib/dietlibc/lib-x86_64 + /usr/share/man + /usr/share/doc + + + + + 2014-05-11 + 0.33.20120825 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-03 + 0.33.20120825 + Version bump + Marcin Bojara + marcin@pisilinux.org + + + 2010-10-11 + 0.32 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + util-macros + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + system.devel + Macros X.Org utilisées pour compiler X.Org + X.Org X11 Autotools macros + X.Org X11 Autotools makroları + X.Org Makros zum Kompilieren von X.Org + X.Org X11 autotools macros are required for building the various packages that comprise the X Window System. + X.Org X11 Autotools makroları, X pencere sistemini oluşturan çeşitli paketleri derlemek için gereklidir. + http://xorg.freedesktop.org/releases/individual/util/util-macros-1.19.0.tar.bz2 + + doc.patch + + system/devel/util-macros/pspec.xml + + + util-macros + + /usr/share/aclocal + /usr/share/pkgconfig + /usr/share/doc + + + + + 2014-07-11 + 1.19.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 1.18.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 1.18.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-08 + 1.17.1 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-12 + 1.17.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-08-19 + 1.17 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + elfutils + http://www.redhat.com/ + + PisiLinux Community + admins@pisilinux.org + + OpenSoftware + app:console + library + system.devel + Libraries/utilities to handle ELF objects + Derlenmiş objeleri işlemek için gereken aletler koleksiyonu + elfutils contains libraries and utilities to handle ELF objects and is a replacement for libelf. + elfutils derlenmiş objeleri işlemek için gereken çeşitli araçlar içerir. + https://fedorahosted.org/releases/e/l/elfutils/0.161/elfutils-0.161.tar.bz2 + + bzip2 + xz-devel + zlib-devel + + system/devel/elfutils/pspec.xml + + + elfutils + + xz + zlib + bzip2 + libgcc + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/include + + + + + 2015-04-09 + 0.161 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-11-23 + 0.160 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 0.158 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-29 + 0.158 + Add upstream patch. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-22 + 0.158 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-08-27 + 0.156 + Clean elfutils. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 0.156 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-16 + 0.155 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-07-30 + 0.154 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + xorg-util + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + app:console + system.devel + Utilitaires de X.Org + X.Org utilities + X.Org araçları + X.Org Werkzeuge + xorg-util contains some Xorg X11 command-line utilities, but more importantly, X11 configuration and rule files. + mirrors://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 + mirrors://xorg/individual/util/imake-1.0.7.tar.bz2 + mirrors://xorg/individual/util/lndir-1.0.3.tar.bz2 + mirrors://xorg/individual/util/makedepend-1.0.5.tar.bz2 + mirrors://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2 + + host-defaults.patch + + system/devel/xorg-util/pspec.xml + + + xorg-util + + /usr/bin + /usr/share/X11/config + /usr/share/man + + + + + 2014-08-31 + 7.6 + Update. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 7.6 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 7.6 + Release bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-08-19 + 7.6 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + xcb-proto + http://xcb.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + data + system.devel + XCB protocol descriptions + XCB protokol tanımlamaları + XCB is a project to enable efficient language bindings to the X11 protocol. This package contains the protocol descriptions themselves. Language bindings use these protocol descriptions to generate code for marshalling the protocol. + http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2 + + libxml2 + + system/devel/xcb-proto/pspec.xml + + + xcb-proto + + /usr/lib/pkgconfig + /usr/lib/python* + /usr/share/doc + /usr/share/xcb + + + + + 2014-09-02 + 1.11 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 1.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-03 + 1.10 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-22 + 1.8 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-11-18 + 1.8 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-11-18 + 1.8 + First release + Erdinç Gültekin + admins@pisilinux.org + + + + + + ccache + http://ccache.samba.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + app:console + system.devel + Fast C/C++ compiler cache + Hızlı C/C++ derleme önbelleği + Cache veloz de compilador + Cache de Compilation rapide + ccache is a compiler cache. It speeds up recompilation of C/C++ code by caching previous compiles and detecting when the same compile is being done. + ccache bir derleme önbelleğidir. Önceki derlemeleri önbelleğinde saklayıp, aynı derlemelerde bu önbelleği kullanarak C/C++ kodlarının yeniden derlenmelerini hızlandırır. + http://samba.org/ftp/ccache/ccache-3.2.tar.xz + + zlib-devel + + system/devel/ccache/pspec.xml + + + ccache + + gcc + zlib + + + /usr/bin + /usr/lib/ccache/bin + /usr/share/doc + /usr/share/man + + + + + 2014-11-23 + 3.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 3.1.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-22 + 3.1.9 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 3.1.9 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-16 + 3.1.9 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-12-15 + 3.1.8 + First release + canatan + admins@pisilinux.org + + + + + + chrpath + http://freshmeat.net/projects/chrpath/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.devel + Change the dynamic library load path (rpath) of binaries + Dinamik kitaplık yükleme yolunu (rpath) değiştirme aracı + chrpath allows you to modify the dynamic library load path (rpath and runpath) of compiled programs and libraries. + chrpath ile derlenmiş kitaplıkların ve programların dinamik kitaplık yükleme yolunu (rpath ve runpath) değiştirebilirsiniz. + http://source.pisilinux.org/1.0/chrpath-0.16.tar.gz + + docdir.patch + + system/devel/chrpath/pspec.xml + + + chrpath + + /usr/bin + /usr/share/doc + /usr/share/man + + + + + 2014-05-11 + 0.16 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 0.16 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-28 + 0.13 + Clean chrpath + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-07-14 + 0.13 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + yasm + http://www.tortall.net/projects/yasm/ + + PisiLinux Community + admins@pisilinux.org + + BSD + GPLv2 + LGPLv2 + Artistic + app:console + system.devel + Assembler that supports many syntaxes and architectures + Bir çok sentaks ve mimari destekleyen Assembler + A complete rewrite of the NASM assembler under the "new" BSD License. Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats and generates source debugging information in STABS, DWARF 2, and CodeView? 8 formats. + NASM Assembler programının yeni BSD lisansı ile baştan yazılmış bir Assembler. En önemli özellikleri x86 ve AMD64 komutsetlerini, NASM ve GAS sentaksını desteklemesidir. İkilik, ELF32, ELF64, 32 ve 64-bit Mach-O, RDOFF2, COFF, Win32 ve Win64 obje formatlarında çıktı üretebilir, hata ayıklamak için STABS, DWARF 2 ve CodeView? 8 formatlarını desteklemektedir. + http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz + system/devel/yasm/pspec.xml + + + yasm + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man + + + + yasm-devel + Development files for yasm + yasm için geliştirme dosyaları + + yasm + + + /usr/include + /usr/lib/libyasm.a + + + + + 2014-05-11 + 1.2.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-22 + 1.2.0 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2011-12-09 + 1.2.0 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + quilt + http://savannah.nongnu.org/projects/quilt + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.devel + Scripts for working with series of patches + Yama serileriyle çalışmak için betik araçları + quilt allow one to manage a series of patches by keeping track of the changes each patch makes. + quilt, yamaları yığın yapısına göre düzenleyen, kolayca yama uygulamayı ve kaldırmayı sağlayan bir yama yönetim uygulamasıdır. + http://mirror.rackdc.com/savannah/quilt/quilt-0.64.tar.gz + + gawk + gettext + util-linux + + system/devel/quilt/pspec.xml + + + quilt + + diffstat + + + /etc + /usr/bin + /usr/lib + /usr/share/locale + /usr/share/man + /usr/share/doc + /usr/share/quilt + + + + + 2015-03-01 + 0.64 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-05-11 + 0.61 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 0.61 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-31 + 0.60 + Clean quilt. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-05-30 + 0.60 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + cloog + http://www.cloog.org/ + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2+ + app:console + library + system.devel + Chunky Loop Generator + cloog is CLooG is a free software and library to generate code for scanning Z-polyhedra. It is used by the GCC Graphite optimization framework. + http://www.bastoul.net/cloog/pages/download/cloog-0.18.1.tar.gz + + gmp-devel + ppl-devel + isl-devel + + + cloog-0.18.1-isl-compat.patch + + system/devel/cloog/pspec.xml + + + cloog + + gmp + isl + + + /usr/bin + /usr/lib + /usr/share/doc/cloog/ + /usr/share/info + + + + cloog-devel + Development files for cloog + + cloog + + + /usr/include + /usr/lib/pkgconfig/cloog.pc + + + + + 2014-09-06 + 0.18.1 + Rebuild for new isl and new toolchain. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 0.18.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 0.18.1 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 0.18.0 + Clean cloog. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-26 + 0.18.0 + Move pc files to devel pack, rebuild. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-04-23 + 0.18.0 + Dep fixed + PisiLinux Community + admins@pisilinux.org + + + 2012-02-16 + 0.18.0 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-06-22 + 0.17.0 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + unifdef + http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/unifdef/ PisiLinux Community admins@pisilinux.org BSD app:console - system.base - Detect the content format of a disk or disk image - Disk veya disk görüntüsünün biçimsel içeriğini saptar - The purpose of disktype is to detect the content format of a disk or disk image. It knows about common file systems, partition tables, and boot codes.The program is written in C and is designed to compile on any modern Unix flavour. - Disktype'ın amacı disk veya disk görüntüsünün içerik yapısını denetlemektir. Yaygın dosya sistemlerini, bölümleme tablolarını ve önyükleme kodlarını bilir. C dilinde yazılmış, herhangi bir modern Unix derleme tadında tasarlanmıştır. - mirrors://sourceforge/disktype/disktype-9.tar.gz - - disktype.patch - vfat.patch - ext4.patch - - system/base/disktype/pspec.xml + system.devel + The unifdef utility selectively processes conditional cpp(1) directives + L'utilitaire unifdef traite sélectivement les directives conditionnelles cpp(1). Il supprime d'un fichier les directives ainsi que le texte additionnel qu'elles indiquent comme à supprimer tout en laissant le reste du fichier intact. + The unifdef utility selectively processes conditional cpp(1) directives. It removes from a file both the directives and any additional text that they specify should be removed, while otherwise leaving the file alone. + http://dotat.at/prog/unifdef/unifdef-2.10.tar.gz + system/devel/unifdef/pspec.xml - disktype + unifdef + + /usr/bin + /usr/share/man + /usr/share/doc/unifdef + + + + + 2014-05-11 + 2.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 2.10 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-24 + 2.9 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-09-17 + 2.6 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + scons + http://www.scons.org + + PisiLinux Community + admins@pisilinux.org + + MIT + app:console + system.devel + An Open Source software construction tool + Python temelli, esnek, geliştirilebilir inşa aracı + Utilitaire extensible écrit en python. On peut considérer SCons comme un substitut amélioré multi-plateforme de Make intégrant des fonctionnalités similaires à celles d'autoconf/automake et un gestionnaire de cache de compilateur tel ccache. + Think of SCons as an improved, cross-platform substitute for the classic Make utility with integrated functionality similar to autoconf/automake and compiler caches such as ccache. + Python temelli, esnek, geliştirilebilir inşa aracı. SCons, klasik "make" aracına "autconf/automake" özellikleri ve "ccache" gibi derleyici önbelleği eklenmiş, gelişmiş bir araç olarak düşünülebilir. + mirrors://sourceforge/scons/scons-2.3.1.tar.gz + + python + + + scons-1.0.0-qt-handle-missing-moc-files.patch + fix-gnu-link-handling.patch + + system/devel/scons/pspec.xml + + + scons + + python + + + /usr/bin + /usr/lib + /usr/share/man + /usr/share/doc + + + + + 2014-05-11 + 2.3.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 2.3.1 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 2.3.0 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-24 + 2.3.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-17 + 2.2.0 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2011-12-14 + 2.1.0 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + catbox + http://pisilinux.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + system.devel + Python sandboxing module + Python için sandbox modülü + catbox is a Python sandboxing module commonly used by the package management system of PiSi Linux, PiSi. + https://github.com/baris/catbox/archive/catbox-1.6.1.tar.gz + + python-setuptools + python-devel + + system/devel/catbox/pspec.xml + + + catbox + + python + + + /usr/bin + /usr/lib + /usr/share/doc + + + + + 2015-03-19 + 1.6.1 + Fix Buildeps. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.6.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-08 + 1.6.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-22 + 1.6 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-24 + 1.6 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2010-10-11 + 1.2 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + mpfr + http://www.mpfr.org + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2+ + LGPLv2+ + library + system.devel + Multiple precision floating point library + La librairie MPFR est une librairie C pour les calculs à virgules flottantes à précisions multiples à arrondi exact (également appelé arrondi correct). Elle est basée sur la librairie à précision multiple GMP. + The MPFR library is a C library for multiple-precision floating-point computations with exact rounding (also called correct rounding). It is based on the GMP multiple-precision library. + MPFR es una librería en C para computaciones de punto flotante de múltiple precisión con redondeo exacto (también llamado redondeo correcto). Está basada en la librería de múltiple precisión GMP. + http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.xz + + gmp-devel + + + mpfr-3.1.2-p10.patch + + system/devel/mpfr/pspec.xml + + + mpfr + + gmp + + + /usr/lib + /usr/share/info + /usr/share/doc/mpfr + + + + mpfr-devel + Development files for mpfr + mpfr için geliştirme dosyaları + + mpfr + + + /usr/include + /usr/share/doc/mpfr/examples + /usr/share/doc/mpfr/html + + + + + 2014-09-06 + 3.1.2_p10 + Patch version bump to 10. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 3.1.2_p5 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-01 + 3.1.2_p5 + Version bump to patch level 5. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 3.1.2 + Clean mpfr. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-23 + 3.1.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-07-13 + 3.1.1 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + bison + http://www.gnu.org/software/bison/bison.html + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2 + app:console + system.devel + A yacc-compatible parser generator + Yacc uyumlu yazım ayrıştırma üreteci + Un générateur d'analyseur syntaxique compatible avec yacc. Une fois que vous maîtrisez Bison, vous pouvez l'utiliser pour développer des analyseur léxicaux pour un grand nombres de langages, de ceux qui sont utilisés dans les simples calculatrices de bureau aux complexes langages de programmation. + A yacc-compatible parser generator. Once you are proficient with Bison, you can use it to develop a wide range of language parsers, from those used in simple desk calculators to complex programming languages + Yacc uyumlu yazım ayrıştırma üreteci. Bison'da ustalık kazandığınızda, basit hesap makinalarından, karmaşık programlama dillerine kadar uzanan geniş yazım ayrıştırıcılar geliştirebilirsiniz. + mirrors://gnu/bison/bison-3.0.4.tar.xz + + m4 + gettext + patch + + system/devel/bison/pspec.xml + + + bison + + m4 + gettext + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man + /usr/share/aclocal + /usr/share/info + /usr/share/bison + /usr/share/locale + + + + + 2015-03-01 + 3.0.4 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-09-06 + 3.0.2 + Rebuild, fix pspec.xml. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 3.0.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-24 + 3.0.2 + Version bump + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2013-11-18 + 3.0.1 + Version bump + Richard de Bruin + richdb@pisilinux.org + + + 2013-08-27 + 3.0 + Version bump, clean. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-23 + 2.7.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-16 + 2.7 + Version bump + Ertan Güven + ertangvn@istanbul.com + + + 2012-10-24 + 2.6.4 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + autogen + http://www.gnu.org/software/autogen + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + system.devel + The automated text and program generation tool + Otomatik metin ve program üretme aracı + Herramienta para simplificar creación y mantenimiento de programas que contienen muchos textos repetitivos + autogen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text. + autogen büyük miktarda tekrarlı metin içeren uygulamaların otomatik üretilmesini sağlayan bir araçtır. + ftp://ftp.gnu.org/gnu/autogen/rel5.18.4/autogen-5.18.4.tar.xz + + gc-devel + gmp-devel + guile-devel + libxml2-devel + which + + system/devel/autogen/pspec.xml + + + autogen + + guile + libxml2 + + + /usr/lib + /usr/share/doc + /usr/share/man + /usr/bin + /usr/share/info + /usr/share/autogen + + + + autogen-devel + Development files for autogen + autogen için geliştirme dosyaları + + autogen + + + /usr/include + /usr/share/aclocal + /usr/lib/pkgconfig + /usr/share/man/man3 + /usr/bin/autoopts-config + /usr/share/man/man1/autoopts-config.1 + + + + + 2014-11-23 + 5.18.4 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-24 + 5.18 + Rebuild for gcc. + PisiLinux Community + admins@pisilinux.org + + + 2014-05-11 + 5.18 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-27 + 5.18 + Clean autogen. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-22 + 5.18 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-17 + 5.17.1 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-04 + 5.16.2 + First release + PisiLinux Community + admins@pisilinux.org + + + + + + yacc + http://dinosaur.compilertools.net/#yacc + + PisiLinux Community + admins@pisilinux.org + + as-is + app:console + system.devel + Yacc: Yet Another Compiler-Compiler + Yacc: Yet Another Compiler-Compiler + Yacc fourni un outil général de description d'entrée pour un logiciel. L'utilisateur de Yacc spécifie la structure de l'entrée avec le code à invoquer lorsque de tels structures sont reconnues. Yacc transforme ce qui a été spécifié en sous-routine gérant le processus d'entrée. + Yacc provides a general tool for describing the input to a computer program. The Yacc user specifies the structures of his input, together with code to be invoked as each such structure is recognized. Yacc turns such a specification into a subroutine that handles the input process + Yacc, bir uygulamaya girdi açıklamasını yapan bir araçtır. Yacc kullanıcısı, girdinin yapısını ve bu yapının her seferinde tanındığı kodu belirtir. Yacc; bu tür bir belirlemeyi, girdi sürecini işleyen bir alt yordama çevirir. + ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/yacc-1.9.1.tar.Z + + mkstemp.patch + skeleton.c.diff + yacc-1.9.1-ia64.patch + + system/devel/yacc/pspec.xml + + + yacc /usr/bin /usr/share/doc @@ -13210,21 +18565,1103 @@ 2014-05-11 - 9 + 1.9.1 Release bump. Marcin Bojara marcin@pisilinux.org - 2013-10-29 - 9 - Rebuild + 2014-01-17 + 1.9.1 + Rebuild for 1.0 + Richard de Bruin + richdb@pisilinux.org + + + 2010-10-11 + 1.9.1 + First release + Pisi Linux Admins + admins@pisilinux.org + + + + + + isl + http://www.kotnet.org/~skimo/isl/ + + Serdar Soytetir + kaptan@pisilinux.org + + LGPLv2.1 + library + system.devel + Integer Set Library + isl is a library for manipulating sets and relations of integer points bounded by linear constraints. + http://isl.gforge.inria.fr/isl-0.13.tar.bz2 + + gmp-devel + + system/devel/isl/pspec.xml + + + isl + + gmp + + + /usr/lib + /usr/share/doc + + + + isl-devel + Development files for isl + isl için geliştirme dosyaları + + isl + + + /usr/include + /usr/lib/pkgconfig + + + + + 2015-05-05 + 0.13 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 0.12.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 0.12.2 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 0.12.1 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 0.12 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-07-24 + 0.12 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-16 + 0.11.1 + New release + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-05 + 0.10 + First release + Erdem Artan + admins@pisilinux.org + + + + + + swig + http://www.swig.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3+ + BSD + app:console + system.devel + Connects C/C++/Objective C to some high-level programming languages + Basitleştirilmiş arayüz oluşturucu + Simplified Wrapper and Interface Generator (Générateur d'interface de scripts d'enrobage simplifié), SWIG est un outil de développement qui connecte des programmes écrits en C et C++ avec divers langages de programmation de haut niveau. SWIG est utilisé avec différents type de langages incluant les langages de script habituels tels que Perl, PHP, Python, Tcl, Ruby. + Simplified Wrapper and Interface Generator, SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages. SWIG is used with different types of languages including common scripting languages such as Perl, PHP, Python, Tcl, Ruby and PHP + SWIG, C ve C++ ile yazılmış uygulamaları çeşitli üst düzey programlama dilleri ile bağlayan bir yazılım geliştirme aracıdır. SWIG, genel betik dilleri olan Perl, PHP, Python, Tcl, Ruby gibi farklı diller ile kullanılır. + mirrors://sourceforge/swig/swig-3.0.2.tar.gz + + python + perl + + system/devel/swig/pspec.xml + + + swig + + zlib + libgcc + libpcre + + + /usr/bin + /usr/lib + /usr/share/swig + /usr/share/doc + /usr/share/man + + + + + 2014-12-22 + 3.0.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 3.0.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 3.0.0 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-23 + 2.0.11 + Clean swig. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-24 + 2.0.10 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-17 + 2.0.9 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-09-15 + 2.0.8 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + m4 + http://www.gnu.org/software/m4/m4.html + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + app:console + system.devel + GNU macro processor + GNU makro işleyicisi + L'utilitaire m4 est processeur de macro permettant de lire un ou plusieurs fichiers, les traiter en fonction leurs directives macro puis écrire le résultat dans la sortie standard. + The m4 utility is a macro processor that shall read one or more text files, process them according to their included macro statements, and write the results to standard output + m4, bir ya da daha fazla metin dosyasını okuyan; içerdikleri makro kurallarına göre bu dosyaları işleyen ve sonuçlarını standart çıktıya ileten bir makro işlemcisidir. + mirrors://gnu/m4/m4-1.4.17.tar.gz + + gettext-devel + libsigsegv + + system/devel/m4/pspec.xml + + + m4 + + libsigsegv + + + /usr/bin + /usr/share/doc + /usr/share/info + /usr/share/man + + + + + 2014-05-11 + 1.4.17 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-23 + 1.4.17 + Version bump. Yusuf Aydemir yusuf.aydemir@pisilinux.org - 2012-08-23 - 9 + 2012-07-12 + 1.4.16 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + diffstat + http://invisible-island.net/diffstat/ + + PisiLinux Community + admins@pisilinux.org + + as-is + app:console + system.devel + Diffstat reads the output of the diff command and displays a histogram of the insertions, deletions, and modifications in each file + Diffstat reads the output of the diff command and displays a histogram of the insertions, deletions, and modifications in each file.Diffstat is commonly used to provide a summary of the changes in large, complex patch files. + Diffstat lee la salida del comando diff y muestra un histograma de inserciones, borrados y modificaciones en cada archivo. Se usa comúnmente para mostrar un resumen de las modificaciones en archivos lagos y complejos. + ftp://invisible-island.net/diffstat/diffstat-1.59.tgz + + xz + gzip + bzip2 + ncompress + + system/devel/diffstat/pspec.xml + + + diffstat + + /usr/bin + /usr/share/doc + /usr/share/man + + + + + 2014-11-23 + 1.59 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-11 + 1.58 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 1.58 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 1.57 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-18 + 1.56 + version bump + PisiLinux Community + admins@pisilinux.org + + + 2012-08-15 + 1.55 + First release + Ramazan Utku + admins@pisilinux.org + + + + + + ppl + http://www.cs.unipr.it/ppl/ + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv3 + app:console + library + system.devel + Pharma Polyhedra library + Pharma Polyhedra kitaplığı + ppl is the Parma Polyhedra Library that provides numerical abstractions for analysis of complex systems. + ppl, kompleks sistemlerin analizi için sayısal ayrım sağlayan Pharma Polyhedra kitaplığıdır. + http://bugseng.com/external/ppl/download/ftp/releases/1.1/ppl-1.1.tar.xz + + gmp-devel + glpk-devel + + system/devel/ppl/pspec.xml + + + ppl + + gmp + glpk + libgcc + + + /usr/bin + /usr/lib + /usr/share/doc/COPYING + /usr/share/doc/CREDITS + /usr/share/doc/README + /usr/share/doc/NEWS + /usr/share/man + + + + ppl-docs + Documentation for ppl + ppl kitaplığı belgeleri + system.doc + + ppl + + + /usr/share/doc/ppl + + + + ppl-devel + Development files for ppl + ppl için geliştirme dosyaları + + ppl + gmp-devel + + + /usr/bin/ppl-config + /usr/include + /usr/share/aclocal + /usr/share/man/man3 + + + + + 2014-09-06 + 1.1 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 1.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 1.1 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 1.0 + Clean ppl, version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-01 + 1.0 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-19 + 1.0 + Add patch for gmp 5.10. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-07-13 + 1.0 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + uClibc + http://www.uclibc.org + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + system.devel + A C library for embedded Linux + Düşük boyut için optimize edilmiş standart C kitaplığı + uClibc is a C library for developing embedded Linux systems. It is much smaller than the GNU C Library but nearly all applications supported by glibc also work perfectly with uClibc. + uClibc, düşük boyutlu olması için optimize edilmiş bir C kitaplığıdır. Farklı mimarilerde statik bağlanmış ve düşük boyutlu ikili dosyalar oluşturmak için kullanılabilir. + http://www.uclibc.org/downloads/uClibc-0.9.33.2.tar.xz + + mandriva/uClibc-0.9.30.2-add-rpmatch-function.patch + mandriva/uClibc-0.9.30.1-add-scanf-a-flag.patch + pisilinux/linux-3.10-add___kernel_long_and___kernel_ulong.patch + suse/uClibc.fix-pthread-warnings.patch + shared-config.patch + + system/devel/uClibc/pspec.xml + + + uClibc + + /usr/lib/uClibc/sbin/ldconfig + /usr/lib/uClibc/bin + /usr/lib/uClibc + /usr/lib/uClibc/lib + /usr/lib/uClibc/usr/lib + /usr/lib/uClibc/etc + /usr/share/doc + + + System.PackageHandler + + + + uClibc-devel + Development files for uClibc + uClibc için geliştirme başlıkları + + uClibc + + + /usr/lib/uClibc/usr/include + /usr/lib/uClibc/usr/lib/*.o + /usr/lib/uClibc/usr/lib/*.a + /usr/lib/uClibc/usr/bin + /usr/bin + + + + + 2014-05-11 + 0.9.33.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-05 + 0.9.33.2 + build for kernel 3.10 + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-09-05 + 0.9.33.2 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2012-08-19 + 0.9.33.2 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + + + + make + http://www.gnu.org/software/make/make.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + system.devel + Standard tool to compile source trees + Geleneksel kaynak kod ağaçlarını derleme aracı + Herramienta estándar para compilación de arboles de fuentes + Outil standard de compilation de hiérarchie de sources. Make détermine ce qu'il faut faire pour construire votre programme à partir d'un fichier appelé makefile. Une fois votre programme écrit, il suffit d'éditer un makefile pour lui afin de pouvoir utiliser Make pour le compiler et l'installer. + Standard tool to compile source trees. Make gets its knowledge of how to build your program from a file called the makefile. When you write a program, you should write a makefile for it, so that it is possible to use Make to build and install the program + Geleneksel kaynak kod ağaçlarını derleme aracı. Make, programınızı nasıl derleyeceği konusundaki bilgiyi "makefile" dosyasından alır. Bir uygulama yazdığınızda bunun için "makefile" dosyasını da hazırlamalısınız ki uygulamanız derlenebilsin ve yüklenebilsin. + mirrors://gnu/make/make-4.1.tar.gz + + gettext + gnuconfig + patch + gc-devel + guile-devel + + system/devel/make/pspec.xml + + + make + + guile + + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + /usr/include + + + + + 2015-02-21 + 4.1 + Version bump + denizgu + denizgu@users.noreply.github.com + + + 2014-05-11 + 4.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-23 + 4.0 + Cleanup, bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-10-24 + 3.82 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + nasm + http://nasm.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + BSD + app:console + system.devel + Groovy little assembler + Assembler derleyicisi + NASM est l'assembleur Netwide, un assembleur libre et portable pour les processeurs des séries Intel 80x86 + NASM is the Netwide Assembler, a free portable assembler for the Intel 80x86 microprocessor series. + Intel 80x86 mikroişlemci serisi için aktarılabilir Assembler derleyicisi. + http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/nasm-2.11.01.tar.xz + + texinfo + + system/devel/nasm/pspec.xml + + + nasm + + /usr/bin + /usr/share/doc + /usr/share/man + + + + + 2014-05-11 + 2.11.01 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-29 + 2.11.01 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 2.10.09 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-24 + 2.10.09 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-02-18 + 2.10.07 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-09-15 + 2.10.05 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + gnuconfig + http://savannah.gnu.org/projects/config + + Serdar Soytetir + kaptan@pisilinux.org + + GPLv2+ + data + system.devel + Base config files for autofoo + Autofoo için temel config dosyaları + fichiers GNU config.sub et config.guess mis à jour. + gnuconfig contains updated config.sub and config.guess files from GNU. + gnuconfig güncel GNU config.sub ve config.guess dosyaları içerir. + http://source.pisilinux.org/1.0/config-20141105.tar.gz + system/devel/gnuconfig/pspec.xml + + + gnuconfig + + /usr/share/gnuconfig + /usr/share/doc + + + + + 2014-12-04 + 20141105 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-11 + 20140511 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-04-01 + 20140401 + New git snapshot. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-27 + 20130930 + Clean, new git snapshot. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-04-07 + 20130212 + Fix git archive + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-02-27 + 20130217 + New git archive + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-23 + 20130123 + bump + Erdinç Gültekin + admins@pisilinux.org + + + 2012-07-13 + 20120712 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + + + + klibc + http://www.zytor.com/mailman/listinfo/klibc + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + GPLv2 + library + system.devel + A minimal libc subset for use with initramfs + Küçük bir C kütüphanesi (libc) uyarlaması + klibc ou "espace utilisateur tôt", est une librairie résultante de l'effort pour transférer autant de code d'initialisation de Linux que possible hors du noyau. + klibc, or "early userspace", is library part of an effort which tries to move as much initialization code in Linux as possible out of the kernel. + klibc, sistem başlangıcı için gerekli olan kodların mümkün olduğunca çok kısmını Linux çekirdeği dışına atma hedefiyle oluşturulmuş bir kütüphanedir. + https://www.kernel.org/pub/linux/libs/klibc/2.0/klibc-2.0.3.tar.xz + + perl + kernel-module-headers + + system/devel/klibc/pspec.xml + + + klibc + + /lib + /usr/bin + /usr/lib/klibc/bin + /usr/lib/klibc/include + /usr/lib/klibc/lib + /usr/share/aclocal + /usr/share/doc + /usr/share/man/ + + + klibc.m4 + + + + + 2014-05-11 + 2.0.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-28 + 2.0.3 + Version bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-22 + 2.0.2 + Rebuild, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-01-04 + 2.0.2 + First release + Marcin Bojara + marcin@pisilinux.org + + + + + + linux-firmware + http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ + + PisiLinux Community + admins@pisilinux.org + + ipw2100-fw + ipw2200-fw + freedist + GPLv2+ + GPLv2 + MIT + data + hardware.firmware + Firmware files used by the Linux kernel + Linux çekirdeği tarafından kullanılan firmware dosyaları + linux-firmware contains different firmware files required for some devices to operate correctly. + linux-firmware, bazı aygıtların düzgün çalışabilmesi için gerekli firmware dosyalarını içerir. + http://source.pisilinux.org/1.0/linux-firmware/linux-firmware-20150320.tar.bz2 + http://source.pisilinux.org/erdinc/common-fw.tar.xz + http://source.pisilinux.org/erdinc/firmware-ipw.tar.xz + http://source.pisilinux.org/erdinc/firmware/firmware-nonfreebox-2-tar.bz2 + http://source.pisilinux.org/erdinc/firmware/ar9170.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/ipw2x00-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/aic94xx-seq.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/zd12x1-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/accessrunner-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/rtl8192se-firmware.tar.bz2 + http://source.pisilinux.org/erdinc/firmware/nouveau-1.tar.xz + + fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq + + hardware/firmware/linux-firmware/pspec.xml + + + linux-firmware + + noDelta + + + /lib/firmware + /usr/share/doc + + + + + 2015-03-26 + 20150320 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-02-14 + 20150214 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-12-16 + 20141216 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-11-07 + 20141107 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-07-23 + 20140603 + Version bump. + Marcin Bojara + marcin.bojara@pisilinux.org + + + 2014-04-02 + 20140316 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-03-01 + 20140217 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-11-30 + 20131013 + Remove unneeded build dep,fix unpack problem. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-11-23 + 20131013 + Version bump to 20131013 git. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-30 + 20130811 + add update Intel-Bluetooth patchs + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-08-11 + 20130811 + add update patchs + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-07-19 + 20130609 + add update patchs + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-06-09 + 20130609 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-04-07 + 20130421 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-03-07 + 20130224 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2012-12-12 + 20121212 + First release + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + + + + mdadm + http://www.kernel.org/pub/linux/utils/raid/mdadm + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + hardware.disk + Utility to control Linux MD devices (software RAID arrays) + MD aygıtlarını (Yazılımsal RAID) denetleme aracı + mdadm is used to create, manage, and monitor Linux MD (software RAID) devices. + mdadm Linux MD (yazılımsal RAID) aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır. + https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.3.2.tar.xz + hardware/disk/mdadm/pspec.xml + + + mdadm + + /sbin/mdadm + /sbin/mdmon + /lib/udev/rules.d + /usr/lib/tmpfiles.d + /usr/share/man + /usr/share/doc + /etc + + + System.Service + + + mdadm.tmpfiles.conf + scripts/raid-check + mdadm.confd + mdadm.rules + + + + mdadm-static + Statik linklemiş Raid denetleme aracı + mdadm Linux MD (yazılımsal RAID) aygıtları yaratmak, yönetmek ve izlemek için kullanılan bir araçtır. + system.base + + /sbin/mdadm.static + /sbin/mdassemble.static + + + + + 2014-12-13 + 3.3.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-17 + 3.3 + Rebuild. Fixed service.py file + Aydın Demirel + aydin.demirel@pisilinux.org + + + 2014-04-13 + 3.3 + mdadm-static is a part of system.base now. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-31 + 3.3 + Ver. bump, rebuild + Kamil Atlı + admins@pisilinux.org + + + 2012-11-14 + 3.2.6 First release PisiLinux Community admins@pisilinux.org @@ -13241,23 +19678,17 @@ GPLv2 app:console - system.base + hardware.disk Userland logical volume management tools Mantıksal Hacim Yönetimi aracı LVM2 includes all of the support for handling read/write operations physical and logical volumes. LVM fiziksel ve mantıksal hacimler üzerinde gerçekleştirilen bütün okuma/yazma işlemlerini destekleyen araçları içerir. - ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.111.tgz + ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.118.tgz - libuuid-devel - libblkid-devel + libutil-linux-devel + eudev-devel - - lvm2-2.02.63-always-make-static-libdm.patch - lvm2-2.02.92-dynamic-static-ldflags.patch - lvm2-2.02.105-pthread-pkgconfig.patch - lvm2-2.02.106-static-pkgconfig-libs.patch - - system/base/lvm2/pspec.xml + hardware/disk/lvm2/pspec.xml device-mapper @@ -13266,7 +19697,7 @@ Device-mapper includes the driver enables the definition of new block devices composed of ranges of sectors of existing devices to define disk partitions or logical volumes. device-mapper mevcut aygıtlardan yeni blok aygıtları yada mantıksal hacimler yaratır. - libudev + eudev /usr/sbin/dmsetup @@ -13287,7 +19718,8 @@ Device-mapper-devel contains files needed to develop applications that use the device-mapper libraries. system.devel - device-mapper + device-mapper + eudev-devel /usr/include/libdevmapper.h @@ -13300,7 +19732,7 @@ Device mapper durum servisi This package contains the dmeventd daemon for monitoring the state of device-mapper devices. - device-mapper + device-mapper /usr/sbin/dmeventd @@ -13318,7 +19750,7 @@ This contains contains files needed to develop applications that use the device-mapper event library. system.devel - device-mapper-event + device-mapper-event /usr/include/libdevmapper-event.h @@ -13330,10 +19762,10 @@ Userland logical volume management tools LVM2 includes all of the support for handling read/write operations on physical volumes,creating volume groups from one or more physical volumes and creating one or more logical volumes in volume groups. - device-mapper - device-mapper-event - libudev - libblkid + device-mapper + device-mapper-event + libutil-linux + eudev /sbin/lvmconf @@ -13360,7 +19792,7 @@ /usr/lib/tmpfiles.d/lvm2.conf /usr/share/doc /usr/share/man/man5/lvm.conf.5 - /usr/share/man/man7/lvmthin.7 + /usr/share/man/man7 /usr/share/man/man8/fsadm.8 /usr/share/man/man8/blkdeactivate.8 /usr/share/man/man8/*pv* @@ -13381,9 +19813,10 @@ This package contains files needed to develop applications that use the lvm2 libraries. system.devel - lvm2 - device-mapper-devel - device-mapper-event-devel + libutil-linux-devel + lvm2 + device-mapper-devel + device-mapper-event-devel /usr/include/lvm2cmd.h @@ -13423,6 +19856,13 @@ + + 2015-05-02 + 2.02.118 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-09-04 2.02.111 @@ -13469,1167 +19909,60 @@ - audit - http://people.redhat.com/sgrubb/audit/ + dejavu-fonts + http://www.dejavu-fonts.org - PisiLinux Community - admins@pisilinux.org + Sezai Yeniay + sezaiyeniay@pisilinux.org - GPLv2+ - app:console - library - service - system.base - User space tools for kernel auditing - Linux çekirdeğinin 2.6 sürümü için inceleme/denetleme araçları - audit contains the user space utilities for storing and searching the audit records generated by the audit subsystem in the Linux 2.6 kernel. - audit Linux çekirdeğinin 2.6 sürümünün inceleme altyapısı tarafından üretilen inceleme kayıtlarını aramak ve saklamak için kullanılan araçları içerir. - http://people.redhat.com/sgrubb/audit/audit-2.3.7.tar.gz + as-is + data:font + desktop.font + DejaVu yazıtipleri + DejaVu fonts + DejaVu fonts + DejaVu yazıtipleri + Les fontes DejaVu basées sur des fontes Bitstream avec des améliorations. + Contains DejaVu fonts that are based on Bitstream fonts, with improvements. + Bevat de DejaVu fonts die zijn gebasserd op de Bitstream fonts, met verbeteringen. + mirrors://sourceforge/dejavu/dejavu-fonts-2.34.tar.bz2 - python-devel - kernel-headers - libcap-ng-devel - tcp-wrappers-devel + fontforge + perl-Font-TTF + unicode-ucd - - without_openldap.patch - - system/base/audit/pspec.xml + desktop/font/dejavu-fonts/pspec.xml - audit - - libcap-ng - - - /etc - /usr/share/doc - /usr/lib - /usr/sbin - /usr/bin - /usr/share/man - /var/log/audit - /var/spool/audit - - - System.Service - System.Package - - - - python-audit - Python bindings for audit - audit için Python bağlayıcısı - - audit - - - /usr/lib/python* - - - - audit-devel - Development files for audit - audit için geliştirme dosyaları - system.devel - - audit - - - /usr/include - /usr/share/man/man3 - - - - - 2014-09-30 - 2.3.7 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-06-06 - 2.3.6 - Rebuild. - Aydın Demirel - aydin.demirel@pisilinux.org - - - 2014-05-16 - 2.3.6 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 2.3.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-22 - 2.3.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-02-14 - 2.2.2 - Version bump - Ertan Güven - ertan@pisilinux.org - - - 2011-12-20 - 2.2.1 - First release - Yusuf Aydemir - Yusuf Aydemir - - - - - - libxml2 - http://www.xmlsoft.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - Version 2 of the library to manipulate XML files - XML türü dosyaları işlemeye aracılık eden kütüphanenin 2. sürümü - Libxml2 est l'analyseur et la boîte à outils XML écrit en C pour le projet Gnome (mais utilisable en dehors de la plateforme Gnome). - Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform). - Libxml2, Gnome projesi için geliştirilmiş C dilinde XML ayrıştırıcısıdır. Gnome platformu olmadan da kullanılabilir. - ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz - - python - xz-devel - zlib-devel - readline-devel - - - CVE-2014-0191.patch - - system/base/libxml2/pspec.xml - - - libxml2-docs - system.doc - - libxml2 - + dejavu-fonts + /etc/fonts + /etc/X11/fontpath.d/dejavu + /usr/share/fonts /usr/share/doc - - libxml2 - - xz - zlib - python - readline - - - /usr/bin - /usr/lib - /usr/share/man - - - - libxml2-devel - Development files for libxml2 - libxml2 için geliştirme dosyaları - system.devel - - libxml2 - - - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/include - /usr/share/aclocal - /usr/share/man/man3 - - - - libxml2-32bit - 32-bit shared libraries for libxml2 - libxml2 için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - xz-32bit - zlib-32bit - readline-32bit - - - libxml2 - xz-32bit - zlib-32bit - - - /usr/lib32 - - - - - 2014-07-06 - 2.9.1 - Security update(CVE-2014-0191). - Vedta Demir - vedat@pisilinux.org - - - 2014-05-24 - 2.9.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 2.9.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-11-11 - 2.9.0 - Fix dep,release bump, binary file goes to main package. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-08-31 - 2.9.1 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-26 - 2.9.0 - Fix dep,release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-10-22 - 2.9.0 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - ca-certificates - http://packages.qa.debian.org/c/ca-certificates.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - MPL-1.1 - app:web - system.base - Common CA certificates - Common CA certificates - http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20141019.tar.xz - system/base/ca-certificates/pspec.xml - - - ca-certificates - - run-parts - - - /etc - /usr/share/man - /usr/sbin - /usr/share/ca-certificates - - - System.Package - - - - - 2015-01-10 - 20141019 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2015-01-10 - 20141019 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2014-05-11 - 20140325 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-01 - 20140325 - Version bump, fix installation. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-03-03 - 20130906 - First Release - PisiLinux Community - admins@pisilinux.org - - - - - - sysfsutils - http://linux-diag.sourceforge.net/Sysfsutils.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - System Utilities Based on Sysfs - Çeşitli sistem araç ve gereçleri - Ceci est un ensemble d'utilitaires se basant sur sysfsm un nouveau système de fichier virtuel des noyaux Linux 2.5 et + exposant l'arbre des périphériques du système. - These are a set of utilites built upon sysfs, a new virtual filesystem in Linux kernel versions 2.5+ that exposes a system's device tree. - sysfsutils sysfs sanal dosya sistemi üzerine kurulu bir araç setidir. - mirrors://sourceforge/linux-diag/sysfsutils-2.1.0.tar.gz - - sysfsutils-2.0.0-class-dup.patch - sysfsutils-2.1.0-get_link.patch - - system/base/sysfsutils/pspec.xml - - - sysfsutils - - /usr/bin - /lib - /usr/lib - /usr/share/doc - /usr/share/man - - - - sysfsutils-devel - Development files for sysfsutils - sysfsutils için geliştirme dosyaları - system.devel - - sysfsutils - - - /usr/include - /usr/share/man/man3 - - - 2014-05-11 - 2.1.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 2.1.0 - Rebuild - Pisi Linux Admins - admins@pisilinux.org - - - 2010-10-11 - 2.1.0 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - ntfs-3g - http://www.tuxera.com/community/ntfs-3g-download - - PisiLinux Community - admins@pisilinux.org - - GPLv2+ - LGPLv2+ - library - app:console - system.base - Userspace driver for NTFS read/write support - NTFS dosya sistemlerine okuma/yazma erişimi için bir sürücü - ntfs-3g allows regular users read/write access to NTFS filesystems. - ntfs-3g kullanıcıların NTFS biçimli disk bölümlerine hem okuma hem yazma erişimi yapabilmesine imkan veren bir sürücüdür. - http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2014.2.15.tgz - system/base/ntfs-3g/pspec.xml - - - ntfs-3g - - fuse - glibc - - - /bin - /sbin - /lib - /usr/lib - /usr/include - /usr/lib/pkgconfig - /usr/share/doc/ntfs-3g - /usr/share/man/man8/mount* - /usr/share/man/man8/ntfs-3g* - - - - ntfsprogs - Userspace tools for NTFS filesystems - NTFS dosya sistemi için kullanıcı araçları - Userspace tools for NTFS filesystems. The goals of the Linux-NTFS project are to develop reliable and full-featured access to NTFS by the Linux kernel driver and to provide a wide collection of NTFS utilities. - NTFS dosya sistemi için kullanıcı araçları içerir. Bu araçların amacı Linux çekirdeğine NTFS dosya sistemlerine güvenilir ve tam erişim sağlayacak NTFS araçlarını sağlamaktır. - hardware.disk - - ntfs-3g - glibc - libuuid - - - /sbin/mkfs.ntfs - /usr/bin - /usr/sbin - /usr/share/doc/ntfsprogs - /usr/share/man/man8 - - - - - 2014-12-13 - 2014.2.15 + 2014-01-27 + 2.34 Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 2013.1.13 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-30 - 2013.1.13 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-01-30 - 2013.1.13 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-14 - 0.0_2012.01.15 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - gawk - http://www.gnu.org/software/gawk/gawk.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - GNU awk pattern-matching language - Metin işleme uygulaması olan awk'ın GNU versiyonu - L'outil awk interprète un langage de programmation spécifique permettant d'effectuer les tâches de modifications simples de données en quelques lignes de code. Il vous permet de faire des changements dans différents fichiers texte lorsqu'un certain patron apparaît ou d'extraire des données de fragments de lignes tout en laissant de côté le reste. Gawk est l'implémentation GNU d'awk. - The awk utility interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code. It helps you to make changes in various text files wherever certain patterns appear, or extract data from parts of certain lines while discarding the rest. Gawk is the GNU implementation of awk. - awk uygulaması az bir kod ile basit veri formatı düzenleme işlerinizi yapabilmenize olanak sağlayan özel amaçlı bir programlama dilidir. Uygulama birçok farklı metin dosyası içinde aradığınız parçaları bulup değiştirmenize veya diğer satırlardan ayırarak işlemenize yardımcı olur. Gawk programı awk'ın GNU sürümüdür. - http://ftp.gnu.org/gnu/gawk/gawk-4.1.1.tar.xz - - gettext-devel - - - gawk-4.1.1-sandbox_issue.patch - gawk-4.1.1-sigpipe.patch - - system/base/gawk/pspec.xml - - - gawk - - readline - gmp - mpfr - - - /usr/bin - /usr/libexec - /usr/lib/gawk - /usr/include - /usr/share/awk - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/locale - - - - - 2014-05-11 - 4.1.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-03-10 - 4.1.0 - Release bump for update eror - Burak Fazıl Ertürk - burakerturk@pisilinux.org - - - 2014-01-05 - 4.1.0 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-26 - 4.0.2 - Fix dep, release bump. Serdar Soytetir kaptan@pisilinux.org - 2013-02-14 - 4.0.2 - Version bump - Ertan Güven - ertan@pisilinux.org - - - 2012-08-23 - 4.01 + 2012-05-24 + 2.33.2514 First release PisiLinux Community admins@pisilinux.org - - - - - net-tools - http://sites.inka.de/lina/linux/NetTools/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Standard Linux networking tools - Linux ağ araçları - net-tools est une collection de programmes représentant les outils réseau de base du système d'exploitation Linux. S'y trouvent arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route et slattach. - net-tools is a collection of programs that form the base set of the networking tools for the Linux operating system. It includes arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route and slattach. - Net-tools, Linux işletim sisteminde kullanılan ağ ile ilgili temel araçların bir birleşimidir. Arp, hostname, ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat, plipconfig, rarp, route ve slattach programlarını içerir. - ftp://ftp.linux.org.tr/pub/mirrors/gentoo/distfiles/net-tools-1.60.tar.bz2 - - 01_all_net-tools-1.60-2.6-compilefix.patch.bz2 - 02_all_net-tools-1.60-gcc34.patch.bz2 - 03_all_net-tools-1.60-cleanup-list-handling.patch.bz2 - 04_all_net-tools-1.60-get_name.patch.bz2 - 20_all_net-tools-1.54-ipvs.patch.bz2 - 21_all_net-tools-1.57-bug22040.patch.bz2 - 22_all_net-tools-1.60-manydevs.patch.bz2 - 23_all_net-tools-1.60-miiioctl.patch.bz2 - 24_all_net-tools-1.60-virtualname.patch.bz2 - 25_all_net-tools-1.60-cycle.patch.bz2 - 26_all_net-tools-1.60-overflow.patch.bz2 - 27_all_net-tools-1.60-netstat_ulong.patch.bz2 - 50_all_net-tools-1.60-multiline-string.patch.bz2 - 51_all_net-tools-1.60-man.patch.bz2 - 52_all_net-tools-1.60-numeric-ports.patch.bz2 - 53_all_net-tools-1.60-appletalk.patch.bz2 - 54_all_net-tools-1.60-wide.patch.bz2 - 55_all_net-tools-1.60-Makefile.patch.bz2 - 56_all_net-tools-1.60-ipv6-hostname.patch.bz2 - 57_all_net-tools-1.60-ifconfig-infiniband.patch.bz2 - 60_all_net-tools-1.60-headers.patch.bz2 - net-tools-missing.patch - kernel_headers.patch - gcc-4.3.patch - large-buffer.patch - - system/base/net-tools/pspec.xml - - - net-tools - - comar - comar-api - - - /bin - /sbin - /usr/bin - /usr/sbin - /usr/share/doc - /usr/share/man - /usr/share/locale - - - - - 2014-05-11 - 1.60 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-30 - 1.60 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-10-13 - 1.60 - First release - Erdem Artan - admins@pisilinux.org - - - - - - timezone - ftp://elsie.nci.nih.gov/pub/ - - PisiLinux Community - admins@pisilinux.org - - BSD - public-domain - app:console - data - system.base - Timezone data files and tools - Zamandilimi veri dosyaları ve araçları - timezone includes timezone data files and tools to use them. Package contents are synchronized with glibc tree. - timezone zamandilimi veri dosyaları ve bu dosyaları kullanmak için gerekli araçları içerir. Paket içeriği glibc gelişim ağacından oluşturulmaktadır. - http://www.iana.org/time-zones/repository/releases/tzdata2014b.tar.gz - - perl - gawk - - system/base/timezone/pspec.xml - - - timezone - - /usr/share/zoneinfo - - - - - 2014-05-11 - 2014b - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 2014b - Version bump. - Burak Fazıl Ertürk - burakerturk@pisilinux.org - - - 2012-09-27 - 0.0_20120927 - First release - Erdem Artan - admins@pisilinux.org - - - - - - libgcrypt - http://www.gnupg.org/ - - PisiLinux Community - admins@pisilinux.org - - LGPLv2.1 - library - system.base - Librairie générale de cryptographie basée sur le code utilisé dans GnuPG. - General purpose crypto library - Genel amaçlı bir şifreleme kitaplığı - Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard. - Libgcrypt, GNU Privacy Guard kodunu temel alan genel amaçlı bir şifreleme kitaplığıdır. - ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.1.tar.bz2 - - libgpg-error-devel - - system/base/libgcrypt/pspec.xml - - - libgcrypt - - libgpg-error - - - /usr/lib - /usr/share/man - /usr/share/doc - /etc/gcrypt - /usr/bin - /usr/share/info - - - - libgcrypt-devel - Development files for libgcrypt - libgcrypt için geliştirme dosyaları - system.devel - - libgcrypt - libgpg-error-devel - - - /usr/include - /usr/lib/pkgconfig - /usr/share/aclocal - /usr/lib32/pkgconfig - /usr/bin/*-config - - - - libgcrypt-32bit - 32-bit shared libraries for libgcrypt - libgcrypt için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libgpg-error-32bit - - - libgpg-error-32bit - libgcrypt - - - /usr/lib32 - - - - - 2014-05-11 - 1.6.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 1.6.1 - Version bump. - PisiLinux Community - admins@pisilinux.org - - 2011-05-03 - 1.5.0 + 2012-05-24 + 2.33 First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - fuse - http://fuse.sourceforge.net - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - system.base - Interface implémentée dans l'environnement utilisateur (userpace) pour les systèmes de fichier. - An interface for filesystems implemented in userspace - Kullanıcı düzeyinde dosya sistemi oluştumaya yarayan kitaplık - Una interfaz para sistemas de archivos implementados en el espacio de usuario - fuse is a backend allowing regular users to (un)mount filesystems for their own use. - FUSE, kullanıcıların kendileri için dosya sistemleri oluşturmasına, bağlamasına ve bağı koparmasına imkân veren bir arkauç kitaplıktır. - mirrors://sourceforge/project/fuse/fuse-2.X/2.9.3/fuse-2.9.3.tar.gz - - skip_umount_test.patch - - system/base/fuse/pspec.xml - - - fuse - - glibc - - - /bin - /sbin - /usr/bin - /lib - /usr/share/doc - /usr/share/man - - - - fuse-devel - Development files for fuse - fuse için geliştirme dosyaları - system.devel - - fuse - - - /usr/include - /usr/lib/pkgconfig - - - - - 2014-05-11 - 2.9.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-24 - 2.9.3 - Rebuild - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2014-01-20 - 2.9.3 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-20-21 - 2.9.2 - First release - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - - - - os-prober - http://joey.kitenet.net/code/os-prober/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2+ - app:console - system.base - Utility to detect other OSes on a set of drives - Narzędzie do wykrywania innych systemów operacyjnych na dyskach - os-probe detects other OSes available on a system and outputs the results in a generic machine-readable format. Support for new OSes and Linux distributions can be added easily. - os-prober wykrywa inne systemy operacyjne dostępne na komputerze i przekazuje rezultaty w standardowym, odczytywalnym maszynowo, formacie. - ftp://ftp.debian.org/debian/pool/main/o/os-prober/os-prober_1.63.tar.gz - system/base/os-prober/pspec.xml - - - os-prober - - /usr/bin - /usr/lib - /var/lib/os-prober - /usr/share/os-prober - /usr/share/doc/os-prober - - - - - 2014-05-11 - 1.63 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-24 - 1.63 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-28 - 1.58 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-01-03 - 1.57 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - slang - http://www.jedsoft.org/slang/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - Artistic - app:console - system.base - Console display library used by most text viewer - Bir çok metin gösterici yazılım tarfından kullanılan konsol görüntüleme kütüphanesi - S-Lang est une librarie de programmation multi-plateforme conçue pour permettre aux développeur de développer des logiciels robustes et portables. Elle fournit les mécanismes requis pour développer une application interactive telle que la gestion d'affichages/écrans, entrées clavier, disposition de touches et ainsi de suite. La fonctionnalité la plus attractive de cette librairie reste l'interpréteur slang qui peut être embarqué au sein même d'un programme pour le rendre extensible. - S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software. It provides facilities required by interactive applications such as display/screen management, keyboard input, keymaps, and so on. The most exciting feature of the library is the slang interpreter that may be easily embedded into a program to make it extensible. - S-lang, yazılım geliştiricilerin bütün işletim sistemlerinde çalışabilen güçlü uygulamalar geliştirmesine yardımcı olan bir uygulama kitaplığıdır. İnteraktif uygulamalar için ekran yönetimi ve klavye girişi gibi araçlar sunar. Kitaplığın en ilginç özelliği programların içine kolayca gömülebilen ve programı genişletilebilir kılan slang yorumlayıcısıdır. - ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/slang-2.2.4.tar.bz2 - - libpng-devel - libpcre-devel - ncurses-devel - readline-devel - zlib-devel - - system/base/slang/pspec.xml - - - slang - - libpng - libpcre - zlib - - - /etc - /usr/bin - /usr/share/slsh - /usr/lib - /usr/share/doc/slang - /usr/share/man - - - - slang-devel - Development files for slang - slang için geliştirme dosyaları - system.devel - - slang - - - /usr/include - /usr/lib/pkgconfig - /usr/share/doc/slang/html - /usr/share/man/man3 - - - - - 2014-05-11 - 2.2.4 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-31 - 2.2.4 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-08-23 - 2.2.4 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - shadow - http://pkg-shadow.alioth.debian.org/ - - PisiLinux Community - admins@pisilinux.org - - BSD - app:console - system.base - Utilities to deal with user accounts - Kullanıcı hesapları yönetimi için araçlar - Le paquet des utilitaires pour le fichier de mot de passe Shadow regroupe les programmes nécessaires à convertir les fichiers de mots de passe traditionnels V7*NIX au format de mot passe shadow SVR4 ainsi que d'autres outils destinés à la gestion des fichiers des groupes et de mots de passe (qui fonctionnent aussi bien pour les mots de passe shadow que non-shadow). - The Shadow password file utilities package includes programs necessary to convert traditional V7 *NIX password files to the SVR4 shadow password format, and additional tools to maintain password and group files (that work with both shadow and non-shadow passwords). - Shadow parola dosyası yardımcı uygulamalar paketi, geleneksel V7 *nix parola dosyalarını SVR4 shadow parola biçimine dönüştüren programlar ile parola ve grup dosyalarının bakımı için ilave araçlar içerir. - http://pkg-shadow.alioth.debian.org/releases/shadow-4.2.1.tar.xz - - pam-devel - audit-devel - gettext-devel - skey-devel - - - shadow-strncpy-usage.patch - xstrdup.patch - - system/base/shadow/pspec.xml - - - shadow - Utilitaires pour gérer les comptes utilisateurs - Kullanıcı hesaplarını düzenlemek için araçlar. - - acl - attr - pam - audit - - - /bin - /usr/bin - /sbin - /usr/sbin - /etc - /lib - /usr/share/man - /usr/share/doc - /usr/share/info - /usr/share/locale - - - securetty - default/useradd - pam.d/login - pam.d/other - pam.d/passwd - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/shadow - pam.d/su - pam.d/system-auth - login.defs - - - - - 2014-12-13 - 4.2.1 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-05-11 - 4.1.5.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 4.1.5.1 - Rebuild without-libcrack, clean shadow, fix login defs. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-08-30 - 4.1.5.1 - Rebuild with-libcrack, clean shadow. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-26 - 4.1.5.1 - Release bump for rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-23 - 4.1.5.1 - First release - PisiLinux Community - admins@pisilinux.org + Sezai Yeniay + sezaiyeniay@pisilinux.org @@ -14644,25 +19977,19 @@ FTL GPLv2 library - system.base + desktop.font A high-quality and portable font engine Yüksek kaliteli ve taşınabilir yazıtipi düzeneği FreeType2 est un moteur logiciel de fontes conçu pour être petit, efficace, très flexible et portable tout en étant capable de produire une sortie de très haute qualité. Il peut être utilisé dans les librairies graphiques, les serveurs d'affichage, les outils de conversion, les outils de génération d'images textuelles, ainsi que beaucoup d'autres produits. FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output. It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well. FreeType 2; küçük, verimli, özelleştirilebilir, taşınabilir ve yüksek kaliteli çıktı oluşturan bir yazıtipi düzeneğidir. Grafik kütüphaneleri, görüntü sunucuları ve yazıtipi değiştirme araçları gibi birçok üründe kullanılabilir. - mirrors://sourceforge/freetype/freetype-2.5.3.tar.bz2 + mirrors://sourceforge/freetype/freetype-2.5.5.tar.bz2 zlib-devel bzip2 libpng-devel - - freetype-2.2.1-enable-valid.patch - freetype-2.5.1-enable-sph.patch - freetype-2.5.1-enable-spr.patch - fix_segfault_with_harfbuzz.diff - - system/base/freetype/pspec.xml + desktop/font/freetype/pspec.xml freetype @@ -14681,10 +20008,9 @@ freetype-devel Development files for freetype freetype için geliştirme dosyaları - system.devel - freetype - harfbuzz-devel + zlib-devel + libpng-devel /usr/bin @@ -14703,10 +20029,9 @@ zlib-32bit libpng-32bit - harfbuzz-32bit - freetype + glibc-32bit zlib-32bit libpng-32bit @@ -14715,6 +20040,13 @@ + + 2015-03-11 + 2.5.5 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-05-11 2.5.3 @@ -14780,4489 +20112,6 @@ - - - xz - http://tukaani.org/xz/ - - PisiLinux Community - admins@pisilinux.org - - LGPLv2+ - GPLv2+ - GPLv3 - app:console - library - system.base - XZ compression utilities - XZ sıkıştırma araçları - XZ Utils provide a general purpose data compression library and command line tools. The .xz format supports multiple compression algorithms, which are called "filters" in context of XZ Utils. The primary filter is currently LZMA2. - xz, genel amaçlı bir veri sıkıştırma kütüphanesi ve konut satırı araçları içerir. xz dosya biçimi filtre adı verilen sıkıştırma algoritmalarını destekler, öntanımlı filtre ise LZMA2 algoritmasıdır. - http://tukaani.org/xz/xz-5.0.7.tar.gz - system/base/xz/pspec.xml - - - xz - - /usr/bin - /usr/lib - /usr/share/man - /usr/share/doc - /usr/share/locale - - - - xz-devel - Development files for XZ - XZ için geliştirme dosyaları - system.devel - - xz - - - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - - xz-32bit - 32bit shared libraries for xz - XZ için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - xz - - - /usr/lib32 - - - - - 2014-10-01 - 5.0.7 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 5.0.5 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-28 - 5.0.5 - Version bump, clean xz. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-26 - 5.0.4 - Move pc files to devel pack, increase release no. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-24 - 5.0.4 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - gperf - http://www.gnu.org/software/gperf/gperf.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A perfect hash function generator - Mükemmel hash üreticisi - gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only. - gperf mükemmel hash fonksiyonu üretecidir. Verilen bir katar listesi için C ve C++ kodu biçiminde bir hash fonksiyonu ve hash tablosu üretir. - GNU gperf es un generador de perfect hash. Produce una función hash y una tabla hash a base de una lista de cadenas, en forma de código C o C++ , para revisar valores dependiendo de una cadena de entrada. La función de hash es perfecta, lo que quiere decir que no hay colisiones en la tabla de hash, y para la búsqueda en la tabla hash se necesita solamente una comparación. - mirrors://gnu/gperf/gperf-3.0.4.tar.gz - system/base/gperf/pspec.xml - - - gperf - - libgcc - - - /usr/bin - /usr/share/doc - /usr/share/info - /usr/share/man - - - - - 2014-05-11 - 3.0.4 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-24 - 3.0.4 - Rebuild. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2013-07-26 - 3.0.4 - Fix dep,release bump. - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 3.0.4 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - openssl - http://www.openssl.org/ - - PisiLinux Community - admins@pisilinux.org - - as-is - app:console - library - system.base - Toolkit for SSL v2/v3 and TLS v1 - SSL v2/v3 ve TLS v1 için araç kiti - OpenSSL est un outil cryptographique implémentant une couche de communication sécurisée (SSL v2/v3) et une couche de transport sécurisée (TLS v1) - OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. - OpenSSL, Güvenlik Soketleri Katmanı (SSL v2/v3) ve Aktarım Katmanı Güvenliği (TLSv1) ağ protokolleri ile bu protokollerin gerektirdiği şifreleme standartlarını uygulayan bir şifreleme aracıdır. - OpenSSL ist ein Kryptographie Werkzeug, das die Netzwerkprotokolle Secure Sockets Layer (SSL v2/v3) und Transport Layer Security (TLS v1) sowie deren erforderliche zugehörige Kryptographie Standards implementiert. - ftp://ftp.openssl.org/source/openssl-1.0.2.tar.gz - - openssl-1.0.0-beta4-ca-dir.patch - - - zlib - perl - sed - - - openssl-1.0.0a-ldflags-norpath.patch - openssl-1.0.0-beta4-ca-dir.patch - openssl-1.0.0-beta5-enginesdir.patch - openssl-1.0.2-parallel-build.patch - openssl-1.0.2-ipv6.patch - openssl-1.0.2-s_client-verify.patch - openssl-include.patch - openssl_fix_for_x32.patch - openssl-optflags.patch - - system/base/openssl/pspec.xml - - - openssl - - zlib - ca-certificates - - - /etc - /usr/bin - /usr/lib - /usr/share/doc - - - System.Package - - - - openssl-devel - Development files for openssl - openssl için geliştirme dosyaları - system.devel - - openssl - - - /usr/include - /usr/share/man - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - - openssl-32bit - 32-bit shared libraries for openssl - openssl için 32-bit paylaşımlı kitaplıklar - emul32 - _emul32 - - zlib-32bit - - - openssl - zlib-32bit - - - /usr/lib32 - - - - - 2015-02-17 - 1.0.2 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-11-05 - 1.0.1j - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-06-05 - 1.0.1h - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 1.0.1g - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-09 - 1.0.1g - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-02-02 - 1.0.1f - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-08-28 - 1.0.1e - Clean openssl. - Serdar Soytetir - kaptan@pisilinux.org - - - security - 2013-01-14 - 1.0.1e - New release - PisiLinux Community - admins@pisilinux.org - - - security - 2012-08-31 - 1.0.1c - First release - Erdem Artan - admins@pisilinux.org - - - - - - libunistring - http://www.gnu.org/software/libunistring - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - LGPLv3 - library - system.base - Unicode string library - Unicode karakter dizisi kitaplığı - This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard. - Bu kitaplığı unicode standartına göre unicode ve C karakter dizilerinde değişiklik yapmak için kullanılabilecek fonksiyonlar sunar. - mirrors://gnu/libunistring/libunistring-0.9.3.tar.gz - system/base/libunistring/pspec.xml - - - libunistring - - /usr/lib - /usr/share/doc - /usr/share/info - - - - libunistring-devel - Development files for libunistring - libunistring için geliştirme dosyaları - system.devel - - libunistring - - - /usr/include - - - - - 2014-05-11 - 0.9.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-30 - 0.9.3 - Rebuild - Pisi Linux Admins - admins@pisilinux.org - - - 2011-02-10 - 0.9.3 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - plyvel - https://pypi.python.org/pypi/plyvel - - Alihan Öztürk - alihan@pisilinux.org - - BSD - app:console - system.base - Plyvel, a fast and feature-rich Python interface to LevelDB. - Plyvel, LevelDB için, hızlı ve zengin özellikli Python arabirimi. - Plyvel has a rich feature set, high performance, and a friendly Pythonic API. - Plyvel zengin özelliklere sahip bir set, yüksek performanslı, ve kullanıcı dostu bir Pythonic API. - https://pypi.python.org/packages/source/p/plyvel/plyvel-0.8.tar.gz - - cython - - system/base/plyvel/pspec.xml - - - plyvel - - libgcc - python - leveldb - - - /usr/lib - /usr/share/doc - - - - - 2014-06-08 - 0.8 - Rebuild. - Aydın Demirel - aydin.demirel@pisilinux.org - - - 2014-06-01 - 0.8 - First release. - Alihan Öztürk - alihan@pisilinux.org - - - - - - baselayout - http://www.pisilinux.org - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - library - data - system.base - Filesystem baselayout - Dosya sisteminin temel planı - Ce paquet crée la hiérarchie du système de fichier principal de Pisi Linux. - baselayout creates the Pisi Linux Linux main filesystem hierarchy. - Bu paket, Pisi Linux dosya sisteminin temelini oluşturur. - http://source.pisilinux.org/1.0/baselayout-3.10.0.tar.gz - system/base/baselayout/pspec.xml - - - baselayout - - pypolkit - - - /bin - /sbin - /lib* - /etc - /etc/pisilinux-release - /media - /boot - /proc - /home - /mnt - /opt - /dev - /run - /sys - /srv - /tmp - /usr - /var - /usr/lib/tmpfiles.d/baselayout.conf - - - System.PackageHandler - System.Package - User.Manager - Network.Stack - - - baselayout.conf - services - protocols - sysctl.conf - pisilinux-release - start-stop-daemon.8 - - - - - 2014-07-16 - 3.10.0 - Add vboxusers - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-07-16 - 3.10.0 - Release Pisi Linux 1.0 - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 3.10.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-15 - 3.10.0 - Rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-19 - 3.10.0 - Update baselayout.conf - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-08 - 3.10.0 - Add baselayout.conf - Marcin Bojara - marcin@pisilinux.org - - - 2013-12-20 - 3.10.0 - Release Pisi Linux Rc2 - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-27 - 3.10.0 - Add gdm user and group, apply chmod 1777 to dev/shm aka run/shm. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-10 - 3.10.0 - Add shm dir to run, new archive. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-05 - 3.8.0 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 3.8.0 - release Izmir - Erdinç Gültekin - erdincgultekin@pisilinux.org - - - 2013-03-24 - 3.8.0 - Pisi Linux changes. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-11 - 3.7.1 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - wireless-tools - http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A collection of tools to configure wireless lan cards - Kablosuz ağ kartlarını yapılandırmak için kullanılan bir araç seti - Les outils sans fil (Wireless Tools ou WT) est un ensemble d'outils permettant de manipuler les extensions sans fil, c'est une interface de programmation d'application (API) générique permettant à un pilote d'exposer à l'espace utilisateur la configuration ainsi que des statistiques spécifiques aux LANs sans fil communs. Ils utilisent une interface textuelle assez rugueuse, mais ont pour objectif de couvrir la totalité de l'extension sans fil. - The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions, a generic application programming interface allowing a driver to expose to the user space configuration and statistics specific to common Wireless LANs. They use a textual interface and are rather crude, but aim to support the full Wireless Extension. - Wireless Extensions, sürücülerin bilinen kablosuz ağların ayarlarını yapmak ve istatistiklerini görüntülemek amacıyla kullandığı bir yazılım programlama arayüzüdür. Wireless Tools ise Wireless Extensions ayarlarını modifiye etmek için kullanılan araçları içeren bir pakettir. Grafik arayüzü bulunmaz, biraz da kabadır; ancak Wireless Extension'u tam olarak desteklemeyi hedefler. - http://svn.mandriva.com/svn/packages/cooker/wireless-tools/current/SOURCES/wireless_tools.30.pre9.tar.gz - - no-ldconfig.patch - wireless_tools.27-wireless-man-upd.patch - wireless-tools-29-makefile.patch - - system/base/wireless-tools/pspec.xml - - - wireless-tools - - comar - - - /sbin - /usr/lib - /usr/share/man - /usr/share/doc - - - - wireless-tools-devel - Development files for wireless-tools - wireless-tools için geliştirme dosyaları - system.devel - - wireless-tools - - - /usr/include - /usr/share/man/man3 - - - - - 2014-05-11 - 30 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 30 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2013-02-11 - 30 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2011-06-01 - 29 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - libee - http://www.libee.org/ - - Marcin Bojara - marcin@pisilinux.org - - LGPLv2.1 - library - system.base - An Event Expression Library inspired by CEE - Libee - An Event Expression Library inspired by CEE - http://www.libee.org/download/files/download/libee-0.4.1.tar.gz - - libestr-devel - - system/base/libee/pspec.xml - - - libee - - libestr - - - /usr/sbin - /usr/lib/libee.so* - /usr/share/doc/libee - - - - libee-devel - Development files for libestr - system.devel - - libee - - - /usr/include/libee - /usr/lib/pkgconfig/libee.pc - - - - - 2014-05-11 - 0.4.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 0.4.1 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-11-21 - 0.4.1 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - pisi - http://www.pisilinux.org/ - - Marcin Bojara - marcin@pisilinux.org - - GPLv2 - app:console - system.base - PISI is the package management system of Pisi Linux - PİSİ PiSi Linux'un paket yönetim sistemidir - PiSi – menadżer pakietów dla PiSi Linux. - PISI est gestionnaire de paquets moderne implémenté en Python.Ces principales fonctionnalités sont les suivantes : - Les paquets sources sont écrits en XML et en python - Implemente tout les fonctions à travers une API simple d'utilisation - Intègre aussi bien les fonctionnalités de bas niveaux que de haut niveau de gestion de paquets. - PISI is a modern package management system implemented in Python. Some of its main features are: package sources are written in XML and python, implements all functions through a simple-to-use API, integrates low-level and high-level package management features. - PİSİ Python'da yazılmış modern bir paket yöneticisidir. Bazı ana özellikleri: Paket kaynakları XML ve python kullanılarak yazılır, bütün işlevleri kullanması kolay bir API ile sağlar ve düşük ve yüksek seviyeli paket yönetim işlevlerini birleştirir. - PISI jest podstawowym narzędziem do instalacji, aktualizacji i usuwania pakietów. Obsługuje zależności dla poszczególnych pakietów, bibliotek i zadań ÇOMAR-a. Instalacja oprogramowania odbywa się w łatwy i przyjazny sposób. Do przechowywania informacji o pakietach wykorzystuje bazę Berkeley DP, co zapewnia większą stabilność i szybkość. - http://source.pisilinux.org/1.0/pisi-2.6.tar.xz - - pisi.conf-i686 - pisi.conf-x86_64 - - - comar - plyvel - python - gettext - leveldb-devel - - - initialize_filesdb_once.patch - no_clean_if_ignore_comar.patch - orphaned_pkgs.patch - improve_pisi_ix.patch - fix_emul32_flags.patch - pisi-2.6-pisitools.dopixmaps-add.patch - - system/base/pisi/pspec.xml - - - pisi - - tar - file - comar - plyvel - python - gettext - leveldb - piksemel - comar-api - urlgrabber - python-psutil - python-pyliblzma - mudur - - - /usr/bin - /usr/sbin - /usr/lib/pardus/pisi - /usr/lib/pisilinux/pisi - /usr/share/locale - /usr/share/doc - /etc/pisi - /usr/share/mime/packages - /usr/lib/tmpfiles.d/pisi.conf - /run/lock/files.ldb/LOCK - /var/lib/pisi/info/files.ldb/LOCK - - - System.Package - System.Manager - - - mirrors.conf - sandbox.conf - pisi.xml - pkgconfig.py - tmpfiles.conf - - - - - 2014-12-07 - 2.6 - Add new pisitools.dopixmaps - Osman Erkan - osman.erkan@pisilinux.org - - - 2014-09-15 - 2.6 - Add new pisi commands: list-orphaned and remove-orphaned. - Improve pisi index. - Marcin Bojara - marcin@pisilinux.org - - - 2014-08-04 - 2.6 - pisi search-file works without sudo now. - Marcin Bojara - marcin@pisilinux.org - - - 2014-07-25 - 2.6 - Rebuild for version number. - Aydın Demirel - aydin.demirel@pisilinux.org - - - 2014-06-24 - 2.6 - Add patch for initialize filesdb once. - Marcin Bojara - marcin@pisilinux.org - - - 2014-06-15 - 2.6 - Version bump. - revdep-rebuild rewritten in python. - Marcin Bojara - marcin@pisilinux.org - - - 2014-06-08 - 2.5 - Add case sensitive for 'pisi sr'. - Change install path. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-27 - 2.5 - Add patch level auto detection feature, - sha1sum for install.tar.xz file, - check sha1sum for upgrade. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 2.5 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 2.5 - Some improvements for buildfarm. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-04 - 2.5 - Handle error for file command. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-16 - 2.5 - Workaround for update espeak package. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-07 - 2.5 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-02-28 - 2.4 - Fix pisitools.dosed output. - Marcin Bojara - marcin@pisilinux.org - - - 2014-02-13 - 2.4 - Workaround for the case where old dir /a/b/c is replaced by file c in /a/b dir. - Marcin Bojara - marcin@pisilinux.org - - - 2013-11-12 - 2.4 - Fix stripping issues, in file info: LSB executable, LSB shared syntax. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-22 - 2.4 - Disable python_installation patch to check python upgrading breaks pisi or not. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-08-25 - 2.4 - Fix autocompletion for local uncompressed index file. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-21 - 2.4 - Fix upgrading python package. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-01 - 2.4 - Improve managing CFLAGS, CXXFLAGS and LDFLAGS, - export HOME=get.workDIR() as default. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-25 - 2.4 - Fix and improve kerneltools. - Avoid double slashes pisi error. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-11 - 2.4 - adjust takeback to new dir structure. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-21 - 2.4 - No capital letters in directory names. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-17 - 2.4 - Fix overwrite 64bit libs by 32bit for some packages - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-02 - 2.4 - Add sorting packages for pisi ix - Marcin Bojara - marcin@pisilinux.org - - - 2013-05-15 - 2.4 - Add pisitools.flags() and pisitools.ldflags() - Marcin Bojara - marcin@pisilinux.org - - - 2013-05-12 - 2.4 - Sandbox.conf edit. - PisiLinux Community - admins@pisilinux.org - - - 2013-03-20 - 2.4 - Add patch for speed up packaging process - Marcin Bojara - marcin@pisilinux.org - - - 2013-03-14 - 2.4 - Improve dosed - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-14 - 2.4 - Add assign-devel-and-doc-packages.patch. - Marcin Bojara - marcin@pisilinux.org - - - 2013-01-18 - 2.4 - First release. - Marcin Bojara - marcin@pisilinux.org - - - - - - ncurses - http://www.gnu.org/software/ncurses/ncurses.html - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - Console display library - Konsol görsel kütüphanesi - NCurses est une librairie de fonction gérant l'affichage des applications pour terminaux en mode caractères. La libraries NCurses défini de nombreuses fonctionalités telles le mouvement de la souris et du curseur, la disposition du clavier et l'affichage en couleur. - The NCurses is a library of functions that manage an application's display on character-cell terminals. The NCurses library defines many functions such as moving mouse and cursor, keyboard mapping and dispaying in color. - NCurses, bir uygulamanın karakter tabanlı uçbirimlerde görüntüleri üzerinde çalışabilmeyi sağlayan işlevler kütüphanesidir. Uygulama programları için imleci hareket ettirmek, pencereler oluşturmak, renkler üretmek, fare ile oynamak v.b. işlevler sağlamaktadır. - mirrors://gnu/ncurses/ncurses-5.9.tar.gz - - gnuconfig - - system/base/ncurses/pspec.xml - - - ncurses - - /etc - /lib - /usr/bin - /usr/lib - /usr/share/terminfo - /usr/share/tabset - /usr/share/man - /usr/share/doc - - - - ncurses-devel - Development files for ncurses - ncurses için geliştirme dosyaları - system.devel - - ncurses - - - /usr/include - /usr/lib/static - /usr/lib32/static - /usr/share/man/man3 - - - - ncurses-32bit - 32-bit shared libraries for ncurses - emul32 - _emul32 - - ncurses - - - /usr/lib32 - /usr/lib32/pkgconfig - - - - - 2014-09-14 - 5.9 - Fix build .pc files. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 5.9 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 5.9 - Rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-27 - 5.9_20121110 - Clean ncurses - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-11-14 - 5.9_20121110 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - python - http://www.python.org/ - - PisiLinux Community - admins@pisilinux.org - - PSF-2.2 - app:console - system.base - An interpreted, interactive, object-orientated programming language - Nesneye yönelik bir programlama dili - Python est un langage de programmation dynamique orienté objet pouvant être utilisé pour différents types de développements logiciels. Il offre une intégration renforcée aussi bien avec les autres langages qu'avec des outils. Il est livré avec des librairies standards couvrant un large périmètre et peut être appris en quelques jours. - Python is a dynamic object-oriented programming language that can be used for many kinds of software development. It offers strong support for integration with other languages and tools, comes with extensive standard libraries, and can be learned in a few days. - Python, yazılım geliştirmenin birçok aşamasında kullanılabilen, dinamik nesne tabanlı bir programlama dilidir. Diğer programlama dilleriyle bütünleşme için sağlam bir destek sunar, kapsamlı standart kütüphanelerle sunulur ve birkaç günde öğrenilebilir. - http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz - - bzip2 - tcl-devel - gdbm-devel - zlib-devel - expat-devel - tcltk-devel - libffi-devel - sqlite-devel - ncurses-devel - openssl-devel - readline-devel - - - pisilinux_platform.patch - add-pisilinux-to-search-path.patch - default-utf8.patch - disable-egginfo.patch - trfix_emaillib.patch - - system/base/python/pspec.xml - - - python - - noDelta - - - gdbm - zlib - bzip2 - expat - libffi - sqlite - ncurses - openssl - readline - - - /etc - /usr/bin - /usr/include/python2.7/pyconfig.h - /usr/lib - /usr/share/doc - /usr/share/man - - - System.PackageHandler - - - pythonstart - 04python - - - - python-devel - Development files for python - python için geliştirme dosyaları - system.devel - - python - - - /usr/include - /usr/lib/pkgconfig - - - - python-tk - Python modules for Tk - Tk için Python modülleri - library - programming.language.python - - tcl - tcltk - - - /usr/lib/python*/lib-tk - /usr/lib/python*/lib-dynload/_tkinter.so - - - - idle - An Integrated Development Environment for Python - Python için Tümleşik Geliştirme Ortamı - app:gui - programming.environment - idle - - python-tk - - - /usr/bin/idle - /usr/lib/python*/idlelib - /usr/share/applications - /usr/share/pixmaps - - - python-logo.png - idle.desktop - - - - - 2014-12-12 - 2.7.9 - Version bump and security fixes. - Vedat Demir - vedat@pisilinux.org - - - 2014-07-05 - 2.7.8 - Version bump and security fixes. - Vedat Demir - vedat@pisilinux.org - - - 2014-06-02 - 2.7.7 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 2.7.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-25 - 2.7.6 - Add upstream patch. - Marcin Bojara - marcin@pisilinux.org - - - 2014-02-20 - 2.7.6 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-09-05 - 2.7.5 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-31 - 2.7.5 - Clean python. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-21 - 2.7.5 - Add some patches. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-16 - 2.7.5 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-07-11 - 2.7.3 - First release - Erdem Artan - admins@pisilinux.org - - - - - - cpio - http://www.gnu.org/software/cpio/cpio.html - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - app:console - system.base - A file archival tool which can also read and write tar files - Tar ve cpio dosyaları içine yazıp okuyabilen bir dosya arşivleme uygulaması - GNU cpio permet de copier des fichiers du système dans une archive cpio ou tar et vice-versa. L'archive peut être un simple fichier sur le disque, une cassette magnétique, ou un tuyau unix (pipe). GNU cpio gère les formats d'archive suivant : binaire, ASCII ancien, ASCII nouveau, crc, binaire HPUX, ASCII ancien HPUX, tar ancien et tar POSIX.1. - GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe. GNU cpio supports the following archive formats: binary, old ASCII, new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar. - GNU cpio dosyaları cpio veya tar arşivlerine kopyalamaya veya bu arşivlerden çıkarmak için tasarlanmıştır. Arşiv diskteki başka bir dosya, manyetik bir teyp veya bir boru sistemi olabilir. GNU cpio şu arşiv formatlarını destekler: ikili, eski ASCII, yeni ASCII, crc, HPUX ikili, HPUX eski ASCII, eski tar ve POSIX.1 tar. - mirrors://gnu/cpio/cpio-2.11.tar.bz2 - - cpio-2.7-svr4compat.patch - cpio-2.9-exitCode.patch - CVE-2010-0624-rpatelib-overflow.patch - - system/base/cpio/pspec.xml - - - cpio - - /bin - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/locale - - - - - 2014-05-11 - 2.11 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 2.11 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-08-24 - 2.11 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - findutils - http://www.gnu.org/software/findutils/findutils.html - - PisiLinux Community - admins@pisilinux.org - - GPLv3+ - app:console - system.base - GNU utilities to find files - Dosya bulmak için kullanılan GNU uygulamaları - Les utilitaires de recherche GNU sont les utilitaire de recherche de répertoire basique du système d'exploitation GNU. Ces programmes sont typiquement associés à d'autres programmes pour leur fournir une capacité de recherche de fichier et de répertoire puissante et modulaire à d'autres commandes. - The GNU Find Utilities are the basic directory searching utilities of the GNU operating system. These programs are typically used in conjunction with other programs to provide modular and powerful directory search and file locating capabilities to other commands. - GNU Find Utilities GNU işletim sisteminin temel dizin arama uygulamalarıdır. Bu uygulamalar diğer komutlara başka programlar ile birlikte çalışarak modüler ve güçlü dizin ve dosya arama yetenekleri sunar. - http://ftp.gnu.org/pub/gnu/findutils/findutils-4.4.2.tar.gz - - gettext-devel - - system/base/findutils/pspec.xml - - - findutils - - /usr/bin - /usr/lib/find - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/locale - - - - - 2014-05-11 - 4.4.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-01 - 4.4.2 - Revert back to stable version, clean findutils. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-09-14 - 4.5.9 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - rsyslog - http://www.rsyslog.com - - PisiLinux Community - admins@pisilinux.org - - GPLv3+ - service - system.base - Enhanced system logging and kernel message trapping daemons - Gelişmiş sistem günlükleme hizmeti - rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part, and fine grain output format control. It is quite compatible with stock sysklogd and can be used as a drop-in replacement. - rsyslog, çoklu iş parçacığı, MySQL, syslog/tcp, RFC 3195, izin verilen gönderici listesi, gelişmiş ileti filtreleme gibi özelliklere sahip gelişmiş bir sistem günlükleme hizmetidir. - http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz - - zlib-devel - json-c-devel - libestr-devel - libgcrypt-devel - liblogging-devel - - system/base/rsyslog/pspec.xml - - - rsyslog - - zlib - json-c - libestr - libuuid - libgcrypt - liblogging - - - /usr/bin/rsyslogd - /usr/lib/rsyslog - /usr/share/man - /usr/share/doc - /etc/logrotate.d - /etc/conf.d - /etc/rsyslog.conf - - - System.Service - - - rsyslog.logrotate - rsyslog.conf - rsyslog.sysconfig - - - - - 2014-05-11 - 7.6.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-30 - 7.6.3 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-02-13 - 7.2.5 - Rebuild Unused - Varol Maksutoğlu - waroi@pisilinux.org - - - 2013-07-26 - 7.2.5 - Release bump, fix dep. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-14 - 7.2.5 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-11-21 - 7.2.3 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - run-parts - http://packages.qa.debian.org/d/debianutils.html - - PisiLinux Community - osman.erkan@yandex.com - - GPLv2+ - system.base - run scripts or programs in a directory - run scripts or programs in a directory - ftp://ftp.archlinux.org/other/run-parts/debianutils_4.4.tar.gz - system/base/run-parts/pspec.xml - - - run-parts - - /usr/share/man - /usr/bin - /usr/sbin - - - - - 2014-05-11 - 4.4 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-02 - 4.4 - rm unneeded files. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2014-04-01 - 4.4 - Release bump for component change. - PisiLinux Community - osman.erkan@yandex.com - - - 2014-03-02 - 4.4 - First Release - PisiLinux Community - osman.erkan@yandex.com - - - - - - sed - http://sed.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - GNU Stream Editor - GNU stream düzenleyici - Sed est un éditeur de flux. Un éditeur de flux est utilisé pour réaliser des opérations basiques de modification de texte sur un flux d'entrée (un fichier ou un tuyau unix). - Sed is a stream editor. A stream editor is used to perform basic text transformations on an input stream (a file or input from a pipeline). - Sed bir dosyadan veya standart girdiden (klavyeden) bilgi okur ve standart çıktıya (ekrana) okuduğu bilgileri kullanıcının belirlediği düzene sokarak yazar. - mirrors://gnu/sed/sed-4.2.2.tar.gz - - gettext-devel - - system/base/sed/pspec.xml - - - sed - - acl - - - /bin - /usr/bin - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/locale - - - - - 2014-05-11 - 4.2.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-27 - 4.2.2 - Clean sed. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-14 - 4.2.2 - Release bump for rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-14 - 4.2.2 - New release - PisiLinux Community - admins@pisilinux.org - - - 2010-10-11 - 4.2.1 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - perl-Locale-gettext - http://search.cpan.org/dist/gettext - - PisiLinux Community - admins@pisilinux.org - - Artistic - library - system.base - A Perl module for accessing the GNU locale utilities - GNU yerel araçlarına erişim için Perl modülü - The gettext module permits access from Perl to the gettext() family of functions for retrieving message strings from databases constructed to internationalize software. - Bu modül, çoklu dil desteğini sağlayan gettext() ailesine Perl üzerinden erişimi sağlar. - El módulo gettext permite Perl acceder a la familia de funciones gettext() para obtener cadenas de mensajes (traducidos) desde bases de datos para la internacionalización de software. - http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz - - perl - - system/base/perl-Locale-gettext/pspec.xml - - - perl-Locale-gettext - - perl - - - /usr/lib - /usr/share/perl - /usr/share/doc - /usr/share/man - - - - - 2014-09-10 - 1.05 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 1.05 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-04 - 1.05 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-10-07 - 1.05 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - pycurl - http://pycurl.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - LGPLv2.1 - library - system.base - Python cURL Module - Python cURL Modülü - PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program. - PycURL, python libcurl için python arayüzüdür. PycURL, URL tarafında tanımlanan nesneleri indirmek için bir python programı tarafından kullanılabilir. - http://pycurl.sourceforge.net/download/pycurl-7.19.3.1.tar.gz - - curl - python - openssl - - system/base/pycurl/pspec.xml - - - pycurl - - curl - python - openssl - - - /usr/lib - /usr/share/doc - - - - - 2014-05-11 - 7.19.3.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-01 - 7.19.3.1 - Version bump. - Kamil Atlı - suvarice@gmail.com - - - 2013-12-19 - 7.19.0.2 - Rebuild - Stefan Gronewold(groni) - groni@pisilinux.org - - - 2013-03-12 - 7.19.0.2 - Version bum. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-03-12 - 7.19.0 - Fix pisi https issue - Pisi Linux Admins - marcin@pisilinux.org - - - 2010-10-11 - 7.19.0 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - dbus-glib - http://dbus.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - AFL-2.1 - library - system.base - Glib bindings for D-Bus - D-Bus için GLib bağlayıcıları - dbus-glib is an add-on library to integrate the standard D-Bus library with the GLib thread abstraction and main loop. - dbus-glib, standart D-Bus kitaplığını GLib ana döngüsüyle bütünleştirmek için kullanılan bir kitaplıktır. - http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.102.tar.gz - - dbus - glib2 - expat - libxml2 - - system/base/dbus-glib/pspec.xml - - - dbus-glib - - dbus - glib2 - expat - libxml2 - - - /usr/bin - /usr/libexec/dbus-bash-completion-helper - /usr/lib - /usr/share/doc - /usr/share/man/man1 - /etc/bash_completion.d - /usr/share/bash-completion - /usr/libexec - - - - dbus-glib-devel - Development files for dbus-glib - dbus-glib için geliştirme dosyaları - system.devel - - dbus-glib - - - /usr/include/dbus-1.0 - /usr/lib/pkgconfig - /usr/share/man/man3 - - - - - 2014-05-11 - 0.102 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-02-18 - 0.102 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-02-11 - 0.100.1 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 0.100 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - psmisc - http://psmisc.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A set of tools that use the proc filesystem - proc dosya sistemi kullanan bir araç takımı - PSmisc est une collection de petits utilitaires utilisant le système de fichier /proc, et assiste l'administrateur système dans ses tâches habituelles. - PSmisc is a collection of small utilities using /proc file system, and providing the system administrator with some help in common tasks. - PSmisc, /proc dosya sistemini kullanan küçük araçlar yardımıyla sistem yöneticisine bazı genel görevlerde yardımcı olmayı amaçlar. - PSmisc ist eine Sammlung von kleinen Anwendungen, die das /proc Dateisystem verwenden und dem System Administrator Hilfe für gängige Aufgaben bieten. - mirrors://sourceforge/psmisc/psmisc-22.20.tar.gz - - ncurses - gettext - - system/base/psmisc/pspec.xml - - - psmisc - - ncurses - - - /bin - /usr/bin - /usr/share/man - /usr/share/doc - /usr/share/locale - - - - - 2014-05-11 - 22.20 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-14 - 22.20 - New version - Ertan Güven - ertan@pisilinux.org - - - 2012-08-24 - 22.19 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - db - http://www.oracle.com/technology/products/berkeley-db/db/index.html - - PisiLinux Community - admins@pisilinux.org - - DB - app:console - system.base - Quatrième version de Berkeley DB - Oracle Berkeley DB - Oracle Berkeley DB - Ein einbettbares Datenbank Engine, dass die Entwickler mit schnellen, zuverlässigen und lokalen Persistenz unterstützt und null Administration erfordert. - The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides embedded database support for both traditional and client/server applications. The Berkeley DB includes B+tree, Extended Linear Hashing, Fixed and Variable-length record access methods, transactions, locking, logging, shared memory caching, and database recovery. The Berkeley DB supports C, C++, Java, and Perl APIs. It is used by many applications, including Python and Perl, so this should be installed on all systems. - Berkeley DB geliştiricilere yerel süreklilik sağlayan ve herhangi bir ayar gerektirmeden (zero administration) kullanılan, hızlı ve gömülebilir bir veritabanı motorudur. - http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz - system/base/db/pspec.xml - - - db - - libgcc - - - /usr/bin - /usr/lib - /usr/sbin - - - db5 - - - - db-devel - Development files for db - - db - - - /usr/include - - - db5-devel - - - - db-docs - Documentation for db - system.doc - - db - - - /usr/share/doc - - - db5-docs - - - - - 2014-09-10 - 5.3.28 - Rebuild for component change. - Perl depends on db, so we need it in system.base. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-07-15 - 5.3.28 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 5.3.28 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2013-08-29 - 5.3.21 - Rename and clean db pack. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-26 - 5.3.21 - Fix dep, release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-31 - 5.3.21 - First release - Erdem Artan - admins@pisilinux.org - - - - - - libXau - http://www.x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - Librairie Au de X.Org. - X.Org Au library - X.Org Au kitaplığı. - X.Org Au Bibliothek - libXau provides functions to manage X authorization files - libXau, X yetkilendirme dosyalarını yönetmek için işlevler sağlar. - http://xorg.freedesktop.org/archive/individual/lib/libXau-1.0.8.tar.gz - - visibility.patch - - system/base/libXau/pspec.xml - - - libXau - - /usr/lib - - - - libXau-devel - Development files for libXau - libXau için geliştirme dosyaları - system.devel - - libXau - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man - - - - libXau-32bit - 32-bit shared libraries for libXau - libXau için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libXau - - - /usr/lib32 - - - - - 2014-05-11 - 1.0.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-07 - 1.0.8 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-21 - 1.0.8 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-08-23 - 1.0.7 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - nspr - http://www.mozilla.org/projects/nspr/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - system.base - Netscape Portable Runtime - Netscape Taşınabilir Çalışma Zamanı - Netscape Portable Runtime (NSPR -- Exécutable Portable Netscape) fourni une API neutre au sens de la plate-forme pour les fonctions de niveau système ou de type libc. Cette API est utilisée au sein du client Mozilla ainsi que de nombreuses solutions logicielles de Netscape/AOL/iPlanet. - Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions. The API is used in the Mozilla client, many of Netscape/AOL/iPlanet's and other software offerings. - Netscape Taşınabilir çalışma Zamanı (NSPR) sistem seviyesindeki libc ve benzeri fonksiyonlar için platform bağımsız bir programlama arayüzü sunar. Bu arayüz, Mozilla istemcilerinde, Netscape/AOL/iPlanet'in diğer yazılımlarında kullanılmaktadır. - Netscape Portable Runtime (NSPR) provee un API independiente de la plataforma a nivel de sistema y funciones como libc. El API está usado en el cliente Mozilla, y muchos otros software de Netscape/AOL/iPlanet. - ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.7/src/nspr-4.10.7.tar.gz - - nspr.pc.in - generate-pc-config.sh - - system/base/nspr/pspec.xml - - - nspr - - /usr/lib - - - - nspr-devel - Development files for nspr - nspr için geliştirme dosyaları - system.devel - - nspr - - - /usr/include - /usr/lib/pkgconfig - /usr/bin - - - - - 2014-12-06 - 4.10.7 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-07-05 - 4.10.6 - Release bump. - PisiLinux Community - admins@pisilinux.org - - - 2014-05-11 - 4.10.4 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 4.10.4 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-11-18 - 4.10.2 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-10-23 - 4.10.1 - Version bump. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2013-07-18 - 4.10 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-05-17 - 4.9.6 - v.bump - Erdinç Gültekin - erdincgultekin@pisilinux.org - - - 2013-01-14 - 4.9.5 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-11-25 - 4.9.4 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - grub2 - http://www.gnu.org/software/grub/ - - Serdar Soytetir - kaptan@pisilinux.org - - GPLv3 - app:gui - system.base - GNU GRUB is a Multiboot boot loader. - GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project. - ftp://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz - http://source.pisilinux.org/1.0/grub2_extras_915resolution_r10.tar.xz - http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz - http://source.pisilinux.org/1.0/grub2-theme-pisilinux-0.2.tar.xz - - autogen - binutils - bison - flex - gcc - help2man - texinfo - freetype-devel - zlib-devel - ncurses-devel - xz-devel - fuse-devel - lvm2-devel - device-mapper-devel - gettext-devel - dejavu-fonts - - - pisi_name_and_initramfs.patch - mkconfig-fix.patch - - system/base/grub2/pspec.xml - - - grub2 - - freetype - xz - fuse - lvm2 - device-mapper - os-prober - - - /usr/bin - /usr/sbin - /usr/lib/grub/i386-pc/ - /usr/share/doc - /usr/share/grub - /usr/share/info - /boot/grub2 - /usr/share/locale - /usr/share/man/man1 - /usr/share/man/man8 - /etc/bash_completion.d - /etc/grub.d - /etc/default - - - pisi-grub-bg.png - grub-defaults - - - - - 2014-07-20 - 2.02_beta2 - New artwork. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 2.02_beta2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-21 - 2.02_beta2 - Version bump - Marcin Bojara - marcin@pisilinux.org - - - 2013-12-31 - 2.00_5148 - Fix finding other distros. - Fix build with current freetype. - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-02 - 2.00_5148 - Version bump - Marcin Bojara - marcin@pisilinux.org - - - 2013-08-24 - 2.00 - Comment GRUB_GFXPAYLOAD_LINUX=keep out. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-28 - 2.00 - Fix deps. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-17 - 2.00 - Set default grub2 resolution to 1024x768 - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-03-03 - 2.00 - Add default Pisi Linux theme - Remove unneeded unifont dep - Manually create Dejavu pf2 fonts - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-02-09 - 2.00 - Enable splash again. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-11-28 - 2.00 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - polkit - http://www.freedesktop.org/wiki/Software/PolicyKit - - PisiLinux Community - admins@pisilinux.org - - LGPLv2+ - service - library - app:console - system.base - PolicyKit Authorization Framework - Sistem bileşenleri için erişim politikası servisi - polkit est un cadre de développement (framework) pour définir des politiques à appliquer à des composants du système ainsi que fournir à des parties du bureau la possibilité de les configurer. - polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged processes. - polkit, sistem genelindeki bileşenlerin ve masaüstü bileşenlerinin ayarlayabileceği şekilde ilkeler tanımlamak için araçlardan oluşur. - http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz - - pam-devel - dbus-devel - glib2-devel - expat-devel - dbus-glib-devel - spidermonkey-devel - - - disable-docs.patch - use-system-locale-in-gobject-api.diff - - system/base/polkit/pspec.xml - - - polkit-devel - Development headers for polkit - polkit geliştirme başlıkları - system.devel - - polkit - glib2-devel - - - /usr/include - /usr/lib/pkgconfig - - - - polkit - - pam - dbus - glib2 - expat - dbus-glib - spidermonkey - - - /etc - /usr/lib - /usr/libexec - /usr/bin - /usr/sbin - /usr/share/locale - /usr/share/polkit-1 - /usr/share/dbus-1 - /usr/share/gir-1.0 - /var/lib/polkit-1 - /lib/systemd - /usr/share/man - /usr/share/doc - - - man/pklocalauthority.8 - man/polkit.8 - man/polkitd.8 - man/pkaction.1 - man/pkcheck.1 - man/pkexec.1 - 70-desktop-policy.conf - - - - - 2014-06-10 - 0.112 - Release bump. - Alihan Öztürk - alihan@pisilinux.org - - - 2014-05-11 - 0.112 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-01 - 0.112 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-28 - 0.111 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-11 - 0.110 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2013-01-11 - 0.107 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - - - - ConsoleKit2 - http://freedesktop.org/Software/Hal - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - system.base - A framework for defining and tracking users, login sessions, and seats - ConsoleKit is a system daemon for tracking what users are logged into the system and how they interact with the computer (e.g. which keyboard and mouse they use). - https://github.com/ConsoleKit2/ConsoleKit2/archive/master.zip - - acl-devel - pam-devel - dbus-devel - udev-devel - zlib-devel - glib2-devel - libX11-devel - polkit-devel - dbus-glib-devel - - system/base/ConsoleKit/pspec.xml - - - ConsoleKit - - acl - pam - dbus - zlib - glib2 - libX11 - polkit - libudev - dbus-glib - - - /etc - /usr/lib/tmpfiles.d/ConsoleKit.conf - /usr/bin - /usr/sbin - /usr/libexec - /lib - /usr/lib - /usr/share/dbus-1 - /usr/share/polkit-1/actions - /usr/share/man - /usr/share/doc - /var - /run - - - ConsoleKit.conf - pam-foreground-compat.ck - - - - ConsoleKit-devel - Development files for ConsoleKit - ConsoleKit için geliştirme dosyaları - system.devel - - ConsoleKit - - - /usr/include - /usr/lib/pkgconfig - - - - - 2015-02-05 - 0.9.2 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-08-01 - 0.4.6 - Rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 0.4.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-06 - 0.4.6 - Dep Fix - Varol Maksutoğlu - waroi@pisilinux.org - - - 2014-01-09 - 0.4.6 - Add gentoo patches and ConsoleKit.conf - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-08 - 0.4.6 - /var/run => /run - Marcin Bojara - marcin@pisilinux.org - - - 2013-03-04 - 0.4.6 - Version bump - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-08-23 - 0.4.5 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - glib2 - http://www.gtk.org/ - - PisiLinux Community - admins@pisilinux.org - - LGPLv2.1 - library - system.base - La librairie GLib2 de routines C. - A library of handy utility functions - C programlama dili için glib kütüphanesi - glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system. - glib2, GTK+ ve GNOME gibi projelerin temelini oluşturan düşük seviyeli çekirdek kütüphanedir. C için veri yapıları, taşınabilirlik katmanları ve çeşitli çalışma zamanı işlevleri için arabirimler sunar. - mirrors://gnome/glib/2.42/glib-2.42.0.tar.xz - - libpcre-devel - zlib-devel - libxslt - elfutils - docbook-xml - - - revert-warn-glib-compile-schemas.patch - - system/base/glib2/pspec.xml - - - glib2 - - libpcre - zlib - elfutils - libffi - - - /etc/profile.d - /usr/bin - /usr/lib - /usr/share/bash-completion/completions/ - /usr/share/locale - /usr/share/man - /usr/share/doc - /usr/share/glib-2.0 - /usr/share/systemtap - /usr/share/glib-2.0/schemas - - - System.PackageHandler - - - glib2.sh - glib2.csh - - - - glib2-devel - Development files for glib2 - glib2 için geliştirme dosyaları - system.devel - - glib2 - - - /usr/bin/gtester - /usr/bin/gtester-report - /usr/bin/gobject-query - /usr/bin/glib-genmarshal - /usr/bin/glib-gettextize - /usr/bin/glib-mkenums - /usr/include - /usr/lib/glib-2.0/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/aclocal - /usr/share/glib-2.0/schemas/gschema.dtd - /usr/share/glib-2.0/gettext - /usr/share/glib-2.0/gdb - /usr/share/gdb/auto-load/libglib-2.0.so.*-gdb.py* - /usr/share/gdb/auto-load/libgobject-2.0.so.*-gdb.py* - /usr/share/man/man3 - /usr/share/man/man1/glib-genmarshal.1 - /usr/share/man/man1/glib-gettextize.1 - /usr/share/man/man1/glib-mkenums.1 - /usr/share/man/man1/gobject-query.1 - /usr/share/man/man1/gtester-report.1 - /usr/share/man/man1/gtester.1 - - - - glib2-32bit - 32-bit shared libraries for glib2 - glib2 için 32-bit paylaşımlı kitaplıklar - emul32 - _emul32 - - libpcre-32bit - zlib-32bit - libffi-32bit - dbus-32bit - - - glib2 - libpcre-32bit - zlib-32bit - libffi-32bit - dbus-32bit - - - /usr/bin/32 - /usr/lib32 - - - System.PackageHandler - - - - glib2-docs - Documentation files for glib2 - Extensive documentation for developers wanting to use the GLib Library - - /usr/share/gtk-doc - - - - - 2014-10-01 - 2.42.0 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 2.40.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-15 - 2.40.0 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-03-29 - 2.38.2 - Minor version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-22 - 2.38.1 - Minor version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-10 - 2.38.0 - Bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-05 - 2.36.3 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-26 - 2.36.3 - Fix dep, release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-14 - 2.36.3 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-11 - 2.36.0 - add missing dep. - Erdinç Gültekin - erdincgultekin@pisilinux.org - - - 2013-05-16 - 2.36.0 - Path Fixed. - PisiLinux Community - admins@pisilinux.org - - - 2013-03-30 - 2.36.0 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-21 - 2.35.2 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - libusb-compat - http://libusb.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - LGPLv2.1 - library - system.base - Userspace access to USB devices - Project's main aim is to create a library for use by user level applications to access USB devices regardless of OS. - mirrors://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2 - - libtool - libusb-devel - - system/base/libusb-compat/pspec.xml - - - libusb-compat - - libusb - - - /usr/lib - /usr/share/doc - - - - libusb-compat-devel - Development files for libusb - system.devel - - libusb-devel - libusb-compat - - - /usr/bin - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - - libusb-compat-32bit - 32-bit shared libraries for libXt - emul32 - emul32 - - libusb-32bit - - - libusb-32bit - libusb-compat - - - /usr/lib32 - - - - - 2014-09-08 - 0.1.5 - Rebuild for libusbx libusb changes - Use auto-emul32, cleanup actions.py - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 0.1.5 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 0.1.5 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-07-21 - 0.1.4 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - e2fsprogs - http://e2fsprogs.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Standard ext2/3/4 filesystem utilities - Standart ext2, ext3, ext4 dosya sistemi uygulamaları - e2frprogs fournit les outils de système de fichier à utiliser avec les systèmes de fichier de type ext2. Il prend également en charge les système de fichier de type ext3/4 avec support de la journalisation. - e2fsprogs provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3/4 filesystem with journaling support. - e2fsprogs ext2 dosya sistemi için standart dosya sistemi uygulamaları sağlar. ext3/4 dosya sistemlerinin günlüğe kaydetme özelliklerini de destekler. - mirrors://sourceforge/e2fsprogs/e2fsprogs-1.42.11.tar.gz - - libblkid-devel - libuuid - gettext - util-linux - - - ntfs-3g.patch - e2fsprogs-1.41.8-strip-me.patch - - system/base/e2fsprogs/pspec.xml - - - e2fsprogs - - libblkid - libuuid - - - /etc - /bin - /usr/bin - /lib - /usr/lib - /sbin - /usr/sbin - /usr/share/et - /usr/share/ss - /usr/share/locale - /usr/share/info - /usr/share/man - /usr/share/doc - - - - e2fsprogs-devel - Development files for e2fsprogs - e2fsprogs için geliştirme dosyaları - system.devel - - e2fsprogs - - - /usr/include - /usr/lib/pkgconfig - /usr/share/man/man3 - - - - - 2014-07-10 - 1.42.11 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 1.42.9 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 1.42.9 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2013-10-28 - 1.42.8 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-26 - 1.42.8 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-15 - 1.42.7 - New version - Ertan Güven - ertan@pisilinux.org - - - 2012-11-25 - 1.42.6 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - time - ftp://prep.ai.mit.edu/pub/gnu/time - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A GNU utility for monitoring a program's use of system resources - Bir programın sistem kaynak kullanımını izleyen GNU aracı - time utility runs another program, collects information about the resources used by that program while it is running, and displays the results. - time başka bir programı çalıştırarak o programın sistem kaynaklarını nasıl kullandığını izler ve topladığı bilgileri ekrana basar. - ftp://prep.ai.mit.edu/pub/gnu/time/time-1.7.tar.gz - - time-1.7-destdir.patch - - system/base/time/pspec.xml - - - time - - /usr/bin/ - /usr/share/info - - - - - 2014-05-11 - 1.7 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-01 - 1.7 - Clean time, add patches. - Serdar Soytetir - kaptan@pisilinux.org - - - 2010-10-11 - 1.7 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - json-c - http://oss.metaparadigm.com/json-c - - PisiLinux Community - admins@pisilinux.org - - MIT - library - system.base - A JSON implementation in C - C dilinde JSON gerçeklemesi - json-c implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects. - json-c, C dilinde kolayca JSON nesneleri yaratılmasını sağlayan bir referans sayma modeli gerçekleyen bir kitaplıktır. - https://github.com/json-c/json-c/archive/json-c-0.12-20140410.tar.gz - - wno-werror.patch - - system/base/json-c/pspec.xml - - - json-c - - /usr/share/doc - /usr/share/man - /usr/lib - - - - json-c-devel - Development files for json-c - json-c için geliştirme dosyaları - system.devel - - json-c - - - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - - json-c-32bit - 32-bit shared libraries for json-c - emul32 - emul32 - - /usr/lib32 - - - - - 2014-07-04 - 0.12 - Version bump and security update(CVE-2013-6371, CVE-2013-6370). - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 0.11 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 0.11 - rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-09 - 0.11 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-04-02 - 0.9 - First release - Erdinç Gültekin - admins@pisilinux.org - - - - - - libpcre - http://www.pcre.org/ - - PisiLinux Community - admins@pisilinux.org - - BSD - library - system.base - Perl-compatible regular expression library - Perl-uyumlu sıradan ifade kütüphanesi - La librairie PCRE (Expressions Régulières Compatible avec Perl) est un ensemble de fonctions implémentant la recherche de motifs de texte à l'aide d'expressions régulières utilisant la même syntaxe et la même sémantique que Perl5. - The PCRE (Perl Compatible Regular Expressions) library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. - PCRE kütüphanesi, Perl 5 programlama dili sözdizimi ve semantiği ile kalıp eşleştirme (pattern matching) görevini yürüten fonksiyonları barındırır. - http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.36.tar.bz2 - - readline-devel - - system/base/libpcre/pspec.xml - - - libpcre - - libgcc - readline - - - /usr/lib - /usr/share/man - /usr/share/doc - /usr/bin - - - - libpcre-devel - Development files for libpcre - libpcre için geliştirme dosyaları - system.devel - - libpcre - - - /usr/include - /usr/share/man/man3 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/doc/libpcre/html - /usr/bin/pcre-config - /usr/share/man/man1/pcre-config.1* - /usr/share/doc/libpcre/pcre-config.txt - - - - libpcre-32bit - 32-bit shared libraries for libpcre - libpcre için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - readline-32bit - - - libgcc - readline - libpcre - - - /usr/lib32 - - - - - 2015-01-25 - 8.36 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 8.34 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 8.34 - Version bump. - Osman Erkan - osman.erkan@pisilinux.org - - - 2013-09-01 - 8.33 - Version bump, clean pcre. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-28 - 8.32 - Fix deps. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-05-20 - 8.32 - adress fixed - Osman Erkan - osman.erkan@pisilinux.org - - - 2013-02-16 - 8.32 - Update - Osman Erkan - osman.erkan@pisilinux.org - - - 2011-03-11 - 8.31 - First release - Erdem Artan - admins@pisilinux.org - - - - - - nano - http://www.nano-editor.org/ - - PisiLinux Community - admins@pisilinux.org - - GPLv3 - app:console - system.base - GNU GPL'd Pico clone with more functionality - Konsol ortamında kullanabileceğiniz bir metin düzenleyicidir. - Nano est un petit éditeur libre et convivial qui a pour but de remplacer Pico, l'éditeur par défaut inclus dans le paquet non-libre Pine. Plutôt que juste copier l'apparence et le ressenti de Pico, nan implémente également certaines fonctionnalité manquantes (ou désactivées par défaut), tel que "rechercher et remplacer" ou "allez à la ligne numéro". - Nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine package. Rather than just copying Pico's look and feel, nano also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number". - Nano özgür olmayan Pine paketinin içindeki metin düzenleme programı olan Pico'nun yerine geçme hedefini güden küçük, özgür ve kullanışlı bir metin düzenleme programıdır. Pico'nun görünüşünü ve işlevini kopyalamaktan çok, Nano aynı zamanda "ara ve değiştir" ve "satır numarasına git" gibi Pico'da olmayan (veya ön tanımlı olarak kapalı) bazı özellikleri sunar. - http://www.nano-editor.org/dist/v2.3/nano-2.3.5.tar.gz - - ncurses-devel - gettext-devel - slang - - system/base/nano/pspec.xml - - - nano - - ncurses - file - - - /etc - /usr/share/locale - /usr/share/doc/nano - /usr/share/man - /usr/share/info - /usr/share/nano - /usr/bin - /bin - - - - - 2014-07-11 - 2.3.5 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 2.3.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-26 - 2.3.1 - Fix dep, release bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2011-06-27 - 2.3.1 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - diffutils - http://www.gnu.org/software/diffutils/diffutils.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - Tools to make diffs and compare files - Dosyaları karşılaştırmak ve fark dosyaları oluşturmak için kullanılan araçlar - Vous pouvez utiliser la commande diff pour voir les différences entre deux fichiers en particulier, ou les différences entre deux répertoires fichiers par fichier. Diff peut afficher les différences entre fichiers ligne par ligne dans différents formats pouvant être choisis avec les options de la ligne de commande. - You can use the diff command to show differences between two files, or each corresponding file in two directories. diff outputs differences between files line by line in any of several formats, selectable by command line options. - İki dosya arasındaki ya da iki klasör içindeki dosyaları karşılaştırarak farklılıkları belirleyebileceğiniz araç. Farklılıkları satır satır olarak, komut satırı seçenekleri ile farklı formatta dosyalara yazdırabilirsiniz. - http://ftp.gnu.org/gnu/diffutils/diffutils-3.3.tar.xz - - patch - - system/base/diffutils/pspec.xml - - - diffutils - - /usr/bin - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/locale - - - - - 2014-05-11 - 3.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-01 - 3.3 - Version bump, clean diffutils. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-23 - 3.2 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - gdbm - http://www.gnu.org/software/gdbm/gdbm.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - system.base - Standard GNU database libraries included for compatibility with Perl - Perl uyumlu standart GNU veritabanı kütüphaneleri - GNU dbm est un ensemble de routines de base de données utilisant extensivement les dictionnaires (hashing). Il fonctionne de manière similaire aux routines dbm UNIX standards. - GNU dbm is a set of database routines that use extensible hashing. It works similar to the standard UNIX dbm routines. - GNU dbm genişletilebilir hash yapabilen veritabanı işlevleri sağlar. Standart UNIX dbm uygulamaları ile aynı şekilde çalışır. - mirrors://gnu/gdbm/gdbm-1.11.tar.gz - - gdbm-1.10-zeroheaders.patch - - system/base/gdbm/pspec.xml - - - gdbm - - /usr/bin - /usr/lib - /usr/share/doc - /usr/share/locale - /usr/share/man - /usr/share/info - - - - gdbm-devel - Development files for gdbm - gdbm için geliştirme dosyaları - system.devel - - gdbm - - - /usr/include - - - - - 2014-05-11 - 1.11 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 1.11 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2013-08-29 - 1.10 - Clean gdbm. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-31 - 1.10 - First release - Erdem Artan - admins@pisilinux.org - - - - - - groff - http://www.gnu.org/software/groff/groff.html - - PisiLinux Community - admins@pisilinux.org - - GPLv3+ - BSD - MIT - app:console - system.base - S'occupe de la mise en forme de texte utilisé pour les pages de manuel - A document formatting system - Belge biçimlendirme sistemi - Text Formatierer für man pages - groff is a document formatting system. Groff takes standard text and formatting commands as input and produces formatted output. - groff bir belge biçimlendirme sistemidir. Groff standart metni ve biçimlendirme komutlarını alır ve biçimlendirilmiş çıktı oluşturur. - http://ftp.gnu.org/gnu/groff/groff-1.22.2.tar.gz - - texinfo - - system/base/groff/pspec.xml - - - groff - - texinfo - libgcc - - - /etc - /usr/bin - /usr/lib - /usr/share/groff - /usr/share/X11/app-defaults - - - - groff-doc - system.doc - - groff - - - /usr/share/doc - /usr/share/man - /usr/share/info - - - - - 2014-05-11 - 1.22.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 1.22.2 - Rebuild. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-07-26 - 1.22.2 - Fix dep, release bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-02-16 - 1.22.2 - Updated - PisiLinux Community - admins@pisilinux.org - - - 2012-11-25 - 1.21 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - dhcpcd - http://roy.marples.name/dhcpcd - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - system.base - A dhcp client only - DHCP protokolü için istemci - Un client daemon DHCP conforme aux RFC2131 et RFC1541. dhcpcd obtient une adresse IP ainsi que d'autres informations depuis le serveur DHCP correspondant, configure l'interface réseau automatiquement et essaie de renouveler le bail selont les RFC2131 et EFC1541 en fonction des options de la ligne de commande. - An RFC2131 and RFC1541 compliant DHCP client daemon. dhcpcd gets an IP address and other information from a corresponding DHCP server, configures the network interface automatically, and tries to renew the lease time according to RFC2131 or RFC1541 depending on the command line option. - RFC2131 ve RFC1541 uyumlu bir DHCP istemci servisi.dhcpcd ilgili bir DHCP sunucusundan bir IP adresi ve gerekli diğer bilgileri alır, ağ arayüzünü otomatik olarak yapılandırır ve RFC2131 veya RFC1541 komut satırı özelliğine bağlı olarak kiralama zamanını yenilemeyi dener. - http://ftp.osuosl.org/pub/blfs/conglomeration/dhcpcd/dhcpcd-6.7.1.tar.bz2 - system/base/dhcpcd/pspec.xml - - - dhcpcd - - libudev - - - /etc - /lib/dhcpcd - /usr/lib/dhcpcd/dev/udev.so - /sbin - /usr/share/doc - /usr/share/man - /var/lib/dhcpcd - - - - - 2015-02-03 - 6.7.1 - Version bump. - Hakan Yıldız - hknyldz93@gmail.com - - - 2014-05-11 - 6.3.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-03 - 6.3.2 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-10-31 - 6.0.5 - Really revert back to 6.0.5. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-10-28 - 6.0.5 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-01-14 - 5.6.7 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 5.6.1 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - libpng - http://www.libpng.org/ - - PisiLinux Community - admins@pisilinux.org - - as-is - library - system.base - Portable Network Graphics library - PNG kütüphanesi - Le format de Graphique Réseau Portable (Portable Network Graphics - PNG) a été conçu pour remplacer le format GIF plus simple et vieillissant ainsi que, d'une certaine manière, le format TIFF beaucoup plus complexe. L'objectif principal du projet est de se concentrer sur deux aspects majeurs : La toile mondiale (World Wide Web - WWW) et l'édition d'image. - The Portable Network Graphics (PNG) format was designed to replace the older and simpler GIF format and, to some extent, the much more complex TIFF format. Project's main aim is to concentrate on two major uses: the World Wide Web (WWW) and image-editing. - Taşınabilir Ağ Grafikleri (PNG) formatı eski ve daha basit GIF formatının yerine geçmek ve daha karmaşık yapıdaki TIFF formatını biraz daha genişletmek için tasarlanmıştır. Projenin ana hedefi iki önemli parça üzerine konsantre olmaktır: World Wide Web (WWW) ve resim düzenleme. - mirrors://sourceforge/libpng/libpng-1.6.15.tar.xz - - zlib - - - libpng-1.6.15-apng.patch.gz - libpng-multilib.patch - - system/base/libpng/pspec.xml - - - libpng - - zlib - - - /usr/lib - /usr/share/doc - - - - libpng-devel - Development files for libpng - libpng için geliştirme dosyaları - system.devel - - libpng - - - /usr/bin - /usr/include - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man - - - - libpng-32bit - 32-bit shared libraries for libpng - libpng için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - zlib-32bit - - - libpng - zlib-32bit - - - /usr/lib32 - - - - - 2014-12-05 - 1.6.15 - Version bump. - Osman Erkan - osman.erkan@pisilinux.org - - - 2014-07-07 - 1.6.12 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-05-11 - 1.6.10 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-29 - 1.6.10 - Version bump - PisiLinux Community - admins@pisilinux.org - - - 2013-10-30 - 1.5.17 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-01-14 - 1.5.14 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-11-03 - 1.5.13 - First release - Erdem Artan - admins@pisilinux.org - - - - - - ncompress - http://ncompress.sourceforge.net - - PisiLinux Community - admins@pisilinux.org - - public-domain - app:console - system.base - Un autre outil de décompression de données pour compatibilité - Another uncompressor for compatibility - Bir başka sıkışmış dosya açma programı - Ein weiterer Nichtkompressor zu Kompatibilitätszwecken - The ncompress package contains the compress and uncompress file compression and decompression utilities, which are compatible with the original UNIX compress utility (.Z file extensions). These utilities can't handle gzipped (.gz file extensions) files, but gzip can handle compressed files. - mirrors://sourceforge/ncompress/ncompress-4.2.4.4.tar.gz - - ncompress-4.2.4-make.patch - ncompress-4.2.4-lfs2.patch - ncompress-2GB.patch - ncompress-4.2.4-endians.patch - - system/base/ncompress/pspec.xml - - - ncompress - - /usr/bin - /usr/share/man - - - - - 2014-05-11 - 4.2.4.4 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2011-12-20 - 4.2.4.4 - First release - Pisi Linux Admins - admins@pisilinux.org - - - - - - libcap-ng - http://people.redhat.com/sgrubb/libcap-ng - - PisiLinux Community - admins@pisilinux.org - - LGPLv2+ - library - system.base - An alternate POSIX capabilities library - Alternatif bir POSIX yetenekleri kütüphanesi - libcap-ng is a library that makes using POSIX capabilities easier. - libcap-ng POSIX yeteneklerinin yönetimini kolaylaştıran bir kütüphanedir. - http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.3.tar.gz - - attr - python - - system/base/libcap-ng/pspec.xml - - - libcap-ng - - /usr/lib - /usr/share/doc - - - - python-libcap-ng - Python bindings for libcap-ng - Python için libcap-ng bağlayıcıları - programming.language.python - - libcap-ng - - - /usr/lib/python* - - - - libcap-ng-utils - Utilities to analyse the POSIX capabilities on running processes - Çalışan süreçlerin sahip olduğu POSIX yeteneklerini incelemeye yarayan araçlar - util.admin - - libcap-ng - - - /usr/bin - /usr/share/man/man8/* - - - - libcap-ng-devel - Development files for libcap-ng - libcap-ng için geliştirme dosyaları - system.devel - - libcap-ng - - - /usr/share/aclocal - /usr/include - /usr/lib/pkgconfig - /usr/share/man/man3 - - - - - 2014-05-11 - 0.7.3 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 0.7.3 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-02-11 - 0.7.3 - Güncellendi. - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 0.7 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - dbus-python - http://dbus.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - AFL-2.1 - library - system.base - D-Bus Python bindings - D-Bus için Python bağlayıcıları - dbus-python provides a Python module which wraps the D-Bus programming API. - http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.0.tar.gz - - python3 - dbus-devel - dbus-glib - glib2-devel - - - suppress-warnings.patch - - system/base/dbus-python/pspec.xml - - - dbus-python-common - Common dbus-python files shared between dbus-python and dbus-python3 - - dbus - - - /usr/include - /usr/lib/pkgconfig - /usr/share/doc - - - - dbus-python - - dbus-python-common - python - dbus - glib2 - dbus-glib - - - /usr/lib/python2* - - - - dbus-python3 - D-Bus Python3 bindings - programming.language.python - - dbus-python-common - python3 - dbus - glib2 - dbus-glib - - - /usr/lib/python3* - - - - - 2014-05-31 - 1.2.0 - Release bump. - Kamil Atlı - suvarice@gmail.com - - - 2014-05-11 - 1.2.0 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-28 - 1.2.0 - rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-23 - 1.2.0 - Version bump. Remove dbus-devel from runtime dependencies. - Marcin Bojara - marcin@pisilinux.org - - - 2013-04-25 - 1.1.1 - Dep Fixed. - PisiLinux Community - admins@pisilinux.org - - - 2012-11-10 - 1.1.1 - First release - Marcin Bojara - marcin@pisilinux.org - - - - - - iputils - http://www.linux-ipv6.org - - PisiLinux Community - admins@pisilinux.org - - BSD - app:console - system.base - Network monitoring tools including ping and ping6 - ping ve ping6 uygulamalarını da içeren ağ izleme araçları - Iputils contient les outils de surveillance réseau incluant ping et ping6. - iputils contains network monitoring tools including ping and ping6. - Iputils, ping ve ping6 gibi ağ izleme araçlarını içeren bir pakettir. - http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 - - ifenslave/ifenslave.c - - - openssl-devel - libidn-devel - gnutls-devel - - - 021109-uclibc-no-ether_ntohost.patch - iputils-20121221-printf-size.patch - iputils-20121221-owl-pingsock.diff - iputils-20121221-openssl.patch - iputils-20121221-makefile.patch - iputils-20121221-crypto-build.patch - iputils-20100418-so_mark.patch - iputils-20071127-nonroot-floodping.patch - iputils-20071127-kernel-ifaddr.patch - fedora/iputils-20020124-countermeasures.patch - fedora/iputils-20020927-ping-subint.patch - fedora/iputils-20070202-traffic_class.patch - fedora/iputils-20100418-convtoint.patch - docs.patch - - system/base/iputils/pspec.xml - - - iputils - - libcap - gnutls - - - /bin - /usr/bin - /usr/sbin - /sbin - /lib/systemd/system - /etc/conf.d/rdisc - /usr/share/doc - /usr/share/man - - - man/arping.8 - man/clockdiff.8 - man/ping.8 - man/rarpd.8 - man/rdisc.8 - man/tracepath.8 - man/traceroute6.8 - ifenslave/ifenslave.8 - ifenslave/README.bonding - fedora/rdisc.sysconfig - fedora/rdisc.service - - - - - 2014-05-11 - 20121221 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-26 - 20121221 - Fix dep, release bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-01-14 - 20121221 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 20101006 - First release - PisiLinux Community - admins@pisilinux.org - - - - - - util-linux - http://userweb.kernel.org/~kzak/util-linux-ng/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - library - system.base - Divers utilitaires Linux utiles. - Various useful Linux utilities - Çeşitli kullanışlı Linux araçları - The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. - util-linux paketi, bir Linux sisteminin işlevsel olması için gerekli olan birçok düşük seviye sistem uygulamasını içerir. - http://www.kernel.org/pub/linux/utils/util-linux/v2.24/util-linux-2.24.1.tar.xz - - zlib - audit - shadow - ncurses - libcap-ng-devel - utempter-devel - - - ntfs-3g.patch - 0001-libmount-FS-id-and-parent-ID-could-be-zero.patch - 0001-switch_root-verify-initramfs-by-f_type-not-devno.patch - move_is_mountinfo.patch - upstream/util-linux-ng-2.21-login-lastlog.patch - - system/base/util-linux/pspec.xml - - - util-linux - - libuuid - libblkid - zlib - perl - audit - ncurses - libudev - utempter - libcap-ng - - - /etc - /bin - /sbin - /usr/bin - /usr/sbin - /usr/share/doc - /usr/share/man - /usr/share/info - /usr/share/misc - /usr/share/getopt - /usr/share/bash-completion/completions - /usr/share/locale - /usr/include - /usr/lib - /lib - - - - uuidd - Helper daemon to guarantee uniqueness of time-based UUIDs - Zaman tabanlı UUID'lerin benzersizliğini garantileyen sistem hizmeti - service - app:console - util.misc - - libuuid - - - /usr/bin/uuidgen - /usr/sbin/uuidd - /usr/share/man/man1/uuidgen.1 - /usr/share/man/man8/uuidd.8 - - - - libuuid - A library for UUID processing - UUID üretimi için bir kitaplık - library - - /usr/share/man/man3/uuid* - /lib/libuuid.* - /usr/lib/libuuid.so - - - - libuuid-devel - libuuid header files - header - system.devel - - libuuid - - - /usr/include/uuid/* - /usr/lib/pkgconfig/ - /usr/lib32/pkgconfig/uuid.pc - /usr/lib32/pkgconfig/blkid.pc - - - - libblkid - A library for block device identifying - Disk tanımlama için bir kitaplık - library - - libuuid - - - /usr/share/man/man3/libblkid* - /usr/share/man/man8/blkid* - /lib/libblkid.* - /usr/lib/libblkid.so - - - - libblkid-devel - libblkid header files - header - system.devel - - libblkid - - - /usr/include/blkid/* - /usr/lib/pkgconfig/blkid.pc - - - - libuuid-32bit - 32-bit shared libraries for libuuid - libuuid için 32-bit paylaşımlı kitaplıklar - emul32 - emul32 - - libuuid - - - /usr/lib32/libuuid.* - - - - libblkid-32bit - 32-bit shared libraries for libblkid - emul32 - emul32 - - libblkid - libuuid-32bit - - - /usr/lib32/libblkid.* - - - - - 2014-05-11 - 2.24.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-08 - 2.24.1 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-01-20 - 2.24 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-27 - 2.22.2 - Move pc files to devel pack, rebuild - PisiLinux Community - admins@pisilinux.org - - - 2013-07-26 - 2.22.2 - Release bump for rebuild. - PisiLinux Community - admins@pisilinux.org - - - 2013-01-14 - 2.22.2 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-11-17 - 2.22.1 - First release - Marcin Bojara - marcin@pisilinux.org - - - system FIXME @@ -20055,6 +20904,17 @@ admins@pisilinux.org + + desktop.toolkit.qt5 + FIXME + FIXME + FIXME + programming + + PisiLinux Community + admins@pisilinux.org + + desktop.toolkit.motif FIXME @@ -20473,39 +21333,6 @@ admins@pisilinux.org - - desktop.lxde - FIXME - FIXME - FIXME - lxde.desktop - - PisiLinux Community - admins@pisilinux.org - - - - desktop.lxde.addon - FIXME - FIXME - FIXME - lxde.addon - - PisiLinux Community - admins@pisilinux.org - - - - desktop.lxde.base - FIXME - FIXME - FIXME - lxde.desktop - - PisiLinux Community - admins@pisilinux.org - - desktop.lxqt FIXME @@ -20561,6 +21388,17 @@ admins@pisilinux.org + + kernel.tools + Kernel Tools + Kernel Tools; perf, cpupowertools + FIXME + system + + PisiLinux Community + admins@pisilinux.org + + x11 FIXME @@ -21883,30 +22721,14 @@ Escritorio Razor-qt razor-qt - - lxde.desktop - Bureau LXDE - LXDE Desktop - LXDE Desktop - LXDE Masaüstü - Skrivbord, LXDE - Escritorio LXDE - preferences-desktop - - - lxde.addon - Lxde Desktop Addons - Lxde Masaüstü Araçları - preferences-desktop - lxqt.desktop - Bureau LXQT - LXQT Desktop - LXQT Desktop - LXQT Masaüstü - Skrivbord, LXQT - Escritorio LXQT + Bureau Lxqt + Lxqt Desktop + Lxqt Desktop + Lxqt Masaüstü + Skrivbord, Lxqt + Escritorio Lxqt preferences-desktop diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum index ecbed250..3309cfa0 100644 --- a/pisi-index.xml.sha1sum +++ b/pisi-index.xml.sha1sum @@ -1 +1 @@ -2706ca17146fbaf0f782335332a3e46b83b5fec0 \ No newline at end of file +90741bd70b3e783d1038397e959a9c83dfd25f81 \ No newline at end of file diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz index d264cb96..0579a395 100644 Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum index 981cc03a..e865f42b 100644 --- a/pisi-index.xml.xz.sha1sum +++ b/pisi-index.xml.xz.sha1sum @@ -1 +1 @@ -5f7a0fd6c2ca07ef51c5221429012c362840a547 \ No newline at end of file +62604d7802db1075fc91ea59e45d2f3bb1afebb0 \ No newline at end of file diff --git a/system/base/ConsoleKit/actions.py b/system/base/ConsoleKit/actions.py deleted file mode 100644 index 44568e93..00000000 --- a/system/base/ConsoleKit/actions.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - -def setup(): - # /var/run => /run - #pisitools.dosed("configure.ac", "^(\s+CONSOLE_KIT_PID_FILE=)\$\{localstatedir\}(\/run\/ConsoleKit\/pid)", r"\1\2") - #pisitools.dosed("src/Makefile.am", "\$\(localstatedir\)(\/run\/ConsoleKit)", r"\1") - shelltools.system("sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in") - - autotools.autoreconf("-fi") - - autotools.configure("\ - --libexecdir=/usr/libexec/ConsoleKit \ - --localstatedir=/var \ - --with-pid-file=/run/ConsoleKit/pid \ - --with-systemdsystemunitdir=no \ - --disable-static \ - --enable-pam-module \ - --enable-udev-acl \ - --enable-pam-module \ - --with-dbus-services=/usr/share/dbus-1/services \ - --with-logrotate-dir=/etc/logrotate.d \ - --with-xinitrc-dir=/etc/X11/xinit/xinitrc \ - --with-pam-module-dir=/lib/security \ - --without-systemdsystemunitdir \ - XMLTO_FLAGS='--skip-validation' \ - ") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("DESTDIR=%s/" % get.installDIR()) - pisitools.dodir("/run/console") - - pisitools.dodoc("AUTHORS", "README", "COPYING", "HACKING", "NEWS", "TODO") diff --git a/system/base/ConsoleKit/files/ConsoleKit.conf b/system/base/ConsoleKit/files/ConsoleKit.conf deleted file mode 100644 index 0288c791..00000000 --- a/system/base/ConsoleKit/files/ConsoleKit.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /run/ConsoleKit 0755 root root -d /run/console 0755 root root diff --git a/system/base/ConsoleKit/files/pam-foreground-compat.ck b/system/base/ConsoleKit/files/pam-foreground-compat.ck deleted file mode 100644 index 3c1d0744..00000000 --- a/system/base/ConsoleKit/files/pam-foreground-compat.ck +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -TAGDIR=/run/console - -[ -n "$CK_SESSION_USER_UID" ] || exit 1 -[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0 - -TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" - -if [ "$1" = "session_added" ]; then - mkdir -p "$TAGDIR" - echo "$CK_SESSION_ID" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" - [ -s "$TAGFILE" ] || rm -f "$TAGFILE" -fi diff --git a/system/base/ConsoleKit/pspec.xml b/system/base/ConsoleKit/pspec.xml deleted file mode 100644 index 4659fedd..00000000 --- a/system/base/ConsoleKit/pspec.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - ConsoleKit2 - http://freedesktop.org/Software/Hal - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - library - A framework for defining and tracking users, login sessions, and seats - ConsoleKit is a system daemon for tracking what users are logged into the system and how they interact with the computer (e.g. which keyboard and mouse they use). - https://github.com/ConsoleKit2/ConsoleKit2/archive/master.zip - - acl-devel - pam-devel - dbus-devel - udev-devel - zlib-devel - glib2-devel - libX11-devel - polkit-devel - dbus-glib-devel - - - - - ConsoleKit - - acl - pam - dbus - zlib - glib2 - libX11 - polkit - libudev - dbus-glib - - - /etc - /usr/lib/tmpfiles.d/ConsoleKit.conf - /usr/bin - /usr/sbin - /usr/libexec - /lib - /usr/lib - /usr/share/dbus-1 - /usr/share/polkit-1/actions - /usr/share/man - /usr/share/doc - /var - /run - - - ConsoleKit.conf - pam-foreground-compat.ck - - - - - ConsoleKit-devel - system.devel - Development files for ConsoleKit - - ConsoleKit - - - /usr/include - /usr/lib/pkgconfig - - - - - - 2015-02-05 - 0.9.2 - Version bump. - Vedat Demir - vedat@pisilinux.org - - - 2014-08-01 - 0.4.6 - Rebuild. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 0.4.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-06 - 0.4.6 - Dep Fix - Varol Maksutoğlu - waroi@pisilinux.org - - - 2014-01-09 - 0.4.6 - Add gentoo patches and ConsoleKit.conf - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-08 - 0.4.6 - /var/run => /run - Marcin Bojara - marcin@pisilinux.org - - - 2013-03-04 - 0.4.6 - Version bump - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-08-23 - 0.4.5 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/system/base/ConsoleKit/translations.xml b/system/base/ConsoleKit/translations.xml deleted file mode 100644 index 836acdac..00000000 --- a/system/base/ConsoleKit/translations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - ConsoleKit - Kullanıcıları, giriş oturumlarını ve koltukları takip etmek ve tanımlamak için bir altyapı - ConsoleKit, sisteme giriş yapmış kullanıcıları ve bu kullanıcıların bilgisayar ile nasıl etkileştiğini izleyen bir sistem hizmetidir. - - - - ConsoleKit-devel - ConsoleKit için geliştirme dosyaları - - diff --git a/system/base/acl/pspec.xml b/system/base/acl/pspec.xml index fa3077e0..b54b2698 100644 --- a/system/base/acl/pspec.xml +++ b/system/base/acl/pspec.xml @@ -16,7 +16,7 @@ acl contains the getfacl and setfacl utilities needed for manipulating access control lists along with the needed libraries. http://download.savannah.gnu.org/releases-noredirect/acl/acl-2.2.52.src.tar.gz - attr + attr-devel @@ -46,6 +46,13 @@ + + 2015-03-15 + 2.2.52 + fix build deps. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-09-30 2.2.52 diff --git a/system/base/alternatives/pspec.xml b/system/base/alternatives/pspec.xml index 4e7629ed..0143f888 100644 --- a/system/base/alternatives/pspec.xml +++ b/system/base/alternatives/pspec.xml @@ -13,6 +13,9 @@ Alternative management system alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. Alternatives system determines the defaults when several programs fulfilling the same or similar functions to be installed on a single system at the same time. https://git.fedorahosted.org/cgit/chkconfig.git/snapshot/chkconfig-1.3.62.tar.xz + + popt-devel + @@ -29,7 +32,7 @@ - 2014-05-11 + 2015-04-01 1.3.62 Version bump. Serdar Soytetir diff --git a/system/base/attr/pspec.xml b/system/base/attr/pspec.xml index ef079393..da5ff861 100644 --- a/system/base/attr/pspec.xml +++ b/system/base/attr/pspec.xml @@ -45,7 +45,11 @@ emul32 32-bit shared libraries for attr emul32 + + glibc-32bit + + glibc-32bit attr @@ -54,6 +58,13 @@ + + 2015-03-15 + 2.4.47 + fix build emul32. + Serdar Soytetir + kaptan@pisilinux.org + 2014-09-30 2.4.47 diff --git a/system/base/audit/actions.py b/system/base/audit/actions.py deleted file mode 100644 index 8e435035..00000000 --- a/system/base/audit/actions.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - autotools.autoreconf("-vif") - autotools.configure("--with-libcap-ng=yes \ - --enable-gssapi-krb5=no \ - --enable-systemd=no \ - --with-python=yes \ - --disable-static") - -def build(): - autotools.make() - -def check(): - autotools.make("-j1 check") - -def install(): - autotools.rawInstall('DESTDIR="%s"' % get.installDIR()) - - # remove RH specific bits - pisitools.removeDir("/etc/sysconfig") - pisitools.removeDir("/etc/rc.d") - - # Create data directories - pisitools.dodir("/var/log/audit") - pisitools.dodir("/var/spool/audit") - - # Disable zos-remote plugin to get rid of deps. like cyrus-sasl - pisitools.remove("/usr/share/man/man8/audispd-zos-remote.8") - pisitools.remove("/usr/share/man/man5/zos-remote.conf.5") - - pisitools.dodoc("AUTHORS", "ChangeLog", "THANKS", "TODO", "README", "COPYING") diff --git a/system/base/audit/comar/package.py b/system/base/audit/comar/package.py deleted file mode 100644 index 9957f0d6..00000000 --- a/system/base/audit/comar/package.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -import os - -def postInstall(fromVersion, fromRelease, toVersion, toRelease): - os.system("ln -s /usr/sbin/audispd /sbin/audispd") - os.system("ln -s /usr/sbin/auditd /sbin/auditd") - os.system("/bin/systemctl enable auditd.service") diff --git a/system/base/audit/comar/service.py b/system/base/audit/comar/service.py deleted file mode 100644 index d4738e8e..00000000 --- a/system/base/audit/comar/service.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from comar.service import * - -serviceType = "server" -serviceDesc = _({"en": "AUDIT Daemon", - "tr": "AUDIT Servisi"}) -serviceDefault = "on" - -@synchronized -def start(): - reply = startService(command="/usr/sbin/auditd", - pidfile="/run/auditd.pid", - donotify=True) - if reply == 0: - run("/usr/sbin/auditctl -R /etc/audit/rules.d/audit.rules") - -@synchronized -def stop(): - stopService(pidfile="/run/auditd.pid", - donotify=True) - run("/usr/sbin/auditctl -D") - -def status(): - return isServiceRunning("/run/auditd.pid") diff --git a/system/base/audit/files/without_openldap.patch b/system/base/audit/files/without_openldap.patch deleted file mode 100644 index 9f2c8591..00000000 --- a/system/base/audit/files/without_openldap.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nuar audit-2.3.6.orig/audisp/plugins/Makefile.am audit-2.3.6/audisp/plugins/Makefile.am ---- audit-2.3.6.orig/audisp/plugins/Makefile.am 2014-04-11 22:49:23.000000000 +0300 -+++ audit-2.3.6/audisp/plugins/Makefile.am 2014-05-17 01:46:10.260461732 +0300 -@@ -22,7 +22,7 @@ - - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - --SUBDIRS = builtins zos-remote remote -+SUBDIRS = builtins remote - #SUBDIRS = builtins zos-remote - if HAVE_PRELUDE - SUBDIRS += prelude -diff -Nuar audit-2.3.6.orig/configure.ac audit-2.3.6/configure.ac ---- audit-2.3.6.orig/configure.ac 2014-04-11 22:49:33.000000000 +0300 -+++ audit-2.3.6/configure.ac 2014-05-17 01:44:36.753791021 +0300 -@@ -291,7 +291,7 @@ - AC_SUBST(LIBPRELUDE_CFLAGS) - AC_SUBST(LIBPRELUDE_LDFLAGS) - --AC_OUTPUT(Makefile lib/Makefile lib/test/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile src/libev/Makefile src/test/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/prelude/Makefile audisp/plugins/remote/Makefile audisp/plugins/zos-remote/Makefile bindings/Makefile bindings/python/Makefile tools/Makefile tools/aulast/Makefile tools/aulastlog/Makefile tools/ausyscall/Makefile tools/auvirt/Makefile) -+AC_OUTPUT(Makefile lib/Makefile lib/test/Makefile auparse/Makefile auparse/test/Makefile src/Makefile src/mt/Makefile src/libev/Makefile src/test/Makefile swig/Makefile docs/Makefile init.d/Makefile audisp/Makefile audisp/plugins/Makefile audisp/plugins/builtins/Makefile audisp/plugins/prelude/Makefile audisp/plugins/remote/Makefile bindings/Makefile bindings/python/Makefile tools/Makefile tools/aulast/Makefile tools/aulastlog/Makefile tools/ausyscall/Makefile tools/auvirt/Makefile) - - echo . - echo " - diff --git a/system/base/audit/pspec.xml b/system/base/audit/pspec.xml deleted file mode 100644 index d7de0df8..00000000 --- a/system/base/audit/pspec.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - audit - http://people.redhat.com/sgrubb/audit/ - - PisiLinux Community - admins@pisilinux.org - - GPLv2+ - app:console - library - service - User space tools for kernel auditing - audit contains the user space utilities for storing and searching the audit records generated by the audit subsystem in the Linux 2.6 kernel. - http://people.redhat.com/sgrubb/audit/audit-2.3.7.tar.gz - - python-devel - kernel-headers - libcap-ng-devel - tcp-wrappers-devel - - - without_openldap.patch - - - - - audit - - libcap-ng - - - /etc - /usr/share/doc - /usr/lib - /usr/sbin - /usr/bin - /usr/share/man - /var/log/audit - /var/spool/audit - - - System.Service - System.Package - - - - - python-audit - Python bindings for audit - - audit - - - /usr/lib/python* - - - - - audit-devel - system.devel - Development files for audit - - audit - - - /usr/include - /usr/share/man/man3 - - - - - - 2014-09-30 - 2.3.7 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-06-06 - 2.3.6 - Rebuild. - Aydın Demirel - aydin.demirel@pisilinux.org - - - 2014-05-16 - 2.3.6 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2014-05-11 - 2.3.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-22 - 2.3.2 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-02-14 - 2.2.2 - Version bump - Ertan Güven - ertan@pisilinux.org - - - 2011-12-20 - 2.2.1 - First release - Yusuf Aydemir - Yusuf Aydemir - - - diff --git a/system/base/audit/translations.xml b/system/base/audit/translations.xml deleted file mode 100644 index dbefa541..00000000 --- a/system/base/audit/translations.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - audit - Linux çekirdeğinin 2.6 sürümü için inceleme/denetleme araçları - audit Linux çekirdeğinin 2.6 sürümünün inceleme altyapısı tarafından üretilen inceleme kayıtlarını aramak ve saklamak için kullanılan araçları içerir. - - - - python-audit - audit için Python bağlayıcısı - - - - audit-devel - audit için geliştirme dosyaları - - diff --git a/system/base/baselayout/files/pisilinux-release b/system/base/baselayout/files/pisilinux-release index 6c508378..b783eff1 100644 --- a/system/base/baselayout/files/pisilinux-release +++ b/system/base/baselayout/files/pisilinux-release @@ -1 +1 @@ -Pisi_Linux 1.0 +Pisi_Linux 1.2 diff --git a/system/base/baselayout/pspec.xml b/system/base/baselayout/pspec.xml index ed275378..b5bb40e0 100644 --- a/system/base/baselayout/pspec.xml +++ b/system/base/baselayout/pspec.xml @@ -67,6 +67,13 @@ + + 2015-03-04 + 3.10.0 + Release bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + 2014-07-16 3.10.0 diff --git a/system/base/bash/files/official/bash43-001.tar.gz b/system/base/bash/files/official/bash43-001.tar.gz deleted file mode 100644 index 2104c27b..00000000 Binary files a/system/base/bash/files/official/bash43-001.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-002.tar.gz b/system/base/bash/files/official/bash43-002.tar.gz deleted file mode 100644 index db5a69ce..00000000 Binary files a/system/base/bash/files/official/bash43-002.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-003.tar.gz b/system/base/bash/files/official/bash43-003.tar.gz deleted file mode 100644 index 1fc74604..00000000 Binary files a/system/base/bash/files/official/bash43-003.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-004.tar.gz b/system/base/bash/files/official/bash43-004.tar.gz deleted file mode 100644 index 71681195..00000000 Binary files a/system/base/bash/files/official/bash43-004.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-005.tar.gz b/system/base/bash/files/official/bash43-005.tar.gz deleted file mode 100644 index d89db7ed..00000000 Binary files a/system/base/bash/files/official/bash43-005.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-006.tar.gz b/system/base/bash/files/official/bash43-006.tar.gz deleted file mode 100644 index 4af805dc..00000000 Binary files a/system/base/bash/files/official/bash43-006.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-007.tar.gz b/system/base/bash/files/official/bash43-007.tar.gz deleted file mode 100644 index 00a50290..00000000 Binary files a/system/base/bash/files/official/bash43-007.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-008.tar.gz b/system/base/bash/files/official/bash43-008.tar.gz deleted file mode 100644 index 350f5864..00000000 Binary files a/system/base/bash/files/official/bash43-008.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-009.tar.gz b/system/base/bash/files/official/bash43-009.tar.gz deleted file mode 100644 index 9c480d71..00000000 Binary files a/system/base/bash/files/official/bash43-009.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-010.tar.gz b/system/base/bash/files/official/bash43-010.tar.gz deleted file mode 100644 index 6f7d19b5..00000000 Binary files a/system/base/bash/files/official/bash43-010.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-011.tar.gz b/system/base/bash/files/official/bash43-011.tar.gz deleted file mode 100644 index e822a8ec..00000000 Binary files a/system/base/bash/files/official/bash43-011.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-012.tar.gz b/system/base/bash/files/official/bash43-012.tar.gz deleted file mode 100644 index edcec478..00000000 Binary files a/system/base/bash/files/official/bash43-012.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-013.tar.gz b/system/base/bash/files/official/bash43-013.tar.gz deleted file mode 100644 index 22d713b9..00000000 Binary files a/system/base/bash/files/official/bash43-013.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-014.tar.gz b/system/base/bash/files/official/bash43-014.tar.gz deleted file mode 100644 index cb5a02cf..00000000 Binary files a/system/base/bash/files/official/bash43-014.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-015.tar.gz b/system/base/bash/files/official/bash43-015.tar.gz deleted file mode 100644 index 2fd99612..00000000 Binary files a/system/base/bash/files/official/bash43-015.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-016.tar.gz b/system/base/bash/files/official/bash43-016.tar.gz deleted file mode 100644 index cf8b2244..00000000 Binary files a/system/base/bash/files/official/bash43-016.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-017.tar.gz b/system/base/bash/files/official/bash43-017.tar.gz deleted file mode 100644 index c369407c..00000000 Binary files a/system/base/bash/files/official/bash43-017.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-018.tar.gz b/system/base/bash/files/official/bash43-018.tar.gz deleted file mode 100644 index 20923f21..00000000 Binary files a/system/base/bash/files/official/bash43-018.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-019.tar.gz b/system/base/bash/files/official/bash43-019.tar.gz deleted file mode 100644 index e981df3b..00000000 Binary files a/system/base/bash/files/official/bash43-019.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-020.tar.gz b/system/base/bash/files/official/bash43-020.tar.gz deleted file mode 100644 index 09e2616d..00000000 Binary files a/system/base/bash/files/official/bash43-020.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-021.tar.gz b/system/base/bash/files/official/bash43-021.tar.gz deleted file mode 100644 index 34306388..00000000 Binary files a/system/base/bash/files/official/bash43-021.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-022.tar.gz b/system/base/bash/files/official/bash43-022.tar.gz deleted file mode 100644 index a4fa071b..00000000 Binary files a/system/base/bash/files/official/bash43-022.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-023.tar.gz b/system/base/bash/files/official/bash43-023.tar.gz deleted file mode 100644 index d9ccf979..00000000 Binary files a/system/base/bash/files/official/bash43-023.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-024.tar.gz b/system/base/bash/files/official/bash43-024.tar.gz deleted file mode 100644 index d79cf678..00000000 Binary files a/system/base/bash/files/official/bash43-024.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-025.tar.gz b/system/base/bash/files/official/bash43-025.tar.gz deleted file mode 100644 index a74afdf0..00000000 Binary files a/system/base/bash/files/official/bash43-025.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-026.tar.gz b/system/base/bash/files/official/bash43-026.tar.gz deleted file mode 100644 index 269eca50..00000000 Binary files a/system/base/bash/files/official/bash43-026.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-027.tar.gz b/system/base/bash/files/official/bash43-027.tar.gz deleted file mode 100644 index 4fb6cd50..00000000 Binary files a/system/base/bash/files/official/bash43-027.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-028.tar.gz b/system/base/bash/files/official/bash43-028.tar.gz deleted file mode 100644 index 5e116d49..00000000 Binary files a/system/base/bash/files/official/bash43-028.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-029.tar.gz b/system/base/bash/files/official/bash43-029.tar.gz deleted file mode 100644 index 606d16c8..00000000 Binary files a/system/base/bash/files/official/bash43-029.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-030.tar.gz b/system/base/bash/files/official/bash43-030.tar.gz deleted file mode 100644 index 57b8076f..00000000 Binary files a/system/base/bash/files/official/bash43-030.tar.gz and /dev/null differ diff --git a/system/base/bash/files/official/bash43-031.tar.gz b/system/base/bash/files/official/bash43-031.tar.gz new file mode 100644 index 00000000..33bee990 Binary files /dev/null and b/system/base/bash/files/official/bash43-031.tar.gz differ diff --git a/system/base/bash/files/official/bash43-032.tar.gz b/system/base/bash/files/official/bash43-032.tar.gz new file mode 100644 index 00000000..a8f1d1f8 Binary files /dev/null and b/system/base/bash/files/official/bash43-032.tar.gz differ diff --git a/system/base/bash/files/official/bash43-033.tar.gz b/system/base/bash/files/official/bash43-033.tar.gz new file mode 100644 index 00000000..a092c52c Binary files /dev/null and b/system/base/bash/files/official/bash43-033.tar.gz differ diff --git a/system/base/bash/pspec.xml b/system/base/bash/pspec.xml index 945d3346..1851baeb 100644 --- a/system/base/bash/pspec.xml +++ b/system/base/bash/pspec.xml @@ -12,42 +12,15 @@ app:console The standard GNU Bourne again shell Bash is the GNU Project's Bourne Again SHell, a complete implementation of the IEEE POSIX and Open Group shell specification with interactive command line editing, csh-like features such as history substitution. - mirrors://gnu/bash/bash-4.3.tar.gz + mirrors://gnu/bash/bash-4.3.30.tar.gz ncurses-devel - official/bash43-001.tar.gz - official/bash43-002.tar.gz - official/bash43-003.tar.gz - official/bash43-004.tar.gz - official/bash43-005.tar.gz - official/bash43-006.tar.gz - official/bash43-007.tar.gz - official/bash43-008.tar.gz - official/bash43-009.tar.gz - official/bash43-010.tar.gz - official/bash43-011.tar.gz - official/bash43-012.tar.gz - official/bash43-013.tar.gz - official/bash43-014.tar.gz - official/bash43-015.tar.gz - official/bash43-016.tar.gz - official/bash43-017.tar.gz - official/bash43-018.tar.gz - official/bash43-019.tar.gz - official/bash43-020.tar.gz - official/bash43-021.tar.gz - official/bash43-022.tar.gz - official/bash43-023.tar.gz - official/bash43-024.tar.gz - official/bash43-025.tar.gz - official/bash43-026.tar.gz - official/bash43-027.tar.gz - official/bash43-028.tar.gz - official/bash43-029.tar.gz - official/bash43-030.tar.gz + official/bash43-031.tar.gz + official/bash43-032.tar.gz + official/bash43-033.tar.gz fedora/bash-2.02-security.patch @@ -99,6 +72,13 @@ + + 2015-08-20 + 4.3_p33 + Update + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + 2014-10-13 4.3_p30 diff --git a/system/base/libXdmcp/actions.py b/system/base/bc/actions.py similarity index 66% rename from system/base/libXdmcp/actions.py rename to system/base/bc/actions.py index 034419ba..09757272 100644 --- a/system/base/libXdmcp/actions.py +++ b/system/base/bc/actions.py @@ -1,3 +1,4 @@ +#!/usr/bin/python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. @@ -8,9 +9,8 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - autotools.autoreconf("-vif") - autotools.configure("--disable-static \ - --without-xmlto") + autotools.configure("--with-readline \ + --without-libedit") def build(): autotools.make() @@ -18,4 +18,4 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") + pisitools.dodoc("AUTHORS", "FAQ", "NEWS", "README", "ChangeLog") diff --git a/system/base/bc/files/fedora/bc-1.06-dc_ibase.patch b/system/base/bc/files/fedora/bc-1.06-dc_ibase.patch new file mode 100644 index 00000000..7d5fa20f --- /dev/null +++ b/system/base/bc/files/fedora/bc-1.06-dc_ibase.patch @@ -0,0 +1,58 @@ +--- bc-1.06/dc/numeric.c.dc_ibase 2007-08-22 08:37:57.000000000 +0200 ++++ bc-1.06/dc/numeric.c 2007-08-22 08:37:40.000000000 +0200 +@@ -285,6 +285,8 @@ dc_getnum DC_DECLARG((input, ibase, read + int digit; + int decimal; + int c; ++ int c_buff = 0; ++ int multi = 0; + + bc_init_num(&tmp); + bc_init_num(&build); +@@ -302,6 +304,9 @@ dc_getnum DC_DECLARG((input, ibase, read + } + while (isspace(c)) + c = (*input)(); ++ c_buff = (*input)(); ++ if (isdigit(c_buff) || ('A' <= c_buff && c_buff <= 'F') || c_buff == '.') ++ multi = 1; + for (;;){ + if (isdigit(c)) + digit = c - '0'; +@@ -309,10 +314,15 @@ dc_getnum DC_DECLARG((input, ibase, read + digit = 10 + c - 'A'; + else + break; +- c = (*input)(); ++ digit = multi ? (digit >= ibase ? ibase -1 : digit) : digit; + bc_int2num(&tmp, digit); + bc_multiply(result, base, &result, 0); + bc_add(result, tmp, &result, 0); ++ if (c_buff) { ++ c = c_buff; ++ c_buff = 0; ++ } else ++ c = (*input)(); + } + if (c == '.'){ + bc_free_num(&build); +@@ -321,13 +331,18 @@ dc_getnum DC_DECLARG((input, ibase, read + build = bc_copy_num(_zero_); + decimal = 0; + for (;;){ +- c = (*input)(); ++ if (c_buff) { ++ c = c_buff; ++ c_buff = 0; ++ } else ++ c = (*input)(); + if (isdigit(c)) + digit = c - '0'; + else if ('A' <= c && c <= 'F') + digit = 10 + c - 'A'; + else + break; ++ digit = digit >= ibase ? ibase -1 : digit; + bc_int2num(&tmp, digit); + bc_multiply(build, base, &build, 0); + bc_add(build, tmp, &build, 0); diff --git a/system/base/bc/files/fedora/bc-1.06.95-matlib.patch b/system/base/bc/files/fedora/bc-1.06.95-matlib.patch new file mode 100644 index 00000000..796c5e28 --- /dev/null +++ b/system/base/bc/files/fedora/bc-1.06.95-matlib.patch @@ -0,0 +1,20 @@ +diff -urNp bc-1.06.95-orig/bc/storage.c bc-1.06.95/bc/storage.c +--- bc-1.06.95-orig/bc/storage.c 2006-09-05 04:39:31.000000000 +0200 ++++ bc-1.06.95/bc/storage.c 2010-12-22 10:26:43.805250912 +0100 +@@ -99,6 +99,7 @@ more_functions (VOID) + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; +@@ -179,7 +180,7 @@ more_arrays () + + + /* Initialize the new elements. */ +- for (; indx < v_count; indx++) ++ for (; indx < a_count; indx++) + arrays[indx] = NULL; + + /* Free the old elements. */ diff --git a/system/base/bc/files/fedora/bc-1.06.95-memleak.patch b/system/base/bc/files/fedora/bc-1.06.95-memleak.patch new file mode 100644 index 00000000..0b8fc5be --- /dev/null +++ b/system/base/bc/files/fedora/bc-1.06.95-memleak.patch @@ -0,0 +1,26 @@ +diff --git a/bc/bc.y b/bc/bc.y +index 14dc4be..bd91c38 100644 +--- a/bc/bc.y ++++ b/bc/bc.y +@@ -569,6 +569,7 @@ expression : named_expression ASSIGN_OP + generate (">"); + break; + } ++ free($2); + } + | expression '+' expression + { +diff --git a/bc/util.c b/bc/util.c +index 30beaf9..26e2e85 100644 +--- a/bc/util.c ++++ b/bc/util.c +@@ -602,8 +602,7 @@ lookup (name, namekind) + case FUNCTDEF: + if (id->f_name != 0) + { +- if (namekind != FUNCT) +- free(name); ++ free(name); + /* Check to see if we are redefining a math lib function. */ + if (use_math && namekind == FUNCTDEF && id->f_name <= 6) + id->f_name = next_func++; diff --git a/system/base/bc/pspec.xml b/system/base/bc/pspec.xml new file mode 100644 index 00000000..131c8e31 --- /dev/null +++ b/system/base/bc/pspec.xml @@ -0,0 +1,64 @@ + + + + + bc + http://www.gnu.org/software/bc + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + Console-based calculator utility + bc is an arbitrary precision numeric processing language and can be used as a calculator. Syntax is similar to C, but differs in many substantial areas. For example, it supports interactive execution of statements. + ftp://alpha.gnu.org/gnu/bc/bc-1.06.95.tar.bz2 + + flex + texinfo + readline-devel + + + fedora/bc-1.06.95-memleak.patch + fedora/bc-1.06-dc_ibase.patch + fedora/bc-1.06.95-matlib.patch + + + + + bc + + readline + + + /usr/bin + /usr/share/doc + /usr/share/man + /usr/share/info + + + + + + 2014-05-11 + 1.06.95 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 1.06.95 + rebuild. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2011-01-02 + 1.06.95 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/system/base/bc/translations.xml b/system/base/bc/translations.xml new file mode 100644 index 00000000..ea5714d4 --- /dev/null +++ b/system/base/bc/translations.xml @@ -0,0 +1,9 @@ + + + + bc + Konsol temelli hesap makinesi + bc, herhangi bir keskinlikte sayısal işlemler yapmayı sağlayan bir programlama dilidir ve bir hesap makinesi olarak kullanılabilir. Sözdizimi C programlama diline benzer, ancak C'den birçok önemli farkları vardır. Örneğin, ifadelerin etkileşimli bir şekilde çalışmasına olanak tanır. + bc est un langage de calcul numérique à précision arbitraire qui peut être utilisé comme calculatrice. La syntaxe est similaire au C, avec quelques différences notables. Il supporte par exemple l'exécution interactive de commandes. + + diff --git a/system/base/biosdevname/actions.py b/system/base/biosdevname/actions.py index e33ae165..1ade155b 100644 --- a/system/base/biosdevname/actions.py +++ b/system/base/biosdevname/actions.py @@ -15,5 +15,8 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + #remove after usbmove + pisitools.dosym("/usr/sbin/biosdevname", "/sbin/biosdevname") pisitools.dodoc("AUTHORS", "NEWS", "ChangeLog", "COPYING", "TODO", "README") diff --git a/system/base/biosdevname/pspec.xml b/system/base/biosdevname/pspec.xml index c08d0972..a86fb4ab 100644 --- a/system/base/biosdevname/pspec.xml +++ b/system/base/biosdevname/pspec.xml @@ -13,10 +13,11 @@ app:gui Biosdevname is a udev helper utility developed Biosdevname is a udev helper utility developed by Dell and released under the GNU General Public License (GPL). It provides a consistent naming mechanism for network devices based on their physical location as suggested by the system BIOS. - http://linux.dell.com/biosdevname/biosdevname-0.6.0/biosdevname-0.6.0.tar.gz + http://linux.dell.com/biosdevname/biosdevname-0.6.1/biosdevname-0.6.1.tar.gz pciutils-devel glibc-devel + zlib-devel @@ -24,9 +25,9 @@ biosdevname pciutils - glibc + /sbin /lib/udev/rules.d /usr/sbin /usr/share/doc @@ -35,6 +36,13 @@ + + 2015-03-30 + 0.6.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 0.6.0 diff --git a/system/base/comar/pspec.xml b/system/base/comar/pspec.xml index 9a16a09c..f6aaf746 100644 --- a/system/base/comar/pspec.xml +++ b/system/base/comar/pspec.xml @@ -14,8 +14,8 @@ Pisi Linux programs are packaged with small scripts which configures them to entegrate with system and each other. Çomar is the tool which manages and executes these scripts. http://source.pisilinux.org/1.0/comar-3.0.3.tar.bz2 - dbus - python + dbus-devel + python-devel run_dir.patch @@ -47,7 +47,7 @@ - 2014-08-19 + 2015-04-01 3.0.3 Fix run dir path. Marcin Bojara diff --git a/system/base/coreutils/pspec.xml b/system/base/coreutils/pspec.xml index 575405b6..cf6e6ee5 100644 --- a/system/base/coreutils/pspec.xml +++ b/system/base/coreutils/pspec.xml @@ -20,6 +20,7 @@ shadow gettext-devel ncurses-devel + texinfo @@ -53,7 +54,7 @@ - 2014-12-12 + 2015-04-01 8.23 Version bump. Yusuf Aydemir diff --git a/system/base/cryptsetup/pspec.xml b/system/base/cryptsetup/pspec.xml index 1a9d8ecc..6747408b 100644 --- a/system/base/cryptsetup/pspec.xml +++ b/system/base/cryptsetup/pspec.xml @@ -3,7 +3,7 @@ cryptsetup - https://code.google.com/p/cryptsetup/ + https://gitlab.com/cryptsetup/cryptsetup Erdem Artan admins@pisilinux.org @@ -13,11 +13,15 @@ app:cli Userspace setup tool for transparent encryption of block devices using dm-crypt Userspace setup tool for transparent encryption of block devices using dm-crypt - https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-1.6.4.tar.xz + https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-1.6.7.tar.xz - device-mapper-devel + device-mapper-devel libgpg-error-devel libgcrypt-devel + python-devel + libutil-linux-devel + popt-devel + popt @@ -42,7 +46,7 @@ device-mapper libgpg-error libgcrypt - libuuid + libutil-linux /lib/libcryptsetup.so* @@ -75,8 +79,15 @@ + + 2015-04-30 + 1.6.7 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + - 2014-05-11 + 2015-04-01 1.6.4 Release bump. Marcin Bojara diff --git a/system/base/curl/pspec.xml b/system/base/curl/pspec.xml index bf60fad1..a1dae12b 100644 --- a/system/base/curl/pspec.xml +++ b/system/base/curl/pspec.xml @@ -14,8 +14,9 @@ library A utility for getting files from remote servers curl is a command line tool for transferring data with URL syntax, supporting various protocols. - http://curl.haxx.se/download/curl-7.41.0.tar.bz2 + http://curl.haxx.se/download/curl-7.42.1.tar.bz2 + glibc-devel zlib-devel openssl-devel libidn-devel @@ -61,12 +62,19 @@ - - 2015-02-25 - 7.41.0 + + 2015-05-01 + 7.42.1 Version bump. - Dmitry Patsura - talk@dmtry.me + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-04-27 + 7.42.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org 2015-01-11 diff --git a/system/base/dbus-glib/pspec.xml b/system/base/dbus-glib/pspec.xml index 8f335143..0a76df88 100644 --- a/system/base/dbus-glib/pspec.xml +++ b/system/base/dbus-glib/pspec.xml @@ -13,12 +13,13 @@ library Glib bindings for D-Bus dbus-glib is an add-on library to integrate the standard D-Bus library with the GLib thread abstraction and main loop. - http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.102.tar.gz + http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.104.tar.gz - dbus + dbus-devel - glib2 - expat + glib2-devel + libpcre-devel + expat-devel libxml2 @@ -50,6 +51,8 @@ Development files for dbus-glib dbus-glib + dbus-devel + glib2-devel /usr/include/dbus-1.0 @@ -59,8 +62,15 @@ + + 2015-05-12 + 0.104 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + - 2014-05-11 + 2015-04-01 0.102 Release bump. Marcin Bojara diff --git a/system/base/dbus-python/pspec.xml b/system/base/dbus-python/pspec.xml index de33195a..f6874e3e 100644 --- a/system/base/dbus-python/pspec.xml +++ b/system/base/dbus-python/pspec.xml @@ -15,10 +15,12 @@ dbus-python provides a Python module which wraps the D-Bus programming API. http://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.2.0.tar.gz + python-devel python3 dbus-devel - dbus-glib + dbus-glib-devel glib2-devel + libpcre-devel suppress-warnings.patch @@ -70,7 +72,7 @@ - 2014-05-31 + 2015-04-01 1.2.0 Release bump. Kamil Atlı diff --git a/system/base/dbus/actions.py b/system/base/dbus/actions.py index 32ff4f29..0e995970 100644 --- a/system/base/dbus/actions.py +++ b/system/base/dbus/actions.py @@ -36,8 +36,8 @@ def setup(): if get.buildTYPE() == "emul32": options += "\ - --enable-xml-docs \ - --enable-doxygen-docs" + --disable-xml-docs \ + --disable-doxygen-docs" # Build only libdbus pisitools.dosed("Makefile.am", "(.*SUBDIRS=dbus) .*", "\\1") diff --git a/system/base/dbus/pspec.xml b/system/base/dbus/pspec.xml index 73800639..4e890a14 100644 --- a/system/base/dbus/pspec.xml +++ b/system/base/dbus/pspec.xml @@ -13,13 +13,13 @@ service A message bus system, a simple way for applications to talk to each other D-Bus supplies both a system daemon (for events such as "new hardware device added" or "printer queue changed") and a per-user-login-session daemon (for general IPC needs among user applications). Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). Currently the communicating applications are on one computer, but TCP/IP option is available and remote support planned. - http://dbus.freedesktop.org/releases/dbus/dbus-1.9.10.tar.gz + http://dbus.freedesktop.org/releases/dbus/dbus-1.9.14.tar.gz expat-devel libX11-devel - doxygen + libcap-ng-devel - xmlto + @@ -27,8 +27,9 @@ dbus expat - libX11 libcap-ng + + libX11 @@ -47,9 +48,21 @@ tmpfiles.conf - + System.Package - + + + + dbus-x11 + x11.util + + libX11 + dbus + + + + /usr/bin/dbus-launch + @@ -75,9 +88,10 @@ emul32 expat-32bit + glibc-32bit - dbus + glibc-32bit /usr/lib32 @@ -85,6 +99,13 @@ + + 2015-05-11 + 1.9.14 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-02-15 1.9.10 diff --git a/system/base/dhcpcd/pspec.xml b/system/base/dhcpcd/pspec.xml index b2b2ec4a..d3dcbc14 100644 --- a/system/base/dhcpcd/pspec.xml +++ b/system/base/dhcpcd/pspec.xml @@ -12,14 +12,11 @@ app:console A dhcp client only An RFC2131 and RFC1541 compliant DHCP client daemon. dhcpcd gets an IP address and other information from a corresponding DHCP server, configures the network interface automatically, and tries to renew the lease time according to RFC2131 or RFC1541 depending on the command line option. - http://ftp.osuosl.org/pub/blfs/conglomeration/dhcpcd/dhcpcd-6.7.1.tar.bz2 + http://ftp.osuosl.org/pub/blfs/conglomeration/dhcpcd/dhcpcd-6.8.1.tar.bz2 dhcpcd - - libudev - /etc /lib/dhcpcd @@ -32,6 +29,13 @@ + + 2015-05-03 + 6.8.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-02-03 6.7.1 diff --git a/system/base/disktype/Makefile içindeki derleyici gcc olarak değiştirildi b/system/base/disktype/Makefile içindeki derleyici gcc olarak değiştirildi deleted file mode 100644 index 8d1c8b69..00000000 --- a/system/base/disktype/Makefile içindeki derleyici gcc olarak değiştirildi +++ /dev/null @@ -1 +0,0 @@ - diff --git a/system/base/disktype/actions.py b/system/base/disktype/actions.py deleted file mode 100644 index 2a353ba2..00000000 --- a/system/base/disktype/actions.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import get - -def build(): - shelltools.export("CCACHE_DIR", "%s" % get.workDIR()) - autotools.make('CFLAGS="%s -fno-stack-protector -fno-strict-aliasing"' % get.CFLAGS()) - -def install(): - pisitools.dobin("disktype") - pisitools.doman("disktype.1") - pisitools.dodoc("README", "HISTORY", "TODO") diff --git a/system/base/disktype/files/disktype.patch b/system/base/disktype/files/disktype.patch deleted file mode 100644 index f130a9d6..00000000 --- a/system/base/disktype/files/disktype.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur disktype-9.orig/linux.c disktype-9/linux.c ---- disktype-9.orig/linux.c 2006-06-04 23:05:06.000000000 +0300 -+++ disktype-9/linux.c 2007-02-14 14:34:36.749572288 +0200 -@@ -43,11 +43,20 @@ - - if (get_le_short(buf + 56) == 0xEF53) { - if (get_le_long(buf + 96) & 0x0008) /* JOURNAL_DEV flag */ -+ { - print_line(level, "Ext3 external journal"); -+ print_line(level, "KERNELMODULE: ext3"); -+ } - else if (get_le_long(buf + 92) & 0x0004) /* HAS_JOURNAL flag */ -+ { - print_line(level, "Ext3 file system"); -+ print_line(level, "KERNELMODULE: ext3"); -+ } - else -+ { - print_line(level, "Ext2 file system"); -+ print_line(level, "KERNELMODULE: ext2"); -+ } - - get_string(buf + 120, 16, s); - if (s[0]) -@@ -93,19 +102,24 @@ - /* check signature */ - if (memcmp(buf + 52, "ReIsErFs", 8) == 0) { - print_line(level, "ReiserFS file system (old 3.5 format, standard journal, starts at %d KiB)", at); -+ print_line(level, "KERNELMODULE: reiserfs"); - newformat = 0; - } else if (memcmp(buf + 52, "ReIsEr2Fs", 9) == 0) { - print_line(level, "ReiserFS file system (new 3.6 format, standard journal, starts at %d KiB)", at); -+ print_line(level, "KERNELMODULE: reiserfs"); - newformat = 1; - } else if (memcmp(buf + 52, "ReIsEr3Fs", 9) == 0) { - newformat = get_le_short(buf + 72); - if (newformat == 0) { - print_line(level, "ReiserFS file system (old 3.5 format, non-standard journal, starts at %d KiB)", at); -+ print_line(level, "KERNELMODULE: reiserfs"); - } else if (newformat == 2) { - print_line(level, "ReiserFS file system (new 3.6 format, non-standard journal, starts at %d KiB)", at); -+ print_line(level, "KERNELMODULE: reiserfs"); - newformat = 1; - } else { - print_line(level, "ReiserFS file system (v3 magic, but unknown version %d, starts at %d KiB)", newformat, at); -+ print_line(level, "KERNELMODULE: reiserfs"); - continue; - } - } else -diff -ur disktype-9.orig/Makefile disktype-9/Makefile ---- disktype-9.orig/Makefile 2006-01-12 19:55:15.000000000 +0200 -+++ disktype-9/Makefile 2007-02-14 14:24:30.917995693 +0200 -@@ -3,7 +3,7 @@ - ### - - RM = rm -f --CC = gcc -+CC = klcc - - OBJS = main.o lib.o \ - buffer.o file.o cdaccess.o cdimage.o vpc.o compressed.o \ -diff -ur disktype-9.orig/unix.c disktype-9/unix.c ---- disktype-9.orig/unix.c 2003-12-30 12:10:41.000000000 +0200 -+++ disktype-9/unix.c 2007-02-14 14:27:48.529848766 +0200 -@@ -49,6 +49,7 @@ - /* tell the user */ - version = get_le_long(buf + 4); - print_line(level, "JFS file system, version %d", version); -+ print_line(level, "KERNELMODULE: jfs"); - - get_string(buf + 101, 11, s); - print_line(level + 1, "Volume name \"%s\"", s); -@@ -82,6 +83,7 @@ - raw_version = get_be_short(buf + 0x64); - version = raw_version & 0x000f; - print_line(level, "XFS file system, version %d", version); -+ print_line(level, "KERNELMODULE: xfs"); - - get_string(buf + 0x6c, 12, s); - print_line(level + 1, "Volume name \"%s\"", s); diff --git a/system/base/disktype/files/ext4.patch b/system/base/disktype/files/ext4.patch deleted file mode 100644 index f67d35fc..00000000 --- a/system/base/disktype/files/ext4.patch +++ /dev/null @@ -1,112 +0,0 @@ - - We first get some sane ext3 poperties and try to match the invert -of these with the filesystems related supoerblock sections. If we find -something not related to ext3 and have journal, we guess the filesystem -is of ext4 type. Then by checking EXT2_FLAGS_TEST_FILESYS in s_flags -section we distinguish ext4 and ext4dev. There may be a better way but -this is the way current e2fsprogs blkid probe does it. Ext4 sections -and flags are taken from the kernel headers of 2.6.25 where ext4 is -still marked as dev. - - Onur Küçük - - -diff -Nur disktype-9-old/detect.c disktype-9/detect.c ---- disktype-9-old/detect.c 2009-03-09 12:38:20.000000000 +0200 -+++ disktype-9/detect.c 2009-03-09 12:38:33.000000000 +0200 -@@ -59,7 +59,7 @@ - void detect_udf(SECTION *section, int level); - - /* in linux.c */ --void detect_ext23(SECTION *section, int level); -+void detect_ext234(SECTION *section, int level); - void detect_reiser(SECTION *section, int level); - void detect_reiser4(SECTION *section, int level); - void detect_linux_raid(SECTION *section, int level); -@@ -136,7 +136,7 @@ - detect_udf, - detect_cdrom_misc, - detect_iso, -- detect_ext23, -+ detect_ext234, - detect_reiser, - detect_reiser4, - detect_linux_raid, -diff -Nur disktype-9-old/linux.c disktype-9/linux.c ---- disktype-9-old/linux.c 2009-03-09 12:38:20.000000000 +0200 -+++ disktype-9/linux.c 2009-03-09 12:38:29.000000000 +0200 -@@ -28,10 +28,43 @@ - #include "global.h" - - /* -- * ext2/ext3 file system -+ * ext2/ext3/ext4 file system - */ - --void detect_ext23(SECTION *section, int level) -+/* for s_flags */ -+#define EXT2_FLAGS_TEST_FILESYS 0x0004 -+ -+/* for s_feature_compat */ -+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 -+ -+/* for s_feature_ro_compat */ -+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 -+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 -+#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 -+#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE 0x0008 -+#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 -+#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 -+#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 -+ -+/* for s_feature_incompat */ -+#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 -+#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 -+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 -+#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010 -+#define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 -+#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 -+#define EXT4_FEATURE_INCOMPAT_MMP 0x0100 -+#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+ -+#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED ~(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER | \ -+ EXT2_FEATURE_RO_COMPAT_LARGE_FILE | \ -+ EXT2_FEATURE_RO_COMPAT_BTREE_DIR) -+ -+#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED ~(EXT2_FEATURE_INCOMPAT_FILETYPE | \ -+ EXT3_FEATURE_INCOMPAT_RECOVER | \ -+ EXT2_FEATURE_INCOMPAT_META_BG) -+ -+void detect_ext234(SECTION *section, int level) - { - unsigned char *buf; - char s[256]; -@@ -49,8 +82,26 @@ - } - else if (get_le_long(buf + 92) & 0x0004) /* HAS_JOURNAL flag */ - { -- print_line(level, "Ext3 file system"); -- print_line(level, "KERNELMODULE: ext3"); -+ /* Try to find if it is ext4 by checking if there are any unsupported features of ext3 */ -+ if ((get_le_long(buf + 96) & EXT3_FEATURE_INCOMPAT_UNSUPPORTED) && (get_le_long(buf + 100) & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED)) -+ { -+ /* We have ext4 but which version */ -+ if (get_le_long(buf + 352) & EXT2_FLAGS_TEST_FILESYS) -+ { -+ print_line(level, "Ext4dev file system"); -+ print_line(level, "KERNELMODULE: ext4dev"); -+ } -+ else -+ { -+ print_line(level, "Ext4 file system"); -+ print_line(level, "KERNELMODULE: ext4"); -+ } -+ } -+ else -+ { -+ print_line(level, "Ext3 file system"); -+ print_line(level, "KERNELMODULE: ext3"); -+ } - } - else - { diff --git a/system/base/disktype/files/vfat.patch b/system/base/disktype/files/vfat.patch deleted file mode 100644 index 99de689a..00000000 --- a/system/base/disktype/files/vfat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur disktype-9-old/dos.c disktype-9/dos.c ---- disktype-9-old/dos.c 2008-07-04 11:06:22.000000000 +0300 -+++ disktype-9/dos.c 2008-07-04 11:22:59.000000000 +0300 -@@ -485,6 +485,7 @@ - strcpy(s, ", ATARI ST bootable"); - print_line(level, "%s file system (hints score %d of %d%s)", - fatnames[fattype], score, 5, s); -+ print_line(level, "KERNELMODULE: vfat"); - - if (sectsize > 512) - print_line(level + 1, "Unusual sector size %lu bytes", sectsize); -@@ -551,6 +552,7 @@ - - /* tell the user */ - print_line(level, "NTFS file system"); -+ print_line(level, "KERNELMODULE: ntfs"); - - format_blocky_size(s, sectcount, sectsize, "sectors", NULL); - print_line(level + 1, "Volume size %s", s); diff --git a/system/base/disktype/pspec.xml b/system/base/disktype/pspec.xml deleted file mode 100644 index 6517b355..00000000 --- a/system/base/disktype/pspec.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - disktype - http://disktype.sourceforge.net/ - - PisiLinux Community - admins@pisilinux.org - - BSD - app:console - Detect the content format of a disk or disk image - The purpose of disktype is to detect the content format of a disk or disk image. It knows about common file systems, partition tables, and boot codes.The program is written in C and is designed to compile on any modern Unix flavour. - mirrors://sourceforge/disktype/disktype-9.tar.gz - - disktype.patch - vfat.patch - ext4.patch - - - - - disktype - - /usr/bin - /usr/share/doc - /usr/share/man - - - - - - 2014-05-11 - 9 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-29 - 9 - Rebuild - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2012-08-23 - 9 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/system/base/disktype/translations.xml b/system/base/disktype/translations.xml deleted file mode 100644 index 2ed94bec..00000000 --- a/system/base/disktype/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - disktype - Disk veya disk görüntüsünün biçimsel içeriğini saptar - Disktype'ın amacı disk veya disk görüntüsünün içerik yapısını denetlemektir. Yaygın dosya sistemlerini, bölümleme tablolarını ve önyükleme kodlarını bilir. C dilinde yazılmış, herhangi bir modern Unix derleme tadında tasarlanmıştır. - - diff --git a/system/base/dnsmasq/actions.py b/system/base/dnsmasq/actions.py deleted file mode 100644 index bc47f1b0..00000000 --- a/system/base/dnsmasq/actions.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - pisitools.dosed("src/config.h", "/\* #define HAVE_DBUS \*/", "#define HAVE_DBUS") - - for f in ("dnsmasq.conf.example", "man/dnsmasq.8", "man/es/dnsmasq.8", "src/config.h"): - pisitools.dosed(f, "/var/lib/misc", "/var/lib/dnsmasq") - - - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("PREFIX=%s/usr" % get.installDIR()) - pisitools.insinto("/etc/dbus-1/system.d", "dbus/dnsmasq.conf", "dnsmasq.conf") - - # Install python binding - pisitools.insinto("/usr/lib/%s/site-packages" % get.curPYTHON(), "dnsmasq.py") - - pisitools.dodir("/var/lib/dnsmasq") - - pisitools.dodoc("CHANGELOG", "COPYING", "COPYING-v3", "FAQ") - pisitools.dohtml("doc.html", "setup.html") diff --git a/system/base/dnsmasq/comar/service.py b/system/base/dnsmasq/comar/service.py deleted file mode 100644 index a98719a3..00000000 --- a/system/base/dnsmasq/comar/service.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -from comar.service import * - -serviceType = "local" -serviceDesc = _({"en": "DNS Cache Service", - "tr": "DNS Önbellekleme Servisi"}) - -DNSMASQMESSAGE = "# This line was added by dnsmasq package" -DNSMASQNAMESERVER = "nameserver 127.0.0.1" - -def addLocalNameServerToResolvConf(filename="/etc/resolv.conf"): - dnslist = [] - for line in file(filename): - dnslist.append(line) - line = line.strip() - if line.startswith(DNSMASQNAMESERVER): - return - - dnslist.insert(0, "%s\n" % DNSMASQMESSAGE) - dnslist.insert(1, "%s\n" % DNSMASQNAMESERVER) - - f = file(filename, "w") - try: - for dns in dnslist: - f.write(dns) - finally: - f.close() - -def removeLocalNameServerFromResolvConf(filename="/etc/resolv.conf"): - dnslist = [] - for line in file(filename): - strippedLine = line.strip() - if strippedLine.startswith(DNSMASQMESSAGE): - continue - if strippedLine.startswith(DNSMASQNAMESERVER): - continue - dnslist.append(line) - - f = file(filename, "w") - try: - for dns in dnslist: - f.write(dns) - finally: - f.close() - -@synchronized -def start(): - addLocalNameServerToResolvConf("/etc/resolv.conf") - addLocalNameServerToResolvConf("/etc/resolv.default.conf") - - startService(command="/usr/sbin/dnsmasq", - args="--enable-dbus", - pidfile="/var/run/dnsmasq.pid", - donotify=True) - -@synchronized -def stop(): - removeLocalNameServerFromResolvConf("/etc/resolv.conf") - removeLocalNameServerFromResolvConf("/etc/resolv.default.conf") - - stopService(pidfile="/var/run/dnsmasq.pid", - donotify=True) - -def status(): - return isServiceRunning("/var/run/dnsmasq.pid") diff --git a/system/base/dnsmasq/comar/stack.py b/system/base/dnsmasq/comar/stack.py deleted file mode 100644 index 4f7bcdd3..00000000 --- a/system/base/dnsmasq/comar/stack.py +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -import os -import string -import subprocess -import dnsmasq - -HEADER_DEFAULT = """# Default DNS settings -# -""" - -HOST_CHARS = string.ascii_letters + string.digits + '.' + '_' + '-' -NAME_PATH = "/etc/env.d/01hostname" -CMD_ENV = "/sbin/update-environment" -HOSTS_PATH = "/etc/hosts" - -RESOLV_USER = "/etc/resolv.default.conf" - -MSG_ERR_INVLCHRSHSNM = {"en": "Invalid character(s) '%s' found in hostname.", - "tr": "Bilgisayar adında geçersiz karakter(ler) ('%s') bulundu.", - } - -# Network.Stack methods - -def getNameServers(): - servers = [] - if not os.access(RESOLV_USER, os.R_OK): - return servers - for line in file(RESOLV_USER): - line = line.strip() - if line.startswith("nameserver"): - ip = line.split()[1] - if ip not in servers: - servers.append(ip) - return servers - -def setNameServers(nameservers, searchdomain): - f = file(RESOLV_USER, "w") - f.write(HEADER_DEFAULT) - - for server in nameservers: - f.write("nameserver %s\n" % server) - - if searchdomain: - f.write("searchdomain %s\n" % searchdomain) - - f.close() - -def registerNameServers(ifname, nameservers, searchdomain): - dnsMasq = dnsmasq.DnsMasq() - for server in nameservers: - dnsMasq.registerNameServer(ifname, server) - dnsMasq.clearCache() - -def unregisterNameServers(ifname, nameservers, searchdomain): - dnsMasq = dnsmasq.DnsMasq() - dnsMasq.unregisterNameServers(ifname) - dnsMasq.clearCache() - -def flushNameCache(): - dnsMasq = dnsmasq.DnsMasq() - dnsMasq.clearCache() - -def getHostName(): - cmd = subprocess.Popen(["/usr/bin/hostname"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - a = cmd.communicate() - if a[1] == "": - return a[0].rstrip("\n") - return "" - -def setHostName(hostname): - if not hostname: - return - invalid = filter(lambda x: not x in HOST_CHARS, hostname) - if len(invalid) > 0: - fail(_(MSG_ERR_INVLCHRSHSNM) % ("".join(invalid))) - - # hostname - if os.path.exists(NAME_PATH): - import re - f = file(NAME_PATH) - data = f.read() - f.close() - data = re.sub('HOSTNAME="(.*)"', 'HOSTNAME="%s"' % hostname, data) - else: - data = 'HOSTNAME="%s"\n' % hostname - f = file(NAME_PATH, "w") - f.write(data) - f.close() - - # hosts - f = file(HOSTS_PATH) - data = f.readlines() - f.close() - f = file(HOSTS_PATH, "w") - flag = 1 - for line in data: - if line.startswith("127.0.0.1"): - line = "127.0.0.1 localhost %s\n" % hostname - flag = 0 - f.write(line) - if flag: - f.write("127.0.0.1 localhost %s\n" % hostname) - f.close() - - # update environment - os.system(CMD_ENV) diff --git a/system/base/dnsmasq/files/dnsmasq.conf b/system/base/dnsmasq/files/dnsmasq.conf deleted file mode 100644 index c13b5557..00000000 --- a/system/base/dnsmasq/files/dnsmasq.conf +++ /dev/null @@ -1,489 +0,0 @@ -# Configuration file for dnsmasq. -# -# Format is one option per line, legal options are the same -# as the long options legal on the command line. See -# "/usr/sbin/dnsmasq --help" or "man 8 dnsmasq" for details. - -# The following two options make you a better netizen, since they -# tell dnsmasq to filter out queries which the public DNS cannot -# answer, and which load the servers (especially the root servers) -# uneccessarily. If you have a dial-on-demand link they also stop -# these requests from bringing up the link uneccessarily. - -# Never forward plain names (without a dot or domain part) -domain-needed -# Never forward addresses in the non-routed address spaces. -bogus-priv - - -# Uncomment this to filter useless windows-originated DNS requests -# which can trigger dial-on-demand links needlessly. -# Note that (amongst other things) this blocks all SRV requests, -# so don't use it if you use eg Kerberos, SIP, XMMP or Google-talk. -# This option only affects forwarding, SRV records originating for -# dnsmasq (via srv-host= lines) are not suppressed by it. -#filterwin2k - -# Change this line if you want dns to get its upstream servers from -# somewhere other that /etc/resolv.conf -#resolv-file= - -# By default, dnsmasq will send queries to any of the upstream -# servers it knows about and tries to favour servers to are known -# to be up. Uncommenting this forces dnsmasq to try each query -# with each server strictly in the order they appear in -# /etc/resolv.conf -#strict-order - -# If you don't want dnsmasq to read /etc/resolv.conf or any other -# file, getting its servers from this file instead (see below), then -# uncomment this. -#no-resolv - -# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv -# files for changes and re-read them then uncomment this. -#no-poll - -# Add other name servers here, with domain specs if they are for -# non-public domains. -#server=/localnet/192.168.0.1 - -# Example of routing PTR queries to nameservers: this will send all -# address->name queries for 192.168.3/24 to nameserver 10.1.2.3 -#server=/3.168.192.in-addr.arpa/10.1.2.3 - -# Add local-only domains here, queries in these domains are answered -# from /etc/hosts or DHCP only. -#local=/localnet/ - -# Add domains which you want to force to an IP address here. -# The example below send any host in doubleclick.net to a local -# webserver. -#address=/doubleclick.net/127.0.0.1 - -# --address (and --server) work with IPv6 addresses too. -#address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83 - -# You can control how dnsmasq talks to a server: this forces -# queries to 10.1.2.3 to be routed via eth1 -# --server=10.1.2.3@eth1 - -# and this sets the source (ie local) address used to talk to -# 10.1.2.3 to 192.168.1.1 port 55 (there must be a interface with that -# IP on the machine, obviously). -# --server=10.1.2.3@192.168.1.1#55 - -# If you want dnsmasq to change uid and gid to something other -# than the default, edit the following lines. -#user= -#group= - -# If you want dnsmasq to listen for DHCP and DNS requests only on -# specified interfaces (and the loopback) give the name of the -# interface (eg eth0) here. -# Repeat the line for more than one interface. -#interface= -# Or you can specify which interface _not_ to listen on -#except-interface= -# Or which to listen on by address (remember to include 127.0.0.1 if -# you use this.) -#listen-address= -# If you want dnsmasq to provide only DNS service on an interface, -# configure it as shown above, and then use the following line to -# disable DHCP on it. -#no-dhcp-interface= - -# On systems which support it, dnsmasq binds the wildcard address, -# even when it is listening on only some interfaces. It then discards -# requests that it shouldn't reply to. This has the advantage of -# working even when interfaces come and go and change address. If you -# want dnsmasq to really bind only the interfaces it is listening on, -# uncomment this option. About the only time you may need this is when -# running another nameserver on the same machine. -#bind-interfaces - -# If you don't want dnsmasq to read /etc/hosts, uncomment the -# following line. -#no-hosts -# or if you want it to read another file, as well as /etc/hosts, use -# this. -#addn-hosts=/etc/banner_add_hosts - -# Set this (and domain: see below) if you want to have a domain -# automatically added to simple names in a hosts-file. -#expand-hosts - -# Set the domain for dnsmasq. this is optional, but if it is set, it -# does the following things. -# 1) Allows DHCP hosts to have fully qualified domain names, as long -# as the domain part matches this setting. -# 2) Sets the "domain" DHCP option thereby potentially setting the -# domain of all systems configured by DHCP -# 3) Provides the domain part for "expand-hosts" -#domain=thekelleys.org.uk - -# Set a different domain for a particular subnet -#domain=wireless.thekelleys.org.uk,192.168.2.0/24 - -# Same idea, but range rather then subnet -#domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200 - -# Uncomment this to enable the integrated DHCP server, you need -# to supply the range of addresses available for lease and optionally -# a lease time. If you have more than one network, you will need to -# repeat this for each network on which you want to supply DHCP -# service. -#dhcp-range=192.168.0.50,192.168.0.150,12h - -# This is an example of a DHCP range where the netmask is given. This -# is needed for networks we reach the dnsmasq DHCP server via a relay -# agent. If you don't know what a DHCP relay agent is, you probably -# don't need to worry about this. -#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h - -# This is an example of a DHCP range with a network-id, so that -# some DHCP options may be set only for this network. -#dhcp-range=red,192.168.0.50,192.168.0.150 - -# Supply parameters for specified hosts using DHCP. There are lots -# of valid alternatives, so we will give examples of each. Note that -# IP addresses DO NOT have to be in the range given above, they just -# need to be on the same network. The order of the parameters in these -# do not matter, it's permissble to give name,adddress and MAC in any order - -# Always allocate the host with ethernet address 11:22:33:44:55:66 -# The IP address 192.168.0.60 -#dhcp-host=11:22:33:44:55:66,192.168.0.60 - -# Always set the name of the host with hardware address -# 11:22:33:44:55:66 to be "fred" -#dhcp-host=11:22:33:44:55:66,fred - -# Always give the host with ethernet address 11:22:33:44:55:66 -# the name fred and IP address 192.168.0.60 and lease time 45 minutes -#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m - -# Give a host with ethernet address 11:22:33:44:55:66 or -# 12:34:56:78:90:12 the IP address 192.168.0.60. Dnsmasq will assume -# that these two ethernet interfaces will never be in use at the same -# time, and give the IP address to the second, even if it is already -# in use by the first. Useful for laptops with wired and wireless -# addresses. -#dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.60 - -# Give the machine which says its name is "bert" IP address -# 192.168.0.70 and an infinite lease -#dhcp-host=bert,192.168.0.70,infinite - -# Always give the host with client identifier 01:02:02:04 -# the IP address 192.168.0.60 -#dhcp-host=id:01:02:02:04,192.168.0.60 - -# Always give the host with client identifier "marjorie" -# the IP address 192.168.0.60 -#dhcp-host=id:marjorie,192.168.0.60 - -# Enable the address given for "judge" in /etc/hosts -# to be given to a machine presenting the name "judge" when -# it asks for a DHCP lease. -#dhcp-host=judge - -# Never offer DHCP service to a machine whose ethernet -# address is 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,ignore - -# Ignore any client-id presented by the machine with ethernet -# address 11:22:33:44:55:66. This is useful to prevent a machine -# being treated differently when running under different OS's or -# between PXE boot and OS boot. -#dhcp-host=11:22:33:44:55:66,id:* - -# Send extra options which are tagged as "red" to -# the machine with ethernet address 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,net:red - -# Send extra options which are tagged as "red" to -# any machine with ethernet address starting 11:22:33: -#dhcp-host=11:22:33:*:*:*,net:red - -# Ignore any clients which are specified in dhcp-host lines -# or /etc/ethers. Equivalent to ISC "deny unkown-clients". -# This relies on the special "known" tag which is set when -# a host is matched. -#dhcp-ignore=#known - -# Send extra options which are tagged as "red" to any machine whose -# DHCP vendorclass string includes the substring "Linux" -#dhcp-vendorclass=red,Linux - -# Send extra options which are tagged as "red" to any machine one -# of whose DHCP userclass strings includes the substring "accounts" -#dhcp-userclass=red,accounts - -# Send extra options which are tagged as "red" to any machine whose -# MAC address matches the pattern. -#dhcp-mac=red,00:60:8C:*:*:* - -# If this line is uncommented, dnsmasq will read /etc/ethers and act -# on the ethernet-address/IP pairs found there just as if they had -# been given as --dhcp-host options. Useful if you keep -# MAC-address/host mappings there for other purposes. -#read-ethers - -# Send options to hosts which ask for a DHCP lease. -# See RFC 2132 for details of available options. -# Common options can be given to dnsmasq by name: -# run "dnsmasq --help dhcp" to get a list. -# Note that all the common settings, such as netmask and -# broadcast address, DNS server and default route, are given -# sane defaults by dnsmasq. You very likely will not need -# any dhcp-options. If you use Windows clients and Samba, there -# are some options which are recommended, they are detailed at the -# end of this section. - -# Override the default route supplied by dnsmasq, which assumes the -# router is the same machine as the one running dnsmasq. -#dhcp-option=3,1.2.3.4 - -# Do the same thing, but using the option name -#dhcp-option=option:router,1.2.3.4 - -# Override the default route supplied by dnsmasq and send no default -# route at all. Note that this only works for the options sent by -# default (1, 3, 6, 12, 28) the same line will send a zero-length option -# for all other option numbers. -#dhcp-option=3 - -# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 -#dhcp-option=option:ntp-server,192.168.0.4,10.10.0.5 - -# Set the NTP time server address to be the same machine as -# is running dnsmasq -#dhcp-option=42,0.0.0.0 - -# Set the NIS domain name to "welly" -#dhcp-option=40,welly - -# Set the default time-to-live to 50 -#dhcp-option=23,50 - -# Set the "all subnets are local" flag -#dhcp-option=27,1 - -# Send the etherboot magic flag and then etherboot options (a string). -#dhcp-option=128,e4:45:74:68:00:00 -#dhcp-option=129,NIC=eepro100 - -# Specify an option which will only be sent to the "red" network -# (see dhcp-range for the declaration of the "red" network) -# Note that the net: part must precede the option: part. -#dhcp-option = net:red, option:ntp-server, 192.168.1.1 - -# The following DHCP options set up dnsmasq in the same way as is specified -# for the ISC dhcpcd in -# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt -# adapted for a typical dnsmasq installation where the host running -# dnsmasq is also the host running samba. -# you may want to uncomment some or all of them if you use -# Windows clients and Samba. -#dhcp-option=19,0 # option ip-forwarding off -#dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) -#dhcp-option=45,0.0.0.0 # netbios datagram distribution server -#dhcp-option=46,8 # netbios node type - -# Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client -# probably doesn't support this...... -#dhcp-option=option:domain-search,eng.apple.com,marketing.apple.com - -# Send RFC-3442 classless static routes (note the netmask encoding) -#dhcp-option=121,192.168.1.0/24,1.2.3.4,10.0.0.0/8,5.6.7.8 - -# Send vendor-class specific options encapsulated in DHCP option 43. -# The meaning of the options is defined by the vendor-class so -# options are sent only when the client supplied vendor class -# matches the class given here. (A substring match is OK, so "MSFT" -# matches "MSFT" and "MSFT 5.0"). This example sets the -# mtftp address to 0.0.0.0 for PXEClients. -#dhcp-option=vendor:PXEClient,1,0.0.0.0 - -# Send microsoft-specific option to tell windows to release the DHCP lease -# when it shuts down. Note the "i" flag, to tell dnsmasq to send the -# value as a four-byte integer - that's what microsoft wants. See -# http://technet2.microsoft.com/WindowsServer/en/library/a70f1bb7-d2d4-49f0-96d6-4b7414ecfaae1033.mspx?mfr=true -#dhcp-option=vendor:MSFT,2,1i - -# Send the Encapsulated-vendor-class ID needed by some configurations of -# Etherboot to allow is to recognise the DHCP server. -#dhcp-option=vendor:Etherboot,60,"Etherboot" - -# Send options to PXELinux. Note that we need to send the options even -# though they don't appear in the parameter request list, so we need -# to use dhcp-option-force here. -# See http://syslinux.zytor.com/pxe.php#special for details. -# Magic number - needed before anything else is recognised -#dhcp-option-force=208,f1:00:74:7e -# Configuration file name -#dhcp-option-force=209,configs/common -# Path prefix -#dhcp-option-force=210,/tftpboot/pxelinux/files/ -# Reboot time. (Note 'i' to send 32-bit value) -#dhcp-option-force=211,30i - -# Set the boot filename for BOOTP. You will only need -# this is you want to boot machines over the network and you will need -# a TFTP server; either dnsmasq's built in TFTP server or an -# external one. (See below for how to enable the TFTP server.) -#dhcp-boot=pxelinux.0 - -# Boot for Etherboot gPXE. The idea is to send two different -# filenames, the first loads gPXE, and the second tells gPXE what to -# load. The dhcp-match sets the gpxe tag for requests from gPXE. -#dhcp-match=gpxe,175 # gPXE sends a 175 option. -#dhcp-boot=net:#gpxe,undionly.kpxe -#dhcp-boot=mybootimage - -# Enable dnsmasq's built-in TFTP server -#enable-tftp - -# Set the root directory for files availble via FTP. -#tftp-root=/var/ftpd - -# Make the TFTP server more secure: with this set, only files owned by -# the user dnsmasq is running as will be send over the net. -#tftp-secure - -# Set the boot file name only when the "red" tag is set. -#dhcp-boot=net:red,pxelinux.red-net - -# An example of dhcp-boot with an external server: the name and IP -# address of the server are given after the filename. -#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 - -# Set the limit on DHCP leases, the default is 150 -#dhcp-lease-max=150 - -# The DHCP server needs somewhere on disk to keep its lease database. -# This defaults to a sane location, but if you want to change it, use -# the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases - -# Set the DHCP server to authoritative mode. In this mode it will barge in -# and take over the lease for any client which broadcasts on the network, -# whether it has a record of the lease or not. This avoids long timeouts -# when a machine wakes up on a new network. DO NOT enable this if there's -# the slighest chance that you might end up accidentally configuring a DHCP -# server for your campus/company accidentally. The ISC server uses -# the same option, and this URL provides more information: -# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php -#dhcp-authoritative - -# Run an executable when a DHCP lease is created or destroyed. -# The arguments sent to the script are "add" or "del", -# then the MAC address, the IP address and finally the hostname -# if there is one. -#dhcp-script=/bin/echo - -# Set the cachesize here. -cache-size=50 - -# If you want to disable negative caching, uncomment this. -#no-negcache - -# Normally responses which come form /etc/hosts and the DHCP lease -# file have Time-To-Live set as zero, which conventionally means -# do not cache further. If you are happy to trade lower load on the -# server for potentially stale date, you can set a time-to-live (in -# seconds) here. -#local-ttl= - -# If you want dnsmasq to detect attempts by Verisign to send queries -# to unregistered .com and .net hosts to its sitefinder service and -# have dnsmasq instead return the correct NXDOMAIN response, uncomment -# this line. You can add similar lines to do the same for other -# registries which have implemented wildcard A records. -#bogus-nxdomain=64.94.110.11 - -# If you want to fix up DNS results from upstream servers, use the -# alias option. This only works for IPv4. -# This alias makes a result of 1.2.3.4 appear as 5.6.7.8 -#alias=1.2.3.4,5.6.7.8 -# and this maps 1.2.3.x to 5.6.7.x -#alias=1.2.3.0,5.6.7.0,255.255.255.0 - - -# Change these lines if you want dnsmasq to serve MX records. - -# Return an MX record named "maildomain.com" with target -# servermachine.com and preference 50 -#mx-host=maildomain.com,servermachine.com,50 - -# Set the default target for MX records created using the localmx option. -#mx-target=servermachine.com - -# Return an MX record pointing to the mx-target for all local -# machines. -#localmx - -# Return an MX record pointing to itself for all local machines. -#selfmx - -# Change the following lines if you want dnsmasq to serve SRV -# records. These are useful if you want to serve ldap requests for -# Active Directory and other windows-originated DNS requests. -# See RFC 2782. -# You may add multiple srv-host lines. -# The fields are ,,,, -# If the domain part if missing from the name (so that is just has the -# service and protocol sections) then the domain given by the domain= -# config option is used. (Note that expand-hosts does not need to be -# set for this to work.) - -# A SRV record sending LDAP for the example.com domain to -# ldapserver.example.com port 289 -#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389 - -# A SRV record sending LDAP for the example.com domain to -# ldapserver.example.com port 289 (using domain=) -#domain=example.com -#srv-host=_ldap._tcp,ldapserver.example.com,389 - -# Two SRV records for LDAP, each with different priorities -#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1 -#srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2 - -# A SRV record indicating that there is no LDAP server for the domain -# example.com -#srv-host=_ldap._tcp.example.com - -# The following line shows how to make dnsmasq serve an arbitrary PTR -# record. This is useful for DNS-SD. (Note that the -# domain-name expansion done for SRV records _does_not -# occur for PTR records.) -#ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services" - -# Change the following lines to enable dnsmasq to serve TXT records. -# These are used for things like SPF and zeroconf. (Note that the -# domain-name expansion done for SRV records _does_not -# occur for TXT records.) - -#Example SPF. -#txt-record=example.com,"v=spf1 a -all" - -#Example zeroconf -#txt-record=_http._tcp.example.com,name=value,paper=A4 - -# Provide an alias for a "local" DNS name. Note that this _only_ works -# for targets which are names from DHCP or /etc/hosts. Give host -# "bert" another name, bertrand -#cname=bertand,bert - -# For debugging purposes, log each DNS query as it passes through -# dnsmasq. -#log-queries - -# Log lots of extra information about DHCP transactions. -#log-dhcp - -# Include a another lot of configuration options. -#conf-file=/etc/dnsmasq.more.conf -#conf-dir=/etc/dnsmasq.d diff --git a/system/base/dnsmasq/files/dnsmasq.py b/system/base/dnsmasq/files/dnsmasq.py deleted file mode 100644 index 877ee1e7..00000000 --- a/system/base/dnsmasq/files/dnsmasq.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -import dbus - -class DnsMasq: - bus = None - obj = None - iface = None - - def __init__(self): - self.bus = dbus.SystemBus() - self.obj = self.bus.get_object("uk.org.thekelleys.dnsmasq", "/uk/org/thekelleys/dnsmasq", introspect=False) - self.iface = dbus.Interface(self.obj, "uk.org.thekelleys") - - def __iptodecimal(self, ip): - hexn = ''.join(["%02X" % long(i) for i in ip.split('.')]) - return long(hexn, 16) - - def getVersion(self): - return self.iface.GetVersion(ignore_reply=False) - - def registerNameServer(self, iface, server): - decimalIP = dbus.UInt32(self.__iptodecimal(server)) - self.iface.RegisterServer(iface, decimalIP, ignore_reply=True) - - def unregisterNameServers(self, iface): - self.iface.UnregisterServers(iface, ignore_reply=True) - - def clearCache(self): - self.iface.ClearCache(ignore_reply=True) diff --git a/system/base/dnsmasq/files/uk.org.thekelleys.dnsmasq.service b/system/base/dnsmasq/files/uk.org.thekelleys.dnsmasq.service deleted file mode 100644 index db619364..00000000 --- a/system/base/dnsmasq/files/uk.org.thekelleys.dnsmasq.service +++ /dev/null @@ -1,4 +0,0 @@ -[D-BUS Service] -Name=uk.org.thekelleys.dnsmasq -Exec=/bin/service dnsmasq start -User=root diff --git a/system/base/dnsmasq/pspec.xml b/system/base/dnsmasq/pspec.xml deleted file mode 100644 index cb99d111..00000000 --- a/system/base/dnsmasq/pspec.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - dnsmasq - http://www.thekelleys.org.uk/dnsmasq/doc.html - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - GPLv3 - service - Lightweight, easy to configure DNS forwarder and DHCP server - dnsmasq is a DNS forwarder and DHCP server that can serve the names of local machines which are not in the global DNS. The DHCP server integrates with the DNS server and allows machines with DHCP-allocated addresses to appear in the DNS with names configured in each host. - http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.70.tar.xz - - dnsmasq.py - - - dbus - - - - - dnsmasq - - dbus - - - /etc - /usr/sbin - /usr/lib - /usr/share - /usr/share/man - /usr/share/doc - /var/lib/dnsmasq - - - dnsmasq.conf - uk.org.thekelleys.dnsmasq.service - - - Network.Stack - System.Service - - - - - - 2014-05-11 - 2.70 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-24 - 2.70 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2014-04-03 - 2.68 - Version bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-10-26 - 2.67 - Version bump. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-14 - 2.65 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 2.63 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/system/base/dnsmasq/translations.xml b/system/base/dnsmasq/translations.xml deleted file mode 100644 index 3641cf46..00000000 --- a/system/base/dnsmasq/translations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - dnsmasq - Hafif, kolay yapılandırılabilir DNS yönlendirici ve DHCP sunucu - dnsmasq, global DNS'te bulunmayan yerel makine isimlerini sunabilen bir DNS yönlendirici ve DHCP sunucudur. - - diff --git a/system/base/e2fsprogs/pspec.xml b/system/base/e2fsprogs/pspec.xml index 557b3231..10c6300b 100644 --- a/system/base/e2fsprogs/pspec.xml +++ b/system/base/e2fsprogs/pspec.xml @@ -12,15 +12,12 @@ app:console Standard ext2/3/4 filesystem utilities e2fsprogs provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3/4 filesystem with journaling support. - mirrors://sourceforge/e2fsprogs/e2fsprogs-1.42.11.tar.gz + mirrors://sourceforge/e2fsprogs/e2fsprogs-1.42.12.tar.gz - libblkid-devel + libutil-linux-devel - libuuid - + libutil-linux gettext - - util-linux @@ -33,9 +30,9 @@ e2fsprogs - libblkid + libutil-linux - libuuid + /etc @@ -69,6 +66,13 @@ + + 2015-04-30 + 1.42.12 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-07-10 1.42.11 diff --git a/system/base/eudev/actions.py b/system/base/eudev/actions.py new file mode 100644 index 00000000..6aeaeb45 --- /dev/null +++ b/system/base/eudev/actions.py @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright 2015 TUBITAK/UEKAE +# Licensed under the GNU General Public License, version 2. +# See the file http://www.gnu.org/copyleft/gpl.txt. + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +suffix = "32" if get.buildTYPE() == "emul32" else "" + +def setup(): + autotools.autoreconf("-if") + + autotools.configure("--prefix=/usr \ + --bindir=/sbin \ + --sbindir=/sbin \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --libexecdir=/lib \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --enable-split-usr \ + --disable-introspection \ + --disable-blkid \ + --enable-gudev \ + --enable-static \ + --disable-manpages \ + --disable-gtk-doc \ + --disable-gtk-doc-html") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("-j1 DESTDIR=%s%s" % (get.installDIR(), suffix)) + #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # emul32 stop here + if get.buildTYPE() == "emul32": + shelltools.move("%s%s/lib" % (get.installDIR(), suffix), "%s/lib%s" % (get.installDIR(), suffix)) + shelltools.move("%s%s/usr/lib" % (get.installDIR(), suffix), "%s/usr/lib%s" % (get.installDIR(), suffix)) + #for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()): + # pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), "emul32", "usr") + #shelltools.unlinkDir("%s%s" % (get.installDIR(), suffix)) + shelltools.unlink("%s/usr/lib%s/libudev.so" % (get.installDIR(), suffix)) + pisitools.dosym("/lib%s/libudev.so.1.6.0" % suffix, "/usr/lib%s/libudev.so" % suffix) + shelltools.unlinkDir("%s/usr/lib%s/pkgconfig" % (get.installDIR(), suffix)) + shelltools.unlinkDir("%s/lib%s/udev" % (get.installDIR(), suffix)) + return + + #add link + pisitools.dosym("/sbin/udevadm", "/bin/udevadm") + + # Create vol_id and scsi_id symlinks in /sbin probably needed by multipath-tools + pisitools.dosym("/lib/udev/scsi_id", "/sbin/scsi_id") + + # Create /sbin/systemd-udevd -> /sbin/udevd sysmlink, we need it for MUDUR, do not touch this sysmlink. + # pisitools.dosym("/lib/systemd/systemd-udevd", "/sbin/systemd-udevd") + + # Create /etc/udev/rules.d for backward compatibility + pisitools.dodir("/etc/udev/rules.d") + pisitools.dodir("/run/udev") + + # Add man files + pisitools.doman("man/*.5", "man/*.7", "man/*.8") + + pisitools.dodoc("README*", "NOTES") diff --git a/system/base/eudev/comar/package.py b/system/base/eudev/comar/package.py new file mode 100644 index 00000000..19e78ab5 --- /dev/null +++ b/system/base/eudev/comar/package.py @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import os + +def createNode(mode, uid, gid, minor, major, path): + os.system("/bin/mknod --mode=%d %s c %d %d" % (mode, path, minor, major)) + os.system("/bin/chown %s:%s %s" % (uid, gid, path)) + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + createNode(600, "root", "root", 1, 11, "/lib/udev/devices/kmsg") + createNode(666, "root", "root", 1, 3, "/lib/udev/devices/null") + createNode(666, "root", "root", 1, 5, "/lib/udev/devices/zero") + createNode(600, "root", "root", 10, 130, "/lib/udev/devices/watchdog") + createNode(666, "root", "root", 10, 229, "/lib/udev/devices/fuse") + createNode(600, "root", "tty", 5, 1, "/lib/udev/devices/console") + createNode(666, "root", "tty", 5, 2, "/lib/udev/devices/ptmx") + createNode(666, "root", "tty", 5, 0, "/lib/udev/devices/tty") + createNode(620, "root", "tty", 4, 1, "/lib/udev/devices/tty1") + createNode(600, "root", "root", 10, 200, "/lib/udev/devices/net/tun") + createNode(600, "root", "root", 36, 0, "/lib/udev/devices/route") + createNode(600, "root", "root", 10, 200, "/lib/udev/devices/skip") + createNode(660, "root", "dialout", 108, 0, "/lib/udev/devices/ppp") + + os.system("/sbin/udevadm hwdb --update") + + if os.path.exists("/lib/udev/devices/rtc"): + os.unlink("/lib/udev/devices/rtc") + + # Migrate UDEV database + if fromVersion and int(fromVersion) < 165: + os.system("/sbin/udevadm info --convert-db &> /dev/null") diff --git a/system/base/eudev/files/config.cache b/system/base/eudev/files/config.cache new file mode 100644 index 00000000..7b275d46 --- /dev/null +++ b/system/base/eudev/files/config.cache @@ -0,0 +1,3 @@ +HAVE_BLKID=1 +BLKID_LIBS="-lblkid" +BLKID_CFLAGS="-I/tools/include" diff --git a/system/base/eudev/files/tmpfiles.conf b/system/base/eudev/files/tmpfiles.conf new file mode 100644 index 00000000..9a7ad93d --- /dev/null +++ b/system/base/eudev/files/tmpfiles.conf @@ -0,0 +1 @@ +D /run/udev 0755 root root diff --git a/system/base/eudev/pspec.xml b/system/base/eudev/pspec.xml new file mode 100644 index 00000000..97fd2ea6 --- /dev/null +++ b/system/base/eudev/pspec.xml @@ -0,0 +1,137 @@ + + + + + eudev + https://www.gentoo.org/proj/en/eudev/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + console + eudev is a fork of system-udev + eudev is a fork of system-udev with the goal of obtaining better compatibility with existing software such as OpenRC and Upstart, older kernels, various toolchains and anything else required by users and various distributions. + https://github.com/gentoo/eudev/archive/v3.0.tar.gz + + + config.cache + + + glibc-devel + libkmod-devel + + glib2-devel + libpcre-devel + + gperf + + + + + eudev + + libkmod + + glib2 + + + udev + libudev + libgudev1 + + + udev + libudev + libgudev1 + + + /bin + /sbin + /usr/bin + /usr/sbin + /lib/udev + /lib + /usr/lib + /etc + /usr/lib/tmpfiles.d/udev.conf + /run/udev + /lib/systemd + /etc/udev/rules.d + /lib/udev/rules.d + /usr/share/doc + /usr/share/man + + + tmpfiles.conf + + + System.Package + + + + + eudev-devel + system.devel + Development files for eudev + + eudev + glib2-devel + + + udev-devel + libudev-devel + libgudev1-devel + + + /usr/include/ + /usr/lib/pkgconfig + /usr/share/pkgconfig + + + + + eudev-32bit + + libudev-32bit + libgudev1-32bit + + + libudev-32bit + libgudev1-32bit + + emul32 + 32-bit shared libraries for eudev + emul32 + + glibc-32bit + libkmod-32bit + glib2-32bit + + + glibc-32bit + glib2-32bit + + + /lib32 + /usr/lib32 + + + + + + 2015-05-11 + 3.0 + build emul32 and static too. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-03-29 + 3.0 + First release. + Ertuğrul Erata + ertugrulerata@gmail.com + + + diff --git a/system/base/eudev/translations.xml b/system/base/eudev/translations.xml new file mode 100644 index 00000000..f70f5611 --- /dev/null +++ b/system/base/eudev/translations.xml @@ -0,0 +1,8 @@ + + + + eudev + eudev sistemd-udev uygulamasının çatalı + eudev sistem-udev uygulamasının OpenRC, Upstart gibi başlangıç sistemleri ile uyumu için hazırlanmış çatalı + + diff --git a/system/base/expat/pspec.xml b/system/base/expat/pspec.xml index 19920893..1b39b901 100644 --- a/system/base/expat/pspec.xml +++ b/system/base/expat/pspec.xml @@ -15,6 +15,7 @@ mirrors://sourceforge/expat/expat-2.1.0.tar.gz gnuconfig + glibc-devel @@ -34,6 +35,9 @@ expat-devel system.devel Development files for expat + + glibc-32bit + expat @@ -88,4 +92,4 @@ yusuf.aydemir@pisilinux.org - + \ No newline at end of file diff --git a/system/base/file/pspec.xml b/system/base/file/pspec.xml index ef2f4545..f6f2504d 100644 --- a/system/base/file/pspec.xml +++ b/system/base/file/pspec.xml @@ -12,16 +12,16 @@ app:console Program to identify a file's format by scanning binary data for patterns Program to identify a file's format by scanning binary data for patterns. - ftp://ftp.astron.com/pub/file/file-5.18.tar.gz + ftp://ftp.astron.com/pub/file/file-5.22.tar.gz zlib python-devel - + @@ -41,6 +41,13 @@ + + 2015-04-02 + 5.22 + Release bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 5.18 diff --git a/system/base/freetype/files/fix_segfault_with_harfbuzz.diff b/system/base/freetype/files/fix_segfault_with_harfbuzz.diff deleted file mode 100644 index e256886c..00000000 --- a/system/base/freetype/files/fix_segfault_with_harfbuzz.diff +++ /dev/null @@ -1,27 +0,0 @@ -From 23367ff97f33ef6a2b7e1fced1157c87a46d9596 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg -Date: Mon, 17 Mar 2014 06:33:14 +0000 -Subject: Fix Savannah bug #41869. - -This works around a problem with HarfBuzz (<= 0.9.26), which doesn't -validate glyph indices returned by -`hb_ot_layout_lookup_collect_glyphs'. - -* src/autofit/hbshim.c (af_get_coverage): Guard `idx'. - -* docs/CHANGES: Updated. ---- src/autofit/hbshim.c.orig 2014-03-30 02:39:43.000000000 +0200 -+++ src/autofit/hbshim.c 2014-03-30 02:41:04.818770184 +0200 -@@ -346,6 +346,12 @@ - FT_TRACE4(( " %d", idx )); - count++; - #endif -+ -+ /* HarfBuzz 0.9.26 and older doesn't validate glyph indices */ -+ /* returned by `hb_ot_layout_lookup_collect_glyphs'... */ -+ if ( idx >= (hb_codepoint_t)globals->glyph_count ) -+ continue; -+ - - if ( gstyles[idx] == AF_STYLE_UNASSIGNED ) - gstyles[idx] = (FT_Byte)style_class->style; diff --git a/system/base/freetype/files/freetype-2.2.1-enable-valid.patch b/system/base/freetype/files/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index 0fbd84ac..00000000 --- a/system/base/freetype/files/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/system/base/freetype/files/freetype-2.5.1-enable-sph.patch b/system/base/freetype/files/freetype-2.5.1-enable-sph.patch deleted file mode 100644 index ca1d5971..00000000 --- a/system/base/freetype/files/freetype-2.5.1-enable-sph.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/include/config/ftoption.h w/include/config/ftoption.h -index fe2ba15..1ab4226 100644 ---- i/include/config/ftoption.h -+++ w/include/config/ftoption.h -@@ -591,7 +591,7 @@ FT_BEGIN_HEADER - /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ - /* defined. */ - /* */ --/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ -+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING - - - /************************************************* diff --git a/system/base/freetype/files/freetype-2.5.1-enable-spr.patch b/system/base/freetype/files/freetype-2.5.1-enable-spr.patch deleted file mode 100644 index 7bb1d724..00000000 --- a/system/base/freetype/files/freetype-2.5.1-enable-spr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/include/config/ftoption.h w/include/config/ftoption.h -index fe2ba15..22ce1a3 100644 ---- i/include/config/ftoption.h -+++ w/include/config/ftoption.h -@@ -92,7 +92,7 @@ FT_BEGIN_HEADER - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /***************************** diff --git a/system/base/fuse/pspec.xml b/system/base/fuse/pspec.xml index 497dfc38..30bf14d7 100644 --- a/system/base/fuse/pspec.xml +++ b/system/base/fuse/pspec.xml @@ -13,6 +13,9 @@ An interface for filesystems implemented in userspace fuse is a backend allowing regular users to (un)mount filesystems for their own use. mirrors://sourceforge/project/fuse/fuse-2.X/2.9.3/fuse-2.9.3.tar.gz + + gettext-devel + skip_umount_test.patch @@ -21,7 +24,7 @@ fuse - glibc + glibc /bin diff --git a/system/base/gettext/pspec.xml b/system/base/gettext/pspec.xml index 11db3ebf..c6ba7901 100644 --- a/system/base/gettext/pspec.xml +++ b/system/base/gettext/pspec.xml @@ -13,7 +13,7 @@ library GNU libraries and utilities for producing multi-lingual messages The GNU gettext package provides a set of tools and documentation for producing multi-lingual messages in programs. Tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs, a runtime library which supports the retrieval of translated messages, and stand-alone programs for handling the translatable and the already translated strings. Gettext provides an easy to use library and tools for creating, using, and modifying natural language catalogs and is a powerful and simple method for internationalizing programs. - http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.2.tar.gz + http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.gz acl-devel glib2-devel @@ -70,6 +70,13 @@ + + 2015-04-03 + 0.19.4 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + 2014-05-11 0.18.3.2 diff --git a/system/base/glib2/actions.py b/system/base/glib2/actions.py index e77660da..b5271e16 100644 --- a/system/base/glib2/actions.py +++ b/system/base/glib2/actions.py @@ -13,9 +13,11 @@ from pisi.actionsapi import shelltools def setup(): options = "--with-pcre=system \ --disable-fam \ + --disable-libelf \ + --enable-gtk-doc=no \ --disable-static \ --enable-shared \ - --enable-man \ + --disable-man \ --enable-systemtap" @@ -28,7 +30,7 @@ def setup(): shelltools.export("CXX", "%s -m32" % get.CXX()) shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") - autotools.autoreconf("-vif") + #autotools.autoreconf("-vif") autotools.configure(options) pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ") @@ -45,4 +47,4 @@ def install(): pisitools.removeDir("/usr/share/gdb") - pisitools.dodoc("AUTHORS", "ChangeLog", "README", "NEWS") \ No newline at end of file + pisitools.dodoc("AUTHORS", "ChangeLog", "README", "NEWS") diff --git a/system/base/glib2/pspec.xml b/system/base/glib2/pspec.xml index 2c47a5dd..a4442408 100644 --- a/system/base/glib2/pspec.xml +++ b/system/base/glib2/pspec.xml @@ -12,13 +12,14 @@ library A library of handy utility functions glib2 is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime functionality as an event loop, threads, dynamic loading, and an object system. - mirrors://gnome/glib/2.42/glib-2.42.0.tar.xz + mirrors://gnome/glib/2.44/glib-2.44.0.tar.xz - libpcre-devel + libpcre-devel zlib-devel - libxslt - elfutils - docbook-xml + libffi-devel + + + revert-warn-glib-compile-schemas.patch @@ -30,7 +31,7 @@ libpcre zlib - elfutils + libffi @@ -60,6 +61,7 @@ Development files for glib2 glib2 + libpcre-devel /usr/bin/gtester @@ -98,6 +100,7 @@ zlib-32bit libffi-32bit dbus-32bit + glibc-32bit glib2 @@ -105,6 +108,7 @@ zlib-32bit libffi-32bit dbus-32bit + glibc-32bit /usr/bin/32 @@ -125,6 +129,13 @@ + + 2015-04-08 + 2.44.0 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-10-01 2.42.0 diff --git a/system/base/glibc/actions.py b/system/base/glibc/actions.py index e048d316..df32e9cf 100644 --- a/system/base/glibc/actions.py +++ b/system/base/glibc/actions.py @@ -11,7 +11,7 @@ from pisi.actionsapi import get import os -WorkDir = "glibc-2.20" +WorkDir = "glibc-2.21" arch = "x86-64" if get.ARCH() == "x86_64" and not get.buildTYPE() == "emul32" else "i686" defaultflags = "-O3 -g -fasynchronous-unwind-tables -mtune=generic -march=%s" % arch @@ -53,16 +53,13 @@ def setup(): --libexecdir=/usr/lib/misc \ --with-bugurl=https://bugs.pisilinux.org \ --enable-add-ons \ - --enable-bind-now \ - --enable-kernel=2.6.32 \ - --enable-stackguard-randomization \ - --without-selinux \ - --without-gd \ - --disable-profile \ --enable-obsolete-rpc \ + --enable-kernel=2.6.32 \ + --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ --enable-lock-elision \ --enable-multi-arch \ - --with-tls" + --disable-werror" if get.buildTYPE() == "emul32": options += "\ --libdir=/usr/lib32 \ diff --git a/system/base/glibc/files/glibc-2.21-roundup.patch b/system/base/glibc/files/glibc-2.21-roundup.patch new file mode 100644 index 00000000..66d3454e --- /dev/null +++ b/system/base/glibc/files/glibc-2.21-roundup.patch @@ -0,0 +1,70 @@ +diff --git a/ChangeLog b/ChangeLog +index dc1ed1b..45579de 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,9 @@ ++2015-02-10 Evangelos Foutras ++ ++ [BZ #17949] ++ * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Fix position of ++ jump label. ++ + 2015-02-06 Carlos O'Donell + + * version.h (RELEASE): Set to "stable". +@@ -7,6 +13,7 @@ + * sysdeps/unix/sysv/linux/hppa/pthread.h: Sync with pthread.h. + + 2015-02-05 Paul Pluzhnikov ++ Paul Eggert + + [BZ #16618] + * stdio-common/tst-sscanf.c (main): Test for buffer overflow. +diff --git a/NEWS b/NEWS +index 617cdbb..ff79f0d 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ See the end for copying conditions. + Please send GNU C library bug reports via + using `glibc' in the "product" field. + ++Version 2.21.1 ++ ++* The following bugs are resolved with this release: ++ ++ 17949. ++ + Version 2.21 + + * The following bugs are resolved with this release: +@@ -21,10 +27,11 @@ Version 2.21 + 17801, 17803, 17806, 17834, 17844, 17848, 17868, 17869, 17870, 17885, + 17892. + +-* CVE-2015-1472 Under certain conditions wscanf can allocate too little +- memory for the to-be-scanned arguments and overflow the allocated +- buffer. The implementation now correctly computes the required buffer +- size when using malloc. ++* CVE-2015-1472 CVE-2015-1473 Under certain conditions wscanf can allocate ++ too little memory for the to-be-scanned arguments and overflow the ++ allocated buffer. The implementation now correctly computes the required ++ buffer size when using malloc, and switches to malloc from alloca as ++ intended. + + * A new semaphore algorithm has been implemented in generic C code for all + machines. Previous custom assembly implementations of semaphore were +diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S +index 207b648..b6fa202 100644 +--- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S ++++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.S +@@ -36,8 +36,8 @@ ENTRY(__mempcpy_chk) + cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx) + jne 1f + call __init_cpu_features +- leal __mempcpy_chk_ia32@GOTOFF(%ebx), %eax +-1: testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx) ++1: leal __mempcpy_chk_ia32@GOTOFF(%ebx), %eax ++ testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx) + jz 2f + leal __mempcpy_chk_sse2_unaligned@GOTOFF(%ebx), %eax + testl $bit_Fast_Unaligned_Load, FEATURE_OFFSET+index_Fast_Unaligned_Load+__cpu_features@GOTOFF(%ebx) diff --git a/system/base/glibc/pspec.xml b/system/base/glibc/pspec.xml index 407fd7c6..e800ec97 100644 --- a/system/base/glibc/pspec.xml +++ b/system/base/glibc/pspec.xml @@ -13,7 +13,7 @@ library GNU libc6 (also called glibc2) C library The GNU C library is used as the C library in the GNU system and most systems with the Linux kernel. It defines the system calls and other basic C programming language facilities. - http://ftp.gnu.org/gnu/libc/glibc-2.20.tar.xz + http://ftp.gnu.org/gnu/libc/glibc-2.21.tar.xz kernel-headers gettext @@ -21,7 +21,7 @@ locale-no-archive.patch - glibc-2.20-roundup.patch + glibc-2.21-roundup.patch @@ -1757,6 +1757,13 @@ + + 2015-04-04 + 2.21 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + 2014-11-28 2.20 diff --git a/system/base/groff/actions.py b/system/base/groff/actions.py index bd80689a..029d4230 100644 --- a/system/base/groff/actions.py +++ b/system/base/groff/actions.py @@ -10,13 +10,13 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): - #shelltools.export("CXXFLAGS","%s -fno-rtti -fno-exceptions" % get.CXXFLAGS()) + #autotools.autoreconf("-fi") + shelltools.export("PAGE", "a4") autotools.configure("--prefix=/usr \ - --with-appresdir=/usr/share/X11/app-defaults \ - --with-x") + --without-x") def build(): - shelltools.export("LC_ALL", "C") + #shelltools.export("LC_ALL", "C") autotools.make() def install(): diff --git a/system/base/groff/files/groff-1.19.2-man-unicode-dashes.patch b/system/base/groff/files/groff-1.19.2-man-unicode-dashes.patch new file mode 100644 index 00000000..d85a8330 --- /dev/null +++ b/system/base/groff/files/groff-1.19.2-man-unicode-dashes.patch @@ -0,0 +1,24 @@ +format dashes as dashes so as to not confuse people + +http://bugs.gentoo.org/16108 +http://bugs.gentoo.org/17580 +http://bugs.gentoo.org/121502 + +--- tmac/man.local ++++ tmac/man.local +@@ -1,2 +1,6 @@ + .\" This file is loaded after an-old.tmac. + .\" Put any local modifications to an-old.tmac here. ++.if '\*[.T]'utf8' \{\ ++. char \- \N'45' ++. char - \N'45' ++.\} +--- tmac/mdoc.local ++++ tmac/mdoc.local +@@ -1,2 +1,6 @@ + .\" This file is loaded after doc.tmac. + .\" Put any local modifications to doc.tmac here. ++.if '\*[.T]'utf8' \{\ ++. char \- \N'45' ++. char - \N'45' ++.\} diff --git a/system/base/groff/files/groff-1.22.3-parallel-mom.patch b/system/base/groff/files/groff-1.22.3-parallel-mom.patch new file mode 100644 index 00000000..10661ac2 --- /dev/null +++ b/system/base/groff/files/groff-1.22.3-parallel-mom.patch @@ -0,0 +1,11 @@ +--- groff-1.22.3/Makefile.in ++++ groff-1.22.3/Makefile.in +@@ -864,7 +864,7 @@ + -f $(top_srcdir)/Makefile.ccpg \ + -f Makefile.dep $(do) + +-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \ ++$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE \ + $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) + @$(ENVSETUP); \ + if test $(srcdir) = .; then \ diff --git a/system/base/groff/files/gropdf.patch b/system/base/groff/files/gropdf.patch new file mode 100644 index 00000000..9044c64a --- /dev/null +++ b/system/base/groff/files/gropdf.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index bc156ce..70c6f85 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -896,6 +896,8 @@ $(GNULIBDIRS): FORCE + $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ + esac + ++$(SHPROGDIRS): $(PROGDEPDIRS) ++ + $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS) + + $(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) $(OTHERDIRS): FORCE diff --git a/system/base/groff/files/savannah_bug.patch b/system/base/groff/files/savannah_bug.patch new file mode 100644 index 00000000..755f706b --- /dev/null +++ b/system/base/groff/files/savannah_bug.patch @@ -0,0 +1,228193 @@ +diff -Nuar groff-1.22.3.old/acinclude.m4 groff-1.22.3/acinclude.m4 +--- groff-1.22.3.old/acinclude.m4 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/acinclude.m4 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,25 @@ ++# generated automatically by aclocal 1.14 -*- Autoconf -*- ++ ++# Copyright (C) 1996-2013 Free Software Foundation, Inc. ++ ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) ++m4_include([m4/ax_compare_version.m4]) ++m4_include([m4/ax_prog_perl_version.m4]) ++m4_include([m4/codeset.m4]) ++m4_include([m4/fcntl-o.m4]) ++m4_include([m4/glibc21.m4]) ++m4_include([m4/groff.m4]) ++m4_include([m4/iconv.m4]) ++m4_include([m4/lib-ld.m4]) ++m4_include([m4/lib-link.m4]) ++m4_include([m4/lib-prefix.m4]) ++m4_include([m4/localcharset.m4]) +diff -Nuar groff-1.22.3.old/aclocal.m4 groff-1.22.3/aclocal.m4 +--- groff-1.22.3.old/aclocal.m4 2014-11-04 10:39:10.174087080 +0200 ++++ groff-1.22.3/aclocal.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,25 +0,0 @@ +-# generated automatically by aclocal 1.14 -*- Autoconf -*- +- +-# Copyright (C) 1996-2013 Free Software Foundation, Inc. +- +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +-m4_include([m4/ax_compare_version.m4]) +-m4_include([m4/ax_prog_perl_version.m4]) +-m4_include([m4/codeset.m4]) +-m4_include([m4/fcntl-o.m4]) +-m4_include([m4/glibc21.m4]) +-m4_include([m4/groff.m4]) +-m4_include([m4/iconv.m4]) +-m4_include([m4/lib-ld.m4]) +-m4_include([m4/lib-link.m4]) +-m4_include([m4/lib-prefix.m4]) +-m4_include([m4/localcharset.m4]) +diff -Nuar groff-1.22.3.old/arch/mingw/Makefile.sub groff-1.22.3/arch/mingw/Makefile.sub +--- groff-1.22.3.old/arch/mingw/Makefile.sub 2014-11-04 10:38:35.432521409 +0200 ++++ groff-1.22.3/arch/mingw/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,66 +0,0 @@ +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.sub +-# +-WINSCRIPTS=\ +- afmtodit.cmd \ +- chem.cmd \ +- gperl.cmd \ +- gpinyin.cmd \ +- grap2graph.cmd \ +- groffer.cmd \ +- grog.cmd \ +- gropdf.cmd \ +- mmroff.cmd \ +- neqn.cmd \ +- pdfmom.cmd \ +- roff2dvi.cmd \ +- roff2html.cmd \ +- roff2pdf.cmd \ +- roff2ps.cmd \ +- roff2text.cmd \ +- roff2x.cmd +- +-RM=rm -f +- +-all: $(make_winscripts) +-install_data: $(make_install_winscripts) +-uninstall_sub: $(make_uninstall_winscripts) +- +-winscripts: $(WINSCRIPTS) +- +-install_winscripts: $(WINSCRIPTS) +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- for f in $(WINSCRIPTS); do \ +- $(RM) $(DESTDIR)$(bindir)/$$f; \ +- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(bindir)/$$f; \ +- done +- +-uninstall_winscripts: +- -for f in $(WINSCRIPTS); do \ +- $(RM) $(DESTDIR)$(bindir)/$$f; \ +- done +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/arch/mingw/mingw.am groff-1.22.3/arch/mingw/mingw.am +--- groff-1.22.3.old/arch/mingw/mingw.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/arch/mingw/mingw.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++# ++# mingw.am ++# ++WINSCRIPTS=\ ++ arch/mingw/afmtodit.cmd \ ++ arch/mingw/chem.cmd \ ++ arch/mingw/gperl.cmd \ ++ arch/mingw/gpinyin.cmd \ ++ arch/mingw/grap2graph.cmd \ ++ arch/mingw/groffer.cmd \ ++ arch/mingw/grog.cmd \ ++ arch/mingw/gropdf.cmd \ ++ arch/mingw/mmroff.cmd \ ++ arch/mingw/neqn.cmd \ ++ arch/mingw/pdfmom.cmd \ ++ arch/mingw/roff2dvi.cmd \ ++ arch/mingw/roff2html.cmd \ ++ arch/mingw/roff2pdf.cmd \ ++ arch/mingw/roff2ps.cmd \ ++ arch/mingw/roff2text.cmd \ ++ arch/mingw/roff2x.cmd ++ ++if BUILD_WINSCRIPTS ++bin_SCRIPTS += $(WINSCRIPTS) ++else ++EXTRA_DIST += $(WINSCRIPTS) ++endif +diff -Nuar groff-1.22.3.old/arch/misc/.gitignore groff-1.22.3/arch/misc/.gitignore +--- groff-1.22.3.old/arch/misc/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/arch/misc/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++shdeps.sed +diff -Nuar groff-1.22.3.old/arch/misc/Makefile.sub groff-1.22.3/arch/misc/Makefile.sub +--- groff-1.22.3.old/arch/misc/Makefile.sub 2014-11-04 10:38:35.191524422 +0200 ++++ groff-1.22.3/arch/misc/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,32 +0,0 @@ +-# Copyright (C) 2004-2014 Free Software Foundation, Inc. +-# Written by Keith Marshall (keith.d.marshall@ntlworld.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +- +-MOSTLYCLEANADD=shdeps.sed +- +-all: shdeps.sed +- +-shdeps.sed: $(srcdir)/shdeps.sh +- $(SHELL) $(srcdir)/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/arch/misc/misc.am groff-1.22.3/arch/misc/misc.am +--- groff-1.22.3.old/arch/misc/misc.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/arch/misc/misc.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,25 @@ ++# Copyright (C) 2004-2014 Free Software Foundation, Inc. ++# Original Makefile.sub written by Keith Marshall ++# (keith.d.marshall@ntlworld.com). ++# Adapted to Automake by Bertrand Garrigues ++# (bertrand.garrigues@laposte.net). ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++EXTRA_DIST += arch/misc/shdeps.sh ++MOSTLYCLEANFILES += shdeps.sed ++ ++shdeps.sed: $(top_srcdir)/arch/misc/shdeps.sh ++ $(SHELL) $(top_srcdir)/arch/misc/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@ +diff -Nuar groff-1.22.3.old/bootstrap groff-1.22.3/bootstrap +--- groff-1.22.3.old/bootstrap 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/bootstrap 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,999 @@ ++#! /bin/sh ++# Print a version string. ++scriptversion=2013-12-05.23; # UTC ++ ++# Bootstrap this package from checked-out sources. ++ ++# Copyright (C) 2003-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 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 . ++ ++# Originally written by Paul Eggert. The canonical version of this ++# script is maintained as build-aux/bootstrap in gnulib, however, to ++# be useful to your project, you should place a copy of it under ++# version control in the top-level directory of your project. The ++# intent is that all customization can be done with a bootstrap.conf ++# file also maintained in your version control; gnulib comes with a ++# template build-aux/bootstrap.conf to get you started. ++ ++# Please report bugs or propose patches to bug-gnulib@gnu.org. ++ ++nl=' ++' ++ ++# Ensure file names are sorted consistently across platforms. ++LC_ALL=C ++export LC_ALL ++ ++# Ensure that CDPATH is not set. Otherwise, the output from cd ++# would cause trouble in at least one use below. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++local_gl_dir=gl ++ ++me=$0 ++ ++usage() { ++ cat <&2 ++} ++ ++# warn_ WORD1... ++warn_ () ++{ ++ # If IFS does not start with ' ', set it and emit the warning in a subshell. ++ case $IFS in ++ ' '*) warnf_ '%s\n' "$*";; ++ *) (IFS=' '; warn_ "$@");; ++ esac ++} ++ ++# die WORD1... ++die() { warn_ "$@"; exit 1; } ++ ++# Configuration. ++ ++# Name of the Makefile.am ++gnulib_mk=gnulib.mk ++ ++# List of gnulib modules needed. ++gnulib_modules= ++ ++# Any gnulib files needed that are not in modules. ++gnulib_files= ++ ++: ${AUTOPOINT=autopoint} ++: ${AUTORECONF=autoreconf} ++ ++# A function to be called right after gnulib-tool is run. ++# Override it via your own definition in bootstrap.conf. ++bootstrap_post_import_hook() { :; } ++ ++# A function to be called after everything else in this script. ++# Override it via your own definition in bootstrap.conf. ++bootstrap_epilogue() { :; } ++ ++# The command to download all .po files for a specified domain into ++# a specified directory. Fill in the first %s is the domain name, and ++# the second with the destination directory. Use rsync's -L and -r ++# options because the latest/%s directory and the .po files within are ++# all symlinks. ++po_download_command_format=\ ++"rsync --delete --exclude '*.s1' -Lrtvz \ ++ 'translationproject.org::tp/latest/%s/' '%s'" ++ ++# Fallback for downloading .po files (if rsync fails). ++po_download_command_format2=\ ++"wget --mirror -nd -q -np -A.po -P '%s' \ ++ http://translationproject.org/latest/%s/" ++ ++# Prefer a non-empty tarname (4th argument of AC_INIT if given), else ++# fall back to the package name (1st argument with munging) ++extract_package_name=' ++ /^AC_INIT(\[*/{ ++ s/// ++ /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{ ++ s//\1/ ++ s/[],)].*// ++ p ++ q ++ } ++ s/[],)].*// ++ s/^GNU // ++ y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ ++ s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g ++ p ++ } ++' ++package=$(sed -n "$extract_package_name" configure.ac) \ ++ || die 'cannot find package name in configure.ac' ++gnulib_name=lib$package ++ ++build_aux=build-aux ++source_base=lib ++m4_base=m4 ++doc_base=doc ++tests_base=tests ++gnulib_extra_files='' ++ ++# Additional gnulib-tool options to use. Use "\newline" to break lines. ++gnulib_tool_option_extras= ++ ++# Other locale categories that need message catalogs. ++EXTRA_LOCALE_CATEGORIES= ++ ++# Additional xgettext options to use. Use "\\\newline" to break lines. ++XGETTEXT_OPTIONS='\\\ ++ --flag=_:1:pass-c-format\\\ ++ --flag=N_:1:pass-c-format\\\ ++ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ ++' ++ ++# Package bug report address and copyright holder for gettext files ++COPYRIGHT_HOLDER='Free Software Foundation, Inc.' ++MSGID_BUGS_ADDRESS=bug-$package@gnu.org ++ ++# Files we don't want to import. ++excluded_files= ++ ++# File that should exist in the top directory of a checked out hierarchy, ++# but not in a distribution tarball. ++checkout_only_file=README-hacking ++ ++# Whether to use copies instead of symlinks. ++copy=false ++ ++# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want ++# those files to be generated in directories like lib/, m4/, and po/. ++# Or set it to 'auto' to make this script select which to use based ++# on which version control system (if any) is used in the source directory. ++vc_ignore=auto ++ ++# Set this to true in bootstrap.conf to enable --bootstrap-sync by ++# default. ++bootstrap_sync=false ++ ++# Use git to update gnulib sources ++use_git=true ++ ++check_exists() { ++ ($1 --version /dev/null 2>&1 ++ test $? -lt 126 ++} ++ ++# find_tool ENVVAR NAMES... ++# ------------------------- ++# Search for a required program. Use the value of ENVVAR, if set, ++# otherwise find the first of the NAMES that can be run. ++# If found, set ENVVAR to the program name, die otherwise. ++# ++# FIXME: code duplication, see also gnu-web-doc-update. ++find_tool () ++{ ++ find_tool_envvar=$1 ++ shift ++ find_tool_names=$@ ++ eval "find_tool_res=\$$find_tool_envvar" ++ if test x"$find_tool_res" = x; then ++ for i; do ++ if check_exists $i; then ++ find_tool_res=$i ++ break ++ fi ++ done ++ fi ++ if test x"$find_tool_res" = x; then ++ warn_ "one of these is required: $find_tool_names;" ++ die "alternatively set $find_tool_envvar to a compatible tool" ++ fi ++ eval "$find_tool_envvar=\$find_tool_res" ++ eval "export $find_tool_envvar" ++} ++ ++# Override the default configuration, if necessary. ++# Make sure that bootstrap.conf is sourced from the current directory ++# if we were invoked as "sh bootstrap". ++case "$0" in ++ */*) test -r "$0.conf" && . "$0.conf" ;; ++ *) test -r "$0.conf" && . ./"$0.conf" ;; ++esac ++ ++# Extra files from gnulib, which override files from other sources. ++test -z "${gnulib_extra_files}" && \ ++ gnulib_extra_files=" ++ build-aux/install-sh ++ build-aux/mdate-sh ++ build-aux/texinfo.tex ++ build-aux/depcomp ++ build-aux/config.guess ++ build-aux/config.sub ++ doc/INSTALL ++" ++ ++if test "$vc_ignore" = auto; then ++ vc_ignore= ++ test -d .git && vc_ignore=.gitignore ++ test -d CVS && vc_ignore="$vc_ignore .cvsignore" ++fi ++ ++# Translate configuration into internal form. ++ ++# Parse options. ++ ++for option ++do ++ case $option in ++ --help) ++ usage ++ exit;; ++ --gnulib-srcdir=*) ++ GNULIB_SRCDIR=${option#--gnulib-srcdir=};; ++ --skip-po) ++ SKIP_PO=t;; ++ --force) ++ checkout_only_file=;; ++ --copy) ++ copy=true;; ++ --bootstrap-sync) ++ bootstrap_sync=true;; ++ --no-bootstrap-sync) ++ bootstrap_sync=false;; ++ --no-git) ++ use_git=false;; ++ *) ++ die "$option: unknown option";; ++ esac ++done ++ ++$use_git || test -d "$GNULIB_SRCDIR" \ ++ || die "Error: --no-git requires --gnulib-srcdir" ++ ++if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then ++ die "Bootstrapping from a non-checked-out distribution is risky." ++fi ++ ++# Strip blank and comment lines to leave significant entries. ++gitignore_entries() { ++ sed '/^#/d; /^$/d' "$@" ++} ++ ++# If $STR is not already on a line by itself in $FILE, insert it at the start. ++# Entries are inserted at the start of the ignore list to ensure existing ++# entries starting with ! are not overridden. Such entries support ++# whitelisting exceptions after a more generic blacklist pattern. ++insert_if_absent() { ++ file=$1 ++ str=$2 ++ test -f $file || touch $file ++ test -r $file || die "Error: failed to read ignore file: $file" ++ duplicate_entries=$(gitignore_entries $file | sort | uniq -d) ++ if [ "$duplicate_entries" ] ; then ++ die "Error: Duplicate entries in $file: " $duplicate_entries ++ fi ++ linesold=$(gitignore_entries $file | wc -l) ++ linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l) ++ if [ $linesold != $linesnew ] ; then ++ { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ ++ || die "insert_if_absent $file $str: failed" ++ fi ++} ++ ++# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with ++# insert_if_absent. ++insert_vc_ignore() { ++ vc_ignore_file="$1" ++ pattern="$2" ++ case $vc_ignore_file in ++ *.gitignore) ++ # A .gitignore entry that does not start with '/' applies ++ # recursively to subdirectories, so prepend '/' to every ++ # .gitignore entry. ++ pattern=$(echo "$pattern" | sed s,^,/,);; ++ esac ++ insert_if_absent "$vc_ignore_file" "$pattern" ++} ++ ++# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. ++found_aux_dir=no ++grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ ++ >/dev/null && found_aux_dir=yes ++grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ ++ >/dev/null && found_aux_dir=yes ++test $found_aux_dir = yes \ ++ || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" ++ ++# If $build_aux doesn't exist, create it now, otherwise some bits ++# below will malfunction. If creating it, also mark it as ignored. ++if test ! -d $build_aux; then ++ mkdir $build_aux ++ for dot_ig in x $vc_ignore; do ++ test $dot_ig = x && continue ++ insert_vc_ignore $dot_ig $build_aux ++ done ++fi ++ ++# Note this deviates from the version comparison in automake ++# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a ++# but this should suffice as we won't be specifying old ++# version formats or redundant trailing .0 in bootstrap.conf. ++# If we did want full compatibility then we should probably ++# use m4_version_compare from autoconf. ++sort_ver() { # sort -V is not generally available ++ ver1="$1" ++ ver2="$2" ++ ++ # split on '.' and compare each component ++ i=1 ++ while : ; do ++ p1=$(echo "$ver1" | cut -d. -f$i) ++ p2=$(echo "$ver2" | cut -d. -f$i) ++ if [ ! "$p1" ]; then ++ echo "$1 $2" ++ break ++ elif [ ! "$p2" ]; then ++ echo "$2 $1" ++ break ++ elif [ ! "$p1" = "$p2" ]; then ++ if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison ++ echo "$2 $1" ++ elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison ++ echo "$1 $2" ++ else # numeric, then lexicographic comparison ++ lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1) ++ if [ "$lp" = "$p2" ]; then ++ echo "$1 $2" ++ else ++ echo "$2 $1" ++ fi ++ fi ++ break ++ fi ++ i=$(($i+1)) ++ done ++} ++ ++get_version() { ++ app=$1 ++ ++ $app --version >/dev/null 2>&1 || return 1 ++ ++ $app --version 2>&1 | ++ sed -n '# Move version to start of line. ++ s/.*[v ]\([0-9]\)/\1/ ++ ++ # Skip lines that do not start with version. ++ /^[0-9]/!d ++ ++ # Remove characters after the version. ++ s/[^.a-z0-9-].*// ++ ++ # The first component must be digits only. ++ s/^\([0-9]*\)[a-z-].*/\1/ ++ ++ #the following essentially does s/5.005/5.5/ ++ s/\.0*\([1-9]\)/.\1/g ++ p ++ q' ++} ++ ++check_versions() { ++ ret=0 ++ ++ while read app req_ver; do ++ # We only need libtoolize from the libtool package. ++ if test "$app" = libtool; then ++ app=libtoolize ++ fi ++ # Exempt git if --no-git is in effect. ++ if test "$app" = git; then ++ $use_git || continue ++ fi ++ # Honor $APP variables ($TAR, $AUTOCONF, etc.) ++ appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_') ++ test "$appvar" = TAR && appvar=AMTAR ++ case $appvar in ++ GZIP) ;; # Do not use $GZIP: it contains gzip options. ++ *) eval "app=\${$appvar-$app}" ;; ++ esac ++ ++ # Handle the still-experimental Automake-NG programs specially. ++ # They remain named as the mainstream Automake programs ("automake", ++ # and "aclocal") to avoid gratuitous incompatibilities with ++ # pre-existing usages (by, say, autoreconf, or custom autogen.sh ++ # scripts), but correctly identify themselves (as being part of ++ # "GNU automake-ng") when asked their version. ++ case $app in ++ automake-ng|aclocal-ng) ++ app=${app%-ng} ++ ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { ++ warn_ "Error: '$app' not found or not from Automake-NG" ++ ret=1 ++ continue ++ } ;; ++ esac ++ if [ "$req_ver" = "-" ]; then ++ # Merely require app to exist; not all prereq apps are well-behaved ++ # so we have to rely on $? rather than get_version. ++ if ! check_exists $app; then ++ warn_ "Error: '$app' not found" ++ ret=1 ++ fi ++ else ++ # Require app to produce a new enough version string. ++ inst_ver=$(get_version $app) ++ if [ ! "$inst_ver" ]; then ++ warn_ "Error: '$app' not found" ++ ret=1 ++ else ++ latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) ++ if [ ! "$latest_ver" = "$inst_ver" ]; then ++ warnf_ '%s\n' \ ++ "Error: '$app' version == $inst_ver is too old" \ ++ " '$app' version >= $req_ver is required" ++ ret=1 ++ fi ++ fi ++ fi ++ done ++ ++ return $ret ++} ++ ++print_versions() { ++ echo "Program Min_version" ++ echo "----------------------" ++ printf %s "$buildreq" ++ echo "----------------------" ++ # can't depend on column -t ++} ++ ++# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6. ++# Also find the compatible sha1 utility on the BSDs ++if test x"$SKIP_PO" = x; then ++ find_tool SHA1SUM sha1sum gsha1sum shasum sha1 ++fi ++ ++use_libtool=0 ++# We'd like to use grep -E, to see if any of LT_INIT, ++# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac, ++# but that's not portable enough (e.g., for Solaris). ++grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \ ++ && use_libtool=1 ++grep '^[ ]*LT_INIT' configure.ac >/dev/null \ ++ && use_libtool=1 ++if test $use_libtool = 1; then ++ find_tool LIBTOOLIZE glibtoolize libtoolize ++fi ++ ++# gnulib-tool requires at least automake and autoconf. ++# If either is not listed, add it (with minimum version) as a prerequisite. ++case $buildreq in ++ *automake*) ;; ++ *) buildreq="automake 1.9 ++$buildreq" ;; ++esac ++case $buildreq in ++ *autoconf*) ;; ++ *) buildreq="autoconf 2.59 ++$buildreq" ;; ++esac ++ ++# When we can deduce that gnulib-tool will require patch, ++# and when patch is not already listed as a prerequisite, add it, too. ++if test -d "$local_gl_dir" \ ++ && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then ++ case $buildreq in ++ *patch*) ;; ++ *) buildreq="patch - ++$buildreq" ;; ++ esac ++fi ++ ++if ! printf "$buildreq" | check_versions; then ++ echo >&2 ++ if test -f README-prereq; then ++ die "See README-prereq for how to get the prerequisite programs" ++ else ++ die "Please install the prerequisite programs" ++ fi ++fi ++ ++# Warn the user if autom4te appears to be broken; this causes known ++# issues with at least gettext 0.18.3. ++probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) ++if test "x$probe" != xhi; then ++ warn_ "WARNING: your autom4te wrapper eats stdin;" ++ warn_ "if bootstrap fails, consider upgrading your autotools" ++fi ++ ++echo "$0: Bootstrapping from checked-out $package sources..." ++ ++# See if we can use gnulib's git-merge-changelog merge driver. ++if $use_git && test -d .git && check_exists git; then ++ if git config merge.merge-changelog.driver >/dev/null ; then ++ : ++ elif check_exists git-merge-changelog; then ++ echo "$0: initializing git-merge-changelog driver" ++ git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' ++ git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' ++ else ++ echo "$0: consider installing git-merge-changelog from gnulib" ++ fi ++fi ++ ++ ++cleanup_gnulib() { ++ status=$? ++ rm -fr "$gnulib_path" ++ exit $status ++} ++ ++git_modules_config () { ++ test -f .gitmodules && git config --file .gitmodules "$@" ++} ++ ++if $use_git; then ++ gnulib_path=$(git_modules_config submodule.gnulib.path) ++ test -z "$gnulib_path" && gnulib_path=gnulib ++fi ++ ++# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a ++# submodule, for use in the rest of the script. ++ ++case ${GNULIB_SRCDIR--} in ++-) ++ # Note that $use_git is necessarily true in this case. ++ if git_modules_config submodule.gnulib.url >/dev/null; then ++ echo "$0: getting gnulib files..." ++ git submodule init || exit $? ++ git submodule update || exit $? ++ ++ elif [ ! -d "$gnulib_path" ]; then ++ echo "$0: getting gnulib files..." ++ ++ trap cleanup_gnulib 1 2 13 15 ++ ++ shallow= ++ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' ++ git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || ++ cleanup_gnulib ++ ++ trap - 1 2 13 15 ++ fi ++ GNULIB_SRCDIR=$gnulib_path ++ ;; ++*) ++ # Use GNULIB_SRCDIR directly or as a reference. ++ if $use_git && test -d "$GNULIB_SRCDIR"/.git && \ ++ git_modules_config submodule.gnulib.url >/dev/null; then ++ echo "$0: getting gnulib files..." ++ if git submodule -h|grep -- --reference > /dev/null; then ++ # Prefer the one-liner available in git 1.6.4 or newer. ++ git submodule update --init --reference "$GNULIB_SRCDIR" \ ++ "$gnulib_path" || exit $? ++ else ++ # This fallback allows at least git 1.5.5. ++ if test -f "$gnulib_path"/gnulib-tool; then ++ # Since file already exists, assume submodule init already complete. ++ git submodule update || exit $? ++ else ++ # Older git can't clone into an empty directory. ++ rmdir "$gnulib_path" 2>/dev/null ++ git clone --reference "$GNULIB_SRCDIR" \ ++ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ ++ && git submodule init && git submodule update \ ++ || exit $? ++ fi ++ fi ++ GNULIB_SRCDIR=$gnulib_path ++ fi ++ ;; ++esac ++ ++# $GNULIB_SRCDIR now points to the version of gnulib to use, and ++# we no longer need to use git or $gnulib_path below here. ++ ++if $bootstrap_sync; then ++ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { ++ echo "$0: updating bootstrap and restarting..." ++ case $(sh -c 'echo "$1"' -- a) in ++ a) ignored=--;; ++ *) ignored=ignored;; ++ esac ++ exec sh -c \ ++ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ ++ $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ ++ "$0" "$@" --no-bootstrap-sync ++ } ++fi ++ ++gnulib_tool=$GNULIB_SRCDIR/gnulib-tool ++<$gnulib_tool || exit $? ++ ++# Get translations. ++ ++download_po_files() { ++ subdir=$1 ++ domain=$2 ++ echo "$me: getting translations into $subdir for $domain..." ++ cmd=$(printf "$po_download_command_format" "$domain" "$subdir") ++ eval "$cmd" && return ++ # Fallback to HTTP. ++ cmd=$(printf "$po_download_command_format2" "$subdir" "$domain") ++ eval "$cmd" ++} ++ ++# Mirror .po files to $po_dir/.reference and copy only the new ++# or modified ones into $po_dir. Also update $po_dir/LINGUAS. ++# Note po files that exist locally only are left in $po_dir but will ++# not be included in LINGUAS and hence will not be distributed. ++update_po_files() { ++ # Directory containing primary .po files. ++ # Overwrite them only when we're sure a .po file is new. ++ po_dir=$1 ++ domain=$2 ++ ++ # Mirror *.po files into this dir. ++ # Usually contains *.s1 checksum files. ++ ref_po_dir="$po_dir/.reference" ++ ++ test -d $ref_po_dir || mkdir $ref_po_dir || return ++ download_po_files $ref_po_dir $domain \ ++ && ls "$ref_po_dir"/*.po 2>/dev/null | ++ sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return ++ ++ langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g') ++ test "$langs" = '*' && langs=x ++ for po in $langs; do ++ case $po in x) continue;; esac ++ new_po="$ref_po_dir/$po.po" ++ cksum_file="$ref_po_dir/$po.s1" ++ if ! test -f "$cksum_file" || ++ ! test -f "$po_dir/$po.po" || ++ ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then ++ echo "$me: updated $po_dir/$po.po..." ++ cp "$new_po" "$po_dir/$po.po" \ ++ && $SHA1SUM < "$new_po" > "$cksum_file" || return ++ fi ++ done ++} ++ ++case $SKIP_PO in ++'') ++ if test -d po; then ++ update_po_files po $package || exit ++ fi ++ ++ if test -d runtime-po; then ++ update_po_files runtime-po $package-runtime || exit ++ fi;; ++esac ++ ++symlink_to_dir() ++{ ++ src=$1/$2 ++ dst=${3-$2} ++ ++ test -f "$src" && { ++ ++ # If the destination directory doesn't exist, create it. ++ # This is required at least for "lib/uniwidth/cjk.h". ++ dst_dir=$(dirname "$dst") ++ if ! test -d "$dst_dir"; then ++ mkdir -p "$dst_dir" ++ ++ # If we've just created a directory like lib/uniwidth, ++ # tell version control system(s) it's ignorable. ++ # FIXME: for now, this does only one level ++ parent=$(dirname "$dst_dir") ++ for dot_ig in x $vc_ignore; do ++ test $dot_ig = x && continue ++ ig=$parent/$dot_ig ++ insert_vc_ignore $ig "${dst_dir##*/}" ++ done ++ fi ++ ++ if $copy; then ++ { ++ test ! -h "$dst" || { ++ echo "$me: rm -f $dst" && ++ rm -f "$dst" ++ } ++ } && ++ test -f "$dst" && ++ cmp -s "$src" "$dst" || { ++ echo "$me: cp -fp $src $dst" && ++ cp -fp "$src" "$dst" ++ } ++ else ++ # Leave any existing symlink alone, if it already points to the source, ++ # so that broken build tools that care about symlink times ++ # aren't confused into doing unnecessary builds. Conversely, if the ++ # existing symlink's time stamp is older than the source, make it afresh, ++ # so that broken tools aren't confused into skipping needed builds. See ++ # . ++ test -h "$dst" && ++ src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && ++ dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && ++ test "$src_i" = "$dst_i" && ++ both_ls=$(ls -dt "$src" "$dst") && ++ test "X$both_ls" = "X$dst$nl$src" || { ++ dot_dots= ++ case $src in ++ /*) ;; ++ *) ++ case /$dst/ in ++ *//* | */../* | */./* | /*/*/*/*/*/) ++ die "invalid symlink calculation: $src -> $dst";; ++ /*/*/*/*/) dot_dots=../../../;; ++ /*/*/*/) dot_dots=../../;; ++ /*/*/) dot_dots=../;; ++ esac;; ++ esac ++ ++ echo "$me: ln -fs $dot_dots$src $dst" && ++ ln -fs "$dot_dots$src" "$dst" ++ } ++ fi ++ } ++} ++ ++version_controlled_file() { ++ parent=$1 ++ file=$2 ++ if test -d .git; then ++ git rm -n "$file" > /dev/null 2>&1 ++ elif test -d .svn; then ++ svn log -r HEAD "$file" > /dev/null 2>&1 ++ elif test -d CVS; then ++ grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | ++ grep '^/[^/]*/[0-9]' > /dev/null ++ else ++ warn_ "no version control for $file?" ++ false ++ fi ++} ++ ++# NOTE: we have to be careful to run both autopoint and libtoolize ++# before gnulib-tool, since gnulib-tool is likely to provide newer ++# versions of files "installed" by these two programs. ++# Then, *after* gnulib-tool (see below), we have to be careful to ++# run autoreconf in such a way that it does not run either of these ++# two just-pre-run programs. ++ ++# Import from gettext. ++with_gettext=yes ++grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ ++ with_gettext=no ++ ++if test $with_gettext = yes || test $use_libtool = 1; then ++ ++ tempbase=.bootstrap$$ ++ trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15 ++ ++ > $tempbase.0 > $tempbase.1 && ++ find . ! -type d -print | sort > $tempbase.0 || exit ++ ++ if test $with_gettext = yes; then ++ # Released autopoint has the tendency to install macros that have been ++ # obsoleted in current gnulib, so run this before gnulib-tool. ++ echo "$0: $AUTOPOINT --force" ++ $AUTOPOINT --force || exit ++ fi ++ ++ # Autoreconf runs aclocal before libtoolize, which causes spurious ++ # warnings if the initial aclocal is confused by the libtoolized ++ # (or worse out-of-date) macro directory. ++ # libtoolize 1.9b added the --install option; but we support back ++ # to libtoolize 1.5.22, where the install action was default. ++ if test $use_libtool = 1; then ++ install= ++ case $($LIBTOOLIZE --help) in ++ *--install*) install=--install ;; ++ esac ++ echo "running: $LIBTOOLIZE $install --copy" ++ $LIBTOOLIZE $install --copy ++ fi ++ ++ find . ! -type d -print | sort >$tempbase.1 ++ old_IFS=$IFS ++ IFS=$nl ++ for file in $(comm -13 $tempbase.0 $tempbase.1); do ++ IFS=$old_IFS ++ parent=${file%/*} ++ version_controlled_file "$parent" "$file" || { ++ for dot_ig in x $vc_ignore; do ++ test $dot_ig = x && continue ++ ig=$parent/$dot_ig ++ insert_vc_ignore "$ig" "${file##*/}" ++ done ++ } ++ done ++ IFS=$old_IFS ++ ++ rm -f $tempbase.0 $tempbase.1 ++ trap - 1 2 13 15 ++fi ++ ++# Import from gnulib. ++ ++gnulib_tool_options="\ ++ --import\ ++ --no-changelog\ ++ --aux-dir $build_aux\ ++ --doc-base $doc_base\ ++ --lib $gnulib_name\ ++ --m4-base $m4_base/\ ++ --source-base $source_base/\ ++ --tests-base $tests_base\ ++ --local-dir $local_gl_dir\ ++ $gnulib_tool_option_extras\ ++" ++if test $use_libtool = 1; then ++ case "$gnulib_tool_options " in ++ *' --libtool '*) ;; ++ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; ++ esac ++fi ++echo "$0: $gnulib_tool $gnulib_tool_options --import ..." ++$gnulib_tool $gnulib_tool_options --import $gnulib_modules && ++ ++for file in $gnulib_files; do ++ symlink_to_dir "$GNULIB_SRCDIR" $file \ ++ || die "failed to symlink $file" ++done ++ ++bootstrap_post_import_hook \ ++ || die "bootstrap_post_import_hook failed" ++ ++# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some ++# gnulib-populated directories. Such .m4 files would cause aclocal to fail. ++# The following requires GNU find 4.2.3 or newer. Considering the usual ++# portability constraints of this script, that may seem a very demanding ++# requirement, but it should be ok. Ignore any failure, which is fine, ++# since this is only a convenience to help developers avoid the relatively ++# unusual case in which a symlinked-to .m4 file is git-removed from gnulib ++# between successive runs of this script. ++find "$m4_base" "$source_base" \ ++ -depth \( -name '*.m4' -o -name '*.[ch]' \) \ ++ -type l -xtype l -delete > /dev/null 2>&1 ++ ++# Invoke autoreconf with --force --install to ensure upgrades of tools ++# such as ylwrap. ++AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" ++ ++# Some systems (RHEL 5) are using ancient autotools, for which the ++# --no-recursive option had not been invented. Detect that lack and ++# omit the option when it's not supported. FIXME in 2017: remove this ++# hack when RHEL 5 autotools are updated, or when they become irrelevant. ++case $($AUTORECONF --help) in ++ *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; ++esac ++ ++# Tell autoreconf not to invoke autopoint or libtoolize; they were run above. ++echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" ++AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ ++ || die "autoreconf failed" ++ ++# Get some extra files from gnulib, overriding existing files. ++for file in $gnulib_extra_files; do ++ case $file in ++ */INSTALL) dst=INSTALL;; ++ build-aux/*) dst=$build_aux/${file#build-aux/};; ++ *) dst=$file;; ++ esac ++ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ ++ || die "failed to symlink $file" ++done ++ ++if test $with_gettext = yes; then ++ # Create gettext configuration. ++ echo "$0: Creating po/Makevars from po/Makevars.template ..." ++ rm -f po/Makevars ++ sed ' ++ /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ ++ /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/ ++ /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'| ++ /^XGETTEXT_OPTIONS *=/{ ++ s/$/ \\/ ++ a\ ++ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} ++ } ++ ' po/Makevars.template >po/Makevars \ ++ || die 'cannot generate po/Makevars' ++ ++ # If the 'gettext' module is in use, grab the latest Makefile.in.in. ++ # If only the 'gettext-h' module is in use, assume autopoint already ++ # put the correct version of this file into place. ++ case $gnulib_modules in ++ *gettext-h*) ;; ++ *gettext*) ++ cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \ ++ || die "cannot create po/Makefile.in.in" ++ ;; ++ esac ++ ++ if test -d runtime-po; then ++ # Similarly for runtime-po/Makevars, but not quite the same. ++ rm -f runtime-po/Makevars ++ sed ' ++ /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ ++ /^subdir *=.*/s/=.*/= runtime-po/ ++ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ ++ /^XGETTEXT_OPTIONS *=/{ ++ s/$/ \\/ ++ a\ ++ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} ++ } ++ ' po/Makevars.template >runtime-po/Makevars \ ++ || die 'cannot generate runtime-po/Makevars' ++ ++ # Copy identical files from po to runtime-po. ++ (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) ++ fi ++fi ++ ++bootstrap_epilogue ++ ++echo "$0: done. Now you can run './configure'." ++ ++# Local variables: ++# 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 -Nuar groff-1.22.3.old/bootstrap.conf groff-1.22.3/bootstrap.conf +--- groff-1.22.3.old/bootstrap.conf 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/bootstrap.conf 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,100 @@ ++# Bootstrap configuration. ++ ++# Copyright (C) 2006-2007, 2009-2012 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 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 . ++ ++ ++# gnulib m4 macro ++m4_base=gnulib_m4 ++ ++# gnulib C source files ++source_base=lib ++ ++# additional standard files, particularly added by ++# automake --add-missing ++build_aux=build-aux ++ ++gnulib_name=libgnu ++ ++# This file is not distributed and used to check if the bootstrap ++# script is not launched on a tarball ++checkout_only_file=README.git ++ ++# gnulib modules used by this package. ++# havelib provides config.rpath ++# can be get through gettext though ++gnulib_modules=" ++ havelib ++ non-recursive-gnulib-prefix-hack ++ wcwidth ++" ++ ++# Name of the Makefile.am ++gnulib_tool_option_extras="--makefile-name=gnulib.mk" ++ ++# Additional xgettext options to use. Use "\\\newline" to break lines. ++XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ ++ --from-code=UTF-8\\\ ++ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\ ++ --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\ ++ --flag=wrapf:1:c-format\\\ ++' ++ ++# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]" ++# appears in configure.ac, exclude some unnecessary files. ++# Without grep's -E option (not portable enough, pre-configure), ++# the following test is ugly. Also, this depends on the existence ++# of configure.ac, not the obsolescent-named configure.in. But if ++# you're using this infrastructure, you should care about such things. ++ ++gettext_external=0 ++grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null && ++ gettext_external=1 ++grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null && ++ gettext_external=1 ++ ++if test $gettext_external = 1; then ++ # Gettext supplies these files, but we don't need them since ++ # we don't have an intl subdirectory. ++ excluded_files=' ++ m4/glibc2.m4 ++ m4/intdiv0.m4 ++ m4/lcmessage.m4 ++ m4/lock.m4 ++ m4/printf-posix.m4 ++ m4/size_max.m4 ++ m4/uintmax_t.m4 ++ m4/ulonglong.m4 ++ m4/visibility.m4 ++ m4/xsize.m4 ++ ' ++fi ++ ++# Build prerequisites ++buildreq="\ ++autoconf 2.65 ++automake 1.12.2 ++git 1.5.5 ++libtool 2.2.2 ++tar - ++" ++ ++bootstrap_post_import_hook () ++{ ++ # Automake requires that ChangeLog exist. ++ touch ChangeLog || return 1 ++ # Massage lib/gnulib.mk before using it later in the bootstrapping process. ++ build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk ++} +diff -Nuar groff-1.22.3.old/ChangeLog groff-1.22.3/ChangeLog +--- groff-1.22.3.old/ChangeLog 2014-11-04 10:38:35.138525085 +0200 ++++ groff-1.22.3/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,243 @@ ++2015-04-22 Deri James ++ ++ Fix Savannah bug #44891. ++ ++ * src/devices/gropdf/gropdf.pl: If module Compress::Zlib is not ++ available fallback to producing uncompressed PDF and output a ++ warning. ++ ++2015-04-22 Bjarni Ingi Gislason ++ ++ Fix Savannah bug #44894. ++ ++ * tmac/strip.sed: Add a `generated file' warning. ++ ++2015-04-21 Deri James ++ ++ Fix Savannah bug #44890. ++ Patch by Peter Bray. ++ ++ * font/devpdf/devpdf.am: Don't use 'find -maxdepth'. ++ ++2015-03-07 Ingo Schwarze ++ ++ [mdoc] Fix Savannah bug #44733. ++ ++ Prevent mdoc(7) Bl with trailing -width or -offset from picking up ++ old args. ++ ++ * tmac/doc.tmac-u (doc-do-Bl-args): When checking whether there is ++ another argument to a Bl macro, do not inspect the argument list ++ because it is never cleaned and may contain arguments from previous ++ macro invocations. Instead, inspect the argument count which is ++ always up to date. ++ ++2015-04-10 Daiki Ueno ++ ++ Fix link error on NetBSD 6. ++ ++ Reported by carsten.kunze@arcor.de in: ++ . ++ The problem can also be reproduced if gl_cv_func_wcwidth_works=no ++ is passed to configure. ++ ++ * src/preproc/grn/grn.am (grn_LDADD): Change the link order of ++ libgroff.a and lib/libgnu.a according to dependency. ++ * src/roff/troff/troff.am (troff_LDADD): Likewise. ++ ++2015-04-08 Werner LEMBERG ++ ++ Fix Savannah bug #44767. ++ Patch by Peter Bray. ++ ++ * src/roff/grog/grog.am (grog): Correctly substitute `grog_dir'. ++ ++2015-04-03 Werner LEMBERG ++ ++ Fix Savannah bug #44708 (2/2). ++ ++ Make man pages work in compatibility mode. ++ Also fix some minor typos. ++ ++ * contrib/pic2graph/pic2graph.man, man/ditroff.man, man/groff.man, ++ man/groff_diff.man, man/groff_out.man, man/groff_tmac.man, ++ man/roff.man, src/devices/grodvi/grodvi.man, ++ src/devices/grohtml/grohtml.man, src/devices/grolbp/grolbp.man, ++ src/devices/grolj4/grolj4.man, src/devices/grolj4/lj4_font.man, ++ src/devices/gropdf/gropdf.man, src/devices/gropdf/pdfmom.man, ++ src/devices/grops/grops.man, src/devices/grotty/grotty.man, ++ src/devices/xditview/xditview.man, src/preproc/eqn/eqn.man, ++ src/preproc/eqn/neqn.man, src/preproc/grn/grn.man, ++ src/preproc/pic/pic.man, src/preproc/preconv/preconv.man, ++ src/preproc/refer/refer.man, src/preproc/soelim/soelim.man, ++ src/preproc/tbl/tbl.man, src/roff/groff/groff.man, ++ src/roff/grog/grog.man, src/roff/nroff/nroff.man, ++ src/roff/troff/troff.man, src/utils/addftinto/addftinfo.man, ++ src/utils/afmtodit/afmtodit.man, src/utils/hpftodit/hpftodit.man, ++ src/utils/indxbib/indxbib.man, src/utils/lkbib/lkbib.man, ++ src/utils/lookbib/lookbib.man, src/utils/pfbtops/pfbtops.man, ++ src/utils/tfmtodit/tfmtodit.man, src/utils/xtotroff/xtotroff.man, ++ tmac/groff_man.man, tmac/groff_trace.man: Do it. ++ ++2015-04-03 Werner LEMBERG ++ ++ Fix Savannah bug #44708 (1/2). ++ ++ * tmac/andoc.tmac (reload_doc, reload_man): Don't use `de1', ++ otherwise we can't manipulate the compatibility flag within the ++ macro. ++ ++ * tmac/doc-common-u (Dt): Remove invalid leading whitespace. ++ ++2015-03-11 Deri James ++ ++ * src/devices/gropdf/gropdf.pl: Was not handling the final glyph ++ correctly in the "standard" fonts which are not embedded. They ++ actually have 257 glyphs (0-256) not 256 as I'd assumed, so the ++ remappiing code needs to be applied for them as well as the ++ embedded downloadable fonts. ++ ++2015-03-11 Deri James ++ ++ * src/devices/gropdf/gropdf.pl: Fix problem remappiing ++ ellipsis (affects all glyphs > 255). ++ ++2015-03-07 Werner LEMBERG ++ ++ * tmac/tmac.am (TMACSPECIALFILES): Removed. No longer used. ++ ++2015-03-07 Ingo Schwarze ++ ++ * tmac/doc-common-u (Dd): Avoid warning `unbalanced .el request'. ++ ++2015-02-12 Werner LEMBERG ++ ++ Minor fixes due to renaming `groff.texinfo' to `groff.texi'. ++ ++ * doc/doc.am (SUFFIXES): Update. ++ * m4/groff.m4 (GROFF_MAKEINFO): Update. ++ ++2015-01-30 Bertrand Garrigues ++ ++ Automake migration and Gnulib integration. ++ ++ Gnulib: ++ - Added gnulib as a git submodule. ++ - Integrated bootstrap scripts from gnulib. ++ - Gnulib m4 directory is now in `gnulib_m4', while Gnulib's .c ++ files are located in `lib'. `gnulib_m4' and `lib' are generated ++ and distributed. ++ ++ Automake: ++ - Removed Makefiles from the old build system. ++ - Converted Makefile.in into Makefile.am. ++ - Converted Makefile.sub files in all directories to a .am file. ++ - Removed configure, src/include/config.hin (now generated). ++ - Removed various helper scripts (config.guess, config.rpath...), ++ now installed by bootstrap in `build-aux'. ++ - Moved aclocal.m4 to acinclude.m4 (aclocal.m4 is now generated). ++ - Makefile in non-recursive style. ++ - Updated INSTALL.REPO (INSTALL is now a symlink to ++ gnulib/doc/INSTALL, original INSTALL file moved to INSTALL.extra) ++ - Added (empty) THANKS, AUTHORS files. ++ - Added a document on the usage of automake in groff in ++ doc/automake.pdf. ++ ++ Additional features: ++ - Out-of-source build is supported. ++ - Parallel build is possible (make -j). ++ - Automatic targets from Automake: `make dist', `make distcheck'. ++ - 'make check' is available for automatic testing, gdiffmk's test ++ was plugged to this target. ++ - Auto-detect if make has builtin variable `RM'. ++ ++2015-01-14 Ingo Schwarze ++ ++ Fix Savannah bug #43905. ++ ++ * src/libs/libgroff/glyphuni.cpp (glyph_to_unicode_list), ++ * src/libs/libgroff/uniglyph.cpp (unicode_to_glyph_list): Remove ++ double entries for `rk', `lk', `lt', `rt', `rb', and `lb'. ++ ++2014-12-16 Werner LEMBERG ++ ++ Update Unicode-to-Unicode mapping to version 7.0.0. ++ ++ * src/libs/libgroff/make-uniuni: Update emitted copyright. ++ ++ * src/libs/libgroff/uniuni.cpp: Regenerated. ++ ++2014-11-29 Werner LEMBERG ++ ++ Fix previous commit. ++ ++ We forgot to test whether the patch works if compiling from ++ scratch... ++ ++ Problem reported by Bertrand Garrigues ++ . ++ ++ * src/include/lib.h (interpret_lf_args, normalize_for_lf): Move ++ declarations to... ++ * src/include/lf.h: This new file. ++ ++ * src/libs/libgroff/lf.cpp, src/preproc/pic/pic.h, ++ src/preproc/preconv/preconv.cpp, src/preproc/refer/refer.h, ++ src/preproc/soelim/soelim.cpp, src/preproc/tbl/table.h: Include ++ `lf.h'. ++ Make `lib.h' the first included header file. ++ ++ * src/preproc/eqn/eqn.h: Don't include `stringclass.h'. ++ * src/preproc/eqn/main.cpp: Include `stringclass.h' and `lf.h'. ++ ++ * src/roff/groff/groff.cpp: Make `lib.h' the first included header ++ file. ++ ++2014-11-10 Eli Zaretskii ++ ++ Improve native Windows port. ++ ++ This patch fixes two issues. ++ ++ . Handle backslashes in `.lf' arguments for MSDOS and Windows. ++ . Fix file name quoting for the groff pipeline. ++ ++ * src/preproc/soelim/soelim.cpp (do_file): ++ * src/preproc/refer/refer.cpp (do_file): ++ * src/preproc/preconv/preconv.cpp (do_file): ++ * src/preproc/pic/main.cpp (do_file): ++ * src/preproc/eqn/main.cpp (do_file): Call `normalize_for_lf' to ++ convert backslashes in the file name being processed to forward ++ slashes. ++ ++ * src/include/lib.h (normalize_for_lf): Add prototype. ++ ++ * src/preproc/eqn/eqn.h: ++ * src/preproc/pic/pic.h: ++ * src/preproc/refer/refer.h: ++ * src/preproc/tbl/table.h: Include stringclass.h before lib.h. ++ ++ * src/libs/libgroff/lf.cpp (normalize_for_lf): New function. ++ ++ * src/roff/groff/groff.cpp: Include stringclass.h before lib.h. ++ (append_arg_to_string) [_WIN32 && !__CYGWIN__]: Use only "..." for ++ quoting in native Windows builds. ++ ++2014-11-18 Deri James ++ ++ My commit '3fe78135c9fe666dadffde2a822b0535d8db6feb' introduced ++ problem in subroutine `TextWid'. Octal char `\nnn' returns width of ++ 4 char string rather than width of single character. ++ ++ * src/devices/gropdf/gropdf.pl: Change `TextWid' to recognise octal ++ escaped characters (\nnn). ++ ++2014-11-07 Deri James ++ ++ See bug #43555. ++ ++ * src/devices/gropdf/gropdf.pl: Correct Date Format. ++ + 2014-11-04 Werner LEMBERG + + * src/libs/gnulib/*: Regenerate autotool files. +diff -Nuar groff-1.22.3.old/config.guess groff-1.22.3/config.guess +--- groff-1.22.3.old/config.guess 2014-11-04 10:38:35.140525060 +0200 ++++ groff-1.22.3/config.guess 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1420 +0,0 @@ +-#! /bin/sh +-# Attempt to guess a canonical system name. +-# Copyright 1992-2014 Free Software Foundation, Inc. +- +-timestamp='2014-03-23' +- +-# 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 +-# 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 . +-# +-# 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 Exception is an additional permission under section 7 +-# of the GNU General Public License, version 3 ("GPLv3"). +-# +-# Originally written by Per Bothner. +-# +-# 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 +-# +-# Please send patches with a ChangeLog entry to config-patches@gnu.org. +- +- +-me=`echo "$0" | sed -e 's,.*/,,'` +- +-usage="\ +-Usage: $0 [OPTION] +- +-Output the configuration name of the system \`$me' is run on. +- +-Operation modes: +- -h, --help print this help, then exit +- -t, --time-stamp print date of last modification, then exit +- -v, --version print version number, then exit +- +-Report bugs and patches to ." +- +-version="\ +-GNU config.guess ($timestamp) +- +-Originally written by Per Bothner. +-Copyright 1992-2014 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." +- +-help=" +-Try \`$me --help' for more information." +- +-# Parse command line +-while test $# -gt 0 ; do +- case $1 in +- --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit ;; +- --version | -v ) +- echo "$version" ; exit ;; +- --help | --h* | -h ) +- echo "$usage"; exit ;; +- -- ) # Stop option processing +- shift; break ;; +- - ) # Use stdin as input. +- break ;; +- -* ) +- echo "$me: invalid option $1$help" >&2 +- exit 1 ;; +- * ) +- break ;; +- esac +-done +- +-if test $# != 0; then +- echo "$me: too many arguments$help" >&2 +- exit 1 +-fi +- +-trap 'exit 1' 1 2 15 +- +-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +-# compiler to aid in system detection is discouraged as it requires +-# temporary files to be created and, as you can see below, it is a +-# headache to deal with in a portable fashion. +- +-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +-# use `HOST_CC' if defined, but it is deprecated. +- +-# Portable tmp directory creation inspired by the Autoconf team. +- +-set_cc_for_build=' +-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +-: ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || +- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || +- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || +- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +-dummy=$tmp/dummy ; +-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +-case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int x;" > $dummy.c ; +- for c in cc gcc c89 c99 ; do +- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +- CC_FOR_BUILD="$c"; break ; +- fi ; +- done ; +- if test x"$CC_FOR_BUILD" = x ; then +- CC_FOR_BUILD=no_compiler_found ; +- fi +- ;; +- ,,*) CC_FOR_BUILD=$CC ;; +- ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ; set_cc_for_build= ;' +- +-# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +-# (ghazi@noc.rutgers.edu 1994-08-24) +-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +- PATH=$PATH:/.attbin ; export PATH +-fi +- +-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +- +-case "${UNAME_SYSTEM}" in +-Linux|GNU|GNU/*) +- # If the system lacks a compiler, then just pick glibc. +- # We could probably try harder. +- LIBC=gnu +- +- eval $set_cc_for_build +- cat <<-EOF > $dummy.c +- #include +- #if defined(__UCLIBC__) +- LIBC=uclibc +- #elif defined(__dietlibc__) +- LIBC=dietlibc +- #else +- LIBC=gnu +- #endif +- EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` +- ;; +-esac +- +-# Note: order is significant - the case branches are not exclusive. +- +-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +- *:NetBSD:*:*) +- # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, +- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently +- # switched to ELF, *-*-netbsd* would select the old +- # object file format. This provides both forward +- # compatibility and a consistent mechanism for selecting the +- # object file format. +- # +- # 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)` +- 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 ;; +- *) machine=${UNAME_MACHINE_ARCH}-unknown ;; +- esac +- # The Operating System including object format, if it has switched +- # to ELF recently, or will in the future. +- case "${UNAME_MACHINE_ARCH}" in +- arm*|i386|m68k|ns32k|sh3*|sparc|vax) +- eval $set_cc_for_build +- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep -q __ELF__ +- then +- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). +- # Return netbsd for either. FIX? +- os=netbsd +- else +- os=netbsdelf +- fi +- ;; +- *) +- os=netbsd +- ;; +- esac +- # The OS release +- # Debian GNU/NetBSD machines have a different userland, and +- # thus, need a distinct triplet. However, they do not need +- # kernel version information, so it can be replaced with a +- # suitable tag, in the style of linux-gnu. +- case "${UNAME_VERSION}" in +- Debian*) +- release='-gnu' +- ;; +- *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- ;; +- 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}" +- exit ;; +- *:Bitrig:*:*) +- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` +- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} +- exit ;; +- *:OpenBSD:*:*) +- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` +- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +- exit ;; +- *:ekkoBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} +- exit ;; +- *:SolidBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} +- exit ;; +- macppc:MirBSD:*:*) +- echo powerpc-unknown-mirbsd${UNAME_RELEASE} +- exit ;; +- *:MirBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +- exit ;; +- alpha:OSF1:*:*) +- case $UNAME_RELEASE in +- *4.0) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- ;; +- *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` +- ;; +- esac +- # According to Compaq, /usr/sbin/psrinfo has been available on +- # OSF/1 and Tru64 systems produced since 1995. I hope that +- # covers most systems running today. This code pipes the CPU +- # types through head -n 1, so we only detect the type of CPU 0. +- 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" ;; +- "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; +- "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; +- "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; +- "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; +- "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; +- "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; +- "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; +- "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; +- "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; +- "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; +- "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; +- "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; +- "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; +- "EV7.9 (21364A)") +- 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'` +- # Reset EXIT trap before exiting to avoid spurious non-zero exit code. +- exitcode=$? +- trap '' 0 +- exit $exitcode ;; +- Alpha\ *:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # Should we change UNAME_MACHINE based on the output of uname instead +- # of the specific Alpha model? +- echo alpha-pc-interix +- exit ;; +- 21064:Windows_NT:50:3) +- echo alpha-dec-winnt3.5 +- exit ;; +- Amiga*:UNIX_System_V:4.0:*) +- echo m68k-unknown-sysv4 +- exit ;; +- *:[Aa]miga[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-amigaos +- exit ;; +- *:[Mm]orph[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-morphos +- exit ;; +- *:OS/390:*:*) +- echo i370-ibm-openedition +- exit ;; +- *:z/VM:*:*) +- echo s390-ibm-zvmoe +- exit ;; +- *:OS400:*:*) +- echo powerpc-ibm-os400 +- exit ;; +- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) +- echo arm-acorn-riscix${UNAME_RELEASE} +- exit ;; +- arm*:riscos:*:*|arm*:RISCOS:*:*) +- echo arm-unknown-riscos +- exit ;; +- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +- echo hppa1.1-hitachi-hiuxmpp +- exit ;; +- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) +- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. +- if test "`(/bin/universe) 2>/dev/null`" = att ; then +- echo pyramid-pyramid-sysv3 +- else +- echo pyramid-pyramid-bsd +- fi +- exit ;; +- NILE*:*:*:dcosx) +- echo pyramid-pyramid-svr4 +- exit ;; +- DRS?6000:unix:4.0:6*) +- echo sparc-icl-nx6 +- exit ;; +- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) +- case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7; exit ;; +- esac ;; +- s390x:SunOS:*:*) +- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4H:SunOS:5.*:*) +- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) +- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) +- echo i386-pc-auroraux${UNAME_RELEASE} +- exit ;; +- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- eval $set_cc_for_build +- 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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ +- grep IS_64BIT_ARCH >/dev/null +- then +- SUN_ARCH="x86_64" +- fi +- fi +- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4*:SunOS:6*:*) +- # According to config.sub, this is the proper way to canonicalize +- # SunOS6. Hard to guess exactly what SunOS6 will be like, but +- # it's likely to be more like Solaris than SunOS4. +- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4*:SunOS:*:*) +- case "`/usr/bin/arch -k`" in +- Series*|S4*) +- UNAME_RELEASE=`uname -v` +- ;; +- esac +- # Japanese Language versions have a version number like `4.1.3-JL'. +- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit ;; +- sun3*:SunOS:*:*) +- echo m68k-sun-sunos${UNAME_RELEASE} +- 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 +- case "`/bin/arch`" in +- sun3) +- echo m68k-sun-sunos${UNAME_RELEASE} +- ;; +- sun4) +- echo sparc-sun-sunos${UNAME_RELEASE} +- ;; +- esac +- exit ;; +- aushp:SunOS:*:*) +- echo sparc-auspex-sunos${UNAME_RELEASE} +- exit ;; +- # The situation for MiNT is a little confusing. The machine name +- # can be virtually everything (everything which is not +- # "atarist" or "atariste" at least should have a processor +- # > m68000). The system name ranges from "MiNT" over "FreeMiNT" +- # to the lowercase version "mint" (or "freemint"). Finally +- # the system name "TOS" denotes a system which is actually not +- # MiNT. But MiNT is downward compatible to TOS, so this should +- # be no problem. +- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; +- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; +- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; +- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; +- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; +- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; +- m68k:machten:*:*) +- echo m68k-apple-machten${UNAME_RELEASE} +- exit ;; +- powerpc:machten:*:*) +- echo powerpc-apple-machten${UNAME_RELEASE} +- exit ;; +- RISC*:Mach:*:*) +- echo mips-dec-mach_bsd4.3 +- exit ;; +- RISC*:ULTRIX:*:*) +- echo mips-dec-ultrix${UNAME_RELEASE} +- exit ;; +- VAX*:ULTRIX*:*:*) +- echo vax-dec-ultrix${UNAME_RELEASE} +- exit ;; +- 2020:CLIX:*:* | 2430:CLIX:*:*) +- echo clipper-intergraph-clix${UNAME_RELEASE} +- exit ;; +- mips:*:*:UMIPS | mips:*:*:RISCos) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +-#ifdef __cplusplus +-#include /* for printf() prototype */ +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +- #if defined (host_mips) && defined (MIPSEB) +- #if defined (SYSTYPE_SYSV) +- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); +- #endif +- #if defined (SYSTYPE_SVR4) +- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); +- #endif +- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) +- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); +- #endif +- #endif +- exit (-1); +- } +-EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && +- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && +- SYSTEM_NAME=`$dummy $dummyarg` && +- { echo "$SYSTEM_NAME"; exit; } +- echo mips-mips-riscos${UNAME_RELEASE} +- exit ;; +- Motorola:PowerMAX_OS:*:*) +- echo powerpc-motorola-powermax +- exit ;; +- Motorola:*:4.3:PL8-*) +- echo powerpc-harris-powermax +- exit ;; +- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) +- echo powerpc-harris-powermax +- exit ;; +- Night_Hawk:Power_UNIX:*:*) +- echo powerpc-harris-powerunix +- exit ;; +- m88k:CX/UX:7*:*) +- echo m88k-harris-cxux7 +- exit ;; +- m88k:*:4*:R4*) +- echo m88k-motorola-sysv4 +- exit ;; +- m88k:*:3*:R3*) +- echo m88k-motorola-sysv3 +- exit ;; +- AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] +- then +- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +- [ ${TARGET_BINARY_INTERFACE}x = x ] +- then +- echo m88k-dg-dgux${UNAME_RELEASE} +- else +- echo m88k-dg-dguxbcs${UNAME_RELEASE} +- fi +- else +- echo i586-dg-dgux${UNAME_RELEASE} +- fi +- exit ;; +- M88*:DolphinOS:*:*) # DolphinOS (SVR3) +- echo m88k-dolphin-sysv3 +- exit ;; +- M88*:*:R3*:*) +- # Delta 88k system running SVR3 +- echo m88k-motorola-sysv3 +- exit ;; +- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) +- echo m88k-tektronix-sysv3 +- exit ;; +- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) +- echo m68k-tektronix-bsd +- exit ;; +- *:IRIX*:*:*) +- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit ;; +- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' +- i*86:AIX:*:*) +- echo i386-ibm-aix +- exit ;; +- ia64:AIX:*:*) +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` +- else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} +- fi +- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit ;; +- *:AIX:2:3) +- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- +- main() +- { +- if (!__power_pc()) +- exit(1); +- puts("powerpc-ibm-aix3.2.5"); +- exit(0); +- } +-EOF +- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` +- then +- echo "$SYSTEM_NAME" +- else +- echo rs6000-ibm-aix3.2.5 +- fi +- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then +- echo rs6000-ibm-aix3.2.4 +- else +- echo rs6000-ibm-aix3.2 +- fi +- exit ;; +- *:AIX:*:[4567]) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` +- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then +- IBM_ARCH=rs6000 +- else +- IBM_ARCH=powerpc +- fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` +- else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} +- fi +- echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit ;; +- *:AIX:*:*) +- echo rs6000-ibm-aix +- exit ;; +- ibmrt:4.4BSD:*|romp-ibm:BSD:*) +- echo romp-ibm-bsd4.4 +- exit ;; +- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and +- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit ;; # report: romp-ibm BSD 4.3 +- *:BOSX:*:*) +- echo rs6000-bull-bosx +- exit ;; +- DPX/2?00:B.O.S.:*:*) +- echo m68k-bull-sysv3 +- exit ;; +- 9000/[34]??:4.3bsd:1.*:*) +- echo m68k-hp-bsd +- exit ;; +- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) +- echo m68k-hp-bsd4.4 +- exit ;; +- 9000/[34678]??:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- case "${UNAME_MACHINE}" in +- 9000/31? ) HP_ARCH=m68000 ;; +- 9000/[34]?? ) HP_ARCH=m68k ;; +- 9000/[678][0-9][0-9]) +- if [ -x /usr/bin/getconf ]; then +- 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 +- 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 +- esac ;; +- esac +- fi +- if [ "${HP_ARCH}" = "" ]; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } +-EOF +- (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" ] +- then +- eval $set_cc_for_build +- +- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating +- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler +- # generating 64-bit code. GNU and HP use different nomenclature: +- # +- # $ CC_FOR_BUILD=cc ./config.guess +- # => hppa2.0w-hp-hpux11.23 +- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess +- # => hppa64-hp-hpux11.23 +- +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep -q __LP64__ +- then +- HP_ARCH="hppa2.0w" +- else +- HP_ARCH="hppa64" +- fi +- fi +- echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit ;; +- ia64:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- echo ia64-hp-hpux${HPUX_REV} +- exit ;; +- 3050*:HI-UX:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- int +- main () +- { +- long cpu = sysconf (_SC_CPU_VERSION); +- /* The order matters, because CPU_IS_HP_MC68K erroneously returns +- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct +- results, however. */ +- if (CPU_IS_PA_RISC (cpu)) +- { +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; +- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; +- default: puts ("hppa-hitachi-hiuxwe2"); break; +- } +- } +- else if (CPU_IS_HP_MC68K (cpu)) +- puts ("m68k-hitachi-hiuxwe2"); +- else puts ("unknown-hitachi-hiuxwe2"); +- exit (0); +- } +-EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && +- { echo "$SYSTEM_NAME"; exit; } +- echo unknown-hitachi-hiuxwe2 +- exit ;; +- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) +- echo hppa1.1-hp-bsd +- exit ;; +- 9000/8??:4.3bsd:*:*) +- echo hppa1.0-hp-bsd +- exit ;; +- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) +- echo hppa1.0-hp-mpeix +- exit ;; +- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) +- echo hppa1.1-hp-osf +- exit ;; +- hp8??:OSF1:*:*) +- echo hppa1.0-hp-osf +- exit ;; +- i*86:OSF1:*:*) +- if [ -x /usr/sbin/sysversion ] ; then +- echo ${UNAME_MACHINE}-unknown-osf1mk +- else +- echo ${UNAME_MACHINE}-unknown-osf1 +- fi +- exit ;; +- parisc*:Lites*:*:*) +- echo hppa1.1-hp-lites +- exit ;; +- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) +- echo c1-convex-bsd +- exit ;; +- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit ;; +- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) +- echo c34-convex-bsd +- exit ;; +- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) +- echo c38-convex-bsd +- exit ;; +- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) +- echo c4-convex-bsd +- exit ;; +- CRAY*Y-MP:*:*:*) +- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*[A-Z]90:*:*:*) +- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ +- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ +- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ +- -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*TS:*:*:*) +- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*T3E:*:*:*) +- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*SV1:*:*:*) +- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- *:UNICOS/mp:*:*) +- 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_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/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; +- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) +- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit ;; +- sparc*:BSD/OS:*:*) +- echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit ;; +- *:BSD/OS:*:*) +- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit ;; +- *:FreeBSD:*:*) +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- case ${UNAME_PROCESSOR} in +- amd64) +- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; +- *) +- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; +- esac +- exit ;; +- i*:CYGWIN*:*) +- echo ${UNAME_MACHINE}-pc-cygwin +- exit ;; +- *:MINGW64*:*) +- echo ${UNAME_MACHINE}-pc-mingw64 +- exit ;; +- *:MINGW*:*) +- echo ${UNAME_MACHINE}-pc-mingw32 +- exit ;; +- *:MSYS*:*) +- echo ${UNAME_MACHINE}-pc-msys +- exit ;; +- i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 +- exit ;; +- i*:PW*:*) +- echo ${UNAME_MACHINE}-pc-pw32 +- exit ;; +- *:Interix*:*) +- case ${UNAME_MACHINE} in +- x86) +- echo i586-pc-interix${UNAME_RELEASE} +- exit ;; +- authenticamd | genuineintel | EM64T) +- echo x86_64-unknown-interix${UNAME_RELEASE} +- exit ;; +- IA64) +- echo ia64-unknown-interix${UNAME_RELEASE} +- exit ;; +- esac ;; +- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) +- echo i${UNAME_MACHINE}-pc-mks +- exit ;; +- 8664:Windows_NT:*) +- echo x86_64-pc-mks +- exit ;; +- i*:Windows_NT*:* | Pentium*:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +- # UNAME_MACHINE based on the output of uname instead of i386? +- echo i586-pc-interix +- exit ;; +- i*:UWIN*:*) +- echo ${UNAME_MACHINE}-pc-uwin +- exit ;; +- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) +- echo x86_64-unknown-cygwin +- exit ;; +- p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin +- exit ;; +- prep*:SunOS:5.*:*) +- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- *:GNU:*:*) +- # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- 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} +- exit ;; +- i*86:Minix:*:*) +- echo ${UNAME_MACHINE}-pc-minix +- exit ;; +- aarch64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- aarch64_be:Linux:*:*) +- UNAME_MACHINE=aarch64_be +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- arc:Linux:*:* | arceb:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- arm*:Linux:*:*) +- eval $set_cc_for_build +- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep -q __ARM_EABI__ +- then +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- else +- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep -q __ARM_PCS_VFP +- then +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi +- else +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf +- fi +- fi +- exit ;; +- avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- cris:Linux:*:*) +- echo ${UNAME_MACHINE}-axis-linux-${LIBC} +- exit ;; +- crisv32:Linux:*:*) +- echo ${UNAME_MACHINE}-axis-linux-${LIBC} +- exit ;; +- frv:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- hexagon:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- i*86:Linux:*:*) +- echo ${UNAME_MACHINE}-pc-linux-${LIBC} +- exit ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- mips:Linux:*:* | mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef ${UNAME_MACHINE} +- #undef ${UNAME_MACHINE}el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=${UNAME_MACHINE}el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=${UNAME_MACHINE} +- #else +- CPU= +- #endif +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } +- ;; +- openrisc*:Linux:*:*) +- echo or1k-unknown-linux-${LIBC} +- exit ;; +- or32:Linux:*:* | or1k*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- padre:Linux:*:*) +- echo sparc-unknown-linux-${LIBC} +- exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-${LIBC} +- exit ;; +- parisc:Linux:*:* | hppa:Linux:*:*) +- # Look for CPU level +- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; +- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; +- *) echo hppa-unknown-linux-${LIBC} ;; +- esac +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-${LIBC} +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-${LIBC} +- exit ;; +- ppc64le:Linux:*:*) +- echo powerpc64le-unknown-linux-${LIBC} +- exit ;; +- ppcle:Linux:*:*) +- echo powerpcle-unknown-linux-${LIBC} +- exit ;; +- s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux-${LIBC} +- exit ;; +- sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- tile*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-${LIBC} +- exit ;; +- x86_64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- i*86:DYNIX/ptx:4*:*) +- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +- # earlier versions are messed up and put the nodename in both +- # sysname and nodename. +- echo i386-sequent-sysv4 +- exit ;; +- i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, +- # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. +- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit ;; +- i*86:OS/2:*:*) +- # If we were able to find `uname', then EMX Unix compatibility +- # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit ;; +- i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop +- exit ;; +- i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos +- exit ;; +- i*86:syllable:*:*) +- echo ${UNAME_MACHINE}-pc-syllable +- exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- i*86:*DOS:*:*) +- echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit ;; +- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) +- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` +- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} +- else +- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} +- fi +- exit ;; +- i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. +- case `/bin/uname -X | grep "^Machine"` in +- *486*) UNAME_MACHINE=i486 ;; +- *Pentium) UNAME_MACHINE=i586 ;; +- *Pent*|*Celeron) UNAME_MACHINE=i686 ;; +- esac +- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit ;; +- i*86:*:3.2:*) +- if test -f /usr/options/cb.name; then +- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then +- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` +- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ +- && UNAME_MACHINE=i586 +- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ +- && UNAME_MACHINE=i686 +- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ +- && UNAME_MACHINE=i686 +- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL +- else +- echo ${UNAME_MACHINE}-pc-sysv32 +- fi +- exit ;; +- pc:*:*:*) +- # Left here for compatibility: +- # 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 +- # this is a cross-build. +- echo i586-pc-msdosdjgpp +- exit ;; +- Intel:Mach:3*:*) +- echo i386-pc-mach3 +- exit ;; +- paragon:*:*:*) +- echo i860-intel-osf1 +- exit ;; +- i860:*:4.*:*) # i860-SVR4 +- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then +- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 +- else # Add other i860-SVR4 vendors below as they are discovered. +- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 +- fi +- exit ;; +- mini*:CTIX:SYS*5:*) +- # "miniframe" +- echo m68010-convergent-sysv +- exit ;; +- mc68k:UNIX:SYSTEM5:3.51m) +- echo m68k-convergent-sysv +- exit ;; +- M680?0:D-NIX:5.3:*) +- echo m68k-diab-dnix +- exit ;; +- M68*:*:R3V[5678]*:*) +- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) +- OS_REL='' +- test -r /etc/.relid \ +- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4.3${OS_REL}; exit; } +- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; +- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; +- NCR*:*:4.2:* | MPRAS*:*:4.2:*) +- OS_REL='.3' +- test -r /etc/.relid \ +- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4.3${OS_REL}; exit; } +- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } +- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ +- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; +- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) +- echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- mc68030:UNIX_System_V:4.*:*) +- echo m68k-atari-sysv4 +- exit ;; +- TSUNAMI:LynxOS:2.*:*) +- echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- rs6000:LynxOS:2.*:*) +- echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) +- echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- SM[BE]S:UNIX_SV:*:*) +- echo mips-dde-sysv${UNAME_RELEASE} +- exit ;; +- RM*:ReliantUNIX-*:*:*) +- echo mips-sni-sysv4 +- exit ;; +- RM*:SINIX-*:*:*) +- echo mips-sni-sysv4 +- exit ;; +- *:SINIX-*:*:*) +- if uname -p 2>/dev/null >/dev/null ; then +- UNAME_MACHINE=`(uname -p) 2>/dev/null` +- echo ${UNAME_MACHINE}-sni-sysv4 +- else +- echo ns32k-sni-sysv +- fi +- exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; +- *:UNIX_System_V:4*:FTX*) +- # From Gerald Hewes . +- # How about differentiating between stratus architectures? -djm +- echo hppa1.1-stratus-sysv4 +- exit ;; +- *:*:*:FTX*) +- # From seanf@swdc.stratus.com. +- echo i860-stratus-sysv4 +- exit ;; +- i*86:VOS:*:*) +- # From Paul.Green@stratus.com. +- echo ${UNAME_MACHINE}-stratus-vos +- exit ;; +- *:VOS:*:*) +- # From Paul.Green@stratus.com. +- echo hppa1.1-stratus-vos +- exit ;; +- mc68*:A/UX:*:*) +- echo m68k-apple-aux${UNAME_RELEASE} +- exit ;; +- news*:NEWS-OS:6*:*) +- echo mips-sony-newsos6 +- exit ;; +- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) +- if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} +- else +- echo mips-unknown-sysv${UNAME_RELEASE} +- fi +- exit ;; +- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. +- echo powerpc-be-beos +- exit ;; +- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. +- echo powerpc-apple-beos +- exit ;; +- BePC:BeOS:*:*) # BeOS running on Intel PC compatible. +- echo i586-pc-beos +- exit ;; +- BePC:Haiku:*:*) # Haiku running on Intel PC compatible. +- echo i586-pc-haiku +- exit ;; +- x86_64:Haiku:*:*) +- echo x86_64-unknown-haiku +- exit ;; +- SX-4:SUPER-UX:*:*) +- echo sx4-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-5:SUPER-UX:*:*) +- echo sx5-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-6:SUPER-UX:*:*) +- echo sx6-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-7:SUPER-UX:*:*) +- echo sx7-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-8:SUPER-UX:*:*) +- echo sx8-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-8R:SUPER-UX:*:*) +- echo sx8r-nec-superux${UNAME_RELEASE} +- exit ;; +- Power*:Rhapsody:*:*) +- echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit ;; +- *:Rhapsody:*:*) +- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit ;; +- *:Darwin:*:*) +- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown +- eval $set_cc_for_build +- if test "$UNAME_PROCESSOR" = unknown ; then +- UNAME_PROCESSOR=powerpc +- fi +- 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 +- UNAME_PROCESSOR=i386 +- UNAME_MACHINE=pc +- fi +- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit ;; +- *:QNX:*:4*) +- echo i386-pc-qnx +- exit ;; +- NEO-?:NONSTOP_KERNEL:*:*) +- echo neo-tandem-nsk${UNAME_RELEASE} +- exit ;; +- NSE-*:NONSTOP_KERNEL:*:*) +- echo nse-tandem-nsk${UNAME_RELEASE} +- exit ;; +- NSR-?:NONSTOP_KERNEL:*:*) +- echo nsr-tandem-nsk${UNAME_RELEASE} +- exit ;; +- *:NonStop-UX:*:*) +- echo mips-compaq-nonstopux +- exit ;; +- BS2000:POSIX*:*:*) +- echo bs2000-siemens-sysv +- exit ;; +- DS/*:UNIX_System_V:*:*) +- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit ;; +- *:Plan9:*:*) +- # "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 +- UNAME_MACHINE=i386 +- else +- UNAME_MACHINE="$cputype" +- fi +- echo ${UNAME_MACHINE}-unknown-plan9 +- exit ;; +- *:TOPS-10:*:*) +- echo pdp10-unknown-tops10 +- exit ;; +- *:TENEX:*:*) +- echo pdp10-unknown-tenex +- exit ;; +- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) +- echo pdp10-dec-tops20 +- exit ;; +- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) +- echo pdp10-xkl-tops20 +- exit ;; +- *:TOPS-20:*:*) +- echo pdp10-unknown-tops20 +- exit ;; +- *:ITS:*:*) +- echo pdp10-unknown-its +- exit ;; +- SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit ;; +- *:DragonFly:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit ;; +- *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` +- case "${UNAME_MACHINE}" in +- A*) echo alpha-dec-vms ; exit ;; +- I*) echo ia64-dec-vms ; exit ;; +- V*) echo vax-dec-vms ; exit ;; +- esac ;; +- *:XENIX:*:SysV) +- echo i386-pc-xenix +- exit ;; +- i*86:skyos:*:*) +- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' +- exit ;; +- i*86:rdos:*:*) +- echo ${UNAME_MACHINE}-pc-rdos +- exit ;; +- i*86:AROS:*:*) +- echo ${UNAME_MACHINE}-pc-aros +- exit ;; +- x86_64:VMkernel:*:*) +- echo ${UNAME_MACHINE}-unknown-esx +- exit ;; +-esac +- +-cat >&2 < in order to provide the needed +-information to handle your system. +- +-config.guess timestamp = $timestamp +- +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` +- +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null` +- +-hostinfo = `(hostinfo) 2>/dev/null` +-/bin/universe = `(/bin/universe) 2>/dev/null` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +-/bin/arch = `(/bin/arch) 2>/dev/null` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +- +-UNAME_MACHINE = ${UNAME_MACHINE} +-UNAME_RELEASE = ${UNAME_RELEASE} +-UNAME_SYSTEM = ${UNAME_SYSTEM} +-UNAME_VERSION = ${UNAME_VERSION} +-EOF +- +-exit 1 +- +-# Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) +-# time-stamp-start: "timestamp='" +-# time-stamp-format: "%:y-%02m-%02d" +-# time-stamp-end: "'" +-# End: +diff -Nuar groff-1.22.3.old/config.rpath groff-1.22.3/config.rpath +--- groff-1.22.3.old/config.rpath 2014-11-04 10:38:35.140525060 +0200 ++++ groff-1.22.3/config.rpath 1970-01-01 02:00:00.000000000 +0200 +@@ -1,684 +0,0 @@ +-#! /bin/sh +-# Output a system dependent set of variables, describing how to set the +-# run time search path of shared libraries in an executable. +-# +-# Copyright 1996-2014 Free Software Foundation, Inc. +-# Taken from GNU libtool, 2001 +-# Originally by Gordon Matzigkeit , 1996 +-# +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +-# +-# The first argument passed to this file is the canonical host specification, +-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +-# or +-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld +-# should be set by the caller. +-# +-# The set of defined variables is at the end of this script. +- +-# Known limitations: +-# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer +-# than 256 bytes, otherwise the compiler driver will dump core. The only +-# known workaround is to choose shorter directory names for the build +-# directory and/or the installation directory. +- +-# All known linkers require a '.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-shrext=.so +- +-host="$1" +-host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +- +-# Code taken from libtool.m4's _LT_CC_BASENAME. +- +-for cc_temp in $CC""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` +- +-# Code taken from libtool.m4's _LT_COMPILER_PIC. +- +-wl= +-if test "$GCC" = yes; then +- wl='-Wl,' +-else +- case "$host_os" in +- aix*) +- wl='-Wl,' +- ;; +- mingw* | cygwin* | pw32* | os2* | cegcc*) +- ;; +- hpux9* | hpux10* | hpux11*) +- wl='-Wl,' +- ;; +- irix5* | irix6* | nonstopux*) +- wl='-Wl,' +- ;; +- linux* | k*bsd*-gnu | kopensolaris*-gnu) +- case $cc_basename in +- ecc*) +- wl='-Wl,' +- ;; +- icc* | ifort*) +- wl='-Wl,' +- ;; +- lf95*) +- wl='-Wl,' +- ;; +- nagfor*) +- wl='-Wl,-Wl,,' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) +- wl='-Wl,' +- ;; +- ccc*) +- wl='-Wl,' +- ;; +- xl* | bgxl* | bgf* | mpixl*) +- wl='-Wl,' +- ;; +- como) +- wl='-lopt=' +- ;; +- *) +- case `$CC -V 2>&1 | sed 5q` in +- *Sun\ F* | *Sun*Fortran*) +- wl= +- ;; +- *Sun\ C*) +- wl='-Wl,' +- ;; +- esac +- ;; +- esac +- ;; +- newsos6) +- ;; +- *nto* | *qnx*) +- ;; +- osf3* | osf4* | osf5*) +- wl='-Wl,' +- ;; +- rdos*) +- ;; +- solaris*) +- case $cc_basename in +- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) +- wl='-Qoption ld ' +- ;; +- *) +- wl='-Wl,' +- ;; +- esac +- ;; +- sunos4*) +- wl='-Qoption ld ' +- ;; +- sysv4 | sysv4.2uw2* | sysv4.3*) +- wl='-Wl,' +- ;; +- sysv4*MP*) +- ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- wl='-Wl,' +- ;; +- unicos*) +- wl='-Wl,' +- ;; +- uts4*) +- ;; +- esac +-fi +- +-# Code taken from libtool.m4's _LT_LINKER_SHLIBS. +- +-hardcode_libdir_flag_spec= +-hardcode_libdir_separator= +-hardcode_direct=no +-hardcode_minus_L=no +- +-case "$host_os" in +- cygwin* | mingw* | pw32* | cegcc*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +-esac +- +-ld_shlibs=yes +-if test "$with_gnu_ld" = yes; then +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- # Unlike libtool, we use -rpath here, not --rpath, since the documented +- # option of GNU ld is called -rpath, not --rpath. +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- case "$host_os" in +- aix[3-9]*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- ld_shlibs=no +- fi +- ;; +- amigaos*) +- case "$host_cpu" in +- powerpc) +- ;; +- m68k) +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- ;; +- esac +- ;; +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- : +- else +- ld_shlibs=no +- fi +- ;; +- cygwin* | mingw* | pw32* | cegcc*) +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec='-L$libdir' +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- : +- else +- ld_shlibs=no +- fi +- ;; +- haiku*) +- ;; +- interix[3-9]*) +- hardcode_direct=no +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- ;; +- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- : +- else +- ld_shlibs=no +- fi +- ;; +- netbsd*) +- ;; +- solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- ld_shlibs=no +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- : +- else +- ld_shlibs=no +- fi +- ;; +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) +- ld_shlibs=no +- ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- else +- ld_shlibs=no +- fi +- ;; +- esac +- ;; +- sunos4*) +- hardcode_direct=yes +- ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- : +- else +- ld_shlibs=no +- fi +- ;; +- esac +- if test "$ld_shlibs" = no; then +- hardcode_libdir_flag_spec= +- fi +-else +- case "$host_os" in +- aix3*) +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- hardcode_minus_L=yes +- if test "$GCC" = yes; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- hardcode_direct=unsupported +- fi +- ;; +- aix[4-9]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- else +- aix_use_runtimelinking=no +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac +- fi +- hardcode_direct=yes +- hardcode_libdir_separator=':' +- if test "$GCC" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- hardcode_direct=unsupported +- hardcode_minus_L=yes +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_libdir_separator= +- fi +- ;; +- esac +- fi +- # Begin _LT_AC_SYS_LIBPATH_AIX. +- echo 'int main () { return 0; }' > conftest.c +- ${CC} ${LDFLAGS} conftest.c -o conftest +- aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +- if test -z "$aix_libpath"; then +- aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +-}'` +- fi +- if test -z "$aix_libpath"; then +- aix_libpath="/usr/lib:/lib" +- fi +- rm -f conftest.c conftest +- # End _LT_AC_SYS_LIBPATH_AIX. +- if test "$aix_use_runtimelinking" = yes; then +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' +- else +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- fi +- fi +- ;; +- amigaos*) +- case "$host_cpu" in +- powerpc) +- ;; +- m68k) +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- ;; +- esac +- ;; +- bsdi[45]*) +- ;; +- cygwin* | mingw* | pw32* | cegcc*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec=' ' +- libext=lib +- ;; +- darwin* | rhapsody*) +- hardcode_direct=no +- if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then +- : +- else +- ld_shlibs=no +- fi +- ;; +- dgux*) +- hardcode_libdir_flag_spec='-L$libdir' +- ;; +- freebsd2.[01]*) +- hardcode_direct=yes +- hardcode_minus_L=yes +- ;; +- freebsd* | dragonfly*) +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- ;; +- hpux9*) +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +- hardcode_direct=yes +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- ;; +- hpux10*) +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +- hardcode_direct=yes +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- fi +- ;; +- hpux11*) +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_direct=no +- ;; +- *) +- hardcode_direct=yes +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- ;; +- esac +- fi +- ;; +- irix5* | irix6* | nonstopux*) +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator=: +- ;; +- netbsd*) +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- ;; +- newsos6) +- hardcode_direct=yes +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator=: +- ;; +- *nto* | *qnx*) +- ;; +- openbsd*) +- if test -f /usr/libexec/ld.so; then +- hardcode_direct=yes +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- else +- case "$host_os" in +- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) +- hardcode_libdir_flag_spec='-R$libdir' +- ;; +- *) +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- else +- ld_shlibs=no +- fi +- ;; +- os2*) +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- ;; +- osf3*) +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator=: +- ;; +- osf4* | osf5*) +- if test "$GCC" = yes; then +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- else +- # Both cc and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec='-rpath $libdir' +- fi +- hardcode_libdir_separator=: +- ;; +- solaris*) +- hardcode_libdir_flag_spec='-R$libdir' +- ;; +- sunos4*) +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_direct=yes +- hardcode_minus_L=yes +- ;; +- sysv4) +- case $host_vendor in +- sni) +- hardcode_direct=yes # is this really true??? +- ;; +- siemens) +- hardcode_direct=no +- ;; +- motorola) +- hardcode_direct=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- ;; +- sysv4.3*) +- ;; +- sysv4*MP*) +- if test -d /usr/nec; then +- ld_shlibs=yes +- fi +- ;; +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- hardcode_libdir_separator=':' +- ;; +- uts4*) +- hardcode_libdir_flag_spec='-L$libdir' +- ;; +- *) +- ld_shlibs=no +- ;; +- esac +-fi +- +-# Check dynamic linker characteristics +-# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. +-# Unlike libtool.m4, here we don't care about _all_ names of the library, but +-# only about the one the linker finds when passed -lNAME. This is the last +-# element of library_names_spec in libtool.m4, or possibly two of them if the +-# linker has special search rules. +-library_names_spec= # the last element of library_names_spec in libtool.m4 +-libname_spec='lib$name' +-case "$host_os" in +- aix3*) +- library_names_spec='$libname.a' +- ;; +- aix[4-9]*) +- library_names_spec='$libname$shrext' +- ;; +- amigaos*) +- case "$host_cpu" in +- powerpc*) +- library_names_spec='$libname$shrext' ;; +- m68k) +- library_names_spec='$libname.a' ;; +- esac +- ;; +- beos*) +- library_names_spec='$libname$shrext' +- ;; +- bsdi[45]*) +- library_names_spec='$libname$shrext' +- ;; +- cygwin* | mingw* | pw32* | cegcc*) +- shrext=.dll +- library_names_spec='$libname.dll.a $libname.lib' +- ;; +- darwin* | rhapsody*) +- shrext=.dylib +- library_names_spec='$libname$shrext' +- ;; +- dgux*) +- library_names_spec='$libname$shrext' +- ;; +- freebsd[23].*) +- library_names_spec='$libname$shrext$versuffix' +- ;; +- freebsd* | dragonfly*) +- library_names_spec='$libname$shrext' +- ;; +- gnu*) +- library_names_spec='$libname$shrext' +- ;; +- haiku*) +- library_names_spec='$libname$shrext' +- ;; +- hpux9* | hpux10* | hpux11*) +- case $host_cpu in +- ia64*) +- shrext=.so +- ;; +- hppa*64*) +- shrext=.sl +- ;; +- *) +- shrext=.sl +- ;; +- esac +- library_names_spec='$libname$shrext' +- ;; +- interix[3-9]*) +- library_names_spec='$libname$shrext' +- ;; +- irix5* | irix6* | nonstopux*) +- library_names_spec='$libname$shrext' +- case "$host_os" in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; +- *) libsuff= shlibsuff= ;; +- esac +- ;; +- esac +- ;; +- linux*oldld* | linux*aout* | linux*coff*) +- ;; +- linux* | k*bsd*-gnu | kopensolaris*-gnu) +- library_names_spec='$libname$shrext' +- ;; +- knetbsd*-gnu) +- library_names_spec='$libname$shrext' +- ;; +- netbsd*) +- library_names_spec='$libname$shrext' +- ;; +- newsos6) +- library_names_spec='$libname$shrext' +- ;; +- *nto* | *qnx*) +- library_names_spec='$libname$shrext' +- ;; +- openbsd*) +- library_names_spec='$libname$shrext$versuffix' +- ;; +- os2*) +- libname_spec='$name' +- shrext=.dll +- library_names_spec='$libname.a' +- ;; +- osf3* | osf4* | osf5*) +- library_names_spec='$libname$shrext' +- ;; +- rdos*) +- ;; +- solaris*) +- library_names_spec='$libname$shrext' +- ;; +- sunos4*) +- library_names_spec='$libname$shrext$versuffix' +- ;; +- sysv4 | sysv4.3*) +- library_names_spec='$libname$shrext' +- ;; +- sysv4*MP*) +- library_names_spec='$libname$shrext' +- ;; +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- library_names_spec='$libname$shrext' +- ;; +- tpf*) +- library_names_spec='$libname$shrext' +- ;; +- uts4*) +- library_names_spec='$libname$shrext' +- ;; +-esac +- +-sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` +-shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +-escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +-escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +- +-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. +-# +-# 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 Exception is an additional permission under section 7 +-# of the GNU General Public License, version 3 ("GPLv3"). +- +- +-# Please send patches with a ChangeLog entry to config-patches@gnu.org. +-# +-# Configuration subroutine to validate and canonicalize a configuration type. +-# Supply the specified configuration type as an argument. +-# If it is invalid, we print an error message on stderr and exit with code 1. +-# 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 +- +-# This file is supposed to be the same for all GNU packages +-# and recognize all the CPU types, system types and aliases +-# that are meaningful with *any* GNU software. +-# Each package is responsible for reporting which valid configurations +-# it does not support. The user should be able to distinguish +-# a failure to support a valid configuration from a meaningless +-# configuration. +- +-# The goal of this file is to map all the various variations of a given +-# machine specification into a single specification in the form: +-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +-# or in some cases, the newer four-part form: +-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +-# It is wrong to echo any other type of specification. +- +-me=`echo "$0" | sed -e 's,.*/,,'` +- +-usage="\ +-Usage: $0 [OPTION] CPU-MFR-OPSYS +- $0 [OPTION] ALIAS +- +-Canonicalize a configuration name. +- +-Operation modes: +- -h, --help print this help, then exit +- -t, --time-stamp print date of last modification, then exit +- -v, --version print version number, then exit +- +-Report bugs and patches to ." +- +-version="\ +-GNU config.sub ($timestamp) +- +-Copyright 1992-2014 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." +- +-help=" +-Try \`$me --help' for more information." +- +-# Parse command line +-while test $# -gt 0 ; do +- case $1 in +- --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit ;; +- --version | -v ) +- echo "$version" ; exit ;; +- --help | --h* | -h ) +- echo "$usage"; exit ;; +- -- ) # Stop option processing +- shift; break ;; +- - ) # Use stdin as input. +- break ;; +- -* ) +- echo "$me: invalid option $1$help" +- exit 1 ;; +- +- *local*) +- # First pass through any local machine types. +- echo $1 +- exit ;; +- +- * ) +- break ;; +- esac +-done +- +-case $# in +- 0) echo "$me: missing argument$help" >&2 +- exit 1;; +- 1) ;; +- *) echo "$me: too many arguments$help" >&2 +- exit 1;; +-esac +- +-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +-# Here we must recognize all the valid KERNEL-OS combinations. +-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* | \ +- storm-chaos* | os2-emx* | rtmk-nova*) +- os=-$maybe_os +- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` +- ;; +- android-linux) +- os=-linux-android +- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown +- ;; +- *) +- basic_machine=`echo $1 | sed 's/-[^-]*$//'` +- if [ $basic_machine != $1 ] +- then os=`echo $1 | sed 's/.*-/-/'` +- else os=; fi +- ;; +-esac +- +-### Let's recognize common machines as not being operating systems so +-### that things like config.sub decstation-3100 work. We also +-### recognize some manufacturers as not being operating systems, so we +-### can provide default operating systems below. +-case $os in +- -sun*os*) +- # Prevent following clause from handling this invalid input. +- ;; +- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ +- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ +- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ +- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ +- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ +- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze*) +- os= +- basic_machine=$1 +- ;; +- -bluegene*) +- os=-cnk +- ;; +- -sim | -cisco | -oki | -wec | -winbond) +- os= +- basic_machine=$1 +- ;; +- -scout) +- ;; +- -wrs) +- os=-vxworks +- basic_machine=$1 +- ;; +- -chorusos*) +- os=-chorusos +- basic_machine=$1 +- ;; +- -chorusrdb) +- os=-chorusrdb +- basic_machine=$1 +- ;; +- -hiux*) +- os=-hiuxwe2 +- ;; +- -sco6) +- os=-sco5v6 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco5) +- os=-sco3.2v5 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco4) +- os=-sco3.2v4 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco3.2.[4-9]*) +- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco3.2v[4-9]*) +- # Don't forget version if it is 3.2v4 or newer. +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco5v6*) +- # Don't forget version if it is 3.2v4 or newer. +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco*) +- os=-sco3.2v2 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -udk*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -isc) +- os=-isc2.2 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -clix*) +- basic_machine=clipper-intergraph +- ;; +- -isc*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -lynx*178) +- os=-lynxos178 +- ;; +- -lynx*5) +- os=-lynxos5 +- ;; +- -lynx*) +- os=-lynxos +- ;; +- -ptx*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` +- ;; +- -windowsnt*) +- os=`echo $os | sed -e 's/windowsnt/winnt/'` +- ;; +- -psos*) +- os=-psos +- ;; +- -mint | -mint[0-9]*) +- basic_machine=m68k-atari +- os=-mint +- ;; +-esac +- +-# Decode aliases for certain CPU-COMPANY combinations. +-case $basic_machine in +- # Recognize the basic CPU types without company name. +- # Some are omitted here because they have special meanings below. +- 1750a | 580 \ +- | a29k \ +- | aarch64 | aarch64_be \ +- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ +- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ +- | am33_2.0 \ +- | arc | arceb \ +- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ +- | avr | avr32 \ +- | be32 | be64 \ +- | bfin \ +- | c4x | c8051 | clipper \ +- | d10v | d30v | dlx | dsp16xx \ +- | epiphany \ +- | fido | fr30 | frv \ +- | 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 \ +- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ +- | mips | mipsbe | mipseb | mipsel | mipsle \ +- | mips16 \ +- | mips64 | mips64el \ +- | mips64octeon | mips64octeonel \ +- | mips64orion | mips64orionel \ +- | mips64r5900 | mips64r5900el \ +- | mips64vr | mips64vrel \ +- | mips64vr4100 | mips64vr4100el \ +- | mips64vr4300 | mips64vr4300el \ +- | mips64vr5000 | mips64vr5000el \ +- | mips64vr5900 | mips64vr5900el \ +- | mipsisa32 | mipsisa32el \ +- | mipsisa32r2 | mipsisa32r2el \ +- | mipsisa32r6 | mipsisa32r6el \ +- | mipsisa64 | mipsisa64el \ +- | mipsisa64r2 | mipsisa64r2el \ +- | mipsisa64r6 | mipsisa64r6el \ +- | mipsisa64sb1 | mipsisa64sb1el \ +- | mipsisa64sr71k | mipsisa64sr71kel \ +- | mipsr5900 | mipsr5900el \ +- | mipstx39 | mipstx39el \ +- | mn10200 | mn10300 \ +- | moxie \ +- | mt \ +- | msp430 \ +- | nds32 | nds32le | nds32be \ +- | nios | nios2 | nios2eb | nios2el \ +- | ns16k | ns32k \ +- | open8 | or1k | or1knd | or32 \ +- | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle \ +- | 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 \ +- | sh64 | sh64le \ +- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ +- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu \ +- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ +- | ubicom32 \ +- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ +- | we32k \ +- | x86 | xc16x | xstormy16 | xtensa \ +- | z8k | z80) +- basic_machine=$basic_machine-unknown +- ;; +- c54x) +- basic_machine=tic54x-unknown +- ;; +- c55x) +- basic_machine=tic55x-unknown +- ;; +- c6x) +- basic_machine=tic6x-unknown +- ;; +- leon|leon[3-9]) +- basic_machine=sparc-$basic_machine +- ;; +- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) +- basic_machine=$basic_machine-unknown +- os=-none +- ;; +- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) +- ;; +- ms1) +- basic_machine=mt-unknown +- ;; +- +- strongarm | thumb | xscale) +- basic_machine=arm-unknown +- ;; +- xgate) +- basic_machine=$basic_machine-unknown +- os=-none +- ;; +- xscaleeb) +- basic_machine=armeb-unknown +- ;; +- +- xscaleel) +- basic_machine=armel-unknown +- ;; +- +- # We use `pc' rather than `unknown' +- # because (1) that's what they normally are, and +- # (2) the word "unknown" tends to confuse beginning users. +- i*86 | x86_64) +- basic_machine=$basic_machine-pc +- ;; +- # Object if more than one company name word. +- *-*-*) +- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +- exit 1 +- ;; +- # Recognize the basic CPU types with company name. +- 580-* \ +- | a29k-* \ +- | aarch64-* | aarch64_be-* \ +- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ +- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ +- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* | avr32-* \ +- | be32-* | be64-* \ +- | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* \ +- | c8051-* | clipper-* | craynv-* | cydra-* \ +- | d10v-* | d30v-* | dlx-* \ +- | 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-* \ +- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ +- | microblaze-* | microblazeel-* \ +- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ +- | mips16-* \ +- | mips64-* | mips64el-* \ +- | mips64octeon-* | mips64octeonel-* \ +- | mips64orion-* | mips64orionel-* \ +- | mips64r5900-* | mips64r5900el-* \ +- | mips64vr-* | mips64vrel-* \ +- | mips64vr4100-* | mips64vr4100el-* \ +- | mips64vr4300-* | mips64vr4300el-* \ +- | mips64vr5000-* | mips64vr5000el-* \ +- | mips64vr5900-* | mips64vr5900el-* \ +- | mipsisa32-* | mipsisa32el-* \ +- | mipsisa32r2-* | mipsisa32r2el-* \ +- | mipsisa32r6-* | mipsisa32r6el-* \ +- | mipsisa64-* | mipsisa64el-* \ +- | mipsisa64r2-* | mipsisa64r2el-* \ +- | mipsisa64r6-* | mipsisa64r6el-* \ +- | mipsisa64sb1-* | mipsisa64sb1el-* \ +- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ +- | mipsr5900-* | mipsr5900el-* \ +- | mipstx39-* | mipstx39el-* \ +- | mmix-* \ +- | mt-* \ +- | msp430-* \ +- | nds32-* | nds32le-* | nds32be-* \ +- | nios-* | nios2-* | nios2eb-* | nios2el-* \ +- | none-* | np1-* | ns16k-* | ns32k-* \ +- | open8-* \ +- | or1k*-* \ +- | orion-* \ +- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ +- | pyramid-* \ +- | 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?-* \ +- | tahoe-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ +- | tile*-* \ +- | tron-* \ +- | ubicom32-* \ +- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ +- | vax-* \ +- | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* \ +- | xstormy16-* | xtensa*-* \ +- | ymp-* \ +- | z8k-* | z80-*) +- ;; +- # Recognize the basic CPU types without company name, with glob match. +- xtensa*) +- basic_machine=$basic_machine-unknown +- ;; +- # Recognize the various machine names and aliases which stand +- # for a CPU type and a company and sometimes even an OS. +- 386bsd) +- basic_machine=i386-unknown +- os=-bsd +- ;; +- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) +- basic_machine=m68000-att +- ;; +- 3b*) +- basic_machine=we32k-att +- ;; +- a29khif) +- basic_machine=a29k-amd +- os=-udi +- ;; +- abacus) +- basic_machine=abacus-unknown +- ;; +- adobe68k) +- basic_machine=m68010-adobe +- os=-scout +- ;; +- alliant | fx80) +- basic_machine=fx80-alliant +- ;; +- altos | altos3068) +- basic_machine=m68k-altos +- ;; +- am29k) +- basic_machine=a29k-none +- os=-bsd +- ;; +- amd64) +- basic_machine=x86_64-pc +- ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- amdahl) +- basic_machine=580-amdahl +- os=-sysv +- ;; +- amiga | amiga-*) +- basic_machine=m68k-unknown +- ;; +- amigaos | amigados) +- basic_machine=m68k-unknown +- os=-amigaos +- ;; +- amigaunix | amix) +- basic_machine=m68k-unknown +- os=-sysv4 +- ;; +- apollo68) +- basic_machine=m68k-apollo +- os=-sysv +- ;; +- apollo68bsd) +- basic_machine=m68k-apollo +- os=-bsd +- ;; +- aros) +- basic_machine=i386-pc +- os=-aros +- ;; +- aux) +- basic_machine=m68k-apple +- os=-aux +- ;; +- balance) +- basic_machine=ns32k-sequent +- os=-dynix +- ;; +- blackfin) +- basic_machine=bfin-unknown +- os=-linux +- ;; +- blackfin-*) +- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` +- os=-linux +- ;; +- bluegene*) +- basic_machine=powerpc-ibm +- os=-cnk +- ;; +- c54x-*) +- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- c55x-*) +- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- c6x-*) +- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- c90) +- basic_machine=c90-cray +- os=-unicos +- ;; +- cegcc) +- basic_machine=arm-unknown +- os=-cegcc +- ;; +- convex-c1) +- basic_machine=c1-convex +- os=-bsd +- ;; +- convex-c2) +- basic_machine=c2-convex +- os=-bsd +- ;; +- convex-c32) +- basic_machine=c32-convex +- os=-bsd +- ;; +- convex-c34) +- basic_machine=c34-convex +- os=-bsd +- ;; +- convex-c38) +- basic_machine=c38-convex +- os=-bsd +- ;; +- cray | j90) +- basic_machine=j90-cray +- os=-unicos +- ;; +- craynv) +- basic_machine=craynv-cray +- os=-unicosmp +- ;; +- cr16 | cr16-*) +- basic_machine=cr16-unknown +- os=-elf +- ;; +- crds | unos) +- basic_machine=m68k-crds +- ;; +- crisv32 | crisv32-* | etraxfs*) +- basic_machine=crisv32-axis +- ;; +- cris | cris-* | etrax*) +- basic_machine=cris-axis +- ;; +- crx) +- basic_machine=crx-unknown +- os=-elf +- ;; +- da30 | da30-*) +- basic_machine=m68k-da30 +- ;; +- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) +- basic_machine=mips-dec +- ;; +- decsystem10* | dec10*) +- basic_machine=pdp10-dec +- os=-tops10 +- ;; +- decsystem20* | dec20*) +- basic_machine=pdp10-dec +- os=-tops20 +- ;; +- delta | 3300 | motorola-3300 | motorola-delta \ +- | 3300-motorola | delta-motorola) +- basic_machine=m68k-motorola +- ;; +- delta88) +- basic_machine=m88k-motorola +- os=-sysv3 +- ;; +- dicos) +- basic_machine=i686-pc +- os=-dicos +- ;; +- djgpp) +- basic_machine=i586-pc +- os=-msdosdjgpp +- ;; +- dpx20 | dpx20-*) +- basic_machine=rs6000-bull +- os=-bosx +- ;; +- dpx2* | dpx2*-bull) +- basic_machine=m68k-bull +- os=-sysv3 +- ;; +- ebmon29k) +- basic_machine=a29k-amd +- os=-ebmon +- ;; +- elxsi) +- basic_machine=elxsi-elxsi +- os=-bsd +- ;; +- encore | umax | mmax) +- basic_machine=ns32k-encore +- ;; +- es1800 | OSE68k | ose68k | ose | OSE) +- basic_machine=m68k-ericsson +- os=-ose +- ;; +- fx2800) +- basic_machine=i860-alliant +- ;; +- genix) +- basic_machine=ns32k-ns +- ;; +- gmicro) +- basic_machine=tron-gmicro +- os=-sysv +- ;; +- go32) +- basic_machine=i386-pc +- os=-go32 +- ;; +- h3050r* | hiux*) +- basic_machine=hppa1.1-hitachi +- os=-hiuxwe2 +- ;; +- h8300hms) +- basic_machine=h8300-hitachi +- os=-hms +- ;; +- h8300xray) +- basic_machine=h8300-hitachi +- os=-xray +- ;; +- h8500hms) +- basic_machine=h8500-hitachi +- os=-hms +- ;; +- harris) +- basic_machine=m88k-harris +- os=-sysv3 +- ;; +- hp300-*) +- basic_machine=m68k-hp +- ;; +- hp300bsd) +- basic_machine=m68k-hp +- os=-bsd +- ;; +- hp300hpux) +- basic_machine=m68k-hp +- os=-hpux +- ;; +- hp3k9[0-9][0-9] | hp9[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hp9k2[0-9][0-9] | hp9k31[0-9]) +- basic_machine=m68000-hp +- ;; +- hp9k3[2-9][0-9]) +- basic_machine=m68k-hp +- ;; +- hp9k6[0-9][0-9] | hp6[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hp9k7[0-79][0-9] | hp7[0-79][0-9]) +- basic_machine=hppa1.1-hp +- ;; +- hp9k78[0-9] | hp78[0-9]) +- # FIXME: really hppa2.0-hp +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) +- # FIXME: really hppa2.0-hp +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[0-9][13679] | hp8[0-9][13679]) +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[0-9][0-9] | hp8[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hppa-next) +- os=-nextstep3 +- ;; +- hppaosf) +- basic_machine=hppa1.1-hp +- os=-osf +- ;; +- hppro) +- basic_machine=hppa1.1-hp +- os=-proelf +- ;; +- i370-ibm* | ibm*) +- basic_machine=i370-ibm +- ;; +- i*86v32) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv32 +- ;; +- i*86v4*) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv4 +- ;; +- i*86v) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv +- ;; +- i*86sol2) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-solaris2 +- ;; +- i386mach) +- basic_machine=i386-mach +- os=-mach +- ;; +- i386-vsta | vsta) +- basic_machine=i386-unknown +- os=-vsta +- ;; +- iris | iris4d) +- basic_machine=mips-sgi +- case $os in +- -irix*) +- ;; +- *) +- os=-irix4 +- ;; +- esac +- ;; +- isi68 | isi) +- 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 +- ;; +- m68knommu-*) +- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` +- os=-linux +- ;; +- m88k-omron*) +- basic_machine=m88k-omron +- ;; +- magnum | m3230) +- basic_machine=mips-mips +- os=-sysv +- ;; +- merlin) +- basic_machine=ns32k-utek +- os=-sysv +- ;; +- microblaze*) +- basic_machine=microblaze-xilinx +- ;; +- mingw64) +- basic_machine=x86_64-pc +- os=-mingw64 +- ;; +- mingw32) +- basic_machine=i686-pc +- os=-mingw32 +- ;; +- mingw32ce) +- basic_machine=arm-unknown +- os=-mingw32ce +- ;; +- miniframe) +- basic_machine=m68000-convergent +- ;; +- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) +- basic_machine=m68k-atari +- os=-mint +- ;; +- mips3*-*) +- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` +- ;; +- mips3*) +- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown +- ;; +- monitor) +- basic_machine=m68k-rom68k +- os=-coff +- ;; +- morphos) +- basic_machine=powerpc-unknown +- os=-morphos +- ;; +- moxiebox) +- basic_machine=moxie-unknown +- os=-moxiebox +- ;; +- msdos) +- basic_machine=i386-pc +- os=-msdos +- ;; +- ms1-*) +- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` +- ;; +- msys) +- basic_machine=i686-pc +- os=-msys +- ;; +- mvs) +- basic_machine=i370-ibm +- os=-mvs +- ;; +- nacl) +- basic_machine=le32-unknown +- os=-nacl +- ;; +- ncr3000) +- basic_machine=i486-ncr +- os=-sysv4 +- ;; +- netbsd386) +- basic_machine=i386-unknown +- os=-netbsd +- ;; +- netwinder) +- basic_machine=armv4l-rebel +- os=-linux +- ;; +- news | news700 | news800 | news900) +- basic_machine=m68k-sony +- os=-newsos +- ;; +- news1000) +- basic_machine=m68030-sony +- os=-newsos +- ;; +- news-3600 | risc-news) +- basic_machine=mips-sony +- os=-newsos +- ;; +- necv70) +- basic_machine=v70-nec +- os=-sysv +- ;; +- next | m*-next ) +- basic_machine=m68k-next +- case $os in +- -nextstep* ) +- ;; +- -ns2*) +- os=-nextstep2 +- ;; +- *) +- os=-nextstep3 +- ;; +- esac +- ;; +- nh3000) +- basic_machine=m68k-harris +- os=-cxux +- ;; +- nh[45]000) +- basic_machine=m88k-harris +- os=-cxux +- ;; +- nindy960) +- basic_machine=i960-intel +- os=-nindy +- ;; +- mon960) +- basic_machine=i960-intel +- os=-mon960 +- ;; +- nonstopux) +- basic_machine=mips-compaq +- os=-nonstopux +- ;; +- np1) +- basic_machine=np1-gould +- ;; +- neo-tandem) +- basic_machine=neo-tandem +- ;; +- nse-tandem) +- basic_machine=nse-tandem +- ;; +- nsr-tandem) +- basic_machine=nsr-tandem +- ;; +- op50n-* | op60c-*) +- basic_machine=hppa1.1-oki +- os=-proelf +- ;; +- openrisc | openrisc-*) +- basic_machine=or32-unknown +- ;; +- os400) +- basic_machine=powerpc-ibm +- os=-os400 +- ;; +- OSE68000 | ose68000) +- basic_machine=m68000-ericsson +- os=-ose +- ;; +- os68k) +- basic_machine=m68k-none +- os=-os68k +- ;; +- pa-hitachi) +- basic_machine=hppa1.1-hitachi +- os=-hiuxwe2 +- ;; +- paragon) +- basic_machine=i860-intel +- os=-osf +- ;; +- parisc) +- basic_machine=hppa-unknown +- os=-linux +- ;; +- parisc-*) +- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` +- os=-linux +- ;; +- pbd) +- basic_machine=sparc-tti +- ;; +- pbb) +- basic_machine=m68k-tti +- ;; +- pc532 | pc532-*) +- basic_machine=ns32k-pc532 +- ;; +- pc98) +- basic_machine=i386-pc +- ;; +- pc98-*) +- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentium | p5 | k5 | k6 | nexgen | viac3) +- basic_machine=i586-pc +- ;; +- pentiumpro | p6 | 6x86 | athlon | athlon_*) +- basic_machine=i686-pc +- ;; +- pentiumii | pentium2 | pentiumiii | pentium3) +- basic_machine=i686-pc +- ;; +- pentium4) +- basic_machine=i786-pc +- ;; +- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) +- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentiumpro-* | p6-* | 6x86-* | athlon-*) +- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) +- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentium4-*) +- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pn) +- basic_machine=pn-gould +- ;; +- power) basic_machine=power-ibm +- ;; +- ppc | ppcbe) basic_machine=powerpc-unknown +- ;; +- ppc-* | ppcbe-*) +- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppcle | powerpclittle | ppc-le | powerpc-little) +- basic_machine=powerpcle-unknown +- ;; +- ppcle-* | powerpclittle-*) +- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppc64) basic_machine=powerpc64-unknown +- ;; +- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppc64le | powerpc64little | ppc64-le | powerpc64-little) +- basic_machine=powerpc64le-unknown +- ;; +- ppc64le-* | powerpc64little-*) +- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ps2) +- basic_machine=i386-ibm +- ;; +- pw32) +- basic_machine=i586-unknown +- os=-pw32 +- ;; +- rdos | rdos64) +- basic_machine=x86_64-pc +- os=-rdos +- ;; +- rdos32) +- basic_machine=i386-pc +- os=-rdos +- ;; +- rom68k) +- basic_machine=m68k-rom68k +- os=-coff +- ;; +- rm[46]00) +- basic_machine=mips-siemens +- ;; +- rtpc | rtpc-*) +- basic_machine=romp-ibm +- ;; +- s390 | s390-*) +- basic_machine=s390-ibm +- ;; +- s390x | s390x-*) +- basic_machine=s390x-ibm +- ;; +- sa29200) +- basic_machine=a29k-amd +- os=-udi +- ;; +- sb1) +- basic_machine=mipsisa64sb1-unknown +- ;; +- sb1el) +- basic_machine=mipsisa64sb1el-unknown +- ;; +- sde) +- basic_machine=mipsisa32-sde +- os=-elf +- ;; +- sei) +- basic_machine=mips-sei +- os=-seiux +- ;; +- sequent) +- basic_machine=i386-sequent +- ;; +- sh) +- basic_machine=sh-hitachi +- os=-hms +- ;; +- sh5el) +- basic_machine=sh5le-unknown +- ;; +- sh64) +- basic_machine=sh64-unknown +- ;; +- sparclite-wrs | simso-wrs) +- basic_machine=sparclite-wrs +- os=-vxworks +- ;; +- sps7) +- basic_machine=m68k-bull +- os=-sysv2 +- ;; +- spur) +- basic_machine=spur-unknown +- ;; +- st2000) +- basic_machine=m68k-tandem +- ;; +- stratus) +- basic_machine=i860-stratus +- os=-sysv4 +- ;; +- strongarm-* | thumb-*) +- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- sun2) +- basic_machine=m68000-sun +- ;; +- sun2os3) +- basic_machine=m68000-sun +- os=-sunos3 +- ;; +- sun2os4) +- basic_machine=m68000-sun +- os=-sunos4 +- ;; +- sun3os3) +- basic_machine=m68k-sun +- os=-sunos3 +- ;; +- sun3os4) +- basic_machine=m68k-sun +- os=-sunos4 +- ;; +- sun4os3) +- basic_machine=sparc-sun +- os=-sunos3 +- ;; +- sun4os4) +- basic_machine=sparc-sun +- os=-sunos4 +- ;; +- sun4sol2) +- basic_machine=sparc-sun +- os=-solaris2 +- ;; +- sun3 | sun3-*) +- basic_machine=m68k-sun +- ;; +- sun4) +- basic_machine=sparc-sun +- ;; +- sun386 | sun386i | roadrunner) +- basic_machine=i386-sun +- ;; +- sv1) +- basic_machine=sv1-cray +- os=-unicos +- ;; +- symmetry) +- basic_machine=i386-sequent +- os=-dynix +- ;; +- t3e) +- basic_machine=alphaev5-cray +- os=-unicos +- ;; +- t90) +- basic_machine=t90-cray +- os=-unicos +- ;; +- tile*) +- basic_machine=$basic_machine-unknown +- os=-linux-gnu +- ;; +- tx39) +- basic_machine=mipstx39-unknown +- ;; +- tx39el) +- basic_machine=mipstx39el-unknown +- ;; +- toad1) +- basic_machine=pdp10-xkl +- os=-tops20 +- ;; +- tower | tower-32) +- basic_machine=m68k-ncr +- ;; +- tpf) +- basic_machine=s390x-ibm +- os=-tpf +- ;; +- udi29k) +- basic_machine=a29k-amd +- os=-udi +- ;; +- ultra3) +- basic_machine=a29k-nyu +- os=-sym1 +- ;; +- v810 | necv810) +- basic_machine=v810-nec +- os=-none +- ;; +- vaxv) +- basic_machine=vax-dec +- os=-sysv +- ;; +- vms) +- basic_machine=vax-dec +- os=-vms +- ;; +- vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; +- vxworks960) +- basic_machine=i960-wrs +- os=-vxworks +- ;; +- vxworks68) +- basic_machine=m68k-wrs +- os=-vxworks +- ;; +- vxworks29k) +- basic_machine=a29k-wrs +- os=-vxworks +- ;; +- w65*) +- basic_machine=w65-wdc +- os=-none +- ;; +- w89k-*) +- basic_machine=hppa1.1-winbond +- os=-proelf +- ;; +- xbox) +- basic_machine=i686-pc +- os=-mingw32 +- ;; +- xps | xps100) +- basic_machine=xps100-honeywell +- ;; +- xscale-* | xscalee[bl]-*) +- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` +- ;; +- ymp) +- basic_machine=ymp-cray +- os=-unicos +- ;; +- z8k-*-coff) +- basic_machine=z8k-unknown +- os=-sim +- ;; +- z80-*-coff) +- basic_machine=z80-unknown +- os=-sim +- ;; +- none) +- basic_machine=none-none +- os=-none +- ;; +- +-# Here we handle the default manufacturer of certain CPU types. It is in +-# some cases the only manufacturer, in others, it is the most popular. +- w89k) +- basic_machine=hppa1.1-winbond +- ;; +- op50n) +- basic_machine=hppa1.1-oki +- ;; +- op60c) +- basic_machine=hppa1.1-oki +- ;; +- romp) +- basic_machine=romp-ibm +- ;; +- mmix) +- basic_machine=mmix-knuth +- ;; +- rs6000) +- basic_machine=rs6000-ibm +- ;; +- vax) +- basic_machine=vax-dec +- ;; +- pdp10) +- # there are many clones, so DEC is not a safe bet +- basic_machine=pdp10-unknown +- ;; +- pdp11) +- basic_machine=pdp11-dec +- ;; +- we32k) +- basic_machine=we32k-att +- ;; +- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) +- basic_machine=sh-unknown +- ;; +- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +- basic_machine=sparc-sun +- ;; +- cydra) +- basic_machine=cydra-cydrome +- ;; +- orion) +- basic_machine=orion-highlevel +- ;; +- orion105) +- basic_machine=clipper-highlevel +- ;; +- mac | mpw | mac-mpw) +- basic_machine=m68k-apple +- ;; +- pmac | pmac-mpw) +- basic_machine=powerpc-apple +- ;; +- *-unknown) +- # Make sure to match an already-canonicalized machine name. +- ;; +- *) +- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +- exit 1 +- ;; +-esac +- +-# Here we canonicalize certain aliases for manufacturers. +-case $basic_machine in +- *-digital*) +- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +- ;; +- *-commodore*) +- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` +- ;; +- *) +- ;; +-esac +- +-# Decode manufacturer-specific aliases for certain operating systems. +- +-if [ x"$os" != x"" ] +-then +-case $os in +- # First match some system type aliases +- # that might get confused with valid system types. +- # -solaris* is a basic system type, with this one exception. +- -auroraux) +- os=-auroraux +- ;; +- -solaris1 | -solaris1.*) +- os=`echo $os | sed -e 's|solaris1|sunos4|'` +- ;; +- -solaris) +- os=-solaris2 +- ;; +- -svr4*) +- os=-sysv4 +- ;; +- -unixware*) +- os=-sysv4.2uw +- ;; +- -gnu/linux*) +- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` +- ;; +- # First accept the basic system types. +- # The portable systems comes first. +- # Each alternative MUST END IN A *, to match a version number. +- # -sysv* is not here because it comes later, after sysvr4. +- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ +- | -sym* | -kopensolaris* | -plan9* \ +- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* | -aros* \ +- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -bitrig* | -openbsd* | -solidbsd* \ +- | -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* \ +- | -linux-newlib* | -linux-musl* | -linux-uclibc* \ +- | -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* | -tirtos*) +- # Remember, each alternative MUST END IN *, to match a version number. +- ;; +- -qnx*) +- case $basic_machine in +- x86-* | i*86-*) +- ;; +- *) +- os=-nto$os +- ;; +- esac +- ;; +- -nto-qnx*) +- ;; +- -nto*) +- os=`echo $os | sed -e 's|nto|nto-qnx|'` +- ;; +- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ +- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) +- ;; +- -mac*) +- os=`echo $os | sed -e 's|mac|macos|'` +- ;; +- -linux-dietlibc) +- os=-linux-dietlibc +- ;; +- -linux*) +- os=`echo $os | sed -e 's|linux|linux-gnu|'` +- ;; +- -sunos5*) +- os=`echo $os | sed -e 's|sunos5|solaris2|'` +- ;; +- -sunos6*) +- os=`echo $os | sed -e 's|sunos6|solaris3|'` +- ;; +- -opened*) +- os=-openedition +- ;; +- -os400*) +- os=-os400 +- ;; +- -wince*) +- os=-wince +- ;; +- -osfrose*) +- os=-osfrose +- ;; +- -osf*) +- os=-osf +- ;; +- -utek*) +- os=-bsd +- ;; +- -dynix*) +- os=-bsd +- ;; +- -acis*) +- os=-aos +- ;; +- -atheos*) +- os=-atheos +- ;; +- -syllable*) +- os=-syllable +- ;; +- -386bsd) +- os=-bsd +- ;; +- -ctix* | -uts*) +- os=-sysv +- ;; +- -nova*) +- os=-rtmk-nova +- ;; +- -ns2 ) +- os=-nextstep2 +- ;; +- -nsk*) +- os=-nsk +- ;; +- # Preserve the version number of sinix5. +- -sinix5.*) +- os=`echo $os | sed -e 's|sinix|sysv|'` +- ;; +- -sinix*) +- os=-sysv4 +- ;; +- -tpf*) +- os=-tpf +- ;; +- -triton*) +- os=-sysv3 +- ;; +- -oss*) +- os=-sysv3 +- ;; +- -svr4) +- os=-sysv4 +- ;; +- -svr3) +- os=-sysv3 +- ;; +- -sysvr4) +- os=-sysv4 +- ;; +- # This must come after -sysvr4. +- -sysv*) +- ;; +- -ose*) +- os=-ose +- ;; +- -es1800*) +- os=-ose +- ;; +- -xenix) +- os=-xenix +- ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- os=-mint +- ;; +- -aros*) +- os=-aros +- ;; +- -zvmoe) +- os=-zvmoe +- ;; +- -dicos*) +- os=-dicos +- ;; +- -nacl*) +- ;; +- -none) +- ;; +- *) +- # Get rid of the `-' at the beginning of $os. +- os=`echo $os | sed 's/[^-]*-//'` +- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 +- exit 1 +- ;; +-esac +-else +- +-# Here we handle the default operating systems that come with various machines. +-# The value should be what the vendor currently ships out the door with their +-# machine or put another way, the most popular os provided with the machine. +- +-# Note that if you're going to try to match "-MANUFACTURER" here (say, +-# "-sun"), then you have to tell the case statement up towards the top +-# that MANUFACTURER isn't an operating system. Otherwise, code above +-# will signal an error saying that MANUFACTURER isn't an operating +-# system, and we'll never get to this point. +- +-case $basic_machine in +- score-*) +- os=-elf +- ;; +- spu-*) +- os=-elf +- ;; +- *-acorn) +- os=-riscix1.2 +- ;; +- arm*-rebel) +- os=-linux +- ;; +- arm*-semi) +- os=-aout +- ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; +- c8051-*) +- os=-elf +- ;; +- hexagon-*) +- os=-elf +- ;; +- tic54x-*) +- os=-coff +- ;; +- tic55x-*) +- os=-coff +- ;; +- tic6x-*) +- os=-coff +- ;; +- # This must come before the *-dec entry. +- pdp10-*) +- os=-tops20 +- ;; +- pdp11-*) +- os=-none +- ;; +- *-dec | vax-*) +- os=-ultrix4.2 +- ;; +- m68*-apollo) +- os=-domain +- ;; +- i386-sun) +- os=-sunos4.0.2 +- ;; +- m68000-sun) +- os=-sunos3 +- ;; +- m68*-cisco) +- os=-aout +- ;; +- mep-*) +- os=-elf +- ;; +- mips*-cisco) +- os=-elf +- ;; +- mips*-*) +- os=-elf +- ;; +- or32-*) +- os=-coff +- ;; +- *-tti) # must be before sparc entry or we get the wrong os. +- os=-sysv3 +- ;; +- sparc-* | *-sun) +- os=-sunos4.1.1 +- ;; +- *-be) +- os=-beos +- ;; +- *-haiku) +- os=-haiku +- ;; +- *-ibm) +- os=-aix +- ;; +- *-knuth) +- os=-mmixware +- ;; +- *-wec) +- os=-proelf +- ;; +- *-winbond) +- os=-proelf +- ;; +- *-oki) +- os=-proelf +- ;; +- *-hp) +- os=-hpux +- ;; +- *-hitachi) +- os=-hiux +- ;; +- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) +- os=-sysv +- ;; +- *-cbm) +- os=-amigaos +- ;; +- *-dg) +- os=-dgux +- ;; +- *-dolphin) +- os=-sysv3 +- ;; +- m68k-ccur) +- os=-rtu +- ;; +- m88k-omron*) +- os=-luna +- ;; +- *-next ) +- os=-nextstep +- ;; +- *-sequent) +- os=-ptx +- ;; +- *-crds) +- os=-unos +- ;; +- *-ns) +- os=-genix +- ;; +- i370-*) +- os=-mvs +- ;; +- *-next) +- os=-nextstep3 +- ;; +- *-gould) +- os=-sysv +- ;; +- *-highlevel) +- os=-bsd +- ;; +- *-encore) +- os=-bsd +- ;; +- *-sgi) +- os=-irix +- ;; +- *-siemens) +- os=-sysv4 +- ;; +- *-masscomp) +- os=-rtu +- ;; +- f30[01]-fujitsu | f700-fujitsu) +- os=-uxpv +- ;; +- *-rom68k) +- os=-coff +- ;; +- *-*bug) +- os=-coff +- ;; +- *-apple) +- os=-macos +- ;; +- *-atari*) +- os=-mint +- ;; +- *) +- os=-none +- ;; +-esac +-fi +- +-# Here we handle the case where we know the os, and the CPU type, but not the +-# manufacturer. We pick the logical manufacturer. +-vendor=unknown +-case $basic_machine in +- *-unknown) +- case $os in +- -riscix*) +- vendor=acorn +- ;; +- -sunos*) +- vendor=sun +- ;; +- -cnk*|-aix*) +- vendor=ibm +- ;; +- -beos*) +- vendor=be +- ;; +- -hpux*) +- vendor=hp +- ;; +- -mpeix*) +- vendor=hp +- ;; +- -hiux*) +- vendor=hitachi +- ;; +- -unos*) +- vendor=crds +- ;; +- -dgux*) +- vendor=dg +- ;; +- -luna*) +- vendor=omron +- ;; +- -genix*) +- vendor=ns +- ;; +- -mvs* | -opened*) +- vendor=ibm +- ;; +- -os400*) +- vendor=ibm +- ;; +- -ptx*) +- vendor=sequent +- ;; +- -tpf*) +- vendor=ibm +- ;; +- -vxsim* | -vxworks* | -windiss*) +- vendor=wrs +- ;; +- -aux*) +- vendor=apple +- ;; +- -hms*) +- vendor=hitachi +- ;; +- -mpw* | -macos*) +- vendor=apple +- ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- vendor=atari +- ;; +- -vos*) +- vendor=stratus +- ;; +- esac +- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` +- ;; +-esac +- +-echo $basic_machine$os +-exit +- +-# Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) +-# time-stamp-start: "timestamp='" +-# time-stamp-format: "%:y-%02m-%02d" +-# time-stamp-end: "'" +-# End: +diff -Nuar groff-1.22.3.old/configure groff-1.22.3/configure +--- groff-1.22.3.old/configure 2014-11-04 10:39:11.525070190 +0200 ++++ groff-1.22.3/configure 1970-01-01 02:00:00.000000000 +0200 +@@ -1,12366 +0,0 @@ +-#! /bin/sh +-# Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for groff 1.22.3. +-# +-# Report bugs to . +-# +-# +-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +-# +-# +-# This configure script is free software; the Free Software Foundation +-# gives unlimited permission to copy, distribute and modify it. +-## -------------------- ## +-## M4sh Initialization. ## +-## -------------------- ## +- +-# Be more Bourne compatible +-DUALCASE=1; export DUALCASE # for MKS sh +-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 +-else +- case `(set -o) 2>/dev/null` in #( +- *posix*) : +- set -o posix ;; #( +- *) : +- ;; +-esac +-fi +- +- +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-# Prefer a ksh shell builtin over an external printf program on Solaris, +-# but without wasting forks for bash or zsh. +-if test -z "$BASH_VERSION$ZSH_VERSION" \ +- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='print -r --' +- as_echo_n='print -rn --' +-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in #( +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } +-fi +- +- +-# IFS +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent editors from complaining about space-tab. +-# (If _AS_PATH_WALK were called with IFS unset, it would disable word +-# splitting by setting IFS to empty value.) +-IFS=" "" $as_nl" +- +-# Find who we are. Look in the path if we contain no directory separator. +-as_myself= +-case $0 in #(( +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' +-# in which case we are not to be found in the path. +-if test "x$as_myself" = x; then +- as_myself=$0 +-fi +-if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- exit 1 +-fi +- +-# Unset variables that we do not need and which cause bugs (e.g. in +-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +-# suppresses any "Segmentation fault" message there. '((' could +-# trigger a bug in pdksh 5.2.14. +-for as_var in BASH_ENV ENV MAIL MAILPATH +-do eval test x\${$as_var+set} = xset \ +- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +-done +-PS1='$ ' +-PS2='> ' +-PS4='+ ' +- +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE +- +-# CDPATH. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +-# Use a proper internal environment variable to ensure we don't fall +- # into an infinite loop, continuously re-executing ourselves. +- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then +- _as_can_reexec=no; export _as_can_reexec; +- # We cannot yet assume a decent shell, so we have to provide a +-# neutralization value for shells without unset; and this also +-# works around shells that cannot unset nonexistent variables. +-# Preserve -v and -x to the replacement shell. +-BASH_ENV=/dev/null +-ENV=/dev/null +-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +-case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +-esac +-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +-# Admittedly, this is quite paranoid, since all the known shells bail +-# out after a failed `exec'. +-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +-as_fn_exit 255 +- fi +- # We don't want this to propagate to other subprocesses. +- { _as_can_reexec=; unset _as_can_reexec;} +-if test "x$CONFIG_SHELL" = x; then +- as_bourne_compatible="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 +-else +- case \`(set -o) 2>/dev/null\` in #( +- *posix*) : +- set -o posix ;; #( +- *) : +- ;; +-esac +-fi +-" +- as_required="as_fn_return () { (exit \$1); } +-as_fn_success () { as_fn_return 0; } +-as_fn_failure () { as_fn_return 1; } +-as_fn_ret_success () { return 0; } +-as_fn_ret_failure () { return 1; } +- +-exitcode=0 +-as_fn_success || { exitcode=1; echo as_fn_success failed.; } +-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +- +-else +- exitcode=1; echo positional parameters were not saved. +-fi +-test x\$exitcode = x0 || exit 1 +-test -x / || exit 1" +- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO +- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO +- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +-test \$(( 1 + 1 )) = 2 || exit 1" +- if (eval "$as_required") 2>/dev/null; then : +- as_have_required=yes +-else +- as_have_required=no +-fi +- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : +- +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_found=false +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- as_found=: +- case $as_dir in #( +- /*) +- for as_base in sh bash ksh sh5; do +- # Try only shells that exist, to save several forks. +- as_shell=$as_dir/$as_base +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : +- CONFIG_SHELL=$as_shell as_have_required=yes +- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : +- break 2 +-fi +-fi +- done;; +- esac +- as_found=false +-done +-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : +- CONFIG_SHELL=$SHELL as_have_required=yes +-fi; } +-IFS=$as_save_IFS +- +- +- if test "x$CONFIG_SHELL" != x; then : +- export CONFIG_SHELL +- # We cannot yet assume a decent shell, so we have to provide a +-# neutralization value for shells without unset; and this also +-# works around shells that cannot unset nonexistent variables. +-# Preserve -v and -x to the replacement shell. +-BASH_ENV=/dev/null +-ENV=/dev/null +-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +-case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +-esac +-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +-# Admittedly, this is quite paranoid, since all the known shells bail +-# out after a failed `exec'. +-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +-exit 255 +-fi +- +- if test x$as_have_required = xno; then : +- $as_echo "$0: This script requires a shell more modern than all" +- $as_echo "$0: the shells that I found on your system." +- if test x${ZSH_VERSION+set} = xset ; then +- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" +- $as_echo "$0: be upgraded to zsh 4.3.4 or later." +- else +- $as_echo "$0: Please tell bug-autoconf@gnu.org and bug-groff@gnu.org +-$0: about your system, including any error possibly output +-$0: before this message. Then install a modern shell, or +-$0: manually run the script under such a shell if you do +-$0: have one." +- fi +- exit 1 +-fi +-fi +-fi +-SHELL=${CONFIG_SHELL-/bin/sh} +-export SHELL +-# Unset more variables known to interfere with behavior of common tools. +-CLICOLOR_FORCE= GREP_OPTIONS= +-unset CLICOLOR_FORCE GREP_OPTIONS +- +-## --------------------- ## +-## M4sh Shell Functions. ## +-## --------------------- ## +-# as_fn_unset VAR +-# --------------- +-# Portably unset VAR. +-as_fn_unset () +-{ +- { eval $1=; unset $1;} +-} +-as_unset=as_fn_unset +- +-# as_fn_set_status STATUS +-# ----------------------- +-# Set $? to STATUS, without forking. +-as_fn_set_status () +-{ +- return $1 +-} # as_fn_set_status +- +-# as_fn_exit STATUS +-# ----------------- +-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +-as_fn_exit () +-{ +- set +e +- as_fn_set_status $1 +- exit $1 +-} # as_fn_exit +- +-# as_fn_mkdir_p +-# ------------- +-# Create "$as_dir" as a directory, including parents if necessary. +-as_fn_mkdir_p () +-{ +- +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || eval $as_mkdir_p || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" +- +- +-} # as_fn_mkdir_p +- +-# as_fn_executable_p FILE +-# ----------------------- +-# Test if FILE is an executable regular file. +-as_fn_executable_p () +-{ +- test -f "$1" && test -x "$1" +-} # as_fn_executable_p +-# as_fn_append VAR VALUE +-# ---------------------- +-# Append the text in VALUE to the end of the definition contained in VAR. Take +-# advantage of any shell optimizations that allow amortized linear growth over +-# repeated appends, instead of the typical quadratic growth present in naive +-# implementations. +-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +- eval 'as_fn_append () +- { +- eval $1+=\$2 +- }' +-else +- as_fn_append () +- { +- eval $1=\$$1\$2 +- } +-fi # as_fn_append +- +-# as_fn_arith ARG... +-# ------------------ +-# Perform arithmetic evaluation on the ARGs, and store the result in the +-# global $as_val. Take advantage of shells that can avoid forks. The arguments +-# must be portable across $(()) and expr. +-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +- eval 'as_fn_arith () +- { +- as_val=$(( $* )) +- }' +-else +- as_fn_arith () +- { +- as_val=`expr "$@" || test $? -eq 1` +- } +-fi # as_fn_arith +- +- +-# as_fn_error STATUS ERROR [LINENO LOG_FD] +-# ---------------------------------------- +-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with STATUS, using 1 if that was 0. +-as_fn_error () +-{ +- as_status=$1; test $as_status -eq 0 && as_status=1 +- if test "$4"; then +- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 +- fi +- $as_echo "$as_me: error: $2" >&2 +- as_fn_exit $as_status +-} # as_fn_error +- +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +- +- as_lineno_1=$LINENO as_lineno_1a=$LINENO +- as_lineno_2=$LINENO as_lineno_2a=$LINENO +- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && +- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { +- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } +- +- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have +- # already done that, so ensure we don't try to do so again and fall +- # in an infinite loop. This has already happened in practice. +- _as_can_reexec=no; export _as_can_reexec +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in #((((( +--n*) +- case `echo 'xy\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- xy) ECHO_C='\c';; +- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null +- ECHO_T=' ';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null +-fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -pR'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -pR' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +- as_ln_s='cp -pR' +- fi +-else +- as_ln_s='cp -pR' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +- +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p='mkdir -p "$as_dir"' +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi +- +-as_test_x='test -x' +-as_executable_p=as_fn_executable_p +- +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +-test -n "$DJDIR" || exec 7<&0 &1 +- +-# Name of the host. +-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +-# so uname gets run too. +-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +- +-# +-# Initializations. +-# +-ac_default_prefix=/usr/local +-ac_clean_files= +-ac_config_libobj_dir=. +-LIBOBJS= +-cross_compiling=no +-subdirs= +-MFLAGS= +-MAKEFLAGS= +- +-# Identity of this package. +-PACKAGE_NAME='groff' +-PACKAGE_TARNAME='groff-1.22.3' +-PACKAGE_VERSION='1.22.3' +-PACKAGE_STRING='groff 1.22.3' +-PACKAGE_BUGREPORT='bug-groff@gnu.org' +-PACKAGE_URL='' +- +-ac_unique_file="src/roff/groff/groff.cpp" +-# Factoring default headers for most tests. +-ac_includes_default="\ +-#include +-#ifdef HAVE_SYS_TYPES_H +-# include +-#endif +-#ifdef HAVE_SYS_STAT_H +-# include +-#endif +-#ifdef STDC_HEADERS +-# include +-# include +-#else +-# ifdef HAVE_STDLIB_H +-# include +-# endif +-#endif +-#ifdef HAVE_STRING_H +-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +-# include +-# endif +-# include +-#endif +-#ifdef HAVE_STRINGS_H +-# include +-#endif +-#ifdef HAVE_INTTYPES_H +-# include +-#endif +-#ifdef HAVE_STDINT_H +-# include +-#endif +-#ifdef HAVE_UNISTD_H +-# include +-#endif" +- +-ac_header_list= +-ac_func_list= +-ac_subst_vars='LTLIBOBJS +-GLIBC21 +-pnmtops_nosetpage +-make_uninstall_pdfexamples +-make_install_pdfexamples +-make_pdfexamples +-make_uninstall_pdfdoc +-make_install_pdfdoc +-make_pdfdoc +-ac_ct_AWK +-ALT_AWK_PROGS +-make_uninstall_htmlexamples +-make_install_htmlexamples +-make_htmlexamples +-make_uninstall_htmldoc +-make_install_htmldoc +-make_htmldoc +-pnmtops +-psselect +-pnmtopng +-pnmcrop +-pnmcut +-ac_ct_GHOSTSCRIPT +-GHOSTSCRIPT +-ALT_GHOSTSCRIPT_PROGS +-GROFF_PATH_SEPARATOR +-tmac_wrap +-sys_tmac_prefix +-g +-PAGE +-BROKEN_SPOOLER_FLAGS +-LIBOBJS +-LIBEXT +-LTLIBICONV +-LIBICONV +-CXXCPP +-host_os +-host_vendor +-host_cpu +-host +-build_os +-build_vendor +-build_cpu +-build +-LIBM +-LIBC +-SH_SCRIPT_SED_CMD +-LN_S +-INSTALL_DATA +-INSTALL_SCRIPT +-INSTALL_PROGRAM +-INSTALL_INFO +-RANLIB +-make_uninstall_infodoc +-make_install_infodoc +-make_infodoc +-MAKEINFO +-make_uninstall_examples +-make_install_examples +-make_examples +-make_uninstall_otherdoc +-make_install_otherdoc +-make_otherdoc +-make_uninstall_shipped_htmldoc +-make_install_shipped_htmldoc +-doc_dist_target_ok +-YACC +-DVIPRINT +-PSPRINT +-LPQ +-LP +-LPR +-AWK +-PERL_VERSION +-SED +-PERL +-groffer_dir +-appresdir +-XLIBDIRS +-XPROGDIRS +-XDEVDIRS +-X_EXTRA_LIBS +-X_LIBS +-X_PRE_LIBS +-X_CFLAGS +-XMKMF +-make_uninstall_winscripts +-make_install_winscripts +-make_winscripts +-OTHERDEVDIRS +-TTYDEVDIRS +-ac_ct_CXX +-CXXFLAGS +-CXX +-EGREP +-GREP +-CPP +-OBJEXT +-EXEEXT +-ac_ct_CC +-CPPFLAGS +-LDFLAGS +-CFLAGS +-CC +-target_alias +-host_alias +-build_alias +-LIBS +-ECHO_T +-ECHO_N +-ECHO_C +-DEFS +-mandir +-localedir +-libdir +-psdir +-pdfdir +-dvidir +-htmldir +-infodir +-docdir +-oldincludedir +-includedir +-localstatedir +-sharedstatedir +-sysconfdir +-datadir +-datarootdir +-libexecdir +-sbindir +-bindir +-program_transform_name +-prefix +-exec_prefix +-PACKAGE_URL +-PACKAGE_BUGREPORT +-PACKAGE_STRING +-PACKAGE_VERSION +-PACKAGE_TARNAME +-PACKAGE_NAME +-PATH_SEPARATOR +-SHELL +-referdir +-grog_dir +-gpinyin_dir +-glilypond_dir +-libprogramdir' +-ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-with_x +-with_appresdir +-with_grofferdir +-with_doc +-with_gnu_ld +-enable_rpath +-with_libiconv_prefix +-with_alt_gs +-with_gs +-with_alt_awk +-with_awk +-' +- ac_precious_vars='build_alias +-host_alias +-target_alias +-CC +-CFLAGS +-LDFLAGS +-LIBS +-CPPFLAGS +-CPP +-CXX +-CXXFLAGS +-CCC +-XMKMF +-CXXCPP' +- +- +-# Initialize some variables set by options. +-ac_init_help= +-ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= +-# The variables have the same names as the options, with +-# dashes changed to underlines. +-cache_file=/dev/null +-exec_prefix=NONE +-no_create= +-no_recursion= +-prefix=NONE +-program_prefix=NONE +-program_suffix=NONE +-program_transform_name=s,x,x, +-silent= +-site= +-srcdir= +-verbose= +-x_includes=NONE +-x_libraries=NONE +- +-# Installation directory options. +-# These are left unexpanded so users can "make install exec_prefix=/foo" +-# and all the variables that are supposed to be based on exec_prefix +-# by default will actually change. +-# Use braces instead of parens because sh, perl, etc. also accept them. +-# (The list follows the same order as the GNU Coding Standards.) +-bindir='${exec_prefix}/bin' +-sbindir='${exec_prefix}/sbin' +-libexecdir='${exec_prefix}/libexec' +-datarootdir='${prefix}/share' +-datadir='${datarootdir}' +-sysconfdir='${prefix}/etc' +-sharedstatedir='${prefix}/com' +-localstatedir='${prefix}/var' +-includedir='${prefix}/include' +-oldincludedir='/usr/include' +-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +-infodir='${datarootdir}/info' +-htmldir='${docdir}' +-dvidir='${docdir}' +-pdfdir='${docdir}' +-psdir='${docdir}' +-libdir='${exec_prefix}/lib' +-localedir='${datarootdir}/locale' +-mandir='${datarootdir}/man' +- +-ac_prev= +-ac_dashdash= +-for ac_option +-do +- # If the previous option needs an argument, assign it. +- if test -n "$ac_prev"; then +- eval $ac_prev=\$ac_option +- ac_prev= +- continue +- fi +- +- case $ac_option in +- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *=) ac_optarg= ;; +- *) ac_optarg=yes ;; +- esac +- +- # Accept the important Cygnus configure options, so we can diagnose typos. +- +- case $ac_dashdash$ac_option in +- --) +- ac_dashdash=yes ;; +- +- -bindir | --bindir | --bindi | --bind | --bin | --bi) +- ac_prev=bindir ;; +- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir=$ac_optarg ;; +- +- -build | --build | --buil | --bui | --bu) +- ac_prev=build_alias ;; +- -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build_alias=$ac_optarg ;; +- +- -cache-file | --cache-file | --cache-fil | --cache-fi \ +- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) +- ac_prev=cache_file ;; +- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ +- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- cache_file=$ac_optarg ;; +- +- --config-cache | -C) +- cache_file=config.cache ;; +- +- -datadir | --datadir | --datadi | --datad) +- ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=*) +- datadir=$ac_optarg ;; +- +- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ +- | --dataroo | --dataro | --datar) +- ac_prev=datarootdir ;; +- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ +- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) +- datarootdir=$ac_optarg ;; +- +- -disable-* | --disable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid feature name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=no ;; +- +- -docdir | --docdir | --docdi | --doc | --do) +- ac_prev=docdir ;; +- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) +- docdir=$ac_optarg ;; +- +- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) +- ac_prev=dvidir ;; +- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) +- dvidir=$ac_optarg ;; +- +- -enable-* | --enable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid feature name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=\$ac_optarg ;; +- +- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +- | --exec | --exe | --ex) +- ac_prev=exec_prefix ;; +- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ +- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ +- | --exec=* | --exe=* | --ex=*) +- exec_prefix=$ac_optarg ;; +- +- -gas | --gas | --ga | --g) +- # Obsolete; use --with-gas. +- with_gas=yes ;; +- +- -help | --help | --hel | --he | -h) +- ac_init_help=long ;; +- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) +- ac_init_help=recursive ;; +- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) +- ac_init_help=short ;; +- +- -host | --host | --hos | --ho) +- ac_prev=host_alias ;; +- -host=* | --host=* | --hos=* | --ho=*) +- host_alias=$ac_optarg ;; +- +- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) +- ac_prev=htmldir ;; +- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ +- | --ht=*) +- htmldir=$ac_optarg ;; +- +- -includedir | --includedir | --includedi | --included | --include \ +- | --includ | --inclu | --incl | --inc) +- ac_prev=includedir ;; +- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ +- | --includ=* | --inclu=* | --incl=* | --inc=*) +- includedir=$ac_optarg ;; +- +- -infodir | --infodir | --infodi | --infod | --info | --inf) +- ac_prev=infodir ;; +- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir=$ac_optarg ;; +- +- -libdir | --libdir | --libdi | --libd) +- ac_prev=libdir ;; +- -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir=$ac_optarg ;; +- +- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ +- | --libexe | --libex | --libe) +- ac_prev=libexecdir ;; +- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ +- | --libexe=* | --libex=* | --libe=*) +- libexecdir=$ac_optarg ;; +- +- -localedir | --localedir | --localedi | --localed | --locale) +- ac_prev=localedir ;; +- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) +- localedir=$ac_optarg ;; +- +- -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst | --locals) +- ac_prev=localstatedir ;; +- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) +- localstatedir=$ac_optarg ;; +- +- -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +- ac_prev=mandir ;; +- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir=$ac_optarg ;; +- +- -nfp | --nfp | --nf) +- # Obsolete; use --without-fp. +- with_fp=no ;; +- +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c | -n) +- no_create=yes ;; +- +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) +- no_recursion=yes ;; +- +- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ +- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ +- | --oldin | --oldi | --old | --ol | --o) +- ac_prev=oldincludedir ;; +- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ +- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ +- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir=$ac_optarg ;; +- +- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) +- ac_prev=prefix ;; +- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix=$ac_optarg ;; +- +- -program-prefix | --program-prefix | --program-prefi | --program-pref \ +- | --program-pre | --program-pr | --program-p) +- ac_prev=program_prefix ;; +- -program-prefix=* | --program-prefix=* | --program-prefi=* \ +- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) +- program_prefix=$ac_optarg ;; +- +- -program-suffix | --program-suffix | --program-suffi | --program-suff \ +- | --program-suf | --program-su | --program-s) +- ac_prev=program_suffix ;; +- -program-suffix=* | --program-suffix=* | --program-suffi=* \ +- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) +- program_suffix=$ac_optarg ;; +- +- -program-transform-name | --program-transform-name \ +- | --program-transform-nam | --program-transform-na \ +- | --program-transform-n | --program-transform- \ +- | --program-transform | --program-transfor \ +- | --program-transfo | --program-transf \ +- | --program-trans | --program-tran \ +- | --progr-tra | --program-tr | --program-t) +- ac_prev=program_transform_name ;; +- -program-transform-name=* | --program-transform-name=* \ +- | --program-transform-nam=* | --program-transform-na=* \ +- | --program-transform-n=* | --program-transform-=* \ +- | --program-transform=* | --program-transfor=* \ +- | --program-transfo=* | --program-transf=* \ +- | --program-trans=* | --program-tran=* \ +- | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name=$ac_optarg ;; +- +- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) +- ac_prev=pdfdir ;; +- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) +- pdfdir=$ac_optarg ;; +- +- -psdir | --psdir | --psdi | --psd | --ps) +- ac_prev=psdir ;; +- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) +- psdir=$ac_optarg ;; +- +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- silent=yes ;; +- +- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) +- ac_prev=sbindir ;; +- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +- | --sbi=* | --sb=*) +- sbindir=$ac_optarg ;; +- +- -sharedstatedir | --sharedstatedir | --sharedstatedi \ +- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +- | --sharedst | --shareds | --shared | --share | --shar \ +- | --sha | --sh) +- ac_prev=sharedstatedir ;; +- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ +- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ +- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ +- | --sha=* | --sh=*) +- sharedstatedir=$ac_optarg ;; +- +- -site | --site | --sit) +- ac_prev=site ;; +- -site=* | --site=* | --sit=*) +- site=$ac_optarg ;; +- +- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) +- ac_prev=srcdir ;; +- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir=$ac_optarg ;; +- +- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ +- | --syscon | --sysco | --sysc | --sys | --sy) +- ac_prev=sysconfdir ;; +- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ +- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +- sysconfdir=$ac_optarg ;; +- +- -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target_alias ;; +- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target_alias=$ac_optarg ;; +- +- -v | -verbose | --verbose | --verbos | --verbo | --verb) +- verbose=yes ;; +- +- -version | --version | --versio | --versi | --vers | -V) +- ac_init_version=: ;; +- +- -with-* | --with-*) +- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid package name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=\$ac_optarg ;; +- +- -without-* | --without-*) +- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid package name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=no ;; +- +- --x) +- # Obsolete; use --with-x. +- with_x=yes ;; +- +- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ +- | --x-incl | --x-inc | --x-in | --x-i) +- ac_prev=x_includes ;; +- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ +- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) +- x_includes=$ac_optarg ;; +- +- -x-libraries | --x-libraries | --x-librarie | --x-librari \ +- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) +- ac_prev=x_libraries ;; +- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ +- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) +- x_libraries=$ac_optarg ;; +- +- -*) as_fn_error $? "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information" +- ;; +- +- *=*) +- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` +- # Reject names that are not valid shell variable names. +- case $ac_envvar in #( +- '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; +- esac +- eval $ac_envvar=\$ac_optarg +- export $ac_envvar ;; +- +- *) +- # FIXME: should be removed in autoconf 3.0. +- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 +- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" +- ;; +- +- esac +-done +- +-if test -n "$ac_prev"; then +- ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error $? "missing argument to $ac_option" +-fi +- +-if test -n "$ac_unrecognized_opts"; then +- case $enable_option_checking in +- no) ;; +- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; +- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; +- esac +-fi +- +-# Check all directory arguments for consistency. +-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 +-do +- eval ac_val=\$$ac_var +- # Remove trailing slashes. +- case $ac_val in +- */ ) +- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` +- eval $ac_var=\$ac_val;; +- esac +- # Be sure to have absolute directory names. +- case $ac_val in +- [\\/$]* | ?:[\\/]* ) continue;; +- NONE | '' ) case $ac_var in *prefix ) continue;; esac;; +- esac +- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +-done +- +-# There might be people who depend on the old broken behavior: `$host' +-# used to hold the argument of --host etc. +-# FIXME: To remove some day. +-build=$build_alias +-host=$host_alias +-target=$target_alias +- +-# FIXME: To remove some day. +-if test "x$host_alias" != x; then +- if test "x$build_alias" = x; then +- cross_compiling=maybe +- elif test "x$build_alias" != "x$host_alias"; then +- cross_compiling=yes +- fi +-fi +- +-ac_tool_prefix= +-test -n "$host_alias" && ac_tool_prefix=$host_alias- +- +-test "$silent" = yes && exec 6>/dev/null +- +- +-ac_pwd=`pwd` && test -n "$ac_pwd" && +-ac_ls_di=`ls -di .` && +-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error $? "working directory cannot be determined" +-test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error $? "pwd does not report name of working directory" +- +- +-# Find the source files, if location was not specified. +-if test -z "$srcdir"; then +- ac_srcdir_defaulted=yes +- # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$as_myself" || +-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_myself" : 'X\(//\)[^/]' \| \ +- X"$as_myself" : 'X\(//\)$' \| \ +- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_myself" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- srcdir=$ac_confdir +- if test ! -r "$srcdir/$ac_unique_file"; then +- srcdir=.. +- fi +-else +- ac_srcdir_defaulted=no +-fi +-if test ! -r "$srcdir/$ac_unique_file"; then +- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +-fi +-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +-ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" +- pwd)` +-# When building in place, set srcdir=. +-if test "$ac_abs_confdir" = "$ac_pwd"; then +- srcdir=. +-fi +-# Remove unnecessary trailing slashes from srcdir. +-# Double slashes in file names in object file debugging info +-# mess up M-x gdb in Emacs. +-case $srcdir in +-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +-esac +-for ac_var in $ac_precious_vars; do +- eval ac_env_${ac_var}_set=\${${ac_var}+set} +- eval ac_env_${ac_var}_value=\$${ac_var} +- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} +- eval ac_cv_env_${ac_var}_value=\$${ac_var} +-done +- +-# +-# Report the --help message. +-# +-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 groff 1.22.3 to adapt to many kinds of systems. +- +-Usage: $0 [OPTION]... [VAR=VALUE]... +- +-To assign environment variables (e.g., CC, CFLAGS...), specify them as +-VAR=VALUE. See below for descriptions of some of the useful variables. +- +-Defaults for the options are specified in brackets. +- +-Configuration: +- -h, --help display this help and exit +- --help=short display options specific to this package +- --help=recursive display the short help of all the included packages +- -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking ...' messages +- --cache-file=FILE cache test results in FILE [disabled] +- -C, --config-cache alias for \`--cache-file=config.cache' +- -n, --no-create do not create output files +- --srcdir=DIR find the sources in DIR [configure dir or \`..'] +- +-Installation directories: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] +- +-By default, \`make install' will install all the files in +-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +-an installation prefix other than \`$ac_default_prefix' using \`--prefix', +-for instance \`--prefix=\$HOME'. +- +-For better control, use the options below. +- +-Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --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] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/groff-1.22.3] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] +-_ACEOF +- +- cat <<\_ACEOF +- +-X features: +- --x-includes=DIR X include files are in DIR +- --x-libraries=DIR X library files are in DIR +- +-System types: +- --build=BUILD configure for building on BUILD [guessed] +- --host=HOST cross-compile to build programs to run on HOST [BUILD] +-_ACEOF +-fi +- +-if test -n "$ac_init_help"; then +- case $ac_init_help in +- short | recursive ) echo "Configuration of groff 1.22.3:";; +- esac +- cat <<\_ACEOF +- +-Optional Features: +- --disable-option-checking ignore unrecognized --enable/--with options +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --disable-rpath do not hardcode runtime library paths +- +-Optional Packages: +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --with-x use the X Window System +- --with-appresdir=DIR X11 application resource files +- --with-grofferdir=DIR groffer files location +- --with-doc[=TYPE] choose which manuals (beside man pages) are +- desirable. TYPE can be `yes' or `no', or a +- comma-separated list of one or multiple of `html', +- `info', `other', `pdf', and `examples', to restrict +- what is produced +- --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib +- --without-libiconv-prefix don't search for libiconv in includedir and libdir +- --with-alt-gs=LIST alternative names for ghostscript executable +- --with-gs=PROG actual [/path/]name of ghostscript executable +- --with-alt-awk=LIST alternative names for awk executable +- --with-awk=PROG actual [/path/]name of awk executable +- +-Some influential environment variables: +- CC C compiler command +- CFLAGS C compiler flags +- LDFLAGS linker flags, e.g. -L if you have libraries in a +- nonstandard directory +- LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if +- you have headers in a nonstandard directory +- CPP C preprocessor +- CXX C++ compiler command +- CXXFLAGS C++ compiler flags +- XMKMF Path to xmkmf, Makefile generator for X Window System +- CXXCPP C++ preprocessor +- +-Use these variables to override the choices made by `configure' or to help +-it to find libraries and programs with nonstandard names/locations. +- +-Report bugs to . +-_ACEOF +-ac_status=$? +-fi +- +-if test "$ac_init_help" = "recursive"; then +- # If there are subdirs, report their specific --help. +- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || +- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || +- continue +- ac_builddir=. +- +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; +-esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix +- +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +-esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +- +- cd "$ac_dir" || { ac_status=$?; continue; } +- # Check for guested configure. +- if test -f "$ac_srcdir/configure.gnu"; then +- echo && +- $SHELL "$ac_srcdir/configure.gnu" --help=recursive +- elif test -f "$ac_srcdir/configure"; then +- echo && +- $SHELL "$ac_srcdir/configure" --help=recursive +- else +- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi || ac_status=$? +- cd "$ac_pwd" || { ac_status=$?; break; } +- done +-fi +- +-test -n "$ac_init_help" && exit $ac_status +-if $ac_init_version; then +- cat <<\_ACEOF +-groff configure 1.22.3 +-generated by GNU Autoconf 2.69 +- +-Copyright (C) 2012 Free Software Foundation, Inc. +-This configure script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it. +-_ACEOF +- exit +-fi +- +-## ------------------------ ## +-## Autoconf initialization. ## +-## ------------------------ ## +- +-# ac_fn_c_try_compile LINENO +-# -------------------------- +-# Try to compile conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_compile () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext +- if { { ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compile") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_compile +- +-# ac_fn_c_try_cpp LINENO +-# ---------------------- +-# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_cpp () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } > conftest.i && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_cpp +- +-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +-# ------------------------------------------------------- +-# Tests whether HEADER exists, giving a warning if it cannot be compiled using +-# the include files in INCLUDES and setting the cache variable VAR +-# accordingly. +-ac_fn_c_check_header_mongrel () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if eval \${$3+:} false; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +-$as_echo_n "checking $2 usability... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-#include <$2> +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_header_compiler=yes +-else +- ac_header_compiler=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +-$as_echo_n "checking $2 presence... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <$2> +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- ac_header_preproc=yes +-else +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( +- yes:no: ) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +- ;; +- no:yes:* ) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +-( $as_echo "## -------------------------------- ## +-## Report this to bug-groff@gnu.org ## +-## -------------------------------- ##" +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- eval "$3=\$ac_header_compiler" +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_header_mongrel +- +-# ac_fn_c_try_run LINENO +-# ---------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +-# that executables *can* be run. +-ac_fn_c_try_run () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=$ac_status +-fi +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_run +- +-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +-# ------------------------------------------------------- +-# Tests whether HEADER exists and can be compiled using the include files in +-# INCLUDES, setting the cache variable VAR accordingly. +-ac_fn_c_check_header_compile () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-#include <$2> +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_header_compile +- +-# ac_fn_cxx_try_compile LINENO +-# ---------------------------- +-# Try to compile conftest.$ac_ext, and return whether this succeeded. +-ac_fn_cxx_try_compile () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext +- if { { ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compile") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_cxx_try_compile +- +-# ac_fn_cxx_try_run LINENO +-# ------------------------ +-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +-# that executables *can* be run. +-ac_fn_cxx_try_run () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=$ac_status +-fi +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_cxx_try_run +- +-# ac_fn_cxx_try_link LINENO +-# ------------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. +-ac_fn_cxx_try_link () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext conftest$ac_exeext +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- test -x conftest$ac_exeext +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information +- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +- # interfere with the next link command; also delete a directory that is +- # left behind by Apple's compiler. We do this before executing the actions. +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_cxx_try_link +- +-# ac_fn_c_try_link LINENO +-# ----------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_link () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext conftest$ac_exeext +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- test -x conftest$ac_exeext +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information +- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +- # interfere with the next link command; also delete a directory that is +- # left behind by Apple's compiler. We do this before executing the actions. +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_link +- +-# ac_fn_c_check_func LINENO FUNC VAR +-# ---------------------------------- +-# Tests whether FUNC exists, setting the cache variable VAR accordingly +-ac_fn_c_check_func () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Define $2 to an innocuous variant, in case declares $2. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $2 innocuous_$2 +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $2 (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $2 +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $2 (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$2 || defined __stub___$2 +-choke me +-#endif +- +-int +-main () +-{ +-return $2 (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_func +- +-# ac_fn_cxx_try_cpp LINENO +-# ------------------------ +-# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +-ac_fn_cxx_try_cpp () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } > conftest.i && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_cxx_try_cpp +- +-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +-# --------------------------------------------- +-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +-# accordingly. +-ac_fn_c_check_decl () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- as_decl_name=`echo $2|sed 's/ *(.*//'` +- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +-$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-#ifndef $as_decl_name +-#ifdef __cplusplus +- (void) $as_decl_use; +-#else +- (void) $as_decl_name; +-#endif +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_decl +-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 groff $as_me 1.22.3, which was +-generated by GNU Autoconf 2.69. Invocation command line was +- +- $ $0 $@ +- +-_ACEOF +-exec 5>>config.log +-{ +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## +- +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` +- +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +- +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +- +-_ASUNAME +- +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +- done +-IFS=$as_save_IFS +- +-} >&5 +- +-cat >&5 <<_ACEOF +- +- +-## ----------- ## +-## Core tests. ## +-## ----------- ## +- +-_ACEOF +- +- +-# Keep a trace of the command line. +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Strip out --silent because we don't want to record it for future runs. +-# Also quote any args containing shell meta-characters. +-# Make two passes to allow for proper duplicate-argument suppression. +-ac_configure_args= +-ac_configure_args0= +-ac_configure_args1= +-ac_must_keep_next=false +-for ac_pass in 1 2 +-do +- for ac_arg +- do +- case $ac_arg in +- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- continue ;; +- *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- case $ac_pass in +- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; +- 2) +- as_fn_append ac_configure_args1 " '$ac_arg'" +- if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. +- else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac +- fi +- as_fn_append ac_configure_args " '$ac_arg'" +- ;; +- esac +- done +-done +-{ ac_configure_args0=; unset ac_configure_args0;} +-{ ac_configure_args1=; unset ac_configure_args1;} +- +-# When interrupted or exit'd, cleanup temporary files, and complete +-# config.log. We remove comments because anyway the quotes in there +-# would cause problems or look ugly. +-# WARNING: Use '\'' to represent an apostrophe within the trap. +-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +-trap 'exit_status=$? +- # Save into config.log some information that might help in debugging. +- { +- echo +- +- $as_echo "## ---------------- ## +-## Cache variables. ## +-## ---------------- ##" +- echo +- # The following way of writing the cache mishandles newlines in values, +-( +- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) { eval $ac_var=; unset $ac_var;} ;; +- esac ;; +- esac +- done +- (set) 2>&1 | +- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- sed -n \ +- "s/'\''/'\''\\\\'\'''\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" +- ;; #( +- *) +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) +- echo +- +- $as_echo "## ----------------- ## +-## Output variables. ## +-## ----------------- ##" +- echo +- for ac_var in $ac_subst_vars +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- +- if test -n "$ac_subst_files"; then +- $as_echo "## ------------------- ## +-## File substitutions. ## +-## ------------------- ##" +- echo +- for ac_var in $ac_subst_files +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- fi +- +- if test -s confdefs.h; then +- $as_echo "## ----------- ## +-## confdefs.h. ## +-## ----------- ##" +- echo +- cat confdefs.h +- echo +- fi +- test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" +- } >&5 +- rm -f core *.core core.conftest.* && +- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +- exit $exit_status +-' 0 +-for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +-done +-ac_signal=0 +- +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h +- +-$as_echo "/* confdefs.h */" > confdefs.h +- +-# Predefined preprocessor variables. +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_VERSION "$PACKAGE_VERSION" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_STRING "$PACKAGE_STRING" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_URL "$PACKAGE_URL" +-_ACEOF +- +- +-# Let the site file select an alternate cache file if it wants to. +-# Prefer an explicitly selected file to automatically selected ones. +-ac_site_file1=NONE +-ac_site_file2=NONE +-if test -n "$CONFIG_SITE"; then +- # We do not want a PATH search for config.site. +- case $CONFIG_SITE in #(( +- -*) ac_site_file1=./$CONFIG_SITE;; +- */*) ac_site_file1=$CONFIG_SITE;; +- *) ac_site_file1=./$CONFIG_SITE;; +- esac +-elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site +-else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site +-fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" +-do +- test "x$ac_site_file" = xNONE && continue +- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +-$as_echo "$as_me: loading site script $ac_site_file" >&6;} +- sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" \ +- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "failed to load site script $ac_site_file +-See \`config.log' for more details" "$LINENO" 5; } +- fi +-done +- +-if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special files +- # actually), so we avoid doing that. DJGPP emulates it as a regular file. +- if test /dev/null != "$cache_file" && test -f "$cache_file"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +-$as_echo "$as_me: loading cache $cache_file" >&6;} +- case $cache_file in +- [\\/]* | ?:[\\/]* ) . "$cache_file";; +- *) . "./$cache_file";; +- esac +- fi +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} +- >$cache_file +-fi +- +-as_fn_append ac_header_list " stdlib.h" +-as_fn_append ac_header_list " unistd.h" +-as_fn_append ac_header_list " sys/param.h" +-as_fn_append ac_func_list " symlink" +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- eval ac_new_val=\$ac_env_${ac_var}_value +- case $ac_old_set,$ac_new_set in +- set,) +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,set) +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- ac_old_val_w=`echo x $ac_old_val` +- ac_new_val_w=`echo x $ac_new_val` +- if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- ac_cache_corrupted=: +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} +- eval $ac_var=\$ac_old_val +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} +- fi;; +- esac +- # Pass precious variables to config.status. +- if test "$ac_new_set" = set; then +- case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; +- *) ac_arg=$ac_var=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) as_fn_append ac_configure_args " '$ac_arg'" ;; +- esac +- fi +-done +-if $ac_cache_corrupted; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +-fi +-## -------------------- ## +-## Main body of script. ## +-## -------------------- ## +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +- +- +-ac_config_headers="$ac_config_headers src/include/config.h:src/include/config.hin" +- +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- fi +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl.exe +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$CC" && break +- done +-fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl.exe +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_CC" && break +-done +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-fi +- +-fi +- +- +-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "no acceptable C compiler found in \$PATH +-See \`config.log' for more details" "$LINENO" 5; } +- +-# Provide some information about the compiler. +-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do +- { { ac_try="$ac_compiler $ac_option >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compiler $ac_option >&5") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- sed '10a\ +-... rest of stderr output deleted ... +- 10q' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- fi +- rm -f conftest.er1 conftest.err +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +-done +- +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +-# Try to create an executable without -o first, disregard a.out. +-# It will help us diagnose broken compilers, and finding out an intuition +-# of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +- +-# The possible output files: +-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +- +-ac_rmfiles= +-for ac_file in $ac_files +-do +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; +- * ) ac_rmfiles="$ac_rmfiles $ac_file";; +- esac +-done +-rm -f $ac_rmfiles +- +-if { { ac_try="$ac_link_default" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link_default") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then : +- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +-# in a Makefile. We should not override ac_cv_exeext if it was cached, +-# so that the user can short-circuit this test for compilers unknown to +-# Autoconf. +-for ac_file in $ac_files '' +-do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) +- ;; +- [ab].out ) +- # We found the default executable, but exeext='' is most +- # certainly right. +- break;; +- *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; +- then :; else +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- fi +- # We set ac_cv_exeext here because the later test for it is not +- # safe: cross compilers may not add the suffix if given an `-o' +- # argument, so we may need to know it at that point already. +- # Even if this section looks crufty: it has the advantage of +- # actually working. +- break;; +- * ) +- break;; +- esac +-done +-test "$ac_cv_exeext" = no && ac_cv_exeext= +- +-else +- ac_file='' +-fi +-if test -z "$ac_file"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error 77 "C compiler cannot create executables +-See \`config.log' for more details" "$LINENO" 5; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } +-ac_exeext=$ac_cv_exeext +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +-$as_echo_n "checking for suffix of executables... " >&6; } +-if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then : +- # If both `conftest.exe' and `conftest' are `present' (well, observable) +-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +-# work properly (i.e., refer to `conftest.exe'), while it won't with +-# `rm'. +-for ac_file in conftest.exe conftest conftest.*; do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; +- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- break;; +- * ) break;; +- esac +-done +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details" "$LINENO" 5; } +-fi +-rm -f conftest conftest$ac_cv_exeext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +-$as_echo "$ac_cv_exeext" >&6; } +- +-rm -f conftest.$ac_ext +-EXEEXT=$ac_cv_exeext +-ac_exeext=$EXEEXT +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-ac_clean_files="$ac_clean_files conftest.out" +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-if test "$cross_compiling" != yes; then +- { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +- if { ac_try='./conftest$ac_cv_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details" "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- +-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +-ac_clean_files=$ac_clean_files_save +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +-$as_echo_n "checking for suffix of object files... " >&6; } +-if ${ac_cv_objext+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.o conftest.obj +-if { { ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compile") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then : +- for ac_file in conftest.o conftest.obj conftest.*; do +- test -f "$ac_file" || continue; +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; +- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +- break;; +- esac +-done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details" "$LINENO" 5; } +-fi +-rm -f conftest.$ac_cv_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +-$as_echo "$ac_cv_objext" >&6; } +-OBJEXT=$ac_cv_objext +-ac_objext=$OBJEXT +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if ${ac_cv_c_compiler_gnu+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_compiler_gnu=yes +-else +- ac_compiler_gnu=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +-$as_echo "$ac_cv_c_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GCC=yes +-else +- GCC= +-fi +-ac_test_CFLAGS=${CFLAGS+set} +-ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +-$as_echo_n "checking whether $CC accepts -g... " >&6; } +-if ${ac_cv_prog_cc_g+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_save_c_werror_flag=$ac_c_werror_flag +- ac_c_werror_flag=yes +- ac_cv_prog_cc_g=no +- CFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_g=yes +-else +- CFLAGS="" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +-else +- ac_c_werror_flag=$ac_save_c_werror_flag +- CFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_g=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_c_werror_flag=$ac_save_c_werror_flag +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +-$as_echo "$ac_cv_prog_cc_g" >&6; } +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if ${ac_cv_prog_cc_c89+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_prog_cc_c89=no +-ac_save_CC=$CC +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-struct stat; +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +- +-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +- function prototypes and stuff, but not '\xHH' hex character constants. +- These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std is added to get +- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +- array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std. */ +-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +- +-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters +- inside strings and character constants. */ +-#define FOO(x) 'x' +-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +- +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int +-main () +-{ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; +- return 0; +-} +-_ACEOF +-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ +- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_c89=$ac_arg +-fi +-rm -f core conftest.err conftest.$ac_objext +- test "x$ac_cv_prog_cc_c89" != "xno" && break +-done +-rm -f conftest.$ac_ext +-CC=$ac_save_CC +- +-fi +-# AC_CACHE_VAL +-case "x$ac_cv_prog_cc_c89" in +- x) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +-$as_echo "none needed" >&6; } ;; +- xno) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +-$as_echo "unsupported" >&6; } ;; +- *) +- CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +-esac +-if test "x$ac_cv_prog_cc_c89" != xno; then : +- +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +-$as_echo_n "checking how to run the C preprocessor... " >&6; } +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= +-fi +-if test -z "$CPP"; then +- if ${ac_cv_prog_CPP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CPP needs to be expanded +- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CPP=$CPP +- +-fi +- CPP=$ac_cv_prog_CPP +-else +- ac_cv_prog_CPP=$CPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +-$as_echo "$CPP" >&6; } +-ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +-$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if ${ac_cv_path_GREP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$GREP"; then +- ac_path_GREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_GREP" || continue +-# Check for GNU ac_path_GREP and select it if it is found. +- # Check for GNU $ac_path_GREP +-case `"$ac_path_GREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'GREP' >> "conftest.nl" +- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_GREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_GREP="$ac_path_GREP" +- ac_path_GREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_GREP_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_GREP"; then +- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +- fi +-else +- ac_cv_path_GREP=$GREP +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +-$as_echo "$ac_cv_path_GREP" >&6; } +- GREP="$ac_cv_path_GREP" +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +-$as_echo_n "checking for egrep... " >&6; } +-if ${ac_cv_path_EGREP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +- then ac_cv_path_EGREP="$GREP -E" +- else +- if test -z "$EGREP"; then +- ac_path_EGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_EGREP" || continue +-# Check for GNU ac_path_EGREP and select it if it is found. +- # Check for GNU $ac_path_EGREP +-case `"$ac_path_EGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'EGREP' >> "conftest.nl" +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_EGREP="$ac_path_EGREP" +- ac_path_EGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_EGREP_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_EGREP"; then +- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +- fi +-else +- ac_cv_path_EGREP=$EGREP +-fi +- +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +-$as_echo "$ac_cv_path_EGREP" >&6; } +- EGREP="$ac_cv_path_EGREP" +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-#include +-#include +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_header_stdc=yes +-else +- ac_cv_header_stdc=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif +- +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int +-main () +-{ +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- ac_cv_header_stdc=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 +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then +- +-$as_echo "#define STDC_HEADERS 1" >>confdefs.h +- +-fi +- +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +-" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +-if test "x$ac_cv_header_minix_config_h" = xyes; then : +- MINIX=yes +-else +- MINIX= +-fi +- +- +- if test "$MINIX" = yes; then +- +-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h +- +- +-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h +- +- +-$as_echo "#define _MINIX 1" >>confdefs.h +- +- fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +-if ${ac_cv_safe_to_define___extensions__+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-# define __EXTENSIONS__ 1 +- $ac_includes_default +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_safe_to_define___extensions__=yes +-else +- ac_cv_safe_to_define___extensions__=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } +- test $ac_cv_safe_to_define___extensions__ = yes && +- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h +- +- $as_echo "#define _ALL_SOURCE 1" >>confdefs.h +- +- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h +- +- $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h +- +- $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +- +- +- +-# checks for programs +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- fi +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl.exe +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$CC" && break +- done +-fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl.exe +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_CC" && break +-done +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-fi +- +-fi +- +- +-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "no acceptable C compiler found in \$PATH +-See \`config.log' for more details" "$LINENO" 5; } +- +-# Provide some information about the compiler. +-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do +- { { ac_try="$ac_compiler $ac_option >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compiler $ac_option >&5") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- sed '10a\ +-... rest of stderr output deleted ... +- 10q' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- fi +- rm -f conftest.er1 conftest.err +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +-done +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if ${ac_cv_c_compiler_gnu+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_compiler_gnu=yes +-else +- ac_compiler_gnu=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +-$as_echo "$ac_cv_c_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GCC=yes +-else +- GCC= +-fi +-ac_test_CFLAGS=${CFLAGS+set} +-ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +-$as_echo_n "checking whether $CC accepts -g... " >&6; } +-if ${ac_cv_prog_cc_g+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_save_c_werror_flag=$ac_c_werror_flag +- ac_c_werror_flag=yes +- ac_cv_prog_cc_g=no +- CFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_g=yes +-else +- CFLAGS="" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +-else +- ac_c_werror_flag=$ac_save_c_werror_flag +- CFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_g=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_c_werror_flag=$ac_save_c_werror_flag +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +-$as_echo "$ac_cv_prog_cc_g" >&6; } +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if ${ac_cv_prog_cc_c89+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_prog_cc_c89=no +-ac_save_CC=$CC +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-struct stat; +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +- +-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +- function prototypes and stuff, but not '\xHH' hex character constants. +- These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std is added to get +- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +- array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std. */ +-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +- +-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters +- inside strings and character constants. */ +-#define FOO(x) 'x' +-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +- +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int +-main () +-{ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; +- return 0; +-} +-_ACEOF +-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ +- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_c89=$ac_arg +-fi +-rm -f core conftest.err conftest.$ac_objext +- test "x$ac_cv_prog_cc_c89" != "xno" && break +-done +-rm -f conftest.$ac_ext +-CC=$ac_save_CC +- +-fi +-# AC_CACHE_VAL +-case "x$ac_cv_prog_cc_c89" in +- x) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +-$as_echo "none needed" >&6; } ;; +- xno) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +-$as_echo "unsupported" >&6; } ;; +- *) +- CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +-esac +-if test "x$ac_cv_prog_cc_c89" != xno; then : +- +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-if test -z "$CXX"; then +- if test -n "$CCC"; then +- CXX=$CCC +- else +- if test -n "$ac_tool_prefix"; then +- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CXX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CXX"; then +- ac_cv_prog_CXX="$CXX" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CXX=$ac_cv_prog_CXX +-if test -n "$CXX"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$CXX" && break +- done +-fi +-if test -z "$CXX"; then +- ac_ct_CXX=$CXX +- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CXX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CXX"; then +- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CXX="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +-if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_CXX" && break +-done +- +- if test "x$ac_ct_CXX" = x; then +- CXX="g++" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CXX=$ac_ct_CXX +- fi +-fi +- +- fi +-fi +-# Provide some information about the compiler. +-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do +- { { ac_try="$ac_compiler $ac_option >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compiler $ac_option >&5") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- sed '10a\ +-... rest of stderr output deleted ... +- 10q' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- fi +- rm -f conftest.er1 conftest.err +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +-done +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if ${ac_cv_cxx_compiler_gnu+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- ac_compiler_gnu=yes +-else +- ac_compiler_gnu=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GXX=yes +-else +- GXX= +-fi +-ac_test_CXXFLAGS=${CXXFLAGS+set} +-ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +-$as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if ${ac_cv_prog_cxx_g+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_save_cxx_werror_flag=$ac_cxx_werror_flag +- ac_cxx_werror_flag=yes +- ac_cv_prog_cxx_g=no +- CXXFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- ac_cv_prog_cxx_g=yes +-else +- CXXFLAGS="" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- +-else +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag +- CXXFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- ac_cv_prog_cxx_g=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +-$as_echo "$ac_cv_prog_cxx_g" >&6; } +-if test "$ac_test_CXXFLAGS" = set; then +- CXXFLAGS=$ac_save_CXXFLAGS +-elif test $ac_cv_prog_cxx_g = yes; then +- if test "$GXX" = yes; then +- CXXFLAGS="-g -O2" +- else +- CXXFLAGS="-g" +- fi +-else +- if test "$GXX" = yes; then +- CXXFLAGS="-O2" +- else +- CXXFLAGS= +- fi +-fi +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +- +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if test "$cross_compiling" = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking that C++ compiler can compile simple program" >&5 +-$as_echo_n "checking that C++ compiler can compile simple program... " >&6; } +- fi +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-int main() { +- return 0; +-} +- +- +- +-_ACEOF +-if ac_fn_cxx_try_run "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "a working C++ compiler is required" "$LINENO" 5 +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- +- if test "$cross_compiling" = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking that C++ static constructors and destructors are called" >&5 +-$as_echo_n "checking that C++ static constructors and destructors are called... " >&6; } +- fi +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-extern "C" { +- void _exit(int); +-} +- +-int i; +-struct A { +- char dummy; +- A() { i = 1; } +- ~A() { if (i == 1) _exit(0); } +-}; +- +-A a; +- +-int main() +-{ +- return 1; +-} +- +- +- +-_ACEOF +-if ac_fn_cxx_try_run "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "a working C++ compiler is required" "$LINENO" 5 +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking that header files support C++" >&5 +-$as_echo_n "checking that header files support C++... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +- +- +-int +-main () +-{ +- +- +-fopen(0, 0); +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "header files do not support C++ +- (if you are using a version of gcc/g++ earlier than 2.5, +- you should install libg++)" "$LINENO" 5 +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether character set is EBCDIC" >&5 +-$as_echo_n "checking whether character set is EBCDIC... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-/* Treat any failure as ASCII for compatibility with existing art. +- Use compile-time rather than run-time tests for cross-compiler +- tolerance. */ +-#if '0' != 240 +-make an error "Character set is not EBCDIC" +-#endif +- +- +-int +-main () +-{ +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- groff_cv_ebcdic="yes" +- TTYDEVDIRS="font/devcp1047" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define IS_EBCDIC_HOST 1" >>confdefs.h +- +-else +- groff_cv_ebcdic="no" +- TTYDEVDIRS="font/devascii font/devlatin1" +- OTHERDEVDIRS="font/devlj4 font/devlbp" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-if test "$groff_cv_ebcdic" = "yes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OS/390 Unix" >&5 +-$as_echo_n "checking for OS/390 Unix... " >&6; } +- case `uname` in +- OS/390) +- CFLAGS="$CFLAGS -D_ALL_SOURCE" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } ;; +- *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } ;; +- esac +- fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install .cmd wrapper scripts for Windows" >&5 +-$as_echo_n "checking whether to install .cmd wrapper scripts for Windows... " >&6; } +- case "$host_os" in +- *mingw*) +- make_winscripts=winscripts +- make_install_winscripts=install_winscripts +- make_uninstall_winscripts=uninstall_winscripts +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } ;; +- *) +- make_winscripts= +- make_install_winscripts= +- make_uninstall_winscripts= +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } ;; +- esac +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +-$as_echo_n "checking for X... " >&6; } +- +- +-# Check whether --with-x was given. +-if test "${with_x+set}" = set; then : +- withval=$with_x; +-fi +- +-# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +-if test "x$with_x" = xno; then +- # The user explicitly disabled X. +- have_x=disabled +-else +- case $x_includes,$x_libraries in #( +- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( +- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # One or both of the vars are not set, and there is no cached value. +-ac_x_includes=no ac_x_libraries=no +-rm -f -r conftest.dir +-if mkdir conftest.dir; then +- cd conftest.dir +- cat >Imakefile <<'_ACEOF' +-incroot: +- @echo incroot='${INCROOT}' +-usrlibdir: +- @echo usrlibdir='${USRLIBDIR}' +-libdir: +- @echo libdir='${LIBDIR}' +-_ACEOF +- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +- for ac_var in incroot usrlibdir libdir; do +- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" +- done +- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl dylib la dll; do +- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && +- test -f "$ac_im_libdir/libX11.$ac_extension"; then +- ac_im_usrlibdir=$ac_im_libdir; break +- fi +- done +- # Screen out bogus values from the imake configuration. They are +- # bogus both because they are the default anyway, and because +- # using them would break gcc on systems where it needs fixed includes. +- case $ac_im_incroot in +- /usr/include) ac_x_includes= ;; +- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; +- esac +- case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; +- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; +- esac +- fi +- cd .. +- rm -f -r conftest.dir +-fi +- +-# Standard set of common directories for X headers. +-# Check X11 before X11Rn because it is often a symlink to the current release. +-ac_x_header_dirs=' +-/usr/X11/include +-/usr/X11R7/include +-/usr/X11R6/include +-/usr/X11R5/include +-/usr/X11R4/include +- +-/usr/include/X11 +-/usr/include/X11R7 +-/usr/include/X11R6 +-/usr/include/X11R5 +-/usr/include/X11R4 +- +-/usr/local/X11/include +-/usr/local/X11R7/include +-/usr/local/X11R6/include +-/usr/local/X11R5/include +-/usr/local/X11R4/include +- +-/usr/local/include/X11 +-/usr/local/include/X11R7 +-/usr/local/include/X11R6 +-/usr/local/include/X11R5 +-/usr/local/include/X11R4 +- +-/usr/X386/include +-/usr/x386/include +-/usr/XFree86/include/X11 +- +-/usr/include +-/usr/local/include +-/usr/unsupported/include +-/usr/athena/include +-/usr/local/x11r5/include +-/usr/lpp/Xamples/include +- +-/usr/openwin/include +-/usr/openwin/share/include' +- +-if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Xlib.h. +- # First, try using that file with no special directory specified. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # We can compile using X headers with no special include directory. +-ac_x_includes= +-else +- for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Xlib.h"; then +- ac_x_includes=$ac_dir +- break +- fi +-done +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +-fi # $ac_x_includes = no +- +-if test "$ac_x_libraries" = no; then +- # Check for the libraries. +- # See if we find them without any special options. +- # Don't add to $LIBS permanently. +- ac_save_LIBS=$LIBS +- LIBS="-lX11 $LIBS" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-XrmInitialize () +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- LIBS=$ac_save_LIBS +-# We can link X programs with no special library path. +-ac_x_libraries= +-else +- LIBS=$ac_save_LIBS +-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +-do +- # Don't even attempt the hair of trying to link an X program! +- for ac_extension in a so sl dylib la dll; do +- if test -r "$ac_dir/libX11.$ac_extension"; then +- ac_x_libraries=$ac_dir +- break 2 +- fi +- done +-done +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi # $ac_x_libraries = no +- +-case $ac_x_includes,$ac_x_libraries in #( +- no,* | *,no | *\'*) +- # Didn't find X, or a directory has "'" in its name. +- ac_cv_have_x="have_x=no";; #( +- *) +- # Record where we found X for the cache. +- ac_cv_have_x="have_x=yes\ +- ac_x_includes='$ac_x_includes'\ +- ac_x_libraries='$ac_x_libraries'" +-esac +-fi +-;; #( +- *) have_x=yes;; +- esac +- eval "$ac_cv_have_x" +-fi # $with_x != no +- +-if test "$have_x" != yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +-$as_echo "$have_x" >&6; } +- no_x=yes +-else +- # If each of the values was on the command line, it overrides each guess. +- test "x$x_includes" = xNONE && x_includes=$ac_x_includes +- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries +- # Update the cache value to reflect the command line values. +- ac_cv_have_x="have_x=yes\ +- ac_x_includes='$x_includes'\ +- ac_x_libraries='$x_libraries'" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +-$as_echo "libraries $x_libraries, headers $x_includes" >&6; } +-fi +- +-if test "$no_x" = yes; then +- # Not all programs may use this symbol, but it does not hurt to define it. +- +-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +- +- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= +-else +- if test -n "$x_includes"; then +- X_CFLAGS="$X_CFLAGS -I$x_includes" +- fi +- +- # It would also be nice to do this for all -L options, not just this one. +- if test -n "$x_libraries"; then +- X_LIBS="$X_LIBS -L$x_libraries" +- # For Solaris; some versions of Sun CC require a space after -R and +- # others require no space. Words are not sufficient . . . . +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +-$as_echo_n "checking whether -R must be followed by a space... " >&6; } +- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" +- ac_xsave_c_werror_flag=$ac_c_werror_flag +- ac_c_werror_flag=yes +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" +-else +- LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +-$as_echo "neither works" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ac_c_werror_flag=$ac_xsave_c_werror_flag +- LIBS=$ac_xsave_LIBS +- fi +- +- # Check for system-dependent libraries X programs must link with. +- # Do this before checking for the system-independent R6 libraries +- # (-lICE), since we may need -lsocket or whatever for X linking. +- +- if test "$ISC" = yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" +- else +- # Martyn Johnson says this is needed for Ultrix, if the X +- # libraries were built with DECnet support. And Karl Berry says +- # the Alpha needs dnet_stub (dnet does not exist). +- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char XOpenDisplay (); +-int +-main () +-{ +-return XOpenDisplay (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldnet $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dnet_ntoa (); +-int +-main () +-{ +-return dnet_ntoa (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_dnet_dnet_ntoa=yes +-else +- ac_cv_lib_dnet_dnet_ntoa=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : +- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +-fi +- +- if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldnet_stub $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dnet_ntoa (); +-int +-main () +-{ +-return dnet_ntoa (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_dnet_stub_dnet_ntoa=yes +-else +- ac_cv_lib_dnet_stub_dnet_ntoa=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : +- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +-fi +- +- fi +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- LIBS="$ac_xsave_LIBS" +- +- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, +- # to get the SysV transport functions. +- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) +- # needs -lnsl. +- # The nsl library prevents programs from opening the X display +- # on Irix 5.2, according to T.E. Dickey. +- # The functions gethostbyname, getservbyname, and inet_addr are +- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes; then : +- +-fi +- +- if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if ${ac_cv_lib_nsl_gethostbyname+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-int +-main () +-{ +-return gethostbyname (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_nsl_gethostbyname=yes +-else +- ac_cv_lib_nsl_gethostbyname=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +-fi +- +- if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if ${ac_cv_lib_bsd_gethostbyname+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lbsd $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-int +-main () +-{ +-return gethostbyname (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_bsd_gethostbyname=yes +-else +- ac_cv_lib_bsd_gethostbyname=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +-fi +- +- fi +- fi +- +- # lieder@skyler.mavd.honeywell.com says without -lsocket, +- # socket/setsockopt and other routines are undefined under SCO ODT +- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary +- # on later versions), says Simon Leinen: it contains gethostby* +- # variants that don't use the name server (or something). -lsocket +- # must be given before -lnsl if both are needed. We assume that +- # if connect needs -lnsl, so does gethostbyname. +- ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" +-if test "x$ac_cv_func_connect" = xyes; then : +- +-fi +- +- if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +-$as_echo_n "checking for connect in -lsocket... " >&6; } +-if ${ac_cv_lib_socket_connect+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char connect (); +-int +-main () +-{ +-return connect (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_socket_connect=yes +-else +- ac_cv_lib_socket_connect=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +-$as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = xyes; then : +- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +-fi +- +- fi +- +- # Guillermo Gomez says -lposix is necessary on A/UX. +- ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" +-if test "x$ac_cv_func_remove" = xyes; then : +- +-fi +- +- if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +-$as_echo_n "checking for remove in -lposix... " >&6; } +-if ${ac_cv_lib_posix_remove+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lposix $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-int +-main () +-{ +-return remove (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_posix_remove=yes +-else +- ac_cv_lib_posix_remove=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +-$as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = xyes; then : +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +-fi +- +- fi +- +- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" +-if test "x$ac_cv_func_shmat" = xyes; then : +- +-fi +- +- if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +-$as_echo_n "checking for shmat in -lipc... " >&6; } +-if ${ac_cv_lib_ipc_shmat+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lipc $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shmat (); +-int +-main () +-{ +-return shmat (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_ipc_shmat=yes +-else +- ac_cv_lib_ipc_shmat=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +-$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = xyes; then : +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +-fi +- +- fi +- fi +- +- # Check for libraries that X11R6 Xt/Xaw programs need. +- ac_save_LDFLAGS=$LDFLAGS +- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" +- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to +- # check for ICE first), but we must link in the order -lSM -lICE or +- # we get undefined symbols. So assume we have SM if we have ICE. +- # These have to be linked with before -lX11, unlike the other +- # libraries we check for below, so use a different variable. +- # John Interrante, Karl Berry +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lICE $X_EXTRA_LIBS $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char IceConnectionNumber (); +-int +-main () +-{ +-return IceConnectionNumber (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_ICE_IceConnectionNumber=yes +-else +- ac_cv_lib_ICE_IceConnectionNumber=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : +- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +-fi +- +- LDFLAGS=$ac_save_LDFLAGS +- +-fi +- +- +- groff_no_x=$no_x +- if test -z "$groff_no_x"; then +- OLDCFLAGS=$CFLAGS +- OLDLDFLAGS=$LDFLAGS +- OLDLIBS=$LIBS +- CFLAGS="$CFLAGS $X_CFLAGS" +- LDFLAGS="$LDFLAGS $X_LIBS" +- LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" +- +- LIBS="$LIBS -lXaw" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xaw library and header files" >&5 +-$as_echo_n "checking for Xaw library and header files... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +- +- +-int +-main () +-{ +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- groff_no_x="yes" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +- LIBS="$LIBS -lXmu" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xmu library and header files" >&5 +-$as_echo_n "checking for Xmu library and header files... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +- +- +-int +-main () +-{ +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- groff_no_x="yes" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +- CFLAGS=$OLDCFLAGS +- LDFLAGS=$OLDLDFLAGS +- LIBS=$OLDLIBS +- fi +- +- if test "x$groff_no_x" = "xyes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: gxditview and xtotroff won't be built" >&5 +-$as_echo "$as_me: gxditview and xtotroff won't be built" >&6;} +- else +- XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12" +- XPROGDIRS="src/devices/xditview src/utils/xtotroff" +- XLIBDIRS="src/libs/libxutil" +- fi +- +- +- +- +- +-# Check whether --with-appresdir was given. +-if test "${with_appresdir+set}" = set; then : +- withval=$with_appresdir; +-fi +- +-if test -z "$groff_no_x"; then +- if test "x$with_appresdir" = "x"; then +- if test "x$prefix" = "xNONE"; then +- appresdir=$ac_default_prefix/lib/X11/app-defaults +- else +- appresdir=$prefix/lib/X11/app-defaults +- fi +- else +- appresdir=$with_appresdir +- fi +- fi +- +-libprogramdir=$libdir/groff +- +- +-# Check whether --with-grofferdir was given. +-if test "${with_grofferdir+set}" = set; then : +- withval=$with_grofferdir; +-fi +- +-if test "x$with_grofferdir" = "x"; then +- groffer_dir=$libprogramdir/groffer +- else +- groffer_dir=$with_grofferdir +- fi +- +-glilypond_dir=$libprogramdir/glilypond +- +-gpinyin_dir=$libprogramdir/gpinyin +- +-grog_dir=$libprogramdir/grog +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +-$as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if ${ac_cv_path_SED+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +- for ac_i in 1 2 3 4 5 6 7; do +- ac_script="$ac_script$as_nl$ac_script" +- done +- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- { ac_script=; unset ac_script;} +- if test -z "$SED"; then +- ac_path_SED_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_SED" || continue +-# Check for GNU ac_path_SED and select it if it is found. +- # Check for GNU $ac_path_SED +-case `"$ac_path_SED" --version 2>&1` in +-*GNU*) +- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo '' >> "conftest.nl" +- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_SED_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_SED="$ac_path_SED" +- ac_path_SED_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_SED_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_SED"; then +- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 +- fi +-else +- ac_cv_path_SED=$SED +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +-$as_echo "$ac_cv_path_SED" >&6; } +- SED="$ac_cv_path_SED" +- rm -f conftest.sed +- +-for ac_prog in gawk mawk nawk awk +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AWK+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$AWK"; then +- ac_cv_prog_AWK="$AWK" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AWK="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-AWK=$ac_cv_prog_AWK +-if test -n "$AWK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +-$as_echo "$AWK" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$AWK" && break +-done +- +-PERLVERSION=v5.6.1 +- # Extract the first word of "perl", so it can be a program name with args. +-set dummy perl; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PERL+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PERL in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PERL="$PERL" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no" +- ;; +-esac +-fi +-PERL=$ac_cv_path_PERL +-if test -n "$PERL"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +-$as_echo "$PERL" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test "x$PERL" = "xno"; then +- as_fn_error 1 "perl binary not found" "$LINENO" 5 +- fi +- +- +- +- +- if test -n "$PERL"; then : +- +- ax_perl_version="$PERLVERSION" +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl version" >&5 +-$as_echo_n "checking for perl version... " >&6; } +- +- perl_version=`$PERL --version 2>&1 \ +- | $SED -n -e '/This is perl/b inspect +-b +-: inspect +-s/.* (\{0,1\}v\([0-9]*\.[0-9]*\.[0-9]*\))\{0,1\} .*/\1/;p'` +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_version" >&5 +-$as_echo "$perl_version" >&6; } +- +- PERL_VERSION=$perl_version +- +- +- +- +- +- # Used to indicate true or false condition +- ax_compare_version=false +- +- # Convert the two version strings to be compared into a format that +- # allows a simple string comparison. The end result is that a version +- # string of the form 1.12.5-r617 will be converted to the form +- # 0001001200050617. In other words, each number is zero padded to four +- # digits, and non digits are removed. +- +- ax_compare_version_A=`echo "$ax_perl_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ +- -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ +- -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ +- -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ +- -e 's/[^0-9]//g'` +- +- +- ax_compare_version_B=`echo "$perl_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ +- -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ +- -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ +- -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ +- -e 's/[^0-9]//g'` +- +- +- ax_compare_version=`echo "x$ax_compare_version_A +-x$ax_compare_version_B" | sed 's/^ *//' | sort | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"` +- +- +- +- if test "$ax_compare_version" = "true" ; then +- +- : +- true +- +- else +- : +- \ +- as_fn_error 1 "perl version is too old" "$LINENO" 5 +- +- fi +- +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the perl interpreter" >&5 +-$as_echo "$as_me: WARNING: could not find the perl interpreter" >&2;} +- \ +- as_fn_error 1 "perl version is too old" "$LINENO" 5 +- +-fi +- +-if test -z "$PSPRINT"; then +- for ac_prog in lpr +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_LPR+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$LPR"; then +- ac_cv_prog_LPR="$LPR" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_LPR="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-LPR=$ac_cv_prog_LPR +-if test -n "$LPR"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LPR" >&5 +-$as_echo "$LPR" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$LPR" && break +-done +- +- for ac_prog in lp +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_LP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$LP"; then +- ac_cv_prog_LP="$LP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_LP="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-LP=$ac_cv_prog_LP +-if test -n "$LP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LP" >&5 +-$as_echo "$LP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$LP" && break +-done +- +- if test -n "$LPR" && test -n "$LP"; then +- # HP-UX provides an lpr command that emulates lpr using lp, +- # but it doesn't have lpq; in this case we want to use lp +- # rather than lpr. +- for ac_prog in lpq +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_LPQ+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$LPQ"; then +- ac_cv_prog_LPQ="$LPQ" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_LPQ="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-LPQ=$ac_cv_prog_LPQ +-if test -n "$LPQ"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LPQ" >&5 +-$as_echo "$LPQ" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$LPQ" && break +-done +- +- test -n "$LPQ" || LPR= +- fi +- if test -n "$LPR"; then +- PSPRINT="$LPR" +- elif test -n "$LP"; then +- PSPRINT="$LP" +- fi +- fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for command to use for printing PostScript files" >&5 +-$as_echo_n "checking for command to use for printing PostScript files... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PSPRINT" >&5 +-$as_echo "$PSPRINT" >&6; } +- +- # Figure out DVIPRINT from PSPRINT. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for command to use for printing dvi files" >&5 +-$as_echo_n "checking for command to use for printing dvi files... " >&6; } +- if test -n "$PSPRINT" && test -z "$DVIPRINT"; then +- if test "x$PSPRINT" = "xlpr"; then +- DVIPRINT="lpr -d" +- else +- DVIPRINT="$PSPRINT" +- fi +- fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DVIPRINT" >&5 +-$as_echo "$DVIPRINT" >&6; } +-# GROFF_REFER +-referdir=$libprogramdir/refer +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +-$as_echo_n "checking for egrep... " >&6; } +-if ${ac_cv_path_EGREP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +- then ac_cv_path_EGREP="$GREP -E" +- else +- if test -z "$EGREP"; then +- ac_path_EGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_EGREP" || continue +-# Check for GNU ac_path_EGREP and select it if it is found. +- # Check for GNU $ac_path_EGREP +-case `"$ac_path_EGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'EGREP' >> "conftest.nl" +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_EGREP="$ac_path_EGREP" +- ac_path_EGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_EGREP_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_EGREP"; then +- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +- fi +-else +- ac_cv_path_EGREP=$EGREP +-fi +- +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +-$as_echo "$ac_cv_path_EGREP" >&6; } +- EGREP="$ac_cv_path_EGREP" +- +- +-for ac_prog in byacc 'bison -y' +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_YACC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$YACC"; then +- ac_cv_prog_YACC="$YACC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_YACC="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-YACC=$ac_cv_prog_YACC +-if test -n "$YACC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +-$as_echo "$YACC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$YACC" && break +-done +-test -n "$YACC" || YACC="yacc" +- +- +-# Check whether --with-doc was given. +-if test "${with_doc+set}" = set; then : +- withval=$with_doc; doc="$withval" +-else +- doc=yes +-fi +- +- test "x$doc" = xno && doc='' +- if test "x$doc" = xyes; then +- doc_dist_target_ok=yes +- docadd_html=yes +- docadd_info=yes +- docadd_other=yes +- docadd_pdf=yes +- docadd_examples=yes +- else +- # Don't use case/esac, verify input. +- doc_dist_target_ok=no +- docadd_html=no +- docadd_info=no +- docadd_other=no +- docadd_pdf=no +- docadd_examples=no +- OFS=$IFS +- IFS=',' +- set -- $doc +- IFS=$OFS +- for i +- do +- test "x$i" = xhtml && { docadd_html=yes; continue; } +- test "x$i" = xinfo && { docadd_info=yes; continue; } +- test "x$i" = xother && { docadd_other=yes; continue; } +- test "x$i" = xpdf && { docadd_pdf=yes; continue; } +- test "x$i" = xexamples && { docadd_examples=yes; continue; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid \`--with-doc' argument: $i" >&5 +-$as_echo "$as_me: WARNING: Invalid \`--with-doc' argument: $i" >&2;} +- done +- fi +- if test $docadd_html = yes; then +- make_install_shipped_htmldoc=install_shipped_htmldoc +- make_uninstall_shipped_htmldoc=uninstall_shipped_htmldoc +- else +- make_install_shipped_htmldoc= +- make_uninstall_shipped_htmldoc= +- fi +- if test $docadd_other = yes; then +- make_otherdoc=otherdoc +- make_install_otherdoc=install_otherdoc +- make_uninstall_otherdoc=uninstall_otherdoc +- else +- make_otherdoc= +- make_install_otherdoc= +- make_uninstall_otherdoc= +- fi +- if test $docadd_examples = yes; then +- make_examples=examples +- make_install_examples=install_examples +- make_uninstall_examples=uninstall_examples +- else +- make_examples= +- make_install_examples= +- make_uninstall_examples= +- fi +- +- +- +- +- +- +- +- +- +-if test $docadd_info = yes; then +- missing= +- # Extract the first word of "makeinfo", so it can be a program name with args. +-set dummy makeinfo; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_MAKEINFO+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$MAKEINFO"; then +- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_MAKEINFO="makeinfo" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-MAKEINFO=$ac_cv_prog_MAKEINFO +-if test -n "$MAKEINFO"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5 +-$as_echo "$MAKEINFO" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test -z "$MAKEINFO"; then +- missing="\`makeinfo' is missing." +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for makeinfo version" >&5 +-$as_echo_n "checking for makeinfo version... " >&6; } +- # We need an additional level of quoting to make sed's regexps work. +- makeinfo_version=`$MAKEINFO --version 2>&1 \ +- | sed -e 's/^.* \([^ ][^ ]*\)$/\1/' -e '1q'` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $makeinfo_version" >&5 +-$as_echo "$makeinfo_version" >&6; } +- # Consider only the first two numbers in version number string. +- makeinfo_version_major=`IFS=.; set x $makeinfo_version; echo 0${2}` +- makeinfo_version_minor=`IFS=.; set x $makeinfo_version; echo 0${3}` +- makeinfo_version_numeric=` +- expr ${makeinfo_version_major}000 \+ ${makeinfo_version_minor}` +- if test $makeinfo_version_numeric -lt 4008; then +- missing="\`makeinfo' is too old." +- fi +- fi +- +- if test -n "$missing"; then +- infofile=doc/groff.info +- test -f ${infofile} || infofile=${srcdir}/${infofile} +- if test ! -f ${infofile} \ +- || test ${srcdir}/doc/groff.texinfo -nt ${infofile}; then +- as_fn_error $? "$missing +-Get the \`texinfo' package version 4.8 or newer." "$LINENO" 5 +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $missing +-Get the \`texinfo' package version 4.8 or newer if you want to convert +-\`groff.texinfo' into a PDF or HTML document." >&5 +-$as_echo "$as_me: WARNING: $missing +-Get the \`texinfo' package version 4.8 or newer if you want to convert +-\`groff.texinfo' into a PDF or HTML document." >&2;} +- fi +- fi +- +- make_infodoc=infodoc +- make_install_infodoc=install_infodoc +- make_uninstall_infodoc=uninstall_infodoc +- else +- make_infodoc= +- make_install_infodoc= +- make_uninstall_infodoc= +- MAKEINFO= +- fi +- +- +- +- +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_RANLIB+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-RANLIB=$ac_cv_prog_RANLIB +-if test -n "$RANLIB"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +-$as_echo "$RANLIB" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_RANLIB"; then +- ac_ct_RANLIB=$RANLIB +- # Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_RANLIB"; then +- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +-if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +-$as_echo "$ac_ct_RANLIB" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_RANLIB" = x; then +- RANLIB=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- RANLIB=$ac_ct_RANLIB +- fi +-else +- RANLIB="$ac_cv_prog_RANLIB" +-fi +- +-ac_aux_dir= +-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi +-done +-if test -z "$ac_aux_dir"; then +- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +-fi +- +-# These three variables are undocumented and unsupported, +-# and are intended to be withdrawn in a future Autoconf release. +-# They can cause serious problems if a builder's source tree is in a directory +-# whose full name contains unusual characters. +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +- +- +- +- ac_dir=`cd $ac_aux_dir; pwd` +- ac_install_sh="$ac_dir/install-sh -c" +-if test $docadd_info = yes; then +- for ac_prog in install-info +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_INSTALL_INFO+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$INSTALL_INFO"; then +- ac_cv_prog_INSTALL_INFO="$INSTALL_INFO" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_INSTALL_INFO="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-INSTALL_INFO=$ac_cv_prog_INSTALL_INFO +-if test -n "$INSTALL_INFO"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL_INFO" >&5 +-$as_echo "$INSTALL_INFO" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$INSTALL_INFO" && break +-done +-test -n "$INSTALL_INFO" || INSTALL_INFO=":" +- +- fi +-# Find a good install program. We prefer a C program (faster), +-# so one script is as good as another. But avoid the broken or +-# incompatible versions: +-# SysV /etc/install, /usr/sbin/install +-# SunOS /usr/etc/install +-# IRIX /sbin/install +-# AIX /bin/install +-# AmigaOS /C/install, which installs bootblocks on floppy discs +-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +-# AFS /usr/afsws/bin/install, which mishandles nonexistent args +-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +-# OS/2's system install, which has a completely different semantic +-# ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +-$as_echo_n "checking for a BSD-compatible install... " >&6; } +-if test -z "$INSTALL"; then +-if ${ac_cv_path_install+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in #(( +- ./ | .// | /[cC]/* | \ +- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ +- /usr/ucb/* ) ;; +- *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- # Don't use installbsd from OSF since it installs stuff as root +- # by default. +- for ac_prog in ginstall scoinst install; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then +- if test $ac_prog = install && +- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # AIX install. It has an incompatible calling convention. +- : +- elif test $ac_prog = install && +- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # program-specific install script used by HP pwplus--don't use. +- : +- else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi +- fi +- fi +- done +- done +- ;; +-esac +- +- done +-IFS=$as_save_IFS +- +-rm -rf conftest.one conftest.two conftest.dir +- +-fi +- if test "${ac_cv_path_install+set}" = set; then +- INSTALL=$ac_cv_path_install +- else +- # As a last resort, use the slow shell script. Don't cache a +- # value for INSTALL within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- INSTALL=$ac_install_sh +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } +- +-# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +-# It thinks the first close brace ends the variable substitution. +-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +- +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +- +-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +- +-{ $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 +- +- +-# use a dummy substitution if no csh hack is necessary to avoid errors +-# with non-GNU sed programs +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for csh hash hack" >&5 +-$as_echo_n "checking for csh hash hack... " >&6; } +- +-cat <conftest.sh +-#! /bin/sh +-true || exit 0 +-export PATH || exit 0 +-exit 1 +-EOF +- +- chmod +x conftest.sh +- if echo ./conftest.sh | (csh >/dev/null 2>&1) >/dev/null 2>&1; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- SH_SCRIPT_SED_CMD='1s/.*/:/' +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- SH_SCRIPT_SED_CMD='1s/a/a/' +- fi +- rm -f conftest.sh +- +- +-# checks for headers +-for ac_header in stddef.h stdlib.h unistd.h dirent.h limits.h sys/dir.h \ +- string.h strings.h math.h sys/time.h direct.h process.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" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ISC 3.x or 4.x" >&5 +-$as_echo_n "checking for ISC 3.x or 4.x... " >&6; } +- if grep '[34]\.' /usr/options/cb.name >/dev/null 2>&1 +- then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define _SYSV3 1" >>confdefs.h +- +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -D_POSIX_SOURCE is necessary" >&5 +-$as_echo_n "checking whether -D_POSIX_SOURCE is necessary... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-extern "C" { void fileno(int); } +- +- +-int +-main () +-{ +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-# checks for header stuff +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for return type of srand" >&5 +-$as_echo_n "checking for return type of srand... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-extern "C" { void srand(unsigned int); } +- +- +-int +-main () +-{ +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: void" >&5 +-$as_echo "void" >&6; } +- +-$as_echo "#define RET_TYPE_SRAND_IS_VOID 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 +-$as_echo "int" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday must be declared" >&5 +-$as_echo_n "checking whether gettimeofday must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_gettimeofday+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef gettimeofday +- char *p = (char *) gettimeofday; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_gettimeofday=no +-else +- groff_cv_decl_needed_gettimeofday=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_gettimeofday" >&5 +-$as_echo "$groff_cv_decl_needed_gettimeofday" >&6; } +- if test $groff_cv_decl_needed_gettimeofday = yes; then +- +-$as_echo "#define NEED_DECLARATION_GETTIMEOFDAY 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hypot must be declared" >&5 +-$as_echo_n "checking whether hypot must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_hypot+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef hypot +- char *p = (char *) hypot; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_hypot=no +-else +- groff_cv_decl_needed_hypot=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_hypot" >&5 +-$as_echo "$groff_cv_decl_needed_hypot" >&6; } +- if test $groff_cv_decl_needed_hypot = yes; then +- +-$as_echo "#define NEED_DECLARATION_HYPOT 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether popen must be declared" >&5 +-$as_echo_n "checking whether popen must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_popen+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef popen +- char *p = (char *) popen; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_popen=no +-else +- groff_cv_decl_needed_popen=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_popen" >&5 +-$as_echo "$groff_cv_decl_needed_popen" >&6; } +- if test $groff_cv_decl_needed_popen = yes; then +- +-$as_echo "#define NEED_DECLARATION_POPEN 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pclose must be declared" >&5 +-$as_echo_n "checking whether pclose must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_pclose+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef pclose +- char *p = (char *) pclose; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_pclose=no +-else +- groff_cv_decl_needed_pclose=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_pclose" >&5 +-$as_echo "$groff_cv_decl_needed_pclose" >&6; } +- if test $groff_cv_decl_needed_pclose = yes; then +- +-$as_echo "#define NEED_DECLARATION_PCLOSE 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether putenv must be declared" >&5 +-$as_echo_n "checking whether putenv must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_putenv+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef putenv +- char *p = (char *) putenv; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_putenv=no +-else +- groff_cv_decl_needed_putenv=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_putenv" >&5 +-$as_echo "$groff_cv_decl_needed_putenv" >&6; } +- if test $groff_cv_decl_needed_putenv = yes; then +- +-$as_echo "#define NEED_DECLARATION_PUTENV 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rand must be declared" >&5 +-$as_echo_n "checking whether rand must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_rand+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef rand +- char *p = (char *) rand; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_rand=no +-else +- groff_cv_decl_needed_rand=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_rand" >&5 +-$as_echo "$groff_cv_decl_needed_rand" >&6; } +- if test $groff_cv_decl_needed_rand = yes; then +- +-$as_echo "#define NEED_DECLARATION_RAND 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf must be declared" >&5 +-$as_echo_n "checking whether snprintf must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_snprintf+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef snprintf +- char *p = (char *) snprintf; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_snprintf=no +-else +- groff_cv_decl_needed_snprintf=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_snprintf" >&5 +-$as_echo "$groff_cv_decl_needed_snprintf" >&6; } +- if test $groff_cv_decl_needed_snprintf = yes; then +- +-$as_echo "#define NEED_DECLARATION_SNPRINTF 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether srand must be declared" >&5 +-$as_echo_n "checking whether srand must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_srand+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef srand +- char *p = (char *) srand; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_srand=no +-else +- groff_cv_decl_needed_srand=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_srand" >&5 +-$as_echo "$groff_cv_decl_needed_srand" >&6; } +- if test $groff_cv_decl_needed_srand = yes; then +- +-$as_echo "#define NEED_DECLARATION_SRAND 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strcasecmp must be declared" >&5 +-$as_echo_n "checking whether strcasecmp must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_strcasecmp+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef strcasecmp +- char *p = (char *) strcasecmp; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_strcasecmp=no +-else +- groff_cv_decl_needed_strcasecmp=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_strcasecmp" >&5 +-$as_echo "$groff_cv_decl_needed_strcasecmp" >&6; } +- if test $groff_cv_decl_needed_strcasecmp = yes; then +- +-$as_echo "#define NEED_DECLARATION_STRCASECMP 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strncasecmp must be declared" >&5 +-$as_echo_n "checking whether strncasecmp must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_strncasecmp+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef strncasecmp +- char *p = (char *) strncasecmp; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_strncasecmp=no +-else +- groff_cv_decl_needed_strncasecmp=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_strncasecmp" >&5 +-$as_echo "$groff_cv_decl_needed_strncasecmp" >&6; } +- if test $groff_cv_decl_needed_strncasecmp = yes; then +- +-$as_echo "#define NEED_DECLARATION_STRNCASECMP 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vfprintf must be declared" >&5 +-$as_echo_n "checking whether vfprintf must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_vfprintf+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef vfprintf +- char *p = (char *) vfprintf; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_vfprintf=no +-else +- groff_cv_decl_needed_vfprintf=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_vfprintf" >&5 +-$as_echo "$groff_cv_decl_needed_vfprintf" >&6; } +- if test $groff_cv_decl_needed_vfprintf = yes; then +- +-$as_echo "#define NEED_DECLARATION_VFPRINTF 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf must be declared" >&5 +-$as_echo_n "checking whether vsnprintf must be declared... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- if ${groff_cv_decl_needed_vsnprintf+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#ifdef HAVE_STRING_H +-#include +-#endif +-#ifdef HAVE_STRINGS_H +-#include +-#endif +-#ifdef HAVE_STDLIB_H +-#include +-#endif +-#ifdef HAVE_SYS_TIME_H +-#include +-#endif +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-#ifdef HAVE_MATH_H +-#include +-#endif +- +- +-int +-main () +-{ +- +- +-#ifndef vsnprintf +- char *p = (char *) vsnprintf; +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_decl_needed_vsnprintf=no +-else +- groff_cv_decl_needed_vsnprintf=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_decl_needed_vsnprintf" >&5 +-$as_echo "$groff_cv_decl_needed_vsnprintf" >&6; } +- if test $groff_cv_decl_needed_vsnprintf = yes; then +- +-$as_echo "#define NEED_DECLARATION_VSNPRINTF 1" >>confdefs.h +- +- fi +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_nerr in , , or " >&5 +-$as_echo_n "checking for sys_nerr in , , or ... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +-#include +- +- +-int +-main () +-{ +- +- +-int k; +-k = sys_nerr; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys_errlist in , , or " >&5 +-$as_echo_n "checking for sys_errlist in , , or ... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +-#include +- +- +-int +-main () +-{ +- +- +-int k; +-k = (int)sys_errlist[0]; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ " >&5 +-$as_echo_n "checking C++ ... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +- +- +-int +-main () +-{ +- +- +-read(0, 0, 0); +-open(0, 0); +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_CC_OSFCN_H 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ " >&5 +-$as_echo_n "checking C++ ... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +- +- +-int +-main () +-{ +- +- +-int x = INT_MIN; +-int y = INT_MAX; +-int z = UCHAR_MAX; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_CC_LIMITS_H 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ " >&5 +-$as_echo_n "checking C++ ... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +- +- +-int +-main () +-{ +- +- +-uintmax_t i = (uintmax_t)-1; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- groff_cv_header_inttypes_h=yes +- +-$as_echo "#define HAVE_CC_INTTYPES_H 1" >>confdefs.h +- +-else +- groff_cv_header_inttypes_h=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_header_inttypes_h" >&5 +-$as_echo "$groff_cv_header_inttypes_h" >&6; } +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-# checks for typedefs +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long" >&5 +-$as_echo_n "checking for unsigned long long... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-unsigned long long ull = 1; +-int i = 63; +-unsigned long long ullmax = (unsigned long long)-1; +- +- +-int +-main () +-{ +- +- +-return ull << i | ull >> i | ullmax / ull | ullmax % ull; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- groff_cv_type_unsigned_long_long=yes +-else +- groff_cv_type_unsigned_long_long=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_cv_type_unsigned_long_long" >&5 +-$as_echo "$groff_cv_type_unsigned_long_long" >&6; } +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +- if test $groff_cv_header_inttypes_h = no; then +- +- test $groff_cv_type_unsigned_long_long = yes \ +- && ac_type='unsigned long long' \ +- || ac_type='unsigned long' +- +-cat >>confdefs.h <<_ACEOF +-#define uintmax_t $ac_type +-_ACEOF +- +- fi +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for declaration of time_t" >&5 +-$as_echo_n "checking for declaration of time_t... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +- +- +-int +-main () +-{ +- +- +-time_t t = time(0); +-struct tm *p = localtime(&t); +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- +-$as_echo "#define LONG_FOR_TIME_T 1" >>confdefs.h +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for return type of signal handlers" >&5 +-$as_echo_n "checking for return type of signal handlers... " >&6; } +- for groff_declaration in \ +- 'extern "C" void (*signal (int, void (*)(int)))(int);' \ +- 'extern "C" void (*signal (int, void (*)(int)) throw ())(int);' \ +- 'void (*signal ()) ();' +- do +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +-#ifdef signal +-# undef signal +-#endif +-$groff_declaration +- +- +-int +-main () +-{ +- +- +-int i; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- break +-else +- continue +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +- +- if test -n "$groff_declaration"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: void" >&5 +-$as_echo "void" >&6; } +- +-$as_echo "#define RETSIGTYPE void" >>confdefs.h +- +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5 +-$as_echo "int" >&6; } +- +-$as_echo "#define RETSIGTYPE int" >>confdefs.h +- +- fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct exception" >&5 +-$as_echo_n "checking struct exception... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +- +- +-int +-main () +-{ +- +- +-struct exception e; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_STRUCT_EXCEPTION 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-# check endianness +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +-$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +-if ${ac_cv_c_bigendian+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_c_bigendian=unknown +- # See if we're dealing with a universal compiler. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifndef __APPLE_CC__ +- not a universal capable compiler +- #endif +- typedef int dummy; +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- # Check for potential -arch flags. It is not universal unless +- # there are at least two -arch flags with different values. +- ac_arch= +- ac_prev= +- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do +- if test -n "$ac_prev"; then +- case $ac_word in +- i?86 | x86_64 | ppc | ppc64) +- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then +- ac_arch=$ac_word +- else +- ac_cv_c_bigendian=universal +- break +- fi +- ;; +- esac +- ac_prev= +- elif test "x$ac_word" = "x-arch"; then +- ac_prev=arch +- fi +- done +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test $ac_cv_c_bigendian = unknown; then +- # See if sys/param.h defines the BYTE_ORDER macro. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- #include +- +-int +-main () +-{ +-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ +- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ +- && LITTLE_ENDIAN) +- bogus endian macros +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- # It does; now see whether it defined to BIG_ENDIAN or not. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- #include +- +-int +-main () +-{ +-#if BYTE_ORDER != BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_c_bigendian=yes +-else +- ac_cv_c_bigendian=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test $ac_cv_c_bigendian = unknown; then +- # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) +- bogus endian macros +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- # It does; now see whether it defined to _BIG_ENDIAN or not. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-#ifndef _BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_c_bigendian=yes +-else +- ac_cv_c_bigendian=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- if test $ac_cv_c_bigendian = unknown; then +- # Compile a test program. +- if test "$cross_compiling" = yes; then : +- # Try to guess by grepping values from an object file. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-short int ascii_mm[] = +- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +- short int ascii_ii[] = +- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +- int use_ascii (int i) { +- return ascii_mm[i] + ascii_ii[i]; +- } +- short int ebcdic_ii[] = +- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +- short int ebcdic_mm[] = +- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +- int use_ebcdic (int i) { +- return ebcdic_mm[i] + ebcdic_ii[i]; +- } +- extern int foo; +- +-int +-main () +-{ +-return use_ascii (foo) == use_ebcdic (foo); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then +- ac_cv_c_bigendian=yes +- fi +- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then +- if test "$ac_cv_c_bigendian" = unknown; then +- ac_cv_c_bigendian=no +- else +- # finding both strings is unlikely to happen, but who knows? +- ac_cv_c_bigendian=unknown +- fi +- fi +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +- +- /* Are we little or big endian? From Harbison&Steele. */ +- union +- { +- long int l; +- char c[sizeof (long int)]; +- } u; +- u.l = 1; +- return u.c[sizeof (long int) - 1] == 1; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- ac_cv_c_bigendian=no +-else +- ac_cv_c_bigendian=yes +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +-$as_echo "$ac_cv_c_bigendian" >&6; } +- case $ac_cv_c_bigendian in #( +- yes) +- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +-;; #( +- no) +- ;; #( +- universal) +- +-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +- +- ;; #( +- *) +- as_fn_error $? "unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; +- esac +- +- +-# checks for libraries +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lc" >&5 +-$as_echo_n "checking for main in -lc... " >&6; } +-if ${ac_cv_lib_c_main+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lc $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-int +-main () +-{ +-return main (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_c_main=yes +-else +- ac_cv_lib_c_main=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_main" >&5 +-$as_echo "$ac_cv_lib_c_main" >&6; } +-if test "x$ac_cv_lib_c_main" = xyes; then : +- LIBC=-lc +-fi +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 +-$as_echo_n "checking for sin in -lm... " >&6; } +-if ${ac_cv_lib_m_sin+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char sin (); +-int +-main () +-{ +-return sin (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_m_sin=yes +-else +- ac_cv_lib_m_sin=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5 +-$as_echo "$ac_cv_lib_m_sin" >&6; } +-if test "x$ac_cv_lib_m_sin" = xyes; then : +- LIBM=-lm +-fi +- +- +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +-# Make sure we can run config.sub. +-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +-$as_echo_n "checking build system type... " >&6; } +-if ${ac_cv_build+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_build_alias=$build_alias +-test "x$ac_build_alias" = x && +- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +-test "x$ac_build_alias" = x && +- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +-$as_echo "$ac_cv_build" >&6; } +-case $ac_cv_build in +-*-*-*) ;; +-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +-esac +-build=$ac_cv_build +-ac_save_IFS=$IFS; IFS='-' +-set x $ac_cv_build +-shift +-build_cpu=$1 +-build_vendor=$2 +-shift; shift +-# Remember, the first character of IFS is used to create $*, +-# except with old shells: +-build_os=$* +-IFS=$ac_save_IFS +-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +-$as_echo_n "checking host system type... " >&6; } +-if ${ac_cv_host+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$host_alias" = x; then +- ac_cv_host=$ac_cv_build +-else +- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +-$as_echo "$ac_cv_host" >&6; } +-case $ac_cv_host in +-*-*-*) ;; +-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +-esac +-host=$ac_cv_host +-ac_save_IFS=$IFS; IFS='-' +-set x $ac_cv_host +-shift +-host_cpu=$1 +-host_vendor=$2 +-shift; shift +-# Remember, the first character of IFS is used to create $*, +-# except with old shells: +-host_os=$* +-IFS=$ac_save_IFS +-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +- +- +- +- if test "X$prefix" = "XNONE"; then +- acl_final_prefix="$ac_default_prefix" +- else +- acl_final_prefix="$prefix" +- fi +- if test "X$exec_prefix" = "XNONE"; then +- acl_final_exec_prefix='${prefix}' +- else +- acl_final_exec_prefix="$exec_prefix" +- fi +- acl_save_prefix="$prefix" +- prefix="$acl_final_prefix" +- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" +- prefix="$acl_save_prefix" +- +- +- +-# Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then : +- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +-else +- with_gnu_ld=no +-fi +- +-# Prepare PATH_SEPARATOR. +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which +- # contains only /bin. Note that ksh looks also at the FPATH variable, +- # so we have to set that as well for the test. +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ +- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ +- || PATH_SEPARATOR=';' +- } +-fi +- +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +-$as_echo_n "checking for ld used by $CC... " >&6; } +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [\\/]* | ?:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` +- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } +-fi +-if ${acl_cv_path_LD+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$LD"; then +- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$acl_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- acl_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$acl_cv_path_LD" -v 2>&1 &5 +-$as_echo "$LD" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if ${acl_cv_prog_gnu_ld+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 &5 +-$as_echo "$acl_cv_prog_gnu_ld" >&6; } +-with_gnu_ld=$acl_cv_prog_gnu_ld +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +-$as_echo_n "checking for shared library run path origin... " >&6; } +-if ${acl_cv_rpath+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ +- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh +- . ./conftest.sh +- rm -f ./conftest.sh +- acl_cv_rpath=done +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +-$as_echo "$acl_cv_rpath" >&6; } +- wl="$acl_cv_wl" +- acl_libext="$acl_cv_libext" +- acl_shlibext="$acl_cv_shlibext" +- acl_libname_spec="$acl_cv_libname_spec" +- acl_library_names_spec="$acl_cv_library_names_spec" +- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" +- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" +- acl_hardcode_direct="$acl_cv_hardcode_direct" +- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" +- # Check whether --enable-rpath was given. +-if test "${enable_rpath+set}" = set; then : +- enableval=$enable_rpath; : +-else +- enable_rpath=yes +-fi +- +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +-$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +-if test -z "$CXXCPP"; then +- if ${ac_cv_prog_CXXCPP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CXXCPP needs to be expanded +- for CXXCPP in "$CXX -E" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CXXCPP=$CXXCPP +- +-fi +- CXXCPP=$ac_cv_prog_CXXCPP +-else +- ac_cv_prog_CXXCPP=$CXXCPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +-$as_echo "$CXXCPP" >&6; } +-ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_cxx_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } +-fi +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +- +- +- acl_libdirstem=lib +- acl_libdirstem2= +- case "$host_os" in +- solaris*) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +-$as_echo_n "checking for 64-bit host... " >&6; } +-if ${gl_cv_solaris_64bit+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#ifdef _LP64 +-sixtyfour bits +-#endif +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "sixtyfour bits" >/dev/null 2>&1; then : +- gl_cv_solaris_64bit=yes +-else +- gl_cv_solaris_64bit=no +-fi +-rm -f conftest* +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +-$as_echo "$gl_cv_solaris_64bit" >&6; } +- if test $gl_cv_solaris_64bit = yes; then +- acl_libdirstem=lib/64 +- case "$host_cpu" in +- sparc*) acl_libdirstem2=lib/sparcv9 ;; +- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; +- esac +- fi +- ;; +- *) +- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` +- if test -n "$searchpath"; then +- acl_save_IFS="${IFS= }"; IFS=":" +- for searchdir in $searchpath; do +- if test -d "$searchdir"; then +- case "$searchdir" in +- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; +- */../ | */.. ) +- # Better ignore directories of this form. They are misleading. +- ;; +- *) searchdir=`cd "$searchdir" && pwd` +- case "$searchdir" in +- */lib64 ) acl_libdirstem=lib64 ;; +- esac ;; +- esac +- fi +- done +- IFS="$acl_save_IFS" +- fi +- ;; +- esac +- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" +- +- +- +- +- +- +- +- +- +- +- +- +- 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-libiconv-prefix was given. +-if test "${with_libiconv_prefix+set}" = set; then : +- withval=$with_libiconv_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 +- +- LIBICONV= +- LTLIBICONV= +- INCICONV= +- LIBICONV_PREFIX= +- HAVE_LIBICONV= +- rpathdirs= +- ltrpathdirs= +- names_already_handled= +- names_next_round='iconv ' +- 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" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" +- eval value=\"\$LTLIB$uppername\" +- test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$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 $LTLIBICONV; 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 +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-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 +- LIBICONV="${LIBICONV}${LIBICONV:+ }$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 +- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" +- else +- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then +- LIBICONV="${LIBICONV}${LIBICONV:+ }$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 $LIBICONV; 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 +- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" +- fi +- if test "$acl_hardcode_minus_L" != no; then +- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" +- else +- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" +- fi +- fi +- fi +- fi +- else +- if test "X$found_a" != "X"; then +- LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" +- else +- LIBICONV="${LIBICONV}${LIBICONV:+ }-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" = 'iconv'; then +- LIBICONV_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" = 'iconv'; then +- LIBICONV_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 $INCICONV; 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 +- INCICONV="${INCICONV}${INCICONV:+ }-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 $LIBICONV; 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 +- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" +- fi +- fi +- haveit= +- for x in $LDFLAGS $LTLIBICONV; 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 +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-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$,,'` +- ;; +- *) +- LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" +- ;; +- esac +- done +- fi +- else +- LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-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" +- LIBICONV="${LIBICONV}${LIBICONV:+ }$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" +- LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" +- done +- fi +- fi +- if test "X$ltrpathdirs" != "X"; then +- for found_dir in $ltrpathdirs; do +- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" +- done +- fi +- +- +- +- +- +- +- +- +- +- +- +- +- 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 +-#include +- +-int +-main () +-{ +-iconv_t cd = iconv_open("",""); +- iconv(cd,NULL,NULL,NULL,NULL); +- iconv_close(cd); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_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 +-#include +- +-int +-main () +-{ +-iconv_t cd = iconv_open("",""); +- iconv(cd,NULL,NULL,NULL,NULL); +- iconv_close(cd); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_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 +-#include +- +-#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_cxx_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 +- +- +- +- if test "$am_cv_func_iconv" = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 +-$as_echo_n "checking for iconv declaration... " >&6; } +- if ${am_cv_proto_iconv+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#include +-extern +-#ifdef __cplusplus +-"C" +-#endif +-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) +-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +-#else +-size_t iconv(); +-#endif +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- am_cv_proto_iconv_arg1="" +-else +- am_cv_proto_iconv_arg1="const" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" +-fi +- +- am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: +- $am_cv_proto_iconv" >&5 +-$as_echo " +- $am_cv_proto_iconv" >&6; } +- +-cat >>confdefs.h <<_ACEOF +-#define ICONV_CONST $am_cv_proto_iconv_arg1 +-_ACEOF +- +- +- fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-# we need LIBEXT +-LIBEXT=$acl_libext +- +- +-# checks for functions +- +- +- +- for ac_header in $ac_header_list +-do : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +-" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +- +- +- +- +- +-for ac_func in getpagesize +-do : +- ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" +-if test "x$ac_cv_func_getpagesize" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_GETPAGESIZE 1 +-_ACEOF +- +-fi +-done +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 +-$as_echo_n "checking for working mmap... " >&6; } +-if ${ac_cv_func_mmap_fixed_mapped+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- ac_cv_func_mmap_fixed_mapped=no +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$ac_includes_default +-/* malloc might have been renamed as rpl_malloc. */ +-#undef malloc +- +-/* Thanks to Mike Haertel and Jim Avera for this test. +- Here is a matrix of mmap possibilities: +- mmap private not fixed +- mmap private fixed at somewhere currently unmapped +- mmap private fixed at somewhere already mapped +- mmap shared not fixed +- mmap shared fixed at somewhere currently unmapped +- mmap shared fixed at somewhere already mapped +- For private mappings, we should verify that changes cannot be read() +- back from the file, nor mmap's back from the file at a different +- address. (There have been systems where private was not correctly +- implemented like the infamous i386 svr4.0, and systems where the +- VM page cache was not coherent with the file system buffer cache +- like early versions of FreeBSD and possibly contemporary NetBSD.) +- For shared mappings, we should conversely verify that changes get +- propagated back to all the places they're supposed to be. +- +- Grep wants private fixed already mapped. +- The main things grep needs to know about mmap are: +- * does it exist and is it safe to write into the mmap'd area +- * how to use it (BSD variants) */ +- +-#include +-#include +- +-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +-char *malloc (); +-#endif +- +-/* This mess was copied from the GNU getpagesize.h. */ +-#ifndef HAVE_GETPAGESIZE +-# ifdef _SC_PAGESIZE +-# define getpagesize() sysconf(_SC_PAGESIZE) +-# else /* no _SC_PAGESIZE */ +-# ifdef HAVE_SYS_PARAM_H +-# include +-# ifdef EXEC_PAGESIZE +-# define getpagesize() EXEC_PAGESIZE +-# else /* no EXEC_PAGESIZE */ +-# ifdef NBPG +-# define getpagesize() NBPG * CLSIZE +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* no CLSIZE */ +-# else /* no NBPG */ +-# ifdef NBPC +-# define getpagesize() NBPC +-# else /* no NBPC */ +-# ifdef PAGESIZE +-# define getpagesize() PAGESIZE +-# endif /* PAGESIZE */ +-# endif /* no NBPC */ +-# endif /* no NBPG */ +-# endif /* no EXEC_PAGESIZE */ +-# else /* no HAVE_SYS_PARAM_H */ +-# define getpagesize() 8192 /* punt totally */ +-# endif /* no HAVE_SYS_PARAM_H */ +-# endif /* no _SC_PAGESIZE */ +- +-#endif /* no HAVE_GETPAGESIZE */ +- +-int +-main () +-{ +- char *data, *data2, *data3; +- const char *cdata2; +- int i, pagesize; +- int fd, fd2; +- +- pagesize = getpagesize (); +- +- /* First, make a file with some known garbage in it. */ +- data = (char *) malloc (pagesize); +- if (!data) +- return 1; +- for (i = 0; i < pagesize; ++i) +- *(data + i) = rand (); +- umask (0); +- fd = creat ("conftest.mmap", 0600); +- if (fd < 0) +- return 2; +- if (write (fd, data, pagesize) != pagesize) +- return 3; +- close (fd); +- +- /* Next, check that the tail of a page is zero-filled. File must have +- non-zero length, otherwise we risk SIGBUS for entire page. */ +- fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); +- if (fd2 < 0) +- return 4; +- cdata2 = ""; +- if (write (fd2, cdata2, 1) != 1) +- return 5; +- data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); +- if (data2 == MAP_FAILED) +- return 6; +- for (i = 0; i < pagesize; ++i) +- if (*(data2 + i)) +- return 7; +- close (fd2); +- if (munmap (data2, pagesize)) +- return 8; +- +- /* Next, try to mmap the file at a fixed address which already has +- something else allocated at it. If we can, also make sure that +- we see the same garbage. */ +- fd = open ("conftest.mmap", O_RDWR); +- if (fd < 0) +- return 9; +- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, +- MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- return 10; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data2 + i)) +- return 11; +- +- /* Finally, make sure that changes to the mapped area do not +- percolate back to the file as seen by read(). (This is a bug on +- some variants of i386 svr4.0.) */ +- for (i = 0; i < pagesize; ++i) +- *(data2 + i) = *(data2 + i) + 1; +- data3 = (char *) malloc (pagesize); +- if (!data3) +- return 12; +- if (read (fd, data3, pagesize) != pagesize) +- return 13; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data3 + i)) +- return 14; +- close (fd); +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- ac_cv_func_mmap_fixed_mapped=yes +-else +- ac_cv_func_mmap_fixed_mapped=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_mmap_fixed_mapped" >&5 +-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +-if test $ac_cv_func_mmap_fixed_mapped = yes; then +- +-$as_echo "#define HAVE_MMAP 1" >>confdefs.h +- +-fi +-rm -f conftest.mmap conftest.txt +- +-saved_libs="$LIBS" +-LIBS="$LIBS $LIBC $LIBM" +-ac_fn_c_check_func "$LINENO" "fmod" "ac_cv_func_fmod" +-if test "x$ac_cv_func_fmod" = xyes; then : +- $as_echo "#define HAVE_FMOD 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" fmod.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS fmod.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" +-if test "x$ac_cv_func_getcwd" = xyes; then : +- $as_echo "#define HAVE_GETCWD 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" getcwd.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS getcwd.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +-if test "x$ac_cv_func_putenv" = xyes; then : +- $as_echo "#define HAVE_PUTENV 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" putenv.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS putenv.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +-if test "x$ac_cv_func_snprintf" = xyes; then : +- $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" snprintf.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +-if test "x$ac_cv_func_strcasecmp" = xyes; then : +- $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" strcasecmp.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +-if test "x$ac_cv_func_strerror" = xyes; then : +- $as_echo "#define HAVE_STRERROR 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" strerror.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS strerror.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +-if test "x$ac_cv_func_strncasecmp" = xyes; then : +- $as_echo "#define HAVE_STRNCASECMP 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" strncasecmp.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS strncasecmp.$ac_objext" +- ;; +-esac +- +-fi +- +-ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" +-if test "x$ac_cv_func_strtol" = xyes; then : +- $as_echo "#define HAVE_STRTOL 1" >>confdefs.h +- +-else +- case " $LIBOBJS " in +- *" strtol.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS strtol.$ac_objext" +- ;; +-esac +- +-fi +- +- +-# vsnprintf is in the same source file as snprintf +-for ac_func in vsnprintf +-do : +- ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf" +-if test "x$ac_cv_func_vsnprintf" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_VSNPRINTF 1 +-_ACEOF +- +-else +- case " $LIBOBJS " in +- *" snprintf.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" +- ;; +-esac +- +-fi +-done +- +-LIBS="$saved_libs" +-for ac_func in gettimeofday isatty kill rename setlocale strsep +-do : +- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkstemp" >&5 +-$as_echo_n "checking for mkstemp... " >&6; } +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +-int (*f) (char *); +- +- +-int +-main () +-{ +- +- +-f = mkstemp; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_link "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_MKSTEMP 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- case " $LIBOBJS " in +- *" mkstemp.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" +- ;; +-esac +- +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default" +-if test "x$ac_cv_have_decl_sys_siglist" = xyes; then : +- ac_have_decl=1 +-else +- ac_have_decl=0 +-fi +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_SYS_SIGLIST $ac_have_decl +-_ACEOF +-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : +- ac_have_decl=1 +-else +- ac_have_decl=0 +-fi +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +-_ACEOF +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 +-$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } +-if ${am_cv_langinfo_codeset+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-char* cs = nl_langinfo(CODESET); return !cs; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- am_cv_langinfo_codeset=yes +-else +- am_cv_langinfo_codeset=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 +-$as_echo "$am_cv_langinfo_codeset" >&6; } +- if test $am_cv_langinfo_codeset = yes; then +- +-$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h +- +- fi +- +- +-# checks for compiler characteristics +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ANSI array delete syntax is supported" >&5 +-$as_echo_n "checking whether ANSI array delete syntax is supported... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-int +-main () +-{ +- +- +-char *p = new char[5]; +-delete [] p; +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; 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" >&5 +-$as_echo "no" >&6; } +- +-$as_echo "#define ARRAY_DELETE_NEEDS_SIZE 1" >>confdefs.h +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking traditional preprocessor" >&5 +-$as_echo_n "checking traditional preprocessor... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#define name2(a, b) a/**/b +- +- +-int +-main () +-{ +- +- +-int name2(foo, bar); +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define TRADITIONAL_CPP 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-# checks for operating system services +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking w_coredump" >&5 +-$as_echo_n "checking w_coredump... " >&6; } +- if test "$cross_compiling" = yes; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include +- +- +-int +-main () +-{ +- +- +-main() +-{ +-#ifdef WCOREFLAG +- exit(1); +-#else +- int i = 0; +- ((union wait *)&i)->w_coredump = 1; +- exit(i != 0200); +-#endif +-} +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define WCOREFLAG 0200" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- +-# other random stuff +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default value for grops -b option" >&5 +-$as_echo_n "checking default value for grops -b option... " >&6; } +- test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=0 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BROKEN_SPOOLER_FLAGS" >&5 +-$as_echo "$BROKEN_SPOOLER_FLAGS" >&6; } +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default paper size" >&5 +-$as_echo_n "checking default paper size... " >&6; } +- groff_prefix=$prefix +- test "x$prefix" = "xNONE" && groff_prefix=$ac_default_prefix +- if test -z "$PAGE"; then +- descfile= +- if test -r $groff_prefix/share/groff/font/devps/DESC; then +- descfile=$groff_prefix/share/groff/font/devps/DESC +- elif test -r $groff_prefix/lib/groff/font/devps/DESC; then +- descfile=$groff_prefix/lib/groff/font/devps/DESC +- else +- for f in $groff_prefix/share/groff/*/font/devps/DESC; do +- if test -r $f; then +- descfile=$f +- break +- fi +- done +- fi +- +- if test -n "$descfile"; then +- if grep '^paperlength[ ]\+841890' $descfile >/dev/null 2>&1; then +- PAGE=A4 +- elif grep '^papersize[ ]\+[aA]4' $descfile >/dev/null 2>&1; then +- PAGE=A4 +- fi +- fi +- fi +- +- if test -z "$PAGE"; then +- dom=`awk '($1 == "dom" || $1 == "search") { print $2; exit}' \ +- /etc/resolv.conf 2>/dev/null` +- if test -z "$dom"; then +- dom=`(domainname) 2>/dev/null | tr -d '+'` +- if test -z "$dom" \ +- || test "$dom" = '(none)'; then +- dom=`(hostname) 2>/dev/null | grep '\.'` +- fi +- fi +- # If the top-level domain is two letters and it's not `us' or `ca' +- # then they probably use A4 paper. +- case "$dom" in +- *.[Uu][Ss]|*.[Cc][Aa]) +- ;; +- *.[A-Za-z][A-Za-z]) +- PAGE=A4 ;; +- esac +- fi +- +- test -n "$PAGE" || PAGE=letter +- if test "x$PAGE" = "xA4"; then +- +-$as_echo "#define PAGEA4 1" >>confdefs.h +- +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PAGE" >&5 +-$as_echo "$PAGE" >&6; } +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for existing troff installation" >&5 +-$as_echo_n "checking for existing troff installation... " >&6; } +- if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- g=g +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- g= +- fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prefix of system macro packages" >&5 +-$as_echo_n "checking for prefix of system macro packages... " >&6; } +- sys_tmac_prefix= +- sys_tmac_file_prefix= +- for d in /usr/share/lib/tmac /usr/lib/tmac; do +- for t in "" tmac.; do +- for m in an s m; do +- f=$d/$t$m +- if test -z "$sys_tmac_prefix" \ +- && test -f $f \ +- && grep '^\.if' $f >/dev/null 2>&1; then +- sys_tmac_prefix=$d/$t +- sys_tmac_file_prefix=$t +- fi +- done +- done +- done +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sys_tmac_prefix" >&5 +-$as_echo "$sys_tmac_prefix" >&6; } +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking which system macro packages should be made available" >&5 +-$as_echo_n "checking which system macro packages should be made available... " >&6; } +- tmac_wrap= +- if test "x$sys_tmac_file_prefix" = "xtmac."; then +- for f in $sys_tmac_prefix*; do +- suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"` +- case "$suff" in +- e) +- ;; +- *) +- grep "Copyright.*Free Software Foundation" $f >/dev/null \ +- || tmac_wrap="$tmac_wrap $suff" ;; +- esac +- done +- elif test -n "$sys_tmac_prefix"; then +- files=`echo $sys_tmac_prefix*` +- grep "\\.so" $files >conftest.sol +- for f in $files; do +- case "$f" in +- ${sys_tmac_prefix}e) +- ;; +- *.me) +- ;; +- */ms.*) +- ;; +- *) +- b=`basename $f` +- if grep "\\.so.*/$b\$" conftest.sol >/dev/null \ +- || grep -l "Copyright.*Free Software Foundation" $f >/dev/null; then +- : +- else +- suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"` +- case "$suff" in +- tmac.*) +- ;; +- *) +- tmac_wrap="$tmac_wrap $suff" ;; +- esac +- fi +- esac +- done +- rm -f conftest.sol +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tmac_wrap" >&5 +-$as_echo "$tmac_wrap" >&6; } +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking separator character to use in groff search paths" >&5 +-$as_echo_n "checking separator character to use in groff search paths... " >&6; } +- cp ${srcdir}/src/include/nonposix.h conftest.h +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +- +-#include +-#include "conftest.h" +- +- +-int +-main () +-{ +- +- +-#if PATH_SEP_CHAR == ';' +-make an error "Path separator is ';'" +-#endif +- +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- GROFF_PATH_SEPARATOR=":" +-else +- GROFF_PATH_SEPARATOR=";" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROFF_PATH_SEPARATOR" >&5 +-$as_echo "$GROFF_PATH_SEPARATOR" >&6; } +- +- +-# Check whether --with-alt-gs was given. +-if test "${with_alt_gs+set}" = set; then : +- withval=$with_alt_gs; ALT_GHOSTSCRIPT_PROGS="$withval" +-else +- ALT_GHOSTSCRIPT_PROGS="gs gswin32c gsos2" +-fi +- +- +- +- +-# Check whether --with-gs was given. +-if test "${with_gs+set}" = set; then : +- withval=$with_gs; GHOSTSCRIPT=$withval +-else +- if test -n "$ac_tool_prefix"; then +- for ac_prog in $ALT_GHOSTSCRIPT_PROGS +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_GHOSTSCRIPT+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$GHOSTSCRIPT"; then +- ac_cv_prog_GHOSTSCRIPT="$GHOSTSCRIPT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_GHOSTSCRIPT="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-GHOSTSCRIPT=$ac_cv_prog_GHOSTSCRIPT +-if test -n "$GHOSTSCRIPT"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GHOSTSCRIPT" >&5 +-$as_echo "$GHOSTSCRIPT" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$GHOSTSCRIPT" && break +- done +-fi +-if test -z "$GHOSTSCRIPT"; then +- ac_ct_GHOSTSCRIPT=$GHOSTSCRIPT +- for ac_prog in $ALT_GHOSTSCRIPT_PROGS +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_GHOSTSCRIPT+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_GHOSTSCRIPT"; then +- ac_cv_prog_ac_ct_GHOSTSCRIPT="$ac_ct_GHOSTSCRIPT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_GHOSTSCRIPT="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_GHOSTSCRIPT=$ac_cv_prog_ac_ct_GHOSTSCRIPT +-if test -n "$ac_ct_GHOSTSCRIPT"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GHOSTSCRIPT" >&5 +-$as_echo "$ac_ct_GHOSTSCRIPT" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_GHOSTSCRIPT" && break +-done +- +- if test "x$ac_ct_GHOSTSCRIPT" = x; then +- GHOSTSCRIPT="missing" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- GHOSTSCRIPT=$ac_ct_GHOSTSCRIPT +- fi +-fi +- +-fi +- +- test "$GHOSTSCRIPT" = "no" && GHOSTSCRIPT=missing +-make_htmldoc= +- make_install_htmldoc= +- make_uninstall_htmldoc= +- make_htmlexamples= +- make_install_htmlexamples= +- make_uninstall_htmlexamples= +- +- +- missing= +- # Extract the first word of "pnmcut", so it can be a program name with args. +-set dummy pnmcut; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_pnmcut+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$pnmcut"; then +- ac_cv_prog_pnmcut="$pnmcut" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_pnmcut="found" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_pnmcut" && ac_cv_prog_pnmcut="missing" +-fi +-fi +-pnmcut=$ac_cv_prog_pnmcut +-if test -n "$pnmcut"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmcut" >&5 +-$as_echo "$pnmcut" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test $pnmcut = missing; then +- missing="$missing \`pnmcut'" +- fi;# Extract the first word of "pnmcrop", so it can be a program name with args. +-set dummy pnmcrop; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_pnmcrop+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$pnmcrop"; then +- ac_cv_prog_pnmcrop="$pnmcrop" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_pnmcrop="found" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_pnmcrop" && ac_cv_prog_pnmcrop="missing" +-fi +-fi +-pnmcrop=$ac_cv_prog_pnmcrop +-if test -n "$pnmcrop"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmcrop" >&5 +-$as_echo "$pnmcrop" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test $pnmcrop = missing; then +- missing="$missing \`pnmcrop'" +- fi;# Extract the first word of "pnmtopng", so it can be a program name with args. +-set dummy pnmtopng; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_pnmtopng+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$pnmtopng"; then +- ac_cv_prog_pnmtopng="$pnmtopng" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_pnmtopng="found" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_pnmtopng" && ac_cv_prog_pnmtopng="missing" +-fi +-fi +-pnmtopng=$ac_cv_prog_pnmtopng +-if test -n "$pnmtopng"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmtopng" >&5 +-$as_echo "$pnmtopng" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test $pnmtopng = missing; then +- missing="$missing \`pnmtopng'" +- fi;# Extract the first word of "psselect", so it can be a program name with args. +-set dummy psselect; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_psselect+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$psselect"; then +- ac_cv_prog_psselect="$psselect" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_psselect="found" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_psselect" && ac_cv_prog_psselect="missing" +-fi +-fi +-psselect=$ac_cv_prog_psselect +-if test -n "$psselect"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $psselect" >&5 +-$as_echo "$psselect" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test $psselect = missing; then +- missing="$missing \`psselect'" +- fi;# Extract the first word of "pnmtops", so it can be a program name with args. +-set dummy pnmtops; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_pnmtops+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$pnmtops"; then +- ac_cv_prog_pnmtops="$pnmtops" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_pnmtops="found" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_prog_pnmtops" && ac_cv_prog_pnmtops="missing" +-fi +-fi +-pnmtops=$ac_cv_prog_pnmtops +-if test -n "$pnmtops"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pnmtops" >&5 +-$as_echo "$pnmtops" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- if test $pnmtops = missing; then +- missing="$missing \`pnmtops'" +- fi; +- +- test "$GHOSTSCRIPT" = "missing" && missing="$missing \`gs'" +- +- if test -z "$missing"; then +- if test $docadd_html = yes; then +- make_htmldoc=htmldoc +- make_install_htmldoc=install_htmldoc +- make_uninstall_htmldoc=uninstall_htmldoc +- if test $docadd_examples = yes; then +- make_htmlexamples=html_examples +- make_install_htmlexamples=install_htmlexamples +- make_uninstall_htmlexamples=uninstall_htmlexamples +- fi +- fi +- else +- plural=`set $missing; test $# -gt 1 && echo s` +- missing=`set $missing +- missing="" +- while test $# -gt 0 +- do +- case $# in +- 1) missing="$missing$1" ;; +- 2) missing="$missing$1 and " ;; +- *) missing="$missing$1, " ;; +- esac +- shift +- done +- echo $missing` +- +- docnote=. +- test $docadd_html = yes && docnote='; +- therefore, it will neither be possible to prepare, nor to install, +- documentation in HTML format.' +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural: +- +- The program$plural +- $missing +- cannot be found in the PATH. +- Consequently, groff's HTML backend (grohtml) will not work properly$docnote +- " >&5 +-$as_echo "$as_me: WARNING: missing program$plural: +- +- The program$plural +- $missing +- cannot be found in the PATH. +- Consequently, groff's HTML backend (grohtml) will not work properly$docnote +- " >&2;} +- doc_dist_target_ok=no +- fi +- +- +- +- +- +- +- +-# Check whether --with-alt-awk was given. +-if test "${with_alt_awk+set}" = set; then : +- withval=$with_alt_awk; ALT_AWK_PROGS="$withval" +-else +- ALT_AWK_PROGS="gawk mawk nawk awk" +-fi +- +- +- +- +-# Check whether --with-awk was given. +-if test "${with_awk+set}" = set; then : +- withval=$with_awk; AWK=$withval +-else +- if test -n "$ac_tool_prefix"; then +- for ac_prog in $ALT_AWK_PROGS +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AWK+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$AWK"; then +- ac_cv_prog_AWK="$AWK" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AWK="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-AWK=$ac_cv_prog_AWK +-if test -n "$AWK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +-$as_echo "$AWK" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$AWK" && break +- done +-fi +-if test -z "$AWK"; then +- ac_ct_AWK=$AWK +- for ac_prog in $ALT_AWK_PROGS +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_AWK+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_AWK"; then +- ac_cv_prog_ac_ct_AWK="$ac_ct_AWK" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_AWK="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_AWK=$ac_cv_prog_ac_ct_AWK +-if test -n "$ac_ct_AWK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AWK" >&5 +-$as_echo "$ac_ct_AWK" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_AWK" && break +-done +- +- if test "x$ac_ct_AWK" = x; then +- AWK="missing" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- AWK=$ac_ct_AWK +- fi +-fi +- +-fi +- +- test "$AWK" = "no" && AWK=missing +-make_pdfdoc= +- make_install_pdfdoc= +- make_uninstall_pdfdoc= +- make_pdfexamples= +- make_install_pdfexamples= +- make_uninstall_pdfexamples= +- +- +- +- missing="" +- test "$AWK" = missing && missing="\`awk'" +- test "$GHOSTSCRIPT" = missing && missing="$missing \`gs'" +- if test -z "$missing"; then +- if test $docadd_pdf = yes; then +- make_pdfdoc=pdfdoc +- make_install_pdfdoc=install_pdfdoc +- make_uninstall_pdfdoc=uninstall_pdfdoc +- if test $docadd_examples = yes; then +- make_pdfexamples=pdfexamples +- make_install_pdfexamples=install_pdfexamples +- make_uninstall_pdfexamples=uninstall_pdfexamples +- fi +- fi +- else +- plural=`set $missing; test $# -eq 2 && echo s` +- test x$plural = xs \ +- && missing=`set $missing; echo "$1 and $2"` \ +- || missing=`echo $missing` +- +- docnote=. +- test $docadd_pdf = yes && docnote='; +- therefore, it will neither be possible to prepare, nor to install, +- documentation and most of the examples in PDF format.' +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: missing program$plural: +- +- The program$plural $missing cannot be found in the PATH. +- Consequently, groff's PDF formatter (pdfroff) will not work properly$docnote +- " >&5 +-$as_echo "$as_me: WARNING: missing program$plural: +- +- The program$plural $missing cannot be found in the PATH. +- Consequently, groff's PDF formatter (pdfroff) will not work properly$docnote +- " >&2;} +- doc_dist_target_ok=no +- fi +- +- +- +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pnmtops can handle the -nosetpage option" >&5 +-$as_echo_n "checking whether pnmtops can handle the -nosetpage option... " >&6; } +- if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- pnmtops_nosetpage="pnmtops -nosetpage" +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- pnmtops_nosetpage="pnmtops" +- fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5 +-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; } +-if ${ac_cv_gnu_library_2_1+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#ifdef __GNU_LIBRARY__ +- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) +- Lucky GNU user +- #endif +-#endif +-#ifdef __UCLIBC__ +- Lucky user +-#endif +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "Lucky" >/dev/null 2>&1; then : +- ac_cv_gnu_library_2_1=yes +-else +- ac_cv_gnu_library_2_1=no +-fi +-rm -f conftest* +- +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 +-$as_echo "$ac_cv_gnu_library_2_1" >&6; } +- +- GLIBC21="$ac_cv_gnu_library_2_1" +- +- +- +- +- +- for ac_func in $ac_func_list +-do : +- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +- +- +- +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5 +-$as_echo_n "checking for working fcntl.h... " >&6; } +-if ${gl_cv_header_working_fcntl_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- gl_cv_header_working_fcntl_h=cross-compiling +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- #include +- #if HAVE_UNISTD_H +- # include +- #else /* on Windows with MSVC */ +- # include +- # include +- # defined sleep(n) _sleep ((n) * 1000) +- #endif +- #include +- #ifndef O_NOATIME +- #define O_NOATIME 0 +- #endif +- #ifndef O_NOFOLLOW +- #define O_NOFOLLOW 0 +- #endif +- static int const constants[] = +- { +- O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND, +- O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY +- }; +- +-int +-main () +-{ +- +- int result = !constants; +- #if HAVE_SYMLINK +- { +- static char const sym[] = "conftest.sym"; +- if (symlink ("/dev/null", sym) != 0) +- result |= 2; +- else +- { +- int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); +- if (fd >= 0) +- { +- close (fd); +- result |= 4; +- } +- } +- if (unlink (sym) != 0 || symlink (".", sym) != 0) +- result |= 2; +- else +- { +- int fd = open (sym, O_RDONLY | O_NOFOLLOW); +- if (fd >= 0) +- { +- close (fd); +- result |= 4; +- } +- } +- unlink (sym); +- } +- #endif +- { +- static char const file[] = "confdefs.h"; +- int fd = open (file, O_RDONLY | O_NOATIME); +- if (fd < 0) +- result |= 8; +- else +- { +- struct stat st0; +- if (fstat (fd, &st0) != 0) +- result |= 16; +- else +- { +- char c; +- sleep (1); +- if (read (fd, &c, 1) != 1) +- result |= 24; +- else +- { +- if (close (fd) != 0) +- result |= 32; +- else +- { +- struct stat st1; +- if (stat (file, &st1) != 0) +- result |= 40; +- else +- if (st0.st_atime != st1.st_atime) +- result |= 64; +- } +- } +- } +- } +- } +- return result; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- gl_cv_header_working_fcntl_h=yes +-else +- case $? in #( +- 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( +- 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( +- 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( +- *) gl_cv_header_working_fcntl_h='no';; +- esac +-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: $gl_cv_header_working_fcntl_h" >&5 +-$as_echo "$gl_cv_header_working_fcntl_h" >&6; } +- +- case $gl_cv_header_working_fcntl_h in #( +- *O_NOATIME* | no | cross-compiling) ac_val=0;; #( +- *) ac_val=1;; +- esac +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_WORKING_O_NOATIME $ac_val +-_ACEOF +- +- +- case $gl_cv_header_working_fcntl_h in #( +- *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #( +- *) ac_val=1;; +- esac +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_WORKING_O_NOFOLLOW $ac_val +-_ACEOF +- +- +-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : +- ac_have_decl=1 +-else +- ac_have_decl=0 +-fi +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +-_ACEOF +- +- +- +- +- +- +- +- +- +- +-ac_config_files="$ac_config_files stamp-h" +- +-ac_config_files="$ac_config_files Makefile doc/Makefile src/utils/xtotroff/Makefile" +- +-ac_config_files="$ac_config_files contrib/gdiffmk/tests/runtests" +- +-ac_config_files="$ac_config_files test-groff" +- +-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 +-# scripts and configure runs, see configure's option --config-cache. +-# It is not useful on other systems. If it contains results you don't +-# want to keep, you may remove or edit it. +-# +-# config.status only pays attention to the cache file if you give it +-# the --recheck option to rerun configure. +-# +-# `ac_cv_env_foo' variables (set or unset) will be overridden when +-# loading this file, other *unset* `ac_cv_foo' will be assigned the +-# following values. +- +-_ACEOF +- +-# The following way of writing the cache mishandles newlines in values, +-# but we know of no workaround that is simple, portable, and efficient. +-# So, we kill variables containing newlines. +-# Ultrix sh set writes to stderr and can't be redirected directly, +-# and sets the high bit in the cache file unless we assign to the vars. +-( +- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) { eval $ac_var=; unset $ac_var;} ;; +- esac ;; +- esac +- done +- +- (set) 2>&1 | +- case $as_nl`(ac_space=' '; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes: double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \. +- sed -n \ +- "s/'/'\\\\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; #( +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) | +- sed ' +- /^ac_cv_env_/b end +- t clear +- :clear +- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ +- t end +- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- :end' >>confcache +-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else +- if test -w "$cache_file"; then +- if test "x$cache_file" != "x/dev/null"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +-$as_echo "$as_me: updating cache $cache_file" >&6;} +- if test ! -f "$cache_file" || test -h "$cache_file"; then +- cat confcache >"$cache_file" +- else +- case $cache_file in #( +- */* | ?:*) +- mv -f confcache "$cache_file"$$ && +- mv -f "$cache_file"$$ "$cache_file" ;; #( +- *) +- mv -f confcache "$cache_file" ;; +- esac +- fi +- fi +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +- fi +-fi +-rm -f confcache +- +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-# Let make expand exec_prefix. +-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- +-DEFS=-DHAVE_CONFIG_H +- +-ac_libobjs= +-ac_ltlibobjs= +-U= +-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue +- # 1. Remove the extension, and $U if already installed. +- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` +- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR +- # will be set to the directory where LIBOBJS objects are built. +- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +-done +-LIBOBJS=$ac_libobjs +- +-LTLIBOBJS=$ac_ltlibobjs +- +- +- +- +-: "${CONFIG_STATUS=./config.status}" +-ac_write_fail=0 +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-as_write_fail=0 +-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +-#! $SHELL +-# Generated by $as_me. +-# Run this file to recreate the current configuration. +-# Compiler output produced by configure, useful for debugging +-# configure, is in config.log if it exists. +- +-debug=false +-ac_cs_recheck=false +-ac_cs_silent=false +- +-SHELL=\${CONFIG_SHELL-$SHELL} +-export SHELL +-_ASEOF +-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +-## -------------------- ## +-## M4sh Initialization. ## +-## -------------------- ## +- +-# Be more Bourne compatible +-DUALCASE=1; export DUALCASE # for MKS sh +-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 +-else +- case `(set -o) 2>/dev/null` in #( +- *posix*) : +- set -o posix ;; #( +- *) : +- ;; +-esac +-fi +- +- +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-# Prefer a ksh shell builtin over an external printf program on Solaris, +-# but without wasting forks for bash or zsh. +-if test -z "$BASH_VERSION$ZSH_VERSION" \ +- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='print -r --' +- as_echo_n='print -rn --' +-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in #( +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } +-fi +- +- +-# IFS +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent editors from complaining about space-tab. +-# (If _AS_PATH_WALK were called with IFS unset, it would disable word +-# splitting by setting IFS to empty value.) +-IFS=" "" $as_nl" +- +-# Find who we are. Look in the path if we contain no directory separator. +-as_myself= +-case $0 in #(( +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' +-# in which case we are not to be found in the path. +-if test "x$as_myself" = x; then +- as_myself=$0 +-fi +-if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- exit 1 +-fi +- +-# Unset variables that we do not need and which cause bugs (e.g. in +-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +-# suppresses any "Segmentation fault" message there. '((' could +-# trigger a bug in pdksh 5.2.14. +-for as_var in BASH_ENV ENV MAIL MAILPATH +-do eval test x\${$as_var+set} = xset \ +- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +-done +-PS1='$ ' +-PS2='> ' +-PS4='+ ' +- +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE +- +-# CDPATH. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +- +-# as_fn_error STATUS ERROR [LINENO LOG_FD] +-# ---------------------------------------- +-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with STATUS, using 1 if that was 0. +-as_fn_error () +-{ +- as_status=$1; test $as_status -eq 0 && as_status=1 +- if test "$4"; then +- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 +- fi +- $as_echo "$as_me: error: $2" >&2 +- as_fn_exit $as_status +-} # as_fn_error +- +- +-# as_fn_set_status STATUS +-# ----------------------- +-# Set $? to STATUS, without forking. +-as_fn_set_status () +-{ +- return $1 +-} # as_fn_set_status +- +-# as_fn_exit STATUS +-# ----------------- +-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +-as_fn_exit () +-{ +- set +e +- as_fn_set_status $1 +- exit $1 +-} # as_fn_exit +- +-# as_fn_unset VAR +-# --------------- +-# Portably unset VAR. +-as_fn_unset () +-{ +- { eval $1=; unset $1;} +-} +-as_unset=as_fn_unset +-# as_fn_append VAR VALUE +-# ---------------------- +-# Append the text in VALUE to the end of the definition contained in VAR. Take +-# advantage of any shell optimizations that allow amortized linear growth over +-# repeated appends, instead of the typical quadratic growth present in naive +-# implementations. +-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +- eval 'as_fn_append () +- { +- eval $1+=\$2 +- }' +-else +- as_fn_append () +- { +- eval $1=\$$1\$2 +- } +-fi # as_fn_append +- +-# as_fn_arith ARG... +-# ------------------ +-# Perform arithmetic evaluation on the ARGs, and store the result in the +-# global $as_val. Take advantage of shells that can avoid forks. The arguments +-# must be portable across $(()) and expr. +-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +- eval 'as_fn_arith () +- { +- as_val=$(( $* )) +- }' +-else +- as_fn_arith () +- { +- as_val=`expr "$@" || test $? -eq 1` +- } +-fi # as_fn_arith +- +- +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in #((((( +--n*) +- case `echo 'xy\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- xy) ECHO_C='\c';; +- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null +- ECHO_T=' ';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null +-fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -pR'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -pR' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +- as_ln_s='cp -pR' +- fi +-else +- as_ln_s='cp -pR' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +- +- +-# as_fn_mkdir_p +-# ------------- +-# Create "$as_dir" as a directory, including parents if necessary. +-as_fn_mkdir_p () +-{ +- +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || eval $as_mkdir_p || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" +- +- +-} # as_fn_mkdir_p +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p='mkdir -p "$as_dir"' +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi +- +- +-# as_fn_executable_p FILE +-# ----------------------- +-# Test if FILE is an executable regular file. +-as_fn_executable_p () +-{ +- test -f "$1" && test -x "$1" +-} # as_fn_executable_p +-as_test_x='test -x' +-as_executable_p=as_fn_executable_p +- +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +-exec 6>&1 +-## ----------------------------------- ## +-## Main body of $CONFIG_STATUS script. ## +-## ----------------------------------- ## +-_ASEOF +-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# Save the log message, to keep $0 and so on meaningful, and to +-# report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. +-ac_log=" +-This file was extended by groff $as_me 1.22.3, which was +-generated by GNU Autoconf 2.69. Invocation command line was +- +- CONFIG_FILES = $CONFIG_FILES +- CONFIG_HEADERS = $CONFIG_HEADERS +- CONFIG_LINKS = $CONFIG_LINKS +- CONFIG_COMMANDS = $CONFIG_COMMANDS +- $ $0 $@ +- +-on `(hostname || uname -n) 2>/dev/null | sed 1q` +-" +- +-_ACEOF +- +-case $ac_config_files in *" +-"*) set x $ac_config_files; shift; ac_config_files=$*;; +-esac +- +-case $ac_config_headers in *" +-"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +-esac +- +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-# Files that config.status was made for. +-config_files="$ac_config_files" +-config_headers="$ac_config_headers" +- +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-ac_cs_usage="\ +-\`$as_me' instantiates files and other configuration actions +-from templates according to the current configuration. Unless the files +-and actions are specified as TAGs, all are instantiated by default. +- +-Usage: $0 [OPTION]... [TAG]... +- +- -h, --help print this help, then exit +- -V, --version print version number and configuration settings, then exit +- --config print configuration, then exit +- -q, --quiet, --silent +- do not print progress messages +- -d, --debug don't remove temporary files +- --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE +- +-Configuration files: +-$config_files +- +-Configuration headers: +-$config_headers +- +-Report bugs to ." +- +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +-ac_cs_version="\\ +-groff config.status 1.22.3 +-configured by $0, generated by GNU Autoconf 2.69, +- with options \\"\$ac_cs_config\\" +- +-Copyright (C) 2012 Free Software Foundation, Inc. +-This config.status script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it." +- +-ac_pwd='$ac_pwd' +-srcdir='$srcdir' +-INSTALL='$INSTALL' +-AWK='$AWK' +-test -n "\$AWK" || AWK=awk +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# The default lists apply if the user does not specify any file. +-ac_need_defaults=: +-while test $# != 0 +-do +- case $1 in +- --*=?*) +- ac_option=`expr "X$1" : 'X\([^=]*\)='` +- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` +- ac_shift=: +- ;; +- --*=) +- ac_option=`expr "X$1" : 'X\([^=]*\)='` +- ac_optarg= +- ac_shift=: +- ;; +- *) +- ac_option=$1 +- ac_optarg=$2 +- ac_shift=shift +- ;; +- esac +- +- case $ac_option in +- # Handling of the options. +- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) +- ac_cs_recheck=: ;; +- --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- $as_echo "$ac_cs_version"; exit ;; +- --config | --confi | --conf | --con | --co | --c ) +- $as_echo "$ac_cs_config"; exit ;; +- --debug | --debu | --deb | --de | --d | -d ) +- debug=: ;; +- --file | --fil | --fi | --f ) +- $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- '') as_fn_error $? "missing file argument" ;; +- esac +- as_fn_append CONFIG_FILES " '$ac_optarg'" +- ac_need_defaults=false;; +- --header | --heade | --head | --hea ) +- $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- as_fn_append CONFIG_HEADERS " '$ac_optarg'" +- ac_need_defaults=false;; +- --he | --h) +- # Conflict between --help and --header +- as_fn_error $? "ambiguous option: \`$1' +-Try \`$0 --help' for more information.";; +- --help | --hel | -h ) +- $as_echo "$ac_cs_usage"; exit ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil | --si | --s) +- ac_cs_silent=: ;; +- +- # This is an error. +- -*) as_fn_error $? "unrecognized option: \`$1' +-Try \`$0 --help' for more information." ;; +- +- *) as_fn_append ac_config_targets " $1" +- ac_need_defaults=false ;; +- +- esac +- shift +-done +- +-ac_configure_extra_args= +- +-if $ac_cs_silent; then +- exec 6>/dev/null +- ac_configure_extra_args="$ac_configure_extra_args --silent" +-fi +- +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-if \$ac_cs_recheck; then +- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +- shift +- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 +- CONFIG_SHELL='$SHELL' +- export CONFIG_SHELL +- exec "\$@" +-fi +- +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +- $as_echo "$ac_log" +-} >&5 +- +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- +-# Handling of arguments. +-for ac_config_target in $ac_config_targets +-do +- case $ac_config_target in +- "src/include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h:src/include/config.hin" ;; +- "stamp-h") CONFIG_FILES="$CONFIG_FILES stamp-h" ;; +- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; +- "src/utils/xtotroff/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/xtotroff/Makefile" ;; +- "contrib/gdiffmk/tests/runtests") CONFIG_FILES="$CONFIG_FILES contrib/gdiffmk/tests/runtests" ;; +- "test-groff") CONFIG_FILES="$CONFIG_FILES test-groff" ;; +- +- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; +- esac +-done +- +- +-# If the user did not use the arguments to specify the items to instantiate, +-# then the envvar interface is used. Set only those that are not. +-# We use the long form for the default assignment because of an extremely +-# bizarre bug on SunOS 4.1.3. +-if $ac_need_defaults; then +- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +-fi +- +-# Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason against having it here, and in addition, +-# creating and moving files from /tmp can sometimes cause problems. +-# Hook for its removal unless debugging. +-# Note that there is a small window in which the directory will not be cleaned: +-# after its creation but before its name has been assigned to `$tmp'. +-$debug || +-{ +- tmp= ac_tmp= +- trap 'exit_status=$? +- : "${ac_tmp:=$tmp}" +- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +-' 0 +- trap 'as_fn_exit 1' 1 2 13 15 +-} +-# Create a (secure) tmp directory for tmp files. +- +-{ +- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -d "$tmp" +-} || +-{ +- tmp=./conf$$-$RANDOM +- (umask 077 && mkdir "$tmp") +-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +-ac_tmp=$tmp +- +-# Set up the scripts for CONFIG_FILES section. +-# No need to generate them if there are no CONFIG_FILES. +-# This happens for instance with `./config.status config.h'. +-if test -n "$CONFIG_FILES"; then +- +- +-ac_cr=`echo X | tr X '\015'` +-# On cygwin, bash can eat \r inside `` if the user requested igncr. +-# But we know of no other shell where ac_cr would be empty at this +-# point, so we can use a bashism as a fallback. +-if test "x$ac_cr" = x; then +- eval ac_cr=\$\'\\r\' +-fi +-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' +-else +- ac_cs_awk_cr=$ac_cr +-fi +- +-echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +-_ACEOF +- +- +-{ +- echo "cat >conf$$subs.awk <<_ACEOF" && +- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && +- echo "_ACEOF" +-} >conf$$subs.sh || +- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- . ./conf$$subs.sh || +- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +- +- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` +- if test $ac_delim_n = $ac_delim_num; then +- break +- elif $ac_last_try; then +- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +-rm -f conf$$subs.sh +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +-_ACEOF +-sed -n ' +-h +-s/^/S["/; s/!.*/"]=/ +-p +-g +-s/^[^!]*!// +-:repl +-t repl +-s/'"$ac_delim"'$// +-t delim +-:nl +-h +-s/\(.\{148\}\)..*/\1/ +-t more1 +-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +-p +-n +-b repl +-:more1 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t nl +-:delim +-h +-s/\(.\{148\}\)..*/\1/ +-t more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"/ +-p +-b +-:more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t delim +-' >$CONFIG_STATUS || ac_write_fail=1 +-rm -f conf$$subs.awk +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-_ACAWK +-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +- for (key in S) S_is_set[key] = 1 +- FS = "" +- +-} +-{ +- line = $ 0 +- nfields = split(line, field, "@") +- substed = 0 +- len = length(field[1]) +- for (i = 2; i < nfields; i++) { +- key = field[i] +- keylen = length(key) +- if (S_is_set[key]) { +- value = S[key] +- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) +- len += length(value) + length(field[++i]) +- substed = 1 +- } else +- len += 1 + keylen +- } +- +- print line +-} +- +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then +- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +-else +- cat +-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ +- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +-_ACEOF +- +-# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +-h +-s/// +-s/^/:/ +-s/[ ]*$/:/ +-s/:\$(srcdir):/:/g +-s/:\${srcdir}:/:/g +-s/:@srcdir@:/:/g +-s/^:*// +-s/:*$// +-x +-s/\(=[ ]*\).*/\1/ +-G +-s/\n// +-s/^[^=]*=[ ]*$// +-}' +-fi +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-fi # test -n "$CONFIG_FILES" +- +-# Set up the scripts for CONFIG_HEADERS section. +-# No need to generate them if there are no CONFIG_HEADERS. +-# This happens for instance with `./config.status Makefile'. +-if test -n "$CONFIG_HEADERS"; then +-cat >"$ac_tmp/defines.awk" <<\_ACAWK || +-BEGIN { +-_ACEOF +- +-# Transform confdefs.h into an awk script `defines.awk', embedded as +-# here-document in config.status, that substitutes the proper values into +-# config.h.in to produce config.h. +- +-# Create a delimiter string that does not exist in confdefs.h, to ease +-# handling of long lines. +-ac_delim='%!_!# ' +-for ac_last_try in false false :; do +- ac_tt=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_tt"; then +- break +- elif $ac_last_try; then +- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +- +-# For the awk script, D is an array of macro values keyed by name, +-# likewise P contains macro parameters if any. Preserve backslash +-# newline sequences. +- +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-sed -n ' +-s/.\{148\}/&'"$ac_delim"'/g +-t rset +-:rset +-s/^[ ]*#[ ]*define[ ][ ]*/ / +-t def +-d +-:def +-s/\\$// +-t bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3"/p +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +-d +-:bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3\\\\\\n"\\/p +-t cont +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +-t cont +-d +-:cont +-n +-s/.\{148\}/&'"$ac_delim"'/g +-t clear +-:clear +-s/\\$// +-t bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/"/p +-d +-:bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +-b cont +-' >$CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- for (key in D) D_is_set[key] = 1 +- FS = "" +-} +-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { +- line = \$ 0 +- split(line, arg, " ") +- if (arg[1] == "#") { +- defundef = arg[2] +- mac1 = arg[3] +- } else { +- defundef = substr(arg[1], 2) +- mac1 = arg[2] +- } +- split(mac1, mac2, "(") #) +- macro = mac2[1] +- prefix = substr(line, 1, index(line, defundef) - 1) +- if (D_is_set[macro]) { +- # Preserve the white space surrounding the "#". +- print prefix "define", macro P[macro] D[macro] +- next +- } else { +- # Replace #undef with comments. This is necessary, for example, +- # in the case of _POSIX_SOURCE, which is predefined and required +- # on some systems where configure will not decide to define it. +- if (defundef == "undef") { +- print "/*", prefix defundef, macro, "*/" +- next +- } +- } +-} +-{ print } +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +-fi # test -n "$CONFIG_HEADERS" +- +- +-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +-shift +-for ac_tag +-do +- case $ac_tag in +- :[FHLC]) ac_mode=$ac_tag; continue;; +- esac +- case $ac_mode$ac_tag in +- :[FHL]*:*);; +- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; +- :[FH]-) ac_tag=-:-;; +- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +- esac +- ac_save_IFS=$IFS +- IFS=: +- set x $ac_tag +- IFS=$ac_save_IFS +- shift +- ac_file=$1 +- shift +- +- case $ac_mode in +- :L) ac_source=$1;; +- :[FH]) +- ac_file_inputs= +- for ac_f +- do +- case $ac_f in +- -) ac_f="$ac_tmp/stdin";; +- *) # Look for the file first in the build tree, then in the source tree +- # (if the path is not absolute). The absolute path cannot be DOS-style, +- # because $ac_f cannot contain `:'. +- test -f "$ac_f" || +- case $ac_f in +- [\\/$]*) false;; +- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; +- esac || +- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; +- esac +- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- as_fn_append ac_file_inputs " '$ac_f'" +- done +- +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- configure_input='Generated from '` +- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' +- `' by configure.' +- if test x"$ac_file" != x-; then +- configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +-$as_echo "$as_me: creating $ac_file" >&6;} +- fi +- # Neutralize special characters interpreted by sed in replacement strings. +- case $configure_input in #( +- *\&* | *\|* | *\\* ) +- ac_sed_conf_input=`$as_echo "$configure_input" | +- sed 's/[\\\\&|]/\\\\&/g'`;; #( +- *) ac_sed_conf_input=$configure_input;; +- esac +- +- case $ac_tag in +- *:-:* | *:-) cat >"$ac_tmp/stdin" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; +- esac +- ;; +- esac +- +- ac_dir=`$as_dirname -- "$ac_file" || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- as_dir="$ac_dir"; as_fn_mkdir_p +- ac_builddir=. +- +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; +-esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix +- +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +-esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +- +- +- case $ac_mode in +- :F) +- # +- # CONFIG_FILE +- # +- +- case $INSTALL in +- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; +- esac +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# If the template does not know about datarootdir, expand it. +-# FIXME: This hack should be removed a few years after 2.60. +-ac_datarootdir_hack=; ac_datarootdir_seen= +-ac_sed_dataroot=' +-/datarootdir/ { +- p +- q +-} +-/@datadir@/p +-/@docdir@/p +-/@infodir@/p +-/@localedir@/p +-/@mandir@/p' +-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +-*datarootdir*) ac_datarootdir_seen=yes;; +-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- ac_datarootdir_hack=' +- s&@datadir@&$datadir&g +- s&@docdir@&$docdir&g +- s&@infodir@&$infodir&g +- s&@localedir@&$localedir&g +- s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; +-esac +-_ACEOF +- +-# Neutralize VPATH when `$srcdir' = `.'. +-# Shell code in configure.ac might set extrasub. +-# FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_sed_extra="$ac_vpsub +-$extrasub +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-:t +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s|@configure_input@|$ac_sed_conf_input|;t t +-s&@top_builddir@&$ac_top_builddir_sub&;t t +-s&@top_build_prefix@&$ac_top_build_prefix&;t t +-s&@srcdir@&$ac_srcdir&;t t +-s&@abs_srcdir@&$ac_abs_srcdir&;t t +-s&@top_srcdir@&$ac_top_srcdir&;t t +-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +-s&@builddir@&$ac_builddir&;t t +-s&@abs_builddir@&$ac_abs_builddir&;t t +-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +-s&@INSTALL@&$ac_INSTALL&;t t +-$ac_datarootdir_hack +-" +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ +- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- +-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ +- "$ac_tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined" >&5 +-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined" >&2;} +- +- rm -f "$ac_tmp/stdin" +- case $ac_file in +- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; +- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; +- esac \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- ;; +- :H) +- # +- # CONFIG_HEADER +- # +- if test x"$ac_file" != x-; then +- { +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" +- } >"$ac_tmp/config.h" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +-$as_echo "$as_me: $ac_file is unchanged" >&6;} +- else +- rm -f "$ac_file" +- mv "$ac_tmp/config.h" "$ac_file" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- fi +- else +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error $? "could not create -" "$LINENO" 5 +- fi +- ;; +- +- +- esac +- +- +- case $ac_file$ac_mode in +- "stamp-h":F) echo timestamp > stamp-h ;; +- "contrib/gdiffmk/tests/runtests":F) chmod +x contrib/gdiffmk/tests/runtests ;; +- "test-groff":F) chmod +x test-groff ;; +- +- esac +-done # for ac_tag +- +- +-as_fn_exit 0 +-_ACEOF +-ac_clean_files=$ac_clean_files_save +- +-test $ac_write_fail = 0 || +- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 +- +- +-# configure is writing to config.log, and then calls config.status. +-# config.status does its own redirection, appending to config.log. +-# Unfortunately, on DOS this fails, as config.log is still kept open +-# by configure, so config.status won't be able to write to it; its +-# output is simply discarded. So we exec the FD to /dev/null, +-# effectively closing config.log, so it can be properly (re)opened and +-# appended to by config.status. When coming back to configure, we +-# need to make the FD available again. +-if test "$no_create" != yes; then +- ac_cs_success=: +- ac_config_status_args= +- test "$silent" = yes && +- ac_config_status_args="$ac_config_status_args --quiet" +- exec 5>/dev/null +- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false +- exec 5>>config.log +- # Use ||, not &&, to avoid exiting from the if with $? = 1, which +- # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit 1 +-fi +-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +-fi +- +- +-echo " +-${PACKAGE_NAME} version ${PACKAGE_VERSION} +----------------------------------------------------------------------- +- Prefix : ${prefix} +- Compiler : ${CC} ${CFLAGS} ${CPPFLAGS}" +-if test "x$groff_no_x" = "xyes"; then +-echo "\ +- X11 support : no" +-else +-echo "\ +- X11 support : yes +- X11 resources dir : $appresdir" +-fi +-if test "x$doc" = x; then +-echo "\ +- Doc build : no" +-else +-echo "\ +- Doc build : ${doc} " +-fi +-echo "\ +-----------------------------------------------------------------------" +- +-if test -z "$groff_no_x"; then +- if test "x$with_appresdir" = "x"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: +- The application resource files for gxditview (GXditview and +- GXditview-color) will be installed in: +- +- $appresdir +- +- (existing files will be saved by appending \`.old' to the file +- name). +- +- To install them into a different directory, say, +- \`/etc/X11/app-defaults', add +- \`--with-appresdir=/etc/X11/app-defaults' to the configure script +- command line options and rerun it (\`prefix' value has no effect on +- a --with-appresdir option). +- +- If the gxditview resources are installed in a directory that is not +- one of the default X11 resources directories (common default +- directories are /usr/lib/X11/app-defaults, +- /usr/share/X11/app-defaults and /etc/X11/app-defaults), you will +- have to set the environment variable XFILESEARCHPATH to this +- path. More details can be found in the X(7) manual page, or in \"X +- Toolkit Intrinsics - C Language Interface manual\" +- " >&5 +-$as_echo "$as_me: +- The application resource files for gxditview (GXditview and +- GXditview-color) will be installed in: +- +- $appresdir +- +- (existing files will be saved by appending \`.old' to the file +- name). +- +- To install them into a different directory, say, +- \`/etc/X11/app-defaults', add +- \`--with-appresdir=/etc/X11/app-defaults' to the configure script +- command line options and rerun it (\`prefix' value has no effect on +- a --with-appresdir option). +- +- If the gxditview resources are installed in a directory that is not +- one of the default X11 resources directories (common default +- directories are /usr/lib/X11/app-defaults, +- /usr/share/X11/app-defaults and /etc/X11/app-defaults), you will +- have to set the environment variable XFILESEARCHPATH to this +- path. More details can be found in the X(7) manual page, or in \"X +- Toolkit Intrinsics - C Language Interface manual\" +- " >&6;} +- fi +- fi +diff -Nuar groff-1.22.3.old/configure.ac groff-1.22.3/configure.ac +--- groff-1.22.3.old/configure.ac 2014-11-04 10:38:35.143525022 +0200 ++++ groff-1.22.3/configure.ac 2015-04-23 20:57:03.000000000 +0300 +@@ -37,20 +37,28 @@ + GROFF_VERSION[.]GROFF_REVISION, + GROFF_VERSION)) + +-AC_INIT([groff], ++AC_INIT([GNU Troff], + GROFF_VERSION_STRING, + [bug-groff@gnu.org], +- [groff-]GROFF_VERSION_STRING) ++ [groff]) + AC_PREREQ([2.62]) + ++# Directories where the helper scripts should be found. This must be consistent ++# with the variable build_aux in bootstrap.conf ++AC_CONFIG_AUX_DIR([build-aux]) ++ + AC_CONFIG_HEADERS([src/include/config.h:src/include/config.hin]) + AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp]) + + AC_USE_SYSTEM_EXTENSIONS + ++AM_INIT_AUTOMAKE([subdir-objects]) ++ + # checks for programs + AC_PROG_CC + AC_PROG_CXX ++gl_EARLY ++gl_INIT + GROFF_CXX_CHECK + GROFF_EBCDIC + GROFF_OS390 +@@ -77,6 +85,8 @@ + GROFF_INSTALL_INFO + AC_PROG_INSTALL + AC_PROG_LN_S ++AC_PROG_MKDIR_P ++GROFF_PROG_XPMTOPPM + + # use a dummy substitution if no csh hack is necessary to avoid errors + # with non-GNU sed programs +@@ -160,13 +170,38 @@ + GROFF_HTML_PROGRAMS + GROFF_PDFDOC_PROGRAMS + GROFF_PNMTOPS_NOSETPAGE ++GROFF_MAKE_RM + gl_GLIBC21 + gl_LOCALCHARSET + +-AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) +-AC_CONFIG_FILES([Makefile doc/Makefile src/utils/xtotroff/Makefile]) +-AC_CONFIG_FILES([contrib/gdiffmk/tests/runtests], +- [chmod +x contrib/gdiffmk/tests/runtests]) ++AM_CONDITIONAL([BUILD_WINSCRIPTS], [test -n "$make_winscripts"]) ++ ++# If X11 is not available, don't build: ++# font/devX75 ++# font/devX75-12 ++# font/devX100 ++# font/devX100-12 ++# src/devices/xditview ++# src/utils/xtotroff ++# src/libs/libxutil ++AM_CONDITIONAL([WITHOUT_X11], [test "x$groff_no_x" = "xyes"]) ++ ++# make builtin variable RM ++AM_CONDITIONAL([MAKE_DONT_HAVE_RM], [test "x$groff_is_rm_defined" = "xno"]) ++ ++# Some programs have a "g" prefix if an existing groff installation is detected ++AM_CONDITIONAL([USEPROGRAMPREFIX], [test x$g = xg]) ++ ++AM_CONDITIONAL([BUILD_INFODOC], [test -n "$make_infodoc"]) ++AM_CONDITIONAL([BUILD_HTML], [test -n "$make_htmldoc"]) ++AM_CONDITIONAL([BUILD_HTMLEXAMPLES], [test -n "$make_htmlexamples"]) ++AM_CONDITIONAL([BUILD_PDFDOC], [test -n "$make_pdfdoc"]) ++AM_CONDITIONAL([BUILD_PDFEXAMPLES], [test -n "$make_pdfexamples"]) ++AM_CONDITIONAL([BUILD_OTHERDOC], [test -n "$make_otherdoc"]) ++AM_CONDITIONAL([BUILD_EXAMPLES], [test -n "$make_examples"]) ++AM_CONDITIONAL([INSTALL_SHIPPED_HTML], [test -n "$make_install_shipped_htmldoc"]) ++ ++AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([test-groff], [chmod +x test-groff]) + AC_OUTPUT + +diff -Nuar groff-1.22.3.old/contrib/chem/ChangeLog groff-1.22.3/contrib/chem/ChangeLog +--- groff-1.22.3.old/contrib/chem/ChangeLog 2014-11-04 10:38:35.438521334 +0200 ++++ groff-1.22.3/contrib/chem/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,8 @@ ++2015-04-03 Werner LEMBERG ++ ++ * chem.man: Make it work in compatibility mode. ++ (EL): Fix typo. ++ + 2014-09-25 Bernd Warken + + * chem.pl: New chem version 1.0.5. +diff -Nuar groff-1.22.3.old/contrib/chem/chem.am groff-1.22.3/contrib/chem/chem.am +--- groff-1.22.3.old/contrib/chem/chem.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/chem/chem.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,121 @@ ++# Automake rules for `chem' ++ ++# File position: /contrib/chem/chem.am ++ ++# Copyright (C) 2006-14 ++# Free Software Foundation, Inc. ++# Written by Bernd Warken . ++# Moved to automake by Bertrand Garrigues ++ ++# This file is part of `chem' which is part of `groff'. ++ ++# `groff' is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License (GPL) version 2 as ++# published by the Free Software Foundation. ++ ++# `groff' 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. ++ ++# The GPL2 license text is available in the internet at ++# . ++ ++######################################################################## ++ ++chem_srcdir = $(top_srcdir)/contrib/chem ++prefixexecbin_SCRIPTS += chem ++ ++# Files installed in $(datasubdir)/pic ++chempicdir = $(datasubdir)/pic ++dist_chempic_DATA = contrib/chem/chem.pic ++ ++ ++CHEM_GENEXAMPLES = contrib/chem/examples/README ++CHEM_EXAMPLES = \ ++ contrib/chem/examples/atp.chem \ ++ contrib/chem/examples/cholesterin.chem \ ++ contrib/chem/examples/ethamivan.chem \ ++ contrib/chem/examples/lsd.chem \ ++ contrib/chem/examples/morphine.chem \ ++ contrib/chem/examples/penicillin.chem \ ++ contrib/chem/examples/reserpine.chem ++ ++if BUILD_EXAMPLES ++# Files installed in $(exampledir)/chem ++chemexampledir = $(exampledir)/chem ++nodist_chemexample_DATA = $(CHEM_GENEXAMPLES) ++dist_chemexample_DATA = $(CHEM_EXAMPLES) ++ ++# Files installed in $(exampledir)/chem/122. All the .chem files in 122 are ++# lazily installed by the local install target ++chemexample122dir = $(chemexampledir)/122 ++nodist_chemexample122_DATA = contrib/chem/examples/122/README ++endif ++EXTRA_DIST += \ ++ contrib/chem/ChangeLog \ ++ contrib/chem/chem.man \ ++ contrib/chem/chem.pic \ ++ contrib/chem/chem.pl \ ++ contrib/chem/README.txt \ ++ contrib/chem/examples/README.txt \ ++ contrib/chem/examples/122/README.txt ++ ++man1_MANS += contrib/chem/chem.n ++MOSTLYCLEANFILES += $(CHEM_GENEXAMPLES) $(nodist_chemexample122_DATA) \ ++ contrib/chem/README ++ ++# This is strangly built but not installed ++all: contrib/chem/README ++ ++contrib/chem/README: $(chem_srcdir)/README.txt ++ @$(MKDIR_P) contrib/chem/ ++ sed -e "s|[@]g[@]|$(g)|g" $? >$@ ++ ++contrib/chem/examples/README: $(chem_srcdir)/examples/README.txt ++ @$(MKDIR_P) contrib/chem/examples ++ sed -e "s|[@]g[@]|$(g)|g" $? >$@ ++ ++contrib/chem/examples/122/README: $(chem_srcdir)/examples/122/README.txt ++ @$(MKDIR_P) contrib/chem/examples/122 ++ sed -e "s|[@]g[@]|$(g)|g" $? >$@ ++ ++chem: $(chem_srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT) ++ $(RM) $@ ++ sed -f "$(SH_DEPS_SED_SCRIPT)" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ ++ -e "s|[@]MACRODIR[@]|$(DESTDIR)$(tmacdir)|g" \ ++ -e "s|[@]PICDIR[@]|$(DESTDIR)$(datasubdir)/pic|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ -e "$(SH_SCRIPT_SED_CMD)" \ ++ $(chem_srcdir)/chem.pl >$@ ++ chmod +x $@ ++ ++install-data-local: install_chem_extra ++install_chem_extra: ++if BUILD_EXAMPLES ++ -test -d $(DESTDIR)$(chemexample122dir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(chemexample122dir); ++ for i in $(chem_srcdir)/examples/122/*.chem; do \ ++ n=`echo $$i | sed 's|$(chem_srcdir)/examples/122/||g'`; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(chemexample122dir)/$$n; \ ++ done ++endif ++ ++uninstall-local: uninstall_chem_extra ++uninstall_chem_extra: ++if BUILD_EXAMPLES ++ $(RM) $(DESTDIR)$(exampledir)/chem/122/* ++ -rmdir $(DESTDIR)$(exampledir)/chem/122 ++ $(RM) $(DESTDIR)$(exampledir)/chem/* ++ -rmdir $(DESTDIR)$(exampledir)/chem ++endif ++ -rmdir $(DESTDIR)$(datasubdir)/pic ++ ++dist-hook: dist_chem ++dist_chem: ++ chmod u+w $(distdir)/contrib/chem/examples/122 ++ for i in $(chem_srcdir)/examples/122/*.chem; do \ ++ cp -f $$i $(distdir)/contrib/chem/examples/122; \ ++ done +diff -Nuar groff-1.22.3.old/contrib/chem/chem.man groff-1.22.3/contrib/chem/chem.man +--- groff-1.22.3.old/contrib/chem/chem.man 2014-11-04 10:38:35.438521334 +0200 ++++ groff-1.22.3/contrib/chem/chem.man 2015-04-23 20:57:03.000000000 +0300 +@@ -12,7 +12,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2006-2014 Free Software Foundation, Inc. ++Copyright \(co 2006-2014 Free Software Foundation, Inc. + + This file is part of chem, which is part of groff, a free software + project. +@@ -39,13 +39,16 @@ + .\" Setup + .\" -------------------------------------------------------------------- + . ++.do nr groff_C \n[.C] ++.cp 0 ++. + .\" -------------------------------------------------------------------- + .\" Characters + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + .\" Bullet +@@ -999,6 +1002,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" -------------------------------------------------------------------- + .\" Emacs settings + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/contrib/chem/examples/.gitignore groff-1.22.3/contrib/chem/examples/.gitignore +--- groff-1.22.3.old/contrib/chem/examples/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/chem/examples/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++README +diff -Nuar groff-1.22.3.old/contrib/chem/.gitignore groff-1.22.3/contrib/chem/.gitignore +--- groff-1.22.3.old/contrib/chem/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/chem/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++chem ++chem.n ++README +diff -Nuar groff-1.22.3.old/contrib/chem/Makefile.sub groff-1.22.3/contrib/chem/Makefile.sub +--- groff-1.22.3.old/contrib/chem/Makefile.sub 2014-11-04 10:38:35.438521334 +0200 ++++ groff-1.22.3/contrib/chem/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,124 +0,0 @@ +-# Makefile.sub for `chem' +- +-# File position: /contrib/chem/Makefile.sub +- +-# Copyright (C) 2006-2014 Free Software Foundation, Inc. +-# Written by Bernd Warken . +- +-# This file is part of `chem' which is part of `groff'. +- +-# `groff' is free software; you can redistribute it and/or modify it +-# under the terms of the GNU General Public License (GPL) version 2 as +-# published by the Free Software Foundation. +- +-# `groff' 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. +- +-# The GPL2 license text is available in the internet at +-# . +- +-######################################################################## +- +-MAN1=chem.n +-MOSTLYCLEANADD=\ +- chem \ +- chem.n \ +- README \ +- examples/README \ +- examples/122/README +- +-RM=rm -f +- +-all: README chem $(MAN1) $(make_examples) +- +-README: $(srcdir)/README.txt +- sed -e "s|@g@|$(g)|g" $? >$@ +- +-.PHONY: examples +-examples: examples/README examples/122/README +- +-examples/README: $(srcdir)/examples/README.txt +- test -d examples || $(mkinstalldirs) examples; +- sed -e "s|@g@|$(g)|g" $? >$@ +- +-examples/122/README: $(srcdir)/examples/122/README.txt +- test -d examples || $(mkinstalldirs) examples; +- test -d examples/122 || $(mkinstalldirs) examples/122; +- sed -e "s|@g@|$(g)|g" $? >$@; +- +-chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT) +- $(RM) $@; +- sed -f "$(SH_DEPS_SED_SCRIPT)" \ +- -e "s|@g@|$(g)|g" \ +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ +- -e "s|@MACRODIR@|$(DESTDIR)$(tmacdir)|g" \ +- -e "s|@PICDIR@|$(DESTDIR)$(datasubdir)/pic|g" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- -e "$(SH_SCRIPT_SED_CMD)" \ +- $(srcdir)/chem.pl >$@; +- chmod +x $@; +- +-.PHONY: install_always +-install_always: chem README $(srcdir)/chem.pic +- test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); +- $(RM) $(DESTDIR)$(bindir)/$(g)chem; +- $(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem; +- test -d $(DESTDIR)$(datasubdir)/pic \ +- || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic; +- $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic; +- $(INSTALL_DATA) $(srcdir)/chem.pic \ +- $(DESTDIR)$(datasubdir)/pic/chem.pic; +- +-.PHONY: install_examples +-install_examples: +- test -d $(DESTDIR)$(exampledir)/chem \ +- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem; +- test -d $(DESTDIR)$(exampledir)/chem/122 \ +- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122; +- find $(DESTDIR)$(exampledir)/chem -type f -exec rm -f '{}' ';' +- $(INSTALL_DATA) examples/README $(DESTDIR)$(exampledir)/chem/README; +- for i in $(srcdir)/examples/*.chem; do \ +- n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \ +- done; +- $(INSTALL_DATA) examples/122/README \ +- $(DESTDIR)$(exampledir)/chem/122/README; +- for i in $(srcdir)/examples/122/*.chem; do \ +- n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \ +- done +- +-.PHONY: install_data +- +-install_data: install_always $(make_install_examples) +- +-# uninstall_sub: uninstall_always $(make_uninstall_examples) +- +-.PHONY: uninstall_always +-uninstall_always: +- $(RM) $(DESTDIR)$(bindir)/chem; +- $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic; +- -test -d $(DESTDIR)$(datasubdir)/pic && \ +- rmdir $(DESTDIR)$(datasubdir)/pic; +- +-.PHONY: uninstall_examples +-uninstall_examples: +- $(RM) $(DESTDIR)$(exampledir)/chem/122/*; +- -test -d $(DESTDIR)$(exampledir)/chem/122 && \ +- rmdir $(DESTDIR)$(exampledir)/chem/122; +- $(RM) $(DESTDIR)$(exampledir)/chem/*; +- -test -d $(DESTDIR)$(exampledir)/chem && \ +- rmdir $(DESTDIR)$(exampledir)/chem; +- +-.PHONY: uninstall_sub +-uninstall_sub: uninstall_always uninstall_examples +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/eqn2graph/eqn2graph.am groff-1.22.3/contrib/eqn2graph/eqn2graph.am +--- groff-1.22.3.old/contrib/eqn2graph/eqn2graph.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/eqn2graph/eqn2graph.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,33 @@ ++# Copyright (C) 2002-2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++# ++# eqn2graph.am ++# ++ ++eqn2graph_srcdir = $(top_srcdir)/contrib/eqn2graph ++bin_SCRIPTS += eqn2graph ++man1_MANS += contrib/eqn2graph/eqn2graph.n ++EXTRA_DIST += \ ++ contrib/eqn2graph/eqn2graph.man \ ++ contrib/eqn2graph/eqn2graph.sh ++ ++eqn2graph: $(top_srcdir)/contrib/eqn2graph/eqn2graph.sh ++ sed -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e $(SH_SCRIPT_SED_CMD) $(eqn2graph_srcdir)/eqn2graph.sh >$@ ++ chmod +x $@ +diff -Nuar groff-1.22.3.old/contrib/eqn2graph/.gitignore groff-1.22.3/contrib/eqn2graph/.gitignore +--- groff-1.22.3.old/contrib/eqn2graph/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/eqn2graph/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++eqn2graph ++eqn2graph.n +diff -Nuar groff-1.22.3.old/contrib/eqn2graph/Makefile.sub groff-1.22.3/contrib/eqn2graph/Makefile.sub +--- groff-1.22.3.old/contrib/eqn2graph/Makefile.sub 2014-11-04 10:38:35.442521284 +0200 ++++ groff-1.22.3/contrib/eqn2graph/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,47 +0,0 @@ +-# Copyright (C) 2002-2014 +-# Free Software Foundation, Inc. +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.sub +-# +-MAN1=eqn2graph.n +-MOSTLYCLEANADD=eqn2graph +-RM=rm -f +- +-all: eqn2graph +- +-eqn2graph: eqn2graph.sh +- sed -e "s|@g@|$(g)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/eqn2graph.sh >$@ +- chmod +x $@ +- +-install_data: eqn2graph +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/eqn2graph +- $(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/eqn2graph +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/ChangeLog groff-1.22.3/contrib/gdiffmk/ChangeLog +--- groff-1.22.3.old/contrib/gdiffmk/ChangeLog 2014-11-04 10:38:35.446521234 +0200 ++++ groff-1.22.3/contrib/gdiffmk/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,49 @@ ++2015-04-13 Mike Bianchi ++ More fixes to Savannah bug #44768. ++ ++ * gdiffmk.sh: ++ replace ++ for OPTION with while [ $# -gt 0 ] ++ ++ test -e ... with test -f ++ ++ use ${DIFFCMD} for the last diff ++ add ++ -s SEDCMD option ++ OPTION="$1" ++ ++ many other cosmetic changes documented in the bug Discussion. ++ especially: ++ capitalize variables e.g. CMD=`basename $0` ++ ++ fix make check tests within gdiffmk ++ * tests/gdiffmk_tests.sh ++ add set -e ++ fails if ${abs_top_builddir} not set or incorrect ++ ++ * tests/runtests.sh ++ add test 6a ++ # Different values for addmark, changemark, deletemark ++ # Alternate format of -a -c and -d flag arguments ++ ++ add test 9a ++ # Test -D and -M options ++ # Alternate format of -M argument. ++ ++ add printout of failure count ++ add exit with failure exit_code if any test fails ++ ++2015-04-10 Werner LEMBERG ++ ++ Fix Savannah bug #44768. ++ ++ * gdiffmk.sh: Remove bash's $(...) with classic `...`. ++ Patch by Peter Bray. ++ ++2015-04-03 Werner LEMBERG + + * all `gdiffmk' source files: Add and improve the copying +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/gdiffmk.am groff-1.22.3/contrib/gdiffmk/gdiffmk.am +--- groff-1.22.3.old/contrib/gdiffmk/gdiffmk.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gdiffmk/gdiffmk.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,58 @@ ++# Automake rules for `gdiffmk' (integration into the groff source tree) ++# ++# File position: /contrib/gdiffmk/gdiffmk.am ++# ++# Copyright (C) 2004, 2006, 2009, 2014 Free Software Foundation, Inc. ++# Written by Mike Bianchi > ++# Automake migration by Bertrand Garrigues ++# ++# This file is part of the gdiffmk utility, which is part of groff. ++# ++# groff 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. ++ ++# groff 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 . ++ ++######################################################################## ++gdiffmk_srcdir = $(top_srcdir)/contrib/gdiffmk ++bin_SCRIPTS += gdiffmk ++TESTS += contrib/gdiffmk/tests/gdiffmk_tests.sh ++man1_MANS += contrib/gdiffmk/gdiffmk.n ++EXTRA_DIST += \ ++ contrib/gdiffmk/gdiffmk.man \ ++ contrib/gdiffmk/ChangeLog \ ++ contrib/gdiffmk/README \ ++ contrib/gdiffmk/gdiffmk.sh \ ++ contrib/gdiffmk/tests/gdiffmk_tests.sh \ ++ contrib/gdiffmk/tests/runtests.sh \ ++ contrib/gdiffmk/tests/baseline \ ++ contrib/gdiffmk/tests/baseline.6 \ ++ contrib/gdiffmk/tests/baseline.6a \ ++ contrib/gdiffmk/tests/baseline.7 \ ++ contrib/gdiffmk/tests/baseline.8 \ ++ contrib/gdiffmk/tests/baseline.9 \ ++ contrib/gdiffmk/tests/baseline.9a \ ++ contrib/gdiffmk/tests/baseline.10 \ ++ contrib/gdiffmk/tests/file1 \ ++ contrib/gdiffmk/tests/file2 ++ ++gdiffmk: $(gdiffmk_srcdir)/gdiffmk.sh ++ sed -e "s|[@]BINDIR[@]|$(bindir)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ -e $(SH_SCRIPT_SED_CMD) $(gdiffmk_srcdir)/gdiffmk.sh >$@ ++ chmod +x $@ ++ ++clean-local: clean_gdiffmk_check ++clean_gdiffmk_check: ++ if test -d $(top_builddir)/contrib/gdiffmk/tests; then \ ++ cd $(top_builddir)/contrib/gdiffmk/tests && \ ++ $(abs_top_srcdir)/contrib/gdiffmk/tests/runtests.sh clean; \ ++ fi +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/gdiffmk.man groff-1.22.3/contrib/gdiffmk/gdiffmk.man +--- groff-1.22.3.old/contrib/gdiffmk/gdiffmk.man 2014-11-04 10:38:35.446521234 +0200 ++++ groff-1.22.3/contrib/gdiffmk/gdiffmk.man 2015-04-23 20:57:03.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2004-2014 Free Software Foundation, Inc. ++Copyright \(co 2004-2014 Free Software Foundation, Inc. + + This file is part of the gdiffmk utility, which is part of groff, a + free software project. +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/gdiffmk.sh groff-1.22.3/contrib/gdiffmk/gdiffmk.sh +--- groff-1.22.3.old/contrib/gdiffmk/gdiffmk.sh 2014-11-04 10:38:35.446521234 +0200 ++++ groff-1.22.3/contrib/gdiffmk/gdiffmk.sh 2015-04-23 20:57:03.000000000 +0300 +@@ -1,6 +1,7 @@ + #! /bin/sh + # Copyright (C) 2004-2014 Free Software Foundation, Inc. + # Written by Mike Bianchi > ++# Thanks to Peter Bray for debugging. + + # This file is part of the gdiffmk utility, which is part of groff. + +@@ -19,16 +20,16 @@ + # This file is part of GNU gdiffmk. + + +-cmd=$( basename $0 ) ++CMD=`basename $0` + + Usage () { +- if test "$#" -gt 0 ++ if test $# -gt 0 + then +- echo >&2 "${cmd}: $@" ++ echo >&2 "${CMD}: $@" + fi + echo >&2 "\ + +-Usage: ${cmd} [ OPTIONS ] FILE1 FILE2 [ OUTPUT ] ++Usage: ${CMD} [ OPTIONS ] FILE1 FILE2 [ OUTPUT ] + Place difference marks into the new version of a groff/nroff/troff document. + FILE1 and FILE2 are compared, using \`diff', and FILE2 is output with + groff \`.mc' requests added to indicate how it is different from FILE1. +@@ -53,6 +54,8 @@ + + -x DIFFCMD Use a different diff(1) command; + one that accepts the \`-Dname' option, such as GNU diff. ++ -s SEDCMD Use a different sed(1) command; ++ one that accepts ????????????????????, such as GNU sed. + --version Print version information on the standard output and exit. + --help Print this message on the standard error. + " +@@ -65,7 +68,7 @@ + shift + for arg + do +- echo >&2 "${cmd}: $1" ++ echo >&2 "${CMD}: $1" + shift + done + exit ${exitcode} +@@ -82,7 +85,7 @@ + ;; + esac + +- if test ! -e "$2" ++ if test ! -f "$2" + then + Exit $1 "File \`$2' not found." + fi +@@ -104,12 +107,13 @@ + ;; + esac + +- if ! touch "$2" 2>/dev/null ++ touch "$2" 2>/dev/null ++ if test $? -ne 0 + then +- if test ! -e "$2" ++ if test ! -f "$2" + then + Exit $1 "File \`$2' not created; " \ +- "Cannot write directory \`$( dirname "$2" )'." ++ "Cannot write directory \``dirname "$2"`'." + fi + Exit $1 "File \`$2' not writeable." + fi +@@ -146,7 +150,7 @@ + ;; + esac + +- if test "$#" -lt 2 ++ if test $# -lt 2 + then + Exit 255 "Option \`$1' requires a value." + fi +@@ -155,47 +159,53 @@ + return 0 + } + +-badoption= ++BADOPTION= + DIFFCMD=diff ++SEDCMD=sed + D_option= + br=.br +-for OPTION ++while [ $# -gt 0 ] + do ++ OPTION="$1" + case "${OPTION}" in + -a*) +- ADDMARK=$( RequiresArgument "${OPTION}" $2 ) && ++ ADDMARK=`RequiresArgument "${OPTION}" "$2"` && + shift + ;; + -c*) +- CHANGEMARK=$( RequiresArgument "${OPTION}" $2 ) && ++ CHANGEMARK=`RequiresArgument "${OPTION}" "$2"` && + shift + ;; + -d*) +- DELETEMARK=$( RequiresArgument "${OPTION}" $2 ) && ++ DELETEMARK=`RequiresArgument "${OPTION}" "$2"` && + shift + ;; + -D ) + D_option=D_option + ;; + -M* ) +- MARK1=$( RequiresArgument "${OPTION}" $2 ) && ++ MARK1=`RequiresArgument "${OPTION}" "$2"` && + shift + if [ $# -lt 2 ] + then + Usage "Option \`-M' is missing the MARK2 value." + fi +- MARK2=$2 ++ MARK2="$2" + shift + ;; + -B ) + br=. + ;; ++ -s* ) ++ SEDCMD=`RequiresArgument "${OPTION}" "$2"` && ++ shift ++ ;; + -x* ) +- DIFFCMD=$( RequiresArgument "${OPTION}" $2 ) && ++ DIFFCMD=`RequiresArgument "${OPTION}" "$2"` && + shift + ;; + --version) +- echo "GNU ${cmd} (groff) version @VERSION@" ++ echo "GNU ${CMD} (groff) version @VERSION@" + exit 0 + ;; + --help) +@@ -210,7 +220,7 @@ + break + ;; + -*) +- badoption="${cmd}: invalid option \`$1'" ++ BADOPTION="${CMD}: invalid option \`$1'" + ;; + *) + break +@@ -224,28 +234,28 @@ + "the required \`-Dname' option. + Use GNU diff instead. See the \`-x DIFFCMD' option." + +-if test -n "${badoption}" ++if test -n "${BADOPTION}" + then +- Usage "${badoption}" ++ Usage "${BADOPTION}" + fi + +-if test "$#" -lt 2 -o "$#" -gt 3 ++if test $# -lt 2 -o $# -gt 3 + then + Usage "Incorrect number of arguments." + fi + +-if test "1$1" = 1- -a "2$2" = 2- ++if test "1$1" = "1-" -a "2$2" = "2-" + then + Usage "Both FILE1 and FILE2 are \`-'." + fi + +-FILE1=$1 +-FILE2=$2 ++FILE1="$1" ++FILE2="$2" + + FileRead 1 "${FILE1}" + FileRead 2 "${FILE2}" + +-if test "$#" = 3 ++if test $# = 3 + then + case "$3" in + -) +@@ -262,24 +272,24 @@ + esac + fi + +-# To make a very unlikely label even more unlikely ... +-label=__diffmk_$$__ ++# To make a very unlikely LABEL even more unlikely ... ++LABEL=__diffmk_$$__ + +-sed_script=' +- /^#ifdef '"${label}"'/,/^#endif \/\* '"${label}"'/ { +- /^#ifdef '"${label}"'/ s/.*/.mc '"${ADDMARK}"'/ +- /^#endif \/\* '"${label}"'/ s/.*/.mc/ ++SED_SCRIPT=' ++ /^#ifdef '"${LABEL}"'/,/^#endif \/\* '"${LABEL}"'/ { ++ /^#ifdef '"${LABEL}"'/ s/.*/.mc '"${ADDMARK}"'/ ++ /^#endif \/\* '"${LABEL}"'/ s/.*/.mc/ + p + d + } +- /^#ifndef '"${label}"'/,/^#endif \/\* [!not ]*'"${label}"'/ { +- /^#else \/\* '"${label}"'/,/^#endif \/\* '"${label}"'/ { +- /^#else \/\* '"${label}"'/ s/.*/.mc '"${CHANGEMARK}"'/ +- /^#endif \/\* '"${label}"'/ s/.*/.mc/ ++ /^#ifndef '"${LABEL}"'/,/^#endif \/\* [!not ]*'"${LABEL}"'/ { ++ /^#else \/\* '"${LABEL}"'/,/^#endif \/\* '"${LABEL}"'/ { ++ /^#else \/\* '"${LABEL}"'/ s/.*/.mc '"${CHANGEMARK}"'/ ++ /^#endif \/\* '"${LABEL}"'/ s/.*/.mc/ + p + d + } +- /^#endif \/\* \(not\|!\) '"${label}"'/ { ++ /^#endif \/\* \(not\|!\) '"${LABEL}"'/ { + s/.*/.mc '"${DELETEMARK}"'/p + a\ + .mc +@@ -291,27 +301,27 @@ + + if [ ${D_option} ] + then +- sed_script=' +- /^#ifdef '"${label}"'/,/^#endif \/\* '"${label}"'/ { +- /^#ifdef '"${label}"'/ s/.*/.mc '"${ADDMARK}"'/ +- /^#endif \/\* '"${label}"'/ s/.*/.mc/ ++ SED_SCRIPT=' ++ /^#ifdef '"${LABEL}"'/,/^#endif \/\* '"${LABEL}"'/ { ++ /^#ifdef '"${LABEL}"'/ s/.*/.mc '"${ADDMARK}"'/ ++ /^#endif \/\* '"${LABEL}"'/ s/.*/.mc/ + p + d + } +- /^#ifndef '"${label}"'/,/^#endif \/\* [!not ]*'"${label}"'/ { +- /^#ifndef '"${label}"'/ { ++ /^#ifndef '"${LABEL}"'/,/^#endif \/\* [!not ]*'"${LABEL}"'/ { ++ /^#ifndef '"${LABEL}"'/ { + i\ + '"${MARK1}"' + d + } +- /^#else \/\* '"${label}"'/ ! { +- /^#endif \/\* [!not ]*'"${label}"'/ ! { ++ /^#else \/\* '"${LABEL}"'/ ! { ++ /^#endif \/\* [!not ]*'"${LABEL}"'/ ! { + p + d + } + } +- /^#else \/\* '"${label}"'/,/^#endif \/\* '"${label}"'/ { +- /^#else \/\* '"${label}"'/ { ++ /^#else \/\* '"${LABEL}"'/,/^#endif \/\* '"${LABEL}"'/ { ++ /^#else \/\* '"${LABEL}"'/ { + i\ + '"${MARK2}"'\ + '"${br}"' +@@ -320,11 +330,11 @@ + .mc '"${CHANGEMARK}"' + d + } +- /^#endif \/\* '"${label}"'/ s/.*/.mc/ ++ /^#endif \/\* '"${LABEL}"'/ s/.*/.mc/ + p + d + } +- /^#endif \/\* \(not\|!\) '"${label}"'/ { ++ /^#endif \/\* \(not\|!\) '"${LABEL}"'/ { + i\ + '"${MARK2}"'\ + '"${br}"' +@@ -338,15 +348,7 @@ + ' + fi + +-diff -D"${label}" -- ${FILE1} ${FILE2} | +- sed -n "${sed_script}" ++${DIFFCMD} -D"${LABEL}" -- "${FILE1}" "${FILE2}" | ++ ${SEDCMD} -n "${SED_SCRIPT}" + + # EOF +- +- +-######################################################################## +-# Emacs settings +-# +-# Local Variables: +-# mode: text +-# End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/.gitignore groff-1.22.3/contrib/gdiffmk/.gitignore +--- groff-1.22.3.old/contrib/gdiffmk/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gdiffmk/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++gdiffmk ++gdiffmk.n ++tests/gdiffmk_tests.sh.log ++tests/gdiffmk_tests.sh.trs ++tests/result.* +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/Makefile.sub groff-1.22.3/contrib/gdiffmk/Makefile.sub +--- groff-1.22.3.old/contrib/gdiffmk/Makefile.sub 2014-11-04 10:38:35.446521234 +0200 ++++ groff-1.22.3/contrib/gdiffmk/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,51 +0,0 @@ +-# Makefile.sub for `gdiffmk' (integration into the groff source tree) +- +-# File position: /contrib/gdiffmk/Makefile.sub +- +-# Copyright (C) 2004-2014 Free Software Foundation, Inc. +-# Written by Mike Bianchi > +- +-# This file is part of the gdiffmk utility, which is part of groff. +- +-# groff 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. +- +-# groff 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 . +- +-######################################################################## +- +-MAN1=gdiffmk.n +-MOSTLYCLEANADD=gdiffmk tests/runtests +-RM=rm -f +- +-all: gdiffmk +- +-gdiffmk: gdiffmk.sh +- sed -e "s|@BINDIR@|$(bindir)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/gdiffmk.sh >$@ +- chmod +x $@ +- +-install_data: gdiffmk +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/gdiffmk +- $(INSTALL_SCRIPT) gdiffmk $(DESTDIR)$(bindir)/gdiffmk +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/gdiffmk +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/baseline groff-1.22.3/contrib/gdiffmk/tests/baseline +--- groff-1.22.3.old/contrib/gdiffmk/tests/baseline 2014-11-04 10:38:35.620519059 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/baseline 2015-04-23 20:57:03.000000000 +0300 +@@ -1,24 +1,3 @@ +-.ig \"-*- nroff -*- +-Copyright (C) 2004-2014 Free Software Foundation, Inc. +- +-This file is part of the gdiffmk utility, which is part of groff. +-Written by Mike Bianchi > +- +-Permission is granted to make and distribute verbatim copies of +-this manual provided the copyright notice and this permission notice +-are preserved on all copies. +- +-Permission is granted to copy and distribute modified versions of this +-manual under the conditions for verbatim copying, provided that the +-entire resulting derived work is distributed under the terms of a +-permission notice identical to this one. +- +-Permission is granted to copy and distribute translations of this +-manual into another language, under the above conditions for modified +-versions, except that this permission notice may be included in +-translations approved by the Free Software Foundation instead of in +-the original English. +-.. + .ll 25 + .pl 20 + .nf +@@ -36,8 +15,3 @@ + .mc + file1 and file2 #4 + file1 and file2 #5 +-. +-.\" Emacs setup +-.\" Local Variables: +-.\" mode: nroff +-.\" End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/baseline.10 groff-1.22.3/contrib/gdiffmk/tests/baseline.10 +--- groff-1.22.3.old/contrib/gdiffmk/tests/baseline.10 2014-11-04 10:38:35.620519059 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/baseline.10 2015-04-23 20:57:03.000000000 +0300 +@@ -1,24 +1,3 @@ +-.ig \"-*- nroff -*- +-Copyright (C) 2004-2014 Free Software Foundation, Inc. +- +-This file is part of the gdiffmk utility, which is part of groff. +-Written by Mike Bianchi > +- +-Permission is granted to make and distribute verbatim copies of +-this manual provided the copyright notice and this permission notice +-are preserved on all copies. +- +-Permission is granted to copy and distribute modified versions of this +-manual under the conditions for verbatim copying, provided that the +-entire resulting derived work is distributed under the terms of a +-permission notice identical to this one. +- +-Permission is granted to copy and distribute translations of this +-manual into another language, under the above conditions for modified +-versions, except that this permission notice may be included in +-translations approved by the Free Software Foundation instead of in +-the original English. +-.. + .ll 25 + .pl 20 + .nf +@@ -45,8 +24,3 @@ + .mc + file1 and file2 #4 + file1 and file2 #5 +-. +-.\" Emacs setup +-.\" Local Variables: +-.\" mode: nroff +-.\" End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/baseline.6 groff-1.22.3/contrib/gdiffmk/tests/baseline.6 +--- groff-1.22.3.old/contrib/gdiffmk/tests/baseline.6 2014-11-04 10:38:35.620519059 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/baseline.6 2015-04-23 20:57:03.000000000 +0300 +@@ -1,24 +1,3 @@ +-.ig \"-*- nroff -*- +-Copyright (C) 2004-2014 Free Software Foundation, Inc. +- +-This file is part of the gdiffmk utility, which is part of groff. +-Written by Mike Bianchi > +- +-Permission is granted to make and distribute verbatim copies of +-this manual provided the copyright notice and this permission notice +-are preserved on all copies. +- +-Permission is granted to copy and distribute modified versions of this +-manual under the conditions for verbatim copying, provided that the +-entire resulting derived work is distributed under the terms of a +-permission notice identical to this one. +- +-Permission is granted to copy and distribute translations of this +-manual into another language, under the above conditions for modified +-versions, except that this permission notice may be included in +-translations approved by the Free Software Foundation instead of in +-the original English. +-.. + .ll 25 + .pl 20 + .nf +@@ -36,8 +15,3 @@ + .mc + file1 and file2 #4 + file1 and file2 #5 +-. +-.\" Emacs setup +-.\" Local Variables: +-.\" mode: nroff +-.\" End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/baseline.8 groff-1.22.3/contrib/gdiffmk/tests/baseline.8 +--- groff-1.22.3.old/contrib/gdiffmk/tests/baseline.8 2014-11-04 10:38:35.621519046 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/baseline.8 2015-04-23 20:57:03.000000000 +0300 +@@ -1,24 +1,3 @@ +-.ig \"-*- nroff -*- +-Copyright (C) 2004-2014 Free Software Foundation, Inc. +- +-This file is part of the gdiffmk utility, which is part of groff. +-Written by Mike Bianchi > +- +-Permission is granted to make and distribute verbatim copies of +-this manual provided the copyright notice and this permission notice +-are preserved on all copies. +- +-Permission is granted to copy and distribute modified versions of this +-manual under the conditions for verbatim copying, provided that the +-entire resulting derived work is distributed under the terms of a +-permission notice identical to this one. +- +-Permission is granted to copy and distribute translations of this +-manual into another language, under the above conditions for modified +-versions, except that this permission notice may be included in +-translations approved by the Free Software Foundation instead of in +-the original English. +-.. + .ll 25 + .pl 20 + .nf +@@ -45,8 +24,3 @@ + .mc + file1 and file2 #4 + file1 and file2 #5 +-. +-.\" Emacs setup +-.\" Local Variables: +-.\" mode: nroff +-.\" End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/baseline.9 groff-1.22.3/contrib/gdiffmk/tests/baseline.9 +--- groff-1.22.3.old/contrib/gdiffmk/tests/baseline.9 2014-11-04 10:38:35.621519046 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/baseline.9 2015-04-23 20:57:03.000000000 +0300 +@@ -1,24 +1,3 @@ +-.ig \"-*- nroff -*- +-Copyright (C) 2004-2014 Free Software Foundation, Inc. +- +-This file is part of the gdiffmk utility, which is part of groff. +-Written by Mike Bianchi > +- +-Permission is granted to make and distribute verbatim copies of +-this manual provided the copyright notice and this permission notice +-are preserved on all copies. +- +-Permission is granted to copy and distribute modified versions of this +-manual under the conditions for verbatim copying, provided that the +-entire resulting derived work is distributed under the terms of a +-permission notice identical to this one. +- +-Permission is granted to copy and distribute translations of this +-manual into another language, under the above conditions for modified +-versions, except that this permission notice may be included in +-translations approved by the Free Software Foundation instead of in +-the original English. +-.. + .ll 25 + .pl 20 + .nf +@@ -45,8 +24,3 @@ + .mc + file1 and file2 #4 + file1 and file2 #5 +-. +-.\" Emacs setup +-.\" Local Variables: +-.\" mode: nroff +-.\" End: +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/gdiffmk_tests.sh groff-1.22.3/contrib/gdiffmk/tests/gdiffmk_tests.sh +--- groff-1.22.3.old/contrib/gdiffmk/tests/gdiffmk_tests.sh 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/gdiffmk_tests.sh 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,9 @@ ++#!/bin/sh ++ ++# Execute runtests.sh in the builddir ++ ++set -e ++ ++mkdir -p ${abs_top_builddir}/contrib/gdiffmk/tests ++cd ${abs_top_builddir}/contrib/gdiffmk/tests ++${abs_top_srcdir}/contrib/gdiffmk/tests/runtests.sh run +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/.gitignore groff-1.22.3/contrib/gdiffmk/tests/.gitignore +--- groff-1.22.3.old/contrib/gdiffmk/tests/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++test_result* ++tmp_file* ++runtests +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/runtests.in groff-1.22.3/contrib/gdiffmk/tests/runtests.in +--- groff-1.22.3.old/contrib/gdiffmk/tests/runtests.in 2014-11-04 10:38:35.621519046 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/runtests.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,118 +0,0 @@ +-#! /bin/sh +-# +-# A very simple function test for gdiffmk.sh. +-# +-# Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. +-# Written by Mike Bianchi > +- +-# This file is part of the gdiffmk utility, which is part of groff. +- +-# groff 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. +- +-# groff 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 . +-# This file is part of GNU gdiffmk. +- +-srcdir=@srcdir@ +- +-command=../gdiffmk +- +-# Test the number of arguments and the first argument. +-case $#-$1 in +-1-clean ) +- rm -fv result* tmp_file* +- exit 0 +- ;; +-1-run ) +- ;; +-* ) +- echo >&2 "$0 [ clean | run ] +-Run a few simple tests on \`${command}'."' +- +-clean Remove the result? and tmp_file? files. +-run Run the tests. +-' +- exit 255 +- ;; +-esac +- +-function TestResult { +- if cmp -s $1 $2 +- then +- echo $2 PASSED +- else +- echo '' +- echo $2 TEST FAILED +- diff $1 $2 +- echo '' +- fi +-} +- +-tmpfile=/tmp/$$ +-trap 'rm -f ${tmpfile}' 0 1 2 3 15 +- +-# Run tests. +- +-# 3 file arguments +-ResultFile=result.1 +-${command} ${srcdir}/file1 ${srcdir}/file2 ${ResultFile} 2>${tmpfile} +-cat ${tmpfile} >>${ResultFile} +-TestResult ${srcdir}/baseline ${ResultFile} +- +-# OUTPUT to stdout by default +-ResultFile=result.2 +-${command} ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline ${ResultFile} +- +-# OUTPUT to stdout via - argument +-ResultFile=result.3 +-${command} ${srcdir}/file1 ${srcdir}/file2 - >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline ${ResultFile} +- +-# FILE1 from standard input via - argument +-ResultFile=result.4 +-${command} - ${srcdir}/file2 <${srcdir}/file1 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline ${ResultFile} +- +-# FILE2 from standard input via - argument +-ResultFile=result.5 +-${command} ${srcdir}/file1 - <${srcdir}/file2 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline ${ResultFile} +- +-# Different values for addmark, changemark, deletemark +-ResultFile=result.6 +-${command} -aA -cC -dD ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline.6 ${ResultFile} +- +-# Test for accidental file overwrite. +-ResultFile=result.7 +-cp ${srcdir}/file2 tmp_file.7 +-${command} -aA -dD -cC ${srcdir}/file1 tmp_file.7 tmp_file.7 \ +- >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline.7 ${ResultFile} +- +-# Test -D option +-ResultFile=result.8 +-${command} -D ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline.8 ${ResultFile} +- +-# Test -D and -M options +-ResultFile=result.9 +-${command} -D -M '<<<<' '>>>>' \ +- ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline.9 ${ResultFile} +- +-# Test -D and -B options +-ResultFile=result.10 +-${command} -D -B ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 +-TestResult ${srcdir}/baseline.10 ${ResultFile} +- +-# EOF +diff -Nuar groff-1.22.3.old/contrib/gdiffmk/tests/runtests.sh groff-1.22.3/contrib/gdiffmk/tests/runtests.sh +--- groff-1.22.3.old/contrib/gdiffmk/tests/runtests.sh 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gdiffmk/tests/runtests.sh 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,154 @@ ++#! /bin/sh ++# ++# A very simple function test for gdiffmk.sh. ++# ++# Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++# Written by Mike Bianchi > ++ ++# This file is part of the gdiffmk utility, which is part of groff. ++ ++# groff 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. ++ ++# groff 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 . ++# This file is part of GNU gdiffmk. ++ ++# abs_top_srcdir and abs_top_builddir are set by AM_TESTS_ENVIRONMENT ++# (defined in Makefile.am) when running make check ++ ++srcdir=${abs_top_srcdir}/contrib/gdiffmk/tests ++ ++command=${abs_top_builddir}/gdiffmk ++ ++# Test the number of arguments and the first argument. ++case "$#-$1" in ++1-clean ) ++ rm -fv result* tmp_file* ++ exit 0 ++ ;; ++1-run ) ++ ;; ++* ) ++ echo >&2 "$0 [ clean | run ] ++Run a few simple tests on \`${command}'."' ++ ++clean Remove the result? and tmp_file? files. ++run Run the tests. ++' ++ exit 255 ++ ;; ++esac ++ ++exit_code=0 # Success ++failure_count=0 ++TestResult () { ++ if cmp -s $1 $2 ++ then ++ echo $2 PASSED ++ else ++ echo '' ++ echo $2 TEST FAILED ++ diff $1 $2 ++ echo '' ++ exit_code=1 # Failure ++ failure_count=`expr ${failure_count} + 1` ++ fi ++} ++ ++tmpfile=/tmp/$$ ++trap 'rm -f ${tmpfile}' 0 1 2 3 15 ++ ++# Run tests. ++ ++# 3 file arguments ++ResultFile=result.1 ++${command} ${srcdir}/file1 ${srcdir}/file2 ${ResultFile} 2>${tmpfile} ++cat ${tmpfile} >>${ResultFile} ++TestResult ${srcdir}/baseline ${ResultFile} ++ ++ ++# OUTPUT to stdout by default ++ResultFile=result.2 ++${command} ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline ${ResultFile} ++ ++ ++# OUTPUT to stdout via - argument ++ResultFile=result.3 ++${command} ${srcdir}/file1 ${srcdir}/file2 - >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline ${ResultFile} ++ ++ ++# FILE1 from standard input via - argument ++ResultFile=result.4 ++${command} - ${srcdir}/file2 <${srcdir}/file1 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline ${ResultFile} ++ ++ ++# FILE2 from standard input via - argument ++ResultFile=result.5 ++${command} ${srcdir}/file1 - <${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline ${ResultFile} ++ ++ ++# Different values for addmark, changemark, deletemark ++ResultFile=result.6 ++${command} -aA -cC -dD ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.6 ${ResultFile} ++ ++ ++# Different values for addmark, changemark, deletemark ++# Alternate format of -a -c and -d flag arguments ++ResultFile=result.6a ++${command} -a A -c C -d D ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.6a ${ResultFile} ++ ++ ++# Test for accidental file overwrite. ++ResultFile=result.7 ++cp ${srcdir}/file2 tmp_file.7 ++${command} -aA -dD -cC ${srcdir}/file1 tmp_file.7 tmp_file.7 \ ++ >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.7 ${ResultFile} ++ ++ ++# Test -D option ++ResultFile=result.8 ++${command} -D ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.8 ${ResultFile} ++ ++ ++# Test -D and -M options ++ResultFile=result.9 ++${command} -D -M '<<<<' '>>>>' \ ++ ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.9 ${ResultFile} ++ ++ ++# Test -D and -M options ++# Alternate format of -M argument. ++ResultFile=result.9a ++${command} -D -M'<<<<' '>>>>' \ ++ ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.9a ${ResultFile} ++ ++ ++# Test -D and -B options ++ResultFile=result.10 ++${command} -D -B ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1 ++TestResult ${srcdir}/baseline.10 ${ResultFile} ++ ++ ++echo failure_count ${failure_count} ++ ++exit ${exit_code} ++ ++# EOF +diff -Nuar groff-1.22.3.old/contrib/glilypond/ChangeLog groff-1.22.3/contrib/glilypond/ChangeLog +--- groff-1.22.3.old/contrib/glilypond/ChangeLog 2014-11-04 10:38:35.452521159 +0200 ++++ groff-1.22.3/contrib/glilypond/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,18 @@ ++2015-04-03 Werner LEMBERG ++ ++ * glilypond.man: Make it work in compatibility mode. ++ (EL): Fix typo. ++ ++2015-03-20 Ralph Corderoy ++ ++ * glilypond.pl: Minor syntax fixes. ++ ++2015-03-20 Werner LEMBERG ++ ++ * glilypond.pl : Fix typo. ++ ++ Problem reported by Grégoire Babey . ++ + 2014-09-03 Bernd Warken + + * glilypond.pl: New version 1.3.1 +diff -Nuar groff-1.22.3.old/contrib/glilypond/examples/example.groff groff-1.22.3/contrib/glilypond/examples/example.groff +--- groff-1.22.3.old/contrib/glilypond/examples/example.groff 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/glilypond/examples/example.groff 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,48 @@ ++.\" -------------------------------------------------------------------- ++.\" Legalese ++.\" -------------------------------------------------------------------- ++. ++.ig ++glilypond - integrate `lilypond' parts into `groff' files ++ ++Source file position: /contrib/glilypond.man ++Installed position: /share/man/man1/glilypond.1 ++ ++This file was written by Bernd Warken . ++. ++Copyright (C) 2013-2014 Free Software Foundation, Inc. ++ ++This file is part of glilypond, which is part of GNU groff, a free ++software project. ++ ++You can redistribute it and/or modify it under the terms of the GNU ++General Public License version 2 as published by the Free Software ++Foundation. ++ ++The license text is available in the internet at ++.UR http://\%www.gnu.org/\%licenses/\%gpl-2.0.html ++.UE . ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" Groff Part ++.\" -------------------------------------------------------------------- ++. ++before ++.lilypond start ++\version "2.14.2" ++\relative c'' { ++ \key c \minor ++ g( ++ ) ++ -. ++ -. ++} ++\paper { ++ oddHeaderMarkup = #f ++ evenHeaderMarkup = #f ++ oddFooterMarkup = #f ++ evenFooterMarkup = #f ++} ++.lilypond end ++after +diff -Nuar groff-1.22.3.old/contrib/glilypond/glilypond.am groff-1.22.3/contrib/glilypond/glilypond.am +--- groff-1.22.3.old/contrib/glilypond/glilypond.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/glilypond/glilypond.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,63 @@ ++# Automake rules for `glilypond' ++ ++# File position: /contrib/lilypond/glilypond.am ++ ++# Copyright (C) 2013-2014 ++# Free Software Foundation, Inc. ++# Written by Werner Lemberg and ++# Bernd Warken . ++# Automake migration by Bertrand Garrigues ++ ++# This file is part of `glilypond' which is part of `groff'. ++ ++# `groff' 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. ++ ++# `groff' 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 . ++ ++######################################################################## ++glilypond_srcdir = $(top_srcdir)/contrib/glilypond ++bin_SCRIPTS += glilypond ++man1_MANS += contrib/glilypond/glilypond.n ++ ++# files going to lib directory `$(glilypond_dir)' ++# TODO glilypond_dir is subsitued by configure.ac, check if this could be removed ++glilyponddir = $(glilypond_dir) ++dist_glilypond_DATA = \ ++ contrib/glilypond/subs.pl \ ++ contrib/glilypond/oop_fh.pl \ ++ contrib/glilypond/args.pl ++ ++EXTRA_DIST += \ ++ contrib/glilypond/ChangeLog \ ++ contrib/glilypond/ChangeLog.0x \ ++ contrib/glilypond/glilypond.man \ ++ contrib/glilypond/glilypond.pl \ ++ contrib/glilypond/README.txt \ ++ contrib/glilypond/examples/example.groff ++ ++ ++# create perl executable `glilypond', being stored into `bindir' ++glilypond: $(glilypond_srcdir)/glilypond.pl shdeps.sed ++ $(RM) $@ ++ sed -f "$(SH_DEPS_SED_SCRIPT)" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ ++ -e "s|[@]glilypond_dir[@]|$(DESTDIR)$(glilypond_dir)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ $(glilypond_srcdir)/glilypond.pl >$@ ++ chmod +x $@ ++ ++uninstall_groffdirs: uninstall-glilypond-hook ++uninstall-glilypond-hook: ++ if test -d $(DESTDIR)$(glilyponddir); then \ ++ rmdir $(DESTDIR)$(glilyponddir); \ ++ fi +diff -Nuar groff-1.22.3.old/contrib/glilypond/glilypond.man groff-1.22.3/contrib/glilypond/glilypond.man +--- groff-1.22.3.old/contrib/glilypond/glilypond.man 2014-11-04 10:38:35.452521159 +0200 ++++ groff-1.22.3/contrib/glilypond/glilypond.man 2015-04-23 20:57:03.000000000 +0300 +@@ -14,7 +14,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2013-2014 Free Software Foundation, Inc. ++Copyright \(co 2013-2014 Free Software Foundation, Inc. + + This file is part of glilypond, which is part of GNU groff, a free + software project. +@@ -40,8 +40,8 @@ + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + .ad l +diff -Nuar groff-1.22.3.old/contrib/glilypond/glilypond.pl groff-1.22.3/contrib/glilypond/glilypond.pl +--- groff-1.22.3.old/contrib/glilypond/glilypond.pl 2014-11-04 10:38:35.452521159 +0200 ++++ groff-1.22.3/contrib/glilypond/glilypond.pl 2015-04-23 20:57:03.000000000 +0300 +@@ -13,7 +13,7 @@ + # use diagnostics; + + use Carp; +-$SIG[__DIE__] = sub { &Carp::croak; }; ++$SIG{__DIE__} = sub { &Carp::croak; }; + + use Data::Dumper; + +@@ -406,7 +406,7 @@ + $Temp->{'eps_dir'} = $dir; + $make_dir = TRUE; + } else { # could not remove +- stderr->print( "Could not use EPS dir `" . $dir . ++ $stderr->print( "Could not use EPS dir `" . $dir . + "', use temp dir." ); + } # end of unlink + } # end test of -d $dir +@@ -546,7 +546,7 @@ + $ly = new FH_FILE($path_ly); + + my $include = new FH_READ_FILE($file); +- my $res = $include->read-all(); # is a refernce to an array ++ my $res = $include->read_all(); # is a reference to an array + foreach ( @$res ) { + chomp; + $ly->print($_); +diff -Nuar groff-1.22.3.old/contrib/glilypond/Makefile.sub groff-1.22.3/contrib/glilypond/Makefile.sub +--- groff-1.22.3.old/contrib/glilypond/Makefile.sub 2014-11-04 10:38:35.452521159 +0200 ++++ groff-1.22.3/contrib/glilypond/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,81 +0,0 @@ +-# Makefile.sub for `glilypond' +- +-# File position: /contrib/lilypond/Makefile.sub +- +-# Copyright (C) 2013-2014 Free Software Foundation, Inc. +-# Written by Werner Lemberg and +-# Bernd Warken . +- +-# This file is part of `glilypond' which is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 . +- +-######################################################################## +- +-MAN1=glilypond.n +- +-MOSTLYCLEANADD=glilypond $(MAN1) +- +-all: glilypond +- +-# files going to lib directory `$(glilypond_dir)' +- +-GLILYPOND_LIB=\ +- $(srcdir)/subs.pl \ +- $(srcdir)/oop_fh.pl \ +- $(srcdir)/args.pl +- +-GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'` +- +-RM=rm -f +- +-# create perl executable `glilypond', being stored into `bindir' +- +-glilypond: $(srcdir)/glilypond.pl +- $(RM) $@ +- sed -f "$(SH_DEPS_SED_SCRIPT)" \ +- -e "s|@g@|$(g)|g" \ +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ +- -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- $(srcdir)/glilypond.pl >$@ +- chmod +x $@ +- +-install_data: glilypond $(GLILYPOND_LIB) +- -test -d $(DESTDIR)$(bindir) \ +- || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/glilypond +- $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond +- -test -d $(DESTDIR)$(glilypond_dir) \ +- || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) +- for f in $(GLILYPOND_LIB_); do \ +- $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ +- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f; \ +- done +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/glilypond +- -for f in $(GLILYPOND_LIB_); do \ +- $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ +- done +- -test -d $(DESTDIR)$(glilypond_dir) && \ +- rmdir $(DESTDIR)$(glilypond_dir) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/gperl/ChangeLog groff-1.22.3/contrib/gperl/ChangeLog +--- groff-1.22.3.old/contrib/gperl/ChangeLog 2014-11-04 10:38:35.457521097 +0200 ++++ groff-1.22.3/contrib/gperl/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,8 @@ ++2015-04-03 Werner LEMBERG ++ ++ * gperl.man: Make it work in compatibility mode. ++ (EL): Fix typo. ++ + 2014-10-11 Bernd Warken + + * gperl.pl: Version 1.2.6 +diff -Nuar groff-1.22.3.old/contrib/gperl/gperl.am groff-1.22.3/contrib/gperl/gperl.am +--- groff-1.22.3.old/contrib/gperl/gperl.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gperl/gperl.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,42 @@ ++# Automake rules for `gperl' (preprocessor for added Perl parts) ++ ++# File position: /contrib/gperl/gperl.am ++ ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# Written by Bernd Warken . ++# Automake migration by Bertrand Garrigues ++ ++# This file is part of `gperl' which is part of `groff'. ++ ++# `groff' 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. ++ ++# `groff' 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 ++# . ++ ++######################################################################## ++ ++bin_SCRIPTS += gperl ++man1_MANS += contrib/gperl/gperl.n ++EXTRA_DIST += \ ++ contrib/gperl/ChangeLog \ ++ contrib/gperl/gperl.man \ ++ contrib/gperl/gperl.pl ++gperl: $(top_srcdir)/contrib/gperl/gperl.pl shdeps.sed ++ $(RM) $@ ++ sed -f "$(SH_DEPS_SED_SCRIPT)" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ -e "$(SH_SCRIPT_SED_CMD)" \ ++ $(top_srcdir)/contrib/gperl/gperl.pl >$@; \ ++ chmod +x $@ ++ +diff -Nuar groff-1.22.3.old/contrib/gperl/gperl.man groff-1.22.3/contrib/gperl/gperl.man +--- groff-1.22.3.old/contrib/gperl/gperl.man 2014-11-04 10:38:35.457521097 +0200 ++++ groff-1.22.3/contrib/gperl/gperl.man 2015-04-23 20:57:03.000000000 +0300 +@@ -16,7 +16,7 @@ + .. + . + .de co +-Copyright \[co] 2014 Free Software Foundation, Inc. ++Copyright \(co 2014 Free Software Foundation, Inc. + . + .P + This file is part of +@@ -46,12 +46,12 @@ + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + .\" Bullet +-.ie t .ds BU \[bu] ++.ie t .ds BU \(bu + .el .ds BU * + .\" used in `.IP \*(BU 2m' (former .Topic) + . +@@ -200,7 +200,7 @@ + .I other_than_start + can additionally be used as a + .I groff +-string variable name for storage \[em] see next section. ++string variable name for storage \(em see next section. + . + . + .\" -------------------------------------------------------------------- +@@ -228,7 +228,7 @@ + . + This pseudo-printing output can have several lines, due to printed + line breaks with +-.BR \[rs]n . ++.BR \(rsn . + . + By that, the output of a Perl run should be stored into a Perl array, + with a single line for each array member. +@@ -432,7 +432,7 @@ + . + .P + This stores the result +-.B \[rq]some data\[rq] ++.B \(rqsome data\(rq + into the + .I roff string + called +@@ -457,9 +457,9 @@ + .RS + .EX + \&.Perl start +-print \[rq]first\[rs]n\[rq]; +-print \[rq]second line\[rs]n\[rq]; +-print \[rq]3\[rs]n\[rq]; ++print \(rqfirst\(rsn\(rq; ++print \(rqsecond line\(rsn\(rq; ++print \(rq3\(rsn\(rq; + \&.Perl var1 var2 .nr var3 + .EE + .RE +diff -Nuar groff-1.22.3.old/contrib/gperl/Makefile.sub groff-1.22.3/contrib/gperl/Makefile.sub +--- groff-1.22.3.old/contrib/gperl/Makefile.sub 2014-11-04 10:38:35.457521097 +0200 ++++ groff-1.22.3/contrib/gperl/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,61 +0,0 @@ +-# Makefile.sub for `gperl' (preprocessor for added Perl parts) +- +-# File position: /contrib/gperl/Makefile.sub +- +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# Written by Bernd Warken . +- +-# This file is part of `gperl' which is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 +-# . +- +-######################################################################## +- +-MAN1=gperl.n +- +-MOSTLYCLEANADD=gperl $(MAN1) +- +-# not all make programs have $(RM) predefined. +-RM=rm -f +- +-all: gperl +- +-gperl: gperl.pl +- sed -f "$(SH_DEPS_SED_SCRIPT)" \ +- -e "s|@g@|$(g)|g" \ +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- -e "$(SH_SCRIPT_SED_CMD)" \ +- $(srcdir)/gperl.pl >$@; \ +- chmod +x $@ +- +-.PHONY: install_data +-install_data: gperl +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/gperl +- $(INSTALL_SCRIPT) gperl $(DESTDIR)$(bindir)/gperl +- +-.PHONY: uninstall_sub +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/gperl +- +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/gpinyin/ChangeLog groff-1.22.3/contrib/gpinyin/ChangeLog +--- groff-1.22.3.old/contrib/gpinyin/ChangeLog 2014-11-04 10:38:35.462521034 +0200 ++++ groff-1.22.3/contrib/gpinyin/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,8 @@ ++2015-04-03 Werner LEMBERG ++ ++ * gpinyin.man: Make it work in compatibility mode. ++ (EL): Fix typo. ++ + 2014-10-11 Werner LEMBERG + + * Makefile.sub (gpinyin): Handle `gpinyin_dir'. +diff -Nuar groff-1.22.3.old/contrib/gpinyin/gpinyin.am groff-1.22.3/contrib/gpinyin/gpinyin.am +--- groff-1.22.3.old/contrib/gpinyin/gpinyin.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/gpinyin/gpinyin.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,52 @@ ++# Automake rules for `gpinyin' (preprocessor for added Perl parts) ++ ++# File position: /contrib/gpinyin/gpinyin.am ++ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# Written by Bernd Warken . ++# Moved to automake by Bertrand Garrigues ++ ++# This file is part of `gpinyin' which is part of `groff'. ++ ++# `groff' 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. ++ ++# `groff' 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 ++# . ++ ++######################################################################## ++ ++gpinyin_srcdir = $(top_srcdir)/contrib/gpinyin ++bin_SCRIPTS += gpinyin ++gpinyindir = $(gpinyin_dir) ++dist_gpinyin_DATA = contrib/gpinyin/subs.pl ++man1_MANS += contrib/gpinyin/gpinyin.n ++EXTRA_DIST += \ ++ contrib/gpinyin/ChangeLog \ ++ contrib/gpinyin/gpinyin.man \ ++ contrib/gpinyin/gpinyin.pl ++ ++gpinyin: contrib/gpinyin/gpinyin.pl ++ sed -f "$(SH_DEPS_SED_SCRIPT)" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ ++ -e "s|[@]gpinyin_dir[@]|$(DESTIR)$(gpinyin_dir)|" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ -e "$(SH_SCRIPT_SED_CMD)" \ ++ $(gpinyin_srcdir)/gpinyin.pl >$@; \ ++ chmod +x $@ ++ ++uninstall_groffdirs: uninstall-gpinyin-hook ++uninstall-gpinyin-hook: ++ if test -d $(DESTDIR)$(gpinyindir); then \ ++ rmdir $(DESTDIR)$(gpinyindir); \ ++ fi +diff -Nuar groff-1.22.3.old/contrib/gpinyin/gpinyin.man groff-1.22.3/contrib/gpinyin/gpinyin.man +--- groff-1.22.3.old/contrib/gpinyin/gpinyin.man 2014-11-04 10:38:35.462521034 +0200 ++++ groff-1.22.3/contrib/gpinyin/gpinyin.man 2015-04-23 20:57:03.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2014 Free Software Foundation, Inc. ++Copyright \(co 2014 Free Software Foundation, Inc. + + This file is part of gpinyin, which is part of groff, a free software + project. +@@ -32,8 +32,8 @@ + .\" Characters + .\" -------------------------------------------------------------------- + . +-.ie t .ds EL \f[S]\N'188'\f[P] +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \f[S]\N'188'\f[P]\" ++.el .ds EL \&.\|.\|.\&\" + .\" ie t .char \[Ellipsis] \f[S]\N'188'\f[P] + .\" el .char \[Ellipsis] \&.\|.\|.\&\ + .\" called with \[Ellipsis] +diff -Nuar groff-1.22.3.old/contrib/gpinyin/Makefile.sub groff-1.22.3/contrib/gpinyin/Makefile.sub +--- groff-1.22.3.old/contrib/gpinyin/Makefile.sub 2014-11-04 10:38:35.462521034 +0200 ++++ groff-1.22.3/contrib/gpinyin/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,71 +0,0 @@ +-# Makefile.sub for `gpinyin' (preprocessor for added Perl parts) +- +-# File position: /contrib/gpinyin/Makefile.sub +- +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# Written by Bernd Warken . +- +-# This file is part of `gpinyin' which is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 +-# . +- +-######################################################################## +- +-MAN1=gpinyin.n +- +-MOSTLYCLEANADD=gpinyin $(MAN1) +- +-# not all make programs have $(RM) predefined. +-RM=rm -f +- +-all: gpinyin +- +-gpinyin: gpinyin.pl +- sed -f "$(SH_DEPS_SED_SCRIPT)" \ +- -e "s|@g@|$(g)|g" \ +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ +- -e "s|@gpinyin_dir@|$(DESTIR)$(gpinyin_dir)|" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- -e "$(SH_SCRIPT_SED_CMD)" \ +- $(srcdir)/gpinyin.pl >$@; \ +- chmod +x $@ +- +-.PHONY: install_data +-install_data: gpinyin subs.pl +- test -d $(DESTDIR)$(bindir) || \ +- $(mkinstalldirs) $(DESTDIR)$(bindir); \ +- $(RM) $(DESTDIR)$(bindir)/gpinyin; \ +- $(INSTALL_SCRIPT) gpinyin $(DESTDIR)$(bindir)/gpinyin; \ +- test -d $(DESTDIR)$(gpinyin_dir) || \ +- $(mkinstalldirs) $(DESTDIR)$(gpinyin_dir); \ +- $(RM) $(DESTDIR)$(gpinyin_dir)/subs.pl; \ +- $(INSTALL_SCRIPT) $(srcdir)/subs.pl \ +- $(DESTDIR)$(gpinyin_dir)/subs.pl +- +-.PHONY: uninstall_sub +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/gpinyin; \ +- $(RM) $(DESTDIR)$(gpinyin_dir)/subs.pl; +- -test -d $(DESTDIR)$(gpinyin_dir) && \ +- rmdir $(DESTDIR)$(gpinyin_dir) +- +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/grap2graph/.gitignore groff-1.22.3/contrib/grap2graph/.gitignore +--- groff-1.22.3.old/contrib/grap2graph/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/grap2graph/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++grap2graph ++grap2graph.n +diff -Nuar groff-1.22.3.old/contrib/grap2graph/grap2graph.am groff-1.22.3/contrib/grap2graph/grap2graph.am +--- groff-1.22.3.old/contrib/grap2graph/grap2graph.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/grap2graph/grap2graph.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,31 @@ ++# Copyright (C) 2003-2014 Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++# ++# grap2graph.am ++# ++ ++grap2graph_srcdir = $(top_srcdir)/contrib/grap2graph ++bin_SCRIPTS += grap2graph ++man1_MANS += contrib/grap2graph/grap2graph.n ++EXTRA_DIST += \ ++ $(grap2graph_srcdir)/grap2graph.sh \ ++ $(grap2graph_srcdir)/grap2graph.man ++grap2graph: $(grap2graph_srcdir)/grap2graph.sh ++ sed -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e $(SH_SCRIPT_SED_CMD) $(grap2graph_srcdir)/grap2graph.sh >$@ ++ chmod +x $@ +diff -Nuar groff-1.22.3.old/contrib/grap2graph/Makefile.sub groff-1.22.3/contrib/grap2graph/Makefile.sub +--- groff-1.22.3.old/contrib/grap2graph/Makefile.sub 2014-11-04 10:38:35.466520984 +0200 ++++ groff-1.22.3/contrib/grap2graph/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,46 +0,0 @@ +-# Copyright (C) 2003-2014 Free Software Foundation, Inc. +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.sub +-# +-MAN1=grap2graph.n +-MOSTLYCLEANADD=grap2graph +-RM=rm -f +- +-all: grap2graph +- +-grap2graph: grap2graph.sh +- sed -e "s|@g@|$(g)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grap2graph.sh >$@ +- chmod +x $@ +- +-install_data: grap2graph +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/grap2graph +- $(INSTALL_SCRIPT) grap2graph $(DESTDIR)$(bindir)/grap2graph +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/grap2graph +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/groffer/ChangeLog groff-1.22.3/contrib/groffer/ChangeLog +--- groff-1.22.3.old/contrib/groffer/ChangeLog 2014-11-04 10:38:35.477520847 +0200 ++++ groff-1.22.3/contrib/groffer/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,20 @@ ++2015-04-04 Werner LEMBERG ++ ++ * roff2.man (EL): Fix typo. ++ ++2015-04-04 Werner LEMBERG ++ ++ * roff2.man: Make it work in compatibility mode. ++ ++2015-04-04 Werner LEMBERG ++ ++ * groffer.man: Make it work in compatibility mode. ++ (EL): Fix typo. ++ ++2015-03-20 Werner LEMBERG ++ ++ * subs.pl (where_is_prog): Fix typo. ++ + 2014-11-04 Werner LEMBERG + + * version.sh (_GROFF_VERSION_PRESET): Set to 1.22.3. +diff -Nuar groff-1.22.3.old/contrib/groffer/.gitignore groff-1.22.3/contrib/groffer/.gitignore +--- groff-1.22.3.old/contrib/groffer/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/groffer/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,24 @@ ++PERL ++SHELL ++groffer ++groffer.man ++groffer.n ++roff2x.n ++roff2x.man ++roff2x ++roff2text.n ++roff2text.man ++roff2text ++roff2ps.n ++roff2ps.man ++roff2ps ++roff2pdf.n ++roff2pdf.man ++roff2pdf ++roff2html.n ++roff2html.man ++roff2html ++roff2dvi.n ++roff2dvi.man ++roff2dvi ++HAVE_PERL +diff -Nuar groff-1.22.3.old/contrib/groffer/groffer.am groff-1.22.3/contrib/groffer/groffer.am +--- groff-1.22.3.old/contrib/groffer/groffer.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/groffer/groffer.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,106 @@ ++# Automake rules for `groffer' ++ ++# File position: /contrib/groffer/groffer.am ++ ++# Copyright (C) 2001-2014 ++# Free Software Foundation, Inc. ++# Written by Werner Lemberg and ++# Bernd Warken . ++# Automake migration by Bertrand Garrigues ++ ++# This file is part of `groffer' which is part of `groff'. ++ ++# `groff' 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. ++ ++# `groff' 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 ++# . ++ ++######################################################################## ++ ++groffer_srcdir = $(top_srcdir)/contrib/groffer ++# generated programs ++ROFF2PROGS = \ ++ roff2dvi \ ++ roff2html \ ++ roff2pdf \ ++ roff2ps \ ++ roff2text \ ++ roff2x ++ ++# Generated man templates ++ROFF2MAN = \ ++ contrib/groffer/roff2dvi.man \ ++ contrib/groffer/roff2html.man \ ++ contrib/groffer/roff2pdf.man \ ++ contrib/groffer/roff2ps.man \ ++ contrib/groffer/roff2text.man \ ++ contrib/groffer/roff2x.man ++ ++GROFFER_PERL = \ ++ contrib/groffer/main_subs.pl \ ++ contrib/groffer/man.pl \ ++ contrib/groffer/split_env.sh \ ++ contrib/groffer/subs.pl ++ ++GROFFER_REST = \ ++ contrib/groffer/roff2.man \ ++ contrib/groffer/version.sh \ ++ contrib/groffer/groffer.man \ ++ contrib/groffer/groffer.pl \ ++ contrib/groffer/roff2.pl ++ ++EXTRA_DIST += $(GROFFER_PERL) $(GROFFER_REST) \ ++ contrib/groffer/ChangeLog \ ++ contrib/groffer/README \ ++ contrib/groffer/README_PERL ++ ++# groffer_dir is set by a m4 macro ++grofferdir = $(groffer_dir) ++bin_SCRIPTS += groffer $(ROFF2PROGS) ++groffer_DATA = $(GROFFER_PERL) contrib/groffer/version.sh ++man1_MANS += \ ++ contrib/groffer/groffer.n \ ++ contrib/groffer/roff2dvi.n \ ++ contrib/groffer/roff2html.n \ ++ contrib/groffer/roff2pdf.n \ ++ contrib/groffer/roff2ps.n \ ++ contrib/groffer/roff2text.n \ ++ contrib/groffer/roff2x.n ++MOSTLYCLEANFILES += $(ROFF2MAN) ++ ++$(ROFF2PROGS): $(groffer_srcdir)/roff2.pl ++ cp $(groffer_srcdir)/roff2.pl $@; ++ ++# we take roff2.man and replace the @ROFF2MODE@ by the type of file ++# (dvi, pdf, html etc ...) ++$(ROFF2MAN): $(groffer_srcdir)/roff2.man ++ @$(MKDIR_P) contrib/groffer ++ FILEMODE=`echo $@ | sed 's|contrib/groffer/roff2\([a-z][a-z]*\)\.man|\1|g'` \ ++ && sed -e 's/[@]ROFF2MODE[@]/'"$$FILEMODE"'/g' $(groffer_srcdir)/roff2.man > $@; ++ ++groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT) ++ echo "Using perl version of groffer."; \ ++ sed -f "$(SH_DEPS_SED_SCRIPT)" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ ++ -e "s|[@]libdir[@]|$(DESTDIR)$(libdir)|g" \ ++ -e "s|[@]groffer_dir[@]|$(DESTDIR)$(groffer_dir)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ -e "$(SH_SCRIPT_SED_CMD)" \ ++ $(groffer_srcdir)/groffer.pl >$@; \ ++ chmod +x $@; ++ ++uninstall_groffdirs: uninstall-groffer-hook ++uninstall-groffer-hook: ++ if test -d $(DESTDIR)$(grofferdir); then \ ++ rmdir $(DESTDIR)$(grofferdir); \ ++ fi +diff -Nuar groff-1.22.3.old/contrib/groffer/groffer.man groff-1.22.3/contrib/groffer/groffer.man +--- groff-1.22.3.old/contrib/groffer/groffer.man 2014-11-04 10:38:35.477520847 +0200 ++++ groff-1.22.3/contrib/groffer/groffer.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,12 +4,22 @@ + . + .\" The .SH was moved to this place in order to appease `apropos'. + . ++. ++.\"********************************************************************* ++.\" ++.\" This man page doesn't use extended groff syntax! ++.\" Formatting it with and without groff's option `-C' should always ++.\" give the same result. ++.\" ++.\"********************************************************************* ++. ++. + .\" -------------------------------------------------------------------- + .\" Legalese + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2001-2014 Free Software Foundation, Inc. ++Copyright \(co 2001-2014 Free Software Foundation, Inc. + + This file is part of groffer, which is part of groff, a free software + project. +@@ -35,12 +45,12 @@ + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + .\" Bullet +-.ie t .ds BU \[bu] ++.ie t .ds BU \(bu + .el .ds BU * + .\" used in `.IP \*(BU 2m' (former .Topic) + . +@@ -102,7 +112,7 @@ + The + .B \%groffer + program also includes many of the features for finding and displaying +-the \%\f[CR]Unix\f[] manual pages ++the \%\f(CRUnix\fP manual pages + .nh + .RI ( man\~pages ), + .hy +@@ -139,7 +149,7 @@ + . + This includes the + .I \%groff +-native \%\f[CR]X\~Window\f[] viewer ++native \%\f(CRX\~Window\fP viewer + .BR \%gxditview (@MAN1EXT@), + each + .IR \%Postcript , +@@ -175,7 +185,7 @@ + . + . + .P +-Option handling is done in \f[CR]GNU\f[] style. ++Option handling is done in \f(CRGNU\fP style. + . + Options and file names can be mixed freely. + . +@@ -294,7 +304,7 @@ + .OP \-\-troff\-device device + .YS + .P +-Further long options of \f[CR]GNU\f[] ++Further long options of \f(CRGNU\fP + .B man + are accepted as well. + .RE +@@ -365,7 +375,7 @@ + The name of a + .I man section + is a single character from +-.BR \%[1\[en]9on] , ++.BR \%[1\(en9on] , + the + .I extension + is some word. +@@ -524,7 +534,7 @@ + .IR "mode x" , + and + .I "mode dvi" +-in \%\f[CR]X\~Window\f[] with different viewers and ++in \%\f(CRX\~Window\fP with different viewers and + .I mode tty + with device + .I utf8 +@@ -535,14 +545,14 @@ + . + . + .P +-In \%\f[CR]X\~Window\f[], many programs create their own window when ++In \%\f(CRX\~Window\fP, many programs create their own window when + called. + . + .B \%groffer + can run these viewers as an independent program in the background. + . + As this does not work in text mode on a terminal (tty) there must be a +-way to know which viewers are \%\f[CR]X\~Window\f[] graphical ++way to know which viewers are \%\f(CRX\~Window\fP graphical + programs. + . + The +@@ -550,7 +560,7 @@ + script has a small set of information on some viewer names. + . + If a viewer argument of the command\-line chooses an element that is +-kept as \%\f[CR]X\~Window\f[] program in this list it is treated as a ++kept as \%\f(CRX\~Window\fP program in this list it is treated as a + viewer that can run in the background. + . + All other, unknown viewer calls are not run in the background. +@@ -620,7 +630,7 @@ + .SM + .BR $PATH . + . +-Known \%\f[CR]X\~Window\f[] ++Known \%\f(CRX\~Window\fP + .I \%dvi + viewers include + .BR \%xdvi (1) +@@ -781,7 +791,7 @@ + Format in a + .I \%groff\~text\~mode + and write the result to standard output using a text pager program, +-even when in \%\f[CR]X\~Window\f[]. ++even when in \%\f(CRX\~Window\fP. + . + . + .TP +@@ -800,7 +810,7 @@ + .BR \%gxditview (@MAN1EXT@) + program being distributed together with + .BR \%groff . +-But the standard \%\f[CR]X\~Window\f[] tool ++But the standard \%\f(CRX\~Window\fP tool + .BR \%xditview (1) + can also be chosen with the option + .BR \-\-viewer . +@@ -1281,7 +1291,7 @@ + .I \%filespec + argument search all + .I \%man\~pages +-and display their description \[em] or say that it is not a ++and display their description \(em or say that it is not a + .IR \%man\~page . + This is written from anew, so it differs from + .IR man 's +@@ -1355,10 +1365,10 @@ + . + The long options of + .B \%groffer +-were synchronized with the long options of \f[CR]GNU\f[] ++were synchronized with the long options of \f(CRGNU\fP + .BR man . + . +-All long options of \f[CR]GNU\f[] ++All long options of \f(CRGNU\fP + .B man + are recognized, but not all of these options are important to + .BR \%groffer , +@@ -1382,9 +1392,9 @@ + . + . + .P +-If your system has \f[CR]GNU\f[] ++If your system has \f(CRGNU\fP + .B man +-installed the full set of long and short options of the \f[CR]GNU\f[] ++installed the full set of long and short options of the \f(CRGNU\fP + .B man + program can be passed via the environment variable + .SM +@@ -1514,11 +1524,11 @@ + .\" -------------------------------------------------------------------- + . + The following long options were adapted from the corresponding +-\%\f[CR]X\~Window\~Toolkit\f[] options. ++\%\f(CRX\~Window\~Toolkit\fP options. + . + .B \%groffer + will pass them to the actual viewer program if it is an +-\%\f[CR]X\~Window\f[] program. ++\%\f(CRX\~Window\fP program. + . + Otherwise these options are ignored. + . +@@ -1534,14 +1544,14 @@ + .B \%groffer + uses the option + .B \-\-font +-for the \%\f[CR]X\~Window\f[] option ++for the \%\f(CRX\~Window\fP option + .BR \-font . + . + . + .P + See + .BR X (7) +-and the documentation on the \%\f[CR]X\~Window\~Toolkit\f[] options ++and the documentation on the \%\f(CRX\~Window\~Toolkit\fP options + for more details on these options and their arguments. + . + . +@@ -1581,8 +1591,8 @@ + . + .TP + .BI \-\-display \ X-display +-Set the \%\f[CR]X\~Window\f[] display on which the viewer program +-shall be started, see the \%\f[CR]X\~Window\f[] documentation for the ++Set the \%\f(CRX\~Window\fP display on which the viewer program ++shall be started, see the \%\f(CRX\~Window\fP documentation for the + syntax of the argument. + . + . +@@ -1607,7 +1617,7 @@ + .BI \-\-font \ font_name + Set the font used by the viewer window. + . +-The argument is an \%\f[CR]X\~Window\f[] font name. ++The argument is an \%\f(CRX\~Window\fP font name. + . + . + .TP +@@ -1628,7 +1638,7 @@ + . + .TP + .BI \-\-resolution \ value +-Set \%\f[CR]X\~Window\f[] resolution in dpi (dots per inch) in some ++Set \%\f(CRX\~Window\fP resolution in dpi (dots per inch) in some + viewer programs. + . + The only supported dpi values are +@@ -1656,7 +1666,7 @@ + . + .TP + .BI \-\-xrm \ 'resource' +-Set \f[CR]\%X\~Window\f[] resource. ++Set \f(CR\%X\~Window\fP resource. + . + . + .\" -------------------------------------------------------------------- +@@ -1790,12 +1800,12 @@ + . + . + .P +-The strange \%\f[CR]POSIX\f[] behavior to regard all arguments behind ++The strange \%\f(CRPOSIX\fP behavior to regard all arguments behind + the first non-option argument as + .I \%filespec + arguments is ignored. + . +-The \f[CR]GNU\f[] behavior to recognize options even when mixed with ++The \f(CRGNU\fP behavior to recognize options even when mixed with + .I \%filespec + arguments is used throughout. + . +@@ -1803,7 +1813,7 @@ + .B \-\- + ends the option handling and interprets all following arguments as + .I \%filespec +-arguments; so the \%\f[CR]POSIX\f[] behavior can be easily adopted. ++arguments; so the \%\f(CRPOSIX\fP behavior can be easily adopted. + . + . + .P +@@ -2026,7 +2036,7 @@ + . + .P + Several different modes are offered, graphical modes for +-\f[CR]\%X\~Window\f[], ++\f(CR\%X\~Window\fP, + .IR \%text\~modes , + and some direct + .I \%groff\~modes +@@ -2060,7 +2070,7 @@ + .SS "Graphical Display Modes" + .\" -------------------------------------------------------------------- + . +-The graphical display modes work mostly in the \%\f[CR]X\~Window\f[] ++The graphical display modes work mostly in the \%\f(CRX\~Window\fP + environment (or similar implementations within other windowing + environments). + . +@@ -2069,11 +2079,11 @@ + .B \%$DISPLAY + and the option + .B \-\-display +-are used for specifying the \%\f[CR]X\~Window\f[] display to be used. ++are used for specifying the \%\f(CRX\~Window\fP display to be used. + . + If this environment variable is empty + .B \%groffer +-assumes that no \%\f[CR]X\~Window\f[] is running and changes to a ++assumes that no \%\f(CRX\~Window\fP is running and changes to a + .IR \%text\~mode . + . + You can change this automatic behavior by the option +@@ -2082,7 +2092,7 @@ + . + .P + Known viewers for the graphical display modes and their standard +-\%\f[CR]X\~Window\f[] viewer programs are ++\%\f(CRX\~Window\fP viewer programs are + . + .IP \*(BU 2m + in a PDF viewer +@@ -2106,7 +2116,7 @@ + .hy + . + .IP \*(BU 2m +-\%\f[CR]X\~Window\f[] ++\%\f(CRX\~Window\fP + .I roff + viewers such as + .BR \%gxditview (@MAN1EXT@) +@@ -2125,7 +2135,7 @@ + .P + The + .I \%pdf\~mode +-has a major advantage \[em] it is the only graphical display mode that ++has a major advantage \(em it is the only graphical display mode that + allows to search for text within the viewer; this can be a really + important feature. + . +@@ -2135,12 +2145,12 @@ + . + .P + These graphical viewers can be customized by options of the +-\%\f[CR]X\~Window\~Toolkit\f[]. ++\%\f(CRX\~Window\~Toolkit\fP. + . + But the + .B \%groffer + options use a leading double minus instead of the single minus used by +-the \%\f[CR]X\~Window\~Toolkit\f[]. ++the \%\f(CRX\~Window\~Toolkit\fP. + . + . + .\" -------------------------------------------------------------------- +@@ -2315,7 +2325,7 @@ + .IR \%man\~pages . + . + All long options, all environment variables, and most of the +-functionality of the \f[CR]GNU\fP ++functionality of the \f(CRGNU\fP + .BR \%man (1) + program were implemented. + . +@@ -2509,7 +2519,7 @@ + The + .I default language + can be specified by specifying one of the pseudo-language parameters +-\f[CR]C\fP or \f[CR]\%POSIX\fP. ++\f(CRC\fP or \f(CR\%POSIX\fP. + . + This is like deleting a formerly given + .I language +@@ -2527,13 +2537,13 @@ + .I language + name is determined by + .BR man . +-In \f[CR]GNU\fP ++In \f(CRGNU\fP + .BR man , +-it is specified in the \%\f[CR]POSIX\~1003.1\fP based format: ++it is specified in the \%\f(CRPOSIX\~1003.1\fP based format: + .P + .nh +-\f[I]\/\f[][\f[CB]_\f[]\,\f[I]\/\f[][\f[CB].\fP\ +-\f[I]\/\f[][\f[CB],\fP\,\f[I]\/\fP]]], ++\fI\/\fP[\f(CB_\fP\,\fI\/\fP[\f(CB.\fP\ ++\fI\/\fP[\f(CB,\fP\,\fI\/\fP]]], + .hy + .P + but the two-letter code in +@@ -2613,8 +2623,8 @@ + file in a + .I section + directory has the form +-.IR \%\f[CB]man\fP
\f[CB]/\fP\f[CB].\fP
\ +-[][\f[CB].\fP] , ++.IR \%\f(CBman\fP
\f(CB/\fP\f(CB.\fP
\ ++[][\f(CB.\fP] , + where + .I \% + and +@@ -2753,7 +2763,7 @@ + .B /usr/share/man/man1/groff.1 + This is an uncompressed file for the + .I \%man\~page +-\f[CR]groff\fP in ++\f(CRgroff\fP in + .IR section\~1 . + . + It can be called by +@@ -2841,8 +2851,8 @@ + \fIsh#\fR\~groffer\~1e\~ctags + \fIsh#\fR\~groffer\~\-\-extension=e\~\-\-sections=1\~ctags + .EE +-where \f[CR]e\fP works as an abbreviation for the extension +-\f[CR]emacs21\fP. ++where \f(CRe\fP works as an abbreviation for the extension ++\f(CRemacs21\fP. + . + . + .TP +@@ -2912,7 +2922,7 @@ + .BR \%bzip2 (1) + it is decompressed on-the-fly. + . +-This includes the \f[CR]GNU\fP ++This includes the \f(CRGNU\fP + .BR \%.gz , + .BR \%.bz2 , + and the traditional +@@ -2934,7 +2944,7 @@ + . + All environment variables of + .BR \%groff (@MAN1EXT@) +-and \f[CR]GNU\fP ++and \f(CRGNU\fP + .BR \%man (1) + and some standard system variables are honored. + . +@@ -2972,7 +2982,7 @@ + .TP + .SM + .B \%$DISPLAY +-If this variable is set this indicates that the \%\f[CR]X\~Window\fP ++If this variable is set this indicates that the \%\f(CRX\~Window\fP + system is running. + . + Testing this variable decides on whether graphical or text output is +@@ -2981,7 +2991,7 @@ + This variable should not be changed by the user carelessly, but it can + be used to start the graphical + .B \%groffer +-on a remote \%\f[CR]X\~Window\fP terminal. ++on a remote \%\f(CRX\~Window\fP terminal. + . + For example, depending on your system, + .B \%groffer +@@ -3026,7 +3036,7 @@ + see + .BR \%setlocale (3). + . +-The locale values \f[CR]C\fP and \%\f[CR]POSIX\fP ++The locale values \f(CRC\fP and \%\f(CRPOSIX\fP + stand for the default, i.e.\& the + .I \%man\~page + directories without a language prefix. +@@ -3407,9 +3417,9 @@ + .BR /usr/local/share/doc/groff , + using the standard viewer + .B \%gxditview +-as graphical viewer when in \%\f[CR]X\~Window\fP, or the ++as graphical viewer when in \%\f(CRX\~Window\fP, or the + .BR \%less (1) +-pager program when not in \%\f[CR]X\~Window\fP. ++pager program when not in \%\f(CRX\~Window\fP. + . + .sp + .EX +@@ -3476,7 +3486,7 @@ + . + .sp + .EX +-\fIsh#\fR\~groffer\~groff\~\[cq]troff(1)\[cq]\~man:roff ++\fIsh#\fR\~groffer\~groff\~\(cqtroff(1)\(cq\~man:roff + .EE + .sp + The arguments that are not existing files are looked-up as the +@@ -3492,13 +3502,13 @@ + . + The quotes around + .nh +-.I \[cq]troff(1)\[cq] ++.I \(cqtroff(1)\(cq + .hy + are necessary because the parentheses are special shell characters; + escaping them with a backslash character +-.I \[rs]( ++.I \(rs( + and +-.I \[rs]) ++.I \(rs) + would be possible, too. + . + The formatted files are concatenated and displayed in one piece. +@@ -3581,12 +3591,12 @@ + . + .sp + .EX +-\fIsh#\fR\~echo\~'\[rs]f[CB]WOW!'\~| ++\fIsh#\fR\~echo\~'\(rsf(CBWOW!'\~| + > groffer \-\-x \-\-bg red \-\-fg yellow \-\-geometry 200x100 \- + .EE + .sp + . +-Display the word \f[CB]WOW!\fP in a small window in constant-width ++Display the word \f(CBWOW!\fP in a small window in constant-width + bold font, using color yellow on red background. + . + . +@@ -3602,9 +3612,9 @@ + .P + .B \%groffer + provides its own parser for command line arguments that is compatible +-to both \%\f[CR]POSIX\fP ++to both \%\f(CRPOSIX\fP + .BR \%getopts (1) +-and \%\f[CR]GNU\fP ++and \%\f(CRGNU\fP + .BR \%getopt (1). + It can handle option arguments and file names containing white space + and a large set of special characters. +@@ -3673,7 +3683,7 @@ + .I \%filespec + parameters follows the GNU principle. + . +-That does not fulfill the strange option behavior of \%\f[CR]POSIX\fP ++That does not fulfill the strange option behavior of \%\f(CRPOSIX\fP + that ends option processing as soon as the first non-option argument + has been reached. + . +diff -Nuar groff-1.22.3.old/contrib/groffer/Makefile.sub groff-1.22.3/contrib/groffer/Makefile.sub +--- groff-1.22.3.old/contrib/groffer/Makefile.sub 2014-11-04 10:38:35.478520834 +0200 ++++ groff-1.22.3/contrib/groffer/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,109 +0,0 @@ +-# Makefile.sub for `groffer' (integration into the `groff' source tree) +- +-# File position: /contrib/groffer/Makefile.sub +- +-# Copyright (C) 2001-2014 Free Software Foundation, Inc. +-# Written by Werner Lemberg and +-# Bernd Warken . +- +-# This file is part of `groffer' which is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 +-# . +- +-######################################################################## +- +-ROFF2MODES=dvi html pdf ps text x +-ROFF2PROGS=`echo $(ROFF2MODES) | sed 's/[a-z][a-z]*/roff2&/g'` +-ROFF2MAN=`echo $(ROFF2MODES) | sed 's/[a-z][a-z]*/roff2&.man/g'` +-ROFF2N=`echo $(ROFF2MODES) | sed 's/[a-z][a-z]*/roff2&.n/g'` +- +-MAN1=groffer.n \ +- roff2dvi.n \ +- roff2html.n \ +- roff2pdf.n \ +- roff2ps.n \ +- roff2text.n \ +- roff2x.n +- +-MOSTLYCLEANADD=groffer $(MAN1) $(ROFF2MAN) $(ROFF2N) $(ROFF2PROGS) +- +-RM=rm -f +- +-all: groffer +- +-GROFFER_PERL=subs.pl \ +- main_subs.pl \ +- man.pl \ +- split_env.sh +-GROFFER_REST=roff2.man \ +- version.sh \ +- groffer.man \ +- groffer.pl \ +- roff2.pl +- +-groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT) +- sed -f "$(SH_DEPS_SED_SCRIPT)" \ +- -e "s|@g@|$(g)|g" \ +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ +- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ +- -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- -e "$(SH_SCRIPT_SED_CMD)" \ +- $(srcdir)/groffer.pl >$@; \ +- for f in $(ROFF2PROGS); do \ +- cp $(srcdir)/roff2.pl $$f; \ +- done; \ +- chmod +x $@ +- for m in $(ROFF2MODES); do \ +- cat $(srcdir)/roff2.man \ +- | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \ +- done +- +-install_data: groffer +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/groffer +- $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer +- for f in $(ROFF2PROGS); do \ +- $(RM) $(DESTDIR)$(bindir)/$$f; \ +- $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \ +- done +- -test -d $(DESTDIR)$(groffer_dir) \ +- || $(mkinstalldirs) $(DESTDIR)$(groffer_dir) +- $(RM) $(DESTDIR)$(groffer_dir)/version.sh +- $(INSTALL_DATA) $(srcdir)/version.sh $(DESTDIR)$(groffer_dir)/version.sh +- for f in $(GROFFER_PERL); do \ +- $(RM) $(DESTDIR)$(groffer_dir)/$$f; \ +- done +- for f in $(GROFFER_PERL); do \ +- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(groffer_dir)/$$f; \ +- done; +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/groffer +- -for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done +- -for f in $(GROFFER_PERL) version.sh; do \ +- $(RM) $(DESTDIR)$(groffer_dir)/$$f;\ +- done +- -test -d $(DESTDIR)$(libdir)/groff/groffer && \ +- rmdir $(DESTDIR)$(libdir)/groff/groffer +- +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/groffer/roff2.man groff-1.22.3/contrib/groffer/roff2.man +--- groff-1.22.3.old/contrib/groffer/roff2.man 2014-11-04 10:38:35.478520834 +0200 ++++ groff-1.22.3/contrib/groffer/roff2.man 2015-04-23 20:57:03.000000000 +0300 +@@ -13,7 +13,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2006-2014 Free Software Foundation, Inc. ++Copyright \(co 2006-2014 Free Software Foundation, Inc. + + This file is part of groffer, which is part of GNU groff, a free + software project. +@@ -39,8 +39,8 @@ + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + . +diff -Nuar groff-1.22.3.old/contrib/groffer/subs.pl groff-1.22.3/contrib/groffer/subs.pl +--- groff-1.22.3.old/contrib/groffer/subs.pl 2014-11-04 10:38:35.478520834 +0200 ++++ groff-1.22.3/contrib/groffer/subs.pl 2015-04-23 20:57:03.000000000 +0300 +@@ -749,7 +749,7 @@ + my @baseargs = ($n); + while (@base) { + my $base = join(' ', @base); +- foreach my $d (@maon::Path) { ++ foreach my $d (@main::Path) { + my $file = File::Spec->catfile($d, $base); + if (-f $file && -x $file) { + my $baseargs = join(' ', @baseargs); +diff -Nuar groff-1.22.3.old/contrib/groff_filenames/ChangeLog groff-1.22.3/contrib/groff_filenames/ChangeLog +--- groff-1.22.3.old/contrib/groff_filenames/ChangeLog 2014-11-04 10:38:35.471520922 +0200 ++++ groff-1.22.3/contrib/groff_filenames/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,7 @@ ++2015-04-03 Werner LEMBERG ++ ++ * groff_filenames.man: Make it work in compatibility mode. ++ + 2014-09-03 Bernd Warken + + * groff_filenames.man, Makefile.sub: Repair copying and Emacs +diff -Nuar groff-1.22.3.old/contrib/groff_filenames/groff_filenames.am groff-1.22.3/contrib/groff_filenames/groff_filenames.am +--- groff-1.22.3.old/contrib/groff_filenames/groff_filenames.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/groff_filenames/groff_filenames.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,30 @@ ++# Automake rules for `groff_filenames' ++ ++# File position: /contrib/groff_filenames/groff_filenames.am ++ ++# Copyright (C) 2013-2014 Free Software Foundation, Inc. ++# ++# Written by Bernd Warken . ++# Automake migration by Bertrand Garrigues ++ ++# This file is part of `groff'. ++ ++# `groff' 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. ++ ++# `groff' 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 . ++ ++######################################################################## ++ ++man7_MANS += contrib/groff_filenames/groff_filenames.n ++EXTRA_DIST += \ ++ contrib/groff_filenames/ChangeLog \ ++ contrib/groff_filenames/groff_filenames.man +diff -Nuar groff-1.22.3.old/contrib/groff_filenames/groff_filenames.man groff-1.22.3/contrib/groff_filenames/groff_filenames.man +--- groff-1.22.3.old/contrib/groff_filenames/groff_filenames.man 2014-11-04 10:38:35.471520922 +0200 ++++ groff-1.22.3/contrib/groff_filenames/groff_filenames.man 2015-04-23 20:57:03.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2013-2014 Free Software Foundation, Inc. ++Copyright \(co 2013-2014 Free Software Foundation, Inc. + + This file is part of groff, a free software project. You can + redistribute it and/or modify it under the terms of the GNU General +@@ -74,7 +74,7 @@ + .IR "compressor name" . + . + So the whole filename has the structure +-.IR \f[CB].\fP [ \f[CB].\fP ] . ++.IR \f(CB.\fP [ \f(CB.\fP ] . + . + . + .P +@@ -635,13 +635,13 @@ + . + .P + .UR https://\:github.com/\:n-t-roff/\:heirloom-doctools +-.I Gunnar Ritter\[aq]s Heirloom roff project ++.I Gunnar Ritter\(aqs Heirloom roff project + .UE . + . + You can get this package with the shell command: + .RS + .EX +-\[Do] git clone https://github.com/n-t-roff/heirloom-doctools ++\(Do git clone https://github.com/n-t-roff/heirloom-doctools + .EE + .RE + . +diff -Nuar groff-1.22.3.old/contrib/groff_filenames/Makefile.sub groff-1.22.3/contrib/groff_filenames/Makefile.sub +--- groff-1.22.3.old/contrib/groff_filenames/Makefile.sub 2014-11-04 10:38:35.471520922 +0200 ++++ groff-1.22.3/contrib/groff_filenames/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,35 +0,0 @@ +-# Makefile.sub for `groff_filenames' (integration into the `groff' source tree) +- +-# File position: /contrib/groff_filenames/Makefile.sub +- +-# Copyright (C) 2013-2014 Free Software Foundation, Inc. +-# +-# Written by Bernd Warken . +- +-# This file is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 . +- +-######################################################################## +- +-MAN7=\ +- groff_filenames.n +- +-MOSTLYCLEANADD=$(MAN7) +- +-######################################################################## +-##### Emacs settings +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/hdtbl/ChangeLog groff-1.22.3/contrib/hdtbl/ChangeLog +--- groff-1.22.3.old/contrib/hdtbl/ChangeLog 2014-11-04 10:38:35.482520784 +0200 ++++ groff-1.22.3/contrib/hdtbl/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,15 @@ ++2015-04-03 Werner LEMBERG ++ ++ Fix Savannah bug #44798. ++ ++ * examples/fonts_n.in, examples/fonts_x.in: Use @EGREP@. ++ ++ * hdtbl.am (.in.roff): Handle @EGREP@. ++ ++2015-04-03 Werner LEMBERG ++ ++ * groff_hdtbl.man: Make it work in compatibility mode. ++ + 2013-09-03 Bernd Warken + + * all files in groff_hdtbl: Copying and Emacs setup. +diff -Nuar groff-1.22.3.old/contrib/hdtbl/examples/fonts_n.in groff-1.22.3/contrib/hdtbl/examples/fonts_n.in +--- groff-1.22.3.old/contrib/hdtbl/examples/fonts_n.in 2014-11-04 10:38:35.593519396 +0200 ++++ groff-1.22.3/contrib/hdtbl/examples/fonts_n.in 2015-04-23 20:57:03.000000000 +0300 +@@ -102,7 +102,7 @@ + . TBL border=.1n bc=red cpd=0 csp=.1n bgc= + . CPTN groff font \\*[*$1] \ + .br \ +- val=b ".pso grep -e internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]" ++ val=b ".pso @EGREP@ internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]" + . TR + . TD + . TBL cols=12 border=.1n bc=red csp=.1n cpd=.2n fgc=red4 bgc=beige \ +diff -Nuar groff-1.22.3.old/contrib/hdtbl/examples/fonts_x.in groff-1.22.3/contrib/hdtbl/examples/fonts_x.in +--- groff-1.22.3.old/contrib/hdtbl/examples/fonts_x.in 2014-11-04 10:38:35.593519396 +0200 ++++ groff-1.22.3/contrib/hdtbl/examples/fonts_x.in 2015-04-23 20:57:03.000000000 +0300 +@@ -102,7 +102,7 @@ + . TBL border=.1n bc=red cpd=0 csp=.1n bgc= + . CPTN groff font \\*[*$1] \ + .br \ +- val=b ".pso grep -e internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]" ++ val=b ".pso @EGREP@ internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]" + . TR + . TD + . TBL cols=18 border=.1n bc=red csp=.1n cpd=.2n fgc=red4 bgc=beige \ +diff -Nuar groff-1.22.3.old/contrib/hdtbl/examples/.gitignore groff-1.22.3/contrib/hdtbl/examples/.gitignore +--- groff-1.22.3.old/contrib/hdtbl/examples/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/hdtbl/examples/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,14 @@ ++stamp ++short_reference.ps ++rainbow.ps ++mixed_pickles.ps ++fonts_x.roff ++fonts_x.ps ++fonts_n.roff ++fonts_n.ps ++color_transitions.ps ++color_table_cells.ps ++color_nested_tables.ps ++color_boxes.ps ++col_rowspan_colors.ps ++chess_board.ps +diff -Nuar groff-1.22.3.old/contrib/hdtbl/.gitignore groff-1.22.3/contrib/hdtbl/.gitignore +--- groff-1.22.3.old/contrib/hdtbl/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/hdtbl/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++stamp-strip ++hdtbl.tmac-s ++hdmisc.tmac-s ++groff_hdtbl.n ++gnu.eps +diff -Nuar groff-1.22.3.old/contrib/hdtbl/groff_hdtbl.man groff-1.22.3/contrib/hdtbl/groff_hdtbl.man +--- groff-1.22.3.old/contrib/hdtbl/groff_hdtbl.man 2014-11-04 10:38:35.483520772 +0200 ++++ groff-1.22.3/contrib/hdtbl/groff_hdtbl.man 2015-04-23 20:57:03.000000000 +0300 +@@ -3,6 +3,10 @@ + groff_hdtbl \- groff `hdtbl' macros for generation of tables + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legalese + .\" -------------------------------------------------------------------- +@@ -1261,7 +1265,7 @@ + .au + . + . +-.\" EOF ++.cp \n[groff_C] + . + . + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/contrib/hdtbl/hdmisc.tmac groff-1.22.3/contrib/hdtbl/hdmisc.tmac +--- groff-1.22.3.old/contrib/hdtbl/hdmisc.tmac 2014-11-04 10:38:35.483520772 +0200 ++++ groff-1.22.3/contrib/hdtbl/hdmisc.tmac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,325 +0,0 @@ +-.\" -*- mode: nroff -*- +-.ig +- +-hdmisc.tmac +- +-This file is part of groff, the GNU roff type-setting system. +- +-Copyright (C) 2005-2014 Free Software Foundation, Inc. +-written by Joachim Walsdorff . +- +-groff 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. +- +-groff 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 . +- +-.. +-. +-. +-.\" %beginstrip% +-. +-.if d t*getarg \ +-. nx +-. +-. +-.\" ****************************************************************** +-.\" ** Some macros and default settings needed by hdtbl ** +-.\" ****************************************************************** +-. +-. +-.\" Utility macro: .getarg ... +-.\" +-.\" Get macro argument. This macro searches in the +-.\" remaining arguments and assigns its value to a string +-.\" register named . The following syntax forms are +-.\" recognized. +-.\" +-.\" = Assign to string . +-.\" must not contain spaces. +-.\" ='' Assign to string . +-.\" can contain spaces. +-.\" = Assign `=' to string . +-.\" Assign `key' to string . +-.\" +-.\" After return, the string `args' contains the remaining +-.\" arguments. +-.\" +-.\" Example: With the definition of string `foo' as +-.\" +-.\" .ds foo aaa=xxx bbb ccc='yyy zzz' ddd= eee +-.\" +-.\" a call to `getarg' with +-.\" +-.\" .getarg ccc \*[foo] +-.\" +-.\" sets string `ccc' to value `yyy zzz'. The string `args' +-.\" now contains `aaa=xxx bbb ddd= eee'. An additional call +-.\" like +-.\" +-.\" .getarg ddd \*[args] +-.\" +-.\" sets string `ddd' to value `=', and `args' contains +-.\" `aaa=xxx bbb eee'. +-.de t*getarg +-. ds \\$1 +-. ds args +-. +-. if (\\n[.$] < 2) \ +-. return +-. +-. ds $1 \\$1\" +-. shift +-. +-. length * \\*[$1] +-. while \\n[.$] \{\ +-. ds * "\\$1\" +-. ds ** "\\$1\" +-. length ** \\*[**] +-. shift +-. if (\\n[*] > \\n[**]) \{\ +-. as args " "\\*[**]"\" value too short, repeat +-. continue +-. \} +-. substring * 0 (\\n[*] - 1) +-. \" The surrounding \? escapes emulate string comparison. +-. ie !"\?\\*[$1]\?"\?\\*[*]\?" \{\ +-. as args " "\\*[**]"\" key not found, repeat +-. continue +-. \} +-. el \{\ +-. ie "\?\\*[**]\?"\?\\*[$1]\?" \ +-. ds \\*[$1] \\*[$1]\" return key as string +-. el \{\ +-. ie "\?\\*[**]\?"\?\\*[$1]=\?" \ +-. ds \\*[$1] =\" return `=' +-. el \{\ +-. substring ** (\\n[*] + 1) -1 +-. ds * \\*[**]\" +-. substring * 0 0 +-. +-. \" check whether value starts with quote +-. if "\?\\*[*]\?"\?'\?" \{\ +-. substring ** 1 -1 +-. ds * \\*[**]\" +-. substring * -1 -1 +-. +-. \" search final quote +-. ie "\?\\*[*]\?"\?'\?" \ +-. substring ** 0 -2 +-. el \{\ +-. as \\*[$1] \\*[**] \" not found, append argument +-. +-. while 1 \{\ +-. ds ** \\$1\" get next argument +-. ds * \\$1\" +-. shift +-. substring * -1 -1 +-. +-. if "\?\\*[*]\?"\?'\?" \{\ +-. substring ** 0 -2 +-. break \" break if no final quote +-. \} +-. +-. as \\*[$1] \\*[**] \" otherwise append and repeat +-. \} +-. \}\} +-. +-. as \\*[$1] \\*[**]\" +-. \} +-. +-. as args " \\$@\" +-. \}\} +-. +-. return +-. \} +-.. +-. +-. +-.\" Utility macro: .index +-.\" +-.\" Check whether is a substring of and +-.\" return its position in number register `t*index', starting +-.\" with 1. If not found, return 0. If is empty, +-.\" set `t*index' to -999. +-.de t*index +-. if "\\$2"" \{\ +-. nr t*index -999 +-. return +-. \} +-. +-. length ** \\$1 +-. length $2 \\$2 +-. nr * 0-1 1 +-. +-. while (\\n+[*] < \\n[**]) \{\ +-. ds * \\$1\" +-. substring * \\n[*] (\\n[*] + \\n[$2] - 1) +-. \" The surrounding \? escapes emulate string comparison. +-. if "\?\\*[*]\?"\?\\$2\?" \ +-. break +-. \} +-. +-. ie (\\n[*] == \\n[**]) \ +-. nr t*index 0 +-. el \ +-. nr t*index (\\n[*] + 1) +-.. +-. +-. +-.\" ****************************************************************** +-.\" ******** non-accumulating space .t*SP [v] ********** +-.\" ** ** +-.\" ** nl vor erster Seite -1, oben auf Seite 0 resp. tH ** +-.\" ** .k nach .sp oder .br 0, ** +-.\" ** sonst Laenge der angefangenen Zeile ** +-.\" ** Der Merker M# fuer vorangegangenes .t*SP wird in .HM am ** +-.\" ** Seitenanfang zurueckgesetzt. ** +-.\" ** ganz richtig ist .sp + .br = .br + .sp = .sp ** +-.\" ****************************************************************** +-.de t*SP +-. if (\\n[nl] < 0) \ +-. br \" start very first page +-. nr * \\n[.p] \" save current page length +-. +-. ie "\\$1"" \ +-. pl +1 \" without arg increase page length by 1v +-. el \ +-. pl +\\$1 \" otherwise use \\$1 +-. +-. nr ** (\\n[.p] - \\n[*]) \" ** now holds arg for .t*SP in base units +-. pl \\n[*]u \" restore page length +-. +-. \" we do nothing at start of new page or column +-. if ((\\n[nl] - \\n[tH]) & (\\n[nl] - \\n[<<]) : \\n[.k]) \{\ +-. ie ((\\n[.d] - \\n[M#]) : \\n[.k]) \{\ +-. sp \\n[**]u \" execute .sp +-. nr S# \\n[**] \" store ** in S# +-. \} +-. el \{\ +-. if (\\n[**] - \\n[S#]) \{\ +-. sp (\\n[**]u - \\n[S#]u)\" emit difference to previous .t*SP +-. nr S# \\n[**] \" store ** in S# +-. \}\} +-. +-. nr M# \\n[.d] \" store vertical position .d in M# +-. \} +-.. +-. +-. +-.\" ****************************************************************** +-.\" ** Perform all arguments once ** +-.\" ** P1 is nestable ** +-.\" ****************************************************************** +-.de t*P1 +-. \" `while' command is about five times faster than recursion! +-. while \\n[.$] \{\ +-. nop \\$1 +-. shift +-. \} +-.. +-. +-. +-.\" ****************************************************************** +-.\" ** Hilfsmakro zum Einstellen von Schriftgroesse und ** +-.\" ** Zeilenabstand, bezogen auf Anfangswerte \n[t*s] ** +-.\" ** und \n[t*v] sowie fuer Hyphenation: ** +-.\" ** .pv s v hy# hart; macht .br ** +-.\" ** Bei 4. Argument setzen der Register s und v und hy. ** +-.\" ** Fuer angefangene Zeile die vorgefundenen Einstellungen ** +-.\" ** ** +-.\" ** Auxiliary macro to set internal registers for font size ** +-.\" ** and line spacing, relative to initial values \n[t*s] and ** +-.\" ** \n[t*v]. Optionally sets hyphenation. A fourth argument ** +-.\" ** initializes internal registers to global default values. ** +-.\" ****************************************************************** +-.de t*pv +-. br +-. +-. if \\n[.$] \ +-. ps (\\n[t*s]u * \\$1z / 1z) +-. +-. ie (\\n[.$] - 1) \ +-. vs (\\n[t*v]u * \\$2p / 1p) +-. el \{\ +-. vs (\\n[t*v]u * \\$1p / 1p) +-. return +-. \} +-. +-. if !""\\$3" \ +-. hy \\$3 +-. +-. if !""\\$4" \{\ +-. nr t*v \\n[.v] +-. nr t*s \\n[.ps] +-. nr t*hy \\n[.hy] +-. \} +-.. +-. +-. +-.\" ****************************************************************** +-.\" ** Hilfsmakros pop/pops/popr (pop stackelement): ** +-.\" ** pop or popr: pop register ** +-.\" ** pops: pop string ** +-.\" ** .pop[s|r] reg|string stackname ** +-.\" ** reg|string: name of reg/string to get the ** +-.\" ** popped element ** +-.\" ** stack: name of stack ** +-.\" ****************************************************************** +-.de *pop +-. ie "\\$1"pops" \ +-. ds \\$2 \\$4\" pop first stackelement +-. el \ +-. nr \\$2 \\$4 +-. +-. ds $3 \\$3\" remember stackname +-. shift 4 \" shift four args +-. +-. ds \\*[$3] "\\$@\" fill stack with remaining elements +-.. +-. +-.de pop +-. *pop \\$0 \\$1 \\$2 \\*[\\$2] +-.. +-. +-.als popr pop +-.als pops pop +-. +-. +-.\" ****************************************************************** +-.\" ** process diversion ** +-.\" ****************************************************************** +-.de t*DI +-. nr * \\n[.u] +-. nf \" diversion is already formatted - output it unchanged +-. \\$1 \" output the diversion ... +-. rm \\$1 \" ... and remove it +-. if \\n[*] \ +-. fi \" reactivate formatting +-.. +-. +-.\" ****************************************************************** +-.\" ** error checking at end ** +-.\" ****************************************************************** +-.de t*EM +-. +-. if !"\\*[t*kept]"" \{\ +-. tm1 "hdtbl: Not all tables have been printed. +-. tm1 " Add `.bp' at the end of your document. +-. \} +-. if !"\\*[t*held]"" \{\ +-. tm1 "hdtbl: There are held tables which haven't been printed. +-. tm1 " Add `.t*free' at the end of your document. +-. \} +-. if \\n[t*#] \ +-. tm hdtbl: Missing `.ETB' macro; last .TBL in \\*[t*FN] at line \\*[t*LN]. +-.. +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/contrib/hdtbl/hdmisc.tmac-u groff-1.22.3/contrib/hdtbl/hdmisc.tmac-u +--- groff-1.22.3.old/contrib/hdtbl/hdmisc.tmac-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/hdtbl/hdmisc.tmac-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,325 @@ ++.\" -*- mode: nroff -*- ++.ig ++ ++hdmisc.tmac ++ ++This file is part of groff, the GNU roff type-setting system. ++ ++Copyright (C) 2005-2014 Free Software Foundation, Inc. ++written by Joachim Walsdorff . ++ ++groff 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. ++ ++groff 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 . ++ ++.. ++. ++. ++.\" %beginstrip% ++. ++.if d t*getarg \ ++. nx ++. ++. ++.\" ****************************************************************** ++.\" ** Some macros and default settings needed by hdtbl ** ++.\" ****************************************************************** ++. ++. ++.\" Utility macro: .getarg ... ++.\" ++.\" Get macro argument. This macro searches in the ++.\" remaining arguments and assigns its value to a string ++.\" register named . The following syntax forms are ++.\" recognized. ++.\" ++.\" = Assign to string . ++.\" must not contain spaces. ++.\" ='' Assign to string . ++.\" can contain spaces. ++.\" = Assign `=' to string . ++.\" Assign `key' to string . ++.\" ++.\" After return, the string `args' contains the remaining ++.\" arguments. ++.\" ++.\" Example: With the definition of string `foo' as ++.\" ++.\" .ds foo aaa=xxx bbb ccc='yyy zzz' ddd= eee ++.\" ++.\" a call to `getarg' with ++.\" ++.\" .getarg ccc \*[foo] ++.\" ++.\" sets string `ccc' to value `yyy zzz'. The string `args' ++.\" now contains `aaa=xxx bbb ddd= eee'. An additional call ++.\" like ++.\" ++.\" .getarg ddd \*[args] ++.\" ++.\" sets string `ddd' to value `=', and `args' contains ++.\" `aaa=xxx bbb eee'. ++.de t*getarg ++. ds \\$1 ++. ds args ++. ++. if (\\n[.$] < 2) \ ++. return ++. ++. ds $1 \\$1\" ++. shift ++. ++. length * \\*[$1] ++. while \\n[.$] \{\ ++. ds * "\\$1\" ++. ds ** "\\$1\" ++. length ** \\*[**] ++. shift ++. if (\\n[*] > \\n[**]) \{\ ++. as args " "\\*[**]"\" value too short, repeat ++. continue ++. \} ++. substring * 0 (\\n[*] - 1) ++. \" The surrounding \? escapes emulate string comparison. ++. ie !"\?\\*[$1]\?"\?\\*[*]\?" \{\ ++. as args " "\\*[**]"\" key not found, repeat ++. continue ++. \} ++. el \{\ ++. ie "\?\\*[**]\?"\?\\*[$1]\?" \ ++. ds \\*[$1] \\*[$1]\" return key as string ++. el \{\ ++. ie "\?\\*[**]\?"\?\\*[$1]=\?" \ ++. ds \\*[$1] =\" return `=' ++. el \{\ ++. substring ** (\\n[*] + 1) -1 ++. ds * \\*[**]\" ++. substring * 0 0 ++. ++. \" check whether value starts with quote ++. if "\?\\*[*]\?"\?'\?" \{\ ++. substring ** 1 -1 ++. ds * \\*[**]\" ++. substring * -1 -1 ++. ++. \" search final quote ++. ie "\?\\*[*]\?"\?'\?" \ ++. substring ** 0 -2 ++. el \{\ ++. as \\*[$1] \\*[**] \" not found, append argument ++. ++. while 1 \{\ ++. ds ** \\$1\" get next argument ++. ds * \\$1\" ++. shift ++. substring * -1 -1 ++. ++. if "\?\\*[*]\?"\?'\?" \{\ ++. substring ** 0 -2 ++. break \" break if no final quote ++. \} ++. ++. as \\*[$1] \\*[**] \" otherwise append and repeat ++. \} ++. \}\} ++. ++. as \\*[$1] \\*[**]\" ++. \} ++. ++. as args " \\$@\" ++. \}\} ++. ++. return ++. \} ++.. ++. ++. ++.\" Utility macro: .index ++.\" ++.\" Check whether is a substring of and ++.\" return its position in number register `t*index', starting ++.\" with 1. If not found, return 0. If is empty, ++.\" set `t*index' to -999. ++.de t*index ++. if "\\$2"" \{\ ++. nr t*index -999 ++. return ++. \} ++. ++. length ** \\$1 ++. length $2 \\$2 ++. nr * 0-1 1 ++. ++. while (\\n+[*] < \\n[**]) \{\ ++. ds * \\$1\" ++. substring * \\n[*] (\\n[*] + \\n[$2] - 1) ++. \" The surrounding \? escapes emulate string comparison. ++. if "\?\\*[*]\?"\?\\$2\?" \ ++. break ++. \} ++. ++. ie (\\n[*] == \\n[**]) \ ++. nr t*index 0 ++. el \ ++. nr t*index (\\n[*] + 1) ++.. ++. ++. ++.\" ****************************************************************** ++.\" ******** non-accumulating space .t*SP [v] ********** ++.\" ** ** ++.\" ** nl vor erster Seite -1, oben auf Seite 0 resp. tH ** ++.\" ** .k nach .sp oder .br 0, ** ++.\" ** sonst Laenge der angefangenen Zeile ** ++.\" ** Der Merker M# fuer vorangegangenes .t*SP wird in .HM am ** ++.\" ** Seitenanfang zurueckgesetzt. ** ++.\" ** ganz richtig ist .sp + .br = .br + .sp = .sp ** ++.\" ****************************************************************** ++.de t*SP ++. if (\\n[nl] < 0) \ ++. br \" start very first page ++. nr * \\n[.p] \" save current page length ++. ++. ie "\\$1"" \ ++. pl +1 \" without arg increase page length by 1v ++. el \ ++. pl +\\$1 \" otherwise use \\$1 ++. ++. nr ** (\\n[.p] - \\n[*]) \" ** now holds arg for .t*SP in base units ++. pl \\n[*]u \" restore page length ++. ++. \" we do nothing at start of new page or column ++. if ((\\n[nl] - \\n[tH]) & (\\n[nl] - \\n[<<]) : \\n[.k]) \{\ ++. ie ((\\n[.d] - \\n[M#]) : \\n[.k]) \{\ ++. sp \\n[**]u \" execute .sp ++. nr S# \\n[**] \" store ** in S# ++. \} ++. el \{\ ++. if (\\n[**] - \\n[S#]) \{\ ++. sp (\\n[**]u - \\n[S#]u)\" emit difference to previous .t*SP ++. nr S# \\n[**] \" store ** in S# ++. \}\} ++. ++. nr M# \\n[.d] \" store vertical position .d in M# ++. \} ++.. ++. ++. ++.\" ****************************************************************** ++.\" ** Perform all arguments once ** ++.\" ** P1 is nestable ** ++.\" ****************************************************************** ++.de t*P1 ++. \" `while' command is about five times faster than recursion! ++. while \\n[.$] \{\ ++. nop \\$1 ++. shift ++. \} ++.. ++. ++. ++.\" ****************************************************************** ++.\" ** Hilfsmakro zum Einstellen von Schriftgroesse und ** ++.\" ** Zeilenabstand, bezogen auf Anfangswerte \n[t*s] ** ++.\" ** und \n[t*v] sowie fuer Hyphenation: ** ++.\" ** .pv s v hy# hart; macht .br ** ++.\" ** Bei 4. Argument setzen der Register s und v und hy. ** ++.\" ** Fuer angefangene Zeile die vorgefundenen Einstellungen ** ++.\" ** ** ++.\" ** Auxiliary macro to set internal registers for font size ** ++.\" ** and line spacing, relative to initial values \n[t*s] and ** ++.\" ** \n[t*v]. Optionally sets hyphenation. A fourth argument ** ++.\" ** initializes internal registers to global default values. ** ++.\" ****************************************************************** ++.de t*pv ++. br ++. ++. if \\n[.$] \ ++. ps (\\n[t*s]u * \\$1z / 1z) ++. ++. ie (\\n[.$] - 1) \ ++. vs (\\n[t*v]u * \\$2p / 1p) ++. el \{\ ++. vs (\\n[t*v]u * \\$1p / 1p) ++. return ++. \} ++. ++. if !""\\$3" \ ++. hy \\$3 ++. ++. if !""\\$4" \{\ ++. nr t*v \\n[.v] ++. nr t*s \\n[.ps] ++. nr t*hy \\n[.hy] ++. \} ++.. ++. ++. ++.\" ****************************************************************** ++.\" ** Hilfsmakros pop/pops/popr (pop stackelement): ** ++.\" ** pop or popr: pop register ** ++.\" ** pops: pop string ** ++.\" ** .pop[s|r] reg|string stackname ** ++.\" ** reg|string: name of reg/string to get the ** ++.\" ** popped element ** ++.\" ** stack: name of stack ** ++.\" ****************************************************************** ++.de *pop ++. ie "\\$1"pops" \ ++. ds \\$2 \\$4\" pop first stackelement ++. el \ ++. nr \\$2 \\$4 ++. ++. ds $3 \\$3\" remember stackname ++. shift 4 \" shift four args ++. ++. ds \\*[$3] "\\$@\" fill stack with remaining elements ++.. ++. ++.de pop ++. *pop \\$0 \\$1 \\$2 \\*[\\$2] ++.. ++. ++.als popr pop ++.als pops pop ++. ++. ++.\" ****************************************************************** ++.\" ** process diversion ** ++.\" ****************************************************************** ++.de t*DI ++. nr * \\n[.u] ++. nf \" diversion is already formatted - output it unchanged ++. \\$1 \" output the diversion ... ++. rm \\$1 \" ... and remove it ++. if \\n[*] \ ++. fi \" reactivate formatting ++.. ++. ++.\" ****************************************************************** ++.\" ** error checking at end ** ++.\" ****************************************************************** ++.de t*EM ++. ++. if !"\\*[t*kept]"" \{\ ++. tm1 "hdtbl: Not all tables have been printed. ++. tm1 " Add `.bp' at the end of your document. ++. \} ++. if !"\\*[t*held]"" \{\ ++. tm1 "hdtbl: There are held tables which haven't been printed. ++. tm1 " Add `.t*free' at the end of your document. ++. \} ++. if \\n[t*#] \ ++. tm hdtbl: Missing `.ETB' macro; last .TBL in \\*[t*FN] at line \\*[t*LN]. ++.. ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/contrib/hdtbl/hdtbl.am groff-1.22.3/contrib/hdtbl/hdtbl.am +--- groff-1.22.3.old/contrib/hdtbl/hdtbl.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/hdtbl/hdtbl.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,126 @@ ++# Copyright (C) 2006-2014 Free Software Foundation, Inc. ++# Written by Werner Lemberg (wl@gnu.org) ++# Automake migration by Bertrand Garrigues ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl ++hdtbl_builddir = $(top_builddir)/contrib/hdtbl ++ ++man7_MANS += contrib/hdtbl/groff_hdtbl.n ++ ++# Groff command used to generate .ps files ++HDTBL_TFLAG = -M$(hdtbl_srcdir) -M$(hdtbl_builddir) ++HDTLB_PFLAG=-t -p -e -U ++HDTBLGROFF = \ ++ GROFF_COMMAND_PREFIX= \ ++ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ ++ $(GROFFBIN) $(FFLAG) $(TFLAG) $(HDTBL_TFLAG) $(HDTLB_PFLAG) ++ ++# Files installed in $(tmacdir). ++# These files are generated with `strip.sed' from their unstripped source file ++# equivalent (e.g. hdtbl.tmac is generated from hdtbl.tmac-u) ++HDTBLSTRIPFILES = \ ++ contrib/hdtbl/hdtbl.tmac \ ++ contrib/hdtbl/hdmisc.tmac ++hdtbltmacdir = $(tmacdir) ++hdtbltmac_DATA = $(HDTBLSTRIPFILES) ++ ++# Files installed in $(exampledir)/hdtbl. HDTBLEXAMPLEFILES are ++# located in the source tree, while HDTBLPROCESSEDEXAMPLEFILES are ++# generated in the build tree. ++ ++# These files are handled by the `.in.roff' rule. ++HDTBLGENFILES = \ ++ contrib/hdtbl/examples/fonts_n.roff \ ++ contrib/hdtbl/examples/fonts_x.roff ++EXTRA_DIST += \ ++ contrib/hdtbl/examples/fonts_n.in \ ++ contrib/hdtbl/examples/fonts_x.in ++ ++HDTBLEXAMPLEFILES = \ ++ contrib/hdtbl/examples/common.roff \ ++ contrib/hdtbl/examples/chess_board.roff \ ++ contrib/hdtbl/examples/color_boxes.roff \ ++ contrib/hdtbl/examples/color_nested_tables.roff \ ++ contrib/hdtbl/examples/color_table_cells.roff \ ++ contrib/hdtbl/examples/color_transitions.roff \ ++ contrib/hdtbl/examples/col_rowspan_colors.roff \ ++ contrib/hdtbl/examples/mixed_pickles.roff \ ++ contrib/hdtbl/examples/rainbow.roff \ ++ contrib/hdtbl/examples/short_reference.roff ++ ++HDTBLPROCESSEDEXAMPLEFILES = \ ++ contrib/hdtbl/examples/chess_board.ps \ ++ contrib/hdtbl/examples/color_boxes.ps \ ++ contrib/hdtbl/examples/color_nested_tables.ps \ ++ contrib/hdtbl/examples/color_table_cells.ps \ ++ contrib/hdtbl/examples/color_transitions.ps \ ++ contrib/hdtbl/examples/col_rowspan_colors.ps \ ++ contrib/hdtbl/examples/fonts_n.ps \ ++ contrib/hdtbl/examples/fonts_x.ps \ ++ contrib/hdtbl/examples/mixed_pickles.ps \ ++ contrib/hdtbl/examples/rainbow.ps \ ++ contrib/hdtbl/examples/short_reference.ps ++ ++hdtblexampledir = $(exampledir)/hdtbl ++ ++if BUILD_EXAMPLES ++dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES) ++nodist_hdtblexample_DATA = \ ++ $(HDTBLGENFILES) \ ++ $(HDTBLPROCESSEDEXAMPLEFILES) \ ++ gnu.eps ++else ++EXTRA_DIST += $(HDTBLEXAMPLEFILES) ++endif ++$(hdtblexample_DATA): $(HDTBLSTRIPFILES) ++ ++MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \ ++ hdmisc.tmac-s hdtbl.tmac-s $(HDTBLSTRIPFILES) ++ ++EXTRA_DIST += \ ++ contrib/hdtbl/ChangeLog \ ++ contrib/hdtbl/TODO \ ++ contrib/hdtbl/groff_hdtbl.man \ ++ contrib/hdtbl/hdtbl.tmac-u \ ++ contrib/hdtbl/hdmisc.tmac-u ++ ++# Rule to generate ps and roff files ++SUFFIXES += .roff .in .ps ++ ++.roff.ps: ++ @$(MKDIR_P) `dirname $@` ++ $(HDTBLGROFF) -Tps -dfontpath=$(top_srcdir)/font -dsopath=$(hdtbl_srcdir)/ \ ++ -mhdtbl $< >$@ ++.in.roff: ++ @$(MKDIR_P) `dirname $@` ++ sed -e "s|[@]fontdir[@]|$(fontdir)|" \ ++ -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ ++ ++ ++$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \ ++ contrib/hdtbl/examples/common.roff ++ ++$(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed ++ @$(MKDIR_P) `dirname $@` ++ sed -f $(top_srcdir)/tmac/strip.sed $(hdtbl_srcdir)/`basename $@`-u > $@; ++ ++uninstall_groffdirs: uninstall-hdtbl-hook ++uninstall-hdtbl-hook: ++ if test -d $(DESTDIR)$(hdtblexampledir); then \ ++ rmdir $(DESTDIR)$(hdtblexampledir); \ ++ fi +diff -Nuar groff-1.22.3.old/contrib/hdtbl/hdtbl.tmac groff-1.22.3/contrib/hdtbl/hdtbl.tmac +--- groff-1.22.3.old/contrib/hdtbl/hdtbl.tmac 2014-11-04 10:38:35.483520772 +0200 ++++ groff-1.22.3/contrib/hdtbl/hdtbl.tmac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1003 +0,0 @@ +-.\" -*- nroff -*- +-.ig +- +-hdtbl.tmac +- +-This file is part of groff, the GNU roff type-setting system. +- +-Copyright (C) 2005-2014 Free Software Foundation, Inc. +-written by Joachim Walsdorff . +- +-groff 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. +- +-groff 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 . +- +-.. +-. +-. +-.\" ***************************************************************** +-.\" * hdtbl - Heidelberger table macros * +-.\" * Vers. 0.91 December 2005 * +-.\" ***************************************************************** +-. +-.if d TBL \ +-. nx +-. +-.mso hdmisc.tmac +-.mso 62bit.tmac +-. +-. +-.\" ***************************************************************** +-.\" * default values for some arguments * +-.\" ***************************************************************** +-. +-.ds t*hl s\" +-.ds t*vl s\" +-.ds t*tal l\" +-.ds t*hal b\" +-.ds t*val t\" +-.ds t*ff \\n[.fam]\" +-.ds t*fst \\n[.f]\" +-.ds t*fsz 1 1\" +-.ds t*fgc red4\" +-.ds t*bgc bisque\" +-.ds t*bc red4\" +-.nr t*cpd .5n +-.nr t*csp .5n +-.nr t*b .1n +-.nr t*cols 1 +-.nr t*v \n[.v] +-.nr t*s \n[.ps] +-.nr t*hy \n[.hy] +-.nr t*l \n[.ll] +-. +-. +-.\" defaults for table captions +-.nr t*cptn 0 1 +-.ds t*cptn "".sp .4" \ +- ".t*pv 1.0 1.0" \ +- ".ad l" \ +- "\m[\\*[t*fgc]]Table \\n+[t*cptn]:\0\c\k*"\" +-. +-. +-.\" %beginstrip% +-. +-.\" for better error messages +-.ds nth-1 st\" +-.ds nth-2 nd\" +-.ds nth-3 rd\" +-. +-.\" initialization of various registers +-.nr t*# 0 \" table nesting level +-.nr t*numb 0 1 \" held table diversion # +-. +-.ds *#trc* +-. +-. +-.\" ***************************************************************** +-.\" * The four base macros and the two optional macros * +-.\" ***************************************************************** +-. +-.ie n \ +-. ds g tty:\" +-.el \ +-. ds g ps: exec\" +-. +-.\" TBL: table start +-.\" predecessor: text, TD or ETB +-.\" successor: CPTN or TR +-.de TBL +-. ds t*m\\n[t*#] \\n[.m]\" +-. ie \\n[t*#] \ +-. br +-. el \{\ +-. ds * \\n[.ev]\" +-. ev t*tbl +-. evc \\*[*] +-. di t*tbl0 +-. sp .4 \" XXX: hard-coded value +-. nr t*i \\n[.i] +-. ll -\\n[.i]u +-. in 0 +-. \} +-. nr t*# +1 +-. +-. \" Save current location for error checking at end +-. ds t*FN \\[.F] +-. ds t*LN \\[.c] +-. +-. t*getarg cols \\$@\" from here string `args' contains the rest of \\$@ +-. ie "\\*[cols]"" \ +-. nr t*cols\\n[t*#] \\n[t*cols] +-. el \{\ +-. ie \B\\*[cols] \ +-. nr t*cols\\n[t*#] \\*[cols] +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid number of columns value `\\*[cols]'. +-. \} +-. +-. t*getarg cpd \\*[args] \" cell padding +-. ie "\\*[cpd]"" \ +-. nr t*cpd\\n[t*#] \\n[t*cpd] +-. el \{\ +-. ie \B\\*[cpd] \ +-. nr t*cpd\\n[t*#] \\*[cpd] +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid cell padding value `\\*[cpd]'. +-. \} +-. +-. t*getarg csp \\*[args] \" cell spacing +-. ie "\\*[csp]"" \ +-. nr t*csp\\n[t*#] \\n[t*csp] +-. el \{\ +-. ie \B\\*[csp] \ +-. nr t*csp\\n[t*#] \\*[csp] +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid cell spacing value `\\*[csp]'. +-. \} +-. +-. t*getarg border \\*[args] \" border thickness +-. ie "\\*[border]"=" \ +-. nr t*b\\n[t*#] 0-1 +-. el \{\ +-. ie "\\*[border]"" \ +-. nr t*b\\n[t*#] \\n[t*b] +-. el \{\ +-. ie \B\\*[border] \ +-. nr t*b\\n[t*#] \\*[border] +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid border thickness value `\\*[border]'. +-. \}\} +-. +-. t*getarg bc \\*[args] \" border color +-. ds t*bc\\n[t*#] \\*[t*bc]\" +-. if !"\\*[bc]"" \{\ +-. ie m\\*[bc] \ +-. ds t*bc\\n[t*#] \\*[bc]\" +-. el \{\ +-. ie "\\*[bc]"=" \ +-. ds t*bc\\n[t*#] =\" +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid border color `\\*[bc]'. +-. \}\} +-. ie "\\*[bc]"=" \ +-. ds t*bc\\n[t*#] +-. el \{\ +-. ie "\\*[bc]"" \ +-. ds t*bc\\n[t*#] \\*[t*bc]\" +-. el \ +-. ds t*bc\\n[t*#] \\*[bc]\" +-. \} +-. +-. t*getarg width \\*[args] \" table/col widths +-. if "\\*[width]"=" \ +-. ds width +-. +-. nr b/2\\n[t*#] (\\n[t*b\\n[t*#]] / 2)\" shortcut +-. nr cscp\\n[t*#] (\\n[t*csp\\n[t*#]] + \\n[t*cpd\\n[t*#]])\" aux. register +-. +-. t*getarg height \\*[args] \" table outline height +-. ie "\\*[height]"" \ +-. nr t*height\\n[t*#] 0 +-. el \{\ +-. ie \B\\*[height] \ +-. nr t*height\\n[t*#] (\\*[height] \ +- - ((2 * \\n[cscp\\n[t*#]]) \ +- + (3 * \\n[b/2\\n[t*#]]))) +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid height value `\\*[height]'. +-. \} +-. +-. t*cl \\*[width] \" get cell widths and offsets +-. t*args \\n[t*#] \" look for common arguments +-. +-. t*getarg tal \\*[args] \" table horizontal alignment +-. if "\\*[tal]"" \ +-. ds tal \\*[t*tal]\" +-. ie "\\*[tal]"l" \ +-. nr in\\n[t*#] \\n[.i] +-. el \{\ +-. ie "\\*[tal]"c" \ +-. nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]]/2 + \\n[.i]) +-. el \{\ +-. ie "\\*[tal]"r" \ +-. nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]] + \\n[.i]) +-. el \{\ +-. tmc \\n[.F]:\\n[.c]: Invalid horizontal table alignment `\\*[tal]': +-. tm1 " must be `l', `c' or `r'. +-. \}\}\} +-. +-. nr t*r#\\n[t*#] 0 \" initialize row index +-. mk toptbl\\n[t*#] +-. +-. t*P1 \\*[args] +-.. +-. +-. +-.\" CPTN: optional table caption +-.\" predecessor: TBL +-.\" successor: TR +-.de CPTN +-. ft 1 +-. +-. if "\\$0"CPTN" \ +-. if \\n[t*r#\\n[t*#]] \{\ +-. tmc \\n[.F]:\\n[.c]: Invalid placement of `.CPTN'; +-. tm1 " must be called immediately after `.TBL'. +-. return +-. \} +-. +-. t*getarg val \\$@ +-. ds args\\n[t*#] "\\*[args]\" +-. +-. t*index "\\*[args]" .TR +-. ie \\n[t*index] \{\ +-. ds *a\\n[t*#] "\\*[args]\" +-. substring args\\n[t*#] 0 \\n[t*index] +-. substring *a\\n[t*#] \\n[t*index]-2 -1 +-. \} +-. el \ +-. ds *a\\n[t*#] +-. +-. ie "\\*[val]"b" \{\ +-. de t*cptn\\n[t*#] +-. *CPTN \\*[args\\n[t*#]] +-. rm t*cptn\\n[t*#] +-\\.. +-. \} +-. el \{\ +-. ll (\\n[ll\\n[t*#]]u + \\n[in\\n[t*#]]u) +-. in \\n[in\\n[t*#]]u +-. t*P1 \\*[t*cptn] +-' in +\\n[*]u +-. t*P1 \\*[args\\n[t*#]] +-. t*pv 1 1 +-. in +-. mk toptbl\\n[t*#] +-. \} +-. +-. t*P1 \\*[*a\\n[t*#]] +-.. +-. +-.als *CPTN CPTN +-. +-. +-.\" TR: table row +-.\" predecessor: TBL, CPTN, text, TD or ETB +-.\" successor: TD +-.de TR +-. ft 1 +-. if !\\n[t*#] \{\ +-. tm \\n[.F]:\\n[.c]: Table row (.TR) without preceding table start (.TBL). +-. return +-. \} +-. +-. \" finish previous data cell, if any +-. if \\n[t*r#\\n[t*#]] \ +-. t*dntr 1 \\n[c#\\*[#t#r]] \\n[t*cols\\n[t*#]] \\*[*#trc*] +-. +-. nr t*r#\\n[t*#] +1 \" row number in this table +-. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" table row identifier +-. \" (*) +-. nr c#\\*[#t#r] 0 1 \" clear cell counter +-. nr dntr\\*[#t#r] 0 1 \" clear accumulated row height +-. +-. t*getarg height \\$@ +-. ie "\\*[height]"" \ +-. nr t*height\\*[#t#r] 0 +-. el \{\ +-. ie \B\\*[height] \ +-. nr t*height\\*[#t#r] \\*[height] +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid table row height `\\*[height]'. +-. \} +-. +-. \" If there is a TR with height `height', the total height of the table +-. \" is too high by 3/2 b, independent of the number of TR with `height'. +-. t*args \\*[#t#r] \\n[t*#] \" look for common arguments +-. +-. t*P1 \\*[args] +-.. +-. +-. +-.\" TH: optional table header cell +-.\" predecessor: text, TD or TR +-.\" successor: text, TD, TR, TBL or ETB +-.\" +-.\" cell content bolded and horizontally and vertically centered, +-.\" else like .TD +-.de TH +-. ft 1 +-. t*getarg hal \\$@ +-. if "\\*[hal]"" \ +-. ds hal c\" +-. +-. t*getarg val \\*[args] +-. if "\\*[val]"" \ +-. ds val m\" +-. +-. t*getarg fst \\*[args] +-. if "\\*[fst]"" \ +-. ds fst B\" +-. +-. TD hal=\\*[hal] val=\\*[val] fst=\\*[fst] \\*[args] +-.. +-. +-. +-.\" TD: table data cell +-.\" predecessor: text, TD or TR +-.\" successor: text, TD, TR, TBL or ETB +-.de TD +-. ft 1 +-. \" finish previous data cell -- note the use of \E +-. t*dntr 0 \\n[c#\\*[#t#r]]-1 \En[c#\\*[#t#r]] \\*[*#trc*] +-. +-. ds *#trc* \\*[#t#r]*\\n[c#\\*[#t#r]]\" table cell identifier +-. \" (**) +-. +-. t*getarg rowspan \\$@ +-. nr rowspan 1 +-. if !"\\*[rowspan]"" \{\ +-. ie \B\\*[rowspan] \{\ +-. nr rowspan (\\*[rowspan] >? 1) +-. nr *rsp*\\*[*#trc*] (\\n[rowspan] - 1) +-. \} +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid value of `rowspan' keyword. +-. \} +-. +-. t*getarg colspan \\*[args] +-. nr colspan 1 +-. if !"\\*[colspan]"" \{\ +-. ie \B\\*[colspan] \ +-. nr colspan (\\*[colspan] >? 1) +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid value of `colspan' keyword. +-. \} +-. +-. t*args \\*[#trc] \\*[#t#r] \" look for common arguments +-. +-. nr in\\*[#trc] \\n[in\\n[t*#]*\\n[c#\\*[#t#r]]] +-. nr *cl \\n[cll\\n[t*#]*\\n[c#\\*[#t#r]]] +-. nr * 0 1 +-. nr *r \\n[t*r#\\n[t*#]] +-. +-. if (\\n[rowspan] - 1) \ +-. while (\\n+[*] <= \\n[rowspan]) \{\ +-. nr rspan\\n[t*#]*\\n[*r]*\\n[c#\\*[#t#r]] \\n[colspan] +-. if (\\n[*] > 1) \ +-. nr cspan\\n[t*#]*\\n[*r]*\\n[c#\\*[#t#r]] \\n[colspan] +-. nr *r +1 +-. \} +-. +-. nr * 1 1 +-. nr *c \\n[c#\\*[#t#r]] +-. +-. if (\\n[colspan] - 1) \{\ +-. nr vline\\*[*#trc*] 0-1 \" set `no vl' flag +-. +-. while (\\n+[*] <= \\n[colspan]) \{\ +-. nr *c +1 +-. nr *cl +(2 * \\n[cscp\\n[t*#]] \ +- + \\n[b/2\\n[t*#]] \ +- + \\n[cll\\n[t*#]*\\n[*c]]) +-. nr c#\\*[#t#r] +1 +-. \} +-. \} +-. +-. if (\\n[c#\\n[t*#]*\\n[t*r#\\n[t*#]]] > \\n[t*cols\\n[t*#]]) \{\ +-. ds * are\" +-. ds ** columns\" +-. if (\\n[c#\\*[#t#r]] == 1) \{\ +-. ds * is\" +-. ds ** column\" +-. \} +-. tmc \\n[.F]:\\n[.c]: There \\*[*] \\n[c#\\*[#t#r]] table \\*[**] (.TD) +-. +-. ds * are\" +-. if (\\n[t*cols\\n[t*#]] == 1) \ +-. ds * is\" +-. tm1 " but only \\n[t*cols\\n[t*#]] \\*[*] expected. +-. +-. ds * +-. length * \\n[.F]:\\n[.c]: +-. +-. while \\n-[*] \ +-. ds * " \\*[*]\" +-. +-. tm1 "\\*[*] Remaining .TDs and its contents are ignored. +-. +-. di *t*dummy* \" bypass superfluous input +-. return +-. \} +-. +-. di t*\\*[#trc] \" open cell diversion and set locals +-. in 0 +-. nr cll\\*[#trc] \\n[*cl] +-. ll \\n[*cl]u +-. nr *cl\\n[t*#] \\n[.l] +-. gcolor \\*[t*fgc\\*[#trc]] +-. ad \\*[t*hal\\*[#trc]] +-. fam \\*[t*ff\\*[#trc]] +-. ft \\*[t*fst\\*[#trc]] +-. t*pv \\*[t*fsz\\*[#trc]] +-. +-. t*P1 \\*[args] +-.. +-. +-. +-.\" ETB: end of table +-.\" predecessor: text, TD or ETB +-.\" successor: text, TD, TR or TBL +-.de ETB +-. ie \\n[t*#] \ +-. if !\\n[t*r#\\n[t*#]] \{\ +-. tmc \\n[.F]:\\n[.c]: Each table (.TBL) +-. tm1 " should contain at least one table row (.TR)! +-. \} +-. el \{\ +-. tmc \\n[.F]:\\n[.c]: Table end (.ETB) +-. tm1 " without corresponding table start (.TBL)! +-. \} +-. +-. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh table row identifier +-. t*dntr 2 \\n[c#\\*[#t#r]] \\n[t*cols\\n[t*#]] \\*[*#trc*] +-. +-. t*divs \" print this table +-. +-. sp \\n[b/2\\n[t*#]]u +-. t*cptn\\n[t*#] +-. nr t*# -1 +-. +-. ll \\n[*cl\\n[t*#]]u \" restore ll outside this table +-. in 0 \" reset indent +-. gcolor \\*[t*m\\n[t*#]] \" reset previous fgc +-. +-. t*getarg hold \\$@ +-. if !\\n[t*#] \{\ +-. sp .5 +-. di +-. in \\n[t*i]u +-. ie "\\*[hold]"" \{\ +-. ie (\\n[.t] - \\n[dn]) \ +-. t*DI t*tbl0 +-. el \{\ +-. rn t*tbl0 t*tbl\\n+[t*numb] +-. ds t*kept \\*[t*kept] t*tbl\\n[t*numb] \\n[dn]\" +-. \} +-. \} +-. el \{\ +-. rn t*tbl0 t*hold\\n+[t*numb] +-. tm \\n[.F]:\\n[.c]: Table t*hold\\n[t*numb] held. +-. ds t*held \\*[t*held] t*hold\\n[t*numb] \\n[dn]\" +-. \} +-. +-. ev \" restore previous environment +-. \} +-. +-. t*P1 \\*[args] +-.. +-. +-. +-.\" ***************************************************************** +-.\" * Following the definition of five utility macros * +-.\" * special to hdtbl. * +-.\" * Other utility macros common to hdtbl and hdgroff * +-.\" * are defined in the file hdmisc.tmac. * +-.\" ***************************************************************** +-. +-. +-.\" .t*free [n] +-.\" print the next [n] held table[s]. +-.\" Don't call it within a table! +-.\" If the table is higher than the remaining space +-.\" on the page, the table is printed on the next page. +-.de t*free +-. if "\\$0"CPTN" \ +-. if \\n[t*r#\\n[t*#]] \{\ +-. tmc \\n[.F]:\\n[.c]: Invalid placement of `.t*free' within a table; +-. tm1 " it must be called outside of any table. +-. return +-. \} +-. +-. if "\\*[t*held]"" \{\ +-. tm \\n[.F]:\\n[.c]: No held tables. +-. return +-. \} +-. +-. nr ** (\\$1 >? 1) 1 +-. while !""\\*[t*held]" \{\ +-. pops * t*held +-. popr * t*held +-. +-. ie (\\n[.t] - \\n[*]) \{\ +-. ev t*tbl +-. t*DI \\*[*] +-. ev +-. \} +-. el \{\ +-. rn \\*[*] t*tbl\\n+[t*numb] +-. ds t*kept \\*[t*kept] t*tbl\\n[t*numb] \\n[*]\" +-. \} +-. +-. if !(\\n-[**] - 1) \ +-. return +-. \} +-.. +-. +-. +-.\" The main utility macro for tables: +-.\" If a table is closed by ETB, this macro is called. It +-.\" processes one complete table, i.e., all the table cell +-.\" diversions, paints the cell backgrounds, draws +-.\" horizontal and vertical table lines and the table border. +-.\" +-.\" Nested tables are processed from inside to outside. +-. +-.de t*divs +-. ll (\\n[t*l]u + 1c) \" avoid warning `can't break line' +-. nf +-. +-. nr b/2 \\n[b/2\\n[t*#]] \" some abbreviations +-. nr cscp \\n[cscp\\n[t*#]] +-. nr cscpb (\\n[b/2] + \\n[cscp]) +-. +-. nr topdiv (\\n[.d] + \\n[b/2] - \\n[cscp])\" top of cell diversion +-. nr cscpb2 (\\n[b/2] / 2 + \\n[cscp]) +-. +-. nr #r 0 1 +-. \" outer loop for rows +-. while (\\n+[#r] <= \\n[t*r#\\n[t*#]]) \{\ +-. \" TODO: insert code here for multipage tables +-. nr * (\\n[#r] - 1) +-. nr topdiv +(\\n[dntr\\n[t*#]*\\n[*]] + \\n[cscp] + \\n[cscpb]) +-. +-. \" if table still smaller than specified table height, increase it +-. if ((\\n[#r] == \\n[t*r#\\n[t*#]]) & \\n[t*height\\n[t*#]]) \ +-. nr dntr\\n[t*#]*\\n[#r] (\\n[cscpb] \ +- + \\n[toptbl\\n[t*#]] \ +- + \\n[t*height\\n[t*#]] \ +- - (\\n[topdiv] >? \\n[dntr\\n[t*#]*\\n[#r]])) +-. +-. nr #c 0 1 +-. \" inner loop for cells +-. while (\\n+[#c] <= \\n[t*cols\\n[t*#]]) \{\ +-. ds #trc \\n[t*#]*\\n[#r]*\\n[#c]\" +-. \" continue if the diversion is empty +-. if !d t*\\*[#trc] \ +-. continue +-. +-. sp |\\n[topdiv]u +-. in (\\n[in\\n[t*#]]u + \\n[in\\*[#trc]]u)\" cell offset +-. nr $1 \\n[dntr\\n[t*#]*\\n[#r]] \" cell height +-. +-. \" if we have spanned rows, calculate resulting row height +-. \" and position of lower horizontal line +-. if \\n[*rsp*\\*[#trc]] \{\ +-. nr * \\n[#r] 1 +-. nr rspan\\*[#trc] 0-1 \" set `no hl' flag +-. nr corr (\\n[dn\\*[#trc]] - \\n[dntr\\n[t*#]*\\n[#r]]) +-. +-. \" clear row span flags in following rows and update row height +-. while \\n[*rsp*\\*[#trc]] \{\ +-. nr *rsp*\\*[#trc] -1 +-. nr rspan\\n[t*#]*\\n+[*]*\\n[#c] 0 +-. nr ** (\\n[dntr\\n[t*#]*\\n[*]] + \\n[cscp] + \\n[cscpb]) +-. nr corr -\\n[**] +-. nr $1 +\\n[**] +-. \} +-. +-. if (\\n-[*] == \\n[t*r#\\n[t*#]]) \ +-. nr $1 ((\\n[t*height\\n[t*#]] \ +- - \\n[.d] \ +- + \\n[toptbl\\n[t*#]] \ +- + \\n[cscpb]) \ +- >? \\n[$1]) +-. nr dntr\\n[t*#]*\\n[*] +(\\n[corr] >? 0) +-. \} +-. +-. \" paint cell background +-. nr * (2 * \\n[t*cpd\\n[t*#]] + \\n[cll\\*[#trc]])\" background width +-. nr $1 (\\n[$1] >? \\n[dn\\*[#trc]])\" cell height +-. +-. if !"\\*[t*bgc\\*[#trc]]"=" \{\ +-. nop \h'\\n[t*csp\\n[t*#]]u'\ +-\M[\\*[t*bgc\\*[#trc]]]\ +-\v'(-.67v - \\n[t*cpd\\n[t*#]]u)'\ +-\D'P \\n[*]u 0 \ +- 0 (2u * \\n[t*cpd\\n[t*#]]u + \\n[$1]u) \ +- -\\n[*]u 0'\ +-\M[] +-. sp -1 +-. \} +-. +-. \" *** horizontal and vertical single or double lines *** +-. \" double and single lines have the same thickness; +-. \" the double lines' distance is the line thickness. +-. \" +-. \" `border=x': horizontal/vertical lines x/2 thick, minimum .1n +-. \" `border=0': no border; horizontal/vertical lines .1n thick +-. \" `border=': neither border nor horizontal/vertical lines +-. +-. nr *t (.1n >? \\n[b/2]) \" thickness of hl/vl; min. .1n +-. in +\\n[cscp]u +-. +-. \" check for vertical and horizontal lines +-. if (1 + \\n[t*b\\n[t*#]]) \{\ +-. if !"\\*[t*bc\\n[t*#]]"=" \{\ +-. \" draw horizontal line between this cell and the one below +-. if (\\n[t*r#\\n[t*#]] - \\n[#r] + \\n[rspan\\*[#trc]]) \{\ +-. if !"\\*[t*hl\\*[#trc]]"=" \{\ +-. sp \\n[$1]u +-. nr * (\\n[cscp] + \\n[cscpb] + \\n[cll\\*[#trc]]) +-. nop \X'\*[g] 1 setlinecap'\ +-\h'(-\\n[cscpb2]u - \\n[*t]u)'\ +-\v'(\\n[cscpb2]u - .67v)'\ +-\m[\\*[t*bc\\n[t*#]]]\ +-\D't \\n[*t]u'\c +-. +-. ie "\\*[t*hl\\*[#trc]]"d" \ +-. nop \v'-\\n[*t]u'\ +-\D'l \\n[*]u 0'\ +-\v'(2u * \\n[*t]u)'\ +-\D'l -\\n[*]u 0'\ +-\D't 0' +-. el \ +-. nop \D'l \\n[*]u 0'\ +-\D't 0' +-. +-. sp (-\\n[$1]u - 1v) +-. \}\} +-. +-. nr rspan\\*[#trc] 0 +-. +-. \" draw vertical line between this cell and the one to the right +-. if (\\n[t*cols\\n[t*#]] - \\n[#c] + \\n[vline\\*[#trc]]) \{\ +-. if !"\\*[t*vl\\*[#trc]]"=" \{\ +-. nop \X'\*[g] 1 setlinecap'\ +-\v'(-\\n[cscpb2]u - .67v)'\ +-\m[\\*[t*bc\\n[t*#]]]\ +-\h'(\\n[cscpb2]u - \\n[*t]u + \\n[cll\\*[#trc]]u)'\c +-. +-. ie "\\*[t*vl\\*[#trc]]"d" \ +-. nop \h'-\\n[*t]u'\ +-\D't \\n[*t]u'\ +-\D'l 0 (2u * \\n[cscp]u + \\n[$1]u + (\\n[*t]u / 2u))'\ +-\h'(2u * \\n[*t]u)'\ +-\D'l 0 -(2u * \\n[cscp]u + \\n[$1]u + (\\n[*t]u / 2u))'\ +-\D't 0' +-. el \ +-. nop \D't \\n[*t]u'\ +-\D'l 0 (2u * \\n[cscp]u + \\n[$1]u + (\\n[*t]u / 2u))'\ +-\D't 0' +-. sp -1 +-. \}\}\}\} +-. +-. nr vline\\*[#trc] 0 +-. +-. \" vert. cell content alignment +-. nr ** 0 +-. +-. ie "\\*[t*val\\*[#trc]]"m" \ +-. nr ** ((\\n[$1] - \\n[dn\\*[#trc]]) / 2)\" val=m +-. el \ +-. if "\\*[t*val\\*[#trc]]"b" \ +-. nr ** (\\n[$1] - \\n[dn\\*[#trc]])\" val=b +-. +-. sp \\n[**]u \" vertical content position +-. +-. \" finally output the diversion +-. t*\\*[#trc] +-. rm t*\\*[#trc] +-. \} +-. \} +-. +-. \" draw the box border +-. in \\n[in\\n[t*#]]u +-. nr ** (\\n[topdiv] + \\n[dntr\\n[t*#]*\\n-[#r]]) +-. +-. if \\n[t*b\\n[t*#]] \{\ +-. sp |(\\n[toptbl\\n[t*#]]u + \\n[b/2]u) +-. nr $1 (\\n[toptbl\\n[t*#]] - \\n[**] - \\n[cscp]) +-. nr * (\\n[ll\\n[t*#]] - \\n[t*b\\n[t*#]]) +-. +-. if !"\\*[t*bc\\n[t*#]]"=" \ +-. nop \X'\*[g] 0 setlinejoin 2 setlinecap'\ +-\v'-.67v'\ +-\h'-\\n[b/2]u'\ +-\m[\\*[t*bc\\n[t*#]]]\ +-\D't \\n[t*b\\n[t*#]]u'\ +-\D'l \\n[*]u 0'\ +-\D'l 0 -\\n[$1]u'\ +-\D'l -\\n[*]u 0'\ +-\D'l 0 \\n[$1]u'\ +-\D't 0' +-. \} +-. +-. sp |(\\n[**]u + \\n[cscpb]u) +-. fi +-.. +-. +-. +-.\" Utility macro: .t*cl [width1 [width2 [...]]] +-.\" +-.\" Calculate cell widths, table width, and cell offsets. +-.de t*cl +-. nr t*cols\\n[t*#] (\\n[.$] >? \\n[t*cols\\n[t*#]]) +-. nr ll\\n[t*#] 0 \" accumulated cell widths +-. nr ** (\\n[.l] / \\n[t*cols\\n[t*#]])\" width for remaining cells +-. nr * 0 1 \" counter +-. +-. \" while-loop: Parse user arguments to get each cell's width. +-. while (\\n[t*cols\\n[t*#]] >= \\n+[*]) \{\ +-. nr $\\n[*] \\n[**] +-. if !"\\$[\\n[*]]"" \{\ +-. \" check for `%' pseudo scaling indicator +-. ds * \\$\\n[*]\" +-. substring * -1 -1 +-. ie "\\*[*]"%" \{\ +-. ds ** \\$[\\n[*]]\" +-. substring ** 0 -2 +-. ie \B\\*[**] \ +-. nr $\\n[*] (\\*[**] * \\n[.l] / 100) +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid relative cell width `\\*[**]%'. +-. \} +-. el \{\ +-. ie \B\\$[\\n[*]] \ +-. nr $\\n[*] \\$[\\n[*]] +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid cell width `\\$[\\n[*]]'. +-. \}\} +-. +-. nr ll\\n[t*#] +\\n[$\\n[*]] +-. nr ** \\n[$\\n[*]] +-. \} +-. +-. if (\\n[ll\\n[t*#]] > \\n[.l]) \ +-. tm \\n[.F]:\\n[.c]: Table width larger than column width. +-. +-. nr ** (0 >? \\n[t*b\\n[t*#]]) +-. nr * 0 1 +-. +-. \" second while loop: Compute final cell widths. +-. while (\\n[t*cols\\n[t*#]] >= \\n+[*]) \{\ +-. \" Remove border width, if any. +-. if \\n[t*b\\n[t*#]] \{\ +-. \" cell_width := cell_width * (length - 1.5*border) / length +-. nr #* (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2)) +-. nr *** (\\n[ll\\n[t*#]] / 2) +-. \" avoid multiplication overflow +-. mult31by31 $\\n[*] #* **** +-. add31to62 *** **** **** +-. div62by31 **** ll\\n[t*#] $\\n[*] +-. \} +-. +-. \" Get cell widths without padding, spacing, and separator line. +-. nr cll\\n[t*#]*\\n[*] (\\n[$\\n[*]] \ +- - (2 * \\n[cscp\\n[t*#]]) \ +- - \\n[b/2\\n[t*#]]) +-. +-. \" Check whether value is non-positive. +-. if !\\n[cll\\n[t*#]*\\n[*]] \{\ +-. nr #* (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2)) +-. nr *** (\\n[#*] / 2) +-. nr *h (2 * \\n[cscp\\n[t*#]] + \\n[b/2\\n[t*#]]) +-. mult31by31 *h ll\\n[t*#] **** +-. add31to62 *** **** **** +-. div62by31 **** #* *h +-. ds * \\n[*]th\" +-. nr *** (\\n[*] % 10) +-. if d nth-\\n[***] \ +-. ds * \\n[*]\\*[nth-\\n[***]]\" +-. tmc \\n[.F]:\\n[.c]: The \\*[*] width value (\\$\\n[*]) is too small. +-. tm1 " It should be greater than \\n[*h]. +-. \} +-. +-. nr in\\n[t*#]*\\n[*] \\n[**] \" cell offset +-. nr ** +\\n[$\\n[*]] +-. \} +-.. +-. +-. +-.\" Utility macro: .t*dntr ? +-.\" +-.\" Close TD diversion, make some calculations, and set +-.\" some help strings and registers. is 0, 1, +-.\" or 2 if the call of .t*dntr occurs in .TD, .TR, or +-.\" .ETB, respectively. +-.de t*dntr +-. nr dn 0 \" reset diversion height +-. br \" finish cell data +-. +-. if "\\n[.z]"*t*dummy*" \ +-. return +-. +-. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh table row identifier +-. +-. if \\n[c#\\*[#t#r]] \{\ +-. di \" close diversion +-. nr dn\\$4 \\n[dn] \" save height of this cell +-. if !\\n[rspan\\*[#trc]] \{\ +-. \" update row height if not in a row span +-. nr dntr\\*[#t#r] (\\n[dntr\\*[#t#r]] >? \\n[dn]) +-. if \\$2 \ +-. nr dntr\\*[#t#r] ((\\n[t*height\\*[#t#r]] \ +- - (2 * \\n[cscp\\n[t*#]] + \\n[b/2\\n[t*#]])) \ +- >? \\n[dntr\\*[#t#r]]) +-. \}\} +-. +-. nr c#\\*[#t#r] +1 +-. nr * \\$2 +-. +-. \" update column span registers +-. while (\\n+[*] <= \\$3) \{\ +-. if r cspan\\*[#t#r]*\\n[*] \ +-. nr c#\\*[#t#r] +\\n[cspan\\*[#t#r]*\\n[*]] +-. nr cspan\\*[#t#r]*\\n[*] 0 +-. \} +-. +-. ds #trc \\*[#t#r]*\\n[c#\\*[#t#r]]\" +-. +-. \" only check for cell underflow if called by .TR or .ETB +-. if (\\$1 & (\\n[c#\\*[#t#r]] <= \\n[t*cols\\n[t*#]])) \{\ +-. ds * are\" +-. ds ** columns\" +-. if (\\n-[c#\\*[#t#r]] == 1) \{\ +-. ds * is\" +-. ds ** column\" +-. \} +-. tmc \\n[.F]:\\n[.c]: There \\*[*] only \\n[c#\\*[#t#r]] \\*[**] +-. +-. nr * \\n[t*r#\\n[t*#]] +-. ds * \\n[*]th\" +-. nr *** (\\n[*] % 10) +-. if d nth-\\n[***] \ +-. ds * \\n[*]\\*[nth-\\n[***]]\" +-. tmc " in the \\*[*] row +-. +-. ds * are\" +-. if (\\n[t*cols\\n[t*#]] == 1) \ +-. ds * is\" +-. tm1 " but \\n[t*cols\\n[t*#]] \\*[*] expected. +-. \} +-.. +-. +-. +-.\" Utility-macro: .t*args level_1 [level_2] +-.\" +-.\" Get the arguments common to TBL, TR, and TD for the level +-.\" in argument 1, using default values from the level in +-.\" argument 2. If argument 2 is missing, use the global +-.\" default values. +-.\" +-.de t*args +-. ds t*bgc\\$1 \\*[t*bgc\\$2]\" +-. ds t*fgc\\$1 \\*[t*fgc\\$2]\" +-. ds t*hl\\$1 \\*[t*hl\\$2]\" +-. ds t*vl\\$1 \\*[t*vl\\$2]\" +-. ds t*hal\\$1 \\*[t*hal\\$2]\" +-. ds t*val\\$1 \\*[t*val\\$2]\" +-. ds t*ff\\$1 \\*[t*ff\\$2]\" +-. ds t*fst\\$1 \\*[t*fst\\$2]\" +-. ds t*fsz\\$1 \\*[t*fsz\\$2]\" +-. +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg bgc \\*[args] \" background color +-. if !"\\*[bgc]"" \{\ +-. ie m\\*[bgc] \ +-. ds t*bgc\\$1 \\*[bgc]\" +-. el \{\ +-. ie "\\*[bgc]"=" \ +-. ds t*bgc\\$1 =\" +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid background color `\\*[bgc]'. +-. \}\} +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg fgc \\*[args] \" foreground color +-. if !"\\*[fgc]"" \{\ +-. ie m\\*[fgc] \ +-. ds t*fgc\\$1 \\*[fgc]\" +-. el \{\ +-. ie "\\*[fgc]"=" \ +-. ds t*fgc\\$1 =\" +-. el \ +-. tm \\n[.F]:\\n[.c]: Invalid foreground color `\\*[fgc]'. +-. \}\} +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg hl \\*[args] \" horizontal line between cells +-. if !"\\*[hl]"" \ +-. ds t*hl\\$1 \\*[hl]\" +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg vl \\*[args] \" vertical line between cells +-. if !"\\*[vl]"" \ +-. ds t*vl\\$1 \\*[vl]\" +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg hal \\*[args] \" horizontal table cell alignment +-. if !"\\*[hal]"" \{\ +-. t*index bcrl \\*[hal] +-. ie \\n[t*index] \ +-. ds t*hal\\$1 \\*[hal]\" +-. el \{\ +-. tmc \\n[.F]:\\n[.c]: Invalid horizontal alignment `\\*[hal]': +-. tm1 " must be `b', `c', `l' or `r'. +-. \}\} +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg val \\*[args] \" vertical table cell alignment +-. if !"\\*[val]"" \{\ +-. t*index tmb \\*[val] +-. ie \\n[t*index] \ +-. ds t*val\\$1 \\*[val]\" +-. el \{\ +-. tmc \\n[.F]:\\n[.c]: Invalid vertical alignment `\\*[val]': +-. tm1 " must be `t', `m' or `b'. +-. \}\} +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg ff \\*[args] \" font family +-. if !"\\*[ff]"" \ +-. ds t*ff\\$1 \\*[ff]\" +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg fst \\*[args] \" font style +-. if !"\\*[fst]"" \ +-. ds t*fst\\$1 \\*[fst]\" +-. if "\\*[args]"" \ +-. return +-. +-. t*getarg fsz \\*[args] \" font size and spacing factor +-. if !"\\*[fsz]"" \ +-. ds t*fsz\\$1 \\*[fsz]\" +-.. +-. +-. +-.\" Append to your page header macro ('pg@top' for MS) +-.\" to enable tables to span pages. +-.de t*hm +-. ev t*tbl +-. nr ** \\n[.t] +-. while !""\\*[t*kept]" \{\ +-. pops * t*kept +-. popr * t*kept +-. if (\\n[*] - \\n[**]) \{\ +-. tm \\n[.F]:\\n[.c]: Table \\*[*] higher than page -- ignored! +-. break +-. \} +-. +-. if (\\n[*] - \\n[.t]) \{\ +-. ds t*kept \\n[*] \\*[t*kept]\" +-. ds t*kept \\*[*] \\*[t*kept]\" +-. tmc \\n[.F]:\\n[.c]: Remaining table(s), +-. tm1 " because not all fit onto this page. +-. break +-. \} +-. +-. t*DI \\*[*] +-. \} +-. ev +-.. +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/contrib/hdtbl/hdtbl.tmac-u groff-1.22.3/contrib/hdtbl/hdtbl.tmac-u +--- groff-1.22.3.old/contrib/hdtbl/hdtbl.tmac-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/hdtbl/hdtbl.tmac-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,1003 @@ ++.\" -*- nroff -*- ++.ig ++ ++hdtbl.tmac ++ ++This file is part of groff, the GNU roff type-setting system. ++ ++Copyright (C) 2005-2014 Free Software Foundation, Inc. ++written by Joachim Walsdorff . ++ ++groff 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. ++ ++groff 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 . ++ ++.. ++. ++. ++.\" ***************************************************************** ++.\" * hdtbl - Heidelberger table macros * ++.\" * Vers. 0.91 December 2005 * ++.\" ***************************************************************** ++. ++.if d TBL \ ++. nx ++. ++.mso hdmisc.tmac ++.mso 62bit.tmac ++. ++. ++.\" ***************************************************************** ++.\" * default values for some arguments * ++.\" ***************************************************************** ++. ++.ds t*hl s\" ++.ds t*vl s\" ++.ds t*tal l\" ++.ds t*hal b\" ++.ds t*val t\" ++.ds t*ff \\n[.fam]\" ++.ds t*fst \\n[.f]\" ++.ds t*fsz 1 1\" ++.ds t*fgc red4\" ++.ds t*bgc bisque\" ++.ds t*bc red4\" ++.nr t*cpd .5n ++.nr t*csp .5n ++.nr t*b .1n ++.nr t*cols 1 ++.nr t*v \n[.v] ++.nr t*s \n[.ps] ++.nr t*hy \n[.hy] ++.nr t*l \n[.ll] ++. ++. ++.\" defaults for table captions ++.nr t*cptn 0 1 ++.ds t*cptn "".sp .4" \ ++ ".t*pv 1.0 1.0" \ ++ ".ad l" \ ++ "\m[\\*[t*fgc]]Table \\n+[t*cptn]:\0\c\k*"\" ++. ++. ++.\" %beginstrip% ++. ++.\" for better error messages ++.ds nth-1 st\" ++.ds nth-2 nd\" ++.ds nth-3 rd\" ++. ++.\" initialization of various registers ++.nr t*# 0 \" table nesting level ++.nr t*numb 0 1 \" held table diversion # ++. ++.ds *#trc* ++. ++. ++.\" ***************************************************************** ++.\" * The four base macros and the two optional macros * ++.\" ***************************************************************** ++. ++.ie n \ ++. ds g tty:\" ++.el \ ++. ds g ps: exec\" ++. ++.\" TBL: table start ++.\" predecessor: text, TD or ETB ++.\" successor: CPTN or TR ++.de TBL ++. ds t*m\\n[t*#] \\n[.m]\" ++. ie \\n[t*#] \ ++. br ++. el \{\ ++. ds * \\n[.ev]\" ++. ev t*tbl ++. evc \\*[*] ++. di t*tbl0 ++. sp .4 \" XXX: hard-coded value ++. nr t*i \\n[.i] ++. ll -\\n[.i]u ++. in 0 ++. \} ++. nr t*# +1 ++. ++. \" Save current location for error checking at end ++. ds t*FN \\[.F] ++. ds t*LN \\[.c] ++. ++. t*getarg cols \\$@\" from here string `args' contains the rest of \\$@ ++. ie "\\*[cols]"" \ ++. nr t*cols\\n[t*#] \\n[t*cols] ++. el \{\ ++. ie \B\\*[cols] \ ++. nr t*cols\\n[t*#] \\*[cols] ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid number of columns value `\\*[cols]'. ++. \} ++. ++. t*getarg cpd \\*[args] \" cell padding ++. ie "\\*[cpd]"" \ ++. nr t*cpd\\n[t*#] \\n[t*cpd] ++. el \{\ ++. ie \B\\*[cpd] \ ++. nr t*cpd\\n[t*#] \\*[cpd] ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid cell padding value `\\*[cpd]'. ++. \} ++. ++. t*getarg csp \\*[args] \" cell spacing ++. ie "\\*[csp]"" \ ++. nr t*csp\\n[t*#] \\n[t*csp] ++. el \{\ ++. ie \B\\*[csp] \ ++. nr t*csp\\n[t*#] \\*[csp] ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid cell spacing value `\\*[csp]'. ++. \} ++. ++. t*getarg border \\*[args] \" border thickness ++. ie "\\*[border]"=" \ ++. nr t*b\\n[t*#] 0-1 ++. el \{\ ++. ie "\\*[border]"" \ ++. nr t*b\\n[t*#] \\n[t*b] ++. el \{\ ++. ie \B\\*[border] \ ++. nr t*b\\n[t*#] \\*[border] ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid border thickness value `\\*[border]'. ++. \}\} ++. ++. t*getarg bc \\*[args] \" border color ++. ds t*bc\\n[t*#] \\*[t*bc]\" ++. if !"\\*[bc]"" \{\ ++. ie m\\*[bc] \ ++. ds t*bc\\n[t*#] \\*[bc]\" ++. el \{\ ++. ie "\\*[bc]"=" \ ++. ds t*bc\\n[t*#] =\" ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid border color `\\*[bc]'. ++. \}\} ++. ie "\\*[bc]"=" \ ++. ds t*bc\\n[t*#] ++. el \{\ ++. ie "\\*[bc]"" \ ++. ds t*bc\\n[t*#] \\*[t*bc]\" ++. el \ ++. ds t*bc\\n[t*#] \\*[bc]\" ++. \} ++. ++. t*getarg width \\*[args] \" table/col widths ++. if "\\*[width]"=" \ ++. ds width ++. ++. nr b/2\\n[t*#] (\\n[t*b\\n[t*#]] / 2)\" shortcut ++. nr cscp\\n[t*#] (\\n[t*csp\\n[t*#]] + \\n[t*cpd\\n[t*#]])\" aux. register ++. ++. t*getarg height \\*[args] \" table outline height ++. ie "\\*[height]"" \ ++. nr t*height\\n[t*#] 0 ++. el \{\ ++. ie \B\\*[height] \ ++. nr t*height\\n[t*#] (\\*[height] \ ++ - ((2 * \\n[cscp\\n[t*#]]) \ ++ + (3 * \\n[b/2\\n[t*#]]))) ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid height value `\\*[height]'. ++. \} ++. ++. t*cl \\*[width] \" get cell widths and offsets ++. t*args \\n[t*#] \" look for common arguments ++. ++. t*getarg tal \\*[args] \" table horizontal alignment ++. if "\\*[tal]"" \ ++. ds tal \\*[t*tal]\" ++. ie "\\*[tal]"l" \ ++. nr in\\n[t*#] \\n[.i] ++. el \{\ ++. ie "\\*[tal]"c" \ ++. nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]]/2 + \\n[.i]) ++. el \{\ ++. ie "\\*[tal]"r" \ ++. nr in\\n[t*#] (\\n[.l] - \\n[ll\\n[t*#]] + \\n[.i]) ++. el \{\ ++. tmc \\n[.F]:\\n[.c]: Invalid horizontal table alignment `\\*[tal]': ++. tm1 " must be `l', `c' or `r'. ++. \}\}\} ++. ++. nr t*r#\\n[t*#] 0 \" initialize row index ++. mk toptbl\\n[t*#] ++. ++. t*P1 \\*[args] ++.. ++. ++. ++.\" CPTN: optional table caption ++.\" predecessor: TBL ++.\" successor: TR ++.de CPTN ++. ft 1 ++. ++. if "\\$0"CPTN" \ ++. if \\n[t*r#\\n[t*#]] \{\ ++. tmc \\n[.F]:\\n[.c]: Invalid placement of `.CPTN'; ++. tm1 " must be called immediately after `.TBL'. ++. return ++. \} ++. ++. t*getarg val \\$@ ++. ds args\\n[t*#] "\\*[args]\" ++. ++. t*index "\\*[args]" .TR ++. ie \\n[t*index] \{\ ++. ds *a\\n[t*#] "\\*[args]\" ++. substring args\\n[t*#] 0 \\n[t*index] ++. substring *a\\n[t*#] \\n[t*index]-2 -1 ++. \} ++. el \ ++. ds *a\\n[t*#] ++. ++. ie "\\*[val]"b" \{\ ++. de t*cptn\\n[t*#] ++. *CPTN \\*[args\\n[t*#]] ++. rm t*cptn\\n[t*#] ++\\.. ++. \} ++. el \{\ ++. ll (\\n[ll\\n[t*#]]u + \\n[in\\n[t*#]]u) ++. in \\n[in\\n[t*#]]u ++. t*P1 \\*[t*cptn] ++' in +\\n[*]u ++. t*P1 \\*[args\\n[t*#]] ++. t*pv 1 1 ++. in ++. mk toptbl\\n[t*#] ++. \} ++. ++. t*P1 \\*[*a\\n[t*#]] ++.. ++. ++.als *CPTN CPTN ++. ++. ++.\" TR: table row ++.\" predecessor: TBL, CPTN, text, TD or ETB ++.\" successor: TD ++.de TR ++. ft 1 ++. if !\\n[t*#] \{\ ++. tm \\n[.F]:\\n[.c]: Table row (.TR) without preceding table start (.TBL). ++. return ++. \} ++. ++. \" finish previous data cell, if any ++. if \\n[t*r#\\n[t*#]] \ ++. t*dntr 1 \\n[c#\\*[#t#r]] \\n[t*cols\\n[t*#]] \\*[*#trc*] ++. ++. nr t*r#\\n[t*#] +1 \" row number in this table ++. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" table row identifier ++. \" (*) ++. nr c#\\*[#t#r] 0 1 \" clear cell counter ++. nr dntr\\*[#t#r] 0 1 \" clear accumulated row height ++. ++. t*getarg height \\$@ ++. ie "\\*[height]"" \ ++. nr t*height\\*[#t#r] 0 ++. el \{\ ++. ie \B\\*[height] \ ++. nr t*height\\*[#t#r] \\*[height] ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid table row height `\\*[height]'. ++. \} ++. ++. \" If there is a TR with height `height', the total height of the table ++. \" is too high by 3/2 b, independent of the number of TR with `height'. ++. t*args \\*[#t#r] \\n[t*#] \" look for common arguments ++. ++. t*P1 \\*[args] ++.. ++. ++. ++.\" TH: optional table header cell ++.\" predecessor: text, TD or TR ++.\" successor: text, TD, TR, TBL or ETB ++.\" ++.\" cell content bolded and horizontally and vertically centered, ++.\" else like .TD ++.de TH ++. ft 1 ++. t*getarg hal \\$@ ++. if "\\*[hal]"" \ ++. ds hal c\" ++. ++. t*getarg val \\*[args] ++. if "\\*[val]"" \ ++. ds val m\" ++. ++. t*getarg fst \\*[args] ++. if "\\*[fst]"" \ ++. ds fst B\" ++. ++. TD hal=\\*[hal] val=\\*[val] fst=\\*[fst] \\*[args] ++.. ++. ++. ++.\" TD: table data cell ++.\" predecessor: text, TD or TR ++.\" successor: text, TD, TR, TBL or ETB ++.de TD ++. ft 1 ++. \" finish previous data cell -- note the use of \E ++. t*dntr 0 \\n[c#\\*[#t#r]]-1 \En[c#\\*[#t#r]] \\*[*#trc*] ++. ++. ds *#trc* \\*[#t#r]*\\n[c#\\*[#t#r]]\" table cell identifier ++. \" (**) ++. ++. t*getarg rowspan \\$@ ++. nr rowspan 1 ++. if !"\\*[rowspan]"" \{\ ++. ie \B\\*[rowspan] \{\ ++. nr rowspan (\\*[rowspan] >? 1) ++. nr *rsp*\\*[*#trc*] (\\n[rowspan] - 1) ++. \} ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid value of `rowspan' keyword. ++. \} ++. ++. t*getarg colspan \\*[args] ++. nr colspan 1 ++. if !"\\*[colspan]"" \{\ ++. ie \B\\*[colspan] \ ++. nr colspan (\\*[colspan] >? 1) ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid value of `colspan' keyword. ++. \} ++. ++. t*args \\*[#trc] \\*[#t#r] \" look for common arguments ++. ++. nr in\\*[#trc] \\n[in\\n[t*#]*\\n[c#\\*[#t#r]]] ++. nr *cl \\n[cll\\n[t*#]*\\n[c#\\*[#t#r]]] ++. nr * 0 1 ++. nr *r \\n[t*r#\\n[t*#]] ++. ++. if (\\n[rowspan] - 1) \ ++. while (\\n+[*] <= \\n[rowspan]) \{\ ++. nr rspan\\n[t*#]*\\n[*r]*\\n[c#\\*[#t#r]] \\n[colspan] ++. if (\\n[*] > 1) \ ++. nr cspan\\n[t*#]*\\n[*r]*\\n[c#\\*[#t#r]] \\n[colspan] ++. nr *r +1 ++. \} ++. ++. nr * 1 1 ++. nr *c \\n[c#\\*[#t#r]] ++. ++. if (\\n[colspan] - 1) \{\ ++. nr vline\\*[*#trc*] 0-1 \" set `no vl' flag ++. ++. while (\\n+[*] <= \\n[colspan]) \{\ ++. nr *c +1 ++. nr *cl +(2 * \\n[cscp\\n[t*#]] \ ++ + \\n[b/2\\n[t*#]] \ ++ + \\n[cll\\n[t*#]*\\n[*c]]) ++. nr c#\\*[#t#r] +1 ++. \} ++. \} ++. ++. if (\\n[c#\\n[t*#]*\\n[t*r#\\n[t*#]]] > \\n[t*cols\\n[t*#]]) \{\ ++. ds * are\" ++. ds ** columns\" ++. if (\\n[c#\\*[#t#r]] == 1) \{\ ++. ds * is\" ++. ds ** column\" ++. \} ++. tmc \\n[.F]:\\n[.c]: There \\*[*] \\n[c#\\*[#t#r]] table \\*[**] (.TD) ++. ++. ds * are\" ++. if (\\n[t*cols\\n[t*#]] == 1) \ ++. ds * is\" ++. tm1 " but only \\n[t*cols\\n[t*#]] \\*[*] expected. ++. ++. ds * ++. length * \\n[.F]:\\n[.c]: ++. ++. while \\n-[*] \ ++. ds * " \\*[*]\" ++. ++. tm1 "\\*[*] Remaining .TDs and its contents are ignored. ++. ++. di *t*dummy* \" bypass superfluous input ++. return ++. \} ++. ++. di t*\\*[#trc] \" open cell diversion and set locals ++. in 0 ++. nr cll\\*[#trc] \\n[*cl] ++. ll \\n[*cl]u ++. nr *cl\\n[t*#] \\n[.l] ++. gcolor \\*[t*fgc\\*[#trc]] ++. ad \\*[t*hal\\*[#trc]] ++. fam \\*[t*ff\\*[#trc]] ++. ft \\*[t*fst\\*[#trc]] ++. t*pv \\*[t*fsz\\*[#trc]] ++. ++. t*P1 \\*[args] ++.. ++. ++. ++.\" ETB: end of table ++.\" predecessor: text, TD or ETB ++.\" successor: text, TD, TR or TBL ++.de ETB ++. ie \\n[t*#] \ ++. if !\\n[t*r#\\n[t*#]] \{\ ++. tmc \\n[.F]:\\n[.c]: Each table (.TBL) ++. tm1 " should contain at least one table row (.TR)! ++. \} ++. el \{\ ++. tmc \\n[.F]:\\n[.c]: Table end (.ETB) ++. tm1 " without corresponding table start (.TBL)! ++. \} ++. ++. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh table row identifier ++. t*dntr 2 \\n[c#\\*[#t#r]] \\n[t*cols\\n[t*#]] \\*[*#trc*] ++. ++. t*divs \" print this table ++. ++. sp \\n[b/2\\n[t*#]]u ++. t*cptn\\n[t*#] ++. nr t*# -1 ++. ++. ll \\n[*cl\\n[t*#]]u \" restore ll outside this table ++. in 0 \" reset indent ++. gcolor \\*[t*m\\n[t*#]] \" reset previous fgc ++. ++. t*getarg hold \\$@ ++. if !\\n[t*#] \{\ ++. sp .5 ++. di ++. in \\n[t*i]u ++. ie "\\*[hold]"" \{\ ++. ie (\\n[.t] - \\n[dn]) \ ++. t*DI t*tbl0 ++. el \{\ ++. rn t*tbl0 t*tbl\\n+[t*numb] ++. ds t*kept \\*[t*kept] t*tbl\\n[t*numb] \\n[dn]\" ++. \} ++. \} ++. el \{\ ++. rn t*tbl0 t*hold\\n+[t*numb] ++. tm \\n[.F]:\\n[.c]: Table t*hold\\n[t*numb] held. ++. ds t*held \\*[t*held] t*hold\\n[t*numb] \\n[dn]\" ++. \} ++. ++. ev \" restore previous environment ++. \} ++. ++. t*P1 \\*[args] ++.. ++. ++. ++.\" ***************************************************************** ++.\" * Following the definition of five utility macros * ++.\" * special to hdtbl. * ++.\" * Other utility macros common to hdtbl and hdgroff * ++.\" * are defined in the file hdmisc.tmac. * ++.\" ***************************************************************** ++. ++. ++.\" .t*free [n] ++.\" print the next [n] held table[s]. ++.\" Don't call it within a table! ++.\" If the table is higher than the remaining space ++.\" on the page, the table is printed on the next page. ++.de t*free ++. if "\\$0"CPTN" \ ++. if \\n[t*r#\\n[t*#]] \{\ ++. tmc \\n[.F]:\\n[.c]: Invalid placement of `.t*free' within a table; ++. tm1 " it must be called outside of any table. ++. return ++. \} ++. ++. if "\\*[t*held]"" \{\ ++. tm \\n[.F]:\\n[.c]: No held tables. ++. return ++. \} ++. ++. nr ** (\\$1 >? 1) 1 ++. while !""\\*[t*held]" \{\ ++. pops * t*held ++. popr * t*held ++. ++. ie (\\n[.t] - \\n[*]) \{\ ++. ev t*tbl ++. t*DI \\*[*] ++. ev ++. \} ++. el \{\ ++. rn \\*[*] t*tbl\\n+[t*numb] ++. ds t*kept \\*[t*kept] t*tbl\\n[t*numb] \\n[*]\" ++. \} ++. ++. if !(\\n-[**] - 1) \ ++. return ++. \} ++.. ++. ++. ++.\" The main utility macro for tables: ++.\" If a table is closed by ETB, this macro is called. It ++.\" processes one complete table, i.e., all the table cell ++.\" diversions, paints the cell backgrounds, draws ++.\" horizontal and vertical table lines and the table border. ++.\" ++.\" Nested tables are processed from inside to outside. ++. ++.de t*divs ++. ll (\\n[t*l]u + 1c) \" avoid warning `can't break line' ++. nf ++. ++. nr b/2 \\n[b/2\\n[t*#]] \" some abbreviations ++. nr cscp \\n[cscp\\n[t*#]] ++. nr cscpb (\\n[b/2] + \\n[cscp]) ++. ++. nr topdiv (\\n[.d] + \\n[b/2] - \\n[cscp])\" top of cell diversion ++. nr cscpb2 (\\n[b/2] / 2 + \\n[cscp]) ++. ++. nr #r 0 1 ++. \" outer loop for rows ++. while (\\n+[#r] <= \\n[t*r#\\n[t*#]]) \{\ ++. \" TODO: insert code here for multipage tables ++. nr * (\\n[#r] - 1) ++. nr topdiv +(\\n[dntr\\n[t*#]*\\n[*]] + \\n[cscp] + \\n[cscpb]) ++. ++. \" if table still smaller than specified table height, increase it ++. if ((\\n[#r] == \\n[t*r#\\n[t*#]]) & \\n[t*height\\n[t*#]]) \ ++. nr dntr\\n[t*#]*\\n[#r] (\\n[cscpb] \ ++ + \\n[toptbl\\n[t*#]] \ ++ + \\n[t*height\\n[t*#]] \ ++ - (\\n[topdiv] >? \\n[dntr\\n[t*#]*\\n[#r]])) ++. ++. nr #c 0 1 ++. \" inner loop for cells ++. while (\\n+[#c] <= \\n[t*cols\\n[t*#]]) \{\ ++. ds #trc \\n[t*#]*\\n[#r]*\\n[#c]\" ++. \" continue if the diversion is empty ++. if !d t*\\*[#trc] \ ++. continue ++. ++. sp |\\n[topdiv]u ++. in (\\n[in\\n[t*#]]u + \\n[in\\*[#trc]]u)\" cell offset ++. nr $1 \\n[dntr\\n[t*#]*\\n[#r]] \" cell height ++. ++. \" if we have spanned rows, calculate resulting row height ++. \" and position of lower horizontal line ++. if \\n[*rsp*\\*[#trc]] \{\ ++. nr * \\n[#r] 1 ++. nr rspan\\*[#trc] 0-1 \" set `no hl' flag ++. nr corr (\\n[dn\\*[#trc]] - \\n[dntr\\n[t*#]*\\n[#r]]) ++. ++. \" clear row span flags in following rows and update row height ++. while \\n[*rsp*\\*[#trc]] \{\ ++. nr *rsp*\\*[#trc] -1 ++. nr rspan\\n[t*#]*\\n+[*]*\\n[#c] 0 ++. nr ** (\\n[dntr\\n[t*#]*\\n[*]] + \\n[cscp] + \\n[cscpb]) ++. nr corr -\\n[**] ++. nr $1 +\\n[**] ++. \} ++. ++. if (\\n-[*] == \\n[t*r#\\n[t*#]]) \ ++. nr $1 ((\\n[t*height\\n[t*#]] \ ++ - \\n[.d] \ ++ + \\n[toptbl\\n[t*#]] \ ++ + \\n[cscpb]) \ ++ >? \\n[$1]) ++. nr dntr\\n[t*#]*\\n[*] +(\\n[corr] >? 0) ++. \} ++. ++. \" paint cell background ++. nr * (2 * \\n[t*cpd\\n[t*#]] + \\n[cll\\*[#trc]])\" background width ++. nr $1 (\\n[$1] >? \\n[dn\\*[#trc]])\" cell height ++. ++. if !"\\*[t*bgc\\*[#trc]]"=" \{\ ++. nop \h'\\n[t*csp\\n[t*#]]u'\ ++\M[\\*[t*bgc\\*[#trc]]]\ ++\v'(-.67v - \\n[t*cpd\\n[t*#]]u)'\ ++\D'P \\n[*]u 0 \ ++ 0 (2u * \\n[t*cpd\\n[t*#]]u + \\n[$1]u) \ ++ -\\n[*]u 0'\ ++\M[] ++. sp -1 ++. \} ++. ++. \" *** horizontal and vertical single or double lines *** ++. \" double and single lines have the same thickness; ++. \" the double lines' distance is the line thickness. ++. \" ++. \" `border=x': horizontal/vertical lines x/2 thick, minimum .1n ++. \" `border=0': no border; horizontal/vertical lines .1n thick ++. \" `border=': neither border nor horizontal/vertical lines ++. ++. nr *t (.1n >? \\n[b/2]) \" thickness of hl/vl; min. .1n ++. in +\\n[cscp]u ++. ++. \" check for vertical and horizontal lines ++. if (1 + \\n[t*b\\n[t*#]]) \{\ ++. if !"\\*[t*bc\\n[t*#]]"=" \{\ ++. \" draw horizontal line between this cell and the one below ++. if (\\n[t*r#\\n[t*#]] - \\n[#r] + \\n[rspan\\*[#trc]]) \{\ ++. if !"\\*[t*hl\\*[#trc]]"=" \{\ ++. sp \\n[$1]u ++. nr * (\\n[cscp] + \\n[cscpb] + \\n[cll\\*[#trc]]) ++. nop \X'\*[g] 1 setlinecap'\ ++\h'(-\\n[cscpb2]u - \\n[*t]u)'\ ++\v'(\\n[cscpb2]u - .67v)'\ ++\m[\\*[t*bc\\n[t*#]]]\ ++\D't \\n[*t]u'\c ++. ++. ie "\\*[t*hl\\*[#trc]]"d" \ ++. nop \v'-\\n[*t]u'\ ++\D'l \\n[*]u 0'\ ++\v'(2u * \\n[*t]u)'\ ++\D'l -\\n[*]u 0'\ ++\D't 0' ++. el \ ++. nop \D'l \\n[*]u 0'\ ++\D't 0' ++. ++. sp (-\\n[$1]u - 1v) ++. \}\} ++. ++. nr rspan\\*[#trc] 0 ++. ++. \" draw vertical line between this cell and the one to the right ++. if (\\n[t*cols\\n[t*#]] - \\n[#c] + \\n[vline\\*[#trc]]) \{\ ++. if !"\\*[t*vl\\*[#trc]]"=" \{\ ++. nop \X'\*[g] 1 setlinecap'\ ++\v'(-\\n[cscpb2]u - .67v)'\ ++\m[\\*[t*bc\\n[t*#]]]\ ++\h'(\\n[cscpb2]u - \\n[*t]u + \\n[cll\\*[#trc]]u)'\c ++. ++. ie "\\*[t*vl\\*[#trc]]"d" \ ++. nop \h'-\\n[*t]u'\ ++\D't \\n[*t]u'\ ++\D'l 0 (2u * \\n[cscp]u + \\n[$1]u + (\\n[*t]u / 2u))'\ ++\h'(2u * \\n[*t]u)'\ ++\D'l 0 -(2u * \\n[cscp]u + \\n[$1]u + (\\n[*t]u / 2u))'\ ++\D't 0' ++. el \ ++. nop \D't \\n[*t]u'\ ++\D'l 0 (2u * \\n[cscp]u + \\n[$1]u + (\\n[*t]u / 2u))'\ ++\D't 0' ++. sp -1 ++. \}\}\}\} ++. ++. nr vline\\*[#trc] 0 ++. ++. \" vert. cell content alignment ++. nr ** 0 ++. ++. ie "\\*[t*val\\*[#trc]]"m" \ ++. nr ** ((\\n[$1] - \\n[dn\\*[#trc]]) / 2)\" val=m ++. el \ ++. if "\\*[t*val\\*[#trc]]"b" \ ++. nr ** (\\n[$1] - \\n[dn\\*[#trc]])\" val=b ++. ++. sp \\n[**]u \" vertical content position ++. ++. \" finally output the diversion ++. t*\\*[#trc] ++. rm t*\\*[#trc] ++. \} ++. \} ++. ++. \" draw the box border ++. in \\n[in\\n[t*#]]u ++. nr ** (\\n[topdiv] + \\n[dntr\\n[t*#]*\\n-[#r]]) ++. ++. if \\n[t*b\\n[t*#]] \{\ ++. sp |(\\n[toptbl\\n[t*#]]u + \\n[b/2]u) ++. nr $1 (\\n[toptbl\\n[t*#]] - \\n[**] - \\n[cscp]) ++. nr * (\\n[ll\\n[t*#]] - \\n[t*b\\n[t*#]]) ++. ++. if !"\\*[t*bc\\n[t*#]]"=" \ ++. nop \X'\*[g] 0 setlinejoin 2 setlinecap'\ ++\v'-.67v'\ ++\h'-\\n[b/2]u'\ ++\m[\\*[t*bc\\n[t*#]]]\ ++\D't \\n[t*b\\n[t*#]]u'\ ++\D'l \\n[*]u 0'\ ++\D'l 0 -\\n[$1]u'\ ++\D'l -\\n[*]u 0'\ ++\D'l 0 \\n[$1]u'\ ++\D't 0' ++. \} ++. ++. sp |(\\n[**]u + \\n[cscpb]u) ++. fi ++.. ++. ++. ++.\" Utility macro: .t*cl [width1 [width2 [...]]] ++.\" ++.\" Calculate cell widths, table width, and cell offsets. ++.de t*cl ++. nr t*cols\\n[t*#] (\\n[.$] >? \\n[t*cols\\n[t*#]]) ++. nr ll\\n[t*#] 0 \" accumulated cell widths ++. nr ** (\\n[.l] / \\n[t*cols\\n[t*#]])\" width for remaining cells ++. nr * 0 1 \" counter ++. ++. \" while-loop: Parse user arguments to get each cell's width. ++. while (\\n[t*cols\\n[t*#]] >= \\n+[*]) \{\ ++. nr $\\n[*] \\n[**] ++. if !"\\$[\\n[*]]"" \{\ ++. \" check for `%' pseudo scaling indicator ++. ds * \\$\\n[*]\" ++. substring * -1 -1 ++. ie "\\*[*]"%" \{\ ++. ds ** \\$[\\n[*]]\" ++. substring ** 0 -2 ++. ie \B\\*[**] \ ++. nr $\\n[*] (\\*[**] * \\n[.l] / 100) ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid relative cell width `\\*[**]%'. ++. \} ++. el \{\ ++. ie \B\\$[\\n[*]] \ ++. nr $\\n[*] \\$[\\n[*]] ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid cell width `\\$[\\n[*]]'. ++. \}\} ++. ++. nr ll\\n[t*#] +\\n[$\\n[*]] ++. nr ** \\n[$\\n[*]] ++. \} ++. ++. if (\\n[ll\\n[t*#]] > \\n[.l]) \ ++. tm \\n[.F]:\\n[.c]: Table width larger than column width. ++. ++. nr ** (0 >? \\n[t*b\\n[t*#]]) ++. nr * 0 1 ++. ++. \" second while loop: Compute final cell widths. ++. while (\\n[t*cols\\n[t*#]] >= \\n+[*]) \{\ ++. \" Remove border width, if any. ++. if \\n[t*b\\n[t*#]] \{\ ++. \" cell_width := cell_width * (length - 1.5*border) / length ++. nr #* (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2)) ++. nr *** (\\n[ll\\n[t*#]] / 2) ++. \" avoid multiplication overflow ++. mult31by31 $\\n[*] #* **** ++. add31to62 *** **** **** ++. div62by31 **** ll\\n[t*#] $\\n[*] ++. \} ++. ++. \" Get cell widths without padding, spacing, and separator line. ++. nr cll\\n[t*#]*\\n[*] (\\n[$\\n[*]] \ ++ - (2 * \\n[cscp\\n[t*#]]) \ ++ - \\n[b/2\\n[t*#]]) ++. ++. \" Check whether value is non-positive. ++. if !\\n[cll\\n[t*#]*\\n[*]] \{\ ++. nr #* (\\n[ll\\n[t*#]] - (3 * \\n[t*b\\n[t*#]] / 2)) ++. nr *** (\\n[#*] / 2) ++. nr *h (2 * \\n[cscp\\n[t*#]] + \\n[b/2\\n[t*#]]) ++. mult31by31 *h ll\\n[t*#] **** ++. add31to62 *** **** **** ++. div62by31 **** #* *h ++. ds * \\n[*]th\" ++. nr *** (\\n[*] % 10) ++. if d nth-\\n[***] \ ++. ds * \\n[*]\\*[nth-\\n[***]]\" ++. tmc \\n[.F]:\\n[.c]: The \\*[*] width value (\\$\\n[*]) is too small. ++. tm1 " It should be greater than \\n[*h]. ++. \} ++. ++. nr in\\n[t*#]*\\n[*] \\n[**] \" cell offset ++. nr ** +\\n[$\\n[*]] ++. \} ++.. ++. ++. ++.\" Utility macro: .t*dntr ? ++.\" ++.\" Close TD diversion, make some calculations, and set ++.\" some help strings and registers. is 0, 1, ++.\" or 2 if the call of .t*dntr occurs in .TD, .TR, or ++.\" .ETB, respectively. ++.de t*dntr ++. nr dn 0 \" reset diversion height ++. br \" finish cell data ++. ++. if "\\n[.z]"*t*dummy*" \ ++. return ++. ++. ds #t#r \\n[t*#]*\\n[t*r#\\n[t*#]]\" refresh table row identifier ++. ++. if \\n[c#\\*[#t#r]] \{\ ++. di \" close diversion ++. nr dn\\$4 \\n[dn] \" save height of this cell ++. if !\\n[rspan\\*[#trc]] \{\ ++. \" update row height if not in a row span ++. nr dntr\\*[#t#r] (\\n[dntr\\*[#t#r]] >? \\n[dn]) ++. if \\$2 \ ++. nr dntr\\*[#t#r] ((\\n[t*height\\*[#t#r]] \ ++ - (2 * \\n[cscp\\n[t*#]] + \\n[b/2\\n[t*#]])) \ ++ >? \\n[dntr\\*[#t#r]]) ++. \}\} ++. ++. nr c#\\*[#t#r] +1 ++. nr * \\$2 ++. ++. \" update column span registers ++. while (\\n+[*] <= \\$3) \{\ ++. if r cspan\\*[#t#r]*\\n[*] \ ++. nr c#\\*[#t#r] +\\n[cspan\\*[#t#r]*\\n[*]] ++. nr cspan\\*[#t#r]*\\n[*] 0 ++. \} ++. ++. ds #trc \\*[#t#r]*\\n[c#\\*[#t#r]]\" ++. ++. \" only check for cell underflow if called by .TR or .ETB ++. if (\\$1 & (\\n[c#\\*[#t#r]] <= \\n[t*cols\\n[t*#]])) \{\ ++. ds * are\" ++. ds ** columns\" ++. if (\\n-[c#\\*[#t#r]] == 1) \{\ ++. ds * is\" ++. ds ** column\" ++. \} ++. tmc \\n[.F]:\\n[.c]: There \\*[*] only \\n[c#\\*[#t#r]] \\*[**] ++. ++. nr * \\n[t*r#\\n[t*#]] ++. ds * \\n[*]th\" ++. nr *** (\\n[*] % 10) ++. if d nth-\\n[***] \ ++. ds * \\n[*]\\*[nth-\\n[***]]\" ++. tmc " in the \\*[*] row ++. ++. ds * are\" ++. if (\\n[t*cols\\n[t*#]] == 1) \ ++. ds * is\" ++. tm1 " but \\n[t*cols\\n[t*#]] \\*[*] expected. ++. \} ++.. ++. ++. ++.\" Utility-macro: .t*args level_1 [level_2] ++.\" ++.\" Get the arguments common to TBL, TR, and TD for the level ++.\" in argument 1, using default values from the level in ++.\" argument 2. If argument 2 is missing, use the global ++.\" default values. ++.\" ++.de t*args ++. ds t*bgc\\$1 \\*[t*bgc\\$2]\" ++. ds t*fgc\\$1 \\*[t*fgc\\$2]\" ++. ds t*hl\\$1 \\*[t*hl\\$2]\" ++. ds t*vl\\$1 \\*[t*vl\\$2]\" ++. ds t*hal\\$1 \\*[t*hal\\$2]\" ++. ds t*val\\$1 \\*[t*val\\$2]\" ++. ds t*ff\\$1 \\*[t*ff\\$2]\" ++. ds t*fst\\$1 \\*[t*fst\\$2]\" ++. ds t*fsz\\$1 \\*[t*fsz\\$2]\" ++. ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg bgc \\*[args] \" background color ++. if !"\\*[bgc]"" \{\ ++. ie m\\*[bgc] \ ++. ds t*bgc\\$1 \\*[bgc]\" ++. el \{\ ++. ie "\\*[bgc]"=" \ ++. ds t*bgc\\$1 =\" ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid background color `\\*[bgc]'. ++. \}\} ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg fgc \\*[args] \" foreground color ++. if !"\\*[fgc]"" \{\ ++. ie m\\*[fgc] \ ++. ds t*fgc\\$1 \\*[fgc]\" ++. el \{\ ++. ie "\\*[fgc]"=" \ ++. ds t*fgc\\$1 =\" ++. el \ ++. tm \\n[.F]:\\n[.c]: Invalid foreground color `\\*[fgc]'. ++. \}\} ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg hl \\*[args] \" horizontal line between cells ++. if !"\\*[hl]"" \ ++. ds t*hl\\$1 \\*[hl]\" ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg vl \\*[args] \" vertical line between cells ++. if !"\\*[vl]"" \ ++. ds t*vl\\$1 \\*[vl]\" ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg hal \\*[args] \" horizontal table cell alignment ++. if !"\\*[hal]"" \{\ ++. t*index bcrl \\*[hal] ++. ie \\n[t*index] \ ++. ds t*hal\\$1 \\*[hal]\" ++. el \{\ ++. tmc \\n[.F]:\\n[.c]: Invalid horizontal alignment `\\*[hal]': ++. tm1 " must be `b', `c', `l' or `r'. ++. \}\} ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg val \\*[args] \" vertical table cell alignment ++. if !"\\*[val]"" \{\ ++. t*index tmb \\*[val] ++. ie \\n[t*index] \ ++. ds t*val\\$1 \\*[val]\" ++. el \{\ ++. tmc \\n[.F]:\\n[.c]: Invalid vertical alignment `\\*[val]': ++. tm1 " must be `t', `m' or `b'. ++. \}\} ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg ff \\*[args] \" font family ++. if !"\\*[ff]"" \ ++. ds t*ff\\$1 \\*[ff]\" ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg fst \\*[args] \" font style ++. if !"\\*[fst]"" \ ++. ds t*fst\\$1 \\*[fst]\" ++. if "\\*[args]"" \ ++. return ++. ++. t*getarg fsz \\*[args] \" font size and spacing factor ++. if !"\\*[fsz]"" \ ++. ds t*fsz\\$1 \\*[fsz]\" ++.. ++. ++. ++.\" Append to your page header macro ('pg@top' for MS) ++.\" to enable tables to span pages. ++.de t*hm ++. ev t*tbl ++. nr ** \\n[.t] ++. while !""\\*[t*kept]" \{\ ++. pops * t*kept ++. popr * t*kept ++. if (\\n[*] - \\n[**]) \{\ ++. tm \\n[.F]:\\n[.c]: Table \\*[*] higher than page -- ignored! ++. break ++. \} ++. ++. if (\\n[*] - \\n[.t]) \{\ ++. ds t*kept \\n[*] \\*[t*kept]\" ++. ds t*kept \\*[*] \\*[t*kept]\" ++. tmc \\n[.F]:\\n[.c]: Remaining table(s), ++. tm1 " because not all fit onto this page. ++. break ++. \} ++. ++. t*DI \\*[*] ++. \} ++. ev ++.. ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/contrib/hdtbl/Makefile.sub groff-1.22.3/contrib/hdtbl/Makefile.sub +--- groff-1.22.3.old/contrib/hdtbl/Makefile.sub 2014-11-04 10:38:35.483520772 +0200 ++++ groff-1.22.3/contrib/hdtbl/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,174 +0,0 @@ +-# Copyright (C) 2006-2014 Free Software Foundation, Inc. +-# Written by Werner Lemberg (wl@gnu.org) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +- +-# These may be overridden if cross-compiling. +-GROFFBIN=$(top_builddir)/src/roff/groff/groff +-GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'` +- +-groff_bin_dirs=\ +- $(top_builddir)/src/roff/groff \ +- $(top_builddir)/src/roff/troff \ +- $(top_builddir)/src/preproc/eqn \ +- $(top_builddir)/src/preproc/pic \ +- $(top_builddir)/src/preproc/tbl \ +- $(top_builddir)/src/devices/grops +- +-FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font +-TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -M$(srcdir) +-PFLAG=-t -p -e -U +- +-GROFF=\ +- GROFF_COMMAND_PREFIX= \ +- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ +- $(GROFFBIN) $(FFLAG) $(TFLAG) $(PFLAG) +- +-MAN7=\ +- groff_hdtbl.n +- +-# These files are processed with `strip.sed'. +-STRIPFILES=\ +- hdtbl.tmac \ +- hdmisc.tmac +- +-# These files are handled by the `.in.roff' rule. +-GENFILES=\ +- examples/fonts_n.roff \ +- examples/fonts_x.roff +- +-EXAMPLEFILES=\ +- examples/common.roff \ +- examples/chess_board.roff \ +- examples/color_boxes.roff \ +- examples/color_nested_tables.roff \ +- examples/color_table_cells.roff \ +- examples/color_transitions.roff \ +- examples/col_rowspan_colors.roff \ +- examples/mixed_pickles.roff \ +- examples/rainbow.roff \ +- examples/short_reference.roff +- +-PROCESSEDEXAMPLEFILES=\ +- examples/chess_board.ps \ +- examples/color_boxes.ps \ +- examples/color_nested_tables.ps \ +- examples/color_table_cells.ps \ +- examples/color_transitions.ps \ +- examples/col_rowspan_colors.ps \ +- examples/fonts_n.ps \ +- examples/fonts_x.ps \ +- examples/mixed_pickles.ps \ +- examples/rainbow.ps \ +- examples/short_reference.ps +- +-EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'` +-GENFILES_=`echo $(GENFILES) | sed 's|examples/||g'` +-PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'` +- +-MOSTLYCLEANADD=\ +- gnu.eps \ +- $(PROCESSEDEXAMPLEFILES) \ +- $(GENFILES) \ +- examples/stamp \ +- stamp-strip \ +- hdmisc.tmac-s hdtbl.tmac-s +- +-RM=rm -f +- +-.SUFFIXES: .roff .in .ps +- +-.roff.ps: +- $(GROFF) -Tps -dfontpath=$(top_srcdir)/font -dsopath=$(srcdir)/ \ +- -mhdtbl $< >$@ +- +-.in.roff: +- sed -e "s|@fontdir@|$(fontdir)|" $< >$@ +- +-all: $(make_examples) stamp-strip +- +-.PHONY: examples +-examples: $(PROCESSEDEXAMPLEFILES) +- +-$(PROCESSEDEXAMPLEFILES): gnu.eps examples/stamp examples/common.roff +- +-gnu.eps: +- if test -f $(top_srcdir)/doc/gnu.eps; then \ +- cp $(top_srcdir)/doc/gnu.eps . ; \ +- elif test -f $(top_builddir)/doc/gnu.eps; then \ +- cp $(top_builddir)/doc/gnu.eps . ; \ +- else \ +- xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \ +- | $(pnmtops_nosetpage) -noturn -rle >$@ ; \ +- fi +- +-examples/stamp: +- -test -d examples || $(mkinstalldirs) examples +- touch $@ +- +-stamp-strip: $(STRIPFILES) +- for f in $(STRIPFILES); do \ +- $(RM) $$f-s; \ +- sed -f $(top_srcdir)/tmac/strip.sed $(srcdir)/$$f >$$f-s; \ +- done +- touch $@ +- +-$(GENFILES): examples/stamp +- +-install_data: install_always $(make_install_examples) +- +-install_always: $(STRIPFILES) $(GENFILES) +- -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir) +- for f in $(STRIPFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \ +- done +- +-install_examples: install_always $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \ +- gnu.eps stamp-strip +- -test -d $(DESTDIR)$(exampledir)/hdtbl \ +- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/hdtbl +- for f in $(EXAMPLEFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f; \ +- $(INSTALL_DATA) $(srcdir)/examples/$$f \ +- $(DESTDIR)$(exampledir)/hdtbl/$$f; \ +- done +- for f in $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f; \ +- $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/hdtbl/$$f; \ +- done +- $(INSTALL_DATA) gnu.eps $(DESTDIR)$(exampledir)/hdtbl/gnu.eps +- +-uninstall_sub: uninstall_always $(make_uninstall_examples) +- +-uninstall_always: +- -for f in $(STRIPFILES); do $(RM) $(DESTDIR)$(tmacdir)/$$f; done +- +-uninstall_examples: uninstall_always +- -for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f; \ +- done +- $(RM) $(DESTDIR)$(exampledir)/hdtbl/gnu.eps +- -test -d $(DESTDIR)$(exampledir)/hdtbl && \ +- rmdir $(DESTDIR)$(exampledir)/hdtbl +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/mm/ChangeLog groff-1.22.3/contrib/mm/ChangeLog +--- groff-1.22.3.old/contrib/mm/ChangeLog 2014-11-04 10:38:35.487520722 +0200 ++++ groff-1.22.3/contrib/mm/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,9 @@ ++Fri Apr 3 16:33:22 2015 Werner LEMBERG ++ ++ Make man pages work in compatibility mode. ++ ++ * groff_mm.man, groff_mmse.man, mmroff.man: Do it. ++ + Wed Sep 3 21:29:00 2014 Bernd Warken + + * all files in contrib/mm: Copying and Emacs setting. +diff -Nuar groff-1.22.3.old/contrib/mm/.gitignore groff-1.22.3/contrib/mm/.gitignore +--- groff-1.22.3.old/contrib/mm/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mm/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++groff_mm.n ++groff_mmse.n ++mmroff ++mmroff.n +diff -Nuar groff-1.22.3.old/contrib/mm/groff_mm.man groff-1.22.3/contrib/mm/groff_mm.man +--- groff-1.22.3.old/contrib/mm/groff_mm.man 2014-11-04 10:38:35.487520722 +0200 ++++ groff-1.22.3/contrib/mm/groff_mm.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,10 @@ + groff_mm \- groff mm macros + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .de co + Copyright \[co] 1989-2014 Free Software Foundation, Inc. + +@@ -3977,6 +3981,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" coding: latin-1 +diff -Nuar groff-1.22.3.old/contrib/mm/groff_mmse.man groff-1.22.3/contrib/mm/groff_mmse.man +--- groff-1.22.3.old/contrib/mm/groff_mmse.man 2014-11-04 10:38:35.487520722 +0200 ++++ groff-1.22.3/contrib/mm/groff_mmse.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,10 @@ + groff_mmse \- svenska mm makro fr groff + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .ig + Copyright \[co] 1989-2014 Free Software Foundation, Inc. + +@@ -157,6 +161,9 @@ + .br + .BR groff_mm (@MAN7EXT@) + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" coding: latin-1 + .\" mode: nroff +diff -Nuar groff-1.22.3.old/contrib/mm/Makefile.sub groff-1.22.3/contrib/mm/Makefile.sub +--- groff-1.22.3.old/contrib/mm/Makefile.sub 2014-11-04 10:38:35.488520709 +0200 ++++ groff-1.22.3/contrib/mm/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,95 +0,0 @@ +-# Copyright 1991-2014 Free Software Foundation, Inc. +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.sub +-# +-# +-PROG=mmroff +-MAN1=\ +- mmroff.n +-MAN7=\ +- groff_mm.n \ +- groff_mmse.n +-FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov +-# Local configuration files with default values. +-LOCALE=locale se_locale +-MOSTLYCLEANADD=temp +-RM=rm -f +- +-all: mmroff +- +-install_bin: install_mmroff +- +-install_data: install_m +- -test -d $(DESTDIR)$(tmacdir)/mm \ +- || $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm +- for f in $(FILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/mm/$$f; \ +- $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \ +- done +- for f in $(LOCALE); do \ +- test -f $(DESTDIR)$(tmacdir)/mm/$$f \ +- || touch $(DESTDIR)$(tmacdir)/mm/$$f; \ +- done +- $(INSTALL_DATA) $(srcdir)/refer-mm.tmac \ +- $(DESTDIR)$(tmacdir)/refer-mm.tmac +- +-install_m: +- -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir) +- $(RM) $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac +- $(INSTALL_DATA) $(srcdir)/m.tmac \ +- $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac +- @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \ +- $(srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac +- @sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \ +- $(srcdir)/mmse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac +- @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \ +- $(srcdir)/mm.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac +- +-install_mmroff: mmroff +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/mmroff +- $(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff +- +-mmroff: mmroff.pl +- sed -e 's;/usr/bin/perl;$(PERL);' $(srcdir)/mmroff.pl >$@ +- chmod +x $@ +- +-uninstall_sub: +- -for f in $(FILES); do $(RM) $(DESTDIR)$(tmacdir)/mm/$$f; done +- -for f in $(LOCALE); do \ +- test -s $(DESTDIR)$(tmacdir)/mm/$$f \ +- || $(RM) $(DESTDIR)$(tmacdir)/mm/$$f; \ +- done +- $(RM) $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac +- $(RM) $(DESTDIR)$(tmacdir)/refer-mm.tmac +- -test -d $(DESTDIR)$(tmacdir)/mm && \ +- rmdir $(DESTDIR)$(tmacdir)/mm +- $(RM) $(DESTDIR)$(bindir)/mmroff +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/contrib/mm/mm.am groff-1.22.3/contrib/mm/mm.am +--- groff-1.22.3.old/contrib/mm/mm.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mm/mm.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,106 @@ ++# Copyright 1991-2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++# ++# mm.am ++# ++ ++mm_srcdir = $(top_srcdir)/contrib/mm ++mm_builddir = $(top_builddir)/contrib/mm ++ ++bin_SCRIPTS += mmroff ++ ++man1_MANS += contrib/mm/mmroff.n ++man7_MANS += \ ++ contrib/mm/groff_mm.n \ ++ contrib/mm/groff_mmse.n ++ ++# Files installed in $(tmacdir)/mm ++MMFILES = \ ++ contrib/mm/mm/0.MT \ ++ contrib/mm/mm/5.MT \ ++ contrib/mm/mm/4.MT \ ++ contrib/mm/mm/ms.cov \ ++ contrib/mm/mm/se_ms.cov ++mmdir = $(tmacdir)/mm ++dist_mm_DATA = $(MMFILES) ++ ++# Files installed in $(tmacdir) ++tmacmmdir = $(tmacdir) ++dist_tmacmm_DATA = contrib/mm/refer-mm.tmac ++ ++# Local configuration files with default values. ++MMLOCALE = \ ++ locale \ ++ se_locale ++ ++EXTRA_DIST += \ ++ contrib/mm/ChangeLog \ ++ contrib/mm/examples \ ++ contrib/mm/Makefile.sim \ ++ contrib/mm/mm \ ++ contrib/mm/NOTES \ ++ contrib/mm/README \ ++ contrib/mm/groff_mm.man \ ++ contrib/mm/groff_mmse.man \ ++ contrib/mm/mmroff.man \ ++ contrib/mm/mmroff.pl ++ ++mmroff: $(mm_srcdir)/mmroff.pl ++ sed -e 's;/usr/bin/perl;$(PERL);' $(mm_srcdir)/mmroff.pl >$@ ++ chmod +x $@ ++ ++# Special installation rules for m.tmac, mse.tmac, mmse.tmac, mm.tmac ++# and MMLOCALE ++install-data-local: install_mm ++install_mm: ++ -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir) ++ -test -d $(DESTDIR)$(mmdir) || $(mkinstalldirs) $(DESTDIR)$(mmdir) ++ $(RM) $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m ++ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac ++ $(INSTALL_DATA) $(mm_srcdir)/m.tmac \ ++ $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac ++ sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \ ++ $(mm_srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac ++ @sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \ ++ $(mm_srcdir)/mmse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac ++ @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \ ++ $(mm_srcdir)/mm.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac ++ @for f in $(MMLOCALE); do \ ++ test -f $(DESTDIR)$(tmacdir)/mm/$$f \ ++ || touch $(DESTDIR)$(tmacdir)/mm/$$f; \ ++ done ++uninstall-local: uninstall_mm ++uninstall_mm: ++ -for f in $(MMLOCALE); do \ ++ test -s $(DESTDIR)$(tmacdir)/mm/$$f \ ++ || $(RM) $(DESTDIR)$(tmacdir)/mm/$$f; \ ++ done ++ $(RM) $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m ++ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac ++ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac ++ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac ++ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac ++ -rmdir $(DESTDIR)$(tmacdir)/mm ++ ++# Special distribution rule: we copy all .tmac files from contrib/mm ++dist-hook: dist_mm ++dist_mm: ++ chmod u+w $(distdir)/contrib/mm/ ++ for i in $(mm_srcdir)/*.tmac; do \ ++ cp -f $$i $(distdir)/contrib/mm/; \ ++ done +diff -Nuar groff-1.22.3.old/contrib/mm/mmroff.man groff-1.22.3/contrib/mm/mmroff.man +--- groff-1.22.3.old/contrib/mm/mmroff.man 2014-11-04 10:38:35.488520709 +0200 ++++ groff-1.22.3/contrib/mm/mmroff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -69,7 +69,7 @@ + .B \-x + Just create the cross reference file. + . +-This can be used to refresh the cross reference file, it isn\[aq]t ++This can be used to refresh the cross reference file, it isn\(aqt + always needed to have accurate cross references and by using this + option + .B groff +diff -Nuar groff-1.22.3.old/contrib/mom/BUGS groff-1.22.3/contrib/mom/BUGS +--- groff-1.22.3.old/contrib/mom/BUGS 2014-11-04 10:38:35.502520534 +0200 ++++ groff-1.22.3/contrib/mom/BUGS 2015-04-23 20:57:03.000000000 +0300 +@@ -1,5 +1,5 @@ + -*- text -*- +- Copyright 2004-2014 Free Software Foundation, Inc. ++ Copyright 2004-2015 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright +@@ -22,6 +22,40 @@ + + ==================================================================== + ++Version 2.1 ++=========== ++PDF_IMAGE and FLOAT environments conflicting. ++---Fixed--- ++ ++DROPCAP picking up color from last call to .gcolor. ++---Fixed--- ++ ++PAD not working properly with mom's indent macros. ++---Fixed--- ++ ++Margin notes not respecting differing recto-verso margins. ++---Fixed--- ++ ++Graphical object macros not clearing fill/no-fill registers and ++modes. ++---Fixed--- ++ ++LIST ALPHA emitting a number register to output. ++---Fixed--- ++ ++HEADER_PLAIN and FOOTER_PLAIN broken. ++---Fixed--- ++ ++Version 2.0-c_1 ++=============== ++ ++.TS with no H causing FN_OVERFLOW warning when there are footnotes ++on same page. ++---Fixed--- ++ ++PDF_TARGET "descriptive text" not printing. ++---Fixed--- ++ + Version 2.0-c + ============= + +diff -Nuar groff-1.22.3.old/contrib/mom/ChangeLog groff-1.22.3/contrib/mom/ChangeLog +--- groff-1.22.3.old/contrib/mom/ChangeLog 2014-11-04 10:38:35.502520534 +0200 ++++ groff-1.22.3/contrib/mom/ChangeLog 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,54 @@ ++* Fri Apr 4 2015 ++ ++ o groff_mom.man: Make it work in compatibility mode. ++ ++* Sat Feb 28 2015 ++ ++ o Added an ADJUST argument to QUOTE and BLOCKQUOTE to facilitate ++ optical centering tweaks ++ ++* Sat Feb 21 2015 ++ ++ o Expanded scope of _STYLE macros to headers/footers and ++ page numbers ++ ++* Thu Feb 5 2015 ++ ++ o Version 2.1 release (see NEWS) ++ ++ o overhaul of control macro handling ++ ++ o overhaul of cover and docheader management ++ ++ o general code cleanup to remove redundancies and reduce size of ++ om.tmac ++ ++ o changes to example files to demonstrate new features ++ ++ o copyrights updated in all files ++ ++* Tue Jan 14 2015 ++ ++ o Added a new example in French, mon_premier_doc.mom ++ ++ o Added README-fr.txt, a translation in French of the README.txt file ++ ++ o Makefile.sub: generation of mon_premier_doc.mom, installation of ++ README-fr.txt ++ ++* Sun Nov 30 2014 ++ ++ o Added auto underscoring, caps, and color to TOC header ++ (first-page titles) ++ ++ o Added vertical page positioning control macros for TOC and ++ ENDNOTES headers (first-page titles) ++ ++* Tue Nov 25 2014 ++ ++ o Tweak so collated, non-chapter docs with the same author ++ don't require .AUTHOR "" to skip printing author in docheader ++ + * Wed Oct 29 2014 + + o Makefile.sub: KFLAG to run pdfmom with -k +diff -Nuar groff-1.22.3.old/contrib/mom/copyright groff-1.22.3/contrib/mom/copyright +--- groff-1.22.3.old/contrib/mom/copyright 2014-11-04 10:38:35.502520534 +0200 ++++ groff-1.22.3/contrib/mom/copyright 2015-04-23 20:57:03.000000000 +0300 +@@ -9,7 +9,7 @@ + ======================================================================== + + The groff macro file om.tmac and the html documentation pertaining to +-it are Copyright (C) 2004-2014 Peter Schaffter. ++it are Copyright (C) 2004-2015 Peter Schaffter. + + om.tmac is issued under the GNU General Public License, a full copy of + which can be had at +diff -Nuar groff-1.22.3.old/contrib/mom/examples/.gitignore groff-1.22.3/contrib/mom/examples/.gitignore +--- groff-1.22.3.old/contrib/mom/examples/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mom/examples/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++*.ps ++stamp +\ Dosya sonunda yenisatır yok. +diff -Nuar groff-1.22.3.old/contrib/mom/examples/letter.mom groff-1.22.3/contrib/mom/examples/letter.mom +--- groff-1.22.3.old/contrib/mom/examples/letter.mom 2014-11-04 10:38:35.606519234 +0200 ++++ groff-1.22.3/contrib/mom/examples/letter.mom 2015-04-23 20:57:03.000000000 +0300 +@@ -1,6 +1,6 @@ + .\" -*- mode: troff; coding: utf-8; -*- + . +-\# Copyright (C) 2004-2014 Free Software Foundation, Inc. ++\# Copyright (C) 2004-2015 Free Software Foundation, Inc. + \# + \# Copying and distribution of this file, with or without modification, + \# are permitted in any medium without royalty provided the copyright +diff -Nuar groff-1.22.3.old/contrib/mom/examples/mom-pdf.mom groff-1.22.3/contrib/mom/examples/mom-pdf.mom +--- groff-1.22.3.old/contrib/mom/examples/mom-pdf.mom 2014-11-04 10:38:35.606519234 +0200 ++++ groff-1.22.3/contrib/mom/examples/mom-pdf.mom 2015-04-23 20:57:03.000000000 +0300 +@@ -1,5 +1,5 @@ + .\" -*- nroff -*- +-.\" Copyright (C) 2012-2014 Free Software Foundation, Inc. ++.\" Copyright (C) 2012-2015 Free Software Foundation, Inc. + .\" + .\" This file is part of mom, which is part of groff, a free software + .\" project. +@@ -8,68 +8,92 @@ + .\" GNU General Public License as published by the "Free Software + \" Foundation", version\~2. + .\" +-.\" The license text is available in the internet at ++.\" The license text is available on the internet at + .\" + .\" +-.PAPER A4 ++.PAPER A4 + .\" Reference macros (metadata) + .TITLE "Producing PDFs" "with groff and mom" + .PDF_TITLE "\*[$TITLE] +-.AUTHOR "\v'-.5v'\*[UP 4p]Deri James" \ +- "\v'-.5v'\*[UP 8p]and" \ +- "\v'-.5v'\*[UP 11p]Peter Schaffter" +-.MISC "This file is part of groff." \ +- ".sp .25v" \ +- "groff is free software; you can redistribute it" \ +- "and\*[FU3]/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." \ +- ".sp .25v" \ +- "You should have received a copy of the GNU" \ +- "General Public License along with this program." \ +- "If not, see:" \ +- ".sp .25v" \ +- ".IL 2P" \ +- ".PDF_WWW_LINK http://www.gnu.org/licenses/" \ +- ".IQ CLEAR" +-.COPYRIGHT "20\*[BU3]1\*[BU2]2 Free Software Foundation ++.COPYRIGHT "20\*[BU3]1\*[BU2]5 Free Software Foundation ++.AUTHOR "Deri James" "\*[UP .5p]and" "Peter Schaffter" ++.\" Cover author style ++.COVER_AUTHOR_STYLE \ ++ LEAD 15 \ ++ SPACE -.5v ++.\" Docheader author style ++.AUTHOR_STYLE \ ++ LEAD 14 \ ++ SPACE -.75 + .ATTRIBUTE_STRING "" \" Don't print 'by' ++.\" + .PDF_BOOKMARKS_OPEN 2 +-.\" Cover and page header +-.COVER TITLE AUTHOR COPYRIGHT MISC +-.HEADER_LEFT "James, Schaffter" +-.\" Page, style, formatting ++.\" Formatting style, margins + .PRINTSTYLE TYPESET + .L_MARGIN 2.5c + .R_MARGIN 2.5c + .B_MARGIN 2.5c +-.\" ++.\" General defaults + .FAM H + .FT R + .PT_SIZE 10.5 + .AUTOLEAD 3 +-.PARA_INDENT 0 \" Because we're spacing paragraphs. ++.PARA_INDENT 0 \" No indent because we're spacing paragraphs. ++.\" Copyright notice ++.COVERTEXT ++.SP .5v ++.QUAD CENTER ++.HY off ++.IB 8P ++This file is part of groff. ++.SP .5v ++Groff is free software. You can redistribute it ++and\*[FU3]/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. ++.SP .5v ++You should have received a copy of the GNU ++General Public License along with this program. ++If not, see: ++.SP .25v ++.PDF_WWW_LINK http://www.gnu.org/licenses/ ++.IQ CLEAR ++.HY ++.COVERTEXT end ++.\" Cover and page header ++.COVER TITLE AUTHOR COPYRIGHT COVERTEXT ++.HEADER_LEFT "James, Schaffter" + .\" + .COVER_LEAD +3.5 + .DOCHEADER_LEAD +3.5 + .\" Color for code snippets + .NEWCOLOUR dark-grey RGB #343434 + .\" Make QUOTE look like CODE +-.QUOTE_FAMILY C +-.QUOTE_FONT B +-.QUOTE_SIZE +1.5 +-.QUOTE_COLOR dark-grey +-.QUOTE_INDENT 9p +-.\" +-.CODE_FONT B +-.CODE_SIZE 115 +-.CODE_COLOR dark-grey +-.CONDENSE 87 +-.\" +-.HEADING_STYLE 1 NUMBER FONT B SIZE +1 BASELINE_ADJUST \n[.v]/5 +-.HEADING_STYLE 2 NUMBER FONT I SIZE +.25 BASELINE_ADJUST \n[.v]/5 ++.QUOTE_STYLE \ ++ FAMILY C \ ++ FONT B \ ++ SIZE +1.5 \ ++ COLOR dark-grey \ ++ INDENT 9p ++.\" ++.CODE_STYLE \ ++ FONT B \ ++ SIZE 115 \ ++ COLOR dark-grey ++.CONDENSE 87 \" Condense percentage used in COD ++.\" ++.HEADING_STYLE 1 \ ++ NUMBER \ ++ FONT B \ ++ SIZE +1 \ ++ BASELINE_ADJUST \n[.v]/5 ++.HEADING_STYLE 2 \ ++ NUMBER \ ++ FONT I \ ++ SIZE +.25 \ ++ BASELINE_ADJUST \n[.v]/5 + .\" + .FOOTNOTE_SIZE -1 + .\" Character definitions for program names, opts, etc. +@@ -119,10 +143,11 @@ + .TOC_ENTRY_STYLE 2 FONT I + .TOC_LEAD 14 + .\" +-.DOCHEADER_ADVANCE 5c \" Begin this distance down from top of page ++.DOCHEADER_ADVANCE 5c \" Begin docheader this distance down from top of page + .\" + .START + .\" ++.SP .5c + .HEADING 1 NAMED intro "Introduction" + .PP + .RW .12 +@@ -198,6 +223,7 @@ + heading for use later on when linking to it (see + .PDF_LINK internal SUFFIX ). + + If headings are being numbered, the heading number is prepended. ++.NO_SHIM off + .HEADING 2 NAMED target "Creating destination points at arbitrary locations" + .PP + Any part of a document can be a link destination, not just headings. +@@ -209,6 +235,7 @@ + \*[cod]HEADING\*[codx], \*[cod]\*[codx] is any unique name. + \*[cod]\*[codx] is optional. \*[cod]\*[codx] can now be linked + to from anywhere in the document. ++.sp 2.5p + .HEADING 2 NAMED internal "Creating internal links" + .PP + Internal links are clickable text areas that allow you to jump to +@@ -529,7 +556,7 @@ + .PP + Several features described in this manual are not available when + using \[pdfmom] with the \[-Tps] option, or when using \[pdfroff], or +-\[groff]\~\[-Tps]\~\[-mpdfmark]. ++\[groff]\~\[-Tps]\~\[-mpdfmark]: + .SP .25v + .QUAD LEFT + .HYPHENATION off +diff -Nuar groff-1.22.3.old/contrib/mom/examples/mon_premier_doc.mom groff-1.22.3/contrib/mom/examples/mon_premier_doc.mom +--- groff-1.22.3.old/contrib/mom/examples/mon_premier_doc.mom 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mom/examples/mon_premier_doc.mom 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,133 @@ ++.\" -*- mode: troff; coding: utf-8; -*- ++\# Copyright (C) 2015 Free Software Foundation, Inc. ++\# ++\# 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. ++\# ++\# A very simple document with basic elements: headings, paragraphs, ++\# lists, table of contents and clickable links. ++\# ++.TITLE "Mon Premier Document" ++.AUTHOR "Cicéron" ++.DOCTYPE DEFAULT ++.PRINTSTYLE TYPESET ++.PAPER A4 ++.DOC_COVERTITLE "Mon Premier Document" ++.DOC_COVER DOC_COVERTITLE ++.COVER TITLE AUTHOR ++.ATTRIBUTE_STRING "par" ++.TOC_HEADER_STRING "Table des matières" ++.AUTO_RELOCATE_TOC ++.HEADING_STYLE 1 NUMBER ++.HEADING_STYLE 2 NUMBER ++.INDENT_FIRST_PARAS ++.START ++\# ++.HEADING 1 "Les différentes versions" ++Voir également le chapitre sur ++.PDF_LINK evolution "les évolutions" ++possibles. ++.HEADING 2 "La version originale" ++.PP ++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non ++risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ++ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula ++massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci ++nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl ++sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, ++consequat in, pretium a, enim. Pellentesque congue. Ut in risus ++volutpat libero pharetra tempor. Cras vestibulum bibendum augue. ++Praesent egestas leo in pede. Praesent blandit odio eu enim. ++Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum ++primis in faucibus orci luctus et ultrices posuere cubilia Curae; ++Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. ++Maecenas adipiscing ante non diam sodales hendrerit. ++.PP ++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non ++risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ++ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula ++massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci ++nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl ++sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, ++consequat in, pretium a, enim. Pellentesque congue. Ut in risus ++volutpat libero pharetra tempor. Cras vestibulum bibendum augue. ++Praesent egestas leo in pede. Praesent blandit odio eu enim. ++Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum ++primis in faucibus orci luctus et ultrices posuere cubilia Curae; ++Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. ++Maecenas adipiscing ante non diam sodales hendrerit. ++.PP ++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non ++risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ++ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula ++massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci ++nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl ++sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, ++consequat in, pretium a, enim. Pellentesque congue. Ut in risus ++volutpat libero pharetra tempor. Cras vestibulum bibendum augue. ++Praesent egestas leo in pede. Praesent blandit odio eu enim. ++Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum ++primis in faucibus orci luctus et ultrices posuere cubilia Curae; ++Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. ++Maecenas adipiscing ante non diam sodales hendrerit. ++\# ++.HEADING 2 "La version moderne" ++.PP ++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non ++risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ++ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula ++massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci ++nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl ++sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, ++consequat in, pretium a, enim. Pellentesque congue. Ut in risus ++volutpat libero pharetra tempor. Cras vestibulum bibendum augue. ++Praesent egestas leo in pede. Praesent blandit odio eu enim. ++Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum ++primis in faucibus orci luctus et ultrices posuere cubilia Curae; ++Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. ++Maecenas adipiscing ante non diam sodales hendrerit. ++.PP ++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non ++risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ++ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula ++massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci ++nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl ++sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, ++consequat in, pretium a, enim. Pellentesque congue. Ut in risus ++volutpat libero pharetra tempor. Cras vestibulum bibendum augue. ++Praesent egestas leo in pede. Praesent blandit odio eu enim. ++Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum ++primis in faucibus orci luctus et ultrices posuere cubilia Curae; ++Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. ++Maecenas adipiscing ante non diam sodales hendrerit. ++\# ++.HEADING 1 NAMED evolution "Les évolutions du Lorem" ++.PP ++Trois axes de progressions sont envisageables: ++.LIST ++.SHIFT_LIST 3m ++.ITEM ++Lorem ipsum dolor sit amet. ++.ITEM ++Consectetur adipiscing elit. ++.ITEM ++.PDF_TARGET sed_non_risus ++Sed non risus. ++.LIST OFF ++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non ++risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ++ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula ++massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci ++nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl ++sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, ++consequat in, pretium a, enim. Pellentesque congue. Ut in risus ++volutpat libero pharetra tempor. Cras vestibulum bibendum augue. ++Praesent egestas leo in pede. Praesent blandit odio eu enim. ++Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum ++primis in faucibus orci luctus et ultrices posuere cubilia Curae; ++Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. ++Maecenas adipiscing ante non diam sodales hendrerit. ++\# ++.TOC_RV_SWITCH ++.TOC +diff -Nuar groff-1.22.3.old/contrib/mom/examples/README-fr.txt groff-1.22.3/contrib/mom/examples/README-fr.txt +--- groff-1.22.3.old/contrib/mom/examples/README-fr.txt 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mom/examples/README-fr.txt 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,111 @@ ++ -*- mode: text; coding: utf-8; -*- ++ Copyright (C) 2014-2015 Free Software Foundation, Inc. ++ ++ 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. ++ ++======================================================================== ++ ++Les fichiers dans ce répertoire vous permettent de voir mom en pleine ++action. ++ ++Si vous avez téléchargé et décompressé une version de mom depuis sa ++page d'accueil, vous verrez qu'aucun exemple n'est accompagné du ++fichier PDF (.pdf) correspondant, comme c'est le cas sur les versions ++pré-compilées de groff, ou groff compilé à partir des sources. ++ ++Je n'ai pas inclu les PDF parce que je voulais conserver l'archive mom ++aussi petite que possible. Pour générer les PDF, traitez les fichiers ++avec pdfmom(1). ++ ++ pdfmom -k letter.mom > letter.pdf ++ pdfmom mom-pdf.mom > mom-pdf.pdf ++ pdfmom -k mon_premier_doc.mom > mon_premier_doc.pdf ++ pdfmom sample_docs.mom > sample_docs.pdf ++ pdfmom typesetting.mom > typesetting.pdf ++ ++Les fichiers ++------------ ++ ++Tous les fichiers sont configurés pour le format lettre US, exceptés ++mom-pdf.mom et mon_premier_doc.mom, qui utilisent le format A4. ++ ++***typesetting.mom** ++ ++Le fichier typesetting.mom montre l'utilisation d'éléments de ++composition typographique: tabulations, tabulations intégrées dans des ++chaînes de caractères, remplissage de lignes, texte sur plusieurs ++colonnes et différents styles d'indentation; ainsi que certaines ++subtilités et réglages précis disponibles via des macros et des ++échappements en ligne ("inline escape", des commandes insérées ++directement dans le texte, par opposition aux macros). ++ ++Comme ce fichier montre également l'utilisation d'une petite image au ++milieu d'un texte et que cette image est la mascotte favorite de tout ++le monde -- Tux, le fichier PDF de cette image, penguin.pdf, a été ++ajouté dans ce répertoire. ++ ++***sample_docs.mom*** ++ ++Le fichier sample_docs.mom montre en exemple les trois styles de ++documents apportés par les macros de formattage de document de mom, ++ansi que l'utilisation de COLLATE. Il montre également certaines ++fonctionnalités PDF de mom dont l'écriture d'une ébauche de nouvelle ++ou des liens cliquables dans une table des matières. ++ ++Le dernier exemple démontre, par un texte séparé en deux colonnes, la ++souplesse de mom pour la conception de document. ++ ++Le PRINTSTYLE de ce fichier est TYPESET et vous donne une idée du ++comportement par défaut de mom pour la composition typographique de ++document. ++ ++Si vous souhaitez voir comment mom traite le même fichier quand ++PRINTSTYLE est TYPEWRITE (c'est-à-dire dactylographié, avec espace ++double) remplacez .PRINTSTYLE TYPESET par .PRINTSTYLE TYPEWRITE au ++début du fichier. ++ ++***letter.mom*** ++ ++Ceci est simplement l'exemple du tutorial de momdocs, prêt à être vu. ++ ++***mon_premier_doc.mom*** ++ ++Le fichier mon_premier_doc.mom est un exemple simple en français ++montrant l'utilisation d'éléments de formattage courants: titres de ++section, paragraphes, listes, table des matières et liens PDF ++cliquables. Il doit être généré avec l'option -k du fait de la ++présence de caractères accentués. ++ ++Un certain nombre de réglages ont également été changés pour ce ++document en français: ATTRIBUTE_STRING est utilisé pour remplacer ++"by" par "par" en tête de document (là où le titre et l'auteur sont ++affichés). TOC_HEADER_STRING sert à modifier le titre de la table des ++matières en "Table des matières" plutôt que "Table of Content". Enfin, ++le paramètre de configuration INDENT_FIRST_PARAS est activé afin ++d'indenter le premier paragraphe de chaque section -- ceci est l'usage ++en typographie française. ++ ++***mom-pdf.mom*** ++ ++Le manuel "Producing PDFs with mom and groff". ++ ++***mom.vim*** ++ ++Les règles de coloration syntaxique vim sont baséés sur celles ++fournies par Christian V. J. Brüssow (cvjb@cvjb.de). Copiez le fichier ++mom.vim dans votre répertoire ~/.vim/syntax directory; ensuite, ++autorisez la coloration syntaxique si ce n'est pas encore le cas: ++ ++ :syntax enable ++ou ++ :syntax on ++ ++***elvis_syntax.new*** ++ ++Ceux qui utilisent elvis, le clone de vi, peuvent directement ++copier-coller le contenu de ce fichier dans leur elvis.syn. Tous les ++fichiers ayant l'extension .mom auront la coloration syntaxique. Les ++règles dans elvis_syntax ne sont pas exhaustive, mais aideront ++beaucoup à rendre les fichiers mom plus lisibles. +diff -Nuar groff-1.22.3.old/contrib/mom/examples/README.txt groff-1.22.3/contrib/mom/examples/README.txt +--- groff-1.22.3.old/contrib/mom/examples/README.txt 2014-11-04 10:38:35.606519234 +0200 ++++ groff-1.22.3/contrib/mom/examples/README.txt 2015-04-23 20:57:03.000000000 +0300 +@@ -1,5 +1,5 @@ + -*- text -*- +- Copyright (C) 2004-2014 Free Software Foundation, Inc. ++ Copyright (C) 2004-2015 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright +@@ -18,16 +18,17 @@ + archive as lean as possible. To view the PDF output, process the + files with pdfmom(1). + +- pdfmom letter.mom > letter.pdf ++ pdfmom -k letter.mom > letter.pdf + pdfmom mom-pdf.mom > mom-pdf.pdf ++ pdfmom -k mon_premier_doc.mom > mon_premier_doc.pdf + pdfmom sample_docs.mom > sample_docs.pdf + pdfmom typesetting.mom > typesetting.pdf + + The files themselves + -------------------- + +-All are set up for US letter papersize except mom-pdf.mom, which +-uses A4. ++All are set up for US letter papersize except mom-pdf.mom and ++mon_premier_doc.mom, which uses A4. + + ***typesetting.mom** + +@@ -64,6 +65,21 @@ + This is just the tutorial example from the momdocs, ready for + previewing. + ++***mon_premier_doc.mom*** ++ ++The file, mon_premier_doc.mom, is a simple example in French showing ++the use of common elements: section headings, paragraphs, lists, table ++of contents and clickable links. It should be generated with option -k ++as there are some accented letters. ++ ++A few settings were also changed for this French document: ++ATTRIBUTE_STRING is used to replace "by" by "par" in the document ++header (where the title and the author are displayed). ++TOC_HEADER_STRING is used to modity the Table of Content title to ++"Table des matires". And finally, INDENT_FIRST_PARAS is used to ++indent the first paragraph of a section -- this is the usual ++convention in French typesetting. ++ + ***mom-pdf.mom*** + + The manual, Producing PDFs with mom and groff. +diff -Nuar groff-1.22.3.old/contrib/mom/examples/sample_docs.mom groff-1.22.3/contrib/mom/examples/sample_docs.mom +--- groff-1.22.3.old/contrib/mom/examples/sample_docs.mom 2014-11-04 10:38:35.607519221 +0200 ++++ groff-1.22.3/contrib/mom/examples/sample_docs.mom 2015-04-23 20:57:03.000000000 +0300 +@@ -1,4 +1,4 @@ +-\# Copyright (C) 2004-2014 Free Software Foundation, Inc. ++\# Copyright (C) 2004-2015 Free Software Foundation, Inc. + \# + \# Copying and distribution of this file, with or without modification, + \# are permitted in any medium without royalty provided the copyright +@@ -31,43 +31,102 @@ + \# subheads and paraheads. I've turned the feature on merely to + \# demonstrate it. + \# +-\# Reference macros (metadata) ++\# Information for the cover pages ++\# ++\# Title, subtitle and copyright for the document cover. ++\# ++.TITLE DOC_COVER \ ++ "Sample mom Documents" ++.SUBTITLE DOC_COVER \ ++ "Three types of mom documents" \ ++ "assembled and collated" \ ++ "by mom's author" ++.COPYRIGHT DOC_COVER \ ++ "2015 Peter Schaffter" ++\# ++\# What appears in the pdf viewer's window title ++\# ++.PDF_TITLE "Sample mom documents" ++\# ++\# Reference macros (metadata) for the first section of the collated ++\# document. + \# + .TITLE "Lake Attica's Shores" + .SUBTITLE "A Romance Novel" + .AUTHOR "Rosemary Winspeare" +-.COPYRIGHT "2004 Alma Podborski" +-.PDF_TITLE "Sample mom documents" ++.COPYRIGHT "2015 Alma Podborski" ++\# ++\# What to put on the cover for the whole document (in mom-speak, ++\# the "doc cover"). The title, subtitle, and author are what were ++\# given to TITLE DOC_COVER, SUBTITLE DOC_COVER, and COPYRIGHT ++\# DOC_COVER. + \# +-\# Additional information, for the cover ++.DOC_COVER TITLE SUBTITLE COPYRIGHT + \# +-.DOC_COVERTITLE "Sample mom Documents" +-.MISC "Three types of mom documents" "assembled and collated by mom's author" ++\# What to put on the first document's title page (in mom-speak, the ++\# "cover"). In this case, we're using the metadata from TITLE, ++\# SUBTITLE, AUTHOR and COPYRIGHT, which will also be used to ++\# generate the docheader (minus the copyright). ++\# ++.COVER TITLE AUTHOR DOCTYPE COPYRIGHT + \# + \# Docstyle macros (templates) + \# + .DOCTYPE NAMED "Outline" +-.PRINTSTYLE TYPESET \" Or TYPEWRITE to preview "typewritten, double-spaced" ++.PRINTSTYLE TYPESET + .PAPER LETTER + \# +-\# What to put on the cover and first title page ++\# Here we style the covers a bit. ++\# ++.DOC_COVER_TITLE_STYLE \ ++ SIZE +8 \ ++ SMALLCAPS \ ++ UNDERLINE 1 3p ++.DOC_COVER_SUBTITLE_STYLE \ ++ FONT I \ ++ SIZE +3 \ ++ LEAD 18 \ ++ SPACE .5v ++.DOC_COVER_COPYRIGHT_SIZE +.5 ++\# ++.COVER_TITLE_SIZE +5 ++.COVER_ATTRIBUTE_STYLE \ ++ SIZE +2 \ ++ SPACE .25v ++.COVER_AUTHOR_STYLE \ ++ SIZE +2 \ ++ LEAD 18 ++.COVER_DOCTYPE_STYLE \ ++ SIZE +4 \ ++ UNDERLINE DOUBLE 1 ++.COVER_COPYRIGHT_SIZE +.5 + \# +-.DOC_COVER DOC_COVERTITLE MISC +-.COVER TITLE AUTHOR DOCTYPE COPYRIGHT ++\# Here we style the docheader a bit. + \# +-\# Style for nested heading levels ++.SUBTITLE_SPACE .25v ++.DOCTYPE_UNDERLINE 1 2p ++\# ++\# Styles for nested heading levels + \# + \# The first two instances of level-1 headings will be paragraph heads + \# so we set the paragraph head style here, then change it when + \# level-1 headings become main heads. + \# +-.HEADING_STYLE 1 FONT BI SIZE +.25 +-.HEADING_STYLE 2 FONT B SIZE +.5 BASELINE_ADJUST \n[.v]/8 \" ie 1/8 the leading ++.HEADING_STYLE 1 \ ++ FONT BI \ ++ SIZE +.75 ++.HEADING_STYLE 2 \ ++ FONT B \ ++ SIZE +.5 \ ++ BASELINE_ADJUST \n[.v]/8 \" ie 1/8 the leading ++\# ++.AUTO_RELOCATE_TOC \" Move table of contents to the top of the doc ++.SPACE_TOC_ITEMS \" Prettify TOC spacing + \# +-.AUTO_RELOCATE_TOC +-.SPACE_TOC_ITEMS ++\# Begin the document + \# + .START ++\# + .PP + .HEADING 1 PARAHEAD "A note on the setting" + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam +@@ -99,8 +158,15 @@ + \# + \# Change level-1 style and add numbering to levels 1 and 2 + \# +-.HEADING_STYLE 1 FONT B SIZE +1.5 CAPS UNDERSCORE .5 2p QUAD C \ +- NO_SPACE_AFTER BASELINE_ADJUST +0 NUMBER ++.HEADING_STYLE 1 \ ++ FONT B \ ++ SIZE +1.5 \ ++ CAPS \ ++ UNDERSCORE .5 2p \ ++ QUAD C \ ++ NO_SPACE_AFTER \ ++ BASELINE_ADJUST +0 \ ++ NUMBER + .HEADING_STYLE 2 NUMBER + \# + .HEADING 1 "Part One" +@@ -168,32 +234,30 @@ + .PP + At vero eos et accusam et justo duo do\%lo\%res et ea rebum. Stet clita + kasd gubergren. Sea takimata sanctus est lorem ipsum dolor +-sit amet. Accusam et justo duo do\%lo\%res et ea rebum +-.SPREAD ++sit amet. Accusam et justo duo do\%lo\%res et ea rebum. Diam ++nonumy eirmod tempor invidunt ut labore et do\%lo\%re magna. + .RIGHT + \*[BD]\&...end of sample outline\c + .EL + .COLLATE + \# +-\# The .EL after the line "...end of sample outline" ensures that +-\# mom doesn't spring the page trap, which would deposit a header at +-\# the top of the next page. COLLATE doesn't print a page header +-\# on the first page of a collated document, but if the page trap +-\# has already deposited one there, COLLATE can't undo it. +-\# +-\# Normally, this isn't necessary; here we require it because the +-\# line falls right at the bottom of the page. +-\# +-\# Please notice, too, the use of "\&" before "..." Whenever an +-\# input line begins with either a period, an apostrophe or a space, +-\# you must precede it with \&, otherwise the line will disappear, +-\# even when, as here, there's an inline escape that starts the +-\# line. ++\# The '\c /.EL' keeps mom from depositing a line break which, ++\# because "...end of sample outline" falls exactly on the last ++\# baseline of the page, would spring the page trap that sets a ++\# header at the top of the next page. Since the next page is a ++\# title page, we don't want that. Normally, this isn't required, ++\# although using it routinely before COLLATE is a good habit. ++\# ++\# Notice, too, the use of "\&" before "..." Whenever an input line ++\# begins with either a period, an apostrophe or a space, you must ++\# precede it with \&, otherwise the line will disappear, even when, ++\# as here, there's an inline escape beforehand. + \# + \# ===================================================================== + \# +-\# Next, two pages of a chapter, set in DRAFT style, showing the use +-\# of the EPIGRAPH BLOCK macro and the QUOTE macro. ++\# Next, a document composed of two pages of a chapter, set in DRAFT ++\# style, showing the use of the EPIGRAPH BLOCK macro and the QUOTE ++\# macro. + \# + \# You'll notice that the starting page number of this "draft" is 1 (in + \# roman numerals). COPYSTYLE DRAFT always numbers the first page of a +@@ -214,10 +278,20 @@ + .EPIGRAPH_FONT I \" Epigraphs are normally set in roman + .DRAFT_WITH_PAGENUMBER \" Draft/revision info usually goes in the header + \# +-.COVER_MISC_FAMILY H +-.COVER_MISC_QUAD RIGHT ++\# Style the title page ++\# ++.COVER_CHAPTER_SIZE +3 ++.COVER_CHAPTER_TITLE_STYLE \ ++ SIZE +5 \ ++ SPACE .25v ++.COVER_MISC_SIZE +.5 ++\# ++\# What goes on the title page ++\# + .COVER CHAPTER+TITLE MISC + \# ++\# Begin the document ++\# + .START + .EPIGRAPH BLOCK + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam +@@ -225,7 +299,8 @@ + sed diam voluptua. + .RIGHT + \# +-\# If running PRINTSTYLE TYPEWRITE, add space before citation ++\# If running PRINTSTYLE TYPEWRITE, this adds space before ++\# attribution ("Joseph E. Blough") + \# + .if \n[#PRINT_STYLE]=1 .sp + \# +@@ -317,24 +392,45 @@ + \# create a stylesheet, along with some of the control macros that + \# can be used. + \# +-.TITLE "CONTROL EQUALS CHAOS" ++\# Style the title page ++\# ++.COVER_TITLE_CAPS ++.COVER_ATTRIBUTE_SPACE .5v ++.COVER_AUTHOR_STYLE \ ++ SIZE +1.5 \ ++ LEAD 14 \ ++ SPACE .25v ++.COVER_MISC_STYLE \ ++ QUAD L \ ++ SIZE +0 ++.COVER_COPYRIGHT_SIZE +0 ++\# ++\# What goes on the title page ++\# ++.COVER TITLE AUTHOR COPYRIGHT MISC ++\# ++.DOCTYPE DEFAULT ++.COPYSTYLE FINAL ++\# ++.TITLE "Control Equals Chaos" + .SUBTITLE "\*[ALD1]The Psychological and Auditory \ + Impact of Serial vs. Aleatoric Music\*[RLD1]" + .AUTHOR "Joe Chang" "and" "Brad Hegel Connors" +-.COPYRIGHT "2004 J. Chang, B.H. Connors +-.MISC "Submitted June 3, 2004" "\*[IT]Piano Quarterly\*[PREV]" ++.COPYRIGHT "2015 J. Chang, B.H. Connors ++.MISC "Submitted June 3, 2015" "\*[IT]Piano Quarterly\*[PREV]" + \# +-.DOCTYPE DEFAULT +-.COPYSTYLE FINAL ++\# Style the docheader ++\# ++.TITLE_CAPS ++.ATTRIBUTE_SPACE .33 ++.AUTHOR_SIZE +1 ++.SUBTITLE_SIZE +2 + \# + .L_MARGIN 6P + .R_MARGIN 4P+6p + .PT_SIZE 10 + .AUTOLEAD 1.5 + \# +-.AUTHOR_SIZE +.5 +-.SUBTITLE_SIZE +1 +-\# + .RECTO_VERSO + .PAGENUM 1 + \# +@@ -350,27 +446,30 @@ + .if \n[#PRINT_STYLE]=2 \{\ + . PARA_INDENT 1P + . QUOTE_INDENT 2 ++. BLOCKQUOTE_INDENT 2 + .\} + \# +-.HEADING_STYLE 1 QUAD L SIZE +0 NO_NUMBER NO_CAPS NO_UNDERSCORE \ +- NO_SPACE_AFTER BASELINE_ADJUST \n[.v]/8 \" ie 1/8 of the leading ++\# Style heading 1 + \# +-.BLOCKQUOTE_FAMILY H +-.BLOCKQUOTE_SIZE -2 +-.BLOCKQUOTE_AUTOLEAD 2 +-\# +-.COVERTITLE "\*[UP 3p]\E*[$TITLE]" \" Use $TITLE, but raise 3 points +-\# +-.COVER_LEAD +2 +-.COVER_AUTHOR_SIZE +1.5 +-.COVER_MISC_FAMILY T +-.COVER_MISC_QUAD L +-.COVER_MISC_SIZE +0 +-.COVER_COPYRIGHT_SIZE +0 ++.HEADING_STYLE 1 \ ++ QUAD L \ ++ SIZE +0 \ ++ NO_NUMBER \ ++ NO_CAPS \ ++ NO_UNDERSCORE \ ++ NO_SPACE_AFTER \ ++ BASELINE_ADJUST \n[.v]/8 \" ie 1/8 of the leading ++\# ++\# Style the blockquotes ++\# ++.BLOCKQUOTE_STYLE \ ++ FAMILY H \ ++ SIZE -2 \ ++ AUTOLEAD 2 + \# +-.COVER COVERTITLE AUTHOR COPYRIGHT MISC ++.COLUMNS 2 1P+6p \" Set in two columns + \# +-.COLUMNS 2 1P+6p ++\# Being the document + \# + .START + .PP +@@ -384,6 +483,7 @@ + invidunt ut labore et do\%lo\%re magna ali\%quyam erat. Sed diam voluptua + at vero eos et accusam et justo. + \# ++.if \n[#PRINT_STYLE]=2 .sp 1p \" A little tweak + .BLOCKQUOTE + Stet clita kasd gubergren, no sea takimata sanctus est lorem. + Ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy +diff -Nuar groff-1.22.3.old/contrib/mom/examples/typesetting.mom groff-1.22.3/contrib/mom/examples/typesetting.mom +--- groff-1.22.3.old/contrib/mom/examples/typesetting.mom 2014-11-04 10:38:35.607519221 +0200 ++++ groff-1.22.3/contrib/mom/examples/typesetting.mom 2015-04-23 20:57:03.000000000 +0300 +@@ -310,7 +310,7 @@ + simple enumerated lists. Nested lists are possible, as the example + shows; however, the more complex the nesting, the wiser it becomes + to use (string) tabs, as seen in Example 4. +-.RLD .25v \" Move upwards 1/2 linespace ++.RLD .5v \" Move upwards 1/2 linespace + .DBX .5 0 \n[.l]u 2P+9p \" Draw box; \n[.l]u means "the current line length" + .IB 6p \" Indent from both left and right margins + .ALD 14p +diff -Nuar groff-1.22.3.old/contrib/mom/.gitignore groff-1.22.3/contrib/mom/.gitignore +--- groff-1.22.3.old/contrib/mom/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mom/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++groff_mom.n ++penguin.ps ++stamp-strip ++om.tmac-s +diff -Nuar groff-1.22.3.old/contrib/mom/groff_mom.man groff-1.22.3/contrib/mom/groff_mom.man +--- groff-1.22.3.old/contrib/mom/groff_mom.man 2014-11-04 10:38:35.502520534 +0200 ++++ groff-1.22.3/contrib/mom/groff_mom.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,11 @@ + . + .\" The .SH was moved to this place in order to appease `apropos'. + . ++. ++.do nr groff_mom_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legalese + .\" -------------------------------------------------------------------- +@@ -80,9 +85,6 @@ + .. + . + . +-.do nr groff_mom_C \n[.C] +-.cp 0 +-. + .de TQ + .br + .ns +diff -Nuar groff-1.22.3.old/contrib/mom/Makefile.sub groff-1.22.3/contrib/mom/Makefile.sub +--- groff-1.22.3.old/contrib/mom/Makefile.sub 2014-11-04 10:38:35.502520534 +0200 ++++ groff-1.22.3/contrib/mom/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,230 +0,0 @@ +-# -*- makefile -*- +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# Written by Werner Lemberg (wl@gnu.org) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +- +-# These may be overridden if cross-compiling. +-GROFFBIN=$(top_builddir)/src/roff/groff/groff +-GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'` +-PDFMOMBIN=$(top_builddir)/src/devices/gropdf/pdfmom +- +-groff_bin_dirs=\ +- $(top_builddir)/src/roff/groff \ +- $(top_builddir)/src/roff/troff \ +- $(top_builddir)/src/devices/grops \ +- $(top_builddir)/src/devices/gropdf +- +-FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font +-TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -M$(srcdir) +-KFLAG=-k +- +-GROFF=\ +- GROFF_COMMAND_PREFIX= \ +- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ +- $(GROFFBIN) $(FFLAG) $(TFLAG) +- +-PDFMOM=\ +- GROFF_COMMAND_PREFIX= \ +- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ +- PDFMOM_BIN_PATH="$(top_builddir)/src/devices/gropdf" \ +- $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(KFLAG) +- +-MAN7=\ +- groff_mom.n +- +-NORMALFILES=\ +- mom.tmac +- +-# These files are processed with `strip.sed'. +-STRIPFILES=\ +- om.tmac +- +-HTMLDOCFILES=\ +- momdoc/stylesheet.css \ +- momdoc/appendices.html \ +- momdoc/color.html \ +- momdoc/cover.html \ +- momdoc/definitions.html \ +- momdoc/docelement.html \ +- momdoc/docprocessing.html \ +- momdoc/goodies.html \ +- momdoc/graphical.html \ +- momdoc/headfootpage.html \ +- momdoc/images.html \ +- momdoc/inlines.html \ +- momdoc/intro.html \ +- momdoc/letters.html \ +- momdoc/macrolist.html \ +- momdoc/rectoverso.html \ +- momdoc/refer.html \ +- momdoc/reserved.html \ +- momdoc/tables-of-contents.html \ +- momdoc/toc.html \ +- momdoc/typesetting.html \ +- momdoc/using.html \ +- momdoc/version-2.html +- +-EXAMPLEFILES=\ +- examples/letter.mom \ +- examples/mom-pdf.mom \ +- examples/sample_docs.mom \ +- examples/typesetting.mom \ +- examples/README.txt \ +- examples/elvis_syntax \ +- examples/elvis_syntax.new \ +- examples/penguin.ps \ +- examples/penguin.pdf \ +- examples/mom.vim +- +-PROCESSEDEXAMPLEFILES=\ +- examples/letter.pdf \ +- examples/mom-pdf.pdf \ +- examples/sample_docs.pdf \ +- examples/typesetting.pdf +- +-HTMLDOCFILES_=`echo $(HTMLDOCFILES) | sed 's|momdoc/||g'` +-EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'` +-PROCESSEDEXAMPLEFILES_=`echo $(PROCESSEDEXAMPLEFILES) | sed 's|examples/||g'` +-PDFDOCFILE=mom-pdf.pdf +- +-MOSTLYCLEANADD=\ +- stamp-strip \ +- penguin.ps \ +- penguin.pdf \ +- $(PROCESSEDEXAMPLEFILES) \ +- examples/stamp \ +- om.tmac-s +- +-RM=rm -f +- +-#.SUFFIXES: .mom .ps +-#.mom.ps: +-# $(GROFF) -Tps -mom $< >$@ +- +-.SUFFIXES: .mom .pdf +-.mom.pdf: +- LC_ALL=C $(PDFMOM) $< >$@ +- +-all: stamp-strip $(make_pdfexamples) +- +-$(PROCESSEDEXAMPLEFILES): penguin.ps penguin.pdf examples/stamp +- +-pdfexamples: $(PROCESSEDEXAMPLEFILES) +- +-penguin.ps: +- cp $(srcdir)/examples/penguin.ps . +-penguin.pdf: +- cp $(srcdir)/examples/penguin.pdf . +- +-examples/stamp: +- -test -d examples || $(mkinstalldirs) examples +- touch $@ +- +-install_data: install_always \ +- $(make_install_pdfdoc) $(make_install_shipped_htmldoc) \ +- $(make_install_examples) +- +-install_always: stamp-strip $(NORMALFILES) +- -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir) +- for f in $(NORMALFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \ +- done +- for f in $(STRIPFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \ +- done +- +-install_pdfdoc: +-# Since this uses examples/, it's in install_pdfexamples +- +-install_shipped_htmldoc: install_always $(HTMLDOCFILES) +- -test -d $(DESTDIR)$(htmldocdir)/mom \ +- || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/mom +- for f in $(HTMLDOCFILES_); do \ +- $(RM) $(DESTDIR)$(htmldocdir)/mom/$$f; \ +- $(INSTALL_DATA) $(srcdir)/momdoc/$$f \ +- $(DESTDIR)$(htmldocdir)/mom/$$f; \ +- done +- +- +-install_examples: install_examples_always $(make_install_pdfexamples) +- +-install_examples_always: $(EXAMPLEFILES) +- -test -d $(DESTDIR)$(exampledir)/mom \ +- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/mom +- for f in $(EXAMPLEFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/mom/$$f; \ +- $(INSTALL_DATA) $(srcdir)/examples/$$f \ +- $(DESTDIR)$(exampledir)/mom/$$f; \ +- done +- +-install_pdfexamples: install_examples_always $(PROCESSEDEXAMPLEFILES) +- for f in $(PROCESSEDEXAMPLEFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/mom/$$f; \ +- $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/mom/$$f; \ +- done +- -test -d $(DESTDIR)$(pdfdocdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(pdfdocdir) +- for f in $(PDFDOCFILE); do \ +- $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \ +- ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f; \ +- done +- +-stamp-strip: $(STRIPFILES) +- for f in $(STRIPFILES); do \ +- $(RM) $$f-s; \ +- LANG=C LC_ALL=C \ +- sed -f $(top_srcdir)/tmac/strip.sed $(srcdir)/$$f >$$f-s; \ +- done +- touch $@ +- +-uninstall_sub: uninstall_always \ +- $(make_uninstall_pdfdoc) $(make_uninstall_shipped_htmldoc) \ +- $(make_uninstall_examples) +- +-uninstall_always: +- -for f in $(NORMALFILES) $(STRIPFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- done +- +-uninstall_pdfdoc: uninstall_always +-# Since that used examples/, it's in uninstall_pdfexamples +- +-uninstall_shipped_htmldoc: uninstall_always +- -for f in $(HTMLDOCFILES_); do \ +- $(RM) $(DESTDIR)$(htmldocdir)/mom/$$f; \ +- done +- -test -d $(DESTDIR)$(htmldocdir)/mom && \ +- rmdir $(DESTDIR)$(htmldocdir)/mom +- +-uninstall_examples: uninstall_examples_always $(make_uninstall_pdfexamples) +- -test -d $(DESTDIR)$(exampledir)/mom && \ +- rmdir $(DESTDIR)$(exampledir)/mom +- +-uninstall_examples_always: +- -for f in $(EXAMPLEFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/mom/$$f; \ +- done +- +-uninstall_pdfexamples: uninstall_examples_always +- -for f in $(PDFDOCFILE); do \ +- $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \ +- done +- -for f in $(PROCESSEDEXAMPLEFILES_); do \ +- $(RM) $(DESTDIR)$(exampledir)/mom/$$f; \ +- done +diff -Nuar groff-1.22.3.old/contrib/mom/mom.am groff-1.22.3/contrib/mom/mom.am +--- groff-1.22.3.old/contrib/mom/mom.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/contrib/mom/mom.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,168 @@ ++# Copyright (C) 2002-2014 ++# Free Software Foundation, Inc. ++# Written by Werner Lemberg (wl@gnu.org) ++# Automake migration by Bertrand Garrigues ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++mom_srcdir = $(top_srcdir)/contrib/mom ++mom_builddir = $(top_builddir)/contrib/mom ++ ++# pdfmom command used to generated .pdf ++MOM_TFLAG = -M$(mom_srcdir) -M$(mom_builddir) ++MOM_KFLAG = -k ++MOMPDFMOM = \ ++ GROFF_COMMAND_PREFIX= \ ++ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ ++ PDFMOM_BIN_PATH="$(top_builddir)" \ ++ $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG) ++ ++man7_MANS += contrib/mom/groff_mom.n ++ ++# Files installed in $(tmacdir). ++# MOMNORMALFILES are located in the source tree. ++# om.tmac is generated in the build tree from the unstripped file om.tmac-u with ++# strip.sed ++MOMNORMALFILES = \ ++ contrib/mom/mom.tmac ++MOMSTRIPFILES = \ ++ contrib/mom/om.tmac ++momtmacdir = $(tmacdir) ++nodist_momtmac_DATA = $(MOMSTRIPFILES) ++dist_momtmac_DATA = $(MOMNORMALFILES) ++ ++# Files installed in htmldocdir/mom ++if INSTALL_SHIPPED_HTML ++MOMHTMLDOCFILES=\ ++ contrib/mom/momdoc/stylesheet.css \ ++ contrib/mom/momdoc/appendices.html \ ++ contrib/mom/momdoc/color.html \ ++ contrib/mom/momdoc/cover.html \ ++ contrib/mom/momdoc/definitions.html \ ++ contrib/mom/momdoc/docelement.html \ ++ contrib/mom/momdoc/docprocessing.html \ ++ contrib/mom/momdoc/goodies.html \ ++ contrib/mom/momdoc/graphical.html \ ++ contrib/mom/momdoc/headfootpage.html \ ++ contrib/mom/momdoc/images.html \ ++ contrib/mom/momdoc/inlines.html \ ++ contrib/mom/momdoc/intro.html \ ++ contrib/mom/momdoc/letters.html \ ++ contrib/mom/momdoc/macrolist.html \ ++ contrib/mom/momdoc/rectoverso.html \ ++ contrib/mom/momdoc/refer.html \ ++ contrib/mom/momdoc/reserved.html \ ++ contrib/mom/momdoc/tables-of-contents.html \ ++ contrib/mom/momdoc/toc.html \ ++ contrib/mom/momdoc/typesetting.html \ ++ contrib/mom/momdoc/using.html \ ++ contrib/mom/momdoc/version-2.html ++momhtmldir = $(htmldocdir)/mom ++momhtml_DATA = $(MOMHTMLDOCFILES) ++endif ++ ++# Files installed in $(examplesdir)/mom. MOMEXAMPLEFILES are located ++# in the source tree, while MOMPROCESSEDEXAMPLEFILES are generated in ++# the build tree. ++MOMEXAMPLEFILES=\ ++ contrib/mom/examples/letter.mom \ ++ contrib/mom/examples/mom-pdf.mom \ ++ contrib/mom/examples/mon_premier_doc.mom \ ++ contrib/mom/examples/sample_docs.mom \ ++ contrib/mom/examples/typesetting.mom \ ++ contrib/mom/examples/README.txt \ ++ contrib/mom/examples/README-fr.txt \ ++ contrib/mom/examples/elvis_syntax \ ++ contrib/mom/examples/elvis_syntax.new \ ++ contrib/mom/examples/penguin.ps \ ++ contrib/mom/examples/penguin.pdf \ ++ contrib/mom/examples/mom.vim ++if BUILD_EXAMPLES ++momexampledir = $(exampledir)/mom ++dist_momexample_DATA = $(MOMEXAMPLEFILES) ++else ++EXTRA_DIST += $(MOMEXAMPLEFILES) ++endif ++ ++if BUILD_PDFEXAMPLES ++MOMPROCESSEDEXAMPLEFILES = \ ++ contrib/mom/examples/letter.pdf \ ++ contrib/mom/examples/mom-pdf.pdf \ ++ contrib/mom/examples/mon_premier_doc.pdf \ ++ contrib/mom/examples/sample_docs.pdf \ ++ contrib/mom/examples/typesetting.pdf ++momprocessedexampledir = $(exampledir)/mom ++nodist_momprocessedexample_DATA = $(MOMPROCESSEDEXAMPLEFILES) ++endif ++ ++# For this list of files we add a symlink from $(exampledir)/mom to $(pdfdocdir) ++PDFDOCFILE = mom-pdf.pdf ++ ++EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \ ++ contrib/mom/BUGS \ ++ contrib/mom/ChangeLog \ ++ contrib/mom/NEWS \ ++ contrib/mom/TODO \ ++ contrib/mom/copyright \ ++ contrib/mom/groff_mom.man \ ++ contrib/mom/om.tmac-u ++ ++MOSTLYCLEANFILES += \ ++ $(MOMPROCESSEDEXAMPLEFILES) \ ++ contrib/mom/om.tmac \ ++ penguin.ps \ ++ penguin.pdf ++ ++# Rule to generated .pdf files from .mom files ++SUFFIXES += .mom .pdf ++.mom.pdf: ++ @$(MKDIR_P) `dirname $@` ++ LC_ALL=C $(MOMPDFMOM) $< >$@ ++ ++$(MOMPROCESSEDEXAMPLEFILES): $(MOMSTRIPFILES) $(MOMNORMALFILES) \ ++ groff troff gropdf pdfmom penguin.ps penguin.pdf \ ++ gnu.eps font/devpdf/build_font_files ++ ++penguin.ps: ++ cp $(mom_srcdir)/examples/penguin.ps $@ ++penguin.pdf: ++ cp $(mom_srcdir)/examples/penguin.pdf $@ ++ ++$(MOMSTRIPFILES): $(top_srcdir)/tmac/strip.sed ++ @$(MKDIR_P) `dirname $@` ++ LANG=C LC_ALL=C \ ++ sed -f $(top_srcdir)/tmac/strip.sed $(mom_srcdir)/`basename $@`-u > $@; ++ ++install-data-hook: install_mom ++install_mom: ++if BUILD_PDFEXAMPLES ++ for f in $(PDFDOCFILE); do \ ++ $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \ ++ ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f; \ ++ done ++endif ++ ++uninstall_groffdirs: uninstall_mom ++uninstall_mom: ++ for f in $(PDFDOCFILE); do \ ++ $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \ ++ done ++ if test -d $(DESTDIR)$(exampledir)/mom; then \ ++ rmdir $(DESTDIR)$(exampledir)/mom; \ ++ fi ++ if test -d $(DESTDIR)$(htmldocdir)/mom; then \ ++ rmdir $(DESTDIR)$(htmldocdir)/mom; \ ++ fi +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/appendices.html groff-1.22.3/contrib/mom/momdoc/appendices.html +--- groff-1.22.3.old/contrib/mom/momdoc/appendices.html 2014-11-04 10:38:35.612519159 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/appendices.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + + +
+-

COVER and DOC_COVER

++

DOC_COVER and COVER

+
+ +-
+-Macro: COVER (see required and optional arguments, below) ++
++Macro: DOC_COVER (see argument list, below) +
+ +-
+-Macro: DOC_COVER (see required and optional arguments, below) ++
++Macro: COVER (see argument list, below) +
+ +-
+-Required argument: TITLE | DOCTITLE | COVERTITLE | CHAPTER | CHAPTER_TITLE | CHAPTER+TITLE +-
+- +-
+-Optional arguments: [ SUBTITLE AUTHOR DOCTYPE COPYRIGHT MISC BLANKPAGE PDF_OUTLINE_LABEL <label> ] +-
+- +-
+-

+-Note: +-These macros should be placed in the style sheet section of your +-document setup (see +-Tutorial – Setting up a mom document), +-ie after PRINTSTYLE (and/or DOCTYPE and/or COPYSTYLE), but before +-START. +-

+-
+- +-

+-COVER and DOC_COVER behave identically. The reason mom provides ++

++DOC_COVER and COVER behave identically. The reason mom provides + two macros for cover page generation is so that you can have two + different kinds of covers with different information on each. +

+@@ -267,50 +279,166 @@ + author’s) name, and perhaps the copyright date. Subsequently, + you could use COVER, after each .COLLATE but before each + .START, +-to generate a cover page (or cover ”sheet”, if you +-prefer) containing just the name of the section. ++to generate a cover page (title page, cover sheet) containing ++just the name of the section, for example, “Part 1”. +

+ +-

The required argument

+- +

+-Both COVER and DOC_COVER, whenever invoked, require a first +-argument, as listed above. This first argument will become the +-first bit of information mom prints on the cover or doc cover (ie +-the title). ++The arguments to DOC_COVER and COVER tell mom ++what you’d like on cover pages. You may give as many or as ++few arguments as you need, in any order. A very common setup would ++be: ++
++ ++ .COVER TITLE AUTHOR COPYRIGHT ++ +

+ +-

+-In order for the information to appear, you must, of course, have +-given mom the appropriate +-reference macro. +-A list of first arguments with their equivalent reference macros follows. +-

+- +-
+-
TITLE
+-
+- – means the argument you gave to TITLE +-
+-
DOCTITLE
+-
+- – means the argument you gave to DOCTITLE +-
+-
COVERTITLE
+-
+- – means the argument you gave to COVERTITLE +- or +- DOC_COVERTITLE +-
+-
CHAPTER, CHAPTER_TITLE, CHAPTER+TITLE
+-
+- – see below, How the CHAPTER argument and friends work +-
+-
++

The argument list

+ +-
How the CHAPTER argument and friends work
++

++The arguments to COVER and DOC_COVER tell mom ++what you want on the cover page: ++
++ ++ TITLE | DOCTITLE | DOC_COVERTITLE | COVERTITLE ++ CHAPTER | CHAPTER_TITLE | CHAPTER+TITLE ++ SUBTITLE ++ AUTHOR ++ DOCTYPE ++ DOC_COVERTEXT | COVERTEXT ++ DOC_COVER_IMAGE | COVER_IMAGE ++ COPYRIGHT ++ MISC ++ PDF_OUTLINE_LABEL "<label>" ++ BLANKPAGE ++ ++

++ ++

What the arguments mean

++ ++
++
TITLE
++
– the string(s) you gave to ++ TITLE ++
++
DOCTITLE
++
– the string(s) you gave to ++ DOCTITLE ++
++
DOC_COVERTITLE / COVERTITLE
++
– the string(s) you gave to ++ DOC_COVERTITLE ++ or ++ COVERTITLE ++
++
CHAPTER, CHAPTER_TITLE, CHAPTER+TITLE
++
– see below, ++ How the CHAPTER argument and friends work ++
++
SUBTITLE
++
– the string(s) you gave to ++ SUBTITLE ++
++
AUTHOR
++
– the string(s) you gave to ++ AUTHOR ++
++
DOCTYPE
++
– the string you gave to ++ DOCTYPE NAMED ++
++
DOC_COVERTEXT / COVERTEXT
++
– the block of type you entered for ++ DOC_COVERTEXT ++ or ++ COVERTEXT ++
++
DOC_COVER_IMAGE / COVER_IMAGE
++
– the image file you gave to ++ DOC_COVER_IMAGE ++ or ++ COVER_IMAGE ++
++
COPYRIGHT
++
– the string you gave to ++ COPYRIGHT ++
++
MISC
++
– the string(s) you gave to ++ MISC ++
++
PDF_OUTLINE_LABEL <label>
++
++ ++ By default, mom identifies doc-covers in the outline panel of PDF ++ viewers with the prepended label, “Cover:”, and covers ++ with the label “Title Page:”. If you would like ++ to change the label, give the PDF_OUTLINE_LABEL ++ argument to DOC_COVER or COVER along with the new label, in ++ quotation marks, as in this example: ++
++   .COVER TITLE AUTHOR COPYRIGHT PDF_LABEL "Cover Sheet: " ++ ++
++
BLANKPAGE
++
++ ++ If the final argument to DOC_COVER or COVER is BLANKPAGE, ++ mom will insert a blank page after the doc-cover or cover. This is ++ particularly useful if you intend to print your document two-sided, ++ since, in two-sided printing, there may be instances where you do ++ not want text on the reverse side of cover or title pages ++ ++ ++ If you enable ++ DOC_COVERS_COUNT_PAGES ++ and/or ++ COVERS_COUNT_PAGES, ++ the blank page will be taken into account in the pagination ++ scheme, though no page number appears on it. Otherwise, blank ++ pages are invisible to mom's pagination. ++ ++
++
++ ++

++Please note that in all cases, if you have passed ++a reference macro one of the optional arguments, ++DOC_COVER or COVER (e.g. ++.TITLE DOC_COVER "Title"), mom will print the ++appropriate string on the appropriate cover page. Thus, ++
++ ++ .TITLE DOC_COVER "Collected Essays" ++ .TITLE COVER "1985-2015" ++ .TITLE "Neo-liberalism: Who Did They Think They Were Fooling?" ++ .DOC_COVER TITLE ++ .COVER TITLE ++ ++will print “Collected Essays” on the doc-cover page, ++“1985-2015” on the cover page, and, assuming the ++docheader hasn’t been disabled, “Neo-liberalism: Who ++Did They Think They Were Fooling?” as the title in the ++docheader. ++

+ +

++Note that ++
++ ++ .DOC_COVERTITLE "Collected Essays" ++ .COVERTITLE "1985-2015" ++ .TITLE "Neo-liberalism: Who Did They Think They Were Fooling?" ++ .DOC_COVER DOC_COVERTITLE ++ .COVER COVERTITLE ++ ++could be used to accomplish the same thing. ++

++ ++
How the CHAPTER argument and friends work
++ ++

+ • CHAPTER +
+ The CHAPTER argument will print the +@@ -322,7 +450,7 @@ + + .CHAPTER 1 + .CHAPTER_TITLE "The Bonny Blue Yonder" +- .COVER CHAPTER \"(or .DOC_COVER CHAPTER) ++ .COVER CHAPTER \" (or .DOC_COVER CHAPTER) + + will print (and only print) +
+@@ -371,72 +499,196 @@ + +

+ +-

The optional arguments

++
++

DOC_COVERTEXT and COVERTEXT

++
++ ++
++Macro: DOC_COVERTEXT <toggle> ++
++
++Macro: COVERTEXT <toggle> ++
++ ++

++• Must come after ++PRINTSTYLE ++

++ ++

++DOC_COVERTEXT and COVERTEXT allow you to add ++text to doc-covers and covers in addition to, or instead of, what is ++generated by mom from the arguments you give to ++DOC_COVER ++and ++COVER. ++

++ ++

++Invoke .DOC_COVERTEXT or .COVERTEXT on a line ++by itself, follow it with the text and formatting you desire, and ++terminate the text block with .DOC_COVERTEXT OFF or ++COVERTEXT OFF (or QUIT, END, DONE, etc.). ++

++ ++

++By default, cover text is set over the full line length of the ++document, using the style parameters of ++running text. ++Therefore, as noted, these macros must come after PRINTSTYLE ++and any global style changes (margins, family, size, leading, ++etc.). Formatting within a cover text block must be done ++“manually” with mom’s typesetting macros; ++PP ++is the only allowed document element tag. ++

++ ++

Placement

+ +

+-The remainder of the arguments to COVER and +-DOC_COVER are optional. They refer specifically to +-the information you gave the +-reference macros +-bearing the same name as the arguments. You may enter as many or as +-few as you like, in any order. ++If you do not instruct mom to put anything on doc-cover or cover ++pages except DOC_COVERTEXT or COVERTEXT, the ++cover text will begin at the document’s top margin. You must ++use ++SP ++or ++ALD ++to move it further down the page. Equally, if only ++COPYRIGHT and/or MISC are to go on the pages, ++cover text begins at the top margin. In all other cases, cover text ++begins below the last element on the page, separated by a blank ++line. +

+ +-
What the DOCTYPE argument means
++

++DOC_COVERTEXT and COVERTEXT are particularly ++useful for putting abstracts on cover pages, as technical reports ++often require. ++

+ +

+-When you pass COVER or DOC_COVER +-the argument, DOCTYPE, it refers to the argument you gave +-to +-DOCTYPE NAMED. +-For example, if, in your +-docstyle macros +-you gave a ++Here's a simple recipe for setting an abstract: +
+ +- .DOCTYPE NAMED "Abstract" ++ .COVERTEXT ++ .FT BI ++ .PT_SIZE 14 ++ .LS 14 ++ .CENTER ++ Abstract ++ .SP .5v ++ .FT R ++ .PT_SIZE 12 ++ .IB 6P ++ .JUSTIFY ++ Text of Abstract... ++ .COVERTEXT OFF + +-the argument, DOCTYPE, given to the COVER or DOC_COVER +-macros, would mean that you wanted the word, Abstract, to appear on +-the cover or doc cover underneath the title and/or author(s), just +-as it would in the +-docheader. ++Assuming you have told mom to put the title and author on the ++cover page, the abstract will appear beneath the author with a ++14-point bold-italic title, centered, with the text of the abstract ++medium-roman and justified, indented 6 picas from both margins. +

+ +-
What the BLANKPAGE argument means
++
++

DOC_COVER_IMAGE and COVER_IMAGE

++
++ ++
++Macro: DOC_COVER_IMAGE <image> <width> <height> [ -L | -C | -R | -I <indent> <Y-pos> [ <X-pos> ] ] ++
++ ++
++Macro: COVER_IMAGE <image> <width> <height> [ -L | -C | -R | -I <indent> <Y-pos> [ <X-pos> ] ] ++
+ +

+-If the final argument to DOC_COVER or COVER is BLANKPAGE, +-mom will insert a blank page after the doc cover or cover. This is +-particularly useful if you intend to print your document two-sided, +-since, in two-sided printing, there may be instances where you do +-not want text on the reverse side of cover or title pages. ++There are times you need a full page image on a cover, for example ++the jacket of a book. Equally, there are times when you need a small ++image on the cover, perhaps a company logo. +

+ +

+-If you enable DOC_COVERS_COUNT_PAGES and/or COVERS_COUNT_PAGES, the +-blank page will be taken into account in the pagination scheme, +-though no page number appears on it. Otherwise, blank pages are +-invisible to mom's pagination. ++DOC_COVER_IMAGE and COVER_IMAGE take the same arguments ++as PDF_IMAGE, and in the same order. Consult ++PDF_IMAGE ++for a desciption. +

+ +-
What the PDF_OUTLINE_LABEL argument means
++

++Two additional arguments allow you to place images using x-y ++coordinates. Please note that if you use x-y coordinates for ++positioning, Y-pos comes before X-pos in the order of ++arguments. ++

+ +

+-By default, mom identifies doccovers in the outline panel of PDF +-viewers with the prepended string, “Cover:”, and covers +-with the string “Title Page:”. If you would like +-to change the strings, pass the PDF_OUTLINE_LABEL +-argument to COVER or DOCCOVER, along with the new string. ++Like PDF_IMAGE, the image file must be in PDF format. Mom ++apologizes, but PostScript images are not supported for inclusion on ++covers. See ++Image conversion and file processing ++for instructions on converting various image types to PDF, and ++here ++for instructions on obtaining image dimensions. +

+ +- ++

Positioning of doc-cover and cover images

+ +-
++

++With no arguments other than <file name>, ++<width>, and <height>, ++DOC_COVER_IMAGE and COVER_IMAGE place images flush with the top ++left corner of the printer sheet. This allows placing full-page ++background images on covers. For example, assuming a US-letter page ++size, ++
++ ++ .DOC_COVER_IMAGE image.pdf 612p 792p ++ .DOC_COVER TITLE AUTHOR DOC_COVER_IMAGE ++ ++will fill the doc-cover page with “image.pdf” and set ++the title and author in their usual locations. ++

++ ++

++For smaller images, the horizontal position is established ++with one of the -L, -C, -R, or ++-I <indent> arguments, just like ++PDF_IMAGE. ++You may instead use the X-pos argument, provided that it ++is preceded by a Y-pos argument. The values given to ++-I, Y-pos and X-pos must have a ++unit of measure ++appended to them. ++

++ ++

++Vertical positioning of smaller images requires the Y-pos ++argument (which is why it precedes X-pos in the order of ++arguments) otherwise the image will be flush with the top edge of ++the printer sheet ++

++ ++

++The positioning of images does not effect the placement of type on ++doc-cover and cover pages. ++

++ ++
++

++Tip: ++The combination of ++COVERTEXT ++and COVER_IMAGE make it possible to design covers entirely to your ++own specifications. ++

++
++ ++
+

Enabling/disabling automatic generation of cover pages

+
+ +-
++
+ Macro: COVERS <toggle> +
+ +@@ -449,7 +701,7 @@ + COVER + or + DOC_COVER +-directive, she will print the cover or doc cover. In a document ++directive, she will print the cover or doc-cover. In a document + that contains sections, articles or chapters formerly treated as + ”one-off’s” but now being + collated, +@@ -458,12 +710,11 @@ + +

+ Mom lets you selectively enable or disable the generation of covers +-and/or doc covers with the toggle macros, COVERS and DOC_COVERS. ++and/or doc-covers with the toggle macros, COVERS and DOC_COVERS. + Because they’re toggle macros, simply invoking them by +-themselves enables automatic cover or doc cover generation, while ++themselves enables automatic cover or doc-cover generation, while + invoking them with any argument at all (OFF, QUIT, X, +-etc) disables cover or doc cover generation. +-

++etc) disables cover or doc-cover generation.

+ +
+

+@@ -482,10 +733,10 @@ + +

+ +-

Control macros for covers and doc covers

++

Control macros for doc-covers and covers

+ +

+-The default typographic appearance of the items on a cover or doc ++The default typographic appearance of the items on a doc-cover or + cover is identical to that of the items in a + docheader. + (See +@@ -501,111 +752,80 @@ + characteristics: +

+
    +-
  • the COPYRIGHT line is set in the bottom right hand corner +- of the page, 2 ++
  • the COPYRIGHT line is set flush with the document’s right ++ and bottom margins, 2 + point sizes + smaller than the size of + running text +
    • +-
  • MISC lines are set in the bottom left hand +- corner of the page, in the same family, font and point size +- as the copyright line. ++
  • MISC lines are set flush with the document’s left and bottom ++ margins, in the same family, font and point size as the ++ copyright line. +
    • +
+ +

+-The defaults for the entirety of covers and doc covers, and all the ++The defaults for the entirety of doc-covers and covers, and all the + elements thereon, can be changed with control macros whose defaults +-and arguments are identical to the corresponding control macros +-governing docheaders. The only difference is the name by which you +-invoke them. ++and arguments are identical to the corresponding ++Control macros for docheaders ++(q.v.) The only difference is the name by which you invoke them. Wherever ++DOCHEADER is used for overall changes, replace it ++with DOC_COVER or COVER. For part-by-part ++changes, prepend DOC_COVER_ or COVER_ to the ++part/parameter. +

+ +

+-A complete list of cover and doc cover control macros follows. +-Please refer to +-docheader control +-in order to get the defaults and any special instructions for usage. +-

+- +-

Cover / doc cover control macros and defaults

+- +-
+- +- +-COVER_ADVANCE DOC_COVER_ADVANCE -+ +-COVER_FAMILY DOC_COVER_FAMILY | like +-COVER_LEAD DOC_COVER_LEAD | DOCHEADER_<spec> +-COVER_QUAD DOC_COVER_QUAD -+ +- +-COVER_TITLE_FAMILY DOC_COVER_TITLE_FAMILY -+ +-COVER_TITLE_FONT DOC_COVER_TITLE_FONT | like +-COVER_TITLE_COLOR DOC_COVER_TITLE_COLOR | TITLE_<spec> +-COVER_TITLE_SIZE DOC_COVER_TITLE_SIZE -+ +- +-COVER_CHAPTER_TITLE_FAMILY DOC_COVER_CHAPTER_TITLE_FAMILY -+ +-COVER_CHAPTER_TITLE_FONT DOC_COVER_CHAPTER_TITLE_FONT | like +-COVER_CHAPTER_TITLE_COLOR DOC_COVER_CHAPTER_TITLE_COLOR | CHAPTER_TITLE_<spec> +-COVER_CHAPTER_TITLE_SIZE DOC_COVER_CHAPTER_TITLE_SIZE -+ +- +-COVER_SUBTITLE_FAMILY DOC_COVER_SUBTITLE_FAMILY -+ +-COVER_SUBTITLE_FONT DOC_COVER_SUBTITLE_FONT | like +-COVER_SUBTITLE_COLOR DOC_COVER_SUBTITLE_COLOR | SUBTITLE_<spec> +-COVER_SUBTITLE_SIZE DOC_COVER_AUTHOR_SIZE -+ +- +-COVER_ATTRIBUTE_COLOR DOC_COVER_ATTRIBUTE_COLOR - like ATTRIBUTE_COLOR +- - the macro, ATTRIBUTE_STRING, controls the attribution string +- for both docheaders and cover pages; cover pages have no +- separate ATTRIBUTE_STRING macro +- +-COVER_AUTHOR_FAMILY DOC_COVER_AUTHOR_FAMILY -+ +-COVER_AUTHOR_FONT DOC_COVER_AUTHOR_FONT | like +-COVER_AUTHOR_COLOR DOC_COVER_AUTHOR_COLOR | AUTHOR_<spec> +-COVER_AUTHOR_SIZE DOC_COVER_AUTHOR_SIZE -+ +- +-COVER_DOCTYPE_FAMILY DOC_COVER_DOCTYPE_FAMILY -+ +-COVER_DOCTYPE_FONT DOC_COVER_DOCTYPE_FONT | like +-COVER_DOCTYPE_COLOR DOC_COVER_DOCTYPE_COLOR | DOCTYPE_<spec> +-COVER_DOCTYPE_SIZE DOC_COVER_DOCTYPE_SIZE -+ +- +-COVER_COPYRIGHT_FAMILY DOC_COVER_COPYRIGHT_FAMILY -+ +-COVER_COPYRIGHT_FONT DOC_COVER_COPYRIGHT_FONT | +-COVER_COPYRIGHT_COLOR DOC_COVER_COPYRIGHT_COLOR | like any of the above +-COVER_COPYRIGHT_SIZE DOC_COVER_COPYRIGHT_SIZE | +-COVER_COPYRIGHT_QUAD DOC_COVER_COPYRIGHT_QUAD -+ +- - copyright quad sets both the position on the page and the quad +- direction and can be either L (left) or R (right); default is right +- +-COVER_MISC_FAMILY DOC_COVER_MISC_FAMILY -+ +-COVER_MISC_FONT DOC_COVER_MISC_FONT | +-COVER_MISC_COLOR DOC_COVER_MISC_COLOR | like any of the above +-COVER_MISC_SIZE DOC_COVER_MISC_SIZE | +-COVER_MISC_QUAD DOC_COVER_MISC_QUAD -+ +- - misc quad sets both the position on the page and the quad +- direction and can be either L (left) or R (right); default is left +- +-COVER_UNDERLINE DOC_COVER_UNDERLINE - like DOCTYPE_UNDERLINE +- - cover underline controls underlining of the argument given to +- DOCTYPE NAMED "<name>" only +- +-COVER_COUNTS_PAGES DOC_COVER_COUNTS_PAGES +- - whether to consider cover pages in the pagination scheme; the +- default is to ignore them +- - see Note ++Thus, to change the overall family, color, leading, quad and ++starting position of a doc-cover, you’d do ++
++ ++ .DOC_COVER_FAMILY H ++ .DOC_COVER_COLOR blue ++ .DOC_COVER_LEADING +2 ++ .DOC_COVER_QUAD L ++ .DOC_COVER_ADVANCE 3i \" or .DOC_COVER_START_POS 3i + +-
+- +-

+-Note: ++To change the style parameters for selected parts of a cover, you ++might do something like this: +
+-COVER_COUNTS_PAGES and DOC_COVER_COUNTS_PAGES are toggle macros, +-hence invoking them by themselves means that mom will consider +-covers and doc covers in the pagination scheme; invoking them with +-any argument (OFF, NO, X, etc.) means they are ignored. +-The default is to ignore them. ++ ++ .COVER_TITLE_FONT B ++ .COVER_TITLE_SIZE +4 ++ .COVER_SUBTITLE_FONT I ++ .COVER_AUTHOR_FONT R ++ .COVER_AUTHOR_SPACE_BEFORE 6p ++ .COVER_DOCTYPE_COLOR red ++ .COVER_MISC_SIZE -1 ++ .COVER_MISC_LEAD 12 ++ .COVER_COPYRIGHT_SIZE -2 ++ .COVER_COPYRIGHT_QUAD L ++ .COVER_MISC_QUAD R ++ ++Note in the above example that _COPYRIGHT_QUAD and _MISC_QUAD set ++both the horizontal position on the page and the quad direction, ++either L (or LEFT) or R (or RIGHT), and have no corresponding ++docheader control macro. +

+ +-
++
++

++Tip: ++As with the docheader control macros, DOC_COVER_ and ++COVER_ part/parameter style changes may be ++grouped, ++for example ++
++ ++ .DOC_COVER_TITLE_STYLE \ ++ FAMILY A \ ++ FONT B \ ++ SIZE +4 \ ++ CAPS ++ ++

++
+ + + +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/definitions.html groff-1.22.3/contrib/mom/momdoc/definitions.html +--- groff-1.22.3.old/contrib/mom/momdoc/definitions.html 2014-11-04 10:38:35.612519159 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/definitions.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + +@@ -469,11 +540,24 @@ + +
+

+-Tip: ++Tips on vertical spacing around epigraphs: ++If you wish to change the vertical position of an epigraph with ++SPACE/ ++ALD/ ++RLD, ++do so before invoking .EPIGRAPH, like this: ++
++ ++ .SP -6p ++ .EPIGRAPH ++ A notable quote. ++ .EPIGRAPH OFF ++ + If you’re setting a document in + columns +-and you’d like to add or subtract space after the epigraph, +-the place to do it is inside the epigraph, like this: ++and you’d like to add or subtract space after the ++epigraph, which is centered over the top of both columns, the place ++to do it is inside the epigraph, like this: +
+ + .EPIGRAPH +@@ -493,6 +577,10 @@ +

+ See + Arguments to the control macros. ++
++The following EPIGRAPH control macros may also be ++grouped ++using EPIGRAPH_STYLE. +

+ + +@@ -501,10 +589,7 @@ + .EPIGRAPH_SIZE default = -1.5 (points) + .EPIGRAPH_COLOR default = black + .EPIGRAPH_AUTOLEAD default = 2 points +- + (The next two apply to “block” style epigraphs only) +- +-.EPIGRAPH_QUAD default = same as paragraphs + .EPIGRAPH_INDENT* (see Note on EPIGRAPH_INDENT, below) + + *Indent here refers to the indent from both the left and right margins +@@ -666,8 +751,11 @@ + The PP macro being so important, and representing, as it were, the + basis of everything that goes on in a document, its control is + managed in a manner somewhat different from other document element +-tags. ++tags. As a result, the control macros for PP may not be ++grouped ++within a _STYLE macro. +

++ +
    +
  1. Family control
    2. +
  2. Font control
    3. +@@ -1270,6 +1358,7 @@ + UNDERSCORE <weight> <gap> | NO_UNDERSCORE \ + UNDERSCORE2 <weight> <gap1> <gap2> | NO_UNDERSCORE2 \ + CAPS | NO_CAPS \ ++ SMALLCAPS | NO_SMALLCAPS \ + BASELINE_ADJUST <amount to raise heading from the baseline> \ + SPACE_AFTER | NO_SPACE_AFTER \ + NUMBER | NO_NUMBER +@@ -1927,9 +2016,9 @@ +

    + +
    +-

    Further notes on quote spacing

    ++

    Notes on quote spacing

    + +-

    ++

    + If your quote (or blockquote) leading differs from the document + leading, mom attempts to observe the same rules for vertical + whitespace outlined above; however, she will also insert a small, +@@ -1945,12 +2034,12 @@ + which, by and large, processes text on a line-per-line basis.) +

    + +-

    Disable shimming of quotes and blockquotes

    ++

    Disable shimming of quotes and blockquotes

    + +

    + If you don’t want the behaviour described above (ie you +-don’t want mom shimming +-quotes and blockquotes), issue the macro ++don’t want mom shimming quotes and blockquotes), issue the ++macro +
    + + .NO_SHIM +@@ -1961,6 +2050,17 @@ +

    + +

    ++If you set the leading of ++quotes ++or ++blockquotes ++to a value other than the one used in paragraphs, mom will apply ++shimming after the quote, whether or not .NO_SHIM ++is enabled. This is the only way mom can guarantee that the ++difference in leading will not result in uneven bottom margins. ++

    ++ ++

    + If you’ve disabled shimming of quotes and blockquotes with + .NO_SHIM and you want mom to return to her default + behaviour in this matter, invoke .NO_SHIM OFF (or +@@ -2015,14 +2115,18 @@ +

    + +
    +-Macro: QUOTE toggle ++Macro: QUOTE [ ADJUST +|-<space> ] | <anything> +
    ++

    ++• The argument to ADJUST requires a ++unit of measure ++

    + +

    +-QUOTE is a toggle macro. To begin a section +-of quoted text, invoke it with no argument, then type in your +-quote. When you’re finished, invoke .QUOTE with any +-argument (eg OFF, END, X, Q...) to turn it off. Example: ++QUOTE is a toggle macro. To begin a section of quoted text, invoke ++it with no argument, then type in your quote. When you’re ++finished, invoke .QUOTE with any argument (eg OFF, ++END, X, Q...) to turn it off. Example: +
    + + .QUOTE +@@ -2033,9 +2137,28 @@ + And bits of her tits in Brazil. + .QUOTE END + ++Mom does her best to equalize whitespace around quotes and make ++sure the line following it falls on a valid baseline. On occasion, ++you may need to tweak the quote placement slightly, which is done ++by passing ADJUST to QUOTE with a plus or minus value. ++The quote will be lowered (+) or raised (-) ++within the space allotted for it by the given amount. For ++example, to lower a quote slightly within the space allotted for it, ++you’d do ++
    ++ ++ .QUOTE ADJUST +3p ++ There was a soprano named Golda ++ Whose lovers grew colda and colda ++ For during love-making ++ She'd sing the earth-shaking ++ Love theme from Tristan und Isolde. ++ .QUOTE off ++ +

    + +
    ++ +

    QUOTE control macros and defaults

    + +
      +@@ -2051,14 +2174,27 @@ +

      + See + Arguments to the control macros. ++
      ++The following QUOTE control macros may also be ++grouped ++using QUOTE_STYLE. If you do so, QUOTE_LEFT, QUOTE_CENTER, ++and QUOTE_RIGHT must be entered as: ++
      ++   QUAD LEFT
      ++   QUAD CENTER
      ++   QUAD RIGHT +

      ++ + + .QUOTE_FAMILY default = prevailing document family; default is Times Roman + .QUOTE_FONT default = italic; underlined in TYPEWRITE + .QUOTE_SIZE default = +0 (ie same size as paragraph text) +-.QUOTE_AUTOLEAD default = none; leading of quotes is the same as paragraphs ++.QUOTE_AUTOLEAD default = none; leading of quotes is the same as paragraphs + .QUOTE_COLOR default = black + .QUOTE_INDENT (see below, "Quote indent") ++.QUOTE_LEFT -+ Quad direction of quote. ++.QUOTE_CENTER | LEFT observes QUOTE_INDENT; ++.QUOTE_RIGHT -+ CENTER and RIGHT do not + +
    + +@@ -2086,19 +2222,13 @@ +

    + +
    +-

    ++

    + Note: + If your PARA_INDENT is 0 (ie no indenting of the first line of + paragraphs), you must set a QUOTE_INDENT yourself, with a + unit of measure appended to the argument. Mom has no default for + QUOTE_INDENT if paragraph first lines are not being indented. +

    +- +-

    +-Additional note: +-QUOTE_INDENT also sets the indent for +-blockquotes. +-

    +
    + +

    2. Spacing above and below quotes (typeset only)

    +@@ -2112,7 +2242,7 @@ + + with no argument. If you wish to restore mom’s + default behaviour regarding the spacing of quotes (see +-above), ++Quote spacing), + invoke the macro with any argument (OFF, QUIT, END, X...) +

    + +@@ -2179,7 +2309,7 @@ + Besides indenting blockquotes, mom further sets them off from + running text with a small amount of vertical whitespace top and + bottom. (See +-above ++Quote spacing + for a complete explanation of how this is managed, and how + to control it.) +

    +@@ -2191,13 +2321,18 @@ +
+ +
+-Macro: BLOCKQUOTE toggle ++Macro: BLOCKQUOTE [ ADJUST +|-<space> ] | <anything> +
+ +

+ Aliases: CITE, CITATION +

+ ++

++• The argument to ADJUST requires a ++unit of measure ++

++ +

+ BLOCKQUOTE is a toggle macro. To begin a cited passage, invoke + the tag with no argument, then type in your blockquote. When +@@ -2219,6 +2354,27 @@ + .PP. +

+ ++

++Mom does her best to equalize whitespace around blockquotes and make ++sure the line following it falls on a valid baseline. On occasion, ++you may need to tweak the blockquote placement slightly, which is ++done by passing ADJUST to BLOCKQUOTE with a plus or minus ++value. The blockquote will be lowered (+) or raised ++(-) within the space allotted for it by the given ++amount. For example, to raise a blockquote slightly within the ++space allotted for it, you’d do ++
++ ++ .BLOCKQUOTE ADJUST -3p ++ True! - nervous - very, very dreadfully nervous I had been and ++ am; but why will you say that I am mad? The disease had sharpened ++ my senses - not destroyed - not dulled them. ++ .RIGHT ++ \[em]Edgar Allen Poe, The Tell-Tale Heart ++ .QUOTE off ++ ++

++ +
+

+ Note: +@@ -2243,12 +2399,16 @@ +

+ See + Arguments to the control macros. ++
++The following BLOCKQUOTE control macros may also be ++grouped ++using BLOCKQUOTE_STYLE. +

+ + .BLOCKQUOTE_FAMILY default = prevailing document family; default is Times Roman + .BLOCKQUOTE_FONT default = roman + .BLOCKQUOTE_SIZE default = -1 (point) +-.BLOCKQUOTE_AUTOLEAD default = none; leading of blockquotes is the same as paragraphs ++.BLOCKQUOTE_AUTOLEAD default = none; leading of blockquotes is the same as paragraphs + .BLOCKQUOTE_COLOR default = black + .BLOCKQUOTE_QUAD default = left + .BLOCKQUOTE_INDENT (see below) +@@ -2280,19 +2440,13 @@ +

+ +
+-

++

+ Note: + If your PARA_INDENT is 0 (ie no indenting of the first line of + paragraphs), you must set a BLOCKQUOTE_INDENT yourself, with + a unit of measure appended to the argument. Mom has no default for + BLOCKQUOTE_INDENT if paragraph first lines are not being indented. +

+- +-

+-Additional note: +-BLOCKQUOTE_INDENT also sets the indent for +-quotes. +-

+
+ + +@@ -2308,7 +2462,7 @@ + + with no argument. If you wish to restore mom’s default + behaviour regarding the spacing of blockquotes (see +-above), ++Quote spacing), + invoke the macro with any argument (OFF, QUIT, END, + X...). +

+@@ -2506,6 +2660,10 @@ +

+ See + Arguments to the control macros. ++
++The following CODE control macros may also be ++grouped ++using CODE_STYLE. +

+ + .CODE_FAMILY default = Courier +@@ -2883,9 +3041,6 @@ + Lorem ipsum dolor sit amet, consetetur sadipscing elitr, + sed diam nonumy eirmod tempor invidunt ut labore. + +-

+- +-

+ Alternatively, you may use the single-purpose macro, + .QUIT_LISTS, to get yourself out of a list structure. In + the example above, the two .LIST OFF lines could be +@@ -2935,7 +3090,12 @@ +

+

LIST control macros and defaults

+ +-
    ++

    ++LIST control macros may not be ++grouped. ++

    ++ ++
      +
    1. Indenting lists (SHIFT_LIST)
      2. +
    2. Resetting an initialized list’s enumerator (RESET_LIST)
      3. +
    3. Padding digit enumerators (PAD_LIST_DIGITS)
      4. +@@ -3377,8 +3537,9 @@ + +
        +
      1. Family/font/size/colour
        2. ++
      2. Reset line numbering after COLLATE
        3. +
      3. Line numbering control for quotes and blockquotes +-
+ +-

2. Line numbering control macros for QUOTE and BLOCKQUOTE

++

2. Reset line numbering after COLLATE

++ ++

++After ++COLLATE, ++line numbering continues from where it left off. If you would like ++each chapter or major document section to begin its line numbering ++at “1”, invoke ++ ++ .NUMBER_LINES_PER_SECTION ++ ++after ++.NUMBER_LINES. ++

++ ++

3. Line numbering control macros for QUOTE and BLOCKQUOTE

+ +
• Including QUOTEs and BLOCKQUOTEs in the line numbering scheme
+ +@@ -3993,6 +4173,10 @@ +

+ See + Arguments to the control macros. ++
++The following FOOTNOTE control macros may also be ++grouped ++using FOOTNOTE_STYLE. +

+ + .FOOTNOTE_FAMILY default = prevailing document family; default is Times Roman +@@ -4711,19 +4895,18 @@ +
  • Header/footer centre string when doctype is CHAPTER
    • +
  • Allow headers on endnotes pages
    • + +-
  • Endnotes' first-page title control ++
  • Endnotes header (first-page title) control +
    • +
  • Endnotes document-identification string control +
    • +
  • Endnotes referencing style +
      +@@ -4747,6 +4930,10 @@ +

      + See + Arguments to the control macros. ++
      ++The following ENDNOTE control macros may also be ++grouped ++using ENDNOTE_STYLE. +

      + + .ENDNOTE_FAMILY default = prevailing document family; default is Times Roman +@@ -5200,59 +5387,82 @@ +

      +
    • + +-

    4. Endnotes' first-page title control

    ++

    4. Endnotes header (first-page title) control

    + +- ++ + +-
    • Title string
    ++
    • Header (first-page title) string
    + +
    +-Macro: ENDNOTE_STRING "<head to print at the top of endnotes>" ++Macro: ENDNOTES_HEADER_STRING "<title to print at the top of endnotes>" +
    + ++

    ++Alias: ENDNOTE_STRING (for compatibility with older documents) ++

    ++ +

    + By default, mom prints the word “ENDNOTES” as a head + at the top of the first page of endnotes. If you want her to +-print something else, invoke .ENDNOTE_STRING with the +-endnotes-page head you want, surrounded by double-quotes. If you +-don’t want a head at the top of the first endnotes-page, +-invoke .ENDNOTE_STRING with a blank argument (either two +-double-quotes side by side—""—or no +-argument at all). ++print something else, invoke .ENDNOTES_HEADER_STRING ++with the endnotes-page head you want, surrounded by double-quotes. ++If you don’t want a head at the top of the first ++endnotes-page, invoke .ENDNOTES_HEADER_STRING ++with a blank argument (either two double-quotes side by ++side—""—or no argument at all). +

    + +- ++ + +-
    • Title control macros and defaults
    ++
    • Header (first-page title) control macros and defaults
    + +
    +

    + See + Arguments to the control macros. ++
    ++The following ENDNOTES_HEADER control macros may also be ++grouped ++using ENDNOTES_HEADER_STYLE. +

    ++ ++

    ++Please note that “_HEADER_”, here, refers to the title ++that appears at the top of the first endnotes page, not to the page ++headers of subsequent endnotes pages. + +-.ENDNOTE_STRING_FAMILY default = prevailing document family +-.ENDNOTE_STRING_FONT default = bold +-.ENDNOTE_STRING_SIZE* default = +1 +-.ENDNOTE_STRING_QUAD default = centred +-.ENDNOTE_STRING_COLOR default = black ++.ENDNOTES_HEADER_FAMILY default = prevailing document family ++.ENDNOTES_HEADER_FONT default = bold ++.ENDNOTES_HEADER_SIZE* default = +1 ++.ENDNOTES_HEADER_QUAD default = centred ++.ENDNOTES_HEADER_COLOR default = black + + *Relative to the size of the endnotes text (set with ENDNOTE_PT_SIZE) + ++

    +
    + +- ++

    ++Note: For compatibility with older documents, these macros are aliased ++as .ENDNOTE_STRING_<SPEC>, e.g. .ENDNOTE_STRING_FAMILY. ++

    ++ ++ + +-
    • Title string placement
    ++
    • Header (first-page title) placement
    + +
    +-Macro: ENDNOTE_STRING_ADVANCE <distance from top of page> ++Macro: ENDNOTES_HEADER_V_POS <distance from top of page> +
    + +

    + • Argument requires a unit of measusure +

    + ++

    ++Alias: ENDNOTE_STRING_ADVANCE (for compatibility with older documents) ++

    ++ +

    + By default, mom places the title (the docheader, as it were) of + endnotes pages (typically "ENDNOTES") on the same +@@ -5261,7 +5471,7 @@ + running text. + If you’d prefer another location, higher or lower on the page + (thereby also raising or lowering the starting position of the +-endnotes themselves), invoke .ENDNOTE_STRING_ADVANCE with ++endnotes themselves), invoke .ENDNOTES_HEADER_V_POS with + an argument stating the distance from the top edge of the page at + which you’d like the title placed. +

    +@@ -5272,20 +5482,23 @@ + mom about it like this: +
    + +- .ENDNOTE_STRING_ADVANCE 1.5i ++ .ENDNOTES_HEADER_V_POS 1.5i + +

    + +- ++ + +-
    • Title string underscoring
    ++
    • Header (first-page title) underscoring
    + +
    +-Macro: ENDNOTE_STRING_UNDERSCORE [DOUBLE] [<underscore weight> [<underscore gap> [<distance between double rules]]] | <none> | <anything> ++Macro: ENDNOTES_HEADER_UNDERSCORE [DOUBLE] [<underscore weight> [<underscore gap> [<distance between double rules]]] | <none> | <anything> +
    + +

    +-Alias: ENDNOTE_STRING_UNDERLINE ++Alias: ENDNOTES_HEADER_UNDERLINE. ++(For compatibility with older documents, also ++aliased as ENDNOTE_STRING_UNDERSCORE and ++ENDNOTE_STRING_UNDERLINE.) +

    + +

    +@@ -5298,16 +5511,16 @@ +

    + +

    +-Invoked without an argument, .ENDNOTE_STRING_UNDERSCORE ++Invoked without an argument, .ENDNOTES_HEADER_UNDERSCORE + will place a single rule underneath the endnotes page title. Invoked +-with the argument, DOUBLE, ENDNOTE_STRING_UNDERSCORE will ++with the argument, DOUBLE, ENDNOTES_HEADER_UNDERSCORE will + double-underscore the title. Invoked with any other non-numeric + argument, (eg OFF, NO, X, etc.) the macro disables + underscoring of the title. +

    + +

    +-In addition, you can use ENDNOTE_STRING_UNDERSCORE to control the ++In addition, you can use ENDNOTES_HEADER_UNDERSCORE to control the + weight of the underscore rule(s), the gap between the title and the + underscore, and, in the case of double-underscores, the distance + between the two rules. +@@ -5317,27 +5530,27 @@ + Some examples: +
    + +- .ENDNOTE_STRING_UNDERSCORE 1 ++ .ENDNOTES_HEADER_UNDERSCORE 1 + - turn underscoring on; set the rule weight to 1 point + +- .ENDNOTE_STRING_UNDERSCORE 1 3p ++ .ENDNOTES_HEADER_UNDERSCORE 1 3p + - turn underscoring on; set the rule weight to 1 point; set + the gap between the title and the underscore to 3 points + +- .ENDNOTE_STRING_UNDERSCORE DOUBLE .75 3p ++ .ENDNOTES_HEADER_UNDERSCORE DOUBLE .75 3p + - turn double-underscoring on; set the rule weight to 3/4 of + a point; set the gap between the title and the upper + underscore to 3 points; leave the gap between the upper +- and the lower underunderscore at the default ++ and the lower underscore at the default + +- .ENDNOTE_STRING_UNDERSCORE DOUBLE 1.5 1.5p 1.5p ++ .ENDNOTES_HEADER_UNDERSCORE DOUBLE 1.5 1.5p 1.5p + - turn double-underscoring on; set the rule weight to 1-1/2 + points; set the gap between the title and the upper + underscore to 1-1/2 points; set the gap between the upper + and the lower underscore to 1-1/2 points + + Note, from the above, that in all instances, underscoring (single +-or double) is enabled whenever ENDNOTE_STRING_UNDERSCORE is used in ++or double) is enabled whenever ENDNOTES_HEADER_UNDERSCORE is used in + this way. +

    + +@@ -5347,16 +5560,20 @@ + title. +

    + +- ++ + +-
    • Title string capitalization
    ++
    • Header (first-page title) capitalization
    + +
    +-Macro: ENDNOTE_STRING_CAPS toggle ++Macro: ENDNOTES_HEADER_CAPS toggle +
    + ++

    ++Alias: ENDNOTE_STRING_CAPS (for compatibility with older documents) ++

    ++ +

    +-Invoked by itself, .ENDNOTE_STRING_CAPS will ++Invoked by itself, .ENDNOTES_HEADER_CAPS will + automatically capitalize the endnotes-page title. Invoked with any + other argument, the macro disables automatic capitalization of the + title. +@@ -5366,8 +5583,8 @@ + If you’re generating a table of contents, you may want the + endnotes pages title to be in caps, but the toc entry in caps/lower + case. If the argument to +-ENDNOTE_STRING +-is in caps/lower case and ENDNOTE_STRING_CAPS is on, this is exactly ++ENDNOTES_HEADER_STRING ++is in caps/lower case and ENDNOTES_HEADER_CAPS is on, this is exactly + what will happen. +

    + +@@ -5412,87 +5629,25 @@ +

    + See + Arguments to the control macros. ++
    ++The following ENDNOTE_TITLE_STYLE control macros may also be ++grouped ++using ENDNOTE_TITLE_STYLE_STYLE. +

    + +-.ENDNOTE_TITLE_FAMILY default = prevailing document family; default is Times Roman +-.ENDNOTE_TITLE_FONT default = bold +-.ENDNOTE_TITLE_SIZE* default = 0 +-.ENDNOTE_TITLE_QUAD default = left ++.ENDNOTE_TITLE_FAMILY default = prevailing document family; default is Times Roman ++.ENDNOTE_TITLE_FONT default = bold ++.ENDNOTE_TITLE_SIZE* default = 0 ++.ENDNOTE_TITLE_COLOR default = black ++.ENDNOTE_TITLE_QUAD default = left ++.ENDNOTE_TITLE_CAPS ++.ENDNOTE_TITLE_SMALLCAPS ++.ENDNOTE_TITLE_UNDERSCORE default = single underscore + + *Relative to the size of the endnotes text (set with ENDNOTE_PT_SIZE) + + + +- +- +-
    • Endnotes document-identification underscoring
    +- +-
    +-Macro: ENDNOTE_TITLE_UNDERSCORE [DOUBLE] [<underline weight> [<underline gap> [<distance between double rules]]] | <none> | <anything> +-
    +- +-

    +-Alias: ENDNOTE_TITLE_UNDERLINE +-

    +- +-

    +-• The argument +-<underscore weight> +-must not have the +-unit of measure, +-p, +-appended to it; all other arguments require a unit of measure +-

    +- +-

    +-Invoked without an argument, .ENDNOTE_TITLE_UNDERSCORE +-will place a single rule underneath the document identification +-string. Invoked with the argument DOUBLE, +-ENDNOTE_TITLE_UNDERSCORE will double-underscore the string. Invoked +-with any other non-numeric argument, (eg OFF, NO, X, +-etc.) the macro disables underscoring of the string. +-

    +- +-

    +-In addition, you can use ENDNOTE_TITLE_UNDERSCORE to control the +-weight of the underscore rule(s), the gap between the title and the +-underscore, and, in the case of double-underscores, the distance +-between the two rules. +-

    +- +-

    +-Some examples: +-
    +- +- .ENDNOTE_TITLE_UNDERSCORE 1 +- - turn underscoring on; set the rule weight to 1 point +- +- .ENDNOTE_TITLE_UNDERSCORE 1 3p +- - turn underscoring on; set the rule weight to 1 point; set +- the gap between the string and the underscore to 3 points +- +- .ENDNOTE_TITLE_UNDERSCORE DOUBLE .75 3p +- - turn double-underscoring on; set the rule weight to 3 points +- +- .ENDNOTE_TITLE_UNDERSCORE DOUBLE 1.5 1.5p 1.5p +- - turn double-underscoring on; set the rule weight to 1-1/2 +- points; set the gap between the string and the upper +- underscore to 1-1/2 points; set the gap between the upper +- and the lower underscore to 1-1/2 points +- +-

    +- +-

    +-Note, from the above, that in all instances, underscoring (single or +-double) is enabled whenever ENDNOTE_TITLE_UNDERSCORE is used in this +-way. +-

    +- +-

    +-Mom’s default is to single-underscore the string with a +-1/2-point rule placed 2 points below its baseline. +-

    +- + + +

    6. Endnotes referencing style

    +@@ -6167,11 +6322,12 @@ + + + +@@ -6243,7 +6399,15 @@ + +

    Finis contol macros

    + +-

    Changing the FINIS string

    ++

    ++Since FINIS is only used once in a document, it has few control ++macros. It is expected that you will make changes to style ++parameters such as family, font, and size with ++inline escapes ++in the FINIS string itself (see below). ++

    ++ ++

    Changing the FINIS string

    + +

    + By default, FINIS prints the word, END, between +@@ -6312,6 +6476,19 @@ + (usually black). +

    + ++ ++ ++

    Removing the dashes around FINIS

    ++ ++

    ++If you don’t want the dashes around the FINIS string, you can ++remove them with ++
    ++ ++ .FINIS_NO_DASHES ++ ++

    ++ +
    + + +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/docprocessing.html groff-1.22.3/contrib/mom/momdoc/docprocessing.html +--- groff-1.22.3.old/contrib/mom/momdoc/docprocessing.html 2014-11-04 10:38:35.613519146 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/docprocessing.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + + +@@ -832,7 +833,7 @@ + +

    + Moreover, DOCTITLE does not appear in the +-PDF outline , ++PDF outline, + as its presence in window title would make it redundant. +

    + +@@ -1255,7 +1256,7 @@ +

    + You may, if you wish, invoke .REVISION without an + argument, in which case, no revision number will be printed beside +-"Rev." in headers or footers. ++“Rev.” in headers or footers. +

    + + +@@ -1487,7 +1488,7 @@ + +

    + Except for +-DOCTITLE, ++DOCTITLE, + mom does not, by default, provide PDF viewers with a document title. + You may set one, if you like, with PDF_TITLE. +

    +@@ -1509,9 +1510,6 @@ +

    Docstyle macros

    +
      +
    • DOCTYPE +-
      • +
    • PRINTSTYLE – non-optional macro required for document processing +
        +
      • Defaults for PRINTSTYLE TYPESET
        • +@@ -1603,100 +1601,21 @@ + for how mom outputs each part of the page header.) +

        + +-

        +-Additionally, if you wish the name of this particular kind of +-document to be coloured, you can pass DOCTYPE NAMED a +-third (optional) argument: the name of a colour pre-defined (or +-“initialized”) with +-NEWCOLOR +-or +-XCOLOR. +-For example, if you have a doctype named “Warning”, +-and you’d like “Warning” to be in red, assuming you’ve +-pre-defined (or “initialized”) the color, red, this is +-what the DOCTYPE entry would look like: +-
        +- +- .DOCTYPE NAMED "Warning" red +- +-

        +- +-
        +-

        How to control DOCTYPE NAMED underlining

        +- +-

        +-By default, the string passed to DOCTYPE NAMED is +-underlined in the docheader, and on document-cover pages and cover +-(“title”) pages. (See the +-Introduction to covers +-for the difference between “doc cover” and +-“cover” pages.) +-

        +- +-

        +-You can use the macro DOCTYPE_UNDERLINE to set the weight of +-the underline and its distance from where the doctype-name appears +-in the docheader (doc covers and covers handle underlining of the +-doctype-name differently; see +-COVER_UNDERLINE), +-or simply toggle doctype underlining on or off. Mom’s default +-is to underline the doctype-name. +-

        +- +-

        +-The order of arguments is weight, optionally followed by +-gap, where “gap” is the distance from the +-baseline +-of the doctype-name to the underline. +-

        +- +-

        +-The weight argument is given in points, or fractions +-thereof, and must not have the +-unit of measure, +-p, appended. Like +-RULE_WEIGHT, +-weights must be greater than 0 and less than 100. Mom’s +-default for DOCTYPE NAMED underlining is 1/2 point. +-

        +- +-

        +-The gap argument can be given using any unit of measure, +-and must have the unit of measure appended to the argument. +-The distance of the gap is measured from the baseline of the +-DOCTYPE NAMED name to the upper edge of the underline. +-Mom’s default gap for named-doctype underlining is 2 points. +-

        +- +-

        +-As an example, suppose you want the doctype-name underlined in the +-docheader with a 2-point rule separated from the doctype-name by 3 +-points. The way to accomplish it is: +-
        +- +- .DOCTYPE_UNDERLINE 2 3p +- +-If you wanted the same thing, but were content with mom’s +-default gap of 2 points, ++

        ++

        ++Note: version 2.1 change +
        +- +- .DOCTYPE_UNDERLINE 2 +- +-would do the trick. +-

        +- +-

        +-If you merely want to toggle the underlining of +-the doctype-name in docheaders on or off, invoke +-.DOCTYPE_UNDERLINE by itself to turn the underlining on, +-or .DOCTYPE_UNDERLINE OFF (or NO, X, etc.) +-

        +- +-

        +-Please note that if you supply a weight to DOCTYPE_UNDERLINE, and +-optionally a gap, you also turn the underlining of the doctype-name +-in docheaders on; if this is not what you want, you must turn the +-underlining off manually afterwards. ++DOCTYPE NAMED "string" no longer accepts a color argument ++after "string". Setting the color of the string is now ++done with DOCTYPE_COLOR <color>. Default ++underscoring of "string" in the docheader and on covers ++has been removed. Use DOCTYPE_UNDERLINE, ++DOC_COVER_DOCTYPE_UNDERLINE and/or ++COVER_DOCTYPE_UNDERLINE to re-enable it. All three ++take the same arguments listed in the ++Underline style, rule weight ++section of ++Arguments to the control macros. +

        +
        + +@@ -2556,22 +2475,16 @@ + of the first line of type. +

        + +-
        +-

        +-Tip: +-Since no document processing happens until you invoke +-.START—including +-anything to do with docheaders—you can +-typeset your own docheader prior to START (if +-you don’t like the way mom does things) and use +-.DOCHEADER OFF with its optional distance +-argument to ensure that the body of your document starts where +-you want. You can even insert a PDF or PostScript image file (see +-PSPIC). +-and +-PDF_IMAGE). ++

        ++With DOCHEADER OFF, it is possible to create your own ++custom docheaders (after ++START) ++using mom’s typesetting macros. It is recommended that if you ++do create a custom docheader, you make ++.SHIM ++the last macro before the first item of your document (for ++example, .PP or .HEADING 1. PP...) +

        +-
        + + + +@@ -2599,8 +2512,7 @@ + by medium italic, same size as running text + Author(s) medium italic, same size as running text + +-(Document type) bold italic, underscored, 3 points larger than running text +- ++(Document type) bold italic, 3 points larger than running text + +
        + +@@ -2613,7 +2525,6 @@ + + Chapter <n> bold, 4 points larger than running text + Chapter Title bold italic, 4 points larger than running text +- + + + +@@ -2624,7 +2535,6 @@ + author and document type are what you supply with the + reference macros. + Any you leave out will not appear; mom will compensate: +- +

        + +
        +@@ -2633,44 +2543,48 @@ + If your DOCTYPE is CHAPTER and you have both “Chapter + <n>” and a “Chapter Title” (as above), mom + inserts a small amount of whitespace between them, equal to +-one-quarter of the leading in +-effect. If this doesn’t suit you, you can alter the space by +-including the +-inline escapes, +-\*[UP] +-or +-\*[DOWN], +-in the argument you pass to +-CHAPTER_TITLE, +-like this: +-
        +- +- .CHAPTER_TITLE "\*[DOWN 2p]Why Not Patent Calculus?" +- +-or +- +- .CHAPTER_TITLE "\*[UP 2p]Why Not Patent Calculus?" +- ++one-quarter of the ++leading ++in effect. If this doesn’t suit you, you can remove or alter ++the space with ++CHAPTER_TITLE_SPACE_BEFORE. +

        +
        + +
        +

        Docheader control

        +-
          +-
        1. Change the starting position of the docheader
          2. +-
        2. Change quad direction the entire docheader
          3. +-
        3. Change the family of the entire docheader
          4. +-
        4. Change the family of individual docheader elements
          5. +-
        5. Change the font of individual docheader elements
          6. +-
        6. Adjust the size of docheader elements
          7. +-
        7. Adjust the docheader leading
          8. +-
        8. Change the colour of the entire docheader
          9. +-
        9. Change the colour of the individual docheader elements
          10. +-
        10. Change the attribution string (“by”)
          11. +-
        ++ ++

        ++With the docheader control macros, you can change the family, ++colour, leading and quad direction of the entire docheader. You can ++also set the style parameters for each part individually. Style ++parameters include family, font, size, colour, lead, space before, ++caps, smallcaps and underscoring. ++

        ++ ++ +
        + +-

        1. Change the starting position of the docheader

        ++

        1. Changes to the whole docheader

        ++ ++
        Change the starting position of the docheader
        + +

        + By default, a docheader starts on the same +@@ -2707,7 +2621,7 @@ +

        + + +-

        2. Change the quad direction of the docheader

        ++
        Change the quad direction of the docheader
        + +

        + By default, mom centers the docheader. If you’d prefer to +@@ -2718,7 +2632,7 @@ + C). +

        + +-

        3. Change the family of the entire docheader

        ++
        Change the family of the entire docheader
        + +

        + By default, mom sets the docheader in the same +@@ -2743,186 +2657,199 @@ + +

        + Please note that if you use DOCHEADER_FAMILY, you can still alter +-the family of individual parts of the docheader with the macros +-listed +-here. ++the family of individual parts of the docheader. +

        + +-

        4. Change the family of individual docheader elements

        ++
        Change the color of the entire docheader
        + +

        +-The following macros let you change the +-family +-of each docheader element separately: +-

        +-
          +-
        • Macro: TITLE_FAMILY <family>
          • +-
        • Macro: CHAPTER_TITLE_FAMILY <family>
          • +-
        • Macro: SUBTITLE_FAMILY <family>
          • +-
        • Macro: AUTHOR_FAMILY <family>
          • +-
        • Macro: DOCTYPE_FAMILY <family> +- (if DOCTYPE is NAMED) +-
          • +-
        +- +-

        +-Simply pass the appropriate macro the family you want, just as you +-would with +-FAMILY. +-

        +- +-

        5. Change the font of individual docheader elements

        +- +-

        +-The following macros let you change the +-font +-of each docheader element separately: +-

        +-
          +-
        • Macro: TITLE_FONT R | B | I | BI
          • +-
        • Macro: CHAPTER_TITLE_FONT R | B | I | BI
          • +-
        • Macro: SUBTITLE_FONT R | B | I | BI
          • +-
        • Macro: AUTHOR_FONT R | B | I | BI
          • +-
        • Macro: DOCTYPE_FONT R | B | I | BI +- (if DOCTYPE is NAMED) +-
          • +-
        +- +-

        +-Simply pass the appropriate macro the font you want. R, B, +-I and BI have the same meaning as they do for +-FT. You may also use any of the +-style extensions +-provided by mom. +-

        +- +-

        6. Adjust the size of individual docheader elements

        +- +-

        +-The following macros let you adjust the point size of each docheader +-element separately. +-

        +- +-

        +-Mom calculates the point size of docheader elements from the point +-size of paragraphs in running text, so you must prepend a + or - +-sign to the argument. Points is assumed as the +-unit of measure, +-so there’s no need to append a unit to the argument. +-Fractional point sizes are allowed. ++The default color for docheaders is black, as you’d expect. ++If you wish to change it, use ++.DOCHEADER_COLOR <color>, where ++ <color> is a color pre-initialized with ++XCOLOR ++or ++NEWCOLOR. +

        + +-
          +-
        • Macro: TITLE_SIZE <+/-points> +-
          +-    default = +3.5 (+4 if docheader title is "Chapter <n>") +-
          • +-
        • Macro: CHAPTER_TITLE_SIZE <+/-points> +-
          +-    default = +4 +-
          • +-
        • Macro: SUBTITLE_SIZE <+/-points> +-
          +-    default = +0 +-
          • +-
        • Macro: AUTHOR_SIZE <+/-points> +-
          +-    default = +0 +-
          • +-
        • Macro: DOCTYPE_SIZE <+/-points> +- (if DOCTYPE is NAMED) +-
          +-    default = +3 +-
          • +-
        ++
        Change the leading of the entire docheader
        + +

        +-Simply pass the appropriate macro the size adjustment you want. ++By default, mom uses the leading in effect for ++running text ++for docheaders. If you want to increase or ++decrease the overall docheader leading, use ++.DOCHEADER_LEAD +|-<amount>, where ++<amount> is the number of ++points ++by which to make the adjustment. +

        + +-

        7. Adjust the docheader leading

        ++

        2. Part by part changes

        + +

        +-The +-leading +-of docheaders is the same as running text. If you’d like your +-docheaders to have a different leading, say, 2 points more than the +-lead of running text, use: ++Whenever you want to change the style parameters for any part of ++the docheader, simply join the name of the part to the parameter ++you wish to change using an underscore, then supply any necessary ++arguments. The subitle double-underlined? No problem. +
        + +- .DOCHEADER_LEAD +2 ++ .SUBTITLE_UNDERLINE DOUBLE + +-Since the leading of docheaders is calculated from the lead of running +-text, a + or - sign is required before the argument (how much to add +-or subtract from the lead of running text). No +-unit of measure +-is required; points is assumed. +-

        +- +-

        8. Change the colour of the entire docheader

        +- +-

        +-If you want to colourize the entire docheader: ++Author in red? +
        + +- .DOCHEADER_COLOR <color name> ++ .AUTHOR_COLOR red ++ ++Title in smallcaps? ++ ++ .TITLE_SMALLCAPS + +-You must pre-define (or “initialize”) the colour with +-NEWCOLOR +-or +-XCOLOR. +-

        +- +- +-

        9. Change the colour of the docheader elements individually

        +- +-

        +-The following macros let you change the colour of each +-docheader element separately. You must pre-define (or +-“initialize”) the colour with +-NEWCOLOR +-or +-XCOLOR. +

        +-
          +-
        • Macro: TITLE_COLOR <colorname>
          • +-
        • Macro: CHAPTER_TITLE_COLOR <colorname> +-
            +-
          • Note: CHAPTER_TITLE_COLOR is needed only if you supply both a +- CHAPTER +- reference macro and a +- CHAPTER_TITLE +- macro. Otherwise, TITLE_COLOR takes care of colorizing the +- chapter header. +-
            • +-
          • +-
        • Macro: SUBTITLE_COLOR <colorname>
          • +-
        • Macro: ATTRIBUTE_COLOR <colorname> +- (the “by” string preceding author[s] name[s]) +-
          • +-
        • Macro: AUTHOR_COLOR <colorname>
          • +-
        • Macro: DOCTYPE_COLOR <colorname> +- (if DOCTYPE is NAMED) +-
          • +-
        + +-

        +-It is not recommended that you embed colour (with the +-inline escape, +-\*[<colorname>]) +-in the strings passed to TITLE, CHAPTER_TITLE, SUBTITLE, AUTHOR or +-the name you give DOCTYPE NAMED. The strings passed to +-these macros are used to generate page +-headers +-and +-footers, +-with the result that an embedded colour will cause the string to be +-colourized in headers and/or footers as well. (If you want headers +-or footers colourized, or parts thereof, use the header/footer +-control macros.) ++

        ++

        ++Note: ++Use ATTRIBUTE as the part name for the attribution string ++(“by”) that precedes the author, and DOCTYPE ++as the name for the string passed to DOCTYPE NAMED "string". ++

        ++
        ++ ++
        List of parameters with arguments
        ++ ++
        ++
        _FAMILY
        ++
        ++ Takes the same argument as FAMILY. ++
        ++
        _FONT
        ++
        ++ Takes the same argument as FT. ++
        ++
        _SIZE
        ++
        ++ Takes a + or - value relative to the size of ++ running text. ++
        ++
        _COLOR
        ++
        ++ Takes the same argument as COLOR. ++ Colors should be pre-initialized with ++ XCOLOR ++ or ++ NEWCOLOR. ++
        ++
        _LEAD
        ++
        ++ Takes an absolute leading value, i.e. not relative to the ++ overall leading of the docheader. The leading applies to ++ multiple lines of type within the same docheader part, e.g. ++ several authors or a long title that must be split over two ++ lines. No ++ unit of measure ++ is required; ++ points ++ is assumed. ++
        ++
        _SPACE_BEFORE
        ++
        ++ Takes a numeric value with a ++ unit of measure ++ appended to it. The value may be negative. This allows you ++ to adjust the whitespace before a docheader part, for example ++ if you want more whitespace between the title and the author. ++ ++ Note that TITLE does not have a _SPACE_BEFORE ++ parameter; use ++ DOCHEADER_ADVANCE ++ to move the title further down on the page. ++ ++
        ++
        _CAPS
        ++
        ++ Capitalizes the entire docheader part. No argument is ++ required. ++
        ++
        _NO_CAPS
        ++
        ++ Only used if you need to reverse the sense of _CAPS, as ++ can sometimes happen when ++ collating ++ documents that have differing docheader style requirements. ++
        ++
        _SMALLCAPS
        ++
        ++ Set the entire docheader part in smallcaps. No argument is ++ required. ++
        ++
        _NO_SMALLCAPS
        ++
        ++ Only used if you need to reverse the sense of ++ _SMALLCAPS, as can sometimes happen when ++ collating ++ documents that have differing docheader style requirements. ++
        ++
        _UNDERSCORE
        ++
        ++ With no argument, underscores the docheader part. With a ++ single, possibly decimal numeric argument, sets the weight of ++ the underscore. A second numeric argument to which a ++ unit of measure ++ is appended (most likely p) sets the distance ++ between the baseline and the underscore. ++ ++ If the argument DOUBLE is given, double underscores ++ the docheader part. With a single, possibly decimal numeric ++ argument afterwards, sets the weight of the underscore rules. ++ A third numeric argument to which a ++ unit of measure ++ is appended (most likely p) sets the distance ++ between the baseline and the first underscore rule. A fourth ++ numeric argument to which a unit of measure is appended sets ++ the distance between the two underscore rules. ++ ++ ++ You may give _UNDERLINE as the parameter instead of ++ _UNDERSCORE if you prefer. ++ ++
        ++
        NO_UNDERSCORE
        ++
        ++ Only used if you need to reverse the sense of ++ _UNDERSCORE, as can sometimes happen when ++ collating ++ documents that have differing docheader style requirements. ++
        ++
        ++ ++
        Grouping part/parameter changes
        ++ ++

        ++If you want to change several parameters for a particular docheader ++part, you may group the changes together in a single macro by ++joining the name of the part to STYLE with an underscore, ++for example TITLE_STYLE or AUTHOR_STYLE. ++The following demonstrates: ++ ++ .CHAPTER_TITLE_STYLE \ ++ FAMILY T \ ++ SIZE +4 \ ++ UNDERSCORE 2 \ ++ SMALLCAPS ++ ++Notice the use of the backslash character, which is required after ++the macro name and all parameters except the last. Grouping reduces ++clutter and the finger fatigue caused by entering ++ ++ .CHAPTER_TITLE_FAMILY T ++ .CHAPTER_TITLE_SIZE +4 ++ .CHAPTER_TITLE_UNDERSCORE 2 ++ .CHAPTER_TITLE_SMALLCAPS ++ +

        + +-

        10. Change the attribution string (“by”)

        ++

        3. Changing or removing the attribution string (“by”)

        + +

        + If you’re not writing in English, you can change what mom +@@ -2933,7 +2860,7 @@ + + changes “by” to “par”. ATTRIBUTE_STRING + can also be used, for example, to make the attribution read +-"Edited by". ++“Edited by”. +

        + +

        +@@ -2978,24 +2905,6 @@ + arguments, is sufficient. +

        + +-
        +-

        +-Note: +-The type specs for the attribution line in docheaders are the +-same as for the author line. Although it’s highly unlikely +-you’ll want the attribution line in a different family, font, +-or point size, you can make such changes using +-inline escapes +-in the argument to ATTRIBUTE_STRING. For example, +-
        +- +- .ATTRIBUTE_STRING "\f[HBI]\*[SIZE -2p] by \*[SIZE +2p]\*[PREV]" +- +-would set “by” in Helvetica bold italic, 2 points +-smaller than normal. +-

        +-
        +- +
        + + +@@ -3151,7 +3060,7 @@ + it left (assuming the type is justified or quad left), and moves over + to the top of the next column. If the column happens to be the last + (rightmost) one on the page, mom starts a new page +-at the "column 1" position. This is the macro to use when ++at the “column 1” position. This is the macro to use when + you want to start a new column after the end of a paragraph. +

        + +@@ -3313,12 +3222,12 @@ + element tag is entered, the font reverts + to the current default for the new tag. + +- N.B. — \•[SLANT] and \•[BOLDER] affect ++ N.B. — \*[SLANT] and \*[BOLDER] affect + paragraph text, and remain in effect for all + paragraphs until turned off. If you want to + use them in a macro that takes a string + argument, include the escape in the string. +- \•[COND] and \•[EXT] behave similarly. ++ \*[COND] and \*[EXT] behave similarly. + + PT_SIZE •Changes point size for the duration of the + current tag only. As soon as another document +@@ -3340,9 +3249,7 @@ + track when you’re ready to return to the + document’s default leading. + +- +- +- AUTOLEAD •Invoked before START, sets the overall document ++ AUTOLEAD •Invoked before START, sets the overall document + leading as a function of the overall document + point size (ie the point size used in paragraphs); + subsequently disabled after START, except for calls +@@ -3822,9 +3729,6 @@ +

        + + +- +-
        +- + +
    + +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/goodies.html groff-1.22.3/contrib/mom/momdoc/goodies.html +--- groff-1.22.3.old/contrib/mom/momdoc/goodies.html 2014-11-04 10:38:35.613519146 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/goodies.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + + +
    +@@ -1433,7 +1448,7 @@ + you can change it by invoking SUPERSCRIPT_RAISE_AMOUNT with the + amount you want them raised. A + unit of measure +-must be appended directly to the amount. Thus, you want ++must be appended directly to the amount. Thus, if you want + superscripts raised by 3 + points + instead of 1/3 em, you’d do +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/graphical.html groff-1.22.3/contrib/mom/momdoc/graphical.html +--- groff-1.22.3.old/contrib/mom/momdoc/graphical.html 2014-11-04 10:38:35.613519146 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/graphical.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + + +

    3. Header/footer vertical placement and spacing

    +@@ -2071,16 +2133,25 @@ +

    + See + Arguments to the control macros. ++
    ++The following control macros may also be ++grouped ++using PAGENUMBER_STYLE.* +

    + +-.PAGENUM_FAMILY default = prevailing document family; default is Times Roman ++.PAGENUM_FAMILY default = prevailing document family + .PAGENUM_FONT default = roman +-.PAGENUM_SIZE default = 0 (ie same size as paragraph text) ++.PAGENUM_SIZE default = +0 (ie same size as paragraph text) + .PAGENUM_COLOR default = black + +
    + +-

    2. Page number position

    ++

    ++*Note: Do not confuse PAGENUMBER_STYLE with ++PAGENUM_STYLE. ++

    ++ ++

    2. Page number position

    + +
    + Macro: PAGENUM_POS TOP | BOTTOM  LEFT | CENTER | RIGHT +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/images.html groff-1.22.3/contrib/mom/momdoc/images.html +--- groff-1.22.3.old/contrib/mom/momdoc/images.html 2014-11-04 10:38:35.614519134 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/images.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + ++ ++
    ++

    Smallcaps

    ++
    ++ ++
    ++Macro: SMALLCAPS <toggle> ++
    ++ ++

    ++To begin setting type in pseudo-smallcaps, simply invoke ++.SMALLCAPS. When you no longer want them, invoke ++SMALLCAPS OFF (or END, STOP, ++DONE, etc). If you are currently in a ++no-fill mode, ++(i.e. .LEFT, .CENTER, or .RIGHT) ++and you want the smallcaps to continue on the same line, ++append a \c to the line, like this ++
    ++ ++ A line of type\c ++ .SMALLCAPS ++ with a few words in smallcaps. ++ .SMALLCAPS OFF ++ ++The line preceding .SMALLCAPS OFF should also have a ++\c appended to it if you wish it to continue unbroken. ++

    ++ ++
    ++

    ++Note: ++SMALLCAPS does not have an inline equivalent to ++\*[UC] / \*[LC]. ++Furthermore, if you’re using the ++document processing macros ++with ++PRINTSTYLE TYPEWRITE, ++mom ignores SMALLCAPS. ++

    ++ ++

    ++Additionally, be aware that no automatic ++kerning ++takes place while pseudo-smallcaps are in effect. ++

    ++
    ++ ++
    ++

    Set size, weight, and width of smallcaps

    ++
    ++ ++
    ++Macro: SMALLCAPS_STYLE SIZE <percentage> WEIGHT_ADJ <percentage> EXTEND <percentage> ++
    ++ ++

    ++True smallcaps are not a font effect, but, like designer cuts of ++bold, condensed, and extended, actual fonts provided with some ++families. It is highly recommended that you acquire real smallcaps ++fonts rather than relying on mom's pseudo version. ++

    ++ ++

    ++To achieve a reasonable facsimile of designer-cut small fonts, mom ++needs to know the percentage of regular caps at a given point size ++by which to reduce the small caps. To make adjustments for the ++difference in weight and width of the smaller caps, she also needs ++to know by how much to embolden (“fatten”) the ++smallcaps, and by how much to increase their width. ++

    ++ ++

    ++All three arguments to SMALLCAPS_STYLE reflect a ++percentage of the point size in effect when ++SMALLCAPS ++is invoked. Mom’s defaults for pseudo-smallcaps are: ++
    ++ ++ SIZE = 74% ++ WEIGHT_ADJ = .3% ++ EXTEND = 5% ++ ++To change any or all of the defaults, you might enter ++
    ++ ++ .SMALLCAPS_STYLE SIZE 80 WEIGHT_ADJ .25 EXTEND 3 ++ ++or, more readably, ++
    ++ ++ .SMALLCAPS_STYLE ++ SIZE 80 \ ++ WEIGHT_ADJ .25 \ ++ EXTEND 3 ++ ++Note that you do not have to give SMALLCAPS_STYLE all three ++arguments, and that the arguments may be entered in any order. Any ++arguments you omit will remain at their former value. ++

    ++ +
    + + +diff -Nuar groff-1.22.3.old/contrib/mom/momdoc/using.html groff-1.22.3/contrib/mom/momdoc/using.html +--- groff-1.22.3.old/contrib/mom/momdoc/using.html 2014-11-04 10:38:35.616519109 +0200 ++++ groff-1.22.3/contrib/mom/momdoc/using.html 2015-04-23 20:57:03.000000000 +0300 +@@ -2,7 +2,7 @@ + | in |<-- +- |<-----------ll------------>| +- +----+----+----------------------+----+ +- | : : : | +- +----+----+----------------------+----+ +- -->| po |<-- +- |<--------paper width---------------->| +- +-These dimensions are: +- +-'po' +- "Page offset" - this is the leftmost position of text on the final +- output, defining the "left margin". +- +-'in' +- "Indentation" - this is the distance from the left margin where +- text is printed. +- +-'ll' +- "Line length" - this is the distance from the left margin to right +- margin. +- +- A simple demonstration: +- +- .ll 3i +- This is text without indentation. +- The line length has been set to 3\~inch. +- .in +.5i +- .ll -.5i +- Now the left and right margins are both increased. +- .in +- .ll +- Calling .in and .ll without parameters restore +- the previous values. +- +- Result: +- +- This is text without indenta- +- tion. The line length has +- been set to 3 inch. +- Now the left and +- right margins are +- both increased. +- Calling .in and .ll without +- parameters restore the previ- +- ous values. +- +- -- Request: .po [offset] +- -- Request: .po +offset +- -- Request: .po -offset +- -- Register: \n[.o] +- Set horizontal page offset to OFFSET (or increment or decrement the +- current value by OFFSET). Note that this request does not cause a +- break, so changing the page offset in the middle of text being +- filled may not yield the expected result. The initial value is 1i. +- For TTY output devices, it is set to 0 in the startup file +- 'troffrc'; the default scaling indicator is 'm' (and not 'v' as +- incorrectly documented in the original UNIX troff manual). +- +- The current page offset can be found in the read-only number +- register '.o'. +- +- If 'po' is called without an argument, the page offset is reset to +- the previous value before the last call to 'po'. +- +- .po 3i +- \n[.o] +- => 720 +- .po -1i +- \n[.o] +- => 480 +- .po +- \n[.o] +- => 720 +- +- -- Request: .in [indent] +- -- Request: .in +indent +- -- Request: .in -indent +- -- Register: \n[.i] +- Set indentation to INDENT (or increment or decrement the current +- value by INDENT). This request causes a break. Initially, there +- is no indentation. +- +- If 'in' is called without an argument, the indentation is reset to +- the previous value before the last call to 'in'. The default +- scaling indicator is 'm'. +- +- The indentation is associated with the current environment (*note +- Environments::). +- +- If a negative indentation value is specified (which is not +- allowed), 'gtroff' emits a warning of type 'range' and sets the +- indentation to zero. +- +- The effect of 'in' is delayed until a partially collected line (if +- it exists) is output. A temporary indentation value is reset to +- zero also. +- +- The current indentation (as set by 'in') can be found in the +- read-only number register '.i'. +- +- -- Request: .ti offset +- -- Request: .ti +offset +- -- Request: .ti -offset +- -- Register: \n[.in] +- Temporarily indent the next output line by OFFSET. If an increment +- or decrement value is specified, adjust the temporary indentation +- relative to the value set by the 'in' request. +- +- This request causes a break; its value is associated with the +- current environment (*note Environments::). The default scaling +- indicator is 'm'. A call of 'ti' without an argument is ignored. +- +- If the total indentation value is negative (which is not allowed), +- 'gtroff' emits a warning of type 'range' and sets the temporary +- indentation to zero. 'Total indentation' is either OFFSET if +- specified as an absolute value, or the temporary plus normal +- indentation, if OFFSET is given as a relative value. +- +- The effect of 'ti' is delayed until a partially collected line (if +- it exists) is output. +- +- The read-only number register '.in' is the indentation that applies +- to the current output line. +- +- The difference between '.i' and '.in' is that the latter takes into +- account whether a partially collected line still uses the old +- indentation value or a temporary indentation value is active. +- +- -- Request: .ll [length] +- -- Request: .ll +length +- -- Request: .ll -length +- -- Register: \n[.l] +- -- Register: \n[.ll] +- Set the line length to LENGTH (or increment or decrement the +- current value by LENGTH). Initially, the line length is set to +- 6.5i. The effect of 'll' is delayed until a partially collected +- line (if it exists) is output. The default scaling indicator is +- 'm'. +- +- If 'll' is called without an argument, the line length is reset to +- the previous value before the last call to 'll'. If a negative +- line length is specified (which is not allowed), 'gtroff' emits a +- warning of type 'range' and sets the line length to zero. +- +- The line length is associated with the current environment (*note +- Environments::). +- +- The current line length (as set by 'll') can be found in the +- read-only number register '.l'. The read-only number register +- '.ll' is the line length that applies to the current output line. +- +- Similar to '.i' and '.in', the difference between '.l' and '.ll' is +- that the latter takes into account whether a partially collected +- line still uses the old line length value. +- +- +-File: groff.info, Node: Line Control, Next: Page Layout, Prev: Line Layout, Up: gtroff Reference +- +-5.14 Line Control +-================= +- +-It is important to understand how 'gtroff' handles input and output +-lines. +- +- Many escapes use positioning relative to the input line. For +-example, this +- +- This is a \h'|1.2i'test. +- +- This is a +- \h'|1.2i'test. +- +-produces +- +- This is a test. +- +- This is a test. +- +- The main usage of this feature is to define macros that act exactly +-at the place where called. +- +- .\" A simple macro to underline a word +- .de underline +- . nop \\$1\l'|0\[ul]' +- .. +- +-In the above example, '|0' specifies a negative distance from the +-current position (at the end of the just emitted argument '\$1') back to +-the beginning of the input line. Thus, the '\l' escape draws a line +-from right to left. +- +- 'gtroff' makes a difference between input and output line +-continuation; the latter is also called "interrupting" a line. +- +- -- Escape: \ +- -- Escape: \c +- -- Register: \n[.int] +- Continue a line. '\' (this is a backslash at the end of a +- line immediately followed by a newline) works on the input level, +- suppressing the effects of the following newline in the input. +- +- This is a \ +- .test +- => This is a .test +- +- The '|' operator is also affected. +- +- '\c' works on the output level. Anything after this escape on the +- same line is ignored except '\R', which works as usual. Anything +- before '\c' on the same line is appended to the current partial +- output line. The next non-command line after an interrupted line +- counts as a new input line. +- +- The visual results depend on whether no-fill mode is active. +- +- * If no-fill mode is active (using the 'nf' request), the next +- input text line after '\c' is handled as a continuation of the +- same input text line. +- +- .nf +- This is a \c +- test. +- => This is a test. +- +- * If fill mode is active (using the 'fi' request), a word +- interrupted with '\c' is continued with the text on the next +- input text line, without an intervening space. +- +- This is a te\c +- st. +- => This is a test. +- +- Note that an intervening control line that causes a break is +- stronger than '\c', flushing out the current partial line in the +- usual way. +- +- The '.int' register contains a positive value if the last output +- line was interrupted with '\c'; this is associated with the current +- environment (*note Environments::). +- +- +-File: groff.info, Node: Page Layout, Next: Page Control, Prev: Line Control, Up: gtroff Reference +- +-5.15 Page Layout +-================ +- +-'gtroff' provides some very primitive operations for controlling page +-layout. +- +- -- Request: .pl [length] +- -- Request: .pl +length +- -- Request: .pl -length +- -- Register: \n[.p] +- Set the "page length" to LENGTH (or increment or decrement the +- current value by LENGTH). This is the length of the physical +- output page. The default scaling indicator is 'v'. +- +- The current setting can be found in the read-only number register +- '.p'. +- +- Note that this only specifies the size of the page, not the top and +- bottom margins. Those are not set by 'gtroff' directly. *Note +- Traps::, for further information on how to do this. +- +- Negative 'pl' values are possible also, but not very useful: No +- trap is sprung, and each line is output on a single page (thus +- suppressing all vertical spacing). +- +- If no argument or an invalid argument is given, 'pl' sets the page +- length to 11i. +- +- 'gtroff' provides several operations that help in setting up top and +-bottom titles (or headers and footers). +- +- -- Request: .tl 'left'center'right' +- Print a "title line". It consists of three parts: a left justified +- portion, a centered portion, and a right justified portion. The +- argument separator ''' can be replaced with any character not +- occurring in the title line. The '%' character is replaced with +- the current page number. This character can be changed with the +- 'pc' request (see below). +- +- Without argument, 'tl' is ignored. +- +- Some notes: +- +- * The line length set by the 'll' request is not honoured by +- 'tl'; use the 'lt' request (described below) instead, to +- control line length for text set by 'tl'. +- +- * A title line is not restricted to the top or bottom of a page. +- +- * 'tl' prints the title line immediately, ignoring a partially +- filled line (which stays untouched). +- +- * It is not an error to omit closing delimiters. For example, +- '.tl /foo' is equivalent to '.tl /foo///': It prints a title +- line with the left justified word 'foo'; the centered and +- right justfied parts are empty. +- +- * 'tl' accepts the same parameter delimiting characters as the +- '\A' escape; see *note Escapes::. +- +- -- Request: .lt [length] +- -- Request: .lt +length +- -- Request: .lt -length +- -- Register: \n[.lt] +- The title line is printed using its own line length, which is +- specified (or incremented or decremented) with the 'lt' request. +- Initially, the title line length is set to 6.5i. If a negative +- line length is specified (which is not allowed), 'gtroff' emits a +- warning of type 'range' and sets the title line length to zero. +- The default scaling indicator is 'm'. If 'lt' is called without an +- argument, the title length is reset to the previous value before +- the last call to 'lt'. +- +- The current setting of this is available in the '.lt' read-only +- number register; it is associated with the current environment +- (*note Environments::). +- +- -- Request: .pn page +- -- Request: .pn +page +- -- Request: .pn -page +- -- Register: \n[.pn] +- Change (increase or decrease) the page number of the _next_ page. +- The only argument is the page number; the request is ignored +- without a parameter. +- +- The read-only number register '.pn' contains the number of the next +- page: either the value set by a 'pn' request, or the number of the +- current page plus 1. +- +- -- Request: .pc [char] +- Change the page number character (used by the 'tl' request) to a +- different character. With no argument, this mechanism is disabled. +- Note that this doesn't affect the number register '%'. +- +- *Note Traps::. +- +- +-File: groff.info, Node: Page Control, Next: Fonts and Symbols, Prev: Page Layout, Up: gtroff Reference +- +-5.16 Page Control +-================= +- +- -- Request: .bp [page] +- -- Request: .bp +page +- -- Request: .bp -page +- -- Register: \n[%] +- Stop processing the current page and move to the next page. This +- request causes a break. It can also take an argument to set +- (increase, decrease) the page number of the next page (which +- actually becomes the current page after 'bp' has finished). The +- difference between 'bp' and 'pn' is that 'pn' does not cause a +- break or actually eject a page. *Note Page Layout::. +- +- .de newpage \" define macro +- 'bp \" begin page +- 'sp .5i \" vertical space +- .tl 'left top'center top'right top' \" title +- 'sp .3i \" vertical space +- .. \" end macro +- +- 'bp' has no effect if not called within the top-level diversion +- (*note Diversions::). +- +- The read-write register '%' holds the current page number. +- +- The number register '.pe' is set to 1 while 'bp' is active. *Note +- Page Location Traps::. +- +- -- Request: .ne [space] +- It is often necessary to force a certain amount of space before a +- new page occurs. This is most useful to make sure that there is +- not a single "orphan" line left at the bottom of a page. The 'ne' +- request ensures that there is a certain distance, specified by the +- first argument, before the next page is triggered (see *note +- Traps::, for further information). The default scaling indicator +- for 'ne' is 'v'; the default value of SPACE is 1v if no argument is +- given. +- +- For example, to make sure that no fewer than 2 lines get orphaned, +- do the following before each paragraph: +- +- .ne 2 +- text text text +- +- 'ne' then automatically causes a page break if there is space for +- one line only. +- +- -- Request: .sv [space] +- -- Request: .os +- 'sv' is similar to the 'ne' request; it reserves the specified +- amount of vertical space. If the desired amount of space exists +- before the next trap (or the bottom page boundary if no trap is +- set), the space is output immediately (ignoring a partially filled +- line, which stays untouched). If there is not enough space, it is +- stored for later output via the 'os' request. The default value +- is 1v if no argument is given; the default scaling indicator is +- 'v'. +- +- Both 'sv' and 'os' ignore no-space mode. While the 'sv' request +- allows negative values for SPACE, 'os' ignores them. +- +- -- Register: \n[nl] +- This register contains the current vertical position. If the +- vertical position is zero and the top of page transition hasn't +- happened yet, 'nl' is set to negative value. 'gtroff' itself does +- this at the very beginning of a document before anything has been +- printed, but the main usage is to plant a header trap on a page if +- this page has already started. +- +- Consider the following: +- +- .de xxx +- . sp +- . tl ''Header'' +- . sp +- .. +- . +- First page. +- .bp +- .wh 0 xxx +- .nr nl (-1) +- Second page. +- +- Result: +- +- First page. +- +- ... +- +- Header +- +- Second page. +- +- ... +- +- Without resetting 'nl' to a negative value, the just planted trap +- would be active beginning with the _next_ page, not the current +- one. +- +- *Note Diversions::, for a comparison with the '.h' and '.d' +- registers. +- +- +-File: groff.info, Node: Fonts and Symbols, Next: Sizes, Prev: Page Control, Up: gtroff Reference +- +-5.17 Fonts and Symbols +-====================== +- +-'gtroff' can switch fonts at any point in the text. +- +- The basic set of fonts is 'R', 'I', 'B', and 'BI'. These are Times +-Roman, Italic, Bold, and Bold Italic. For non-TTY devices, there is +-also at least one symbol font that contains various special symbols +-(Greek, mathematics). +- +-* Menu: +- +-* Changing Fonts:: +-* Font Families:: +-* Font Positions:: +-* Using Symbols:: +-* Character Classes:: +-* Special Fonts:: +-* Artificial Fonts:: +-* Ligatures and Kerning:: +- +- +-File: groff.info, Node: Changing Fonts, Next: Font Families, Prev: Fonts and Symbols, Up: Fonts and Symbols +- +-5.17.1 Changing Fonts +---------------------- +- +- -- Request: .ft [font] +- -- Escape: \ff +- -- Escape: \f(fn +- -- Escape: \f[font] +- -- Register: \n[.sty] +- The 'ft' request and the '\f' escape change the current font to +- FONT (one-character name F, two-character name FN). +- +- If FONT is a style name (as set with the 'sty' request or with the +- 'styles' command in the 'DESC' file), use it within the current +- font family (as set with the 'fam' request, '\F' escape, or with +- the 'family' command in the 'DESC' file). +- +- It is not possible to switch to a font with the name 'DESC' +- (whereas this name could be used as a style name; however, this is +- not recommended). +- +- With no argument or using 'P' as an argument, '.ft' switches to the +- previous font. Use '\f[]' to do this with the escape. The old +- syntax forms '\fP' or '\f[P]' are also supported. +- +- Fonts are generally specified as upper-case strings, which are +- usually 1 to 4 characters representing an abbreviation or acronym +- of the font name. This is no limitation, just a convention. +- +- The example below produces two identical lines. +- +- eggs, bacon, +- .ft B +- spam +- .ft +- and sausage. +- +- eggs, bacon, \fBspam\fP and sausage. +- +- Note that '\f' doesn't produce an input token in 'gtroff'. As a +- consequence, it can be used in requests like 'mc' (which expects a +- single character as an argument) to change the font on the fly: +- +- .mc \f[I]x\f[] +- +- The current style name is available in the read-only number +- register '.sty' (this is a string-valued register); if the current +- font isn't a style, the empty string is returned. It is associated +- with the current environment. +- +- *Note Font Positions::, for an alternative syntax. +- +- -- Request: .ftr f [g] +- Translate font F to font G. Whenever a font named F is referred to +- in a '\f' escape sequence, in the 'F' and 'S' conditional +- operators, or in the 'ft', 'ul', 'bd', 'cs', 'tkf', 'special', +- 'fspecial', 'fp', or 'sty' requests, font G is used. If G is +- missing or equal to F the translation is undone. +- +- Note that it is not possible to chain font translations. Example: +- +- .ftr XXX TR +- .ftr XXX YYY +- .ft XXX +- => warning: can't find font `XXX' +- +- -- Request: .fzoom f [zoom] +- -- Register: \n[.zoom] +- Set magnification of font F to factor ZOOM, which must be a +- non-negative integer multiple of 1/1000th. This request is useful +- to adjust the optical size of a font in relation to the others. In +- the example below, font 'CR' is magnified by 10% (the zoom factor +- is thus 1.1). +- +- .fam P +- .fzoom CR 1100 +- .ps 12 +- Palatino and \f[CR]Courier\f[] +- +- A missing or zero value of ZOOM is the same as a value of 1000, +- which means no magnification. F must be a real font name, not a +- style. +- +- Note that the magnification of a font is completely transparent to +- troff; a change of the zoom factor doesn't cause any effect except +- that the dimensions of glyphs, (word) spaces, kerns, etc., of the +- affected font are adjusted accordingly. +- +- The zoom factor of the current font is available in the read-only +- number register '.zoom', in multiples of 1/1000th. It returns zero +- if there is no magnification. +- +- +-File: groff.info, Node: Font Families, Next: Font Positions, Prev: Changing Fonts, Up: Fonts and Symbols +- +-5.17.2 Font Families +--------------------- +- +-Due to the variety of fonts available, 'gtroff' has added the concept of +-"font families" and "font styles". The fonts are specified as the +-concatenation of the font family and style. Specifying a font without +-the family part causes 'gtroff' to use that style of the current family. +- +- Currently, fonts for the devices '-Tps', '-Tpdf', '-Tdvi', '-Tlj4', +-'-Tlbp', and the X11 fonts are set up to this mechanism. By default, +-'gtroff' uses the Times family with the four styles 'R', 'I', 'B', and +-'BI'. +- +- This way, it is possible to use the basic four fonts and to select a +-different font family on the command line (*note Groff Options::). +- +- -- Request: .fam [family] +- -- Register: \n[.fam] +- -- Escape: \Ff +- -- Escape: \F(fm +- -- Escape: \F[family] +- -- Register: \n[.fn] +- Switch font family to FAMILY (one-character name F, two-character +- name FM). If no argument is given, switch back to the previous +- font family. Use '\F[]' to do this with the escape. Note that +- '\FP' doesn't work; it selects font family 'P' instead. +- +- The value at start-up is 'T'. The current font family is available +- in the read-only number register '.fam' (this is a string-valued +- register); it is associated with the current environment. +- +- spam, +- .fam H \" helvetica family +- spam, \" used font is family H + style R = HR +- .ft B \" family H + style B = font HB +- spam, +- .fam T \" times family +- spam, \" used font is family T + style B = TB +- .ft AR \" font AR (not a style) +- baked beans, +- .ft R \" family T + style R = font TR +- and spam. +- +- Note that '\F' doesn't produce an input token in 'gtroff'. As a +- consequence, it can be used in requests like 'mc' (which expects a +- single character as an argument) to change the font family on the +- fly: +- +- .mc \F[P]x\F[] +- +- The '.fn' register contains the current "real font name" of the +- current font. This is a string-valued register. If the current +- font is a style, the value of '\n[.fn]' is the proper concatenation +- of family and style name. +- +- -- Request: .sty n style +- Associate STYLE with font position N. A font position can be +- associated either with a font or with a style. The current font is +- the index of a font position and so is also either a font or a +- style. If it is a style, the font that is actually used is the +- font which name is the concatenation of the name of the current +- family and the name of the current style. For example, if the +- current font is 1 and font position 1 is associated with style 'R' +- and the current font family is 'T', then font 'TR' is used. If the +- current font is not a style, then the current family is ignored. +- If the requests 'cs', 'bd', 'tkf', 'uf', or 'fspecial' are applied +- to a style, they are instead applied to the member of the current +- family corresponding to that style. +- +- N must be a non-negative integer value. +- +- The default family can be set with the '-f' option (*note Groff +- Options::). The 'styles' command in the 'DESC' file controls which +- font positions (if any) are initially associated with styles rather +- than fonts. For example, the default setting for POSTSCRIPT fonts +- +- styles R I B BI +- +- is equivalent to +- +- .sty 1 R +- .sty 2 I +- .sty 3 B +- .sty 4 BI +- +- 'fam' and '\F' always check whether the current font position is +- valid; this can give surprising results if the current font +- position is associated with a style. +- +- In the following example, we want to access the POSTSCRIPT font +- 'FooBar' from the font family 'Foo': +- +- .sty \n[.fp] Bar +- .fam Foo +- => warning: can't find font `FooR' +- +- The default font position at start-up is 1; for the POSTSCRIPT +- device, this is associated with style 'R', so 'gtroff' tries to +- open 'FooR'. +- +- A solution to this problem is to use a dummy font like the +- following: +- +- .fp 0 dummy TR \" set up dummy font at position 0 +- .sty \n[.fp] Bar \" register style `Bar' +- .ft 0 \" switch to font at position 0 +- .fam Foo \" activate family `Foo' +- .ft Bar \" switch to font `FooBar' +- +- *Note Font Positions::. +- +- +-File: groff.info, Node: Font Positions, Next: Using Symbols, Prev: Font Families, Up: Fonts and Symbols +- +-5.17.3 Font Positions +---------------------- +- +-For the sake of old phototypesetters and compatibility with old versions +-of 'troff', 'gtroff' has the concept of font "positions", on which +-various fonts are mounted. +- +- -- Request: .fp pos font [external-name] +- -- Register: \n[.f] +- -- Register: \n[.fp] +- Mount font FONT at position POS (which must be a non-negative +- integer). This numeric position can then be referred to with font +- changing commands. When 'gtroff' starts it is using font +- position 1 (which must exist; position 0 is unused usually at +- start-up). +- +- The current font in use, as a font position, is available in the +- read-only number register '.f'. This can be useful to remember the +- current font for later recall. It is associated with the current +- environment (*note Environments::). +- +- .nr save-font \n[.f] +- .ft B +- ... text text text ... +- .ft \n[save-font] +- +- The number of the next free font position is available in the +- read-only number register '.fp'. This is useful when mounting a +- new font, like so: +- +- .fp \n[.fp] NEATOFONT +- +- Fonts not listed in the 'DESC' file are automatically mounted on +- the next available font position when they are referenced. If a +- font is to be mounted explicitly with the 'fp' request on an unused +- font position, it should be mounted on the first unused font +- position, which can be found in the '.fp' register. Although +- 'gtroff' does not enforce this strictly, it is not allowed to mount +- a font at a position whose number is much greater (approx. 1000 +- positions) than that of any currently used position. +- +- The 'fp' request has an optional third argument. This argument +- gives the external name of the font, which is used for finding the +- font description file. The second argument gives the internal name +- of the font, which is used to refer to the font in 'gtroff' after +- it has been mounted. If there is no third argument then the +- internal name is used as the external name. This feature makes it +- possible to use fonts with long names in compatibility mode. +- +- Both the 'ft' request and the '\f' escape have alternative syntax +-forms to access font positions. +- +- -- Request: .ft nnn +- -- Escape: \fn +- -- Escape: \f(nn +- -- Escape: \f[nnn] +- Change the current font position to NNN (one-digit position N, +- two-digit position NN), which must be a non-negative integer. +- +- If NNN is associated with a style (as set with the 'sty' request or +- with the 'styles' command in the 'DESC' file), use it within the +- current font family (as set with the 'fam' request, the '\F' +- escape, or with the 'family' command in the 'DESC' file). +- +- this is font 1 +- .ft 2 +- this is font 2 +- .ft \" switch back to font 1 +- .ft 3 +- this is font 3 +- .ft +- this is font 1 again +- +- *Note Changing Fonts::, for the standard syntax form. +- +- +-File: groff.info, Node: Using Symbols, Next: Character Classes, Prev: Font Positions, Up: Fonts and Symbols +- +-5.17.4 Using Symbols +--------------------- +- +-A "glyph" is a graphical representation of a "character". While a +-character is an abstract entity containing semantic information, a glyph +-is something that can be actually seen on screen or paper. It is +-possible that a character has multiple glyph representation forms (for +-example, the character 'A' can be either written in a roman or an italic +-font, yielding two different glyphs); sometimes more than one character +-maps to a single glyph (this is a "ligature" - the most common is 'fi'). +- +- A "symbol" is simply a named glyph. Within 'gtroff', all glyph names +-of a particular font are defined in its font file. If the user requests +-a glyph not available in this font, 'gtroff' looks up an ordered list of +-"special fonts". By default, the POSTSCRIPT output device supports the +-two special fonts 'SS' (slanted symbols) and 'S' (symbols) (the former +-is looked up before the latter). Other output devices use different +-names for special fonts. Fonts mounted with the 'fonts' keyword in the +-'DESC' file are globally available. To install additional special fonts +-locally (i.e. for a particular font), use the 'fspecial' request. +- +- Here the exact rules how 'gtroff' searches a given symbol: +- +- * If the symbol has been defined with the 'char' request, use it. +- This hides a symbol with the same name in the current font. +- +- * Check the current font. +- +- * If the symbol has been defined with the 'fchar' request, use it. +- +- * Check whether the current font has a font-specific list of special +- fonts; test all fonts in the order of appearance in the last +- 'fspecial' call if appropriate. +- +- * If the symbol has been defined with the 'fschar' request for the +- current font, use it. +- +- * Check all fonts in the order of appearance in the last 'special' +- call. +- +- * If the symbol has been defined with the 'schar' request, use it. +- +- * As a last resort, consult all fonts loaded up to now for special +- fonts and check them, starting with the lowest font number. Note +- that this can sometimes lead to surprising results since the +- 'fonts' line in the 'DESC' file often contains empty positions, +- which are filled later on. For example, consider the following: +- +- fonts 3 0 0 FOO +- +- This mounts font 'foo' at font position 3. We assume that 'FOO' is +- a special font, containing glyph 'foo', and that no font has been +- loaded yet. The line +- +- .fspecial BAR BAZ +- +- makes font 'BAZ' special only if font 'BAR' is active. We further +- assume that 'BAZ' is really a special font, i.e., the font +- description file contains the 'special' keyword, and that it also +- contains glyph 'foo' with a special shape fitting to font 'BAR'. +- After executing 'fspecial', font 'BAR' is loaded at font +- position 1, and 'BAZ' at position 2. +- +- We now switch to a new font 'XXX', trying to access glyph 'foo' +- that is assumed to be missing. There are neither font-specific +- special fonts for 'XXX' nor any other fonts made special with the +- 'special' request, so 'gtroff' starts the search for special fonts +- in the list of already mounted fonts, with increasing font +- positions. Consequently, it finds 'BAZ' before 'FOO' even for +- 'XXX', which is not the intended behaviour. +- +- *Note Font Files::, and *note Special Fonts::, for more details. +- +- The list of available symbols is device dependent; see the +-'groff_char(7)' man page for a complete list of all glyphs. For +-example, say +- +- man -Tdvi groff_char > groff_char.dvi +- +-for a list using the default DVI fonts (not all versions of the 'man' +-program support the '-T' option). If you want to use an additional +-macro package to change the used fonts, 'groff' must be called directly: +- +- groff -Tdvi -mec -man groff_char.7 > groff_char.dvi +- +- Glyph names not listed in groff_char(7) are derived algorithmically, +-using a simplified version of the Adobe Glyph List (AGL) algorithm, +-which is described in +-. +-The (frozen) set of glyph names that can't be derived algorithmically is +-called "groff glyph list (GGL)". +- +- * A glyph for Unicode character U+XXXX[X[X]], which is not a +- composite character is named 'uXXXX[X[X]]'. X must be an uppercase +- hexadecimal digit. Examples: 'u1234', 'u008E', 'u12DB8'. The +- largest Unicode value is 0x10FFFF. There must be at least four 'X' +- digits; if necessary, add leading zeroes (after the 'u'). No zero +- padding is allowed for character codes greater than 0xFFFF. +- Surrogates (i.e., Unicode values greater than 0xFFFF represented +- with character codes from the surrogate area U+D800-U+DFFF) are not +- allowed too. +- +- * A glyph representing more than a single input character is named +- +- 'u' COMPONENT1 '_' COMPONENT2 '_' COMPONENT3 ... +- +- Example: 'u0045_0302_0301'. +- +- For simplicity, all Unicode characters that are composites must be +- decomposed maximally (this is normalization form D in the Unicode +- standard); for example, 'u00CA_0301' is not a valid glyph name +- since U+00CA (LATIN CAPITAL LETTER E WITH CIRCUMFLEX) can be +- further decomposed into U+0045 (LATIN CAPITAL LETTER E) and U+0302 +- (COMBINING CIRCUMFLEX ACCENT). 'u0045_0302_0301' is thus the glyph +- name for U+1EBE, LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE. +- +- * groff maintains a table to decompose all algorithmically derived +- glyph names that are composites itself. For example, 'u0100' +- (LATIN LETTER A WITH MACRON) is automatically decomposed into +- 'u0041_0304'. Additionally, a glyph name of the GGL is preferred +- to an algorithmically derived glyph name; groff also automatically +- does the mapping. Example: The glyph 'u0045_0302' is mapped to +- '^E'. +- +- * glyph names of the GGL can't be used in composite glyph names; for +- example, '^E_u0301' is invalid. +- +- -- Escape: \(nm +- -- Escape: \[name] +- -- Escape: \[component1 component2 ...] +- Insert a symbol NAME (two-character name NM) or a composite glyph +- with component glyphs COMPONENT1, COMPONENT2, ... There is no +- special syntax for one-character names - the natural form '\N' +- would collide with escapes.(1) (*note Using Symbols-Footnote-1::) +- +- If NAME is undefined, a warning of type 'char' is generated, and +- the escape is ignored. *Note Debugging::, for information about +- warnings. +- +- groff resolves '\[...]' with more than a single component as +- follows: +- +- * Any component that is found in the GGL is converted to the +- 'uXXXX' form. +- +- * Any component 'uXXXX' that is found in the list of +- decomposable glyphs is decomposed. +- +- * The resulting elements are then concatenated with '_' in +- between, dropping the leading 'u' in all elements but the +- first. +- +- No check for the existence of any component (similar to 'tr' +- request) is done. +- +- Examples: +- +- '\[A ho]' +- 'A' maps to 'u0041', 'ho' maps to 'u02DB', thus the final +- glyph name would be 'u0041_02DB'. Note this is not the +- expected result: The ogonek glyph 'ho' is a spacing ogonek, +- but for a proper composite a non-spacing ogonek (U+0328) is +- necessary. Looking into the file 'composite.tmac' one can +- find '.composite ho u0328', which changes the mapping of 'ho' +- while a composite glyph name is constructed, causing the final +- glyph name to be 'u0041_0328'. +- +- '\[^E u0301]' +- '\[^E aa]' +- '\[E a^ aa]' +- '\[E ^ ']' +- '^E' maps to 'u0045_0302', thus the final glyph name is +- 'u0045_0302_0301' in all forms (assuming proper calls of the +- 'composite' request). +- +- It is not possible to define glyphs with names like 'A ho' within a +- groff font file. This is not really a limitation; instead, you +- have to define 'u0041_0328'. +- +- -- Escape: \C'xxx' +- Typeset the glyph named XXX.(2) (*note Using Symbols-Footnote-2::) +- Normally it is more convenient to use '\[XXX]', but '\C' has the +- advantage that it is compatible with newer versions of AT&T 'troff' +- and is available in compatibility mode. +- +- -- Request: .composite from to +- Map glyph name FROM to glyph name TO if it is used in '\[...]' with +- more than one component. See above for examples. +- +- This mapping is based on glyph names only; no check for the +- existence of either glyph is done. +- +- A set of default mappings for many accents can be found in the file +- 'composite.tmac', which is loaded at start-up. +- +- -- Escape: \N'n' +- Typeset the glyph with code N in the current font ('n' is *not* the +- input character code). The number N can be any non-negative +- decimal integer. Most devices only have glyphs with codes between +- 0 and 255; the Unicode output device uses codes in the range +- 0-65535. If the current font does not contain a glyph with that +- code, special fonts are _not_ searched. The '\N' escape sequence +- can be conveniently used in conjunction with the 'char' request: +- +- .char \[phone] \f[ZD]\N'37' +- +- The code of each glyph is given in the fourth column in the font +- description file after the 'charset' command. It is possible to +- include unnamed glyphs in the font description file by using a name +- of '---'; the '\N' escape sequence is the only way to use these. +- +- No kerning is applied to glyphs accessed with '\N'. +- +- Some escape sequences directly map onto special glyphs. +- +- -- Escape: \' +- This is a backslash followed by the apostrophe character, ASCII +- character '0x27' (EBCDIC character '0x7D'). The same as '\[aa]', +- the acute accent. +- +- -- Escape: \` +- This is a backslash followed by ASCII character '0x60' (EBCDIC +- character '0x79' usually). The same as '\[ga]', the grave accent. +- +- -- Escape: \- +- This is the same as '\[-]', the minus sign in the current font. +- +- -- Escape: \_ +- This is the same as '\[ul]', the underline character. +- +- -- Request: .cflags n c1 c2 ... +- Input characters and symbols have certain properties associated +- with it.(3) (*note Using Symbols-Footnote-3::) These properties +- can be modified with the 'cflags' request. The first argument is +- the sum of the desired flags and the remaining arguments are the +- characters or symbols to have those properties. It is possible to +- omit the spaces between the characters or symbols. Instead of +- single characters or symbols you can also use character classes +- (see *note Character Classes:: for more details). +- +- '1' +- The character ends sentences (initially characters '.?!' have +- this property). +- +- '2' +- Lines can be broken before the character (initially no +- characters have this property). This only works if both the +- characters before and after have non-zero hyphenation codes +- (as set with the 'hcode' request). Use value 64 to override +- this behaviour. +- +- '4' +- Lines can be broken after the character (initially the +- character '-' and the symbols '\[hy]' and '\[em]' have this +- property). This only works if both the characters before and +- after have non-zero hyphenation codes (as set with the 'hcode' +- request). Use value 64 to override this behaviour. +- +- '8' +- The character overlaps horizontally if used as a horizontal +- line building element. Initially the symbols '\[ul]', +- '\[rn]', '\[ru]', '\[radicalex]', and '\[sqrtex]' have this +- property. +- +- '16' +- The character overlaps vertically if used as vertical line +- building element. Initially symbol '\[br]' has this property. +- +- '32' +- An end-of-sentence character followed by any number of +- characters with this property is treated as the end of a +- sentence if followed by a newline or two spaces; in other +- words the character is "transparent" for the purposes of +- end-of-sentence recognition - this is the same as having a +- zero space factor in TeX (initially characters '"')]*' and the +- symbols '\[dg]', '\[rq]', and '\[cq]' have this property). +- +- '64' +- Ignore hyphenation code values of the surrounding characters. +- Use this in combination with values 2 and 4 (initially no +- characters have this property). For example, if you need an +- automatic break point after the hyphen in number ranges like +- '3000-5000', insert +- +- .cflags 68 - +- +- into your document. Note, however, that this can lead to bad +- layout if done without thinking; in most situations, a better +- solution instead of changing the 'cflags' value is to insert +- '\:' right after the hyphen at the places that really need a +- break point. +- +- '128' +- Prohibit a line break before the character, but allow a line +- break after the character. This works only in combination +- with flags 256 and 512 (see below) and has no effect +- otherwise. +- +- '256' +- Prohibit a line break after the character, but allow a line +- break before the character. This works only in combination +- with flags 128 and 512 (see below) and has no effect +- otherwise. +- +- '512' +- Allow line break before or after the character. This works +- only in combination with flags 128 and 256 and has no effect +- otherwise. +- +- Contrary to flag values 2 and 4, the flags 128, 256, and 512 +- work pairwise. If, for example, the left character has value +- 512, and the right character 128, no line break gets inserted. +- If we use value 6 instead for the left character, a line break +- after the character can't be suppressed since the right +- neighbour character doesn't get examined. +- +- -- Request: .char g [string] +- -- Request: .fchar g [string] +- -- Request: .fschar f g [string] +- -- Request: .schar g [string] +- Define a new glyph G to be STRING (which can be empty).(4) (*note +- Using Symbols-Footnote-4::) Every time glyph G needs to be printed, +- STRING is processed in a temporary environment and the result is +- wrapped up into a single object. Compatibility mode is turned off +- and the escape character is set to '\' while STRING is being +- processed. Any emboldening, constant spacing or track kerning is +- applied to this object rather than to individual characters in +- STRING. +- +- A glyph defined by these requests can be used just like a normal +- glyph provided by the output device. In particular, other +- characters can be translated to it with the 'tr' or 'trin' +- requests; it can be made the leader character by the 'lc' request; +- repeated patterns can be drawn with the glyph using the '\l' and +- '\L' escape sequences; words containing the glyph can be hyphenated +- correctly if the 'hcode' request is used to give the glyph's symbol +- a hyphenation code. +- +- There is a special anti-recursion feature: Use of 'g' within the +- glyph's definition is handled like normal characters and symbols +- not defined with 'char'. +- +- Note that the 'tr' and 'trin' requests take precedence if 'char' +- accesses the same symbol. +- +- .tr XY +- X +- => Y +- .char X Z +- X +- => Y +- .tr XX +- X +- => Z +- +- The 'fchar' request defines a fallback glyph: 'gtroff' only checks +- for glyphs defined with 'fchar' if it cannot find the glyph in the +- current font. 'gtroff' carries out this test before checking +- special fonts. +- +- 'fschar' defines a fallback glyph for font F: 'gtroff' checks for +- glyphs defined with 'fschar' after the list of fonts declared as +- font-specific special fonts with the 'fspecial' request, but before +- the list of fonts declared as global special fonts with the +- 'special' request. +- +- Finally, the 'schar' request defines a global fallback glyph: +- 'gtroff' checks for glyphs defined with 'schar' after the list of +- fonts declared as global special fonts with the 'special' request, +- but before the already mounted special fonts. +- +- *Note Using Symbols::, for a detailed description of the glyph +- searching mechanism in 'gtroff'. +- +- -- Request: .rchar c1 c2 ... +- -- Request: .rfschar f c1 c2 ... +- Remove the definitions of glyphs C1, C2, ... This undoes the +- effect of a 'char', 'fchar', or 'schar' request. +- +- It is possible to omit the whitespace between arguments. +- +- The request 'rfschar' removes glyph definitions defined with +- 'fschar' for glyph f. +- +- *Note Special Characters::. +- +- +-File: groff.info, Node: Using Symbols-Footnotes, Up: Using Symbols +- +- (1) Note that a one-character symbol is not the same as an input +-character, i.e., the character 'a' is not the same as '\[a]'. By +-default, 'groff' defines only a single one-character symbol, '\[-]'; it +-is usually accessed as '\-'. On the other hand, 'gtroff' has the +-special feature that '\[charXXX]' is the same as the input character +-with character code XXX. For example, '\[char97]' is identical to the +-letter 'a' if ASCII encoding is active. +- +- (2) '\C' is actually a misnomer since it accesses an output glyph. +- +- (3) Note that the output glyphs themselves don't have such +-properties. For 'gtroff', a glyph is a numbered box with a given width, +-depth, and height, nothing else. All manipulations with the 'cflags' +-request work on the input level. +- +- (4) 'char' is a misnomer since an output glyph is defined. +- +- +-File: groff.info, Node: Character Classes, Next: Special Fonts, Prev: Using Symbols, Up: Fonts and Symbols +- +-5.17.5 Character Classes +------------------------- +- +-Classes are particularly useful for East Asian languages such as +-Chinese, Japanese, and Korean, where the number of needed characters is +-much larger than in European languages, and where large sets of +-characters share the same properties. +- +- -- Request: .class n c1 c2 ... +- In 'groff', a "character class" (or simply "class") is a set of +- characters, grouped by some user aspect. The 'class' request +- defines such classes so that other requests can refer to all +- characters belonging to this set with a single class name. +- Currently, only the 'cflags' request can handle character classes. +- +- A 'class' request takes a class name followed by a list of +- entities. In its simplest form, the entities are characters or +- symbols: +- +- .class [prepunct] , : ; > } +- +- Since class and glyph names share the same namespace, it is +- recommended to start and end the class name with '[' and ']', +- respectively, to avoid collisions with normal 'groff' symbols (and +- symbols defined by the user). In particular, the presence of ']' +- in the symbol name intentionally prevents the usage of '\[...]', +- thus you must use the '\C' escape to access a class with such a +- name. +- +- You can also use a special character range notation, consisting of +- a start character or symbol, followed by '-', and an end character +- or symbol. Internally, 'gtroff' converts these two symbol names to +- Unicode values (according to the groff glyph gist), which then give +- the start and end value of the range. If that fails, the class +- definition is skipped. +- +- Finally, classes can be nested, too. +- +- Here is a more complex example: +- +- .class [prepunctx] \C'[prepunct]' \[u2013]-\[u2016] +- +- The class 'prepunctx' now contains the contents of the class +- 'prepunct' as defined above (the set ', : ; > }'), and characters +- in the range between 'U+2013' and 'U+2016'. +- +- If you want to add '-' to a class, it must be the first character +- value in the argument list, otherwise it gets misinterpreted as a +- range. +- +- Note that it is not possible to use class names within range +- definitions. +- +- Typical use of the 'class' request is to control line-breaking and +- hyphenation rules as defined by the 'cflags' request. For example, +- to inhibit line breaks before the characters belonging to the +- 'prepunctx' class, you can write: +- +- .cflags 2 \C'[prepunctx]' +- +- See the 'cflags' request in *note Using Symbols::, for more +- details. +- +- +-File: groff.info, Node: Special Fonts, Next: Artificial Fonts, Prev: Character Classes, Up: Fonts and Symbols +- +-5.17.6 Special Fonts +--------------------- +- +-Special fonts are those that 'gtroff' searches when it cannot find the +-requested glyph in the current font. The Symbol font is usually a +-special font. +- +- 'gtroff' provides the following two requests to add more special +-fonts. *Note Using Symbols::, for a detailed description of the glyph +-searching mechanism in 'gtroff'. +- +- Usually, only non-TTY devices have special fonts. +- +- -- Request: .special [s1 s2 ...] +- -- Request: .fspecial f [s1 s2 ...] +- Use the 'special' request to define special fonts. Initially, this +- list is empty. +- +- Use the 'fspecial' request to designate special fonts only when +- font F is active. Initially, this list is empty. +- +- Previous calls to 'special' or 'fspecial' are overwritten; without +- arguments, the particular list of special fonts is set to empty. +- Special fonts are searched in the order they appear as arguments. +- +- All fonts that appear in a call to 'special' or 'fspecial' are +- loaded. +- +- *Note Using Symbols::, for the exact search order of glyphs. +- +- +-File: groff.info, Node: Artificial Fonts, Next: Ligatures and Kerning, Prev: Special Fonts, Up: Fonts and Symbols +- +-5.17.7 Artificial Fonts +------------------------ +- +-There are a number of requests and escapes for artificially creating +-fonts. These are largely vestiges of the days when output devices did +-not have a wide variety of fonts, and when 'nroff' and 'troff' were +-separate programs. Most of them are no longer necessary in GNU 'troff'. +-Nevertheless, they are supported. +- +- -- Escape: \H'height' +- -- Escape: \H'+height' +- -- Escape: \H'-height' +- -- Register: \n[.height] +- Change (increment, decrement) the height of the current font, but +- not the width. If HEIGHT is zero, restore the original height. +- Default scaling indicator is 'z'. +- +- The read-only number register '.height' contains the font height as +- set by '\H'. +- +- Currently, only the '-Tps' and '-Tpdf' devices support this +- feature. +- +- Note that '\H' doesn't produce an input token in 'gtroff'. As a +- consequence, it can be used in requests like 'mc' (which expects a +- single character as an argument) to change the font on the fly: +- +- .mc \H'+5z'x\H'0' +- +- In compatibility mode, 'gtroff' behaves differently: If an +- increment or decrement is used, it is always taken relative to the +- current point size and not relative to the previously selected font +- height. Thus, +- +- .cp 1 +- \H'+5'test \H'+5'test +- +- prints the word 'test' twice with the same font height (five points +- larger than the current font size). +- +- -- Escape: \S'slant' +- -- Register: \n[.slant] +- Slant the current font by SLANT degrees. Positive values slant to +- the right. Only integer values are possible. +- +- The read-only number register '.slant' contains the font slant as +- set by '\S'. +- +- Currently, only the '-Tps' and '-Tpdf' devices support this +- feature. +- +- Note that '\S' doesn't produce an input token in 'gtroff'. As a +- consequence, it can be used in requests like 'mc' (which expects a +- single character as an argument) to change the font on the fly: +- +- .mc \S'20'x\S'0' +- +- This request is incorrectly documented in the original UNIX troff +- manual; the slant is always set to an absolute value. +- +- -- Request: .ul [lines] +- The 'ul' request normally underlines subsequent lines if a TTY +- output device is used. Otherwise, the lines are printed in italics +- (only the term 'underlined' is used in the following). The single +- argument is the number of input lines to be underlined; with no +- argument, the next line is underlined. If LINES is zero or +- negative, stop the effects of 'ul' (if it was active). Requests +- and empty lines do not count for computing the number of underlined +- input lines, even if they produce some output like 'tl'. Lines +- inserted by macros (e.g. invoked by a trap) do count. +- +- At the beginning of 'ul', the current font is stored and the +- underline font is activated. Within the span of a 'ul' request, it +- is possible to change fonts, but after the last line affected by +- 'ul' the saved font is restored. +- +- This number of lines still to be underlined is associated with the +- current environment (*note Environments::). The underline font can +- be changed with the 'uf' request. +- +- The 'ul' request does not underline spaces. +- +- -- Request: .cu [lines] +- The 'cu' request is similar to 'ul' but underlines spaces as well +- (if a TTY output device is used). +- +- -- Request: .uf font +- Set the underline font (globally) used by 'ul' and 'cu'. By +- default, this is the font at position 2. FONT can be either a +- non-negative font position or the name of a font. +- +- -- Request: .bd font [offset] +- -- Request: .bd font1 font2 [offset] +- -- Register: \n[.b] +- Artificially create a bold font by printing each glyph twice, +- slightly offset. +- +- Two syntax forms are available. +- +- * Imitate a bold font unconditionally. The first argument +- specifies the font to embolden, and the second is the number +- of basic units, minus one, by which the two glyphs are offset. +- If the second argument is missing, emboldening is turned off. +- +- FONT can be either a non-negative font position or the name of +- a font. +- +- OFFSET is available in the '.b' read-only register if a +- special font is active; in the 'bd' request, its default unit +- is 'u'. +- +- * Imitate a bold form conditionally. Embolden FONT1 by OFFSET +- only if font FONT2 is the current font. This command can be +- issued repeatedly to set up different emboldening values for +- different current fonts. If the second argument is missing, +- emboldening is turned off for this particular current font. +- +- This affects special fonts only (either set up with the +- 'special' command in font files or with the 'fspecial' +- request). +- +- -- Request: .cs font [width [em-size]] +- Switch to and from "constant glyph space mode". If activated, the +- width of every glyph is WIDTH/36 ems. The em size is given +- absolutely by EM-SIZE; if this argument is missing, the em value is +- taken from the current font size (as set with the 'ps' request) +- when the font is effectively in use. Without second and third +- argument, constant glyph space mode is deactivated. +- +- Default scaling indicator for EM-SIZE is 'z'; WIDTH is an integer. +- +- +-File: groff.info, Node: Ligatures and Kerning, Prev: Artificial Fonts, Up: Fonts and Symbols +- +-5.17.8 Ligatures and Kerning +----------------------------- +- +-Ligatures are groups of characters that are run together, i.e, producing +-a single glyph. For example, the letters 'f' and 'i' can form a +-ligature 'fi' as in the word 'file'. This produces a cleaner look +-(albeit subtle) to the printed output. Usually, ligatures are not +-available in fonts for TTY output devices. +- +- Most POSTSCRIPT fonts support the fi and fl ligatures. The C/A/T +-typesetter that was the target of AT&T 'troff' also supported 'ff', +-'ffi', and 'ffl' ligatures. Advanced typesetters or 'expert' fonts may +-include ligatures for 'ft' and 'ct', although GNU 'troff' does not +-support these (yet). +- +- Only the current font is checked for ligatures and kerns; neither +-special fonts nor entities defined with the 'char' request (and its +-siblings) are taken into account. +- +- -- Request: .lg [flag] +- -- Register: \n[.lg] +- Switch the ligature mechanism on or off; if the parameter is +- non-zero or missing, ligatures are enabled, otherwise disabled. +- Default is on. The current ligature mode can be found in the +- read-only number register '.lg' (set to 1 or 2 if ligatures are +- enabled, 0 otherwise). +- +- Setting the ligature mode to 2 enables the two-character ligatures +- (fi, fl, and ff) and disables the three-character ligatures (ffi +- and ffl). +- +- "Pairwise kerning" is another subtle typesetting mechanism that +-modifies the distance between a glyph pair to improve readability. In +-most cases (but not always) the distance is decreased. Typewriter-like +-fonts and fonts for terminals where all glyphs have the same width don't +-use kerning. +- +- -- Request: .kern [flag] +- -- Register: \n[.kern] +- Switch kerning on or off. If the parameter is non-zero or missing, +- enable pairwise kerning, otherwise disable it. The read-only +- number register '.kern' is set to 1 if pairwise kerning is enabled, +- 0 otherwise. +- +- If the font description file contains pairwise kerning information, +- glyphs from that font are kerned. Kerning between two glyphs can +- be inhibited by placing '\&' between them: 'V\&A'. +- +- *Note Font File Format::. +- +- "Track kerning" expands or reduces the space between glyphs. This +-can be handy, for example, if you need to squeeze a long word onto a +-single line or spread some text to fill a narrow column. It must be +-used with great care since it is usually considered bad typography if +-the reader notices the effect. +- +- -- Request: .tkf f s1 n1 s2 n2 +- Enable track kerning for font F. If the current font is F the +- width of every glyph is increased by an amount between N1 and N2 +- (N1, N2 can be negative); if the current point size is less than or +- equal to S1 the width is increased by N1; if it is greater than or +- equal to S2 the width is increased by N2; if the point size is +- greater than or equal to S1 and less than or equal to S2 the +- increase in width is a linear function of the point size. +- +- The default scaling indicator is 'z' for S1 and S2, 'p' for N1 and +- N2. +- +- Note that the track kerning amount is added even to the rightmost +- glyph in a line; for large values it is thus recommended to +- increase the line length by the same amount to compensate it. +- +- Sometimes, when typesetting letters of different fonts, more or less +-space at such boundaries are needed. There are two escapes to help with +-this. +- +- -- Escape: \/ +- Increase the width of the preceding glyph so that the spacing +- between that glyph and the following glyph is correct if the +- following glyph is a roman glyph. For example, if an italic 'f' is +- immediately followed by a roman right parenthesis, then in many +- fonts the top right portion of the 'f' overlaps the top left of the +- right parenthesis. Use this escape sequence whenever an italic +- glyph is immediately followed by a roman glyph without any +- intervening space. This small amount of space is also called +- "italic correction". +- +- -- Escape: \, +- Modify the spacing of the following glyph so that the spacing +- between that glyph and the preceding glyph is correct if the +- preceding glyph is a roman glyph. Use this escape sequence +- whenever a roman glyph is immediately followed by an italic glyph +- without any intervening space. In analogy to above, this space +- could be called "left italic correction", but this term isn't used +- widely. +- +- -- Escape: \& +- Insert a zero-width character, which is invisible. Its intended +- use is to stop interaction of a character with its surrounding. +- +- * It prevents the insertion of extra space after an +- end-of-sentence character. +- +- Test. +- Test. +- => Test. Test. +- Test.\& +- Test. +- => Test. Test. +- +- * It prevents interpretation of a control character at the +- beginning of an input line. +- +- .Test +- => warning: `Test' not defined +- \&.Test +- => .Test +- +- * It prevents kerning between two glyphs. +- +- * It is needed to map an arbitrary character to nothing in the +- 'tr' request (*note Character Translations::). +- +- -- Escape: \) +- This escape is similar to '\&' except that it behaves like a +- character declared with the 'cflags' request to be transparent for +- the purposes of an end-of-sentence character. +- +- Its main usage is in macro definitions to protect against arguments +- starting with a control character. +- +- .de xxx +- \)\\$1 +- .. +- .de yyy +- \&\\$1 +- .. +- This is a test.\c +- .xxx ' +- This is a test. +- =>This is a test.' This is a test. +- This is a test.\c +- .yyy ' +- This is a test. +- =>This is a test.' This is a test. +- +- +-File: groff.info, Node: Sizes, Next: Strings, Prev: Fonts and Symbols, Up: gtroff Reference +- +-5.18 Sizes +-========== +- +-'gtroff' uses two dimensions with each line of text, type size and +-vertical spacing. The "type size" is approximately the height of the +-tallest glyph.(1) (*note Sizes-Footnote-1::) "Vertical spacing" is the +-amount of space 'gtroff' allows for a line of text; normally, this is +-about 20% larger than the current type size. Ratios smaller than this +-can result in hard-to-read text; larger than this, it spreads the text +-out more vertically (useful for term papers). By default, 'gtroff' uses +-10 point type on 12 point spacing. +- +- The difference between type size and vertical spacing is known, by +-typesetters, as "leading" (this is pronounced 'ledding'). +- +-* Menu: +- +-* Changing Type Sizes:: +-* Fractional Type Sizes:: +- +- +-File: groff.info, Node: Sizes-Footnotes, Up: Sizes +- +- (1) This is usually the parenthesis. Note that in most cases the +-real dimensions of the glyphs in a font are _not_ related to its type +-size! For example, the standard POSTSCRIPT font families 'Times Roman', +-'Helvetica', and 'Courier' can't be used together at 10pt; to get +-acceptable output, the size of 'Helvetica' has to be reduced by one +-point, and the size of 'Courier' must be increased by one point. +- +- +-File: groff.info, Node: Changing Type Sizes, Next: Fractional Type Sizes, Prev: Sizes, Up: Sizes +- +-5.18.1 Changing Type Sizes +--------------------------- +- +- -- Request: .ps [size] +- -- Request: .ps +size +- -- Request: .ps -size +- -- Escape: \ssize +- -- Register: \n[.s] +- Use the 'ps' request or the '\s' escape to change (increase, +- decrease) the type size (in points). Specify SIZE as either an +- absolute point size, or as a relative change from the current size. +- The size 0 (for both '.ps' and '\s'), or no argument (for '.ps' +- only), goes back to the previous size. +- +- Default scaling indicator of 'size' is 'z'. If 'size' is negative, +- it is set to 1u. +- +- The read-only number register '.s' returns the point size in points +- as a decimal fraction. This is a string. To get the point size in +- scaled points, use the '.ps' register instead. +- +- '.s' is associated with the current environment (*note +- Environments::). +- +- snap, snap, +- .ps +2 +- grin, grin, +- .ps +2 +- wink, wink, \s+2nudge, nudge,\s+8 say no more! +- .ps 10 +- +- The '\s' escape may be called in a variety of ways. Much like +- other escapes there must be a way to determine where the argument +- ends and the text begins. Any of the following forms are valid: +- +- '\sN' +- Set the point size to N points. N must be either 0 or in the +- range 4 to 39. +- +- '\s+N' +- '\s-N' +- Increase or decrease the point size by N points. N must be +- exactly one digit. +- +- '\s(NN' +- Set the point size to NN points. NN must be exactly two +- digits. +- +- '\s+(NN' +- '\s-(NN' +- '\s(+NN' +- '\s(-NN' +- Increase or decrease the point size by NN points. NN must be +- exactly two digits. +- +- Note that '\s' doesn't produce an input token in 'gtroff'. As a +- consequence, it can be used in requests like 'mc' (which expects a +- single character as an argument) to change the font on the fly: +- +- .mc \s[20]x\s[0] +- +- *Note Fractional Type Sizes::, for yet another syntactical form of +- using the '\s' escape. +- +- -- Request: .sizes s1 s2 ... sn [0] +- Some devices may only have certain permissible sizes, in which case +- 'gtroff' rounds to the nearest permissible size. The 'DESC' file +- specifies which sizes are permissible for the device. +- +- Use the 'sizes' request to change the permissible sizes for the +- current output device. Arguments are in scaled points; the +- 'sizescale' line in the 'DESC' file for the output device provides +- the scaling factor. For example, if the scaling factor is 1000, +- then the value 12000 is 12 points. +- +- Each argument can be a single point size (such as '12000'), or a +- range of sizes (such as '4000-72000'). You can optionally end the +- list with a zero. +- +- -- Request: .vs [space] +- -- Request: .vs +space +- -- Request: .vs -space +- -- Register: \n[.v] +- Change (increase, decrease) the vertical spacing by SPACE. The +- default scaling indicator is 'p'. +- +- If 'vs' is called without an argument, the vertical spacing is +- reset to the previous value before the last call to 'vs'. +- +- 'gtroff' creates a warning of type 'range' if SPACE is negative; +- the vertical spacing is then set to smallest positive value, the +- vertical resolution (as given in the '.V' register). +- +- Note that '.vs 0' isn't saved in a diversion since it doesn't +- result in a vertical motion. You explicitly have to repeat this +- command before inserting the diversion. +- +- The read-only number register '.v' contains the current vertical +- spacing; it is associated with the current environment (*note +- Environments::). +- +- The effective vertical line spacing consists of four components. +-Breaking a line causes the following actions (in the given order). +- +- * Move the current point vertically by the "extra pre-vertical line +- space". This is the minimum value of all '\x' escapes with a +- negative argument in the current output line. +- +- * Move the current point vertically by the vertical line spacing as +- set with the 'vs' request. +- +- * Output the current line. +- +- * Move the current point vertically by the "extra post-vertical line +- space". This is the maximum value of all '\x' escapes with a +- positive argument in the line that has just been output. +- +- * Move the current point vertically by the "post-vertical line +- spacing" as set with the 'pvs' request. +- +- It is usually better to use 'vs' or 'pvs' instead of 'ls' to produce +-double-spaced documents: 'vs' and 'pvs' have a finer granularity for the +-inserted vertical space compared to 'ls'; furthermore, certain +-preprocessors assume single-spacing. +- +- *Note Manipulating Spacing::, for more details on the '\x' escape and +-the 'ls' request. +- +- -- Request: .pvs [space] +- -- Request: .pvs +space +- -- Request: .pvs -space +- -- Register: \n[.pvs] +- Change (increase, decrease) the post-vertical spacing by SPACE. +- The default scaling indicator is 'p'. +- +- If 'pvs' is called without an argument, the post-vertical spacing +- is reset to the previous value before the last call to 'pvs'. +- +- 'gtroff' creates a warning of type 'range' if SPACE is zero or +- negative; the vertical spacing is then set to zero. +- +- The read-only number register '.pvs' contains the current +- post-vertical spacing; it is associated with the current +- environment (*note Environments::). +- +- +-File: groff.info, Node: Fractional Type Sizes, Prev: Changing Type Sizes, Up: Sizes +- +-5.18.2 Fractional Type Sizes +----------------------------- +- +-A "scaled point" is equal to 1/SIZESCALE points, where SIZESCALE is +-specified in the 'DESC' file (1 by default). There is a new scale +-indicator 'z', which has the effect of multiplying by SIZESCALE. +-Requests and escape sequences in 'gtroff' interpret arguments that +-represent a point size as being in units of scaled points, but they +-evaluate each such argument using a default scale indicator of 'z'. +-Arguments treated in this way are the argument to the 'ps' request, the +-third argument to the 'cs' request, the second and fourth arguments to +-the 'tkf' request, the argument to the '\H' escape sequence, and those +-variants of the '\s' escape sequence that take a numeric expression as +-their argument (see below). +- +- For example, suppose SIZESCALE is 1000; then a scaled point is +-equivalent to a millipoint; the request '.ps 10.25' is equivalent to +-'.ps 10.25z' and thus sets the point size to 10250 scaled points, which +-is equal to 10.25 points. +- +- 'gtroff' disallows the use of the 'z' scale indicator in instances +-where it would make no sense, such as a numeric expression whose default +-scale indicator was neither 'u' nor 'z'. Similarly it would make no +-sense to use a scaling indicator other than 'z' or 'u' in a numeric +-expression whose default scale indicator was 'z', and so 'gtroff' +-disallows this as well. +- +- There is also new scale indicator 's', which multiplies by the number +-of units in a scaled point. So, for example, '\n[.ps]s' is equal to +-'1m'. Be sure not to confuse the 's' and 'z' scale indicators. +- +- -- Register: \n[.ps] +- A read-only number register returning the point size in scaled +- points. +- +- '.ps' is associated with the current environment (*note +- Environments::). +- +- -- Register: \n[.psr] +- -- Register: \n[.sr] +- The last-requested point size in scaled points is contained in the +- '.psr' read-only number register. The last requested point size in +- points as a decimal fraction can be found in '.sr'. This is a +- string-valued read-only number register. +- +- Note that the requested point sizes are device-independent, whereas +- the values returned by the '.ps' and '.s' registers are not. For +- example, if a point size of 11pt is requested, and a 'sizes' +- request (or a 'sizescale' line in a 'DESC' file) specifies 10.95pt +- instead, this value is actually used. +- +- Both registers are associated with the current environment (*note +- Environments::). +- +- The '\s' escape has the following syntax for working with fractional +-type sizes: +- +-'\s[N]' +-'\s'N'' +- Set the point size to N scaled points; N is a numeric expression +- with a default scale indicator of 'z'. +- +-'\s[+N]' +-'\s[-N]' +-'\s+[N]' +-'\s-[N]' +-'\s'+N'' +-'\s'-N'' +-'\s+'N'' +-'\s-'N'' +- Increase or or decrease the point size by N scaled points; N is a +- numeric expression (which may start with a minus sign) with a +- default scale indicator of 'z'. +- +- *Note Font Files::. +- +- +-File: groff.info, Node: Strings, Next: Conditionals and Loops, Prev: Sizes, Up: gtroff Reference +- +-5.19 Strings +-============ +- +-'gtroff' has string variables, which are entirely for user convenience +-(i.e. there are no built-in strings exept '.T', but even this is a +-read-write string variable). +- +- Although the following requests can be used to create strings, simply +-using an undefined string will cause it to be defined as empty. *Note +-Identifiers::. +- +- -- Request: .ds name [string] +- -- Request: .ds1 name [string] +- -- Escape: \*n +- -- Escape: \*(nm +- -- Escape: \*[name arg1 arg2 ...] +- Define and access a string variable NAME (one-character name N, +- two-character name NM). If NAME already exists, 'ds' overwrites +- the previous definition. Only the syntax form using brackets can +- take arguments that are handled identically to macro arguments; the +- single exception is that a closing bracket as an argument must be +- enclosed in double quotes. *Note Request and Macro Arguments::, +- and *note Parameters::. +- +- Example: +- +- .ds foo a \\$1 test +- . +- This is \*[foo nice]. +- => This is a nice test. +- +- The '\*' escape "interpolates" (expands in-place) a +- previously-defined string variable. To be more precise, the stored +- string is pushed onto the input stack, which is then parsed by +- 'gtroff'. Similar to number registers, it is possible to nest +- strings, i.e., string variables can be called within string +- variables. +- +- If the string named by the '\*' escape does not exist, it is +- defined as empty, and a warning of type 'mac' is emitted (see *note +- Debugging::, for more details). +- +- *Caution:* Unlike other requests, the second argument to the 'ds' +- request takes up the entire line including trailing spaces. This +- means that comments on a line with such a request can introduce +- unwanted space into a string. +- +- .ds UX \s-1UNIX\s0\u\s-3tm\s0\d \" UNIX trademark +- +- Instead the comment should be put on another line or have the +- comment escape adjacent with the end of the string. +- +- .ds UX \s-1UNIX\s0\u\s-3tm\s0\d\" UNIX trademark +- +- To produce leading space the string can be started with a double +- quote. No trailing quote is needed; in fact, any trailing quote is +- included in your string. +- +- .ds sign " Yours in a white wine sauce, +- +- Strings are not limited to a single line of text. A string can +- span several lines by escaping the newlines with a backslash. The +- resulting string is stored _without_ the newlines. +- +- .ds foo lots and lots \ +- of text are on these \ +- next several lines +- +- It is not possible to have real newlines in a string. To put a +- single double quote character into a string, use two consecutive +- double quote characters. +- +- The 'ds1' request turns off compatibility mode while interpreting a +- string. To be more precise, a "compatibility save" input token is +- inserted at the beginning of the string, and a "compatibility +- restore" input token at the end. +- +- .nr xxx 12345 +- .ds aa The value of xxx is \\n[xxx]. +- .ds1 bb The value of xxx ix \\n[xxx]. +- . +- .cp 1 +- . +- \*(aa +- => warning: number register `[' not defined +- => The value of xxx is 0xxx]. +- \*(bb +- => The value of xxx ix 12345. +- +- Strings, macros, and diversions (and boxes) share the same name +- space. Internally, even the same mechanism is used to store them. +- This has some interesting consequences. For example, it is +- possible to call a macro with string syntax and vice versa. +- +- .de xxx +- a funny test. +- .. +- This is \*[xxx] +- => This is a funny test. +- +- .ds yyy a funny test +- This is +- .yyy +- => This is a funny test. +- +- In particular, interpolating a string does not hide existing macro +- arguments. Thus in a macro, a more efficient way of doing +- +- .xx \\$@ +- +- is +- +- \\*[xx]\\ +- +- Note that the latter calling syntax doesn't change the value of +- '\$0', which is then inherited from the calling macro. +- +- Diversions and boxes can be also called with string syntax. +- +- Another consequence is that you can copy one-line diversions or +- boxes to a string. +- +- .di xxx +- a \fItest\fR +- .br +- .di +- .ds yyy This is \*[xxx]\c +- \*[yyy]. +- => This is a test. +- +- As the previous example shows, it is possible to store formatted +- output in strings. The '\c' escape prevents the insertion of an +- additional blank line in the output. +- +- Copying diversions longer than a single output line produces +- unexpected results. +- +- .di xxx +- a funny +- .br +- test +- .br +- .di +- .ds yyy This is \*[xxx]\c +- \*[yyy]. +- => test This is a funny. +- +- Usually, it is not predictable whether a diversion contains one or +- more output lines, so this mechanism should be avoided. With UNIX +- 'troff', this was the only solution to strip off a final newline +- from a diversion. Another disadvantage is that the spaces in the +- copied string are already formatted, making them unstretchable. +- This can cause ugly results. +- +- A clean solution to this problem is available in GNU 'troff', using +- the requests 'chop' to remove the final newline of a diversion, and +- 'unformat' to make the horizontal spaces stretchable again. +- +- .box xxx +- a funny +- .br +- test +- .br +- .box +- .chop xxx +- .unformat xxx +- This is \*[xxx]. +- => This is a funny test. +- +- *Note Gtroff Internals::, for more information. +- +- -- Request: .as name [string] +- -- Request: .as1 name [string] +- The 'as' request is similar to 'ds' but appends STRING to the +- string stored as NAME instead of redefining it. If NAME doesn't +- exist yet, it is created. +- +- .as sign " with shallots, onions and garlic, +- +- The 'as1' request is similar to 'as', but compatibility mode is +- switched off while the appended string is interpreted. To be more +- precise, a "compatibility save" input token is inserted at the +- beginning of the appended string, and a "compatibility restore" +- input token at the end. +- +- Rudimentary string manipulation routines are given with the next two +-requests. +- +- -- Request: .substring str n1 [n2] +- Replace the string named STR with the substring defined by the +- indices N1 and N2. The first character in the string has index 0. +- If N2 is omitted, it is implicitly set to the largest valid value +- (the string length minus one). If the index value N1 or N2 is +- negative, it is counted from the end of the string, going +- backwards: The last character has index -1, the character before +- the last character has index -2, etc. +- +- .ds xxx abcdefgh +- .substring xxx 1 -4 +- \*[xxx] +- => bcde +- .substring xxx 2 +- \*[xxx] +- => de +- +- -- Request: .length reg str +- Compute the number of characters of STR and return it in the number +- register REG. If REG doesn't exist, it is created. 'str' is read +- in copy mode. +- +- .ds xxx abcd\h'3i'efgh +- .length yyy \*[xxx] +- \n[yyy] +- => 14 +- +- -- Request: .rn xx yy +- Rename the request, macro, diversion, or string XX to YY. +- +- -- Request: .rm xx +- Remove the request, macro, diversion, or string XX. 'gtroff' +- treats subsequent invocations as if the object had never been +- defined. +- +- -- Request: .als new old +- Create an alias named NEW for the request, string, macro, or +- diversion object named OLD. The new name and the old name are +- exactly equivalent (it is similar to a hard rather than a soft +- link). If OLD is undefined, 'gtroff' generates a warning of type +- 'mac' and ignores the request. +- +- To understand how the 'als' request works it is probably best to +- think of two different pools: one pool for objects (macros, +- strings, etc.), and another one for names. As soon as an object is +- defined, 'gtroff' adds it to the object pool, adds its name to the +- name pool, and creates a link between them. When 'als' creates an +- alias, it adds a new name to the name pool that gets linked to the +- same object as the old name. +- +- Now consider this example. +- +- .de foo +- .. +- . +- .als bar foo +- . +- .de bar +- . foo +- .. +- . +- .bar +- => input stack limit exceeded +- +- The definition of macro 'bar' replaces the old object this name is +- linked to. However, the alias to 'foo' is still active! In other +- words, 'foo' is still linked to the same object as 'bar', and the +- result of calling 'bar' is an infinite, recursive loop that finally +- leads to an error. +- +- To undo an alias, simply call 'rm' on the aliased name. The object +- itself is not destroyed until there are no more aliases. +- +- -- Request: .chop xx +- Remove (chop) the last character from the macro, string, or +- diversion named XX. This is useful for removing the newline from +- the end of diversions that are to be interpolated as strings. This +- command can be used repeatedly; see *note Gtroff Internals::, for +- details on nodes inserted additionally by 'gtroff'. +- +- *Note Identifiers::, and *note Comments::. +- +- +-File: groff.info, Node: Conditionals and Loops, Next: Writing Macros, Prev: Strings, Up: gtroff Reference +- +-5.20 Conditionals and Loops +-=========================== +- +-* Menu: +- +-* Operators in Conditionals:: +-* if-else:: +-* while:: +- +- +-File: groff.info, Node: Operators in Conditionals, Next: if-else, Prev: Conditionals and Loops, Up: Conditionals and Loops +- +-5.20.1 Operators in Conditionals +--------------------------------- +- +-In 'if', 'ie', and 'while' requests, in addition to ordinary *note +-Expressions::, there are several more operators available: +- +-'e' +-'o' +- True if the current page is even or odd numbered (respectively). +- +-'n' +- True if the document is being processed in nroff mode (i.e., the +- '.nroff' command has been issued). *Note Troff and Nroff Mode::. +- +-'t' +- True if the document is being processed in troff mode (i.e., the +- '.troff' command has been issued). *Note Troff and Nroff Mode::. +- +-'v' +- Always false. This condition is for compatibility with other +- 'troff' versions only (identifying a '-Tversatec' device). +- +-''XXX'YYY'' +- True if the output produced by XXX is equal to the output produced +- by YYY. Other characters can be used in place of the single +- quotes; the same set of delimiters as for the '\D' escape is used +- (*note Escapes::). 'gtroff' formats XXX and YYY in separate +- environments; after the comparison the resulting data is discarded. +- +- .ie "|"\fR|\fP" \ +- true +- .el \ +- false +- => true +- +- The resulting motions, glyph sizes, and fonts have to match,(1) +- (*note Operators in Conditionals-Footnote-1::) and not the +- individual motion, size, and font requests. In the previous +- example, '|' and '\fR|\fP' both result in a roman '|' glyph with +- the same point size and at the same location on the page, so the +- strings are equal. If '.ft I' had been added before the '.ie', the +- result would be "false" because (the first) '|' produces an italic +- '|' rather than a roman one. +- +- To compare strings without processing, surround the data with '\?'. +- +- .ie "\?|\?"\?\fR|\fP\?" \ +- true +- .el \ +- false +- => false +- +- Since data protected with '\?' is read in copy-in mode it is even +- possible to use incomplete input without causing an error. +- +- .ds a \[ +- .ds b \[ +- .ie '\?\*a\?'\?\*b\?' \ +- true +- .el \ +- false +- => true +- +-'r XXX' +- True if there is a number register named XXX. +- +-'d XXX' +- True if there is a string, macro, diversion, or request named XXX. +- +-'m XXX' +- True if there is a color named XXX. +- +-'c G' +- True if there is a glyph G available(2) (*note Operators in +- Conditionals-Footnote-2::); G is either an ASCII character or a +- special character ('\N'XXX'', '\(GG' or '\[GGG]'); the condition is +- also true if G has been defined by the 'char' request. +- +-'F FONT' +- True if a font named FONT exists. FONT is handled as if it was +- opened with the 'ft' request (this is, font translation and styles +- are applied), without actually mounting it. +- +- This test doesn't load the complete font but only its header to +- verify its validity. +- +-'S STYLE' +- True if style STYLE has been registered. Font translation is +- applied. +- +- Note that these operators can't be combined with other operators like +-':' or '&'; only a leading '!' (without whitespace between the +-exclamation mark and the operator) can be used to negate the result. +- +- .nr xxx 1 +- .ie !r xxx \ +- true +- .el \ +- false +- => false +- +- A whitespace after '!' always evaluates to zero (this bizarre +-behaviour is due to compatibility with UNIX 'troff'). +- +- .nr xxx 1 +- .ie ! r xxx \ +- true +- .el \ +- false +- => r xxx true +- +- It is possible to omit the whitespace before the argument to the 'r', +-'d', and 'c' operators. +- +- *Note Expressions::. +- +- +-File: groff.info, Node: Operators in Conditionals-Footnotes, Up: Operators in Conditionals +- +- (1) The created output nodes must be identical. *Note Gtroff +-Internals::. +- +- (2) The name of this conditional operator is a misnomer since it +-tests names of output glyphs. +- +- +-File: groff.info, Node: if-else, Next: while, Prev: Operators in Conditionals, Up: Conditionals and Loops +- +-5.20.2 if-else +--------------- +- +-'gtroff' has if-then-else constructs like other languages, although the +-formatting can be painful. +- +- -- Request: .if expr anything +- +- Evaluate the expression EXPR, and executes ANYTHING (the remainder +- of the line) if EXPR evaluates to a value greater than zero (true). +- ANYTHING is interpreted as though it was on a line by itself +- (except that leading spaces are swallowed). *Note Operators in +- Conditionals::, for more info. +- +- .nr xxx 1 +- .nr yyy 2 +- .if ((\n[xxx] == 1) & (\n[yyy] == 2)) true +- => true +- +- -- Request: .nop anything +- Executes ANYTHING. This is similar to '.if 1'. +- +- -- Request: .ie expr anything +- -- Request: .el anything +- Use the 'ie' and 'el' requests to write an if-then-else. The first +- request is the 'if' part and the latter is the 'else' part. +- +- .ie n .ls 2 \" double-spacing in nroff +- .el .ls 1 \" single-spacing in troff +- +- -- Escape: \{ +- -- Escape: \} +- In many cases, an if (or if-else) construct needs to execute more +- than one request. This can be done using the escapes '\{' (which +- must start the first line) and '\}' (which must end the last line). +- +- .ie t \{\ +- . ds lq `` +- . ds rq '' +- .\} +- .el \{\ +- . ds lq "" +- . ds rq "" +- .\} +- +- *Note Expressions::. +- +- +-File: groff.info, Node: while, Prev: if-else, Up: Conditionals and Loops +- +-5.20.3 while +------------- +- +-'gtroff' provides a looping construct using the 'while' request, which +-is used much like the 'if' (and related) requests. +- +- -- Request: .while expr anything +- Evaluate the expression EXPR, and repeatedly execute ANYTHING (the +- remainder of the line) until EXPR evaluates to 0. +- +- .nr a 0 1 +- .while (\na < 9) \{\ +- \n+a, +- .\} +- \n+a +- => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 +- +- Some remarks. +- +- * The body of a 'while' request is treated like the body of a +- 'de' request: 'gtroff' temporarily stores it in a macro that +- is deleted after the loop has been exited. It can +- considerably slow down a macro if the body of the 'while' +- request (within the macro) is large. Each time the macro is +- executed, the 'while' body is parsed and stored again as a +- temporary macro. +- +- .de xxx +- . nr num 10 +- . while (\\n[num] > 0) \{\ +- . \" many lines of code +- . nr num -1 +- . \} +- .. +- +- The traditional and ofter better solution (UNIX 'troff' +- doesn't have the 'while' request) is to use a recursive macro +- instead that is parsed only once during its definition. +- +- .de yyy +- . if (\\n[num] > 0) \{\ +- . \" many lines of code +- . nr num -1 +- . yyy +- . \} +- .. +- . +- .de xxx +- . nr num 10 +- . yyy +- .. +- +- Note that the number of available recursion levels is set +- to 1000 (this is a compile-time constant value of 'gtroff'). +- +- * The closing brace of a 'while' body must end a line. +- +- .if 1 \{\ +- . nr a 0 1 +- . while (\n[a] < 10) \{\ +- . nop \n+[a] +- .\}\} +- => unbalanced \{ \} +- +- -- Request: .break +- Break out of a 'while' loop. Be sure not to confuse this with the +- 'br' request (causing a line break). +- +- -- Request: .continue +- Finish the current iteration of a 'while' loop, immediately +- restarting the next iteration. +- +- *Note Expressions::. +- +- +-File: groff.info, Node: Writing Macros, Next: Page Motions, Prev: Conditionals and Loops, Up: gtroff Reference +- +-5.21 Writing Macros +-=================== +- +-A "macro" is a collection of text and embedded commands that can be +-invoked multiple times. Use macros to define common operations. *Note +-Strings::, for a (limited) alternative syntax to call macros. +- +- Although the following requests can be used to create macros, simply +-using an undefined macro will cause it to be defined as empty. *Note +-Identifiers::. +- +- -- Request: .de name [end] +- -- Request: .de1 name [end] +- -- Request: .dei name [end] +- -- Request: .dei1 name [end] +- Define a new macro named NAME. 'gtroff' copies subsequent lines +- (starting with the next one) into an internal buffer until it +- encounters the line '..' (two dots). If the optional second +- argument to 'de' is present it is used as the macro closure request +- instead of '..'. +- +- There can be whitespace after the first dot in the line containing +- the ending token (either '.' or macro 'END'). Don't insert a tab +- character immediately after the '..', otherwise it isn't recognized +- as the end-of-macro symbol.(1) (*note Writing Macros-Footnote-1::) +- +- Here a small example macro called 'P' that causes a break and +- inserts some vertical space. It could be used to separate +- paragraphs. +- +- .de P +- . br +- . sp .8v +- .. +- +- The following example defines a macro within another. Remember +- that expansion must be protected twice; once for reading the macro +- and once for executing. +- +- \# a dummy macro to avoid a warning +- .de end +- .. +- . +- .de foo +- . de bar end +- . nop \f[B]Hallo \\\\$1!\f[] +- . end +- .. +- . +- .foo +- .bar Joe +- => Hallo Joe! +- +- Since '\f' has no expansion, it isn't necessary to protect its +- backslash. Had we defined another macro within 'bar' that takes a +- parameter, eight backslashes would be necessary before '$1'. +- +- The 'de1' request turns off compatibility mode while executing the +- macro. On entry, the current compatibility mode is saved and +- restored at exit. +- +- .nr xxx 12345 +- . +- .de aa +- The value of xxx is \\n[xxx]. +- .. +- .de1 bb +- The value of xxx ix \\n[xxx]. +- .. +- . +- .cp 1 +- . +- .aa +- => warning: number register `[' not defined +- => The value of xxx is 0xxx]. +- .bb +- => The value of xxx ix 12345. +- +- The 'dei' request defines a macro indirectly. That is, it expands +- strings whose names are NAME or END before performing the append. +- +- This: +- +- .ds xx aa +- .ds yy bb +- .dei xx yy +- +- is equivalent to: +- +- .de aa bb +- +- The 'dei1' request is similar to 'dei' but with compatibility mode +- switched off during execution of the defined macro. +- +- If compatibility mode is on, 'de' (and 'dei') behave similar to +- 'de1' (and 'dei1'): A 'compatibility save' token is inserted at the +- beginning, and a 'compatibility restore' token at the end, with +- compatibility mode switched on during execution. *Note Gtroff +- Internals::, for more information on switching compatibility mode +- on and off in a single document. +- +- Using 'trace.tmac', you can trace calls to 'de' and 'de1'. +- +- Note that macro identifiers are shared with identifiers for strings +- and diversions. +- +- *Note the description of the 'als' request: als, for possible +- pitfalls if redefining a macro that has been aliased. +- +- -- Request: .am name [end] +- -- Request: .am1 name [end] +- -- Request: .ami name [end] +- -- Request: .ami1 name [end] +- Works similarly to 'de' except it appends onto the macro named +- NAME. So, to make the previously defined 'P' macro actually do +- indented instead of block paragraphs, add the necessary code to the +- existing macro like this: +- +- .am P +- .ti +5n +- .. +- +- The 'am1' request turns off compatibility mode while executing the +- appended macro piece. To be more precise, a "compatibility save" +- input token is inserted at the beginning of the appended code, and +- a "compatibility restore" input token at the end. +- +- The 'ami' request appends indirectly, meaning that 'gtroff' expands +- strings whose names are NAME or END before performing the append. +- +- The 'ami1' request is similar to 'ami' but compatibility mode is +- switched off during execution of the defined macro. +- +- Using 'trace.tmac', you can trace calls to 'am' and 'am1'. +- +- *Note Strings::, for the 'als' and 'rn' request to create an alias +-and rename a macro, respectively. +- +- The 'de', 'am', 'di', 'da', 'ds', and 'as' requests (together with +-its variants) only create a new object if the name of the macro, +-diversion or string diversion is currently undefined or if it is defined +-to be a request; normally they modify the value of an existing object. +- +- -- Request: .return [anything] +- Exit a macro, immediately returning to the caller. +- +- If called with an argument, exit twice, namely the current macro +- and the macro one level higher. This is used to define a wrapper +- macro for 'return' in 'trace.tmac'. +- +-* Menu: +- +-* Copy-in Mode:: +-* Parameters:: +- +- +-File: groff.info, Node: Writing Macros-Footnotes, Up: Writing Macros +- +- (1) While it is possible to define and call a macro '.' with +- +- .de . +- . tm foo +- .. +- . +- .. \" This calls macro `.'! +- +-you can't use this as the end-of-macro macro: during a macro definition, +-'..' is never handled as a call to '.', even if you say '.de foo .' +-explicitly. +- +diff -Nuar groff-1.22.3.old/doc/groff.info-2 groff-1.22.3/doc/groff.info-2 +--- groff-1.22.3.old/doc/groff.info-2 2014-11-04 10:39:07.761117246 +0200 ++++ groff-1.22.3/doc/groff.info-2 1970-01-01 02:00:00.000000000 +0200 +@@ -1,8155 +0,0 @@ +-This is groff.info, produced by makeinfo version 5.2dev from +-groff.texinfo. +- +-This manual documents GNU 'troff' version 1.22.3. +- +- Copyright 1994-2014 Free Software Foundation, Inc. +- +- Permission is granted to copy, distribute and/or modify this +- document under the terms of the GNU Free Documentation License, +- Version 1.3 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have the freedom to copy and +- modify this GNU manual. Buying copies from the FSF supports it in +- developing GNU and promoting software freedom." +-INFO-DIR-SECTION Typesetting +-START-INFO-DIR-ENTRY +-* Groff: (groff). The GNU troff document formatting system. +-END-INFO-DIR-ENTRY +- +- +-File: groff.info, Node: Copy-in Mode, Next: Parameters, Prev: Writing Macros, Up: Writing Macros +- +-5.21.1 Copy-in Mode +-------------------- +- +-When 'gtroff' reads in the text for a macro, string, or diversion, it +-copies the text (including request lines, but excluding escapes) into an +-internal buffer. Escapes are converted into an internal form, except +-for '\n', '\$', '\*', '\\' and '\', which are evaluated and +-inserted into the text where the escape was located. This is known as +-"copy-in" mode or "copy" mode. +- +- What this means is that you can specify when these escapes are to be +-evaluated (either at copy-in time or at the time of use) by insulating +-the escapes with an extra backslash. Compare this to the '\def' and +-'\edef' commands in TeX. +- +- The following example prints the numbers 20 and 10: +- +- .nr x 20 +- .de y +- .nr x 10 +- \&\nx +- \&\\nx +- .. +- .y +- +- +-File: groff.info, Node: Parameters, Prev: Copy-in Mode, Up: Writing Macros +- +-5.21.2 Parameters +------------------ +- +-The arguments to a macro or string can be examined using a variety of +-escapes. +- +- -- Register: \n[.$] +- The number of arguments passed to a macro or string. This is a +- read-only number register. +- +- Note that the 'shift' request can change its value. +- +- Any individual argument can be retrieved with one of the following +-escapes: +- +- -- Escape: \$n +- -- Escape: \$(nn +- -- Escape: \$[nnn] +- Retrieve the Nth, NNth or NNNth argument. As usual, the first form +- only accepts a single number (larger than zero), the second a +- two-digit number (larger or equal to 10), and the third any +- positive integer value (larger than zero). Macros and strings can +- have an unlimited number of arguments. Note that due to copy-in +- mode, use two backslashes on these in actual use to prevent +- interpolation until the macro is actually invoked. +- +- -- Request: .shift [n] +- Shift the arguments 1 position, or as many positions as specified +- by its argument. After executing this request, argument I becomes +- argument I-N; arguments 1 to N are no longer available. Shifting +- by negative amounts is currently undefined. +- +- The register '.$' is adjusted accordingly. +- +- -- Escape: \$* +- -- Escape: \$@ +- In some cases it is convenient to use all of the arguments at once +- (for example, to pass the arguments along to another macro). The +- '\$*' escape concatenates all the arguments separated by spaces. A +- similar escape is '\$@', which concatenates all the arguments with +- each surrounded by double quotes, and separated by spaces. If not +- in compatibility mode, the input level of double quotes is +- preserved (see *note Request and Macro Arguments::). +- +- -- Escape: \$^ +- Handle the parameters of a macro as if they were an argument to the +- 'ds' or similar requests. +- +- .de foo +- . tm $1=`\\$1' +- . tm $2=`\\$2' +- . tm $*=`\\$*' +- . tm $@=`\\$@' +- . tm $^=`\\$^' +- .. +- .foo " This is a "test" +- => $1=` This is a ' +- => $2=`test"' +- => $*=` This is a test"' +- => $@=`" This is a " "test""' +- => $^=`" This is a "test"' +- +- This escape is useful mainly for macro packages like 'trace.tmac', +- which redefines some requests and macros for debugging purposes. +- +- -- Escape: \$0 +- The name used to invoke the current macro. The 'als' request can +- make a macro have more than one name. +- +- If a macro is called as a string (within another macro), the value +- of '\$0' isn't changed. +- +- .de foo +- . tm \\$0 +- .. +- .als foo bar +- . +- .de aaa +- . foo +- .. +- .de bbb +- . bar +- .. +- .de ccc +- \\*[foo]\\ +- .. +- .de ddd +- \\*[bar]\\ +- .. +- . +- .aaa +- => foo +- .bbb +- => bar +- .ccc +- => ccc +- .ddd +- => ddd +- +- *Note Request and Macro Arguments::. +- +- +-File: groff.info, Node: Page Motions, Next: Drawing Requests, Prev: Writing Macros, Up: gtroff Reference +- +-5.22 Page Motions +-================= +- +-*Note Manipulating Spacing::, for a discussion of the main request for +-vertical motion, 'sp'. +- +- -- Request: .mk [reg] +- -- Request: .rt [dist] +- The request 'mk' can be used to mark a location on a page, for +- movement to later. This request takes a register name as an +- argument in which to store the current page location. With no +- argument it stores the location in an internal register. The +- results of this can be used later by the 'rt' or the 'sp' request +- (or the '\v' escape). +- +- The 'rt' request returns _upwards_ to the location marked with the +- last 'mk' request. If used with an argument, return to a position +- which distance from the top of the page is DIST (no previous call +- to 'mk' is necessary in this case). Default scaling indicator is +- 'v'. +- +- Here a primitive solution for a two-column macro. +- +- .nr column-length 1.5i +- .nr column-gap 4m +- .nr bottom-margin 1m +- . +- .de 2c +- . br +- . mk +- . ll \\n[column-length]u +- . wh -\\n[bottom-margin]u 2c-trap +- . nr right-side 0 +- .. +- . +- .de 2c-trap +- . ie \\n[right-side] \{\ +- . nr right-side 0 +- . po -(\\n[column-length]u + \\n[column-gap]u) +- . \" remove trap +- . wh -\\n[bottom-margin]u +- . \} +- . el \{\ +- . \" switch to right side +- . nr right-side 1 +- . po +(\\n[column-length]u + \\n[column-gap]u) +- . rt +- . \} +- .. +- . +- .pl 1.5i +- .ll 4i +- This is a small test that shows how the +- rt request works in combination with mk. +- +- .2c +- Starting here, text is typeset in two columns. +- Note that this implementation isn't robust +- and thus not suited for a real two-column +- macro. +- +- Result: +- +- This is a small test that shows how the +- rt request works in combination with mk. +- +- Starting here, isn't robust +- text is typeset and thus not +- in two columns. suited for a +- Note that this real two-column +- implementation macro. +- +- The following escapes give fine control of movements about the page. +- +- -- Escape: \v'e' +- Move vertically, usually from the current location on the page (if +- no absolute position operator '|' is used). The argument E +- specifies the distance to move; positive is downwards and negative +- upwards. The default scaling indicator for this escape is 'v'. +- Beware, however, that 'gtroff' continues text processing at the +- point where the motion ends, so you should always balance motions +- to avoid interference with text processing. +- +- '\v' doesn't trigger a trap. This can be quite useful; for +- example, consider a page bottom trap macro that prints a marker in +- the margin to indicate continuation of a footnote or something +- similar. +- +- There are some special-case escapes for vertical motion. +- +- -- Escape: \r +- Move upwards 1v. +- +- -- Escape: \u +- Move upwards .5v. +- +- -- Escape: \d +- Move down .5v. +- +- -- Escape: \h'e' +- Move horizontally, usually from the current location (if no +- absolute position operator '|' is used). The expression E +- indicates how far to move: positive is rightwards and negative +- leftwards. The default scaling indicator for this escape is 'm'. +- +- This horizontal space is not discarded at the end of a line. To +- insert discardable space of a certain length use the 'ss' request. +- +- There are a number of special-case escapes for horizontal motion. +- +- -- Escape: \ +- An unbreakable and unpaddable (i.e. not expanded during filling) +- space. (Note: This is a backslash followed by a space.) +- +- -- Escape: \~ +- An unbreakable space that stretches like a normal inter-word space +- when a line is adjusted. +- +- -- Escape: \| +- A 1/6th em space. Ignored for TTY output devices (rounded to +- zero). +- +- However, if there is a glyph defined in the current font file with +- name '\|' (note the leading backslash), the width of this glyph is +- used instead (even for TTYs). +- +- -- Escape: \^ +- A 1/12th em space. Ignored for TTY output devices (rounded to +- zero). +- +- However, if there is a glyph defined in the current font file with +- name '\^' (note the leading backslash), the width of this glyph is +- used instead (even for TTYs). +- +- -- Escape: \0 +- A space the size of a digit. +- +- The following string sets the TeX logo: +- +- .ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X +- +- -- Escape: \w'text' +- -- Register: \n[st] +- -- Register: \n[sb] +- -- Register: \n[rst] +- -- Register: \n[rsb] +- -- Register: \n[ct] +- -- Register: \n[ssc] +- -- Register: \n[skw] +- Return the width of the specified TEXT in basic units. This allows +- horizontal movement based on the width of some arbitrary text (e.g. +- given as an argument to a macro). +- +- The length of the string `abc' is \w'abc'u. +- => The length of the string `abc' is 72u. +- +- Font changes may occur in TEXT, which don't affect current +- settings. +- +- After use, '\w' sets several registers: +- +- 'st' +- 'sb' +- The highest and lowest point of the baseline, respectively, in +- TEXT. +- +- 'rst' +- 'rsb' +- Like the 'st' and 'sb' registers, but takes account of the +- heights and depths of glyphs. In other words, this gives the +- highest and lowest point of TEXT. Values below the baseline +- are negative. +- +- 'ct' +- Defines the kinds of glyphs occurring in TEXT: +- +- 0 +- only short glyphs, no descenders or tall glyphs. +- +- 1 +- at least one descender. +- +- 2 +- at least one tall glyph. +- +- 3 +- at least one each of a descender and a tall glyph. +- +- 'ssc' +- The amount of horizontal space (possibly negative) that should +- be added to the last glyph before a subscript. +- +- 'skw' +- How far to right of the center of the last glyph in the '\w' +- argument, the center of an accent from a roman font should be +- placed over that glyph. +- +- -- Escape: \kp +- -- Escape: \k(ps +- -- Escape: \k[position] +- Store the current horizontal position in the _input_ line in number +- register with name POSITION (one-character name P, two-character +- name PS). Use this, for example, to return to the beginning of a +- string for highlighting or other decoration. +- +- -- Register: \n[hp] +- The current horizontal position at the input line. +- +- -- Register: \n[.k] +- A read-only number register containing the current horizontal +- output position (relative to the current indentation). +- +- -- Escape: \o'abc' +- Overstrike glyphs A, B, C, ...; the glyphs are centered, and the +- resulting spacing is the largest width of the affected glyphs. +- +- -- Escape: \zg +- Print glyph G with zero width, i.e., without spacing. Use this to +- overstrike glyphs left-aligned. +- +- -- Escape: \Z'anything' +- Print ANYTHING, then restore the horizontal and vertical position. +- The argument may not contain tabs or leaders. +- +- The following is an example of a strike-through macro: +- +- .de ST +- .nr ww \w'\\$1' +- \Z@\v'-.25m'\l'\\n[ww]u'@\\$1 +- .. +- . +- This is +- .ST "a test" +- an actual emergency! +- +- +-File: groff.info, Node: Drawing Requests, Next: Traps, Prev: Page Motions, Up: gtroff Reference +- +-5.23 Drawing Requests +-===================== +- +-'gtroff' provides a number of ways to draw lines and other figures on +-the page. Used in combination with the page motion commands (see *note +-Page Motions::, for more info), a wide variety of figures can be drawn. +-However, for complex drawings these operations can be quite cumbersome, +-and it may be wise to use graphic preprocessors like 'gpic' or 'ggrn'. +-*Note gpic::, and *note ggrn::, for more information. +- +- All drawing is done via escapes. +- +- -- Escape: \l'l' +- -- Escape: \l'lg' +- Draw a line horizontally. L is the length of the line to be drawn. +- If it is positive, start the line at the current location and draw +- to the right; its end point is the new current location. Negative +- values are handled differently: The line starts at the current +- location and draws to the left, but the current location doesn't +- move. +- +- L can also be specified absolutely (i.e. with a leading '|'), which +- draws back to the beginning of the input line. Default scaling +- indicator is 'm'. +- +- The optional second parameter G is a glyph to draw the line with. +- If this second argument is not specified, 'gtroff' uses the +- underscore glyph, '\[ru]'. +- +- To separate the two arguments (to prevent 'gtroff' from +- interpreting a drawing glyph as a scaling indicator if the glyph is +- represented by a single character) use '\&'. +- +- Here a small useful example: +- +- .de box +- \[br]\\$*\[br]\l'|0\[rn]'\l'|0\[ul]' +- .. +- +- Note that this works by outputting a box rule (a vertical line), +- then the text given as an argument and then another box rule. +- Finally, the line drawing escapes both draw from the current +- location to the beginning of the _input_ line - this works because +- the line length is negative, not moving the current point. +- +- -- Escape: \L'l' +- -- Escape: \L'lg' +- Draw vertical lines. Its parameters are similar to the '\l' +- escape, except that the default scaling indicator is 'v'. The +- movement is downwards for positive values, and upwards for negative +- values. The default glyph is the box rule glyph, '\[br]'. As with +- the vertical motion escapes, text processing blindly continues +- where the line ends. +- +- This is a \L'3v'test. +- +- Here the result, produced with 'grotty'. +- +- This is a +- | +- | +- |test. +- +- -- Escape: \D'command arg ...' +- The '\D' escape provides a variety of drawing functions. Note that +- on character devices, only vertical and horizontal lines are +- supported within 'grotty'; other devices may only support a subset +- of the available drawing functions. +- +- The default scaling indicator for all subcommands of '\D' is 'm' +- for horizontal distances and 'v' for vertical ones. Exceptions are +- '\D'f ...'' and '\D't ...'', which use 'u' as the default, and +- '\D'FX ...'', which arguments are treated similar to the 'defcolor' +- request. +- +- '\D'l DX DY'' +- Draw a line from the current location to the relative point +- specified by (DX,DY), where positive values mean down and +- right, respectively. The end point of the line is the new +- current location. +- +- The following example is a macro for creating a box around a +- text string; for simplicity, the box margin is taken as a +- fixed value, 0.2m. +- +- .de BOX +- . nr @wd \w'\\$1' +- \h'.2m'\ +- \h'-.2m'\v'(.2m - \\n[rsb]u)'\ +- \D'l 0 -(\\n[rst]u - \\n[rsb]u + .4m)'\ +- \D'l (\\n[@wd]u + .4m) 0'\ +- \D'l 0 (\\n[rst]u - \\n[rsb]u + .4m)'\ +- \D'l -(\\n[@wd]u + .4m) 0'\ +- \h'.2m'\v'-(.2m - \\n[rsb]u)'\ +- \\$1\ +- \h'.2m' +- .. +- +- First, the width of the string is stored in register '@wd'. +- Then, four lines are drawn to form a box, properly offset by +- the box margin. The registers 'rst' and 'rsb' are set by the +- '\w' escape, containing the largest height and depth of the +- whole string. +- +- '\D'c D'' +- Draw a circle with a diameter of D with the leftmost point at +- the current position. After drawing, the current location is +- positioned at the rightmost point of the circle. +- +- '\D'C D'' +- Draw a solid circle with the same parameters and behaviour as +- an outlined circle. No outline is drawn. +- +- '\D'e X Y'' +- Draw an ellipse with a horizontal diameter of X and a vertical +- diameter of Y with the leftmost point at the current position. +- After drawing, the current location is positioned at the +- rightmost point of the ellipse. +- +- '\D'E X Y'' +- Draw a solid ellipse with the same parameters and behaviour as +- an outlined ellipse. No outline is drawn. +- +- '\D'a DX1 DY1 DX2 DY2'' +- Draw an arc clockwise from the current location through the +- two specified relative locations (DX1,DY1) and (DX2,DY2). The +- coordinates of the first point are relative to the current +- position, and the coordinates of the second point are relative +- to the first point. After drawing, the current position is +- moved to the final point of the arc. +- +- '\D'~ DX1 DY1 DX2 DY2 ...'' +- Draw a spline from the current location to the relative point +- (DX1,DY1) and then to (DX2,DY2), and so on. The current +- position is moved to the terminal point of the drawn curve. +- +- '\D'f N'' +- Set the shade of gray to be used for filling solid objects +- to N; N must be an integer between 0 and 1000, where 0 +- corresponds solid white and 1000 to solid black, and values in +- between correspond to intermediate shades of gray. This +- applies only to solid circles, solid ellipses, and solid +- polygons. By default, a level of 1000 is used. +- +- Despite of being silly, the current point is moved +- horizontally to the right by N. +- +- Don't use this command! It has the serious drawback that it +- is always rounded to the next integer multiple of the +- horizontal resolution (the value of the 'hor' keyword in the +- 'DESC' file). Use '\M' (*note Colors::) or '\D'Fg ...'' +- instead. +- +- '\D'p DX1 DY1 DX2 DY2 ...'' +- Draw a polygon from the current location to the relative +- position (DX1,DY1) and then to (DX2,DY2) and so on. When the +- specified data points are exhausted, a line is drawn back to +- the starting point. The current position is changed by adding +- the sum of all arguments with odd index to the actual +- horizontal position and the even ones to the vertical +- position. +- +- '\D'P DX1 DY1 DX2 DY2 ...'' +- Draw a solid polygon with the same parameters and behaviour as +- an outlined polygon. No outline is drawn. +- +- Here a better variant of the box macro to fill the box with +- some color. Note that the box must be drawn before the text +- since colors in 'gtroff' are not transparent; the filled +- polygon would hide the text completely. +- +- .de BOX +- . nr @wd \w'\\$1' +- \h'.2m'\ +- \h'-.2m'\v'(.2m - \\n[rsb]u)'\ +- \M[lightcyan]\ +- \D'P 0 -(\\n[rst]u - \\n[rsb]u + .4m) \ +- (\\n[@wd]u + .4m) 0 \ +- 0 (\\n[rst]u - \\n[rsb]u + .4m) \ +- -(\\n[@wd]u + .4m) 0'\ +- \h'.2m'\v'-(.2m - \\n[rsb]u)'\ +- \M[]\ +- \\$1\ +- \h'.2m' +- .. +- +- If you want a filled polygon that has exactly the same size as +- an unfilled one, you must draw both an unfilled and a filled +- polygon. A filled polygon is always smaller than an unfilled +- one because the latter uses straight lines with a given line +- thickness to connect the polygon's corners, while the former +- simply fills the area defined by the coordinates. +- +- \h'1i'\v'1i'\ +- \# increase line thickness +- \Z'\D't 5p''\ +- \# draw unfilled polygon +- \Z'\D'p 3 3 -6 0''\ +- \# draw filled polygon +- \Z'\D'P 3 3 -6 0'' +- +- '\D't N'' +- Set the current line thickness to N machine units. A value of +- zero selects the smallest available line thickness. A +- negative value makes the line thickness proportional to the +- current point size (this is the default behaviour of AT&T +- 'troff'). +- +- Despite of being silly, the current point is moved +- horizontally to the right by N. +- +- '\D'FSCHEME COLOR_COMPONENTS'' +- Change current fill color. SCHEME is a single letter denoting +- the color scheme: 'r' (rgb), 'c' (cmy), 'k' (cmyk), 'g' +- (gray), or 'd' (default color). The color components use +- exactly the same syntax as in the 'defcolor' request (*note +- Colors::); the command '\D'Fd'' doesn't take an argument. +- +- _No_ position changing! +- +- Examples: +- +- \D'Fg .3' \" same gray as \D'f 700' +- \D'Fr #0000ff' \" blue +- +- *Note Graphics Commands::. +- +- -- Escape: \b'string' +- "Pile" a sequence of glyphs vertically, and center it vertically on +- the current line. Use it to build large brackets and braces. +- +- Here an example how to create a large opening brace: +- +- \b'\[lt]\[bv]\[lk]\[bv]\[lb]' +- +- The first glyph is on the top, the last glyph in STRING is at the +- bottom. Note that 'gtroff' separates the glyphs vertically by 1m, +- and the whole object is centered 0.5m above the current baseline; +- the largest glyph width is used as the width for the whole object. +- This rather unflexible positioning algorithm doesn't work with +- '-Tdvi' since the bracket pieces vary in height for this device. +- Instead, use the 'eqn' preprocessor. +- +- *Note Manipulating Spacing::, how to adjust the vertical spacing +- with the '\x' escape. +- +- +-File: groff.info, Node: Traps, Next: Diversions, Prev: Drawing Requests, Up: gtroff Reference +- +-5.24 Traps +-========== +- +-"Traps" are locations that, when reached, call a specified macro. These +-traps can occur at a given location on the page, at a given location in +-the current diversion, at a blank line, after a certain number of input +-lines, or at the end of input. +- +- Setting a trap is also called "planting". It is also said that a +-trap is "sprung" if the associated macro is executed. +- +-* Menu: +- +-* Page Location Traps:: +-* Diversion Traps:: +-* Input Line Traps:: +-* Blank Line Traps:: +-* Leading Spaces Traps:: +-* End-of-input Traps:: +- +- +-File: groff.info, Node: Page Location Traps, Next: Diversion Traps, Prev: Traps, Up: Traps +- +-5.24.1 Page Location Traps +--------------------------- +- +-"Page location traps" perform an action when 'gtroff' reaches or passes +-a certain vertical location on the page. Page location traps have a +-variety of purposes, including: +- +- * setting headers and footers +- +- * setting body text in multiple columns +- +- * setting footnotes +- +- -- Request: .vpt flag +- -- Register: \n[.vpt] +- Enable vertical position traps if FLAG is non-zero, or disables +- them otherwise. Vertical position traps are traps set by the 'wh' +- or 'dt' requests. Traps set by the 'it' request are not vertical +- position traps. The parameter that controls whether vertical +- position traps are enabled is global. Initially vertical position +- traps are enabled. The current setting of this is available in the +- '.vpt' read-only number register. +- +- Note that a page can't be ejected if 'vpt' is set to zero. +- +- -- Request: .wh dist [macro] +- Set a page location trap. Non-negative values for DIST set the +- trap relative to the top of the page; negative values set the trap +- relative to the bottom of the page. Default scaling indicator is +- 'v'; values of DIST are always rounded to be multiples of the +- vertical resolution (as given in register '.V'). +- +- MACRO is the name of the macro to execute when the trap is sprung. +- If MACRO is missing, remove the first trap (if any) at DIST. +- +- The following is a simple example of how many macro packages set +- headers and footers. +- +- .de hd \" Page header +- ' sp .5i +- . tl 'Title''date' +- ' sp .3i +- .. +- . +- .de fo \" Page footer +- ' sp 1v +- . tl ''%'' +- ' bp +- .. +- . +- .wh 0 hd \" trap at top of the page +- .wh -1i fo \" trap one inch from bottom +- +- A trap at or below the bottom of the page is ignored; it can be +- made active by either moving it up or increasing the page length so +- that the trap is on the page. +- +- Negative trap values always use the _current_ page length; they are +- not converted to an absolute vertical position: +- +- .pl 5i +- .wh -1i xx +- .ptr +- => xx -240 +- .pl 100i +- .ptr +- => xx -240 +- +- It is possible to have more than one trap at the same location; to +- do so, the traps must be defined at different locations, then moved +- together with the 'ch' request; otherwise the second trap would +- replace the first one. Earlier defined traps hide later defined +- traps if moved to the same position (the many empty lines caused by +- the 'bp' request are omitted in the following example): +- +- .de a +- . nop a +- .. +- .de b +- . nop b +- .. +- .de c +- . nop c +- .. +- . +- .wh 1i a +- .wh 2i b +- .wh 3i c +- .bp +- => a b c +- .ch b 1i +- .ch c 1i +- .bp +- => a +- .ch a 0.5i +- .bp +- => a b +- +- -- Register: \n[.t] +- A read-only number register holding the distance to the next trap. +- +- If there are no traps between the current position and the bottom +- of the page, it contains the distance to the page bottom. In a +- diversion, the distance to the page bottom is infinite (the +- returned value is the biggest integer that can be represented in +- 'groff') if there are no diversion traps. +- +- -- Request: .ch macro [dist] +- Change the location of a trap. The first argument is the name of +- the macro to be invoked at the trap, and the second argument is the +- new location for the trap (note that the parameters are specified +- in opposite order as in the 'wh' request). This is useful for +- building up footnotes in a diversion to allow more space at the +- bottom of the page for them. +- +- Default scaling indicator for DIST is 'v'. If DIST is missing, the +- trap is removed. +- +- -- Register: \n[.ne] +- The read-only number register '.ne' contains the amount of space +- that was needed in the last 'ne' request that caused a trap to be +- sprung. Useful in conjunction with the '.trunc' register. *Note +- Page Control::, for more information. +- +- Since the '.ne' register is only set by traps it doesn't make much +- sense to use it outside of trap macros. +- +- -- Register: \n[.trunc] +- A read-only register containing the amount of vertical space +- truncated by the most recently sprung vertical position trap, or, +- if the trap was sprung by an 'ne' request, minus the amount of +- vertical motion produced by the 'ne' request. In other words, at +- the point a trap is sprung, it represents the difference of what +- the vertical position would have been but for the trap, and what +- the vertical position actually is. +- +- Since the '.trunc' register is only set by traps it doesn't make +- much sense to use it outside of trap macros. +- +- -- Register: \n[.pe] +- A read-only register that is set to 1 while a page is ejected with +- the 'bp' request (or by the end of input). +- +- Outside of traps this register is always zero. In the following +- example, only the second call to 'x' is caused by 'bp'. +- +- .de x +- \&.pe=\\n[.pe] +- .br +- .. +- .wh 1v x +- .wh 4v x +- A line. +- .br +- Another line. +- .br +- => A line. +- .pe=0 +- Another line. +- +- .pe=1 +- +- An important fact to consider while designing macros is that +-diversions and traps do not interact normally. For example, if a trap +-invokes a header macro (while outputting a diversion) that tries to +-change the font on the current page, the effect is not visible before +-the diversion has completely been printed (except for input protected +-with '\!' or '\?') since the data in the diversion is already formatted. +-In most cases, this is not the expected behaviour. +- +- +-File: groff.info, Node: Diversion Traps, Next: Input Line Traps, Prev: Page Location Traps, Up: Traps +- +-5.24.2 Diversion Traps +----------------------- +- +- -- Request: .dt [dist macro] +- Set a trap _within_ a diversion. DIST is the location of the trap +- (identical to the 'wh' request; default scaling indicator is 'v') +- and MACRO is the name of the macro to be invoked. If called +- without arguments, the diversion trap is removed. +- +- Note that there exists only a single diversion trap. +- +- The number register '.t' still works within diversions. *Note +- Diversions::, for more information. +- +- +-File: groff.info, Node: Input Line Traps, Next: Blank Line Traps, Prev: Diversion Traps, Up: Traps +- +-5.24.3 Input Line Traps +------------------------ +- +- -- Request: .it n macro +- -- Request: .itc n macro +- Set an input line trap. N is the number of lines of input that may +- be read before springing the trap, MACRO is the macro to be +- invoked. Request lines are not counted as input lines. +- +- For example, one possible use is to have a macro that prints the +- next N lines in a bold font. +- +- .de B +- . it \\$1 B-end +- . ft B +- .. +- . +- .de B-end +- . ft R +- .. +- +- The 'itc' request is identical except that an interrupted text line +- (ending with '\c') is not counted as a separate line. +- +- Both requests are associated with the current environment (*note +- Environments::); switching to another environment disables the +- current input trap, and going back reactivates it, restoring the +- number of already processed lines. +- +- +-File: groff.info, Node: Blank Line Traps, Next: Leading Spaces Traps, Prev: Input Line Traps, Up: Traps +- +-5.24.4 Blank Line Traps +------------------------ +- +- -- Request: .blm macro +- Set a blank line trap. 'gtroff' executes MACRO when it encounters +- a blank line in the input file. +- +- +-File: groff.info, Node: Leading Spaces Traps, Next: End-of-input Traps, Prev: Blank Line Traps, Up: Traps +- +-5.24.5 Leading Spaces Traps +---------------------------- +- +- -- Request: .lsm macro +- -- Register: \n[lsn] +- -- Register: \n[lss] +- Set a leading spaces trap. 'gtroff' executes MACRO when it +- encounters leading spaces in an input line; the implicit line break +- that normally happens in this case is suppressed. A line +- consisting of spaces only, however, is treated as an empty line, +- possibly subject to an empty line macro set with the 'blm' request. +- +- Leading spaces are removed from the input line before calling the +- leading spaces macro. The number of removed spaces is stored in +- register 'lsn'; the horizontal space that would be emitted if there +- was no leading space macro is stored in register 'lss'. Note that +- 'lsn' and 'lss' are available even if no leading space macro has +- been set. +- +- The first thing a leading space macro sees is a token. However, +- some escapes like '\f' or '\m' are handled on the fly (see *note +- Gtroff Internals::, for a complete list) without creating a token +- at all. Consider that a line starts with two spaces followed by +- '\fIfoo'. While skipping the spaces '\fI' is handled too so that +- groff's current font is properly set to 'I', but the leading space +- macro only sees 'foo', without the preceding '\fI'. If the macro +- should see the font escape you have to 'protect' it with something +- that creates a token, for example with '\&\fIfoo'. +- +- +-File: groff.info, Node: End-of-input Traps, Prev: Leading Spaces Traps, Up: Traps +- +-5.24.6 End-of-input Traps +-------------------------- +- +- -- Request: .em macro +- Set a trap at the end of input. MACRO is executed after the last +- line of the input file has been processed. +- +- For example, if the document had to have a section at the bottom of +- the last page for someone to approve it, the 'em' request could be +- used. +- +- .de approval +- \c +- . ne 3v +- . sp (\\n[.t]u - 3v) +- . in +4i +- . lc _ +- . br +- Approved:\t\a +- . sp +- Date:\t\t\a +- .. +- . +- .em approval +- +- The '\c' in the above example needs explanation. For historical +- reasons (and for compatibility with AT&T 'troff'), the end macro +- exits as soon as it causes a page break and no remaining data is in +- the partially collected line. +- +- Let us assume that there is no '\c' in the above 'approval' macro, +- and that the page is full and has been ended with, say, a 'br' +- request. The 'ne' request now causes the start of a new page, +- which in turn makes 'troff' exit immediately for the reasons just +- described. In most situations this is not intended. +- +- To always force processing the whole end macro independently of +- this behaviour it is thus advisable to insert something that starts +- an empty partially filled line ('\c') whenever there is a chance +- that a page break can happen. In the above example, the call of +- the 'ne' request assures that the remaining code stays on the same +- page, so we have to insert '\c' only once. +- +- The next example shows how to append three lines, then starting a +- new page unconditionally. Since '.ne 1' doesn't give the desired +- effect - there is always one line available or we are already at +- the beginning of the next page - we temporarily increase the page +- length by one line so that we can use '.ne 2'. +- +- .de EM +- .pl +1v +- \c +- .ne 2 +- line one +- .br +- \c +- .ne 2 +- line two +- .br +- \c +- .ne 2 +- line three +- .br +- .pl -1v +- \c +- 'bp +- .. +- .em EM +- +- Note that this specific feature affects only the first potential +- page break caused by the end macro; further page breaks emitted by +- the end macro are handled normally. +- +- Another possible use of the 'em' request is to make 'gtroff' emit a +- single large page instead of multiple pages. For example, one may +- want to produce a long plain-text file for reading on-screen. The +- idea is to set the page length at the beginning of the document to +- a very large value to hold all the text, and automatically adjust +- it to the exact height of the document after the text has been +- output. +- +- .de adjust-page-length +- . br +- . pl \\n[nl]u \" \n[nl] holds the current page length +- .. +- . +- .de single-page-mode +- . pl 99999 +- . em adjust-page-length +- .. +- . +- .\" activate the above code +- .single-page-mode +- +- Since only one end-of-input trap does exist and other macro +- packages may already use it, care must be taken not to break the +- mechanism. A simple solution would be to append the above macro to +- the macro package's end-of-input macro using the '.am' request. +- +- +-File: groff.info, Node: Diversions, Next: Environments, Prev: Traps, Up: gtroff Reference +- +-5.25 Diversions +-=============== +- +-In 'gtroff' it is possible to "divert" text into a named storage area. +-Due to the similarity to defining macros it is sometimes said to be +-stored in a macro. This is used for saving text for output at a later +-time, which is useful for keeping blocks of text on the same page, +-footnotes, tables of contents, and indices. +- +- For orthogonality it is said that 'gtroff' is in the "top-level +-diversion" if no diversion is active (i.e., the data is diverted to the +-output device). +- +- Although the following requests can be used to create diversions, +-simply using an undefined diversion will cause it to be defined as +-empty. *Note Identifiers::. +- +- -- Request: .di macro +- -- Request: .da macro +- Begin a diversion. Like the 'de' request, it takes an argument of +- a macro name to divert subsequent text into. The 'da' macro +- appends to an existing diversion. +- +- 'di' or 'da' without an argument ends the diversion. +- +- The current partially-filled line is included into the diversion. +- See the 'box' request below for an example. Note that switching to +- another (empty) environment (with the 'ev' request) avoids the +- inclusion of the current partially-filled line. +- +- -- Request: .box macro +- -- Request: .boxa macro +- Begin (or append to) a diversion like the 'di' and 'da' requests. +- The difference is that 'box' and 'boxa' do not include a +- partially-filled line in the diversion. +- +- Compare this: +- +- Before the box. +- .box xxx +- In the box. +- .br +- .box +- After the box. +- .br +- => Before the box. After the box. +- .xxx +- => In the box. +- +- with this: +- +- Before the diversion. +- .di yyy +- In the diversion. +- .br +- .di +- After the diversion. +- .br +- => After the diversion. +- .yyy +- => Before the diversion. In the diversion. +- +- 'box' or 'boxa' without an argument ends the diversion. +- +- -- Register: \n[.z] +- -- Register: \n[.d] +- Diversions may be nested. The read-only number register '.z' +- contains the name of the current diversion (this is a string-valued +- register). The read-only number register '.d' contains the current +- vertical place in the diversion. If not in a diversion it is the +- same as register 'nl'. +- +- -- Register: \n[.h] +- The "high-water mark" on the current page. It corresponds to the +- text baseline of the lowest line on the page. This is a read-only +- register. +- +- .tm .h==\n[.h], nl==\n[nl] +- => .h==0, nl==-1 +- This is a test. +- .br +- .sp 2 +- .tm .h==\n[.h], nl==\n[nl] +- => .h==40, nl==120 +- +- As can be seen in the previous example, empty lines are not +- considered in the return value of the '.h' register. +- +- -- Register: \n[dn] +- -- Register: \n[dl] +- After completing a diversion, the read-write number registers 'dn' +- and 'dl' contain the vertical and horizontal size of the diversion. +- Note that only the just processed lines are counted: For the +- computation of 'dn' and 'dl', the requests 'da' and 'boxa' are +- handled as if 'di' and 'box' had been used - lines that have been +- already stored in a macro are not taken into account. +- +- .\" Center text both horizontally & vertically +- . +- .\" Enclose macro definitions in .eo and .ec +- .\" to avoid the doubling of the backslash +- .eo +- .\" macro .(c starts centering mode +- .de (c +- . br +- . ev (c +- . evc 0 +- . in 0 +- . nf +- . di @c +- .. +- .\" macro .)c terminates centering mode +- .de )c +- . br +- . ev +- . di +- . nr @s (((\n[.t]u - \n[dn]u) / 2u) - 1v) +- . sp \n[@s]u +- . ce 1000 +- . @c +- . ce 0 +- . sp \n[@s]u +- . br +- . fi +- . rr @s +- . rm @s +- . rm @c +- .. +- .\" End of macro definitions, restore escape mechanism +- .ec +- +- -- Escape: \! +- -- Escape: \?anything\? +- Prevent requests, macros, and escapes from being interpreted when +- read into a diversion. Both escapes take the given text and +- "transparently" embed it into the diversion. This is useful for +- macros that shouldn't be invoked until the diverted text is +- actually output. +- +- The '\!' escape transparently embeds text up to and including the +- end of the line. The '\?' escape transparently embeds text until +- the next occurrence of the '\?' escape. Example: +- +- \?ANYTHING\? +- +- ANYTHING may not contain newlines; use '\!' to embed newlines in a +- diversion. The escape sequence '\?' is also recognized in copy +- mode and turned into a single internal code; it is this code that +- terminates ANYTHING. Thus the following example prints 4. +- +- .nr x 1 +- .nf +- .di d +- \?\\?\\\\?\\\\\\\\nx\\\\?\\?\? +- .di +- .nr x 2 +- .di e +- .d +- .di +- .nr x 3 +- .di f +- .e +- .di +- .nr x 4 +- .f +- +- Both escapes read the data in copy mode. +- +- If '\!' is used in the top-level diversion, its argument is +- directly embedded into the 'gtroff' intermediate output. This can +- be used for example to control a postprocessor that processes the +- data before it is sent to the device driver. +- +- The '\?' escape used in the top-level diversion produces no output +- at all; its argument is simply ignored. +- +- -- Request: .output string +- Emit STRING directly to the 'gtroff' intermediate output (subject +- to copy mode interpretation); this is similar to '\!' used at the +- top level. An initial double quote in STRING is stripped off to +- allow initial blanks. +- +- This request can't be used before the first page has started - if +- you get an error, simply insert '.br' before the 'output' request. +- +- Without argument, 'output' is ignored. +- +- Use with caution! It is normally only needed for mark-up used by a +- postprocessor that does something with the output before sending it +- to the output device, filtering out STRING again. +- +- -- Request: .asciify div +- "Unformat" the diversion specified by DIV in such a way that ASCII +- characters, characters translated with the 'trin' request, space +- characters, and some escape sequences that were formatted and +- diverted are treated like ordinary input characters when the +- diversion is reread. It can be also used for gross hacks; for +- example, the following sets register 'n' to 1. +- +- .tr @. +- .di x +- @nr n 1 +- .br +- .di +- .tr @@ +- .asciify x +- .x +- +- Note that 'asciify' cannot return all items in a diversion back to +- their source equivalent, nodes such as '\N[...]' will still remain +- as nodes, so the result cannot be guaranteed to be a pure string. +- +- *Note Copy-in Mode::. +- +- -- Request: .unformat div +- Like 'asciify', unformat the specified diversion. However, +- 'unformat' only unformats spaces and tabs between words. +- Unformatted tabs are treated as input tokens, and spaces are +- stretchable again. +- +- The vertical size of lines is not preserved; glyph information +- (font, font size, space width, etc.) is retained. +- +- +-File: groff.info, Node: Environments, Next: Suppressing output, Prev: Diversions, Up: gtroff Reference +- +-5.26 Environments +-================= +- +-It happens frequently that some text should be printed in a certain +-format regardless of what may be in effect at the time, for example, in +-a trap invoked macro to print headers and footers. To solve this +-'gtroff' processes text in "environments". An environment contains most +-of the parameters that control text processing. It is possible to +-switch amongst these environments; by default 'gtroff' processes text in +-environment 0. The following is the information kept in an environment. +- +- * font parameters (size, family, style, glyph height and slant, space +- and sentence space size) +- +- * page parameters (line length, title length, vertical spacing, line +- spacing, indentation, line numbering, centering, right-justifying, +- underlining, hyphenation data) +- +- * fill and adjust mode +- +- * tab stops, tab and leader characters, escape character, no-break +- and hyphen indicators, margin character data +- +- * partially collected lines +- +- * input traps +- +- * drawing and fill colours +- +- These environments may be given arbitrary names (see *note +-Identifiers::, for more info). Old versions of 'troff' only had +-environments named '0', '1', and '2'. +- +- -- Request: .ev [env] +- -- Register: \n[.ev] +- Switch to another environment. The argument ENV is the name of the +- environment to switch to. With no argument, 'gtroff' switches back +- to the previous environment. There is no limit on the number of +- named environments; they are created the first time that they are +- referenced. The '.ev' read-only register contains the name or +- number of the current environment. This is a string-valued +- register. +- +- Note that a call to 'ev' (with argument) pushes the previously +- active environment onto a stack. If, say, environments 'foo', +- 'bar', and 'zap' are called (in that order), the first 'ev' request +- without parameter switches back to environment 'bar' (which is +- popped off the stack), and a second call switches back to +- environment 'foo'. +- +- Here is an example: +- +- .ev footnote-env +- .fam N +- .ps 6 +- .vs 8 +- .ll -.5i +- .ev +- +- ... +- +- .ev footnote-env +- \(dg Note the large, friendly letters. +- .ev +- +- -- Request: .evc env +- Copy the environment ENV into the current environment. +- +- The following environment data is not copied: +- +- * Partially filled lines. +- +- * The status whether the previous line was interrupted. +- +- * The number of lines still to center, or to right-justify, or +- to underline (with or without underlined spaces); they are set +- to zero. +- +- * The status whether a temporary indentation is active. +- +- * Input traps and its associated data. +- +- * Line numbering mode is disabled; it can be reactivated with +- '.nm +0'. +- +- * The number of consecutive hyphenated lines (set to zero). +- +- -- Register: \n[.w] +- -- Register: \n[.cht] +- -- Register: \n[.cdp] +- -- Register: \n[.csk] +- The '\n[.w]' register contains the width of the last glyph added to +- the current environment. +- +- The '\n[.cht]' register contains the height of the last glyph added +- to the current environment. +- +- The '\n[.cdp]' register contains the depth of the last glyph added +- to the current environment. It is positive for glyphs extending +- below the baseline. +- +- The '\n[.csk]' register contains the "skew" (how far to the right +- of the glyph's center that 'gtroff' should place an accent) of the +- last glyph added to the current environment. +- +- -- Register: \n[.n] +- The '\n[.n]' register contains the length of the previous output +- line in the current environment. +- +- +-File: groff.info, Node: Suppressing output, Next: Colors, Prev: Environments, Up: gtroff Reference +- +-5.27 Suppressing output +-======================= +- +- -- Escape: \Onum +- Disable or enable output depending on the value of NUM: +- +- '\O0' +- Disable any glyphs from being emitted to the device driver, +- provided that the escape occurs at the outer level (see +- '\O[3]' and '\O[4]'). Motion is not suppressed so effectively +- '\O[0]' means _pen up_. +- +- '\O1' +- Enable output of glyphs, provided that the escape occurs at +- the outer level. +- +- '\O0' and '\O1' also reset the four registers 'opminx', 'opminy', +- 'opmaxx', and 'opmaxy' to -1. *Note Register Index::. These four +- registers mark the top left and bottom right hand corners of a box +- that encompasses all written glyphs. +- +- For example the input text: +- +- Hello \O[0]world \O[1]this is a test. +- +- produces the following output: +- +- Hello this is a test. +- +- '\O2' +- Provided that the escape occurs at the outer level, enable +- output of glyphs and also write out to 'stderr' the page +- number and four registers encompassing the glyphs previously +- written since the last call to '\O'. +- +- '\O3' +- Begin a nesting level. At start-up, 'gtroff' is at outer +- level. The current level is contained within the read-only +- register '.O'. *Note Built-in Registers::. +- +- '\O4' +- End a nesting level. The current level is contained within +- the read-only register '.O'. *Note Built-in Registers::. +- +- '\O[5PFILENAME]' +- This escape is 'grohtml' specific. Provided that this escape +- occurs at the outer nesting level write the 'filename' to +- 'stderr'. The position of the image, P, must be specified and +- must be one of 'l', 'r', 'c', or 'i' (left, right, centered, +- inline). FILENAME is associated with the production of the +- next inline image. +- +- +-File: groff.info, Node: Colors, Next: I/O, Prev: Suppressing output, Up: gtroff Reference +- +-5.28 Colors +-=========== +- +- -- Request: .color [n] +- -- Register: \n[.color] +- If N is missing or non-zero, activate colors (this is the default); +- otherwise, turn it off. +- +- The read-only number register '.color' is 1 if colors are active, +- 0 otherwise. +- +- Internally, 'color' sets a global flag; it does not produce a +- token. Similar to the 'cp' request, you should use it at the +- beginning of your document to control color output. +- +- Colors can be also turned off with the '-c' command line option. +- +- -- Request: .defcolor ident scheme color_components +- Define color with name IDENT. SCHEME can be one of the following +- values: 'rgb' (three components), 'cmy' (three components), 'cmyk' +- (four components), and 'gray' or 'grey' (one component). +- +- Color components can be given either as a hexadecimal string or as +- positive decimal integers in the range 0-65535. A hexadecimal +- string contains all color components concatenated. It must start +- with either '#' or '##'; the former specifies hex values in the +- range 0-255 (which are internally multiplied by 257), the latter in +- the range 0-65535. Examples: '#FFC0CB' (pink), '##ffff0000ffff' +- (magenta). The default color name value is device-specific +- (usually black). It is possible that the default color for '\m' +- and '\M' is not identical. +- +- A new scaling indicator 'f' has been introduced, which multiplies +- its value by 65536; this makes it convenient to specify color +- components as fractions in the range 0 to 1 (1f equals 65536u). +- Example: +- +- .defcolor darkgreen rgb 0.1f 0.5f 0.2f +- +- Note that 'f' is the default scaling indicator for the 'defcolor' +- request, thus the above statement is equivalent to +- +- .defcolor darkgreen rgb 0.1 0.5 0.2 +- +- -- Request: .gcolor [color] +- -- Escape: \mc +- -- Escape: \m(co +- -- Escape: \m[color] +- -- Register: \n[.m] +- Set (glyph) drawing color. The following examples show how to turn +- the next four words red. +- +- .gcolor red +- these are in red +- .gcolor +- and these words are in black. +- +- \m[red]these are in red\m[] and these words are in black. +- +- The escape '\m[]' returns to the previous color, as does a call to +- 'gcolor' without an argument. +- +- The name of the current drawing color is available in the +- read-only, string-valued number register '.m'. +- +- The drawing color is associated with the current environment (*note +- Environments::). +- +- Note that '\m' doesn't produce an input token in 'gtroff'. As a +- consequence, it can be used in requests like 'mc' (which expects a +- single character as an argument) to change the color on the fly: +- +- .mc \m[red]x\m[] +- +- -- Request: .fcolor [color] +- -- Escape: \Mc +- -- Escape: \M(co +- -- Escape: \M[color] +- -- Register: \n[.M] +- Set fill (background) color for filled objects drawn with the +- '\D'...'' commands. +- +- A red ellipse can be created with the following code: +- +- \M[red]\h'0.5i'\D'E 2i 1i'\M[] +- +- The escape '\M[]' returns to the previous fill color, as does a +- call to 'fcolor' without an argument. +- +- The name of the current fill (background) color is available in the +- read-only, string-valued number register '.M'. +- +- The fill color is associated with the current environment (*note +- Environments::). +- +- Note that '\M' doesn't produce an input token in 'gtroff'. +- +- +-File: groff.info, Node: I/O, Next: Postprocessor Access, Prev: Colors, Up: gtroff Reference +- +-5.29 I/O +-======== +- +-'gtroff' has several requests for including files: +- +- -- Request: .so file +- Read in the specified FILE and includes it in place of the 'so' +- request. This is quite useful for large documents, e.g. keeping +- each chapter in a separate file. *Note gsoelim::, for more +- information. +- +- Since 'gtroff' replaces the 'so' request with the contents of +- 'file', it makes a difference whether the data is terminated with a +- newline or not: Assuming that file 'xxx' contains the word 'foo' +- without a final newline, this +- +- This is +- .so xxx +- bar +- +- yields 'This is foobar'. +- +- The search path for FILE can be controlled with the '-I' command +- line option. +- +- -- Request: .pso command +- Read the standard output from the specified COMMAND and includes it +- in place of the 'pso' request. +- +- This request causes an error if used in safer mode (which is the +- default). Use 'groff''s or 'troff''s '-U' option to activate +- unsafe mode. +- +- The comment regarding a final newline for the 'so' request is valid +- for 'pso' also. +- +- -- Request: .mso file +- Identical to the 'so' request except that 'gtroff' searches for the +- specified FILE in the same directories as macro files for the the +- '-m' command line option. If the file name to be included has the +- form 'NAME.tmac' and it isn't found, 'mso' tries to include +- 'tmac.NAME' and vice versa. If the file does not exist, a warning +- of type 'file' is emitted. *Note Debugging::, for information +- about warnings. +- +- -- Request: .trf file +- -- Request: .cf file +- Transparently output the contents of FILE. Each line is output as +- if it were preceded by '\!'; however, the lines are _not_ subject +- to copy mode interpretation. If the file does not end with a +- newline, then a newline is added ('trf' only). For example, to +- define a macro 'x' containing the contents of file 'f', use +- +- .ev 1 +- .di x +- .trf f +- .di +- .ev +- +- The calls to 'ev' prevent that the current partial input line +- becomes part of the diversion. +- +- Both 'trf' and 'cf', when used in a diversion, embeds an object in +- the diversion which, when reread, causes the contents of FILE to be +- transparently copied through to the output. In UNIX 'troff', the +- contents of FILE is immediately copied through to the output +- regardless of whether there is a current diversion; this behaviour +- is so anomalous that it must be considered a bug. +- +- While 'cf' copies the contents of FILE completely unprocessed, +- 'trf' disallows characters such as NUL that are not valid 'gtroff' +- input characters (*note Identifiers::). +- +- For 'cf', within a diversion, 'completely unprocessed' means that +- each line of a file to be inserted is handled as if it were +- preceded by '\!\\!'. +- +- Both requests cause a line break. +- +- -- Request: .nx [file] +- Force 'gtroff' to continue processing of the file specified as an +- argument. If no argument is given, immediately jump to the end of +- file. +- +- -- Request: .rd [prompt [arg1 arg2 ...]] +- Read from standard input, and include what is read as though it +- were part of the input file. Text is read until a blank line is +- encountered. +- +- If standard input is a TTY input device (keyboard), write PROMPT to +- standard error, followed by a colon (or send BEL for a beep if no +- argument is given). +- +- Arguments after PROMPT are available for the input. For example, +- the line +- +- .rd data foo bar +- +- with the input 'This is \$2.' prints +- +- This is bar. +- +- Using the 'nx' and 'rd' requests, it is easy to set up form letters. +-The form letter template is constructed like this, putting the following +-lines into a file called 'repeat.let': +- +- .ce +- \*(td +- .sp 2 +- .nf +- .rd +- .sp +- .rd +- .fi +- Body of letter. +- .bp +- .nx repeat.let +- +-When this is run, a file containing the following lines should be +-redirected in. Note that requests included in this file are executed as +-though they were part of the form letter. The last block of input is +-the 'ex' request, which tells 'groff' to stop processing. If this was +-not there, 'groff' would not know when to stop. +- +- Trent A. Fisher +- 708 NW 19th Av., #202 +- Portland, OR 97209 +- +- Dear Trent, +- +- Len Adollar +- 4315 Sierra Vista +- San Diego, CA 92103 +- +- Dear Mr. Adollar, +- +- .ex +- +- -- Request: .pi pipe +- Pipe the output of 'gtroff' to the shell command(s) specified by +- PIPE. This request must occur before 'gtroff' has a chance to +- print anything. +- +- 'pi' causes an error if used in safer mode (which is the default). +- Use 'groff''s or 'troff''s '-U' option to activate unsafe mode. +- +- Multiple calls to 'pi' are allowed, acting as a chain. For +- example, +- +- .pi foo +- .pi bar +- ... +- +- is the same as '.pi foo | bar'. +- +- Note that the intermediate output format of 'gtroff' is piped to +- the specified commands. Consequently, calling 'groff' without the +- '-Z' option normally causes a fatal error. +- +- -- Request: .sy cmds +- -- Register: \n[systat] +- Execute the shell command(s) specified by CMDS. The output is not +- saved anyplace, so it is up to the user to do so. +- +- This request causes an error if used in safer mode (which is the +- default). Use 'groff''s or 'troff''s '-U' option to activate +- unsafe mode. +- +- For example, the following code fragment introduces the current +- time into a document: +- +- .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\ +- (localtime(time))[2,1,0]' > /tmp/x\n[$$] +- .so /tmp/x\n[$$] +- .sy rm /tmp/x\n[$$] +- \nH:\nM:\nS +- +- Note that this works by having the 'perl' script (run by 'sy') +- print out the 'nr' requests that set the number registers 'H', 'M', +- and 'S', and then reads those commands in with the 'so' request. +- +- For most practical purposes, the number registers 'seconds', +- 'minutes', and 'hours', which are initialized at start-up of +- 'gtroff', should be sufficient. Use the 'af' request to get a +- formatted output: +- +- .af hours 00 +- .af minutes 00 +- .af seconds 00 +- \n[hours]:\n[minutes]:\n[seconds] +- +- The 'systat' read-write number register contains the return value +- of the 'system()' function executed by the last 'sy' request. +- +- -- Request: .open stream file +- -- Request: .opena stream file +- Open the specified FILE for writing and associates the specified +- STREAM with it. +- +- The 'opena' request is like 'open', but if the file exists, append +- to it instead of truncating it. +- +- Both 'open' and 'opena' cause an error if used in safer mode (which +- is the default). Use 'groff''s or 'troff''s '-U' option to +- activate unsafe mode. +- +- -- Request: .write stream data +- -- Request: .writec stream data +- Write to the file associated with the specified STREAM. The stream +- must previously have been the subject of an open request. The +- remainder of the line is interpreted as the 'ds' request reads its +- second argument: A leading '"' is stripped, and it is read in +- copy-in mode. +- +- The 'writec' request is like 'write', but only 'write' appends a +- newline to the data. +- +- -- Request: .writem stream xx +- Write the contents of the macro or string XX to the file associated +- with the specified STREAM. +- +- XX is read in copy mode, i.e., already formatted elements are +- ignored. Consequently, diversions must be unformatted with the +- 'asciify' request before calling 'writem'. Usually, this means a +- loss of information. +- +- -- Request: .close stream +- Close the specified STREAM; the stream is no longer an acceptable +- argument to the 'write' request. +- +- Here a simple macro to write an index entry. +- +- .open idx test.idx +- . +- .de IX +- . write idx \\n[%] \\$* +- .. +- . +- .IX test entry +- . +- .close idx +- +- -- Escape: \Ve +- -- Escape: \V(ev +- -- Escape: \V[env] +- Interpolate the contents of the specified environment variable ENV +- (one-character name E, two-character name EV) as returned by the +- function 'getenv'. '\V' is interpreted in copy-in mode. +- +- +-File: groff.info, Node: Postprocessor Access, Next: Miscellaneous, Prev: I/O, Up: gtroff Reference +- +-5.30 Postprocessor Access +-========================= +- +-There are two escapes that give information directly to the +-postprocessor. This is particularly useful for embedding POSTSCRIPT +-into the final document. +- +- -- Request: .device xxx +- -- Escape: \X'xxx' +- Embeds its argument into the 'gtroff' output preceded with 'x X'. +- +- The escapes '\&', '\)', '\%', and '\:' are ignored within '\X', +- '\ ' and '\~' are converted to single space characters. All other +- escapes (except '\\', which produces a backslash) cause an error. +- +- Contrary to '\X', the 'device' request simply processes its +- argument in copy mode (*note Copy-in Mode::). +- +- If the 'use_charnames_in_special' keyword is set in the 'DESC' +- file, special characters no longer cause an error; they are simply +- output verbatim. Additionally, the backslash is represented as +- '\\'. +- +- 'use_charnames_in_special' is currently used by 'grohtml' only. +- +- -- Request: .devicem xx +- -- Escape: \Yn +- -- Escape: \Y(nm +- -- Escape: \Y[name] +- This is approximately equivalent to '\X'\*[NAME]'' (one-character +- name N, two-character name NM). However, the contents of the +- string or macro NAME are not interpreted; also it is permitted for +- NAME to have been defined as a macro and thus contain newlines (it +- is not permitted for the argument to '\X' to contain newlines). +- The inclusion of newlines requires an extension to the UNIX 'troff' +- output format, and confuses drivers that do not know about this +- extension (*note Device Control Commands::). +- +- *Note Output Devices::. +- +- +-File: groff.info, Node: Miscellaneous, Next: Gtroff Internals, Prev: Postprocessor Access, Up: gtroff Reference +- +-5.31 Miscellaneous +-================== +- +-This section documents parts of 'gtroff' that cannot (yet) be +-categorized elsewhere in this manual. +- +- -- Request: .nm [start [inc [space [indent]]]] +- Print line numbers. START is the line number of the _next_ output +- line. INC indicates which line numbers are printed. For example, +- the value 5 means to emit only line numbers that are multiples +- of 5; this defaults to 1. SPACE is the space to be left between +- the number and the text; this defaults to one digit space. The +- fourth argument is the indentation of the line numbers, defaulting +- to zero. Both SPACE and INDENT are given as multiples of digit +- spaces; they can be negative also. Without any arguments, line +- numbers are turned off. +- +- 'gtroff' reserves three digit spaces for the line number (which is +- printed right-justified) plus the amount given by INDENT; the +- output lines are concatenated to the line numbers, separated by +- SPACE, and _without_ reducing the line length. Depending on the +- value of the horizontal page offset (as set with the 'po' request), +- line numbers that are longer than the reserved space stick out to +- the left, or the whole line is moved to the right. +- +- Parameters corresponding to missing arguments are not changed; any +- non-digit argument (to be more precise, any argument starting with +- a character valid as a delimiter for identifiers) is also treated +- as missing. +- +- If line numbering has been disabled with a call to 'nm' without an +- argument, it can be reactivated with '.nm +0', using the previously +- active line numbering parameters. +- +- The parameters of 'nm' are associated with the current environment +- (*note Environments::). The current output line number is +- available in the number register 'ln'. +- +- .po 1m +- .ll 2i +- This test shows how line numbering works with groff. +- .nm 999 +- This test shows how line numbering works with groff. +- .br +- .nm xxx 3 2 +- .ll -\w'0'u +- This test shows how line numbering works with groff. +- .nn 2 +- This test shows how line numbering works with groff. +- +- And here the result: +- +- This test shows how +- line numbering works +- 999 with groff. This +- 1000 test shows how line +- 1001 numbering works with +- 1002 groff. +- This test shows how +- line numbering +- works with groff. +- This test shows how +- 1005 line numbering +- works with groff. +- +- -- Request: .nn [skip] +- Temporarily turn off line numbering. The argument is the number of +- lines not to be numbered; this defaults to 1. +- +- -- Request: .mc glyph [dist] +- Print a "margin character" to the right of the text.(1) (*note +- Miscellaneous-Footnote-1::) The first argument is the glyph to be +- printed. The second argument is the distance away from the right +- margin. If missing, the previously set value is used; default is +- 10pt). For text lines that are too long (that is, longer than the +- text length plus DIST), the margin character is directly appended +- to the lines. +- +- With no arguments the margin character is turned off. If this +- occurs before a break, no margin character is printed. +- +- For compatibility with AT&T 'troff', a call to 'mc' to set the +- margin character can't be undone immediately; at least one line +- gets a margin character. Thus +- +- .ll 1i +- .mc \[br] +- .mc +- xxx +- .br +- xxx +- +- produces +- +- xxx | +- xxx +- +- For empty lines and lines produced by the 'tl' request no margin +- character is emitted. +- +- The margin character is associated with the current environment +- (*note Environments::). +- +- This is quite useful for indicating text that has changed, and, in +- fact, there are programs available for doing this (they are called +- 'nrchbar' and 'changebar' and can be found in any +- 'comp.sources.unix' archive). +- +- .ll 3i +- .mc | +- This paragraph is highlighted with a margin +- character. +- .sp +- Note that vertical space isn't marked. +- .br +- \& +- .br +- But we can fake it with `\&'. +- +- Result: +- +- This paragraph is highlighted | +- with a margin character. | +- +- Note that vertical space isn't | +- marked. | +- | +- But we can fake it with `\&'. | +- +- -- Request: .psbb filename +- -- Register: \n[llx] +- -- Register: \n[lly] +- -- Register: \n[urx] +- -- Register: \n[ury] +- Retrieve the bounding box of the POSTSCRIPT image found in +- FILENAME. The file must conform to Adobe's "Document Structuring +- Conventions" (DSC); the command searches for a '%%BoundingBox' +- comment and extracts the bounding box values into the number +- registers 'llx', 'lly', 'urx', and 'ury'. If an error occurs (for +- example, 'psbb' cannot find the '%%BoundingBox' comment), it sets +- the four number registers to zero. +- +- The search path for FILENAME can be controlled with the '-I' +- command line option. +- +- +-File: groff.info, Node: Miscellaneous-Footnotes, Up: Miscellaneous +- +- (1) "Margin character" is a misnomer since it is an output glyph. +- +- +-File: groff.info, Node: Gtroff Internals, Next: Debugging, Prev: Miscellaneous, Up: gtroff Reference +- +-5.32 'gtroff' Internals +-======================= +- +-'gtroff' processes input in three steps. One or more input characters +-are converted to an "input token".(1) (*note Gtroff +-Internals-Footnote-1::) Then, one or more input tokens are converted to +-an "output node". Finally, output nodes are converted to the +-intermediate output language understood by all output devices. +- +- Actually, before step one happens, 'gtroff' converts certain escape +-sequences into reserved input characters (not accessible by the user); +-such reserved characters are used for other internal processing also - +-this is the very reason why not all characters are valid input. *Note +-Identifiers::, for more on this topic. +- +- For example, the input string 'fi\[:u]' is converted into a character +-token 'f', a character token 'i', and a special token ':u' (representing +-u umlaut). Later on, the character tokens 'f' and 'i' are merged to a +-single output node representing the ligature glyph 'fi' (provided the +-current font has a glyph for this ligature); the same happens with ':u'. +-All output glyph nodes are 'processed', which means that they are +-invariably associated with a given font, font size, advance width, etc. +-During the formatting process, 'gtroff' itself adds various nodes to +-control the data flow. +- +- Macros, diversions, and strings collect elements in two chained +-lists: a list of input tokens that have been passed unprocessed, and a +-list of output nodes. Consider the following the diversion. +- +- .di xxx +- a +- \!b +- c +- .br +- .di +- +-It contains these elements. +- +-node list token list element number +- +-line start node -- 1 +-glyph node 'a' -- 2 +-word space node -- 3 +--- 'b' 4 +--- '\n' 5 +-glyph node 'c' -- 6 +-vertical size node -- 7 +-vertical size node -- 8 +--- '\n' 9 +- +-Elements 1, 7, and 8 are inserted by 'gtroff'; the latter two (which are +-always present) specify the vertical extent of the last line, possibly +-modified by '\x'. The 'br' request finishes the current partial line, +-inserting a newline input token, which is subsequently converted to a +-space when the diversion is reread. Note that the word space node has a +-fixed width that isn't stretchable anymore. To convert horizontal space +-nodes back to input tokens, use the 'unformat' request. +- +- Macros only contain elements in the token list (and the node list is +-empty); diversions and strings can contain elements in both lists. +- +- Note that the 'chop' request simply reduces the number of elements in +-a macro, string, or diversion by one. Exceptions are "compatibility +-save" and "compatibility ignore" input tokens, which are ignored. The +-'substring' request also ignores those input tokens. +- +- Some requests like 'tr' or 'cflags' work on glyph identifiers only; +-this means that the associated glyph can be changed without destroying +-this association. This can be very helpful for substituting glyphs. In +-the following example, we assume that glyph 'foo' isn't available by +-default, so we provide a substitution using the 'fchar' request and map +-it to input character 'x'. +- +- .fchar \[foo] foo +- .tr x \[foo] +- +-Now let us assume that we install an additional special font 'bar' that +-has glyph 'foo'. +- +- .special bar +- .rchar \[foo] +- +-Since glyphs defined with 'fchar' are searched before glyphs in special +-fonts, we must call 'rchar' to remove the definition of the fallback +-glyph. Anyway, the translation is still active; 'x' now maps to the +-real glyph 'foo'. +- +- Macro and request arguments preserve the compatibility mode: +- +- .cp 1 \" switch to compatibility mode +- .de xx +- \\$1 +- .. +- .cp 0 \" switch compatibility mode off +- .xx caf\['e] +- => caf +- +-Since compatibility mode is on while 'de' is called, the macro 'xx' +-activates compatibility mode while executing. Argument '$1' can still +-be handled properly because it inherits the compatibility mode status +-which was active at the point where 'xx' is called. +- +- After expansion of the parameters, the compatibility save and restore +-tokens are removed. +- +- +-File: groff.info, Node: Gtroff Internals-Footnotes, Up: Gtroff Internals +- +- (1) Except the escapes '\f', '\F', '\H', '\m', '\M', '\R', '\s', and +-'\S', which are processed immediately if not in copy-in mode. +- +- +-File: groff.info, Node: Debugging, Next: Implementation Differences, Prev: Gtroff Internals, Up: gtroff Reference +- +-5.33 Debugging +-============== +- +-'gtroff' is not easy to debug, but there are some useful features and +-strategies for debugging. +- +- -- Request: .lf line [filename] +- Change the line number and optionally the file name 'gtroff' shall +- use for error and warning messages. LINE is the input line number +- of the _next_ line. +- +- Without argument, the request is ignored. +- +- This is a debugging aid for documents that are split into many +- files, then put together with 'soelim' and other preprocessors. +- Usually, it isn't invoked manually. +- +- Note that other 'troff' implementations (including the original +- AT&T version) handle 'lf' differently. For them, LINE changes the +- line number of the _current_ line. +- +- -- Request: .tm string +- -- Request: .tm1 string +- -- Request: .tmc string +- Send STRING to the standard error output; this is very useful for +- printing debugging messages among other things. +- +- STRING is read in copy mode. +- +- The 'tm' request ignores leading spaces of STRING; 'tm1' handles +- its argument similar to the 'ds' request: a leading double quote in +- STRING is stripped to allow initial blanks. +- +- The 'tmc' request is similar to 'tm1' but does not append a newline +- (as is done in 'tm' and 'tm1'). +- +- -- Request: .ab [string] +- Similar to the 'tm' request, except that it causes 'gtroff' to stop +- processing. With no argument it prints 'User Abort.' to standard +- error. +- +- -- Request: .ex +- The 'ex' request also causes 'gtroff' to stop processing; see also +- *note I/O::. +- +- When doing something involved it is useful to leave the debugging +-statements in the code and have them turned on by a command line flag. +- +- .if \n(DB .tm debugging output +- +-To activate these statements say +- +- groff -rDB=1 file +- +- If it is known in advance that there are many errors and no useful +-output, 'gtroff' can be forced to suppress formatted output with the +-'-z' flag. +- +- -- Request: .pev +- Print the contents of the current environment and all the currently +- defined environments (both named and numbered) on 'stderr'. +- +- -- Request: .pm +- Print the entire symbol table on 'stderr'. Names of all defined +- macros, strings, and diversions are print together with their size +- in bytes. Since 'gtroff' sometimes adds nodes by itself, the +- returned size can be larger than expected. +- +- This request differs from UNIX 'troff': 'gtroff' reports the sizes +- of diversions, ignores an additional argument to print only the +- total of the sizes, and the size isn't returned in blocks of 128 +- characters. +- +- -- Request: .pnr +- Print the names and contents of all currently defined number +- registers on 'stderr'. +- +- -- Request: .ptr +- Print the names and positions of all traps (not including input +- line traps and diversion traps) on 'stderr'. Empty slots in the +- page trap list are printed as well, because they can affect the +- priority of subsequently planted traps. +- +- -- Request: .fl +- Instruct 'gtroff' to flush its output immediately. The intent is +- for interactive use, but this behaviour is currently not +- implemented in 'gtroff'. Contrary to UNIX 'troff', TTY output is +- sent to a device driver also ('grotty'), making it non-trivial to +- communicate interactively. +- +- This request causes a line break. +- +- -- Request: .backtrace +- Print a backtrace of the input stack to the standard error stream. +- +- Consider the following in file 'test': +- +- .de xxx +- . backtrace +- .. +- .de yyy +- . xxx +- .. +- . +- .yyy +- +- On execution, 'gtroff' prints the following: +- +- test:2: backtrace: macro `xxx' +- test:5: backtrace: macro `yyy' +- test:8: backtrace: file `test' +- +- The option '-b' of 'gtroff' internally calls a variant of this +- request on each error and warning. +- +- -- Register: \n[slimit] +- Use the 'slimit' number register to set the maximum number of +- objects on the input stack. If 'slimit' is less than or equal +- to 0, there is no limit set. With no limit, a buggy recursive +- macro can exhaust virtual memory. +- +- The default value is 1000; this is a compile-time constant. +- +- -- Request: .warnscale si +- Set the scaling indicator used in warnings to SI. Valid values for +- SI are 'u', 'i', 'c', 'p', and 'P'. At startup, it is set to 'i'. +- +- -- Request: .spreadwarn [limit] +- Make 'gtroff' emit a warning if the additional space inserted for +- each space between words in an output line is larger or equal to +- LIMIT. A negative value is changed to zero; no argument toggles +- the warning on and off without changing LIMIT. The default scaling +- indicator is 'm'. At startup, 'spreadwarn' is deactivated, and +- LIMIT is set to 3m. +- +- For example, +- +- .spreadwarn 0.2m +- +- causes a warning if 'gtroff' must add 0.2m or more for each +- interword space in a line. +- +- This request is active only if text is justified to both margins +- (using '.ad b'). +- +- 'gtroff' has command line options for printing out more warnings +-('-w') and for printing backtraces ('-b') when a warning or an error +-occurs. The most verbose level of warnings is '-ww'. +- +- -- Request: .warn [flags] +- -- Register: \n[.warn] +- Control the level of warnings checked for. The FLAGS are the sum +- of the numbers associated with each warning that is to be enabled; +- all other warnings are disabled. The number associated with each +- warning is listed below. For example, '.warn 0' disables all +- warnings, and '.warn 1' disables all warnings except that about +- missing glyphs. If no argument is given, all warnings are enabled. +- +- The read-only number register '.warn' contains the current warning +- level. +- +-* Menu: +- +-* Warnings:: +- +- +-File: groff.info, Node: Warnings, Prev: Debugging, Up: Debugging +- +-5.33.1 Warnings +---------------- +- +-The warnings that can be given to 'gtroff' are divided into the +-following categories. The name associated with each warning is used by +-the '-w' and '-W' options; the number is used by the 'warn' request and +-by the '.warn' register. +- +-'char' +-'1' +- Non-existent glyphs.(1) (*note Warnings-Footnote-1::) This is +- enabled by default. +- +-'number' +-'2' +- Invalid numeric expressions. This is enabled by default. *Note +- Expressions::. +- +-'break' +-'4' +- In fill mode, lines that could not be broken so that their length +- was less than the line length. This is enabled by default. +- +-'delim' +-'8' +- Missing or mismatched closing delimiters. +- +-'el' +-'16' +- Use of the 'el' request with no matching 'ie' request. *Note +- if-else::. +- +-'scale' +-'32' +- Meaningless scaling indicators. +- +-'range' +-'64' +- Out of range arguments. +- +-'syntax' +-'128' +- Dubious syntax in numeric expressions. +- +-'di' +-'256' +- Use of 'di' or 'da' without an argument when there is no current +- diversion. +- +-'mac' +-'512' +- Use of undefined strings, macros and diversions. When an undefined +- string, macro, or diversion is used, that string is automatically +- defined as empty. So, in most cases, at most one warning is given +- for each name. +- +-'reg' +-'1024' +- Use of undefined number registers. When an undefined number +- register is used, that register is automatically defined to have a +- value of 0. So, in most cases, at most one warning is given for +- use of a particular name. +- +-'tab' +-'2048' +- Use of a tab character where a number was expected. +- +-'right-brace' +-'4096' +- Use of '\}' where a number was expected. +- +-'missing' +-'8192' +- Requests that are missing non-optional arguments. +- +-'input' +-'16384' +- Invalid input characters. +- +-'escape' +-'32768' +- Unrecognized escape sequences. When an unrecognized escape +- sequence '\X' is encountered, the escape character is ignored, and +- X is printed. +- +-'space' +-'65536' +- Missing space between a request or macro and its argument. This +- warning is given when an undefined name longer than two characters +- is encountered, and the first two characters of the name make a +- defined name. The request or macro is not invoked. When this +- warning is given, no macro is automatically defined. This is +- enabled by default. This warning never occurs in compatibility +- mode. +- +-'font' +-'131072' +- Non-existent fonts. This is enabled by default. +- +-'ig' +-'262144' +- Invalid escapes in text ignored with the 'ig' request. These are +- conditions that are errors when they do not occur in ignored text. +- +-'color' +-'524288' +- Color related warnings. +- +-'file' +-'1048576' +- Missing files. The 'mso' request gives this warning when the +- requested macro file does not exist. This is enabled by default. +- +-'all' +- All warnings except 'di', 'mac' and 'reg'. It is intended that +- this covers all warnings that are useful with traditional macro +- packages. +- +-'w' +- All warnings. +- +- +-File: groff.info, Node: Warnings-Footnotes, Up: Warnings +- +- (1) 'char' is a misnomer since it reports missing glyphs - there +-aren't missing input characters, only invalid ones. +- +- +-File: groff.info, Node: Implementation Differences, Prev: Debugging, Up: gtroff Reference +- +-5.34 Implementation Differences +-=============================== +- +-GNU 'troff' has a number of features that cause incompatibilities with +-documents written with old versions of 'troff'. +- +- Long names cause some incompatibilities. UNIX 'troff' interprets +- +- .dsabcd +- +-as defining a string 'ab' with contents 'cd'. Normally, GNU 'troff' +-interprets this as a call of a macro named 'dsabcd'. Also UNIX 'troff' +-interprets '\*[' or '\n[' as references to a string or number register +-called '['. In GNU 'troff', however, this is normally interpreted as +-the start of a long name. In compatibility mode GNU 'troff' interprets +-long names in the traditional way (which means that they are not +-recognized as names). +- +- -- Request: .cp [n] +- -- Request: .do cmd +- -- Register: \n[.C] +- If N is missing or non-zero, turn on compatibility mode; otherwise, +- turn it off. +- +- The read-only number register '.C' is 1 if compatibility mode is +- on, 0 otherwise. +- +- Compatibility mode can be also turned on with the '-C' command line +- option. +- +- The 'do' request turns off compatibility mode while executing its +- arguments as a 'gtroff' command. However, it does not turn off +- compatibility mode while processing the macro itself. To do that, +- use the 'de1' request (or manipulate the '.C' register manually). +- *Note Writing Macros::. +- +- .do fam T +- +- executes the 'fam' request when compatibility mode is enabled. +- +- 'gtroff' restores the previous compatibility setting before +- interpreting any files sourced by the CMD. +- +- Two other features are controlled by '-C'. If not in compatibility +-mode, GNU 'troff' preserves the input level in delimited arguments: +- +- .ds xx ' +- \w'abc\*(xxdef' +- +-In compatibility mode, the string '72def'' is returned; without '-C' the +-resulting string is '168' (assuming a TTY output device). +- +- Finally, the escapes '\f', '\H', '\m', '\M', '\R', '\s', and '\S' are +-transparent for recognizing the beginning of a line only in +-compatibility mode (this is a rather obscure feature). For example, the +-code +- +- .de xx +- Hallo! +- .. +- \fB.xx\fP +- +-prints 'Hallo!' in bold face if in compatibility mode, and '.xx' in bold +-face otherwise. +- +- GNU 'troff' does not allow the use of the escape sequences '\|', +-'\^', '\&', '\{', '\}', '\', '\'', '\`', '\-', '\_', '\!', '\%', and +-'\c' in names of strings, macros, diversions, number registers, fonts or +-environments; UNIX 'troff' does. The '\A' escape sequence (*note +-Identifiers::) may be helpful in avoiding use of these escape sequences +-in names. +- +- Fractional point sizes cause one noteworthy incompatibility. In UNIX +-'troff' the 'ps' request ignores scale indicators and thus +- +- .ps 10u +- +-sets the point size to 10 points, whereas in GNU 'troff' it sets the +-point size to 10 scaled points. *Note Fractional Type Sizes::, for more +-information. +- +- In GNU 'troff' there is a fundamental difference between +-(unformatted) input characters and (formatted) output glyphs. +-Everything that affects how a glyph is output is stored with the glyph +-node; once a glyph node has been constructed it is unaffected by any +-subsequent requests that are executed, including 'bd', 'cs', 'tkf', +-'tr', or 'fp' requests. Normally glyphs are constructed from input +-characters at the moment immediately before the glyph is added to the +-current output line. Macros, diversions and strings are all, in fact, +-the same type of object; they contain lists of input characters and +-glyph nodes in any combination. A glyph node does not behave like an +-input character for the purposes of macro processing; it does not +-inherit any of the special properties that the input character from +-which it was constructed might have had. For example, +- +- .di x +- \\\\ +- .br +- .di +- .x +- +-prints '\\' in GNU 'troff'; each pair of input backslashes is turned +-into one output backslash and the resulting output backslashes are not +-interpreted as escape characters when they are reread. UNIX 'troff' +-would interpret them as escape characters when they were reread and +-would end up printing one '\'. The correct way to obtain a printable +-backslash is to use the '\e' escape sequence: This always prints a +-single instance of the current escape character, regardless of whether +-or not it is used in a diversion; it also works in both GNU 'troff' and +-UNIX 'troff'.(1) (*note Implementation Differences-Footnote-1::) To +-store, for some reason, an escape sequence in a diversion that is +-interpreted when the diversion is reread, either use the traditional +-'\!' transparent output facility, or, if this is unsuitable, the new +-'\?' escape sequence. +- +- *Note Diversions::, and *note Gtroff Internals::, for more +-information. +- +- +-File: groff.info, Node: Implementation Differences-Footnotes, Up: Implementation Differences +- +- (1) To be completely independent of the current escape character, use +-'\(rs', which represents a reverse solidus (backslash) glyph. +- +- +-File: groff.info, Node: Preprocessors, Next: Output Devices, Prev: gtroff Reference, Up: Top +- +-6 Preprocessors +-*************** +- +-This chapter describes all preprocessors that come with 'groff' or which +-are freely available. +- +-* Menu: +- +-* geqn:: +-* gtbl:: +-* gpic:: +-* ggrn:: +-* grap:: +-* gchem:: +-* grefer:: +-* gsoelim:: +-* preconv:: +- +- +-File: groff.info, Node: geqn, Next: gtbl, Prev: Preprocessors, Up: Preprocessors +- +-6.1 'geqn' +-========== +- +-* Menu: +- +-* Invoking geqn:: +- +- +-File: groff.info, Node: Invoking geqn, Prev: geqn, Up: geqn +- +-6.1.1 Invoking 'geqn' +---------------------- +- +- +-File: groff.info, Node: gtbl, Next: gpic, Prev: geqn, Up: Preprocessors +- +-6.2 'gtbl' +-========== +- +-* Menu: +- +-* Invoking gtbl:: +- +- +-File: groff.info, Node: Invoking gtbl, Prev: gtbl, Up: gtbl +- +-6.2.1 Invoking 'gtbl' +---------------------- +- +- +-File: groff.info, Node: gpic, Next: ggrn, Prev: gtbl, Up: Preprocessors +- +-6.3 'gpic' +-========== +- +-* Menu: +- +-* Invoking gpic:: +- +- +-File: groff.info, Node: Invoking gpic, Prev: gpic, Up: gpic +- +-6.3.1 Invoking 'gpic' +---------------------- +- +- +-File: groff.info, Node: ggrn, Next: grap, Prev: gpic, Up: Preprocessors +- +-6.4 'ggrn' +-========== +- +-* Menu: +- +-* Invoking ggrn:: +- +- +-File: groff.info, Node: Invoking ggrn, Prev: ggrn, Up: ggrn +- +-6.4.1 Invoking 'ggrn' +---------------------- +- +- +-File: groff.info, Node: grap, Next: gchem, Prev: ggrn, Up: Preprocessors +- +-6.5 'grap' +-========== +- +-A free implementation of 'grap', written by Ted Faber, is available as +-an extra package from the following address: +- +- +- +- +-File: groff.info, Node: gchem, Next: grefer, Prev: grap, Up: Preprocessors +- +-6.6 'gchem' +-=========== +- +-* Menu: +- +-* Invoking gchem:: +- +- +-File: groff.info, Node: Invoking gchem, Prev: gchem, Up: gchem +- +-6.6.1 Invoking 'gchem' +----------------------- +- +- +-File: groff.info, Node: grefer, Next: gsoelim, Prev: gchem, Up: Preprocessors +- +-6.7 'grefer' +-============ +- +-* Menu: +- +-* Invoking grefer:: +- +- +-File: groff.info, Node: Invoking grefer, Prev: grefer, Up: grefer +- +-6.7.1 Invoking 'grefer' +------------------------ +- +- +-File: groff.info, Node: gsoelim, Next: preconv, Prev: grefer, Up: Preprocessors +- +-6.8 'gsoelim' +-============= +- +-* Menu: +- +-* Invoking gsoelim:: +- +- +-File: groff.info, Node: Invoking gsoelim, Prev: gsoelim, Up: gsoelim +- +-6.8.1 Invoking 'gsoelim' +------------------------- +- +- +-File: groff.info, Node: preconv, Prev: gsoelim, Up: Preprocessors +- +-6.9 'preconv' +-============= +- +-* Menu: +- +-* Invoking preconv:: +- +- +-File: groff.info, Node: Invoking preconv, Prev: preconv, Up: preconv +- +-6.9.1 Invoking 'preconv' +------------------------- +- +- +-File: groff.info, Node: Output Devices, Next: File formats, Prev: Preprocessors, Up: Top +- +-7 Output Devices +-**************** +- +-* Menu: +- +-* Special Characters:: +-* grotty:: +-* grops:: +-* gropdf:: +-* grodvi:: +-* grolj4:: +-* grolbp:: +-* grohtml:: +-* gxditview:: +- +- +-File: groff.info, Node: Special Characters, Next: grotty, Prev: Output Devices, Up: Output Devices +- +-7.1 Special Characters +-====================== +- +-*Note Font Files::. +- +- +-File: groff.info, Node: grotty, Next: grops, Prev: Special Characters, Up: Output Devices +- +-7.2 'grotty' +-============ +- +-The postprocessor 'grotty' translates the output from GNU 'troff' into a +-form suitable for typewriter-like devices. It is fully documented on +-its manual page, 'grotty(1)'. +- +-* Menu: +- +-* Invoking grotty:: +- +- +-File: groff.info, Node: Invoking grotty, Prev: grotty, Up: grotty +- +-7.2.1 Invoking 'grotty' +------------------------ +- +-The postprocessor 'grotty' accepts the following command-line options: +- +-'-b' +- Do not overstrike bold glyphs. Ignored if '-c' isn't used. +- +-'-B' +- Do not underline bold-italic glyphs. Ignored if '-c' isn't used. +- +-'-c' +- Use overprint and disable colours for printing on legacy Teletype +- printers (see below). +- +-'-d' +- Do not render lines (this is, ignore all '\D' escapes). +- +-'-f' +- Use form feed control characters in the output. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font and device description files, given the target device NAME. +- +-'-h' +- Use horizontal tabs for sequences of 8 space characters. +- +-'-i' +- Request italic glyphs from the terminal. Ignored if '-c' is +- active. +- +-'-o' +- Do not overstrike. +- +-'-r' +- Highlight italic glyphs. Ignored if '-c' is active. +- +-'-u' +- Do not underline italic glyphs. Ignored if '-c' isn't used. +- +-'-U' +- Do not overstrike bold-italic glyphs. Ignored if '-c' isn't used. +- +-'-v' +- Print the version number. +- +- The '-c' mode for TTY output devices means that underlining is done +-by emitting sequences of '_' and '^H' (the backspace character) before +-the actual character. Literally, this is printing an underline +-character, then moving the caret back one character position, and +-printing the actual character at the same position as the underline +-character (similar to a typewriter). Usually, a modern terminal can't +-interpret this (and the original Teletype machines for which this +-sequence was appropriate are no longer in use). You need a pager +-program like 'less' that translates this into ISO 6429 SGR sequences to +-control terminals. +- +- +-File: groff.info, Node: grops, Next: gropdf, Prev: grotty, Up: Output Devices +- +-7.3 'grops' +-=========== +- +-The postprocessor 'grops' translates the output from GNU 'troff' into a +-form suitable for Adobe POSTSCRIPT devices. It is fully documented on +-its manual page, 'grops(1)'. +- +-* Menu: +- +-* Invoking grops:: +-* Embedding PostScript:: +- +- +-File: groff.info, Node: Invoking grops, Next: Embedding PostScript, Prev: grops, Up: grops +- +-7.3.1 Invoking 'grops' +----------------------- +- +-The postprocessor 'grops' accepts the following command-line options: +- +-'-bFLAGS' +- Use backward compatibility settings given by FLAGS as documented in +- the 'grops(1)' manual page. Overrides the command 'broken' in the +- 'DESC' file. +- +-'-cN' +- Print N copies of each page. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font, prologue and device description files, given the target +- device NAME, usually *ps*. +- +-'-g' +- Tell the printer to guess the page length. Useful for printing +- vertically centered pages when the paper dimensions are determined +- at print time. +- +-'-IPATH ...' +- Consider the directory 'PATH' for searching included files +- specified with relative paths. The current directory is searched +- as fallback. +- +-'-l' +- Use landscape orientation. +- +-'-m' +- Use manual feed. +- +-'-pPAPERSIZE' +- Set the page dimensions. Overrides the commands 'papersize', +- 'paperlength', and 'paperwidth' in the 'DESC' file. See the +- 'groff_font(5)' manual page for details. +- +-'-PPROLOGUE' +- Use the PROLOGUE in the font path as the prologue instead of the +- default 'prologue'. Overrides the environment variable +- 'GROPS_PROLOGUE'. +- +-'-wN' +- Set the line thickness to N/1000em. Overrides the default value N +- = 40. +- +-'-v' +- Print the version number. +- +- +-File: groff.info, Node: Embedding PostScript, Prev: Invoking grops, Up: grops +- +-7.3.2 Embedding POSTSCRIPT +--------------------------- +- +-The escape sequence +- +- '\X'ps: import FILE LLX LLY URX URY WIDTH [HEIGHT]'' +- +-places a rectangle of the specified WIDTH containing the POSTSCRIPT +-drawing from file FILE bound by the box from LLX LLY to URX URY (in +-POSTSCRIPT coordinates) at the insertion point. If HEIGHT is not +-specified, the embedded drawing is scaled proportionally. +- +- *Note Miscellaneous::, for the 'psbb' request, which automatically +-generates the bounding box. +- +- This escape sequence is used internally by the macro 'PSPIC' (see the +-'groff_tmac(5)' manual page). +- +- +-File: groff.info, Node: gropdf, Next: grodvi, Prev: grops, Up: Output Devices +- +-7.4 'gropdf' +-============ +- +-The postprocessor 'gropdf' translates the output from GNU 'troff' into a +-form suitable for Adobe PDF devices. It is fully documented on its +-manual page, 'gropdf(1)'. +- +-* Menu: +- +-* Invoking gropdf:: +-* Embedding PDF:: +- +- +-File: groff.info, Node: Invoking gropdf, Next: Embedding PDF, Prev: gropdf, Up: gropdf +- +-7.4.1 Invoking 'gropdf' +------------------------ +- +-The postprocessor 'gropdf' accepts the following command-line options: +- +-'-d' +- Produce uncompressed PDFs that include debugging comments. +- +-'-e' +- This forces 'gropdf' to embed all used fonts in the PDF, even if +- they are one of the 14 base Adobe fonts. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font, prologue and device description files, given the target +- device NAME, usually *pdf*. +- +-'-yFOUNDRY' +- This forces the use of a different font foundry. +- +-'-l' +- Use landscape orientation. +- +-'-pPAPERSIZE' +- Set the page dimensions. Overrides the commands 'papersize', +- 'paperlength', and 'paperwidth' in the 'DESC' file. See the +- 'groff_font(5)' manual page for details. +- +-'-v' +- Print the version number. +- +-'-s' +- Append a comment line to end of PDF showing statistics, i.e. +- number of pages in document. Ghostscript's 'ps2pdf(1)' complains +- about this line if it is included, but works anyway. +- +-'-uFILENAME' +- 'gropdf' normally includes a ToUnicode CMap with any font created +- using 'text.enc' as the encoding file, this makes it easier to +- search for words that contain ligatures. You can include your own +- CMap by specifying a FILENAME or have no CMap at all by omitting +- the FILENAME. +- +- +-File: groff.info, Node: Embedding PDF, Prev: Invoking gropdf, Up: gropdf +- +-7.4.2 Embedding PDF +-------------------- +- +-The escape sequence +- +- '\X'pdf: pdfpic FILE ALIGNMENT WIDTH [HEIGHT] [LINELENGTH]'' +- +-places a rectangle of the specified WIDTH containing the PDF drawing +-from file FILE of desired WIDTH and HEIGHT (if HEIGHT is missing or zero +-then it is scaled proportionally). If ALIGNMENT is '-L' the drawing is +-left aligned. If it is '-C' or '-R' a LINELENGTH greater than the width +-of the drawing is required as well. If WIDTH is specified as zero then +-the width is scaled in proportion to the height. +- +- +-File: groff.info, Node: grodvi, Next: grolj4, Prev: gropdf, Up: Output Devices +- +-7.5 'grodvi' +-============ +- +-The postprocessor 'grodvi' translates the output from GNU 'troff' into +-the *DVI* output format compatible with the *TeX* document preparation +-system. It is fully documented on its manual page, 'grodvi(1)'. +- +-* Menu: +- +-* Invoking grodvi:: +- +- +-File: groff.info, Node: Invoking grodvi, Prev: grodvi, Up: grodvi +- +-7.5.1 Invoking 'grodvi' +------------------------ +- +-The postprocessor 'grodvi' accepts the following command-line options: +- +-'-d' +- Do not use *tpic* specials to implement drawing commands. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font and device description files, given the target device NAME, +- usually *dvi*. +- +-'-l' +- Use landscape orientation. +- +-'-pPAPERSIZE' +- Set the page dimensions. Overrides the commands 'papersize', +- 'paperlength', and 'paperwidth' in the 'DESC' file. See +- 'groff_font(5)' manual page for details. +- +-'-v' +- Print the version number. +- +-'-wN' +- Set the line thickness to N/1000em. Overrides the default value N +- = 40. +- +- +-File: groff.info, Node: grolj4, Next: grolbp, Prev: grodvi, Up: Output Devices +- +-7.6 'grolj4' +-============ +- +-The postprocessor 'grolj4' translates the output from GNU 'troff' into +-the *PCL5* output format suitable for printing on a *HP LaserJet 4* +-printer. It is fully documented on its manual page, 'grolj4(1)'. +- +-* Menu: +- +-* Invoking grolj4:: +- +- +-File: groff.info, Node: Invoking grolj4, Prev: grolj4, Up: grolj4 +- +-7.6.1 Invoking 'grolj4' +------------------------ +- +-The postprocessor 'grolj4' accepts the following command-line options: +- +-'-cN' +- Print N copies of each page. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font and device description files, given the target device NAME, +- usually *lj4*. +- +-'-l' +- Use landscape orientation. +- +-'-pSIZE' +- Set the page dimensions. Valid values for SIZE are: 'letter', +- 'legal', 'executive', 'a4', 'com10', 'monarch', 'c5', 'b5', 'd1'. +- +-'-v' +- Print the version number. +- +-'-wN' +- Set the line thickness to N/1000em. Overrides the default value N +- = 40. +- +- The special drawing command '\D'R DH DV'' draws a horizontal +-rectangle from the current position to the position at offset (DH,DV). +- +- +-File: groff.info, Node: grolbp, Next: grohtml, Prev: grolj4, Up: Output Devices +- +-7.7 'grolbp' +-============ +- +-The postprocessor 'grolbp' translates the output from GNU 'troff' into +-the *LBP* output format suitable for printing on *Canon CAPSL* printers. +-It is fully documented on its manual page, 'grolbp(1)'. +- +-* Menu: +- +-* Invoking grolbp:: +- +- +-File: groff.info, Node: Invoking grolbp, Prev: grolbp, Up: grolbp +- +-7.7.1 Invoking 'grolbp' +------------------------ +- +-The postprocessor 'grolbp' accepts the following command-line options: +- +-'-cN' +- Print N copies of each page. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font, prologue and device description files, given the target +- device NAME, usually *lbp*. +- +-'-l' +- Use landscape orientation. +- +-'-oORIENTATION' +- Use the ORIENTATION specified: 'portrait' or 'landscape'. +- +-'-pPAPERSIZE' +- Set the page dimensions. See 'groff_font(5)' manual page for +- details. +- +-'-wN' +- Set the line thickness to N/1000em. Overrides the default value N +- = 40. +- +-'-v' +- Print the version number. +- +-'-h' +- Print command-line help. +- +- +-File: groff.info, Node: grohtml, Next: gxditview, Prev: grolbp, Up: Output Devices +- +-7.8 'grohtml' +-============= +- +-The 'grohtml' front end (which consists of a preprocessor, +-'pre-grohtml', and a device driver, 'post-grohtml') translates the +-output of GNU 'troff' to HTML. Users should always invoke 'grohtml' via +-the 'groff' command with a '\-Thtml' option. If no files are given, +-'grohtml' will read the standard input. A filename of '-' will also +-cause 'grohtml' to read the standard input. HTML output is written to +-the standard output. When 'grohtml' is run by 'groff', options can be +-passed to 'grohtml' using 'groff''s '-P' option. +- +- 'grohtml' invokes 'groff' twice. In the first pass, pictures, +-equations, and tables are rendered using the 'ps' device, and in the +-second pass HTML output is generated by the 'html' device. +- +- 'grohtml' always writes output in 'UTF-8' encoding and has built-in +-entities for all non-composite unicode characters. In spite of this, +-'groff' may issue warnings about unknown special characters if they +-can't be found during the first pass. Such warnings can be safely +-ignored unless the special characters appear inside a table or equation, +-in which case glyphs for these characters must be defined for the 'ps' +-device as well. +- +- This output device is fully documented on its manual page, +-'grohtml(1)'. +- +-* Menu: +- +-* Invoking grohtml:: +-* grohtml specific registers and strings:: +- +- +-File: groff.info, Node: Invoking grohtml, Next: grohtml specific registers and strings, Prev: grohtml, Up: grohtml +- +-7.8.1 Invoking 'grohtml' +------------------------- +- +-The postprocessor 'grohtml' accepts the following command-line options: +- +-'-aBITS' +- Use this number of BITS (= 1, 2 or 4) for text antialiasing. +- Default: BITS = 4. +- +-'-a0' +- Do not use text antialiasing. +- +-'-b' +- Use white background. +- +-'-DDIR' +- Store rendered images in the directory 'DIR'. +- +-'-FDIR' +- Put the directory 'DIR/devNAME' in front of the search path for the +- font, prologue and device description files, given the target +- device NAME, usually *html*. +- +-'-gBITS' +- Use this number of BITS (= 1, 2 or 4) for antialiasing of drawings. +- Default: BITS = 4. +- +-'-g0' +- Do not use antialiasing for drawings. +- +-'-h' +- Use the 'B' element for section headings. +- +-'-iRESOLUTION' +- Use the RESOLUTION for rendered images. Default: RESOLUTION = +- 100dpi. +- +-'-ISTEM' +- Set the images' STEM NAME. Default: STEM = 'grohtml-XXX' (XXX is +- the process ID). +- +-'-jSTEM' +- Place each section in a separate file called 'STEM-N.html' (where N +- is a generated section number). +- +-'-l' +- Do not generate the table of contents. +- +-'-n' +- Generate simple fragment identifiers. +- +-'-oOFFSET' +- Use vertical paddding OFFSET for images. +- +-'-p' +- Display the page rendering progress to 'stderr'. +- +-'-r' +- Do not use horizontal rules to separate headers and footers. +- +-'-sSIZE' +- Set the base font size, to be modified using the elements 'BIG' and +- 'SMALL'. +- +-'-SLEVEL' +- Generate separate files for sections at level LEVEL. +- +-'-v' +- Print the version number. +- +-'-V' +- Generate a validator button at the bottom. +- +-'-y' +- Generate a signature of groff after the validator button, if any. +- +- +-File: groff.info, Node: grohtml specific registers and strings, Prev: Invoking grohtml, Up: grohtml +- +-7.8.2 'grohtml' specific registers and strings +----------------------------------------------- +- +- -- Register: \n[ps4html] +- -- String: \*[www-image-template] +- The registers 'ps4html' and 'www-image-template' are defined by the +- 'pre-grohtml' preprocessor. 'pre-grohtml' reads in the 'troff' +- input, marks up the inline equations and passes the result firstly +- to +- +- troff -Tps -rps4html=1 -dwww-image-template=TEMPLATE +- +- and secondly to +- +- troff -Thtml +- +- or +- +- troff -Txhtml +- +- The POSTSCRIPT device is used to create all the image files (for +- '-Thtml'; if '-Txhtml' is used, all equations are passed to 'geqn' +- to produce MathML, and the register 'ps4html' enables the macro +- sets to ignore floating keeps, footers, and headings. +- +- The register 'www-image-template' is set to the user specified +- template name or the default name. +- +- +-File: groff.info, Node: gxditview, Prev: grohtml, Up: Output Devices +- +-7.9 'gxditview' +-=============== +- +-* Menu: +- +-* Invoking gxditview:: +- +- +-File: groff.info, Node: Invoking gxditview, Prev: gxditview, Up: gxditview +- +-7.9.1 Invoking 'gxditview' +--------------------------- +- +- +-File: groff.info, Node: File formats, Next: Installation, Prev: Output Devices, Up: Top +- +-8 File formats +-************** +- +-All files read and written by 'gtroff' are text files. The following +-two sections describe their format. +- +-* Menu: +- +-* gtroff Output:: +-* Font Files:: +- +- +-File: groff.info, Node: gtroff Output, Next: Font Files, Prev: File formats, Up: File formats +- +-8.1 'gtroff' Output +-=================== +- +-This section describes the intermediate output format of GNU 'troff'. +-This output is produced by a run of 'gtroff' before it is fed into a +-device postprocessor program. +- +- As 'groff' is a wrapper program around 'gtroff' that automatically +-calls a postprocessor, this output does not show up normally. This is +-why it is called "intermediate". 'groff' provides the option '-Z' to +-inhibit postprocessing, such that the produced intermediate output is +-sent to standard output just like calling 'gtroff' manually. +- +- Here, the term "troff output" describes what is output by 'gtroff', +-while "intermediate output" refers to the language that is accepted by +-the parser that prepares this output for the postprocessors. This +-parser is smarter on whitespace and implements obsolete elements for +-compatibility, otherwise both formats are the same.(1) (*note gtroff +-Output-Footnote-1::) +- +- The main purpose of the intermediate output concept is to facilitate +-the development of postprocessors by providing a common programming +-interface for all devices. It has a language of its own that is +-completely different from the 'gtroff' language. While the 'gtroff' +-language is a high-level programming language for text processing, the +-intermediate output language is a kind of low-level assembler language +-by specifying all positions on the page for writing and drawing. +- +- The intermediate output produced by 'gtroff' is fairly readable, +-while output from AT&T 'troff' is rather hard to understand because of +-strange habits that are still supported, but not used any longer by +-'gtroff'. +- +-* Menu: +- +-* Language Concepts:: +-* Command Reference:: +-* Intermediate Output Examples:: +-* Output Language Compatibility:: +- +- +-File: groff.info, Node: gtroff Output-Footnotes, Up: gtroff Output +- +- (1) The parser and postprocessor for intermediate output can be found +-in the file +-'GROFF-SOURCE-DIR/src/libs/libdriver/input.cpp'. +- +- +-File: groff.info, Node: Language Concepts, Next: Command Reference, Prev: gtroff Output, Up: gtroff Output +- +-8.1.1 Language Concepts +------------------------ +- +-During the run of 'gtroff', the input data is cracked down to the +-information on what has to be printed at what position on the intended +-device. So the language of the intermediate output format can be quite +-small. Its only elements are commands with and without arguments. In +-this section, the term "command" always refers to the intermediate +-output language, and never to the 'gtroff' language used for document +-formatting. There are commands for positioning and text writing, for +-drawing, and for device controlling. +- +-* Menu: +- +-* Separation:: +-* Argument Units:: +-* Document Parts:: +- +- +-File: groff.info, Node: Separation, Next: Argument Units, Prev: Language Concepts, Up: Language Concepts +- +-8.1.1.1 Separation +-.................. +- +-AT&T 'troff' output has strange requirements on whitespace. The +-'gtroff' output parser, however, is smart about whitespace by making it +-maximally optional. The whitespace characters, i.e., the tab, space, +-and newline characters, always have a syntactical meaning. They are +-never printable because spacing within the output is always done by +-positioning commands. +- +- Any sequence of space or tab characters is treated as a single +-"syntactical space". It separates commands and arguments, but is only +-required when there would occur a clashing between the command code and +-the arguments without the space. Most often, this happens when +-variable-length command names, arguments, argument lists, or command +-clusters meet. Commands and arguments with a known, fixed length need +-not be separated by syntactical space. +- +- A line break is a syntactical element, too. Every command argument +-can be followed by whitespace, a comment, or a newline character. Thus +-a "syntactical line break" is defined to consist of optional syntactical +-space that is optionally followed by a comment, and a newline character. +- +- The normal commands, those for positioning and text, consist of a +-single letter taking a fixed number of arguments. For historical +-reasons, the parser allows to stack such commands on the same line, but +-fortunately, in 'gtroff''s intermediate output, every command with at +-least one argument is followed by a line break, thus providing excellent +-readability. +- +- The other commands - those for drawing and device controlling - have +-a more complicated structure; some recognize long command names, and +-some take a variable number of arguments. So all 'D' and 'x' commands +-were designed to request a syntactical line break after their last +-argument. Only one command, 'x X', has an argument that can stretch +-over several lines; all other commands must have all of their arguments +-on the same line as the command, i.e., the arguments may not be split by +-a line break. +- +- Empty lines (these are lines containing only space and/or a comment), +-can occur everywhere. They are just ignored. +- +- +-File: groff.info, Node: Argument Units, Next: Document Parts, Prev: Separation, Up: Language Concepts +- +-8.1.1.2 Argument Units +-...................... +- +-Some commands take integer arguments that are assumed to represent +-values in a measurement unit, but the letter for the corresponding scale +-indicator is not written with the output command arguments. Most +-commands assume the scale indicator 'u', the basic unit of the device, +-some use 'z', the scaled point unit of the device, while others, such as +-the color commands, expect plain integers. +- +- Note that single characters can have the eighth bit set, as can the +-names of fonts and special characters. The names of characters and +-fonts can be of arbitrary length. A character that is to be printed is +-always in the current font. +- +- A string argument is always terminated by the next whitespace +-character (space, tab, or newline); an embedded '#' character is +-regarded as part of the argument, not as the beginning of a comment +-command. An integer argument is already terminated by the next +-non-digit character, which then is regarded as the first character of +-the next argument or command. +- +- +-File: groff.info, Node: Document Parts, Prev: Argument Units, Up: Language Concepts +- +-8.1.1.3 Document Parts +-...................... +- +-A correct intermediate output document consists of two parts, the +-"prologue" and the "body". +- +- The task of the prologue is to set the general device parameters +-using three exactly specified commands. 'gtroff''s prologue is +-guaranteed to consist of the following three lines (in that order): +- +- x T DEVICE +- x res N H V +- x init +- +-with the arguments set as outlined in *note Device Control Commands::. +-Note that the parser for the intermediate output format is able to +-swallow additional whitespace and comments as well even in the prologue. +- +- The body is the main section for processing the document data. +-Syntactically, it is a sequence of any commands different from the ones +-used in the prologue. Processing is terminated as soon as the first +-'x stop' command is encountered; the last line of any 'gtroff' +-intermediate output always contains such a command. +- +- Semantically, the body is page oriented. A new page is started by a +-'p' command. Positioning, writing, and drawing commands are always done +-within the current page, so they cannot occur before the first 'p' +-command. Absolute positioning (by the 'H' and 'V' commands) is done +-relative to the current page; all other positioning is done relative to +-the current location within this page. +- +- +-File: groff.info, Node: Command Reference, Next: Intermediate Output Examples, Prev: Language Concepts, Up: gtroff Output +- +-8.1.2 Command Reference +------------------------ +- +-This section describes all intermediate output commands, both from AT&T +-'troff' as well as the 'gtroff' extensions. +- +-* Menu: +- +-* Comment Command:: +-* Simple Commands:: +-* Graphics Commands:: +-* Device Control Commands:: +-* Obsolete Command:: +- +- +-File: groff.info, Node: Comment Command, Next: Simple Commands, Prev: Command Reference, Up: Command Reference +- +-8.1.2.1 Comment Command +-....................... +- +-'#ANYTHING' +- A comment. Ignore any characters from the '#' character up to the +- next newline character. +- +- This command is the only possibility for commenting in the +- intermediate output. Each comment can be preceded by arbitrary +- syntactical space; every command can be terminated by a comment. +- +- +-File: groff.info, Node: Simple Commands, Next: Graphics Commands, Prev: Comment Command, Up: Command Reference +- +-8.1.2.2 Simple Commands +-....................... +- +-The commands in this subsection have a command code consisting of a +-single character, taking a fixed number of arguments. Most of them are +-commands for positioning and text writing. These commands are smart +-about whitespace. Optionally, syntactical space can be inserted before, +-after, and between the command letter and its arguments. All of these +-commands are stackable, i.e., they can be preceded by other simple +-commands or followed by arbitrary other commands on the same line. A +-separating syntactical space is only necessary when two integer +-arguments would clash or if the preceding argument ends with a string +-argument. +- +-'C XXX' +- Print a special character named XXX. The trailing syntactical +- space or line break is necessary to allow glyph names of arbitrary +- length. The glyph is printed at the current print position; the +- glyph's size is read from the font file. The print position is not +- changed. +- +-'c G' +- Print glyph G at the current print position;(1) (*note Simple +- Commands-Footnote-1::) the glyph's size is read from the font file. +- The print position is not changed. +- +-'f N' +- Set font to font number N (a non-negative integer). +- +-'H N' +- Move right to the absolute vertical position N (a non-negative +- integer in basic units 'u' relative to left edge of current page. +- +-'h N' +- Move N (a non-negative integer) basic units 'u' horizontally to the +- right. The original UNIX troff manual allows negative values for N +- also, but 'gtroff' doesn't use this. +- +-'m COLOR-SCHEME [COMPONENT ...]' +- Set the color for text (glyphs), line drawing, and the outline of +- graphic objects using different color schemes; the analoguous +- command for the filling color of graphic objects is 'DF'. The +- color components are specified as integer arguments between 0 and +- 65536. The number of color components and their meaning vary for +- the different color schemes. These commands are generated by +- 'gtroff''s escape sequence '\m'. No position changing. These +- commands are a 'gtroff' extension. +- +- 'mc CYAN MAGENTA YELLOW' +- Set color using the CMY color scheme, having the 3 color +- components CYAN, MAGENTA, and YELLOW. +- +- 'md' +- Set color to the default color value (black in most cases). +- No component arguments. +- +- 'mg GRAY' +- Set color to the shade of gray given by the argument, an +- integer between 0 (black) and 65536 (white). +- +- 'mk CYAN MAGENTA YELLOW BLACK' +- Set color using the CMYK color scheme, having the 4 color +- components CYAN, MAGENTA, YELLOW, and BLACK. +- +- 'mr RED GREEN BLUE' +- Set color using the RGB color scheme, having the 3 color +- components RED, GREEN, and BLUE. +- +-'N N' +- Print glyph with index N (a non-negative integer) of the current +- font. This command is a 'gtroff' extension. +- +-'n B A' +- Inform the device about a line break, but no positioning is done by +- this command. In AT&T 'troff', the integer arguments B and A +- informed about the space before and after the current line to make +- the intermediate output more human readable without performing any +- action. In 'groff', they are just ignored, but they must be +- provided for compatibility reasons. +- +-'p N' +- Begin a new page in the outprint. The page number is set to N. +- This page is completely independent of pages formerly processed +- even if those have the same page number. The vertical position on +- the outprint is automatically set to 0. All positioning, writing, +- and drawing is always done relative to a page, so a 'p' command +- must be issued before any of these commands. +- +-'s N' +- Set point size to N scaled points (this is unit 'z'). AT&T 'troff' +- used the unit points ('p') instead. *Note Output Language +- Compatibility::. +- +-'t XXX' +-'t XXX DUMMY-ARG' +- Print a word, i.e., a sequence of characters XXX representing +- output glyphs which names are single characters, terminated by a +- space character or a line break; an optional second integer +- argument is ignored (this allows the formatter to generate an even +- number of arguments). The first glyph should be printed at the +- current position, the current horizontal position should then be +- increased by the width of the first glyph, and so on for each +- glyph. The widths of the glyphs are read from the font file, +- scaled for the current point size, and rounded to a multiple of the +- horizontal resolution. Special characters cannot be printed using +- this command (use the 'C' command for special characters). This +- command is a 'gtroff' extension; it is only used for devices whose +- 'DESC' file contains the 'tcommand' keyword (*note DESC File +- Format::). +- +-'u N XXX' +- Print word with track kerning. This is the same as the 't' command +- except that after printing each glyph, the current horizontal +- position is increased by the sum of the width of that glyph and N +- (an integer in basic units 'u'). This command is a 'gtroff' +- extension; it is only used for devices whose 'DESC' file contains +- the 'tcommand' keyword (*note DESC File Format::). +- +-'V N' +- Move down to the absolute vertical position N (a non-negative +- integer in basic units 'u') relative to upper edge of current page. +- +-'v N' +- Move N basic units 'u' down (N is a non-negative integer). The +- original UNIX troff manual allows negative values for N also, but +- 'gtroff' doesn't use this. +- +-'w' +- Informs about a paddable white space to increase readability. The +- spacing itself must be performed explicitly by a move command. +- +- +-File: groff.info, Node: Simple Commands-Footnotes, Up: Simple Commands +- +- (1) 'c' is actually a misnomer since it outputs a glyph. +- +- +-File: groff.info, Node: Graphics Commands, Next: Device Control Commands, Prev: Simple Commands, Up: Command Reference +- +-8.1.2.3 Graphics Commands +-......................... +- +-Each graphics or drawing command in the intermediate output starts with +-the letter 'D', followed by one or two characters that specify a +-subcommand; this is followed by a fixed or variable number of integer +-arguments that are separated by a single space character. A 'D' command +-may not be followed by another command on the same line (apart from a +-comment), so each 'D' command is terminated by a syntactical line break. +- +- 'gtroff' output follows the classical spacing rules (no space between +-command and subcommand, all arguments are preceded by a single space +-character), but the parser allows optional space between the command +-letters and makes the space before the first argument optional. As +-usual, each space can be any sequence of tab and space characters. +- +- Some graphics commands can take a variable number of arguments. In +-this case, they are integers representing a size measured in basic units +-'u'. The arguments called H1, H2, ..., HN stand for horizontal +-distances where positive means right, negative left. The arguments +-called V1, V2, ..., VN stand for vertical distances where positive means +-down, negative up. All these distances are offsets relative to the +-current location. +- +- Each graphics command directly corresponds to a similar 'gtroff' '\D' +-escape sequence. *Note Drawing Requests::. +- +- Unknown 'D' commands are assumed to be device-specific. Its +-arguments are parsed as strings; the whole information is then sent to +-the postprocessor. +- +- In the following command reference, the syntax element +-means a syntactical line break as defined above. +- +-'D~ H1 V1 H2 V2 ... HN VN' +- Draw B-spline from current position to offset (H1,V1), then to +- offset (H2,V2), if given, etc. up to (HN,VN). This command takes a +- variable number of argument pairs; the current position is moved to +- the terminal point of the drawn curve. +- +-'Da H1 V1 H2 V2' +- Draw arc from current position to (H1,V1)+(H2,V2) with center at +- (H1,V1); then move the current position to the final point of the +- arc. +- +-'DC D' +-'DC D DUMMY-ARG' +- Draw a solid circle using the current fill color with diameter D +- (integer in basic units 'u') with leftmost point at the current +- position; then move the current position to the rightmost point of +- the circle. An optional second integer argument is ignored (this +- allows the formatter to generate an even number of arguments). +- This command is a 'gtroff' extension. +- +-'Dc D' +- Draw circle line with diameter D (integer in basic units 'u') with +- leftmost point at the current position; then move the current +- position to the rightmost point of the circle. +- +-'DE H V' +- Draw a solid ellipse in the current fill color with a horizontal +- diameter of H and a vertical diameter of V (both integers in basic +- units 'u') with the leftmost point at the current position; then +- move to the rightmost point of the ellipse. This command is a +- 'gtroff' extension. +- +-'De H V' +- Draw an outlined ellipse with a horizontal diameter of H and a +- vertical diameter of V (both integers in basic units 'u') with the +- leftmost point at current position; then move to the rightmost +- point of the ellipse. +- +-'DF COLOR-SCHEME [COMPONENT ...]' +- Set fill color for solid drawing objects using different color +- schemes; the analoguous command for setting the color of text, line +- graphics, and the outline of graphic objects is 'm'. The color +- components are specified as integer arguments between 0 and 65536. +- The number of color components and their meaning vary for the +- different color schemes. These commands are generated by +- 'gtroff''s escape sequences '\D'F ...'' and '\M' (with no other +- corresponding graphics commands). No position changing. This +- command is a 'gtroff' extension. +- +- 'DFc CYAN MAGENTA YELLOW' +- Set fill color for solid drawing objects using the CMY color +- scheme, having the 3 color components CYAN, MAGENTA, and +- YELLOW. +- +- 'DFd' +- Set fill color for solid drawing objects to the default fill +- color value (black in most cases). No component arguments. +- +- 'DFg GRAY' +- Set fill color for solid drawing objects to the shade of gray +- given by the argument, an integer between 0 (black) and 65536 +- (white). +- +- 'DFk CYAN MAGENTA YELLOW BLACK' +- Set fill color for solid drawing objects using the CMYK color +- scheme, having the 4 color components CYAN, MAGENTA, YELLOW, +- and BLACK. +- +- 'DFr RED GREEN BLUE' +- Set fill color for solid drawing objects using the RGB color +- scheme, having the 3 color components RED, GREEN, and BLUE. +- +-'Df N' +- The argument N must be an integer in the range -32767 to 32767. +- +- 0 <= N <= 1000 +- Set the color for filling solid drawing objects to a shade of +- gray, where 0 corresponds to solid white, 1000 (the default) +- to solid black, and values in between to intermediate shades +- of gray; this is obsoleted by command 'DFg'. +- +- N < 0 or N > 1000 +- Set the filling color to the color that is currently being +- used for the text and the outline, see command 'm'. For +- example, the command sequence +- +- mg 0 0 65536 +- Df -1 +- +- sets all colors to blue. +- +- No position changing. This command is a 'gtroff' extension. +- +-'Dl H V' +- Draw line from current position to offset (H,V) (integers in basic +- units 'u'); then set current position to the end of the drawn line. +- +-'Dp H1 V1 H2 V2 ... HN VN' +- Draw a polygon line from current position to offset (H1,V1), from +- there to offset (H2,V2), etc. up to offset (HN,VN), and from there +- back to the starting position. For historical reasons, the +- position is changed by adding the sum of all arguments with odd +- index to the actual horizontal position and the even ones to the +- vertical position. Although this doesn't make sense it is kept for +- compatibility. This command is a 'gtroff' extension. +- +-'Dp H1 V1 H2 V2 ... HN VN' +- Draw a solid polygon in the current fill color rather than an +- outlined polygon, using the same arguments and positioning as the +- corresponding 'Dp' command. This command is a 'gtroff' extension. +- +-'Dt N' +- Set the current line thickness to N (an integer in basic units 'u') +- if N>0; if N=0 select the smallest available line thickness; if N<0 +- set the line thickness proportional to the point size (this is the +- default before the first 'Dt' command was specified). For +- historical reasons, the horizontal position is changed by adding +- the argument to the actual horizontal position, while the vertical +- position is not changed. Although this doesn't make sense it is +- kept for compatibility. This command is a 'gtroff' extension. +- +- +-File: groff.info, Node: Device Control Commands, Next: Obsolete Command, Prev: Graphics Commands, Up: Command Reference +- +-8.1.2.4 Device Control Commands +-............................... +- +-Each device control command starts with the letter 'x', followed by a +-space character (optional or arbitrary space or tab in 'gtroff') and a +-subcommand letter or word; each argument (if any) must be preceded by a +-syntactical space. All 'x' commands are terminated by a syntactical +-line break; no device control command can be followed by another command +-on the same line (except a comment). +- +- The subcommand is basically a single letter, but to increase +-readability, it can be written as a word, i.e., an arbitrary sequence of +-characters terminated by the next tab, space, or newline character. All +-characters of the subcommand word but the first are simply ignored. For +-example, 'gtroff' outputs the initialization command 'x i' as 'x init' +-and the resolution command 'x r' as 'x res'. +- +- In the following, the syntax element means a syntactical +-line break (*note Separation::). +- +-'xF NAME' +- The 'F' stands for FILENAME. +- +- Use NAME as the intended name for the current file in error +- reports. This is useful for remembering the original file name +- when 'gtroff' uses an internal piping mechanism. The input file is +- not changed by this command. This command is a 'gtroff' extension. +- +-'xf N S' +- The 'f' stands for FONT. +- +- Mount font position N (a non-negative integer) with font named S (a +- text word). *Note Font Positions::. +- +-'xH N' +- The 'H' stands for HEIGHT. +- +- Set glyph height to N (a positive integer in scaled points 'z'). +- AT&T 'troff' uses the unit points ('p') instead. *Note Output +- Language Compatibility::. +- +-'xi' +- The 'i' stands for INIT. +- +- Initialize device. This is the third command of the prologue. +- +-'xp' +- The 'p' stands for PAUSE. +- +- Parsed but ignored. The original UNIX troff manual writes +- +- pause device, can be restarted +- +-'xr N H V' +- The 'r' stands for RESOLUTION. +- +- Resolution is N, while H is the minimal horizontal motion, and V +- the minimal vertical motion possible with this device; all +- arguments are positive integers in basic units 'u' per inch. This +- is the second command of the prologue. +- +-'xS N' +- The 'S' stands for SLANT. +- +- Set slant to N (an integer in basic units 'u'). +- +-'xs' +- The 's' stands for STOP. +- +- Terminates the processing of the current file; issued as the last +- command of any intermediate troff output. +- +-'xt' +- The 't' stands for TRAILER. +- +- Generate trailer information, if any. In GTROFF, this is actually +- just ignored. +- +-'xT XXX' +- The 'T' stands for TYPESETTER. +- +- Set name of device to word XXX, a sequence of characters ended by +- the next white space character. The possible device names coincide +- with those from the 'groff' '-T' option. This is the first command +- of the prologue. +- +-'xu N' +- The 'u' stands for UNDERLINE. +- +- Configure underlining of spaces. If N is 1, start underlining of +- spaces; if N is 0, stop underlining of spaces. This is needed for +- the 'cu' request in nroff mode and is ignored otherwise. This +- command is a 'gtroff' extension. +- +-'xX ANYTHING' +- The 'x' stands for X-ESCAPE. +- +- Send string ANYTHING uninterpreted to the device. If the line +- following this command starts with a '+' character this line is +- interpreted as a continuation line in the following sense. The '+' +- is ignored, but a newline character is sent instead to the device, +- the rest of the line is sent uninterpreted. The same applies to +- all following lines until the first character of a line is not a +- '+' character. This command is generated by the 'gtroff' escape +- sequence '\X'. The line-continuing feature is a 'gtroff' +- extension. +- +- +-File: groff.info, Node: Obsolete Command, Prev: Device Control Commands, Up: Command Reference +- +-8.1.2.5 Obsolete Command +-........................ +- +-In AT&T 'troff' output, the writing of a single glyph is mostly done by +-a very strange command that combines a horizontal move and a single +-character giving the glyph name. It doesn't have a command code, but is +-represented by a 3-character argument consisting of exactly 2 digits and +-a character. +- +-DDG +- Move right DD (exactly two decimal digits) basic units 'u', then +- print glyph G (represented as a single character). +- +- In 'gtroff', arbitrary syntactical space around and within this +- command is allowed to be added. Only when a preceding command on +- the same line ends with an argument of variable length a separating +- space is obligatory. In AT&T 'troff', large clusters of these and +- other commands are used, mostly without spaces; this made such +- output almost unreadable. +- +- For modern high-resolution devices, this command does not make sense +-because the width of the glyphs can become much larger than two decimal +-digits. In 'gtroff', this is only used for the devices 'X75', 'X75-12', +-'X100', and 'X100-12'. For other devices, the commands 't' and 'u' +-provide a better functionality. +- +- +-File: groff.info, Node: Intermediate Output Examples, Next: Output Language Compatibility, Prev: Command Reference, Up: gtroff Output +- +-8.1.3 Intermediate Output Examples +----------------------------------- +- +-This section presents the intermediate output generated from the same +-input for three different devices. The input is the sentence 'hell +-world' fed into 'gtroff' on the command line. +- +-High-resolution device 'ps' +- +- This is the standard output of 'gtroff' if no '-T' option is given. +- +- shell> echo "hell world" | groff -Z -T ps +- +- x T ps +- x res 72000 1 1 +- x init +- p1 +- x font 5 TR +- f5 +- s10000 +- V12000 +- H72000 +- thell +- wh2500 +- tw +- H96620 +- torld +- n12000 0 +- x trailer +- V792000 +- x stop +- +- This output can be fed into 'grops' to get its representation as a +- POSTSCRIPT file. +- +-Low-resolution device 'latin1' +- +- This is similar to the high-resolution device except that the +- positioning is done at a minor scale. Some comments (lines +- starting with '#') were added for clarification; they were not +- generated by the formatter. +- +- shell> echo "hell world" | groff -Z -T latin1 +- +- # prologue +- x T latin1 +- x res 240 24 40 +- x init +- # begin a new page +- p1 +- # font setup +- x font 1 R +- f1 +- s10 +- # initial positioning on the page +- V40 +- H0 +- # write text `hell' +- thell +- # inform about space, and issue a horizontal jump +- wh24 +- # write text `world' +- tworld +- # announce line break, but do nothing because ... +- n40 0 +- # ... the end of the document has been reached +- x trailer +- V2640 +- x stop +- +- This output can be fed into 'grotty' to get a formatted text +- document. +- +-AT&T 'troff' output +- Since a computer monitor has a very low resolution compared to +- modern printers the intermediate output for the X Window devices +- can use the jump-and-write command with its 2-digit displacements. +- +- shell> echo "hell world" | groff -Z -T X100 +- +- x T X100 +- x res 100 1 1 +- x init +- p1 +- x font 5 TR +- f5 +- s10 +- V16 +- H100 +- # write text with jump-and-write commands +- ch07e07l03lw06w11o07r05l03dh7 +- n16 0 +- x trailer +- V1100 +- x stop +- +- This output can be fed into 'xditview' or 'gxditview' for +- displaying in X. +- +- Due to the obsolete jump-and-write command, the text clusters in +- the AT&T 'troff' output are almost unreadable. +- +- +-File: groff.info, Node: Output Language Compatibility, Prev: Intermediate Output Examples, Up: gtroff Output +- +-8.1.4 Output Language Compatibility +------------------------------------ +- +-The intermediate output language of AT&T 'troff' was first documented in +-the UNIX troff manual, with later additions documented in 'A +-Typesetter-indenpendent TROFF', written by Brian Kernighan. +- +- The 'gtroff' intermediate output format is compatible with this +-specification except for the following features. +- +- * The classical quasi device independence is not yet implemented. +- +- * The old hardware was very different from what we use today. So the +- 'groff' devices are also fundamentally different from the ones in +- AT&T 'troff'. For example, the AT&T POSTSCRIPT device is called +- 'post' and has a resolution of only 720 units per inch, suitable +- for printers 20 years ago, while 'groff''s 'ps' device has a +- resolution of 72000 units per inch. Maybe, by implementing some +- rescaling mechanism similar to the classical quasi device +- independence, 'groff' could emulate AT&T's 'post' device. +- +- * The B-spline command 'D~' is correctly handled by the intermediate +- output parser, but the drawing routines aren't implemented in some +- of the postprocessor programs. +- +- * The argument of the commands 's' and 'x H' has the implicit unit +- scaled point 'z' in 'gtroff', while AT&T 'troff' has point ('p'). +- This isn't an incompatibility but a compatible extension, for both +- units coincide for all devices without a 'sizescale' parameter in +- the 'DESC' file, including all postprocessors from AT&T and +- 'groff''s text devices. The few 'groff' devices with a 'sizescale' +- parameter either do not exist for AT&T 'troff', have a different +- name, or seem to have a different resolution. So conflicts are +- very unlikely. +- +- * The position changing after the commands 'Dp', 'DP', and 'Dt' is +- illogical, but as old versions of 'gtroff' used this feature it is +- kept for compatibility reasons. +- +- +-File: groff.info, Node: Font Files, Prev: gtroff Output, Up: File formats +- +-8.2 Font Files +-============== +- +-The 'gtroff' font format is roughly a superset of the 'ditroff' font +-format (as used in later versions of AT&T 'troff' and its descendants). +-Unlike the 'ditroff' font format, there is no associated binary format; +-all files are text files.(1) (*note Font Files-Footnote-1::) The font +-files for device NAME are stored in a directory 'devNAME'. There are +-two types of file: a device description file called 'DESC' and for each +-font F a font file called 'F'. +- +-* Menu: +- +-* DESC File Format:: +-* Font File Format:: +- +- +-File: groff.info, Node: Font Files-Footnotes, Up: Font Files +- +- (1) Plan 9 'troff' has also abandoned the binary format. +- +- +-File: groff.info, Node: DESC File Format, Next: Font File Format, Prev: Font Files, Up: Font Files +- +-8.2.1 'DESC' File Format +------------------------- +- +-The 'DESC' file can contain the following types of line. Except for the +-'charset' keyword, which must comes last (if at all), the order of the +-lines is not important. Later entries in the file, however, override +-previous values. +- +-'charset' +- This line and everything following in the file are ignored. It is +- allowed for the sake of backwards compatibility. +- +-'family FAM' +- The default font family is FAM. +- +-'fonts N F1 F2 F3 ... FN' +- Fonts F1 ... FN are mounted in the font positions M+1, ..., M+N +- where M is the number of styles. This command may extend over more +- than one line. A font name of 0 means no font is mounted on the +- corresponding font position. +- +-'hor N' +- The horizontal resolution is N machine units. All horizontal +- quantities are rounded to be multiples of this value. +- +-'image_generator STRING' +- Needed for 'grohtml' only. It specifies the program to generate +- PNG images from POSTSCRIPT input. Under GNU/Linux this is usually +- 'gs' but under other systems (notably cygwin) it might be set to +- another name. +- +-'paperlength N' +- The physical vertical dimension of the output medium in machine +- units. This isn't used by 'troff' itself but by output devices. +- Deprecated. Use 'papersize' instead. +- +-'papersize STRING ...' +- Select a paper size. Valid values for STRING are the ISO paper +- types 'A0'-'A7', 'B0'-'B7', 'C0'-'C7', 'D0'-'D7', 'DL', and the US +- paper types 'letter', 'legal', 'tabloid', 'ledger', 'statement', +- 'executive', 'com10', and 'monarch'. Case is not significant for +- STRING if it holds predefined paper types. Alternatively, STRING +- can be a file name (e.g. '/etc/papersize'); if the file can be +- opened, 'groff' reads the first line and tests for the above paper +- sizes. Finally, STRING can be a custom paper size in the format +- 'LENGTH,WIDTH' (no spaces before and after the comma). Both LENGTH +- and WIDTH must have a unit appended; valid values are 'i' for +- inches, 'C' for centimeters, 'p' for points, and 'P' for picas. +- Example: '12c,235p'. An argument that starts with a digit is +- always treated as a custom paper format. 'papersize' sets both the +- vertical and horizontal dimension of the output medium. +- +- More than one argument can be specified; 'groff' scans from left to +- right and uses the first valid paper specification. +- +-'paperwidth N' +- The physical horizontal dimension of the output medium in machine +- units. This isn't used by 'troff' itself but by output devices. +- Deprecated. Use 'papersize' instead. +- +-'pass_filenames' +- Tell 'gtroff' to emit the name of the source file currently being +- processed. This is achieved by the intermediate output command +- 'F'. Currently, this is only used by the 'grohtml' output device. +- +-'postpro PROGRAM' +- Call PROGRAM as a postprocessor. For example, the line +- +- postpro grodvi +- +- in the file 'devdvi/DESC' makes 'groff' call 'grodvi' if option +- '-Tdvi' is given (and '-Z' isn't used). +- +-'prepro PROGRAM' +- Call PROGRAM as a preprocessor. Currently, this keyword is used by +- 'groff' with option '-Thtml' or '-Txhtml' only. +- +-'print PROGRAM' +- Use PROGRAM as a spooler program for printing. If omitted, the +- '-l' and '-L' options of 'groff' are ignored. +- +-'res N' +- There are N machine units per inch. +- +-'sizes S1 S2 ... SN 0' +- This means that the device has fonts at S1, S2, ... SN scaled +- points. The list of sizes must be terminated by 0 (this is digit +- zero). Each SI can also be a range of sizes M-N. The list can +- extend over more than one line. +- +-'sizescale N' +- The scale factor for point sizes. By default this has a value +- of 1. One scaled point is equal to one point/N. The arguments to +- the 'unitwidth' and 'sizes' commands are given in scaled points. +- *Note Fractional Type Sizes::, for more information. +- +-'styles S1 S2 ... SM' +- The first M font positions are associated with styles S1 ... SM. +- +-'tcommand' +- This means that the postprocessor can handle the 't' and 'u' +- intermediate output commands. +- +-'unicode' +- Indicate that the output device supports the complete Unicode +- repertoire. Useful only for devices that produce _character +- entities_ instead of glyphs. +- +- If 'unicode' is present, no 'charset' section is required in the +- font description files since the Unicode handling built into +- 'groff' is used. However, if there are entries in a 'charset' +- section, they either override the default mappings for those +- particular characters or add new mappings (normally for composite +- characters). +- +- This is used for '-Tutf8', '-Thtml', and '-Txhtml'. +- +-'unitwidth N' +- Quantities in the font files are given in machine units for fonts +- whose point size is N scaled points. +- +-'unscaled_charwidths' +- Make the font handling module always return unscaled character +- widths. Needed for the 'grohtml' device. +- +-'use_charnames_in_special' +- This command indicates that 'gtroff' should encode special +- characters inside special commands. Currently, this is only used +- by the 'grohtml' output device. *Note Postprocessor Access::. +- +-'vert N' +- The vertical resolution is N machine units. All vertical +- quantities are rounded to be multiples of this value. +- +- The 'res', 'unitwidth', 'fonts', and 'sizes' lines are mandatory. +-Other commands are ignored by 'gtroff' but may be used by postprocessors +-to store arbitrary information about the device in the 'DESC' file. +- +- Here a list of obsolete keywords that are recognized by 'groff' but +-completely ignored: 'spare1', 'spare2', 'biggestfont'. +- +- +-File: groff.info, Node: Font File Format, Prev: DESC File Format, Up: Font Files +- +-8.2.2 Font File Format +----------------------- +- +-A "font file", also (and probably better) called a "font description +-file", has two sections. The first section is a sequence of lines each +-containing a sequence of blank delimited words; the first word in the +-line is a key, and subsequent words give a value for that key. +- +-'name F' +- The name of the font is F. +- +-'spacewidth N' +- The normal width of a space is N. +- +-'slant N' +- The glyphs of the font have a slant of N degrees. (Positive means +- forward.) +- +-'ligatures LIG1 LIG2 ... LIGN [0]' +- Glyphs LIG1, LIG2, ..., LIGN are ligatures; possible ligatures are +- 'ff', 'fi', 'fl', 'ffi' and 'ffl'. For backwards compatibility, +- the list of ligatures may be terminated with a 0. The list of +- ligatures may not extend over more than one line. +- +-'special' +- The font is "special"; this means that when a glyph is requested +- that is not present in the current font, it is searched for in any +- special fonts that are mounted. +- +- Other commands are ignored by 'gtroff' but may be used by +-postprocessors to store arbitrary information about the font in the font +-file. +- +- The first section can contain comments, which start with the '#' +-character and extend to the end of a line. +- +- The second section contains one or two subsections. It must contain +-a 'charset' subsection and it may also contain a 'kernpairs' subsection. +-These subsections can appear in any order. Each subsection starts with +-a word on a line by itself. +- +- The word 'charset' starts the character set subsection.(1) (*note +-Font File Format-Footnote-1::) The 'charset' line is followed by a +-sequence of lines. Each line gives information for one glyph. A line +-comprises a number of fields separated by blanks or tabs. The format is +- +- NAME METRICS TYPE CODE [ENTITY-NAME] ['--' COMMENT] +- +-NAME identifies the glyph name(2) (*note Font File Format-Footnote-2::): +-If NAME is a single character C then it corresponds to the 'gtroff' +-input character C; if it is of the form '\C' where C is a single +-character, then it corresponds to the special character '\[C]'; +-otherwise it corresponds to the special character '\[NAME]'. If it is +-exactly two characters XX it can be entered as '\(XX'. Note that +-single-letter special characters can't be accessed as '\C'; the only +-exception is '\-', which is identical to '\[-]'. +- +- 'gtroff' supports 8-bit input characters; however some utilities have +-difficulties with eight-bit characters. For this reason, there is a +-convention that the entity name 'charN' is equivalent to the single +-input character whose code is N. For example, 'char163' would be +-equivalent to the character with code 163, which is the pounds sterling +-sign in the ISO Latin-1 character set. You shouldn't use 'charN' +-entities in font description files since they are related to input, not +-output. Otherwise, you get hard-coded connections between input and +-output encoding, which prevents use of different (input) character sets. +- +- The name '---' is special and indicates that the glyph is unnamed; +-such glyphs can only be used by means of the '\N' escape sequence in +-'gtroff'. +- +- The TYPE field gives the glyph type: +- +-'1' +- the glyph has a descender, for example, 'p'; +- +-'2' +- the glyph has an ascender, for example, 'b'; +- +-'3' +- the glyph has both an ascender and a descender, for example, '('. +- +- The CODE field gives the code that the postprocessor uses to print +-the glyph. The glyph can also be input to 'gtroff' using this code by +-means of the '\N' escape sequence. CODE can be any integer. If it +-starts with '0' it is interpreted as octal; if it starts with '0x' or +-'0X' it is interpreted as hexadecimal. Note, however, that the '\N' +-escape sequence only accepts a decimal integer. +- +- The ENTITY-NAME field gives an ASCII string identifying the glyph +-that the postprocessor uses to print the 'gtroff' glyph NAME. This +-field is optional and has been introduced so that the 'grohtml' device +-driver can encode its character set. For example, the glyph '\[Po]' is +-represented as '£' in HTML 4.0. +- +- Anything on the line after the ENTITY-NAME field resp. after '--' is +-ignored. +- +- The METRICS field has the form: +- +- WIDTH[','HEIGHT[','DEPTH[','ITALIC-CORRECTION +- [','LEFT-ITALIC-CORRECTION[','SUBSCRIPT-CORRECTION]]]]] +- +-There must not be any spaces between these subfields (it has been split +-here into two lines for better legibility only). Missing subfields are +-assumed to be 0. The subfields are all decimal integers. Since there +-is no associated binary format, these values are not required to fit +-into a variable of type 'char' as they are in 'ditroff'. The WIDTH +-subfield gives the width of the glyph. The HEIGHT subfield gives the +-height of the glyph (upwards is positive); if a glyph does not extend +-above the baseline, it should be given a zero height, rather than a +-negative height. The DEPTH subfield gives the depth of the glyph, that +-is, the distance from the baseline to the lowest point below the +-baseline to which the glyph extends (downwards is positive); if a glyph +-does not extend below the baseline, it should be given a zero depth, +-rather than a negative depth. The ITALIC-CORRECTION subfield gives the +-amount of space that should be added after the glyph when it is +-immediately to be followed by a glyph from a roman font. The +-LEFT-ITALIC-CORRECTION subfield gives the amount of space that should be +-added before the glyph when it is immediately to be preceded by a glyph +-from a roman font. The SUBSCRIPT-CORRECTION gives the amount of space +-that should be added after a glyph before adding a subscript. This +-should be less than the italic correction. +- +- A line in the 'charset' section can also have the format +- +- NAME " +- +-This indicates that NAME is just another name for the glyph mentioned in +-the preceding line. +- +- The word 'kernpairs' starts the kernpairs section. This contains a +-sequence of lines of the form: +- +- C1 C2 N +- +-This means that when glyph C1 appears next to glyph C2 the space between +-them should be increased by N. Most entries in the kernpairs section +-have a negative value for N. +- +- +-File: groff.info, Node: Font File Format-Footnotes, Up: Font File Format +- +- (1) This keyword is misnamed since it starts a list of ordered +-glyphs, not characters. +- +- (2) The distinction between input, characters, and output, glyphs, is +-not clearly separated in the terminology of 'groff'; for example, the +-'char' request should be called 'glyph' since it defines an output +-entity. +- +- +-File: groff.info, Node: Installation, Next: Copying This Manual, Prev: File formats, Up: Top +- +-9 Installation +-************** +- +- +-File: groff.info, Node: Copying This Manual, Next: Request Index, Prev: Installation, Up: Top +- +-Appendix A Copying This Manual +-****************************** +- +- Version 1.3, 3 November 2008 +- +- Copyright 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +- +- +- Everyone is permitted to copy and distribute verbatim copies +- of this license document, but changing it is not allowed. +- +- 0. PREAMBLE +- +- The purpose of this License is to make a manual, textbook, or other +- functional and useful document "free" in the sense of freedom: to +- assure everyone the effective freedom to copy and redistribute it, +- with or without modifying it, either commercially or +- noncommercially. Secondarily, this License preserves for the +- author and publisher a way to get credit for their work, while not +- being considered responsible for modifications made by others. +- +- This License is a kind of "copyleft", which means that derivative +- works of the document must themselves be free in the same sense. +- It complements the GNU General Public License, which is a copyleft +- license designed for free software. +- +- We have designed this License in order to use it for manuals for +- free software, because free software needs free documentation: a +- free program should come with manuals providing the same freedoms +- that the software does. But this License is not limited to +- software manuals; it can be used for any textual work, regardless +- of subject matter or whether it is published as a printed book. We +- recommend this License principally for works whose purpose is +- instruction or reference. +- +- 1. APPLICABILITY AND DEFINITIONS +- +- This License applies to any manual or other work, in any medium, +- that contains a notice placed by the copyright holder saying it can +- be distributed under the terms of this License. Such a notice +- grants a world-wide, royalty-free license, unlimited in duration, +- to use that work under the conditions stated herein. The +- "Document", below, refers to any such manual or work. Any member +- of the public is a licensee, and is addressed as "you". You accept +- the license if you copy, modify or distribute the work in a way +- requiring permission under copyright law. +- +- A "Modified Version" of the Document means any work containing the +- Document or a portion of it, either copied verbatim, or with +- modifications and/or translated into another language. +- +- A "Secondary Section" is a named appendix or a front-matter section +- of the Document that deals exclusively with the relationship of the +- publishers or authors of the Document to the Document's overall +- subject (or to related matters) and contains nothing that could +- fall directly within that overall subject. (Thus, if the Document +- is in part a textbook of mathematics, a Secondary Section may not +- explain any mathematics.) The relationship could be a matter of +- historical connection with the subject or with related matters, or +- of legal, commercial, philosophical, ethical or political position +- regarding them. +- +- The "Invariant Sections" are certain Secondary Sections whose +- titles are designated, as being those of Invariant Sections, in the +- notice that says that the Document is released under this License. +- If a section does not fit the above definition of Secondary then it +- is not allowed to be designated as Invariant. The Document may +- contain zero Invariant Sections. If the Document does not identify +- any Invariant Sections then there are none. +- +- The "Cover Texts" are certain short passages of text that are +- listed, as Front-Cover Texts or Back-Cover Texts, in the notice +- that says that the Document is released under this License. A +- Front-Cover Text may be at most 5 words, and a Back-Cover Text may +- be at most 25 words. +- +- A "Transparent" copy of the Document means a machine-readable copy, +- represented in a format whose specification is available to the +- general public, that is suitable for revising the document +- straightforwardly with generic text editors or (for images composed +- of pixels) generic paint programs or (for drawings) some widely +- available drawing editor, and that is suitable for input to text +- formatters or for automatic translation to a variety of formats +- suitable for input to text formatters. A copy made in an otherwise +- Transparent file format whose markup, or absence of markup, has +- been arranged to thwart or discourage subsequent modification by +- readers is not Transparent. An image format is not Transparent if +- used for any substantial amount of text. A copy that is not +- "Transparent" is called "Opaque". +- +- Examples of suitable formats for Transparent copies include plain +- ASCII without markup, Texinfo input format, LaTeX input format, +- SGML or XML using a publicly available DTD, and standard-conforming +- simple HTML, PostScript or PDF designed for human modification. +- Examples of transparent image formats include PNG, XCF and JPG. +- Opaque formats include proprietary formats that can be read and +- edited only by proprietary word processors, SGML or XML for which +- the DTD and/or processing tools are not generally available, and +- the machine-generated HTML, PostScript or PDF produced by some word +- processors for output purposes only. +- +- The "Title Page" means, for a printed book, the title page itself, +- plus such following pages as are needed to hold, legibly, the +- material this License requires to appear in the title page. For +- works in formats which do not have any title page as such, "Title +- Page" means the text near the most prominent appearance of the +- work's title, preceding the beginning of the body of the text. +- +- The "publisher" means any person or entity that distributes copies +- of the Document to the public. +- +- A section "Entitled XYZ" means a named subunit of the Document +- whose title either is precisely XYZ or contains XYZ in parentheses +- following text that translates XYZ in another language. (Here XYZ +- stands for a specific section name mentioned below, such as +- "Acknowledgements", "Dedications", "Endorsements", or "History".) +- To "Preserve the Title" of such a section when you modify the +- Document means that it remains a section "Entitled XYZ" according +- to this definition. +- +- The Document may include Warranty Disclaimers next to the notice +- which states that this License applies to the Document. These +- Warranty Disclaimers are considered to be included by reference in +- this License, but only as regards disclaiming warranties: any other +- implication that these Warranty Disclaimers may have is void and +- has no effect on the meaning of this License. +- +- 2. VERBATIM COPYING +- +- You may copy and distribute the Document in any medium, either +- commercially or noncommercially, provided that this License, the +- copyright notices, and the license notice saying this License +- applies to the Document are reproduced in all copies, and that you +- add no other conditions whatsoever to those of this License. You +- may not use technical measures to obstruct or control the reading +- or further copying of the copies you make or distribute. However, +- you may accept compensation in exchange for copies. If you +- distribute a large enough number of copies you must also follow the +- conditions in section 3. +- +- You may also lend copies, under the same conditions stated above, +- and you may publicly display copies. +- +- 3. COPYING IN QUANTITY +- +- If you publish printed copies (or copies in media that commonly +- have printed covers) of the Document, numbering more than 100, and +- the Document's license notice requires Cover Texts, you must +- enclose the copies in covers that carry, clearly and legibly, all +- these Cover Texts: Front-Cover Texts on the front cover, and +- Back-Cover Texts on the back cover. Both covers must also clearly +- and legibly identify you as the publisher of these copies. The +- front cover must present the full title with all words of the title +- equally prominent and visible. You may add other material on the +- covers in addition. Copying with changes limited to the covers, as +- long as they preserve the title of the Document and satisfy these +- conditions, can be treated as verbatim copying in other respects. +- +- If the required texts for either cover are too voluminous to fit +- legibly, you should put the first ones listed (as many as fit +- reasonably) on the actual cover, and continue the rest onto +- adjacent pages. +- +- If you publish or distribute Opaque copies of the Document +- numbering more than 100, you must either include a machine-readable +- Transparent copy along with each Opaque copy, or state in or with +- each Opaque copy a computer-network location from which the general +- network-using public has access to download using public-standard +- network protocols a complete Transparent copy of the Document, free +- of added material. If you use the latter option, you must take +- reasonably prudent steps, when you begin distribution of Opaque +- copies in quantity, to ensure that this Transparent copy will +- remain thus accessible at the stated location until at least one +- year after the last time you distribute an Opaque copy (directly or +- through your agents or retailers) of that edition to the public. +- +- It is requested, but not required, that you contact the authors of +- the Document well before redistributing any large number of copies, +- to give them a chance to provide you with an updated version of the +- Document. +- +- 4. MODIFICATIONS +- +- You may copy and distribute a Modified Version of the Document +- under the conditions of sections 2 and 3 above, provided that you +- release the Modified Version under precisely this License, with the +- Modified Version filling the role of the Document, thus licensing +- distribution and modification of the Modified Version to whoever +- possesses a copy of it. In addition, you must do these things in +- the Modified Version: +- +- A. Use in the Title Page (and on the covers, if any) a title +- distinct from that of the Document, and from those of previous +- versions (which should, if there were any, be listed in the +- History section of the Document). You may use the same title +- as a previous version if the original publisher of that +- version gives permission. +- +- B. List on the Title Page, as authors, one or more persons or +- entities responsible for authorship of the modifications in +- the Modified Version, together with at least five of the +- principal authors of the Document (all of its principal +- authors, if it has fewer than five), unless they release you +- from this requirement. +- +- C. State on the Title page the name of the publisher of the +- Modified Version, as the publisher. +- +- D. Preserve all the copyright notices of the Document. +- +- E. Add an appropriate copyright notice for your modifications +- adjacent to the other copyright notices. +- +- F. Include, immediately after the copyright notices, a license +- notice giving the public permission to use the Modified +- Version under the terms of this License, in the form shown in +- the Addendum below. +- +- G. Preserve in that license notice the full lists of Invariant +- Sections and required Cover Texts given in the Document's +- license notice. +- +- H. Include an unaltered copy of this License. +- +- I. Preserve the section Entitled "History", Preserve its Title, +- and add to it an item stating at least the title, year, new +- authors, and publisher of the Modified Version as given on the +- Title Page. If there is no section Entitled "History" in the +- Document, create one stating the title, year, authors, and +- publisher of the Document as given on its Title Page, then add +- an item describing the Modified Version as stated in the +- previous sentence. +- +- J. Preserve the network location, if any, given in the Document +- for public access to a Transparent copy of the Document, and +- likewise the network locations given in the Document for +- previous versions it was based on. These may be placed in the +- "History" section. You may omit a network location for a work +- that was published at least four years before the Document +- itself, or if the original publisher of the version it refers +- to gives permission. +- +- K. For any section Entitled "Acknowledgements" or "Dedications", +- Preserve the Title of the section, and preserve in the section +- all the substance and tone of each of the contributor +- acknowledgements and/or dedications given therein. +- +- L. Preserve all the Invariant Sections of the Document, unaltered +- in their text and in their titles. Section numbers or the +- equivalent are not considered part of the section titles. +- +- M. Delete any section Entitled "Endorsements". Such a section +- may not be included in the Modified Version. +- +- N. Do not retitle any existing section to be Entitled +- "Endorsements" or to conflict in title with any Invariant +- Section. +- +- O. Preserve any Warranty Disclaimers. +- +- If the Modified Version includes new front-matter sections or +- appendices that qualify as Secondary Sections and contain no +- material copied from the Document, you may at your option designate +- some or all of these sections as invariant. To do this, add their +- titles to the list of Invariant Sections in the Modified Version's +- license notice. These titles must be distinct from any other +- section titles. +- +- You may add a section Entitled "Endorsements", provided it contains +- nothing but endorsements of your Modified Version by various +- parties--for example, statements of peer review or that the text +- has been approved by an organization as the authoritative +- definition of a standard. +- +- You may add a passage of up to five words as a Front-Cover Text, +- and a passage of up to 25 words as a Back-Cover Text, to the end of +- the list of Cover Texts in the Modified Version. Only one passage +- of Front-Cover Text and one of Back-Cover Text may be added by (or +- through arrangements made by) any one entity. If the Document +- already includes a cover text for the same cover, previously added +- by you or by arrangement made by the same entity you are acting on +- behalf of, you may not add another; but you may replace the old +- one, on explicit permission from the previous publisher that added +- the old one. +- +- The author(s) and publisher(s) of the Document do not by this +- License give permission to use their names for publicity for or to +- assert or imply endorsement of any Modified Version. +- +- 5. COMBINING DOCUMENTS +- +- You may combine the Document with other documents released under +- this License, under the terms defined in section 4 above for +- modified versions, provided that you include in the combination all +- of the Invariant Sections of all of the original documents, +- unmodified, and list them all as Invariant Sections of your +- combined work in its license notice, and that you preserve all +- their Warranty Disclaimers. +- +- The combined work need only contain one copy of this License, and +- multiple identical Invariant Sections may be replaced with a single +- copy. If there are multiple Invariant Sections with the same name +- but different contents, make the title of each such section unique +- by adding at the end of it, in parentheses, the name of the +- original author or publisher of that section if known, or else a +- unique number. Make the same adjustment to the section titles in +- the list of Invariant Sections in the license notice of the +- combined work. +- +- In the combination, you must combine any sections Entitled +- "History" in the various original documents, forming one section +- Entitled "History"; likewise combine any sections Entitled +- "Acknowledgements", and any sections Entitled "Dedications". You +- must delete all sections Entitled "Endorsements." +- +- 6. COLLECTIONS OF DOCUMENTS +- +- You may make a collection consisting of the Document and other +- documents released under this License, and replace the individual +- copies of this License in the various documents with a single copy +- that is included in the collection, provided that you follow the +- rules of this License for verbatim copying of each of the documents +- in all other respects. +- +- You may extract a single document from such a collection, and +- distribute it individually under this License, provided you insert +- a copy of this License into the extracted document, and follow this +- License in all other respects regarding verbatim copying of that +- document. +- +- 7. AGGREGATION WITH INDEPENDENT WORKS +- +- A compilation of the Document or its derivatives with other +- separate and independent documents or works, in or on a volume of a +- storage or distribution medium, is called an "aggregate" if the +- copyright resulting from the compilation is not used to limit the +- legal rights of the compilation's users beyond what the individual +- works permit. When the Document is included in an aggregate, this +- License does not apply to the other works in the aggregate which +- are not themselves derivative works of the Document. +- +- If the Cover Text requirement of section 3 is applicable to these +- copies of the Document, then if the Document is less than one half +- of the entire aggregate, the Document's Cover Texts may be placed +- on covers that bracket the Document within the aggregate, or the +- electronic equivalent of covers if the Document is in electronic +- form. Otherwise they must appear on printed covers that bracket +- the whole aggregate. +- +- 8. TRANSLATION +- +- Translation is considered a kind of modification, so you may +- distribute translations of the Document under the terms of section +- 4. Replacing Invariant Sections with translations requires special +- permission from their copyright holders, but you may include +- translations of some or all Invariant Sections in addition to the +- original versions of these Invariant Sections. You may include a +- translation of this License, and all the license notices in the +- Document, and any Warranty Disclaimers, provided that you also +- include the original English version of this License and the +- original versions of those notices and disclaimers. In case of a +- disagreement between the translation and the original version of +- this License or a notice or disclaimer, the original version will +- prevail. +- +- If a section in the Document is Entitled "Acknowledgements", +- "Dedications", or "History", the requirement (section 4) to +- Preserve its Title (section 1) will typically require changing the +- actual title. +- +- 9. TERMINATION +- +- You may not copy, modify, sublicense, or distribute the Document +- except as expressly provided under this License. Any attempt +- otherwise to copy, modify, sublicense, or distribute it is void, +- and will automatically terminate your rights under this License. +- +- However, if you cease all violation of this License, then your +- license from a particular copyright holder is reinstated (a) +- provisionally, unless and until the copyright holder explicitly and +- finally terminates your license, and (b) permanently, if the +- copyright holder fails to notify you of the violation by some +- reasonable means prior to 60 days after the cessation. +- +- Moreover, your license from a particular copyright holder is +- reinstated permanently if the copyright holder notifies you of the +- violation by some reasonable means, this is the first time you have +- received notice of violation of this License (for any work) from +- that copyright holder, and you cure the violation prior to 30 days +- after your receipt of the notice. +- +- Termination of your rights under this section does not terminate +- the licenses of parties who have received copies or rights from you +- under this License. If your rights have been terminated and not +- permanently reinstated, receipt of a copy of some or all of the +- same material does not give you any rights to use it. +- +- 10. FUTURE REVISIONS OF THIS LICENSE +- +- The Free Software Foundation may publish new, revised versions of +- the GNU Free Documentation 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. See +- . +- +- Each version of the License is given a distinguishing version +- number. If the Document specifies that a particular numbered +- version of this License "or any later version" applies to it, you +- have the option of following the terms and conditions either of +- that specified version or of any later version that has been +- published (not as a draft) by the Free Software Foundation. If the +- Document does not specify a version number of this License, you may +- choose any version ever published (not as a draft) by the Free +- Software Foundation. If the Document specifies that a proxy can +- decide which future versions of this License can be used, that +- proxy's public statement of acceptance of a version permanently +- authorizes you to choose that version for the Document. +- +- 11. RELICENSING +- +- "Massive Multiauthor Collaboration Site" (or "MMC Site") means any +- World Wide Web server that publishes copyrightable works and also +- provides prominent facilities for anybody to edit those works. A +- public wiki that anybody can edit is an example of such a server. +- A "Massive Multiauthor Collaboration" (or "MMC") contained in the +- site means any set of copyrightable works thus published on the MMC +- site. +- +- "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +- license published by Creative Commons Corporation, a not-for-profit +- corporation with a principal place of business in San Francisco, +- California, as well as future copyleft versions of that license +- published by that same organization. +- +- "Incorporate" means to publish or republish a Document, in whole or +- in part, as part of another Document. +- +- An MMC is "eligible for relicensing" if it is licensed under this +- License, and if all works that were first published under this +- License somewhere other than this MMC, and subsequently +- incorporated in whole or in part into the MMC, (1) had no cover +- texts or invariant sections, and (2) were thus incorporated prior +- to November 1, 2008. +- +- The operator of an MMC Site may republish an MMC contained in the +- site under CC-BY-SA on the same site at any time before August 1, +- 2009, provided the MMC is eligible for relicensing. +- +-ADDENDUM: How to use this License for your documents +-==================================================== +- +-To use this License in a document you have written, include a copy of +-the License in the document and put the following copyright and license +-notices just after the title page: +- +- Copyright (C) YEAR YOUR NAME. +- Permission is granted to copy, distribute and/or modify this document +- under the terms of the GNU Free Documentation License, Version 1.3 +- or any later version published by the Free Software Foundation; +- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover +- Texts. A copy of the license is included in the section entitled ``GNU +- Free Documentation License''. +- +- If you have Invariant Sections, Front-Cover Texts and Back-Cover +-Texts, replace the "with...Texts." line with this: +- +- with the Invariant Sections being LIST THEIR TITLES, with +- the Front-Cover Texts being LIST, and with the Back-Cover Texts +- being LIST. +- +- If you have Invariant Sections without Cover Texts, or some other +-combination of the three, merge those two alternatives to suit the +-situation. +- +- If your document contains nontrivial examples of program code, we +-recommend releasing these examples in parallel under your choice of free +-software license, such as the GNU General Public License, to permit +-their use in free software. +- +- +-File: groff.info, Node: Request Index, Next: Escape Index, Prev: Copying This Manual, Up: Top +- +-Appendix B Request Index +-************************ +- +-Requests appear without the leading control character (normally either +-'.' or '''). +- +-[index] +-* Menu: +- +-* ab: Debugging. (line 40) +-* ad: Manipulating Filling and Adjusting. +- (line 50) +-* af: Assigning Formats. (line 12) +-* aln: Setting Registers. (line 112) +-* als: Strings. (line 229) +-* am: Writing Macros. (line 113) +-* am1: Writing Macros. (line 114) +-* ami: Writing Macros. (line 115) +-* ami1: Writing Macros. (line 116) +-* as: Strings. (line 175) +-* as1: Strings. (line 176) +-* asciify: Diversions. (line 195) +-* backtrace: Debugging. (line 96) +-* bd: Artificial Fonts. (line 96) +-* blm: Blank Line Traps. (line 7) +-* box: Diversions. (line 34) +-* boxa: Diversions. (line 35) +-* bp: Page Control. (line 7) +-* br: Manipulating Filling and Adjusting. +- (line 12) +-* break: while. (line 68) +-* brp: Manipulating Filling and Adjusting. +- (line 130) +-* c2: Character Translations. +- (line 16) +-* cc: Character Translations. +- (line 10) +-* ce: Manipulating Filling and Adjusting. +- (line 203) +-* cf: I/O. (line 50) +-* cflags: Using Symbols. (line 237) +-* ch: Page Location Traps. (line 111) +-* char: Using Symbols. (line 323) +-* chop: Strings. (line 267) +-* class: Character Classes. (line 12) +-* close: I/O. (line 231) +-* color: Colors. (line 7) +-* composite: Using Symbols. (line 191) +-* continue: while. (line 72) +-* cp: Implementation Differences. +- (line 22) +-* cs: Artificial Fonts. (line 126) +-* cu: Artificial Fonts. (line 86) +-* da: Diversions. (line 22) +-* de: Writing Macros. (line 15) +-* de1: Writing Macros. (line 16) +-* defcolor: Colors. (line 22) +-* dei: Writing Macros. (line 17) +-* dei1: Writing Macros. (line 18) +-* device: Postprocessor Access. +- (line 11) +-* devicem: Postprocessor Access. +- (line 30) +-* di: Diversions. (line 21) +-* do: Implementation Differences. +- (line 23) +-* ds: Strings. (line 15) +-* ds1: Strings. (line 16) +-* dt: Diversion Traps. (line 7) +-* ec: Character Translations. +- (line 47) +-* ecr: Character Translations. +- (line 59) +-* ecs: Character Translations. +- (line 58) +-* el: if-else. (line 27) +-* em: End-of-input Traps. (line 7) +-* eo: Character Translations. +- (line 24) +-* ev: Environments. (line 38) +-* evc: Environments. (line 70) +-* ex: Debugging. (line 45) +-* fam: Font Families. (line 20) +-* fc: Fields. (line 18) +-* fchar: Using Symbols. (line 324) +-* fcolor: Colors. (line 80) +-* fi: Manipulating Filling and Adjusting. +- (line 28) +-* fl: Debugging. (line 87) +-* fp: Font Positions. (line 11) +-* fschar: Using Symbols. (line 325) +-* fspecial: Special Fonts. (line 18) +-* ft: Changing Fonts. (line 7) +-* ft <1>: Font Positions. (line 57) +-* ftr: Changing Fonts. (line 55) +-* fzoom: Changing Fonts. (line 70) +-* gcolor: Colors. (line 50) +-* hc: Manipulating Hyphenation. +- (line 105) +-* hcode: Manipulating Hyphenation. +- (line 175) +-* hla: Manipulating Hyphenation. +- (line 255) +-* hlm: Manipulating Hyphenation. +- (line 45) +-* hpf: Manipulating Hyphenation. +- (line 114) +-* hpfa: Manipulating Hyphenation. +- (line 115) +-* hpfcode: Manipulating Hyphenation. +- (line 116) +-* hw: Manipulating Hyphenation. +- (line 62) +-* hy: Manipulating Hyphenation. +- (line 9) +-* hym: Manipulating Hyphenation. +- (line 210) +-* hys: Manipulating Hyphenation. +- (line 226) +-* ie: if-else. (line 26) +-* if: if-else. (line 10) +-* ig: Comments. (line 63) +-* in: Line Layout. (line 86) +-* it: Input Line Traps. (line 7) +-* itc: Input Line Traps. (line 8) +-* kern: Ligatures and Kerning. +- (line 41) +-* lc: Leaders. (line 23) +-* length: Strings. (line 211) +-* lf: Debugging. (line 10) +-* lg: Ligatures and Kerning. +- (line 23) +-* linetabs: Tabs and Fields. (line 137) +-* ll: Line Layout. (line 140) +-* ls: Manipulating Spacing. +- (line 63) +-* lsm: Leading Spaces Traps. +- (line 7) +-* lt: Page Layout. (line 64) +-* mc: Miscellaneous. (line 75) +-* mk: Page Motions. (line 10) +-* mso: I/O. (line 40) +-* na: Manipulating Filling and Adjusting. +- (line 122) +-* ne: Page Control. (line 33) +-* nf: Manipulating Filling and Adjusting. +- (line 39) +-* nh: Manipulating Hyphenation. +- (line 37) +-* nm: Miscellaneous. (line 10) +-* nn: Miscellaneous. (line 71) +-* nop: if-else. (line 23) +-* nr: Setting Registers. (line 13) +-* nr <1>: Setting Registers. (line 68) +-* nr <2>: Auto-increment. (line 11) +-* nroff: Troff and Nroff Mode. +- (line 32) +-* ns: Manipulating Spacing. +- (line 121) +-* nx: I/O. (line 84) +-* open: I/O. (line 199) +-* opena: I/O. (line 200) +-* os: Page Control. (line 53) +-* output: Diversions. (line 180) +-* pc: Page Layout. (line 94) +-* pev: Debugging. (line 62) +-* pi: I/O. (line 143) +-* pl: Page Layout. (line 10) +-* pm: Debugging. (line 66) +-* pn: Page Layout. (line 81) +-* pnr: Debugging. (line 77) +-* po: Line Layout. (line 58) +-* ps: Changing Type Sizes. (line 7) +-* psbb: Miscellaneous. (line 135) +-* pso: I/O. (line 29) +-* ptr: Debugging. (line 81) +-* pvs: Changing Type Sizes. (line 134) +-* rchar: Using Symbols. (line 381) +-* rd: I/O. (line 89) +-* return: Writing Macros. (line 147) +-* rfschar: Using Symbols. (line 382) +-* rj: Manipulating Filling and Adjusting. +- (line 249) +-* rm: Strings. (line 224) +-* rn: Strings. (line 221) +-* rnn: Setting Registers. (line 108) +-* rr: Setting Registers. (line 104) +-* rs: Manipulating Spacing. +- (line 122) +-* rt: Page Motions. (line 11) +-* schar: Using Symbols. (line 326) +-* shc: Manipulating Hyphenation. +- (line 243) +-* shift: Parameters. (line 31) +-* sizes: Changing Type Sizes. (line 69) +-* so: I/O. (line 9) +-* sp: Manipulating Spacing. +- (line 7) +-* special: Special Fonts. (line 17) +-* spreadwarn: Debugging. (line 131) +-* ss: Manipulating Filling and Adjusting. +- (line 149) +-* sty: Font Families. (line 59) +-* substring: Strings. (line 192) +-* sv: Page Control. (line 52) +-* sy: I/O. (line 164) +-* ta: Tabs and Fields. (line 14) +-* tc: Tabs and Fields. (line 129) +-* ti: Line Layout. (line 112) +-* tkf: Ligatures and Kerning. +- (line 60) +-* tl: Page Layout. (line 35) +-* tm: Debugging. (line 25) +-* tm1: Debugging. (line 26) +-* tmc: Debugging. (line 27) +-* tr: Character Translations. +- (line 148) +-* trf: I/O. (line 49) +-* trin: Character Translations. +- (line 149) +-* trnt: Character Translations. +- (line 237) +-* troff: Troff and Nroff Mode. +- (line 24) +-* uf: Artificial Fonts. (line 90) +-* ul: Artificial Fonts. (line 64) +-* unformat: Diversions. (line 218) +-* vpt: Page Location Traps. (line 17) +-* vs: Changing Type Sizes. (line 85) +-* warn: Debugging. (line 154) +-* warnscale: Debugging. (line 127) +-* wh: Page Location Traps. (line 29) +-* while: while. (line 10) +-* write: I/O. (line 211) +-* writec: I/O. (line 212) +-* writem: I/O. (line 222) +- +- +-File: groff.info, Node: Escape Index, Next: Operator Index, Prev: Request Index, Up: Top +- +-Appendix C Escape Index +-*********************** +- +-Any escape sequence '\X' with X not in the list below emits a warning, +-printing glyph X. +- +-[index] +-* Menu: +- +-* \: Using Symbols. (line 132) +-* \!: Diversions. (line 135) +-* \": Comments. (line 10) +-* \#: Comments. (line 48) +-* \$: Parameters. (line 19) +-* \$*: Parameters. (line 40) +-* \$0: Parameters. (line 71) +-* \$@: Parameters. (line 41) +-* \$^: Parameters. (line 50) +-* \%: Manipulating Hyphenation. +- (line 84) +-* \&: Ligatures and Kerning. +- (line 100) +-* \': Using Symbols. (line 222) +-* \): Ligatures and Kerning. +- (line 127) +-* \*: Strings. (line 17) +-* \,: Ligatures and Kerning. +- (line 91) +-* \-: Using Symbols. (line 231) +-* \.: Character Translations. +- (line 122) +-* \/: Ligatures and Kerning. +- (line 80) +-* \0: Page Motions. (line 138) +-* \: Manipulating Hyphenation. +- (line 85) +-* \?: Diversions. (line 136) +-* \A: Identifiers. (line 53) +-* \a: Leaders. (line 18) +-* \B: Expressions. (line 83) +-* \b: Drawing Requests. (line 232) +-* \c: Line Control. (line 41) +-* \C: Using Symbols. (line 185) +-* \d: Page Motions. (line 100) +-* \D: Drawing Requests. (line 67) +-* \e: Character Translations. +- (line 69) +-* \E: Character Translations. +- (line 70) +-* \f: Changing Fonts. (line 8) +-* \F: Font Families. (line 22) +-* \f <1>: Font Positions. (line 58) +-* \g: Assigning Formats. (line 73) +-* \H: Artificial Fonts. (line 13) +-* \h: Page Motions. (line 103) +-* \k: Page Motions. (line 201) +-* \l: Drawing Requests. (line 16) +-* \L: Drawing Requests. (line 49) +-* \m: Colors. (line 51) +-* \M: Colors. (line 81) +-* \n: Interpolating Registers. +- (line 9) +-* \n <1>: Auto-increment. (line 19) +-* \N: Using Symbols. (line 201) +-* \o: Page Motions. (line 216) +-* \O: Suppressing output. (line 7) +-* \p: Manipulating Filling and Adjusting. +- (line 131) +-* \R: Setting Registers. (line 14) +-* \R <1>: Setting Registers. (line 70) +-* \r: Page Motions. (line 94) +-* \: Line Control. (line 40) +-* \S: Artificial Fonts. (line 44) +-* \s: Changing Type Sizes. (line 10) +-* \: Page Motions. (line 114) +-* \t: Tabs and Fields. (line 10) +-* \u: Page Motions. (line 97) +-* \v: Page Motions. (line 78) +-* \V: I/O. (line 247) +-* \w: Page Motions. (line 145) +-* \x: Manipulating Spacing. +- (line 82) +-* \X: Postprocessor Access. +- (line 12) +-* \Y: Postprocessor Access. +- (line 31) +-* \z: Page Motions. (line 220) +-* \Z: Page Motions. (line 224) +-* \\: Character Translations. +- (line 68) +-* \^: Page Motions. (line 130) +-* \_: Using Symbols. (line 234) +-* \`: Using Symbols. (line 227) +-* \{: if-else. (line 35) +-* \|: Page Motions. (line 122) +-* \}: if-else. (line 35) +-* \~: Page Motions. (line 118) +- +- +-File: groff.info, Node: Operator Index, Next: Register Index, Prev: Escape Index, Up: Top +- +-Appendix D Operator Index +-************************* +- +-[index] +-* Menu: +- +-* !: Expressions. (line 21) +-* %: Expressions. (line 8) +-* &: Expressions. (line 19) +-* (: Expressions. (line 59) +-* ): Expressions. (line 59) +-* *: Expressions. (line 8) +-* +: Expressions. (line 8) +-* + <1>: Expressions. (line 21) +-* -: Expressions. (line 8) +-* - <1>: Expressions. (line 21) +-* /: Expressions. (line 8) +-* <: Expressions. (line 15) +-* <=: Expressions. (line 15) +-* : Expressions. (line 19) +-* =: Expressions. (line 15) +-* ==: Expressions. (line 15) +-* >: Expressions. (line 15) +-* >=: Expressions. (line 15) +-* >?: Expressions. (line 44) +- +- +-File: groff.info, Node: Register Index, Next: Macro Index, Prev: Operator Index, Up: Top +- +-Appendix E Register Index +-************************* +- +-The macro package or program a specific register belongs to is appended +-in brackets. +- +- A register name 'x' consisting of exactly one character can be +-accessed as '\nx'. A register name 'xx' consisting of exactly two +-characters can be accessed as '\n(xx'. Register names 'xxx' of any +-length can be accessed as '\n[xxx]'. +- +-[index] +-* Menu: +- +-* $$: Built-in Registers. (line 99) +-* %: Page Layout. (line 94) +-* % <1>: Page Control. (line 10) +-* .$: Parameters. (line 10) +-* .A: Built-in Registers. (line 106) +-* .a: Manipulating Spacing. +- (line 83) +-* .b: Artificial Fonts. (line 98) +-* .br: Requests. (line 56) +-* .c: Built-in Registers. (line 76) +-* .C: Implementation Differences. +- (line 24) +-* .cdp: Environments. (line 94) +-* .ce: Manipulating Filling and Adjusting. +- (line 204) +-* .cht: Environments. (line 93) +-* .color: Colors. (line 8) +-* .csk: Environments. (line 95) +-* .d: Diversions. (line 69) +-* .ev: Environments. (line 39) +-* .F: Built-in Registers. (line 12) +-* .f: Font Positions. (line 12) +-* .fam: Font Families. (line 21) +-* .fn: Font Families. (line 25) +-* .fp: Font Positions. (line 13) +-* .g: Built-in Registers. (line 102) +-* .H: Built-in Registers. (line 15) +-* .h: Diversions. (line 76) +-* .height: Artificial Fonts. (line 16) +-* .hla: Manipulating Hyphenation. +- (line 256) +-* .hlc: Manipulating Hyphenation. +- (line 47) +-* .hlm: Manipulating Hyphenation. +- (line 46) +-* .hy: Manipulating Hyphenation. +- (line 10) +-* .hym: Manipulating Hyphenation. +- (line 211) +-* .hys: Manipulating Hyphenation. +- (line 227) +-* .i: Line Layout. (line 89) +-* .in: Line Layout. (line 115) +-* .int: Line Control. (line 42) +-* .j: Manipulating Filling and Adjusting. +- (line 51) +-* .k: Page Motions. (line 212) +-* .kern: Ligatures and Kerning. +- (line 42) +-* .L: Manipulating Spacing. +- (line 64) +-* .l: Line Layout. (line 143) +-* .lg: Ligatures and Kerning. +- (line 24) +-* .linetabs: Tabs and Fields. (line 138) +-* .ll: Line Layout. (line 144) +-* .lt: Page Layout. (line 67) +-* .m: Colors. (line 54) +-* .M: Colors. (line 84) +-* .n: Environments. (line 110) +-* .ne: Page Location Traps. (line 122) +-* .ns: Manipulating Spacing. +- (line 123) +-* .O: Built-in Registers. (line 112) +-* .o: Line Layout. (line 61) +-* .P: Built-in Registers. (line 116) +-* .p: Page Layout. (line 13) +-* .pe: Page Location Traps. (line 143) +-* .pn: Page Layout. (line 84) +-* .ps: Fractional Type Sizes. +- (line 37) +-* .psr: Fractional Type Sizes. +- (line 44) +-* .pvs: Changing Type Sizes. (line 137) +-* .R: Built-in Registers. (line 18) +-* .rj: Manipulating Filling and Adjusting. +- (line 250) +-* .s: Changing Type Sizes. (line 11) +-* .slant: Artificial Fonts. (line 45) +-* .sr: Fractional Type Sizes. +- (line 45) +-* .ss: Manipulating Filling and Adjusting. +- (line 150) +-* .sss: Manipulating Filling and Adjusting. +- (line 151) +-* .sty: Changing Fonts. (line 11) +-* .T: Built-in Registers. (line 122) +-* .t: Page Location Traps. (line 102) +-* .tabs: Tabs and Fields. (line 15) +-* .trunc: Page Location Traps. (line 131) +-* .U: Built-in Registers. (line 23) +-* .u: Manipulating Filling and Adjusting. +- (line 29) +-* .V: Built-in Registers. (line 28) +-* .v: Changing Type Sizes. (line 88) +-* .vpt: Page Location Traps. (line 18) +-* .w: Environments. (line 92) +-* .warn: Debugging. (line 155) +-* .x: Built-in Registers. (line 88) +-* .y: Built-in Registers. (line 92) +-* .Y: Built-in Registers. (line 96) +-* .z: Diversions. (line 68) +-* .zoom: Changing Fonts. (line 71) +-* c.: Built-in Registers. (line 77) +-* ct: Page Motions. (line 150) +-* DD [ms]: ms Document Control Registers. +- (line 239) +-* dl: Diversions. (line 93) +-* dn: Diversions. (line 92) +-* dw: Built-in Registers. (line 45) +-* dy: Built-in Registers. (line 48) +-* FAM [ms]: ms Document Control Registers. +- (line 111) +-* FF [ms]: ms Document Control Registers. +- (line 185) +-* FI [ms]: ms Document Control Registers. +- (line 178) +-* FL [ms]: ms Document Control Registers. +- (line 171) +-* FM [ms]: ms Document Control Registers. +- (line 47) +-* FPD [ms]: ms Document Control Registers. +- (line 221) +-* FPS [ms]: ms Document Control Registers. +- (line 205) +-* FVS [ms]: ms Document Control Registers. +- (line 213) +-* GROWPS [ms]: ms Document Control Registers. +- (line 89) +-* GS [ms]: Differences from AT&T ms. +- (line 45) +-* HM [ms]: ms Document Control Registers. +- (line 40) +-* HORPHANS [ms]: ms Document Control Registers. +- (line 155) +-* hours: Built-in Registers. (line 41) +-* hp: Page Motions. (line 209) +-* HY [ms]: ms Document Control Registers. +- (line 102) +-* LL [ms]: ms Document Control Registers. +- (line 25) +-* llx: Miscellaneous. (line 136) +-* lly: Miscellaneous. (line 137) +-* ln: Built-in Registers. (line 82) +-* lsn: Leading Spaces Traps. +- (line 8) +-* lss: Leading Spaces Traps. +- (line 9) +-* LT [ms]: ms Document Control Registers. +- (line 32) +-* MINGW [ms]: ms Document Control Registers. +- (line 231) +-* MINGW [ms] <1>: Additional ms Macros. +- (line 28) +-* minutes: Built-in Registers. (line 37) +-* mo: Built-in Registers. (line 51) +-* nl: Page Control. (line 67) +-* opmaxx: Suppressing output. (line 19) +-* opmaxy: Suppressing output. (line 19) +-* opminx: Suppressing output. (line 19) +-* opminy: Suppressing output. (line 19) +-* PD [ms]: ms Document Control Registers. +- (line 128) +-* PI [ms]: ms Document Control Registers. +- (line 121) +-* PO [ms]: ms Document Control Registers. +- (line 16) +-* PORPHANS [ms]: ms Document Control Registers. +- (line 143) +-* PS [ms]: ms Document Control Registers. +- (line 57) +-* ps4html [grohtml]: grohtml specific registers and strings. +- (line 7) +-* PSINCR [ms]: ms Document Control Registers. +- (line 77) +-* QI [ms]: ms Document Control Registers. +- (line 135) +-* rsb: Page Motions. (line 149) +-* rst: Page Motions. (line 148) +-* sb: Page Motions. (line 147) +-* seconds: Built-in Registers. (line 31) +-* skw: Page Motions. (line 152) +-* slimit: Debugging. (line 119) +-* ssc: Page Motions. (line 151) +-* st: Page Motions. (line 146) +-* systat: I/O. (line 165) +-* urx: Miscellaneous. (line 138) +-* ury: Miscellaneous. (line 139) +-* VS [ms]: ms Document Control Registers. +- (line 67) +-* year: Built-in Registers. (line 54) +-* yr: Built-in Registers. (line 57) +- +- +-File: groff.info, Node: Macro Index, Next: String Index, Prev: Register Index, Up: Top +- +-Appendix F Macro Index +-********************** +- +-The macro package a specific macro belongs to is appended in brackets. +-They appear without the leading control character (normally '.'). +- +-[index] +-* Menu: +- +-* 1C [ms]: ms Multiple Columns. (line 13) +-* 2C [ms]: ms Multiple Columns. (line 16) +-* [ [ms]: ms Insertions. (line 33) +-* ] [ms]: ms Insertions. (line 34) +-* AB [ms]: ms Cover Page Macros. +- (line 59) +-* AE [ms]: ms Cover Page Macros. +- (line 64) +-* AI [ms]: ms Cover Page Macros. +- (line 55) +-* AM [ms]: ms Strings and Special Characters. +- (line 51) +-* AM [ms] <1>: Additional ms Macros. +- (line 10) +-* AT [man]: Miscellaneous man macros. +- (line 27) +-* AU [ms]: ms Cover Page Macros. +- (line 39) +-* B [man]: Man font macros. (line 47) +-* B [ms]: Highlighting in ms. (line 10) +-* B1 [ms]: ms Displays and Keeps. +- (line 94) +-* B2 [ms]: ms Displays and Keeps. +- (line 95) +-* BD [ms]: ms Displays and Keeps. +- (line 31) +-* BI [man]: Man font macros. (line 18) +-* BI [ms]: Highlighting in ms. (line 38) +-* BR [man]: Man font macros. (line 39) +-* BT [man]: Optional man extensions. +- (line 21) +-* BT [ms]: ms Headers and Footers. +- (line 39) +-* BX [ms]: Highlighting in ms. (line 42) +-* CD [ms]: ms Displays and Keeps. +- (line 41) +-* CT [man]: Optional man extensions. +- (line 36) +-* CW [man]: Optional man extensions. +- (line 39) +-* CW [ms]: Highlighting in ms. (line 34) +-* CW [ms] <1>: Additional ms Macros. +- (line 19) +-* DA [ms]: ms Cover Page Macros. +- (line 24) +-* De [man]: Optional man extensions. +- (line 45) +-* DE [ms]: ms Displays and Keeps. +- (line 16) +-* DE [ms] <1>: ms Displays and Keeps. +- (line 24) +-* DE [ms] <2>: ms Displays and Keeps. +- (line 32) +-* DE [ms] <3>: ms Displays and Keeps. +- (line 42) +-* DE [ms] <4>: ms Displays and Keeps. +- (line 50) +-* De [ms]: ms Displays and Keeps. +- (line 57) +-* Ds [man]: Optional man extensions. +- (line 42) +-* DS [ms]: ms Displays and Keeps. +- (line 14) +-* DS [ms] <1>: ms Displays and Keeps. +- (line 22) +-* DS [ms] <2>: ms Displays and Keeps. +- (line 30) +-* DS [ms] <3>: ms Displays and Keeps. +- (line 40) +-* DS [ms] <4>: ms Displays and Keeps. +- (line 48) +-* Ds [ms]: ms Displays and Keeps. +- (line 56) +-* DS [ms] <5>: Additional ms Macros. +- (line 14) +-* DT [man]: Miscellaneous man macros. +- (line 10) +-* EE [man]: Optional man extensions. +- (line 52) +-* EF [ms]: ms Headers and Footers. +- (line 26) +-* EH [ms]: ms Headers and Footers. +- (line 24) +-* EN [ms]: ms Insertions. (line 28) +-* EQ [ms]: ms Insertions. (line 27) +-* EX [man]: Optional man extensions. +- (line 48) +-* FE [ms]: ms Footnotes. (line 15) +-* FS [ms]: ms Footnotes. (line 14) +-* G [man]: Optional man extensions. +- (line 55) +-* GL [man]: Optional man extensions. +- (line 60) +-* HB [man]: Optional man extensions. +- (line 65) +-* HD [ms]: ms Headers and Footers. +- (line 38) +-* HP [man]: Man usage. (line 98) +-* I [man]: Man font macros. (line 52) +-* I [ms]: Highlighting in ms. (line 30) +-* IB [man]: Man font macros. (line 27) +-* ID [ms]: ms Displays and Keeps. +- (line 23) +-* IP [man]: Man usage. (line 80) +-* IP [ms]: Lists in ms. (line 9) +-* IR [man]: Man font macros. (line 35) +-* IX [ms]: Additional ms Macros. +- (line 22) +-* KE [ms]: ms Displays and Keeps. +- (line 73) +-* KE [ms] <1>: ms Displays and Keeps. +- (line 78) +-* KF [ms]: ms Displays and Keeps. +- (line 77) +-* KS [ms]: ms Displays and Keeps. +- (line 72) +-* LD [ms]: ms Displays and Keeps. +- (line 15) +-* LG [ms]: Highlighting in ms. (line 51) +-* LP [man]: Man usage. (line 70) +-* LP [ms]: Paragraphs in ms. (line 12) +-* MC [ms]: ms Multiple Columns. (line 19) +-* MS [man]: Optional man extensions. +- (line 73) +-* ND [ms]: ms Cover Page Macros. +- (line 29) +-* NE [man]: Optional man extensions. +- (line 85) +-* NH [ms]: Headings in ms. (line 13) +-* NL [ms]: Highlighting in ms. (line 63) +-* NT [man]: Optional man extensions. +- (line 78) +-* OF [ms]: ms Headers and Footers. +- (line 25) +-* OH [ms]: ms Headers and Footers. +- (line 23) +-* P [man]: Man usage. (line 72) +-* P1 [ms]: ms Cover Page Macros. +- (line 20) +-* PD [man]: Miscellaneous man macros. +- (line 15) +-* PE [ms]: ms Insertions. (line 21) +-* PN [man]: Optional man extensions. +- (line 88) +-* Pn [man]: Optional man extensions. +- (line 92) +-* PP [man]: Man usage. (line 71) +-* PP [ms]: Paragraphs in ms. (line 9) +-* PS [ms]: ms Insertions. (line 20) +-* PT [man]: Optional man extensions. +- (line 16) +-* PT [ms]: ms Headers and Footers. +- (line 37) +-* PX [ms]: ms TOC. (line 62) +-* QP [ms]: Paragraphs in ms. (line 15) +-* R [man]: Optional man extensions. +- (line 98) +-* R [ms]: Highlighting in ms. (line 26) +-* RB [man]: Man font macros. (line 43) +-* RD [ms]: ms Displays and Keeps. +- (line 49) +-* RE [man]: Man usage. (line 115) +-* RE [ms]: Indentation values in ms. +- (line 12) +-* RI [man]: Man font macros. (line 31) +-* RN [man]: Optional man extensions. +- (line 101) +-* RP [ms]: ms Cover Page Macros. +- (line 10) +-* RS [man]: Man usage. (line 106) +-* RS [ms]: Indentation values in ms. +- (line 11) +-* SB [man]: Man font macros. (line 14) +-* SH [man]: Man usage. (line 34) +-* SH [ms]: Headings in ms. (line 54) +-* SM [man]: Man font macros. (line 10) +-* SM [ms]: Highlighting in ms. (line 57) +-* SS [man]: Man usage. (line 43) +-* TA [ms]: Tabstops in ms. (line 10) +-* TB [man]: Optional man extensions. +- (line 70) +-* TC [ms]: ms TOC. (line 52) +-* TE [ms]: ms Insertions. (line 12) +-* TH [man]: Man usage. (line 11) +-* TL [ms]: ms Cover Page Macros. +- (line 34) +-* TP [man]: Man usage. (line 51) +-* TS [ms]: ms Insertions. (line 11) +-* UC [man]: Miscellaneous man macros. +- (line 44) +-* UL [ms]: Highlighting in ms. (line 46) +-* VE [man]: Optional man extensions. +- (line 108) +-* VS [man]: Optional man extensions. +- (line 104) +-* XA [ms]: ms TOC. (line 13) +-* XE [ms]: ms TOC. (line 14) +-* XP [ms]: Paragraphs in ms. (line 20) +-* XS [ms]: ms TOC. (line 12) +- +- +-File: groff.info, Node: String Index, Next: Glyph Name Index, Prev: Macro Index, Up: Top +- +-Appendix G String Index +-*********************** +- +-The macro package or program a specific string belongs to is appended in +-brackets. +- +- A string name 'x' consisting of exactly one character can be accessed +-as '\*x'. A string name 'xx' consisting of exactly two characters can +-be accessed as '\*(xx'. String names 'xxx' of any length can be +-accessed as '\*[xxx]'. +- +-[index] +-* Menu: +- +-* ! [ms]: ms Strings and Special Characters. +- (line 101) +-* ' [ms]: ms Strings and Special Characters. +- (line 65) +-* * [ms]: ms Footnotes. (line 11) +-* , [ms]: ms Strings and Special Characters. +- (line 74) +-* - [ms]: ms Strings and Special Characters. +- (line 41) +-* . [ms]: ms Strings and Special Characters. +- (line 89) +-* .T: Built-in Registers. (line 127) +-* 3 [ms]: ms Strings and Special Characters. +- (line 107) +-* 8 [ms]: ms Strings and Special Characters. +- (line 104) +-* ? [ms]: ms Strings and Special Characters. +- (line 98) +-* \*[] [ms]: ms Strings and Special Characters. +- (line 80) +-* ^ [ms]: ms Strings and Special Characters. +- (line 71) +-* _ [ms]: ms Strings and Special Characters. +- (line 86) +-* ` [ms]: ms Strings and Special Characters. +- (line 68) +-* { [ms]: Highlighting in ms. (line 67) +-* } [ms]: Highlighting in ms. (line 68) +-* ~ [ms]: ms Strings and Special Characters. +- (line 77) +-* ABSTRACT [ms]: ms Strings and Special Characters. +- (line 15) +-* ae [ms]: ms Strings and Special Characters. +- (line 125) +-* Ae [ms]: ms Strings and Special Characters. +- (line 128) +-* CF [ms]: ms Headers and Footers. +- (line 16) +-* CH [ms]: ms Headers and Footers. +- (line 11) +-* D- [ms]: ms Strings and Special Characters. +- (line 116) +-* d- [ms]: ms Strings and Special Characters. +- (line 119) +-* HF [man]: Predefined man strings. +- (line 12) +-* LF [ms]: ms Headers and Footers. +- (line 15) +-* LH [ms]: ms Headers and Footers. +- (line 10) +-* lq [man]: Predefined man strings. +- (line 21) +-* MONTH1 [ms]: ms Strings and Special Characters. +- (line 23) +-* MONTH10 [ms]: ms Strings and Special Characters. +- (line 32) +-* MONTH11 [ms]: ms Strings and Special Characters. +- (line 33) +-* MONTH12 [ms]: ms Strings and Special Characters. +- (line 34) +-* MONTH2 [ms]: ms Strings and Special Characters. +- (line 24) +-* MONTH3 [ms]: ms Strings and Special Characters. +- (line 25) +-* MONTH4 [ms]: ms Strings and Special Characters. +- (line 26) +-* MONTH5 [ms]: ms Strings and Special Characters. +- (line 27) +-* MONTH6 [ms]: ms Strings and Special Characters. +- (line 28) +-* MONTH7 [ms]: ms Strings and Special Characters. +- (line 29) +-* MONTH8 [ms]: ms Strings and Special Characters. +- (line 30) +-* MONTH9 [ms]: ms Strings and Special Characters. +- (line 31) +-* o [ms]: ms Strings and Special Characters. +- (line 92) +-* Q [ms]: ms Strings and Special Characters. +- (line 44) +-* q [ms]: ms Strings and Special Characters. +- (line 122) +-* R [man]: Predefined man strings. +- (line 15) +-* REFERENCES [ms]: ms Strings and Special Characters. +- (line 11) +-* RF [ms]: ms Headers and Footers. +- (line 17) +-* RH [ms]: ms Headers and Footers. +- (line 12) +-* rq [man]: Predefined man strings. +- (line 22) +-* S [man]: Predefined man strings. +- (line 9) +-* SN [ms]: Headings in ms. (line 22) +-* SN-DOT [ms]: Headings in ms. (line 23) +-* SN-NO-DOT [ms]: Headings in ms. (line 24) +-* SN-STYLE [ms]: Headings in ms. (line 36) +-* Th [ms]: ms Strings and Special Characters. +- (line 110) +-* th [ms]: ms Strings and Special Characters. +- (line 113) +-* Tm [man]: Predefined man strings. +- (line 18) +-* TOC [ms]: ms Strings and Special Characters. +- (line 19) +-* U [ms]: ms Strings and Special Characters. +- (line 45) +-* v [ms]: ms Strings and Special Characters. +- (line 83) +-* www-image-template [grohtml]: grohtml specific registers and strings. +- (line 8) +- +- +-File: groff.info, Node: Glyph Name Index, Next: Font File Keyword Index, Prev: String Index, Up: Top +- +-Appendix H Glyph Name Index +-*************************** +- +-A glyph name 'xx' consisting of exactly two characters can be accessed +-as '\(xx'. Glyph names 'xxx' of any length can be accessed as '\[xxx]'. +- +- +-File: groff.info, Node: Font File Keyword Index, Next: Program and File Index, Prev: Glyph Name Index, Up: Top +- +-Appendix I Font File Keyword Index +-********************************** +- +-[index] +-* Menu: +- +-* #: Font File Format. (line 36) +-* ---: Font File Format. (line 51) +-* biggestfont: DESC File Format. (line 142) +-* charset: DESC File Format. (line 12) +-* charset <1>: Font File Format. (line 44) +-* family: Changing Fonts. (line 11) +-* family <1>: Font Positions. (line 60) +-* family <2>: DESC File Format. (line 16) +-* fonts: Using Symbols. (line 14) +-* fonts <1>: Special Fonts. (line 18) +-* fonts <2>: DESC File Format. (line 19) +-* hor: DESC File Format. (line 25) +-* image_generator: DESC File Format. (line 29) +-* kernpairs: Font File Format. (line 139) +-* ligatures: Font File Format. (line 22) +-* name: Font File Format. (line 12) +-* paperlength: DESC File Format. (line 35) +-* papersize: DESC File Format. (line 40) +-* paperwidth: DESC File Format. (line 59) +-* pass_filenames: DESC File Format. (line 64) +-* postpro: DESC File Format. (line 69) +-* prepro: DESC File Format. (line 77) +-* print: DESC File Format. (line 81) +-* res: DESC File Format. (line 85) +-* sizes: DESC File Format. (line 88) +-* sizescale: DESC File Format. (line 95) +-* slant: Font File Format. (line 18) +-* spacewidth: Font File Format. (line 15) +-* spare1: DESC File Format. (line 142) +-* spare2: DESC File Format. (line 142) +-* special: Artificial Fonts. (line 115) +-* special <1>: Font File Format. (line 28) +-* styles: Changing Fonts. (line 11) +-* styles <1>: Font Families. (line 75) +-* styles <2>: Font Positions. (line 60) +-* styles <3>: DESC File Format. (line 101) +-* tcommand: DESC File Format. (line 104) +-* unicode: DESC File Format. (line 108) +-* unitwidth: DESC File Format. (line 122) +-* unscaled_charwidths: DESC File Format. (line 126) +-* use_charnames_in_special: Postprocessor Access. +- (line 22) +-* use_charnames_in_special <1>: DESC File Format. (line 130) +-* vert: DESC File Format. (line 135) +- +- +-File: groff.info, Node: Program and File Index, Next: Concept Index, Prev: Font File Keyword Index, Up: Top +- +-Appendix J Program and File Index +-********************************* +- +-[index] +-* Menu: +- +-* an.tmac: man. (line 6) +-* changebar: Miscellaneous. (line 108) +-* composite.tmac: Using Symbols. (line 191) +-* cp1047.tmac: Input Encodings. (line 9) +-* DESC: Changing Fonts. (line 11) +-* DESC <1>: Font Families. (line 75) +-* DESC <2>: Font Positions. (line 60) +-* DESC <3>: Using Symbols. (line 14) +-* DESC <4>: Using Symbols. (line 212) +-* DESC <5>: Special Fonts. (line 18) +-* DESC file format: DESC File Format. (line 6) +-* DESC, and font mounting: Font Positions. (line 36) +-* DESC, and 'use_charnames_in_special': Postprocessor Access. +- (line 22) +-* ditroff: History. (line 59) +-* ec.tmac: Input Encodings. (line 46) +-* eqn: ms Insertions. (line 7) +-* freeeuro.pfa: Input Encodings. (line 46) +-* gchem: Groff Options. (line 6) +-* geqn: Groff Options. (line 6) +-* geqn, invocation in manual pages: Preprocessors in man pages. +- (line 11) +-* ggrn: Groff Options. (line 6) +-* gpic: Groff Options. (line 6) +-* grap: Groff Options. (line 6) +-* grefer: Groff Options. (line 6) +-* grefer, invocation in manual pages: Preprocessors in man pages. +- (line 11) +-* groff: Groff Options. (line 6) +-* grog: grog. (line 6) +-* grohtml: Miscellaneous man macros. +- (line 6) +-* gsoelim: Groff Options. (line 6) +-* gtbl: Groff Options. (line 6) +-* gtbl, invocation in manual pages: Preprocessors in man pages. +- (line 11) +-* gtroff: Groff Options. (line 6) +-* hyphen.us: Manipulating Hyphenation. +- (line 162) +-* hyphenex.us: Manipulating Hyphenation. +- (line 162) +-* latin1.tmac: Input Encodings. (line 14) +-* latin2.tmac: Input Encodings. (line 18) +-* latin2.tmac <1>: Input Encodings. (line 23) +-* latin9.tmac: Input Encodings. (line 28) +-* less: Invoking grotty. (line 50) +-* makeindex: Indices. (line 10) +-* man, invocation of preprocessors: Preprocessors in man pages. +- (line 11) +-* man-old.tmac: man. (line 6) +-* man.local: Man usage. (line 6) +-* man.local <1>: Optional man extensions. +- (line 6) +-* man.tmac: man. (line 6) +-* man.ultrix: Optional man extensions. +- (line 30) +-* nrchbar: Miscellaneous. (line 108) +-* papersize.tmac: Paper Size. (line 16) +-* perl: I/O. (line 175) +-* pic: ms Insertions. (line 7) +-* post-grohtml: Groff Options. (line 275) +-* pre-grohtml: Groff Options. (line 275) +-* preconv: Groff Options. (line 6) +-* refer: ms Insertions. (line 7) +-* soelim: Debugging. (line 10) +-* tbl: ms Insertions. (line 7) +-* trace.tmac: Writing Macros. (line 104) +-* trace.tmac <1>: Writing Macros. (line 136) +-* troffrc: Groff Options. (line 206) +-* troffrc <1>: Paper Size. (line 16) +-* troffrc <2>: Manipulating Hyphenation. +- (line 162) +-* troffrc <3>: Manipulating Hyphenation. +- (line 256) +-* troffrc <4>: Troff and Nroff Mode. +- (line 24) +-* troffrc <5>: Line Layout. (line 61) +-* troffrc-end: Groff Options. (line 206) +-* troffrc-end <1>: Manipulating Hyphenation. +- (line 162) +-* troffrc-end <2>: Manipulating Hyphenation. +- (line 256) +-* troffrc-end <3>: Troff and Nroff Mode. +- (line 24) +-* tty.tmac: Troff and Nroff Mode. +- (line 32) +- +- +-File: groff.info, Node: Concept Index, Prev: Program and File Index, Up: Top +- +-Appendix K Concept Index +-************************ +- +-[index] +-* Menu: +- +-* '"', at end of sentence: Sentences. (line 18) +-* '"', at end of sentence <1>: Using Symbols. (line 275) +-* '"', in a macro argument: Request and Macro Arguments. +- (line 25) +-* '%', as delimiter: Escapes. (line 67) +-* '&', as delimiter: Escapes. (line 67) +-* ''', as a comment: Comments. (line 42) +-* ''', at end of sentence: Sentences. (line 18) +-* ''', at end of sentence <1>: Using Symbols. (line 275) +-* ''', delimiting arguments: Escapes. (line 29) +-* '(', as delimiter: Escapes. (line 67) +-* '(', starting a two-character identifier: Identifiers. (line 73) +-* '(', starting a two-character identifier <1>: Escapes. (line 16) +-* ')', as delimiter: Escapes. (line 67) +-* ')', at end of sentence: Sentences. (line 18) +-* ')', at end of sentence <1>: Using Symbols. (line 275) +-* '*', as delimiter: Escapes. (line 67) +-* '*', at end of sentence: Sentences. (line 18) +-* '*', at end of sentence <1>: Using Symbols. (line 275) +-* '+', and page motion: Expressions. (line 65) +-* '+', as delimiter: Escapes. (line 67) +-* '-', and page motion: Expressions. (line 65) +-* '-', as delimiter: Escapes. (line 67) +-* '.', as delimiter: Escapes. (line 67) +-* '.h' register, difference to 'nl': Diversions. (line 88) +-* '.ps' register, in comparison with '.psr': Fractional Type Sizes. +- (line 45) +-* '.s' register, in comparison with '.sr': Fractional Type Sizes. +- (line 45) +-* '.S' register, Plan 9 alias for '.tabs': Tabs and Fields. (line 125) +-* '.t' register, and diversions: Diversion Traps. (line 7) +-* '.tabs' register, Plan 9 alias ('.S'): Tabs and Fields. (line 125) +-* '.V' register, and 'vs': Changing Type Sizes. (line 94) +-* '/', as delimiter: Escapes. (line 67) +-* 8-bit input: Font File Format. (line 51) +-* '<', as delimiter: Escapes. (line 67) +-* , as delimiter: Escapes. (line 67) +-* '=', as delimiter: Escapes. (line 67) +-* '>', as delimiter: Escapes. (line 67) +-* '[', macro names starting with, and 'refer': Identifiers. (line 46) +-* '[', starting an identifier: Identifiers. (line 75) +-* '[', starting an identifier <1>: Escapes. (line 20) +-* '\!', and copy-in mode: Diversions. (line 148) +-* '\!', and 'output' request: Diversions. (line 179) +-* '\!', and 'trnt': Character Translations. +- (line 237) +-* '\!', in top-level diversion: Diversions. (line 171) +-* '\!', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\!', incompatibilities with AT&T 'troff' <1>: Implementation Differences. +- (line 106) +-* '\!', used as delimiter: Escapes. (line 52) +-* '\!', used as delimiter <1>: Escapes. (line 71) +-* '\$', when reading text for a macro: Copy-in Mode. (line 6) +-* '\%', and translations: Character Translations. +- (line 166) +-* '\%', following '\X' or '\Y': Manipulating Hyphenation. +- (line 98) +-* '\%', in '\X': Postprocessor Access. +- (line 14) +-* '\%', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\%', used as delimiter: Escapes. (line 52) +-* '\%', used as delimiter <1>: Escapes. (line 71) +-* '\&', and glyph definitions: Using Symbols. (line 326) +-* '\&', and translations: Character Translations. +- (line 176) +-* '\&', at end of sentence: Sentences. (line 24) +-* '\&', escaping control characters: Requests. (line 47) +-* '\&', in '\X': Postprocessor Access. +- (line 14) +-* '\&', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\&', used as delimiter: Escapes. (line 52) +-* '\'', and translations: Character Translations. +- (line 160) +-* '\'', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\'', used as delimiter: Escapes. (line 52) +-* '\'', used as delimiter <1>: Escapes. (line 71) +-* '\(', and translations: Character Translations. +- (line 160) +-* '\)', in '\X': Postprocessor Access. +- (line 14) +-* '\)', used as delimiter: Escapes. (line 52) +-* '\*', and warnings: Warnings. (line 54) +-* '\*', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 13) +-* '\*', when reading text for a macro: Copy-in Mode. (line 6) +-* '\', disabling ('eo'): Character Translations. +- (line 24) +-* '\,', used as delimiter: Escapes. (line 52) +-* '\-', and translations: Character Translations. +- (line 160) +-* '\-', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\-', used as delimiter: Escapes. (line 52) +-* '\-', used as delimiter <1>: Escapes. (line 71) +-* '\/', used as delimiter: Escapes. (line 52) +-* '\/', used as delimiter <1>: Escapes. (line 71) +-* '\0', used as delimiter: Escapes. (line 52) +-* '\', in '\X': Postprocessor Access. +- (line 14) +-* '\', used as delimiter: Escapes. (line 52) +-* '\', used as delimiter <1>: Escapes. (line 71) +-* '\?', and copy-in mode: Operators in Conditionals. +- (line 55) +-* '\?', and copy-in mode <1>: Diversions. (line 148) +-* '\?', in top-level diversion: Diversions. (line 176) +-* '\?', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 106) +-* '\?', used as delimiter: Escapes. (line 52) +-* '\A', allowed delimiters: Escapes. (line 59) +-* '\a', and copy-in mode: Leaders. (line 18) +-* '\a', and translations: Character Translations. +- (line 169) +-* '\A', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\a', used as delimiter: Escapes. (line 52) +-* '\B', allowed delimiters: Escapes. (line 59) +-* '\b', limitations: Drawing Requests. (line 239) +-* '\b', possible quote characters: Escapes. (line 37) +-* '\C', allowed delimiters: Escapes. (line 59) +-* '\c', and fill mode: Line Control. (line 69) +-* '\c', and no-fill mode: Line Control. (line 60) +-* '\C', and translations: Character Translations. +- (line 160) +-* '\c', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\c', used as delimiter: Escapes. (line 52) +-* '\c', used as delimiter <1>: Escapes. (line 71) +-* '\D'f ...'' and horizontal resolution: Drawing Requests. (line 151) +-* '\D', allowed delimiters: Escapes. (line 62) +-* '\d', used as delimiter: Escapes. (line 52) +-* '\E', and copy-in mode: Character Translations. +- (line 81) +-* '\e', and glyph definitions: Using Symbols. (line 326) +-* '\e', and translations: Character Translations. +- (line 164) +-* '\e', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 106) +-* '\e', used as delimiter: Escapes. (line 52) +-* '\E', used as delimiter: Escapes. (line 52) +-* '\e', used as delimiter <1>: Escapes. (line 71) +-* '\F', and changing fonts: Changing Fonts. (line 11) +-* '\F', and font positions: Font Positions. (line 60) +-* '\f', and font translations: Changing Fonts. (line 55) +-* '\f', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 56) +-* '\h', allowed delimiters: Escapes. (line 62) +-* '\H', allowed delimiters: Escapes. (line 62) +-* '\H', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 56) +-* '\H', using '+' and '-': Expressions. (line 75) +-* '\H', with fractional type sizes: Fractional Type Sizes. +- (line 6) +-* '\l', allowed delimiters: Escapes. (line 62) +-* '\L', allowed delimiters: Escapes. (line 62) +-* '\l', and glyph definitions: Using Symbols. (line 326) +-* '\L', and glyph definitions: Using Symbols. (line 326) +-* '\N', allowed delimiters: Escapes. (line 62) +-* '\N', and translations: Character Translations. +- (line 160) +-* '\n', and warnings: Warnings. (line 61) +-* '\n', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 13) +-* '\n', when reading text for a macro: Copy-in Mode. (line 6) +-* '\o', possible quote characters: Escapes. (line 37) +-* '\p', used as delimiter: Escapes. (line 52) +-* '\p', used as delimiter <1>: Escapes. (line 71) +-* '\R', after '\c': Line Control. (line 52) +-* '\R', allowed delimiters: Escapes. (line 62) +-* '\R', and warnings: Warnings. (line 61) +-* '\R', difference to 'nr': Auto-increment. (line 11) +-* '\r', used as delimiter: Escapes. (line 52) +-* '\R', using '+' and '-': Expressions. (line 75) +-* \, when reading text for a macro: Copy-in Mode. (line 6) +-* '\s', allowed delimiters: Escapes. (line 62) +-* '\S', allowed delimiters: Escapes. (line 62) +-* '\s', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 56) +-* '\S', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 56) +-* '\s', using '+' and '-': Expressions. (line 75) +-* '\s', with fractional type sizes: Fractional Type Sizes. +- (line 6) +-* '\', difference to '\~': Request and Macro Arguments. +- (line 20) +-* '\', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\', used as delimiter: Escapes. (line 52) +-* '\t', and copy-in mode: Tabs and Fields. (line 10) +-* '\t', and translations: Character Translations. +- (line 169) +-* '\t', and warnings: Warnings. (line 69) +-* '\t', used as delimiter: Escapes. (line 52) +-* '\u', used as delimiter: Escapes. (line 52) +-* '\v', allowed delimiters: Escapes. (line 62) +-* '\V', and copy-in mode: I/O. (line 249) +-* '\v', internal representation: Gtroff Internals. (line 54) +-* '\w', allowed delimiters: Escapes. (line 59) +-* '\x', allowed delimiters: Escapes. (line 62) +-* '\X', and special characters: Postprocessor Access. +- (line 22) +-* '\X', followed by '\%': Manipulating Hyphenation. +- (line 98) +-* '\X', possible quote characters: Escapes. (line 37) +-* '\Y', followed by '\%': Manipulating Hyphenation. +- (line 98) +-* '\Z', allowed delimiters: Escapes. (line 59) +-* '\[', and translations: Character Translations. +- (line 160) +-* '\\', when reading text for a macro: Copy-in Mode. (line 6) +-* '\^', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\^', used as delimiter: Escapes. (line 52) +-* '\_', and translations: Character Translations. +- (line 160) +-* '\_', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\_', used as delimiter: Escapes. (line 52) +-* '\_', used as delimiter <1>: Escapes. (line 71) +-* '\`', and translations: Character Translations. +- (line 160) +-* '\`', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\`', used as delimiter: Escapes. (line 52) +-* '\`', used as delimiter <1>: Escapes. (line 71) +-* '\{', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\{', used as delimiter: Escapes. (line 52) +-* '\{', used as delimiter <1>: Escapes. (line 71) +-* '\|', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\|', used as delimiter: Escapes. (line 52) +-* '\}', and warnings: Warnings. (line 73) +-* '\}', incompatibilities with AT&T 'troff': Implementation Differences. +- (line 69) +-* '\}', used as delimiter: Escapes. (line 52) +-* '\}', used as delimiter <1>: Escapes. (line 71) +-* '\~', and translations: Character Translations. +- (line 166) +-* '\~', difference to '\': Request and Macro Arguments. +- (line 20) +-* '\~', used as delimiter: Escapes. (line 52) +-* ']', as part of an identifier: Identifiers. (line 41) +-* ']', at end of sentence: Sentences. (line 18) +-* ']', at end of sentence <1>: Using Symbols. (line 275) +-* ']', ending an identifier: Identifiers. (line 75) +-* ']', ending an identifier <1>: Escapes. (line 20) +-* ']', macro names starting with, and 'refer': Identifiers. (line 46) +-* '|', and page motion: Expressions. (line 70) +-* aborting ('ab'): Debugging. (line 40) +-* absolute position operator ('|'): Expressions. (line 70) +-* accent marks ['ms']: ms Strings and Special Characters. +- (line 6) +-* access of postprocessor: Postprocessor Access. +- (line 6) +-* accessing unnamed glyphs with '\N': Font File Format. (line 51) +-* activating kerning ('kern'): Ligatures and Kerning. +- (line 42) +-* activating ligatures ('lg'): Ligatures and Kerning. +- (line 24) +-* activating track kerning ('tkf'): Ligatures and Kerning. +- (line 60) +-* 'ad' request, and hyphenation margin: Manipulating Hyphenation. +- (line 211) +-* 'ad' request, and hyphenation space: Manipulating Hyphenation. +- (line 227) +-* adjusting: Filling and Adjusting. +- (line 6) +-* adjusting and filling, manipulating: Manipulating Filling and Adjusting. +- (line 6) +-* adjustment mode register ('.j'): Manipulating Filling and Adjusting. +- (line 114) +-* adobe glyph list (AGL): Using Symbols. (line 88) +-* AGL (adobe glyph list): Using Symbols. (line 88) +-* alias, diversion, creating ('als'): Strings. (line 229) +-* alias, diversion, removing ('rm'): Strings. (line 263) +-* alias, macro, creating ('als'): Strings. (line 229) +-* alias, macro, removing ('rm'): Strings. (line 263) +-* alias, number register, creating ('aln'): Setting Registers. +- (line 112) +-* alias, string, creating ('als'): Strings. (line 229) +-* alias, string, removing ('rm'): Strings. (line 263) +-* 'als' request, and '\$0': Parameters. (line 71) +-* 'am', 'am1', 'ami' requests, and warnings: Warnings. (line 54) +-* annotations: Footnotes and Annotations. +- (line 6) +-* appending to a diversion ('da'): Diversions. (line 22) +-* appending to a file ('opena'): I/O. (line 200) +-* appending to a macro ('am'): Writing Macros. (line 116) +-* appending to a string ('as'): Strings. (line 176) +-* arc, drawing ('\D'a ...''): Drawing Requests. (line 128) +-* argument delimiting characters: Escapes. (line 29) +-* arguments to macros, and tabs: Request and Macro Arguments. +- (line 6) +-* arguments to requests and macros: Request and Macro Arguments. +- (line 6) +-* arguments, and compatibility mode: Gtroff Internals. (line 91) +-* arguments, macro ('\$'): Parameters. (line 21) +-* arguments, of strings: Strings. (line 19) +-* arithmetic operators: Expressions. (line 8) +-* artificial fonts: Artificial Fonts. (line 6) +-* 'as', 'as1' requests, and comments: Comments. (line 16) +-* 'as', 'as1' requests, and warnings: Warnings. (line 54) +-* ASCII approximation output register ('.A'): Groff Options. (line 51) +-* ASCII approximation output register ('.A') <1>: Built-in Registers. +- (line 106) +-* ASCII, output encoding: Groff Options. (line 250) +-* 'asciify' request, and 'writem': I/O. (line 222) +-* assigning formats ('af'): Assigning Formats. (line 6) +-* assignments, indirect: Interpolating Registers. +- (line 11) +-* assignments, nested: Interpolating Registers. +- (line 11) +-* AT&T 'troff', 'ms' macro package differences: Differences from AT&T ms. +- (line 6) +-* auto-increment: Auto-increment. (line 6) +-* auto-increment, and 'ig' request: Comments. (line 85) +-* available glyphs, list ('groff_char(7)' man page): Using Symbols. +- (line 76) +-* background color name register ('.M'): Colors. (line 94) +-* backslash, printing ('\\', '\e', '\E', '\[rs]'): Escapes. (line 74) +-* backslash, printing ('\\', '\e', '\E', '\[rs]') <1>: Implementation Differences. +- (line 106) +-* backspace character: Identifiers. (line 12) +-* backspace character, and translations: Character Translations. +- (line 169) +-* backtrace of input stack ('backtrace'): Debugging. (line 96) +-* baseline: Sizes. (line 6) +-* basic unit ('u'): Measurements. (line 6) +-* basics of macros: Basics. (line 6) +-* 'bd' request, and font styles: Font Families. (line 59) +-* 'bd' request, and font translations: Changing Fonts. (line 55) +-* 'bd' request, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 86) +-* begin of conditional block ('\{'): if-else. (line 35) +-* beginning diversion ('di'): Diversions. (line 22) +-* blank line: Implicit Line Breaks. +- (line 10) +-* blank line <1>: Requests. (line 27) +-* blank line ('sp'): Basics. (line 93) +-* blank line macro ('blm'): Implicit Line Breaks. +- (line 10) +-* blank line macro ('blm') <1>: Requests. (line 27) +-* blank line macro ('blm') <2>: Blank Line Traps. (line 7) +-* blank line traps: Blank Line Traps. (line 6) +-* blank lines, disabling: Manipulating Spacing. +- (line 123) +-* block, conditional, begin ('\{'): if-else. (line 35) +-* block, condititional, end ('\}'): if-else. (line 35) +-* bold face ['man']: Man font macros. (line 14) +-* bold face, imitating ('bd'): Artificial Fonts. (line 98) +-* bottom margin: Page Layout. (line 20) +-* bounding box: Miscellaneous. (line 139) +-* box rule glyph ('\[br]'): Drawing Requests. (line 50) +-* 'box', 'boxa' requests, and warnings: Warnings. (line 54) +-* 'boxa' request, and 'dn' ('dl'): Diversions. (line 93) +-* 'bp' request, and top-level diversion: Page Control. (line 24) +-* 'bp' request, and traps ('.pe'): Page Location Traps. (line 143) +-* 'bp' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'bp' request, using '+' and '-': Expressions. (line 75) +-* 'br' glyph, and 'cflags': Using Symbols. (line 271) +-* break: Basics. (line 48) +-* break <1>: Manipulating Filling and Adjusting. +- (line 6) +-* break ('br'): Basics. (line 118) +-* 'break' request, in a 'while' loop: while. (line 68) +-* break, implicit: Implicit Line Breaks. +- (line 6) +-* built-in registers: Built-in Registers. (line 6) +-* bulleted list, example markup ['ms']: Lists in ms. (line 21) +-* 'c' unit: Measurements. (line 27) +-* calling convention of preprocessors: Preprocessors in man pages. +- (line 6) +-* capabilities of 'groff': groff Capabilities. (line 6) +-* 'ce' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'ce' request, difference to '.ad c': Manipulating Filling and Adjusting. +- (line 66) +-* centered text: Manipulating Filling and Adjusting. +- (line 66) +-* centering lines ('ce'): Basics. (line 105) +-* centering lines ('ce') <1>: Manipulating Filling and Adjusting. +- (line 204) +-* centimeter unit ('c'): Measurements. (line 27) +-* 'cf' request, and copy-in mode: I/O. (line 50) +-* 'cf' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* changing font family ('fam', '\F'): Font Families. (line 25) +-* changing font position ('\f'): Font Positions. (line 60) +-* changing font style ('sty'): Font Families. (line 59) +-* changing fonts ('ft', '\f'): Changing Fonts. (line 11) +-* changing format, and read-only registers: Assigning Formats. +- (line 68) +-* changing the font height ('\H'): Artificial Fonts. (line 16) +-* changing the font slant ('\S'): Artificial Fonts. (line 45) +-* changing the page number character ('pc'): Page Layout. (line 94) +-* changing trap location ('ch'): Page Location Traps. (line 111) +-* changing type sizes ('ps', '\s'): Changing Type Sizes. (line 11) +-* changing vertical line spacing ('vs'): Changing Type Sizes. (line 88) +-* 'char' request, and soft hyphen character: Manipulating Hyphenation. +- (line 243) +-* 'char' request, and translations: Character Translations. +- (line 160) +-* 'char' request, used with '\N': Using Symbols. (line 201) +-* character: Using Symbols. (line 6) +-* character class ('class'): Character Classes. (line 12) +-* character classes: Character Classes. (line 6) +-* character properties ('cflags'): Using Symbols. (line 237) +-* character translations: Character Translations. +- (line 6) +-* character, backspace: Identifiers. (line 12) +-* character, backspace, and translations: Character Translations. +- (line 169) +-* character, control ('.'): Requests. (line 6) +-* character, control, changing ('cc'): Character Translations. +- (line 6) +-* character, defining ('char'): Using Symbols. (line 326) +-* character, defining fallback ('fchar', 'fschar', 'schar'): Using Symbols. +- (line 326) +-* character, escape, changing ('ec'): Character Translations. +- (line 47) +-* character, escape, while defining glyph: Using Symbols. (line 326) +-* character, field delimiting ('fc'): Fields. (line 6) +-* character, field padding ('fc'): Fields. (line 6) +-* character, hyphenation ('\%'): Manipulating Hyphenation. +- (line 85) +-* character, leader repetition ('lc'): Leaders. (line 23) +-* character, leader, and translations: Character Translations. +- (line 169) +-* character, leader, non-interpreted ('\a'): Leaders. (line 18) +-* character, named ('\C'): Using Symbols. (line 185) +-* character, newline: Escapes. (line 69) +-* character, newline, and translations: Character Translations. +- (line 169) +-* character, no-break control ('''): Requests. (line 6) +-* character, no-break control, changing ('c2'): Character Translations. +- (line 6) +-* character, soft hyphen, setting ('shc'): Manipulating Hyphenation. +- (line 243) +-* character, space: Escapes. (line 69) +-* character, special: Character Translations. +- (line 160) +-* character, tab: Escapes. (line 69) +-* character, tab repetition ('tc'): Tabs and Fields. (line 129) +-* character, tab, and translations: Character Translations. +- (line 169) +-* character, tab, non-interpreted ('\t'): Tabs and Fields. (line 10) +-* character, tabulator: Tab Stops. (line 6) +-* character, transparent: Sentences. (line 18) +-* character, transparent <1>: Using Symbols. (line 275) +-* character, whitespace: Identifiers. (line 10) +-* character, zero width space ('\&'): Requests. (line 47) +-* character, zero width space ('\&') <1>: Ligatures and Kerning. +- (line 47) +-* character, zero width space ('\&') <2>: Drawing Requests. (line 32) +-* characters, argument delimiting: Escapes. (line 29) +-* characters, end-of-sentence: Using Symbols. (line 247) +-* characters, hyphenation: Using Symbols. (line 251) +-* characters, input, and output glyphs, compatibility with AT&T 'troff': Implementation Differences. +- (line 86) +-* characters, invalid for 'trf' request: I/O. (line 73) +-* characters, invalid input: Identifiers. (line 15) +-* characters, overlapping: Using Symbols. (line 265) +-* characters, special: Special Characters. (line 6) +-* characters, unnamed, accessing with '\N': Font File Format. (line 51) +-* 'chem', the program: gchem. (line 6) +-* circle, drawing ('\D'c ...''): Drawing Requests. (line 109) +-* circle, solid, drawing ('\D'C ...''): Drawing Requests. (line 114) +-* class of characters ('class'): Character Classes. (line 12) +-* classes, character: Character Classes. (line 6) +-* closing file ('close'): I/O. (line 231) +-* code, hyphenation ('hcode'): Manipulating Hyphenation. +- (line 175) +-* color name, background, register ('.M'): Colors. (line 94) +-* color name, drawing, register ('.m'): Colors. (line 67) +-* color name, fill, register ('.M'): Colors. (line 94) +-* color, default: Colors. (line 26) +-* colors: Colors. (line 6) +-* colors, fill, unnamed ('\D'F...''): Drawing Requests. (line 216) +-* command prefix: Environment. (line 14) +-* command-line options: Groff Options. (line 50) +-* commands, embedded: Embedded Commands. (line 6) +-* comments: Comments. (line 6) +-* comments in font files: Font File Format. (line 36) +-* comments, lining up with tabs: Comments. (line 21) +-* comments, with 'ds': Strings. (line 45) +-* common features: Common Features. (line 6) +-* common name space of macros, diversions, and strings: Strings. +- (line 92) +-* comparison of strings: Operators in Conditionals. +- (line 47) +-* comparison operators: Expressions. (line 15) +-* compatibility mode: Warnings. (line 91) +-* compatibility mode <1>: Implementation Differences. +- (line 6) +-* compatibility mode, and parameters: Gtroff Internals. (line 91) +-* composite glyph names: Using Symbols. (line 88) +-* conditional block, begin ('\{'): if-else. (line 35) +-* conditional block, end ('\}'): if-else. (line 35) +-* conditional output for terminal (TTY): Operators in Conditionals. +- (line 14) +-* conditional page break ('ne'): Page Control. (line 33) +-* conditionals and loops: Conditionals and Loops. +- (line 6) +-* consecutive hyphenated lines ('hlm'): Manipulating Hyphenation. +- (line 47) +-* constant glyph space mode ('cs'): Artificial Fonts. (line 126) +-* contents, table of: Table of Contents. (line 6) +-* contents, table of <1>: Leaders. (line 29) +-* continuation, input line ('\'): Line Control. (line 36) +-* continuation, output line ('\c'): Line Control. (line 36) +-* 'continue' request, in a 'while' loop: while. (line 68) +-* continuous underlining ('cu'): Artificial Fonts. (line 86) +-* control character ('.'): Requests. (line 6) +-* control character, changing ('cc'): Character Translations. +- (line 6) +-* control character, no-break ('''): Requests. (line 6) +-* control character, no-break, changing ('c2'): Character Translations. +- (line 6) +-* control sequences, for terminals: Invoking grotty. (line 50) +-* control, line: Line Control. (line 6) +-* control, page: Page Control. (line 6) +-* conventions for input: Input Conventions. (line 6) +-* copy mode: Copy-in Mode. (line 6) +-* copy-in mode: Copy-in Mode. (line 6) +-* copy-in mode, and 'cf' request: I/O. (line 50) +-* copy-in mode, and 'device' request: Postprocessor Access. +- (line 19) +-* copy-in mode, and 'ig' request: Comments. (line 85) +-* copy-in mode, and 'length' request: Strings. (line 211) +-* copy-in mode, and macro arguments: Parameters. (line 21) +-* copy-in mode, and 'output' request: Diversions. (line 179) +-* copy-in mode, and 'tm' request: Debugging. (line 30) +-* copy-in mode, and 'tm1' request: Debugging. (line 30) +-* copy-in mode, and 'tmc' request: Debugging. (line 30) +-* copy-in mode, and 'trf' request: I/O. (line 50) +-* copy-in mode, and 'write' request: I/O. (line 212) +-* copy-in mode, and 'writec' request: I/O. (line 212) +-* copy-in mode, and 'writem' request: I/O. (line 225) +-* copy-in mode, and '\!': Diversions. (line 148) +-* copy-in mode, and '\?': Operators in Conditionals. +- (line 55) +-* copy-in mode, and '\?' <1>: Diversions. (line 148) +-* copy-in mode, and '\a': Leaders. (line 18) +-* copy-in mode, and '\E': Character Translations. +- (line 81) +-* copy-in mode, and '\t': Tabs and Fields. (line 10) +-* copy-in mode, and '\V': I/O. (line 249) +-* copying environment ('evc'): Environments. (line 70) +-* correction between italic and roman glyph ('\/', '\,'): Ligatures and Kerning. +- (line 80) +-* correction, italic ('\/'): Ligatures and Kerning. +- (line 80) +-* correction, left italic ('\,'): Ligatures and Kerning. +- (line 91) +-* cover page macros, ['ms']: ms Cover Page Macros. +- (line 6) +-* 'cp' request, and glyph definitions: Using Symbols. (line 326) +-* cp1047, input encoding: Input Encodings. (line 9) +-* cp1047, output encoding: Groff Options. (line 264) +-* 'cq' glyph, at end of sentence: Sentences. (line 18) +-* 'cq' glyph, at end of sentence <1>: Using Symbols. (line 275) +-* creating alias, for diversion ('als'): Strings. (line 229) +-* creating alias, for macro ('als'): Strings. (line 229) +-* creating alias, for number register ('aln'): Setting Registers. +- (line 112) +-* creating alias, for string ('als'): Strings. (line 229) +-* creating new characters ('char'): Using Symbols. (line 326) +-* credits: Credits. (line 6) +-* 'cs' request, and font styles: Font Families. (line 59) +-* 'cs' request, and font translations: Changing Fonts. (line 55) +-* 'cs' request, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 86) +-* 'cs' request, with fractional type sizes: Fractional Type Sizes. +- (line 6) +-* current directory: Macro Directories. (line 21) +-* current input file name register ('.F'): Built-in Registers. +- (line 12) +-* current page number ('%'): Page Control. (line 27) +-* current time: I/O. (line 175) +-* current time, hours ('hours'): Built-in Registers. (line 41) +-* current time, minutes ('minutes'): Built-in Registers. (line 37) +-* current time, seconds ('seconds'): Built-in Registers. (line 31) +-* current vertical position ('nl'): Page Control. (line 67) +-* 'da' request, and 'dn' ('dl'): Diversions. (line 93) +-* 'da' request, and warnings: Warnings. (line 49) +-* 'da' request, and warnings <1>: Warnings. (line 54) +-* date, day of the month register ('dy'): Built-in Registers. (line 48) +-* date, day of the week register ('dw'): Built-in Registers. (line 45) +-* date, month of the year register ('mo'): Built-in Registers. +- (line 51) +-* date, year register ('year', 'yr'): Built-in Registers. (line 54) +-* day of the month register ('dy'): Built-in Registers. (line 48) +-* day of the week register ('dw'): Built-in Registers. (line 45) +-* 'de' request, and 'while': while. (line 22) +-* 'de', 'de1', 'dei' requests, and warnings: Warnings. (line 54) +-* debugging: Debugging. (line 6) +-* default color: Colors. (line 26) +-* default indentation ['man']: Miscellaneous man macros. +- (line 6) +-* default indentation, resetting ['man']: Man usage. (line 127) +-* default units: Default Units. (line 6) +-* defining character ('char'): Using Symbols. (line 326) +-* defining character class ('class'): Character Classes. (line 12) +-* defining fallback character ('fchar', 'fschar', 'schar'): Using Symbols. +- (line 326) +-* defining glyph ('char'): Using Symbols. (line 326) +-* defining symbol ('char'): Using Symbols. (line 326) +-* delayed text: Footnotes and Annotations. +- (line 10) +-* delimited arguments, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 47) +-* delimiting character, for fields ('fc'): Fields. (line 6) +-* delimiting characters for arguments: Escapes. (line 29) +-* depth, of last glyph ('.cdp'): Environments. (line 95) +-* 'DESC' file, format: DESC File Format. (line 6) +-* 'device' request, and copy-in mode: Postprocessor Access. +- (line 19) +-* device resolution: DESC File Format. (line 85) +-* devices for output: Output device intro. (line 6) +-* devices for output <1>: Output Devices. (line 6) +-* 'dg' glyph, at end of sentence: Sentences. (line 18) +-* 'dg' glyph, at end of sentence <1>: Using Symbols. (line 275) +-* 'di' request, and warnings: Warnings. (line 49) +-* 'di' request, and warnings <1>: Warnings. (line 54) +-* differences in implementation: Implementation Differences. +- (line 6) +-* digit width space ('\0'): Page Motions. (line 138) +-* digits, and delimiters: Escapes. (line 65) +-* dimensions, line: Line Layout. (line 6) +-* directories for fonts: Font Directories. (line 6) +-* directories for macros: Macro Directories. (line 6) +-* directory, current: Macro Directories. (line 21) +-* directory, for tmac files: Macro Directories. (line 11) +-* directory, home: Macro Directories. (line 24) +-* directory, platform-specific: Macro Directories. (line 26) +-* directory, site-specific: Macro Directories. (line 26) +-* directory, site-specific <1>: Font Directories. (line 29) +-* disabling hyphenation ('\%'): Manipulating Hyphenation. +- (line 85) +-* disabling '\' ('eo'): Character Translations. +- (line 24) +-* discardable horizontal space: Manipulating Filling and Adjusting. +- (line 183) +-* discarded space in traps: Manipulating Spacing. +- (line 53) +-* displays: Displays. (line 6) +-* displays ['ms']: ms Displays and Keeps. +- (line 6) +-* displays, and footnotes ['ms']: ms Footnotes. (line 24) +-* distance to next trap register ('.t'): Page Location Traps. (line 102) +-* 'ditroff', the program: History. (line 59) +-* diversion name register ('.z'): Diversions. (line 69) +-* diversion trap, setting ('dt'): Diversion Traps. (line 7) +-* diversion traps: Diversion Traps. (line 6) +-* diversion, appending ('da'): Diversions. (line 22) +-* diversion, beginning ('di'): Diversions. (line 22) +-* diversion, creating alias ('als'): Strings. (line 229) +-* diversion, ending ('di'): Diversions. (line 22) +-* diversion, nested: Diversions. (line 69) +-* diversion, removing ('rm'): Strings. (line 224) +-* diversion, removing alias ('rm'): Strings. (line 263) +-* diversion, renaming ('rn'): Strings. (line 221) +-* diversion, stripping final newline: Strings. (line 157) +-* diversion, top-level: Diversions. (line 12) +-* diversion, top-level, and 'bp': Page Control. (line 24) +-* diversion, top-level, and '\!': Diversions. (line 171) +-* diversion, top-level, and '\?': Diversions. (line 176) +-* diversion, unformatting ('asciify'): Diversions. (line 195) +-* diversion, vertical position in, register ('.d'): Diversions. +- (line 69) +-* diversions: Diversions. (line 6) +-* diversions, and traps: Page Location Traps. (line 166) +-* diversions, shared name space with macros and strings: Strings. +- (line 92) +-* 'dl' register, and 'da' ('boxa'): Diversions. (line 93) +-* 'dn' register, and 'da' ('boxa'): Diversions. (line 93) +-* documents, multi-file: Debugging. (line 10) +-* documents, structuring the source code: Requests. (line 14) +-* double quote, in a macro argument: Request and Macro Arguments. +- (line 25) +-* double-spacing ('ls'): Basics. (line 82) +-* double-spacing ('ls') <1>: Manipulating Spacing. +- (line 64) +-* double-spacing ('vs', 'pvs'): Changing Type Sizes. (line 125) +-* drawing a circle ('\D'c ...''): Drawing Requests. (line 109) +-* drawing a line ('\D'l ...''): Drawing Requests. (line 80) +-* drawing a polygon ('\D'p ...''): Drawing Requests. (line 158) +-* drawing a solid circle ('\D'C ...''): Drawing Requests. (line 114) +-* drawing a solid ellipse ('\D'E ...''): Drawing Requests. (line 124) +-* drawing a solid polygon ('\D'P ...''): Drawing Requests. (line 167) +-* drawing a spline ('\D'~ ...''): Drawing Requests. (line 136) +-* drawing an arc ('\D'a ...''): Drawing Requests. (line 128) +-* drawing an ellipse ('\D'e ...''): Drawing Requests. (line 118) +-* drawing color name register ('.m'): Colors. (line 67) +-* drawing horizontal lines ('\l'): Drawing Requests. (line 17) +-* drawing requests: Drawing Requests. (line 6) +-* drawing vertical lines ('\L'): Drawing Requests. (line 50) +-* 'ds' request, and comments: Strings. (line 45) +-* 'ds' request, and double quotes: Request and Macro Arguments. +- (line 69) +-* 'ds' request, and leading spaces: Strings. (line 57) +-* 'ds', 'ds1' requests, and comments: Comments. (line 16) +-* 'ds', 'ds1' requests, and warnings: Warnings. (line 54) +-* dumping environments ('pev'): Debugging. (line 62) +-* dumping number registers ('pnr'): Debugging. (line 77) +-* dumping symbol table ('pm'): Debugging. (line 66) +-* dumping traps ('ptr'): Debugging. (line 81) +-* EBCDIC encoding: Tab Stops. (line 6) +-* EBCDIC encoding of a tab: Tabs and Fields. (line 6) +-* EBCDIC encoding of backspace: Identifiers. (line 12) +-* EBCDIC, input encoding: Input Encodings. (line 9) +-* EBCDIC, output encoding: Groff Options. (line 264) +-* 'el' request, and warnings: Warnings. (line 32) +-* ellipse, drawing ('\D'e ...''): Drawing Requests. (line 118) +-* ellipse, solid, drawing ('\D'E ...''): Drawing Requests. (line 124) +-* 'em' glyph, and 'cflags': Using Symbols. (line 258) +-* em unit ('m'): Measurements. (line 50) +-* embedded commands: Embedded Commands. (line 6) +-* embedding PDF: Embedding PDF. (line 6) +-* embedding PostScript: Embedding PostScript. +- (line 6) +-* embolding of special fonts: Artificial Fonts. (line 115) +-* empty line: Implicit Line Breaks. +- (line 10) +-* empty line ('sp'): Basics. (line 93) +-* empty space before a paragraph ['man']: Miscellaneous man macros. +- (line 15) +-* en unit ('n'): Measurements. (line 55) +-* enabling vertical position traps ('vpt'): Page Location Traps. +- (line 18) +-* encoding, EBCDIC: Tab Stops. (line 6) +-* encoding, input, cp1047: Input Encodings. (line 9) +-* encoding, input, EBCDIC: Input Encodings. (line 9) +-* encoding, input, latin-1 (ISO 8859-1): Input Encodings. (line 14) +-* encoding, input, latin-2 (ISO 8859-2): Input Encodings. (line 18) +-* encoding, input, latin-5 (ISO 8859-9): Input Encodings. (line 23) +-* encoding, input, latin-9 (latin-0, ISO 8859-15): Input Encodings. +- (line 28) +-* encoding, output, ASCII: Groff Options. (line 250) +-* encoding, output, cp1047: Groff Options. (line 264) +-* encoding, output, EBCDIC: Groff Options. (line 264) +-* encoding, output, latin-1 (ISO 8859-1): Groff Options. (line 254) +-* encoding, output, utf-8: Groff Options. (line 259) +-* end of conditional block ('\}'): if-else. (line 35) +-* end-of-input macro ('em'): End-of-input Traps. (line 7) +-* end-of-input trap, setting ('em'): End-of-input Traps. (line 7) +-* end-of-input traps: End-of-input Traps. (line 6) +-* end-of-sentence characters: Using Symbols. (line 247) +-* ending diversion ('di'): Diversions. (line 22) +-* environment number/name register ('.ev'): Environments. (line 39) +-* environment variables: Environment. (line 6) +-* environment, copying ('evc'): Environments. (line 70) +-* environment, dimensions of last glyph ('.w', '.cht', '.cdp', '.csk'): Environments. +- (line 95) +-* environment, previous line length ('.n'): Environments. (line 110) +-* environment, switching ('ev'): Environments. (line 39) +-* environments: Environments. (line 6) +-* environments, dumping ('pev'): Debugging. (line 62) +-* 'eqn', the program: geqn. (line 6) +-* equations ['ms']: ms Insertions. (line 6) +-* escape character, changing ('ec'): Character Translations. +- (line 47) +-* escape character, while defining glyph: Using Symbols. (line 326) +-* escapes: Escapes. (line 6) +-* escaping newline characters, in strings: Strings. (line 63) +-* 'ex' request, use in debugging: Debugging. (line 45) +-* 'ex' request, used with 'nx' and 'rd': I/O. (line 122) +-* example markup, bulleted list ['ms']: Lists in ms. (line 21) +-* example markup, glossary-style list ['ms']: Lists in ms. (line 65) +-* example markup, multi-page table ['ms']: Example multi-page table. +- (line 6) +-* example markup, numbered list ['ms']: Lists in ms. (line 41) +-* example markup, title page: ms Cover Page Macros. +- (line 66) +-* examples of invocation: Invocation Examples. (line 6) +-* exiting ('ex'): Debugging. (line 45) +-* expansion of strings ('\*'): Strings. (line 19) +-* explicit hyphen ('\%'): Manipulating Hyphenation. +- (line 47) +-* expression, limitation of logical not in: Expressions. (line 27) +-* expression, order of evaluation: Expressions. (line 59) +-* expressions: Expressions. (line 6) +-* expressions, and space characters: Expressions. (line 86) +-* extra post-vertical line space ('\x'): Changing Type Sizes. (line 118) +-* extra post-vertical line space register ('.a'): Manipulating Spacing. +- (line 94) +-* extra pre-vertical line space ('\x'): Changing Type Sizes. (line 109) +-* extra spaces: Filling and Adjusting. +- (line 10) +-* extremum operators ('>?', ': Manipulating Filling and Adjusting. +- (line 156) +-* fill mode <2>: Warnings. (line 23) +-* fill mode ('fi'): Manipulating Filling and Adjusting. +- (line 29) +-* fill mode, and '\c': Line Control. (line 69) +-* filling: Filling and Adjusting. +- (line 6) +-* filling and adjusting, manipulating: Manipulating Filling and Adjusting. +- (line 6) +-* final newline, stripping in diversions: Strings. (line 157) +-* 'fl' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* floating keep: Displays. (line 23) +-* flush output ('fl'): Debugging. (line 87) +-* font description file, format: DESC File Format. (line 6) +-* font description file, format <1>: Font File Format. (line 6) +-* font directories: Font Directories. (line 6) +-* font families: Font Families. (line 6) +-* font family, changing ('fam', '\F'): Font Families. (line 25) +-* font file, format: Font File Format. (line 6) +-* font files: Font Files. (line 6) +-* font files, comments: Font File Format. (line 36) +-* font for underlining ('uf'): Artificial Fonts. (line 90) +-* font height, changing ('\H'): Artificial Fonts. (line 16) +-* font path: Font Directories. (line 14) +-* font position register ('.f'): Font Positions. (line 20) +-* font position, changing ('\f'): Font Positions. (line 60) +-* font positions: Font Positions. (line 6) +-* font selection ['man']: Man font macros. (line 6) +-* font slant, changing ('\S'): Artificial Fonts. (line 45) +-* font style, changing ('sty'): Font Families. (line 59) +-* font styles: Font Families. (line 6) +-* font translation ('ftr'): Changing Fonts. (line 55) +-* font, magnification ('fzoom'): Changing Fonts. (line 71) +-* font, mounting ('fp'): Font Positions. (line 13) +-* font, optical size: Changing Fonts. (line 71) +-* font, previous ('ft', '\f[]', '\fP'): Changing Fonts. (line 23) +-* font, zoom factor ('fzoom'): Changing Fonts. (line 71) +-* fonts: Fonts and Symbols. (line 6) +-* fonts <1>: Changing Fonts. (line 6) +-* fonts, artificial: Artificial Fonts. (line 6) +-* fonts, changing ('ft', '\f'): Changing Fonts. (line 11) +-* fonts, PostScript: Font Families. (line 11) +-* fonts, searching: Font Directories. (line 6) +-* fonts, special: Special Fonts. (line 6) +-* footers: Page Layout. (line 31) +-* footers <1>: Page Location Traps. (line 38) +-* footers ['ms']: ms Headers and Footers. +- (line 6) +-* footnotes: Footnotes and Annotations. +- (line 6) +-* footnotes ['ms']: ms Footnotes. (line 6) +-* footnotes, and displays ['ms']: ms Footnotes. (line 24) +-* footnotes, and keeps ['ms']: ms Footnotes. (line 24) +-* form letters: I/O. (line 106) +-* format of font description file: DESC File Format. (line 6) +-* format of font description files: Font File Format. (line 6) +-* format of font files: Font File Format. (line 6) +-* format of register ('\g'): Assigning Formats. (line 75) +-* formats, assigning ('af'): Assigning Formats. (line 6) +-* formats, file: File formats. (line 6) +-* 'fp' request, and font translations: Changing Fonts. (line 55) +-* 'fp' request, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 86) +-* fractional point sizes: Fractional Type Sizes. +- (line 6) +-* fractional point sizes <1>: Implementation Differences. +- (line 76) +-* fractional type sizes: Fractional Type Sizes. +- (line 6) +-* fractional type sizes <1>: Implementation Differences. +- (line 76) +-* french-spacing: Sentences. (line 12) +-* 'fspecial' request, and font styles: Font Families. (line 59) +-* 'fspecial' request, and font translations: Changing Fonts. (line 55) +-* 'fspecial' request, and glyph search order: Using Symbols. (line 14) +-* 'fspecial' request, and imitating bold: Artificial Fonts. (line 115) +-* 'ft' request, and font translations: Changing Fonts. (line 55) +-* 'gchem', invoking: Invoking gchem. (line 5) +-* 'gchem', the program: gchem. (line 6) +-* 'geqn', invoking: Invoking geqn. (line 5) +-* 'geqn', the program: geqn. (line 6) +-* GGL (groff glyph list): Using Symbols. (line 88) +-* GGL (groff glyph list) <1>: Character Classes. (line 32) +-* 'ggrn', invoking: Invoking ggrn. (line 5) +-* 'ggrn', the program: ggrn. (line 6) +-* glossary-style list, example markup ['ms']: Lists in ms. (line 65) +-* glyph: Using Symbols. (line 6) +-* glyph for line drawing: Drawing Requests. (line 50) +-* glyph names, composite: Using Symbols. (line 88) +-* glyph pile ('\b'): Drawing Requests. (line 232) +-* glyph properties ('cflags'): Using Symbols. (line 237) +-* glyph, box rule ('\[br]'): Drawing Requests. (line 50) +-* glyph, constant space: Artificial Fonts. (line 126) +-* glyph, defining ('char'): Using Symbols. (line 326) +-* glyph, for line drawing: Drawing Requests. (line 28) +-* glyph, for margins ('mc'): Miscellaneous. (line 75) +-* glyph, italic correction ('\/'): Ligatures and Kerning. +- (line 80) +-* glyph, last, dimensions ('.w', '.cht', '.cdp', '.csk'): Environments. +- (line 95) +-* glyph, leader repetition ('lc'): Leaders. (line 23) +-* glyph, left italic correction ('\,'): Ligatures and Kerning. +- (line 91) +-* glyph, numbered ('\N'): Character Translations. +- (line 160) +-* glyph, numbered ('\N') <1>: Using Symbols. (line 201) +-* glyph, removing definition ('rchar', 'rfschar'): Using Symbols. +- (line 382) +-* glyph, soft hyphen ('hy'): Manipulating Hyphenation. +- (line 243) +-* glyph, tab repetition ('tc'): Tabs and Fields. (line 129) +-* glyph, underscore ('\[ru]'): Drawing Requests. (line 28) +-* glyphs, available, list ('groff_char(7)' man page): Using Symbols. +- (line 76) +-* glyphs, output, and input characters, compatibility with AT&T 'troff': Implementation Differences. +- (line 86) +-* glyphs, overstriking ('\o'): Page Motions. (line 216) +-* glyphs, unnamed: Using Symbols. (line 212) +-* glyphs, unnamed, accessing with '\N': Font File Format. (line 51) +-* GNU-specific register ('.g'): Built-in Registers. (line 102) +-* 'gpic', invoking: Invoking gpic. (line 5) +-* 'gpic', the program: gpic. (line 6) +-* 'grap', the program: grap. (line 6) +-* gray shading ('\D'f ...''): Drawing Requests. (line 141) +-* 'grefer', invoking: Invoking grefer. (line 5) +-* 'grefer', the program: grefer. (line 6) +-* 'grn', the program: ggrn. (line 6) +-* 'grodvi', invoking: Invoking grodvi. (line 6) +-* 'grodvi', the program: grodvi. (line 6) +-* 'groff' - what is it?: What Is groff?. (line 6) +-* 'groff' capabilities: groff Capabilities. (line 6) +-* groff glyph list (GGL): Using Symbols. (line 88) +-* groff glyph list (GGL) <1>: Character Classes. (line 32) +-* 'groff' invocation: Invoking groff. (line 6) +-* 'groff', and 'pi' request: I/O. (line 159) +-* GROFF_BIN_PATH, environment variable: Environment. (line 10) +-* GROFF_COMMAND_PREFIX, environment variable: Environment. (line 14) +-* GROFF_ENCODING, environment variable: Environment. (line 25) +-* GROFF_FONT_PATH, environment variable: Environment. (line 34) +-* GROFF_FONT_PATH, environment variable <1>: Font Directories. +- (line 26) +-* GROFF_TMAC_PATH, environment variable: Environment. (line 39) +-* GROFF_TMAC_PATH, environment variable <1>: Macro Directories. +- (line 18) +-* GROFF_TMPDIR, environment variable: Environment. (line 44) +-* GROFF_TYPESETTER, environment variable: Environment. (line 52) +-* 'grohtml', invoking: Invoking grohtml. (line 6) +-* 'grohtml', registers and strings: grohtml specific registers and strings. +- (line 6) +-* 'grohtml', the program: Groff Options. (line 275) +-* 'grohtml', the program <1>: grohtml. (line 6) +-* 'grolbp', invoking: Invoking grolbp. (line 6) +-* 'grolbp', the program: grolbp. (line 6) +-* 'grolj4', invoking: Invoking grolj4. (line 6) +-* 'grolj4', the program: grolj4. (line 6) +-* 'gropdf', invoking: Invoking gropdf. (line 6) +-* 'gropdf', the program: gropdf. (line 6) +-* 'grops', invoking: Invoking grops. (line 6) +-* 'grops', the program: grops. (line 6) +-* 'grotty', invoking: Invoking grotty. (line 6) +-* 'grotty', the program: grotty. (line 6) +-* 'gsoelim', invoking: Invoking gsoelim. (line 5) +-* 'gsoelim', the program: gsoelim. (line 6) +-* 'gtbl', invoking: Invoking gtbl. (line 5) +-* 'gtbl', the program: gtbl. (line 6) +-* 'gtroff', identification register ('.g'): Built-in Registers. +- (line 102) +-* 'gtroff', interactive use: Debugging. (line 87) +-* 'gtroff', output: gtroff Output. (line 6) +-* 'gtroff', process ID register ('$$'): Built-in Registers. (line 99) +-* 'gtroff', reference: gtroff Reference. (line 6) +-* 'gxditview', invoking: Invoking gxditview. (line 5) +-* 'gxditview', the program: gxditview. (line 6) +-* hanging indentation ['man']: Man usage. (line 98) +-* 'hcode' request, and glyph definitions: Using Symbols. (line 326) +-* headers: Page Layout. (line 31) +-* headers <1>: Page Location Traps. (line 38) +-* headers ['ms']: ms Headers and Footers. +- (line 6) +-* height, font, changing ('\H'): Artificial Fonts. (line 16) +-* height, of last glyph ('.cht'): Environments. (line 95) +-* high-water mark register ('.h'): Diversions. (line 76) +-* history: History. (line 6) +-* home directory: Macro Directories. (line 24) +-* horizontal discardable space: Manipulating Filling and Adjusting. +- (line 183) +-* horizontal input line position register ('hp'): Page Motions. +- (line 209) +-* horizontal input line position, saving ('\k'): Page Motions. +- (line 203) +-* horizontal line, drawing ('\l'): Drawing Requests. (line 17) +-* horizontal motion ('\h'): Page Motions. (line 103) +-* horizontal output line position register ('.k'): Page Motions. +- (line 212) +-* horizontal resolution: DESC File Format. (line 25) +-* horizontal resolution register ('.H'): Built-in Registers. (line 15) +-* horizontal space ('\h'): Page Motions. (line 103) +-* horizontal space, unformatting: Strings. (line 157) +-* hours, current time ('hours'): Built-in Registers. (line 41) +-* 'hpf' request, and hyphenation language: Manipulating Hyphenation. +- (line 256) +-* 'hw' request, and hyphenation language: Manipulating Hyphenation. +- (line 256) +-* 'hy' glyph, and 'cflags': Using Symbols. (line 258) +-* hyphen, explicit ('\%'): Manipulating Hyphenation. +- (line 47) +-* hyphenated lines, consecutive ('hlm'): Manipulating Hyphenation. +- (line 47) +-* hyphenating characters: Using Symbols. (line 251) +-* hyphenation: Hyphenation. (line 6) +-* hyphenation character ('\%'): Manipulating Hyphenation. +- (line 85) +-* hyphenation code ('hcode'): Manipulating Hyphenation. +- (line 175) +-* hyphenation language register ('.hla'): Manipulating Hyphenation. +- (line 263) +-* hyphenation margin ('hym'): Manipulating Hyphenation. +- (line 211) +-* hyphenation margin register ('.hym'): Manipulating Hyphenation. +- (line 222) +-* hyphenation patterns ('hpf'): Manipulating Hyphenation. +- (line 116) +-* hyphenation restrictions register ('.hy'): Manipulating Hyphenation. +- (line 30) +-* hyphenation space ('hys'): Manipulating Hyphenation. +- (line 227) +-* hyphenation space register ('.hys'): Manipulating Hyphenation. +- (line 239) +-* hyphenation, disabling ('\%'): Manipulating Hyphenation. +- (line 85) +-* hyphenation, manipulating: Manipulating Hyphenation. +- (line 6) +-* 'i' unit: Measurements. (line 22) +-* i/o: I/O. (line 6) +-* IBM cp1047 input encoding: Input Encodings. (line 9) +-* IBM cp1047 output encoding: Groff Options. (line 264) +-* identifiers: Identifiers. (line 6) +-* identifiers, undefined: Identifiers. (line 79) +-* 'ie' request, and font translations: Changing Fonts. (line 55) +-* 'ie' request, and warnings: Warnings. (line 32) +-* 'ie' request, operators to use with: Operators in Conditionals. +- (line 6) +-* 'if' request, and font translations: Changing Fonts. (line 55) +-* 'if' request, and the '!' operator: Expressions. (line 21) +-* 'if' request, operators to use with: Operators in Conditionals. +- (line 6) +-* if-else: if-else. (line 6) +-* 'ig' request, and auto-increment: Comments. (line 85) +-* 'ig' request, and copy-in mode: Comments. (line 85) +-* imitating bold face ('bd'): Artificial Fonts. (line 98) +-* implementation differences: Implementation Differences. +- (line 6) +-* implicit breaks of lines: Implicit Line Breaks. +- (line 6) +-* implicit line breaks: Implicit Line Breaks. +- (line 6) +-* 'in' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'in' request, using '+' and '-': Expressions. (line 75) +-* inch unit ('i'): Measurements. (line 22) +-* including a file ('so'): I/O. (line 9) +-* incompatibilities with AT&T 'troff': Implementation Differences. +- (line 6) +-* increment value without changing the register: Auto-increment. +- (line 52) +-* increment, automatic: Auto-increment. (line 6) +-* indentaion, resetting to default ['man']: Man usage. (line 127) +-* indentation ('in'): Line Layout. (line 25) +-* index, in macro package: Indices. (line 6) +-* indicator, scaling: Measurements. (line 6) +-* indirect assignments: Interpolating Registers. +- (line 11) +-* input and output requests: I/O. (line 6) +-* input characters and output glyphs, compatibility with AT&T 'troff': Implementation Differences. +- (line 86) +-* input characters, invalid: Identifiers. (line 15) +-* input conventions: Input Conventions. (line 6) +-* input encoding, cp1047: Input Encodings. (line 9) +-* input encoding, EBCDIC: Input Encodings. (line 9) +-* input encoding, latin-1 (ISO 8859-1): Input Encodings. (line 14) +-* input encoding, latin-2 (ISO 8859-2): Input Encodings. (line 18) +-* input encoding, latin-2 (ISO 8859-9): Input Encodings. (line 23) +-* input encoding, latin-9 (latin-9, ISO 8859-15): Input Encodings. +- (line 28) +-* input file name, current, register ('.F'): Built-in Registers. +- (line 12) +-* input level in delimited arguments: Implementation Differences. +- (line 47) +-* input line continuation ('\'): Line Control. (line 36) +-* input line number register ('.c', 'c.'): Built-in Registers. +- (line 77) +-* input line number, setting ('lf'): Debugging. (line 10) +-* input line position, horizontal, saving ('\k'): Page Motions. +- (line 203) +-* input line trap, setting ('it'): Input Line Traps. (line 8) +-* input line traps: Input Line Traps. (line 6) +-* input line traps and interrupted lines ('itc'): Input Line Traps. +- (line 24) +-* input line, horizontal position, register ('hp'): Page Motions. +- (line 209) +-* input stack, backtrace ('backtrace'): Debugging. (line 96) +-* input stack, setting limit: Debugging. (line 119) +-* input token: Gtroff Internals. (line 6) +-* input, 8-bit: Font File Format. (line 51) +-* input, standard, reading from ('rd'): I/O. (line 89) +-* inserting horizontal space ('\h'): Page Motions. (line 103) +-* installation: Installation. (line 5) +-* interactive use of 'gtroff': Debugging. (line 87) +-* intermediate output: gtroff Output. (line 16) +-* interpolating registers ('\n'): Interpolating Registers. +- (line 6) +-* interpolation of strings ('\*'): Strings. (line 19) +-* interrupted line: Line Control. (line 36) +-* interrupted line register ('.int'): Line Control. (line 81) +-* interrupted lines and input line traps ('itc'): Input Line Traps. +- (line 24) +-* introduction: Introduction. (line 6) +-* invalid characters for 'trf' request: I/O. (line 73) +-* invalid input characters: Identifiers. (line 15) +-* invocation examples: Invocation Examples. (line 6) +-* invoking 'gchem': Invoking gchem. (line 6) +-* invoking 'geqn': Invoking geqn. (line 6) +-* invoking 'ggrn': Invoking ggrn. (line 6) +-* invoking 'gpic': Invoking gpic. (line 6) +-* invoking 'grefer': Invoking grefer. (line 6) +-* invoking 'grodvi': Invoking grodvi. (line 6) +-* invoking 'groff': Invoking groff. (line 6) +-* invoking 'grohtml': Invoking grohtml. (line 6) +-* invoking 'grolbp': Invoking grolbp. (line 6) +-* invoking 'grolj4': Invoking grolj4. (line 6) +-* invoking 'gropdf': Invoking gropdf. (line 6) +-* invoking 'grops': Invoking grops. (line 6) +-* invoking 'grotty': Invoking grotty. (line 6) +-* invoking 'gsoelim': Invoking gsoelim. (line 6) +-* invoking 'gtbl': Invoking gtbl. (line 6) +-* invoking 'gxditview': Invoking gxditview. (line 6) +-* invoking 'preconv': Invoking preconv. (line 6) +-* ISO 6249 SGR: Invoking grotty. (line 50) +-* ISO 8859-1 (latin-1), input encoding: Input Encodings. (line 14) +-* ISO 8859-1 (latin-1), output encoding: Groff Options. (line 254) +-* ISO 8859-15 (latin-9, latin-0), input encoding: Input Encodings. +- (line 28) +-* ISO 8859-2 (latin-2), input encoding: Input Encodings. (line 18) +-* ISO 8859-9 (latin-2), input encoding: Input Encodings. (line 23) +-* italic correction ('\/'): Ligatures and Kerning. +- (line 80) +-* italic fonts ['man']: Man font macros. (line 52) +-* italic glyph, correction after roman glyph ('\,'): Ligatures and Kerning. +- (line 91) +-* italic glyph, correction before roman glyph ('\/'): Ligatures and Kerning. +- (line 80) +-* justifying text: Manipulating Filling and Adjusting. +- (line 6) +-* justifying text ('rj'): Manipulating Filling and Adjusting. +- (line 250) +-* keep: Displays. (line 18) +-* keep, floating: Displays. (line 23) +-* keeps ['ms']: ms Displays and Keeps. +- (line 6) +-* keeps, and footnotes ['ms']: ms Footnotes. (line 24) +-* kerning and ligatures: Ligatures and Kerning. +- (line 6) +-* kerning enabled register ('.kern'): Ligatures and Kerning. +- (line 42) +-* kerning, activating ('kern'): Ligatures and Kerning. +- (line 42) +-* kerning, track: Ligatures and Kerning. +- (line 53) +-* landscape page orientation: Paper Size. (line 6) +-* last glyph, dimensions ('.w', '.cht', '.cdp', '.csk'): Environments. +- (line 95) +-* last-requested point size registers ('.psr', '.sr'): Fractional Type Sizes. +- (line 45) +-* latin-1 (ISO 8859-1), input encoding: Input Encodings. (line 14) +-* latin-1 (ISO 8859-1), output encoding: Groff Options. (line 254) +-* latin-2 (ISO 8859-2), input encoding: Input Encodings. (line 18) +-* latin-2 (ISO 8859-9), input encoding: Input Encodings. (line 23) +-* latin-9 (latin-0, ISO 8859-15), input encoding: Input Encodings. +- (line 28) +-* layout, line: Line Layout. (line 6) +-* layout, page: Page Layout. (line 6) +-* 'lc' request, and glyph definitions: Using Symbols. (line 326) +-* leader character: Leaders. (line 12) +-* leader character, and translations: Character Translations. +- (line 169) +-* leader character, non-interpreted ('\a'): Leaders. (line 18) +-* leader repetition character ('lc'): Leaders. (line 23) +-* leaders: Leaders. (line 6) +-* leading: Sizes. (line 17) +-* leading spaces: Filling and Adjusting. +- (line 10) +-* leading spaces macro ('lsm'): Implicit Line Breaks. +- (line 15) +-* leading spaces macro ('lsm') <1>: Leading Spaces Traps. +- (line 9) +-* leading spaces traps: Leading Spaces Traps. +- (line 6) +-* leading spaces with 'ds': Strings. (line 57) +-* left italic correction ('\,'): Ligatures and Kerning. +- (line 91) +-* left margin ('po'): Line Layout. (line 21) +-* left margin, how to move ['man']: Man usage. (line 106) +-* length of a string ('length'): Strings. (line 211) +-* length of line ('ll'): Line Layout. (line 29) +-* length of page ('pl'): Page Layout. (line 13) +-* length of previous line ('.n'): Environments. (line 110) +-* length of title line ('lt'): Page Layout. (line 67) +-* 'length' request, and copy-in mode: Strings. (line 211) +-* letters, form: I/O. (line 106) +-* level of warnings ('warn'): Debugging. (line 155) +-* ligature: Using Symbols. (line 6) +-* ligatures and kerning: Ligatures and Kerning. +- (line 6) +-* ligatures enabled register ('.lg'): Ligatures and Kerning. +- (line 24) +-* ligatures, activating ('lg'): Ligatures and Kerning. +- (line 24) +-* limitations of '\b' escape: Drawing Requests. (line 239) +-* line break: Basics. (line 48) +-* line break <1>: Implicit Line Breaks. +- (line 6) +-* line break <2>: Manipulating Filling and Adjusting. +- (line 6) +-* line break ('br'): Basics. (line 118) +-* line breaks, with vertical space ['man']: Man usage. (line 120) +-* line breaks, without vertical space ['man']: Man usage. (line 124) +-* line control: Line Control. (line 6) +-* line dimensions: Line Layout. (line 6) +-* line drawing glyph: Drawing Requests. (line 28) +-* line drawing glyph <1>: Drawing Requests. (line 50) +-* line indentation ('in'): Line Layout. (line 25) +-* line layout: Line Layout. (line 6) +-* line length ('ll'): Line Layout. (line 29) +-* line length register ('.l'): Line Layout. (line 158) +-* line length, previous ('.n'): Environments. (line 110) +-* line number, input, register ('.c', 'c.'): Built-in Registers. +- (line 77) +-* line number, output, register ('ln'): Built-in Registers. (line 82) +-* line numbers, printing ('nm'): Miscellaneous. (line 10) +-* line space, extra post-vertical ('\x'): Changing Type Sizes. +- (line 118) +-* line space, extra pre-vertical ('\x'): Changing Type Sizes. (line 109) +-* line spacing register ('.L'): Manipulating Spacing. +- (line 75) +-* line spacing, post-vertical ('pvs'): Changing Type Sizes. (line 122) +-* line thickness ('\D't ...''): Drawing Requests. (line 206) +-* line, blank: Implicit Line Breaks. +- (line 10) +-* line, drawing ('\D'l ...''): Drawing Requests. (line 80) +-* line, empty ('sp'): Basics. (line 93) +-* line, horizontal, drawing ('\l'): Drawing Requests. (line 17) +-* line, implicit breaks: Implicit Line Breaks. +- (line 6) +-* line, input, continuation ('\'): Line Control. (line 36) +-* line, input, horizontal position, register ('hp'): Page Motions. +- (line 209) +-* line, input, horizontal position, saving ('\k'): Page Motions. +- (line 203) +-* line, interrupted: Line Control. (line 36) +-* line, output, continuation ('\c'): Line Control. (line 36) +-* line, output, horizontal position, register ('.k'): Page Motions. +- (line 212) +-* line, vertical, drawing ('\L'): Drawing Requests. (line 50) +-* line-tabs mode: Tabs and Fields. (line 138) +-* lines, blank, disabling: Manipulating Spacing. +- (line 123) +-* lines, centering ('ce'): Basics. (line 105) +-* lines, centering ('ce') <1>: Manipulating Filling and Adjusting. +- (line 204) +-* lines, consecutive hyphenated ('hlm'): Manipulating Hyphenation. +- (line 47) +-* lines, interrupted, and input line traps ('itc'): Input Line Traps. +- (line 24) +-* list: Displays. (line 13) +-* list of available glyphs ('groff_char(7)' man page): Using Symbols. +- (line 76) +-* 'll' request, using '+' and '-': Expressions. (line 75) +-* location, vertical, page, marking ('mk'): Page Motions. (line 11) +-* location, vertical, page, returning to marked ('rt'): Page Motions. +- (line 11) +-* logical not, limitation in expression: Expressions. (line 27) +-* logical operators: Expressions. (line 19) +-* long names: Implementation Differences. +- (line 9) +-* loops and conditionals: Conditionals and Loops. +- (line 6) +-* 'lq' glyph, and 'lq' string ['man']: Predefined man strings. +- (line 22) +-* 'ls' request, alternative to ('pvs'): Changing Type Sizes. (line 137) +-* 'lt' request, using '+' and '-': Expressions. (line 75) +-* 'm' unit: Measurements. (line 50) +-* 'M' unit: Measurements. (line 62) +-* machine unit ('u'): Measurements. (line 6) +-* macro arguments: Request and Macro Arguments. +- (line 6) +-* macro arguments, and compatibility mode: Gtroff Internals. (line 91) +-* macro arguments, and tabs: Request and Macro Arguments. +- (line 6) +-* macro basics: Basics. (line 6) +-* macro directories: Macro Directories. (line 6) +-* macro files, searching: Macro Directories. (line 11) +-* macro name register ('\$0'): Parameters. (line 71) +-* macro names, starting with '[' or ']', and 'refer': Identifiers. +- (line 46) +-* macro packages: Macro Package Intro. (line 6) +-* macro packages <1>: Macro Packages. (line 6) +-* macro packages, structuring the source code: Requests. (line 14) +-* macro, appending ('am'): Writing Macros. (line 116) +-* macro, arguments ('\$'): Parameters. (line 21) +-* macro, creating alias ('als'): Strings. (line 229) +-* macro, end-of-input ('em'): End-of-input Traps. (line 7) +-* macro, removing ('rm'): Strings. (line 224) +-* macro, removing alias ('rm'): Strings. (line 263) +-* macro, renaming ('rn'): Strings. (line 221) +-* macros: Macros. (line 6) +-* macros for manual pages ['man']: Man usage. (line 6) +-* macros, recursive: while. (line 38) +-* macros, searching: Macro Directories. (line 6) +-* macros, shared name space with strings and diversions: Strings. +- (line 92) +-* macros, tutorial for users: Tutorial for Macro Users. +- (line 6) +-* macros, writing: Writing Macros. (line 6) +-* magnification of a font ('fzoom'): Changing Fonts. (line 71) +-* major quotes: Displays. (line 10) +-* major version number register ('.x'): Built-in Registers. (line 88) +-* 'man' macros: Man usage. (line 6) +-* 'man' macros, bold face: Man font macros. (line 14) +-* 'man' macros, custom headers and footers: Optional man extensions. +- (line 12) +-* 'man' macros, default indentation: Miscellaneous man macros. +- (line 6) +-* 'man' macros, empty space before a paragraph: Miscellaneous man macros. +- (line 15) +-* 'man' macros, hanging indentation: Man usage. (line 98) +-* 'man' macros, how to set fonts: Man font macros. (line 6) +-* 'man' macros, italic fonts: Man font macros. (line 52) +-* 'man' macros, line breaks with vertical space: Man usage. (line 120) +-* 'man' macros, line breaks without vertical space: Man usage. +- (line 124) +-* 'man' macros, moving left margin: Man usage. (line 106) +-* 'man' macros, resetting default indentation: Man usage. (line 127) +-* 'man' macros, tab stops: Miscellaneous man macros. +- (line 10) +-* 'man' macros, Ultrix-specific: Optional man extensions. +- (line 30) +-* man pages: man. (line 6) +-* manipulating filling and adjusting: Manipulating Filling and Adjusting. +- (line 6) +-* manipulating hyphenation: Manipulating Hyphenation. +- (line 6) +-* manipulating spacing: Manipulating Spacing. +- (line 6) +-* 'man'macros, BSD compatibility: Miscellaneous man macros. +- (line 27) +-* 'man'macros, BSD compatibility <1>: Miscellaneous man macros. +- (line 44) +-* manual pages: man. (line 6) +-* margin for hyphenation ('hym'): Manipulating Hyphenation. +- (line 211) +-* margin glyph ('mc'): Miscellaneous. (line 75) +-* margin, bottom: Page Layout. (line 20) +-* margin, left ('po'): Line Layout. (line 21) +-* margin, top: Page Layout. (line 20) +-* mark, high-water, register ('.h'): Diversions. (line 76) +-* marking vertical page location ('mk'): Page Motions. (line 11) +-* MathML: grohtml specific registers and strings. +- (line 23) +-* maximum values of Roman numerals: Assigning Formats. (line 59) +-* 'mdoc' macros: mdoc. (line 6) +-* 'me' macro package: me. (line 6) +-* measurement unit: Measurements. (line 6) +-* measurements: Measurements. (line 6) +-* measurements, specifying safely: Default Units. (line 25) +-* minimum values of Roman numerals: Assigning Formats. (line 59) +-* minor version number register ('.y'): Built-in Registers. (line 92) +-* minutes, current time ('minutes'): Built-in Registers. (line 37) +-* 'mm' macro package: mm. (line 6) +-* mode for constant glyph space ('cs'): Artificial Fonts. (line 126) +-* mode, compatibility: Implementation Differences. +- (line 6) +-* mode, compatibility, and parameters: Gtroff Internals. (line 91) +-* mode, copy: Copy-in Mode. (line 6) +-* mode, copy-in: Copy-in Mode. (line 6) +-* mode, copy-in, and 'cf' request: I/O. (line 50) +-* mode, copy-in, and 'device' request: Postprocessor Access. +- (line 19) +-* mode, copy-in, and 'ig' request: Comments. (line 85) +-* mode, copy-in, and 'length' request: Strings. (line 211) +-* mode, copy-in, and macro arguments: Parameters. (line 21) +-* mode, copy-in, and 'output' request: Diversions. (line 179) +-* mode, copy-in, and 'tm' request: Debugging. (line 30) +-* mode, copy-in, and 'tm1' request: Debugging. (line 30) +-* mode, copy-in, and 'tmc' request: Debugging. (line 30) +-* mode, copy-in, and 'trf' request: I/O. (line 50) +-* mode, copy-in, and 'write' request: I/O. (line 212) +-* mode, copy-in, and 'writec' request: I/O. (line 212) +-* mode, copy-in, and 'writem' request: I/O. (line 225) +-* mode, copy-in, and '\!': Diversions. (line 148) +-* mode, copy-in, and '\?': Operators in Conditionals. +- (line 55) +-* mode, copy-in, and '\?' <1>: Diversions. (line 148) +-* mode, copy-in, and '\a': Leaders. (line 18) +-* mode, copy-in, and '\E': Character Translations. +- (line 81) +-* mode, copy-in, and '\t': Tabs and Fields. (line 10) +-* mode, copy-in, and '\V': I/O. (line 249) +-* mode, fill: Implicit Line Breaks. +- (line 15) +-* mode, fill <1>: Manipulating Filling and Adjusting. +- (line 156) +-* mode, fill <2>: Warnings. (line 23) +-* mode, fill ('fi'): Manipulating Filling and Adjusting. +- (line 29) +-* mode, fill, and '\c': Line Control. (line 69) +-* mode, line-tabs: Tabs and Fields. (line 138) +-* mode, no-fill ('nf'): Manipulating Filling and Adjusting. +- (line 39) +-* mode, no-fill, and '\c': Line Control. (line 60) +-* mode, no-space ('ns'): Manipulating Spacing. +- (line 123) +-* mode, nroff: Troff and Nroff Mode. +- (line 6) +-* mode, safer: Groff Options. (line 214) +-* mode, safer <1>: Macro Directories. (line 21) +-* mode, safer <2>: Built-in Registers. (line 23) +-* mode, safer <3>: I/O. (line 32) +-* mode, safer <4>: I/O. (line 147) +-* mode, safer <5>: I/O. (line 168) +-* mode, safer <6>: I/O. (line 206) +-* mode, troff: Troff and Nroff Mode. +- (line 6) +-* mode, unsafe: Groff Options. (line 292) +-* mode, unsafe <1>: Macro Directories. (line 21) +-* mode, unsafe <2>: Built-in Registers. (line 23) +-* mode, unsafe <3>: I/O. (line 32) +-* mode, unsafe <4>: I/O. (line 147) +-* mode, unsafe <5>: I/O. (line 168) +-* mode, unsafe <6>: I/O. (line 206) +-* modifying requests: Requests. (line 61) +-* 'mom' macro package: mom. (line 6) +-* month of the year register ('mo'): Built-in Registers. (line 51) +-* motion operators: Expressions. (line 65) +-* motion, horizontal ('\h'): Page Motions. (line 103) +-* motion, vertical ('\v'): Page Motions. (line 78) +-* motions, page: Page Motions. (line 6) +-* mounting font ('fp'): Font Positions. (line 13) +-* 'ms' macros: ms. (line 6) +-* 'ms' macros, accent marks: ms Strings and Special Characters. +- (line 6) +-* 'ms' macros, body text: ms Body Text. (line 6) +-* 'ms' macros, cover page: ms Cover Page Macros. +- (line 6) +-* 'ms' macros, creating table of contents: ms TOC. (line 6) +-* 'ms' macros, differences from AT&T: Differences from AT&T ms. +- (line 6) +-* 'ms' macros, displays: ms Displays and Keeps. +- (line 6) +-* 'ms' macros, document control registers: ms Document Control Registers. +- (line 6) +-* 'ms' macros, equations: ms Insertions. (line 6) +-* 'ms' macros, figures: ms Insertions. (line 6) +-* 'ms' macros, footers: ms Headers and Footers. +- (line 6) +-* 'ms' macros, footnotes: ms Footnotes. (line 6) +-* 'ms' macros, general structure: General ms Structure. +- (line 6) +-* 'ms' macros, headers: ms Headers and Footers. +- (line 6) +-* 'ms' macros, headings: Headings in ms. (line 6) +-* 'ms' macros, highlighting: Highlighting in ms. (line 6) +-* 'ms' macros, keeps: ms Displays and Keeps. +- (line 6) +-* 'ms' macros, lists: Lists in ms. (line 6) +-* 'ms' macros, margins: ms Margins. (line 6) +-* 'ms' macros, multiple columns: ms Multiple Columns. (line 6) +-* 'ms' macros, naming conventions: Naming Conventions. (line 6) +-* 'ms' macros, nested lists: Lists in ms. (line 122) +-* 'ms' macros, page layout: ms Page Layout. (line 6) +-* 'ms' macros, paragraph handling: Paragraphs in ms. (line 6) +-* 'ms' macros, references: ms Insertions. (line 6) +-* 'ms' macros, special characters: ms Strings and Special Characters. +- (line 6) +-* 'ms' macros, strings: ms Strings and Special Characters. +- (line 6) +-* 'ms' macros, tables: ms Insertions. (line 6) +-* multi-file documents: Debugging. (line 10) +-* multi-line strings: Strings. (line 63) +-* multi-page table, example markup ['ms']: Example multi-page table. +- (line 6) +-* multiple columns ['ms']: ms Multiple Columns. (line 6) +-* 'n' unit: Measurements. (line 55) +-* name space, common, of macros, diversions, and strings: Strings. +- (line 92) +-* name, background color, register ('.M'): Colors. (line 94) +-* name, drawing color, register ('.m'): Colors. (line 67) +-* name, fill color, register ('.M'): Colors. (line 94) +-* named character ('\C'): Using Symbols. (line 185) +-* names, long: Implementation Differences. +- (line 9) +-* naming conventions, 'ms' macros: Naming Conventions. (line 6) +-* 'ne' request, and the '.trunc' register: Page Location Traps. +- (line 131) +-* 'ne' request, comparison with 'sv': Page Control. (line 53) +-* negating register values: Setting Registers. (line 78) +-* nested assignments: Interpolating Registers. +- (line 11) +-* nested diversions: Diversions. (line 69) +-* nested lists ['ms']: Lists in ms. (line 122) +-* new page ('bp'): Basics. (line 91) +-* new page ('bp') <1>: Page Control. (line 10) +-* newline character: Identifiers. (line 10) +-* newline character <1>: Escapes. (line 69) +-* newline character, and translations: Character Translations. +- (line 169) +-* newline character, in strings, escaping: Strings. (line 63) +-* newline, final, stripping in diversions: Strings. (line 157) +-* next file, processing ('nx'): I/O. (line 84) +-* next free font position register ('.fp'): Font Positions. (line 30) +-* 'nf' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'nl' register, and '.d': Diversions. (line 69) +-* 'nl' register, difference to '.h': Diversions. (line 88) +-* 'nm' request, using '+' and '-': Expressions. (line 75) +-* no-break control character ('''): Requests. (line 6) +-* no-break control character, changing ('c2'): Character Translations. +- (line 6) +-* no-fill mode ('nf'): Manipulating Filling and Adjusting. +- (line 39) +-* no-fill mode, and '\c': Line Control. (line 60) +-* no-space mode ('ns'): Manipulating Spacing. +- (line 123) +-* node, output: Gtroff Internals. (line 6) +-* 'nr' request, and warnings: Warnings. (line 61) +-* 'nr' request, using '+' and '-': Expressions. (line 75) +-* nroff mode: Troff and Nroff Mode. +- (line 6) +-* 'nroff', the program: History. (line 22) +-* number of arguments register ('.$'): Parameters. (line 10) +-* number of registers register ('.R'): Built-in Registers. (line 18) +-* number register, creating alias ('aln'): Setting Registers. (line 112) +-* number register, removing ('rr'): Setting Registers. (line 104) +-* number register, renaming ('rnn'): Setting Registers. (line 108) +-* number registers, dumping ('pnr'): Debugging. (line 77) +-* number, input line, setting ('lf'): Debugging. (line 10) +-* number, page ('pn'): Page Layout. (line 84) +-* numbered glyph ('\N'): Character Translations. +- (line 160) +-* numbered glyph ('\N') <1>: Using Symbols. (line 201) +-* numbered list, example markup ['ms']: Lists in ms. (line 41) +-* numbers, and delimiters: Escapes. (line 65) +-* numbers, line, printing ('nm'): Miscellaneous. (line 10) +-* numerals, Roman: Assigning Formats. (line 32) +-* numeric expression, valid: Expressions. (line 83) +-* offset, page ('po'): Line Layout. (line 21) +-* 'open' request, and safer mode: Groff Options. (line 214) +-* 'opena' request, and safer mode: Groff Options. (line 214) +-* opening file ('open'): I/O. (line 200) +-* operator, scaling: Expressions. (line 54) +-* operators, arithmetic: Expressions. (line 8) +-* operators, as delimiters: Escapes. (line 67) +-* operators, comparison: Expressions. (line 15) +-* operators, extremum ('>?', ': Built-in Registers. +- (line 127) +-* output device usage number register ('.T'): Groff Options. (line 281) +-* output devices: Output device intro. (line 6) +-* output devices <1>: Output Devices. (line 6) +-* output encoding, ASCII: Groff Options. (line 250) +-* output encoding, cp1047: Groff Options. (line 264) +-* output encoding, EBCDIC: Groff Options. (line 264) +-* output encoding, latin-1 (ISO 8859-1): Groff Options. (line 254) +-* output encoding, utf-8: Groff Options. (line 259) +-* output glyphs, and input characters,compatibility with AT&T 'troff': Implementation Differences. +- (line 86) +-* output line number register ('ln'): Built-in Registers. (line 82) +-* output line, continuation ('\c'): Line Control. (line 36) +-* output line, horizontal position, register ('.k'): Page Motions. +- (line 212) +-* output node: Gtroff Internals. (line 6) +-* 'output' request, and copy-in mode: Diversions. (line 179) +-* 'output' request, and '\!': Diversions. (line 179) +-* output, flush ('fl'): Debugging. (line 87) +-* output, 'gtroff': gtroff Output. (line 6) +-* output, intermediate: gtroff Output. (line 16) +-* output, suppressing ('\O'): Suppressing output. (line 7) +-* output, transparent ('cf', 'trf'): I/O. (line 50) +-* output, transparent ('\!', '\?'): Diversions. (line 136) +-* output, transparent, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 106) +-* output, troff: gtroff Output. (line 16) +-* overlapping characters: Using Symbols. (line 265) +-* overstriking glyphs ('\o'): Page Motions. (line 216) +-* 'p' unit: Measurements. (line 30) +-* 'P' unit: Measurements. (line 34) +-* packages, macros: Macro Packages. (line 6) +-* padding character, for fields ('fc'): Fields. (line 6) +-* page break, conditional ('ne'): Page Control. (line 33) +-* page control: Page Control. (line 6) +-* page ejecting register ('.pe'): Page Location Traps. (line 143) +-* page footers: Page Location Traps. (line 38) +-* page headers: Page Location Traps. (line 38) +-* page layout: Page Layout. (line 6) +-* page layout ['ms']: ms Page Layout. (line 6) +-* page length ('pl'): Page Layout. (line 13) +-* page length register ('.p'): Page Layout. (line 17) +-* page location traps: Page Location Traps. (line 6) +-* page location, vertical, marking ('mk'): Page Motions. (line 11) +-* page location, vertical, returning to marked ('rt'): Page Motions. +- (line 11) +-* page motions: Page Motions. (line 6) +-* page number ('pn'): Page Layout. (line 84) +-* page number character ('%'): Page Layout. (line 35) +-* page number character, changing ('pc'): Page Layout. (line 94) +-* page number register ('%'): Page Control. (line 27) +-* page offset ('po'): Line Layout. (line 21) +-* page orientation, landscape: Paper Size. (line 6) +-* page, new ('bp'): Page Control. (line 10) +-* paper formats: Paper Formats. (line 6) +-* paper size: Paper Size. (line 6) +-* paragraphs: Paragraphs. (line 6) +-* parameters: Parameters. (line 6) +-* parameters, and compatibility mode: Gtroff Internals. (line 91) +-* parentheses: Expressions. (line 59) +-* path, for font files: Font Directories. (line 14) +-* path, for tmac files: Macro Directories. (line 11) +-* patterns for hyphenation ('hpf'): Manipulating Hyphenation. +- (line 116) +-* PDF, embedding: Embedding PDF. (line 6) +-* 'pi' request, and 'groff': I/O. (line 159) +-* 'pi' request, and safer mode: Groff Options. (line 214) +-* 'pic', the program: gpic. (line 6) +-* pica unit ('P'): Measurements. (line 34) +-* pile, glyph ('\b'): Drawing Requests. (line 232) +-* 'pl' request, using '+' and '-': Expressions. (line 75) +-* planting a trap: Traps. (line 11) +-* platform-specific directory: Macro Directories. (line 26) +-* 'pn' request, using '+' and '-': Expressions. (line 75) +-* PNG image generation from PostScript: DESC File Format. (line 29) +-* 'po' request, using '+' and '-': Expressions. (line 75) +-* point size registers ('.s', '.ps'): Changing Type Sizes. (line 20) +-* point size registers, last-requested ('.psr', '.sr'): Fractional Type Sizes. +- (line 45) +-* point sizes, changing ('ps', '\s'): Changing Type Sizes. (line 11) +-* point sizes, fractional: Fractional Type Sizes. +- (line 6) +-* point sizes, fractional <1>: Implementation Differences. +- (line 76) +-* point unit ('p'): Measurements. (line 30) +-* polygon, drawing ('\D'p ...''): Drawing Requests. (line 158) +-* polygon, solid, drawing ('\D'P ...''): Drawing Requests. (line 167) +-* position of lowest text line ('.h'): Diversions. (line 76) +-* position, absolute, operator ('|'): Expressions. (line 70) +-* position, horizontal input line, saving ('\k'): Page Motions. +- (line 203) +-* position, horizontal, in input line, register ('hp'): Page Motions. +- (line 209) +-* position, horizontal, in output line, register ('.k'): Page Motions. +- (line 212) +-* position, vertical, current ('nl'): Page Control. (line 67) +-* position, vertical, in diversion, register ('.d'): Diversions. +- (line 69) +-* positions, font: Font Positions. (line 6) +-* post-vertical line spacing: Changing Type Sizes. (line 122) +-* post-vertical line spacing register ('.pvs'): Changing Type Sizes. +- (line 137) +-* post-vertical line spacing, changing ('pvs'): Changing Type Sizes. +- (line 137) +-* postprocessor access: Postprocessor Access. +- (line 6) +-* postprocessors: Output device intro. (line 6) +-* PostScript fonts: Font Families. (line 11) +-* PostScript, bounding box: Miscellaneous. (line 139) +-* PostScript, embedding: Embedding PostScript. +- (line 6) +-* PostScript, PNG image generation: DESC File Format. (line 29) +-* 'preconv', invoking: Invoking preconv. (line 5) +-* 'preconv', the program: preconv. (line 6) +-* prefix, for commands: Environment. (line 14) +-* preprocessor, calling convention: Preprocessors in man pages. +- (line 6) +-* preprocessors: Preprocessor Intro. (line 6) +-* preprocessors <1>: Preprocessors. (line 6) +-* previous font ('ft', '\f[]', '\fP'): Changing Fonts. (line 23) +-* previous line length ('.n'): Environments. (line 110) +-* print current page register ('.P'): Groff Options. (line 171) +-* printing backslash ('\\', '\e', '\E', '\[rs]'): Escapes. (line 74) +-* printing backslash ('\\', '\e', '\E', '\[rs]') <1>: Implementation Differences. +- (line 106) +-* printing line numbers ('nm'): Miscellaneous. (line 10) +-* printing to stderr ('tm', 'tm1', 'tmc'): Debugging. (line 27) +-* printing, zero-width ('\z', '\Z'): Page Motions. (line 220) +-* printing, zero-width ('\z', '\Z') <1>: Page Motions. (line 224) +-* process ID of 'gtroff' register ('$$'): Built-in Registers. (line 99) +-* processing next file ('nx'): I/O. (line 84) +-* properties of characters ('cflags'): Using Symbols. (line 237) +-* properties of glyphs ('cflags'): Using Symbols. (line 237) +-* 'ps' request, and constant glyph space mode: Artificial Fonts. +- (line 126) +-* 'ps' request, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 76) +-* 'ps' request, using '+' and '-': Expressions. (line 75) +-* 'ps' request, with fractional type sizes: Fractional Type Sizes. +- (line 6) +-* 'pso' request, and safer mode: Groff Options. (line 214) +-* 'pvs' request, using '+' and '-': Expressions. (line 75) +-* quotes, major: Displays. (line 10) +-* quotes, trailing: Strings. (line 57) +-* 'radicalex' glyph, and 'cflags': Using Symbols. (line 265) +-* ragged-left: Manipulating Filling and Adjusting. +- (line 63) +-* ragged-right: Manipulating Filling and Adjusting. +- (line 59) +-* 'rc' request, and glyph definitions: Using Symbols. (line 326) +-* read-only register, changing format: Assigning Formats. (line 68) +-* reading from standard input ('rd'): I/O. (line 89) +-* recursive macros: while. (line 38) +-* 'refer', and macro names starting with '[' or ']': Identifiers. +- (line 46) +-* 'refer', the program: grefer. (line 6) +-* reference, 'gtroff': gtroff Reference. (line 6) +-* references ['ms']: ms Insertions. (line 6) +-* register, creating alias ('aln'): Setting Registers. (line 112) +-* register, format ('\g'): Assigning Formats. (line 75) +-* register, removing ('rr'): Setting Registers. (line 104) +-* register, renaming ('rnn'): Setting Registers. (line 108) +-* registers: Registers. (line 6) +-* registers specific to 'grohtml': grohtml specific registers and strings. +- (line 6) +-* registers, built-in: Built-in Registers. (line 6) +-* registers, interpolating ('\n'): Interpolating Registers. +- (line 6) +-* registers, number of, register ('.R'): Built-in Registers. (line 18) +-* registers, setting ('nr', '\R'): Setting Registers. (line 6) +-* removing alias, for diversion ('rm'): Strings. (line 263) +-* removing alias, for macro ('rm'): Strings. (line 263) +-* removing alias, for string ('rm'): Strings. (line 263) +-* removing diversion ('rm'): Strings. (line 224) +-* removing glyph definition ('rchar', 'rfschar'): Using Symbols. +- (line 382) +-* removing macro ('rm'): Strings. (line 224) +-* removing number register ('rr'): Setting Registers. (line 104) +-* removing request ('rm'): Strings. (line 224) +-* removing string ('rm'): Strings. (line 224) +-* renaming diversion ('rn'): Strings. (line 221) +-* renaming macro ('rn'): Strings. (line 221) +-* renaming number register ('rnn'): Setting Registers. (line 108) +-* renaming request ('rn'): Strings. (line 221) +-* renaming string ('rn'): Strings. (line 221) +-* request arguments: Request and Macro Arguments. +- (line 6) +-* request arguments, and compatibility mode: Gtroff Internals. +- (line 91) +-* request, removing ('rm'): Strings. (line 224) +-* request, renaming ('rn'): Strings. (line 221) +-* request, undefined: Comments. (line 25) +-* requests: Requests. (line 6) +-* requests for drawing: Drawing Requests. (line 6) +-* requests for input and output: I/O. (line 6) +-* requests, modifying: Requests. (line 61) +-* resolution, device: DESC File Format. (line 85) +-* resolution, horizontal: DESC File Format. (line 25) +-* resolution, horizontal, register ('.H'): Built-in Registers. +- (line 15) +-* resolution, vertical: DESC File Format. (line 135) +-* resolution, vertical, register ('.V'): Built-in Registers. (line 28) +-* returning to marked vertical page location ('rt'): Page Motions. +- (line 11) +-* revision number register ('.Y'): Built-in Registers. (line 96) +-* 'rf', the program: History. (line 6) +-* right-justifying ('rj'): Manipulating Filling and Adjusting. +- (line 250) +-* 'rj' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'rn' glyph, and 'cflags': Using Symbols. (line 265) +-* 'roff', the program: History. (line 17) +-* roman glyph, correction after italic glyph ('\/'): Ligatures and Kerning. +- (line 80) +-* roman glyph, correction before italic glyph ('\,'): Ligatures and Kerning. +- (line 91) +-* Roman numerals: Assigning Formats. (line 32) +-* Roman numerals, maximum and minimum: Assigning Formats. (line 59) +-* 'rq' glyph, and 'rq' string ['man']: Predefined man strings. +- (line 22) +-* 'rq' glyph, at end of sentence: Sentences. (line 18) +-* 'rq' glyph, at end of sentence <1>: Using Symbols. (line 275) +-* 'rt' request, using '+' and '-': Expressions. (line 75) +-* 'ru' glyph, and 'cflags': Using Symbols. (line 265) +-* 'RUNOFF', the program: History. (line 6) +-* 's' unit: Measurements. (line 40) +-* 's' unit <1>: Fractional Type Sizes. +- (line 6) +-* safer mode: Groff Options. (line 214) +-* safer mode <1>: Macro Directories. (line 21) +-* safer mode <2>: Built-in Registers. (line 23) +-* safer mode <3>: I/O. (line 32) +-* safer mode <4>: I/O. (line 147) +-* safer mode <5>: I/O. (line 168) +-* safer mode <6>: I/O. (line 206) +-* saving horizontal input line position ('\k'): Page Motions. (line 203) +-* scaling indicator: Measurements. (line 6) +-* scaling operator: Expressions. (line 54) +-* searching fonts: Font Directories. (line 6) +-* searching macro files: Macro Directories. (line 11) +-* searching macros: Macro Directories. (line 6) +-* seconds, current time ('seconds'): Built-in Registers. (line 31) +-* sentence space: Sentences. (line 12) +-* sentence space size register ('.sss'): Manipulating Filling and Adjusting. +- (line 151) +-* sentences: Sentences. (line 6) +-* setting diversion trap ('dt'): Diversion Traps. (line 7) +-* setting end-of-input trap ('em'): End-of-input Traps. (line 7) +-* setting input line number ('lf'): Debugging. (line 10) +-* setting input line trap ('it'): Input Line Traps. (line 8) +-* setting registers ('nr', '\R'): Setting Registers. (line 6) +-* shading filled objects ('\D'f ...''): Drawing Requests. (line 141) +-* 'shc' request, and translations: Character Translations. +- (line 173) +-* site-specific directory: Macro Directories. (line 26) +-* site-specific directory <1>: Font Directories. (line 29) +-* size of sentence space register ('.sss'): Manipulating Filling and Adjusting. +- (line 151) +-* size of type: Sizes. (line 6) +-* size of word space register ('.ss'): Manipulating Filling and Adjusting. +- (line 151) +-* size, optical, of a font: Changing Fonts. (line 71) +-* size, paper: Paper Size. (line 6) +-* sizes: Sizes. (line 6) +-* sizes, fractional: Fractional Type Sizes. +- (line 6) +-* sizes, fractional <1>: Implementation Differences. +- (line 76) +-* skew, of last glyph ('.csk'): Environments. (line 95) +-* slant, font, changing ('\S'): Artificial Fonts. (line 45) +-* 'soelim', the program: gsoelim. (line 6) +-* soft hyphen character, setting ('shc'): Manipulating Hyphenation. +- (line 243) +-* soft hyphen glyph ('hy'): Manipulating Hyphenation. +- (line 243) +-* solid circle, drawing ('\D'C ...''): Drawing Requests. (line 114) +-* solid ellipse, drawing ('\D'E ...''): Drawing Requests. (line 124) +-* solid polygon, drawing ('\D'P ...''): Drawing Requests. (line 167) +-* 'sp' request, and no-space mode: Manipulating Spacing. +- (line 123) +-* 'sp' request, and traps: Manipulating Spacing. +- (line 53) +-* 'sp' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* space between sentences: Sentences. (line 12) +-* space between sentences register ('.sss'): Manipulating Filling and Adjusting. +- (line 151) +-* space between words register ('.ss'): Manipulating Filling and Adjusting. +- (line 151) +-* space character: Escapes. (line 69) +-* space character, zero width ('\&'): Requests. (line 47) +-* space character, zero width ('\&') <1>: Ligatures and Kerning. +- (line 47) +-* space character, zero width ('\&') <2>: Drawing Requests. (line 32) +-* space characters, in expressions: Expressions. (line 86) +-* space, discardable, horizontal: Manipulating Filling and Adjusting. +- (line 183) +-* space, discarded, in traps: Manipulating Spacing. +- (line 53) +-* space, horizontal ('\h'): Page Motions. (line 103) +-* space, horizontal, unformatting: Strings. (line 157) +-* space, unbreakable: Page Motions. (line 114) +-* space, vertical, unit ('v'): Measurements. (line 58) +-* space, width of a digit ('\0'): Page Motions. (line 138) +-* spaces with 'ds': Strings. (line 57) +-* spaces, in a macro argument: Request and Macro Arguments. +- (line 10) +-* spaces, leading and trailing: Filling and Adjusting. +- (line 10) +-* spacing: Basics. (line 82) +-* spacing, manipulating: Manipulating Spacing. +- (line 6) +-* spacing, vertical: Sizes. (line 6) +-* special characters: Character Translations. +- (line 160) +-* special characters <1>: Special Characters. (line 6) +-* special characters ['ms']: ms Strings and Special Characters. +- (line 6) +-* special fonts: Using Symbols. (line 14) +-* special fonts <1>: Special Fonts. (line 6) +-* special fonts <2>: Font File Format. (line 28) +-* special fonts, emboldening: Artificial Fonts. (line 115) +-* 'special' request, and font translations: Changing Fonts. (line 55) +-* 'special' request, and glyph search order: Using Symbols. (line 14) +-* spline, drawing ('\D'~ ...''): Drawing Requests. (line 136) +-* springing a trap: Traps. (line 11) +-* 'sqrtex' glyph, and 'cflags': Using Symbols. (line 265) +-* stacking glyphs ('\b'): Drawing Requests. (line 232) +-* standard input, reading from ('rd'): I/O. (line 89) +-* stderr, printing to ('tm', 'tm1', 'tmc'): Debugging. (line 27) +-* stops, tabulator: Tab Stops. (line 6) +-* string arguments: Strings. (line 19) +-* string comparison: Operators in Conditionals. +- (line 47) +-* string expansion ('\*'): Strings. (line 19) +-* string interpolation ('\*'): Strings. (line 19) +-* string, appending ('as'): Strings. (line 176) +-* string, creating alias ('als'): Strings. (line 229) +-* string, length of ('length'): Strings. (line 211) +-* string, removing ('rm'): Strings. (line 224) +-* string, removing alias ('rm'): Strings. (line 263) +-* string, renaming ('rn'): Strings. (line 221) +-* strings: Strings. (line 6) +-* strings specific to 'grohtml': grohtml specific registers and strings. +- (line 6) +-* strings ['ms']: ms Strings and Special Characters. +- (line 6) +-* strings, multi-line: Strings. (line 63) +-* strings, shared name space with macros and diversions: Strings. +- (line 92) +-* stripping final newline in diversions: Strings. (line 157) +-* structuring source code of documents or macro packages: Requests. +- (line 14) +-* 'sty' request, and changing fonts: Changing Fonts. (line 11) +-* 'sty' request, and font positions: Font Positions. (line 60) +-* 'sty' request, and font translations: Changing Fonts. (line 55) +-* styles, font: Font Families. (line 6) +-* substring ('substring'): Strings. (line 192) +-* suppressing output ('\O'): Suppressing output. (line 7) +-* 'sv' request, and no-space mode: Page Control. (line 63) +-* switching environments ('ev'): Environments. (line 39) +-* 'sy' request, and safer mode: Groff Options. (line 214) +-* symbol: Using Symbols. (line 14) +-* symbol table, dumping ('pm'): Debugging. (line 66) +-* symbol, defining ('char'): Using Symbols. (line 326) +-* symbols, using: Using Symbols. (line 6) +-* 'system()' return value register ('systat'): I/O. (line 195) +-* tab character: Tab Stops. (line 6) +-* tab character <1>: Escapes. (line 69) +-* tab character, and translations: Character Translations. +- (line 169) +-* tab character, non-interpreted ('\t'): Tabs and Fields. (line 10) +-* tab repetition character ('tc'): Tabs and Fields. (line 129) +-* tab settings register ('.tabs'): Tabs and Fields. (line 117) +-* tab stops: Tab Stops. (line 6) +-* tab stops ['man']: Miscellaneous man macros. +- (line 10) +-* tab stops, for TTY output devices: Tabs and Fields. (line 115) +-* tab, line-tabs mode: Tabs and Fields. (line 138) +-* table of contents: Table of Contents. (line 6) +-* table of contents <1>: Leaders. (line 29) +-* table of contents, creating ['ms']: ms TOC. (line 6) +-* tables ['ms']: ms Insertions. (line 6) +-* tabs, and fields: Tabs and Fields. (line 6) +-* tabs, and macro arguments: Request and Macro Arguments. +- (line 6) +-* tabs, before comments: Comments. (line 21) +-* 'tbl', the program: gtbl. (line 6) +-* Teletype: Invoking grotty. (line 50) +-* terminal control sequences: Invoking grotty. (line 50) +-* terminal, conditional output for: Operators in Conditionals. +- (line 14) +-* text line, position of lowest ('.h'): Diversions. (line 76) +-* text, 'gtroff' processing: Text. (line 6) +-* text, justifying: Manipulating Filling and Adjusting. +- (line 6) +-* text, justifying ('rj'): Manipulating Filling and Adjusting. +- (line 250) +-* thickness of lines ('\D't ...''): Drawing Requests. (line 206) +-* three-part title ('tl'): Page Layout. (line 35) +-* 'ti' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'ti' request, using '+' and '-': Expressions. (line 75) +-* time, current: I/O. (line 175) +-* time, current, hours ('hours'): Built-in Registers. (line 41) +-* time, current, minutes ('minutes'): Built-in Registers. (line 37) +-* time, current, seconds ('seconds'): Built-in Registers. (line 31) +-* title line ('tl'): Page Layout. (line 35) +-* title line length register ('.lt'): Page Layout. (line 67) +-* title line, length ('lt'): Page Layout. (line 67) +-* title page, example markup: ms Cover Page Macros. +- (line 66) +-* titles: Page Layout. (line 31) +-* 'tkf' request, and font styles: Font Families. (line 59) +-* 'tkf' request, and font translations: Changing Fonts. (line 55) +-* 'tkf' request, with fractional type sizes: Fractional Type Sizes. +- (line 6) +-* 'tl' request, and 'mc': Miscellaneous. (line 102) +-* 'tm' request, and copy-in mode: Debugging. (line 30) +-* 'tm1' request, and copy-in mode: Debugging. (line 30) +-* tmac, directory: Macro Directories. (line 11) +-* tmac, path: Macro Directories. (line 11) +-* 'tmc' request, and copy-in mode: Debugging. (line 30) +-* TMPDIR, environment variable: Environment. (line 44) +-* token, input: Gtroff Internals. (line 6) +-* top margin: Page Layout. (line 20) +-* top-level diversion: Diversions. (line 12) +-* top-level diversion, and 'bp': Page Control. (line 24) +-* top-level diversion, and '\!': Diversions. (line 171) +-* top-level diversion, and '\?': Diversions. (line 176) +-* 'tr' request, and glyph definitions: Using Symbols. (line 326) +-* 'tr' request, and soft hyphen character: Manipulating Hyphenation. +- (line 243) +-* 'tr' request, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 86) +-* track kerning: Ligatures and Kerning. +- (line 53) +-* track kerning, activating ('tkf'): Ligatures and Kerning. +- (line 60) +-* trailing quotes: Strings. (line 57) +-* trailing spaces: Filling and Adjusting. +- (line 10) +-* translations of characters: Character Translations. +- (line 6) +-* transparent characters: Sentences. (line 18) +-* transparent characters <1>: Using Symbols. (line 275) +-* transparent output ('cf', 'trf'): I/O. (line 50) +-* transparent output ('\!', '\?'): Diversions. (line 136) +-* transparent output, incompatibilities with AT&T 'troff': Implementation Differences. +- (line 106) +-* trap, changing location ('ch'): Page Location Traps. (line 111) +-* trap, distance, register ('.t'): Page Location Traps. (line 102) +-* trap, diversion, setting ('dt'): Diversion Traps. (line 7) +-* trap, end-of-input, setting ('em'): End-of-input Traps. (line 7) +-* trap, input line, setting ('it'): Input Line Traps. (line 8) +-* trap, planting: Traps. (line 11) +-* trap, springing: Traps. (line 11) +-* traps: Traps. (line 6) +-* traps, and discarded space: Manipulating Spacing. +- (line 53) +-* traps, and diversions: Page Location Traps. (line 166) +-* traps, blank line: Blank Line Traps. (line 6) +-* traps, diversion: Diversion Traps. (line 6) +-* traps, dumping ('ptr'): Debugging. (line 81) +-* traps, end-of-input: End-of-input Traps. (line 6) +-* traps, input line: Input Line Traps. (line 6) +-* traps, input line, and interrupted lines ('itc'): Input Line Traps. +- (line 24) +-* traps, leading spaces: Leading Spaces Traps. +- (line 6) +-* traps, page location: Page Location Traps. (line 6) +-* traps, sprung by 'bp' request ('.pe'): Page Location Traps. (line 143) +-* 'trf' request, and copy-in mode: I/O. (line 50) +-* 'trf' request, and invalid characters: I/O. (line 73) +-* 'trf' request, causing implicit linebreak: Manipulating Filling and Adjusting. +- (line 6) +-* 'trin' request, and 'asciify': Diversions. (line 195) +-* troff mode: Troff and Nroff Mode. +- (line 6) +-* troff output: gtroff Output. (line 16) +-* truncated vertical space register ('.trunc'): Page Location Traps. +- (line 131) +-* TTY, conditional output for: Operators in Conditionals. +- (line 14) +-* tutorial for macro users: Tutorial for Macro Users. +- (line 6) +-* type size: Sizes. (line 6) +-* type size registers ('.s', '.ps'): Changing Type Sizes. (line 20) +-* type sizes, changing ('ps', '\s'): Changing Type Sizes. (line 11) +-* type sizes, fractional: Fractional Type Sizes. +- (line 6) +-* type sizes, fractional <1>: Implementation Differences. +- (line 76) +-* 'u' unit: Measurements. (line 6) +-* 'uf' request, and font styles: Font Families. (line 59) +-* 'ul' glyph, and 'cflags': Using Symbols. (line 265) +-* 'ul' request, and font translations: Changing Fonts. (line 55) +-* Ultrix-specific 'man' macros: Optional man extensions. +- (line 30) +-* unary operators: Expressions. (line 21) +-* unbreakable space: Page Motions. (line 114) +-* undefined identifiers: Identifiers. (line 79) +-* undefined request: Comments. (line 25) +-* underline font ('uf'): Artificial Fonts. (line 90) +-* underlining ('ul'): Artificial Fonts. (line 64) +-* underlining, continuous ('cu'): Artificial Fonts. (line 86) +-* underscore glyph ('\[ru]'): Drawing Requests. (line 28) +-* unformatting diversions ('asciify'): Diversions. (line 195) +-* unformatting horizontal space: Strings. (line 157) +-* Unicode: Identifiers. (line 15) +-* Unicode <1>: Using Symbols. (line 201) +-* unit, 'c': Measurements. (line 27) +-* unit, 'f': Measurements. (line 43) +-* unit, 'f', and colors: Colors. (line 36) +-* unit, 'i': Measurements. (line 22) +-* unit, 'm': Measurements. (line 50) +-* unit, 'M': Measurements. (line 62) +-* unit, 'n': Measurements. (line 55) +-* unit, 'p': Measurements. (line 30) +-* unit, 'P': Measurements. (line 34) +-* unit, 's': Measurements. (line 40) +-* unit, 's' <1>: Fractional Type Sizes. +- (line 6) +-* unit, 'u': Measurements. (line 6) +-* unit, 'v': Measurements. (line 58) +-* unit, 'z': Measurements. (line 40) +-* unit, 'z' <1>: Fractional Type Sizes. +- (line 6) +-* units of measurement: Measurements. (line 6) +-* units, default: Default Units. (line 6) +-* unnamed fill colors ('\D'F...''): Drawing Requests. (line 216) +-* unnamed glyphs: Using Symbols. (line 212) +-* unnamed glyphs, accessing with '\N': Font File Format. (line 51) +-* unsafe mode: Groff Options. (line 292) +-* unsafe mode <1>: Macro Directories. (line 21) +-* unsafe mode <2>: Built-in Registers. (line 23) +-* unsafe mode <3>: I/O. (line 32) +-* unsafe mode <4>: I/O. (line 147) +-* unsafe mode <5>: I/O. (line 168) +-* unsafe mode <6>: I/O. (line 206) +-* user's macro tutorial: Tutorial for Macro Users. +- (line 6) +-* user's tutorial for macros: Tutorial for Macro Users. +- (line 6) +-* using symbols: Using Symbols. (line 6) +-* utf-8, output encoding: Groff Options. (line 259) +-* 'v' unit: Measurements. (line 58) +-* valid numeric expression: Expressions. (line 83) +-* value, incrementing without changing the register: Auto-increment. +- (line 52) +-* variables in environment: Environment. (line 6) +-* version number, major, register ('.x'): Built-in Registers. (line 88) +-* version number, minor, register ('.y'): Built-in Registers. (line 92) +-* vertical line drawing ('\L'): Drawing Requests. (line 50) +-* vertical line spacing register ('.v'): Changing Type Sizes. (line 88) +-* vertical line spacing, changing ('vs'): Changing Type Sizes. +- (line 88) +-* vertical line spacing, effective value: Changing Type Sizes. +- (line 106) +-* vertical motion ('\v'): Page Motions. (line 78) +-* vertical page location, marking ('mk'): Page Motions. (line 11) +-* vertical page location, returning to marked ('rt'): Page Motions. +- (line 11) +-* vertical position in diversion register ('.d'): Diversions. (line 69) +-* vertical position trap enable register ('.vpt'): Page Location Traps. +- (line 18) +-* vertical position traps, enabling ('vpt'): Page Location Traps. +- (line 18) +-* vertical position, current ('nl'): Page Control. (line 67) +-* vertical resolution: DESC File Format. (line 135) +-* vertical resolution register ('.V'): Built-in Registers. (line 28) +-* vertical space unit ('v'): Measurements. (line 58) +-* vertical spacing: Sizes. (line 6) +-* warnings: Debugging. (line 149) +-* warnings <1>: Warnings. (line 6) +-* warnings, level ('warn'): Debugging. (line 155) +-* what is 'groff'?: What Is groff?. (line 6) +-* while: while. (line 6) +-* 'while' request, and font translations: Changing Fonts. (line 55) +-* 'while' request, and the '!' operator: Expressions. (line 21) +-* 'while' request, confusing with 'br': while. (line 68) +-* 'while' request, operators to use with: Operators in Conditionals. +- (line 6) +-* whitespace characters: Identifiers. (line 10) +-* width escape ('\w'): Page Motions. (line 152) +-* width, of last glyph ('.w'): Environments. (line 95) +-* word space size register ('.ss'): Manipulating Filling and Adjusting. +- (line 151) +-* 'write' request, and copy-in mode: I/O. (line 212) +-* 'writec' request, and copy-in mode: I/O. (line 212) +-* 'writem' request, and copy-in mode: I/O. (line 225) +-* writing macros: Writing Macros. (line 6) +-* writing to file ('write', 'writec'): I/O. (line 212) +-* year, current, register ('year', 'yr'): Built-in Registers. (line 54) +-* 'z' unit: Measurements. (line 40) +-* 'z' unit <1>: Fractional Type Sizes. +- (line 6) +-* zero width space character ('\&'): Requests. (line 47) +-* zero width space character ('\&') <1>: Ligatures and Kerning. +- (line 47) +-* zero width space character ('\&') <2>: Drawing Requests. (line 32) +-* zero-width printing ('\z', '\Z'): Page Motions. (line 220) +-* zero-width printing ('\z', '\Z') <1>: Page Motions. (line 224) +-* zoom factor of a font ('fzoom'): Changing Fonts. (line 71) +- +diff -Nuar groff-1.22.3.old/doc/groff.texi groff-1.22.3/doc/groff.texi +--- groff-1.22.3.old/doc/groff.texi 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/doc/groff.texi 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,17157 @@ ++\input texinfo ++ ++@c ++@c Please convert this manual with `texi2dvi -e groff.texi' due to ++@c problems in texinfo regarding expansion of user-defined macros. ++@c ++@c You need texinfo 4.8 or newer to format this document! ++@c ++ ++@c %**start of header (This is for running Texinfo on a region.) ++@setfilename groff.info ++@settitle The GNU Troff Manual ++@setchapternewpage odd ++@footnotestyle separate ++@c %**end of header (This is for running Texinfo on a region.) ++ ++@documentlanguage en ++@documentencoding ISO-8859-1 ++ ++ ++@smallbook ++ ++@finalout ++ ++ ++@copying ++This manual documents GNU @code{troff} version 1.22.3. ++ ++Copyright @copyright{} 1994-2014 Free Software Foundation, Inc. ++ ++@quotation ++Permission is granted to copy, distribute and/or modify this document ++under the terms of the GNU Free Documentation License, Version 1.3 or ++any later version published by the Free Software Foundation; with no ++Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' ++and with the Back-Cover Texts as in (a) below. A copy of the license is ++included in the section entitled ``GNU Free Documentation License.'' ++ ++(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and ++modify this GNU manual. Buying copies from the FSF supports it in ++developing GNU and promoting software freedom.'' ++@end quotation ++@end copying ++ ++ ++@c We use the following indices: ++@c ++@c cindex: concepts ++@c rqindex: requests ++@c esindex: escapes ++@c vindex: registers ++@c kindex: commands in font files ++@c pindex: programs and files ++@c tindex: environment variables ++@c maindex: macros ++@c stindex: strings ++@c opindex: operators ++@c ++@c tindex and cindex are merged. ++ ++@defcodeindex rq ++@defcodeindex es ++@defcodeindex ma ++@defcodeindex st ++@defcodeindex op ++@syncodeindex tp cp ++ ++ ++@c To avoid uppercasing in @deffn while converting to info, we define ++@c our special @Var{}. ++ ++@macro Var{arg} ++@r{@slanted{\arg\}} ++@end macro ++ ++ ++@c To assure correct HTML translation, some ugly hacks are necessary. ++@c While processing a @def... request, the HTML translator looks at the ++@c next line to decide whether to start indentation, and if the line ++@c starts with @def... (e.g. @deffnx), indentation is started. We must ++@c therefore ensure that a @def... is seen, during macro expansion. ++@c ++@c The following macros have to be used: ++@c ++@c One item: ++@c ++@c @Def... ++@c ++@c Two items: ++@c ++@c @Def...List ++@c @Def...ListEnd ++@c ++@c More than two: ++@c ++@c @Def...List ++@c @Def...Item ++@c @Def...Item ++@c ... ++@c @Def...ListEnd ++@c ++@c The definition block must end with ++@c ++@c @endDef... ++@c ++@c The above is valid for texinfo 4.0f and above. ++@c ++@c By default, only the first item generates an index entry. To ++@c override this, use a variant with a trailing `x' (like ++@c `@DefmacItemx'). ++ ++ ++@c a dummy macro to assure the `@def...' ++ ++@macro defdummy ++@c ++@end macro ++ ++ ++@c definition of requests ++ ++@macro Defreq{name, arg} ++@deffn Request @t{.\name\} \arg\ ++@rqindex \name\ ++@c ++@end macro ++ ++@macro DefreqList{name, arg} ++@deffn Request @t{.\name\} \arg\ ++@defdummy ++@rqindex \name\ ++@c ++@end macro ++ ++@macro DefreqItem{name, arg} ++@deffnx Request @t{.\name\} \arg\ ++@defdummy ++@c ++@end macro ++ ++@macro DefreqItemx{name, arg} ++@deffnx Request @t{.\name\} \arg\ ++@defdummy ++@rqindex \name\ ++@c ++@end macro ++ ++@macro DefreqListEnd{name, arg} ++@deffnx Request @t{.\name\} \arg\ ++@c ++@end macro ++ ++@macro DefreqListEndx{name, arg} ++@deffnx Request @t{.\name\} \arg\ ++@rqindex \name\ ++@c ++@end macro ++ ++@macro endDefreq ++@end deffn ++@end macro ++ ++ ++@c definition of escapes ++ ++@macro Defesc{name, delimI, arg, delimII} ++@deffn Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} ++@esindex \name\ ++@c ++@end macro ++ ++@macro DefescList{name, delimI, arg, delimII} ++@deffn Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} ++@defdummy ++@esindex \name\ ++@c ++@end macro ++ ++@macro DefescItem{name, delimI, arg, delimII} ++@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} ++@defdummy ++@c ++@end macro ++ ++@macro DefescItemx{name, delimI, arg, delimII} ++@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} ++@defdummy ++@esindex \name\ ++@c ++@end macro ++ ++@macro DefescListEnd{name, delimI, arg, delimII} ++@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} ++@c ++@end macro ++ ++@macro DefescListEndx{name, delimI, arg, delimII} ++@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} ++@esindex \name\ ++@c ++@end macro ++ ++@macro endDefesc ++@end deffn ++@end macro ++ ++ ++@c definition of registers ++ ++@macro Defreg{name} ++@deffn Register @t{\\n[\name\]} ++@vindex \name\ ++@c ++@end macro ++ ++@macro DefregList{name} ++@deffn Register @t{\\n[\name\]} ++@defdummy ++@vindex \name\ ++@c ++@end macro ++ ++@macro DefregItem{name} ++@deffnx Register @t{\\n[\name\]} ++@defdummy ++@c ++@end macro ++ ++@macro DefregItemx{name} ++@deffnx Register @t{\\n[\name\]} ++@defdummy ++@vindex \name\ ++@c ++@end macro ++ ++@macro DefregListEnd{name} ++@deffnx Register @t{\\n[\name\]} ++@c ++@end macro ++ ++@macro DefregListEndx{name} ++@deffnx Register @t{\\n[\name\]} ++@vindex \name\ ++@c ++@end macro ++ ++@macro endDefreg ++@end deffn ++@end macro ++ ++ ++@c definition of registers specific to macro packages, preprocessors, etc. ++ ++@macro Defmpreg{name, package} ++@deffn Register @t{\\n[\name\]} ++@vindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefmpregList{name, package} ++@deffn Register @t{\\n[\name\]} ++@defdummy ++@vindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefmpregItem{name, package} ++@deffnx Register @t{\\n[\name\]} ++@defdummy ++@c ++@end macro ++ ++@macro DefmpregItemx{name, package} ++@deffnx Register @t{\\n[\name\]} ++@defdummy ++@vindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefmpregListEnd{name, package} ++@deffnx Register @t{\\n[\name\]} ++@c ++@end macro ++ ++@macro DefmpregListEndx{name, package} ++@deffnx Register @t{\\n[\name\]} ++@vindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro endDefmpreg ++@end deffn ++@end macro ++ ++ ++@c definition of macros ++ ++@macro Defmac{name, arg, package} ++@defmac @t{.\name\} \arg\ ++@maindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefmacList{name, arg, package} ++@defmac @t{.\name\} \arg\ ++@defdummy ++@maindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefmacItem{name, arg, package} ++@defmacx @t{.\name\} \arg\ ++@defdummy ++@c ++@end macro ++ ++@macro DefmacItemx{name, arg, package} ++@defmacx @t{.\name\} \arg\ ++@defdummy ++@maindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefmacListEnd{name, arg, package} ++@defmacx @t{.\name\} \arg\ ++@c ++@end macro ++ ++@macro DefmacListEndx{name, arg, package} ++@defmacx @t{.\name\} \arg\ ++@maindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro endDefmac ++@end defmac ++@end macro ++ ++ ++@c definition of strings ++ ++@macro Defstr{name, package} ++@deffn String @t{\\*[\name\]} ++@stindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefstrList{name, package} ++@deffn String @t{\\*[\name\]} ++@defdummy ++@stindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefstrItem{name, package} ++@deffnx String @t{\\*[\name\]} ++@defdummy ++@c ++@end macro ++ ++@macro DefstrItemx{name, package} ++@deffnx String @t{\\*[\name\]} ++@defdummy ++@stindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro DefstrListEnd{name, package} ++@deffnx String @t{\\*[\name\]} ++@c ++@end macro ++ ++@macro DefstrListEndx{name, package} ++@deffnx String @t{\\*[\name\]} ++@stindex \name\ @r{[}\package\@r{]} ++@c ++@end macro ++ ++@macro endDefstr ++@end deffn ++@end macro ++ ++ ++@c our example macros ++ ++@macro Example ++@example ++@group ++@end macro ++ ++@macro endExample ++@end group ++@end example ++@end macro ++ ++@macro CartoucheExample ++@cartouche ++@example ++@end macro ++ ++@macro endCartoucheExample ++@end example ++@end cartouche ++@end macro ++ ++ ++@c ++ ++@tex ++\gdef\Langlemacro{\angleleft} ++\gdef\Ranglemacro{\angleright} ++@end tex ++ ++@iftex ++@set Langlemacro @Langlemacro ++@set Ranglemacro @Ranglemacro ++@end iftex ++ ++@ifnottex ++@set Langlemacro < ++@set Ranglemacro > ++@end ifnottex ++ ++@macro angles{text} ++@value{Langlemacro}@r{\text\}@value{Ranglemacro} ++@end macro ++ ++ ++@c a <= sign ++@c ++@c Since expansion of macros has changed between texinfo 4.x and 5.x, ++@c we can't define a macro but have to use @value directly. ++ ++@tex ++\gdef\LE{\le} ++@end tex ++ ++@iftex ++@set LE @LE ++@end iftex ++ ++@ifnottex ++@set LE <= ++@end ifnottex ++ ++ ++@c Special care is required with parentheses, brackets, and braces: ++@c ++@c . Real parentheses in @deffn produce an error while compiling with ++@c TeX. ++@c . Real brackets use the wrong font in @deffn, overriding @t{}. ++@c ++@c . @{ and @} fail with info if used in a macro. ++@c ++@c Since macros aren't expanded in @deffn during -E, the following ++@c definitions are for non-TeX only. ++@c ++@c This is true for texinfo 4.0 and above. ++ ++@iftex ++@set Lparenmacro @lparen ++@set Rparenmacro @rparen ++@set Lbrackmacro @lbrack ++@set Rbrackmacro @rbrack ++@set Lbracemacro @{ ++@set Rbracemacro @} ++@end iftex ++ ++@ifnottex ++@set Lparenmacro ( ++@set Rparenmacro ) ++@set Lbrackmacro [ ++@set Rbrackmacro ] ++@set Lbracemacro @{ ++@set Rbracemacro @} ++@end ifnottex ++ ++@macro Lparen{} ++@value{Lparenmacro} ++@end macro ++@macro Rparen{} ++@value{Rparenmacro} ++@end macro ++@macro Lbrack{} ++@value{Lbrackmacro} ++@end macro ++@macro Rbrack{} ++@value{Rbrackmacro} ++@end macro ++@macro Lbrace{} ++@value{Lbracemacro} ++@end macro ++@macro Rbrace{} ++@value{Rbracemacro} ++@end macro ++ ++ ++@c This suppresses the word `Appendix' in the appendix headers. ++ ++@tex ++\gdef\gobblefirst#1#2{#2} ++\gdef\putwordAppendix{\gobblefirst} ++@end tex ++ ++ ++@c We map some latin-1 characters to corresponding texinfo macros. ++@c Newer versions of texinfo.tex have similar code included already. ++ ++@tex ++\global\catcode`^^e4\active % ++\gdef^^e4{\"a} ++\global\catcode`^^c4\active % ++\gdef^^c4{\"A} ++\global\catcode`^^e9\active % ++\gdef^^e9{\'e} ++\global\catcode`^^c9\active % ++\gdef^^c9{\'E} ++\global\catcode`^^f6\active % ++\gdef^^f6{\"o} ++\global\catcode`^^d6\active % ++\gdef^^d6{\"O} ++\global\catcode`^^fc\active % ++\gdef^^fc{\"u} ++\global\catcode`^^dc\active % ++\gdef^^dc{\"U} ++\global\catcode`^^e6\active % ++\gdef^^e6{\ae} ++\global\catcode`^^c6\active % ++\gdef^^c6{\AE} ++\global\catcode`^^df\active % ++\gdef^^df{\ss} ++@end tex ++ ++ ++@c Note: We say `Roman numerals' but `roman font'. ++ ++ ++@dircategory Typesetting ++@direntry ++* Groff: (groff). The GNU troff document formatting system. ++@end direntry ++ ++ ++@titlepage ++@title groff ++@subtitle The GNU implementation of @code{troff} ++@subtitle Edition 1.22.3 ++@subtitle Autumn 2014 ++@author by Trent A.@tie{}Fisher ++@author and Werner Lemberg (@email{bug-groff@@gnu.org}) ++ ++@page ++@vskip 0pt plus 1filll ++@insertcopying ++@end titlepage ++ ++@contents ++ ++@ifnottex ++@node Top, Introduction, (dir), (dir) ++@top GNU troff ++@end ifnottex ++ ++@menu ++* Introduction:: ++* Invoking groff:: ++* Tutorial for Macro Users:: ++* Macro Packages:: ++* gtroff Reference:: ++* Preprocessors:: ++* Output Devices:: ++* File formats:: ++* Installation:: ++* Copying This Manual:: ++* Request Index:: ++* Escape Index:: ++* Operator Index:: ++* Register Index:: ++* Macro Index:: ++* String Index:: ++* Glyph Name Index:: ++* Font File Keyword Index:: ++* Program and File Index:: ++* Concept Index:: ++@end menu ++ ++@ifnottex ++@insertcopying ++@end ifnottex ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Introduction, Invoking groff, Top, Top ++@chapter Introduction ++@cindex introduction ++ ++GNU @code{troff} (or @code{groff}) is a system for typesetting ++documents. @code{troff} is very flexible and has been used extensively ++for some thirty years. It is well entrenched in the @acronym{UNIX} ++community. ++ ++@menu ++* What Is groff?:: ++* History:: ++* groff Capabilities:: ++* Macro Package Intro:: ++* Preprocessor Intro:: ++* Output device intro:: ++* Credits:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node What Is groff?, History, Introduction, Introduction ++@section What Is @code{groff}? ++@cindex what is @code{groff}? ++@cindex @code{groff} -- what is it? ++ ++@code{groff} belongs to an older generation of document preparation ++systems, which operate more like compilers than the more recent ++interactive @acronym{WYSIWYG}@footnote{What You See Is What You Get} ++systems. @code{groff} and its contemporary counterpart, @TeX{}, both ++work using a @dfn{batch} paradigm: The input (or @dfn{source}) files are ++normal text files with embedded formatting commands. These files can ++then be processed by @code{groff} to produce a typeset document on a ++variety of devices. ++ ++@code{groff} should not be confused with a @dfn{word processor}, an ++integrated system of editor and text formatter. Also, many word ++processors follow the @acronym{WYSIWYG} paradigm discussed earlier. ++ ++Although @acronym{WYSIWYG} systems may be easier to use, they have a ++number of disadvantages compared to @code{troff}: ++ ++@itemize @bullet ++@item ++They must be used on a graphics display to work on a document. ++ ++@item ++Most of the @acronym{WYSIWYG} systems are either non-free or are not ++very portable. ++ ++@item ++@code{troff} is firmly entrenched in all @acronym{UNIX} systems. ++ ++@item ++It is difficult to have a wide range of capabilities within the confines ++of a GUI/window system. ++ ++@item ++It is more difficult to make global changes to a document. ++@end itemize ++ ++@quotation ++``GUIs normally make it simple to accomplish simple actions and ++impossible to accomplish complex actions.'' --Doug Gwyn (22/Jun/91 in ++@code{comp.unix.wizards}) ++@end quotation ++ ++ ++@c ===================================================================== ++ ++@node History, groff Capabilities, What Is groff?, Introduction ++@section History ++@cindex history ++ ++@cindex @code{RUNOFF}, the program ++@cindex @code{rf}, the program ++@code{troff} can trace its origins back to a formatting program called ++@code{RUNOFF}, written by Jerry Saltzer, which ran on the @acronym{CTSS} ++(@emph{Compatible Time Sharing System}, a project of MIT, the ++Massachusetts Institute of Technology) in the ++mid-sixties.@footnote{Jerome H.@: Saltzer, a grad student then, later a ++Professor of Electrical Engineering, now retired. Saltzer's PhD thesis ++was the first application for @code{RUNOFF} and is available from the ++MIT Libraries.} The name came from the use of the phrase ``run off a ++document'', meaning to print it out. ++@c ++@c Tom Van Vleck writes about the following: ++@c ++@c I am not sure about this.. I think the BCPL runoff was the port to ++@c the 635 architecture, and that the order of events is ++@c 1. CTSS runoff ++@c 2. BCPL runoff on Multics ++@c 3. BCPL runoff on 635 ++@c 4. rf on PDP-7 ++@c ++Bob Morris ported it to the 635 architecture and called the program ++@code{roff} (an abbreviation of @code{runoff}). It was rewritten as ++@code{rf} for the @w{PDP-7} (before having @acronym{UNIX}), and at the ++same time (1969), Doug McIllroy rewrote an extended and simplified ++version of @code{roff} in the @acronym{BCPL} programming language. ++ ++@cindex @code{roff}, the program ++In 1971, the UNIX developers wanted to get a @w{PDP-11}, and to justify ++the cost, proposed the development of a document formatting system for ++the @acronym{AT&T} patents division. This first formatting program was ++a reimplementation of McIllroy's @code{roff}, written by J.@tie{}F.@: ++Ossanna. ++ ++@cindex @code{nroff}, the program ++When they needed a more flexible language, a new version of @code{roff} ++called @code{nroff} (``Newer @code{roff}'') was written. It had a much ++more complicated syntax, but provided the basis for all future versions. ++When they got a Graphic Systems CAT Phototypesetter, Ossanna wrote a ++version of @code{nroff} that would drive it. It was dubbed ++@code{troff}, for ``typesetter @code{roff}'', although many people have ++speculated that it actually means ``Times @code{roff}'' because of the ++use of the Times font family in @code{troff} by default. As such, the ++name @code{troff} is pronounced `@w{t-roff}' rather than `trough'. ++ ++With @code{troff} came @code{nroff} (they were actually the same program ++except for some @samp{#ifdef}s), which was for producing output for line ++printers and character terminals. It understood everything @code{troff} ++did, and ignored the commands that were not applicable (e.g.@: font ++changes). ++ ++Since there are several things that cannot be done easily in ++@code{troff}, work on several preprocessors began. These programs would ++transform certain parts of a document into @code{troff}, which made a ++very natural use of pipes in @acronym{UNIX}. ++ ++The @code{eqn} preprocessor allowed mathematical formul to be specified ++in a much simpler and more intuitive manner. @code{tbl} is a ++preprocessor for formatting tables. The @code{refer} preprocessor (and ++the similar program, @code{bib}) processes citations in a document ++according to a bibliographic database. ++ ++Unfortunately, Ossanna's @code{troff} was written in @w{PDP-11} assembly ++language and produced output specifically for the CAT phototypesetter. ++He rewrote it in C, although it was now 7000@tie{}lines of uncommented ++code and still dependent on the CAT@. As the CAT became less common, and ++was no longer supported by the manufacturer, the need to make it support ++other devices became a priority. However, before this could be done, ++Ossanna died by a severe heart attack in a hospital while recovering ++from a previous one. ++ ++@pindex ditroff ++@cindex @code{ditroff}, the program ++So, Brian Kernighan took on the task of rewriting @code{troff}. The ++newly rewritten version produced device independent code that was very ++easy for postprocessors to read and translate to the appropriate printer ++codes. Also, this new version of @code{troff} (called @code{ditroff} ++for ``device independent @code{troff}'') had several extensions, which ++included drawing functions. ++ ++Due to the additional abilities of the new version of @code{troff}, ++several new preprocessors appeared. The @code{pic} preprocessor ++provides a wide range of drawing functions. Likewise the @code{ideal} ++preprocessor did the same, although via a much different paradigm. The ++@code{grap} preprocessor took specifications for graphs, but, unlike ++other preprocessors, produced @code{pic} code. ++ ++James Clark began work on a GNU implementation of @code{ditroff} in ++early@tie{}1989. The first version, @code{groff}@tie{}0.3.1, was ++released June@tie{}1990. @code{groff} included: ++ ++@itemize @bullet ++@item ++A replacement for @code{ditroff} with many extensions. ++ ++@item ++The @code{soelim}, @code{pic}, @code{tbl}, and @code{eqn} preprocessors. ++ ++@item ++Postprocessors for character devices, @sc{PostScript}, @TeX{} DVI, and ++X@tie{}Windows. GNU @code{troff} also eliminated the need for a ++separate @code{nroff} program with a postprocessor that would produce ++@acronym{ASCII} output. ++ ++@item ++A version of the @file{me} macros and an implementation of the ++@file{man} macros. ++@end itemize ++ ++Also, a front-end was included that could construct the, sometimes ++painfully long, pipelines required for all the post- and preprocessors. ++ ++Development of GNU @code{troff} progressed rapidly, and saw the ++additions of a replacement for @code{refer}, an implementation of the ++@file{ms} and @file{mm} macros, and a program to deduce how to format a ++document (@code{grog}). ++ ++It was declared a stable (i.e.@: non-beta) package with the release of ++version@tie{}1.04 around November@tie{}1991. ++ ++Beginning in@tie{}1999, @code{groff} has new maintainers (the package ++was an orphan for a few years). As a result, new features and programs ++like @code{grn}, a preprocessor for gremlin images, and an output device ++to produce @acronym{HTML} and @acronym{XHTML} have been added. ++ ++ ++@c ===================================================================== ++ ++@node groff Capabilities, Macro Package Intro, History, Introduction ++@section @code{groff} Capabilities ++@cindex @code{groff} capabilities ++@cindex capabilities of @code{groff} ++ ++So what exactly is @code{groff} capable of doing? @code{groff} provides ++a wide range of low-level text formatting operations. Using these, it ++is possible to perform a wide range of formatting tasks, such as ++footnotes, table of contents, multiple columns, etc. Here's a list of ++the most important operations supported by @code{groff}: ++ ++@itemize @bullet ++@item ++text filling, adjusting, and centering ++ ++@item ++hyphenation ++ ++@item ++page control ++ ++@item ++font and glyph size control ++ ++@item ++vertical spacing (e.g.@: double-spacing) ++ ++@item ++line length and indenting ++ ++@item ++macros, strings, diversions, and traps ++ ++@item ++number registers ++ ++@item ++tabs, leaders, and fields ++ ++@item ++input and output conventions and character translation ++ ++@item ++overstrike, bracket, line drawing, and zero-width functions ++ ++@item ++local horizontal and vertical motions and the width function ++ ++@item ++three-part titles ++ ++@item ++output line numbering ++ ++@item ++conditional acceptance of input ++ ++@item ++environment switching ++ ++@item ++insertions from the standard input ++ ++@item ++input/output file switching ++ ++@item ++output and error messages ++@end itemize ++ ++ ++@c ===================================================================== ++ ++@node Macro Package Intro, Preprocessor Intro, groff Capabilities, Introduction ++@section Macro Packages ++@cindex macro packages ++ ++Since @code{groff} provides such low-level facilities, it can be quite ++difficult to use by itself. However, @code{groff} provides a ++@dfn{macro} facility to specify how certain routine operations ++(e.g.@tie{}starting paragraphs, printing headers and footers, etc.)@: ++should be done. These macros can be collected together into a ++@dfn{macro package}. There are a number of macro packages available; ++the most common (and the ones described in this manual) are @file{man}, ++@file{mdoc}, @file{me}, @file{ms}, and @file{mm}. ++ ++ ++@c ===================================================================== ++ ++@node Preprocessor Intro, Output device intro, Macro Package Intro, Introduction ++@section Preprocessors ++@cindex preprocessors ++ ++Although @code{groff} provides most functions needed to format a ++document, some operations would be unwieldy (e.g.@: to draw pictures). ++Therefore, programs called @dfn{preprocessors} were written that ++understand their own language and produce the necessary @code{groff} ++operations. These preprocessors are able to differentiate their own ++input from the rest of the document via markers. ++ ++To use a preprocessor, @acronym{UNIX} pipes are used to feed the output ++from the preprocessor into @code{groff}. Any number of preprocessors ++may be used on a given document; in this case, the preprocessors are ++linked together into one pipeline. However, with @code{groff}, the user ++does not need to construct the pipe, but only tell @code{groff} what ++preprocessors to use. ++ ++@code{groff} currently has preprocessors for producing tables ++(@code{tbl}), typesetting equations (@code{eqn}), drawing pictures ++(@code{pic} and @code{grn}), processing bibliographies ++(@code{refer}), and drawing chemical structures (@code{chem}). An ++associated program that is useful when dealing with preprocessors is ++@code{soelim}. ++ ++A free implementation of @code{grap}, a preprocessor for drawing graphs, ++can be obtained as an extra package; @code{groff} can use @code{grap} ++also. ++ ++Unique to @code{groff} is the @code{preconv} preprocessor that enables ++@code{groff} to handle documents in various input encodings. ++ ++There are other preprocessors in existence, but, unfortunately, no free ++implementations are available. Among them is a preprocessor for drawing ++mathematical pictures (@code{ideal}). ++ ++ ++@c ===================================================================== ++ ++@node Output device intro, Credits, Preprocessor Intro, Introduction ++@section Output Devices ++@cindex postprocessors ++@cindex output devices ++@cindex devices for output ++ ++@code{groff} actually produces device independent code that may be fed ++into a postprocessor to produce output for a particular device. ++Currently, @code{groff} has postprocessors for @sc{PostScript} devices, ++character terminals, X@tie{}Windows (for previewing), @TeX{} DVI format, ++HP LaserJet@tie{}4 and Canon LBP printers (which use @acronym{CAPSL}), ++@acronym{HTML}, @acronym{XHTML}, and PDF. ++ ++ ++@c ===================================================================== ++ ++@node Credits, , Output device intro, Introduction ++@section Credits ++@cindex credits ++ ++Large portions of this manual were taken from existing documents, most ++notably, the manual pages for the @code{groff} package by James Clark, ++and Eric Allman's papers on the @file{me} macro package. ++ ++The section on the @file{man} macro package is partly based on ++Susan@tie{}G.@: Kleinmann's @file{groff_man} manual page written for the ++Debian GNU/Linux system. ++ ++Larry Kollar contributed the section in the @file{ms} macro package. ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Invoking groff, Tutorial for Macro Users, Introduction, Top ++@chapter Invoking @code{groff} ++@cindex invoking @code{groff} ++@cindex @code{groff} invocation ++ ++This section focuses on how to invoke the @code{groff} front end. This ++front end takes care of the details of constructing the pipeline among ++the preprocessors, @code{gtroff} and the postprocessor. ++ ++It has become a tradition that GNU programs get the prefix @samp{g} to ++distinguish it from its original counterparts provided by the host (see ++@ref{Environment}, for more details). Thus, for example, @code{geqn} is ++GNU @code{eqn}. On operating systems like GNU/Linux or the Hurd, which ++don't contain proprietary versions of @code{troff}, and on ++MS-DOS/MS-Windows, where @code{troff} and associated programs are not ++available at all, this prefix is omitted since GNU @code{troff} is the ++only used incarnation of @code{troff}. Exception: @samp{groff} is never ++replaced by @samp{roff}. ++ ++In this document, we consequently say @samp{gtroff} when talking about ++the GNU @code{troff} program. All other implementations of @code{troff} ++are called @acronym{AT&T} @code{troff}, which is the common origin of all ++@code{troff} derivates (with more or less compatible changes). ++Similarly, we say @samp{gpic}, @samp{geqn}, etc. ++ ++@menu ++* Groff Options:: ++* Environment:: ++* Macro Directories:: ++* Font Directories:: ++* Paper Size:: ++* Invocation Examples:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node Groff Options, Environment, Invoking groff, Invoking groff ++@section Options ++@cindex options ++ ++@pindex groff ++@pindex gtroff ++@pindex gpic ++@pindex geqn ++@pindex ggrn ++@pindex grap ++@pindex gtbl ++@pindex gchem ++@pindex grefer ++@pindex gsoelim ++@pindex preconv ++@code{groff} normally runs the @code{gtroff} program and a ++postprocessor appropriate for the selected device. The default device ++is @samp{ps} (but it can be changed when @code{groff} is configured and ++built). It can optionally preprocess with any of @code{gpic}, ++@code{geqn}, @code{gtbl}, @code{ggrn}, @code{grap}, @code{gchem}, ++@code{grefer}, @code{gsoelim}, or @code{preconv}. ++ ++This section only documents options to the @code{groff} front end. Many ++of the arguments to @code{groff} are passed on to @code{gtroff}, ++therefore those are also included. Arguments to pre- or postprocessors ++can be found in @ref{Invoking gpic}, @ref{Invoking geqn}, @ref{Invoking ++gtbl}, @ref{Invoking ggrn}, @ref{Invoking grefer}, @ref{Invoking gchem}, ++@ref{Invoking gsoelim}, @ref{Invoking preconv}, @ref{Invoking grotty}, ++@ref{Invoking grops}, @ref{Invoking gropdf}, @ref{Invoking grohtml}, ++@ref{Invoking grodvi}, @ref{Invoking grolj4}, @ref{Invoking grolbp}, and ++@ref{Invoking gxditview}. ++ ++The command line format for @code{groff} is: ++ ++@Example ++groff [ -abceghijklpstvzCEGNRSUVXZ ] [ -d@var{cs} ] [ -D@var{arg} ] ++ [ -f@var{fam} ] [ -F@var{dir} ] [ -I@var{dir} ] [ -K@var{arg} ] ++ [ -L@var{arg} ] [ -m@var{name} ] [ -M@var{dir} ] [ -n@var{num} ] ++ [ -o@var{list} ] [ -P@var{arg} ] [ -r@var{cn} ] [ -T@var{dev} ] ++ [ -w@var{name} ] [ -W@var{name} ] [ @var{files}@dots{} ] ++@endExample ++ ++The command line format for @code{gtroff} is as follows. ++ ++@Example ++gtroff [ -abcivzCERU ] [ -d@var{cs} ] [ -f@var{fam} ] [ -F@var{dir} ] ++ [ -m@var{name} ] [ -M@var{dir} ] [ -n@var{num} ] [ -o@var{list} ] ++ [ -r@var{cn} ] [ -T@var{name} ] [ -w@var{name} ] [ -W@var{name} ] ++ [ @var{files}@dots{} ] ++@endExample ++ ++@noindent ++Obviously, many of the options to @code{groff} are actually passed on to ++@code{gtroff}. ++ ++Options without an argument can be grouped behind a ++single@tie{}@option{-}. A filename of@tie{}@file{-} denotes the ++standard input. It is possible to have whitespace between an option and ++its parameter. ++ ++The @code{grog} command can be used to guess the correct @code{groff} ++command to format a file. ++ ++Here's the description of the command-line options: ++ ++@cindex command-line options ++@table @samp ++@item -a ++@cindex @acronym{ASCII} approximation output register (@code{.A}) ++Generate an @acronym{ASCII} approximation of the typeset output. The ++read-only register @code{.A} is then set to@tie{}1. @xref{Built-in ++Registers}. A typical example is ++ ++@Example ++groff -a -man -Tdvi troff.man | less ++@endExample ++ ++@noindent ++which shows how lines are broken for the DVI device. Note that this ++option is rather useless today since graphic output devices are ++available virtually everywhere. ++ ++@item -b ++Print a backtrace with each warning or error message. This backtrace ++should help track down the cause of the error. The line numbers given ++in the backtrace may not always be correct: @code{gtroff} can get ++confused by @code{as} or @code{am} requests while counting line numbers. ++ ++@item -c ++Suppress color output. ++ ++@item -C ++Enable compatibility mode. @xref{Implementation Differences}, for the ++list of incompatibilities between @code{groff} and @acronym{AT&T} ++@code{troff}. ++ ++@item -d@var{c}@var{s} ++@itemx -d@var{name}=@var{s} ++Define @var{c} or @var{name} to be a string@tie{}@var{s}. ++@var{c}@tie{}must be a one-letter name; @var{name} can be of arbitrary ++length. All string assignments happen before loading any macro file ++(including the start-up file). ++ ++@item -D@var{arg} ++Set default input encoding used by @code{preconv} to @var{arg}. Implies ++@option{-k}. ++ ++@item -e ++Preprocess with @code{geqn}. ++ ++@item -E ++Inhibit all error messages. ++ ++@item -f@var{fam} ++Use @var{fam} as the default font family. @xref{Font Families}. ++ ++@item -F@var{dir} ++Search @file{@var{dir}} for subdirectories @file{dev@var{name}} ++(@var{name} is the name of the device), for the @file{DESC} file, and ++for font files before looking in the standard directories (@pxref{Font ++Directories}). This option is passed to all pre- and postprocessors ++using the @env{GROFF_FONT_PATH} environment variable. ++ ++@item -g ++Preprocess with @code{ggrn}. ++ ++@item -G ++Preprocess with @code{grap}. Implies @option{-p}. ++ ++@item -h ++Print a help message. ++ ++@item -i ++Read the standard input after all the named input files have been ++processed. ++ ++@item -I@var{dir} ++This option may be used to specify a directory to search for files. ++It is passed to the following programs: ++ ++@itemize ++@item ++@code{gsoelim} (see @ref{gsoelim} for more details); ++it also implies @code{groff}'s @option{-s} option. ++ ++@item ++@code{gtroff}; it is used to search files named in the @code{psbb} and ++@code{so} requests. ++ ++@item ++@code{grops}; it is used to search files named in the ++@w{@code{\X'ps: import}} and @w{@code{\X'ps: file}} escapes. ++@end itemize ++ ++The current directory is always searched first. This option may be ++specified more than once; the directories are searched in the order ++specified. No directory search is performed for files specified using ++an absolute path. ++ ++@item -j ++Preprocess with @code{gchem}. Implies @option{-p}. ++ ++@item -k ++Preprocess with @code{preconv}. This is run before any other ++preprocessor. Please refer to @code{preconv}'s manual page for its ++behaviour if no @option{-K} (or @option{-D}) option is specified. ++ ++@item -K@var{arg} ++Set input encoding used by preconv to @var{arg}. Implies @option{-k}. ++ ++@item -l ++Send the output to a spooler for printing. The command used for this is ++specified by the @code{print} command in the device description file ++(see @ref{Font Files}, for more info). If not present, @option{-l} is ++ignored. ++ ++@item -L@var{arg} ++Pass @var{arg} to the spooler. Each argument should be passed with a ++separate @option{-L} option. Note that @code{groff} does not prepend a ++@samp{-} to @var{arg} before passing it to the postprocessor. If the ++@code{print} keyword in the device description file is missing, ++@option{-L} is ignored. ++ ++@item -m@var{name} ++Read in the file @file{@var{name}.tmac}. Normally @code{groff} searches ++for this in its macro directories. If it isn't found, it tries ++@file{tmac.@var{name}} (searching in the same directories). ++ ++@item -M@var{dir} ++Search directory @file{@var{dir}} for macro files before the standard ++directories (@pxref{Macro Directories}). ++ ++@item -n@var{num} ++Number the first page @var{num}. ++ ++@item -N ++Don't allow newlines with @code{eqn} delimiters. This is the same as ++the @option{-N} option in @code{geqn}. ++ ++@item -o@var{list} ++@cindex print current page register (@code{.P}) ++Output only pages in @var{list}, which is a comma-separated list of page ++ranges; @samp{@var{n}} means print page@tie{}@var{n}, ++@samp{@var{m}-@var{n}} means print every page between @var{m} ++and@tie{}@var{n}, @samp{-@var{n}} means print every page up ++to@tie{}@var{n}, @samp{@var{n}-} means print every page beginning ++with@tie{}@var{n}. @code{gtroff} exits after printing the last page in ++the list. All the ranges are inclusive on both ends. ++ ++Within @code{gtroff}, this information can be extracted with the ++@samp{.P} register. @xref{Built-in Registers}. ++ ++If your document restarts page numbering at the beginning of each ++chapter, then @code{gtroff} prints the specified page range for each ++chapter. ++ ++@item -p ++Preprocess with @code{gpic}. ++ ++@item -P@var{arg} ++Pass @var{arg} to the postprocessor. Each argument should be passed ++with a separate @option{-P} option. Note that @code{groff} does not ++prepend @samp{-} to @var{arg} before passing it to the postprocessor. ++ ++@item -r@var{c}@var{n} ++@itemx -r@var{name}=@var{n} ++Set number register@tie{}@var{c} or @var{name} to the ++value@tie{}@var{n}. @var{c}@tie{}must be a one-letter name; @var{name} ++can be of arbitrary length. @var{n}@tie{}can be any @code{gtroff} ++numeric expression. All register assignments happen before loading any ++macro file (including the start-up file). ++ ++@item -R ++Preprocess with @code{grefer}. No mechanism is provided for passing ++arguments to @code{grefer} because most @code{grefer} options have ++equivalent commands that can be included in the file. @xref{grefer}, ++for more details. ++ ++@pindex troffrc ++@pindex troffrc-end ++Note that @code{gtroff} also accepts a @option{-R} option, which is not ++accessible via @code{groff}. This option prevents the loading of the ++@file{troffrc} and @file{troffrc-end} files. ++ ++@item -s ++Preprocess with @code{gsoelim}. ++ ++@item -S ++@cindex @code{open} request, and safer mode ++@cindex @code{opena} request, and safer mode ++@cindex @code{pso} request, and safer mode ++@cindex @code{sy} request, and safer mode ++@cindex @code{pi} request, and safer mode ++@cindex safer mode ++@cindex mode, safer ++Safer mode. Pass the @option{-S} option to @code{gpic} and disable the ++@code{open}, @code{opena}, @code{pso}, @code{sy}, and @code{pi} ++requests. For security reasons, this is enabled by default. ++ ++@item -t ++Preprocess with @code{gtbl}. ++ ++@item -T@var{dev} ++Prepare output for device @var{dev}. The default device is @samp{ps}, ++unless changed when @code{groff} was configured and built. The ++following are the output devices currently available: ++ ++@table @code ++@item ps ++For @sc{PostScript} printers and previewers. ++ ++@item pdf ++For PDF viewers or printers. ++ ++@item dvi ++For @TeX{} DVI format. ++ ++@item X75 ++For a 75@dmn{dpi} X11 previewer. ++ ++@item X75-12 ++For a 75@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the ++document. ++ ++@item X100 ++For a 100@dmn{dpi} X11 previewer. ++ ++@item X100-12 ++For a 100@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the ++document. ++ ++@item ascii ++@cindex encoding, output, @acronym{ASCII} ++@cindex @acronym{ASCII}, output encoding ++@cindex output encoding, @acronym{ASCII} ++For typewriter-like devices using the (7-bit) @acronym{ASCII} ++character set. ++ ++@item latin1 ++@cindex encoding, output, @w{latin-1} (ISO @w{8859-1}) ++@cindex @w{latin-1} (ISO @w{8859-1}), output encoding ++@cindex ISO @w{8859-1} (@w{latin-1}), output encoding ++@cindex output encoding, @w{latin-1} (ISO @w{8859-1}) ++For typewriter-like devices that support the @w{Latin-1} ++(ISO@tie{}@w{8859-1}) character set. ++ ++@item utf8 ++@cindex encoding, output, @w{utf-8} ++@cindex @w{utf-8}, output encoding ++@cindex output encoding, @w{utf-8} ++For typewriter-like devices that use the Unicode (ISO@tie{}10646) ++character set with @w{UTF-8} encoding. ++ ++@item cp1047 ++@cindex encoding, output, @acronym{EBCDIC} ++@cindex @acronym{EBCDIC}, output encoding ++@cindex output encoding, @acronym{EBCDIC} ++@cindex encoding, output, cp1047 ++@cindex cp1047, output encoding ++@cindex output encoding, cp1047 ++@cindex IBM cp1047 output encoding ++For typewriter-like devices that use the @acronym{EBCDIC} encoding IBM ++cp1047. ++ ++@item lj4 ++For HP LaserJet4-compatible (or other PCL5-compatible) printers. ++ ++@item lbp ++For Canon @acronym{CAPSL} printers (@w{LBP-4} and @w{LBP-8} series laser ++printers). ++ ++@pindex pre-grohtml ++@pindex post-grohtml ++@cindex @code{grohtml}, the program ++@item html ++@itemx xhtml ++To produce @acronym{HTML} and @acronym{XHTML} output, respectively. ++Note that this driver consists of two parts, a preprocessor ++(@code{pre-grohtml}) and a postprocessor (@code{post-grohtml}). ++@end table ++ ++@cindex output device name string register (@code{.T}) ++@cindex output device usage number register (@code{.T}) ++The predefined @code{gtroff} string register @code{.T} contains the ++current output device; the read-only number register @code{.T} is set ++to@tie{}1 if this option is used (which is always true if @code{groff} ++is used to call @code{gtroff}). @xref{Built-in Registers}. ++ ++The postprocessor to be used for a device is specified by the ++@code{postpro} command in the device description file. (@xref{Font ++Files}, for more info.) This can be overridden with the @option{-X} ++option. ++ ++@item -U ++@cindex mode, unsafe ++@cindex unsafe mode ++Unsafe mode. This enables the @code{open}, @code{opena}, @code{pso}, ++@code{sy}, and @code{pi} requests. ++ ++@item -w@var{name} ++Enable warning @var{name}. Available warnings are described in ++@ref{Debugging}. Multiple @option{-w} options are allowed. ++ ++@item -W@var{name} ++Inhibit warning @var{name}. Multiple @option{-W} options are allowed. ++ ++@item -v ++Make programs run by @code{groff} print out their version number. ++ ++@item -V ++Print the pipeline on @code{stdout} instead of executing it. If ++specified more than once, print the pipeline on @code{stderr} and ++execute it. ++ ++@item -X ++Preview with @code{gxditview} instead of using the usual postprocessor. ++This is unlikely to produce good results except with @option{-Tps}. ++ ++Note that this is not the same as using @option{-TX75} or ++@option{-TX100} to view a document with @code{gxditview}: The former ++uses the metrics of the specified device, whereas the latter uses ++X-specific fonts and metrics. ++ ++@item -z ++Suppress output from @code{gtroff}. Only error messages are printed. ++ ++@item -Z ++Do not postprocess the output of @code{gtroff}. Normally @code{groff} ++automatically runs the appropriate postprocessor. ++@end table ++ ++ ++@c ===================================================================== ++ ++@node Environment, Macro Directories, Groff Options, Invoking groff ++@section Environment ++@cindex environment variables ++@cindex variables in environment ++ ++There are also several environment variables (of the operating system, ++not within @code{gtroff}) that can modify the behavior of @code{groff}. ++ ++@table @code ++@item GROFF_BIN_PATH ++@tindex GROFF_BIN_PATH@r{, environment variable} ++This search path, followed by @code{PATH}, is used for commands executed ++by @code{groff}. ++ ++@item GROFF_COMMAND_PREFIX ++@tindex GROFF_COMMAND_PREFIX@r{, environment variable} ++@cindex command prefix ++@cindex prefix, for commands ++If this is set to@tie{}@var{X}, then @code{groff} runs ++@code{@var{X}troff} instead of @code{gtroff}. This also applies to ++@code{tbl}, @code{pic}, @code{eqn}, @code{grn}, @code{chem}, ++@code{refer}, and @code{soelim}. It does not apply to @code{grops}, ++@code{grodvi}, @code{grotty}, @code{pre-grohtml}, @code{post-grohtml}, ++@code{preconv}, @code{grolj4}, @code{gropdf}, and @code{gxditview}. ++ ++The default command prefix is determined during the installation ++process. If a non-GNU troff system is found, prefix @samp{g} is used, ++none otherwise. ++ ++@item GROFF_ENCODING ++@tindex GROFF_ENCODING@r{, environment variable} ++The value of this environment value is passed to the @code{preconv} ++preprocessor to select the encoding of input files. Setting this option ++implies @code{groff}'s command line option @option{-k} (this is, ++@code{groff} actually always calls @code{preconv}). If set without a ++value, @code{groff} calls @code{preconv} without arguments. An explicit ++@option{-K} command line option overrides the value of ++@env{GROFF_ENCODING}. See the manual page of @code{preconv} for details. ++ ++@item GROFF_FONT_PATH ++@tindex GROFF_FONT_PATH@r{, environment variable} ++A colon-separated list of directories in which to search for the ++@code{dev}@var{name} directory (before the default directories are ++tried). @xref{Font Directories}. ++ ++@item GROFF_TMAC_PATH ++@tindex GROFF_TMAC_PATH@r{, environment variable} ++A colon-separated list of directories in which to search for macro files ++(before the default directories are tried). @xref{Macro Directories}. ++ ++@item GROFF_TMPDIR ++@tindex GROFF_TMPDIR@r{, environment variable} ++@tindex TMPDIR@r{, environment variable} ++The directory in which @code{groff} creates temporary files. If this is ++not set and @env{TMPDIR} is set, temporary files are created in that ++directory. Otherwise temporary files are created in a system-dependent ++default directory (on Unix and GNU/Linux systems, this is usually ++@file{/tmp}). @code{grops}, @code{grefer}, @code{pre-grohtml}, and ++@code{post-grohtml} can create temporary files in this directory. ++ ++@item GROFF_TYPESETTER ++@tindex GROFF_TYPESETTER@r{, environment variable} ++The default output device. ++@end table ++ ++Note that MS-DOS and MS-Windows ports of @code{groff} use semi-colons, ++rather than colons, to separate the directories in the lists described ++above. ++ ++ ++@c ===================================================================== ++ ++@node Macro Directories, Font Directories, Environment, Invoking groff ++@section Macro Directories ++@cindex macro directories ++@cindex directories for macros ++@cindex searching macros ++@cindex macros, searching ++ ++All macro file names must be named @code{@var{name}.tmac} or ++@code{tmac.@var{name}} to make the @option{-m@var{name}} command line ++option work. The @code{mso} request doesn't have this restriction; any ++file name can be used, and @code{gtroff} won't try to append or prepend ++the @samp{tmac} string. ++ ++@cindex tmac, directory ++@cindex directory, for tmac files ++@cindex tmac, path ++@cindex path, for tmac files ++@cindex searching macro files ++@cindex macro files, searching ++@cindex files, macro, searching ++Macro files are kept in the @dfn{tmac directories}, all of which ++constitute the @dfn{tmac path}. The elements of the search path for ++macro files are (in that order): ++ ++@itemize @bullet ++@item ++The directories specified with @code{gtroff}'s or @code{groff}'s ++@option{-M} command line option. ++ ++@item ++@tindex GROFF_TMAC_PATH@r{, environment variable} ++The directories given in the @env{GROFF_TMAC_PATH} environment variable. ++ ++@item ++@cindex safer mode ++@cindex mode, safer ++@cindex unsafe mode ++@cindex mode, unsafe ++@cindex current directory ++@cindex directory, current ++The current directory (only if in unsafe mode using the @option{-U} ++command line switch). ++ ++@item ++@cindex home directory ++@cindex directory, home ++The home directory. ++ ++@item ++@cindex site-specific directory ++@cindex directory, site-specific ++@cindex platform-specific directory ++@cindex directory, platform-specific ++A platform-dependent directory, a site-specific (platform-independent) ++directory, and the main tmac directory; the default locations are ++ ++@Example ++/usr/local/lib/groff/site-tmac ++/usr/local/share/groff/site-tmac ++/usr/local/share/groff/1.22.3/tmac ++@endExample ++ ++@noindent ++assuming that the version of @code{groff} is 1.22.3, and the ++installation prefix was @file{/usr/local}. It is possible to fine-tune ++those directories during the installation process. ++@end itemize ++ ++ ++@c ===================================================================== ++ ++@node Font Directories, Paper Size, Macro Directories, Invoking groff ++@section Font Directories ++@cindex font directories ++@cindex directories for fonts ++@cindex searching fonts ++@cindex fonts, searching ++ ++Basically, there is no restriction how font files for @code{groff} are ++named and how long font names are; however, to make the font family ++mechanism work (@pxref{Font Families}), fonts within a family should ++start with the family name, followed by the shape. For example, the ++Times family uses @samp{T} for the family name and @samp{R}, @samp{B}, ++@samp{I}, and @samp{BI} to indicate the shapes `roman', `bold', ++`italic', and `bold italic', respectively. Thus the final font names ++are @samp{TR}, @samp{TB}, @samp{TI}, and @samp{TBI}. ++ ++@cindex font path ++@cindex path, for font files ++All font files are kept in the @dfn{font directories}, which constitute ++the @dfn{font path}. The file search functions always append the ++directory @code{dev}@var{name}, where @var{name} is the name of the ++output device. Assuming, say, DVI output, and @file{/foo/bar} as a font ++directory, the font files for @code{grodvi} must be in ++@file{/foo/bar/devdvi}. ++ ++The elements of the search path for font files are (in that order): ++ ++@itemize @bullet ++@item ++The directories specified with @code{gtroff}'s or @code{groff}'s ++@option{-F} command line option. All device drivers and some ++preprocessors also have this option. ++ ++@item ++@tindex GROFF_FONT_PATH@r{, environment variable} ++The directories given in the @env{GROFF_FONT_PATH} environment variable. ++ ++@item ++@cindex site-specific directory ++@cindex directory, site-specific ++A site-specific directory and the main font directory; the default ++locations are ++ ++@Example ++/usr/local/share/groff/site-font ++/usr/local/share/groff/1.22.3/font ++@endExample ++ ++@noindent ++assuming that the version of @code{groff} is 1.22.3, and the ++installation prefix was @file{/usr/local}. It is possible to fine-tune ++those directories during the installation process. ++@end itemize ++ ++ ++@c ===================================================================== ++ ++@node Paper Size, Invocation Examples, Font Directories, Invoking groff ++@section Paper Size ++@cindex paper size ++@cindex size, paper ++@cindex landscape page orientation ++@cindex orientation, landscape ++@cindex page orientation, landscape ++ ++In groff, the page size for @code{gtroff} and for output devices are ++handled separately. @xref{Page Layout}, for vertical manipulation of ++the page size. @xref{Line Layout}, for horizontal changes. ++ ++A default paper size can be set in the device's @file{DESC} file. Most ++output devices also have a command line option @option{-p} to override ++the default paper size and option @option{-l} to use landscape ++orientation. @xref{DESC File Format}, for a description of the ++@code{papersize} keyword, which takes the same argument as @option{-p}. ++ ++@pindex papersize.tmac ++@pindex troffrc ++A convenient shorthand to set a particular paper size for @code{gtroff} ++is command line option @option{-dpaper=@var{size}}. This defines string ++@code{paper}, which is processed in file @file{papersize.tmac} (loaded in ++the start-up file @file{troffrc} by default). Possible values for ++@var{size} are the same as the predefined values for the ++@code{papersize} keyword (but only in lowercase) except ++@code{a7}-@code{d7}. An appended @samp{l} (ell) character denotes ++landscape orientation. ++ ++For example, use the following for PS output on A4 paper in landscape ++orientation: ++ ++@Example ++groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps ++@endExample ++ ++Note that it is up to the particular macro package to respect default ++page dimensions set in this way (most do). ++ ++ ++@c ===================================================================== ++ ++@node Invocation Examples, , Paper Size, Invoking groff ++@section Invocation Examples ++@cindex invocation examples ++@cindex examples of invocation ++ ++This section lists several common uses of @code{groff} and the ++corresponding command lines. ++ ++@Example ++groff file ++@endExample ++ ++@noindent ++This command processes @file{file} without a macro package or a ++preprocessor. The output device is the default, @samp{ps}, and the ++output is sent to @code{stdout}. ++ ++@Example ++groff -t -mandoc -Tascii file | less ++@endExample ++ ++@noindent ++This is basically what a call to the @code{man} program does. ++@code{gtroff} processes the manual page @file{file} with the ++@file{mandoc} macro file (which in turn either calls the @file{man} or ++the @file{mdoc} macro package), using the @code{tbl} preprocessor and ++the @acronym{ASCII} output device. Finally, the @code{less} pager ++displays the result. ++ ++@Example ++groff -X -m me file ++@endExample ++ ++@noindent ++Preview @file{file} with @code{gxditview}, using the @file{me} macro ++package. Since no @option{-T} option is specified, use the default ++device (@samp{ps}). Note that you can either say @w{@samp{-m me}} or ++@w{@samp{-me}}; the latter is an anachronism from the early days of ++@acronym{UNIX}.@footnote{The same is true for the other main macro ++packages that come with @code{groff}: @file{man}, @file{mdoc}, ++@file{ms}, @file{mm}, and @file{mandoc}. This won't work in general; ++for example, to load @file{trace.tmac}, either @samp{-mtrace} or ++@w{@samp{-m trace}} must be used.} ++ ++@Example ++groff -man -rD1 -z file ++@endExample ++ ++@noindent ++Check @file{file} with the @file{man} macro package, forcing ++double-sided printing -- don't produce any output. ++ ++@menu ++* grog:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node grog, , Invocation Examples, Invocation Examples ++@subsection @code{grog} ++ ++@pindex grog ++@code{grog} reads files, guesses which of the @code{groff} preprocessors ++and/or macro packages are required for formatting them, and prints the ++@code{groff} command including those options on the standard output. It ++generates one or more of the options @option{-e}, @option{-man}, ++@option{-me}, @option{-mm}, @option{-mom}, @option{-ms}, @option{-mdoc}, ++@option{-mdoc-old}, @option{-p}, @option{-R}, @option{-g}, @option{-G}, ++@option{-s}, and @option{-t}. ++ ++A special file name@tie{}@file{-} refers to the standard input. ++Specifying no files also means to read the standard input. Any ++specified options are included in the printed command. No space is ++allowed between options and their arguments. The only options ++recognized are @option{-C} (which is also passed on) to enable ++compatibility mode, and @option{-v} to print the version number and ++exit. ++ ++For example, ++ ++@Example ++grog -Tdvi paper.ms ++@endExample ++ ++@noindent ++guesses the appropriate command to print @file{paper.ms} and then prints ++it to the command line after adding the @option{-Tdvi} option. For ++direct execution, enclose the call to @code{grog} in backquotes at the ++@acronym{UNIX} shell prompt: ++ ++@Example ++`grog -Tdvi paper.ms` > paper.dvi ++@endExample ++ ++@noindent ++As seen in the example, it is still necessary to redirect the output to ++something meaningful (i.e.@: either a file or a pager program like ++@code{less}). ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Tutorial for Macro Users, Macro Packages, Invoking groff, Top ++@chapter Tutorial for Macro Users ++@cindex tutorial for macro users ++@cindex macros, tutorial for users ++@cindex user's tutorial for macros ++@cindex user's macro tutorial ++ ++Most users tend to use a macro package to format their papers. This ++means that the whole breadth of @code{groff} is not necessary for most ++people. This chapter covers the material needed to efficiently use a ++macro package. ++ ++@menu ++* Basics:: ++* Common Features:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node Basics, Common Features, Tutorial for Macro Users, Tutorial for Macro Users ++@section Basics ++@cindex basics of macros ++@cindex macro basics ++ ++This section covers some of the basic concepts necessary to understand ++how to use a macro package.@footnote{This section is derived from ++@cite{Writing Papers with nroff using -me} by Eric P.@tie{}Allman.} ++References are made throughout to more detailed information, if desired. ++ ++@code{gtroff} reads an input file prepared by the user and outputs a ++formatted document suitable for publication or framing. The input ++consists of text, or words to be printed, and embedded commands ++(@dfn{requests} and @dfn{escapes}), which tell @code{gtroff} how to ++format the output. For more detail on this, see @ref{Embedded ++Commands}. ++ ++The word @dfn{argument} is used in this chapter to mean a word or number ++that appears on the same line as a request, and which modifies the ++meaning of that request. For example, the request ++ ++@Example ++.sp ++@endExample ++ ++@noindent ++spaces one line, but ++ ++@Example ++.sp 4 ++@endExample ++ ++@noindent ++spaces four lines. The number@tie{}4 is an argument to the @code{sp} ++request, which says to space four lines instead of one. Arguments are ++separated from the request and from each other by spaces (@emph{no} ++tabs). More details on this can be found in @ref{Request and Macro ++Arguments}. ++ ++The primary function of @code{gtroff} is to collect words from input ++lines, fill output lines with those words, justify the right-hand margin ++by inserting extra spaces in the line, and output the result. For ++example, the input: ++ ++@Example ++Now is the time ++for all good men ++to come to the aid ++of their party. ++Four score and seven ++years ago, etc. ++@endExample ++ ++@noindent ++is read, packed onto output lines, and justified to produce: ++ ++@quotation ++Now is the time for all good men to come to the aid of their party. ++Four score and seven years ago, etc. ++@end quotation ++ ++@cindex break ++@cindex line break ++Sometimes a new output line should be started even though the current ++line is not yet full; for example, at the end of a paragraph. To do ++this it is possible to cause a @dfn{break}, which starts a new output ++line. Some requests cause a break automatically, as normally do blank ++input lines and input lines beginning with a space. ++ ++Not all input lines are text to be formatted. Some input lines are ++requests that describe how to format the text. Requests always have a ++period (@samp{.}) or an apostrophe (@samp{'}) as the first character of ++the input line. ++ ++The text formatter also does more complex things, such as automatically ++numbering pages, skipping over page boundaries, putting footnotes in the ++correct place, and so forth. ++ ++Here are a few hints for preparing text for input to @code{gtroff}. ++ ++@itemize @bullet ++@item ++First, keep the input lines short. Short input lines are easier to ++edit, and @code{gtroff} packs words onto longer lines anyhow. ++ ++@item ++In keeping with this, it is helpful to begin a new line after every ++comma or phrase, since common corrections are to add or delete sentences ++or phrases. ++ ++@item ++End each sentence with two spaces -- or better, start each sentence on a ++new line. @code{gtroff} recognizes characters that usually end a ++sentence, and inserts sentence space accordingly. ++ ++@item ++Do not hyphenate words at the end of lines -- @code{gtroff} is smart ++enough to hyphenate words as needed, but is not smart enough to take ++hyphens out and join a word back together. Also, words such as ++``mother-in-law'' should not be broken over a line, since then a space ++can occur where not wanted, such as ``@w{mother- in}-law''. ++@end itemize ++ ++@cindex double-spacing (@code{ls}) ++@cindex spacing ++@code{gtroff} double-spaces output text automatically if you use the ++request @w{@samp{.ls 2}}. Reactivate single-spaced mode by typing ++@w{@samp{.ls 1}}.@footnote{If you need finer granularity of the vertical ++space, use the @code{pvs} request (@pxref{Changing Type Sizes}).} ++ ++A number of requests allow to change the way the output looks, sometimes ++called the @dfn{layout} of the output page. Most of these requests ++adjust the placing of @dfn{whitespace} (blank lines or spaces). ++ ++@cindex new page (@code{bp}) ++The @code{bp} request starts a new page, causing a line break. ++ ++@cindex blank line (@code{sp}) ++@cindex empty line (@code{sp}) ++@cindex line, empty (@code{sp}) ++The request @w{@samp{.sp @var{N}}} leaves @var{N}@tie{}lines of blank ++space. @var{N}@tie{}can be omitted (meaning skip a single line) or can ++be of the form @var{N}i (for @var{N}@tie{}inches) or @var{N}c (for ++@var{N}@tie{}centimeters). For example, the input: ++ ++@Example ++.sp 1.5i ++My thoughts on the subject ++.sp ++@endExample ++ ++@noindent ++leaves one and a half inches of space, followed by the line ``My ++thoughts on the subject'', followed by a single blank line (more ++measurement units are available, see @ref{Measurements}). ++ ++@cindex centering lines (@code{ce}) ++@cindex lines, centering (@code{ce}) ++Text lines can be centered by using the @code{ce} request. The line ++after @code{ce} is centered (horizontally) on the page. To center more ++than one line, use @w{@samp{.ce @var{N}}} (where @var{N} is the number ++of lines to center), followed by the @var{N}@tie{}lines. To center many ++lines without counting them, type: ++ ++@Example ++.ce 1000 ++lines to center ++.ce 0 ++@endExample ++ ++@noindent ++The @w{@samp{.ce 0}} request tells @code{groff} to center zero more ++lines, in other words, stop centering. ++ ++@cindex line break (@code{br}) ++@cindex break (@code{br}) ++All of these requests cause a break; that is, they always start a new ++line. To start a new line without performing any other action, use ++@code{br}. ++ ++ ++@c ===================================================================== ++ ++@node Common Features, , Basics, Tutorial for Macro Users ++@section Common Features ++@cindex common features ++@cindex features, common ++ ++@code{gtroff} provides very low-level operations for formatting a ++document. There are many common routine operations that are done in ++all documents. These common operations are written into @dfn{macros} ++and collected into a @dfn{macro package}. ++ ++All macro packages provide certain common capabilities that fall into ++the following categories. ++ ++@menu ++* Paragraphs:: ++* Sections and Chapters:: ++* Headers and Footers:: ++* Page Layout Adjustment:: ++* Displays:: ++* Footnotes and Annotations:: ++* Table of Contents:: ++* Indices:: ++* Paper Formats:: ++* Multiple Columns:: ++* Font and Size Changes:: ++* Predefined Strings:: ++* Preprocessor Support:: ++* Configuration and Customization:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Paragraphs, Sections and Chapters, Common Features, Common Features ++@subsection Paragraphs ++@cindex paragraphs ++ ++One of the most common and most used capability is starting a paragraph. ++There are a number of different types of paragraphs, any of which can be ++initiated with macros supplied by the macro package. Normally, ++paragraphs start with a blank line and the first line indented, like the ++text in this manual. There are also block style paragraphs, which omit ++the indentation: ++ ++@Example ++Some men look at constitutions with sanctimonious ++reverence, and deem them like the ark of the covenant, too ++sacred to be touched. ++@endExample ++ ++@noindent ++And there are also indented paragraphs, which begin with a tag or label ++at the margin and the remaining text indented. ++ ++@Example ++one This is the first paragraph. Notice how the first ++ line of the resulting paragraph lines up with the ++ other lines in the paragraph. ++@endExample ++ ++@Example ++longlabel ++ This paragraph had a long label. The first ++ character of text on the first line does not line up ++ with the text on second and subsequent lines, ++ although they line up with each other. ++@endExample ++ ++A variation of this is a bulleted list. ++ ++@Example ++. Bulleted lists start with a bullet. It is possible ++ to use other glyphs instead of the bullet. In nroff ++ mode using the ASCII character set for output, a dot ++ is used instead of a real bullet. ++@endExample ++ ++@c --------------------------------------------------------------------- ++ ++@node Sections and Chapters, Headers and Footers, Paragraphs, Common Features ++@subsection Sections and Chapters ++ ++Most macro packages supply some form of section headers. The simplest ++kind is simply the heading on a line by itself in bold type. Others ++supply automatically numbered section heading or different heading ++styles at different levels. Some, more sophisticated, macro packages ++supply macros for starting chapters and appendices. ++ ++@c --------------------------------------------------------------------- ++ ++@node Headers and Footers, Page Layout Adjustment, Sections and Chapters, Common Features ++@subsection Headers and Footers ++ ++Every macro package gives some way to manipulate the @dfn{headers} and ++@dfn{footers} (also called @dfn{titles}) on each page. This is text put ++at the top and bottom of each page, respectively, which contain data ++like the current page number, the current chapter title, and so on. Its ++appearance is not affected by the running text. Some packages allow for ++different ones on the even and odd pages (for material printed in a book ++form). ++ ++The titles are called @dfn{three-part titles}, that is, there is a ++left-justified part, a centered part, and a right-justified part. An ++automatically generated page number may be put in any of these fields ++with the @samp{%} character (see @ref{Page Layout}, for more details). ++ ++@c --------------------------------------------------------------------- ++ ++@node Page Layout Adjustment, Displays, Headers and Footers, Common Features ++@subsection Page Layout ++ ++Most macro packages let the user specify top and bottom margins and ++other details about the appearance of the printed pages. ++ ++@c --------------------------------------------------------------------- ++ ++@node Displays, Footnotes and Annotations, Page Layout Adjustment, Common Features ++@subsection Displays ++@cindex displays ++ ++@dfn{Displays} are sections of text to be set off from the body of the ++paper. Major quotes, tables, and figures are types of displays, as are ++all the examples used in this document. ++ ++@cindex quotes, major ++@cindex major quotes ++@dfn{Major quotes} are quotes that are several lines long, and hence ++are set in from the rest of the text without quote marks around them. ++ ++@cindex list ++A @dfn{list} is an indented, single-spaced, unfilled display. Lists ++should be used when the material to be printed should not be filled and ++justified like normal text, such as columns of figures or the examples ++used in this paper. ++ ++@cindex keep ++A @dfn{keep} is a display of lines that are kept on a single page if ++possible. An example for a keep might be a diagram. Keeps differ from ++lists in that lists may be broken over a page boundary whereas keeps are ++not. ++ ++@cindex keep, floating ++@cindex floating keep ++@dfn{Floating keeps} move relative to the text. Hence, they are good ++for things that are referred to by name, such as ``See figure@tie{}3''. ++A floating keep appears at the bottom of the current page if it fits; ++otherwise, it appears at the top of the next page. Meanwhile, the ++surrounding text `flows' around the keep, thus leaving no blank areas. ++ ++@c --------------------------------------------------------------------- ++ ++@node Footnotes and Annotations, Table of Contents, Displays, Common Features ++@subsection Footnotes and Annotations ++@cindex footnotes ++@cindex annotations ++ ++There are a number of requests to save text for later printing. ++ ++@dfn{Footnotes} are printed at the bottom of the current page. ++ ++@cindex delayed text ++@dfn{Delayed text} is very similar to a footnote except that it is ++printed when called for explicitly. This allows a list of references to ++appear (for example) at the end of each chapter, as is the convention in ++some disciplines. ++ ++Most macro packages that supply this functionality also supply a means ++of automatically numbering either type of annotation. ++ ++@c --------------------------------------------------------------------- ++ ++@node Table of Contents, Indices, Footnotes and Annotations, Common Features ++@subsection Table of Contents ++@cindex table of contents ++@cindex contents, table of ++ ++@dfn{Tables of contents} are a type of delayed text having a tag ++(usually the page number) attached to each entry after a row of dots. ++The table accumulates throughout the paper until printed, usually after ++the paper has ended. Many macro packages provide the ability to have ++several tables of contents (e.g.@: a standard table of contents, a list ++of tables, etc). ++ ++@c --------------------------------------------------------------------- ++ ++@node Indices, Paper Formats, Table of Contents, Common Features ++@subsection Indices ++@cindex index, in macro package ++ ++While some macro packages use the term @dfn{index}, none actually ++provide that functionality. The facilities they call indices are ++actually more appropriate for tables of contents. ++ ++@pindex makeindex ++To produce a real index in a document, external tools like the ++@code{makeindex} program are necessary. ++ ++@c --------------------------------------------------------------------- ++ ++@node Paper Formats, Multiple Columns, Indices, Common Features ++@subsection Paper Formats ++@cindex paper formats ++ ++Some macro packages provide stock formats for various kinds of ++documents. Many of them provide a common format for the title and ++opening pages of a technical paper. The @file{mm} macros in particular ++provide formats for letters and memoranda. ++ ++@c --------------------------------------------------------------------- ++ ++@node Multiple Columns, Font and Size Changes, Paper Formats, Common Features ++@subsection Multiple Columns ++ ++Some macro packages (but not @file{man}) provide the ability to have two ++or more columns on a page. ++ ++@c --------------------------------------------------------------------- ++ ++@node Font and Size Changes, Predefined Strings, Multiple Columns, Common Features ++@subsection Font and Size Changes ++ ++The built-in font and size functions are not always intuitive, so all ++macro packages provide macros to make these operations simpler. ++ ++@c --------------------------------------------------------------------- ++ ++@node Predefined Strings, Preprocessor Support, Font and Size Changes, Common Features ++@subsection Predefined Strings ++ ++Most macro packages provide various predefined strings for a variety of ++uses; examples are sub- and superscripts, printable dates, quotes and ++various special characters. ++ ++@c --------------------------------------------------------------------- ++ ++@node Preprocessor Support, Configuration and Customization, Predefined Strings, Common Features ++@subsection Preprocessor Support ++ ++All macro packages provide support for various preprocessors and may ++extend their functionality. ++ ++For example, all macro packages mark tables (which are processed with ++@code{gtbl}) by placing them between @code{TS} and @code{TE} macros. ++The @file{ms} macro package has an option, @samp{.TS@tie{}H}, that ++prints a caption at the top of a new page (when the table is too long to ++fit on a single page). ++ ++@c --------------------------------------------------------------------- ++ ++@node Configuration and Customization, , Preprocessor Support, Common Features ++@subsection Configuration and Customization ++ ++Some macro packages provide means of customizing many of the details of ++how the package behaves. This ranges from setting the default type size ++to changing the appearance of section headers. ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Macro Packages, gtroff Reference, Tutorial for Macro Users, Top ++@chapter Macro Packages ++@cindex macro packages ++@cindex packages, macros ++ ++This chapter documents the main macro packages that come with ++@code{groff}. ++ ++Different main macro packages can't be used at the same time; for ++example ++ ++@Example ++groff -m man foo.man -m ms bar.doc ++@endExample ++ ++@noindent ++doesn't work. Note that option arguments are processed before ++non-option arguments; the above (failing) sample is thus reordered to ++ ++@Example ++groff -m man -m ms foo.man bar.doc ++@endExample ++ ++@menu ++* man:: ++* mdoc:: ++* ms:: ++* me:: ++* mm:: ++* mom:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node man, mdoc, Macro Packages, Macro Packages ++@section @file{man} ++@cindex manual pages ++@cindex man pages ++@pindex an.tmac ++@pindex man.tmac ++@pindex man-old.tmac ++ ++This is the most popular and probably the most important macro package ++of @code{groff}. It is easy to use, and a vast majority of manual pages ++are based on it. ++ ++@menu ++* Man options:: ++* Man usage:: ++* Man font macros:: ++* Miscellaneous man macros:: ++* Predefined man strings:: ++* Preprocessors in man pages:: ++* Optional man extensions:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Man options, Man usage, man, man ++@subsection Options ++ ++The command line format for using the @file{man} macros with ++@code{groff} is: ++ ++@Example ++groff -m man [ -rLL=@var{length} ] [ -rLT=@var{length} ] [ -rFT=@var{dist} ] ++ [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [-rHY=@var{flags} ] ++ [ -rP@var{nnn} ] [ -rS@var{xx} ] [ -rX@var{nnn} ] ++ [ -rIN=@var{length} ] [ -rSN=@var{length} ] [ @var{files}@dots{} ] ++@endExample ++ ++@noindent ++It is possible to use @samp{-man} instead of @w{@samp{-m man}}. ++ ++@table @code ++@item -rcR=1 ++This option (the default if a TTY output device is used) creates a ++single, very long page instead of multiple pages. Use @code{-rcR=0} to ++disable it. ++ ++@item -rC1 ++If more than one manual page is given on the command line, number the ++pages continuously, rather than starting each at@tie{}1. ++ ++@item -rD1 ++Double-sided printing. Footers for even and odd pages are formatted ++differently. ++ ++@item -rFT=@var{dist} ++Set the position of the footer text to @var{dist}. If positive, the ++distance is measured relative to the top of the page, otherwise it is ++relative to the bottom. The default is @minus{}0.5@dmn{i}. ++ ++@item -rHY=@var{flags} ++Set hyphenation flags. Possible values are 1@tie{}to hyphenate without ++restrictions, 2@tie{}to not hyphenate the last word on a page, 4@tie{}to ++not hyphenate the last two characters of a word, and 8@tie{}to not ++hyphenate the first two characters of a word. These values are ++additive; the default is@tie{}14. ++ ++@item -rIN=@var{length} ++Set the body text indentation to @var{length}. If not specified, the ++indentation defaults to 7@dmn{n} (7@tie{}characters) in nroff mode and ++7.2@dmn{n} otherwise. For nroff, this value should always be an integer ++multiple of unit @samp{n} to get consistent indentation. ++ ++@item -rLL=@var{length} ++Set line length to @var{length}. If not specified, the line length is ++set to respect any value set by a prior @samp{ll} request (which ++@emph{must} be in effect when the @samp{TH} macro is invoked), if this ++differs from the built-in default for the formatter; otherwise it ++defaults to 78@dmn{n} in nroff mode (this is 78 characters per line) and ++6.5@dmn{i} in troff mode.@footnote{Note that the use of a @samp{.ll ++@var{length}} request to initialize the line length, prior to use of the ++@samp{TH} macro, is supported for backward compatibility with some ++versions of the @code{man} program. @emph{Always} use the ++@option{-rLL=@var{length}} option, or an equivalent @samp{.nr LL ++@var{length}} request, in preference to such a @samp{.ll @var{length}} ++request. In particular, note that in nroff mode, the request @samp{.ll ++65n}, (with any @var{length} expression that evaluates equal to ++65@dmn{n}, i.e., the formatter's default line length in nroff mode), ++does @emph{not} set the line length to 65@dmn{n} (it is adjusted to the ++@code{man} macro package's default setting of 78@dmn{n}), whereas the ++use of the @option{-rLL=65n} option, or the @samp{.nr LL 65n} request ++@emph{does} establish a line length of 65@dmn{n}.} ++ ++@item -rLT=@var{length} ++Set title length to @var{length}. If not specified, the title length ++defaults to the line length. ++ ++@item -rP@var{nnn} ++Page numbering starts with @var{nnn} rather than with@tie{}1. ++ ++@item -rS@var{xx} ++Use @var{xx} (which can be 10, 11, or@tie{}12@dmn{pt}) as the base ++document font size instead of the default value of@tie{}10@dmn{pt}. ++ ++@item -rSN=@var{length} ++Set the indentation for sub-subheadings to @var{length}. If not ++specified, the indentation defaults to 3@dmn{n}. ++ ++@item -rX@var{nnn} ++After page @var{nnn}, number pages as @var{nnn}a, @var{nnn}b, ++@var{nnn}c, etc. For example, the option @option{-rX2} produces the ++following page numbers: 1, 2, 2a, 2b, 2c, etc. ++@end table ++ ++@c --------------------------------------------------------------------- ++ ++@node Man usage, Man font macros, Man options, man ++@subsection Usage ++@cindex @code{man} macros ++@cindex macros for manual pages [@code{man}] ++ ++@pindex man.local ++This section describes the available macros for manual pages. For ++further customization, put additional macros and requests into the file ++@file{man.local}, which is loaded immediately after the @file{man} ++package. ++ ++@Defmac {TH, title section [@Var{extra1} [@Var{extra2} [@Var{extra3}]]], man} ++Set the title of the man page to @var{title} and the section to ++@var{section}, which must have a value between 1 and@tie{}8. The value ++of @var{section} may also have a string appended, e.g.@: @samp{.pm}, to ++indicate a specific subsection of the man pages. ++ ++Both @var{title} and @var{section} are positioned at the left and right ++in the header line (with @var{section} in parentheses immediately ++appended to @var{title}. @var{extra1} is positioned in the middle of ++the footer line. @var{extra2} is positioned at the left in the footer ++line (or at the left on even pages and at the right on odd pages if ++double-sided printing is active). @var{extra3} is centered in the ++header line. ++ ++For @acronym{HTML} and @acronym{XHTML} output, headers and footers are ++completely suppressed. ++ ++Additionally, this macro starts a new page; the new line number ++is@tie{}1 again (except if the @option{-rC1} option is given on the ++command line) -- this feature is intended only for formatting multiple ++man pages; a single man page should contain exactly one @code{TH} macro ++at the beginning of the file. ++@endDefmac ++ ++@Defmac {SH, [@Var{heading}], man} ++Set up an unnumbered section heading sticking out to the left. Prints ++out all the text following @code{SH} up to the end of the line (or the ++text in the next line if there is no argument to @code{SH}) in bold face ++(or the font specified by the string @code{HF}), one size larger than ++the base document size. Additionally, the left margin and the ++indentation for the following text is reset to its default value. ++@endDefmac ++ ++@Defmac {SS, [@Var{heading}], man} ++Set up an unnumbered (sub)section heading. Prints out all the text ++following @code{SS} up to the end of the line (or the text in the next ++line if there is no argument to @code{SS}) in bold face (or the font ++specified by the string @code{HF}), at the same size as the base ++document size. Additionally, the left margin and the indentation for ++the following text is reset to its default value. ++@endDefmac ++ ++@Defmac {TP, [@Var{nnn}], man} ++Set up an indented paragraph with label. The indentation is set to ++@var{nnn} if that argument is supplied (the default unit is @samp{n} if ++omitted), otherwise it is set to the previous indentation value ++specified with @code{TP}, @code{IP}, or @code{HP} (or to the default ++value if none of them have been used yet). ++ ++The first line of text following this macro is interpreted as a string ++to be printed flush-left, as it is appropriate for a label. It is not ++interpreted as part of a paragraph, so there is no attempt to fill the ++first line with text from the following input lines. Nevertheless, if ++the label is not as wide as the indentation the paragraph starts at the ++same line (but indented), continuing on the following lines. If the ++label is wider than the indentation the descriptive part of the ++paragraph begins on the line following the label, entirely indented. ++Note that neither font shape nor font size of the label is set to a ++default value; on the other hand, the rest of the text has default font ++settings. ++@endDefmac ++ ++@DefmacList {LP, , man} ++@DefmacItemx {PP, , man} ++@DefmacListEndx {P, , man} ++These macros are mutual aliases. Any of them causes a line break at the ++current position, followed by a vertical space downwards by the amount ++specified by the @code{PD} macro. The font size and shape are reset to ++the default value (10@dmn{pt} roman if no @option{-rS} option is given ++on the command line). Finally, the current left margin and the ++indentation is restored. ++@endDefmac ++ ++@Defmac {IP, [@Var{designator} [@Var{nnn}]], man} ++Set up an indented paragraph, using @var{designator} as a tag to mark ++its beginning. The indentation is set to @var{nnn} if that argument is ++supplied (default unit is @samp{n}), otherwise it is set to the previous ++indentation value specified with @code{TP}, @code{IP}, or @code{HP} (or ++the default value if none of them have been used yet). Font size and ++face of the paragraph (but not the designator) are reset to their ++default values. ++ ++To start an indented paragraph with a particular indentation but without ++a designator, use @samp{""} (two double quotes) as the first argument of ++@code{IP}. ++ ++For example, to start a paragraph with bullets as the designator and ++4@tie{}en indentation, write ++ ++@Example ++.IP \(bu 4 ++@endExample ++@endDefmac ++ ++@Defmac {HP, [@Var{nnn}], man} ++@cindex hanging indentation [@code{man}] ++@cindex @code{man} macros, hanging indentation ++Set up a paragraph with hanging left indentation. The indentation is ++set to @var{nnn} if that argument is supplied (default unit is ++@samp{n}), otherwise it is set to the previous indentation value ++specified with @code{TP}, @code{IP}, or @code{HP} (or the default value ++if non of them have been used yet). Font size and face are reset to ++their default values. ++@endDefmac ++ ++@Defmac {RS, [@Var{nnn}], man} ++@cindex left margin, how to move [@code{man}] ++@cindex @code{man} macros, moving left margin ++Move the left margin to the right by the value @var{nnn} if specified ++(default unit is @samp{n}); otherwise it is set to the previous ++indentation value specified with @code{TP}, @code{IP}, or @code{HP} (or ++to the default value if none of them have been used yet). The ++indentation value is then set to the default. ++ ++Calls to the @code{RS} macro can be nested. ++@endDefmac ++ ++@Defmac {RE, [@Var{nnn}], man} ++Move the left margin back to level @var{nnn}, restoring the previous ++left margin. If no argument is given, it moves one level back. The ++first level (i.e., no call to @code{RS} yet) has number@tie{}1, and each ++call to @code{RS} increases the level by@tie{}1. ++@endDefmac ++ ++@cindex line breaks, with vertical space [@code{man}] ++@cindex @code{man} macros, line breaks with vertical space ++To summarize, the following macros cause a line break with the insertion ++of vertical space (which amount can be changed with the @code{PD} ++macro): @code{SH}, @code{SS}, @code{TP}, @code{LP} (@code{PP}, ++@code{P}), @code{IP}, and @code{HP}. ++ ++@cindex line breaks, without vertical space [@code{man}] ++@cindex @code{man} macros, line breaks without vertical space ++The macros @code{RS} and @code{RE} also cause a break but do not insert ++vertical space. ++ ++@cindex default indentation, resetting [@code{man}] ++@cindex indentaion, resetting to default [@code{man}] ++@cindex @code{man} macros, resetting default indentation ++Finally, the macros @code{SH}, @code{SS}, @code{LP} (@code{PP}, ++@code{P}), and @code{RS} reset the indentation to its default value. ++ ++@c --------------------------------------------------------------------- ++ ++@node Man font macros, Miscellaneous man macros, Man usage, man ++@subsection Macros to set fonts ++@cindex font selection [@code{man}] ++@cindex @code{man} macros, how to set fonts ++ ++The standard font is roman; the default text size is 10@tie{}point. If ++command line option @option{-rS=@var{n}} is given, use @var{n}@dmn{pt} ++as the default text size. ++ ++@Defmac {SM, [@Var{text}], man} ++Set the text on the same line or the text on the next line in a font ++that is one point size smaller than the default font. ++@endDefmac ++ ++@Defmac {SB, [@Var{text}], man} ++@cindex bold face [@code{man}] ++@cindex @code{man} macros, bold face ++Set the text on the same line or the text on the next line in bold face ++font, one point size smaller than the default font. ++@endDefmac ++ ++@Defmac {BI, text, man} ++Set its arguments alternately in bold face and italic, without a space ++between the arguments. Thus, ++ ++@Example ++.BI this "word and" that ++@endExample ++ ++@noindent ++produces ``thisword andthat'' with ``this'' and ``that'' in bold face, ++and ``word and'' in italics. ++@endDefmac ++ ++@Defmac {IB, text, man} ++Set its arguments alternately in italic and bold face, without a space ++between the arguments. ++@endDefmac ++ ++@Defmac {RI, text, man} ++Set its arguments alternately in roman and italic, without a space ++between the arguments. ++@endDefmac ++ ++@Defmac {IR, text, man} ++Set its arguments alternately in italic and roman, without a space ++between the arguments. ++@endDefmac ++ ++@Defmac {BR, text, man} ++Set its arguments alternately in bold face and roman, without a space ++between the arguments. ++@endDefmac ++ ++@Defmac {RB, text, man} ++Set its arguments alternately in roman and bold face, without a space ++between the arguments. ++@endDefmac ++ ++@Defmac {B, [@Var{text}], man} ++Set @var{text} in bold face. If no text is present on the line where ++the macro is called, then the text of the next line appears in bold ++face. ++@endDefmac ++ ++@Defmac {I, [@Var{text}], man} ++@cindex italic fonts [@code{man}] ++@cindex @code{man} macros, italic fonts ++Set @var{text} in italic. If no text is present on the line where the ++macro is called, then the text of the next line appears in italic. ++@endDefmac ++ ++@c --------------------------------------------------------------------- ++ ++@node Miscellaneous man macros, Predefined man strings, Man font macros, man ++@subsection Miscellaneous macros ++ ++@pindex grohtml ++@cindex @code{man} macros, default indentation ++@cindex default indentation [@code{man}] ++The default indentation is 7.2@dmn{n} in troff mode and 7@dmn{n} in ++nroff mode except for @code{grohtml}, which ignores indentation. ++ ++@Defmac {DT, , man} ++@cindex tab stops [@code{man}] ++@cindex @code{man} macros, tab stops ++Set tabs every 0.5@tie{}inches. Since this macro is always executed ++during a call to the @code{TH} macro, it makes sense to call it only if ++the tab positions have been changed. ++@endDefmac ++ ++@Defmac {PD, [@Var{nnn}], man} ++@cindex empty space before a paragraph [@code{man}] ++@cindex @code{man} macros, empty space before a paragraph ++Adjust the empty space before a new paragraph (or section). The ++optional argument gives the amount of space (default unit is @samp{v}); ++without parameter, the value is reset to its default value (1@tie{}line ++in nroff mode, 0.4@dmn{v}@tie{}otherwise). ++ ++This affects the macros @code{SH}, @code{SS}, @code{TP}, @code{LP} (as ++well as @code{PP} and @code{P}), @code{IP}, and @code{HP}. ++@endDefmac ++ ++The following two macros are included for BSD compatibility. ++ ++@Defmac {AT, [@Var{system} [@Var{release}]], man} ++@cindex @code{man}macros, BSD compatibility ++Alter the footer for use with @acronym{AT&T} manpages. This command ++exists only for compatibility; don't use it. The first argument ++@var{system} can be: ++ ++@table @code ++@item 3 ++7th Edition (the default) ++ ++@item 4 ++System III ++ ++@item 5 ++System V ++@end table ++ ++An optional second argument @var{release} to @code{AT} specifies the ++release number (such as ``System V Release 3''). ++@endDefmac ++ ++@Defmac {UC, [@Var{version}], man} ++@cindex @code{man}macros, BSD compatibility ++Alters the footer for use with BSD manpages. This command exists only ++for compatibility; don't use it. The argument can be: ++ ++@table @code ++@item 3 ++3rd Berkeley Distribution (the default) ++ ++@item 4 ++4th Berkeley Distribution ++ ++@item 5 ++4.2 Berkeley Distribution ++ ++@item 6 ++4.3 Berkeley Distribution ++ ++@item 7 ++4.4 Berkeley Distribution ++@end table ++@endDefmac ++ ++@c --------------------------------------------------------------------- ++ ++@node Predefined man strings, Preprocessors in man pages, Miscellaneous man macros, man ++@subsection Predefined strings ++ ++The following strings are defined: ++ ++@Defstr {S, man} ++Switch back to the default font size. ++@endDefstr ++ ++@Defstr {HF, man} ++The typeface used for headings. ++The default is @samp{B}. ++@endDefstr ++ ++@Defstr {R, man} ++The `registered' sign. ++@endDefstr ++ ++@Defstr {Tm, man} ++The `trademark' sign. ++@endDefstr ++ ++@DefstrList {lq, man} ++@DefstrListEndx {rq, man} ++@cindex @code{lq} glyph, and @code{lq} string [@code{man}] ++@cindex @code{rq} glyph, and @code{rq} string [@code{man}] ++Left and right quote. This is equal to @code{\(lq} and @code{\(rq}, ++respectively. ++@endDefstr ++ ++@c --------------------------------------------------------------------- ++ ++@node Preprocessors in man pages, Optional man extensions, Predefined man strings, man ++@subsection Preprocessors in @file{man} pages ++ ++@cindex preprocessor, calling convention ++@cindex calling convention of preprocessors ++If a preprocessor like @code{gtbl} or @code{geqn} is needed, it has ++become common usage to make the first line of the man page look like ++this: ++ ++@Example ++'\" @var{word} ++@endExample ++ ++@pindex geqn@r{, invocation in manual pages} ++@pindex grefer@r{, invocation in manual pages} ++@pindex gtbl@r{, invocation in manual pages} ++@pindex man@r{, invocation of preprocessors} ++@noindent ++Note the single space character after the double quote. @var{word} ++consists of letters for the needed preprocessors: @samp{e} for ++@code{geqn}, @samp{r} for @code{grefer}, @samp{t} for @code{gtbl}. ++Modern implementations of the @code{man} program read this first line ++and automatically call the right preprocessor(s). ++ ++@c --------------------------------------------------------------------- ++ ++@node Optional man extensions, , Preprocessors in man pages, man ++@subsection Optional @file{man} extensions ++ ++@pindex man.local ++Use the file @file{man.local} for local extensions to the @code{man} ++macros or for style changes. ++ ++@unnumberedsubsubsec Custom headers and footers ++@cindex @code{man} macros, custom headers and footers ++ ++In groff versions 1.18.2 and later, you can specify custom headers and ++footers by redefining the following macros in @file{man.local}. ++ ++@Defmac {PT, , man} ++Control the content of the headers. Normally, the header prints the ++command name and section number on either side, and the optional fifth ++argument to @code{TH} in the center. ++@endDefmac ++ ++@Defmac {BT, , man} ++Control the content of the footers. Normally, the footer prints the ++page number and the third and fourth arguments to @code{TH}. ++ ++Use the @code{FT} number register to specify the footer position. The ++default is @minus{}0.5@dmn{i}. ++@endDefmac ++ ++@unnumberedsubsubsec Ultrix-specific man macros ++@cindex Ultrix-specific @code{man} macros ++@cindex @code{man} macros, Ultrix-specific ++ ++@pindex man.ultrix ++The @code{groff} source distribution includes a file named ++@file{man.ultrix}, containing macros compatible with the Ultrix variant ++of @code{man}. Copy this file into @file{man.local} (or use the ++@code{mso} request to load it) to enable the following macros. ++ ++@Defmac {CT, @Var{key}, man} ++Print @samp{}. ++@endDefmac ++ ++@Defmac {CW, , man} ++Print subsequent text using the constant width (Courier) typeface. ++@endDefmac ++ ++@Defmac {Ds, , man} ++Begin a non-filled display. ++@endDefmac ++ ++@Defmac {De, , man} ++End a non-filled display started with @code{Ds}. ++@endDefmac ++ ++@Defmac {EX, [@Var{indent}], man} ++Begin a non-filled display using the constant width (Courier) typeface. ++Use the optional @var{indent} argument to indent the display. ++@endDefmac ++ ++@Defmac {EE, , man} ++End a non-filled display started with @code{EX}. ++@endDefmac ++ ++@Defmac {G, [@Var{text}], man} ++Set @var{text} in Helvetica. If no text is present on the line where ++the macro is called, then the text of the next line appears in ++Helvetica. ++@endDefmac ++ ++@Defmac {GL, [@Var{text}], man} ++Set @var{text} in Helvetica Oblique. If no text is present on the line ++where the macro is called, then the text of the next line appears in ++Helvetica Oblique. ++@endDefmac ++ ++@Defmac {HB, [@Var{text}], man} ++Set @var{text} in Helvetica Bold. If no text is present on the line ++where the macro is called, then all text up to the next @code{HB} ++appears in Helvetica Bold. ++@endDefmac ++ ++@Defmac {TB, [@Var{text}], man} ++Identical to @code{HB}. ++@endDefmac ++ ++@Defmac {MS, @Var{title} @Var{sect} [@Var{punct}], man} ++Set a manpage reference in Ultrix format. The @var{title} is in Courier ++instead of italic. Optional punctuation follows the section number ++without an intervening space. ++@endDefmac ++ ++@Defmac {NT, [@code{C}] [@Var{title}], man} ++Begin a note. Print the optional @Var{title}, or the word ``Note'', ++centered on the page. Text following the macro makes up the body of the ++note, and is indented on both sides. If the first argument is @code{C}, ++the body of the note is printed centered (the second argument replaces ++the word ``Note'' if specified). ++@endDefmac ++ ++@Defmac {NE, , man} ++End a note begun with @code{NT}. ++@endDefmac ++ ++@Defmac {PN, @Var{path} [@Var{punct}], man} ++Set the path name in constant width (Courier), followed by optional ++punctuation. ++@endDefmac ++ ++@Defmac {Pn, [@Var{punct}] @Var{path} [@Var{punct}], man} ++If called with two arguments, identical to @code{PN}. If called with ++three arguments, set the second argument in constant width (Courier), ++bracketed by the first and third arguments in the current font. ++@endDefmac ++ ++@Defmac {R, , man} ++Switch to roman font and turn off any underlining in effect. ++@endDefmac ++ ++@Defmac {RN, , man} ++Print the string @samp{}. ++@endDefmac ++ ++@Defmac {VS, [@code{4}], man} ++Start printing a change bar in the margin if the number@tie{}@code{4} is ++specified. Otherwise, this macro does nothing. ++@endDefmac ++ ++@Defmac {VE, , man} ++End printing the change bar begun by @code{VS}. ++@endDefmac ++ ++@unnumberedsubsubsec Simple example ++ ++The following example @file{man.local} file alters the @code{SH} macro ++to add some extra vertical space before printing the heading. Headings ++are printed in Helvetica Bold. ++ ++@Example ++.\" Make the heading fonts Helvetica ++.ds HF HB ++. ++.\" Put more whitespace in front of headings. ++.rn SH SH-orig ++.de SH ++. if t .sp (u;\\n[PD]*2) ++. SH-orig \\$* ++.. ++@endExample ++ ++ ++@c ===================================================================== ++ ++@node mdoc, ms, man, Macro Packages ++@section @file{mdoc} ++@cindex @code{mdoc} macros ++ ++@c XXX documentation ++@c XXX this is a placeholder until we get stuff knocked into shape ++See the @cite{groff_mdoc(7)} man page (type @command{man groff_mdoc} ++at the command line). ++ ++ ++@c ===================================================================== ++ ++@node ms, me, mdoc, Macro Packages ++@section @file{ms} ++@cindex @code{ms} macros ++ ++The @file{-ms} macros are suitable for reports, letters, books, user ++manuals, and so forth. The package provides macros for cover pages, ++section headings, paragraphs, lists, footnotes, pagination, and a table ++of contents. ++ ++@menu ++* ms Intro:: ++* General ms Structure:: ++* ms Document Control Registers:: ++* ms Cover Page Macros:: ++* ms Body Text:: ++* ms Page Layout:: ++* Differences from AT&T ms:: ++* Naming Conventions:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Intro, General ms Structure, ms, ms ++@subsection Introduction to @file{ms} ++ ++The original @file{-ms} macros were included with @acronym{AT&T} ++@code{troff} as well as the @file{man} macros. While the @file{man} ++package is intended for brief documents that can be read on-line as well ++as printed, the @file{ms} macros are suitable for longer documents that ++are meant to be printed rather than read on-line. ++ ++The @file{ms} macro package included with @code{groff} is a complete, ++bottom-up re-implementation. Several macros (specific to @acronym{AT&T} ++or Berkeley) are not included, while several new commands are. ++@xref{Differences from AT&T ms}, for more information. ++ ++@c --------------------------------------------------------------------- ++ ++@node General ms Structure, ms Document Control Registers, ms Intro, ms ++@subsection General structure of an @file{ms} document ++@cindex @code{ms} macros, general structure ++ ++The @file{ms} macro package expects a certain amount of structure, but ++not as much as packages such as @file{man} or @file{mdoc}. ++ ++The simplest documents can begin with a paragraph macro (such as ++@code{LP} or @code{PP}), and consist of text separated by paragraph ++macros or even blank lines. Longer documents have a structure as ++follows: ++ ++@table @strong ++@item Document type ++If you invoke the @code{RP} (report) macro on the first line of the ++document, @code{groff} prints the cover page information on its own ++page; otherwise it prints the information on the first page with your ++document text immediately following. Other document formats found in ++@acronym{AT&T} @code{troff} are specific to @acronym{AT&T} or Berkeley, ++and are not supported in @code{groff}. ++ ++@item Format and layout ++By setting number registers, you can change your document's type (font ++and size), margins, spacing, headers and footers, and footnotes. ++@xref{ms Document Control Registers}, for more details. ++ ++@item Cover page ++A cover page consists of a title, the author's name and institution, an ++abstract, and the date.@footnote{Actually, only the title is required.} ++@xref{ms Cover Page Macros}, for more details. ++ ++@item Body ++Following the cover page is your document. You can use the @file{ms} ++macros to write reports, letters, books, and so forth. The package is ++designed for structured documents, consisting of paragraphs interspersed ++with headings and augmented by lists, footnotes, tables, and other ++common constructs. @xref{ms Body Text}, for more details. ++ ++@item Table of contents ++Longer documents usually include a table of contents, which you can ++invoke by placing the @code{TC} macro at the end of your document. The ++@file{ms} macros have minimal indexing facilities, consisting of the ++@code{IX} macro, which prints an entry on standard error. Printing the ++table of contents at the end is necessary since @code{groff} is a ++single-pass text formatter, thus it cannot determine the page number of ++each section until that section has actually been set and printed. ++Since @file{ms} output is intended for hardcopy, you can manually ++relocate the pages containing the table of contents between the cover ++page and the body text after printing. ++@end table ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Document Control Registers, ms Cover Page Macros, General ms Structure, ms ++@subsection Document control registers ++@cindex @code{ms} macros, document control registers ++ ++The following is a list of document control number registers. For the ++sake of consistency, set registers related to margins at the beginning ++of your document, or just after the @code{RP} macro. You can set other ++registers later in your document, but you should keep them together at ++the beginning to make them easy to find and edit as necessary. ++ ++@unnumberedsubsubsec Margin Settings ++ ++@Defmpreg {PO, ms} ++Defines the page offset (i.e., the left margin). There is no explicit ++right margin setting; the combination of the @code{PO} and @code{LL} ++registers implicitly define the right margin width. ++ ++Effective: next page. ++ ++Default value: 1@dmn{i}. ++@endDefmpreg ++ ++@Defmpreg {LL, ms} ++Defines the line length (i.e., the width of the body text). ++ ++Effective: next paragraph. ++ ++Default: 6@dmn{i}. ++@endDefmpreg ++ ++@Defmpreg {LT, ms} ++Defines the title length (i.e., the header and footer width). This ++is usually the same as @code{LL}, but not necessarily. ++ ++Effective: next paragraph. ++ ++Default: 6@dmn{i}. ++@endDefmpreg ++ ++@Defmpreg {HM, ms} ++Defines the header margin height at the top of the page. ++ ++Effective: next page. ++ ++Default: 1@dmn{i}. ++@endDefmpreg ++ ++@Defmpreg {FM, ms} ++Defines the footer margin height at the bottom of the page. ++ ++Effective: next page. ++ ++Default: 1@dmn{i}. ++@endDefmpreg ++ ++@unnumberedsubsubsec Text Settings ++ ++@Defmpreg {PS, ms} ++Defines the point size of the body text. If the value is larger than or ++equal to 1000, divide it by 1000 to get a fractional point size. For ++example, @samp{.nr PS 10250} sets the document's point size to ++10.25@dmn{p}. ++ ++Effective: next paragraph. ++ ++Default: 10@dmn{p}. ++@endDefmpreg ++ ++@Defmpreg {VS, ms} ++Defines the space between lines (line height plus leading). If the ++value is larger than or equal to 1000, divide it by 1000 to get a ++fractional point size. Due to backwards compatibility, @code{VS} must ++be smaller than 40000 (this is 40.0@dmn{p}). ++ ++Effective: next paragraph. ++ ++Default: 12@dmn{p}. ++@endDefmpreg ++ ++@Defmpreg {PSINCR, ms} ++Defines an increment in point size, which is applied to section headings ++at nesting levels below the value specified in @code{GROWPS}. The value ++of @code{PSINCR} should be specified in points, with the @dmn{p} scaling ++factor, and may include a fractional component; for example, ++@w{@samp{.nr PSINCR 1.5p}} sets a point size increment of 1.5@dmn{p}. ++ ++Effective: next section heading. ++ ++Default: 1@dmn{p}. ++@endDefmpreg ++ ++@Defmpreg {GROWPS, ms} ++Defines the heading level below which the point size increment set by ++@code{PSINCR} becomes effective. Section headings at and above the ++level specified by @code{GROWPS} are printed at the point size set by ++@code{PS}; for each level below the value of @code{GROWPS}, the point ++size is increased in steps equal to the value of @code{PSINCR}. Setting ++@code{GROWPS} to any value less than@tie{}2 disables the incremental ++heading size feature. ++ ++Effective: next section heading. ++ ++Default: 0. ++@endDefmpreg ++ ++@Defmpreg {HY, ms} ++Defines the hyphenation level. @code{HY} sets safely the value of the ++low-level @code{hy} register. Setting the value of @code{HY} to@tie{}0 ++is equivalent to using the @code{nh} request. ++ ++Effective: next paragraph. ++ ++Default: 14. ++@endDefmpreg ++ ++@Defmpreg {FAM, ms} ++Defines the font family used to typeset the document. ++ ++Effective: next paragraph. ++ ++Default: as defined in the output device. ++@endDefmpreg ++ ++@unnumberedsubsubsec Paragraph Settings ++ ++@Defmpreg {PI, ms} ++Defines the initial indentation of a (@code{PP} macro) paragraph. ++ ++Effective: next paragraph. ++ ++Default: 5@dmn{n}. ++@endDefmpreg ++ ++@Defmpreg {PD, ms} ++Defines the space between paragraphs. ++ ++Effective: next paragraph. ++ ++Default: 0.3@dmn{v}. ++@endDefmpreg ++ ++@Defmpreg {QI, ms} ++Defines the indentation on both sides of a quoted (@code{QP} macro) ++paragraph. ++ ++Effective: next paragraph. ++ ++Default: 5@dmn{n}. ++@endDefmpreg ++ ++@Defmpreg {PORPHANS, ms} ++Defines the minimum number of initial lines of any paragraph that ++should be kept together, to avoid orphan lines at the bottom of a page. ++If a new paragraph is started close to the bottom of a page, and there ++is insufficient space to accommodate @code{PORPHANS} lines before an ++automatic page break, then the page break is forced, before the start of ++the paragraph. ++ ++Effective: next paragraph. ++ ++Default: 1. ++@endDefmpreg ++ ++@Defmpreg {HORPHANS, ms} ++Defines the minimum number of lines of the following paragraph that ++should be kept together with any section heading introduced by the ++@code{NH} or @code{SH} macros. If a section heading is placed close to ++the bottom of a page, and there is insufficient space to accommodate ++both the heading and at least @code{HORPHANS} lines of the following ++paragraph, before an automatic page break, then the page break is forced ++before the heading. ++ ++Effective: next paragraph. ++ ++Default: 1. ++@endDefmpreg ++ ++@unnumberedsubsubsec Footnote Settings ++ ++@Defmpreg {FL, ms} ++Defines the length of a footnote. ++ ++Effective: next footnote. ++ ++Default: @math{@code{@\n[LL]} * 5 / 6}. ++@endDefmpreg ++ ++@Defmpreg {FI, ms} ++Defines the footnote indentation. ++ ++Effective: next footnote. ++ ++Default: 2@dmn{n}. ++@endDefmpreg ++ ++@Defmpreg {FF, ms} ++The footnote format: ++@table @code ++@item 0 ++Print the footnote number as a superscript; indent the footnote ++(default). ++ ++@item 1 ++Print the number followed by a period (like 1.@:) and indent the ++footnote. ++ ++@item 2 ++Like 1, without an indentation. ++ ++@item 3 ++Like 1, but print the footnote number as a hanging paragraph. ++@end table ++ ++Effective: next footnote. ++ ++Default: 0. ++@endDefmpreg ++ ++@Defmpreg {FPS, ms} ++Defines the footnote point size. If the value is larger than or equal ++to 1000, divide it by 1000 to get a fractional point size. ++ ++Effective: next footnote. ++ ++Default: @math{@code{@\n[PS]} - 2}. ++@endDefmpreg ++ ++@Defmpreg {FVS, ms} ++Defines the footnote vertical spacing. If the value is larger than or ++equal to 1000, divide it by 1000 to get a fractional point size. ++ ++Effective: next footnote. ++ ++Default: @math{@code{@\n[FPS]} + 2}. ++@endDefmpreg ++ ++@Defmpreg {FPD, ms} ++Defines the footnote paragraph spacing. ++ ++Effective: next footnote. ++ ++Default: @math{@code{@\n[PD]} / 2}. ++@endDefmpreg ++ ++@unnumberedsubsubsec Miscellaneous Number Registers ++ ++@Defmpreg {MINGW, ms} ++Defines the minimum width between columns in a multi-column document. ++ ++Effective: next page. ++ ++Default: 2@dmn{n}. ++@endDefmpreg ++ ++@Defmpreg {DD, ms} ++Sets the vertical spacing before and after a display, a @code{tbl} table, an ++@code{eqn} equation, or a @code{pic} image. ++ ++Effective: next paragraph. ++ ++Default: 0.5@dmn{v}. ++@endDefmpreg ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Cover Page Macros, ms Body Text, ms Document Control Registers, ms ++@subsection Cover page macros ++@cindex @code{ms} macros, cover page ++@cindex cover page macros, [@code{ms}] ++ ++Use the following macros to create a cover page for your document in the ++order shown. ++ ++@Defmac {RP, [@code{no}], ms} ++Specifies the report format for your document. The report format ++creates a separate cover page. The default action (no @code{RP} macro) ++is to print a subset of the cover page on page@tie{}1 of your document. ++ ++If you use the word @code{no} as an optional argument, @code{groff} ++prints a title page but does not repeat any of the title page ++information (title, author, abstract, etc.@:) on page@tie{}1 of the ++document. ++@endDefmac ++ ++@Defmac {P1, , ms} ++(P-one) Prints the header on page@tie{}1. The default is to suppress ++the header. ++@endDefmac ++ ++@Defmac {DA, [@dots{}], ms} ++(optional) Prints the current date, or the arguments to the macro if ++any, on the title page (if specified) and in the footers. This is the ++default for @code{nroff}. ++@endDefmac ++ ++@Defmac {ND, [@dots{}], ms} ++(optional) Prints the current date, or the arguments to the macro if ++any, on the title page (if specified) but not in the footers. This is ++the default for @code{troff}. ++@endDefmac ++ ++@Defmac {TL, , ms} ++Specifies the document title. @code{groff} collects text following the ++@code{TL} macro into the title, until reaching the author name or ++abstract. ++@endDefmac ++ ++@Defmac {AU, , ms} ++Specifies the author's name, which appears on the line (or lines) ++immediately following. You can specify multiple authors as follows: ++ ++@Example ++.AU ++John Doe ++.AI ++University of West Bumblefuzz ++.AU ++Martha Buck ++.AI ++Monolithic Corporation ++ ++... ++@endExample ++@endDefmac ++ ++@Defmac {AI, , ms} ++Specifies the author's institution. You can specify multiple ++institutions in the same way that you specify multiple authors. ++@endDefmac ++ ++@Defmac {AB, [@code{no}], ms} ++Begins the abstract. The default is to print the word ++@acronym{ABSTRACT}, centered and in italics, above the text of the ++abstract. The word @code{no} as an optional argument suppresses this ++heading. ++@endDefmac ++ ++@Defmac {AE, , ms} ++Ends the abstract. ++@endDefmac ++ ++The following is example mark-up for a title page. ++@cindex title page, example markup ++@cindex example markup, title page ++ ++@CartoucheExample ++.RP ++.TL ++The Inevitability of Code Bloat ++in Commercial and Free Software ++.AU ++J. Random Luser ++.AI ++University of West Bumblefuzz ++.AB ++This report examines the long-term growth ++of the code bases in two large, popular software ++packages; the free Emacs and the commercial ++Microsoft Word. ++While differences appear in the type or order ++of features added, due to the different ++methodologies used, the results are the same ++in the end. ++.PP ++The free software approach is shown to be ++superior in that while free software can ++become as bloated as commercial offerings, ++free software tends to have fewer serious ++bugs and the added features are in line with ++user demand. ++.AE ++ ++... the rest of the paper follows ... ++@endCartoucheExample ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Body Text, ms Page Layout, ms Cover Page Macros, ms ++@subsection Body text ++@cindex @code{ms} macros, body text ++ ++This section describes macros used to mark up the body of your document. ++Examples include paragraphs, sections, and other groups. ++ ++@menu ++* Paragraphs in ms:: ++* Headings in ms:: ++* Highlighting in ms:: ++* Lists in ms:: ++* Indentation values in ms:: ++* Tabstops in ms:: ++* ms Displays and Keeps:: ++* ms Insertions:: ++* Example multi-page table:: ++* ms Footnotes:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Paragraphs in ms, Headings in ms, ms Body Text, ms Body Text ++@subsubsection Paragraphs ++@cindex @code{ms} macros, paragraph handling ++ ++The following paragraph types are available. ++ ++@Defmac {PP, , ms} ++Sets a paragraph with an initial indentation. ++@endDefmac ++ ++@Defmac {LP, , ms} ++Sets a paragraph without an initial indentation. ++@endDefmac ++ ++@Defmac {QP, , ms} ++Sets a paragraph that is indented at both left and right margins. The ++effect is identical to the @acronym{HTML} @code{
    } element. ++The next paragraph or heading returns margins to normal. ++@endDefmac ++ ++@Defmac {XP, , ms} ++Sets a paragraph whose lines are indented, except for the first line. ++This is a Berkeley extension. ++@endDefmac ++ ++The following markup uses all four paragraph macros. ++ ++@CartoucheExample ++.NH 2 ++Cases used in the study ++.LP ++The following software and versions were ++considered for this report. ++.PP ++For commercial software, we chose ++.B "Microsoft Word for Windows" , ++starting with version 1.0 through the ++current version (Word 2000). ++.PP ++For free software, we chose ++.B Emacs , ++from its first appearance as a standalone ++editor through the current version (v20). ++See [Bloggs 2002] for details. ++.QP ++Franklin's Law applied to software: ++software expands to outgrow both ++RAM and disk space over time. ++.LP ++Bibliography: ++.XP ++Bloggs, Joseph R., ++.I "Everyone's a Critic" , ++Underground Press, March 2002. ++A definitive work that answers all questions ++and criticisms about the quality and usability of ++free software. ++@endCartoucheExample ++ ++The @code{PORPHANS} register (@pxref{ms Document Control Registers}) ++operates in conjunction with each of these macros, to inhibit the ++printing of orphan lines at the bottom of any page. ++ ++@c --------------------------------------------------------------------- ++ ++@node Headings in ms, Highlighting in ms, Paragraphs in ms, ms Body Text ++@subsubsection Headings ++@cindex @code{ms} macros, headings ++ ++Use headings to create a hierarchical structure for your document. The ++@file{ms} macros print headings in @strong{bold}, using the same font ++family and point size as the body text. ++ ++The following describes the heading macros: ++ ++@DefmacList {NH, @Var{curr-level}, ms} ++@DefmacListEnd {NH, @t{S} @Var{level0} @dots{}, ms} ++Numbered heading. The argument is either a numeric argument to indicate ++the level of the heading, or the letter@tie{}@code{S} followed by ++numeric arguments to set the heading level explicitly. ++ ++If you specify heading levels out of sequence, such as invoking ++@samp{.NH 3} after @samp{.NH 1}, @code{groff} prints a warning on ++standard error. ++@endDefmac ++ ++@DefstrList {SN, ms} ++@DefstrItemx {SN-DOT, ms} ++@DefstrListEndx {SN-NO-DOT, ms} ++After invocation of @code{NH}, the assigned section number is made ++available in the strings @code{SN-DOT} (as it appears in a printed ++section heading with default formatting, followed by a terminating ++period), and @code{SN-NO-DOT} (with the terminating period omitted). ++The string @code{SN} is also defined, as an alias for @code{SN-DOT}; if ++preferred, you may redefine it as an alias for @code{SN-NO-DOT}, by ++including the initialization ++@Example ++.als SN SN-NO-DOT ++@endExample ++ ++@noindent ++at any time @strong{before} you would like the change to take effect. ++@endDefstr ++ ++@Defstr {SN-STYLE, ms} ++You may control the style used to print section numbers, within numbered ++section headings, by defining an appropriate alias for the string ++@code{SN-STYLE}. The default style, in which the printed section number ++is followed by a terminating period, is obtained by defining the alias ++ ++@Example ++.als SN-STYLE SN-DOT ++@endExample ++ ++@noindent ++If you prefer to omit the terminating period, from section numbers ++appearing in numbered section headings, you may define the alias ++ ++@Example ++.als SN-STYLE SN-NO-DOT ++@endExample ++ ++@noindent ++Any such change in section numbering style becomes effective from the ++next use of @code{.NH}, following redefinition of the alias for ++@code{SN-STYLE}. ++@endDefstr ++ ++@Defmac {SH, [@Var{match-level}], ms} ++Unnumbered subheading. ++ ++The optional @var{match-level} argument is a GNU extension. It is a ++number indicating the level of the heading, in a manner analogous to the ++@var{curr-level} argument to @code{.NH}. Its purpose is to match the ++point size, at which the heading is printed, to the size of a numbered ++heading at the same level, when the @code{GROWPS} and @code{PSINCR} ++heading size adjustment mechanism is in effect. @xref{ms Document ++Control Registers}. ++@endDefmac ++ ++The @code{HORPHANS} register (@pxref{ms Document Control Registers}) ++operates in conjunction with the @code{NH} and @code{SH} macros, to ++inhibit the printing of orphaned section headings at the bottom of any ++page. ++ ++@c --------------------------------------------------------------------- ++ ++@node Highlighting in ms, Lists in ms, Headings in ms, ms Body Text ++@subsubsection Highlighting ++@cindex @code{ms} macros, highlighting ++ ++The @file{ms} macros provide a variety of methods to highlight or ++emphasize text: ++ ++@Defmac {B, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} ++Sets its first argument in @strong{bold type}. If you specify a second ++argument, @code{groff} prints it in the previous font after the bold ++text, with no intervening space (this allows you to set punctuation ++after the highlighted text without highlighting the punctuation). ++Similarly, it prints the third argument (if any) in the previous font ++@strong{before} the first argument. For example, ++ ++@Example ++.B foo ) ( ++@endExample ++ ++prints (@strong{foo}). ++ ++If you give this macro no arguments, @code{groff} prints all text ++following in bold until the next highlighting, paragraph, or heading ++macro. ++@endDefmac ++ ++@Defmac {R, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} ++Sets its first argument in roman (or regular) type. It operates ++similarly to the @code{B}@tie{}macro otherwise. ++@endDefmac ++ ++@Defmac {I, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} ++Sets its first argument in @emph{italic type}. It operates similarly ++to the @code{B}@tie{}macro otherwise. ++@endDefmac ++ ++@Defmac {CW, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} ++Sets its first argument in a @code{constant width face}. It operates ++similarly to the @code{B}@tie{}macro otherwise. ++@endDefmac ++ ++@Defmac {BI, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} ++Sets its first argument in bold italic type. It operates similarly to ++the @code{B}@tie{}macro otherwise. ++@endDefmac ++ ++@Defmac {BX, [@Var{txt}], ms} ++Prints its argument and draws a box around it. If you want to box a ++string that contains spaces, use a digit-width space (@code{\0}). ++@endDefmac ++ ++@Defmac {UL, [@Var{txt} [@Var{post}]], ms} ++Prints its first argument with an underline. If you specify a second ++argument, @code{groff} prints it in the previous font after the ++underlined text, with no intervening space. ++@endDefmac ++ ++@Defmac {LG, , ms} ++Prints all text following in larger type (two points larger than the ++current point size) until the next font size, highlighting, paragraph, ++or heading macro. You can specify this macro multiple times to ++enlarge the point size as needed. ++@endDefmac ++ ++@Defmac {SM, , ms} ++Prints all text following in smaller type (two points smaller than the ++current point size) until the next type size, highlighting, paragraph, ++or heading macro. You can specify this macro multiple times to reduce ++the point size as needed. ++@endDefmac ++ ++@Defmac {NL, , ms} ++Prints all text following in the normal point size (that is, the value ++of the @code{PS} register). ++@endDefmac ++ ++@DefstrList {@Lbrace{}, ms} ++@DefstrListEndx {@Rbrace{}, ms} ++Text enclosed with @code{\*@{} and @code{\*@}} is printed as a ++superscript. ++@endDefstr ++ ++@c --------------------------------------------------------------------- ++ ++@node Lists in ms, Indentation values in ms, Highlighting in ms, ms Body Text ++@subsubsection Lists ++@cindex @code{ms} macros, lists ++ ++The @code{IP} macro handles duties for all lists. ++ ++@Defmac {IP, [@Var{marker} [@Var{width}]], ms} ++The @var{marker} is usually a bullet glyph (@code{\[bu]}) for unordered ++lists, a number (or auto-incrementing number register) for numbered ++lists, or a word or phrase for indented (glossary-style) lists. ++ ++The @var{width} specifies the indentation for the body of each list ++item; its default unit is @samp{n}. Once specified, the indentation ++remains the same for all list items in the document until specified ++again. ++ ++The @code{PORPHANS} register (@pxref{ms Document Control Registers}) ++operates in conjunction with the @code{IP} macro, to inhibit the ++printing of orphaned list markers at the bottom of any page. ++@endDefmac ++ ++The following is an example of a bulleted list. ++@cindex example markup, bulleted list [@code{ms}] ++@cindex bulleted list, example markup [@code{ms}] ++ ++@Example ++A bulleted list: ++.IP \[bu] 2 ++lawyers ++.IP \[bu] ++guns ++.IP \[bu] ++money ++@endExample ++ ++Produces: ++ ++@Example ++A bulleted list: ++ ++o lawyers ++ ++o guns ++ ++o money ++@endExample ++ ++The following is an example of a numbered list. ++@cindex example markup, numbered list [@code{ms}] ++@cindex numbered list, example markup [@code{ms}] ++ ++@Example ++.nr step 1 1 ++A numbered list: ++.IP \n[step] 3 ++lawyers ++.IP \n+[step] ++guns ++.IP \n+[step] ++money ++@endExample ++ ++Produces: ++ ++@Example ++A numbered list: ++ ++1. lawyers ++ ++2. guns ++ ++3. money ++@endExample ++ ++Note the use of the auto-incrementing number register in this example. ++ ++The following is an example of a glossary-style list. ++@cindex example markup, glossary-style list [@code{ms}] ++@cindex glossary-style list, example markup [@code{ms}] ++ ++@Example ++A glossary-style list: ++.IP lawyers 0.4i ++Two or more attorneys. ++.IP guns ++Firearms, preferably ++large-caliber. ++.IP money ++Gotta pay for those ++lawyers and guns! ++@endExample ++ ++Produces: ++ ++@Example ++A glossary-style list: ++ ++lawyers ++ Two or more attorneys. ++ ++guns Firearms, preferably large-caliber. ++ ++money ++ Gotta pay for those lawyers and guns! ++@endExample ++ ++In the last example, the @code{IP} macro places the definition on the ++same line as the term if it has enough space; otherwise, it breaks to ++the next line and starts the definition below the term. This may or may ++not be the effect you want, especially if some of the definitions break ++and some do not. The following examples show two possible ways to force ++a break. ++ ++The first workaround uses the @code{br} request to force a break after ++printing the term or label. ++ ++@CartoucheExample ++A glossary-style list: ++.IP lawyers 0.4i ++Two or more attorneys. ++.IP guns ++.br ++Firearms, preferably large-caliber. ++.IP money ++Gotta pay for those lawyers and guns! ++@endCartoucheExample ++ ++The second workaround uses the @code{\p} escape to force the break. ++Note the space following the escape; this is important. If you omit the ++space, @code{groff} prints the first word on the same line as the term ++or label (if it fits) @strong{then} breaks the line. ++ ++@CartoucheExample ++A glossary-style list: ++.IP lawyers 0.4i ++Two or more attorneys. ++.IP guns ++\p Firearms, preferably large-caliber. ++.IP money ++Gotta pay for those lawyers and guns! ++@endCartoucheExample ++ ++To set nested lists, use the @code{RS} and @code{RE} macros. ++@xref{Indentation values in ms}, for more information. ++@cindex @code{ms} macros, nested lists ++@cindex nested lists [@code{ms}] ++ ++For example: ++ ++@CartoucheExample ++.IP \[bu] 2 ++Lawyers: ++.RS ++.IP \[bu] ++Dewey, ++.IP \[bu] ++Cheatham, ++.IP \[bu] ++and Howe. ++.RE ++.IP \[bu] ++Guns ++@endCartoucheExample ++ ++Produces: ++ ++@Example ++o Lawyers: ++ ++ o Dewey, ++ ++ o Cheatham, ++ ++ o and Howe. ++ ++o Guns ++@endExample ++ ++@c --------------------------------------------------------------------- ++ ++@node Indentation values in ms, Tabstops in ms, Lists in ms, ms Body Text ++@subsubsection Indentation values ++ ++In many situations, you may need to indentation a section of text while ++still wrapping and filling. @xref{Lists in ms}, for an example of ++nested lists. ++ ++@DefmacList {RS, , ms} ++@DefmacListEndx {RE, , ms} ++These macros begin and end an indented section. The @code{PI} register ++controls the amount of indentation, allowing the indented text to line ++up under hanging and indented paragraphs. ++@endDefmac ++ ++@xref{ms Displays and Keeps}, for macros to indentation and turn off ++filling. ++ ++@c --------------------------------------------------------------------- ++ ++@node Tabstops in ms, ms Displays and Keeps, Indentation values in ms, ms Body Text ++@subsubsection Tab Stops ++ ++Use the @code{ta} request to define tab stops as needed. @xref{Tabs and ++Fields}. ++ ++@Defmac {TA, , ms} ++Use this macro to reset the tab stops to the default for @file{ms} ++(every 5n). You can redefine the @code{TA} macro to create a different ++set of default tab stops. ++@endDefmac ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Displays and Keeps, ms Insertions, Tabstops in ms, ms Body Text ++@subsubsection Displays and keeps ++@cindex @code{ms} macros, displays ++@cindex @code{ms} macros, keeps ++@cindex keeps [@code{ms}] ++@cindex displays [@code{ms}] ++ ++Use displays to show text-based examples or figures (such as code ++listings). ++ ++Displays turn off filling, so lines of code are displayed as-is without ++inserting @code{br} requests in between each line. Displays can be ++@dfn{kept} on a single page, or allowed to break across pages. ++ ++@DefmacList {DS, @t{L}, ms} ++@DefmacItemx {LD, , ms} ++@DefmacListEndx {DE, , ms} ++Left-justified display. The @samp{.DS L} call generates a page break, ++if necessary, to keep the entire display on one page. The @code{LD} ++macro allows the display to break across pages. The @code{DE} macro ++ends the display. ++@endDefmac ++ ++@DefmacList {DS, @t{I}, ms} ++@DefmacItemx {ID, , ms} ++@DefmacListEndx {DE, , ms} ++Indents the display as defined by the @code{DI} register. The @samp{.DS ++I} call generates a page break, if necessary, to keep the entire display ++on one page. The @code{ID} macro allows the display to break across ++pages. The @code{DE} macro ends the display. ++@endDefmac ++ ++@DefmacList {DS, @t{B}, ms} ++@DefmacItemx {BD, , ms} ++@DefmacListEndx {DE, , ms} ++Sets a block-centered display: the entire display is left-justified, but ++indented so that the longest line in the display is centered on the ++page. The @samp{.DS B} call generates a page break, if necessary, to ++keep the entire display on one page. The @code{BD} macro allows the ++display to break across pages. The @code{DE} macro ends the display. ++@endDefmac ++ ++@DefmacList {DS, @t{C}, ms} ++@DefmacItemx {CD, , ms} ++@DefmacListEndx {DE, , ms} ++Sets a centered display: each line in the display is centered. The ++@samp{.DS C} call generates a page break, if necessary, to keep the ++entire display on one page. The @code{CD} macro allows the display to ++break across pages. The @code{DE} macro ends the display. ++@endDefmac ++ ++@DefmacList {DS, @t{R}, ms} ++@DefmacItemx {RD, , ms} ++@DefmacListEndx {DE, , ms} ++Right-justifies each line in the display. The @samp{.DS R} call ++generates a page break, if necessary, to keep the entire display on one ++page. The @code{RD} macro allows the display to break across pages. ++The @code{DE} macro ends the display. ++@endDefmac ++ ++@DefmacList {Ds, , ms} ++@DefmacListEndx {De, , ms} ++These two macros were formerly provided as aliases for @code{DS} and ++@code{DE}, respectively. They have been removed, and should no longer ++be used. The original implementations of @code{DS} and @code{DE} are ++retained, and should be used instead. X11 documents that actually use ++@code{Ds} and @code{De} always load a specific macro file from the X11 ++distribution (@file{macros.t}) that provides proper definitions for the ++two macros. ++@endDefmac ++ ++On occasion, you may want to @dfn{keep} other text together on a page. ++For example, you may want to keep two paragraphs together, or a ++paragraph that refers to a table (or list, or other item) immediately ++following. The @file{ms} macros provide the @code{KS} and @code{KE} ++macros for this purpose. ++ ++@DefmacList {KS, , ms} ++@DefmacListEndx {KE, , ms} ++The @code{KS} macro begins a block of text to be kept on a single page, ++and the @code{KE} macro ends the block. ++@endDefmac ++ ++@DefmacList {KF, , ms} ++@DefmacListEndx {KE, , ms} ++Specifies a @dfn{floating keep}; if the keep cannot fit on the current ++page, @code{groff} holds the contents of the keep and allows text ++following the keep (in the source file) to fill in the remainder of the ++current page. When the page breaks, whether by an explicit @code{bp} ++request or by reaching the end of the page, @code{groff} prints the ++floating keep at the top of the new page. This is useful for printing ++large graphics or tables that do not need to appear exactly where ++specified. ++@endDefmac ++ ++You can also use the @code{ne} request to force a page break if there is ++not enough vertical space remaining on the page. ++ ++Use the following macros to draw a box around a section of text (such as ++a display). ++ ++@DefmacList {B1, , ms} ++@DefmacListEndx {B2, , ms} ++Marks the beginning and ending of text that is to have a box drawn ++around it. The @code{B1} macro begins the box; the @code{B2} macro ends ++it. Text in the box is automatically placed in a diversion (keep). ++@endDefmac ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Insertions, Example multi-page table, ms Displays and Keeps, ms Body Text ++@subsubsection Tables, figures, equations, and references ++@cindex @code{ms} macros, tables ++@cindex @code{ms} macros, figures ++@cindex @code{ms} macros, equations ++@cindex @code{ms} macros, references ++@cindex tables [@code{ms}] ++@cindex figures [@code{ms}] ++@cindex equations [@code{ms}] ++@cindex references [@code{ms}] ++ ++The @file{ms} macros support the standard @code{groff} preprocessors: ++@code{tbl}, @code{pic}, @code{eqn}, and @code{refer}. ++@pindex tbl ++@pindex pic ++@pindex eqn ++@pindex refer ++You mark text meant for preprocessors by enclosing it in pairs of tags ++as follows. ++ ++@DefmacList {TS, [@code{H}], ms} ++@DefmacListEndx {TE, , ms} ++Denotes a table, to be processed by the @code{tbl} preprocessor. The ++optional argument@tie{}@code{H} to @code{TS} instructs @code{groff} to ++create a running header with the information up to the @code{TH} macro. ++@code{groff} prints the header at the beginning of the table; if the ++table runs onto another page, @code{groff} prints the header on the next ++page as well. ++@endDefmac ++ ++@DefmacList {PS, , ms} ++@DefmacListEndx {PE, , ms} ++Denotes a graphic, to be processed by the @code{pic} preprocessor. You ++can create a @code{pic} file by hand, using the @acronym{AT&T} ++@code{pic} manual available on the Web as a reference, or by using a ++graphics program such as @code{xfig}. ++@endDefmac ++ ++@DefmacList {EQ, [@Var{align}], ms} ++@DefmacListEndx {EN, , ms} ++Denotes an equation, to be processed by the @code{eqn} preprocessor. ++The optional @var{align} argument can be @code{C}, @code{L}, ++or@tie{}@code{I} to center (the default), left-justify, or indent the ++equation. ++@endDefmac ++ ++@DefmacList {[, , ms} ++@DefmacListEndx {], , ms} ++Denotes a reference, to be processed by the @code{refer} preprocessor. ++The GNU @cite{refer(1)} man page provides a comprehensive reference to ++the preprocessor and the format of the bibliographic database. ++@endDefmac ++ ++@menu ++* Example multi-page table:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Example multi-page table, ms Footnotes, ms Insertions, ms Body Text ++@subsubsection An example multi-page table ++@cindex example markup, multi-page table [@code{ms}] ++@cindex multi-page table, example markup [@code{ms}] ++ ++The following is an example of how to set up a table that may print ++across two or more pages. ++ ++@CartoucheExample ++.TS H ++allbox expand; ++cb | cb . ++Text ...of heading... ++_ ++.TH ++.T& ++l | l . ++... the rest of the table follows... ++.CW ++.TE ++@endCartoucheExample ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Footnotes, , Example multi-page table, ms Body Text ++@subsubsection Footnotes ++@cindex @code{ms} macros, footnotes ++@cindex footnotes [@code{ms}] ++ ++The @file{ms} macro package has a flexible footnote system. You can ++specify either numbered footnotes or symbolic footnotes (that is, using ++a marker such as a dagger symbol). ++ ++@Defstr {*, ms} ++Specifies the location of a numbered footnote marker in the text. ++@endDefesc ++ ++@DefmacList {FS, , ms} ++@DefmacListEndx {FE, , ms} ++Specifies the text of the footnote. The default action is to create a ++numbered footnote; you can create a symbolic footnote by specifying a ++@dfn{mark} glyph (such as @code{\[dg]} for the dagger glyph) in the body ++text and as an argument to the @code{FS} macro, followed by the text of ++the footnote and the @code{FE} macro. ++@endDefmac ++ ++You can control how @code{groff} prints footnote numbers by changing the ++value of the @code{FF} register. @xref{ms Document Control Registers}. ++ ++@cindex footnotes, and keeps [@code{ms}] ++@cindex keeps, and footnotes [@code{ms}] ++@cindex footnotes, and displays [@code{ms}] ++@cindex displays, and footnotes [@code{ms}] ++Footnotes can be safely used within keeps and displays, but you should ++avoid using numbered footnotes within floating keeps. You can set a ++second @code{\**} marker between a @code{\**} and its corresponding ++@code{.FS} entry; as long as each @code{FS} macro occurs @emph{after} ++the corresponding @code{\**} and the occurrences of @code{.FS} are in ++the same order as the corresponding occurrences of @code{\**}. ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Page Layout, Differences from AT&T ms, ms Body Text, ms ++@subsection Page layout ++@cindex @code{ms} macros, page layout ++@cindex page layout [@code{ms}] ++ ++The default output from the @file{ms} macros provides a minimalist page ++layout: it prints a single column, with the page number centered at the ++top of each page. It prints no footers. ++ ++You can change the layout by setting the proper number registers and ++strings. ++ ++@menu ++* ms Headers and Footers:: ++* ms Margins:: ++* ms Multiple Columns:: ++* ms TOC:: ++* ms Strings and Special Characters:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Headers and Footers, ms Margins, ms Page Layout, ms Page Layout ++@subsubsection Headers and footers ++@cindex @code{ms} macros, headers ++@cindex @code{ms} macros, footers ++@cindex headers [@code{ms}] ++@cindex footers [@code{ms}] ++ ++For documents that do not distinguish between odd and even pages, set ++the following strings: ++ ++@DefstrList {LH, ms} ++@DefstrItemx {CH, ms} ++@DefstrListEndx {RH, ms} ++Sets the left, center, and right headers. ++@endDefstr ++ ++@DefstrList {LF, ms} ++@DefstrItemx {CF, ms} ++@DefstrListEndx {RF, ms} ++Sets the left, center, and right footers. ++@endDefstr ++ ++For documents that need different information printed in the even and ++odd pages, use the following macros: ++ ++@DefmacList {OH, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} ++@DefmacItemx {EH, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} ++@DefmacItemx {OF, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} ++@DefmacListEndx {EF, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} ++The @code{OH} and @code{EH} macros define headers for the odd and even ++pages; the @code{OF} and @code{EF} macros define footers for the odd and ++even pages. This is more flexible than defining the individual strings. ++ ++You can replace the quote (@code{'}) marks with any character not ++appearing in the header or footer text. ++@endDefmac ++ ++To specify custom header and footer processing, redefine the following ++macros: ++ ++@DefmacList {PT,, ms} ++@DefmacItemx {HD,, ms} ++@DefmacListEndx {BT,, ms} ++The @code{PT} macro defines a custom header; the @code{BT} macro defines ++a custom footer. These macros must handle odd/even/first page ++differences if necessary. ++ ++The @code{HD} macro defines additional header processing to take place ++after executing the @code{PT} macro. ++@endDefmac ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Margins, ms Multiple Columns, ms Headers and Footers, ms Page Layout ++@subsubsection Margins ++@cindex @code{ms} macros, margins ++ ++You control margins using a set of number registers. @xref{ms Document ++Control Registers}, for details. ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Multiple Columns, ms TOC, ms Margins, ms Page Layout ++@subsubsection Multiple columns ++@cindex @code{ms} macros, multiple columns ++@cindex multiple columns [@code{ms}] ++ ++The @file{ms} macros can set text in as many columns as do reasonably ++fit on the page. The following macros are available; all of them force ++a page break if a multi-column mode is already set. However, if the ++current mode is single-column, starting a multi-column mode does ++@emph{not} force a page break. ++ ++@Defmac {1C, , ms} ++Single-column mode. ++@endDefmac ++ ++@Defmac {2C, , ms} ++Two-column mode. ++@endDefmac ++ ++@Defmac {MC, [@Var{width} [@Var{gutter}]], ms} ++Multi-column mode. If you specify no arguments, it is equivalent to the ++@code{2C} macro. Otherwise, @var{width} is the width of each column and ++@var{gutter} is the space between columns. The @code{MINGW} number ++register controls the default gutter width. ++@endDefmac ++ ++@c --------------------------------------------------------------------- ++ ++@node ms TOC, ms Strings and Special Characters, ms Multiple Columns, ms Page Layout ++@subsubsection Creating a table of contents ++@cindex @code{ms} macros, creating table of contents ++@cindex table of contents, creating [@code{ms}] ++ ++The facilities in the @file{ms} macro package for creating a table of ++contents are semi-automated at best. Assuming that you want the table ++of contents to consist of the document's headings, you need to repeat ++those headings wrapped in @code{XS} and @code{XE} macros. ++ ++@DefmacList {XS, [@Var{page}], ms} ++@DefmacItemx {XA, [@Var{page}], ms} ++@DefmacListEndx {XE, , ms} ++These macros define a table of contents or an individual entry in the ++table of contents, depending on their use. The macros are very simple; ++they cannot indent a heading based on its level. The easiest way to ++work around this is to add tabs to the table of contents string. The ++following is an example: ++ ++@CartoucheExample ++.NH 1 ++Introduction ++.XS ++Introduction ++.XE ++.LP ++... ++.CW ++.NH 2 ++Methodology ++.XS ++Methodology ++.XE ++.LP ++... ++@endCartoucheExample ++ ++You can manually create a table of contents by beginning with the ++@code{XS} macro for the first entry, specifying the page number for that ++entry as the argument to @code{XS}. Add subsequent entries using the ++@code{XA} macro, specifying the page number for that entry as the ++argument to @code{XA}. The following is an example: ++ ++@CartoucheExample ++.XS 1 ++Introduction ++.XA 2 ++A Brief History of the Universe ++.XA 729 ++Details of Galactic Formation ++... ++.XE ++@endCartoucheExample ++@endDefmac ++ ++@Defmac {TC, [@code{no}], ms} ++Prints the table of contents on a new page, setting the page number ++to@tie{}@strong{i} (Roman lowercase numeral one). You should usually ++place this macro at the end of the file, since @code{groff} is a ++single-pass formatter and can only print what has been collected up to ++the point that the @code{TC} macro appears. ++ ++The optional argument @code{no} suppresses printing the title specified ++by the string register @code{TOC}. ++@endDefmac ++ ++@Defmac {PX, [@code{no}], ms} ++Prints the table of contents on a new page, using the current page ++numbering sequence. Use this macro to print a manually-generated table ++of contents at the beginning of your document. ++ ++The optional argument @code{no} suppresses printing the title specified ++by the string register @code{TOC}. ++@endDefmac ++ ++The @cite{Groff and Friends HOWTO} includes a @code{sed} script that ++automatically inserts @code{XS} and @code{XE} macro entries after each ++heading in a document. ++ ++Altering the @code{NH} macro to automatically build the table of ++contents is perhaps initially more difficult, but would save a great ++deal of time in the long run if you use @file{ms} regularly. ++ ++@c --------------------------------------------------------------------- ++ ++@node ms Strings and Special Characters, , ms TOC, ms Page Layout ++@subsubsection Strings and Special Characters ++@cindex @code{ms} macros, strings ++@cindex @code{ms} macros, special characters ++@cindex @code{ms} macros, accent marks ++@cindex accent marks [@code{ms}] ++@cindex special characters [@code{ms}] ++@cindex strings [@code{ms}] ++ ++The @file{ms} macros provide the following predefined strings. You can ++change the string definitions to help in creating documents in languages ++other than English. ++ ++@Defstr {REFERENCES, ms} ++Contains the string printed at the beginning of the references ++(bibliography) page. The default is @samp{References}. ++@endDefstr ++ ++@Defstr {ABSTRACT, ms} ++Contains the string printed at the beginning of the abstract. The ++default is @samp{ABSTRACT}. ++@endDefstr ++ ++@Defstr {TOC, ms} ++Contains the string printed at the beginning of the table of contents. ++@endDefstr ++ ++@DefstrList {MONTH1, ms} ++@DefstrItemx {MONTH2, ms} ++@DefstrItemx {MONTH3, ms} ++@DefstrItemx {MONTH4, ms} ++@DefstrItemx {MONTH5, ms} ++@DefstrItemx {MONTH6, ms} ++@DefstrItemx {MONTH7, ms} ++@DefstrItemx {MONTH8, ms} ++@DefstrItemx {MONTH9, ms} ++@DefstrItemx {MONTH10, ms} ++@DefstrItemx {MONTH11, ms} ++@DefstrListEndx {MONTH12, ms} ++Prints the full name of the month in dates. The default is ++@samp{January}, @samp{February}, etc. ++@endDefstr ++ ++The following special characters are available@footnote{For an ++explanation what special characters are see @ref{Special Characters}.}: ++ ++@Defstr {-, ms} ++Prints an em dash. ++@endDefstr ++ ++@DefstrList {Q, ms} ++@DefstrListEndx {U, ms} ++Prints typographer's quotes in troff, and plain quotes in nroff. ++@code{\*Q} is the left quote and @code{\*U} is the right quote. ++@endDefstr ++ ++Improved accent marks are available in the @file{ms} macros. ++ ++@Defmac {AM, , ms} ++Specify this macro at the beginning of your document to enable extended ++accent marks and special characters. This is a Berkeley extension. ++ ++To use the accent marks, place them @strong{after} the character being ++accented. ++ ++Note that groff's native support for accents is superior to the ++following definitions. ++@endDefmac ++ ++The following accent marks are available after invoking the @code{AM} ++macro: ++ ++@Defstr {', ms} ++Acute accent. ++@endDefstr ++ ++@Defstr {`, ms} ++Grave accent. ++@endDefstr ++ ++@Defstr {^, ms} ++Circumflex. ++@endDefstr ++ ++@Defstr {\,, ms} ++Cedilla. ++@endDefstr ++ ++@Defstr {~, ms} ++Tilde. ++@endDefstr ++ ++@deffn String @t{\*[:]} ++@ifnotinfo ++@stindex : @r{[}ms@r{]} ++@end ifnotinfo ++@ifinfo ++@stindex \*[@r{}] @r{[}ms@r{]} ++@end ifinfo ++Umlaut. ++@end deffn ++ ++@Defstr {v, ms} ++Hacek. ++@endDefstr ++ ++@Defstr {_, ms} ++Macron (overbar). ++@endDefstr ++ ++@Defstr {., ms} ++Underdot. ++@endDefstr ++ ++@Defstr {o, ms} ++Ring above. ++@endDefstr ++ ++The following are standalone characters available after invoking the ++@code{AM} macro: ++ ++@Defstr {?, ms} ++Upside-down question mark. ++@endDefstr ++ ++@Defstr {!, ms} ++Upside-down exclamation point. ++@endDefstr ++ ++@Defstr {8, ms} ++German ligature. ++@endDefstr ++ ++@Defstr {3, ms} ++Yogh. ++@endDefstr ++ ++@Defstr {Th, ms} ++Uppercase thorn. ++@endDefstr ++ ++@Defstr {th, ms} ++Lowercase thorn. ++@endDefstr ++ ++@Defstr {D-, ms} ++Uppercase eth. ++@endDefstr ++ ++@Defstr {d-, ms} ++Lowercase eth. ++@endDefstr ++ ++@Defstr {q, ms} ++Hooked o. ++@endDefstr ++ ++@Defstr {ae, ms} ++Lowercase ligature. ++@endDefstr ++ ++@Defstr {Ae, ms} ++Uppercase ligature. ++@endDefstr ++ ++@c --------------------------------------------------------------------- ++ ++@node Differences from AT&T ms, Naming Conventions, ms Page Layout, ms ++@subsection Differences from @acronym{AT&T} @file{ms} ++@cindex @code{ms} macros, differences from @acronym{AT&T} ++@cindex @acronym{AT&T} @code{troff}, @code{ms} macro package differences ++ ++This section lists the (minor) differences between the @code{groff -ms} ++macros and @acronym{AT&T} @code{troff -ms} macros. ++ ++@itemize @bullet ++@item ++The internals of @code{groff -ms} differ from the internals of ++@acronym{AT&T} @code{troff -ms}. Documents that depend upon ++implementation details of @acronym{AT&T} @code{troff -ms} may not format ++properly with @code{groff -ms}. ++ ++@item ++The general error-handling policy of @code{groff -ms} is to detect and ++report errors, rather than silently to ignore them. ++ ++@item ++@code{groff -ms} does not work in compatibility mode (this is, with the ++@option{-C} option). ++ ++@item ++There is no special support for typewriter-like devices. ++ ++@item ++@code{groff -ms} does not provide cut marks. ++ ++@item ++Multiple line spacing is not supported. Use a larger vertical spacing ++instead. ++ ++@item ++Some @acronym{UNIX} @code{ms} documentation says that the @code{CW} and ++@code{GW} number registers can be used to control the column width and ++gutter width, respectively. These number registers are not used in ++@code{groff -ms}. ++ ++@item ++Macros that cause a reset (paragraphs, headings, etc.@:) may change the ++indentation. Macros that change the indentation do not increment or ++decrement the indentation, but rather set it absolutely. This can cause ++problems for documents that define additional macros of their own. The ++solution is to use not the @code{in} request but instead the @code{RS} ++and @code{RE} macros. ++ ++@item ++To make @code{groff -ms} use the default page offset (which also ++specifies the left margin), the @code{PO} register must stay undefined ++until the first @file{-ms} macro is evaluated. This implies that ++@code{PO} should not be used early in the document, unless it is changed ++also: Remember that accessing an undefined register automatically ++defines it. ++@end itemize ++ ++@Defmpreg {GS, ms} ++This number register is set to@tie{}1 by the @code{groff -ms} macros, ++but it is not used by the @code{AT&T} @code{troff -ms} macros. ++Documents that need to determine whether they are being formatted with ++@code{AT&T} @code{troff -ms} or @code{groff -ms} should use this number ++register. ++@endDefmpreg ++ ++Emulations of a few ancient Bell Labs macros can be re-enabled by ++calling the otherwise undocumented @code{SC} section-header macro. ++Calling @code{SC} enables @code{UC} for marking up a product or ++application name, and the pair @code{P1}/@code{P2} for surrounding code ++example displays. ++ ++These are not enabled by default because (a)@tie{}they were not ++documented, in the original @code{ms} manual, and (b)@tie{}the @code{P1} ++and @code{UC} macros collide with different macros with the same names ++in the Berkeley version of @code{ms}. ++ ++These @code{groff} emulations are sufficient to give back the 1976 ++Kernighan@tie{}& Cherry paper @cite{Typsetting Mathematics -- User's ++Guide} its section headings, and restore some text that had gone missing ++as arguments of undefined macros. No warranty express or implied is ++given as to how well the typographic details these produce match the ++original Bell Labs macros. ++ ++@menu ++* Missing ms Macros:: ++* Additional ms Macros:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Missing ms Macros, Additional ms Macros, Differences from AT&T ms, Differences from AT&T ms ++@subsubsection @code{troff} macros not appearing in @code{groff} ++ ++Macros missing from @code{groff -ms} are cover page macros specific to ++Bell Labs and Berkeley. The macros known to be missing are: ++ ++@table @code ++@item .TM ++Technical memorandum; a cover sheet style ++ ++@item .IM ++Internal memorandum; a cover sheet style ++ ++@item .MR ++Memo for record; a cover sheet style ++ ++@item .MF ++Memo for file; a cover sheet style ++ ++@item .EG ++Engineer's notes; a cover sheet style ++ ++@item .TR ++Computing Science Tech Report; a cover sheet style ++ ++@item .OK ++Other keywords ++ ++@item .CS ++Cover sheet information ++ ++@item .MH ++A cover sheet macro ++@end table ++ ++@c --------------------------------------------------------------------- ++ ++@node Additional ms Macros, , Missing ms Macros, Differences from AT&T ms ++@subsubsection @code{groff} macros not appearing in @acronym{AT&T} @code{troff} ++ ++The @code{groff -ms} macros have a few minor extensions compared to the ++@acronym{AT&T} @code{troff -ms} macros. ++ ++@Defmac {AM, , ms} ++Improved accent marks. @xref{ms Strings and Special Characters}, for ++details. ++@endDefmac ++ ++@Defmac {DS, @t{I}, ms} ++Indented display. The default behavior of @acronym{AT&T} @code{troff ++-ms} was to indent; the @code{groff} default prints displays flush left ++with the body text. ++@endDefmac ++ ++@Defmac {CW, , ms} ++Print text in @code{constant width} (Courier) font. ++@endDefmac ++ ++@Defmac {IX, , ms} ++Indexing term (printed on standard error). You can write a script to ++capture and process an index generated in this manner. ++@endDefmac ++ ++The following additional number registers ++appear in @code{groff -ms}: ++ ++@Defmpreg {MINGW, ms} ++Specifies a minimum space between columns (for multi-column output); ++this takes the place of the @code{GW} register that was documented but ++apparently not implemented in @acronym{AT&T} @code{troff}. ++@endDefmpreg ++ ++Several new string registers are available as well. You can change ++these to handle (for example) the local language. @xref{ms Strings and ++Special Characters}, for details. ++ ++@c --------------------------------------------------------------------- ++ ++@node Naming Conventions, , Differences from AT&T ms, ms ++@subsection Naming Conventions ++@cindex @code{ms} macros, naming conventions ++@cindex naming conventions, @code{ms} macros ++ ++The following conventions are used for names of macros, strings and ++number registers. External names available to documents that use the ++@code{groff -ms} macros contain only uppercase letters and digits. ++ ++Internally the macros are divided into modules; naming conventions are ++as follows: ++ ++@itemize @bullet ++@item ++Names used only within one module are of the form ++@var{module}@code{*}@var{name}. ++ ++@item ++Names used outside the module in which they are defined are of the form ++@var{module}@code{@@}@var{name}. ++ ++@item ++Names associated with a particular environment are of the form ++@var{environment}@code{:}@var{name}; these are used only within the ++@code{par} module. ++ ++@item ++@var{name} does not have a module prefix. ++ ++@item ++Constructed names used to implement arrays are of the form ++@var{array}@code{!}@var{index}. ++@end itemize ++ ++Thus the groff ms macros reserve the following names: ++ ++@itemize @bullet ++@item ++Names containing the characters @code{*}, @code{@@}, and@tie{}@code{:}. ++ ++@item ++Names containing only uppercase letters and digits. ++@end itemize ++ ++ ++@c ===================================================================== ++ ++@node me, mm, ms, Macro Packages ++@section @file{me} ++@cindex @code{me} macro package ++ ++@c XXX documentation ++@c XXX this is a placeholder until we get stuff knocked into shape ++See the @file{meintro.me} and @file{meref.me} documents in groff's ++@file{doc} directory. ++ ++ ++@c ===================================================================== ++ ++@node mm, mom, me, Macro Packages ++@section @file{mm} ++@cindex @code{mm} macro package ++ ++@c XXX documentation ++@c XXX this is a placeholder until we get stuff knocked into shape ++See the @cite{groff_mm(7)} man page (type @command{man groff_mm} at the ++command line). ++ ++ ++@c ===================================================================== ++ ++@node mom, , mm, Macro Packages ++@section @file{mom} ++@cindex @code{mom} macro package ++ ++@c XXX documentation ++@c XXX this is a placeholder until we get stuff knocked into shape ++See the @cite{groff_mom(7)} man page (type @command{man groff_mom} at ++the command line), which gives a short overview and a link to its ++extensive documentation in HTML format. ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node gtroff Reference, Preprocessors, Macro Packages, Top ++@chapter @code{gtroff} Reference ++@cindex reference, @code{gtroff} ++@cindex @code{gtroff}, reference ++ ++This chapter covers @strong{all} of the facilities of @code{gtroff}. ++Users of macro packages may skip it if not interested in details. ++ ++ ++@menu ++* Text:: ++* Measurements:: ++* Expressions:: ++* Identifiers:: ++* Embedded Commands:: ++* Registers:: ++* Manipulating Filling and Adjusting:: ++* Manipulating Hyphenation:: ++* Manipulating Spacing:: ++* Tabs and Fields:: ++* Character Translations:: ++* Troff and Nroff Mode:: ++* Line Layout:: ++* Line Control:: ++* Page Layout:: ++* Page Control:: ++* Fonts and Symbols:: ++* Sizes:: ++* Strings:: ++* Conditionals and Loops:: ++* Writing Macros:: ++* Page Motions:: ++* Drawing Requests:: ++* Traps:: ++* Diversions:: ++* Environments:: ++* Suppressing output:: ++* Colors:: ++* I/O:: ++* Postprocessor Access:: ++* Miscellaneous:: ++* Gtroff Internals:: ++* Debugging:: ++* Implementation Differences:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node Text, Measurements, gtroff Reference, gtroff Reference ++@section Text ++@cindex text, @code{gtroff} processing ++ ++@code{gtroff} input files contain text with control commands ++interspersed throughout. But, even without control codes, @code{gtroff} ++still does several things with the input text: ++ ++@itemize @bullet ++@item ++filling and adjusting ++ ++@item ++adding additional space after sentences ++ ++@item ++hyphenating ++ ++@item ++inserting implicit line breaks ++@end itemize ++ ++@menu ++* Filling and Adjusting:: ++* Hyphenation:: ++* Sentences:: ++* Tab Stops:: ++* Implicit Line Breaks:: ++* Input Conventions:: ++* Input Encodings:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Filling and Adjusting, Hyphenation, Text, Text ++@subsection Filling and Adjusting ++@cindex filling ++@cindex adjusting ++ ++When @code{gtroff} reads text, it collects words from the input and fits ++as many of them together on one output line as it can. This is known as ++@dfn{filling}. ++ ++@cindex leading spaces ++@cindex spaces, leading and trailing ++@cindex extra spaces ++@cindex trailing spaces ++Once @code{gtroff} has a @dfn{filled} line, it tries to @dfn{adjust} it. ++This means it widens the spacing between words until the text reaches ++the right margin (in the default adjustment mode). Extra spaces between ++words are preserved, but spaces at the end of lines are ignored. Spaces ++at the front of a line cause a @dfn{break} (breaks are explained in ++@ref{Implicit Line Breaks}). ++ ++@xref{Manipulating Filling and Adjusting}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Hyphenation, Sentences, Filling and Adjusting, Text ++@subsection Hyphenation ++@cindex hyphenation ++ ++Since the odds are not great for finding a set of words, for every ++output line, which fit nicely on a line without inserting excessive ++amounts of space between words, @code{gtroff} hyphenates words so that ++it can justify lines without inserting too much space between words. It ++uses an internal hyphenation algorithm (a simplified version of the ++algorithm used within @TeX{}) to indicate which words can be hyphenated ++and how to do so. When a word is hyphenated, the first part of the word ++is added to the current filled line being output (with an attached ++hyphen), and the other portion is added to the next line to be filled. ++ ++@xref{Manipulating Hyphenation}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Sentences, Tab Stops, Hyphenation, Text ++@subsection Sentences ++@cindex sentences ++ ++Although it is often debated, some typesetting rules say there should be ++different amounts of space after various punctuation marks. For ++example, the @cite{Chicago typsetting manual} says that a period at the ++end of a sentence should have twice as much space following it as would ++a comma or a period as part of an abbreviation. ++ ++@c XXX exact citation of Chicago manual ++ ++@cindex sentence space ++@cindex space between sentences ++@cindex french-spacing ++@code{gtroff} does this by flagging certain characters (normally ++@samp{!}, @samp{?}, and @samp{.}) as @dfn{end-of-sentence} characters. ++When @code{gtroff} encounters one of these characters at the end of a ++line, it appends a normal space followed by a @dfn{sentence space} in ++the formatted output. (This justifies one of the conventions mentioned ++in @ref{Input Conventions}.) ++ ++@cindex transparent characters ++@cindex character, transparent ++@cindex @code{dg} glyph, at end of sentence ++@cindex @code{rq} glyph, at end of sentence ++@cindex @code{cq} glyph, at end of sentence ++@cindex @code{"}, at end of sentence ++@cindex @code{'}, at end of sentence ++@cindex @code{)}, at end of sentence ++@cindex @code{]}, at end of sentence ++@cindex @code{*}, at end of sentence ++In addition, the following characters and symbols are treated ++transparently while handling end-of-sentence characters: @samp{"}, ++@samp{'}, @samp{)}, @samp{]}, @samp{*}, @code{\[dg]}, @code{\[rq]}, and ++@code{\[cq]}. ++ ++See the @code{cflags} request in @ref{Using Symbols}, for more details. ++ ++@cindex @code{\&}, at end of sentence ++To prevent the insertion of extra space after an end-of-sentence ++character (at the end of a line), append @code{\&}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Tab Stops, Implicit Line Breaks, Sentences, Text ++@subsection Tab Stops ++@cindex tab stops ++@cindex stops, tabulator ++@cindex tab character ++@cindex character, tabulator ++ ++@cindex @acronym{EBCDIC} encoding ++@cindex encoding, @acronym{EBCDIC} ++@code{gtroff} translates @dfn{tabulator characters}, also called ++@dfn{tabs} (normally code point @acronym{ASCII} @code{0x09} or ++@acronym{EBCDIC} @code{0x05}), in the input into movements to the next ++tabulator stop. These tab stops are initially located every half inch ++across the page. Using this, simple tables can be made easily. ++However, it can often be deceptive as the appearance (and width) of the ++text on a terminal and the results from @code{gtroff} can vary greatly. ++ ++Also, a possible sticking point is that lines beginning with tab ++characters are still filled, again producing unexpected results. For ++example, the following input ++ ++@multitable {12345678} {12345678} {12345678} {12345678} ++@item ++@tab 1 @tab 2 @tab 3 ++@item ++@tab @tab 4 @tab 5 ++@end multitable ++ ++@noindent ++produces ++ ++@multitable {12345678} {12345678} {12345678} {12345678} {12345678} {12345678} {12345678} ++@item ++@tab 1 @tab 2 @tab 3 @tab @tab 4 @tab 5 ++@end multitable ++ ++@xref{Tabs and Fields}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Implicit Line Breaks, Input Conventions, Tab Stops, Text ++@subsection Implicit Line Breaks ++@cindex implicit line breaks ++@cindex implicit breaks of lines ++@cindex line, implicit breaks ++@cindex break, implicit ++@cindex line break ++ ++An important concept in @code{gtroff} is the @dfn{break}. When a break ++occurs, @code{gtroff} outputs the partially filled line (unjustified), ++and resumes collecting and filling text on the next output line. ++ ++@cindex blank line ++@cindex empty line ++@cindex line, blank ++@cindex blank line macro (@code{blm}) ++There are several ways to cause a break in @code{gtroff}. A blank line ++not only causes a break, but it also outputs a one-line vertical space ++(effectively a blank line). Note that this behaviour can be modified ++with the blank line macro request @code{blm}. @xref{Blank Line Traps}. ++ ++@cindex fill mode ++@cindex mode, fill ++@cindex leading spaces macro (@code{lsm}) ++A line that begins with a space causes a break and the space is output ++at the beginning of the next line. Note that this space isn't adjusted, ++even in fill mode; however, the behaviour can be modified with the ++leading spaces macro request @code{lsm}. @xref{Leading Spaces Traps}. ++ ++The end of file also causes a break -- otherwise the last line of the ++document may vanish! ++ ++Certain requests also cause breaks, implicitly or explicitly. This is ++discussed in @ref{Manipulating Filling and Adjusting}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Input Conventions, Input Encodings, Implicit Line Breaks, Text ++@subsection Input Conventions ++@cindex input conventions ++@cindex conventions for input ++ ++Since @code{gtroff} does filling automatically, it is traditional in ++@code{groff} not to try and type things in as nicely formatted ++paragraphs. These are some conventions commonly used when typing ++@code{gtroff} text: ++ ++@itemize @bullet ++@item ++Break lines after punctuation, particularly at the end of a sentence and ++in other logical places. Keep separate phrases on lines by themselves, ++as entire phrases are often added or deleted when editing. ++ ++@item ++Try to keep lines less than 40-60@tie{}characters, to allow space for ++inserting more text. ++ ++@item ++Do not try to do any formatting in a @acronym{WYSIWYG} manner (i.e., ++don't try using spaces to get proper indentation). ++@end itemize ++ ++@c --------------------------------------------------------------------- ++ ++@node Input Encodings, , Input Conventions, Text ++@subsection Input Encodings ++ ++Currently, the following input encodings are available. ++ ++@table @asis ++@item cp1047 ++@cindex encoding, input, @acronym{EBCDIC} ++@cindex @acronym{EBCDIC}, input encoding ++@cindex input encoding, @acronym{EBCDIC} ++@cindex encoding, input, cp1047 ++@cindex cp1047, input encoding ++@cindex input encoding, cp1047 ++@cindex IBM cp1047 input encoding ++@pindex cp1047.tmac ++This input encoding works only on @acronym{EBCDIC} platforms (and vice ++versa, the other input encodings don't work with @acronym{EBCDIC}); the ++file @file{cp1047.tmac} is by default loaded at start-up. ++ ++@item latin-1 ++@cindex encoding, input, @w{latin-1} (ISO @w{8859-1}) ++@cindex @w{latin-1} (ISO @w{8859-1}), input encoding ++@cindex ISO @w{8859-1} (@w{latin-1}), input encoding ++@cindex input encoding, @w{latin-1} (ISO @w{8859-1}) ++@pindex latin1.tmac ++This is the default input encoding on non-@acronym{EBCDIC} platforms; ++the file @file{latin1.tmac} is loaded at start-up. ++ ++@item latin-2 ++@cindex encoding, input, @w{latin-2} (ISO @w{8859-2}) ++@cindex @w{latin-2} (ISO @w{8859-2}), input encoding ++@cindex ISO @w{8859-2} (@w{latin-2}), input encoding ++@cindex input encoding, @w{latin-2} (ISO @w{8859-2}) ++@pindex latin2.tmac ++To use this encoding, either say @w{@samp{.mso latin2.tmac}} at the very ++beginning of your document or use @samp{-mlatin2} as a command line ++argument for @code{groff}. ++ ++@item latin-5 ++@cindex encoding, input, @w{latin-5} (ISO @w{8859-9}) ++@cindex @w{latin-2} (ISO @w{8859-9}), input encoding ++@cindex ISO @w{8859-9} (@w{latin-2}), input encoding ++@cindex input encoding, @w{latin-2} (ISO @w{8859-9}) ++@pindex latin2.tmac ++For Turkish. Either say @w{@samp{.mso latin9.tmac}} at the very ++beginning of your document or use @samp{-mlatin9} as a command line ++argument for @code{groff}. ++ ++@item latin-9 (latin-0) ++@cindex encoding, input, @w{latin-9} (@w{latin-0}, ISO @w{8859-15}) ++@cindex @w{latin-9} (@w{latin-0}, ISO @w{8859-15}), input encoding ++@cindex ISO @w{8859-15} (@w{latin-9}, @w{latin-0}), input encoding ++@cindex input encoding, @w{latin-9} (@w{latin-9}, ISO @w{8859-15}) ++@pindex latin9.tmac ++This encoding is intended (at least in Europe) to replace @w{latin-1} ++encoding. The main difference to @w{latin-1} is that @w{latin-9} ++contains the Euro character. To use this encoding, either say ++@w{@samp{.mso latin9.tmac}} at the very beginning of your document or ++use @samp{-mlatin9} as a command line argument for @code{groff}. ++@end table ++ ++Note that it can happen that some input encoding characters are not ++available for a particular output device. For example, saying ++ ++@Example ++groff -Tlatin1 -mlatin9 ... ++@endExample ++ ++@noindent ++fails if you use the Euro character in the input. Usually, this ++limitation is present only for devices that have a limited set of ++output glyphs (e.g.@: @option{-Tascii} and @option{-Tlatin1}); for other ++devices it is usually sufficient to install proper fonts that contain ++the necessary glyphs. ++ ++@pindex freeeuro.pfa ++@pindex ec.tmac ++Due to the importance of the Euro glyph in Europe, the groff package now ++comes with a @sc{PostScript} font called @file{freeeuro.pfa}, which ++provides various glyph shapes for the Euro. In other words, ++@w{latin-9} encoding is supported for the @option{-Tps} device out of ++the box (@w{latin-2} isn't). ++ ++By its very nature, @option{-Tutf8} supports all input encodings; ++@option{-Tdvi} has support for both @w{latin-2} and @w{latin-9} if the ++command line @option{-mec} is used also to load the file @file{ec.tmac} ++(which flips to the EC fonts). ++ ++ ++@c ===================================================================== ++ ++@node Measurements, Expressions, Text, gtroff Reference ++@section Measurements ++@cindex measurements ++@cindex scaling indicator ++@cindex indicator, scaling ++ ++@cindex units of measurement ++@cindex basic unit (@code{u}) ++@cindex machine unit (@code{u}) ++@cindex measurement unit ++@cindex @code{u} unit ++@cindex unit, @code{u} ++@code{gtroff} (like many other programs) requires numeric parameters to ++specify various measurements. Most numeric parameters@footnote{those ++that specify vertical or horizontal motion or a type size} may have a ++@dfn{measurement unit} attached. These units are specified as a single ++character that immediately follows the number or expression. Each of ++these units are understood, by @code{gtroff}, to be a multiple of its ++@dfn{basic unit}. So, whenever a different measurement unit is ++specified @code{gtroff} converts this into its @dfn{basic units}. This ++basic unit, represented by a @samp{u}, is a device dependent measurement, ++which is quite small, ranging from 1/75@dmn{th} to 1/72000@dmn{th} of an ++inch. The values may be given as fractional numbers; however, ++fractional basic units are always rounded to integers. ++ ++Some of the measurement units are completely independent of any of the ++current settings (e.g.@: type size) of @code{gtroff}. ++ ++@table @code ++@item i ++@cindex inch unit (@code{i}) ++@cindex @code{i} unit ++@cindex unit, @code{i} ++Inches. An antiquated measurement unit still in use in certain ++backwards countries with incredibly low-cost computer equipment. One ++inch is equal to@tie{}2.54@dmn{cm}. ++ ++@item c ++@cindex centimeter unit (@code{c}) ++@cindex @code{c} unit ++@cindex unit, @code{c} ++Centimeters. One centimeter is equal to@tie{}0.3937@dmn{in}. ++ ++@item p ++@cindex point unit (@code{p}) ++@cindex @code{p} unit ++@cindex unit, @code{p} ++Points. This is a typesetter's measurement used for measure type size. ++It is 72@tie{}points to an inch. ++ ++@item P ++@cindex pica unit (@code{P}) ++@cindex @code{P} unit ++@cindex unit, @code{P} ++Pica. Another typesetting measurement. 6@tie{}Picas to an inch (and ++12@tie{}points to a pica). ++ ++@item s ++@itemx z ++@cindex @code{s} unit ++@cindex unit, @code{s} ++@cindex @code{z} unit ++@cindex unit, @code{z} ++@xref{Fractional Type Sizes}, for a discussion of these units. ++ ++@item f ++@cindex @code{f} unit ++@cindex unit, @code{f} ++Fractions. Value is 65536. ++@xref{Colors}, for usage. ++@end table ++ ++The other measurements understood by @code{gtroff} depend on settings ++currently in effect in @code{gtroff}. These are very useful for ++specifying measurements that should look proper with any size of text. ++ ++@table @code ++@item m ++@cindex em unit (@code{m}) ++@cindex @code{m} unit ++@cindex unit, @code{m} ++Ems. This unit is equal to the current font size in points. So called ++because it is @emph{approximately} the width of the letter@tie{}@samp{m} ++in the current font. ++ ++@item n ++@cindex en unit (@code{n}) ++@cindex @code{n} unit ++@cindex unit, @code{n} ++Ens. In @code{groff}, this is half of an em. ++ ++@item v ++@cindex vertical space unit (@code{v}) ++@cindex space, vertical, unit (@code{v}) ++@cindex @code{v} unit ++@cindex unit, @code{v} ++Vertical space. This is equivalent to the current line spacing. ++@xref{Sizes}, for more information about this. ++ ++@item M ++@cindex @code{M} unit ++@cindex unit, @code{M} ++100ths of an em. ++@end table ++ ++@menu ++* Default Units:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Default Units, , Measurements, Measurements ++@subsection Default Units ++@cindex default units ++@cindex units, default ++ ++Many requests take a default unit. While this can be helpful at times, ++it can cause strange errors in some expressions. For example, the line ++length request expects em units. Here are several attempts to get a ++line length of 3.5@tie{}inches and their results: ++ ++@Example ++3.5i @result{} 3.5i ++7/2 @result{} 0i ++7/2i @result{} 0i ++(7 / 2)u @result{} 0i ++7i/2 @result{} 0.1i ++7i/2u @result{} 3.5i ++@endExample ++ ++@noindent ++Everything is converted to basic units first. In the above example it ++is assumed that 1@dmn{i} equals@tie{}240@dmn{u}, and 1@dmn{m} ++equals@tie{}10@dmn{p} (thus 1@dmn{m} equals@tie{}33@dmn{u}). The value ++7@dmn{i}/2 is first handled as 7@dmn{i}/2@dmn{m}, then converted to ++1680@dmn{u}/66@dmn{u}, which is 25@dmn{u}, and this is approximately ++0.1@dmn{i}. As can be seen, a scaling indicator after a closing ++parenthesis is simply ignored. ++ ++@cindex measurements, specifying safely ++Thus, the safest way to specify measurements is to always attach a ++scaling indicator. If you want to multiply or divide by a certain ++scalar value, use @samp{u} as the unit for that value. ++ ++ ++@c ===================================================================== ++ ++@node Expressions, Identifiers, Measurements, gtroff Reference ++@section Expressions ++@cindex expressions ++ ++@code{gtroff} has most arithmetic operators common to other languages: ++ ++@itemize @bullet ++@item ++@cindex arithmetic operators ++@cindex operators, arithmetic ++@opindex + ++@opindex - ++@opindex / ++@opindex * ++@opindex % ++Arithmetic: @samp{+} (addition), @samp{-} (subtraction), @samp{/} ++(division), @samp{*} (multiplication), @samp{%} (modulo). ++ ++@code{gtroff} only provides integer arithmetic. The internal type used ++for computing results is @samp{int}, which is usually a 32@dmn{bit} ++signed integer. ++ ++@item ++@cindex comparison operators ++@cindex operators, comparison ++@opindex < ++@opindex > ++@opindex >= ++@opindex <= ++@opindex = ++@opindex == ++Comparison: @samp{<} (less than), @samp{>} (greater than), @samp{<=} ++(less than or equal), @samp{>=} (greater than or equal), @samp{=} ++(equal), @samp{==} (the same as @samp{=}). ++ ++@item ++@cindex logical operators ++@cindex operators, logical ++@opindex & ++@ifnotinfo ++@opindex : ++@end ifnotinfo ++@ifinfo ++@opindex @r{} ++@end ifinfo ++Logical: @samp{&} (logical and), @samp{:} (logical or). ++ ++@item ++@cindex unary operators ++@cindex operators, unary ++@opindex - ++@opindex + ++@opindex ! ++@cindex @code{if} request, and the @samp{!} operator ++@cindex @code{while} request, and the @samp{!} operator ++Unary operators: @samp{-} (negating, i.e.@: changing the sign), @samp{+} ++(just for completeness; does nothing in expressions), @samp{!} (logical ++not; this works only within @code{if} and @code{while} ++requests).@footnote{Note that, for example, @samp{!(-1)} evaluates to ++`true' because @code{gtroff} treats both negative numbers and zero as ++`false'.} See below for the use of unary operators in motion requests. ++ ++@cindex logical not, limitation in expression ++@cindex expression, limitation of logical not in ++The logical not operator, ++as described above, ++works only within @code{if} and @code{while} requests. ++Furthermore, it may appear ++only at the beginning of an expression, ++and negates the entire expression. ++Attempting to insert the @samp{!} operator ++within the expression results in a ++@samp{numeric expression expected} warning. This ++maintains compatibility ++with old versions of @code{troff}. ++ ++Example: ++ ++@Example ++.nr X 1 ++.nr Y 0 ++.\" This does not work as expected ++.if (\n[X])&(!\n[Y]) .nop X only ++. ++.\" Use this construct instead ++.if (\n[X]=1)&(\n[Y]=0) .nop X only ++@endExample ++ ++@item ++@cindex extremum operators (@code{>?}, @code{?}, @code{? ++@opindex ?} (maximum), @samp{? \n[y]) ++@endExample ++ ++@noindent ++The register@tie{}@code{z} now contains@tie{}5. ++ ++@item ++@cindex scaling operator ++@cindex operator, scaling ++Scaling: @code{(@var{c};@var{e})}. Evaluate@tie{}@var{e} ++using@tie{}@var{c} as the default scaling indicator. If @var{c} is ++missing, ignore scaling indicators in the evaluation of@tie{}@var{e}. ++@end itemize ++ ++@cindex parentheses ++@cindex order of evaluation in expressions ++@cindex expression, order of evaluation ++@opindex ( ++@opindex ) ++Parentheses may be used as in any other language. However, in ++@code{gtroff} they are necessary to ensure order of evaluation. ++@code{gtroff} has no operator precedence; expressions are evaluated left ++to right. This means that @code{gtroff} evaluates @samp{3+5*4} as if it ++were parenthesized like @samp{(3+5)*4}, not as @samp{3+(5*4)}, as might ++be expected. ++ ++@cindex @code{+}, and page motion ++@cindex @code{-}, and page motion ++@cindex motion operators ++@cindex operators, motion ++For many requests that cause a motion on the page, the unary operators ++@samp{+} and @samp{-} work differently if leading an expression. They ++then indicate a motion relative to the current position (down or up, ++respectively). ++ ++@cindex @code{|}, and page motion ++@cindex absolute position operator (@code{|}) ++@cindex position, absolute, operator (@code{|}) ++Similarly, a leading @samp{|} operator indicates an absolute position. ++For vertical movements, it specifies the distance from the top of the ++page; for horizontal movements, it gives the distance from the beginning ++of the @emph{input} line. ++ ++@cindex @code{bp} request, using @code{+} and@tie{}@code{-} ++@cindex @code{in} request, using @code{+} and@tie{}@code{-} ++@cindex @code{ll} request, using @code{+} and@tie{}@code{-} ++@cindex @code{lt} request, using @code{+} and@tie{}@code{-} ++@cindex @code{nm} request, using @code{+} and@tie{}@code{-} ++@cindex @code{nr} request, using @code{+} and@tie{}@code{-} ++@cindex @code{pl} request, using @code{+} and@tie{}@code{-} ++@cindex @code{pn} request, using @code{+} and@tie{}@code{-} ++@cindex @code{po} request, using @code{+} and@tie{}@code{-} ++@cindex @code{ps} request, using @code{+} and@tie{}@code{-} ++@cindex @code{pvs} request, using @code{+} and@tie{}@code{-} ++@cindex @code{rt} request, using @code{+} and@tie{}@code{-} ++@cindex @code{ti} request, using @code{+} and@tie{}@code{-} ++@cindex @code{\H}, using @code{+} and@tie{}@code{-} ++@cindex @code{\R}, using @code{+} and@tie{}@code{-} ++@cindex @code{\s}, using @code{+} and@tie{}@code{-} ++@samp{+} and @samp{-} are also treated differently by the following ++requests and escapes: @code{bp}, @code{in}, @code{ll}, @code{lt}, ++@code{nm}, @code{nr}, @code{pl}, @code{pn}, @code{po}, @code{ps}, ++@code{pvs}, @code{rt}, @code{ti}, @code{\H}, @code{\R}, and @code{\s}. ++Here, leading plus and minus signs indicate increments and decrements. ++ ++@xref{Setting Registers}, for some examples. ++ ++@Defesc {\\B, ', anything, '} ++@cindex numeric expression, valid ++@cindex valid numeric expression ++Return@tie{}1 if @var{anything} is a valid numeric expression; or@tie{}0 ++if @var{anything} is empty or not a valid numeric expression. ++@endDefesc ++ ++@cindex space characters, in expressions ++@cindex expressions, and space characters ++Due to the way arguments are parsed, spaces are not allowed in ++expressions, unless the entire expression is surrounded by parentheses. ++ ++@xref{Request and Macro Arguments}, and @ref{Conditionals and Loops}. ++ ++ ++@c ===================================================================== ++ ++@node Identifiers, Embedded Commands, Expressions, gtroff Reference ++@section Identifiers ++@cindex identifiers ++ ++Like any other language, @code{gtroff} has rules for properly formed ++@dfn{identifiers}. In @code{gtroff}, an identifier can be made up of ++almost any printable character, with the exception of the following ++characters: ++ ++@itemize @bullet ++@item ++@cindex whitespace characters ++@cindex newline character ++@cindex character, whitespace ++Whitespace characters (spaces, tabs, and newlines). ++ ++@item ++@cindex character, backspace ++@cindex backspace character ++@cindex @acronym{EBCDIC} encoding of backspace ++Backspace (@acronym{ASCII}@tie{}@code{0x08} or ++@acronym{EBCDIC}@tie{}@code{0x16}) and character code @code{0x01}. ++ ++@item ++@cindex invalid input characters ++@cindex input characters, invalid ++@cindex characters, invalid input ++@cindex Unicode ++The following input characters are invalid and are ignored if ++@code{groff} runs on a machine based on @acronym{ASCII}, causing a ++warning message of type @samp{input} (see @ref{Debugging}, for more ++details): @code{0x00}, @code{0x0B}, @code{0x0D}-@code{0x1F}, ++@code{0x80}-@code{0x9F}. ++ ++And here are the invalid input characters if @code{groff} runs on an ++@acronym{EBCDIC} host: @code{0x00}, @code{0x08}, @code{0x09}, ++@code{0x0B}, @code{0x0D}-@code{0x14}, @code{0x17}-@code{0x1F}, ++@code{0x30}-@code{0x3F}. ++ ++Currently, some of these reserved codepoints are used internally, thus ++making it non-trivial to extend @code{gtroff} to cover Unicode or other ++character sets and encodings that use characters of these ranges. ++ ++Note that invalid characters are removed before parsing; an identifier ++@code{foo}, followed by an invalid character, followed by @code{bar} is ++treated as @code{foobar}. ++@end itemize ++ ++For example, any of the following is valid. ++ ++@Example ++br ++PP ++(l ++end-list ++@@_ ++@endExample ++ ++@cindex @code{]}, as part of an identifier ++@noindent ++Note that identifiers longer than two characters with a closing bracket ++(@samp{]}) in its name can't be accessed with escape sequences that ++expect an identifier as a parameter. For example, @samp{\[foo]]} ++accesses the glyph @samp{foo}, followed by @samp{]}, whereas ++@samp{\C'foo]'} really asks for glyph @samp{foo]}. ++ ++@cindex @code{refer}, and macro names starting with @code{[} or @code{]} ++@cindex @code{[}, macro names starting with, and @code{refer} ++@cindex @code{]}, macro names starting with, and @code{refer} ++@cindex macro names, starting with @code{[} or @code{]}, and @code{refer} ++To avoid problems with the @code{refer} preprocessor, macro names should ++not start with @samp{[} or @samp{]}. Due to backwards compatibility, ++everything after @samp{.[} and @samp{.]} is handled as a special ++argument to @code{refer}. For example, @samp{.[foo} makes @code{refer} ++to start a reference, using @samp{foo} as a parameter. ++ ++@Defesc {\\A, ', ident, '} ++Test whether an identifier @var{ident} is valid in @code{gtroff}. It ++expands to the character@tie{}1 or@tie{}0 according to whether its ++argument (usually delimited by quotes) is or is not acceptable as the ++name of a string, macro, diversion, number register, environment, or ++font. It returns@tie{}0 if no argument is given. This is useful for ++looking up user input in some sort of associative table. ++ ++@Example ++\A'end-list' ++ @result{} 1 ++@endExample ++@endDefesc ++ ++@xref{Escapes}, for details on parameter delimiting characters. ++ ++Identifiers in @code{gtroff} can be any length, but, in some contexts, ++@code{gtroff} needs to be told where identifiers end and text begins ++(and in different ways depending on their length): ++ ++@itemize @bullet ++@item ++Single character. ++ ++@cindex @code{(}, starting a two-character identifier ++@item ++Two characters. Must be prefixed with @samp{(} in some situations. ++ ++@cindex @code{[}, starting an identifier ++@cindex @code{]}, ending an identifier ++@item ++Arbitrary length (@code{gtroff} only). Must be bracketed with @samp{[} ++and@tie{}@samp{]} in some situations. Any length identifier can be put ++in brackets. ++@end itemize ++ ++@cindex undefined identifiers ++@cindex identifiers, undefined ++Unlike many other programming languages, undefined identifiers are ++silently ignored or expanded to nothing. When @code{gtroff} finds an ++undefined identifier, it emits a warning, doing the following: ++ ++@itemize @bullet ++@item ++If the identifier is a string, macro, or diversion, @code{gtroff} ++defines it as empty. ++ ++@item ++If the identifier is a number register, @code{gtroff} defines it with a ++value of@tie{}0. ++@end itemize ++ ++@xref{Warnings}., @ref{Interpolating Registers}, and @ref{Strings}. ++ ++Note that macros, strings, and diversions share the same name space. ++ ++@Example ++.de xxx ++. nop foo ++.. ++. ++.di xxx ++bar ++.br ++.di ++. ++.xxx ++ @result{} bar ++@endExample ++ ++@noindent ++As can be seen in the previous example, @code{gtroff} reuses the ++identifier @samp{xxx}, changing it from a macro to a diversion. No ++warning is emitted! The contents of the first macro definition is lost. ++ ++@xref{Interpolating Registers}, and @ref{Strings}. ++ ++ ++@c ===================================================================== ++ ++@node Embedded Commands, Registers, Identifiers, gtroff Reference ++@section Embedded Commands ++@cindex embedded commands ++@cindex commands, embedded ++ ++Most documents need more functionality beyond filling, adjusting and ++implicit line breaking. In order to gain further functionality, ++@code{gtroff} allows commands to be embedded into the text, in two ways. ++ ++The first is a @dfn{request} that takes up an entire line, and does ++some large-scale operation (e.g.@: break lines, start new pages). ++ ++The other is an @dfn{escape} that can be usually embedded anywhere in ++the text; most requests can accept it even as an argument. Escapes ++generally do more minor operations like sub- and superscripts, print a ++symbol, etc. ++ ++@menu ++* Requests:: ++* Macros:: ++* Escapes:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Requests, Macros, Embedded Commands, Embedded Commands ++@subsection Requests ++@cindex requests ++ ++@cindex control character (@code{.}) ++@cindex character, control (@code{.}) ++@cindex no-break control character (@code{'}) ++@cindex character, no-break control (@code{'}) ++@cindex control character, no-break (@code{'}) ++A request line begins with a control character, which is either a single ++quote (@samp{'}, the @dfn{no-break control character}) or a period ++(@samp{.}, the normal @dfn{control character}). These can be changed; ++see @ref{Character Translations}, for details. After this there may be ++optional tabs or spaces followed by an identifier, which is the name of ++the request. This may be followed by any number of space-separated ++arguments (@emph{no} tabs here). ++ ++@cindex structuring source code of documents or macro packages ++@cindex documents, structuring the source code ++@cindex macro packages, structuring the source code ++Since a control character followed by whitespace only is ignored, it is ++common practice to use this feature for structuring the source code of ++documents or macro packages. ++ ++@Example ++.de foo ++. tm This is foo. ++.. ++. ++. ++.de bar ++. tm This is bar. ++.. ++@endExample ++ ++@cindex blank line ++@cindex blank line macro (@code{blm}) ++Another possibility is to use the blank line macro request @code{blm} by ++assigning an empty macro to it. ++ ++@Example ++.de do-nothing ++.. ++.blm do-nothing \" activate blank line macro ++ ++.de foo ++. tm This is foo. ++.. ++ ++ ++.de bar ++. tm This is bar. ++.. ++ ++.blm \" deactivate blank line macro ++@endExample ++ ++@xref{Blank Line Traps}. ++ ++@cindex zero width space character (@code{\&}) ++@cindex character, zero width space (@code{\&}) ++@cindex space character, zero width (@code{\&}) ++@cindex @code{\&}, escaping control characters ++To begin a line with a control character without it being interpreted, ++precede it with @code{\&}. This represents a zero width space, which ++means it does not affect the output. ++ ++In most cases the period is used as a control character. Several ++requests cause a break implicitly; using the single quote control ++character prevents this. ++ ++@Defreg {.br} ++A read-only number register, which is set to@tie{}1 if a macro is called ++with the normal control character (as defined with the @code{cc} ++request), and set to@tie{}0 otherwise. ++ ++@cindex modifying requests ++@cindex requests, modifying ++This allows to reliably modify requests. ++ ++@Example ++.als bp*orig bp ++.de bp ++. tm before bp ++. ie \\n[.br] .bp*orig ++. el 'bp*orig ++. tm after bp ++.. ++@endExample ++ ++Using this register outside of a macro makes no sense (it always returns ++zero in such cases). ++ ++If a macro is called as a string (this is, using @code{\*}), the value ++of the @code{.br} register is inherited from the calling macro. ++@endDefreg ++ ++@menu ++* Request and Macro Arguments:: ++@end menu ++ ++@node Request and Macro Arguments, , Requests, Requests ++@subsubsection Request and Macro Arguments ++@cindex request arguments ++@cindex macro arguments ++@cindex arguments to requests and macros ++ ++@cindex tabs, and macro arguments ++@cindex macro arguments, and tabs ++@cindex arguments to macros, and tabs ++Arguments to requests and macros are processed much like the shell: ++The line is split into arguments according to ++spaces.@footnote{Plan@tie{}9's @code{troff} implementation also allows ++tabs for argument separation -- @code{gtroff} intentionally doesn't ++support this.} ++ ++@cindex spaces, in a macro argument ++An argument to a macro that is intended to contain spaces can either be ++enclosed in double quotes, or have the spaces @dfn{escaped} with ++backslashes. This is @emph{not} true for requests. ++ ++Here are a few examples for a hypothetical macro @code{uh}: ++ ++@Example ++.uh The Mouse Problem ++.uh "The Mouse Problem" ++.uh The\ Mouse\ Problem ++@endExample ++ ++@cindex @code{\~}, difference to @code{\@key{SP}} ++@cindex @code{\@key{SP}}, difference to @code{\~} ++@noindent ++The first line is the @code{uh} macro being called with 3 arguments, ++@samp{The}, @samp{Mouse}, and @samp{Problem}. The latter two have the ++same effect of calling the @code{uh} macro with one argument, @samp{The ++Mouse Problem}.@footnote{The last solution, i.e., using escaped spaces, ++is ``classical'' in the sense that it can be found in most @code{troff} ++documents. Nevertheless, it is not optimal in all situations, since ++@w{@samp{\ }} inserts a fixed-width, non-breaking space character that ++can't stretch. @code{gtroff} provides a different command @code{\~} to ++insert a stretchable, non-breaking space.} ++ ++@cindex @code{"}, in a macro argument ++@cindex double quote, in a macro argument ++A double quote that isn't preceded by a space doesn't start a macro ++argument. If not closing a string, it is printed literally. ++ ++For example, ++ ++@Example ++.xxx a" "b c" "de"fg" ++@endExample ++ ++@noindent ++has the arguments @samp{a"}, @w{@samp{b c}}, @samp{de}, and @samp{fg"}. ++Don't rely on this obscure behaviour! ++ ++There are two possibilities to get a double quote reliably. ++ ++@itemize @bullet ++@item ++Enclose the whole argument with double quotes and use two consecutive ++double quotes to represent a single one. This traditional solution has ++the disadvantage that double quotes don't survive argument expansion ++again if called in compatibility mode (using the @option{-C} option of ++@code{groff}): ++ ++@Example ++.de xx ++. tm xx: `\\$1' `\\$2' `\\$3' ++. ++. yy "\\$1" "\\$2" "\\$3" ++.. ++.de yy ++. tm yy: `\\$1' `\\$2' `\\$3' ++.. ++.xx A "test with ""quotes""" . ++ @result{} xx: `A' `test with "quotes"' `.' ++ @result{} yy: `A' `test with ' `quotes""' ++@endExample ++ ++@noindent ++If not in compatibility mode, you get the expected result ++ ++@Example ++xx: `A' `test with "quotes"' `.' ++yy: `A' `test with "quotes"' `.' ++@endExample ++ ++@noindent ++since @code{gtroff} preserves the input level. ++ ++@item ++Use the double quote glyph @code{\(dq}. This works with and without ++compatibility mode enabled since @code{gtroff} doesn't convert ++@code{\(dq} back to a double quote input character. ++ ++Note that this method won't work with @acronym{UNIX} @code{troff} in ++general since the glyph `dq' isn't defined normally. ++@end itemize ++ ++@cindex @code{ds} request, and double quotes ++Double quotes in the @code{ds} request are handled differently. ++@xref{Strings}, for more details. ++ ++@c --------------------------------------------------------------------- ++ ++@node Macros, Escapes, Requests, Embedded Commands ++@subsection Macros ++@cindex macros ++ ++@code{gtroff} has a @dfn{macro} facility for defining a series of lines ++that can be invoked by name. They are called in the same manner as ++requests -- arguments also may be passed basically in the same manner. ++ ++@xref{Writing Macros}, and @ref{Request and Macro Arguments}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Escapes, , Macros, Embedded Commands ++@subsection Escapes ++@cindex escapes ++ ++Escapes may occur anywhere in the input to @code{gtroff}. They usually ++begin with a backslash and are followed by a single character, which ++indicates the function to be performed. The escape character can be ++changed; see @ref{Character Translations}. ++ ++Escape sequences that require an identifier as a parameter accept three ++possible syntax forms. ++ ++@itemize @bullet ++@item ++The next single character is the identifier. ++ ++@cindex @code{(}, starting a two-character identifier ++@item ++If this single character is an opening parenthesis, take the following ++two characters as the identifier. Note that there is no closing ++parenthesis after the identifier. ++ ++@cindex @code{[}, starting an identifier ++@cindex @code{]}, ending an identifier ++@item ++If this single character is an opening bracket, take all characters ++until a closing bracket as the identifier. ++@end itemize ++ ++@noindent ++Examples: ++ ++@Example ++\fB ++\n(XX ++\*[TeX] ++@endExample ++ ++@cindex @code{'}, delimiting arguments ++@cindex argument delimiting characters ++@cindex characters, argument delimiting ++@cindex delimiting characters for arguments ++Other escapes may require several arguments and/or some special format. ++In such cases the argument is traditionally enclosed in single quotes ++(and quotes are always used in this manual for the definitions of escape ++sequences). The enclosed text is then processed according to what that ++escape expects. Example: ++ ++@Example ++\l'1.5i\(bu' ++@endExample ++ ++@cindex @code{\o}, possible quote characters ++@cindex @code{\b}, possible quote characters ++@cindex @code{\X}, possible quote characters ++Note that the quote character can be replaced with any other character ++that does not occur in the argument (even a newline or a space ++character) in the following escapes: @code{\o}, @code{\b}, and ++@code{\X}. This makes e.g. ++ ++@Example ++A caf ++\o ++e\' ++ ++ ++in Paris ++ @result{} A caf in Paris ++@endExample ++ ++@noindent ++possible, but it is better not to use this feature to avoid confusion. ++ ++@cindex @code{\%}, used as delimiter ++@cindex @code{\@key{SP}}, used as delimiter ++@cindex @code{\|}, used as delimiter ++@cindex @code{\^}, used as delimiter ++@cindex @code{\@{}, used as delimiter ++@cindex @code{\@}}, used as delimiter ++@cindex @code{\'}, used as delimiter ++@cindex @code{\`}, used as delimiter ++@cindex @code{\-}, used as delimiter ++@cindex @code{\_}, used as delimiter ++@cindex @code{\!}, used as delimiter ++@cindex @code{\?}, used as delimiter ++@cindex @code{\)}, used as delimiter ++@cindex @code{\/}, used as delimiter ++@cindex @code{\,}, used as delimiter ++@cindex @code{\&}, used as delimiter ++@ifnotinfo ++@cindex @code{\:}, used as delimiter ++@end ifnotinfo ++@ifinfo ++@cindex @code{\@r{}}, used as delimiter ++@end ifinfo ++@cindex @code{\~}, used as delimiter ++@cindex @code{\0}, used as delimiter ++@cindex @code{\a}, used as delimiter ++@cindex @code{\c}, used as delimiter ++@cindex @code{\d}, used as delimiter ++@cindex @code{\e}, used as delimiter ++@cindex @code{\E}, used as delimiter ++@cindex @code{\p}, used as delimiter ++@cindex @code{\r}, used as delimiter ++@cindex @code{\t}, used as delimiter ++@cindex @code{\u}, used as delimiter ++The following escapes sequences (which are handled similarly to ++characters since they don't take a parameter) are also allowed as ++delimiters: @code{\%}, @w{@samp{\ }}, @code{\|}, @code{\^}, @code{\@{}, ++@code{\@}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, ++@code{\?}, @code{\)}, @code{\/}, @code{\,}, @code{\&}, @code{\:}, ++@code{\~}, @code{\0}, @code{\a}, @code{\c}, @code{\d}, @code{\e}, ++@code{\E}, @code{\p}, @code{\r}, @code{\t}, and @code{\u}. Again, don't ++use these if possible. ++ ++@cindex @code{\A}, allowed delimiters ++@cindex @code{\B}, allowed delimiters ++@cindex @code{\Z}, allowed delimiters ++@cindex @code{\C}, allowed delimiters ++@cindex @code{\w}, allowed delimiters ++No newline characters as delimiters are allowed in the following ++escapes: @code{\A}, @code{\B}, @code{\Z}, @code{\C}, and @code{\w}. ++ ++@cindex @code{\D}, allowed delimiters ++@cindex @code{\h}, allowed delimiters ++@cindex @code{\H}, allowed delimiters ++@cindex @code{\l}, allowed delimiters ++@cindex @code{\L}, allowed delimiters ++@cindex @code{\N}, allowed delimiters ++@cindex @code{\R}, allowed delimiters ++@cindex @code{\s}, allowed delimiters ++@cindex @code{\S}, allowed delimiters ++@cindex @code{\v}, allowed delimiters ++@cindex @code{\x}, allowed delimiters ++Finally, the escapes @code{\D}, @code{\h}, @code{\H}, @code{\l}, ++@code{\L}, @code{\N}, @code{\R}, @code{\s}, @code{\S}, @code{\v}, and ++@code{\x} can't use the following characters as delimiters: ++ ++@itemize @bullet ++@item ++@cindex numbers, and delimiters ++@cindex digits, and delimiters ++The digits @code{0}-@code{9}. ++ ++@item ++@cindex operators, as delimiters ++@cindex @code{+}, as delimiter ++@cindex @code{-}, as delimiter ++@cindex @code{/}, as delimiter ++@cindex @code{*}, as delimiter ++@cindex @code{%}, as delimiter ++@cindex @code{<}, as delimiter ++@cindex @code{>}, as delimiter ++@cindex @code{=}, as delimiter ++@cindex @code{&}, as delimiter ++@ifnotinfo ++@cindex @code{:}, as delimiter ++@end ifnotinfo ++@ifinfo ++@cindex , as delimiter ++@end ifinfo ++@cindex @code{(}, as delimiter ++@cindex @code{)}, as delimiter ++@cindex @code{.}, as delimiter ++The (single-character) operators @samp{+-/*%<>=&:().}. ++ ++@item ++@cindex space character ++@cindex character, space ++@cindex tab character ++@cindex character, tab ++@cindex newline character ++@cindex character, newline ++The space, tab, and newline characters. ++ ++@item ++@cindex @code{\%}, used as delimiter ++@ifnotinfo ++@cindex @code{\:}, used as delimiter ++@end ifnotinfo ++@ifinfo ++@cindex @code{\@r{}}, used as delimiter ++@end ifinfo ++@cindex @code{\@{}, used as delimiter ++@cindex @code{\@}}, used as delimiter ++@cindex @code{\'}, used as delimiter ++@cindex @code{\`}, used as delimiter ++@cindex @code{\-}, used as delimiter ++@cindex @code{\_}, used as delimiter ++@cindex @code{\!}, used as delimiter ++@cindex @code{\/}, used as delimiter ++@cindex @code{\c}, used as delimiter ++@cindex @code{\e}, used as delimiter ++@cindex @code{\p}, used as delimiter ++All escape sequences except @code{\%}, @code{\:}, @code{\@{}, ++@code{\@}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, ++@code{\/}, @code{\c}, @code{\e}, and @code{\p}. ++@end itemize ++ ++@cindex printing backslash (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) ++@cindex backslash, printing (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) ++To have a backslash (actually, the current escape character) appear in ++the output several escapes are defined: @code{\\}, @code{\e} or ++@code{\E}. These are very similar, and only differ with respect to ++being used in macros or diversions. @xref{Character Translations}, for ++an exact description of those escapes. ++ ++@xref{Implementation Differences}, @ref{Copy-in Mode}, and ++@ref{Diversions}, @ref{Identifiers}, for more information. ++ ++@menu ++* Comments:: ++@end menu ++ ++@node Comments, , Escapes, Escapes ++@subsubsection Comments ++@cindex comments ++ ++Probably one of the most@footnote{Unfortunately, this is a lie. But ++hopefully future @code{gtroff} hackers will believe it @code{:-)}} ++common forms of escapes is the comment. ++ ++@Defesc {\\", , , } ++Start a comment. Everything to the end of the input line is ignored. ++ ++This may sound simple, but it can be tricky to keep the comments from ++interfering with the appearance of the final output. ++ ++@cindex @code{ds}, @code{ds1} requests, and comments ++@cindex @code{as}, @code{as1} requests, and comments ++If the escape is to the right of some text or a request, that portion of ++the line is ignored, but the space leading up to it is noticed by ++@code{gtroff}. This only affects the @code{ds} and @code{as} request ++and its variants. ++ ++@cindex tabs, before comments ++@cindex comments, lining up with tabs ++One possibly irritating idiosyncracy is that tabs must not be used to ++line up comments. Tabs are not treated as whitespace between the ++request and macro arguments. ++ ++@cindex undefined request ++@cindex request, undefined ++A comment on a line by itself is treated as a blank line, because after ++eliminating the comment, that is all that remains: ++ ++@Example ++Test ++\" comment ++Test ++@endExample ++ ++@noindent ++produces ++ ++@Example ++Test ++ ++Test ++@endExample ++ ++To avoid this, it is common to start the line with @code{.\"}, which ++causes the line to be treated as an undefined request and thus ignored ++completely. ++ ++@cindex @code{'}, as a comment ++Another commenting scheme seen sometimes is three consecutive single ++quotes (@code{'''}) at the beginning of a line. This works, but ++@code{gtroff} gives a warning about an undefined macro (namely ++@code{''}), which is harmless, but irritating. ++@endDefesc ++ ++@Defesc {\\#, , , } ++To avoid all this, @code{gtroff} has a new comment mechanism using the ++@code{\#} escape. This escape works the same as @code{\"} except that ++the newline is also ignored: ++ ++@Example ++Test ++\# comment ++Test ++@endExample ++ ++@noindent ++produces ++ ++@Example ++Test Test ++@endExample ++ ++@noindent ++as expected. ++@endDefesc ++ ++@Defreq {ig, [@Var{end}]} ++Ignore all input until @code{gtroff} encounters the macro named ++@code{.}@var{end} on a line by itself (or @code{..} if @var{end} is not ++specified). This is useful for commenting out large blocks of text: ++ ++@Example ++text text text... ++.ig ++This is part of a large block ++of text that has been ++temporarily(?) commented out. ++ ++We can restore it simply by removing ++the .ig request and the ".." at the ++end of the block. ++.. ++More text text text... ++@endExample ++ ++@noindent ++produces ++ ++@Example ++text text text@dots{} More text text text@dots{} ++@endExample ++ ++@noindent ++Note that the commented-out block of text does not cause a break. ++ ++@cindex @code{ig} request, and copy-in mode ++@cindex copy-in mode, and @code{ig} request ++@cindex mode, copy-in, and @code{ig} request ++@cindex @code{ig} request, and auto-increment ++@cindex auto-increment, and @code{ig} request ++The input is read in copy-mode; auto-incremented registers @emph{are} ++affected (@pxref{Auto-increment}). ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Registers, Manipulating Filling and Adjusting, Embedded Commands, gtroff Reference ++@section Registers ++@cindex registers ++ ++Numeric variables in @code{gtroff} are called @dfn{registers}. There ++are a number of built-in registers, supplying anything from the date to ++details of formatting parameters. ++ ++@xref{Identifiers}, for details on register identifiers. ++ ++@menu ++* Setting Registers:: ++* Interpolating Registers:: ++* Auto-increment:: ++* Assigning Formats:: ++* Built-in Registers:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Setting Registers, Interpolating Registers, Registers, Registers ++@subsection Setting Registers ++@cindex setting registers (@code{nr}, @code{\R}) ++@cindex registers, setting (@code{nr}, @code{\R}) ++ ++Define or set registers using the @code{nr} request or the @code{\R} ++escape. ++ ++Although the following requests and escapes can be used to create ++registers, simply using an undefined register will cause it to be ++set to zero. ++ ++@DefreqList {nr, ident value} ++@DefescListEndx {\\R, ', ident value, '} ++Set number register @var{ident} to @var{value}. If @var{ident} doesn't ++exist, @code{gtroff} creates it. ++ ++The argument to @code{\R} usually has to be enclosed in quotes. ++@xref{Escapes}, for details on parameter delimiting characters. ++ ++The @code{\R} escape doesn't produce an input token in @code{gtroff}; ++in other words, it vanishes completely after @code{gtroff} has ++processed it. ++ ++For example, the following two lines are equivalent: ++ ++@Example ++.nr a (((17 + (3 * 4))) % 4) ++\R'a (((17 + (3 * 4))) % 4)' ++ @result{} 1 ++@endExample ++ ++Note that the complete transparency of @code{\R} can cause surprising ++effects if you use number registers like @code{.k}, which get evaluated ++at the time they are accessed. ++ ++@Example ++.ll 1.6i ++. ++aaa bbb ccc ddd eee fff ggg hhh\R':k \n[.k]' ++.tm :k == \n[:k] ++ @result{} :k == 126950 ++. ++.br ++. ++aaa bbb ccc ddd eee fff ggg hhh\h'0'\R':k \n[.k]' ++.tm :k == \n[:k] ++ @result{} :k == 15000 ++@endExample ++ ++If you process this with the @sc{PostScript} device (@code{-Tps}), ++there will be a line break eventually after @code{ggg} in both input ++lines. However, after processing the space after @code{ggg}, the ++partially collected line is not overfull yet, so @code{troff} ++continues to collect input until it sees the space (or in this case, ++the newline) after @code{hhh}. At this point, the line is longer ++than the line length, and the line gets broken. ++ ++In the first input line, since the @code{\R} escape leaves no traces, ++the check for the overfull line hasn't been done yet at the point where ++@code{\R} gets handled, and you get a value for the @code{.k} number ++register that is even greater than the current line length. ++ ++In the second input line, the insertion of @code{\h'0'} to emit an ++invisible zero-width space forces @code{troff} to check the line length, ++which in turn causes the start of a new output line. Now @code{.k} ++returns the expected value. ++@endDefreq ++ ++Both @code{nr} and @code{\R} have two additional special forms to ++increment or decrement a register. ++ ++@DefreqList {nr, ident @t{+}@Var{value}} ++@DefreqItem {nr, ident @t{-}@Var{value}} ++@DefescItemx {\\R, ', ident @t{+}value, '} ++@DefescListEnd {\\R, ', ident @t{-}value, '} ++Increment (decrement) register @var{ident} by @var{value}. ++ ++@Example ++.nr a 1 ++.nr a +1 ++\na ++ @result{} 2 ++@endExample ++ ++@cindex negating register values ++To assign the negated value of a register to another register, some care ++must be taken to get the desired result: ++ ++@Example ++.nr a 7 ++.nr b 3 ++.nr a -\nb ++\na ++ @result{} 4 ++.nr a (-\nb) ++\na ++ @result{} -3 ++@endExample ++ ++@noindent ++The surrounding parentheses prevent the interpretation of the minus sign ++as a decrementing operator. An alternative is to start the assignment ++with a @samp{0}: ++ ++@Example ++.nr a 7 ++.nr b -3 ++.nr a \nb ++\na ++ @result{} 4 ++.nr a 0\nb ++\na ++ @result{} -3 ++@endExample ++@endDefreq ++ ++@Defreq {rr, ident} ++@cindex removing number register (@code{rr}) ++@cindex number register, removing (@code{rr}) ++@cindex register, removing (@code{rr}) ++Remove number register @var{ident}. If @var{ident} doesn't exist, the ++request is ignored. ++@endDefreq ++ ++@Defreq {rnn, ident1 ident2} ++@cindex renaming number register (@code{rnn}) ++@cindex number register, renaming (@code{rnn}) ++@cindex register, renaming (@code{rnn}) ++Rename number register @var{ident1} to @var{ident2}. If either ++@var{ident1} or @var{ident2} doesn't exist, the request is ignored. ++@endDefreq ++ ++@Defreq {aln, ident1 ident2} ++@cindex alias, number register, creating (@code{aln}) ++@cindex creating alias, for number register (@code{aln}) ++@cindex number register, creating alias (@code{aln}) ++@cindex register, creating alias (@code{aln}) ++Create an alias @var{ident1} for a number register @var{ident2}. The ++new name and the old name are exactly equivalent. If @var{ident1} is ++undefined, a warning of type @samp{reg} is generated, and the request is ++ignored. @xref{Debugging}, for information about warnings. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Interpolating Registers, Auto-increment, Setting Registers, Registers ++@subsection Interpolating Registers ++@cindex interpolating registers (@code{\n}) ++@cindex registers, interpolating (@code{\n}) ++ ++Numeric registers can be accessed via the @code{\n} escape. ++ ++@DefescList {\\n, , i, } ++@DefescItem {\\n, @Lparen{}, id, } ++@DefescListEnd {\\n, @Lbrack{}, ident, @Rbrack{}} ++@cindex nested assignments ++@cindex assignments, nested ++@cindex indirect assignments ++@cindex assignments, indirect ++Interpolate number register with name @var{ident} (one-character ++name@tie{}@var{i}, two-character name @var{id}). This means that the ++value of the register is expanded in-place while @code{gtroff} is ++parsing the input line. Nested assignments (also called indirect ++assignments) are possible. ++ ++@Example ++.nr a 5 ++.nr as \na+\na ++\n(as ++ @result{} 10 ++@endExample ++ ++@Example ++.nr a1 5 ++.nr ab 6 ++.ds str b ++.ds num 1 ++\n[a\n[num]] ++ @result{} 5 ++\n[a\*[str]] ++ @result{} 6 ++@endExample ++@endDefesc ++ ++@c --------------------------------------------------------------------- ++ ++@node Auto-increment, Assigning Formats, Interpolating Registers, Registers ++@subsection Auto-increment ++@cindex auto-increment ++@cindex increment, automatic ++ ++Number registers can also be auto-incremented and auto-decremented. The ++increment or decrement value can be specified with a third argument to ++the @code{nr} request or @code{\R} escape. ++ ++@Defreq {nr, ident value incr} ++@cindex @code{\R}, difference to @code{nr} ++Set number register @var{ident} to @var{value}; the increment for ++auto-incrementing is set to @var{incr}. Note that the @code{\R} escape ++doesn't support this notation. ++@endDefreq ++ ++To activate auto-incrementing, the escape @code{\n} has a special syntax ++form. ++ ++@DefescList {\\n, +, i, } ++@DefescItem {\\n, -, i, } ++@DefescItem {\\n, @Lparen{}+, id, } ++@DefescItem {\\n, @Lparen{}-, id, } ++@DefescItem {\\n, +@Lparen{}, id, } ++@DefescItem {\\n, -@Lparen{}, id, } ++@DefescItem {\\n, @Lbrack{}+, ident, @Rbrack{}} ++@DefescItem {\\n, @Lbrack{}-, ident, @Rbrack{}} ++@DefescItem {\\n, +@Lbrack{}, ident, @Rbrack{}} ++@DefescListEnd {\\n, -@Lbrack{}, ident, @Rbrack{}} ++Before interpolating, increment or decrement @var{ident} (one-character ++name@tie{}@var{i}, two-character name @var{id}) by the auto-increment ++value as specified with the @code{nr} request (or the @code{\R} escape). ++If no auto-increment value has been specified, these syntax forms are ++identical to @code{\n}. ++@endDefesc ++ ++For example, ++ ++@Example ++.nr a 0 1 ++.nr xx 0 5 ++.nr foo 0 -2 ++\n+a, \n+a, \n+a, \n+a, \n+a ++.br ++\n-(xx, \n-(xx, \n-(xx, \n-(xx, \n-(xx ++.br ++\n+[foo], \n+[foo], \n+[foo], \n+[foo], \n+[foo] ++@endExample ++ ++@noindent ++produces ++ ++@Example ++1, 2, 3, 4, 5 ++-5, -10, -15, -20, -25 ++-2, -4, -6, -8, -10 ++@endExample ++ ++@cindex increment value without changing the register ++@cindex value, incrementing without changing the register ++To change the increment value without changing the value of a register ++(@var{a} in the example), the following can be used: ++ ++@Example ++.nr a \na 10 ++@endExample ++ ++@c --------------------------------------------------------------------- ++ ++@node Assigning Formats, Built-in Registers, Auto-increment, Registers ++@subsection Assigning Formats ++@cindex assigning formats (@code{af}) ++@cindex formats, assigning (@code{af}) ++ ++When a register is used, it is always textually replaced (or ++interpolated) with a representation of that number. This output format ++can be changed to a variety of formats (numbers, Roman numerals, etc.). ++This is done using the @code{af} request. ++ ++@Defreq {af, ident format} ++Change the output format of a number register. The first argument ++@var{ident} is the name of the number register to be changed, and the ++second argument @var{format} is the output format. The following output ++formats are available: ++ ++@table @code ++@item 1 ++Decimal arabic numbers. This is the default format: 0, 1, 2, ++3,@tie{}@enddots{} ++ ++@item 0@dots{}0 ++Decimal numbers with as many digits as specified. So, @samp{00} would ++result in printing numbers as 01, 02, 03,@tie{}@enddots{} ++ ++In fact, any digit instead of zero does work; @code{gtroff} only counts ++how many digits are specified. As a consequence, @code{af}'s default ++format @samp{1} could be specified as @samp{0} also (and exactly this is ++returned by the @code{\g} escape, see below). ++ ++@item I ++@cindex Roman numerals ++@cindex numerals, Roman ++Upper-case Roman numerals: 0, I, II, III, IV,@tie{}@enddots{} ++ ++@item i ++Lower-case Roman numerals: 0, i, ii, iii, iv,@tie{}@enddots{} ++ ++@item A ++Upper-case letters: 0, A, B, C, @dots{},@tie{}Z, AA, AB,@tie{}@enddots{} ++ ++@item a ++Lower-case letters: 0, a, b, c, @dots{},@tie{}z, aa, ab,@tie{}@enddots{} ++@end table ++ ++Omitting the number register format causes a warning of type ++@samp{missing}. @xref{Debugging}, for more details. Specifying a ++nonexistent format causes an error. ++ ++The following example produces @samp{10, X, j, 010}: ++ ++@Example ++.nr a 10 ++.af a 1 \" the default format ++\na, ++.af a I ++\na, ++.af a a ++\na, ++.af a 001 ++\na ++@endExample ++ ++@cindex Roman numerals, maximum and minimum ++@cindex maximum values of Roman numerals ++@cindex minimum values of Roman numerals ++The largest number representable for the @samp{i} and @samp{I} formats ++is 39999 (or @minus{}39999); @acronym{UNIX} @code{troff} uses @samp{z} ++and @samp{w} to represent 10000 and 5000 in Roman numerals, and so does ++@code{gtroff}. Currently, the correct glyphs of Roman numeral five ++thousand and Roman numeral ten thousand (Unicode code points ++@code{U+2182} and @code{U+2181}, respectively) are not available. ++ ++If @var{ident} doesn't exist, it is created. ++ ++@cindex read-only register, changing format ++@cindex changing format, and read-only registers ++Changing the output format of a read-only register causes an error. It ++is necessary to first copy the register's value to a writeable register, ++then apply the @code{af} request to this other register. ++@endDefreq ++ ++@DefescList {\\g, , i, } ++@DefescItem {\\g, @Lparen{}, id, } ++@DefescListEnd {\\g, @Lbrack{}, ident, @Rbrack{}} ++@cindex format of register (@code{\g}) ++@cindex register, format (@code{\g}) ++Return the current format of the specified register @var{ident} ++(one-character name@tie{}@var{i}, two-character name @var{id}). For ++example, @samp{\ga} after the previous example would produce the string ++@samp{000}. If the register hasn't been defined yet, nothing is ++returned. ++@endDefesc ++ ++@c --------------------------------------------------------------------- ++ ++@node Built-in Registers, , Assigning Formats, Registers ++@subsection Built-in Registers ++@cindex built-in registers ++@cindex registers, built-in ++ ++The following lists some built-in registers that are not described ++elsewhere in this manual. Any register that begins with a @samp{.} is ++read-only. A complete listing of all built-in registers can be found in ++@ref{Register Index}. ++ ++@table @code ++@item \n[.F] ++@cindex current input file name register (@code{.F}) ++@cindex input file name, current, register (@code{.F}) ++@vindex .F ++This string-valued register returns the current input file name. ++ ++@item \n[.H] ++@cindex horizontal resolution register (@code{.H}) ++@cindex resolution, horizontal, register (@code{.H}) ++@vindex .H ++Horizontal resolution in basic units. ++ ++@item \n[.R] ++@cindex number of registers register (@code{.R}) ++@cindex registers, number of, register (@code{.R}) ++@vindex .R ++The number of number registers available. This is always 10000 in ++GNU@tie{}@code{troff}; it exists for backward compatibility. ++ ++@item \n[.U] ++@cindex safer mode ++@cindex mode, safer ++@cindex unsafe mode ++@cindex mode, unsafe ++@vindex .U ++If @code{gtroff} is called with the @option{-U} command line option to ++activate unsafe mode, the number register @code{.U} is set to@tie{}1, ++and to zero otherwise. @xref{Groff Options}. ++ ++@item \n[.V] ++@cindex vertical resolution register (@code{.V}) ++@cindex resolution, vertical, register (@code{.V}) ++@vindex .V ++Vertical resolution in basic units. ++ ++@item \n[seconds] ++@cindex seconds, current time (@code{seconds}) ++@cindex time, current, seconds (@code{seconds}) ++@cindex current time, seconds (@code{seconds}) ++@vindex seconds ++The number of seconds after the minute, normally in the range@tie{}0 ++to@tie{}59, but can be up to@tie{}61 to allow for leap seconds. ++Initialized at start-up of @code{gtroff}. ++ ++@item \n[minutes] ++@cindex minutes, current time (@code{minutes}) ++@cindex time, current, minutes (@code{minutes}) ++@cindex current time, minutes (@code{minutes}) ++@vindex minutes ++The number of minutes after the hour, in the range@tie{}0 to@tie{}59. ++Initialized at start-up of @code{gtroff}. ++ ++@item \n[hours] ++@cindex hours, current time (@code{hours}) ++@cindex time, current, hours (@code{hours}) ++@cindex current time, hours (@code{hours}) ++@vindex hours ++The number of hours past midnight, in the range@tie{}0 to@tie{}23. ++Initialized at start-up of @code{gtroff}. ++ ++@item \n[dw] ++@cindex day of the week register (@code{dw}) ++@cindex date, day of the week register (@code{dw}) ++@vindex dw ++Day of the week (1-7). ++ ++@item \n[dy] ++@cindex day of the month register (@code{dy}) ++@cindex date, day of the month register (@code{dy}) ++@vindex dy ++Day of the month (1-31). ++ ++@item \n[mo] ++@cindex month of the year register (@code{mo}) ++@cindex date, month of the year register (@code{mo}) ++@vindex mo ++Current month (1-12). ++ ++@item \n[year] ++@cindex date, year register (@code{year}, @code{yr}) ++@cindex year, current, register (@code{year}, @code{yr}) ++@vindex year ++The current year. ++ ++@item \n[yr] ++@vindex yr ++The current year minus@tie{}1900. Unfortunately, the documentation of ++@acronym{UNIX} Version@tie{}7's @code{troff} had a year@tie{}2000 bug: ++It incorrectly claimed that @code{yr} contains the last two digits of ++the year. That claim has never been true of either @acronym{AT&T} ++@code{troff} or GNU @code{troff}. Old @code{troff} input that looks ++like this: ++ ++@Example ++'\" The following line stopped working after 1999 ++This document was formatted in 19\n(yr. ++@endExample ++ ++@noindent ++can be corrected as follows: ++ ++@Example ++This document was formatted in \n[year]. ++@endExample ++ ++@noindent ++or, to be portable to older @code{troff} versions, as follows: ++ ++@Example ++.nr y4 1900+\n(yr ++This document was formatted in \n(y4. ++@endExample ++ ++@item \n[.c] ++@vindex .c ++@itemx \n[c.] ++@vindex c. ++@cindex input line number register (@code{.c}, @code{c.}) ++@cindex line number, input, register (@code{.c}, @code{c.}) ++The current @emph{input} line number. Register @samp{.c} is read-only, ++whereas @samp{c.} (a @code{gtroff} extension) is writable also, ++affecting both @samp{.c} and @samp{c.}. ++ ++@item \n[ln] ++@vindex ln ++@cindex output line number register (@code{ln}) ++@cindex line number, output, register (@code{ln}) ++The current @emph{output} line number after a call to the @code{nm} ++request to activate line numbering. ++ ++@xref{Miscellaneous}, for more information about line numbering. ++ ++@item \n[.x] ++@vindex .x ++@cindex major version number register (@code{.x}) ++@cindex version number, major, register (@code{.x}) ++The major version number. For example, if the version number is 1.03 ++then @code{.x} contains@tie{}@samp{1}. ++ ++@item \n[.y] ++@vindex .y ++@cindex minor version number register (@code{.y}) ++@cindex version number, minor, register (@code{.y}) ++The minor version number. For example, if the version number is 1.03 ++then @code{.y} contains@tie{}@samp{03}. ++ ++@item \n[.Y] ++@vindex .Y ++@cindex revision number register (@code{.Y}) ++The revision number of @code{groff}. ++ ++@item \n[$$] ++@vindex $$ ++@cindex process ID of @code{gtroff} register (@code{$$}) ++@cindex @code{gtroff}, process ID register (@code{$$}) ++The process ID of @code{gtroff}. ++ ++@item \n[.g] ++@vindex .g ++@cindex @code{gtroff}, identification register (@code{.g}) ++@cindex GNU-specific register (@code{.g}) ++Always@tie{}1. Macros should use this to determine whether they are ++running under GNU @code{troff}. ++ ++@item \n[.A] ++@vindex .A ++@cindex @acronym{ASCII} approximation output register (@code{.A}) ++If the command line option @option{-a} is used to produce an ++@acronym{ASCII} approximation of the output, this is set to@tie{}1, zero ++otherwise. @xref{Groff Options}. ++ ++@item \n[.O] ++@vindex .O ++This read-only register is set to the suppression nesting level (see ++escapes @code{\O}). @xref{Suppressing output}. ++ ++@item \n[.P] ++@vindex .P ++This register is set to@tie{}1 (and to@tie{}0 otherwise) if the current ++page is actually being printed, i.e., if the @option{-o} option is being ++used to only print selected pages. @xref{Groff Options}, for more ++information. ++ ++@item \n[.T] ++@vindex .T ++If @code{gtroff} is called with the @option{-T} command line option, the ++number register @code{.T} is set to@tie{}1, and zero otherwise. ++@xref{Groff Options}. ++ ++@item \*[.T] ++@stindex .T ++@cindex output device name string register (@code{.T}) ++A single read-write string register that contains the current output ++device (for example, @samp{latin1} or @samp{ps}). This is the only ++string register defined by @code{gtroff}. ++@end table ++ ++ ++@c ===================================================================== ++ ++@node Manipulating Filling and Adjusting, Manipulating Hyphenation, Registers, gtroff Reference ++@section Manipulating Filling and Adjusting ++@cindex manipulating filling and adjusting ++@cindex filling and adjusting, manipulating ++@cindex adjusting and filling, manipulating ++@cindex justifying text ++@cindex text, justifying ++ ++@cindex break ++@cindex line break ++@cindex @code{bp} request, causing implicit linebreak ++@cindex @code{ce} request, causing implicit linebreak ++@cindex @code{cf} request, causing implicit linebreak ++@cindex @code{fi} request, causing implicit linebreak ++@cindex @code{fl} request, causing implicit linebreak ++@cindex @code{in} request, causing implicit linebreak ++@cindex @code{nf} request, causing implicit linebreak ++@cindex @code{rj} request, causing implicit linebreak ++@cindex @code{sp} request, causing implicit linebreak ++@cindex @code{ti} request, causing implicit linebreak ++@cindex @code{trf} request, causing implicit linebreak ++Various ways of causing @dfn{breaks} were given in @ref{Implicit Line ++Breaks}. The @code{br} request likewise causes a break. Several other ++requests also cause breaks, but implicitly. These are @code{bp}, ++@code{ce}, @code{cf}, @code{fi}, @code{fl}, @code{in}, @code{nf}, ++@code{rj}, @code{sp}, @code{ti}, and @code{trf}. ++ ++@Defreq {br, } ++Break the current line, i.e., the input collected so far is emitted ++without adjustment. ++ ++If the no-break control character is used, @code{gtroff} suppresses the ++break: ++ ++@Example ++a ++'br ++b ++ @result{} a b ++@endExample ++@endDefreq ++ ++Initially, @code{gtroff} fills and adjusts text to both margins. ++Filling can be disabled via the @code{nf} request and re-enabled with ++the @code{fi} request. ++ ++@DefreqList {fi, } ++@DefregListEndx {.u} ++@cindex fill mode (@code{fi}) ++@cindex mode, fill (@code{fi}) ++Activate fill mode (which is the default). This request implicitly ++enables adjusting; it also inserts a break in the text currently being ++filled. The read-only number register @code{.u} is set to@tie{}1. ++ ++The fill mode status is associated with the current environment ++(@pxref{Environments}). ++ ++See @ref{Line Control}, for interaction with the @code{\c} escape. ++@endDefreq ++ ++@Defreq {nf, } ++@cindex no-fill mode (@code{nf}) ++@cindex mode, no-fill (@code{nf}) ++Activate no-fill mode. Input lines are output as-is, retaining line ++breaks and ignoring the current line length. This command implicitly ++disables adjusting; it also causes a break. The number register ++@code{.u} is set to@tie{}0. ++ ++The fill mode status is associated with the current environment ++(@pxref{Environments}). ++ ++See @ref{Line Control}, for interaction with the @code{\c} escape. ++@endDefreq ++ ++@DefreqList {ad, [@Var{mode}]} ++@DefregListEndx {.j} ++Set adjusting mode. ++ ++Activation and deactivation of adjusting is done implicitly with calls ++to the @code{fi} or @code{nf} requests. ++ ++@var{mode} can have one of the following values: ++ ++@table @code ++@item l ++@cindex ragged-right ++Adjust text to the left margin. This produces what is traditionally ++called ragged-right text. ++ ++@item r ++@cindex ragged-left ++Adjust text to the right margin, producing ragged-left text. ++ ++@item c ++@cindex centered text ++@cindex @code{ce} request, difference to @samp{.ad@tie{}c} ++Center filled text. This is different to the @code{ce} request, which ++only centers text without filling. ++ ++@item b ++@itemx n ++Justify to both margins. This is the default used by @code{gtroff}. ++@end table ++ ++Finally, @var{mode} can be the numeric argument returned by the ++@code{.j} register. ++ ++Using @code{ad} without argument is the same as saying ++@w{@code{.ad \[.j]}}. In particular, @code{gtroff} adjusts lines ++in the same way it did before adjusting was deactivated (with a call ++to @code{na}, say). For example, this input code ++ ++@Example ++.de AD ++. br ++. ad \\$1 ++.. ++. ++.de NA ++. br ++. na ++.. ++. ++textA ++.AD r ++.nr ad \n[.j] ++textB ++.AD c ++textC ++.NA ++textD ++.AD \" back to centering ++textE ++.AD \n[ad] \" back to right justifying ++textF ++@endExample ++ ++@noindent ++produces the following output: ++ ++@Example ++textA ++ textB ++ textC ++textD ++ textE ++ textF ++@endExample ++ ++@cindex adjustment mode register (@code{.j}) ++As just demonstrated, the current adjustment mode is available in the ++read-only number register @code{.j}; it can be stored and ++subsequently used to set adjustment. ++ ++The adjustment mode status is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@Defreq {na, } ++Disable adjusting. This request won't change the current adjustment ++mode: A subsequent call to @code{ad} uses the previous adjustment ++setting. ++ ++The adjustment mode status is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@DefreqList {brp, } ++@DefescListEndx {\\p, , , } ++Adjust the current line and cause a break. ++ ++In most cases this produces very ugly results since @code{gtroff} ++doesn't have a sophisticated paragraph building algorithm (as @TeX{} ++have, for example); instead, @code{gtroff} fills and adjusts a paragraph ++line by line: ++ ++@Example ++This is an uninteresting sentence. ++This is an uninteresting sentence.\p ++This is an uninteresting sentence. ++@endExample ++ ++@noindent ++is formatted as ++ ++@Example ++This is an uninteresting sentence. This is an ++uninteresting sentence. ++This is an uninteresting sentence. ++@endExample ++@endDefreq ++ ++@DefreqList {ss, word_space_size [@Var{sentence_space_size}]} ++@DefregItemx {.ss} ++@DefregListEndx {.sss} ++@cindex word space size register (@code{.ss}) ++@cindex size of word space register (@code{.ss}) ++@cindex space between words register (@code{.ss}) ++@cindex sentence space size register (@code{.sss}) ++@cindex size of sentence space register (@code{.sss}) ++@cindex space between sentences register (@code{.sss}) ++Change the size of a space between words. It takes its units as one ++twelfth of the space width parameter for the current font. Initially ++both the @var{word_space_size} and @var{sentence_space_size} ++are@tie{}12. In fill mode, the values specify the minimum distance. ++ ++@cindex fill mode ++@cindex mode, fill ++If two arguments are given to the @code{ss} request, the second argument ++sets the sentence space size. If the second argument is not given, ++sentence space size is set to @var{word_space_size}. The sentence space ++size is used in two circumstances: If the end of a sentence occurs at ++the end of a line in fill mode, then both an inter-word space and a ++sentence space are added; if two spaces follow the end of a sentence in ++the middle of a line, then the second space is a sentence space. If a ++second argument is never given to the @code{ss} request, the behaviour ++of @acronym{UNIX} @code{troff} is the same as that exhibited by GNU ++@code{troff}. In GNU @code{troff}, as in @acronym{UNIX} @code{troff}, a ++sentence should always be followed by either a newline or two spaces. ++ ++The read-only number registers @code{.ss} and @code{.sss} hold the ++values of the parameters set by the first and second arguments of the ++@code{ss} request. ++ ++The word space and sentence space values are associated with the current ++environment (@pxref{Environments}). ++ ++Contrary to @acronym{AT&T} @code{troff}, this request is @emph{not} ++ignored if a TTY output device is used; the given values are then ++rounded down to a multiple of@tie{}12 (@pxref{Implementation ++Differences}). ++ ++The request is ignored if there is no parameter. ++ ++@cindex discardable horizontal space ++@cindex space, discardable, horizontal ++@cindex horizontal discardable space ++Another useful application of the @code{ss} request is to insert ++discardable horizontal space, i.e., space that is discarded at a line ++break. For example, paragraph-style footnotes could be separated this ++way: ++ ++@Example ++.ll 4.5i ++1.\ This is the first footnote.\c ++.ss 48 ++.nop ++.ss 12 ++2.\ This is the second footnote. ++@endExample ++ ++@noindent ++The result: ++ ++@Example ++1. This is the first footnote. 2. This ++is the second footnote. ++@endExample ++ ++@noindent ++Note that the @code{\h} escape produces unbreakable space. ++@endDefreq ++ ++@DefreqList {ce, [@Var{nnn}]} ++@DefregListEndx {.ce} ++@cindex centering lines (@code{ce}) ++@cindex lines, centering (@code{ce}) ++Center text. While the @w{@samp{.ad c}} request also centers text, it ++fills the text as well. @code{ce} does not fill the text it affects. ++This request causes a break. The number of lines still to be centered ++is associated with the current environment (@pxref{Environments}). ++ ++The following example demonstrates the differences. Here is the input: ++ ++@Example ++.ll 4i ++.ce 1000 ++This is a small text fragment that shows the differences ++between the `.ce' and the `.ad c' request. ++.ce 0 ++ ++.ad c ++This is a small text fragment that shows the differences ++between the `.ce' and the `.ad c' request. ++@endExample ++ ++@noindent ++And here the result: ++ ++@Example ++ This is a small text fragment that ++ shows the differences ++between the `.ce' and the `.ad c' request. ++ ++ This is a small text fragment that ++shows the differences between the `.ce' ++ and the `.ad c' request. ++@endExample ++ ++With no arguments, @code{ce} centers the next line of text. @var{nnn} ++specifies the number of lines to be centered. If the argument is zero ++or negative, centering is disabled. ++ ++The basic length for centering text is the line length (as set with the ++@code{ll} request) minus the indentation (as set with the @code{in} ++request). Temporary indentation is ignored. ++ ++As can be seen in the previous example, it is a common idiom to turn on ++centering for a large number of lines, and to turn off centering after ++text to be centered. This is useful for any request that takes a ++number of lines as an argument. ++ ++The @code{.ce} read-only number register contains the number of lines ++remaining to be centered, as set by the @code{ce} request. ++@endDefreq ++ ++@DefreqList {rj, [@Var{nnn}]} ++@DefregListEndx {.rj} ++@cindex justifying text (@code{rj}) ++@cindex text, justifying (@code{rj}) ++@cindex right-justifying (@code{rj}) ++Justify unfilled text to the right margin. Arguments are identical to ++the @code{ce} request. The @code{.rj} read-only number register is the ++number of lines to be right-justified as set by the @code{rj} request. ++This request causes a break. The number of lines still to be ++right-justified is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Manipulating Hyphenation, Manipulating Spacing, Manipulating Filling and Adjusting, gtroff Reference ++@section Manipulating Hyphenation ++@cindex manipulating hyphenation ++@cindex hyphenation, manipulating ++ ++Here a description of requests that influence hyphenation. ++ ++@DefreqList {hy, [@Var{mode}]} ++@DefregListEndx {.hy} ++Enable hyphenation. The request has an optional numeric argument, ++@var{mode}, to restrict hyphenation if necessary: ++ ++@table @code ++@item 1 ++The default argument if @var{mode} is omitted. Hyphenate without ++restrictions. This is also the start-up value of @code{gtroff}. ++ ++@item 2 ++Do not hyphenate the last word on a page or column. ++ ++@item 4 ++Do not hyphenate the last two characters of a word. ++ ++@item 8 ++Do not hyphenate the first two characters of a word. ++@end table ++ ++Values in the previous table are additive. For example, the ++value@tie{}12 causes @code{gtroff} to neither hyphenate the last two nor ++the first two characters of a word. ++ ++@cindex hyphenation restrictions register (@code{.hy}) ++The current hyphenation restrictions can be found in the read-only ++number register @samp{.hy}. ++ ++The hyphenation mode is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@Defreq {nh, } ++Disable hyphenation (i.e., set the hyphenation mode to zero). Note that ++the hyphenation mode of the last call to @code{hy} is not remembered. ++ ++The hyphenation mode is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@DefreqList {hlm, [@Var{nnn}]} ++@DefregItemx {.hlm} ++@DefregListEndx {.hlc} ++@cindex explicit hyphen (@code{\%}) ++@cindex hyphen, explicit (@code{\%}) ++@cindex consecutive hyphenated lines (@code{hlm}) ++@cindex lines, consecutive hyphenated (@code{hlm}) ++@cindex hyphenated lines, consecutive (@code{hlm}) ++Set the maximum number of consecutive hyphenated lines to @var{nnn}. If ++this number is negative, there is no maximum. The default value ++is@tie{}@minus{}1 if @var{nnn} is omitted. This value is associated ++with the current environment (@pxref{Environments}). Only lines output ++from a given environment count towards the maximum associated with that ++environment. Hyphens resulting from @code{\%} are counted; explicit ++hyphens are not. ++ ++The current setting of @code{hlm} is available in the @code{.hlm} ++read-only number register. Also the number of immediately preceding ++consecutive hyphenated lines are available in the read-only number ++register @samp{.hlc}. ++@endDefreq ++ ++@Defreq {hw, word1 word2 @dots{}} ++Define how @var{word1}, @var{word2}, etc.@: are to be hyphenated. The ++words must be given with hyphens at the hyphenation points. For ++example: ++ ++@Example ++.hw in-sa-lub-rious ++@endExample ++ ++@noindent ++Besides the space character, any character whose hyphenation code value ++is zero can be used to separate the arguments of @code{hw} (see the ++documentation for the @code{hcode} request below for more information). ++In addition, this request can be used more than once. ++ ++Hyphenation exceptions specified with the @code{hw} request are ++associated with the current hyphenation language; it causes an error if ++there is no current hyphenation language. ++ ++This request is ignored if there is no parameter. ++ ++In old versions of @code{troff} there was a limited amount of space to ++store such information; fortunately, with @code{gtroff}, this is no ++longer a restriction. ++@endDefreq ++ ++@DefescList {\\%, , , } ++@deffnx Escape @t{\:} ++@ifnotinfo ++@esindex \: ++@end ifnotinfo ++@ifinfo ++@esindex \@r{} ++@end ifinfo ++@cindex hyphenation character (@code{\%}) ++@cindex character, hyphenation (@code{\%}) ++@cindex disabling hyphenation (@code{\%}) ++@cindex hyphenation, disabling (@code{\%}) ++To tell @code{gtroff} how to hyphenate words on the fly, use the ++@code{\%} escape, also known as the @dfn{hyphenation character}. ++Preceding a word with this character prevents it from being ++hyphenated; putting it inside a word indicates to @code{gtroff} that ++the word may be hyphenated at that point. Note that this mechanism ++only affects that one occurrence of the word; to change the ++hyphenation of a word for the entire document, use the @code{hw} ++request. ++ ++The @code{\:} escape inserts a zero-width break point (that is, the word ++breaks but without adding a hyphen). ++ ++@Example ++... check the /var/log/\:httpd/\:access_log file ... ++@endExample ++ ++@cindex @code{\X}, followed by @code{\%} ++@cindex @code{\Y}, followed by @code{\%} ++@cindex @code{\%}, following @code{\X} or @code{\Y} ++Note that @code{\X} and @code{\Y} start a word, that is, the @code{\%} ++escape in (say) @w{@samp{\X'...'\%foobar}} and ++@w{@samp{\Y'...'\%foobar}} no longer prevents hyphenation but inserts a ++hyphenation point at the beginning of @samp{foobar}; most likely this ++isn't what you want to do. ++@endDefesc ++ ++@Defreq {hc, [@Var{char}]} ++Change the hyphenation character to @var{char}. This character then ++works the same as the @code{\%} escape, and thus, no longer appears in ++the output. Without an argument, @code{hc} resets the hyphenation ++character to be @code{\%} (the default) only. ++ ++The hyphenation character is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@DefreqList {hpf, pattern_file} ++@DefreqItemx {hpfa, pattern_file} ++@DefreqListEndx {hpfcode, a b [c d @dots{}]} ++@cindex hyphenation patterns (@code{hpf}) ++@cindex patterns for hyphenation (@code{hpf}) ++Read in a file of hyphenation patterns. This file is searched for in ++the same way as @file{@var{name}.tmac} (or @file{tmac.@var{name}}) is ++searched for if the @option{-m@var{name}} option is specified. ++ ++It should have the same format as (simple) @TeX{} patterns files. More ++specifically, the following scanning rules are implemented. ++ ++@itemize @bullet ++@item ++A percent sign starts a comment (up to the end of the line) even if ++preceded by a backslash. ++ ++@item ++No support for `digraphs' like @code{\$}. ++ ++@item ++@code{^^@var{xx}} (@var{x} is 0-9 or a-f) and @code{^^@var{x}} ++(character code of @var{x} in the range 0-127) are recognized; other use ++of @code{^} causes an error. ++ ++@item ++No macro expansion. ++ ++@item ++@code{hpf} checks for the expression @code{\patterns@{@dots{}@}} ++(possibly with whitespace before and after the braces). Everything ++between the braces is taken as hyphenation patterns. Consequently, ++@code{@{} and @code{@}} are not allowed in patterns. ++ ++@item ++Similarly, @code{\hyphenation@{@dots{}@}} gives a list of hyphenation ++exceptions. ++ ++@item ++@code{\endinput} is recognized also. ++ ++@item ++For backwards compatibility, if @code{\patterns} is missing, the whole ++file is treated as a list of hyphenation patterns (only recognizing the ++@code{%} character as the start of a comment). ++@end itemize ++ ++If no @code{hpf} request is specified (either in the document or in a ++macro package), @code{gtroff} won't hyphenate at all. ++ ++The @code{hpfa} request appends a file of patterns to the current list. ++ ++The @code{hpfcode} request defines mapping values for character codes in ++hyphenation patterns. @code{hpf} or @code{hpfa} then apply the mapping ++(after reading the patterns) before replacing or appending them to the ++current list of patterns. Its arguments are pairs of character codes -- ++integers from 0 to@tie{}255. The request maps character ++code@tie{}@var{a} to code@tie{}@var{b}, code@tie{}@var{c} to ++code@tie{}@var{d}, and so on. You can use character codes that would ++be invalid otherwise. By default, everything maps to itself except ++letters `A' to `Z', which map to `a' to `z'. ++ ++ ++@pindex troffrc ++@pindex troffrc-end ++@pindex hyphen.us ++@pindex hyphenex.us ++The set of hyphenation patterns is associated with the current language ++set by the @code{hla} request. The @code{hpf} request is usually ++invoked by the @file{troffrc} or @file{troffrc-end} file; by default, ++@file{troffrc} loads hyphenation patterns and exceptions for American ++English (in files @file{hyphen.us} and @file{hyphenex.us}). ++ ++A second call to @code{hpf} (for the same language) replaces the ++hyphenation patterns with the new ones. ++ ++Invoking @code{hpf} causes an error if there is no current hyphenation ++language. ++@endDefreq ++ ++@Defreq {hcode, c1 code1 [c2 code2 @dots{}]} ++@cindex hyphenation code (@code{hcode}) ++@cindex code, hyphenation (@code{hcode}) ++Set the hyphenation code of character @var{c1} to @var{code1}, that of ++@var{c2} to @var{code2}, etc. A hyphenation code must be a single input ++character (not a special character) other than a digit or a space. ++ ++To make hyphenation work, hyphenation codes must be set up. At ++start-up, groff only assigns hyphenation codes to the letters ++@samp{a}-@samp{z} (mapped to themselves) and to the letters ++@samp{A}-@samp{Z} (mapped to @samp{a}-@samp{z}); all other hyphenation ++codes are set to zero. Normally, hyphenation patterns contain only ++lowercase letters, which should be applied regardless of case. In ++other words, the words `FOO' and `Foo' should be hyphenated exactly the ++same way as the word `foo' is hyphenated, and this is what @code{hcode} ++is good for. Words that contain other letters won't be hyphenated ++properly if the corresponding hyphenation patterns actually do contain ++them. For example, the following @code{hcode} requests are necessary to ++assign hyphenation codes to the letters @samp{} (this is needed ++for German): ++ ++@Example ++.hcode ++.hcode ++.hcode ++.hcode ++@endExample ++ ++Without those assignments, groff treats German words like ++@w{`Kindergrten'} (the plural form of `kindergarten') as two substrings ++@w{`kinderg'} and @w{`rten'} because the hyphenation code of the ++umlaut@tie{}a is zero by default. There is a German hyphenation pattern ++that covers @w{`kinder'}, so groff finds the hyphenation `kin-der'. ++The other two hyphenation points (`kin-der-gr-ten') are missed. ++ ++This request is ignored if it has no parameter. ++@endDefreq ++ ++@DefreqList {hym, [@Var{length}]} ++@DefregListEndx {.hym} ++@cindex hyphenation margin (@code{hym}) ++@cindex margin for hyphenation (@code{hym}) ++@cindex @code{ad} request, and hyphenation margin ++Set the (right) hyphenation margin to @var{length}. If the current ++adjustment mode is not @samp{b} or @samp{n}, the line is not hyphenated ++if it is shorter than @var{length}. Without an argument, the ++hyphenation margin is reset to its default value, which is@tie{}0. The ++default scaling indicator for this request is @samp{m}. The hyphenation ++margin is associated with the current environment ++(@pxref{Environments}). ++ ++A negative argument resets the hyphenation margin to zero, emitting a ++warning of type @samp{range}. ++ ++@cindex hyphenation margin register (@code{.hym}) ++The current hyphenation margin is available in the @code{.hym} read-only ++number register. ++@endDefreq ++ ++@DefreqList {hys, [@Var{hyphenation_space}]} ++@DefregListEndx {.hys} ++@cindex hyphenation space (@code{hys}) ++@cindex @code{ad} request, and hyphenation space ++Set the hyphenation space to @var{hyphenation_space}. If the current ++adjustment mode is @samp{b} or @samp{n}, don't hyphenate the line if it ++can be justified by adding no more than @var{hyphenation_space} extra ++space to each word space. Without argument, the hyphenation space is ++set to its default value, which is@tie{}0. The default scaling ++indicator for this request is @samp{m}. The hyphenation space is ++associated with the current environment (@pxref{Environments}). ++ ++A negative argument resets the hyphenation space to zero, emitting a ++warning of type @samp{range}. ++ ++@cindex hyphenation space register (@code{.hys}) ++The current hyphenation space is available in the @code{.hys} read-only ++number register. ++@endDefreq ++ ++@Defreq {shc, [@Var{glyph}]} ++@cindex soft hyphen character, setting (@code{shc}) ++@cindex character, soft hyphen, setting (@code{shc}) ++@cindex glyph, soft hyphen (@code{hy}) ++@cindex soft hyphen glyph (@code{hy}) ++@cindex @code{char} request, and soft hyphen character ++@cindex @code{tr} request, and soft hyphen character ++Set the @dfn{soft hyphen character} to @var{glyph}.@footnote{@dfn{Soft ++hyphen character} is a misnomer since it is an output glyph.} If the ++argument is omitted, the soft hyphen character is set to the default ++glyph @code{\(hy} (this is the start-up value of @code{gtroff} also). ++The soft hyphen character is the glyph that is inserted when a word is ++hyphenated at a line break. If the soft hyphen character does not exist ++in the font of the character immediately preceding a potential break ++point, then the line is not broken at that point. Neither definitions ++(specified with the @code{char} request) nor translations (specified ++with the @code{tr} request) are considered when finding the soft hyphen ++character. ++@endDefreq ++ ++@DefreqList {hla, language} ++@DefregListEndx {.hla} ++@cindex @code{hpf} request, and hyphenation language ++@cindex @code{hw} request, and hyphenation language ++@pindex troffrc ++@pindex troffrc-end ++Set the current hyphenation language to the string @var{language}. ++Hyphenation exceptions specified with the @code{hw} request and ++hyphenation patterns specified with the @code{hpf} and @code{hpfa} ++requests are both associated with the current hyphenation language. The ++@code{hla} request is usually invoked by the @file{troffrc} or the ++@file{troffrc-end} files; @file{troffrc} sets the default language to ++@samp{us}. ++ ++@cindex hyphenation language register (@code{.hla}) ++The current hyphenation language is available as a string in the ++read-only number register @samp{.hla}. ++ ++@Example ++.ds curr_language \n[.hla] ++\*[curr_language] ++ @result{} us ++@endExample ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Manipulating Spacing, Tabs and Fields, Manipulating Hyphenation, gtroff Reference ++@section Manipulating Spacing ++@cindex manipulating spacing ++@cindex spacing, manipulating ++ ++@Defreq {sp, [@Var{distance}]} ++Space downwards @var{distance}. With no argument it advances ++1@tie{}line. A negative argument causes @code{gtroff} to move up the ++page the specified distance. If the argument is preceded by a @samp{|} ++then @code{gtroff} moves that distance from the top of the page. This ++request causes a line break, and that adds the current line spacing to ++the space you have just specified. The default scaling indicator is ++@samp{v}. ++ ++For convenience you may wish to use the following macros to set the ++height of the next line at a given distance from the top or the bottom ++of the page: ++ ++@Example ++.de y-from-top-down ++. sp |\\$1-\\n[.v]u ++.. ++. ++.de y-from-bot-up ++. sp |\\n[.p]u-\\$1-\\n[.v]u ++.. ++@endExample ++ ++@noindent ++A call to @samp{.y-from-bot-up 10c} means that the bottom of the next ++line will be at 10@dmn{cm} from the paper edge at the bottom. ++ ++If a vertical trap is sprung during execution of @code{sp}, the amount ++of vertical space after the trap is discarded. For example, this ++ ++@Example ++.de xxx ++.. ++. ++.wh 0 xxx ++. ++.pl 5v ++foo ++.sp 2 ++bar ++.sp 50 ++baz ++@endExample ++ ++@noindent ++results in ++ ++@Example ++foo ++ ++ ++bar ++ ++baz ++@endExample ++ ++@cindex @code{sp} request, and traps ++@cindex discarded space in traps ++@cindex space, discarded, in traps ++@cindex traps, and discarded space ++The amount of discarded space is available in the number register ++@code{.trunc}. ++ ++To protect @code{sp} against vertical traps, use the @code{vpt} request: ++ ++@Example ++.vpt 0 ++.sp -3 ++.vpt 1 ++@endExample ++@endDefreq ++ ++@DefreqList {ls, [@Var{nnn}]} ++@DefregListEndx {.L} ++@cindex double-spacing (@code{ls}) ++Output @w{@var{nnn}@minus{}1} blank lines after each line of text. With ++no argument, @code{gtroff} uses the previous value before the last ++@code{ls} call. ++ ++@Example ++.ls 2 \" This causes double-spaced output ++.ls 3 \" This causes triple-spaced output ++.ls \" Again double-spaced ++@endExample ++ ++The line spacing is associated with the current environment ++(@pxref{Environments}). ++ ++@cindex line spacing register (@code{.L}) ++The read-only number register @code{.L} contains the current line ++spacing setting. ++@endDefreq ++ ++@xref{Changing Type Sizes}, for the requests @code{vs} and @code{pvs} as ++alternatives to @code{ls}. ++ ++@DefescList {\\x, ', spacing, '} ++@DefregListEndx {.a} ++Sometimes, extra vertical spacing is only needed occasionally, e.g.@: to ++allow space for a tall construct (like an equation). The @code{\x} ++escape does this. The escape is given a numerical argument, usually ++enclosed in quotes (like @samp{\x'3p'}); the default scaling indicator ++is @samp{v}. If this number is positive extra vertical space is ++inserted below the current line. A negative number adds space above. ++If this escape is used multiple times on the same line, the maximum of ++the values is used. ++ ++@xref{Escapes}, for details on parameter delimiting characters. ++ ++@cindex extra post-vertical line space register (@code{.a}) ++The @code{.a} read-only number register contains the most recent ++(nonnegative) extra vertical line space. ++ ++Using @code{\x} can be necessary in combination with the @code{\b} ++escape, as the following example shows. ++ ++@Example ++This is a test with the \[rs]b escape. ++.br ++This is a test with the \[rs]b escape. ++.br ++This is a test with \b'xyz'\x'-1m'\x'1m'. ++.br ++This is a test with the \[rs]b escape. ++.br ++This is a test with the \[rs]b escape. ++@endExample ++ ++@noindent ++produces ++ ++@Example ++This is a test with the \b escape. ++This is a test with the \b escape. ++ x ++This is a test with y. ++ z ++This is a test with the \b escape. ++This is a test with the \b escape. ++@endExample ++@endDefesc ++ ++@DefreqList {ns, } ++@DefreqItemx {rs, } ++@DefregListEndx {.ns} ++@cindex @code{sp} request, and no-space mode ++@cindex no-space mode (@code{ns}) ++@cindex mode, no-space (@code{ns}) ++@cindex blank lines, disabling ++@cindex lines, blank, disabling ++Enable @dfn{no-space mode}. In this mode, spacing (either via @code{sp} ++or via blank lines) is disabled. The @code{bp} request to advance to ++the next page is also disabled, except if it is accompanied by a page ++number (see @ref{Page Control}, for more information). This mode ends ++when actual text is output or the @code{rs} request is encountered, which ++ends no-space mode. The read-only number register @code{.ns} is set ++to@tie{}1 as long as no-space mode is active. ++ ++This request is useful for macros that conditionally insert vertical ++space before the text starts (for example, a paragraph macro could ++insert some space except when it is the first paragraph after a section ++header). ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Tabs and Fields, Character Translations, Manipulating Spacing, gtroff Reference ++@section Tabs and Fields ++@cindex tabs, and fields ++@cindex fields, and tabs ++ ++@cindex @acronym{EBCDIC} encoding of a tab ++A tab character (@acronym{ASCII} char@tie{}9, @acronym{EBCDIC} ++char@tie{}5) causes a horizontal movement to the next tab stop (much ++like it did on a typewriter). ++ ++@Defesc {\\t, , , } ++@cindex tab character, non-interpreted (@code{\t}) ++@cindex character, tab, non-interpreted (@code{\t}) ++@cindex @code{\t}, and copy-in mode ++@cindex copy-in mode, and @code{\t} ++@cindex mode, copy-in, and @code{\t} ++This escape is a non-interpreted tab character. In copy mode ++(@pxref{Copy-in Mode}), @code{\t} is the same as a real tab character. ++@endDefesc ++ ++@DefreqList {ta, [@Var{n1} @Var{n2} @dots{} @Var{nn} @t{T} @Var{r1} @Var{r2} @dots{} @Var{rn}]} ++@DefregListEndx {.tabs} ++Change tab stop positions. This request takes a series of tab ++specifiers as arguments (optionally divided into two groups with the ++letter @samp{T}) that indicate where each tab stop is to be (overriding ++any previous settings). ++ ++Tab stops can be specified absolutely, i.e., as the distance from the ++left margin. For example, the following sets 6@tie{}tab stops every one ++inch. ++ ++@Example ++.ta 1i 2i 3i 4i 5i 6i ++@endExample ++ ++Tab stops can also be specified using a leading @samp{+}, which means ++that the specified tab stop is set relative to the previous tab stop. ++For example, the following is equivalent to the previous example. ++ ++@Example ++.ta 1i +1i +1i +1i +1i +1i ++@endExample ++ ++@code{gtroff} supports an extended syntax to specify repeat values after ++the @samp{T} mark (these values are always taken as relative) -- this is ++the usual way to specify tabs set at equal intervals. The following is, ++yet again, the same as the previous examples. It does even more since ++it defines an infinite number of tab stops separated by one inch. ++ ++@Example ++.ta T 1i ++@endExample ++ ++Now we are ready to interpret the full syntax given at the beginning: ++Set tabs at positions @var{n1}, @var{n2}, @dots{}, @var{nn} and then set ++tabs at @var{nn}+@var{r1}, @var{nn}+@var{r2}, @dots{}, @var{nn}+@var{rn} ++and then at @var{nn}+@var{rn}+@var{r1}, @var{nn}+@var{rn}+@var{r2}, ++@dots{}, @var{nn}+@var{rn}+@var{rn}, and so on. ++ ++Example: @samp{4c +6c T 3c 5c 2c} is equivalent to @samp{4c 10c 13c 18c ++20c 23c 28c 30c @dots{}}. ++ ++The material in each tab column (i.e., the column between two tab stops) ++may be justified to the right or left or centered in the column. This ++is specified by appending @samp{R}, @samp{L}, or @samp{C} to the tab ++specifier. The default justification is @samp{L}. Example: ++ ++@Example ++.ta 1i 2iC 3iR ++@endExample ++ ++Some notes: ++ ++@itemize @bullet ++@item ++The default unit of the @code{ta} request is @samp{m}. ++ ++@item ++A tab stop is converted into a non-breakable horizontal movement that ++can be neither stretched nor squeezed. For example, ++ ++@Example ++.ds foo a\tb\tc ++.ta T 5i ++\*[foo] ++@endExample ++ ++@noindent ++creates a single line, which is a bit longer than 10@tie{}inches (a ++string is used to show exactly where the tab characters are). Now ++consider the following: ++ ++@Example ++.ds bar a\tb b\tc ++.ta T 5i ++\*[bar] ++@endExample ++ ++@noindent ++@code{gtroff} first converts the tab stops of the line into unbreakable ++horizontal movements, then splits the line after the second @samp{b} ++(assuming a sufficiently short line length). Usually, this isn't what ++the user wants. ++ ++@item ++Superfluous tabs (i.e., tab characters that do not correspond to a tab ++stop) are ignored except the first one, which delimits the characters ++belonging to the last tab stop for right-justifying or centering. ++Consider the following example ++ ++@Example ++.ds Z foo\tbar\tfoo ++.ds ZZ foo\tbar\tfoobar ++.ds ZZZ foo\tbar\tfoo\tbar ++.ta 2i 4iR ++\*[Z] ++.br ++\*[ZZ] ++.br ++\*[ZZZ] ++.br ++@endExample ++ ++@noindent ++which produces the following output: ++ ++@Example ++foo bar foo ++foo bar foobar ++foo bar foobar ++@endExample ++ ++@noindent ++The first line right-justifies the second `foo' relative to the tab ++stop. The second line right-justifies `foobar'. The third line finally ++right-justifies only `foo' because of the additional tab character, which ++marks the end of the string belonging to the last defined tab stop. ++ ++@item ++Tab stops are associated with the current environment ++(@pxref{Environments}). ++ ++@item ++Calling @code{ta} without an argument removes all tab stops. ++ ++@item ++@cindex tab stops, for TTY output devices ++The start-up value of @code{gtroff} is @w{@samp{T 0.8i}}. ++@end itemize ++ ++@cindex tab settings register (@code{.tabs}) ++The read-only number register @code{.tabs} contains a string ++representation of the current tab settings suitable for use as an ++argument to the @code{ta} request. ++ ++@Example ++.ds tab-string \n[.tabs] ++\*[tab-string] ++ @result{} T120u ++@endExample ++ ++@cindex @code{.S} register, Plan@tie{}9 alias for @code{.tabs} ++@cindex @code{.tabs} register, Plan@tie{}9 alias (@code{.S}) ++The @code{troff} version of the Plan@tie{}9 operating system uses ++register @code{.S} for the same purpose. ++@endDefreq ++ ++@Defreq {tc, [@Var{fill-glyph}]} ++@cindex tab repetition character (@code{tc}) ++@cindex character, tab repetition (@code{tc}) ++@cindex glyph, tab repetition (@code{tc}) ++Normally @code{gtroff} fills the space to the next tab stop with ++whitespace. This can be changed with the @code{tc} request. With no ++argument @code{gtroff} reverts to using whitespace, which is the ++default. The value of this @dfn{tab repetition character} is associated ++with the current environment (@pxref{Environments}).@footnote{@dfn{Tab ++repetition character} is a misnomer since it is an output glyph.} ++@endDefreq ++ ++@DefreqList {linetabs, n} ++@DefregListEndx {.linetabs} ++@cindex tab, line-tabs mode ++@cindex line-tabs mode ++@cindex mode, line-tabs ++If @var{n} is missing or not zero, enable @dfn{line-tabs} mode, or ++disable it otherwise (the default). In line-tabs mode, @code{gtroff} ++computes tab distances relative to the (current) output line instead of ++the input line. ++ ++For example, the following code: ++ ++@Example ++.ds x a\t\c ++.ds y b\t\c ++.ds z c ++.ta 1i 3i ++\*x ++\*y ++\*z ++@endExample ++ ++@noindent ++in normal mode, results in the output ++ ++@Example ++a b c ++@endExample ++ ++@noindent ++in line-tabs mode, the same code outputs ++ ++@Example ++a b c ++@endExample ++ ++Line-tabs mode is associated with the current environment. The ++read-only register @code{.linetabs} is set to@tie{}1 if in line-tabs ++mode, and 0 in normal mode. ++@endDefreq ++ ++@menu ++* Leaders:: ++* Fields:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Leaders, Fields, Tabs and Fields, Tabs and Fields ++@subsection Leaders ++@cindex leaders ++ ++Sometimes it may may be desirable to use the @code{tc} request to fill a ++particular tab stop with a given glyph (for example dots in a table of ++contents), but also normal tab stops on the rest of the line. For this ++@code{gtroff} provides an alternate tab mechanism, called @dfn{leaders}, ++which does just that. ++ ++@cindex leader character ++A leader character (character code@tie{}1) behaves similarly to a tab ++character: It moves to the next tab stop. The only difference is that ++for this movement, the fill glyph defaults to a period character and not ++to space. ++ ++@Defesc {\\a, , , } ++@cindex leader character, non-interpreted (@code{\a}) ++@cindex character, leader, non-interpreted (@code{\a}) ++@cindex @code{\a}, and copy-in mode ++@cindex copy-in mode, and @code{\a} ++@cindex mode, copy-in, and @code{\a} ++This escape is a non-interpreted leader character. In copy mode ++(@pxref{Copy-in Mode}), @code{\a} is the same as a real leader ++character. ++@endDefesc ++ ++@Defreq {lc, [@Var{fill-glyph}]} ++@cindex leader repetition character (@code{lc}) ++@cindex character, leader repetition (@code{lc}) ++@cindex glyph, leader repetition (@code{lc}) ++Declare the @dfn{leader repetition character}.@footnote{@dfn{Leader ++repetition character} is a misnomer since it is an output glyph.} ++Without an argument, leaders act the same as tabs (i.e., using ++whitespace for filling). @code{gtroff}'s start-up value is a dot ++(@samp{.}). The value of the leader repetition character is associated ++with the current environment (@pxref{Environments}). ++@endDefreq ++ ++@cindex table of contents ++@cindex contents, table of ++For a table of contents, to name an example, tab stops may be defined so ++that the section number is one tab stop, the title is the second with ++the remaining space being filled with a line of dots, and then the page ++number slightly separated from the dots. ++ ++@Example ++.ds entry 1.1\tFoo\a\t12 ++.lc . ++.ta 1i 5i +.25i ++\*[entry] ++@endExample ++ ++@noindent ++This produces ++ ++@Example ++1.1 Foo.......................................... 12 ++@endExample ++ ++@c --------------------------------------------------------------------- ++ ++@node Fields, , Leaders, Tabs and Fields ++@subsection Fields ++@cindex fields ++ ++@cindex field delimiting character (@code{fc}) ++@cindex delimiting character, for fields (@code{fc}) ++@cindex character, field delimiting (@code{fc}) ++@cindex field padding character (@code{fc}) ++@cindex padding character, for fields (@code{fc}) ++@cindex character, field padding (@code{fc}) ++@dfn{Fields} are a more general way of laying out tabular data. A field ++is defined as the data between a pair of @dfn{delimiting characters}. ++It contains substrings that are separated by @dfn{padding characters}. ++The width of a field is the distance on the @emph{input} line from the ++position where the field starts to the next tab stop. A padding ++character inserts stretchable space similar to @TeX{}'s @code{\hss} ++command (thus it can even be negative) to make the sum of all substring ++lengths plus the stretchable space equal to the field width. If more ++than one padding character is inserted, the available space is evenly ++distributed among them. ++ ++@Defreq {fc, [@Var{delim-char} [@Var{padding-char}]]} ++Define a delimiting and a padding character for fields. If the latter ++is missing, the padding character defaults to a space character. If ++there is no argument at all, the field mechanism is disabled (which is ++the default). Note that contrary to e.g.@: the tab repetition ++character, delimiting and padding characters are @emph{not} associated ++to the current environment (@pxref{Environments}). ++ ++Example: ++ ++@Example ++.fc # ^ ++.ta T 3i ++#foo^bar^smurf# ++.br ++#foo^^bar^smurf# ++@endExample ++ ++@noindent ++and here the result: ++ ++@Example ++foo bar smurf ++foo bar smurf ++@endExample ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Character Translations, Troff and Nroff Mode, Tabs and Fields, gtroff Reference ++@section Character Translations ++@cindex character translations ++@cindex translations of characters ++ ++@cindex control character, changing (@code{cc}) ++@cindex character, control, changing (@code{cc}) ++@cindex no-break control character, changing (@code{c2}) ++@cindex character, no-break control, changing (@code{c2}) ++@cindex control character, no-break, changing (@code{c2}) ++The control character (@samp{.}) and the no-break control character ++(@samp{'}) can be changed with the @code{cc} and @code{c2} requests, ++respectively. ++ ++@Defreq {cc, [@Var{c}]} ++Set the control character to@tie{}@var{c}. With no argument the default ++control character @samp{.} is restored. The value of the control ++character is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@Defreq {c2, [@Var{c}]} ++Set the no-break control character to@tie{}@var{c}. With no argument ++the default control character @samp{'} is restored. The value of the ++no-break control character is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@xref{Requests}. ++ ++@Defreq {eo, } ++@cindex disabling @code{\} (@code{eo}) ++@cindex @code{\}, disabling (@code{eo}) ++Disable the escape mechanism completely. After executing this request, ++the backslash character @samp{\} no longer starts an escape sequence. ++ ++This request can be very helpful in writing macros since it is not ++necessary then to double the escape character. Here an example: ++ ++@Example ++.\" This is a simplified version of the ++.\" .BR request from the man macro package ++.eo ++.de BR ++. ds result \& ++. while (\n[.$] >= 2) \@{\ ++. as result \fB\$1\fR\$2 ++. shift 2 ++. \@} ++. if \n[.$] .as result \fB\$1 ++\*[result] ++. ft R ++.. ++.ec ++@endExample ++@endDefreq ++ ++@Defreq {ec, [@Var{c}]} ++@cindex escape character, changing (@code{ec}) ++@cindex character, escape, changing (@code{ec}) ++Set the escape character to@tie{}@var{c}. With no argument the default ++escape character @samp{\} is restored. It can be also used to re-enable ++the escape mechanism after an @code{eo} request. ++ ++Note that changing the escape character globally likely breaks macro ++packages since @code{gtroff} has no mechanism to `intern' macros, i.e., ++to convert a macro definition into an internal form that is independent ++of its representation (@TeX{} has this mechanism). If a macro is ++called, it is executed literally. ++@endDefreq ++ ++@DefreqList {ecs, } ++@DefreqListEndx {ecr, } ++The @code{ecs} request saves the current escape character in an internal ++register. Use this request in combination with the @code{ec} request to ++temporarily change the escape character. ++ ++The @code{ecr} request restores the escape character saved with ++@code{ecs}. Without a previous call to @code{ecs}, this request sets ++the escape character to @code{\}. ++@endDefreq ++ ++@DefescList {\\\\, , , } ++@DefescItemx {\\e, , , } ++@DefescListEndx {\\E, , , } ++Print the current escape character (which is the backslash character ++@samp{\} by default). ++ ++@code{\\} is a `delayed' backslash; more precisely, it is the default ++escape character followed by a backslash, which no longer has special ++meaning due to the leading escape character. It is @emph{not} an escape ++sequence in the usual sense! In any unknown escape sequence ++@code{\@var{X}} the escape character is ignored and @var{X} is printed. ++But if @var{X} is equal to the current escape character, no warning is ++emitted. ++ ++@cindex @code{\E}, and copy-in mode ++@cindex copy-in mode, and @code{\E} ++@cindex mode, copy-in, and @code{\E} ++As a consequence, only at top-level or in a diversion a backslash glyph ++is printed; in copy-in mode, it expands to a single backslash, which then ++combines with the following character to an escape sequence. ++ ++The @code{\E} escape differs from @code{\e} by printing an escape ++character that is not interpreted in copy mode. Use this to define ++strings with escapes that work when used in copy mode (for example, as a ++macro argument). The following example defines strings to begin and end ++a superscript: ++ ++@Example ++.ds @{ \v'-.3m'\s'\En[.s]*60/100' ++.ds @} \s0\v'.3m' ++@endExample ++ ++Another example to demonstrate the differences between the various ++escape sequences, using a strange escape character, @samp{-}. ++ ++@Example ++.ec - ++.de xxx ++--A'123' ++.. ++.xxx ++ @result{} -A'foo' ++@endExample ++ ++@noindent ++The result is surprising for most users, expecting @samp{1} since ++@samp{foo} is a valid identifier. What has happened? As mentioned ++above, the leading escape character makes the following character ++ordinary. Written with the default escape character the sequence ++@samp{--} becomes @samp{\-} -- this is the minus sign. ++ ++If the escape character followed by itself is a valid escape sequence, ++only @code{\E} yields the expected result: ++ ++@Example ++.ec - ++.de xxx ++-EA'123' ++.. ++.xxx ++ @result{} 1 ++@endExample ++@endDefesc ++ ++@Defesc {\\., , , } ++Similar to @code{\\}, the sequence @code{\.} isn't a real escape ++sequence. As before, a warning message is suppressed if the escape ++character is followed by a dot, and the dot itself is printed. ++ ++@Example ++.de foo ++. nop foo ++. ++. de bar ++. nop bar ++\\.. ++. ++.. ++.foo ++.bar ++ @result{} foo bar ++@endExample ++ ++@noindent ++The first backslash is consumed while the macro is read, and the second ++is swallowed while executing macro @code{foo}. ++@endDefesc ++ ++A @dfn{translation} is a mapping of an input character to an output ++glyph. The mapping occurs at output time, i.e., the input character ++gets assigned the metric information of the mapped output character ++right before input tokens are converted to nodes (@pxref{Gtroff ++Internals}, for more on this process). ++ ++@DefreqList {tr, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} ++@DefreqListEndx {trin, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} ++Translate character @var{a} to glyph@tie{}@var{b}, character @var{c} to ++glyph@tie{}@var{d}, etc. If there is an odd number of arguments, the ++last one is translated to an unstretchable space (@w{@samp{\ }}). ++ ++The @code{trin} request is identical to @code{tr}, but when you unformat ++a diversion with @code{asciify} it ignores the translation. ++@xref{Diversions}, for details about the @code{asciify} request. ++ ++Some notes: ++ ++@itemize @bullet ++@item ++@cindex @code{\(}, and translations ++@cindex @code{\[}, and translations ++@cindex @code{\'}, and translations ++@cindex @code{\`}, and translations ++@cindex @code{\-}, and translations ++@cindex @code{\_}, and translations ++@cindex @code{\C}, and translations ++@cindex @code{\N}, and translations ++@cindex @code{char} request, and translations ++@cindex special characters ++@cindex character, special ++@cindex numbered glyph (@code{\N}) ++@cindex glyph, numbered (@code{\N}) ++Special characters (@code{\(@var{xx}}, @code{\[@var{xxx}]}, ++@code{\C'@var{xxx}'}, @code{\'}, @code{\`}, @code{\-}, @code{\_}), ++glyphs defined with the @code{char} request, and numbered glyphs ++(@code{\N'@var{xxx}'}) can be translated also. ++ ++@item ++@cindex @code{\e}, and translations ++The @code{\e} escape can be translated also. ++ ++@item ++@cindex @code{\%}, and translations ++@cindex @code{\~}, and translations ++Characters can be mapped onto the @code{\%} and @code{\~} escapes (but ++@code{\%} and @code{\~} can't be mapped onto another glyph). ++ ++@item ++@cindex backspace character, and translations ++@cindex character, backspace, and translations ++@cindex leader character, and translations ++@cindex character, leader, and translations ++@cindex newline character, and translations ++@cindex character, newline, and translations ++@cindex tab character, and translations ++@cindex character, tab, and translations ++@cindex @code{\a}, and translations ++@cindex @code{\t}, and translations ++The following characters can't be translated: space (with one exception, ++see below), backspace, newline, leader (and @code{\a}), tab (and ++@code{\t}). ++ ++@item ++@cindex @code{shc} request, and translations ++Translations are not considered for finding the soft hyphen character ++set with the @code{shc} request. ++ ++@item ++@cindex @code{\&}, and translations ++The pair @samp{@var{c}\&} (this is an arbitrary character@tie{}@var{c} ++followed by the zero width space character) maps this character to ++nothing. ++ ++@Example ++.tr a\& ++foo bar ++ @result{} foo br ++@endExample ++ ++@noindent ++It is even possible to map the space character to nothing: ++ ++@Example ++.tr aa \& ++foo bar ++ @result{} foobar ++@endExample ++ ++@noindent ++As shown in the example, the space character can't be the first ++character/glyph pair as an argument of @code{tr}. Additionally, it is ++not possible to map the space character to any other glyph; requests ++like @w{@samp{.tr aa x}} undo @w{@samp{.tr aa \&}} instead. ++ ++If justification is active, lines are justified in spite of the `empty' ++space character (but there is no minimal distance, i.e.@: the space ++character, between words). ++ ++@item ++After an output glyph has been constructed (this happens at the moment ++immediately before the glyph is appended to an output glyph list, either ++by direct output, in a macro, diversion, or string), it is no longer ++affected by @code{tr}. ++ ++@item ++Translating character to glyphs where one of them or both are undefined ++is possible also; @code{tr} does not check whether the entities in its ++argument do exist. ++ ++@xref{Gtroff Internals}. ++ ++@item ++@code{troff} no longer has a hard-coded dependency on @w{Latin-1}; all ++@code{char@var{XXX}} entities have been removed from the font ++description files. This has a notable consequence that shows up in ++warnings like @code{can't find character with input code @var{XXX}} if ++the @code{tr} request isn't handled properly. ++ ++Consider the following translation: ++ ++@Example ++.tr ++@endExample ++ ++@noindent ++This maps input character @code{} onto glyph @code{}, which is ++identical to glyph @code{char201}. But this glyph intentionally doesn't ++exist! Instead, @code{\[char201]} is treated as an input character ++entity and is by default mapped onto @code{\['E]}, and @code{gtroff} ++doesn't handle translations of translations. ++ ++The right way to write the above translation is ++ ++@Example ++.tr \['E] ++@endExample ++ ++@noindent ++In other words, the first argument of @code{tr} should be an input ++character or entity, and the second one a glyph entity. ++ ++@item ++Without an argument, the @code{tr} request is ignored. ++@end itemize ++@endDefreq ++ ++@Defreq {trnt, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} ++@cindex @code{\!}, and @code{trnt} ++@code{trnt} is the same as the @code{tr} request except that the ++translations do not apply to text that is transparently throughput into ++a diversion with @code{\!}. @xref{Diversions}, for more information. ++ ++For example, ++ ++@Example ++.tr ab ++.di x ++\!.tm a ++.di ++.x ++@endExample ++ ++@noindent ++prints @samp{b} to the standard error stream; if @code{trnt} is used ++instead of @code{tr} it prints @samp{a}. ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Troff and Nroff Mode, Line Layout, Character Translations, gtroff Reference ++@section Troff and Nroff Mode ++@cindex troff mode ++@cindex mode, troff ++@cindex nroff mode ++@cindex mode, nroff ++ ++Originally, @code{nroff} and @code{troff} were two separate programs, ++the former for TTY output, the latter for everything else. With GNU ++@code{troff}, both programs are merged into one executable, sending its ++output to a device driver (@code{grotty} for TTY devices, @code{grops} ++for @sc{PostScript}, etc.)@: which interprets the intermediate output of ++@code{gtroff}. For @acronym{UNIX} @code{troff} it makes sense to talk ++about @dfn{Nroff mode} and @dfn{Troff mode} since the differences are ++hardcoded. For GNU @code{troff}, this distinction is not appropriate ++because @code{gtroff} simply takes the information given in the font ++files for a particular device without handling requests specially if a ++TTY output device is used. ++ ++Usually, a macro package can be used with all output devices. ++Nevertheless, it is sometimes necessary to make a distinction between ++TTY and non-TTY devices: @code{gtroff} provides two built-in conditions ++@samp{n} and @samp{t} for the @code{if}, @code{ie}, and @code{while} ++requests to decide whether @code{gtroff} shall behave like @code{nroff} ++or like @code{troff}. ++ ++@Defreq {troff, } ++@pindex troffrc ++@pindex troffrc-end ++Make the @samp{t} built-in condition true (and the @samp{n} built-in ++condition false) for @code{if}, @code{ie}, and @code{while} conditional ++requests. This is the default if @code{gtroff} (@emph{not} ++@code{groff}) is started with the @option{-R} switch to avoid loading of ++the start-up files @file{troffrc} and @file{troffrc-end}. Without ++@option{-R}, @code{gtroff} stays in troff mode if the output device is ++not a TTY (e.g.@: `ps'). ++@endDefreq ++ ++@Defreq {nroff, } ++@pindex tty.tmac ++Make the @samp{n} built-in condition true (and the @samp{t} built-in ++condition false) for @code{if}, @code{ie}, and @code{while} conditional ++requests. This is the default if @code{gtroff} uses a TTY output ++device; the code for switching to nroff mode is in the file ++@file{tty.tmac}, which is loaded by the start-up file @code{troffrc}. ++@endDefreq ++ ++@xref{Conditionals and Loops}, for more details on built-in conditions. ++ ++ ++@c ===================================================================== ++ ++@node Line Layout, Line Control, Troff and Nroff Mode, gtroff Reference ++@section Line Layout ++@cindex line layout ++@cindex layout, line ++ ++@cindex dimensions, line ++@cindex line dimensions ++The following drawing shows the dimensions that @code{gtroff} uses for ++placing a line of output onto the page. They are labeled with the ++request that manipulates each dimension. ++ ++@Example ++ -->| in |<-- ++ |<-----------ll------------>| ++ +----+----+----------------------+----+ ++ | : : : | ++ +----+----+----------------------+----+ ++-->| po |<-- ++ |<--------paper width---------------->| ++@endExample ++ ++@noindent ++These dimensions are: ++ ++@ftable @code ++@item po ++@cindex left margin (@code{po}) ++@cindex margin, left (@code{po}) ++@cindex page offset (@code{po}) ++@cindex offset, page (@code{po}) ++@dfn{Page offset} -- this is the leftmost position of text on the final ++output, defining the @dfn{left margin}. ++ ++@item in ++@cindex indentation (@code{in}) ++@cindex line indentation (@code{in}) ++@dfn{Indentation} -- this is the distance from the left margin where ++text is printed. ++ ++@item ll ++@cindex line length (@code{ll}) ++@cindex length of line (@code{ll}) ++@dfn{Line length} -- this is the distance from the left margin to right ++margin. ++@end ftable ++ ++A simple demonstration: ++ ++@Example ++.ll 3i ++This is text without indentation. ++The line length has been set to 3\~inch. ++.in +.5i ++.ll -.5i ++Now the left and right margins are both increased. ++.in ++.ll ++Calling .in and .ll without parameters restore ++the previous values. ++@endExample ++ ++Result: ++ ++@Example ++This is text without indenta- ++tion. The line length has ++been set to 3 inch. ++ Now the left and ++ right margins are ++ both increased. ++Calling .in and .ll without ++parameters restore the previ- ++ous values. ++@endExample ++ ++@DefreqList {po, [@Var{offset}]} ++@DefreqItem {po, @t{+}@Var{offset}} ++@DefreqItem {po, @t{-}@Var{offset}} ++@DefregListEndx {.o} ++@pindex troffrc ++Set horizontal page offset to @var{offset} (or increment or decrement ++the current value by @var{offset}). Note that this request does not ++cause a break, so changing the page offset in the middle of text being ++filled may not yield the expected result. The initial value is ++1@dmn{i}. For TTY output devices, it is set to 0 in the startup file ++@file{troffrc}; the default scaling indicator is @samp{m} (and not ++@samp{v} as incorrectly documented in the original @acronym{UNIX} troff ++manual). ++ ++The current page offset can be found in the read-only number register ++@samp{.o}. ++ ++If @code{po} is called without an argument, the page offset is reset to ++the previous value before the last call to @code{po}. ++ ++@Example ++.po 3i ++\n[.o] ++ @result{} 720 ++.po -1i ++\n[.o] ++ @result{} 480 ++.po ++\n[.o] ++ @result{} 720 ++@endExample ++@endDefreq ++ ++@DefreqList {in, [@Var{indent}]} ++@DefreqItem {in, @t{+}@Var{indent}} ++@DefreqItem {in, @t{-}@Var{indent}} ++@DefregListEndx {.i} ++Set indentation to @var{indent} (or increment or decrement the current ++value by @var{indent}). This request causes a break. Initially, there ++is no indentation. ++ ++If @code{in} is called without an argument, the indentation is reset to ++the previous value before the last call to @code{in}. The default ++scaling indicator is @samp{m}. ++ ++The indentation is associated with the current environment ++(@pxref{Environments}). ++ ++If a negative indentation value is specified (which is not allowed), ++@code{gtroff} emits a warning of type @samp{range} and sets the ++indentation to zero. ++ ++The effect of @code{in} is delayed until a partially collected line (if ++it exists) is output. A temporary indentation value is reset to zero ++also. ++ ++The current indentation (as set by @code{in}) can be found in the ++read-only number register @samp{.i}. ++@endDefreq ++ ++@DefreqList {ti, offset} ++@DefreqItem {ti, @t{+}@Var{offset}} ++@DefreqItem {ti, @t{-}@Var{offset}} ++@DefregListEndx {.in} ++Temporarily indent the next output line by @var{offset}. If an ++increment or decrement value is specified, adjust the temporary ++indentation relative to the value set by the @code{in} request. ++ ++This request causes a break; its value is associated with the current ++environment (@pxref{Environments}). The default scaling indicator is ++@samp{m}. A call of @code{ti} without an argument is ignored. ++ ++If the total indentation value is negative (which is not allowed), ++@code{gtroff} emits a warning of type @samp{range} and sets the ++temporary indentation to zero. `Total indentation' is either ++@var{offset} if specified as an absolute value, or the temporary plus ++normal indentation, if @var{offset} is given as a relative value. ++ ++The effect of @code{ti} is delayed until a partially collected line (if ++it exists) is output. ++ ++The read-only number register @code{.in} is the indentation that applies ++to the current output line. ++ ++The difference between @code{.i} and @code{.in} is that the latter takes ++into account whether a partially collected line still uses the old ++indentation value or a temporary indentation value is active. ++@endDefreq ++ ++@DefreqList {ll, [@Var{length}]} ++@DefreqItem {ll, @t{+}@Var{length}} ++@DefreqItem {ll, @t{-}@Var{length}} ++@DefregItemx {.l} ++@DefregListEndx {.ll} ++Set the line length to @var{length} (or increment or decrement the ++current value by @var{length}). Initially, the line length is set to ++6.5@dmn{i}. The effect of @code{ll} is delayed until a partially ++collected line (if it exists) is output. The default scaling indicator ++is @samp{m}. ++ ++If @code{ll} is called without an argument, the line length is reset to ++the previous value before the last call to @code{ll}. If a negative ++line length is specified (which is not allowed), @code{gtroff} emits a ++warning of type @samp{range} and sets the line length to zero. ++ ++The line length is associated with the current environment ++(@pxref{Environments}). ++ ++@cindex line length register (@code{.l}) ++The current line length (as set by @code{ll}) can be found in the ++read-only number register @samp{.l}. The read-only number register ++@code{.ll} is the line length that applies to the current output line. ++ ++Similar to @code{.i} and @code{.in}, the difference between @code{.l} ++and @code{.ll} is that the latter takes into account whether a partially ++collected line still uses the old line length value. ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Line Control, Page Layout, Line Layout, gtroff Reference ++@section Line Control ++@cindex line control ++@cindex control, line ++ ++It is important to understand how @code{gtroff} handles input and output ++lines. ++ ++Many escapes use positioning relative to the input line. For example, ++this ++ ++@Example ++This is a \h'|1.2i'test. ++ ++This is a ++\h'|1.2i'test. ++@endExample ++ ++@noindent ++produces ++ ++@Example ++This is a test. ++ ++This is a test. ++@endExample ++ ++The main usage of this feature is to define macros that act exactly at ++the place where called. ++ ++@Example ++.\" A simple macro to underline a word ++.de underline ++. nop \\$1\l'|0\[ul]' ++.. ++@endExample ++ ++@noindent ++In the above example, @samp{|0} specifies a negative distance from the ++current position (at the end of the just emitted argument @code{\$1}) ++back to the beginning of the input line. Thus, the @samp{\l} escape ++draws a line from right to left. ++ ++@cindex input line continuation (@code{\}) ++@cindex line, input, continuation (@code{\}) ++@cindex continuation, input line (@code{\}) ++@cindex output line, continuation (@code{\c}) ++@cindex line, output, continuation (@code{\c}) ++@cindex continuation, output line (@code{\c}) ++@cindex interrupted line ++@cindex line, interrupted ++@code{gtroff} makes a difference between input and output line ++continuation; the latter is also called @dfn{interrupting} a line. ++ ++@DefescList {\\@key{RET}, , ,} ++@DefescItemx {\\c, , ,} ++@DefregListEndx {.int} ++Continue a line. @code{\@key{RET}} (this is a backslash at the end of a ++line immediately followed by a newline) works on the input level, ++suppressing the effects of the following newline in the input. ++ ++@Example ++This is a \ ++.test ++ @result{} This is a .test ++@endExample ++ ++The @samp{|} operator is also affected. ++ ++@cindex @code{\R}, after @code{\c} ++@code{\c} works on the output level. Anything after this escape on the ++same line is ignored except @code{\R}, which works as usual. Anything ++before @code{\c} on the same line is appended to the current partial ++output line. The next non-command line after an interrupted line counts ++as a new input line. ++ ++The visual results depend on whether no-fill mode is active. ++ ++@itemize @bullet ++@item ++@cindex @code{\c}, and no-fill mode ++@cindex no-fill mode, and @code{\c} ++@cindex mode, no-fill, and @code{\c} ++If no-fill mode is active (using the @code{nf} request), the next input ++text line after @code{\c} is handled as a continuation of the same input ++text line. ++ ++@Example ++.nf ++This is a \c ++test. ++ @result{} This is a test. ++@endExample ++ ++@item ++@cindex @code{\c}, and fill mode ++@cindex fill mode, and @code{\c} ++@cindex mode, fill, and @code{\c} ++If fill mode is active (using the @code{fi} request), a word interrupted ++with @code{\c} is continued with the text on the next input text line, ++without an intervening space. ++ ++@Example ++This is a te\c ++st. ++ @result{} This is a test. ++@endExample ++@end itemize ++ ++Note that an intervening control line that causes a break is stronger ++than @code{\c}, flushing out the current partial line in the usual way. ++ ++@cindex interrupted line register (@code{.int}) ++The @code{.int} register contains a positive value if the last output ++line was interrupted with @code{\c}; this is associated with the current ++environment (@pxref{Environments}). ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node Page Layout, Page Control, Line Control, gtroff Reference ++@section Page Layout ++@cindex page layout ++@cindex layout, page ++ ++@code{gtroff} provides some very primitive operations for controlling ++page layout. ++ ++@DefreqList {pl, [@Var{length}]} ++@DefreqItem {pl, @t{+}@Var{length}} ++@DefreqItem {pl, @t{-}@Var{length}} ++@DefregListEndx {.p} ++@cindex page length (@code{pl}) ++@cindex length of page (@code{pl}) ++Set the @dfn{page length} to @var{length} (or increment or decrement the ++current value by @var{length}). This is the length of the physical ++output page. The default scaling indicator is @samp{v}. ++ ++@cindex page length register (@code{.p}) ++The current setting can be found in the read-only number register ++@samp{.p}. ++ ++@cindex top margin ++@cindex margin, top ++@cindex bottom margin ++@cindex margin, bottom ++Note that this only specifies the size of the page, not the top and ++bottom margins. Those are not set by @code{gtroff} directly. ++@xref{Traps}, for further information on how to do this. ++ ++Negative @code{pl} values are possible also, but not very useful: No ++trap is sprung, and each line is output on a single page (thus ++suppressing all vertical spacing). ++ ++If no argument or an invalid argument is given, @code{pl} sets the page ++length to 11@dmn{i}. ++@endDefreq ++ ++@cindex headers ++@cindex footers ++@cindex titles ++@code{gtroff} provides several operations that help in setting up top ++and bottom titles (or headers and footers). ++ ++@Defreq {tl, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}} ++@cindex title line (@code{tl}) ++@cindex three-part title (@code{tl}) ++@cindex page number character (@code{%}) ++Print a @dfn{title line}. It consists of three parts: a left justified ++portion, a centered portion, and a right justified portion. The ++argument separator @samp{'} can be replaced with any character not ++occurring in the title line. The @samp{%} character is replaced with ++the current page number. This character can be changed with the ++@code{pc} request (see below). ++ ++Without argument, @code{tl} is ignored. ++ ++Some notes: ++ ++@itemize @bullet ++@item ++The line length set by the @code{ll} request is not honoured by ++@code{tl}; use the @code{lt} request (described below) instead, to ++control line length for text set by @code{tl}. ++ ++@item ++A title line is not restricted to the top or bottom of a page. ++ ++@item ++@code{tl} prints the title line immediately, ignoring a partially filled ++line (which stays untouched). ++ ++@item ++It is not an error to omit closing delimiters. For example, ++@w{@samp{.tl /foo}} is equivalent to @w{@samp{.tl /foo///}}: It prints a ++title line with the left justified word @samp{foo}; the centered and ++right justfied parts are empty. ++ ++@item ++@code{tl} accepts the same parameter delimiting characters as the ++@code{\A} escape; see @ref{Escapes}. ++@end itemize ++@endDefreq ++ ++@DefreqList {lt, [@Var{length}]} ++@DefreqItem {lt, @t{+}@Var{length}} ++@DefreqItem {lt, @t{-}@Var{length}} ++@DefregListEndx {.lt} ++@cindex length of title line (@code{lt}) ++@cindex title line, length (@code{lt}) ++@cindex title line length register (@code{.lt}) ++The title line is printed using its own line length, which is specified ++(or incremented or decremented) with the @code{lt} request. Initially, ++the title line length is set to 6.5@dmn{i}. If a negative line length ++is specified (which is not allowed), @code{gtroff} emits a warning of ++type @samp{range} and sets the title line length to zero. The default ++scaling indicator is @samp{m}. If @code{lt} is called without an ++argument, the title length is reset to the previous value before the ++last call to @code{lt}. ++ ++The current setting of this is available in the @code{.lt} read-only ++number register; it is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@DefreqList {pn, page} ++@DefreqItem {pn, @t{+}@Var{page}} ++@DefreqItem {pn, @t{-}@Var{page}} ++@DefregListEndx {.pn} ++@cindex page number (@code{pn}) ++@cindex number, page (@code{pn}) ++Change (increase or decrease) the page number of the @emph{next} page. ++The only argument is the page number; the request is ignored without a ++parameter. ++ ++The read-only number register @code{.pn} contains the number of the next ++page: either the value set by a @code{pn} request, or the number of the ++current page plus@tie{}1. ++@endDefreq ++ ++@Defreq {pc, [@Var{char}]} ++@cindex changing the page number character (@code{pc}) ++@cindex page number character, changing (@code{pc}) ++@vindex % ++Change the page number character (used by the @code{tl} request) to a ++different character. With no argument, this mechanism is disabled. ++Note that this doesn't affect the number register@tie{}@code{%}. ++@endDefreq ++ ++@xref{Traps}. ++ ++ ++@c ===================================================================== ++ ++@node Page Control, Fonts and Symbols, Page Layout, gtroff Reference ++@section Page Control ++@cindex page control ++@cindex control, page ++ ++@DefreqList {bp, [@Var{page}]} ++@DefreqItem {bp, @t{+}@Var{page}} ++@DefreqItem {bp, @t{-}@Var{page}} ++@DefregListEndx {%} ++@cindex new page (@code{bp}) ++@cindex page, new (@code{bp}) ++Stop processing the current page and move to the next page. This ++request causes a break. It can also take an argument to set (increase, ++decrease) the page number of the next page (which actually becomes the ++current page after @code{bp} has finished). The difference between ++@code{bp} and @code{pn} is that @code{pn} does not cause a break or ++actually eject a page. @xref{Page Layout}. ++ ++@Example ++.de newpage \" define macro ++'bp \" begin page ++'sp .5i \" vertical space ++.tl 'left top'center top'right top' \" title ++'sp .3i \" vertical space ++.. \" end macro ++@endExample ++ ++@cindex @code{bp} request, and top-level diversion ++@cindex top-level diversion, and @code{bp} ++@cindex diversion, top-level, and @code{bp} ++@code{bp} has no effect if not called within the top-level diversion ++(@pxref{Diversions}). ++ ++@cindex page number register (@code{%}) ++@cindex current page number (@code{%}) ++The read-write register@tie{}@code{%} holds the current page number. ++ ++The number register @code{.pe} is set to@tie{}1 while @code{bp} is ++active. @xref{Page Location Traps}. ++@endDefreq ++ ++@Defreq {ne, [@Var{space}]} ++@cindex orphan lines, preventing with @code{ne} ++@cindex conditional page break (@code{ne}) ++@cindex page break, conditional (@code{ne}) ++It is often necessary to force a certain amount of space before a new ++page occurs. This is most useful to make sure that there is not a ++single @dfn{orphan} line left at the bottom of a page. The @code{ne} ++request ensures that there is a certain distance, specified by the first ++argument, before the next page is triggered (see @ref{Traps}, for ++further information). The default scaling indicator for @code{ne} is ++@samp{v}; the default value of @var{space} is@tie{}1@dmn{v} if no ++argument is given. ++ ++For example, to make sure that no fewer than 2@tie{}lines get orphaned, ++do the following before each paragraph: ++ ++@Example ++.ne 2 ++text text text ++@endExample ++ ++@code{ne} then automatically causes a page break if there is space for ++one line only. ++@endDefreq ++ ++@DefreqList {sv, [@Var{space}]} ++@DefreqListEndx {os, } ++@cindex @code{ne} request, comparison with @code{sv} ++@code{sv} is similar to the @code{ne} request; it reserves the specified ++amount of vertical space. If the desired amount of space exists before ++the next trap (or the bottom page boundary if no trap is set), the space ++is output immediately (ignoring a partially filled line, which stays ++untouched). If there is not enough space, it is stored for later output ++via the @code{os} request. The default value is@tie{}1@dmn{v} if no ++argument is given; the default scaling indicator is @samp{v}. ++ ++@cindex @code{sv} request, and no-space mode ++@cindex @code{os} request, and no-space mode ++Both @code{sv} and @code{os} ignore no-space mode. While the @code{sv} ++request allows negative values for @var{space}, @code{os} ignores them. ++@endDefreq ++ ++@Defreg {nl} ++@cindex current vertical position (@code{nl}) ++@cindex vertical position, current (@code{nl}) ++@cindex position, vertical, current (@code{nl}) ++This register contains the current vertical position. If the vertical ++position is zero and the top of page transition hasn't happened yet, ++@code{nl} is set to negative value. @code{gtroff} itself does this at ++the very beginning of a document before anything has been printed, but ++the main usage is to plant a header trap on a page if this page has ++already started. ++ ++Consider the following: ++ ++@Example ++.de xxx ++. sp ++. tl ''Header'' ++. sp ++.. ++. ++First page. ++.bp ++.wh 0 xxx ++.nr nl (-1) ++Second page. ++@endExample ++ ++@noindent ++Result: ++ ++@Example ++First page. ++ ++... ++ ++ Header ++ ++Second page. ++ ++... ++@endExample ++ ++@noindent ++Without resetting @code{nl} to a negative value, the just planted trap ++would be active beginning with the @emph{next} page, not the current ++one. ++ ++@xref{Diversions}, for a comparison with the @code{.h} and @code{.d} ++registers. ++@endDefreg ++ ++ ++@c ===================================================================== ++ ++@node Fonts and Symbols, Sizes, Page Control, gtroff Reference ++@section Fonts and Symbols ++@cindex fonts ++ ++@code{gtroff} can switch fonts at any point in the text. ++ ++The basic set of fonts is @samp{R}, @samp{I}, @samp{B}, and @samp{BI}. ++These are Times Roman, Italic, Bold, and Bold Italic. For non-TTY ++devices, there is also at least one symbol font that contains various ++special symbols (Greek, mathematics). ++ ++@menu ++* Changing Fonts:: ++* Font Families:: ++* Font Positions:: ++* Using Symbols:: ++* Character Classes:: ++* Special Fonts:: ++* Artificial Fonts:: ++* Ligatures and Kerning:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Changing Fonts, Font Families, Fonts and Symbols, Fonts and Symbols ++@subsection Changing Fonts ++@cindex fonts ++ ++@DefreqList {ft, [@Var{font}]} ++@DefescItemx {\\f, , f, } ++@DefescItem {\\f, @Lparen{}, fn, } ++@DefescItem {\\f, @Lbrack{}, font, @Rbrack{}} ++@DefregListEndx {.sty} ++@cindex changing fonts (@code{ft}, @code{\f}) ++@cindex fonts, changing (@code{ft}, @code{\f}) ++@cindex @code{sty} request, and changing fonts ++@cindex @code{fam} request, and changing fonts ++@cindex @code{\F}, and changing fonts ++@kindex styles ++@kindex family ++@pindex DESC ++The @code{ft} request and the @code{\f} escape change the current font ++to @var{font} (one-character name@tie{}@var{f}, two-character name ++@var{fn}). ++ ++If @var{font} is a style name (as set with the @code{sty} request or ++with the @code{styles} command in the @file{DESC} file), use it within ++the current font family (as set with the @code{fam} request, @code{\F} ++escape, or with the @code{family} command in the @file{DESC} file). ++ ++It is not possible to switch to a font with the name @samp{DESC} ++(whereas this name could be used as a style name; however, this is not ++recommended). ++ ++@cindex previous font (@code{ft}, @code{\f[]}, @code{\fP}) ++@cindex font, previous (@code{ft}, @code{\f[]}, @code{\fP}) ++With no argument or using @samp{P} as an argument, @code{.ft} switches ++to the previous font. Use @code{\f[]} to do this with the escape. The ++old syntax forms @code{\fP} or @code{\f[P]} are also supported. ++ ++Fonts are generally specified as upper-case strings, which are usually ++1@tie{}to 4 characters representing an abbreviation or acronym of the ++font name. This is no limitation, just a convention. ++ ++The example below produces two identical lines. ++ ++@Example ++eggs, bacon, ++.ft B ++spam ++.ft ++and sausage. ++ ++eggs, bacon, \fBspam\fP and sausage. ++@endExample ++ ++Note that @code{\f} doesn't produce an input token in @code{gtroff}. As ++a consequence, it can be used in requests like @code{mc} (which expects ++a single character as an argument) to change the font on the fly: ++ ++@Example ++.mc \f[I]x\f[] ++@endExample ++ ++The current style name is available in the read-only number register ++@samp{.sty} (this is a string-valued register); if the current font ++isn't a style, the empty string is returned. It is associated with the ++current environment. ++ ++@xref{Font Positions}, for an alternative syntax. ++@endDefreq ++ ++@Defreq {ftr, f [@Var{g}]} ++@cindex font translation (@code{ftr}) ++@cindex @code{ft} request, and font translations ++@cindex @code{ul} request, and font translations ++@cindex @code{bd} request, and font translations ++@cindex @code{\f}, and font translations ++@cindex @code{cs} request, and font translations ++@cindex @code{tkf} request, and font translations ++@cindex @code{special} request, and font translations ++@cindex @code{fspecial} request, and font translations ++@cindex @code{fp} request, and font translations ++@cindex @code{sty} request, and font translations ++@cindex @code{if} request, and font translations ++@cindex @code{ie} request, and font translations ++@cindex @code{while} request, and font translations ++Translate font@tie{}@var{f} to font@tie{}@var{g}. Whenever a font ++named@tie{}@var{f} is referred to in a @code{\f} escape sequence, in the ++@code{F} and @code{S} conditional operators, or in the @code{ft}, ++@code{ul}, @code{bd}, @code{cs}, @code{tkf}, @code{special}, ++@code{fspecial}, @code{fp}, or @code{sty} requests, font@tie{}@var{g} is ++used. If @var{g} is missing or equal to@tie{}@var{f} the translation is ++undone. ++ ++Note that it is not possible to chain font translations. Example: ++ ++@Example ++.ftr XXX TR ++.ftr XXX YYY ++.ft XXX ++ @result{} warning: can't find font `XXX' ++@endExample ++@endDefreq ++ ++@DefreqList {fzoom, f [@Var{zoom}]} ++@DefregListEndx {.zoom} ++@cindex magnification of a font (@code{fzoom}) ++@cindex font, magnification (@code{fzoom}) ++@cindex zoom factor of a font (@code{fzoom}) ++@cindex factor, zoom, of a font (@code{fzoom}) ++@cindex font, zoom factor (@code{fzoom}) ++@cindex optical size of a font ++@cindex font, optical size ++@cindex size, optical, of a font ++Set magnification of font@tie{}@var{f} to factor @var{zoom}, which must ++be a non-negative integer multiple of 1/1000th. This request is useful ++to adjust the optical size of a font in relation to the others. In the ++example below, font @code{CR} is magnified by 10% (the zoom factor is ++thus 1.1). ++ ++@Example ++.fam P ++.fzoom CR 1100 ++.ps 12 ++Palatino and \f[CR]Courier\f[] ++@endExample ++ ++A missing or zero value of @var{zoom} is the same as a value of 1000, ++which means no magnification. @var{f}@tie{}must be a real font name, ++not a style. ++ ++Note that the magnification of a font is completely transparent to ++troff; a change of the zoom factor doesn't cause any effect except that ++the dimensions of glyphs, (word) spaces, kerns, etc., of the affected ++font are adjusted accordingly. ++ ++The zoom factor of the current font is available in the read-only number ++register @samp{.zoom}, in multiples of 1/1000th. It returns zero if ++there is no magnification. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Font Families, Font Positions, Changing Fonts, Fonts and Symbols ++@subsection Font Families ++@cindex font families ++@cindex families, font ++@cindex font styles ++@cindex styles, font ++ ++Due to the variety of fonts available, @code{gtroff} has added the ++concept of @dfn{font families} and @dfn{font styles}. The fonts are ++specified as the concatenation of the font family and style. Specifying ++a font without the family part causes @code{gtroff} to use that style of ++the current family. ++ ++@cindex PostScript fonts ++@cindex fonts, PostScript ++Currently, fonts for the devices @option{-Tps}, @option{-Tpdf}, ++@option{-Tdvi}, @option{-Tlj4}, @option{-Tlbp}, and the X11 fonts are ++set up to this mechanism. By default, @code{gtroff} uses the Times ++family with the four styles @samp{R}, @samp{I}, @samp{B}, and @samp{BI}. ++ ++This way, it is possible to use the basic four fonts and to select a ++different font family on the command line (@pxref{Groff Options}). ++ ++@DefreqList {fam, [@Var{family}]} ++@DefregItemx {.fam} ++@DefescItemx {\\F, , f, } ++@DefescItem {\\F, @Lparen{}, fm, } ++@DefescItem {\\F, @Lbrack{}, family, @Rbrack{}} ++@DefregListEndx {.fn} ++@cindex changing font family (@code{fam}, @code{\F}) ++@cindex font family, changing (@code{fam}, @code{\F}) ++Switch font family to @var{family} (one-character name@tie{}@var{f}, ++two-character name @var{fm}). If no argument is given, switch back to ++the previous font family. Use @code{\F[]} to do this with the escape. ++Note that @code{\FP} doesn't work; it selects font family @samp{P} ++instead. ++ ++The value at start-up is @samp{T}. The current font family is available ++in the read-only number register @samp{.fam} (this is a string-valued ++register); it is associated with the current environment. ++ ++@Example ++spam, ++.fam H \" helvetica family ++spam, \" used font is family H + style R = HR ++.ft B \" family H + style B = font HB ++spam, ++.fam T \" times family ++spam, \" used font is family T + style B = TB ++.ft AR \" font AR (not a style) ++baked beans, ++.ft R \" family T + style R = font TR ++and spam. ++@endExample ++ ++Note that @code{\F} doesn't produce an input token in @code{gtroff}. As ++a consequence, it can be used in requests like @code{mc} (which expects ++a single character as an argument) to change the font family on the fly: ++ ++@Example ++.mc \F[P]x\F[] ++@endExample ++ ++The @samp{.fn} register contains the current @dfn{real font name} of the ++current font. This is a string-valued register. If the current font is ++a style, the value of @code{\n[.fn]} is the proper concatenation of ++family and style name. ++@endDefreq ++ ++@Defreq {sty, n style} ++@cindex changing font style (@code{sty}) ++@cindex font style, changing (@code{sty}) ++@cindex @code{cs} request, and font styles ++@cindex @code{bd} request, and font styles ++@cindex @code{tkf} request, and font styles ++@cindex @code{uf} request, and font styles ++@cindex @code{fspecial} request, and font styles ++Associate @var{style} with font position@tie{}@var{n}. A font position ++can be associated either with a font or with a style. The current font ++is the index of a font position and so is also either a font or a style. ++If it is a style, the font that is actually used is the font which name ++is the concatenation of the name of the current family and the name of ++the current style. For example, if the current font is@tie{}1 and font ++position@tie{}1 is associated with style @samp{R} and the current font ++family is @samp{T}, then font @samp{TR} is used. If the current font is ++not a style, then the current family is ignored. If the requests ++@code{cs}, @code{bd}, @code{tkf}, @code{uf}, or @code{fspecial} are ++applied to a style, they are instead applied to the member of the ++current family corresponding to that style. ++ ++@var{n}@tie{}must be a non-negative integer value. ++ ++@pindex DESC ++@kindex styles ++The default family can be set with the @option{-f} option (@pxref{Groff ++Options}). The @code{styles} command in the @file{DESC} file controls ++which font positions (if any) are initially associated with styles ++rather than fonts. For example, the default setting for @sc{PostScript} ++fonts ++ ++@Example ++styles R I B BI ++@endExample ++ ++@noindent ++is equivalent to ++ ++@Example ++.sty 1 R ++.sty 2 I ++.sty 3 B ++.sty 4 BI ++@endExample ++ ++@code{fam} and @code{\F} always check whether the current font position ++is valid; this can give surprising results if the current font position ++is associated with a style. ++ ++In the following example, we want to access the @sc{PostScript} font ++@code{FooBar} from the font family @code{Foo}: ++ ++@Example ++.sty \n[.fp] Bar ++.fam Foo ++ @result{} warning: can't find font `FooR' ++@endExample ++ ++@noindent ++The default font position at start-up is@tie{}1; for the @sc{PostScript} ++device, this is associated with style @samp{R}, so @code{gtroff} tries ++to open @code{FooR}. ++ ++A solution to this problem is to use a dummy font like the following: ++ ++@Example ++.fp 0 dummy TR \" set up dummy font at position 0 ++.sty \n[.fp] Bar \" register style `Bar' ++.ft 0 \" switch to font at position 0 ++.fam Foo \" activate family `Foo' ++.ft Bar \" switch to font `FooBar' ++@endExample ++ ++@xref{Font Positions}. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Font Positions, Using Symbols, Font Families, Fonts and Symbols ++@subsection Font Positions ++@cindex font positions ++@cindex positions, font ++ ++For the sake of old phototypesetters and compatibility with old versions ++of @code{troff}, @code{gtroff} has the concept of font @dfn{positions}, ++on which various fonts are mounted. ++ ++@DefreqList {fp, pos font [@Var{external-name}]} ++@DefregItemx {.f} ++@DefregListEndx {.fp} ++@cindex mounting font (@code{fp}) ++@cindex font, mounting (@code{fp}) ++Mount font @var{font} at position @var{pos} (which must be a ++non-negative integer). This numeric position can then be referred to ++with font changing commands. When @code{gtroff} starts it is using font ++position@tie{}1 (which must exist; position@tie{}0 is unused usually at ++start-up). ++ ++@cindex font position register (@code{.f}) ++The current font in use, as a font position, is available in the ++read-only number register @samp{.f}. This can be useful to remember the ++current font for later recall. It is associated with the current ++environment (@pxref{Environments}). ++ ++@Example ++.nr save-font \n[.f] ++.ft B ++... text text text ... ++.ft \n[save-font] ++@endExample ++ ++@cindex next free font position register (@code{.fp}) ++The number of the next free font position is available in the read-only ++number register @samp{.fp}. This is useful when mounting a new font, ++like so: ++ ++@Example ++.fp \n[.fp] NEATOFONT ++@endExample ++ ++@pindex DESC@r{, and font mounting} ++Fonts not listed in the @file{DESC} file are automatically mounted on ++the next available font position when they are referenced. If a font is ++to be mounted explicitly with the @code{fp} request on an unused font ++position, it should be mounted on the first unused font position, which ++can be found in the @code{.fp} register. Although @code{gtroff} does ++not enforce this strictly, it is not allowed to mount a font at a ++position whose number is much greater (approx.@: 1000 positions) than ++that of any currently used position. ++ ++The @code{fp} request has an optional third argument. This argument ++gives the external name of the font, which is used for finding the font ++description file. The second argument gives the internal name of the ++font, which is used to refer to the font in @code{gtroff} after it has ++been mounted. If there is no third argument then the internal name is ++used as the external name. This feature makes it possible to use fonts ++with long names in compatibility mode. ++@endDefreq ++ ++Both the @code{ft} request and the @code{\f} escape have alternative ++syntax forms to access font positions. ++ ++@DefreqList {ft, nnn} ++@DefescItemx {\\f, , n, } ++@DefescItem {\\f, @Lparen{}, nn, } ++@DefescListEnd {\\f, @Lbrack{}, nnn, @Rbrack{}} ++@cindex changing font position (@code{\f}) ++@cindex font position, changing (@code{\f}) ++@cindex @code{sty} request, and font positions ++@cindex @code{fam} request, and font positions ++@cindex @code{\F}, and font positions ++@kindex styles ++@kindex family ++@pindex DESC ++Change the current font position to @var{nnn} (one-digit ++position@tie{}@var{n}, two-digit position @var{nn}), which must be a ++non-negative integer. ++ ++If @var{nnn} is associated with a style (as set with the @code{sty} ++request or with the @code{styles} command in the @file{DESC} file), use ++it within the current font family (as set with the @code{fam} request, ++the @code{\F} escape, or with the @code{family} command in the ++@file{DESC} file). ++ ++@Example ++this is font 1 ++.ft 2 ++this is font 2 ++.ft \" switch back to font 1 ++.ft 3 ++this is font 3 ++.ft ++this is font 1 again ++@endExample ++ ++@xref{Changing Fonts}, for the standard syntax form. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Using Symbols, Character Classes, Font Positions, Fonts and Symbols ++@subsection Using Symbols ++@cindex using symbols ++@cindex symbols, using ++ ++@cindex glyph ++@cindex character ++@cindex ligature ++A @dfn{glyph} is a graphical representation of a @dfn{character}. While ++a character is an abstract entity containing semantic information, a ++glyph is something that can be actually seen on screen or paper. It is ++possible that a character has multiple glyph representation forms (for ++example, the character `A' can be either written in a roman or an italic ++font, yielding two different glyphs); sometimes more than one character ++maps to a single glyph (this is a @dfn{ligature} -- the most common is ++`fi'). ++ ++@cindex symbol ++@cindex special fonts ++@kindex fonts ++@pindex DESC ++@cindex @code{special} request, and glyph search order ++@cindex @code{fspecial} request, and glyph search order ++A @dfn{symbol} is simply a named glyph. Within @code{gtroff}, all glyph ++names of a particular font are defined in its font file. If the user ++requests a glyph not available in this font, @code{gtroff} looks up an ++ordered list of @dfn{special fonts}. By default, the @sc{PostScript} ++output device supports the two special fonts @samp{SS} (slanted symbols) ++and @samp{S} (symbols) (the former is looked up before the latter). ++Other output devices use different names for special fonts. Fonts ++mounted with the @code{fonts} keyword in the @file{DESC} file are ++globally available. To install additional special fonts locally (i.e.@: ++for a particular font), use the @code{fspecial} request. ++ ++Here are the exact rules how @code{gtroff} searches a given symbol: ++ ++@itemize @bullet ++@item ++If the symbol has been defined with the @code{char} request, use it. ++This hides a symbol with the same name in the current font. ++ ++@item ++Check the current font. ++ ++@item ++If the symbol has been defined with the @code{fchar} request, use it. ++ ++@item ++Check whether the current font has a font-specific list of special ++fonts; test all fonts in the order of appearance in the last ++@code{fspecial} call if appropriate. ++ ++@item ++If the symbol has been defined with the @code{fschar} request for the ++current font, use it. ++ ++@item ++Check all fonts in the order of appearance in the last @code{special} ++call. ++ ++@item ++If the symbol has been defined with the @code{schar} request, use it. ++ ++@item ++As a last resort, consult all fonts loaded up to now for special fonts ++and check them, starting with the lowest font number. Note that this ++can sometimes lead to surprising results since the @code{fonts} line in ++the @file{DESC} file often contains empty positions, which are filled ++later on. For example, consider the following: ++ ++@Example ++fonts 3 0 0 FOO ++@endExample ++ ++@noindent ++This mounts font @code{foo} at font position@tie{}3. We assume that ++@code{FOO} is a special font, containing glyph @code{foo}, and that no ++font has been loaded yet. The line ++ ++@Example ++.fspecial BAR BAZ ++@endExample ++ ++@noindent ++makes font @code{BAZ} special only if font @code{BAR} is active. We ++further assume that @code{BAZ} is really a special font, i.e., the font ++description file contains the @code{special} keyword, and that it also ++contains glyph @code{foo} with a special shape fitting to font ++@code{BAR}. After executing @code{fspecial}, font @code{BAR} is loaded ++at font position@tie{}1, and @code{BAZ} at position@tie{}2. ++ ++We now switch to a new font @code{XXX}, trying to access glyph ++@code{foo} that is assumed to be missing. There are neither ++font-specific special fonts for @code{XXX} nor any other fonts made ++special with the @code{special} request, so @code{gtroff} starts the ++search for special fonts in the list of already mounted fonts, with ++increasing font positions. Consequently, it finds @code{BAZ} before ++@code{FOO} even for @code{XXX}, which is not the intended behaviour. ++@end itemize ++ ++@xref{Font Files}, and @ref{Special Fonts}, for more details. ++ ++@cindex list of available glyphs (@cite{groff_char(7)} man page) ++@cindex available glyphs, list (@cite{groff_char(7)} man page) ++@cindex glyphs, available, list (@cite{groff_char(7)} man page) ++The list of available symbols is device dependent; see the ++@cite{groff_char(7)} man page for a complete list of all glyphs. For ++example, say ++ ++@Example ++man -Tdvi groff_char > groff_char.dvi ++@endExample ++ ++@noindent ++for a list using the default DVI fonts (not all versions of the ++@code{man} program support the @option{-T} option). If you want to use ++an additional macro package to change the used fonts, @code{groff} must ++be called directly: ++ ++@Example ++groff -Tdvi -mec -man groff_char.7 > groff_char.dvi ++@endExample ++ ++@cindex composite glyph names ++@cindex glyph names, composite ++@cindex groff glyph list (GGL) ++@cindex GGL (groff glyph list) ++@cindex adobe glyph list (AGL) ++@cindex AGL (adobe glyph list) ++Glyph names not listed in groff_char(7) are derived algorithmically, ++using a simplified version of the Adobe Glyph List (AGL) algorithm, which ++is described in ++@uref{http://partners.adobe.com@//public@//developer@//opentype@//index_glyph.html}. ++The (frozen) set of glyph names that can't be derived algorithmically ++is called @dfn{groff glyph list (GGL)}. ++ ++@itemize @bullet ++@item ++A glyph for Unicode character U+@var{XXXX}[@var{X}[@var{X}]], which is ++not a composite character is named ++@code{u@var{XXXX}@r{[}@var{X}@r{[}@var{X}@r{]]}}. @var{X} must be an ++uppercase hexadecimal digit. Examples: @code{u1234}, @code{u008E}, ++@code{u12DB8}. The largest Unicode value is 0x10FFFF. There must be at ++least four @code{X} digits; if necessary, add leading zeroes (after the ++@samp{u}). No zero padding is allowed for character codes greater than ++0xFFFF. Surrogates (i.e., Unicode values greater than 0xFFFF ++represented with character codes from the surrogate area U+D800-U+DFFF) ++are not allowed too. ++ ++@item ++A glyph representing more than a single input character is named ++ ++@display ++@samp{u} @var{component1} @samp{_} @var{component2} @samp{_} @var{component3} @dots{} ++@end display ++ ++@noindent ++Example: @code{u0045_0302_0301}. ++ ++For simplicity, all Unicode characters that are composites must be ++decomposed maximally (this is normalization form@tie{}D in the Unicode ++standard); for example, @code{u00CA_0301} is not a valid glyph name ++since U+00CA (@sc{latin capital letter e with circumflex}) can be ++further decomposed into U+0045 (@sc{latin capital letter e}) and U+0302 ++(@sc{combining circumflex accent}). @code{u0045_0302_0301} is thus the ++glyph name for U+1EBE, @sc{latin capital letter e with circumflex and ++acute}. ++ ++@item ++groff maintains a table to decompose all algorithmically derived glyph ++names that are composites itself. For example, @code{u0100} (@sc{latin ++letter a with macron}) is automatically decomposed into ++@code{u0041_0304}. Additionally, a glyph name of the GGL is preferred ++to an algorithmically derived glyph name; groff also automatically does ++the mapping. Example: The glyph @code{u0045_0302} is mapped to ++@code{^E}. ++ ++@item ++glyph names of the GGL can't be used in composite glyph names; for ++example, @code{^E_u0301} is invalid. ++@end itemize ++ ++@DefescList {\\, @Lparen{}, nm, } ++@DefescItem {\\, @Lbrack{}, name, @Rbrack{}} ++@DefescListEnd {\\, @Lbrack{}, component1 component2 @dots{}, @Rbrack{}} ++Insert a symbol @var{name} (two-character name @var{nm}) or a composite ++glyph with component glyphs @var{component1}, @var{component2}, ++@enddots{} There is no special syntax for one-character names -- the ++natural form @samp{\@var{n}} would collide with escapes.@footnote{Note ++that a one-character symbol is not the same as an input character, i.e., ++the character @code{a} is not the same as @code{\[a]}. By default, ++@code{groff} defines only a single one-character symbol, @code{\[-]}; it ++is usually accessed as @code{\-}. On the other hand, @code{gtroff} has ++the special feature that @code{\[char@var{XXX}]} is the same as the ++input character with character code @var{XXX}. For example, ++@code{\[char97]} is identical to the letter @code{a} if @acronym{ASCII} ++encoding is active.} ++ ++If @var{name} is undefined, a warning of type @samp{char} is generated, ++and the escape is ignored. @xref{Debugging}, for information about ++warnings. ++ ++groff resolves @code{\[...]} with more than a single component as ++follows: ++ ++@itemize @bullet ++@item ++Any component that is found in the GGL is converted to the ++@code{u@var{XXXX}} form. ++ ++@item ++Any component @code{u@var{XXXX}} that is found in the list of ++decomposable glyphs is decomposed. ++ ++@item ++The resulting elements are then concatenated with @samp{_} in between, ++dropping the leading @samp{u} in all elements but the first. ++@end itemize ++ ++No check for the existence of any component (similar to @code{tr} ++request) is done. ++ ++Examples: ++ ++@table @code ++@item \[A ho] ++@samp{A} maps to @code{u0041}, @samp{ho} maps to @code{u02DB}, thus the ++final glyph name would be @code{u0041_02DB}. Note this is not the ++expected result: The ogonek glyph @samp{ho} is a spacing ogonek, but for ++a proper composite a non-spacing ogonek (U+0328) is necessary. Looking ++into the file @file{composite.tmac} one can find @w{@samp{.composite ho ++u0328}}, which changes the mapping of @samp{ho} while a composite glyph ++name is constructed, causing the final glyph name to be ++@code{u0041_0328}. ++ ++@item \[^E u0301] ++@itemx \[^E aa] ++@itemx \[E a^ aa] ++@itemx \[E ^ '] ++@samp{^E} maps to @code{u0045_0302}, thus the final glyph name is ++@code{u0045_0302_0301} in all forms (assuming proper calls of the ++@code{composite} request). ++@end table ++ ++It is not possible to define glyphs with names like @w{@samp{A ho}} ++within a groff font file. This is not really a limitation; instead, you ++have to define @code{u0041_0328}. ++@endDefesc ++ ++@Defesc {\\C, ', xxx, '} ++@cindex named character (@code{\C}) ++@cindex character, named (@code{\C}) ++Typeset the glyph named @var{xxx}.@footnote{@code{\C} is actually a ++misnomer since it accesses an output glyph.} Normally it is more ++convenient to use @code{\[@var{xxx}]}, but @code{\C} has the advantage ++that it is compatible with newer versions of @acronym{AT&T} @code{troff} ++and is available in compatibility mode. ++@endDefesc ++ ++@Defreq {composite, from to} ++@pindex composite.tmac ++Map glyph name @var{from} to glyph name @var{to} if it is used in ++@code{\[...]} with more than one component. See above for examples. ++ ++This mapping is based on glyph names only; no check for the existence of ++either glyph is done. ++ ++A set of default mappings for many accents can be found in the file ++@file{composite.tmac}, which is loaded at start-up. ++@endDefreq ++ ++@Defesc {\\N, ', n, '} ++@cindex numbered glyph (@code{\N}) ++@cindex glyph, numbered (@code{\N}) ++@cindex @code{char} request, used with @code{\N} ++@cindex Unicode ++Typeset the glyph with code@tie{}@var{n} in the current font ++(@code{n}@tie{}is @strong{not} the input character code). The number ++@var{n}@tie{}can be any non-negative decimal integer. Most devices only ++have glyphs with codes between 0 and@tie{}255; the Unicode output device ++uses codes in the range 0--65535. If the current font does not contain ++a glyph with that code, special fonts are @emph{not} searched. The ++@code{\N} escape sequence can be conveniently used in conjunction with ++the @code{char} request: ++ ++@Example ++.char \[phone] \f[ZD]\N'37' ++@endExample ++ ++@noindent ++@pindex DESC ++@cindex unnamed glyphs ++@cindex glyphs, unnamed ++The code of each glyph is given in the fourth column in the font ++description file after the @code{charset} command. It is possible to ++include unnamed glyphs in the font description file by using a name of ++@samp{---}; the @code{\N} escape sequence is the only way to use these. ++ ++No kerning is applied to glyphs accessed with @code{\N}. ++@endDefesc ++ ++Some escape sequences directly map onto special glyphs. ++ ++@Defesc {\\', , , } ++This is a backslash followed by the apostrophe character, ++@acronym{ASCII} character @code{0x27} (@acronym{EBCDIC} character ++@code{0x7D}). The same as @code{\[aa]}, the acute accent. ++@endDefesc ++ ++@Defesc {\\`, , , } ++This is a backslash followed by @acronym{ASCII} character @code{0x60} ++(@acronym{EBCDIC} character @code{0x79} usually). The same as ++@code{\[ga]}, the grave accent. ++@endDefesc ++ ++@Defesc {\\-, , , } ++This is the same as @code{\[-]}, the minus sign in the current font. ++@endDefesc ++ ++@Defesc {\\_, , , } ++This is the same as @code{\[ul]}, the underline character. ++@endDefesc ++ ++@Defreq {cflags, n c1 c2 @dots{}} ++@cindex glyph properties (@code{cflags}) ++@cindex character properties (@code{cflags}) ++@cindex properties of glyphs (@code{cflags}) ++@cindex properties of characters (@code{cflags}) ++Input characters and symbols have certain properties associated with ++it.@footnote{Note that the output glyphs themselves don't have such ++properties. For @code{gtroff}, a glyph is a numbered box with a given ++width, depth, and height, nothing else. All manipulations with the ++@code{cflags} request work on the input level.} These properties can be ++modified with the @code{cflags} request. The first argument is the sum ++of the desired flags and the remaining arguments are the characters or ++symbols to have those properties. It is possible to omit the spaces ++between the characters or symbols. Instead of single characters or ++symbols you can also use character classes (see @ref{Character Classes} ++for more details). ++ ++@table @code ++@item 1 ++@cindex end-of-sentence characters ++@cindex characters, end-of-sentence ++The character ends sentences (initially characters @samp{.?!} have this ++property). ++ ++@item 2 ++@cindex hyphenating characters ++@cindex characters, hyphenation ++Lines can be broken before the character (initially no characters have ++this property). This only works if both the characters before and after ++have non-zero hyphenation codes (as set with the @code{hcode} request). ++Use value@tie{}64 to override this behaviour. ++ ++@item 4 ++@cindex @code{hy} glyph, and @code{cflags} ++@cindex @code{em} glyph, and @code{cflags} ++Lines can be broken after the character (initially the character ++@samp{-} and the symbols @samp{\[hy]} and @samp{\[em]} have this ++property). This only works if both the characters before and after have ++non-zero hyphenation codes (as set with the @code{hcode} request). Use ++value@tie{}64 to override this behaviour. ++ ++@item 8 ++@cindex overlapping characters ++@cindex characters, overlapping ++@cindex @code{ul} glyph, and @code{cflags} ++@cindex @code{rn} glyph, and @code{cflags} ++@cindex @code{ru} glyph, and @code{cflags} ++@cindex @code{radicalex} glyph, and @code{cflags} ++@cindex @code{sqrtex} glyph, and @code{cflags} ++The character overlaps horizontally if used as a horizontal line ++building element. Initially the symbols @samp{\[ul]}, @samp{\[rn]}, ++@samp{\[ru]}, @samp{\[radicalex]}, and @samp{\[sqrtex]} have this ++property. ++ ++@item 16 ++@cindex @code{br} glyph, and @code{cflags} ++The character overlaps vertically if used as vertical line building ++element. Initially symbol @samp{\[br]} has this property. ++ ++@item 32 ++@cindex transparent characters ++@cindex character, transparent ++@cindex @code{"}, at end of sentence ++@cindex @code{'}, at end of sentence ++@cindex @code{)}, at end of sentence ++@cindex @code{]}, at end of sentence ++@cindex @code{*}, at end of sentence ++@cindex @code{dg} glyph, at end of sentence ++@cindex @code{rq} glyph, at end of sentence ++@cindex @code{cq} glyph, at end of sentence ++An end-of-sentence character followed by any number of characters with ++this property is treated as the end of a sentence if followed by a ++newline or two spaces; in other words the character is @dfn{transparent} ++for the purposes of end-of-sentence recognition -- this is the same as ++having a zero space factor in @TeX{} (initially characters @samp{"')]*} ++and the symbols @samp{\[dg]}, @samp{\[rq]}, and @samp{\[cq]} have this ++property). ++ ++@item 64 ++Ignore hyphenation code values of the surrounding characters. Use this ++in combination with values 2 and@tie{}4 (initially no characters have ++this property). For example, if you need an automatic break point after ++the hyphen in number ranges like `3000-5000', insert ++ ++@Example ++.cflags 68 - ++@endExample ++ ++@noindent ++into your document. Note, however, that this can lead to bad layout if ++done without thinking; in most situations, a better solution instead of ++changing the @code{cflags} value is to insert @code{\:} right after the ++hyphen at the places that really need a break point. ++ ++@item 128 ++Prohibit a line break before the character, but allow a line break after ++the character. This works only in combination with flags 256 and 512 ++(see below) and has no effect otherwise. ++ ++@item 256 ++Prohibit a line break after the character, but allow a line break before ++the character. This works only in combination with flags 128 and 512 ++(see below) and has no effect otherwise. ++ ++@item 512 ++Allow line break before or after the character. This works only in ++combination with flags 128 and 256 and has no effect otherwise. ++ ++Contrary to flag values 2 and@tie{}4, the flags 128, 256, and 512 work ++pairwise. If, for example, the left character has value 512, and the ++right character 128, no line break gets inserted. If we use ++value@tie{}6 instead for the left character, a line break after the ++character can't be suppressed since the right neighbour character ++doesn't get examined. ++@end table ++@endDefreq ++ ++@DefreqList {char, g [@Var{string}]} ++@DefreqItemx {fchar, g [@Var{string}]} ++@DefreqItemx {fschar, f g [@Var{string}]} ++@DefreqListEndx {schar, g [@Var{string}]} ++@cindex defining character (@code{char}) ++@cindex defining fallback character (@code{fchar}, @code{fschar}, @code{schar}) ++@cindex character, defining (@code{char}) ++@cindex character, defining fallback (@code{fchar}, @code{fschar}, @code{schar}) ++@cindex fallback character, defining (@code{fchar}, @code{fschar}, @code{schar}) ++@cindex creating new characters (@code{char}) ++@cindex defining symbol (@code{char}) ++@cindex symbol, defining (@code{char}) ++@cindex defining glyph (@code{char}) ++@cindex glyph, defining (@code{char}) ++@cindex escape character, while defining glyph ++@cindex character, escape, while defining glyph ++@cindex @code{tr} request, and glyph definitions ++@cindex @code{cp} request, and glyph definitions ++@cindex @code{rc} request, and glyph definitions ++@cindex @code{lc} request, and glyph definitions ++@cindex @code{\l}, and glyph definitions ++@cindex @code{\L}, and glyph definitions ++@cindex @code{\&}, and glyph definitions ++@cindex @code{\e}, and glyph definitions ++@cindex @code{hcode} request, and glyph definitions ++Define a new glyph@tie{}@var{g} to be @var{string} (which can be ++empty).@footnote{@code{char} is a misnomer since an output glyph is ++defined.} Every time glyph@tie{}@var{g} needs to be printed, ++@var{string} is processed in a temporary environment and the result is ++wrapped up into a single object. Compatibility mode is turned off and ++the escape character is set to @samp{\} while @var{string} is being ++processed. Any emboldening, constant spacing or track kerning is ++applied to this object rather than to individual characters in ++@var{string}. ++ ++A glyph defined by these requests can be used just like a normal glyph ++provided by the output device. In particular, other characters can be ++translated to it with the @code{tr} or @code{trin} requests; it can be ++made the leader character by the @code{lc} request; repeated patterns ++can be drawn with the glyph using the @code{\l} and @code{\L} escape ++sequences; words containing the glyph can be hyphenated correctly if the ++@code{hcode} request is used to give the glyph's symbol a hyphenation ++code. ++ ++There is a special anti-recursion feature: Use of @code{g} within the ++glyph's definition is handled like normal characters and symbols not ++defined with @code{char}. ++ ++Note that the @code{tr} and @code{trin} requests take precedence if ++@code{char} accesses the same symbol. ++ ++@Example ++.tr XY ++X ++ @result{} Y ++.char X Z ++X ++ @result{} Y ++.tr XX ++X ++ @result{} Z ++@endExample ++ ++The @code{fchar} request defines a fallback glyph: @code{gtroff} only ++checks for glyphs defined with @code{fchar} if it cannot find the glyph ++in the current font. @code{gtroff} carries out this test before ++checking special fonts. ++ ++@code{fschar} defines a fallback glyph for font@tie{}@var{f}: ++@code{gtroff} checks for glyphs defined with @code{fschar} after the ++list of fonts declared as font-specific special fonts with the ++@code{fspecial} request, but before the list of fonts declared as global ++special fonts with the @code{special} request. ++ ++Finally, the @code{schar} request defines a global fallback glyph: ++@code{gtroff} checks for glyphs defined with @code{schar} after the list ++of fonts declared as global special fonts with the @code{special} ++request, but before the already mounted special fonts. ++ ++@xref{Using Symbols}, for a detailed description of the glyph searching ++mechanism in @code{gtroff}. ++@endDefreq ++ ++@DefreqList {rchar, c1 c2 @dots{}} ++@DefreqListEndx {rfschar, f c1 c2 @dots{}} ++@cindex removing glyph definition (@code{rchar}, @code{rfschar}) ++@cindex glyph, removing definition (@code{rchar}, @code{rfschar}) ++@cindex fallback glyph, removing definition (@code{rchar}, @code{rfschar}) ++Remove the definitions of glyphs @var{c1}, @var{c2},@tie{}@enddots{} ++This undoes the effect of a @code{char}, @code{fchar}, or @code{schar} ++request. ++ ++It is possible to omit the whitespace between arguments. ++ ++The request @code{rfschar} removes glyph definitions defined with ++@code{fschar} for glyph@tie{}f. ++@endDefreq ++ ++@xref{Special Characters}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Character Classes, Special Fonts, Using Symbols, Fonts and Symbols ++@subsection Character Classes ++@cindex character classes ++@cindex classes, character ++ ++Classes are particularly useful for East Asian languages such as ++Chinese, Japanese, and Korean, where the number of needed characters is ++much larger than in European languages, and where large sets of ++characters share the same properties. ++ ++@Defreq {class, n c1 c2 @dots{}} ++@cindex character class (@code{class}) ++@cindex defining character class (@code{class}) ++@cindex class of characters (@code{class}) ++In @code{groff}, a @dfn{character class} (or simply ``class'') is a set ++of characters, grouped by some user aspect. The @code{class} request ++defines such classes so that other requests can refer to all characters ++belonging to this set with a single class name. Currently, only the ++@code{cflags} request can handle character classes. ++ ++A @code{class} request takes a class name followed by a list of ++entities. In its simplest form, the entities are characters or symbols: ++ ++@Example ++.class [prepunct] , : ; > @} ++@endExample ++ ++Since class and glyph names share the same namespace, it is recommended ++to start and end the class name with @code{[} and @code{]}, ++respectively, to avoid collisions with normal @code{groff} symbols (and ++symbols defined by the user). In particular, the presence of @code{]} ++in the symbol name intentionally prevents the usage of @code{\[...]}, ++thus you must use the @code{\C} escape to access a class with such a ++name. ++ ++@cindex GGL (groff glyph list) ++@cindex groff glyph list (GGL) ++You can also use a special character range notation, consisting of a ++start character or symbol, followed by @samp{-}, and an end character or ++symbol. Internally, @code{gtroff} converts these two symbol names to ++Unicode values (according to the groff glyph gist), which then give the ++start and end value of the range. If that fails, the class definition ++is skipped. ++ ++Finally, classes can be nested, too. ++ ++Here is a more complex example: ++ ++@Example ++.class [prepunctx] \C'[prepunct]' \[u2013]-\[u2016] ++@endExample ++ ++The class @samp{prepunctx} now contains the contents of the class ++@code{prepunct} as defined above (the set @samp{, : ; > @}}), and ++characters in the range between @code{U+2013} and @code{U+2016}. ++ ++If you want to add @samp{-} to a class, it must be the first character ++value in the argument list, otherwise it gets misinterpreted as a range. ++ ++Note that it is not possible to use class names within range ++definitions. ++ ++Typical use of the @code{class} request is to control line-breaking and ++hyphenation rules as defined by the @code{cflags} request. For example, ++to inhibit line breaks before the characters belonging to the ++@code{prepunctx} class, you can write: ++ ++@Example ++.cflags 2 \C'[prepunctx]' ++@endExample ++ ++See the @code{cflags} request in @ref{Using Symbols}, for more details. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Special Fonts, Artificial Fonts, Character Classes, Fonts and Symbols ++@subsection Special Fonts ++@cindex special fonts ++@cindex fonts, special ++ ++Special fonts are those that @code{gtroff} searches when it cannot find ++the requested glyph in the current font. The Symbol font is usually a ++special font. ++ ++@code{gtroff} provides the following two requests to add more special ++fonts. @xref{Using Symbols}, for a detailed description of the glyph ++searching mechanism in @code{gtroff}. ++ ++Usually, only non-TTY devices have special fonts. ++ ++@DefreqList {special, [@Var{s1} @Var{s2} @dots{}]} ++@DefreqListEndx {fspecial, f [@Var{s1} @Var{s2} @dots{}]} ++@kindex fonts ++@pindex DESC ++Use the @code{special} request to define special fonts. Initially, this ++list is empty. ++ ++Use the @code{fspecial} request to designate special fonts only when ++font@tie{}@var{f} is active. Initially, this list is empty. ++ ++Previous calls to @code{special} or @code{fspecial} are overwritten; ++without arguments, the particular list of special fonts is set to empty. ++Special fonts are searched in the order they appear as arguments. ++ ++All fonts that appear in a call to @code{special} or @code{fspecial} ++are loaded. ++ ++@xref{Using Symbols}, for the exact search order of glyphs. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Artificial Fonts, Ligatures and Kerning, Special Fonts, Fonts and Symbols ++@subsection Artificial Fonts ++@cindex artificial fonts ++@cindex fonts, artificial ++ ++There are a number of requests and escapes for artificially creating ++fonts. These are largely vestiges of the days when output devices did ++not have a wide variety of fonts, and when @code{nroff} and @code{troff} ++were separate programs. Most of them are no longer necessary in GNU ++@code{troff}. Nevertheless, they are supported. ++ ++@DefescList {\\H, ', height, '} ++@DefescItem {\\H, ', @t{+}height, '} ++@DefescItem {\\H, ', @t{-}height, '} ++@DefregListEndx {.height} ++@cindex changing the font height (@code{\H}) ++@cindex font height, changing (@code{\H}) ++@cindex height, font, changing (@code{\H}) ++Change (increment, decrement) the height of the current font, but not ++the width. If @var{height} is zero, restore the original height. ++Default scaling indicator is @samp{z}. ++ ++The read-only number register @code{.height} contains the font height as ++set by @code{\H}. ++ ++Currently, only the @option{-Tps} and @option{-Tpdf} devices support ++this feature. ++ ++Note that @code{\H} doesn't produce an input token in @code{gtroff}. As ++a consequence, it can be used in requests like @code{mc} (which expects ++a single character as an argument) to change the font on the fly: ++ ++@Example ++.mc \H'+5z'x\H'0' ++@endExample ++ ++In compatibility mode, @code{gtroff} behaves differently: If an ++increment or decrement is used, it is always taken relative to the ++current point size and not relative to the previously selected font ++height. Thus, ++ ++@Example ++.cp 1 ++\H'+5'test \H'+5'test ++@endExample ++ ++@noindent ++prints the word @samp{test} twice with the same font height (five points ++larger than the current font size). ++@endDefesc ++ ++@DefescList {\\S, ', slant, '} ++@DefregListEndx {.slant} ++@cindex changing the font slant (@code{\S}) ++@cindex font slant, changing (@code{\S}) ++@cindex slant, font, changing (@code{\S}) ++Slant the current font by @var{slant} degrees. Positive values slant to ++the right. Only integer values are possible. ++ ++The read-only number register @code{.slant} contains the font slant as ++set by @code{\S}. ++ ++Currently, only the @option{-Tps} and @option{-Tpdf} devices support ++this feature. ++ ++Note that @code{\S} doesn't produce an input token in @code{gtroff}. As ++a consequence, it can be used in requests like @code{mc} (which expects ++a single character as an argument) to change the font on the fly: ++ ++@Example ++.mc \S'20'x\S'0' ++@endExample ++ ++This request is incorrectly documented in the original @acronym{UNIX} ++troff manual; the slant is always set to an absolute value. ++@endDefesc ++ ++@Defreq {ul, [@Var{lines}]} ++@cindex underlining (@code{ul}) ++The @code{ul} request normally underlines subsequent lines if a TTY ++output device is used. Otherwise, the lines are printed in italics ++(only the term `underlined' is used in the following). The single ++argument is the number of input lines to be underlined; with no ++argument, the next line is underlined. If @var{lines} is zero or ++negative, stop the effects of @code{ul} (if it was active). Requests ++and empty lines do not count for computing the number of underlined ++input lines, even if they produce some output like @code{tl}. Lines ++inserted by macros (e.g.@: invoked by a trap) do count. ++ ++At the beginning of @code{ul}, the current font is stored and the ++underline font is activated. Within the span of a @code{ul} request, it ++is possible to change fonts, but after the last line affected by ++@code{ul} the saved font is restored. ++ ++This number of lines still to be underlined is associated with the ++current environment (@pxref{Environments}). The underline font can be ++changed with the @code{uf} request. ++ ++@c XXX @xref should be changed to grotty ++ ++@c @xref{Troff and Nroff Mode}, for a discussion how underlining is ++@c implemented in for TTY output devices, and which problems can arise. ++ ++The @code{ul} request does not underline spaces. ++@endDefreq ++ ++@Defreq {cu, [@Var{lines}]} ++@cindex continuous underlining (@code{cu}) ++@cindex underlining, continuous (@code{cu}) ++The @code{cu} request is similar to @code{ul} but underlines spaces as ++well (if a TTY output device is used). ++@endDefreq ++ ++@Defreq {uf, font} ++@cindex underline font (@code{uf}) ++@cindex font for underlining (@code{uf}) ++Set the underline font (globally) used by @code{ul} and @code{cu}. By ++default, this is the font at position@tie{}2. @var{font} can be either ++a non-negative font position or the name of a font. ++@endDefreq ++ ++@DefreqList {bd, font [@Var{offset}]} ++@DefreqItem {bd, font1 font2 [@Var{offset}]} ++@DefregListEndx {.b} ++@cindex imitating bold face (@code{bd}) ++@cindex bold face, imitating (@code{bd}) ++Artificially create a bold font by printing each glyph twice, slightly ++offset. ++ ++Two syntax forms are available. ++ ++@itemize @bullet ++@item ++Imitate a bold font unconditionally. The first argument specifies the ++font to embolden, and the second is the number of basic units, minus ++one, by which the two glyphs are offset. If the second argument is ++missing, emboldening is turned off. ++ ++@var{font} can be either a non-negative font position or the name of a ++font. ++ ++@var{offset} is available in the @code{.b} read-only register if a ++special font is active; in the @code{bd} request, its default unit is ++@samp{u}. ++ ++@cindex @code{fspecial} request, and imitating bold ++@kindex special ++@cindex embolding of special fonts ++@cindex special fonts, emboldening ++@item ++Imitate a bold form conditionally. Embolden @var{font1} by @var{offset} ++only if font @var{font2} is the current font. This command can be ++issued repeatedly to set up different emboldening values for different ++current fonts. If the second argument is missing, emboldening is turned ++off for this particular current font. ++ ++This affects special fonts only (either set up with the @code{special} ++command in font files or with the @code{fspecial} request). ++@end itemize ++@endDefreq ++ ++@Defreq {cs, font [@Var{width} [@Var{em-size}]]} ++@cindex constant glyph space mode (@code{cs}) ++@cindex mode for constant glyph space (@code{cs}) ++@cindex glyph, constant space ++@cindex @code{ps} request, and constant glyph space mode ++Switch to and from @dfn{constant glyph space mode}. If activated, the ++width of every glyph is @math{@var{width}/36} ems. The em size is given ++absolutely by @var{em-size}; if this argument is missing, the em value ++is taken from the current font size (as set with the @code{ps} request) ++when the font is effectively in use. Without second and third argument, ++constant glyph space mode is deactivated. ++ ++Default scaling indicator for @var{em-size} is @samp{z}; @var{width} is ++an integer. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Ligatures and Kerning, , Artificial Fonts, Fonts and Symbols ++@subsection Ligatures and Kerning ++@cindex ligatures and kerning ++@cindex kerning and ligatures ++ ++Ligatures are groups of characters that are run together, i.e, producing ++a single glyph. For example, the letters `f' and `i' can form a ++ligature `fi' as in the word `file'. This produces a cleaner look ++(albeit subtle) to the printed output. Usually, ligatures are not ++available in fonts for TTY output devices. ++ ++Most @sc{PostScript} fonts support the fi and fl ligatures. The C/A/T ++typesetter that was the target of @acronym{AT&T} @code{troff} also ++supported `ff', `ffi', and `ffl' ligatures. Advanced typesetters or ++`expert' fonts may include ligatures for `ft' and `ct', although GNU ++@code{troff} does not support these (yet). ++ ++Only the current font is checked for ligatures and kerns; neither ++special fonts nor entities defined with the @code{char} request (and its ++siblings) are taken into account. ++ ++@DefreqList {lg, [@Var{flag}]} ++@DefregListEndx {.lg} ++@cindex activating ligatures (@code{lg}) ++@cindex ligatures, activating (@code{lg}) ++@cindex ligatures enabled register (@code{.lg}) ++Switch the ligature mechanism on or off; if the parameter is non-zero or ++missing, ligatures are enabled, otherwise disabled. Default is on. The ++current ligature mode can be found in the read-only number register ++@code{.lg} (set to 1 or@tie{}2 if ligatures are enabled, ++0@tie{}otherwise). ++ ++Setting the ligature mode to@tie{}2 enables the two-character ligatures ++(fi, fl, and ff) and disables the three-character ligatures (ffi and ++ffl). ++@endDefreq ++ ++@dfn{Pairwise kerning} is another subtle typesetting mechanism that ++modifies the distance between a glyph pair to improve readability. In ++most cases (but not always) the distance is decreased. ++@iftex ++For example, compare the combination of the letters `V' and `A'. With ++kerning, `VA' is printed. Without kerning it appears as `V@w{}A'. ++@end iftex ++Typewriter-like fonts and fonts for terminals where all glyphs have the ++same width don't use kerning. ++ ++@DefreqList {kern, [@Var{flag}]} ++@DefregListEndx {.kern} ++@cindex activating kerning (@code{kern}) ++@cindex kerning, activating (@code{kern}) ++@cindex kerning enabled register (@code{.kern}) ++Switch kerning on or off. If the parameter is non-zero or missing, ++enable pairwise kerning, otherwise disable it. The read-only number ++register @code{.kern} is set to@tie{}1 if pairwise kerning is enabled, ++0@tie{}otherwise. ++ ++@cindex zero width space character (@code{\&}) ++@cindex character, zero width space (@code{\&}) ++@cindex space character, zero width (@code{\&}) ++If the font description file contains pairwise kerning information, ++glyphs from that font are kerned. Kerning between two glyphs can be ++inhibited by placing @code{\&} between them: @samp{V\&A}. ++ ++@xref{Font File Format}. ++@endDefreq ++ ++@cindex track kerning ++@cindex kerning, track ++@dfn{Track kerning} expands or reduces the space between glyphs. This ++can be handy, for example, if you need to squeeze a long word onto a ++single line or spread some text to fill a narrow column. It must be ++used with great care since it is usually considered bad typography if ++the reader notices the effect. ++ ++@Defreq {tkf, f s1 n1 s2 n2} ++@cindex activating track kerning (@code{tkf}) ++@cindex track kerning, activating (@code{tkf}) ++Enable track kerning for font@tie{}@var{f}. If the current font ++is@tie{}@var{f} the width of every glyph is increased by an amount ++between @var{n1} and @var{n2} (@var{n1}, @var{n2} can be negative); if ++the current point size is less than or equal to @var{s1} the width is ++increased by @var{n1}; if it is greater than or equal to @var{s2} the ++width is increased by @var{n2}; if the point size is greater than or ++equal to @var{s1} and less than or equal to @var{s2} the increase in ++width is a linear function of the point size. ++ ++The default scaling indicator is @samp{z} for @var{s1} and @var{s2}, ++@samp{p} for @var{n1} and @var{n2}. ++ ++Note that the track kerning amount is added even to the rightmost glyph ++in a line; for large values it is thus recommended to increase the line ++length by the same amount to compensate it. ++@endDefreq ++ ++Sometimes, when typesetting letters of different fonts, more or less ++space at such boundaries are needed. There are two escapes to help with ++this. ++ ++@Defesc {\\/, , , } ++@cindex italic correction (@code{\/}) ++@cindex correction, italic (@code{\/}) ++@cindex correction between italic and roman glyph (@code{\/}, @code{\,}) ++@cindex roman glyph, correction after italic glyph (@code{\/}) ++@cindex italic glyph, correction before roman glyph (@code{\/}) ++@cindex glyph, italic correction (@code{\/}) ++Increase the width of the preceding glyph so that the spacing between ++that glyph and the following glyph is correct if the following glyph is ++a roman glyph. For example, if an italic@tie{}@code{f} is immediately ++followed by a roman right parenthesis, then in many fonts the top right ++portion of the@tie{}@code{f} overlaps the top left of the right ++parenthesis. Use this escape sequence whenever an italic glyph is ++immediately followed by a roman glyph without any intervening space. ++This small amount of space is also called @dfn{italic correction}. ++ ++@iftex ++@c can't use @Example...@endExample here ++@example ++@group ++\f[I]f\f[R]) ++ @result{} {@it f}@r{)} ++\f[I]f\/\f[R]) ++ @result{} @i{f}@r{)} ++@end group ++@end example ++@end iftex ++@endDefesc ++ ++@Defesc {\\\,, , , } ++@cindex left italic correction (@code{\,}) ++@cindex correction, left italic (@code{\,}) ++@cindex glyph, left italic correction (@code{\,}) ++@cindex roman glyph, correction before italic glyph (@code{\,}) ++@cindex italic glyph, correction after roman glyph (@code{\,}) ++Modify the spacing of the following glyph so that the spacing between ++that glyph and the preceding glyph is correct if the preceding glyph is ++a roman glyph. Use this escape sequence whenever a roman glyph is ++immediately followed by an italic glyph without any intervening space. ++In analogy to above, this space could be called @dfn{left italic ++correction}, but this term isn't used widely. ++ ++@iftex ++@c can't use @Example...@endExample here ++@example ++@group ++q\f[I]f ++ @result{} @r{q}@i{f} ++q\,\f[I]f ++ @result{} @r{q}@math{@ptexcomma}@i{f} ++@end group ++@end example ++@end iftex ++@endDefesc ++ ++@Defesc {\\&, , , } ++Insert a zero-width character, which is invisible. Its intended use is ++to stop interaction of a character with its surrounding. ++ ++@itemize @bullet ++@item ++It prevents the insertion of extra space after an end-of-sentence ++character. ++ ++@Example ++Test. ++Test. ++ @result{} Test. Test. ++Test.\& ++Test. ++ @result{} Test. Test. ++@endExample ++ ++@item ++It prevents interpretation of a control character at the beginning of an ++input line. ++ ++@Example ++.Test ++ @result{} warning: `Test' not defined ++\&.Test ++ @result{} .Test ++@endExample ++ ++@item ++It prevents kerning between two glyphs. ++ ++@iftex ++@c can't use @Example...@endExample here ++@example ++@group ++VA ++ @result{} @r{VA} ++V\&A ++ @result{} @r{V@w{}A} ++@end group ++@end example ++@end iftex ++ ++@item ++It is needed to map an arbitrary character to nothing in the @code{tr} ++request (@pxref{Character Translations}). ++@end itemize ++@endDefesc ++ ++@Defesc {\\), , , } ++This escape is similar to @code{\&} except that it behaves like a ++character declared with the @code{cflags} request to be transparent for ++the purposes of an end-of-sentence character. ++ ++Its main usage is in macro definitions to protect against arguments ++starting with a control character. ++ ++@Example ++.de xxx ++\)\\$1 ++.. ++.de yyy ++\&\\$1 ++.. ++This is a test.\c ++.xxx ' ++This is a test. ++ @result{}This is a test.' This is a test. ++This is a test.\c ++.yyy ' ++This is a test. ++ @result{}This is a test.' This is a test. ++@endExample ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node Sizes, Strings, Fonts and Symbols, gtroff Reference ++@section Sizes ++@cindex sizes ++ ++@cindex baseline ++@cindex type size ++@cindex size of type ++@cindex vertical spacing ++@cindex spacing, vertical ++@code{gtroff} uses two dimensions with each line of text, type size and ++vertical spacing. The @dfn{type size} is approximately the height of ++the tallest glyph.@footnote{This is usually the parenthesis. Note that ++in most cases the real dimensions of the glyphs in a font are @emph{not} ++related to its type size! For example, the standard @sc{PostScript} ++font families `Times Roman', `Helvetica', and `Courier' can't be used ++together at 10@dmn{pt}; to get acceptable output, the size of ++`Helvetica' has to be reduced by one point, and the size of `Courier' ++must be increased by one point.} @dfn{Vertical spacing} is the amount ++of space @code{gtroff} allows for a line of text; normally, this is ++about 20%@tie{}larger than the current type size. Ratios smaller than ++this can result in hard-to-read text; larger than this, it spreads the ++text out more vertically (useful for term papers). By default, ++@code{gtroff} uses 10@tie{}point type on 12@tie{}point spacing. ++ ++@cindex leading ++The difference between type size and vertical spacing is known, by ++typesetters, as @dfn{leading} (this is pronounced `ledding'). ++ ++@menu ++* Changing Type Sizes:: ++* Fractional Type Sizes:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Changing Type Sizes, Fractional Type Sizes, Sizes, Sizes ++@subsection Changing Type Sizes ++ ++@DefreqList {ps, [@Var{size}]} ++@DefreqItem {ps, @t{+}@Var{size}} ++@DefreqItem {ps, @t{-}@Var{size}} ++@DefescItemx {\\s, , size, } ++@DefregListEndx {.s} ++@cindex changing type sizes (@code{ps}, @code{\s}) ++@cindex type sizes, changing (@code{ps}, @code{\s}) ++@cindex point sizes, changing (@code{ps}, @code{\s}) ++Use the @code{ps} request or the @code{\s} escape to change (increase, ++decrease) the type size (in points). Specify @var{size} as either an ++absolute point size, or as a relative change from the current size. The ++size@tie{}0 (for both @code{.ps} and @code{\s}), or no argument (for ++@code{.ps} only), goes back to the previous size. ++ ++Default scaling indicator of @code{size} is @samp{z}. If @code{size} is ++negative, it is set to 1@dmn{u}. ++ ++@cindex type size registers (@code{.s}, @code{.ps}) ++@cindex point size registers (@code{.s}, @code{.ps}) ++The read-only number register @code{.s} returns the point size in points ++as a decimal fraction. This is a string. To get the point size in ++scaled points, use the @code{.ps} register instead. ++ ++@code{.s} is associated with the current environment ++(@pxref{Environments}). ++ ++@Example ++snap, snap, ++.ps +2 ++grin, grin, ++.ps +2 ++wink, wink, \s+2nudge, nudge,\s+8 say no more! ++.ps 10 ++@endExample ++ ++The @code{\s} escape may be called in a variety of ways. Much like ++other escapes there must be a way to determine where the argument ends ++and the text begins. Any of the following forms are valid: ++ ++@table @code ++@item \s@var{n} ++Set the point size to @var{n}@tie{}points. @var{n}@tie{}must be either ++0 or in the range 4 to@tie{}39. ++ ++@item \s+@var{n} ++@itemx \s-@var{n} ++Increase or decrease the point size by @var{n}@tie{}points. ++@var{n}@tie{}must be exactly one digit. ++ ++@item \s(@var{nn} ++Set the point size to @var{nn}@tie{}points. @var{nn} must be exactly ++two digits. ++ ++@item \s+(@var{nn} ++@itemx \s-(@var{nn} ++@itemx \s(+@var{nn} ++@itemx \s(-@var{nn} ++Increase or decrease the point size by @var{nn}@tie{}points. @var{nn} ++must be exactly two digits. ++@end table ++ ++Note that @code{\s} doesn't produce an input token in @code{gtroff}. As ++a consequence, it can be used in requests like @code{mc} (which expects ++a single character as an argument) to change the font on the fly: ++ ++@Example ++.mc \s[20]x\s[0] ++@endExample ++ ++@xref{Fractional Type Sizes}, for yet another syntactical form of using ++the @code{\s} escape. ++@endDefreq ++ ++@Defreq {sizes, s1 s2 @dots{} sn [0]} ++Some devices may only have certain permissible sizes, in which case ++@code{gtroff} rounds to the nearest permissible size. The @file{DESC} ++file specifies which sizes are permissible for the device. ++ ++Use the @code{sizes} request to change the permissible sizes for the ++current output device. Arguments are in scaled points; the ++@code{sizescale} line in the @file{DESC} file for the output device ++provides the scaling factor. For example, if the scaling factor is ++1000, then the value 12000 is 12@tie{}points. ++ ++Each argument can be a single point size (such as @samp{12000}), or a ++range of sizes (such as @samp{4000-72000}). You can optionally end the ++list with a zero. ++@endDefreq ++ ++@DefreqList {vs, [@Var{space}]} ++@DefreqItem {vs, @t{+}@Var{space}} ++@DefreqItem {vs, @t{-}@Var{space}} ++@DefregListEndx {.v} ++@cindex changing vertical line spacing (@code{vs}) ++@cindex vertical line spacing, changing (@code{vs}) ++@cindex vertical line spacing register (@code{.v}) ++Change (increase, decrease) the vertical spacing by @var{space}. The ++default scaling indicator is @samp{p}. ++ ++If @code{vs} is called without an argument, the vertical spacing is ++reset to the previous value before the last call to @code{vs}. ++ ++@cindex @code{.V} register, and @code{vs} ++@code{gtroff} creates a warning of type @samp{range} if @var{space} is ++negative; the vertical spacing is then set to smallest positive value, ++the vertical resolution (as given in the @code{.V} register). ++ ++Note that @w{@samp{.vs 0}} isn't saved in a diversion since it doesn't ++result in a vertical motion. You explicitly have to repeat this command ++before inserting the diversion. ++ ++The read-only number register @code{.v} contains the current vertical ++spacing; it is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@cindex vertical line spacing, effective value ++The effective vertical line spacing consists of four components. ++Breaking a line causes the following actions (in the given order). ++ ++@itemize @bullet ++@item ++@cindex extra pre-vertical line space (@code{\x}) ++@cindex line space, extra pre-vertical (@code{\x}) ++Move the current point vertically by the @dfn{extra pre-vertical line ++space}. This is the minimum value of all @code{\x} escapes with a ++negative argument in the current output line. ++ ++@item ++Move the current point vertically by the vertical line spacing as set ++with the @code{vs} request. ++ ++@item ++Output the current line. ++ ++@item ++@cindex extra post-vertical line space (@code{\x}) ++@cindex line space, extra post-vertical (@code{\x}) ++Move the current point vertically by the @dfn{extra post-vertical line ++space}. This is the maximum value of all @code{\x} escapes with a ++positive argument in the line that has just been output. ++ ++@item ++@cindex post-vertical line spacing ++@cindex line spacing, post-vertical (@code{pvs}) ++Move the current point vertically by the @dfn{post-vertical line ++spacing} as set with the @code{pvs} request. ++@end itemize ++ ++@cindex double-spacing (@code{vs}, @code{pvs}) ++It is usually better to use @code{vs} or @code{pvs} instead of @code{ls} ++to produce double-spaced documents: @code{vs} and @code{pvs} have a ++finer granularity for the inserted vertical space compared to @code{ls}; ++furthermore, certain preprocessors assume single-spacing. ++ ++@xref{Manipulating Spacing}, for more details on the @code{\x} escape ++and the @code{ls} request. ++ ++@DefreqList {pvs, [@Var{space}]} ++@DefreqItem {pvs, @t{+}@Var{space}} ++@DefreqItem {pvs, @t{-}@Var{space}} ++@DefregListEndx {.pvs} ++@cindex @code{ls} request, alternative to (@code{pvs}) ++@cindex post-vertical line spacing, changing (@code{pvs}) ++@cindex post-vertical line spacing register (@code{.pvs}) ++Change (increase, decrease) the post-vertical spacing by @var{space}. ++The default scaling indicator is @samp{p}. ++ ++If @code{pvs} is called without an argument, the post-vertical spacing ++is reset to the previous value before the last call to @code{pvs}. ++ ++@code{gtroff} creates a warning of type @samp{range} if @var{space} is ++zero or negative; the vertical spacing is then set to zero. ++ ++The read-only number register @code{.pvs} contains the current ++post-vertical spacing; it is associated with the current environment ++(@pxref{Environments}). ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Fractional Type Sizes, , Changing Type Sizes, Sizes ++@subsection Fractional Type Sizes ++@cindex fractional type sizes ++@cindex fractional point sizes ++@cindex type sizes, fractional ++@cindex point sizes, fractional ++@cindex sizes, fractional ++ ++@cindex @code{s} unit ++@cindex unit, @code{s} ++@cindex @code{z} unit ++@cindex unit, @code{z} ++@cindex @code{ps} request, with fractional type sizes ++@cindex @code{cs} request, with fractional type sizes ++@cindex @code{tkf} request, with fractional type sizes ++@cindex @code{\H}, with fractional type sizes ++@cindex @code{\s}, with fractional type sizes ++A @dfn{scaled point} is equal to @math{1/@var{sizescale}} points, where ++@var{sizescale} is specified in the @file{DESC} file (1@tie{}by ++default). There is a new scale indicator @samp{z}, which has the effect ++of multiplying by @var{sizescale}. Requests and escape sequences in ++@code{gtroff} interpret arguments that represent a point size as being ++in units of scaled points, but they evaluate each such argument using a ++default scale indicator of @samp{z}. Arguments treated in this way are ++the argument to the @code{ps} request, the third argument to the ++@code{cs} request, the second and fourth arguments to the @code{tkf} ++request, the argument to the @code{\H} escape sequence, and those ++variants of the @code{\s} escape sequence that take a numeric expression ++as their argument (see below). ++ ++For example, suppose @var{sizescale} is@tie{}1000; then a scaled point ++is equivalent to a millipoint; the request @w{@samp{.ps 10.25}} is ++equivalent to @w{@samp{.ps 10.25z}} and thus sets the point size to ++10250@tie{}scaled points, which is equal to 10.25@tie{}points. ++ ++@code{gtroff} disallows the use of the @samp{z} scale indicator in ++instances where it would make no sense, such as a numeric expression ++whose default scale indicator was neither @samp{u} nor @samp{z}. ++Similarly it would make no sense to use a scaling indicator other than ++@samp{z} or @samp{u} in a numeric expression whose default scale ++indicator was @samp{z}, and so @code{gtroff} disallows this as well. ++ ++There is also new scale indicator @samp{s}, which multiplies by the ++number of units in a scaled point. So, for example, @samp{\n[.ps]s} is ++equal to @samp{1m}. Be sure not to confuse the @samp{s} and @samp{z} ++scale indicators. ++ ++@Defreg {.ps} ++A read-only number register returning the point size in scaled points. ++ ++@code{.ps} is associated with the current environment ++(@pxref{Environments}). ++@endDefreg ++ ++@DefregList {.psr} ++@DefregListEndx {.sr} ++@cindex last-requested point size registers (@code{.psr}, @code{.sr}) ++@cindex point size registers, last-requested (@code{.psr}, @code{.sr}) ++@cindex @code{.ps} register, in comparison with @code{.psr} ++@cindex @code{.s} register, in comparison with @code{.sr} ++The last-requested point size in scaled points is contained in the ++@code{.psr} read-only number register. The last requested point size in ++points as a decimal fraction can be found in @code{.sr}. This is a ++string-valued read-only number register. ++ ++Note that the requested point sizes are device-independent, whereas the ++values returned by the @code{.ps} and @code{.s} registers are not. For ++example, if a point size of 11@dmn{pt} is requested, and a @code{sizes} ++request (or a @code{sizescale} line in a @file{DESC} file) specifies ++10.95@dmn{pt} instead, this value is actually used. ++ ++Both registers are associated with the current environment ++(@pxref{Environments}). ++@endDefreg ++ ++The @code{\s} escape has the following syntax for working with ++fractional type sizes: ++ ++@table @code ++@item \s[@var{n}] ++@itemx \s'@var{n}' ++Set the point size to @var{n}@tie{}scaled points; @var{n}@tie{}is a ++numeric expression with a default scale indicator of @samp{z}. ++ ++@item \s[+@var{n}] ++@itemx \s[-@var{n}] ++@itemx \s+[@var{n}] ++@itemx \s-[@var{n}] ++@itemx \s'+@var{n}' ++@itemx \s'-@var{n}' ++@itemx \s+'@var{n}' ++@itemx \s-'@var{n}' ++Increase or or decrease the point size by @var{n}@tie{}scaled points; ++@var{n}@tie{}is a numeric expression (which may start with a minus sign) ++with a default scale indicator of @samp{z}. ++@end table ++ ++@xref{Font Files}. ++ ++ ++@c ===================================================================== ++ ++@node Strings, Conditionals and Loops, Sizes, gtroff Reference ++@section Strings ++@cindex strings ++ ++@code{gtroff} has string variables, which are entirely for user ++convenience (i.e.@: there are no built-in strings exept @code{.T}, but ++even this is a read-write string variable). ++ ++Although the following requests can be used to create strings, ++simply using an undefined string will cause it to be defined as empty. ++@xref{Identifiers}. ++ ++@DefreqList {ds, name [@Var{string}]} ++@DefreqItemx {ds1, name [@Var{string}]} ++@DefescItemx {\\*, , n, } ++@DefescItem {\\*, @Lparen{}, nm, } ++@DefescListEnd {\\*, @Lbrack{}, name arg1 arg2 @dots{}, @Rbrack{}} ++@cindex string interpolation (@code{\*}) ++@cindex string expansion (@code{\*}) ++@cindex interpolation of strings (@code{\*}) ++@cindex expansion of strings (@code{\*}) ++@cindex string arguments ++@cindex arguments, of strings ++Define and access a string variable @var{name} (one-character ++name@tie{}@var{n}, two-character name @var{nm}). If @var{name} already ++exists, @code{ds} overwrites the previous definition. Only the syntax ++form using brackets can take arguments that are handled identically to ++macro arguments; the single exception is that a closing bracket as an ++argument must be enclosed in double quotes. @xref{Request and Macro ++Arguments}, and @ref{Parameters}. ++ ++Example: ++ ++@Example ++.ds foo a \\$1 test ++. ++This is \*[foo nice]. ++ @result{} This is a nice test. ++@endExample ++ ++The @code{\*} escape @dfn{interpolates} (expands in-place) a ++previously-defined string variable. To be more precise, the stored ++string is pushed onto the input stack, which is then parsed by ++@code{gtroff}. Similar to number registers, it is possible to nest ++strings, i.e., string variables can be called within string variables. ++ ++If the string named by the @code{\*} escape does not exist, it is ++defined as empty, and a warning of type @samp{mac} is emitted (see ++@ref{Debugging}, for more details). ++ ++@cindex comments, with @code{ds} ++@cindex @code{ds} request, and comments ++@strong{Caution:} Unlike other requests, the second argument to the ++@code{ds} request takes up the entire line including trailing spaces. ++This means that comments on a line with such a request can introduce ++unwanted space into a string. ++ ++@Example ++.ds UX \s-1UNIX\s0\u\s-3tm\s0\d \" UNIX trademark ++@endExample ++ ++@noindent ++Instead the comment should be put on another line or have the comment ++escape adjacent with the end of the string. ++ ++@Example ++.ds UX \s-1UNIX\s0\u\s-3tm\s0\d\" UNIX trademark ++@endExample ++ ++@cindex trailing quotes ++@cindex quotes, trailing ++@cindex leading spaces with @code{ds} ++@cindex spaces with @code{ds} ++@cindex @code{ds} request, and leading spaces ++To produce leading space the string can be started with a double quote. ++No trailing quote is needed; in fact, any trailing quote is included in ++your string. ++ ++@Example ++.ds sign " Yours in a white wine sauce, ++@endExample ++ ++@cindex multi-line strings ++@cindex strings, multi-line ++@cindex newline character, in strings, escaping ++@cindex escaping newline characters, in strings ++Strings are not limited to a single line of text. A string can span ++several lines by escaping the newlines with a backslash. The resulting ++string is stored @emph{without} the newlines. ++ ++@Example ++.ds foo lots and lots \ ++of text are on these \ ++next several lines ++@endExample ++ ++It is not possible to have real newlines in a string. To put a single ++double quote character into a string, use two consecutive double quote ++characters. ++ ++The @code{ds1} request turns off compatibility mode while interpreting a ++string. To be more precise, a @dfn{compatibility save} input token is ++inserted at the beginning of the string, and a @dfn{compatibility ++restore} input token at the end. ++ ++@Example ++.nr xxx 12345 ++.ds aa The value of xxx is \\n[xxx]. ++.ds1 bb The value of xxx ix \\n[xxx]. ++. ++.cp 1 ++. ++\*(aa ++ @result{} warning: number register `[' not defined ++ @result{} The value of xxx is 0xxx]. ++\*(bb ++ @result{} The value of xxx ix 12345. ++@endExample ++ ++@cindex name space, common, of macros, diversions, and strings ++@cindex common name space of macros, diversions, and strings ++@cindex macros, shared name space with strings and diversions ++@cindex strings, shared name space with macros and diversions ++@cindex diversions, shared name space with macros and strings ++Strings, macros, and diversions (and boxes) share the same name space. ++Internally, even the same mechanism is used to store them. This has ++some interesting consequences. For example, it is possible to call a ++macro with string syntax and vice versa. ++ ++@Example ++.de xxx ++a funny test. ++.. ++This is \*[xxx] ++ @result{} This is a funny test. ++ ++.ds yyy a funny test ++This is ++.yyy ++ @result{} This is a funny test. ++@endExample ++ ++In particular, interpolating a string does not hide existing macro ++arguments. Thus in a macro, a more efficient way of doing ++ ++@Example ++.xx \\$@@ ++@endExample ++ ++@noindent ++is ++ ++@Example ++\\*[xx]\\ ++@endExample ++ ++@noindent ++Note that the latter calling syntax doesn't change the value of ++@code{\$0}, which is then inherited from the calling macro. ++ ++Diversions and boxes can be also called with string syntax. ++ ++Another consequence is that you can copy one-line diversions or boxes to ++a string. ++ ++@Example ++.di xxx ++a \fItest\fR ++.br ++.di ++.ds yyy This is \*[xxx]\c ++\*[yyy]. ++ @result{} @r{This is a }@i{test}. ++@endExample ++ ++@noindent ++As the previous example shows, it is possible to store formatted output ++in strings. The @code{\c} escape prevents the insertion of an ++additional blank line in the output. ++ ++Copying diversions longer than a single output line produces unexpected ++results. ++ ++@Example ++.di xxx ++a funny ++.br ++test ++.br ++.di ++.ds yyy This is \*[xxx]\c ++\*[yyy]. ++ @result{} test This is a funny. ++@endExample ++ ++Usually, it is not predictable whether a diversion contains one or more ++output lines, so this mechanism should be avoided. With @acronym{UNIX} ++@code{troff}, this was the only solution to strip off a final newline ++from a diversion. Another disadvantage is that the spaces in the copied ++string are already formatted, making them unstretchable. This can cause ++ugly results. ++ ++@cindex stripping final newline in diversions ++@cindex diversion, stripping final newline ++@cindex final newline, stripping in diversions ++@cindex newline, final, stripping in diversions ++@cindex horizontal space, unformatting ++@cindex space, horizontal, unformatting ++@cindex unformatting horizontal space ++A clean solution to this problem is available in GNU @code{troff}, using ++the requests @code{chop} to remove the final newline of a diversion, and ++@code{unformat} to make the horizontal spaces stretchable again. ++ ++@Example ++.box xxx ++a funny ++.br ++test ++.br ++.box ++.chop xxx ++.unformat xxx ++This is \*[xxx]. ++ @result{} This is a funny test. ++@endExample ++ ++@xref{Gtroff Internals}, for more information. ++@endDefreq ++ ++@DefreqList {as, name [@Var{string}]} ++@DefreqListEndx {as1, name [@Var{string}]} ++@cindex appending to a string (@code{as}) ++@cindex string, appending (@code{as}) ++The @code{as} request is similar to @code{ds} but appends @var{string} ++to the string stored as @var{name} instead of redefining it. If ++@var{name} doesn't exist yet, it is created. ++ ++@Example ++.as sign " with shallots, onions and garlic, ++@endExample ++ ++The @code{as1} request is similar to @code{as}, but compatibility mode ++is switched off while the appended string is interpreted. To be more ++precise, a @dfn{compatibility save} input token is inserted at the ++beginning of the appended string, and a @dfn{compatibility restore} ++input token at the end. ++@endDefreq ++ ++Rudimentary string manipulation routines are given with the next two ++requests. ++ ++@Defreq {substring, str n1 [@Var{n2}]} ++@cindex substring (@code{substring}) ++Replace the string named @var{str} with the substring defined by the ++indices @var{n1} and @var{n2}. The first character in the string has ++index@tie{}0. If @var{n2} is omitted, it is implicitly set to the ++largest valid value (the string length minus one). If the index value ++@var{n1} or @var{n2} is negative, it is counted from the end of the ++string, going backwards: The last character has index@tie{}@minus{}1, ++the character before the last character has index@tie{}@minus{}2, etc. ++ ++@Example ++.ds xxx abcdefgh ++.substring xxx 1 -4 ++\*[xxx] ++ @result{} bcde ++.substring xxx 2 ++\*[xxx] ++ @result{} de ++@endExample ++@endDefreq ++ ++@Defreq {length, reg str} ++@cindex length of a string (@code{length}) ++@cindex string, length of (@code{length}) ++@cindex @code{length} request, and copy-in mode ++@cindex copy-in mode, and @code{length} request ++@cindex mode, copy-in, and @code{length} request ++Compute the number of characters of @var{str} and return it in the ++number register @var{reg}. If @var{reg} doesn't exist, it is created. ++@code{str} is read in copy mode. ++ ++@Example ++.ds xxx abcd\h'3i'efgh ++.length yyy \*[xxx] ++\n[yyy] ++ @result{} 14 ++@endExample ++@endDefreq ++ ++@Defreq {rn, xx yy} ++@cindex renaming request (@code{rn}) ++@cindex request, renaming (@code{rn}) ++@cindex renaming macro (@code{rn}) ++@cindex macro, renaming (@code{rn}) ++@cindex renaming string (@code{rn}) ++@cindex string, renaming (@code{rn}) ++@cindex renaming diversion (@code{rn}) ++@cindex diversion, renaming (@code{rn}) ++Rename the request, macro, diversion, or string @var{xx} to @var{yy}. ++@endDefreq ++ ++@Defreq {rm, xx} ++@cindex removing request (@code{rm}) ++@cindex request, removing (@code{rm}) ++@cindex removing macro (@code{rm}) ++@cindex macro, removing (@code{rm}) ++@cindex removing string (@code{rm}) ++@cindex string, removing (@code{rm}) ++@cindex removing diversion (@code{rm}) ++@cindex diversion, removing (@code{rm}) ++Remove the request, macro, diversion, or string @var{xx}. @code{gtroff} ++treats subsequent invocations as if the object had never been defined. ++@endDefreq ++ ++@anchor{als} ++@Defreq {als, new old} ++@cindex alias, string, creating (@code{als}) ++@cindex alias, macro, creating (@code{als}) ++@cindex alias, diversion, creating (@code{als}) ++@cindex creating alias, for string (@code{als}) ++@cindex creating alias, for macro (@code{als}) ++@cindex creating alias, for diversion (@code{als}) ++@cindex string, creating alias (@code{als}) ++@cindex macro, creating alias (@code{als}) ++@cindex diversion, creating alias (@code{als}) ++Create an alias named @var{new} for the request, string, macro, or ++diversion object named @var{old}. The new name and the old name are ++exactly equivalent (it is similar to a hard rather than a soft link). If ++@var{old} is undefined, @code{gtroff} generates a warning of type ++@samp{mac} and ignores the request. ++ ++To understand how the @code{als} request works it is probably best to ++think of two different pools: one pool for objects (macros, strings, ++etc.), and another one for names. As soon as an object is defined, ++@code{gtroff} adds it to the object pool, adds its name to the name ++pool, and creates a link between them. When @code{als} creates an ++alias, it adds a new name to the name pool that gets linked to the same ++object as the old name. ++ ++Now consider this example. ++ ++@Example ++.de foo ++.. ++. ++.als bar foo ++. ++.de bar ++. foo ++.. ++. ++.bar ++ @result{} input stack limit exceeded ++@endExample ++ ++@noindent ++The definition of macro @code{bar} replaces the old object this name is ++linked to. However, the alias to @code{foo} is still active! In ++other words, @code{foo} is still linked to the same object as ++@code{bar}, and the result of calling @code{bar} is an infinite, ++recursive loop that finally leads to an error. ++ ++@cindex alias, string, removing (@code{rm}) ++@cindex alias, macro, removing (@code{rm}) ++@cindex alias, diversion, removing (@code{rm}) ++@cindex removing alias, for string (@code{rm}) ++@cindex removing alias, for macro (@code{rm}) ++@cindex removing alias, for diversion (@code{rm}) ++@cindex string, removing alias (@code{rm}) ++@cindex macro, removing alias (@code{rm}) ++@cindex diversion, removing alias (@code{rm}) ++To undo an alias, simply call @code{rm} on the aliased name. The object ++itself is not destroyed until there are no more aliases. ++@endDefreq ++ ++@Defreq {chop, xx} ++Remove (chop) the last character from the macro, string, or diversion ++named @var{xx}. This is useful for removing the newline from the end of ++diversions that are to be interpolated as strings. This command can be ++used repeatedly; see @ref{Gtroff Internals}, for details on nodes ++inserted additionally by @code{gtroff}. ++@endDefreq ++ ++@xref{Identifiers}, and @ref{Comments}. ++ ++ ++@c ===================================================================== ++ ++@node Conditionals and Loops, Writing Macros, Strings, gtroff Reference ++@section Conditionals and Loops ++@cindex conditionals and loops ++@cindex loops and conditionals ++ ++@menu ++* Operators in Conditionals:: ++* if-else:: ++* while:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Operators in Conditionals, if-else, Conditionals and Loops, Conditionals and Loops ++@subsection Operators in Conditionals ++ ++@cindex @code{if} request, operators to use with ++@cindex @code{ie} request, operators to use with ++@cindex @code{while} request, operators to use with ++In @code{if}, @code{ie}, and @code{while} requests, in addition to ordinary ++@ref{Expressions}, there are several more operators available: ++ ++@table @code ++@item e ++@itemx o ++True if the current page is even or odd numbered (respectively). ++ ++@item n ++@cindex conditional output for terminal (TTY) ++@cindex TTY, conditional output for ++@cindex terminal, conditional output for ++True if the document is being processed in nroff mode (i.e., the ++@code{.nroff} command has been issued). @xref{Troff and Nroff Mode}. ++ ++@item t ++True if the document is being processed in troff mode (i.e., the ++@code{.troff} command has been issued). @xref{Troff and Nroff Mode}. ++ ++@item v ++Always false. This condition is for compatibility with other ++@code{troff} versions only (identifying a @code{-Tversatec} device). ++ ++@item '@var{xxx}'@var{yyy}' ++True if the output produced by @var{xxx} is equal to the output produced ++by @var{yyy}. Other characters can be used in place of the single ++quotes; the same set of delimiters as for the @code{\D} escape is used ++(@pxref{Escapes}). @code{gtroff} formats @var{xxx} and @var{yyy} in ++separate environments; after the comparison the resulting data is ++discarded. ++ ++@Example ++.ie "|"\fR|\fP" \ ++true ++.el \ ++false ++ @result{} true ++@endExample ++ ++@noindent ++The resulting motions, glyph sizes, and fonts have to ++match,@footnote{The created output nodes must be identical. ++@xref{Gtroff Internals}.} and not the individual motion, size, and font ++requests. In the previous example, @samp{|} and @samp{\fR|\fP} both ++result in a roman @samp{|} glyph with the same point size and at the ++same location on the page, so the strings are equal. If ++@samp{.ft@tie{}I} had been added before the @samp{.ie}, the result would ++be ``false'' because (the first) @samp{|} produces an italic @samp{|} ++rather than a roman one. ++ ++@cindex string comparison ++@cindex comparison of strings ++To compare strings without processing, surround the data with @code{\?}. ++ ++@Example ++.ie "\?|\?"\?\fR|\fP\?" \ ++true ++.el \ ++false ++ @result{} false ++@endExample ++ ++@cindex @code{\?}, and copy-in mode ++@cindex copy-in mode, and @code{\?} ++@cindex mode, copy-in, and @code{\?} ++@noindent ++Since data protected with @code{\?} is read in copy-in mode it is even ++possible to use incomplete input without causing an error. ++ ++@Example ++.ds a \[ ++.ds b \[ ++.ie '\?\*a\?'\?\*b\?' \ ++true ++.el \ ++false ++ @result{} true ++@endExample ++ ++@item r @var{xxx} ++True if there is a number register named @var{xxx}. ++ ++@item d @var{xxx} ++True if there is a string, macro, diversion, or request named @var{xxx}. ++ ++@item m @var{xxx} ++True if there is a color named @var{xxx}. ++ ++@item c @var{g} ++True if there is a glyph @var{g} available@footnote{The name of this ++conditional operator is a misnomer since it tests names of output ++glyphs.}; @var{g} is either an @acronym{ASCII} character or a special ++character (@code{\N'@var{xxx}'}, @code{\(@var{gg}} or ++@code{\[@var{ggg}]}); the condition is also true if @var{g} has been ++defined by the @code{char} request. ++ ++@item F @var{font} ++True if a font named @var{font} exists. @var{font} is handled as if it ++was opened with the @code{ft} request (this is, font translation and ++styles are applied), without actually mounting it. ++ ++This test doesn't load the complete font but only its header to verify ++its validity. ++ ++@item S @var{style} ++True if style @var{style} has been registered. Font translation is ++applied. ++@end table ++ ++Note that these operators can't be combined with other operators like ++@samp{:} or @samp{&}; only a leading @samp{!} (without whitespace ++between the exclamation mark and the operator) can be used to negate the ++result. ++ ++@Example ++.nr xxx 1 ++.ie !r xxx \ ++true ++.el \ ++false ++ @result{} false ++@endExample ++ ++A whitespace after @samp{!} always evaluates to zero (this bizarre ++behaviour is due to compatibility with @acronym{UNIX} @code{troff}). ++ ++@Example ++.nr xxx 1 ++.ie ! r xxx \ ++true ++.el \ ++false ++ @result{} r xxx true ++@endExample ++ ++It is possible to omit the whitespace before the argument to the ++@samp{r}, @samp{d}, and @samp{c} operators. ++ ++@xref{Expressions}. ++ ++@c --------------------------------------------------------------------- ++ ++@node if-else, while, Operators in Conditionals, Conditionals and Loops ++@subsection if-else ++@cindex if-else ++ ++@code{gtroff} has if-then-else constructs like other languages, although ++the formatting can be painful. ++ ++@Defreq {if, expr anything} ++ ++Evaluate the expression @var{expr}, and executes @var{anything} (the ++remainder of the line) if @var{expr} evaluates to a value greater than ++zero (true). @var{anything} is interpreted as though it was on a line ++by itself (except that leading spaces are swallowed). ++@xref{Operators in Conditionals}, for more info. ++ ++@Example ++.nr xxx 1 ++.nr yyy 2 ++.if ((\n[xxx] == 1) & (\n[yyy] == 2)) true ++ @result{} true ++@endExample ++@endDefreq ++ ++@Defreq {nop, anything} ++Executes @var{anything}. This is similar to @code{.if@tie{}1}. ++@endDefreq ++ ++@DefreqList {ie, expr anything} ++@DefreqListEndx {el, anything} ++Use the @code{ie} and @code{el} requests to write an if-then-else. The ++first request is the `if' part and the latter is the `else' part. ++ ++@Example ++.ie n .ls 2 \" double-spacing in nroff ++.el .ls 1 \" single-spacing in troff ++@endExample ++@endDefreq ++ ++@c there is a bug in makeinfo <= 4.1a: you can't have `@{' as an argument ++@c to @deffn ++@c ++@c and in 4.2 you still can't use @{ in macros. ++ ++@c @DefescList {\@{, , , } ++@c @DefescListEnd {\@}, , , } ++@deffn Escape @t{\@{} ++@deffnx Escape @t{\@}} ++@esindex \@{ ++@esindex \@} ++@cindex begin of conditional block (@code{\@{}) ++@cindex end of conditional block (@code{\@}}) ++@cindex conditional block, begin (@code{\@{}) ++@cindex conditional block, end (@code{\@}}) ++@cindex block, conditional, begin (@code{\@{}) ++@cindex block, condititional, end (@code{\@}}) ++In many cases, an if (or if-else) construct needs to execute more than ++one request. This can be done using the escapes @code{\@{} (which must ++start the first line) and @code{\@}} (which must end the last line). ++ ++@Example ++.ie t \@{\ ++. ds lq `` ++. ds rq '' ++.\@} ++.el \@{\ ++. ds lq "" ++. ds rq "" ++.\@} ++@endExample ++@c @endDefesc ++@end deffn ++ ++@xref{Expressions}. ++ ++@c --------------------------------------------------------------------- ++ ++@node while, , if-else, Conditionals and Loops ++@subsection while ++@cindex while ++ ++@code{gtroff} provides a looping construct using the @code{while} ++request, which is used much like the @code{if} (and related) requests. ++ ++@Defreq {while, expr anything} ++Evaluate the expression @var{expr}, and repeatedly execute ++@var{anything} (the remainder of the line) until @var{expr} evaluates ++to@tie{}0. ++ ++@Example ++.nr a 0 1 ++.while (\na < 9) \@{\ ++\n+a, ++.\@} ++\n+a ++ @result{} 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ++@endExample ++ ++Some remarks. ++ ++@cindex @code{de} request, and @code{while} ++@itemize @bullet ++@item ++The body of a @code{while} request is treated like the body of a ++@code{de} request: @code{gtroff} temporarily stores it in a macro that ++is deleted after the loop has been exited. It can considerably slow ++down a macro if the body of the @code{while} request (within the macro) ++is large. Each time the macro is executed, the @code{while} body is ++parsed and stored again as a temporary macro. ++ ++@Example ++.de xxx ++. nr num 10 ++. while (\\n[num] > 0) \@{\ ++. \" many lines of code ++. nr num -1 ++. \@} ++.. ++@endExample ++ ++@cindex recursive macros ++@cindex macros, recursive ++@noindent ++The traditional and ofter better solution (@acronym{UNIX} @code{troff} ++doesn't have the @code{while} request) is to use a recursive macro ++instead that is parsed only once during its definition. ++ ++@Example ++.de yyy ++. if (\\n[num] > 0) \@{\ ++. \" many lines of code ++. nr num -1 ++. yyy ++. \@} ++.. ++. ++.de xxx ++. nr num 10 ++. yyy ++.. ++@endExample ++ ++@noindent ++Note that the number of available recursion levels is set to@tie{}1000 ++(this is a compile-time constant value of @code{gtroff}). ++ ++@item ++The closing brace of a @code{while} body must end a line. ++ ++@Example ++.if 1 \@{\ ++. nr a 0 1 ++. while (\n[a] < 10) \@{\ ++. nop \n+[a] ++.\@}\@} ++ @result{} unbalanced \@{ \@} ++@endExample ++@end itemize ++@endDefreq ++ ++@Defreq {break, } ++@cindex @code{while} request, confusing with @code{br} ++@cindex @code{break} request, in a @code{while} loop ++@cindex @code{continue} request, in a @code{while} loop ++Break out of a @code{while} loop. Be sure not to confuse this with the ++@code{br} request (causing a line break). ++@endDefreq ++ ++@Defreq {continue, } ++Finish the current iteration of a @code{while} loop, immediately ++restarting the next iteration. ++@endDefreq ++ ++@xref{Expressions}. ++ ++ ++@c ===================================================================== ++ ++@node Writing Macros, Page Motions, Conditionals and Loops, gtroff Reference ++@section Writing Macros ++@cindex writing macros ++@cindex macros, writing ++ ++A @dfn{macro} is a collection of text and embedded commands that can be ++invoked multiple times. Use macros to define common operations. ++@xref{Strings}, for a (limited) alternative syntax to call macros. ++ ++Although the following requests can be used to create macros, ++simply using an undefined macro will cause it to be defined as empty. ++@xref{Identifiers}. ++ ++@DefreqList {de, name [@Var{end}]} ++@DefreqItemx {de1, name [@Var{end}]} ++@DefreqItemx {dei, name [@Var{end}]} ++@DefreqListEndx {dei1, name [@Var{end}]} ++Define a new macro named @var{name}. @code{gtroff} copies subsequent ++lines (starting with the next one) into an internal buffer until it ++encounters the line @samp{..} (two dots). If the optional second ++argument to @code{de} is present it is used as the macro closure ++request instead of @samp{..}. ++ ++There can be whitespace after the first dot in the line containing the ++ending token (either @samp{.} or macro @samp{@var{end}}). Don't insert ++a tab character immediately after the @samp{..}, otherwise it isn't ++recognized as the end-of-macro symbol.@footnote{While it is possible to ++define and call a macro @samp{.} with ++ ++@Example ++.de . ++. tm foo ++.. ++. ++.. \" This calls macro `.'! ++@endExample ++ ++@noindent ++you can't use this as the end-of-macro macro: during a macro definition, ++@samp{..} is never handled as a call to @samp{.}, even if you say ++@samp{.de foo .} explicitly.} ++ ++Here a small example macro called @samp{P} that causes a break and ++inserts some vertical space. It could be used to separate paragraphs. ++ ++@Example ++.de P ++. br ++. sp .8v ++.. ++@endExample ++ ++The following example defines a macro within another. Remember that ++expansion must be protected twice; once for reading the macro and once ++for executing. ++ ++@Example ++\# a dummy macro to avoid a warning ++.de end ++.. ++. ++.de foo ++. de bar end ++. nop \f[B]Hallo \\\\$1!\f[] ++. end ++.. ++. ++.foo ++.bar Joe ++ @result{} @b{Hallo Joe!} ++@endExample ++ ++@noindent ++Since @code{\f} has no expansion, it isn't necessary to protect its ++backslash. Had we defined another macro within @code{bar} that takes a ++parameter, eight backslashes would be necessary before @samp{$1}. ++ ++The @code{de1} request turns off compatibility mode while executing the ++macro. On entry, the current compatibility mode is saved and restored ++at exit. ++ ++@Example ++.nr xxx 12345 ++. ++.de aa ++The value of xxx is \\n[xxx]. ++.. ++.de1 bb ++The value of xxx ix \\n[xxx]. ++.. ++. ++.cp 1 ++. ++.aa ++ @result{} warning: number register `[' not defined ++ @result{} The value of xxx is 0xxx]. ++.bb ++ @result{} The value of xxx ix 12345. ++@endExample ++ ++The @code{dei} request defines a macro indirectly. That is, it expands ++strings whose names are @var{name} or @var{end} before performing the ++append. ++ ++This: ++ ++@Example ++.ds xx aa ++.ds yy bb ++.dei xx yy ++@endExample ++ ++@noindent ++is equivalent to: ++ ++@Example ++.de aa bb ++@endExample ++ ++The @code{dei1} request is similar to @code{dei} but with compatibility ++mode switched off during execution of the defined macro. ++ ++If compatibility mode is on, @code{de} (and @code{dei}) behave similar ++to @code{de1} (and @code{dei1}): A `compatibility save' token is ++inserted at the beginning, and a `compatibility restore' token at the ++end, with compatibility mode switched on during execution. @xref{Gtroff ++Internals}, for more information on switching compatibility mode on and ++off in a single document. ++ ++@pindex trace.tmac ++Using @file{trace.tmac}, you can trace calls to @code{de} and ++@code{de1}. ++ ++Note that macro identifiers are shared with identifiers for strings and ++diversions. ++ ++@xref{als,,the description of the @code{als} request}, for possible ++pitfalls if redefining a macro that has been aliased. ++@endDefreq ++ ++@DefreqList {am, name [@Var{end}]} ++@DefreqItemx {am1, name [@Var{end}]} ++@DefreqItemx {ami, name [@Var{end}]} ++@DefreqListEndx {ami1, name [@Var{end}]} ++@cindex appending to a macro (@code{am}) ++@cindex macro, appending (@code{am}) ++Works similarly to @code{de} except it appends onto the macro named ++@var{name}. So, to make the previously defined @samp{P} macro actually ++do indented instead of block paragraphs, add the necessary code to the ++existing macro like this: ++ ++@Example ++.am P ++.ti +5n ++.. ++@endExample ++ ++The @code{am1} request turns off compatibility mode while executing the ++appended macro piece. To be more precise, a @dfn{compatibility save} ++input token is inserted at the beginning of the appended code, and a ++@dfn{compatibility restore} input token at the end. ++ ++The @code{ami} request appends indirectly, meaning that @code{gtroff} ++expands strings whose names are @var{name} or @var{end} before ++performing the append. ++ ++The @code{ami1} request is similar to @code{ami} but compatibility mode ++is switched off during execution of the defined macro. ++ ++@pindex trace.tmac ++Using @file{trace.tmac}, you can trace calls to @code{am} and ++@code{am1}. ++@endDefreq ++ ++@xref{Strings}, for the @code{als} and @code{rn} request to create an ++alias and rename a macro, respectively. ++ ++The @code{de}, @code{am}, @code{di}, @code{da}, @code{ds}, and @code{as} ++requests (together with its variants) only create a new object if the ++name of the macro, diversion or string diversion is currently undefined ++or if it is defined to be a request; normally they modify the value of ++an existing object. ++ ++@Defreq {return, [@Var{anything}]} ++Exit a macro, immediately returning to the caller. ++ ++If called with an argument, exit twice, namely the current macro and the ++macro one level higher. This is used to define a wrapper macro for ++@code{return} in @file{trace.tmac}. ++@endDefreq ++ ++@menu ++* Copy-in Mode:: ++* Parameters:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Copy-in Mode, Parameters, Writing Macros, Writing Macros ++@subsection Copy-in Mode ++@cindex copy mode ++@cindex copy-in mode ++@cindex mode, copy ++@cindex mode, copy-in ++ ++@cindex @code{\n}, when reading text for a macro ++@cindex @code{\$}, when reading text for a macro ++@cindex @code{\*}, when reading text for a macro ++@cindex @code{\\}, when reading text for a macro ++@cindex \@key{RET}, when reading text for a macro ++When @code{gtroff} reads in the text for a macro, string, or diversion, ++it copies the text (including request lines, but excluding escapes) into ++an internal buffer. Escapes are converted into an internal form, except ++for @code{\n}, @code{\$}, @code{\*}, @code{\\} and @code{\@key{RET}}, ++which are evaluated and inserted into the text where the escape was ++located. This is known as @dfn{copy-in} mode or @dfn{copy} mode. ++ ++What this means is that you can specify when these escapes are to be ++evaluated (either at copy-in time or at the time of use) by insulating ++the escapes with an extra backslash. Compare this to the @code{\def} ++and @code{\edef} commands in @TeX{}. ++ ++The following example prints the numbers 20 and@tie{}10: ++ ++@Example ++.nr x 20 ++.de y ++.nr x 10 ++\&\nx ++\&\\nx ++.. ++.y ++@endExample ++ ++@c --------------------------------------------------------------------- ++ ++@node Parameters, , Copy-in Mode, Writing Macros ++@subsection Parameters ++@cindex parameters ++ ++The arguments to a macro or string can be examined using a variety of ++escapes. ++ ++@Defreg {.$} ++@cindex number of arguments register (@code{.$}) ++The number of arguments passed to a macro or string. This is a ++read-only number register. ++ ++Note that the @code{shift} request can change its value. ++@endDefreg ++ ++Any individual argument can be retrieved with one of the following ++escapes: ++ ++@DefescList {\\$, , n, } ++@DefescItem {\\$, @Lparen{}, nn, } ++@DefescListEnd {\\$, @Lbrack{}, nnn, @Rbrack{}} ++@cindex copy-in mode, and macro arguments ++@cindex mode, copy-in, and macro arguments ++@cindex macro, arguments (@code{\$}) ++@cindex arguments, macro (@code{\$}) ++Retrieve the @var{n}@dmn{th}, @var{nn}@dmn{th} or @var{nnn}@dmn{th} ++argument. As usual, the first form only accepts a single number (larger ++than zero), the second a two-digit number (larger or equal to@tie{}10), ++and the third any positive integer value (larger than zero). Macros and ++strings can have an unlimited number of arguments. Note that due to ++copy-in mode, use two backslashes on these in actual use to prevent ++interpolation until the macro is actually invoked. ++@endDefesc ++ ++@Defreq {shift, [@Var{n}]} ++Shift the arguments 1@tie{}position, or as many positions as specified ++by its argument. After executing this request, argument@tie{}@var{i} ++becomes argument @math{@var{i}-@var{n}}; arguments 1 to@tie{}@var{n} are ++no longer available. Shifting by negative amounts is currently ++undefined. ++ ++The register @code{.$} is adjusted accordingly. ++@endDefreq ++ ++@DefescList {\\$*, , , } ++@DefescListEndx {\\$@@, , , } ++In some cases it is convenient to use all of the arguments at once (for ++example, to pass the arguments along to another macro). The @code{\$*} ++escape concatenates all the arguments separated by spaces. A similar ++escape is @code{\$@@}, which concatenates all the arguments with each ++surrounded by double quotes, and separated by spaces. If not in ++compatibility mode, the input level of double quotes is preserved (see ++@ref{Request and Macro Arguments}). ++@endDefesc ++ ++@Defesc {\\$^, , , } ++Handle the parameters of a macro as if they were an argument to the ++@code{ds} or similar requests. ++ ++@Example ++.de foo ++. tm $1=`\\$1' ++. tm $2=`\\$2' ++. tm $*=`\\$*' ++. tm $@@=`\\$@@' ++. tm $^=`\\$^' ++.. ++.foo " This is a "test" ++ @result{} $1=` This is a ' ++ @result{} $2=`test"' ++ @result{} $*=` This is a test"' ++ @result{} $@@=`" This is a " "test""' ++ @result{} $^=`" This is a "test"' ++@endExample ++ ++This escape is useful mainly for macro packages like @file{trace.tmac}, ++which redefines some requests and macros for debugging purposes. ++@endDefesc ++ ++@Defesc {\\$0, , , } ++@cindex macro name register (@code{\$0}) ++@cindex @code{als} request, and @code{\$0} ++The name used to invoke the current macro. The @code{als} request can ++make a macro have more than one name. ++ ++If a macro is called as a string (within another macro), the value of ++@code{\$0} isn't changed. ++ ++@Example ++.de foo ++. tm \\$0 ++.. ++.als foo bar ++. ++@endExample ++@Example ++.de aaa ++. foo ++.. ++.de bbb ++. bar ++.. ++.de ccc ++\\*[foo]\\ ++.. ++.de ddd ++\\*[bar]\\ ++.. ++. ++@endExample ++@Example ++.aaa ++ @result{} foo ++.bbb ++ @result{} bar ++.ccc ++ @result{} ccc ++.ddd ++ @result{} ddd ++@endExample ++@endDefesc ++ ++@xref{Request and Macro Arguments}. ++ ++ ++@c ===================================================================== ++ ++@node Page Motions, Drawing Requests, Writing Macros, gtroff Reference ++@section Page Motions ++@cindex page motions ++@cindex motions, page ++ ++@xref{Manipulating Spacing}, for a discussion of the main request for ++vertical motion, @code{sp}. ++ ++@DefreqList {mk, [@Var{reg}]} ++@DefreqListEndx {rt, [@Var{dist}]} ++@cindex marking vertical page location (@code{mk}) ++@cindex page location, vertical, marking (@code{mk}) ++@cindex location, vertical, page, marking (@code{mk}) ++@cindex vertical page location, marking (@code{mk}) ++@cindex returning to marked vertical page location (@code{rt}) ++@cindex page location, vertical, returning to marked (@code{rt}) ++@cindex location, vertical, page, returning to marked (@code{rt}) ++@cindex vertical page location, returning to marked (@code{rt}) ++The request @code{mk} can be used to mark a location on a page, for ++movement to later. This request takes a register name as an argument in ++which to store the current page location. With no argument it stores ++the location in an internal register. The results of this can be used ++later by the @code{rt} or the @code{sp} request (or the @code{\v} ++escape). ++ ++The @code{rt} request returns @emph{upwards} to the location marked with ++the last @code{mk} request. If used with an argument, return to a ++position which distance from the top of the page is @var{dist} (no ++previous call to @code{mk} is necessary in this case). Default scaling ++indicator is @samp{v}. ++ ++Here a primitive solution for a two-column macro. ++ ++@Example ++.nr column-length 1.5i ++.nr column-gap 4m ++.nr bottom-margin 1m ++. ++@endExample ++@Example ++.de 2c ++. br ++. mk ++. ll \\n[column-length]u ++. wh -\\n[bottom-margin]u 2c-trap ++. nr right-side 0 ++.. ++. ++@endExample ++@Example ++.de 2c-trap ++. ie \\n[right-side] \@{\ ++. nr right-side 0 ++. po -(\\n[column-length]u + \\n[column-gap]u) ++. \" remove trap ++. wh -\\n[bottom-margin]u ++. \@} ++. el \@{\ ++. \" switch to right side ++. nr right-side 1 ++. po +(\\n[column-length]u + \\n[column-gap]u) ++. rt ++. \@} ++.. ++. ++@endExample ++@Example ++.pl 1.5i ++.ll 4i ++This is a small test that shows how the ++rt request works in combination with mk. ++ ++.2c ++Starting here, text is typeset in two columns. ++Note that this implementation isn't robust ++and thus not suited for a real two-column ++macro. ++@endExample ++ ++Result: ++ ++@Example ++This is a small test that shows how the ++rt request works in combination with mk. ++ ++Starting here, isn't robust ++text is typeset and thus not ++in two columns. suited for a ++Note that this real two-column ++implementation macro. ++@endExample ++@endDefreq ++ ++The following escapes give fine control of movements about the page. ++ ++@Defesc {\\v, ', e, '} ++@cindex vertical motion (@code{\v}) ++@cindex motion, vertical (@code{\v}) ++Move vertically, usually from the current location on the page (if no ++absolute position operator @samp{|} is used). The argument@tie{}@var{e} ++specifies the distance to move; positive is downwards and negative ++upwards. The default scaling indicator for this escape is @samp{v}. ++Beware, however, that @code{gtroff} continues text processing at the ++point where the motion ends, so you should always balance motions to ++avoid interference with text processing. ++ ++@code{\v} doesn't trigger a trap. This can be quite useful; for ++example, consider a page bottom trap macro that prints a marker in the ++margin to indicate continuation of a footnote or something similar. ++@endDefesc ++ ++There are some special-case escapes for vertical motion. ++ ++@Defesc {\\r, , , } ++Move upwards@tie{}1@dmn{v}. ++@endDefesc ++ ++@Defesc {\\u, , , } ++Move upwards@tie{}.5@dmn{v}. ++@endDefesc ++ ++@Defesc {\\d, , , } ++Move down@tie{}.5@dmn{v}. ++@endDefesc ++ ++@Defesc {\\h, ', e, '} ++@cindex inserting horizontal space (@code{\h}) ++@cindex horizontal space (@code{\h}) ++@cindex space, horizontal (@code{\h}) ++@cindex horizontal motion (@code{\h}) ++@cindex motion, horizontal (@code{\h}) ++Move horizontally, usually from the current location (if no absolute ++position operator @samp{|} is used). The expression@tie{}@var{e} ++indicates how far to move: positive is rightwards and negative ++leftwards. The default scaling indicator for this escape is @samp{m}. ++ ++This horizontal space is not discarded at the end of a line. To insert ++discardable space of a certain length use the @code{ss} request. ++@endDefesc ++ ++There are a number of special-case escapes for horizontal motion. ++ ++@Defesc {\\@key{SP}, , , } ++@cindex space, unbreakable ++@cindex unbreakable space ++An unbreakable and unpaddable (i.e.@: not expanded during filling) ++space. (Note: This is a backslash followed by a space.) ++@endDefesc ++ ++@Defesc {\\~, , , } ++An unbreakable space that stretches like a normal inter-word space when ++a line is adjusted. ++@endDefesc ++ ++@Defesc {\\|, , , } ++A 1/6@dmn{th} em space. Ignored for TTY output devices (rounded to ++zero). ++ ++However, if there is a glyph defined in the current font file with name ++@code{\|} (note the leading backslash), the width of this glyph is used ++instead (even for TTYs). ++@endDefesc ++ ++@Defesc {\\^, , , } ++A 1/12@dmn{th} em space. Ignored for TTY output devices (rounded to ++zero). ++ ++However, if there is a glyph defined in the current font file with name ++@code{\^} (note the leading backslash), the width of this glyph is used ++instead (even for TTYs). ++@endDefesc ++ ++@Defesc {\\0, , , } ++@cindex space, width of a digit (@code{\0}) ++@cindex digit width space (@code{\0}) ++A space the size of a digit. ++@endDefesc ++ ++The following string sets the @TeX{} logo: ++ ++@Example ++.ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X ++@endExample ++ ++@DefescList {\\w, ', text, '} ++@DefregItemx {st} ++@DefregItemx {sb} ++@DefregItemx {rst} ++@DefregItemx {rsb} ++@DefregItemx {ct} ++@DefregItemx {ssc} ++@DefregListEndx {skw} ++@cindex width escape (@code{\w}) ++Return the width of the specified @var{text} in basic units. This ++allows horizontal movement based on the width of some arbitrary text ++(e.g.@: given as an argument to a macro). ++ ++@Example ++The length of the string `abc' is \w'abc'u. ++ @result{} The length of the string `abc' is 72u. ++@endExample ++ ++Font changes may occur in @var{text}, which don't affect current ++settings. ++ ++After use, @code{\w} sets several registers: ++ ++@table @code ++@item st ++@itemx sb ++The highest and lowest point of the baseline, respectively, in ++@var{text}. ++ ++@item rst ++@itemx rsb ++Like the @code{st} and @code{sb} registers, but takes account of the ++heights and depths of glyphs. In other words, this gives the highest ++and lowest point of @var{text}. Values below the baseline are negative. ++ ++@item ct ++Defines the kinds of glyphs occurring in @var{text}: ++ ++@table @asis ++@item 0 ++only short glyphs, no descenders or tall glyphs. ++ ++@item 1 ++at least one descender. ++ ++@item 2 ++at least one tall glyph. ++ ++@item 3 ++at least one each of a descender and a tall glyph. ++@end table ++ ++@item ssc ++The amount of horizontal space (possibly negative) that should be added ++to the last glyph before a subscript. ++ ++@item skw ++How far to right of the center of the last glyph in the @code{\w} ++argument, the center of an accent from a roman font should be placed ++over that glyph. ++@end table ++@endDefesc ++ ++@DefescList {\\k, , p, } ++@DefescItem {\\k, @Lparen{}, ps, } ++@DefescListEnd {\\k, @Lbrack{}, position, @Rbrack{}} ++@cindex saving horizontal input line position (@code{\k}) ++@cindex horizontal input line position, saving (@code{\k}) ++@cindex input line position, horizontal, saving (@code{\k}) ++@cindex position, horizontal input line, saving (@code{\k}) ++@cindex line, input, horizontal position, saving (@code{\k}) ++Store the current horizontal position in the @emph{input} line in number ++register with name @var{position} (one-character name@tie{}@var{p}, ++two-character name @var{ps}). Use this, for example, to return to the ++beginning of a string for highlighting or other decoration. ++@endDefesc ++ ++@Defreg {hp} ++@cindex horizontal input line position register (@code{hp}) ++@cindex input line, horizontal position, register (@code{hp}) ++@cindex position, horizontal, in input line, register (@code{hp}) ++@cindex line, input, horizontal position, register (@code{hp}) ++The current horizontal position at the input line. ++@endDefreg ++ ++@Defreg {.k} ++@cindex horizontal output line position register (@code{.k}) ++@cindex output line, horizontal position, register (@code{.k}) ++@cindex position, horizontal, in output line, register (@code{.k}) ++@cindex line, output, horizontal position, register (@code{.k}) ++A read-only number register containing the current horizontal output ++position (relative to the current indentation). ++@endDefreg ++ ++@Defesc {\\o, ', abc, '} ++@cindex overstriking glyphs (@code{\o}) ++@cindex glyphs, overstriking (@code{\o}) ++Overstrike glyphs @var{a}, @var{b}, @var{c}, @dots{}; the glyphs are ++centered, and the resulting spacing is the largest width of the affected ++glyphs. ++@endDefesc ++ ++@Defesc {\\z, , g, } ++@cindex zero-width printing (@code{\z}, @code{\Z}) ++@cindex printing, zero-width (@code{\z}, @code{\Z}) ++Print glyph @var{g} with zero width, i.e., without spacing. Use this to ++overstrike glyphs left-aligned. ++@endDefesc ++ ++@Defesc {\\Z, ', anything, '} ++@cindex zero-width printing (@code{\z}, @code{\Z}) ++@cindex printing, zero-width (@code{\z}, @code{\Z}) ++Print @var{anything}, then restore the horizontal and vertical position. ++The argument may not contain tabs or leaders. ++ ++The following is an example of a strike-through macro: ++ ++@Example ++.de ST ++.nr ww \w'\\$1' ++\Z@@\v'-.25m'\l'\\n[ww]u'@@\\$1 ++.. ++. ++This is ++.ST "a test" ++an actual emergency! ++@endExample ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node Drawing Requests, Traps, Page Motions, gtroff Reference ++@section Drawing Requests ++@cindex drawing requests ++@cindex requests for drawing ++ ++@code{gtroff} provides a number of ways to draw lines and other figures ++on the page. Used in combination with the page motion commands (see ++@ref{Page Motions}, for more info), a wide variety of figures can be ++drawn. However, for complex drawings these operations can be quite ++cumbersome, and it may be wise to use graphic preprocessors like ++@code{gpic} or @code{ggrn}. @xref{gpic}, and @ref{ggrn}, for more ++information. ++ ++All drawing is done via escapes. ++ ++@DefescList {\\l, ', l, '} ++@DefescListEnd {\\l, ', lg, '} ++@cindex drawing horizontal lines (@code{\l}) ++@cindex horizontal line, drawing (@code{\l}) ++@cindex line, horizontal, drawing (@code{\l}) ++Draw a line horizontally. @var{l} is the length of the line to be ++drawn. If it is positive, start the line at the current location and ++draw to the right; its end point is the new current location. Negative ++values are handled differently: The line starts at the current location ++and draws to the left, but the current location doesn't move. ++ ++@var{l} can also be specified absolutely (i.e.@: with a leading ++@samp{|}), which draws back to the beginning of the input line. Default ++scaling indicator is @samp{m}. ++ ++@cindex underscore glyph (@code{\[ru]}) ++@cindex glyph, underscore (@code{\[ru]}) ++@cindex line drawing glyph ++@cindex glyph, for line drawing ++The optional second parameter@tie{}@var{g} is a glyph to draw the line ++with. If this second argument is not specified, @code{gtroff} uses the ++underscore glyph, @code{\[ru]}. ++ ++@cindex zero width space character (@code{\&}) ++@cindex character, zero width space (@code{\&}) ++@cindex space character, zero width (@code{\&}) ++To separate the two arguments (to prevent @code{gtroff} from ++interpreting a drawing glyph as a scaling indicator if the glyph is ++represented by a single character) use @code{\&}. ++ ++Here a small useful example: ++ ++@Example ++.de box ++\[br]\\$*\[br]\l'|0\[rn]'\l'|0\[ul]' ++.. ++@endExample ++ ++@noindent ++Note that this works by outputting a box rule (a vertical line), then ++the text given as an argument and then another box rule. Finally, the ++line drawing escapes both draw from the current location to the ++beginning of the @emph{input} line -- this works because the line length ++is negative, not moving the current point. ++@endDefesc ++ ++@DefescList {\\L, ', l, '} ++@DefescListEnd {\\L, ', lg, '} ++@cindex drawing vertical lines (@code{\L}) ++@cindex vertical line drawing (@code{\L}) ++@cindex line, vertical, drawing (@code{\L}) ++@cindex line drawing glyph ++@cindex glyph for line drawing ++@cindex box rule glyph (@code{\[br]}) ++@cindex glyph, box rule (@code{\[br]}) ++Draw vertical lines. Its parameters are similar to the @code{\l} ++escape, except that the default scaling indicator is @samp{v}. The ++movement is downwards for positive values, and upwards for negative ++values. The default glyph is the box rule glyph, @code{\[br]}. As with ++the vertical motion escapes, text processing blindly continues where the ++line ends. ++ ++@Example ++This is a \L'3v'test. ++@endExample ++ ++@noindent ++Here is the result, produced with @code{grotty}. ++ ++@Example ++This is a ++ | ++ | ++ |test. ++@endExample ++@endDefesc ++ ++@Defesc {\\D, ', command arg @dots{}, '} ++The @code{\D} escape provides a variety of drawing functions. Note that ++on character devices, only vertical and horizontal lines are supported ++within @code{grotty}; other devices may only support a subset of the ++available drawing functions. ++ ++The default scaling indicator for all subcommands of @code{\D} is ++@samp{m} for horizontal distances and @samp{v} for vertical ones. ++Exceptions are @w{@code{\D'f @dots{}'}} and @w{@code{\D't @dots{}'}}, ++which use @code{u} as the default, and @w{@code{\D'F@var{x} @dots{}'}}, ++which arguments are treated similar to the @code{defcolor} request. ++ ++@table @code ++@item \D'l @var{dx} @var{dy}' ++@cindex line, drawing (@w{@code{\D'l @dots{}'}}) ++@cindex drawing a line (@w{@code{\D'l @dots{}'}}) ++Draw a line from the current location to the relative point specified by ++(@var{dx},@var{dy}), where positive values mean down and right, ++respectively. The end point of the line is the new current location. ++ ++The following example is a macro for creating a box around a text ++string; for simplicity, the box margin is taken as a fixed value, ++0.2@dmn{m}. ++ ++@Example ++.de BOX ++. nr @@wd \w'\\$1' ++\h'.2m'\ ++\h'-.2m'\v'(.2m - \\n[rsb]u)'\ ++\D'l 0 -(\\n[rst]u - \\n[rsb]u + .4m)'\ ++\D'l (\\n[@@wd]u + .4m) 0'\ ++\D'l 0 (\\n[rst]u - \\n[rsb]u + .4m)'\ ++\D'l -(\\n[@@wd]u + .4m) 0'\ ++\h'.2m'\v'-(.2m - \\n[rsb]u)'\ ++\\$1\ ++\h'.2m' ++.. ++@endExample ++ ++@noindent ++First, the width of the string is stored in register @code{@@wd}. Then, ++four lines are drawn to form a box, properly offset by the box margin. ++The registers @code{rst} and @code{rsb} are set by the @code{\w} escape, ++containing the largest height and depth of the whole string. ++ ++@item \D'c @var{d}' ++@cindex circle, drawing (@w{@code{\D'c @dots{}'}}) ++@cindex drawing a circle (@w{@code{\D'c @dots{}'}}) ++Draw a circle with a diameter of@tie{}@var{d} with the leftmost point at ++the current position. After drawing, the current location is positioned ++at the rightmost point of the circle. ++ ++@item \D'C @var{d}' ++@cindex circle, solid, drawing (@w{@code{\D'C @dots{}'}}) ++@cindex drawing a solid circle (@w{@code{\D'C @dots{}'}}) ++@cindex solid circle, drawing (@w{@code{\D'C @dots{}'}}) ++Draw a solid circle with the same parameters and behaviour as an ++outlined circle. No outline is drawn. ++ ++@item \D'e @var{x} @var{y}' ++@cindex drawing an ellipse (@w{@code{\D'e @dots{}'}}) ++@cindex ellipse, drawing (@w{@code{\D'e @dots{}'}}) ++Draw an ellipse with a horizontal diameter of @var{x} and a vertical ++diameter of @var{y} with the leftmost point at the current position. ++After drawing, the current location is positioned at the rightmost point ++of the ellipse. ++ ++@item \D'E @var{x} @var{y}' ++@cindex ellipse, solid, drawing (@w{@code{\D'E @dots{}'}}) ++@cindex drawing a solid ellipse (@w{@code{\D'E @dots{}'}}) ++@cindex solid ellipse, drawing (@w{@code{\D'E @dots{}'}}) ++Draw a solid ellipse with the same parameters and behaviour as an ++outlined ellipse. No outline is drawn. ++ ++@item \D'a @var{dx1} @var{dy1} @var{dx2} @var{dy2}' ++@cindex arc, drawing (@w{@code{\D'a @dots{}'}}) ++@cindex drawing an arc (@w{@code{\D'a @dots{}'}}) ++Draw an arc clockwise from the current location through the two ++specified relative locations (@var{dx1},@var{dy1}) and ++(@var{dx2},@var{dy2}). The coordinates of the first point are relative ++to the current position, and the coordinates of the second point are ++relative to the first point. After drawing, the current position is ++moved to the final point of the arc. ++ ++@item \D'~ @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}' ++@cindex drawing a spline (@w{@code{\D'~ @dots{}'}}) ++@cindex spline, drawing (@w{@code{\D'~ @dots{}'}}) ++Draw a spline from the current location to the relative point ++(@var{dx1},@var{dy1}) and then to (@var{dx2},@var{dy2}), and so on. The ++current position is moved to the terminal point of the drawn curve. ++ ++@item \D'f @var{n}' ++@cindex gray shading (@w{@code{\D'f @dots{}'}}) ++@cindex shading filled objects (@w{@code{\D'f @dots{}'}}) ++Set the shade of gray to be used for filling solid objects ++to@tie{}@var{n}; @var{n}@tie{}must be an integer between 0 ++and@tie{}1000, where 0 corresponds solid white and 1000 to solid black, ++and values in between correspond to intermediate shades of gray. This ++applies only to solid circles, solid ellipses, and solid polygons. By ++default, a level of 1000 is used. ++ ++Despite of being silly, the current point is moved horizontally to the ++right by@tie{}@var{n}. ++ ++@cindex @w{@code{\D'f @dots{}'}} and horizontal resolution ++Don't use this command! It has the serious drawback that it is always ++rounded to the next integer multiple of the horizontal resolution (the ++value of the @code{hor} keyword in the @file{DESC} file). Use @code{\M} ++(@pxref{Colors}) or @w{@code{\D'Fg @dots{}'}} instead. ++ ++@item \D'p @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}' ++@cindex drawing a polygon (@w{@code{\D'p @dots{}'}}) ++@cindex polygon, drawing (@w{@code{\D'p @dots{}'}}) ++Draw a polygon from the current location to the relative position ++(@var{dx1},@var{dy1}) and then to (@var{dx2},@var{dy2}) and so on. When ++the specified data points are exhausted, a line is drawn back to the ++starting point. The current position is changed by adding the sum of ++all arguments with odd index to the actual horizontal position and the ++even ones to the vertical position. ++ ++@item \D'P @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}' ++@cindex polygon, solid, drawing (@w{@code{\D'P @dots{}'}}) ++@cindex drawing a solid polygon (@w{@code{\D'P @dots{}'}}) ++@cindex solid polygon, drawing (@w{@code{\D'P @dots{}'}}) ++Draw a solid polygon with the same parameters and behaviour as an ++outlined polygon. No outline is drawn. ++ ++Here a better variant of the box macro to fill the box with some color. ++Note that the box must be drawn before the text since colors in ++@code{gtroff} are not transparent; the filled polygon would hide the ++text completely. ++ ++@Example ++.de BOX ++. nr @@wd \w'\\$1' ++\h'.2m'\ ++\h'-.2m'\v'(.2m - \\n[rsb]u)'\ ++\M[lightcyan]\ ++\D'P 0 -(\\n[rst]u - \\n[rsb]u + .4m) \ ++ (\\n[@@wd]u + .4m) 0 \ ++ 0 (\\n[rst]u - \\n[rsb]u + .4m) \ ++ -(\\n[@@wd]u + .4m) 0'\ ++\h'.2m'\v'-(.2m - \\n[rsb]u)'\ ++\M[]\ ++\\$1\ ++\h'.2m' ++.. ++@endExample ++ ++If you want a filled polygon that has exactly the same size as an ++unfilled one, you must draw both an unfilled and a filled polygon. A ++filled polygon is always smaller than an unfilled one because the latter ++uses straight lines with a given line thickness to connect the polygon's ++corners, while the former simply fills the area defined by the ++coordinates. ++ ++@Example ++\h'1i'\v'1i'\ ++\# increase line thickness ++\Z'\D't 5p''\ ++\# draw unfilled polygon ++\Z'\D'p 3 3 -6 0''\ ++\# draw filled polygon ++\Z'\D'P 3 3 -6 0'' ++@endExample ++ ++@item \D't @var{n}' ++@cindex line thickness (@w{@code{\D't @dots{}'}}) ++@cindex thickness of lines (@w{@code{\D't @dots{}'}}) ++Set the current line thickness to @var{n}@tie{}machine units. A value ++of zero selects the smallest available line thickness. A negative value ++makes the line thickness proportional to the current point size (this is ++the default behaviour of @acronym{AT&T} @code{troff}). ++ ++Despite of being silly, the current point is moved horizontally to the ++right by@tie{}@var{n}. ++ ++@item \D'F@var{scheme} @var{color_components}' ++@cindex unnamed fill colors (@code{\D'F@dots{}'}) ++@cindex fill colors, unnamed (@code{\D'F@dots{}'}) ++@cindex colors, fill, unnamed (@code{\D'F@dots{}'}) ++Change current fill color. @var{scheme} is a single letter denoting the ++color scheme: @samp{r} (rgb), @samp{c} (cmy), @samp{k} (cmyk), @samp{g} ++(gray), or @samp{d} (default color). The color components use exactly ++the same syntax as in the @code{defcolor} request (@pxref{Colors}); the ++command @code{\D'Fd'} doesn't take an argument. ++ ++@emph{No} position changing! ++ ++Examples: ++ ++@Example ++\D'Fg .3' \" same gray as \D'f 700' ++\D'Fr #0000ff' \" blue ++@endExample ++@end table ++@endDefesc ++ ++@xref{Graphics Commands}. ++ ++@Defesc {\\b, ', string, '} ++@cindex pile, glyph (@code{\b}) ++@cindex glyph pile (@code{\b}) ++@cindex stacking glyphs (@code{\b}) ++@dfn{Pile} a sequence of glyphs vertically, and center it vertically on ++the current line. Use it to build large brackets and braces. ++ ++Here an example how to create a large opening brace: ++ ++@Example ++\b'\[lt]\[bv]\[lk]\[bv]\[lb]' ++@endExample ++ ++@cindex @code{\b}, limitations ++@cindex limitations of @code{\b} escape ++The first glyph is on the top, the last glyph in @var{string} is at the ++bottom. Note that @code{gtroff} separates the glyphs vertically by ++1@dmn{m}, and the whole object is centered 0.5@dmn{m} above the current ++baseline; the largest glyph width is used as the width for the whole ++object. This rather unflexible positioning algorithm doesn't work with ++@option{-Tdvi} since the bracket pieces vary in height for this device. ++Instead, use the @code{eqn} preprocessor. ++ ++@xref{Manipulating Spacing}, how to adjust the vertical spacing with the ++@code{\x} escape. ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node Traps, Diversions, Drawing Requests, gtroff Reference ++@section Traps ++@cindex traps ++ ++@dfn{Traps} are locations that, when reached, call a specified macro. ++These traps can occur at a given location on the page, at a given ++location in the current diversion, at a blank line, after a certain ++number of input lines, or at the end of input. ++ ++@cindex planting a trap ++@cindex trap, planting ++Setting a trap is also called @dfn{planting}. ++@cindex trap, springing ++@cindex springing a trap ++It is also said that a trap is @dfn{sprung} if the associated macro is ++executed. ++ ++@menu ++* Page Location Traps:: ++* Diversion Traps:: ++* Input Line Traps:: ++* Blank Line Traps:: ++* Leading Spaces Traps:: ++* End-of-input Traps:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Page Location Traps, Diversion Traps, Traps, Traps ++@subsection Page Location Traps ++@cindex page location traps ++@cindex traps, page location ++ ++@dfn{Page location traps} perform an action when @code{gtroff} reaches ++or passes a certain vertical location on the page. Page location traps ++have a variety of purposes, including: ++ ++@itemize ++@item ++setting headers and footers ++ ++@item ++setting body text in multiple columns ++ ++@item ++setting footnotes ++@end itemize ++ ++@DefreqList {vpt, flag} ++@DefregListEndx {.vpt} ++@cindex enabling vertical position traps (@code{vpt}) ++@cindex vertical position traps, enabling (@code{vpt}) ++@cindex vertical position trap enable register (@code{.vpt}) ++Enable vertical position traps if @var{flag} is non-zero, or disables ++them otherwise. Vertical position traps are traps set by the @code{wh} ++or @code{dt} requests. Traps set by the @code{it} request are not ++vertical position traps. The parameter that controls whether vertical ++position traps are enabled is global. Initially vertical position traps ++are enabled. The current setting of this is available in the ++@code{.vpt} read-only number register. ++ ++Note that a page can't be ejected if @code{vpt} is set to zero. ++@endDefreq ++ ++@Defreq {wh, dist [@Var{macro}]} ++Set a page location trap. Non-negative values for @var{dist} set the ++trap relative to the top of the page; negative values set the trap ++relative to the bottom of the page. Default scaling indicator is ++@samp{v}; values of @var{dist} are always rounded to be multiples of the ++vertical resolution (as given in register @code{.V}). ++ ++@var{macro} is the name of the macro to execute when the trap is sprung. ++If @var{macro} is missing, remove the first trap (if any) at @var{dist}. ++ ++@cindex page headers ++@cindex page footers ++@cindex headers ++@cindex footers ++The following is a simple example of how many macro packages set headers ++and footers. ++ ++@Example ++.de hd \" Page header ++' sp .5i ++. tl 'Title''date' ++' sp .3i ++.. ++. ++.de fo \" Page footer ++' sp 1v ++. tl ''%'' ++' bp ++.. ++. ++.wh 0 hd \" trap at top of the page ++.wh -1i fo \" trap one inch from bottom ++@endExample ++ ++A trap at or below the bottom of the page is ignored; it can be made ++active by either moving it up or increasing the page length so that the ++trap is on the page. ++ ++Negative trap values always use the @emph{current} page length; they are ++not converted to an absolute vertical position: ++ ++@Example ++.pl 5i ++.wh -1i xx ++.ptr ++ @result{} xx -240 ++.pl 100i ++.ptr ++ @result{} xx -240 ++@endExample ++ ++It is possible to have more than one trap at the same location; to do ++so, the traps must be defined at different locations, then moved ++together with the @code{ch} request; otherwise the second trap would ++replace the first one. Earlier defined traps hide later defined traps ++if moved to the same position (the many empty lines caused by the ++@code{bp} request are omitted in the following example): ++ ++@Example ++.de a ++. nop a ++.. ++.de b ++. nop b ++.. ++.de c ++. nop c ++.. ++. ++.wh 1i a ++.wh 2i b ++.wh 3i c ++.bp ++ @result{} a b c ++@endExample ++@Example ++.ch b 1i ++.ch c 1i ++.bp ++ @result{} a ++@endExample ++@Example ++.ch a 0.5i ++.bp ++ @result{} a b ++@endExample ++@endDefreq ++ ++@Defreg {.t} ++@cindex distance to next trap register (@code{.t}) ++@cindex trap, distance, register (@code{.t}) ++A read-only number register holding the distance to the next trap. ++ ++If there are no traps between the current position and the bottom of the ++page, it contains the distance to the page bottom. In a diversion, the ++distance to the page bottom is infinite (the returned value is the ++biggest integer that can be represented in @code{groff}) if there are ++no diversion traps. ++@endDefreg ++ ++@Defreq {ch, macro [@Var{dist}]} ++@cindex changing trap location (@code{ch}) ++@cindex trap, changing location (@code{ch}) ++Change the location of a trap. The first argument is the name of the ++macro to be invoked at the trap, and the second argument is the new ++location for the trap (note that the parameters are specified in ++opposite order as in the @code{wh} request). This is useful for ++building up footnotes in a diversion to allow more space at the bottom ++of the page for them. ++ ++Default scaling indicator for @var{dist} is @samp{v}. If @var{dist} is ++missing, the trap is removed. ++ ++@c XXX ++ ++@ignore ++@Example ++... (simplified) footnote example ... ++@endExample ++@end ignore ++@endDefreq ++ ++@Defreg {.ne} ++The read-only number register @code{.ne} contains the amount of space ++that was needed in the last @code{ne} request that caused a trap to be ++sprung. Useful in conjunction with the @code{.trunc} register. ++@xref{Page Control}, for more information. ++ ++Since the @code{.ne} register is only set by traps it doesn't make much ++sense to use it outside of trap macros. ++@endDefreg ++ ++@Defreg {.trunc} ++@cindex @code{ne} request, and the @code{.trunc} register ++@cindex truncated vertical space register (@code{.trunc}) ++A read-only register containing the amount of vertical space truncated ++by the most recently sprung vertical position trap, or, if the trap was ++sprung by an @code{ne} request, minus the amount of vertical motion ++produced by the @code{ne} request. In other words, at the point a trap ++is sprung, it represents the difference of what the vertical position ++would have been but for the trap, and what the vertical position ++actually is. ++ ++Since the @code{.trunc} register is only set by traps it doesn't make ++much sense to use it outside of trap macros. ++@endDefreg ++ ++@Defreg {.pe} ++@cindex @code{bp} request, and traps (@code{.pe}) ++@cindex traps, sprung by @code{bp} request (@code{.pe}) ++@cindex page ejecting register (@code{.pe}) ++A read-only register that is set to@tie{}1 while a page is ejected with ++the @code{bp} request (or by the end of input). ++ ++Outside of traps this register is always zero. In the following ++example, only the second call to@tie{}@code{x} is caused by @code{bp}. ++ ++@Example ++.de x ++\&.pe=\\n[.pe] ++.br ++.. ++.wh 1v x ++.wh 4v x ++A line. ++.br ++Another line. ++.br ++ @result{} A line. ++ .pe=0 ++ Another line. ++ ++ .pe=1 ++@endExample ++@endDefreg ++ ++@cindex diversions, and traps ++@cindex traps, and diversions ++An important fact to consider while designing macros is that diversions ++and traps do not interact normally. For example, if a trap invokes a ++header macro (while outputting a diversion) that tries to change the ++font on the current page, the effect is not visible before the diversion ++has completely been printed (except for input protected with @code{\!} ++or @code{\?}) since the data in the diversion is already formatted. In ++most cases, this is not the expected behaviour. ++ ++@c --------------------------------------------------------------------- ++ ++@node Diversion Traps, Input Line Traps, Page Location Traps, Traps ++@subsection Diversion Traps ++@cindex diversion traps ++@cindex traps, diversion ++ ++@Defreq {dt, [@Var{dist} @Var{macro}]} ++@cindex @code{.t} register, and diversions ++@cindex setting diversion trap (@code{dt}) ++@cindex diversion trap, setting (@code{dt}) ++@cindex trap, diversion, setting (@code{dt}) ++Set a trap @emph{within} a diversion. @var{dist} is the location of the ++trap (identical to the @code{wh} request; default scaling indicator is ++@samp{v}) and @var{macro} is the name of the macro to be invoked. If ++called without arguments, the diversion trap is removed. ++ ++Note that there exists only a single diversion trap. ++ ++The number register @code{.t} still works within diversions. ++@xref{Diversions}, for more information. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Input Line Traps, Blank Line Traps, Diversion Traps, Traps ++@subsection Input Line Traps ++@cindex input line traps ++@cindex traps, input line ++ ++@DefreqList {it, n macro} ++@DefreqListEndx {itc, n macro} ++@cindex setting input line trap (@code{it}) ++@cindex input line trap, setting (@code{it}) ++@cindex trap, input line, setting (@code{it}) ++Set an input line trap. @var{n}@tie{}is the number of lines of input ++that may be read before springing the trap, @var{macro} is the macro to ++be invoked. Request lines are not counted as input lines. ++ ++For example, one possible use is to have a macro that prints the next ++@var{n}@tie{}lines in a bold font. ++ ++@Example ++.de B ++. it \\$1 B-end ++. ft B ++.. ++. ++.de B-end ++. ft R ++.. ++@endExample ++ ++@cindex input line traps and interrupted lines (@code{itc}) ++@cindex interrupted lines and input line traps (@code{itc}) ++@cindex traps, input line, and interrupted lines (@code{itc}) ++@cindex lines, interrupted, and input line traps (@code{itc}) ++The @code{itc} request is identical except that an interrupted text line ++(ending with @code{\c}) is not counted as a separate line. ++ ++Both requests are associated with the current environment ++(@pxref{Environments}); switching to another environment disables the ++current input trap, and going back reactivates it, restoring the number ++of already processed lines. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Blank Line Traps, Leading Spaces Traps, Input Line Traps, Traps ++@subsection Blank Line Traps ++@cindex blank line traps ++@cindex traps, blank line ++ ++@Defreq {blm, macro} ++@cindex blank line macro (@code{blm}) ++Set a blank line trap. @code{gtroff} executes @var{macro} when it ++encounters a blank line in the input file. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node Leading Spaces Traps, End-of-input Traps, Blank Line Traps, Traps ++@subsection Leading Spaces Traps ++@cindex leading spaces traps ++@cindex traps, leading spaces ++ ++@DefreqList {lsm, macro} ++@DefregItemx {lsn} ++@DefregListEndx {lss} ++@cindex leading spaces macro (@code{lsm}) ++Set a leading spaces trap. @code{gtroff} executes @var{macro} when it ++encounters leading spaces in an input line; the implicit line break ++that normally happens in this case is suppressed. A line consisting ++of spaces only, however, is treated as an empty line, possibly subject ++to an empty line macro set with the @code{blm} request. ++ ++Leading spaces are removed from the input line before calling the ++leading spaces macro. The number of removed spaces is stored in ++register @code{lsn}; the horizontal space that would be emitted if ++there was no leading space macro is stored in register @code{lss}. ++Note that @code{lsn} and @code{lss} are available even if no leading ++space macro has been set. ++ ++The first thing a leading space macro sees is a token. However, some ++escapes like @code{\f} or @code{\m} are handled on the fly (see ++@ref{Gtroff Internals}, for a complete list) without creating a token ++at all. Consider that a line starts with two spaces followed by ++@code{\fIfoo}. While skipping the spaces @code{\fI} is handled too so ++that groff's current font is properly set to @samp{I}, but the leading ++space macro only sees @code{foo}, without the preceding @code{\fI}. ++If the macro should see the font escape you have to `protect' it with ++something that creates a token, for example with @code{\&\fIfoo}. ++@endDefreq ++ ++@c --------------------------------------------------------------------- ++ ++@node End-of-input Traps, , Leading Spaces Traps, Traps ++@subsection End-of-input Traps ++@cindex end-of-input traps ++@cindex traps, end-of-input ++ ++@Defreq {em, macro} ++@cindex setting end-of-input trap (@code{em}) ++@cindex end-of-input trap, setting (@code{em}) ++@cindex trap, end-of-input, setting (@code{em}) ++@cindex end-of-input macro (@code{em}) ++@cindex macro, end-of-input (@code{em}) ++Set a trap at the end of input. @var{macro} is executed after the last ++line of the input file has been processed. ++ ++For example, if the document had to have a section at the bottom of the ++last page for someone to approve it, the @code{em} request could be ++used. ++ ++@Example ++.de approval ++\c ++. ne 3v ++. sp (\\n[.t]u - 3v) ++. in +4i ++. lc _ ++. br ++Approved:\t\a ++. sp ++Date:\t\t\a ++.. ++. ++.em approval ++@endExample ++ ++The @code{\c} in the above example needs explanation. For historical ++reasons (and for compatibility with @acronym{AT&T} @code{troff}), the ++end macro exits as soon as it causes a page break and no remaining ++data is in the partially collected line. ++ ++Let us assume that there is no @code{\c} in the above @code{approval} ++macro, and that the page is full and has been ended with, say, a ++@code{br} request. The @code{ne} request now causes the start of a new ++page, which in turn makes @code{troff} exit immediately for the reasons ++just described. In most situations this is not intended. ++ ++To always force processing the whole end macro independently of this ++behaviour it is thus advisable to insert something that starts an ++empty partially filled line (@code{\c}) whenever there is a chance that ++a page break can happen. In the above example, the call of the ++@code{ne} request assures that the remaining code stays on the same ++page, so we have to insert @code{\c} only once. ++ ++The next example shows how to append three lines, then starting a new ++page unconditionally. Since @w{@samp{.ne 1}} doesn't give the desired ++effect -- there is always one line available or we are already at the ++beginning of the next page -- we temporarily increase the page length ++by one line so that we can use @w{@samp{.ne 2}}. ++ ++@Example ++.de EM ++.pl +1v ++\c ++.ne 2 ++line one ++.br ++\c ++.ne 2 ++line two ++.br ++\c ++.ne 2 ++line three ++.br ++.pl -1v ++\c ++'bp ++.. ++.em EM ++@endExample ++ ++Note that this specific feature affects only the first potential page ++break caused by the end macro; further page breaks emitted by the end ++macro are handled normally. ++ ++Another possible use of the @code{em} request is to make @code{gtroff} ++emit a single large page instead of multiple pages. For example, one ++may want to produce a long plain-text file for reading on-screen. The ++idea is to set the page length at the beginning of the document to a ++very large value to hold all the text, and automatically adjust it to ++the exact height of the document after the text has been output. ++ ++@Example ++.de adjust-page-length ++. br ++. pl \\n[nl]u \" \n[nl] holds the current page length ++.. ++. ++.de single-page-mode ++. pl 99999 ++. em adjust-page-length ++.. ++. ++.\" activate the above code ++.single-page-mode ++@endExample ++ ++Since only one end-of-input trap does exist and other macro packages ++may already use it, care must be taken not to break the mechanism. A ++simple solution would be to append the above macro to the macro ++package's end-of-input macro using the @code{.am} request. ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Diversions, Environments, Traps, gtroff Reference ++@section Diversions ++@cindex diversions ++ ++In @code{gtroff} it is possible to @dfn{divert} text into a named ++storage area. Due to the similarity to defining macros it is sometimes ++said to be stored in a macro. This is used for saving text for output ++at a later time, which is useful for keeping blocks of text on the same ++page, footnotes, tables of contents, and indices. ++ ++@cindex top-level diversion ++@cindex diversion, top-level ++For orthogonality it is said that @code{gtroff} is in the @dfn{top-level ++diversion} if no diversion is active (i.e., the data is diverted to the ++output device). ++ ++Although the following requests can be used to create diversions, ++simply using an undefined diversion will cause it to be defined as empty. ++@xref{Identifiers}. ++ ++@DefreqList {di, macro} ++@DefreqListEndx {da, macro} ++@cindex beginning diversion (@code{di}) ++@cindex diversion, beginning (@code{di}) ++@cindex ending diversion (@code{di}) ++@cindex diversion, ending (@code{di}) ++@cindex appending to a diversion (@code{da}) ++@cindex diversion, appending (@code{da}) ++Begin a diversion. Like the @code{de} request, it takes an argument of ++a macro name to divert subsequent text into. The @code{da} macro ++appends to an existing diversion. ++ ++@code{di} or @code{da} without an argument ends the diversion. ++ ++The current partially-filled line is included into the diversion. See ++the @code{box} request below for an example. Note that switching to ++another (empty) environment (with the @code{ev} request) avoids the ++inclusion of the current partially-filled line. ++@endDefreq ++ ++@DefreqList {box, macro} ++@DefreqListEndx {boxa, macro} ++Begin (or append to) a diversion like the @code{di} and @code{da} ++requests. The difference is that @code{box} and @code{boxa} do not ++include a partially-filled line in the diversion. ++ ++Compare this: ++ ++@Example ++Before the box. ++.box xxx ++In the box. ++.br ++.box ++After the box. ++.br ++ @result{} Before the box. After the box. ++.xxx ++ @result{} In the box. ++@endExample ++ ++@noindent ++with this: ++ ++@Example ++Before the diversion. ++.di yyy ++In the diversion. ++.br ++.di ++After the diversion. ++.br ++ @result{} After the diversion. ++.yyy ++ @result{} Before the diversion. In the diversion. ++@endExample ++ ++@code{box} or @code{boxa} without an argument ends the diversion. ++@endDefreq ++ ++@DefregList {.z} ++@DefregListEndx {.d} ++@cindex @code{nl} register, and @code{.d} ++@cindex nested diversions ++@cindex diversion, nested ++@cindex diversion name register (@code{.z}) ++@cindex vertical position in diversion register (@code{.d}) ++@cindex position, vertical, in diversion, register (@code{.d}) ++@cindex diversion, vertical position in, register (@code{.d}) ++Diversions may be nested. The read-only number register @code{.z} ++contains the name of the current diversion (this is a string-valued ++register). The read-only number register @code{.d} contains the current ++vertical place in the diversion. If not in a diversion it is the same ++as register @code{nl}. ++@endDefreg ++ ++@Defreg {.h} ++@cindex high-water mark register (@code{.h}) ++@cindex mark, high-water, register (@code{.h}) ++@cindex position of lowest text line (@code{.h}) ++@cindex text line, position of lowest (@code{.h}) ++The @dfn{high-water mark} on the current page. It corresponds to the ++text baseline of the lowest line on the page. This is a read-only ++register. ++ ++@Example ++.tm .h==\n[.h], nl==\n[nl] ++ @result{} .h==0, nl==-1 ++This is a test. ++.br ++.sp 2 ++.tm .h==\n[.h], nl==\n[nl] ++ @result{} .h==40, nl==120 ++@endExample ++ ++@cindex @code{.h} register, difference to @code{nl} ++@cindex @code{nl} register, difference to @code{.h} ++@noindent ++As can be seen in the previous example, empty lines are not considered ++in the return value of the @code{.h} register. ++@endDefreg ++ ++@DefregList {dn} ++@DefregListEndx {dl} ++@cindex @code{dn} register, and @code{da} (@code{boxa}) ++@cindex @code{dl} register, and @code{da} (@code{boxa}) ++@cindex @code{da} request, and @code{dn} (@code{dl}) ++@cindex @code{boxa} request, and @code{dn} (@code{dl}) ++After completing a diversion, the read-write number registers @code{dn} ++and @code{dl} contain the vertical and horizontal size of the diversion. ++Note that only the just processed lines are counted: For the computation ++of @code{dn} and @code{dl}, the requests @code{da} and @code{boxa} are ++handled as if @code{di} and @code{box} had been used -- lines that have ++been already stored in a macro are not taken into account. ++ ++@Example ++.\" Center text both horizontally & vertically ++. ++.\" Enclose macro definitions in .eo and .ec ++.\" to avoid the doubling of the backslash ++.eo ++.\" macro .(c starts centering mode ++.de (c ++. br ++. ev (c ++. evc 0 ++. in 0 ++. nf ++. di @@c ++.. ++@endExample ++@Example ++.\" macro .)c terminates centering mode ++.de )c ++. br ++. ev ++. di ++. nr @@s (((\n[.t]u - \n[dn]u) / 2u) - 1v) ++. sp \n[@@s]u ++. ce 1000 ++. @@c ++. ce 0 ++. sp \n[@@s]u ++. br ++. fi ++. rr @@s ++. rm @@s ++. rm @@c ++.. ++.\" End of macro definitions, restore escape mechanism ++.ec ++@endExample ++@endDefreg ++ ++@DefescList {\\!, , , } ++@DefescListEndx {\\?, , anything, \\?} ++@cindex transparent output (@code{\!}, @code{\?}) ++@cindex output, transparent (@code{\!}, @code{\?}) ++Prevent requests, macros, and escapes from being interpreted when read ++into a diversion. Both escapes take the given text and ++@dfn{transparently} embed it into the diversion. This is useful for ++macros that shouldn't be invoked until the diverted text is actually ++output. ++ ++The @code{\!} escape transparently embeds text up to and including the ++end of the line. The @code{\?} escape transparently embeds text until ++the next occurrence of the @code{\?} escape. Example: ++ ++@Example ++\?@var{anything}\? ++@endExample ++ ++@cindex @code{\?}, and copy-in mode ++@cindex copy-in mode, and @code{\?} ++@cindex mode, copy-in, and @code{\?} ++@cindex @code{\!}, and copy-in mode ++@cindex copy-in mode, and @code{\!} ++@cindex mode, copy-in, and @code{\!} ++@noindent ++@var{anything} may not contain newlines; use @code{\!} to embed ++newlines in a diversion. The escape sequence @code{\?} is also ++recognized in copy mode and turned into a single internal code; it is ++this code that terminates @var{anything}. Thus the following example ++prints@tie{}4. ++ ++@Example ++.nr x 1 ++.nf ++.di d ++\?\\?\\\\?\\\\\\\\nx\\\\?\\?\? ++.di ++.nr x 2 ++.di e ++.d ++.di ++.nr x 3 ++.di f ++.e ++.di ++.nr x 4 ++.f ++@endExample ++ ++Both escapes read the data in copy mode. ++ ++@cindex @code{\!}, in top-level diversion ++@cindex top-level diversion, and @code{\!} ++@cindex diversion, top-level, and @code{\!} ++If @code{\!} is used in the top-level diversion, its argument is ++directly embedded into the @code{gtroff} intermediate output. This can ++be used for example to control a postprocessor that processes the data ++before it is sent to the device driver. ++ ++@cindex @code{\?}, in top-level diversion ++@cindex top-level diversion, and @code{\?} ++@cindex diversion, top-level, and @code{\?} ++The @code{\?} escape used in the top-level diversion produces no output ++at all; its argument is simply ignored. ++@endDefesc ++ ++@cindex @code{\!}, and @code{output} request ++@cindex @code{output} request, and @code{\!} ++@cindex @code{output} request, and copy-in mode ++@cindex copy-in mode, and @code{output} request ++@cindex mode, copy-in, and @code{output} request ++@Defreq {output, string} ++Emit @var{string} directly to the @code{gtroff} intermediate output ++(subject to copy mode interpretation); this is similar to @code{\!} used ++at the top level. An initial double quote in @var{string} is stripped ++off to allow initial blanks. ++ ++This request can't be used before the first page has started -- if you ++get an error, simply insert @code{.br} before the @code{output} request. ++ ++Without argument, @code{output} is ignored. ++ ++Use with caution! It is normally only needed for mark-up used by a ++postprocessor that does something with the output before sending it to ++the output device, filtering out @var{string} again. ++@endDefreq ++ ++@Defreq {asciify, div} ++@cindex unformatting diversions (@code{asciify}) ++@cindex diversion, unformatting (@code{asciify}) ++@cindex @code{trin} request, and @code{asciify} ++@dfn{Unformat} the diversion specified by @var{div} in such a way that ++@acronym{ASCII} characters, characters translated with the @code{trin} ++request, space characters, and some escape sequences that were formatted ++and diverted are treated like ordinary input characters when the ++diversion is reread. It can be also used for gross hacks; for example, ++the following sets register@tie{}@code{n} to@tie{}1. ++ ++@Example ++.tr @@. ++.di x ++@@nr n 1 ++.br ++.di ++.tr @@@@ ++.asciify x ++.x ++@endExample ++ ++Note that @code{asciify} cannot return all items in a diversion back ++to their source equivalent, nodes such as @code{\N[...]} will still ++remain as nodes, so the result cannot be guaranteed to be a pure string. ++ ++@xref{Copy-in Mode}. ++@endDefreq ++ ++@Defreq {unformat, div} ++Like @code{asciify}, unformat the specified diversion. However, ++@code{unformat} only unformats spaces and tabs between words. ++Unformatted tabs are treated as input tokens, and spaces are stretchable ++again. ++ ++The vertical size of lines is not preserved; glyph information (font, ++font size, space width, etc.)@: is retained. ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Environments, Suppressing output, Diversions, gtroff Reference ++@section Environments ++@cindex environments ++ ++It happens frequently that some text should be printed in a certain ++format regardless of what may be in effect at the time, for example, in ++a trap invoked macro to print headers and footers. To solve this ++@code{gtroff} processes text in @dfn{environments}. An environment ++contains most of the parameters that control text processing. It is ++possible to switch amongst these environments; by default @code{gtroff} ++processes text in environment@tie{}0. The following is the information ++kept in an environment. ++ ++@itemize @bullet ++@item ++font parameters (size, family, style, glyph height and slant, space and ++sentence space size) ++ ++@item ++page parameters (line length, title length, vertical spacing, line ++spacing, indentation, line numbering, centering, right-justifying, ++underlining, hyphenation data) ++ ++@item ++fill and adjust mode ++ ++@item ++tab stops, tab and leader characters, escape character, no-break and ++hyphen indicators, margin character data ++ ++@item ++partially collected lines ++ ++@item ++input traps ++ ++@item ++drawing and fill colours ++@end itemize ++ ++These environments may be given arbitrary names (see @ref{Identifiers}, ++for more info). Old versions of @code{troff} only had environments ++named @samp{0}, @samp{1}, and @samp{2}. ++ ++@DefreqList {ev, [@Var{env}]} ++@DefregListEndx {.ev} ++@cindex switching environments (@code{ev}) ++@cindex environment, switching (@code{ev}) ++@cindex environment number/name register (@code{.ev}) ++Switch to another environment. The argument @var{env} is the name of ++the environment to switch to. With no argument, @code{gtroff} switches ++back to the previous environment. There is no limit on the number of ++named environments; they are created the first time that they are ++referenced. The @code{.ev} read-only register contains the name or ++number of the current environment. This is a string-valued register. ++ ++Note that a call to @code{ev} (with argument) pushes the previously ++active environment onto a stack. If, say, environments @samp{foo}, ++@samp{bar}, and @samp{zap} are called (in that order), the first ++@code{ev} request without parameter switches back to environment ++@samp{bar} (which is popped off the stack), and a second call switches ++back to environment @samp{foo}. ++ ++Here is an example: ++ ++@Example ++.ev footnote-env ++.fam N ++.ps 6 ++.vs 8 ++.ll -.5i ++.ev ++ ++... ++ ++.ev footnote-env ++\(dg Note the large, friendly letters. ++.ev ++@endExample ++@endDefreq ++ ++@Defreq {evc, env} ++@cindex copying environment (@code{evc}) ++@cindex environment, copying (@code{evc}) ++Copy the environment @var{env} into the current environment. ++ ++The following environment data is not copied: ++ ++@itemize @bullet ++@item ++Partially filled lines. ++ ++@item ++The status whether the previous line was interrupted. ++ ++@item ++The number of lines still to center, or to right-justify, or to ++underline (with or without underlined spaces); they are set to zero. ++ ++@item ++The status whether a temporary indentation is active. ++ ++@item ++Input traps and its associated data. ++ ++@item ++Line numbering mode is disabled; it can be reactivated with @w{@samp{.nm +++0}}. ++ ++@item ++The number of consecutive hyphenated lines (set to zero). ++@end itemize ++@endDefreq ++ ++@DefregList {.w} ++@DefregItemx {.cht} ++@DefregItemx {.cdp} ++@DefregListEndx {.csk} ++@cindex environment, dimensions of last glyph (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk}) ++@cindex width, of last glyph (@code{.w}) ++@cindex height, of last glyph (@code{.cht}) ++@cindex depth, of last glyph (@code{.cdp}) ++@cindex skew, of last glyph (@code{.csk}) ++@cindex last glyph, dimensions (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk}) ++@cindex glyph, last, dimensions (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk}) ++The @code{\n[.w]} register contains the width of the last glyph added to ++the current environment. ++ ++The @code{\n[.cht]} register contains the height of the last glyph added ++to the current environment. ++ ++The @code{\n[.cdp]} register contains the depth of the last glyph added ++to the current environment. It is positive for glyphs extending below ++the baseline. ++ ++The @code{\n[.csk]} register contains the @dfn{skew} (how far to the ++right of the glyph's center that @code{gtroff} should place an accent) ++of the last glyph added to the current environment. ++@endDefreg ++ ++@Defreg {.n} ++@cindex environment, previous line length (@code{.n}) ++@cindex line length, previous (@code{.n}) ++@cindex length of previous line (@code{.n}) ++@cindex previous line length (@code{.n}) ++The @code{\n[.n]} register contains the length of the previous output ++line in the current environment. ++@endDefreg ++ ++ ++@c ===================================================================== ++ ++@node Suppressing output, Colors, Environments, gtroff Reference ++@section Suppressing output ++ ++@Defesc {\\O, , num, } ++@cindex suppressing output (@code{\O}) ++@cindex output, suppressing (@code{\O}) ++Disable or enable output depending on the value of @var{num}: ++ ++@table @samp ++@item \O0 ++Disable any glyphs from being emitted to the device driver, provided ++that the escape occurs at the outer level (see @code{\O[3]} and ++@code{\O[4]}). Motion is not suppressed so effectively @code{\O[0]} ++means @emph{pen up}. ++ ++@item \O1 ++Enable output of glyphs, provided that the escape occurs at the outer ++level. ++@end table ++ ++@vindex opminx ++@vindex opminy ++@vindex opmaxx ++@vindex opmaxy ++@code{\O0} and @code{\O1} also reset the four registers @samp{opminx}, ++@samp{opminy}, @samp{opmaxx}, and @samp{opmaxy} to @minus{}1. ++@xref{Register Index}. These four registers mark the top left and ++bottom right hand corners of a box that encompasses all written glyphs. ++ ++For example the input text: ++ ++@Example ++Hello \O[0]world \O[1]this is a test. ++@endExample ++ ++@noindent ++produces the following output: ++ ++@Example ++Hello this is a test. ++@endExample ++ ++@table @samp ++@item \O2 ++Provided that the escape occurs at the outer level, enable output of ++glyphs and also write out to @code{stderr} the page number and four ++registers encompassing the glyphs previously written since the last call ++to @code{\O}. ++ ++@item \O3 ++Begin a nesting level. At start-up, @code{gtroff} is at outer level. ++The current level is contained within the read-only register @code{.O}. ++@xref{Built-in Registers}. ++ ++@item \O4 ++End a nesting level. The current level is contained within the ++read-only register @code{.O}. @xref{Built-in Registers}. ++ ++@item \O[5@var{P}@var{filename}] ++This escape is @code{grohtml} specific. Provided that this escape ++occurs at the outer nesting level write the @code{filename} to ++@code{stderr}. The position of the image, @var{P}, must be specified ++and must be one of @code{l}, @code{r}, @code{c}, or@tie{}@code{i} (left, ++right, centered, inline). @var{filename} is associated with the ++production of the next inline image. ++@end table ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node Colors, I/O, Suppressing output, gtroff Reference ++@section Colors ++@cindex colors ++ ++@DefreqList {color, [@Var{n}]} ++@DefregListEndx {.color} ++If @var{n} is missing or non-zero, activate colors (this is the ++default); otherwise, turn it off. ++ ++The read-only number register @code{.color} is@tie{}1 if colors are ++active, 0@tie{}otherwise. ++ ++Internally, @code{color} sets a global flag; it does not produce a ++token. Similar to the @code{cp} request, you should use it at the ++beginning of your document to control color output. ++ ++Colors can be also turned off with the @option{-c} command line option. ++@endDefreq ++ ++@Defreq {defcolor, ident scheme color_components} ++Define color with name @var{ident}. @var{scheme} can be one of the ++following values: @code{rgb} (three components), @code{cmy} (three ++components), @code{cmyk} (four components), and @code{gray} or ++@code{grey} (one component). ++ ++@cindex default color ++@cindex color, default ++Color components can be given either as a hexadecimal string or as ++positive decimal integers in the range 0--65535. A hexadecimal string ++contains all color components concatenated. It must start with either ++@code{#} or @code{##}; the former specifies hex values in the range ++0--255 (which are internally multiplied by@tie{}257), the latter in the ++range 0--65535. Examples: @code{#FFC0CB} (pink), @code{##ffff0000ffff} ++(magenta). The default color name @c{default} can't be redefined; its ++value is device-specific (usually black). It is possible that the ++default color for @code{\m} and @code{\M} is not identical. ++ ++@cindex @code{f} unit, and colors ++@cindex unit, @code{f}, and colors ++A new scaling indicator@tie{}@code{f} has been introduced, which ++multiplies its value by 65536; this makes it convenient to specify color ++components as fractions in the range 0 to@tie{}1 (1f equals 65536u). ++Example: ++ ++@Example ++.defcolor darkgreen rgb 0.1f 0.5f 0.2f ++@endExample ++ ++Note that @code{f} is the default scaling indicator for the ++@code{defcolor} request, thus the above statement is equivalent to ++ ++@Example ++.defcolor darkgreen rgb 0.1 0.5 0.2 ++@endExample ++@endDefreq ++ ++@DefreqList {gcolor, [@Var{color}]} ++@DefescItemx {\\m, , c, } ++@DefescItem {\\m, @Lparen{}, co, } ++@DefescItem {\\m, @Lbrack{}, color, @Rbrack{}} ++@DefregListEndx {.m} ++Set (glyph) drawing color. The following examples show how to turn the ++next four words red. ++ ++@Example ++.gcolor red ++these are in red ++.gcolor ++and these words are in black. ++@endExample ++ ++@Example ++\m[red]these are in red\m[] and these words are in black. ++@endExample ++ ++The escape @code{\m[]} returns to the previous color, as does a call to ++@code{gcolor} without an argument. ++ ++@cindex drawing color name register (@code{.m}) ++@cindex name, drawing color, register (@code{.m}) ++@cindex color name, drawing, register (@code{.m}) ++The name of the current drawing color is available in the read-only, ++string-valued number register @samp{.m}. ++ ++The drawing color is associated with the current environment ++(@pxref{Environments}). ++ ++Note that @code{\m} doesn't produce an input token in @code{gtroff}. As ++a consequence, it can be used in requests like @code{mc} (which expects ++a single character as an argument) to change the color on the fly: ++ ++@Example ++.mc \m[red]x\m[] ++@endExample ++@endDefesc ++ ++@DefreqList {fcolor, [@Var{color}]} ++@DefescItemx {\\M, , c, } ++@DefescItem {\\M, @Lparen{}, co, } ++@DefescItem {\\M, @Lbrack{}, color, @Rbrack{}} ++@DefregListEndx {.M} ++Set fill (background) color for filled objects drawn with the ++@code{\D'@dots{}'} commands. ++ ++A red ellipse can be created with the following code: ++ ++@Example ++\M[red]\h'0.5i'\D'E 2i 1i'\M[] ++@endExample ++ ++The escape @code{\M[]} returns to the previous fill color, as does a ++call to @code{fcolor} without an argument. ++ ++@cindex background color name register (@code{.M}) ++@cindex name, background color, register (@code{.M}) ++@cindex color name, background, register (@code{.M}) ++@cindex fill color name register (@code{.M}) ++@cindex name, fill color, register (@code{.M}) ++@cindex color name, fill, register (@code{.M}) ++The name of the current fill (background) color is available in the ++read-only, string-valued number register @samp{.M}. ++ ++The fill color is associated with the current environment ++(@pxref{Environments}). ++ ++Note that @code{\M} doesn't produce an input token in @code{gtroff}. ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node I/O, Postprocessor Access, Colors, gtroff Reference ++@section I/O ++@cindex i/o ++@cindex input and output requests ++@cindex requests for input and output ++@cindex output and input requests ++ ++@code{gtroff} has several requests for including files: ++ ++@Defreq {so, file} ++@cindex including a file (@code{so}) ++@cindex file, inclusion (@code{so}) ++Read in the specified @var{file} and includes it in place of the ++@code{so} request. This is quite useful for large documents, e.g.@: ++keeping each chapter in a separate file. @xref{gsoelim}, for more ++information. ++ ++Since @code{gtroff} replaces the @code{so} request with the contents of ++@code{file}, it makes a difference whether the data is terminated with a ++newline or not: Assuming that file @file{xxx} contains the word ++@samp{foo} without a final newline, this ++ ++@Example ++This is ++.so xxx ++bar ++@endExample ++ ++@noindent ++yields @samp{This is foobar}. ++ ++The search path for @var{file} can be controlled with the @option{-I} ++command line option. ++@endDefreq ++ ++@Defreq {pso, command} ++Read the standard output from the specified @var{command} and includes ++it in place of the @code{pso} request. ++ ++@cindex safer mode ++@cindex mode, safer ++@cindex unsafe mode ++@cindex mode, unsafe ++This request causes an error if used in safer mode (which is the ++default). Use @code{groff}'s or @code{troff}'s @option{-U} option to ++activate unsafe mode. ++ ++The comment regarding a final newline for the @code{so} request is valid ++for @code{pso} also. ++@endDefreq ++ ++@Defreq {mso, file} ++Identical to the @code{so} request except that @code{gtroff} searches ++for the specified @var{file} in the same directories as macro files for ++the the @option{-m} command line option. If the file name to be ++included has the form @file{@var{name}.tmac} and it isn't found, ++@code{mso} tries to include @file{tmac.@var{name}} and vice versa. ++If the file does not exist, a warning of type @samp{file} is emitted. ++@xref{Debugging}, for information about warnings. ++@endDefreq ++ ++@DefreqList {trf, file} ++@DefreqListEndx {cf, file} ++@cindex transparent output (@code{cf}, @code{trf}) ++@cindex output, transparent (@code{cf}, @code{trf}) ++@cindex @code{cf} request, and copy-in mode ++@cindex copy-in mode, and @code{cf} request ++@cindex mode, copy-in, and @code{cf} request ++@cindex @code{trf} request, and copy-in mode ++@cindex copy-in mode, and @code{trf} request ++@cindex mode, copy-in, and @code{trf} request ++Transparently output the contents of @var{file}. Each line is output as ++if it were preceded by @code{\!}; however, the lines are @emph{not} ++subject to copy mode interpretation. If the file does not end with a ++newline, then a newline is added (@code{trf} only). For example, to ++define a macro@tie{}@code{x} containing the contents of ++file@tie{}@file{f}, use ++ ++@Example ++.ev 1 ++.di x ++.trf f ++.di ++.ev ++@endExample ++ ++@noindent ++The calls to @code{ev} prevent that the current partial input line ++becomes part of the diversion. ++ ++Both @code{trf} and @code{cf}, when used in a diversion, embeds an ++object in the diversion which, when reread, causes the contents of ++@var{file} to be transparently copied through to the output. In ++@acronym{UNIX} @code{troff}, the contents of @var{file} is immediately ++copied through to the output regardless of whether there is a current ++diversion; this behaviour is so anomalous that it must be considered a ++bug. ++ ++@cindex @code{trf} request, and invalid characters ++@cindex characters, invalid for @code{trf} request ++@cindex invalid characters for @code{trf} request ++ ++While @code{cf} copies the contents of @var{file} completely ++unprocessed, @code{trf} disallows characters such as NUL that are not ++valid @code{gtroff} input characters (@pxref{Identifiers}). ++ ++For @code{cf}, within a diversion, `completely unprocessed' means that ++each line of a file to be inserted is handled as if it were preceded by ++@code{\!\\!}. ++ ++Both requests cause a line break. ++@endDefreq ++ ++@Defreq {nx, [@Var{file}]} ++@cindex processing next file (@code{nx}) ++@cindex file, processing next (@code{nx}) ++@cindex next file, processing (@code{nx}) ++Force @code{gtroff} to continue processing of the file specified as an ++argument. If no argument is given, immediately jump to the end of file. ++@endDefreq ++ ++@Defreq {rd, [@Var{prompt} [@Var{arg1} @Var{arg2} @dots{}]]} ++@cindex reading from standard input (@code{rd}) ++@cindex standard input, reading from (@code{rd}) ++@cindex input, standard, reading from (@code{rd}) ++Read from standard input, and include what is read as though it were ++part of the input file. Text is read until a blank line is encountered. ++ ++If standard input is a TTY input device (keyboard), write @var{prompt} ++to standard error, followed by a colon (or send BEL for a beep if no ++argument is given). ++ ++Arguments after @var{prompt} are available for the input. For example, ++the line ++ ++@Example ++.rd data foo bar ++@endExample ++ ++with the input @w{@samp{This is \$2.}} prints ++ ++@Example ++This is bar. ++@endExample ++@endDefreq ++ ++@cindex form letters ++@cindex letters, form ++Using the @code{nx} and @code{rd} requests, it is easy to set up form ++letters. The form letter template is constructed like this, putting the ++following lines into a file called @file{repeat.let}: ++ ++@Example ++.ce ++\*(td ++.sp 2 ++.nf ++.rd ++.sp ++.rd ++.fi ++Body of letter. ++.bp ++.nx repeat.let ++@endExample ++ ++@cindex @code{ex} request, used with @code{nx} and @code{rd} ++@noindent ++When this is run, a file containing the following lines should be ++redirected in. Note that requests included in this file are executed as ++though they were part of the form letter. The last block of input is ++the @code{ex} request, which tells @code{groff} to stop processing. If ++this was not there, @code{groff} would not know when to stop. ++ ++@Example ++Trent A. Fisher ++708 NW 19th Av., #202 ++Portland, OR 97209 ++ ++Dear Trent, ++ ++Len Adollar ++4315 Sierra Vista ++San Diego, CA 92103 ++ ++Dear Mr. Adollar, ++ ++.ex ++@endExample ++ ++@Defreq {pi, pipe} ++Pipe the output of @code{gtroff} to the shell command(s) specified by ++@var{pipe}. This request must occur before @code{gtroff} has a chance ++to print anything. ++ ++@cindex safer mode ++@cindex mode, safer ++@cindex unsafe mode ++@cindex mode, unsafe ++@code{pi} causes an error if used in safer mode (which is the default). ++Use @code{groff}'s or @code{troff}'s @option{-U} option to activate ++unsafe mode. ++ ++Multiple calls to @code{pi} are allowed, acting as a chain. For ++example, ++ ++@Example ++.pi foo ++.pi bar ++... ++@endExample ++ ++is the same as @w{@samp{.pi foo | bar}}. ++ ++@cindex @code{groff}, and @code{pi} request ++@cindex @code{pi} request, and @code{groff} ++Note that the intermediate output format of @code{gtroff} is piped to ++the specified commands. Consequently, calling @code{groff} without the ++@option{-Z} option normally causes a fatal error. ++@endDefreq ++ ++@DefreqList {sy, cmds} ++@DefregListEndx {systat} ++Execute the shell command(s) specified by @var{cmds}. The output is not ++saved anyplace, so it is up to the user to do so. ++ ++@cindex safer mode ++@cindex mode, safer ++@cindex unsafe mode ++@cindex mode, unsafe ++This request causes an error if used in safer mode (which is the ++default). Use @code{groff}'s or @code{troff}'s @option{-U} option to ++activate unsafe mode. ++ ++For example, the following code fragment introduces the current time ++into a document: ++ ++@cindex time, current ++@cindex current time ++@pindex perl ++@Example ++.sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\ ++ (localtime(time))[2,1,0]' > /tmp/x\n[$$] ++.so /tmp/x\n[$$] ++.sy rm /tmp/x\n[$$] ++\nH:\nM:\nS ++@endExample ++ ++@noindent ++Note that this works by having the @code{perl} script (run by @code{sy}) ++print out the @code{nr} requests that set the number registers ++@code{H}, @code{M}, and @code{S}, and then reads those commands in with ++the @code{so} request. ++ ++For most practical purposes, the number registers @code{seconds}, ++@code{minutes}, and @code{hours}, which are initialized at start-up of ++@code{gtroff}, should be sufficient. Use the @code{af} request to get a ++formatted output: ++ ++@Example ++.af hours 00 ++.af minutes 00 ++.af seconds 00 ++\n[hours]:\n[minutes]:\n[seconds] ++@endExample ++ ++@cindex @code{system()} return value register (@code{systat}) ++The @code{systat} read-write number register contains the return value ++of the @code{system()} function executed by the last @code{sy} request. ++@endDefreq ++ ++@DefreqList {open, stream file} ++@DefreqListEndx {opena, stream file} ++@cindex opening file (@code{open}) ++@cindex file, opening (@code{open}) ++@cindex appending to a file (@code{opena}) ++@cindex file, appending to (@code{opena}) ++Open the specified @var{file} for writing and associates the specified ++@var{stream} with it. ++ ++The @code{opena} request is like @code{open}, but if the file exists, ++append to it instead of truncating it. ++ ++@cindex safer mode ++@cindex mode, safer ++@cindex unsafe mode ++@cindex mode, unsafe ++Both @code{open} and @code{opena} cause an error if used in safer mode ++(which is the default). Use @code{groff}'s or @code{troff}'s ++@option{-U} option to activate unsafe mode. ++@endDefreq ++ ++@DefreqList {write, stream data} ++@DefreqListEndx {writec, stream data} ++@cindex copy-in mode, and @code{write} request ++@cindex @code{write} request, and copy-in mode ++@cindex mode, copy-in, and @code{write} request ++@cindex copy-in mode, and @code{writec} request ++@cindex @code{writec} request, and copy-in mode ++@cindex mode, copy-in, and @code{writec} request ++@cindex writing to file (@code{write}, @code{writec}) ++@cindex file, writing to (@code{write}, @code{writec}) ++Write to the file associated with the specified @var{stream}. The ++stream must previously have been the subject of an open request. The ++remainder of the line is interpreted as the @code{ds} request reads its ++second argument: A leading @samp{"} is stripped, and it is read in ++copy-in mode. ++ ++The @code{writec} request is like @code{write}, but only @code{write} ++appends a newline to the data. ++@endDefreq ++ ++@Defreq {writem, stream xx} ++@cindex @code{asciify} request, and @code{writem} ++Write the contents of the macro or string @var{xx} to the file ++associated with the specified @var{stream}. ++ ++@cindex @code{writem} request, and copy-in mode ++@cindex copy-in mode, and @code{writem} request ++@cindex mode, copy-in, and @code{writem} request ++@var{xx} is read in copy mode, i.e., already formatted elements are ++ignored. Consequently, diversions must be unformatted with the ++@code{asciify} request before calling @code{writem}. Usually, this ++means a loss of information. ++@endDefreq ++ ++@Defreq {close, stream} ++@cindex closing file (@code{close}) ++@cindex file, closing (@code{close}) ++Close the specified @var{stream}; the stream is no longer an acceptable ++argument to the @code{write} request. ++ ++Here a simple macro to write an index entry. ++ ++@Example ++.open idx test.idx ++. ++.de IX ++. write idx \\n[%] \\$* ++.. ++. ++.IX test entry ++. ++.close idx ++@endExample ++@endDefreq ++ ++@DefescList {\\V, , e, } ++@DefescItem {\\V, @Lparen{}, ev, } ++@DefescListEnd {\\V, @Lbrack{}, env, @Rbrack{}} ++@cindex @code{\V}, and copy-in mode ++@cindex copy-in mode, and @code{\V} ++@cindex mode, copy-in, and @code{\V} ++Interpolate the contents of the specified environment variable @var{env} ++(one-character name@tie{}@var{e}, two-character name @var{ev}) as ++returned by the function @code{getenv}. @code{\V} is interpreted in ++copy-in mode. ++@endDefesc ++ ++ ++@c ===================================================================== ++ ++@node Postprocessor Access, Miscellaneous, I/O, gtroff Reference ++@section Postprocessor Access ++@cindex postprocessor access ++@cindex access of postprocessor ++ ++There are two escapes that give information directly to the ++postprocessor. This is particularly useful for embedding ++@sc{PostScript} into the final document. ++ ++@DefreqList {device, xxx} ++@DefescListEndx {\\X, ', xxx, '} ++Embeds its argument into the @code{gtroff} output preceded with ++@w{@samp{x X}}. ++ ++@cindex @code{\&}, in @code{\X} ++@cindex @code{\)}, in @code{\X} ++@cindex @code{\%}, in @code{\X} ++@ifnotinfo ++@cindex @code{\:}, in @code{\X} ++@end ifnotinfo ++@ifinfo ++@cindex @code{\@r{}}, in @code{\X} ++@end ifinfo ++The escapes @code{\&}, @code{\)}, @code{\%}, and @code{\:} are ignored ++within @code{\X}, @w{@samp{\ }} and @code{\~} are converted to single ++space characters. All other escapes (except @code{\\}, which produces a ++backslash) cause an error. ++ ++@cindex @code{device} request, and copy-in mode ++@cindex copy-in mode, and @code{device} request ++@cindex mode, copy-in, and @code{device} request ++Contrary to @code{\X}, the @code{device} request simply processes its ++argument in copy mode (@pxref{Copy-in Mode}). ++ ++@kindex use_charnames_in_special ++@pindex DESC@r{, and @code{use_charnames_in_special}} ++@cindex @code{\X}, and special characters ++If the @samp{use_charnames_in_special} keyword is set in the @file{DESC} ++file, special characters no longer cause an error; they are simply ++output verbatim. Additionally, the backslash is represented as ++@code{\\}. ++ ++@samp{use_charnames_in_special} is currently used by @code{grohtml} ++only. ++@endDefesc ++ ++@DefreqList {devicem, xx} ++@DefescItemx {\\Y, , n, } ++@DefescItem {\\Y, @Lparen{}, nm, } ++@DefescListEnd {\\Y, @Lbrack{}, name, @Rbrack{}} ++This is approximately equivalent to @samp{\X'\*[@var{name}]'} ++(one-character name@tie{}@var{n}, two-character name @var{nm}). ++However, the contents of the string or macro @var{name} are not ++interpreted; also it is permitted for @var{name} to have been defined as ++a macro and thus contain newlines (it is not permitted for the argument ++to @code{\X} to contain newlines). The inclusion of newlines requires ++an extension to the @acronym{UNIX} @code{troff} output format, and ++confuses drivers that do not know about this extension (@pxref{Device ++Control Commands}). ++@endDefesc ++ ++@xref{Output Devices}. ++ ++ ++@c ===================================================================== ++ ++@node Miscellaneous, Gtroff Internals, Postprocessor Access, gtroff Reference ++@section Miscellaneous ++ ++This section documents parts of @code{gtroff} that cannot (yet) be ++categorized elsewhere in this manual. ++ ++@Defreq {nm, [@Var{start} [@Var{inc} [@Var{space} [@Var{indent}]]]]} ++@cindex printing line numbers (@code{nm}) ++@cindex line numbers, printing (@code{nm}) ++@cindex numbers, line, printing (@code{nm}) ++Print line numbers. @var{start} is the line number of the @emph{next} ++output line. @var{inc} indicates which line numbers are printed. For ++example, the value@tie{}5 means to emit only line numbers that are ++multiples of@tie{}5; this defaults to@tie{}1. @var{space} is the space ++to be left between the number and the text; this defaults to one digit ++space. The fourth argument is the indentation of the line numbers, ++defaulting to zero. Both @var{space} and @var{indent} are given as ++multiples of digit spaces; they can be negative also. Without any ++arguments, line numbers are turned off. ++ ++@code{gtroff} reserves three digit spaces for the line number (which is ++printed right-justified) plus the amount given by @var{indent}; the ++output lines are concatenated to the line numbers, separated by ++@var{space}, and @emph{without} reducing the line length. Depending on ++the value of the horizontal page offset (as set with the @code{po} ++request), line numbers that are longer than the reserved space stick ++out to the left, or the whole line is moved to the right. ++ ++Parameters corresponding to missing arguments are not changed; any ++non-digit argument (to be more precise, any argument starting with a ++character valid as a delimiter for identifiers) is also treated as ++missing. ++ ++If line numbering has been disabled with a call to @code{nm} without an ++argument, it can be reactivated with @samp{.nm +0}, using the previously ++active line numbering parameters. ++ ++The parameters of @code{nm} are associated with the current environment ++(@pxref{Environments}). The current output line number is available in ++the number register @code{ln}. ++ ++@Example ++.po 1m ++.ll 2i ++This test shows how line numbering works with groff. ++.nm 999 ++This test shows how line numbering works with groff. ++.br ++.nm xxx 3 2 ++.ll -\w'0'u ++This test shows how line numbering works with groff. ++.nn 2 ++This test shows how line numbering works with groff. ++@endExample ++ ++@noindent ++And here the result: ++ ++@Example ++ This test shows how ++ line numbering works ++ 999 with groff. This ++1000 test shows how line ++1001 numbering works with ++1002 groff. ++ This test shows how ++ line numbering ++ works with groff. ++ This test shows how ++1005 line numbering ++ works with groff. ++@endExample ++@endDefreq ++ ++@Defreq {nn, [@Var{skip}]} ++Temporarily turn off line numbering. The argument is the number of ++lines not to be numbered; this defaults to@tie{}1. ++@endDefreq ++ ++@Defreq {mc, glyph [@Var{dist}]} ++@cindex margin glyph (@code{mc}) ++@cindex glyph, for margins (@code{mc}) ++Print a @dfn{margin character} to the right of the ++text.@footnote{@dfn{Margin character} is a misnomer since it is an ++output glyph.} The first argument is the glyph to be printed. The ++second argument is the distance away from the right margin. If missing, ++the previously set value is used; default is 10@dmn{pt}). For text ++lines that are too long (that is, longer than the text length plus ++@var{dist}), the margin character is directly appended to the lines. ++ ++With no arguments the margin character is turned off. If this occurs ++before a break, no margin character is printed. ++ ++For compatibility with @acronym{AT&T} @code{troff}, a call to @code{mc} ++to set the margin character can't be undone immediately; at least one ++line gets a margin character. Thus ++ ++@Example ++.ll 1i ++.mc \[br] ++.mc ++xxx ++.br ++xxx ++@endExample ++ ++@noindent ++produces ++ ++@Example ++xxx | ++xxx ++@endExample ++ ++@cindex @code{tl} request, and @code{mc} ++For empty lines and lines produced by the @code{tl} request no margin ++character is emitted. ++ ++The margin character is associated with the current environment ++(@pxref{Environments}). ++ ++@pindex nrchbar ++@pindex changebar ++This is quite useful for indicating text that has changed, and, in fact, ++there are programs available for doing this (they are called ++@code{nrchbar} and @code{changebar} and can be found in any ++@samp{comp.sources.unix} archive). ++ ++@Example ++.ll 3i ++.mc | ++This paragraph is highlighted with a margin ++character. ++.sp ++Note that vertical space isn't marked. ++.br ++\& ++.br ++But we can fake it with `\&'. ++@endExample ++ ++Result: ++ ++@Example ++This paragraph is highlighted | ++with a margin character. | ++ ++Note that vertical space isn't | ++marked. | ++ | ++But we can fake it with `\&'. | ++@endExample ++@endDefreq ++ ++@DefreqList {psbb, filename} ++@DefregItemx {llx} ++@DefregItemx {lly} ++@DefregItemx {urx} ++@DefregListEndx {ury} ++@cindex PostScript, bounding box ++@cindex bounding box ++Retrieve the bounding box of the @sc{PostScript} image found in ++@var{filename}. The file must conform to Adobe's @dfn{Document ++Structuring Conventions} (DSC); the command searches for a ++@code{%%BoundingBox} comment and extracts the bounding box values into ++the number registers @code{llx}, @code{lly}, @code{urx}, and @code{ury}. ++If an error occurs (for example, @code{psbb} cannot find the ++@code{%%BoundingBox} comment), it sets the four number registers to ++zero. ++ ++The search path for @var{filename} can be controlled with the ++@option{-I} command line option. ++@endDefreq ++ ++ ++@c ===================================================================== ++ ++@node Gtroff Internals, Debugging, Miscellaneous, gtroff Reference ++@section @code{gtroff} Internals ++ ++@cindex input token ++@cindex token, input ++@cindex output node ++@cindex node, output ++@code{gtroff} processes input in three steps. One or more input ++characters are converted to an @dfn{input token}.@footnote{Except the ++escapes @code{\f}, @code{\F}, @code{\H}, @code{\m}, @code{\M}, ++@code{\R}, @code{\s}, and @code{\S}, which are processed immediately if ++not in copy-in mode.} Then, one or more input tokens are converted to ++an @dfn{output node}. Finally, output nodes are converted to the ++intermediate output language understood by all output devices. ++ ++Actually, before step one happens, @code{gtroff} converts certain escape ++sequences into reserved input characters (not accessible by the user); ++such reserved characters are used for other internal processing also -- ++this is the very reason why not all characters are valid input. ++@xref{Identifiers}, for more on this topic. ++ ++For example, the input string @samp{fi\[:u]} is converted into a ++character token @samp{f}, a character token @samp{i}, and a special ++token @samp{:u} (representing u@tie{}umlaut). Later on, the character ++tokens @samp{f} and @samp{i} are merged to a single output node ++representing the ligature glyph @samp{fi} (provided the current font has ++a glyph for this ligature); the same happens with @samp{:u}. All output ++glyph nodes are `processed', which means that they are invariably ++associated with a given font, font size, advance width, etc. During the ++formatting process, @code{gtroff} itself adds various nodes to control ++the data flow. ++ ++Macros, diversions, and strings collect elements in two chained lists: a ++list of input tokens that have been passed unprocessed, and a list of ++output nodes. Consider the following the diversion. ++ ++@Example ++.di xxx ++a ++\!b ++c ++.br ++.di ++@endExample ++ ++@noindent ++It contains these elements. ++ ++@multitable {@i{vertical size node}} {token list} {element number} ++@item node list @tab token list @tab element number ++ ++@item @i{line start node} @tab --- @tab 1 ++@item @i{glyph node @code{a}} @tab --- @tab 2 ++@item @i{word space node} @tab --- @tab 3 ++@item --- @tab @code{b} @tab 4 ++@item --- @tab @code{\n} @tab 5 ++@item @i{glyph node @code{c}} @tab --- @tab 6 ++@item @i{vertical size node} @tab --- @tab 7 ++@item @i{vertical size node} @tab --- @tab 8 ++@item --- @tab @code{\n} @tab 9 ++@end multitable ++ ++@cindex @code{\v}, internal representation ++@noindent ++Elements 1, 7, and@tie{}8 are inserted by @code{gtroff}; the latter two ++(which are always present) specify the vertical extent of the last line, ++possibly modified by @code{\x}. The @code{br} request finishes the ++current partial line, inserting a newline input token, which is ++subsequently converted to a space when the diversion is reread. Note ++that the word space node has a fixed width that isn't stretchable ++anymore. To convert horizontal space nodes back to input tokens, use ++the @code{unformat} request. ++ ++Macros only contain elements in the token list (and the node list is ++empty); diversions and strings can contain elements in both lists. ++ ++Note that the @code{chop} request simply reduces the number of elements ++in a macro, string, or diversion by one. Exceptions are ++@dfn{compatibility save} and @dfn{compatibility ignore} input tokens, ++which are ignored. The @code{substring} request also ignores those ++input tokens. ++ ++Some requests like @code{tr} or @code{cflags} work on glyph identifiers ++only; this means that the associated glyph can be changed without ++destroying this association. This can be very helpful for substituting ++glyphs. In the following example, we assume that glyph @samp{foo} isn't ++available by default, so we provide a substitution using the ++@code{fchar} request and map it to input character @samp{x}. ++ ++@Example ++.fchar \[foo] foo ++.tr x \[foo] ++@endExample ++ ++@noindent ++Now let us assume that we install an additional special font @samp{bar} ++that has glyph @samp{foo}. ++ ++@Example ++.special bar ++.rchar \[foo] ++@endExample ++ ++@noindent ++Since glyphs defined with @code{fchar} are searched before glyphs in ++special fonts, we must call @code{rchar} to remove the definition of the ++fallback glyph. Anyway, the translation is still active; @samp{x} now ++maps to the real glyph @samp{foo}. ++ ++@cindex compatibility mode, and parameters ++@cindex mode, compatibility, and parameters ++@cindex arguments, and compatibility mode ++@cindex parameters, and compatibility mode ++@cindex macro arguments, and compatibility mode ++@cindex request arguments, and compatibility mode ++Macro and request arguments preserve the compatibility mode: ++ ++@Example ++.cp 1 \" switch to compatibility mode ++.de xx ++\\$1 ++.. ++.cp 0 \" switch compatibility mode off ++.xx caf\['e] ++ @result{} caf ++@endExample ++ ++@noindent ++Since compatibility mode is on while @code{de} is called, the macro ++@code{xx} activates compatibility mode while executing. Argument ++@code{$1} can still be handled properly because it inherits the ++compatibility mode status which was active at the point where @code{xx} ++is called. ++ ++After expansion of the parameters, the compatibility save and restore ++tokens are removed. ++ ++ ++@c ===================================================================== ++ ++@node Debugging, Implementation Differences, Gtroff Internals, gtroff Reference ++@section Debugging ++@cindex debugging ++ ++@code{gtroff} is not easy to debug, but there are some useful features ++and strategies for debugging. ++ ++@Defreq {lf, line [@Var{filename}]} ++@pindex soelim ++@cindex multi-file documents ++@cindex documents, multi-file ++@cindex setting input line number (@code{lf}) ++@cindex input line number, setting (@code{lf}) ++@cindex number, input line, setting (@code{lf}) ++Change the line number and optionally the file name @code{gtroff} shall ++use for error and warning messages. @var{line} is the input line number ++of the @emph{next} line. ++ ++Without argument, the request is ignored. ++ ++This is a debugging aid for documents that are split into many files, ++then put together with @code{soelim} and other preprocessors. Usually, ++it isn't invoked manually. ++ ++Note that other @code{troff} implementations (including the original ++@acronym{AT&T} version) handle @code{lf} differently. For them, ++@var{line} changes the line number of the @emph{current} line. ++@endDefreq ++ ++@DefreqList {tm, string} ++@DefreqItemx {tm1, string} ++@DefreqListEndx {tmc, string} ++@cindex printing to stderr (@code{tm}, @code{tm1}, @code{tmc}) ++@cindex stderr, printing to (@code{tm}, @code{tm1}, @code{tmc}) ++Send @var{string} to the standard error output; this is very useful for ++printing debugging messages among other things. ++ ++@cindex @code{tm} request, and copy-in mode ++@cindex copy-in mode, and @code{tm} request ++@cindex mode, copy-in, and @code{tm} request ++@cindex @code{tm1} request, and copy-in mode ++@cindex copy-in mode, and @code{tm1} request ++@cindex mode, copy-in, and @code{tm1} request ++@cindex @code{tmc} request, and copy-in mode ++@cindex copy-in mode, and @code{tmc} request ++@cindex mode, copy-in, and @code{tmc} request ++@var{string} is read in copy mode. ++ ++The @code{tm} request ignores leading spaces of @var{string}; @code{tm1} ++handles its argument similar to the @code{ds} request: a leading double ++quote in @var{string} is stripped to allow initial blanks. ++ ++The @code{tmc} request is similar to @code{tm1} but does not append a ++newline (as is done in @code{tm} and @code{tm1}). ++@endDefreq ++ ++@Defreq {ab, [@Var{string}]} ++@cindex aborting (@code{ab}) ++Similar to the @code{tm} request, except that it causes @code{gtroff} to ++stop processing. With no argument it prints @samp{User Abort.} to ++standard error. ++@endDefreq ++ ++@Defreq {ex, } ++@cindex @code{ex} request, use in debugging ++@cindex exiting (@code{ex}) ++The @code{ex} request also causes @code{gtroff} to stop processing; see ++also @ref{I/O}. ++@endDefreq ++ ++When doing something involved it is useful to leave the debugging ++statements in the code and have them turned on by a command line flag. ++ ++@Example ++.if \n(DB .tm debugging output ++@endExample ++ ++@noindent ++To activate these statements say ++ ++@Example ++groff -rDB=1 file ++@endExample ++ ++If it is known in advance that there are many errors and no useful ++output, @code{gtroff} can be forced to suppress formatted output with ++the @option{-z} flag. ++ ++@Defreq {pev, } ++@cindex dumping environments (@code{pev}) ++@cindex environments, dumping (@code{pev}) ++Print the contents of the current environment and all the currently ++defined environments (both named and numbered) on @code{stderr}. ++@endDefreq ++ ++@Defreq {pm, } ++@cindex dumping symbol table (@code{pm}) ++@cindex symbol table, dumping (@code{pm}) ++Print the entire symbol table on @code{stderr}. Names of all defined ++macros, strings, and diversions are print together with their size in ++bytes. Since @code{gtroff} sometimes adds nodes by itself, the returned ++size can be larger than expected. ++ ++This request differs from @acronym{UNIX} @code{troff}: @code{gtroff} ++reports the sizes of diversions, ignores an additional argument to print ++only the total of the sizes, and the size isn't returned in blocks of ++128 characters. ++@endDefreq ++ ++@Defreq {pnr, } ++@cindex dumping number registers (@code{pnr}) ++@cindex number registers, dumping (@code{pnr}) ++Print the names and contents of all currently defined number registers ++on @code{stderr}. ++@endDefreq ++ ++@Defreq {ptr, } ++@cindex dumping traps (@code{ptr}) ++@cindex traps, dumping (@code{ptr}) ++Print the names and positions of all traps (not including input line ++traps and diversion traps) on @code{stderr}. Empty slots in the page ++trap list are printed as well, because they can affect the priority of ++subsequently planted traps. ++@endDefreq ++ ++@Defreq {fl, } ++@cindex flush output (@code{fl}) ++@cindex output, flush (@code{fl}) ++@cindex interactive use of @code{gtroff} ++@cindex @code{gtroff}, interactive use ++Instruct @code{gtroff} to flush its output immediately. The intent is ++for interactive use, but this behaviour is currently not implemented in ++@code{gtroff}. Contrary to @acronym{UNIX} @code{troff}, TTY output is ++sent to a device driver also (@code{grotty}), making it non-trivial to ++communicate interactively. ++ ++This request causes a line break. ++@endDefreq ++ ++@Defreq {backtrace, } ++@cindex backtrace of input stack (@code{backtrace}) ++@cindex input stack, backtrace (@code{backtrace}) ++Print a backtrace of the input stack to the standard error stream. ++ ++Consider the following in file @file{test}: ++ ++@Example ++.de xxx ++. backtrace ++.. ++.de yyy ++. xxx ++.. ++. ++.yyy ++@endExample ++ ++@noindent ++On execution, @code{gtroff} prints the following: ++ ++@Example ++test:2: backtrace: macro `xxx' ++test:5: backtrace: macro `yyy' ++test:8: backtrace: file `test' ++@endExample ++ ++The option @option{-b} of @code{gtroff} internally calls a variant of ++this request on each error and warning. ++@endDefreq ++ ++@Defreg {slimit} ++@cindex input stack, setting limit ++Use the @code{slimit} number register to set the maximum number of ++objects on the input stack. If @code{slimit} is less than or equal ++to@tie{}0, there is no limit set. With no limit, a buggy recursive ++macro can exhaust virtual memory. ++ ++The default value is 1000; this is a compile-time constant. ++@endDefreg ++ ++@Defreq {warnscale, si} ++Set the scaling indicator used in warnings to @var{si}. Valid values ++for @var{si} are @samp{u}, @samp{i}, @samp{c}, @samp{p}, and @samp{P}. ++At startup, it is set to @samp{i}. ++@endDefreq ++ ++@Defreq {spreadwarn, [@Var{limit}]} ++Make @code{gtroff} emit a warning if the additional space inserted for ++each space between words in an output line is larger or equal to ++@var{limit}. A negative value is changed to zero; no argument toggles ++the warning on and off without changing @var{limit}. The default ++scaling indicator is @samp{m}. At startup, @code{spreadwarn} is ++deactivated, and @var{limit} is set to 3@dmn{m}. ++ ++For example, ++ ++@Example ++.spreadwarn 0.2m ++@endExample ++ ++@noindent ++causes a warning if @code{gtroff} must add 0.2@dmn{m} or more for each ++interword space in a line. ++ ++This request is active only if text is justified to both margins (using ++@w{@samp{.ad b}}). ++@endDefreq ++ ++@cindex warnings ++@code{gtroff} has command line options for printing out more warnings ++(@option{-w}) and for printing backtraces (@option{-b}) when a warning ++or an error occurs. The most verbose level of warnings is @option{-ww}. ++ ++@DefreqList {warn, [@Var{flags}]} ++@DefregListEndx {.warn} ++@cindex level of warnings (@code{warn}) ++@cindex warnings, level (@code{warn}) ++Control the level of warnings checked for. The @var{flags} are the sum ++of the numbers associated with each warning that is to be enabled; all ++other warnings are disabled. The number associated with each warning is ++listed below. For example, @w{@code{.warn 0}} disables all warnings, ++and @w{@code{.warn 1}} disables all warnings except that about missing ++glyphs. If no argument is given, all warnings are enabled. ++ ++The read-only number register @code{.warn} contains the current warning ++level. ++@endDefreq ++ ++@menu ++* Warnings:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Warnings, , Debugging, Debugging ++@subsection Warnings ++@cindex warnings ++ ++The warnings that can be given to @code{gtroff} are divided into the ++following categories. The name associated with each warning is used by ++the @option{-w} and @option{-W} options; the number is used by the ++@code{warn} request and by the @code{.warn} register. ++ ++@table @samp ++@item char ++@itemx 1 ++Non-existent glyphs.@footnote{@code{char} is a misnomer since it reports ++missing glyphs -- there aren't missing input characters, only invalid ++ones.} This is enabled by default. ++ ++@item number ++@itemx 2 ++Invalid numeric expressions. This is enabled by default. ++@xref{Expressions}. ++ ++@item break ++@itemx 4 ++@cindex fill mode ++@cindex mode, fill ++In fill mode, lines that could not be broken so that their length was ++less than the line length. This is enabled by default. ++ ++@item delim ++@itemx 8 ++Missing or mismatched closing delimiters. ++ ++@item el ++@itemx 16 ++@cindex @code{ie} request, and warnings ++@cindex @code{el} request, and warnings ++Use of the @code{el} request with no matching @code{ie} request. ++@xref{if-else}. ++ ++@item scale ++@itemx 32 ++Meaningless scaling indicators. ++ ++@item range ++@itemx 64 ++Out of range arguments. ++ ++@item syntax ++@itemx 128 ++Dubious syntax in numeric expressions. ++ ++@item di ++@itemx 256 ++@cindex @code{di} request, and warnings ++@cindex @code{da} request, and warnings ++Use of @code{di} or @code{da} without an argument when there is no ++current diversion. ++ ++@item mac ++@itemx 512 ++@cindex @code{de}, @code{de1}, @code{dei} requests, and warnings ++@cindex @code{am}, @code{am1}, @code{ami} requests, and warnings ++@cindex @code{ds}, @code{ds1} requests, and warnings ++@cindex @code{as}, @code{as1} requests, and warnings ++@cindex @code{di} request, and warnings ++@cindex @code{da} request, and warnings ++@cindex @code{box}, @code{boxa} requests, and warnings ++@cindex @code{\*}, and warnings ++Use of undefined strings, macros and diversions. When an undefined ++string, macro, or diversion is used, that string is automatically ++defined as empty. So, in most cases, at most one warning is given for ++each name. ++ ++@item reg ++@itemx 1024 ++@cindex @code{nr} request, and warnings ++@cindex @code{\R}, and warnings ++@cindex @code{\n}, and warnings ++Use of undefined number registers. When an undefined number register is ++used, that register is automatically defined to have a value of@tie{}0. ++So, in most cases, at most one warning is given for use of a particular ++name. ++ ++@item tab ++@itemx 2048 ++@cindex @code{\t}, and warnings ++Use of a tab character where a number was expected. ++ ++@item right-brace ++@itemx 4096 ++@cindex @code{\@}}, and warnings ++Use of @code{\@}} where a number was expected. ++ ++@item missing ++@itemx 8192 ++Requests that are missing non-optional arguments. ++ ++@item input ++@itemx 16384 ++Invalid input characters. ++ ++@item escape ++@itemx 32768 ++Unrecognized escape sequences. When an unrecognized escape sequence ++@code{\@var{X}} is encountered, the escape character is ignored, and ++@var{X} is printed. ++ ++@item space ++@itemx 65536 ++@cindex compatibility mode ++Missing space between a request or macro and its argument. This warning ++is given when an undefined name longer than two characters is ++encountered, and the first two characters of the name make a defined ++name. The request or macro is not invoked. When this warning is given, ++no macro is automatically defined. This is enabled by default. This ++warning never occurs in compatibility mode. ++ ++@item font ++@itemx 131072 ++Non-existent fonts. This is enabled by default. ++ ++@item ig ++@itemx 262144 ++Invalid escapes in text ignored with the @code{ig} request. These are ++conditions that are errors when they do not occur in ignored text. ++ ++@item color ++@itemx 524288 ++Color related warnings. ++ ++@item file ++@itemx 1048576 ++Missing files. The @code{mso} request gives this warning when the ++requested macro file does not exist. This is enabled by default. ++ ++@item all ++All warnings except @samp{di}, @samp{mac} and @samp{reg}. It is ++intended that this covers all warnings that are useful with traditional ++macro packages. ++ ++@item w ++All warnings. ++@end table ++ ++ ++@c ===================================================================== ++ ++@node Implementation Differences, , Debugging, gtroff Reference ++@section Implementation Differences ++@cindex implementation differences ++@cindex differences in implementation ++@cindex incompatibilities with @acronym{AT&T} @code{troff} ++@cindex compatibility mode ++@cindex mode, compatibility ++ ++GNU @code{troff} has a number of features that cause incompatibilities ++with documents written with old versions of @code{troff}. ++ ++@cindex long names ++@cindex names, long ++Long names cause some incompatibilities. @acronym{UNIX} @code{troff} ++interprets ++ ++@Example ++.dsabcd ++@endExample ++ ++@cindex @code{\*}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\n}, incompatibilities with @acronym{AT&T} @code{troff} ++@noindent ++as defining a string @samp{ab} with contents @samp{cd}. Normally, GNU ++@code{troff} interprets this as a call of a macro named @code{dsabcd}. ++Also @acronym{UNIX} @code{troff} interprets @code{\*[} or @code{\n[} as ++references to a string or number register called @samp{[}. In GNU ++@code{troff}, however, this is normally interpreted as the start of a ++long name. In compatibility mode GNU @code{troff} interprets long names ++in the traditional way (which means that they are not recognized as ++names). ++ ++@DefreqList {cp, [@Var{n}]} ++@DefreqItemx {do, cmd} ++@DefregListEndx {.C} ++If @var{n} is missing or non-zero, turn on compatibility mode; ++otherwise, turn it off. ++ ++The read-only number register @code{.C} is@tie{}1 if compatibility mode ++is on, 0@tie{}otherwise. ++ ++Compatibility mode can be also turned on with the @option{-C} command ++line option. ++ ++The @code{do} request turns off compatibility mode while executing its ++arguments as a @code{gtroff} command. However, it does not turn off ++compatibility mode while processing the macro itself. To do that, use ++the @code{de1} request (or manipulate the @code{.C} register manually). ++@xref{Writing Macros}. ++ ++@Example ++.do fam T ++@endExample ++ ++@noindent ++executes the @code{fam} request when compatibility mode is enabled. ++ ++@code{gtroff} restores the previous compatibility setting before ++interpreting any files sourced by the @var{cmd}. ++@endDefreq ++ ++@cindex input level in delimited arguments ++@cindex delimited arguments, incompatibilities with @acronym{AT&T} @code{troff} ++Two other features are controlled by @option{-C}. If not in ++compatibility mode, GNU @code{troff} preserves the input level in ++delimited arguments: ++ ++@Example ++.ds xx ' ++\w'abc\*(xxdef' ++@endExample ++ ++@noindent ++In compatibility mode, the string @samp{72def'} is returned; without ++@option{-C} the resulting string is @samp{168} (assuming a TTY output ++device). ++ ++@cindex @code{\f}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\H}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\s}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\S}, incompatibilities with @acronym{AT&T} @code{troff} ++Finally, the escapes @code{\f}, @code{\H}, @code{\m}, @code{\M}, ++@code{\R}, @code{\s}, and @code{\S} are transparent for recognizing the ++beginning of a line only in compatibility mode (this is a rather obscure ++feature). For example, the code ++ ++@Example ++.de xx ++Hallo! ++.. ++\fB.xx\fP ++@endExample ++ ++@noindent ++prints @samp{Hallo!} in bold face if in compatibility mode, and ++@samp{.xx} in bold face otherwise. ++ ++@cindex @code{\A}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\|}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\^}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\&}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\@{}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\@}}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\@key{SP}}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\'}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\`}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\-}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\_}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\!}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\%}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\c}, incompatibilities with @acronym{AT&T} @code{troff} ++GNU @code{troff} does not allow the use of the escape sequences ++@code{\|}, @code{\^}, @code{\&}, @code{\@{}, @code{\@}}, ++@code{\@key{SP}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, ++@code{\%}, and @code{\c} in names of strings, macros, diversions, number ++registers, fonts or environments; @acronym{UNIX} @code{troff} does. The ++@code{\A} escape sequence (@pxref{Identifiers}) may be helpful in ++avoiding use of these escape sequences in names. ++ ++@cindex fractional point sizes ++@cindex fractional type sizes ++@cindex point sizes, fractional ++@cindex type sizes, fractional ++@cindex sizes, fractional ++@cindex @code{ps} request, incompatibilities with @acronym{AT&T} @code{troff} ++Fractional point sizes cause one noteworthy incompatibility. In ++@acronym{UNIX} @code{troff} the @code{ps} request ignores scale ++indicators and thus ++ ++@Example ++.ps 10u ++@endExample ++ ++@noindent ++sets the point size to 10@tie{}points, whereas in GNU @code{troff} it ++sets the point size to 10@tie{}scaled points. @xref{Fractional Type ++Sizes}, for more information. ++ ++@cindex @code{bd} request, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{cs} request, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{tr} request, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{fp} request, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex input characters and output glyphs, compatibility with @acronym{AT&T} @code{troff} ++@cindex output glyphs, and input characters,compatibility with @acronym{AT&T} @code{troff} ++@cindex characters, input, and output glyphs, compatibility with @acronym{AT&T} @code{troff} ++@cindex glyphs, output, and input characters, compatibility with @acronym{AT&T} @code{troff} ++In GNU @code{troff} there is a fundamental difference between ++(unformatted) input characters and (formatted) output glyphs. ++Everything that affects how a glyph is output is stored with the glyph ++node; once a glyph node has been constructed it is unaffected by any ++subsequent requests that are executed, including @code{bd}, @code{cs}, ++@code{tkf}, @code{tr}, or @code{fp} requests. Normally glyphs are ++constructed from input characters at the moment immediately before the ++glyph is added to the current output line. Macros, diversions and ++strings are all, in fact, the same type of object; they contain lists of ++input characters and glyph nodes in any combination. A glyph node does ++not behave like an input character for the purposes of macro processing; ++it does not inherit any of the special properties that the input ++character from which it was constructed might have had. For example, ++ ++@Example ++.di x ++\\\\ ++.br ++.di ++.x ++@endExample ++ ++@cindex printing backslash (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) ++@cindex backslash, printing (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) ++@cindex @code{\e}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\!}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex @code{\?}, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex transparent output, incompatibilities with @acronym{AT&T} @code{troff} ++@cindex output, transparent, incompatibilities with @acronym{AT&T} @code{troff} ++@noindent ++prints @samp{\\} in GNU @code{troff}; each pair of input backslashes is ++turned into one output backslash and the resulting output backslashes ++are not interpreted as escape characters when they are reread. ++@acronym{UNIX} @code{troff} would interpret them as escape characters ++when they were reread and would end up printing one @samp{\}. The ++correct way to obtain a printable backslash is to use the @code{\e} ++escape sequence: This always prints a single instance of the current ++escape character, regardless of whether or not it is used in a ++diversion; it also works in both GNU @code{troff} and @acronym{UNIX} ++@code{troff}.@footnote{To be completely independent of the current ++escape character, use @code{\(rs}, which represents a reverse solidus ++(backslash) glyph.} To store, for some reason, an escape sequence in a ++diversion that is interpreted when the diversion is reread, either use ++the traditional @code{\!} transparent output facility, or, if this is ++unsuitable, the new @code{\?} escape sequence. ++ ++@xref{Diversions}, and @ref{Gtroff Internals}, for more information. ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Preprocessors, Output Devices, gtroff Reference, Top ++@chapter Preprocessors ++@cindex preprocessors ++ ++This chapter describes all preprocessors that come with @code{groff} or ++which are freely available. ++ ++@menu ++* geqn:: ++* gtbl:: ++* gpic:: ++* ggrn:: ++* grap:: ++* gchem:: ++* grefer:: ++* gsoelim:: ++* preconv:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node geqn, gtbl, Preprocessors, Preprocessors ++@section @code{geqn} ++@cindex @code{eqn}, the program ++@cindex @code{geqn}, the program ++ ++@c XXX ++ ++@menu ++* Invoking geqn:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking geqn, , geqn, geqn ++@subsection Invoking @code{geqn} ++@cindex invoking @code{geqn} ++@cindex @code{geqn}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node gtbl, gpic, geqn, Preprocessors ++@section @code{gtbl} ++@cindex @code{tbl}, the program ++@cindex @code{gtbl}, the program ++ ++@c XXX ++ ++@menu ++* Invoking gtbl:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking gtbl, , gtbl, gtbl ++@subsection Invoking @code{gtbl} ++@cindex invoking @code{gtbl} ++@cindex @code{gtbl}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node gpic, ggrn, gtbl, Preprocessors ++@section @code{gpic} ++@cindex @code{pic}, the program ++@cindex @code{gpic}, the program ++ ++@c XXX ++ ++@menu ++* Invoking gpic:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking gpic, , gpic, gpic ++@subsection Invoking @code{gpic} ++@cindex invoking @code{gpic} ++@cindex @code{gpic}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node ggrn, grap, gpic, Preprocessors ++@section @code{ggrn} ++@cindex @code{grn}, the program ++@cindex @code{ggrn}, the program ++ ++@c XXX ++ ++@menu ++* Invoking ggrn:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking ggrn, , ggrn, ggrn ++@subsection Invoking @code{ggrn} ++@cindex invoking @code{ggrn} ++@cindex @code{ggrn}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node grap, gchem, ggrn, Preprocessors ++@section @code{grap} ++@cindex @code{grap}, the program ++ ++A free implementation of @code{grap}, written by Ted Faber, ++is available as an extra package from the following address: ++ ++@display ++@uref{http://www.lunabase.org/~faber/Vault/software/grap/} ++@end display ++ ++ ++@c ===================================================================== ++ ++@node gchem, grefer, grap, Preprocessors ++@section @code{gchem} ++@cindex @code{chem}, the program ++@cindex @code{gchem}, the program ++ ++@c XXX ++ ++@menu ++* Invoking gchem:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking gchem, , gchem, gchem ++@subsection Invoking @code{gchem} ++@cindex invoking @code{gchem} ++@cindex @code{gchem}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node grefer, gsoelim, gchem, Preprocessors ++@section @code{grefer} ++@cindex @code{refer}, the program ++@cindex @code{grefer}, the program ++ ++@c XXX ++ ++@menu ++* Invoking grefer:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grefer, , grefer, grefer ++@subsection Invoking @code{grefer} ++@cindex invoking @code{grefer} ++@cindex @code{grefer}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node gsoelim, preconv, grefer, Preprocessors ++@section @code{gsoelim} ++@cindex @code{soelim}, the program ++@cindex @code{gsoelim}, the program ++ ++@c XXX ++ ++@menu ++* Invoking gsoelim:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking gsoelim, , gsoelim, gsoelim ++@subsection Invoking @code{gsoelim} ++@cindex invoking @code{gsoelim} ++@cindex @code{gsoelim}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++ ++@node preconv, , gsoelim, Preprocessors ++@section @code{preconv} ++@cindex @code{preconv}, the program ++ ++@c XXX ++ ++@menu ++* Invoking preconv:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking preconv, , preconv, preconv ++@subsection Invoking @code{preconv} ++@cindex invoking @code{preconv} ++@cindex @code{preconv}, invoking ++ ++@c XXX ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Output Devices, File formats, Preprocessors, Top ++@chapter Output Devices ++@cindex output devices ++@cindex devices for output ++ ++@c XXX ++ ++@menu ++* Special Characters:: ++* grotty:: ++* grops:: ++* gropdf:: ++* grodvi:: ++* grolj4:: ++* grolbp:: ++* grohtml:: ++* gxditview:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node Special Characters, grotty, Output Devices, Output Devices ++@section Special Characters ++@cindex special characters ++@cindex characters, special ++ ++@c XXX ++ ++@xref{Font Files}. ++ ++ ++@c ===================================================================== ++ ++@node grotty, grops, Special Characters, Output Devices ++@section @code{grotty} ++@cindex @code{grotty}, the program ++ ++The postprocessor @code{grotty} translates the output from GNU ++@code{troff} into a form suitable for typewriter-like devices. It is ++fully documented on its manual page, @cite{grotty(1)}. ++ ++@menu ++* Invoking grotty:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grotty, , grotty, grotty ++@subsection Invoking @code{grotty} ++@cindex invoking @code{grotty} ++@cindex @code{grotty}, invoking ++ ++The postprocessor @command{grotty} accepts the following command-line ++options: ++ ++@table @option ++@item -b ++Do not overstrike bold glyphs. Ignored if @option{-c} isn't used. ++ ++@item -B ++Do not underline bold-italic glyphs. Ignored if @option{-c} isn't ++used. ++ ++@item -c ++Use overprint and disable colours for printing on legacy Teletype ++printers (see below). ++ ++@item -d ++Do not render lines (this is, ignore all @code{\D} escapes). ++ ++@item -f ++Use form feed control characters in the output. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font and device description files, given the ++target device @var{name}. ++ ++@item -h ++Use horizontal tabs for sequences of 8 space characters. ++ ++@item -i ++Request italic glyphs from the terminal. Ignored if @option{-c} is ++active. ++ ++@item -o ++Do not overstrike. ++ ++@item -r ++Highlight italic glyphs. Ignored if @option{-c} is active. ++ ++@item -u ++Do not underline italic glyphs. Ignored if @option{-c} isn't used. ++ ++@item -U ++Do not overstrike bold-italic glyphs. Ignored if @option{-c} isn't ++used. ++ ++@item -v ++Print the version number. ++@end table ++ ++@pindex less ++@cindex Teletype ++@cindex ISO 6249 SGR ++@cindex terminal control sequences ++@cindex control sequences, for terminals ++The @option{-c} mode for TTY output devices means that underlining is ++done by emitting sequences of @samp{_} and @samp{^H} (the backspace ++character) before the actual character. Literally, this is printing ++an underline character, then moving the caret back one character ++position, and printing the actual character at the same position as ++the underline character (similar to a typewriter). Usually, a modern ++terminal can't interpret this (and the original Teletype machines for ++which this sequence was appropriate are no longer in use). You need ++a pager program like @code{less} that translates this into ++ISO@tie{}6429 SGR sequences to control terminals. ++ ++ ++@c ===================================================================== ++ ++@node grops, gropdf, grotty, Output Devices ++@section @code{grops} ++@cindex @code{grops}, the program ++ ++The postprocessor @command{grops} translates the output from GNU ++@command{troff} into a form suitable for Adobe @sc{PostScript} ++devices. It is fully documented on its manual page, @cite{grops(1)}. ++ ++ ++@menu ++* Invoking grops:: ++* Embedding PostScript:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grops, Embedding PostScript, grops, grops ++@subsection Invoking @code{grops} ++@cindex invoking @code{grops} ++@cindex @code{grops}, invoking ++ ++The postprocessor @code{grops} accepts the following command-line ++options: ++ ++@table @option ++@item -b@var{flags} ++Use backward compatibility settings given by @var{flags} as ++documented in the @cite{grops(1)} manual page. Overrides the command ++@option{broken} in the @file{DESC} file. ++ ++@item -c@var{n} ++Print @var{n} copies of each page. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font, prologue and device description files, ++given the target device @var{name}, usually @strong{ps}. ++ ++@item -g ++Tell the printer to guess the page length. Useful for printing ++vertically centered pages when the paper dimensions are determined at ++print time. ++ ++@item -I@var{path} @dots{} ++Consider the directory @file{@var{path}} for searching included files ++specified with relative paths. The current directory is searched as ++fallback. ++ ++@item -l ++Use landscape orientation. ++ ++@item -m ++Use manual feed. ++ ++@item -p@var{papersize} ++Set the page dimensions. Overrides the commands @option{papersize}, ++@option{paperlength}, and @option{paperwidth} in the @file{DESC} ++file. See the @cite{groff_font(5)} manual page for details. ++ ++@item -P@var{prologue} ++Use the @var{prologue} in the font path as the prologue instead of ++the default @file{prologue}. Overrides the environment variable ++@env{GROPS_PROLOGUE}. ++ ++@item -w@var{n} ++Set the line thickness to @var{n}/1000@dmn{em}. Overrides the ++default value @var{n} = 40. ++ ++@item -v ++Print the version number. ++@end table ++ ++@c --------------------------------------------------------------------- ++ ++@node Embedding PostScript, , Invoking grops, grops ++@subsection Embedding @sc{PostScript} ++@cindex embedding PostScript ++@cindex PostScript, embedding ++ ++The escape sequence ++ ++@code{\X'ps: import @var{file} @var{llx} @var{lly} @var{urx} @var{ury} ++ @var{width} [@var{height}]'} ++ ++@noindent ++places a rectangle of the specified @var{width} containing the ++@sc{PostScript} drawing from file @var{file} bound by the box from ++@var{llx} @var{lly} to @var{urx} @var{ury} (in @sc{PostScript} ++coordinates) at the insertion point. If @var{height} is not ++specified, the embedded drawing is scaled proportionally. ++ ++@xref{Miscellaneous}, for the @code{psbb} request, which automatically ++generates the bounding box. ++ ++This escape sequence is used internally by the macro @code{PSPIC} ++(see the @cite{groff_tmac(5)} manual page). ++ ++ ++@c ===================================================================== ++ ++@node gropdf, grodvi, grops, Output Devices ++@section @code{gropdf} ++@cindex @code{gropdf}, the program ++ ++The postprocessor @command{gropdf} translates the output from GNU ++@command{troff} into a form suitable for Adobe PDF devices. It is fully ++documented on its manual page, @cite{gropdf(1)}. ++ ++@menu ++* Invoking gropdf:: ++* Embedding PDF:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking gropdf, Embedding PDF, gropdf, gropdf ++@subsection Invoking @code{gropdf} ++@cindex invoking @code{gropdf} ++@cindex @code{gropdf}, invoking ++ ++The postprocessor @code{gropdf} accepts the following command-line ++options: ++ ++@table @option ++@item -d ++Produce uncompressed PDFs that include debugging comments. ++ ++@item -e ++This forces @code{gropdf} to embed all used fonts in the PDF, ++even if they are one of the 14 base Adobe fonts. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font, prologue and device description files, ++given the target device @var{name}, usually @strong{pdf}. ++ ++@item -y@var{foundry} ++This forces the use of a different font foundry. ++ ++@item -l ++Use landscape orientation. ++ ++@item -p@var{papersize} ++Set the page dimensions. Overrides the commands @option{papersize}, ++@option{paperlength}, and @option{paperwidth} in the @file{DESC} ++file. See the @cite{groff_font(5)} manual page for details. ++ ++@item -v ++Print the version number. ++ ++@item -s ++Append a comment line to end of PDF showing statistics, i.e. number of ++pages in document. Ghostscript's @cite{ps2pdf(1)} complains about this ++line if it is included, but works anyway. ++ ++@item -u@var{filename} ++@code{gropdf} normally includes a ToUnicode CMap with any font created ++using @file{text.enc} as the encoding file, this makes it easier to ++search for words that contain ligatures. You can include your own CMap ++by specifying a @var{filename} or have no CMap at all by omitting the ++@var{filename}. ++@end table ++ ++@c --------------------------------------------------------------------- ++ ++@node Embedding PDF, , Invoking gropdf, gropdf ++@subsection Embedding PDF ++@cindex embedding PDF ++@cindex PDF, embedding ++ ++The escape sequence ++ ++@code{\X'pdf: pdfpic @var{file} @var{alignment} @var{width} [@var{height}] ++ [@var{linelength}]'} ++ ++@noindent ++places a rectangle of the specified @var{width} containing the PDF ++drawing from file @var{file} of desired @var{width} and @var{height} (if ++@var{height} is missing or zero then it is scaled proportionally). If ++@var{alignment} is @code{-L} the drawing is left aligned. If it is ++@code{-C} or @code{-R} a @var{linelength} greater than the width of the ++drawing is required as well. If @var{width} is specified as zero then ++the width is scaled in proportion to the height. ++ ++ ++@c ===================================================================== ++ ++@node grodvi, grolj4, gropdf, Output Devices ++@section @code{grodvi} ++@cindex @code{grodvi}, the program ++ ++The postprocessor @command{grodvi} translates the output from GNU ++@command{troff} into the @strong{DVI} output format compatible with ++the @strong{@TeX{}} document preparation system. It is fully ++documented on its manual page, @cite{grodvi(1)}. ++ ++@menu ++* Invoking grodvi:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grodvi, , grodvi, grodvi ++@subsection Invoking @code{grodvi} ++@cindex invoking @code{grodvi} ++@cindex @code{grodvi}, invoking ++ ++The postprocessor @code{grodvi} accepts the following command-line ++options: ++ ++@table @option ++@item -d ++Do not use @strong{tpic} specials to implement drawing commands. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font and device description files, given the ++target device @var{name}, usually @strong{dvi}. ++ ++@item -l ++Use landscape orientation. ++ ++@item -p@var{papersize} ++Set the page dimensions. Overrides the commands @option{papersize}, ++@option{paperlength}, and @option{paperwidth} in the @file{DESC} ++file. See @cite{groff_font(5)} manual page for details. ++ ++@item -v ++Print the version number. ++ ++@item -w@var{n} ++Set the line thickness to @var{n}/1000@dmn{em}. Overrides the ++default value @var{n} = 40. ++@end table ++ ++ ++@c ===================================================================== ++ ++@node grolj4, grolbp, grodvi, Output Devices ++@section @code{grolj4} ++@cindex @code{grolj4}, the program ++ ++The postprocessor @command{grolj4} translates the output from GNU ++@command{troff} into the @strong{PCL5} output format suitable for ++printing on a @strong{HP LaserJet@tie{}4} printer. It is fully ++documented on its manual page, @cite{grolj4(1)}. ++ ++@menu ++* Invoking grolj4:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grolj4, , grolj4, grolj4 ++@subsection Invoking @code{grolj4} ++@cindex invoking @code{grolj4} ++@cindex @code{grolj4}, invoking ++ ++The postprocessor @code{grolj4} accepts the following command-line ++options: ++ ++@table @option ++@item -c@var{n} ++Print @var{n} copies of each page. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font and device description files, given the ++target device @var{name}, usually @strong{lj4}. ++ ++@item -l ++Use landscape orientation. ++ ++@item -p@var{size} ++Set the page dimensions. Valid values for @var{size} are: ++@code{letter}, @code{legal}, @code{executive}, @code{a4}, ++@code{com10}, @code{monarch}, @code{c5}, @code{b5}, @code{d1}. ++ ++@item -v ++Print the version number. ++ ++@item -w@var{n} ++Set the line thickness to @var{n}/1000@dmn{em}. Overrides the ++default value @var{n} = 40. ++@end table ++ ++The special drawing command @code{\D'R @var{dh} @var{dv}'} draws a ++horizontal rectangle from the current position to the position at ++offset (@var{dh},@var{dv}). ++ ++ ++@c ===================================================================== ++ ++@node grolbp, grohtml, grolj4, Output Devices ++@section @code{grolbp} ++@cindex @code{grolbp}, the program ++ ++The postprocessor @command{grolbp} translates the output from GNU ++@command{troff} into the @strong{LBP} output format suitable for ++printing on @strong{Canon CAPSL} printers. It is fully documented on ++its manual page, @cite{grolbp(1)}. ++ ++@menu ++* Invoking grolbp:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grolbp, , grolbp, grolbp ++@subsection Invoking @code{grolbp} ++@cindex invoking @code{grolbp} ++@cindex @code{grolbp}, invoking ++ ++The postprocessor @code{grolbp} accepts the following command-line ++options: ++ ++@table @option ++@item -c@var{n} ++Print @var{n} copies of each page. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font, prologue and device description files, ++given the target device @var{name}, usually @strong{lbp}. ++ ++@item -l ++Use landscape orientation. ++ ++@item -o@var{orientation} ++Use the @var{orientation} specified: @code{portrait} or ++@code{landscape}. ++ ++@item -p@var{papersize} ++Set the page dimensions. See @cite{groff_font(5)} manual page for ++details. ++ ++@item -w@var{n} ++Set the line thickness to @var{n}/1000@dmn{em}. Overrides the ++default value @var{n} = 40. ++ ++@item -v ++Print the version number. ++ ++@item -h ++Print command-line help. ++@end table ++ ++ ++@c ===================================================================== ++ ++@node grohtml, gxditview, grolbp, Output Devices ++@section @code{grohtml} ++@cindex @code{grohtml}, the program ++ ++The @code{grohtml} front end (which consists of a preprocessor, ++@code{pre-grohtml}, and a device driver, @code{post-grohtml}) translates ++the output of GNU @code{troff} to @acronym{HTML}. Users should always ++invoke @code{grohtml} via the @code{groff} command with a @code{\-Thtml} ++option. If no files are given, @code{grohtml} will read the standard ++input. A filename of @code{-} will also cause @code{grohtml} to read ++the standard input. @acronym{HTML} output is written to the standard ++output. When @code{grohtml} is run by @code{groff}, options can be ++passed to @code{grohtml} using @code{groff}'s @option{-P} option. ++ ++@code{grohtml} invokes @code{groff} twice. In the first pass, pictures, ++equations, and tables are rendered using the @code{ps} device, and in ++the second pass @acronym{HTML} output is generated by the @code{html} ++device. ++ ++@code{grohtml} always writes output in @code{UTF-8} encoding and has ++built-in entities for all non-composite unicode characters. In spite of ++this, @code{groff} may issue warnings about unknown special characters ++if they can't be found during the first pass. Such warnings can be ++safely ignored unless the special characters appear inside a table or ++equation, in which case glyphs for these characters must be defined for ++the @code{ps} device as well. ++ ++This output device is fully documented on its manual page, ++@cite{grohtml(1)}. ++ ++@menu ++* Invoking grohtml:: ++* grohtml specific registers and strings:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking grohtml, grohtml specific registers and strings, grohtml, grohtml ++@subsection Invoking @code{grohtml} ++@cindex invoking @code{grohtml} ++@cindex @code{grohtml}, invoking ++ ++The postprocessor @code{grohtml} accepts the following command-line ++options: ++ ++@table @option ++@item -a@var{bits} ++Use this number of @var{bits} (= 1, 2 or 4) for text antialiasing. ++Default: @var{bits} = 4. ++ ++@item -a0 ++Do not use text antialiasing. ++ ++@item -b ++Use white background. ++ ++@item -D@var{dir} ++Store rendered images in the directory @file{@var{dir}}. ++ ++@item -F@var{dir} ++Put the directory @file{@var{dir}/dev@var{name}} in front of the ++search path for the font, prologue and device description files, ++given the target device @var{name}, usually @strong{html}. ++ ++@item -g@var{bits} ++Use this number of @var{bits} (= 1, 2 or 4) for antialiasing of ++drawings. Default: @var{bits} = 4. ++ ++@item -g0 ++Do not use antialiasing for drawings. ++ ++@item -h ++Use the @code{B} element for section headings. ++ ++@item -i@var{resolution} ++Use the @var{resolution} for rendered images. Default: ++@var{resolution} = 100@dmn{dpi}. ++ ++@item -I@var{stem} ++Set the images' @var{stem name}. Default: @var{stem} = ++@file{grohtml-@var{XXX}} (@var{XXX} is the process ID). ++ ++@item -j@var{stem} ++Place each section in a separate file called ++@file{@var{stem}-@var{n}.html} (where @var{n} is a generated section ++number). ++ ++@item -l ++Do not generate the table of contents. ++ ++@item -n ++Generate simple fragment identifiers. ++ ++@item -o@var{offset} ++Use vertical paddding @var{offset} for images. ++ ++@item -p ++Display the page rendering progress to @code{stderr}. ++ ++@item -r ++Do not use horizontal rules to separate headers and footers. ++ ++@item -s@var{size} ++Set the base font size, to be modified using the elements @code{BIG} ++and @code{SMALL}. ++ ++@item -S@var{level} ++Generate separate files for sections at level @var{level}. ++ ++@item -v ++Print the version number. ++ ++@item -V ++Generate a validator button at the bottom. ++ ++@item -y ++Generate a signature of groff after the validator button, if any. ++@end table ++ ++ ++@c --------------------------------------------------------------------- ++ ++@node grohtml specific registers and strings, , Invoking grohtml, grohtml ++@subsection @code{grohtml} specific registers and strings ++@cindex registers specific to @code{grohtml} ++@cindex strings specific to @code{grohtml} ++@cindex @code{grohtml}, registers and strings ++ ++@DefmpregList {ps4html, grohtml} ++@DefstrListEndx {www-image-template, grohtml} ++The registers @code{ps4html} and @code{www-image-template} are defined ++by the @code{pre-grohtml} preprocessor. @code{pre-grohtml} reads in the ++@code{troff} input, marks up the inline equations and passes the result ++firstly to ++ ++@Example ++troff -Tps -rps4html=1 -dwww-image-template=@var{template} ++@endExample ++ ++@noindent ++and secondly to ++ ++@Example ++troff -Thtml ++@endExample ++ ++@noindent ++or ++ ++@Example ++troff -Txhtml ++@endExample ++ ++@cindex MathML ++The @sc{PostScript} device is used to create all the image files (for ++@option{-Thtml}; if @option{-Txhtml} is used, all equations are passed ++to @code{geqn} to produce @acronym{MathML}, and the register ++@code{ps4html} enables the macro sets to ignore floating keeps, footers, ++and headings. ++ ++The register @code{www-image-template} is set to the user specified ++template name or the default name. ++@endDefmpreg ++ ++ ++@c ===================================================================== ++ ++@node gxditview, , grohtml, Output Devices ++@section @code{gxditview} ++@cindex @code{gxditview}, the program ++ ++@c XXX ++ ++@menu ++* Invoking gxditview:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Invoking gxditview, , gxditview, gxditview ++@subsection Invoking @code{gxditview} ++@cindex invoking @code{gxditview} ++@cindex @code{gxditview}, invoking ++ ++@c XXX ++@c X11's xditview ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node File formats, Installation, Output Devices, Top ++@chapter File formats ++@cindex file formats ++@cindex formats, file ++ ++All files read and written by @code{gtroff} are text files. The ++following two sections describe their format. ++ ++@menu ++* gtroff Output:: ++* Font Files:: ++@end menu ++ ++ ++@c ===================================================================== ++ ++@node gtroff Output, Font Files, File formats, File formats ++@section @code{gtroff} Output ++@cindex @code{gtroff}, output ++@cindex output, @code{gtroff} ++ ++This section describes the intermediate output format of GNU ++@code{troff}. This output is produced by a run of @code{gtroff} before ++it is fed into a device postprocessor program. ++ ++As @code{groff} is a wrapper program around @code{gtroff} that ++automatically calls a postprocessor, this output does not show up ++normally. This is why it is called @dfn{intermediate}. @code{groff} ++provides the option @option{-Z} to inhibit postprocessing, such that the ++produced intermediate output is sent to standard output just like ++calling @code{gtroff} manually. ++ ++@cindex troff output ++@cindex output, troff ++@cindex intermediate output ++@cindex output, intermediate ++Here, the term @dfn{troff output} describes what is output by ++@code{gtroff}, while @dfn{intermediate output} refers to the language ++that is accepted by the parser that prepares this output for the ++postprocessors. This parser is smarter on whitespace and implements ++obsolete elements for compatibility, otherwise both formats are the ++same.@footnote{The parser and postprocessor for intermediate output can ++be found in the file@* ++@file{@var{groff-source-dir}/src/libs/libdriver/input.cpp}.} ++ ++The main purpose of the intermediate output concept is to facilitate the ++development of postprocessors by providing a common programming ++interface for all devices. It has a language of its own that is ++completely different from the @code{gtroff} language. While the ++@code{gtroff} language is a high-level programming language for text ++processing, the intermediate output language is a kind of low-level ++assembler language by specifying all positions on the page for writing ++and drawing. ++ ++The intermediate output produced by @code{gtroff} is fairly readable, ++while output from @acronym{AT&T} @code{troff} is rather hard to ++understand because of strange habits that are still supported, but not ++used any longer by @code{gtroff}. ++ ++@menu ++* Language Concepts:: ++* Command Reference:: ++* Intermediate Output Examples:: ++* Output Language Compatibility:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node Language Concepts, Command Reference, gtroff Output, gtroff Output ++@subsection Language Concepts ++ ++During the run of @code{gtroff}, the input data is cracked down to the ++information on what has to be printed at what position on the intended ++device. So the language of the intermediate output format can be quite ++small. Its only elements are commands with and without arguments. In ++this section, the term @dfn{command} always refers to the intermediate ++output language, and never to the @code{gtroff} language used for ++document formatting. There are commands for positioning and text ++writing, for drawing, and for device controlling. ++ ++@menu ++* Separation:: ++* Argument Units:: ++* Document Parts:: ++@end menu ++ ++@node Separation, Argument Units, Language Concepts, Language Concepts ++@subsubsection Separation ++ ++@acronym{AT&T} @code{troff} output has strange requirements on ++whitespace. The @code{gtroff} output parser, however, is smart about ++whitespace by making it maximally optional. The whitespace characters, ++i.e., the tab, space, and newline characters, always have a syntactical ++meaning. They are never printable because spacing within the output is ++always done by positioning commands. ++ ++Any sequence of space or tab characters is treated as a single ++@dfn{syntactical space}. It separates commands and arguments, but is ++only required when there would occur a clashing between the command code ++and the arguments without the space. Most often, this happens when ++variable-length command names, arguments, argument lists, or command ++clusters meet. Commands and arguments with a known, fixed length need ++not be separated by syntactical space. ++ ++A line break is a syntactical element, too. Every command argument can ++be followed by whitespace, a comment, or a newline character. Thus a ++@dfn{syntactical line break} is defined to consist of optional ++syntactical space that is optionally followed by a comment, and a ++newline character. ++ ++The normal commands, those for positioning and text, consist of a single ++letter taking a fixed number of arguments. For historical reasons, the ++parser allows to stack such commands on the same line, but fortunately, ++in @code{gtroff}'s intermediate output, every command with at least one ++argument is followed by a line break, thus providing excellent ++readability. ++ ++The other commands -- those for drawing and device controlling -- have a ++more complicated structure; some recognize long command names, and some ++take a variable number of arguments. So all @samp{D} and @samp{x} ++commands were designed to request a syntactical line break after their ++last argument. Only one command, @w{@samp{x X}}, has an argument that ++can stretch over several lines; all other commands must have all of ++their arguments on the same line as the command, i.e., the arguments may ++not be split by a line break. ++ ++Empty lines (these are lines containing only space and/or a comment), ++can occur everywhere. They are just ignored. ++ ++@node Argument Units, Document Parts, Separation, Language Concepts ++@subsubsection Argument Units ++ ++Some commands take integer arguments that are assumed to represent ++values in a measurement unit, but the letter for the corresponding scale ++indicator is not written with the output command arguments. Most ++commands assume the scale indicator @samp{u}, the basic unit of the ++device, some use @samp{z}, the scaled point unit of the device, while ++others, such as the color commands, expect plain integers. ++ ++Note that single characters can have the eighth bit set, as can the ++names of fonts and special characters. The names of characters and ++fonts can be of arbitrary length. A character that is to be printed is ++always in the current font. ++ ++A string argument is always terminated by the next whitespace character ++(space, tab, or newline); an embedded @samp{#} character is regarded as ++part of the argument, not as the beginning of a comment command. An ++integer argument is already terminated by the next non-digit character, ++which then is regarded as the first character of the next argument or ++command. ++ ++@node Document Parts, , Argument Units, Language Concepts ++@subsubsection Document Parts ++ ++A correct intermediate output document consists of two parts, the ++@dfn{prologue} and the @dfn{body}. ++ ++The task of the prologue is to set the general device parameters using ++three exactly specified commands. @code{gtroff}'s prologue is ++guaranteed to consist of the following three lines (in that order): ++ ++@Example ++x T @var{device} ++x res @var{n} @var{h} @var{v} ++x init ++@endExample ++ ++@noindent ++with the arguments set as outlined in @ref{Device Control Commands}. ++Note that the parser for the intermediate output format is able to ++swallow additional whitespace and comments as well even in the prologue. ++ ++The body is the main section for processing the document data. ++Syntactically, it is a sequence of any commands different from the ones ++used in the prologue. Processing is terminated as soon as the first ++@w{@samp{x stop}} command is encountered; the last line of any ++@code{gtroff} intermediate output always contains such a command. ++ ++Semantically, the body is page oriented. A new page is started by a ++@samp{p} command. Positioning, writing, and drawing commands are always ++done within the current page, so they cannot occur before the first ++@samp{p} command. Absolute positioning (by the @samp{H} and @samp{V} ++commands) is done relative to the current page; all other positioning is ++done relative to the current location within this page. ++ ++@c --------------------------------------------------------------------- ++ ++@node Command Reference, Intermediate Output Examples, Language Concepts, gtroff Output ++@subsection Command Reference ++ ++This section describes all intermediate output commands, both from ++@acronym{AT&T} @code{troff} as well as the @code{gtroff} extensions. ++ ++@menu ++* Comment Command:: ++* Simple Commands:: ++* Graphics Commands:: ++* Device Control Commands:: ++* Obsolete Command:: ++@end menu ++ ++@node Comment Command, Simple Commands, Command Reference, Command Reference ++@subsubsection Comment Command ++ ++@table @code ++@item #@var{anything}@angles{end of line} ++A comment. Ignore any characters from the @samp{#} character up to the ++next newline character. ++ ++This command is the only possibility for commenting in the intermediate ++output. Each comment can be preceded by arbitrary syntactical space; ++every command can be terminated by a comment. ++@end table ++ ++@node Simple Commands, Graphics Commands, Comment Command, Command Reference ++@subsubsection Simple Commands ++ ++The commands in this subsection have a command code consisting of a ++single character, taking a fixed number of arguments. Most of them are ++commands for positioning and text writing. These commands are smart ++about whitespace. Optionally, syntactical space can be inserted before, ++after, and between the command letter and its arguments. All of these ++commands are stackable, i.e., they can be preceded by other simple ++commands or followed by arbitrary other commands on the same line. A ++separating syntactical space is only necessary when two integer ++arguments would clash or if the preceding argument ends with a string ++argument. ++ ++@table @code ++@ignore ++.if (\n[@USE_ENV_STACK] == 1) \{\ ++.command { ++Open a new environment by copying the actual device configuration data ++to the environment stack. ++. ++The current environment is setup by the device specification and ++manipulated by the setting commands. ++. ++. ++.command } ++Close the actual environment (opened by a preceding ++.BR { \~command) ++and restore the previous environment from the environment ++stack as the actual device configuration data. ++. ++\} \" endif @USE_ENV_STACK ++@end ignore ++ ++@item C @var{xxx}@angles{whitespace} ++Print a special character named @var{xxx}. The trailing syntactical ++space or line break is necessary to allow glyph names of arbitrary ++length. The glyph is printed at the current print position; the glyph's ++size is read from the font file. The print position is not changed. ++ ++@item c @var{g} ++Print glyph@tie{}@var{g} at the current print ++position;@footnote{@samp{c} is actually a misnomer since it outputs a ++glyph.} the glyph's size is read from the font file. The print position ++is not changed. ++ ++@item f @var{n} ++Set font to font number@tie{}@var{n} (a non-negative integer). ++ ++@item H @var{n} ++Move right to the absolute vertical position@tie{}@var{n} (a ++non-negative integer in basic units @samp{u} relative to left edge of ++current page. ++ ++@item h @var{n} ++Move @var{n} (a non-negative integer) basic units @samp{u} horizontally ++to the right. The original @acronym{UNIX} troff manual allows negative ++values for @var{n} also, but @code{gtroff} doesn't use this. ++ ++@item m @var{color-scheme} @r{[}@var{component} @dots{}@r{]} ++Set the color for text (glyphs), line drawing, and the outline of ++graphic objects using different color schemes; the analoguous command ++for the filling color of graphic objects is @samp{DF}. The color ++components are specified as integer arguments between 0 and 65536. The ++number of color components and their meaning vary for the different ++color schemes. These commands are generated by @code{gtroff}'s escape ++sequence @code{\m}. No position changing. These commands are a ++@code{gtroff} extension. ++ ++@table @code ++@item mc @var{cyan} @var{magenta} @var{yellow} ++Set color using the CMY color scheme, having the 3@tie{}color components ++@var{cyan}, @var{magenta}, and @var{yellow}. ++ ++@item md ++Set color to the default color value (black in most cases). No ++component arguments. ++ ++@item mg @var{gray} ++Set color to the shade of gray given by the argument, an integer between ++0 (black) and 65536 (white). ++ ++@item mk @var{cyan} @var{magenta} @var{yellow} @var{black} ++Set color using the CMYK color scheme, having the 4@tie{}color ++components @var{cyan}, @var{magenta}, @var{yellow}, and @var{black}. ++ ++@item mr @var{red} @var{green} @var{blue} ++Set color using the RGB color scheme, having the 3@tie{}color components ++@var{red}, @var{green}, and @var{blue}. ++@end table ++ ++@item N @var{n} ++Print glyph with index@tie{}@var{n} (a non-negative integer) of the ++current font. This command is a @code{gtroff} extension. ++ ++@item n @var{b} @var{a} ++Inform the device about a line break, but no positioning is done by this ++command. In @acronym{AT&T} @code{troff}, the integer arguments @var{b} ++and@tie{}@var{a} informed about the space before and after the current ++line to make the intermediate output more human readable without ++performing any action. In @code{groff}, they are just ignored, but they ++must be provided for compatibility reasons. ++ ++@item p @var{n} ++Begin a new page in the outprint. The page number is set ++to@tie{}@var{n}. This page is completely independent of pages formerly ++processed even if those have the same page number. The vertical ++position on the outprint is automatically set to@tie{}0. All ++positioning, writing, and drawing is always done relative to a page, so ++a @samp{p} command must be issued before any of these commands. ++ ++@item s @var{n} ++Set point size to @var{n}@tie{}scaled points (this is unit @samp{z}). ++@acronym{AT&T} @code{troff} used the unit points (@samp{p}) instead. ++@xref{Output Language Compatibility}. ++ ++@item t @var{xxx}@angles{whitespace} ++@itemx t @var{xxx} @var{dummy-arg}@angles{whitespace} ++Print a word, i.e., a sequence of characters @var{xxx} representing ++output glyphs which names are single characters, terminated by a space ++character or a line break; an optional second integer argument is ++ignored (this allows the formatter to generate an even number of ++arguments). The first glyph should be printed at the current position, ++the current horizontal position should then be increased by the width of ++the first glyph, and so on for each glyph. The widths of the glyphs are ++read from the font file, scaled for the current point size, and rounded ++to a multiple of the horizontal resolution. Special characters cannot ++be printed using this command (use the @samp{C} command for special ++characters). This command is a @code{gtroff} extension; it is only used ++for devices whose @file{DESC} file contains the @code{tcommand} keyword ++(@pxref{DESC File Format}). ++ ++@item u @var{n} @var{xxx}@angles{whitespace} ++Print word with track kerning. This is the same as the @samp{t} command ++except that after printing each glyph, the current horizontal position ++is increased by the sum of the width of that glyph and@tie{}@var{n} (an ++integer in basic units @samp{u}). This command is a @code{gtroff} ++extension; it is only used for devices whose @file{DESC} file contains ++the @code{tcommand} keyword (@pxref{DESC File Format}). ++ ++@item V @var{n} ++Move down to the absolute vertical position@tie{}@var{n} (a non-negative ++integer in basic units @samp{u}) relative to upper edge of current page. ++ ++@item v @var{n} ++Move @var{n}@tie{}basic units @samp{u} down (@var{n} is a non-negative ++integer). The original @acronym{UNIX} troff manual allows negative ++values for @var{n} also, but @code{gtroff} doesn't use this. ++ ++@item w ++Informs about a paddable white space to increase readability. The ++spacing itself must be performed explicitly by a move command. ++@end table ++ ++@node Graphics Commands, Device Control Commands, Simple Commands, Command Reference ++@subsubsection Graphics Commands ++ ++Each graphics or drawing command in the intermediate output starts with ++the letter @samp{D}, followed by one or two characters that specify a ++subcommand; this is followed by a fixed or variable number of integer ++arguments that are separated by a single space character. A @samp{D} ++command may not be followed by another command on the same line (apart ++from a comment), so each @samp{D} command is terminated by a syntactical ++line break. ++ ++@code{gtroff} output follows the classical spacing rules (no space ++between command and subcommand, all arguments are preceded by a single ++space character), but the parser allows optional space between the ++command letters and makes the space before the first argument optional. ++As usual, each space can be any sequence of tab and space characters. ++ ++Some graphics commands can take a variable number of arguments. In this ++case, they are integers representing a size measured in basic units ++@samp{u}. The arguments called @var{h1}, @var{h2}, @dots{}, @var{hn} ++stand for horizontal distances where positive means right, negative ++left. The arguments called @var{v1}, @var{v2}, @dots{}, @var{vn} stand ++for vertical distances where positive means down, negative up. All ++these distances are offsets relative to the current location. ++ ++Each graphics command directly corresponds to a similar @code{gtroff} ++@code{\D} escape sequence. @xref{Drawing Requests}. ++ ++Unknown @samp{D} commands are assumed to be device-specific. Its ++arguments are parsed as strings; the whole information is then sent to ++the postprocessor. ++ ++In the following command reference, the syntax element @angles{line ++break} means a syntactical line break as defined above. ++ ++@table @code ++@item D~ @var{h1} @var{v1} @var{h2} @var{v2} @dots{} @var{hn} @var{vn}@angles{line break} ++Draw B-spline from current position to offset (@var{h1},@var{v1}), then ++to offset (@var{h2},@var{v2}), if given, etc.@: up to ++(@var{hn},@var{vn}). This command takes a variable number of argument ++pairs; the current position is moved to the terminal point of the drawn ++curve. ++ ++@item Da @var{h1} @var{v1} @var{h2} @var{v2}@angles{line break} ++Draw arc from current position to ++(@var{h1},@var{v1})@math{+}(@var{h2},@var{v2}) with center at ++(@var{h1},@var{v1}); then move the current position to the final point ++of the arc. ++ ++@item DC @var{d}@angles{line break} ++@itemx DC @var{d} @var{dummy-arg}@angles{line break} ++Draw a solid circle using the current fill color with ++diameter@tie{}@var{d} (integer in basic units @samp{u}) with leftmost ++point at the current position; then move the current position to the ++rightmost point of the circle. An optional second integer argument is ++ignored (this allows the formatter to generate an even number of ++arguments). This command is a @code{gtroff} extension. ++ ++@item Dc @var{d}@angles{line break} ++Draw circle line with diameter@tie{}@var{d} (integer in basic units ++@samp{u}) with leftmost point at the current position; then move the ++current position to the rightmost point of the circle. ++ ++@item DE @var{h} @var{v}@angles{line break} ++Draw a solid ellipse in the current fill color with a horizontal ++diameter of@tie{}@var{h} and a vertical diameter of@tie{}@var{v} (both ++integers in basic units @samp{u}) with the leftmost point at the current ++position; then move to the rightmost point of the ellipse. This command ++is a @code{gtroff} extension. ++ ++@item De @var{h} @var{v}@angles{line break} ++Draw an outlined ellipse with a horizontal diameter of@tie{}@var{h} and ++a vertical diameter of@tie{}@var{v} (both integers in basic units ++@samp{u}) with the leftmost point at current position; then move to the ++rightmost point of the ellipse. ++ ++@item DF @var{color-scheme} @r{[}@var{component} @dots{}@r{]}@angles{line break} ++Set fill color for solid drawing objects using different color schemes; ++the analoguous command for setting the color of text, line graphics, and ++the outline of graphic objects is @samp{m}. The color components are ++specified as integer arguments between 0 and 65536. The number of color ++components and their meaning vary for the different color schemes. ++These commands are generated by @code{gtroff}'s escape sequences ++@w{@code{\D'F @dots{}'}} and @code{\M} (with no other corresponding ++graphics commands). No position changing. This command is a ++@code{gtroff} extension. ++ ++@table @code ++@item DFc @var{cyan} @var{magenta} @var{yellow}@angles{line break} ++Set fill color for solid drawing objects using the CMY color scheme, ++having the 3@tie{}color components @var{cyan}, @var{magenta}, and ++@var{yellow}. ++ ++@item DFd@angles{line break} ++Set fill color for solid drawing objects to the default fill color value ++(black in most cases). No component arguments. ++ ++@item DFg @var{gray}@angles{line break} ++Set fill color for solid drawing objects to the shade of gray given by ++the argument, an integer between 0 (black) and 65536 (white). ++ ++@item DFk @var{cyan} @var{magenta} @var{yellow} @var{black}@angles{line break} ++Set fill color for solid drawing objects using the CMYK color scheme, ++having the 4@tie{}color components @var{cyan}, @var{magenta}, ++@var{yellow}, and @var{black}. ++ ++@item DFr @var{red} @var{green} @var{blue}@angles{line break} ++Set fill color for solid drawing objects using the RGB color scheme, ++having the 3@tie{}color components @var{red}, @var{green}, and ++@var{blue}. ++@end table ++ ++@item Df @var{n}@angles{line break} ++The argument@tie{}@var{n} must be an integer in the range @math{-32767} ++to 32767. ++ ++@table @asis ++@item @math{0 @value{LE} @var{n} @value{LE} 1000} ++Set the color for filling solid drawing objects to a shade of gray, ++where 0 corresponds to solid white, 1000 (the default) to solid black, ++and values in between to intermediate shades of gray; this is obsoleted ++by command @samp{DFg}. ++ ++@item @math{@var{n} < 0} or @math{@var{n} > 1000} ++Set the filling color to the color that is currently being used for the ++text and the outline, see command @samp{m}. For example, the command ++sequence ++ ++@Example ++mg 0 0 65536 ++Df -1 ++@endExample ++ ++@noindent ++sets all colors to blue. ++@end table ++ ++@noindent ++No position changing. This command is a @code{gtroff} extension. ++ ++@item Dl @var{h} @var{v}@angles{line break} ++Draw line from current position to offset (@var{h},@var{v}) (integers in ++basic units @samp{u}); then set current position to the end of the drawn ++line. ++ ++@item Dp @var{h1} @var{v1} @var{h2} @var{v2} @dots{} @var{hn} @var{vn}@angles{line break} ++Draw a polygon line from current position to offset (@var{h1},@var{v1}), ++from there to offset (@var{h2},@var{v2}), etc.@: up to offset ++(@var{hn},@var{vn}), and from there back to the starting position. For ++historical reasons, the position is changed by adding the sum of all ++arguments with odd index to the actual horizontal position and the even ++ones to the vertical position. Although this doesn't make sense it is ++kept for compatibility. ++@ignore ++As the polygon is closed, the end of drawing is the starting point, so ++the position doesn't change. ++@end ignore ++This command is a @code{gtroff} extension. ++ ++@item Dp @var{h1} @var{v1} @var{h2} @var{v2} @dots{} @var{hn} @var{vn}@angles{line break} ++Draw a solid polygon in the current fill color rather than an outlined ++polygon, using the same arguments and positioning as the corresponding ++@samp{Dp} command. ++@ignore ++No position changing. ++@end ignore ++This command is a @code{gtroff} extension. ++ ++@item Dt @var{n}@angles{line break} ++Set the current line thickness to@tie{}@var{n} (an integer in basic ++units @samp{u}) if @math{@var{n}>0}; if @math{@var{n}=0} select the ++smallest available line thickness; if @math{@var{n}<0} set the line ++thickness proportional to the point size (this is the default before the ++first @samp{Dt} command was specified). For historical reasons, the ++horizontal position is changed by adding the argument to the actual ++horizontal position, while the vertical position is not changed. ++Although this doesn't make sense it is kept for compatibility. ++@ignore ++No position changing. ++@end ignore ++This command is a @code{gtroff} extension. ++@end table ++ ++@node Device Control Commands, Obsolete Command, Graphics Commands, Command Reference ++@subsubsection Device Control Commands ++ ++Each device control command starts with the letter @samp{x}, followed by ++a space character (optional or arbitrary space or tab in @code{gtroff}) ++and a subcommand letter or word; each argument (if any) must be preceded ++by a syntactical space. All @samp{x} commands are terminated by a ++syntactical line break; no device control command can be followed by ++another command on the same line (except a comment). ++ ++The subcommand is basically a single letter, but to increase ++readability, it can be written as a word, i.e., an arbitrary sequence of ++characters terminated by the next tab, space, or newline character. All ++characters of the subcommand word but the first are simply ignored. For ++example, @code{gtroff} outputs the initialization command @w{@samp{x i}} ++as @w{@samp{x init}} and the resolution command @w{@samp{x r}} as ++@w{@samp{x res}}. ++ ++In the following, the syntax element @angles{line break} means a ++syntactical line break (@pxref{Separation}). ++ ++@table @code ++@item xF @var{name}@angles{line break} ++The @samp{F} stands for @var{Filename}. ++ ++Use @var{name} as the intended name for the current file in error ++reports. This is useful for remembering the original file name when ++@code{gtroff} uses an internal piping mechanism. The input file is not ++changed by this command. This command is a @code{gtroff} extension. ++ ++@item xf @var{n} @var{s}@angles{line break} ++The @samp{f} stands for @var{font}. ++ ++Mount font position@tie{}@var{n} (a non-negative integer) with font ++named@tie{}@var{s} (a text word). @xref{Font Positions}. ++ ++@item xH @var{n}@angles{line break} ++The @samp{H} stands for @var{Height}. ++ ++Set glyph height to@tie{}@var{n} (a positive integer in scaled points ++@samp{z}). @acronym{AT&T} @code{troff} uses the unit points (@samp{p}) ++instead. @xref{Output Language Compatibility}. ++ ++@item xi@angles{line break} ++The @samp{i} stands for @var{init}. ++ ++Initialize device. This is the third command of the prologue. ++ ++@item xp@angles{line break} ++The @samp{p} stands for @var{pause}. ++ ++Parsed but ignored. The original @acronym{UNIX} troff manual writes ++ ++@display ++pause device, can be restarted ++@end display ++ ++@item xr @var{n} @var{h} @var{v}@angles{line break} ++The @samp{r} stands for @var{resolution}. ++ ++Resolution is@tie{}@var{n}, while @var{h} is the minimal horizontal ++motion, and @var{v} the minimal vertical motion possible with this ++device; all arguments are positive integers in basic units @samp{u} per ++inch. This is the second command of the prologue. ++ ++@item xS @var{n}@angles{line break} ++The @samp{S} stands for @var{Slant}. ++ ++Set slant to@tie{}@var{n} (an integer in basic units @samp{u}). ++ ++@item xs@angles{line break} ++The @samp{s} stands for @var{stop}. ++ ++Terminates the processing of the current file; issued as the last ++command of any intermediate troff output. ++ ++@item xt@angles{line break} ++The @samp{t} stands for @var{trailer}. ++ ++Generate trailer information, if any. In @var{gtroff}, this is actually ++just ignored. ++ ++@item xT @var{xxx}@angles{line break} ++The @samp{T} stands for @var{Typesetter}. ++ ++Set name of device to word @var{xxx}, a sequence of characters ended by ++the next white space character. The possible device names coincide with ++those from the @code{groff} @option{-T} option. This is the first ++command of the prologue. ++ ++@item xu @var{n}@angles{line break} ++The @samp{u} stands for @var{underline}. ++ ++Configure underlining of spaces. If @var{n} is@tie{}1, start ++underlining of spaces; if @var{n} is@tie{}0, stop underlining of spaces. ++This is needed for the @code{cu} request in nroff mode and is ignored ++otherwise. This command is a @code{gtroff} extension. ++ ++@item xX @var{anything}@angles{line break} ++The @samp{x} stands for @var{X-escape}. ++ ++Send string @var{anything} uninterpreted to the device. If the line ++following this command starts with a @samp{+} character this line is ++interpreted as a continuation line in the following sense. The @samp{+} ++is ignored, but a newline character is sent instead to the device, the ++rest of the line is sent uninterpreted. The same applies to all ++following lines until the first character of a line is not a @samp{+} ++character. This command is generated by the @code{gtroff} escape ++sequence @code{\X}. The line-continuing feature is a @code{gtroff} ++extension. ++@end table ++ ++@node Obsolete Command, , Device Control Commands, Command Reference ++@subsubsection Obsolete Command ++In @acronym{AT&T} @code{troff} output, the writing of a single glyph is ++mostly done by a very strange command that combines a horizontal move ++and a single character giving the glyph name. It doesn't have a command ++code, but is represented by a 3-character argument consisting of exactly ++2@tie{}digits and a character. ++ ++@table @asis ++@item @var{dd}@var{g} ++Move right @var{dd} (exactly two decimal digits) basic units @samp{u}, ++then print glyph@tie{}@var{g} (represented as a single character). ++ ++In @code{gtroff}, arbitrary syntactical space around and within this ++command is allowed to be added. Only when a preceding command on the ++same line ends with an argument of variable length a separating space is ++obligatory. In @acronym{AT&T} @code{troff}, large clusters of these and ++other commands are used, mostly without spaces; this made such output ++almost unreadable. ++@end table ++ ++For modern high-resolution devices, this command does not make sense ++because the width of the glyphs can become much larger than two decimal ++digits. In @code{gtroff}, this is only used for the devices @code{X75}, ++@code{X75-12}, @code{X100}, and @code{X100-12}. For other devices, the ++commands @samp{t} and @samp{u} provide a better functionality. ++ ++@c --------------------------------------------------------------------- ++ ++@node Intermediate Output Examples, Output Language Compatibility, Command Reference, gtroff Output ++@subsection Intermediate Output Examples ++ ++This section presents the intermediate output generated from the same ++input for three different devices. The input is the sentence @samp{hell ++world} fed into @code{gtroff} on the command line. ++ ++@table @asis ++@item High-resolution device @code{ps} ++ ++This is the standard output of @code{gtroff} if no @option{-T} option is ++given. ++ ++@example ++@group ++shell> echo "hell world" | groff -Z -T ps ++ ++x T ps ++x res 72000 1 1 ++x init ++@end group ++p1 ++x font 5 TR ++f5 ++s10000 ++V12000 ++H72000 ++thell ++wh2500 ++tw ++H96620 ++torld ++n12000 0 ++@group ++x trailer ++V792000 ++x stop ++@end group ++@end example ++ ++@noindent ++This output can be fed into @code{grops} to get its representation as a ++@sc{PostScript} file. ++ ++@item Low-resolution device @code{latin1} ++ ++This is similar to the high-resolution device except that the ++positioning is done at a minor scale. Some comments (lines starting ++with @samp{#}) were added for clarification; they were not generated by ++the formatter. ++ ++@example ++@group ++shell> echo "hell world" | groff -Z -T latin1 ++ ++# prologue ++x T latin1 ++x res 240 24 40 ++x init ++@end group ++# begin a new page ++p1 ++# font setup ++x font 1 R ++f1 ++s10 ++# initial positioning on the page ++V40 ++H0 ++# write text `hell' ++thell ++# inform about space, and issue a horizontal jump ++wh24 ++# write text `world' ++tworld ++# announce line break, but do nothing because ... ++n40 0 ++@group ++# ... the end of the document has been reached ++x trailer ++V2640 ++x stop ++@end group ++@end example ++ ++@noindent ++This output can be fed into @code{grotty} to get a formatted text ++document. ++ ++@item @acronym{AT&T} @code{troff} output ++Since a computer monitor has a very low resolution compared to modern ++printers the intermediate output for the X@tie{}Window devices can use ++the jump-and-write command with its 2-digit displacements. ++ ++@example ++@group ++shell> echo "hell world" | groff -Z -T X100 ++ ++x T X100 ++x res 100 1 1 ++x init ++@end group ++p1 ++x font 5 TR ++f5 ++s10 ++V16 ++H100 ++# write text with jump-and-write commands ++ch07e07l03lw06w11o07r05l03dh7 ++n16 0 ++@group ++x trailer ++V1100 ++x stop ++@end group ++@end example ++ ++@noindent ++This output can be fed into @code{xditview} or @code{gxditview} for ++displaying in@tie{}X. ++ ++Due to the obsolete jump-and-write command, the text clusters in the ++@acronym{AT&T} @code{troff} output are almost unreadable. ++@end table ++ ++@c --------------------------------------------------------------------- ++ ++@node Output Language Compatibility, , Intermediate Output Examples, gtroff Output ++@subsection Output Language Compatibility ++ ++The intermediate output language of @acronym{AT&T} @code{troff} was ++first documented in the @acronym{UNIX} troff manual, with later ++additions documented in @cite{A Typesetter-indenpendent TROFF}, written ++by Brian Kernighan. ++ ++The @code{gtroff} intermediate output format is compatible with this ++specification except for the following features. ++ ++@itemize @bullet ++@item ++The classical quasi device independence is not yet implemented. ++ ++@item ++The old hardware was very different from what we use today. So the ++@code{groff} devices are also fundamentally different from the ones ++in @acronym{AT&T} @code{troff}. For example, the @acronym{AT&T} ++@sc{PostScript} device is called @code{post} and has a resolution of ++only 720 units per inch, suitable for printers 20 years ago, while ++@code{groff}'s @code{ps} device has a resolution of 72000 units per ++inch. Maybe, by implementing some rescaling mechanism similar to the ++classical quasi device independence, @code{groff} could emulate ++@acronym{AT&T}'s @code{post} device. ++ ++@item ++The B-spline command @samp{D~} is correctly handled by the intermediate ++output parser, but the drawing routines aren't implemented in some of ++the postprocessor programs. ++ ++@item ++The argument of the commands @samp{s} and @w{@samp{x H}} has the ++implicit unit scaled point @samp{z} in @code{gtroff}, while ++@acronym{AT&T} @code{troff} has point (@samp{p}). This isn't an ++incompatibility but a compatible extension, for both units coincide for ++all devices without a @code{sizescale} parameter in the @file{DESC} ++file, including all postprocessors from @acronym{AT&T} and ++@code{groff}'s text devices. The few @code{groff} devices with a ++@code{sizescale} parameter either do not exist for @acronym{AT&T} ++@code{troff}, have a different name, or seem to have a different ++resolution. So conflicts are very unlikely. ++ ++@item ++The position changing after the commands @samp{Dp}, @samp{DP}, and ++@samp{Dt} is illogical, but as old versions of @code{gtroff} used this ++feature it is kept for compatibility reasons. ++ ++@ignore ++Temporarily, there existed some confusion on the positioning after the ++@samp{D} commands that are groff extensions. This has been clarified by ++establishing the classical rule for all @code{groff} drawing commands: ++ ++@itemize ++@item ++The position after a graphic object has been drawn is at its end; for ++circles and ellipses, the `end' is at the right side. ++ ++@item ++From this, the positionings specified for the drawing commands above ++follow quite naturally. ++@end itemize ++@end ignore ++ ++@end itemize ++ ++ ++@c ===================================================================== ++ ++@node Font Files, , gtroff Output, File formats ++@section Font Files ++@cindex font files ++@cindex files, font ++ ++The @code{gtroff} font format is roughly a superset of the ++@code{ditroff} font format (as used in later versions of @acronym{AT&T} ++@code{troff} and its descendants). Unlike the @code{ditroff} font ++format, there is no associated binary format; all files are text ++files.@footnote{Plan@tie{}9 @code{troff} has also abandoned the binary ++format.} The font files for device @var{name} are stored in a directory ++@file{dev@var{name}}. There are two types of file: a device description ++file called @file{DESC} and for each font@tie{}@var{f} a font file ++called@tie{}@file{@var{f}}. ++ ++@menu ++* DESC File Format:: ++* Font File Format:: ++@end menu ++ ++@c --------------------------------------------------------------------- ++ ++@node DESC File Format, Font File Format, Font Files, Font Files ++@subsection @file{DESC} File Format ++@cindex @file{DESC} file, format ++@cindex font description file, format ++@cindex format of font description file ++@pindex DESC@r{ file format} ++ ++The @file{DESC} file can contain the following types of line. Except ++for the @code{charset} keyword, which must comes last (if at all), the ++order of the lines is not important. Later entries in the file, ++however, override previous values. ++ ++@table @code ++@item charset ++@kindex charset ++This line and everything following in the file are ignored. It is ++allowed for the sake of backwards compatibility. ++ ++@item family @var{fam} ++@kindex family ++The default font family is @var{fam}. ++ ++@item fonts @var{n} @var{F1} @var{F2} @var{F3} @dots{} @var{Fn} ++@kindex fonts ++Fonts @var{F1} @dots{} @var{Fn} are mounted in the font positions ++@var{m}+1, @dots{}, @var{m}+@var{n} where @var{m} is the number of ++styles. This command may extend over more than one line. A font name ++of@tie{}0 means no font is mounted on the corresponding font position. ++ ++@item hor @var{n} ++@kindex hor ++@cindex horizontal resolution ++@cindex resolution, horizontal ++The horizontal resolution is @var{n}@tie{}machine units. All horizontal ++quantities are rounded to be multiples of this value. ++ ++@item image_generator @var{string} ++@kindex image_generator ++@cindex PostScript, PNG image generation ++@cindex PNG image generation from PostScript ++Needed for @code{grohtml} only. It specifies the program to generate ++PNG images from @sc{PostScript} input. Under GNU/Linux this is ++usually @code{gs} but under other systems (notably cygwin) it might ++be set to another name. ++ ++@item paperlength @var{n} ++@kindex paperlength ++The physical vertical dimension of the output medium in machine units. ++This isn't used by @code{troff} itself but by output devices. ++Deprecated. Use @code{papersize} instead. ++ ++@item papersize @var{string} @dots{} ++@kindex papersize ++Select a paper size. Valid values for @var{string} are the ISO paper ++types @code{A0}-@code{A7}, @code{B0}-@code{B7}, @code{C0}-@code{C7}, ++@code{D0}-@code{D7}, @code{DL}, and the US paper types @code{letter}, ++@code{legal}, @code{tabloid}, @code{ledger}, @code{statement}, ++@code{executive}, @code{com10}, and @code{monarch}. Case is not ++significant for @var{string} if it holds predefined paper types. ++Alternatively, @var{string} can be a file name (e.g.@: ++@file{/etc/papersize}); if the file can be opened, @code{groff} reads ++the first line and tests for the above paper sizes. Finally, ++@var{string} can be a custom paper size in the format ++@code{@var{length},@var{width}} (no spaces before and after the comma). ++Both @var{length} and @var{width} must have a unit appended; valid ++values are @samp{i} for inches, @samp{C} for centimeters, @samp{p} for ++points, and @samp{P} for picas. Example: @code{12c,235p}. An argument ++that starts with a digit is always treated as a custom paper format. ++@code{papersize} sets both the vertical and horizontal dimension of the ++output medium. ++ ++More than one argument can be specified; @code{groff} scans from left to ++right and uses the first valid paper specification. ++ ++@item paperwidth @var{n} ++@kindex paperwidth ++The physical horizontal dimension of the output medium in machine units. ++This isn't used by @code{troff} itself but by output devices. ++Deprecated. Use @code{papersize} instead. ++ ++@item pass_filenames ++@kindex pass_filenames ++Tell @code{gtroff} to emit the name of the source file currently being ++processed. This is achieved by the intermediate output command ++@samp{F}. Currently, this is only used by the @code{grohtml} output ++device. ++ ++@item postpro @var{program} ++@kindex postpro ++Call @var{program} as a postprocessor. For example, the line ++ ++@Example ++postpro grodvi ++@endExample ++ ++@noindent ++in the file @file{devdvi/DESC} makes @code{groff} call @code{grodvi} if ++option @option{-Tdvi} is given (and @option{-Z} isn't used). ++ ++@item prepro @var{program} ++@kindex prepro ++Call @var{program} as a preprocessor. Currently, this keyword is used ++by @code{groff} with option @option{-Thtml} or @option{-Txhtml} only. ++ ++@item print @var{program} ++@kindex print ++Use @var{program} as a spooler program for printing. If omitted, the ++@option{-l} and @option{-L} options of @code{groff} are ignored. ++ ++@item res @var{n} ++@kindex res ++@cindex device resolution ++@cindex resolution, device ++There are @var{n}@tie{}machine units per inch. ++ ++@item sizes @var{s1} @var{s2} @dots{} @var{sn} 0 ++@kindex sizes ++This means that the device has fonts at @var{s1}, @var{s2}, @dots{} ++@var{sn} scaled points. The list of sizes must be terminated by@tie{}0 ++(this is digit zero). Each @var{si} can also be a range of sizes ++@var{m}-@var{n}. The list can extend over more than one line. ++ ++@item sizescale @var{n} ++@kindex sizescale ++The scale factor for point sizes. By default this has a value ++of@tie{}1. One scaled point is equal to one point/@var{n}. The ++arguments to the @code{unitwidth} and @code{sizes} commands are given in ++scaled points. @xref{Fractional Type Sizes}, for more information. ++ ++@item styles @var{S1} @var{S2} @dots{} @var{Sm} ++@kindex styles ++The first @var{m}@tie{}font positions are associated with styles ++@var{S1} @dots{} @var{Sm}. ++ ++@item tcommand ++@kindex tcommand ++This means that the postprocessor can handle the @samp{t} and @samp{u} ++intermediate output commands. ++ ++@item unicode ++@kindex unicode ++Indicate that the output device supports the complete Unicode ++repertoire. Useful only for devices that produce @emph{character ++entities} instead of glyphs. ++ ++If @code{unicode} is present, no @code{charset} section is required in ++the font description files since the Unicode handling built into ++@code{groff} is used. However, if there are entries in a @code{charset} ++section, they either override the default mappings for those particular ++characters or add new mappings (normally for composite characters). ++ ++This is used for @option{-Tutf8}, @option{-Thtml}, and @option{-Txhtml}. ++ ++@item unitwidth @var{n} ++@kindex unitwidth ++Quantities in the font files are given in machine units for fonts whose ++point size is @var{n}@tie{}scaled points. ++ ++@item unscaled_charwidths ++@kindex unscaled_charwidths ++Make the font handling module always return unscaled character widths. ++Needed for the @code{grohtml} device. ++ ++@item use_charnames_in_special ++@kindex use_charnames_in_special ++This command indicates that @code{gtroff} should encode special ++characters inside special commands. Currently, this is only used by the ++@code{grohtml} output device. @xref{Postprocessor Access}. ++ ++@item vert @var{n} ++@kindex vert ++@cindex vertical resolution ++@cindex resolution, vertical ++The vertical resolution is @var{n}@tie{}machine units. All vertical ++quantities are rounded to be multiples of this value. ++@end table ++ ++The @code{res}, @code{unitwidth}, @code{fonts}, and @code{sizes} lines ++are mandatory. Other commands are ignored by @code{gtroff} but may be ++used by postprocessors to store arbitrary information about the device ++in the @file{DESC} file. ++ ++@kindex spare1 ++@kindex spare2 ++@kindex biggestfont ++Here a list of obsolete keywords that are recognized by @code{groff} ++but completely ignored: @code{spare1}, @code{spare2}, ++@code{biggestfont}. ++ ++@c --------------------------------------------------------------------- ++ ++@node Font File Format, , DESC File Format, Font Files ++@subsection Font File Format ++@cindex font file, format ++@cindex font description file, format ++@cindex format of font files ++@cindex format of font description files ++ ++A @dfn{font file}, also (and probably better) called a @dfn{font ++description file}, has two sections. The first section is a sequence of ++lines each containing a sequence of blank delimited words; the first ++word in the line is a key, and subsequent words give a value for that ++key. ++ ++@table @code ++@item name @var{f} ++@kindex name ++The name of the font is@tie{}@var{f}. ++ ++@item spacewidth @var{n} ++@kindex spacewidth ++The normal width of a space is@tie{}@var{n}. ++ ++@item slant @var{n} ++@kindex slant ++The glyphs of the font have a slant of @var{n}@tie{}degrees. (Positive ++means forward.) ++ ++@item ligatures @var{lig1} @var{lig2} @dots{} @var{lign} [0] ++@kindex ligatures ++Glyphs @var{lig1}, @var{lig2}, @dots{}, @var{lign} are ligatures; ++possible ligatures are @samp{ff}, @samp{fi}, @samp{fl}, @samp{ffi} and ++@samp{ffl}. For backwards compatibility, the list of ligatures may be ++terminated with a@tie{}0. The list of ligatures may not extend over ++more than one line. ++ ++@item special ++@cindex special fonts ++@kindex special ++The font is @dfn{special}; this means that when a glyph is requested ++that is not present in the current font, it is searched for in any ++special fonts that are mounted. ++@end table ++ ++Other commands are ignored by @code{gtroff} but may be used by ++postprocessors to store arbitrary information about the font in the font ++file. ++ ++@cindex comments in font files ++@cindex font files, comments ++@kindex # ++The first section can contain comments, which start with the @samp{#} ++character and extend to the end of a line. ++ ++The second section contains one or two subsections. It must contain a ++@code{charset} subsection and it may also contain a @code{kernpairs} ++subsection. These subsections can appear in any order. Each subsection ++starts with a word on a line by itself. ++ ++@kindex charset ++The word @code{charset} starts the character set ++subsection.@footnote{This keyword is misnamed since it starts a list of ++ordered glyphs, not characters.} The @code{charset} line is followed by ++a sequence of lines. Each line gives information for one glyph. A line ++comprises a number of fields separated by blanks or tabs. The format is ++ ++@quotation ++@var{name} @var{metrics} @var{type} @var{code} [@var{entity-name}] ++[@code{--} @var{comment}] ++@end quotation ++ ++@cindex 8-bit input ++@cindex input, 8-bit ++@cindex accessing unnamed glyphs with @code{\N} ++@cindex unnamed glyphs, accessing with @code{\N} ++@cindex characters, unnamed, accessing with @code{\N} ++@cindex glyphs, unnamed, accessing with @code{\N} ++@kindex --- ++@noindent ++@var{name} identifies the glyph name@footnote{The distinction between ++input, characters, and output, glyphs, is not clearly separated in the ++terminology of @code{groff}; for example, the @code{char} request should ++be called @code{glyph} since it defines an output entity.}: If ++@var{name} is a single character@tie{}@var{c} then it corresponds to the ++@code{gtroff} input character@tie{}@var{c}; if it is of the form ++@samp{\@var{c}} where @var{c} is a single character, then it corresponds ++to the special character @code{\[@var{c}]}; otherwise it corresponds to ++the special character @samp{\[@var{name}]}. If it is exactly two ++characters @var{xx} it can be entered as @samp{\(@var{xx}}. Note that ++single-letter special characters can't be accessed as @samp{\@var{c}}; ++the only exception is @samp{\-}, which is identical to @code{\[-]}. ++ ++@code{gtroff} supports 8-bit input characters; however some utilities ++have difficulties with eight-bit characters. For this reason, there is ++a convention that the entity name @samp{char@var{n}} is equivalent to ++the single input character whose code is@tie{}@var{n}. For example, ++@samp{char163} would be equivalent to the character with code@tie{}163, ++which is the pounds sterling sign in the ISO@tie{}@w{Latin-1} character ++set. You shouldn't use @samp{char@var{n}} entities in font description ++files since they are related to input, not output. Otherwise, you get ++hard-coded connections between input and output encoding, which prevents ++use of different (input) character sets. ++ ++The name @samp{---} is special and indicates that the glyph is unnamed; ++such glyphs can only be used by means of the @code{\N} escape sequence ++in @code{gtroff}. ++ ++The @var{type} field gives the glyph type: ++ ++@table @code ++@item 1 ++the glyph has a descender, for example, @samp{p}; ++ ++@item 2 ++the glyph has an ascender, for example, @samp{b}; ++ ++@item 3 ++the glyph has both an ascender and a descender, for example, @samp{(}. ++@end table ++ ++The @var{code} field gives the code that the postprocessor uses to ++print the glyph. The glyph can also be input to @code{gtroff} using ++this code by means of the @code{\N} escape sequence. @var{code} can be ++any integer. If it starts with @samp{0} it is interpreted as octal; if ++it starts with @samp{0x} or @samp{0X} it is interpreted as hexadecimal. ++Note, however, that the @code{\N} escape sequence only accepts a decimal ++integer. ++ ++The @var{entity-name} field gives an @acronym{ASCII} string identifying ++the glyph that the postprocessor uses to print the @code{gtroff} glyph ++@var{name}. This field is optional and has been introduced so that the ++@code{grohtml} device driver can encode its character set. For example, ++the glyph @samp{\[Po]} is represented as @samp{£} in ++@acronym{HTML} 4.0. ++ ++Anything on the line after the @var{entity-name} field resp.@: after ++@samp{--} is ignored. ++ ++The @var{metrics} field has the form: ++ ++@display ++@group ++@var{width}[@code{,}@var{height}[@code{,}@var{depth}[@code{,}@var{italic-correction} ++ [@code{,}@var{left-italic-correction}[@code{,}@var{subscript-correction}]]]]] ++@end group ++@end display ++ ++@noindent ++There must not be any spaces between these subfields (it has been split ++here into two lines for better legibility only). Missing subfields are ++assumed to be@tie{}0. The subfields are all decimal integers. Since ++there is no associated binary format, these values are not required to ++fit into a variable of type @samp{char} as they are in @code{ditroff}. ++The @var{width} subfield gives the width of the glyph. The @var{height} ++subfield gives the height of the glyph (upwards is positive); if a glyph ++does not extend above the baseline, it should be given a zero height, ++rather than a negative height. The @var{depth} subfield gives the depth ++of the glyph, that is, the distance from the baseline to the lowest ++point below the baseline to which the glyph extends (downwards is ++positive); if a glyph does not extend below the baseline, it should be ++given a zero depth, rather than a negative depth. The ++@var{italic-correction} subfield gives the amount of space that should ++be added after the glyph when it is immediately to be followed by a ++glyph from a roman font. The @var{left-italic-correction} subfield ++gives the amount of space that should be added before the glyph when it ++is immediately to be preceded by a glyph from a roman font. The ++@var{subscript-correction} gives the amount of space that should be ++added after a glyph before adding a subscript. This should be less than ++the italic correction. ++ ++A line in the @code{charset} section can also have the format ++ ++@Example ++@var{name} " ++@endExample ++ ++@noindent ++This indicates that @var{name} is just another name for the glyph ++mentioned in the preceding line. ++ ++@kindex kernpairs ++The word @code{kernpairs} starts the kernpairs section. This contains a ++sequence of lines of the form: ++ ++@Example ++@var{c1} @var{c2} @var{n} ++@endExample ++ ++@noindent ++This means that when glyph @var{c1} appears next to glyph @var{c2} the ++space between them should be increased by@tie{}@var{n}. Most entries in ++the kernpairs section have a negative value for@tie{}@var{n}. ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Installation, Copying This Manual, File formats, Top ++@chapter Installation ++@cindex installation ++ ++@c XXX ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Copying This Manual, Request Index, Installation, Top ++@appendix Copying This Manual ++ ++@include fdl.texi ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Request Index, Escape Index, Copying This Manual, Top ++@appendix Request Index ++ ++Requests appear without the leading control character (normally either ++@samp{.} or @samp{'}). ++ ++@printindex rq ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Escape Index, Operator Index, Request Index, Top ++@appendix Escape Index ++ ++Any escape sequence @code{\@var{X}} with @var{X} not in the list below ++emits a warning, printing glyph @var{X}. ++ ++@printindex es ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Operator Index, Register Index, Escape Index, Top ++@appendix Operator Index ++ ++@printindex op ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Register Index, Macro Index, Operator Index, Top ++@appendix Register Index ++ ++The macro package or program a specific register belongs to is appended in ++brackets. ++ ++A register name@tie{}@code{x} consisting of exactly one character can be ++accessed as @samp{\nx}. A register name @code{xx} consisting of exactly ++two characters can be accessed as @samp{\n(xx}. Register names ++@code{xxx} of any length can be accessed as @samp{\n[xxx]}. ++ ++@printindex vr ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Macro Index, String Index, Register Index, Top ++@appendix Macro Index ++ ++The macro package a specific macro belongs to is appended in brackets. ++They appear without the leading control character (normally @samp{.}). ++ ++@printindex ma ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node String Index, Glyph Name Index, Macro Index, Top ++@appendix String Index ++ ++The macro package or program a specific string belongs to is appended in ++brackets. ++ ++A string name@tie{}@code{x} consisting of exactly one character can be ++accessed as @samp{\*x}. A string name @code{xx} consisting of exactly ++two characters can be accessed as @samp{\*(xx}. String names @code{xxx} ++of any length can be accessed as @samp{\*[xxx]}. ++ ++ ++@printindex st ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Glyph Name Index, Font File Keyword Index, String Index, Top ++@appendix Glyph Name Index ++ ++A glyph name @code{xx} consisting of exactly two characters can be ++accessed as @samp{\(xx}. Glyph names @code{xxx} of any length can be ++accessed as @samp{\[xxx]}. ++ ++@c XXX ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Font File Keyword Index, Program and File Index, Glyph Name Index, Top ++@appendix Font File Keyword Index ++ ++@printindex ky ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Program and File Index, Concept Index, Font File Keyword Index, Top ++@appendix Program and File Index ++ ++@printindex pg ++ ++ ++ ++@c ===================================================================== ++@c ===================================================================== ++ ++@node Concept Index, , Program and File Index, Top ++@appendix Concept Index ++ ++@printindex cp ++ ++ ++@bye ++ ++@c Local Variables: ++@c mode: texinfo ++@c coding: latin-1 ++@c End: +diff -Nuar groff-1.22.3.old/doc/groff.texinfo groff-1.22.3/doc/groff.texinfo +--- groff-1.22.3.old/doc/groff.texinfo 2014-11-04 10:38:35.560519809 +0200 ++++ groff-1.22.3/doc/groff.texinfo 1970-01-01 02:00:00.000000000 +0200 +@@ -1,17157 +0,0 @@ +-\input texinfo +- +-@c +-@c Please convert this manual with `texi2dvi -e groff.texinfo' due to +-@c problems in texinfo regarding expansion of user-defined macros. +-@c +-@c You need texinfo 4.8 or newer to format this document! +-@c +- +-@c %**start of header (This is for running Texinfo on a region.) +-@setfilename groff.info +-@settitle The GNU Troff Manual +-@setchapternewpage odd +-@footnotestyle separate +-@c %**end of header (This is for running Texinfo on a region.) +- +-@documentlanguage en +-@documentencoding ISO-8859-1 +- +- +-@smallbook +- +-@finalout +- +- +-@copying +-This manual documents GNU @code{troff} version 1.22.3. +- +-Copyright @copyright{} 1994-2014 Free Software Foundation, Inc. +- +-@quotation +-Permission is granted to copy, distribute and/or modify this document +-under the terms of the GNU Free Documentation License, Version 1.3 or +-any later version published by the Free Software Foundation; with no +-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' +-and with the Back-Cover Texts as in (a) below. A copy of the license is +-included in the section entitled ``GNU Free Documentation License.'' +- +-(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and +-modify this GNU manual. Buying copies from the FSF supports it in +-developing GNU and promoting software freedom.'' +-@end quotation +-@end copying +- +- +-@c We use the following indices: +-@c +-@c cindex: concepts +-@c rqindex: requests +-@c esindex: escapes +-@c vindex: registers +-@c kindex: commands in font files +-@c pindex: programs and files +-@c tindex: environment variables +-@c maindex: macros +-@c stindex: strings +-@c opindex: operators +-@c +-@c tindex and cindex are merged. +- +-@defcodeindex rq +-@defcodeindex es +-@defcodeindex ma +-@defcodeindex st +-@defcodeindex op +-@syncodeindex tp cp +- +- +-@c To avoid uppercasing in @deffn while converting to info, we define +-@c our special @Var{}. +- +-@macro Var{arg} +-@r{@slanted{\arg\}} +-@end macro +- +- +-@c To assure correct HTML translation, some ugly hacks are necessary. +-@c While processing a @def... request, the HTML translator looks at the +-@c next line to decide whether to start indentation, and if the line +-@c starts with @def... (e.g. @deffnx), indentation is started. We must +-@c therefore ensure that a @def... is seen, during macro expansion. +-@c +-@c The following macros have to be used: +-@c +-@c One item: +-@c +-@c @Def... +-@c +-@c Two items: +-@c +-@c @Def...List +-@c @Def...ListEnd +-@c +-@c More than two: +-@c +-@c @Def...List +-@c @Def...Item +-@c @Def...Item +-@c ... +-@c @Def...ListEnd +-@c +-@c The definition block must end with +-@c +-@c @endDef... +-@c +-@c The above is valid for texinfo 4.0f and above. +-@c +-@c By default, only the first item generates an index entry. To +-@c override this, use a variant with a trailing `x' (like +-@c `@DefmacItemx'). +- +- +-@c a dummy macro to assure the `@def...' +- +-@macro defdummy +-@c +-@end macro +- +- +-@c definition of requests +- +-@macro Defreq{name, arg} +-@deffn Request @t{.\name\} \arg\ +-@rqindex \name\ +-@c +-@end macro +- +-@macro DefreqList{name, arg} +-@deffn Request @t{.\name\} \arg\ +-@defdummy +-@rqindex \name\ +-@c +-@end macro +- +-@macro DefreqItem{name, arg} +-@deffnx Request @t{.\name\} \arg\ +-@defdummy +-@c +-@end macro +- +-@macro DefreqItemx{name, arg} +-@deffnx Request @t{.\name\} \arg\ +-@defdummy +-@rqindex \name\ +-@c +-@end macro +- +-@macro DefreqListEnd{name, arg} +-@deffnx Request @t{.\name\} \arg\ +-@c +-@end macro +- +-@macro DefreqListEndx{name, arg} +-@deffnx Request @t{.\name\} \arg\ +-@rqindex \name\ +-@c +-@end macro +- +-@macro endDefreq +-@end deffn +-@end macro +- +- +-@c definition of escapes +- +-@macro Defesc{name, delimI, arg, delimII} +-@deffn Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} +-@esindex \name\ +-@c +-@end macro +- +-@macro DefescList{name, delimI, arg, delimII} +-@deffn Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} +-@defdummy +-@esindex \name\ +-@c +-@end macro +- +-@macro DefescItem{name, delimI, arg, delimII} +-@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} +-@defdummy +-@c +-@end macro +- +-@macro DefescItemx{name, delimI, arg, delimII} +-@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} +-@defdummy +-@esindex \name\ +-@c +-@end macro +- +-@macro DefescListEnd{name, delimI, arg, delimII} +-@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} +-@c +-@end macro +- +-@macro DefescListEndx{name, delimI, arg, delimII} +-@deffnx Escape @t{\name\\delimI\}@Var{\arg\}@t{\delimII\} +-@esindex \name\ +-@c +-@end macro +- +-@macro endDefesc +-@end deffn +-@end macro +- +- +-@c definition of registers +- +-@macro Defreg{name} +-@deffn Register @t{\\n[\name\]} +-@vindex \name\ +-@c +-@end macro +- +-@macro DefregList{name} +-@deffn Register @t{\\n[\name\]} +-@defdummy +-@vindex \name\ +-@c +-@end macro +- +-@macro DefregItem{name} +-@deffnx Register @t{\\n[\name\]} +-@defdummy +-@c +-@end macro +- +-@macro DefregItemx{name} +-@deffnx Register @t{\\n[\name\]} +-@defdummy +-@vindex \name\ +-@c +-@end macro +- +-@macro DefregListEnd{name} +-@deffnx Register @t{\\n[\name\]} +-@c +-@end macro +- +-@macro DefregListEndx{name} +-@deffnx Register @t{\\n[\name\]} +-@vindex \name\ +-@c +-@end macro +- +-@macro endDefreg +-@end deffn +-@end macro +- +- +-@c definition of registers specific to macro packages, preprocessors, etc. +- +-@macro Defmpreg{name, package} +-@deffn Register @t{\\n[\name\]} +-@vindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefmpregList{name, package} +-@deffn Register @t{\\n[\name\]} +-@defdummy +-@vindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefmpregItem{name, package} +-@deffnx Register @t{\\n[\name\]} +-@defdummy +-@c +-@end macro +- +-@macro DefmpregItemx{name, package} +-@deffnx Register @t{\\n[\name\]} +-@defdummy +-@vindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefmpregListEnd{name, package} +-@deffnx Register @t{\\n[\name\]} +-@c +-@end macro +- +-@macro DefmpregListEndx{name, package} +-@deffnx Register @t{\\n[\name\]} +-@vindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro endDefmpreg +-@end deffn +-@end macro +- +- +-@c definition of macros +- +-@macro Defmac{name, arg, package} +-@defmac @t{.\name\} \arg\ +-@maindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefmacList{name, arg, package} +-@defmac @t{.\name\} \arg\ +-@defdummy +-@maindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefmacItem{name, arg, package} +-@defmacx @t{.\name\} \arg\ +-@defdummy +-@c +-@end macro +- +-@macro DefmacItemx{name, arg, package} +-@defmacx @t{.\name\} \arg\ +-@defdummy +-@maindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefmacListEnd{name, arg, package} +-@defmacx @t{.\name\} \arg\ +-@c +-@end macro +- +-@macro DefmacListEndx{name, arg, package} +-@defmacx @t{.\name\} \arg\ +-@maindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro endDefmac +-@end defmac +-@end macro +- +- +-@c definition of strings +- +-@macro Defstr{name, package} +-@deffn String @t{\\*[\name\]} +-@stindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefstrList{name, package} +-@deffn String @t{\\*[\name\]} +-@defdummy +-@stindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefstrItem{name, package} +-@deffnx String @t{\\*[\name\]} +-@defdummy +-@c +-@end macro +- +-@macro DefstrItemx{name, package} +-@deffnx String @t{\\*[\name\]} +-@defdummy +-@stindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro DefstrListEnd{name, package} +-@deffnx String @t{\\*[\name\]} +-@c +-@end macro +- +-@macro DefstrListEndx{name, package} +-@deffnx String @t{\\*[\name\]} +-@stindex \name\ @r{[}\package\@r{]} +-@c +-@end macro +- +-@macro endDefstr +-@end deffn +-@end macro +- +- +-@c our example macros +- +-@macro Example +-@example +-@group +-@end macro +- +-@macro endExample +-@end group +-@end example +-@end macro +- +-@macro CartoucheExample +-@cartouche +-@example +-@end macro +- +-@macro endCartoucheExample +-@end example +-@end cartouche +-@end macro +- +- +-@c +- +-@tex +-\gdef\Langlemacro{\angleleft} +-\gdef\Ranglemacro{\angleright} +-@end tex +- +-@iftex +-@set Langlemacro @Langlemacro +-@set Ranglemacro @Ranglemacro +-@end iftex +- +-@ifnottex +-@set Langlemacro < +-@set Ranglemacro > +-@end ifnottex +- +-@macro angles{text} +-@value{Langlemacro}@r{\text\}@value{Ranglemacro} +-@end macro +- +- +-@c a <= sign +-@c +-@c Since expansion of macros has changed between texinfo 4.x and 5.x, +-@c we can't define a macro but have to use @value directly. +- +-@tex +-\gdef\LE{\le} +-@end tex +- +-@iftex +-@set LE @LE +-@end iftex +- +-@ifnottex +-@set LE <= +-@end ifnottex +- +- +-@c Special care is required with parentheses, brackets, and braces: +-@c +-@c . Real parentheses in @deffn produce an error while compiling with +-@c TeX. +-@c . Real brackets use the wrong font in @deffn, overriding @t{}. +-@c +-@c . @{ and @} fail with info if used in a macro. +-@c +-@c Since macros aren't expanded in @deffn during -E, the following +-@c definitions are for non-TeX only. +-@c +-@c This is true for texinfo 4.0 and above. +- +-@iftex +-@set Lparenmacro @lparen +-@set Rparenmacro @rparen +-@set Lbrackmacro @lbrack +-@set Rbrackmacro @rbrack +-@set Lbracemacro @{ +-@set Rbracemacro @} +-@end iftex +- +-@ifnottex +-@set Lparenmacro ( +-@set Rparenmacro ) +-@set Lbrackmacro [ +-@set Rbrackmacro ] +-@set Lbracemacro @{ +-@set Rbracemacro @} +-@end ifnottex +- +-@macro Lparen{} +-@value{Lparenmacro} +-@end macro +-@macro Rparen{} +-@value{Rparenmacro} +-@end macro +-@macro Lbrack{} +-@value{Lbrackmacro} +-@end macro +-@macro Rbrack{} +-@value{Rbrackmacro} +-@end macro +-@macro Lbrace{} +-@value{Lbracemacro} +-@end macro +-@macro Rbrace{} +-@value{Rbracemacro} +-@end macro +- +- +-@c This suppresses the word `Appendix' in the appendix headers. +- +-@tex +-\gdef\gobblefirst#1#2{#2} +-\gdef\putwordAppendix{\gobblefirst} +-@end tex +- +- +-@c We map some latin-1 characters to corresponding texinfo macros. +-@c Newer versions of texinfo.tex have similar code included already. +- +-@tex +-\global\catcode`^^e4\active % +-\gdef^^e4{\"a} +-\global\catcode`^^c4\active % +-\gdef^^c4{\"A} +-\global\catcode`^^e9\active % +-\gdef^^e9{\'e} +-\global\catcode`^^c9\active % +-\gdef^^c9{\'E} +-\global\catcode`^^f6\active % +-\gdef^^f6{\"o} +-\global\catcode`^^d6\active % +-\gdef^^d6{\"O} +-\global\catcode`^^fc\active % +-\gdef^^fc{\"u} +-\global\catcode`^^dc\active % +-\gdef^^dc{\"U} +-\global\catcode`^^e6\active % +-\gdef^^e6{\ae} +-\global\catcode`^^c6\active % +-\gdef^^c6{\AE} +-\global\catcode`^^df\active % +-\gdef^^df{\ss} +-@end tex +- +- +-@c Note: We say `Roman numerals' but `roman font'. +- +- +-@dircategory Typesetting +-@direntry +-* Groff: (groff). The GNU troff document formatting system. +-@end direntry +- +- +-@titlepage +-@title groff +-@subtitle The GNU implementation of @code{troff} +-@subtitle Edition 1.22.3 +-@subtitle Autumn 2014 +-@author by Trent A.@tie{}Fisher +-@author and Werner Lemberg (@email{bug-groff@@gnu.org}) +- +-@page +-@vskip 0pt plus 1filll +-@insertcopying +-@end titlepage +- +-@contents +- +-@ifnottex +-@node Top, Introduction, (dir), (dir) +-@top GNU troff +-@end ifnottex +- +-@menu +-* Introduction:: +-* Invoking groff:: +-* Tutorial for Macro Users:: +-* Macro Packages:: +-* gtroff Reference:: +-* Preprocessors:: +-* Output Devices:: +-* File formats:: +-* Installation:: +-* Copying This Manual:: +-* Request Index:: +-* Escape Index:: +-* Operator Index:: +-* Register Index:: +-* Macro Index:: +-* String Index:: +-* Glyph Name Index:: +-* Font File Keyword Index:: +-* Program and File Index:: +-* Concept Index:: +-@end menu +- +-@ifnottex +-@insertcopying +-@end ifnottex +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Introduction, Invoking groff, Top, Top +-@chapter Introduction +-@cindex introduction +- +-GNU @code{troff} (or @code{groff}) is a system for typesetting +-documents. @code{troff} is very flexible and has been used extensively +-for some thirty years. It is well entrenched in the @acronym{UNIX} +-community. +- +-@menu +-* What Is groff?:: +-* History:: +-* groff Capabilities:: +-* Macro Package Intro:: +-* Preprocessor Intro:: +-* Output device intro:: +-* Credits:: +-@end menu +- +- +-@c ===================================================================== +- +-@node What Is groff?, History, Introduction, Introduction +-@section What Is @code{groff}? +-@cindex what is @code{groff}? +-@cindex @code{groff} -- what is it? +- +-@code{groff} belongs to an older generation of document preparation +-systems, which operate more like compilers than the more recent +-interactive @acronym{WYSIWYG}@footnote{What You See Is What You Get} +-systems. @code{groff} and its contemporary counterpart, @TeX{}, both +-work using a @dfn{batch} paradigm: The input (or @dfn{source}) files are +-normal text files with embedded formatting commands. These files can +-then be processed by @code{groff} to produce a typeset document on a +-variety of devices. +- +-@code{groff} should not be confused with a @dfn{word processor}, an +-integrated system of editor and text formatter. Also, many word +-processors follow the @acronym{WYSIWYG} paradigm discussed earlier. +- +-Although @acronym{WYSIWYG} systems may be easier to use, they have a +-number of disadvantages compared to @code{troff}: +- +-@itemize @bullet +-@item +-They must be used on a graphics display to work on a document. +- +-@item +-Most of the @acronym{WYSIWYG} systems are either non-free or are not +-very portable. +- +-@item +-@code{troff} is firmly entrenched in all @acronym{UNIX} systems. +- +-@item +-It is difficult to have a wide range of capabilities within the confines +-of a GUI/window system. +- +-@item +-It is more difficult to make global changes to a document. +-@end itemize +- +-@quotation +-``GUIs normally make it simple to accomplish simple actions and +-impossible to accomplish complex actions.'' --Doug Gwyn (22/Jun/91 in +-@code{comp.unix.wizards}) +-@end quotation +- +- +-@c ===================================================================== +- +-@node History, groff Capabilities, What Is groff?, Introduction +-@section History +-@cindex history +- +-@cindex @code{RUNOFF}, the program +-@cindex @code{rf}, the program +-@code{troff} can trace its origins back to a formatting program called +-@code{RUNOFF}, written by Jerry Saltzer, which ran on the @acronym{CTSS} +-(@emph{Compatible Time Sharing System}, a project of MIT, the +-Massachusetts Institute of Technology) in the +-mid-sixties.@footnote{Jerome H.@: Saltzer, a grad student then, later a +-Professor of Electrical Engineering, now retired. Saltzer's PhD thesis +-was the first application for @code{RUNOFF} and is available from the +-MIT Libraries.} The name came from the use of the phrase ``run off a +-document'', meaning to print it out. +-@c +-@c Tom Van Vleck writes about the following: +-@c +-@c I am not sure about this.. I think the BCPL runoff was the port to +-@c the 635 architecture, and that the order of events is +-@c 1. CTSS runoff +-@c 2. BCPL runoff on Multics +-@c 3. BCPL runoff on 635 +-@c 4. rf on PDP-7 +-@c +-Bob Morris ported it to the 635 architecture and called the program +-@code{roff} (an abbreviation of @code{runoff}). It was rewritten as +-@code{rf} for the @w{PDP-7} (before having @acronym{UNIX}), and at the +-same time (1969), Doug McIllroy rewrote an extended and simplified +-version of @code{roff} in the @acronym{BCPL} programming language. +- +-@cindex @code{roff}, the program +-In 1971, the UNIX developers wanted to get a @w{PDP-11}, and to justify +-the cost, proposed the development of a document formatting system for +-the @acronym{AT&T} patents division. This first formatting program was +-a reimplementation of McIllroy's @code{roff}, written by J.@tie{}F.@: +-Ossanna. +- +-@cindex @code{nroff}, the program +-When they needed a more flexible language, a new version of @code{roff} +-called @code{nroff} (``Newer @code{roff}'') was written. It had a much +-more complicated syntax, but provided the basis for all future versions. +-When they got a Graphic Systems CAT Phototypesetter, Ossanna wrote a +-version of @code{nroff} that would drive it. It was dubbed +-@code{troff}, for ``typesetter @code{roff}'', although many people have +-speculated that it actually means ``Times @code{roff}'' because of the +-use of the Times font family in @code{troff} by default. As such, the +-name @code{troff} is pronounced `@w{t-roff}' rather than `trough'. +- +-With @code{troff} came @code{nroff} (they were actually the same program +-except for some @samp{#ifdef}s), which was for producing output for line +-printers and character terminals. It understood everything @code{troff} +-did, and ignored the commands that were not applicable (e.g.@: font +-changes). +- +-Since there are several things that cannot be done easily in +-@code{troff}, work on several preprocessors began. These programs would +-transform certain parts of a document into @code{troff}, which made a +-very natural use of pipes in @acronym{UNIX}. +- +-The @code{eqn} preprocessor allowed mathematical formul to be specified +-in a much simpler and more intuitive manner. @code{tbl} is a +-preprocessor for formatting tables. The @code{refer} preprocessor (and +-the similar program, @code{bib}) processes citations in a document +-according to a bibliographic database. +- +-Unfortunately, Ossanna's @code{troff} was written in @w{PDP-11} assembly +-language and produced output specifically for the CAT phototypesetter. +-He rewrote it in C, although it was now 7000@tie{}lines of uncommented +-code and still dependent on the CAT@. As the CAT became less common, and +-was no longer supported by the manufacturer, the need to make it support +-other devices became a priority. However, before this could be done, +-Ossanna died by a severe heart attack in a hospital while recovering +-from a previous one. +- +-@pindex ditroff +-@cindex @code{ditroff}, the program +-So, Brian Kernighan took on the task of rewriting @code{troff}. The +-newly rewritten version produced device independent code that was very +-easy for postprocessors to read and translate to the appropriate printer +-codes. Also, this new version of @code{troff} (called @code{ditroff} +-for ``device independent @code{troff}'') had several extensions, which +-included drawing functions. +- +-Due to the additional abilities of the new version of @code{troff}, +-several new preprocessors appeared. The @code{pic} preprocessor +-provides a wide range of drawing functions. Likewise the @code{ideal} +-preprocessor did the same, although via a much different paradigm. The +-@code{grap} preprocessor took specifications for graphs, but, unlike +-other preprocessors, produced @code{pic} code. +- +-James Clark began work on a GNU implementation of @code{ditroff} in +-early@tie{}1989. The first version, @code{groff}@tie{}0.3.1, was +-released June@tie{}1990. @code{groff} included: +- +-@itemize @bullet +-@item +-A replacement for @code{ditroff} with many extensions. +- +-@item +-The @code{soelim}, @code{pic}, @code{tbl}, and @code{eqn} preprocessors. +- +-@item +-Postprocessors for character devices, @sc{PostScript}, @TeX{} DVI, and +-X@tie{}Windows. GNU @code{troff} also eliminated the need for a +-separate @code{nroff} program with a postprocessor that would produce +-@acronym{ASCII} output. +- +-@item +-A version of the @file{me} macros and an implementation of the +-@file{man} macros. +-@end itemize +- +-Also, a front-end was included that could construct the, sometimes +-painfully long, pipelines required for all the post- and preprocessors. +- +-Development of GNU @code{troff} progressed rapidly, and saw the +-additions of a replacement for @code{refer}, an implementation of the +-@file{ms} and @file{mm} macros, and a program to deduce how to format a +-document (@code{grog}). +- +-It was declared a stable (i.e.@: non-beta) package with the release of +-version@tie{}1.04 around November@tie{}1991. +- +-Beginning in@tie{}1999, @code{groff} has new maintainers (the package +-was an orphan for a few years). As a result, new features and programs +-like @code{grn}, a preprocessor for gremlin images, and an output device +-to produce @acronym{HTML} and @acronym{XHTML} have been added. +- +- +-@c ===================================================================== +- +-@node groff Capabilities, Macro Package Intro, History, Introduction +-@section @code{groff} Capabilities +-@cindex @code{groff} capabilities +-@cindex capabilities of @code{groff} +- +-So what exactly is @code{groff} capable of doing? @code{groff} provides +-a wide range of low-level text formatting operations. Using these, it +-is possible to perform a wide range of formatting tasks, such as +-footnotes, table of contents, multiple columns, etc. Here's a list of +-the most important operations supported by @code{groff}: +- +-@itemize @bullet +-@item +-text filling, adjusting, and centering +- +-@item +-hyphenation +- +-@item +-page control +- +-@item +-font and glyph size control +- +-@item +-vertical spacing (e.g.@: double-spacing) +- +-@item +-line length and indenting +- +-@item +-macros, strings, diversions, and traps +- +-@item +-number registers +- +-@item +-tabs, leaders, and fields +- +-@item +-input and output conventions and character translation +- +-@item +-overstrike, bracket, line drawing, and zero-width functions +- +-@item +-local horizontal and vertical motions and the width function +- +-@item +-three-part titles +- +-@item +-output line numbering +- +-@item +-conditional acceptance of input +- +-@item +-environment switching +- +-@item +-insertions from the standard input +- +-@item +-input/output file switching +- +-@item +-output and error messages +-@end itemize +- +- +-@c ===================================================================== +- +-@node Macro Package Intro, Preprocessor Intro, groff Capabilities, Introduction +-@section Macro Packages +-@cindex macro packages +- +-Since @code{groff} provides such low-level facilities, it can be quite +-difficult to use by itself. However, @code{groff} provides a +-@dfn{macro} facility to specify how certain routine operations +-(e.g.@tie{}starting paragraphs, printing headers and footers, etc.)@: +-should be done. These macros can be collected together into a +-@dfn{macro package}. There are a number of macro packages available; +-the most common (and the ones described in this manual) are @file{man}, +-@file{mdoc}, @file{me}, @file{ms}, and @file{mm}. +- +- +-@c ===================================================================== +- +-@node Preprocessor Intro, Output device intro, Macro Package Intro, Introduction +-@section Preprocessors +-@cindex preprocessors +- +-Although @code{groff} provides most functions needed to format a +-document, some operations would be unwieldy (e.g.@: to draw pictures). +-Therefore, programs called @dfn{preprocessors} were written that +-understand their own language and produce the necessary @code{groff} +-operations. These preprocessors are able to differentiate their own +-input from the rest of the document via markers. +- +-To use a preprocessor, @acronym{UNIX} pipes are used to feed the output +-from the preprocessor into @code{groff}. Any number of preprocessors +-may be used on a given document; in this case, the preprocessors are +-linked together into one pipeline. However, with @code{groff}, the user +-does not need to construct the pipe, but only tell @code{groff} what +-preprocessors to use. +- +-@code{groff} currently has preprocessors for producing tables +-(@code{tbl}), typesetting equations (@code{eqn}), drawing pictures +-(@code{pic} and @code{grn}), processing bibliographies +-(@code{refer}), and drawing chemical structures (@code{chem}). An +-associated program that is useful when dealing with preprocessors is +-@code{soelim}. +- +-A free implementation of @code{grap}, a preprocessor for drawing graphs, +-can be obtained as an extra package; @code{groff} can use @code{grap} +-also. +- +-Unique to @code{groff} is the @code{preconv} preprocessor that enables +-@code{groff} to handle documents in various input encodings. +- +-There are other preprocessors in existence, but, unfortunately, no free +-implementations are available. Among them is a preprocessor for drawing +-mathematical pictures (@code{ideal}). +- +- +-@c ===================================================================== +- +-@node Output device intro, Credits, Preprocessor Intro, Introduction +-@section Output Devices +-@cindex postprocessors +-@cindex output devices +-@cindex devices for output +- +-@code{groff} actually produces device independent code that may be fed +-into a postprocessor to produce output for a particular device. +-Currently, @code{groff} has postprocessors for @sc{PostScript} devices, +-character terminals, X@tie{}Windows (for previewing), @TeX{} DVI format, +-HP LaserJet@tie{}4 and Canon LBP printers (which use @acronym{CAPSL}), +-@acronym{HTML}, @acronym{XHTML}, and PDF. +- +- +-@c ===================================================================== +- +-@node Credits, , Output device intro, Introduction +-@section Credits +-@cindex credits +- +-Large portions of this manual were taken from existing documents, most +-notably, the manual pages for the @code{groff} package by James Clark, +-and Eric Allman's papers on the @file{me} macro package. +- +-The section on the @file{man} macro package is partly based on +-Susan@tie{}G.@: Kleinmann's @file{groff_man} manual page written for the +-Debian GNU/Linux system. +- +-Larry Kollar contributed the section in the @file{ms} macro package. +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Invoking groff, Tutorial for Macro Users, Introduction, Top +-@chapter Invoking @code{groff} +-@cindex invoking @code{groff} +-@cindex @code{groff} invocation +- +-This section focuses on how to invoke the @code{groff} front end. This +-front end takes care of the details of constructing the pipeline among +-the preprocessors, @code{gtroff} and the postprocessor. +- +-It has become a tradition that GNU programs get the prefix @samp{g} to +-distinguish it from its original counterparts provided by the host (see +-@ref{Environment}, for more details). Thus, for example, @code{geqn} is +-GNU @code{eqn}. On operating systems like GNU/Linux or the Hurd, which +-don't contain proprietary versions of @code{troff}, and on +-MS-DOS/MS-Windows, where @code{troff} and associated programs are not +-available at all, this prefix is omitted since GNU @code{troff} is the +-only used incarnation of @code{troff}. Exception: @samp{groff} is never +-replaced by @samp{roff}. +- +-In this document, we consequently say @samp{gtroff} when talking about +-the GNU @code{troff} program. All other implementations of @code{troff} +-are called @acronym{AT&T} @code{troff}, which is the common origin of all +-@code{troff} derivates (with more or less compatible changes). +-Similarly, we say @samp{gpic}, @samp{geqn}, etc. +- +-@menu +-* Groff Options:: +-* Environment:: +-* Macro Directories:: +-* Font Directories:: +-* Paper Size:: +-* Invocation Examples:: +-@end menu +- +- +-@c ===================================================================== +- +-@node Groff Options, Environment, Invoking groff, Invoking groff +-@section Options +-@cindex options +- +-@pindex groff +-@pindex gtroff +-@pindex gpic +-@pindex geqn +-@pindex ggrn +-@pindex grap +-@pindex gtbl +-@pindex gchem +-@pindex grefer +-@pindex gsoelim +-@pindex preconv +-@code{groff} normally runs the @code{gtroff} program and a +-postprocessor appropriate for the selected device. The default device +-is @samp{ps} (but it can be changed when @code{groff} is configured and +-built). It can optionally preprocess with any of @code{gpic}, +-@code{geqn}, @code{gtbl}, @code{ggrn}, @code{grap}, @code{gchem}, +-@code{grefer}, @code{gsoelim}, or @code{preconv}. +- +-This section only documents options to the @code{groff} front end. Many +-of the arguments to @code{groff} are passed on to @code{gtroff}, +-therefore those are also included. Arguments to pre- or postprocessors +-can be found in @ref{Invoking gpic}, @ref{Invoking geqn}, @ref{Invoking +-gtbl}, @ref{Invoking ggrn}, @ref{Invoking grefer}, @ref{Invoking gchem}, +-@ref{Invoking gsoelim}, @ref{Invoking preconv}, @ref{Invoking grotty}, +-@ref{Invoking grops}, @ref{Invoking gropdf}, @ref{Invoking grohtml}, +-@ref{Invoking grodvi}, @ref{Invoking grolj4}, @ref{Invoking grolbp}, and +-@ref{Invoking gxditview}. +- +-The command line format for @code{groff} is: +- +-@Example +-groff [ -abceghijklpstvzCEGNRSUVXZ ] [ -d@var{cs} ] [ -D@var{arg} ] +- [ -f@var{fam} ] [ -F@var{dir} ] [ -I@var{dir} ] [ -K@var{arg} ] +- [ -L@var{arg} ] [ -m@var{name} ] [ -M@var{dir} ] [ -n@var{num} ] +- [ -o@var{list} ] [ -P@var{arg} ] [ -r@var{cn} ] [ -T@var{dev} ] +- [ -w@var{name} ] [ -W@var{name} ] [ @var{files}@dots{} ] +-@endExample +- +-The command line format for @code{gtroff} is as follows. +- +-@Example +-gtroff [ -abcivzCERU ] [ -d@var{cs} ] [ -f@var{fam} ] [ -F@var{dir} ] +- [ -m@var{name} ] [ -M@var{dir} ] [ -n@var{num} ] [ -o@var{list} ] +- [ -r@var{cn} ] [ -T@var{name} ] [ -w@var{name} ] [ -W@var{name} ] +- [ @var{files}@dots{} ] +-@endExample +- +-@noindent +-Obviously, many of the options to @code{groff} are actually passed on to +-@code{gtroff}. +- +-Options without an argument can be grouped behind a +-single@tie{}@option{-}. A filename of@tie{}@file{-} denotes the +-standard input. It is possible to have whitespace between an option and +-its parameter. +- +-The @code{grog} command can be used to guess the correct @code{groff} +-command to format a file. +- +-Here's the description of the command-line options: +- +-@cindex command-line options +-@table @samp +-@item -a +-@cindex @acronym{ASCII} approximation output register (@code{.A}) +-Generate an @acronym{ASCII} approximation of the typeset output. The +-read-only register @code{.A} is then set to@tie{}1. @xref{Built-in +-Registers}. A typical example is +- +-@Example +-groff -a -man -Tdvi troff.man | less +-@endExample +- +-@noindent +-which shows how lines are broken for the DVI device. Note that this +-option is rather useless today since graphic output devices are +-available virtually everywhere. +- +-@item -b +-Print a backtrace with each warning or error message. This backtrace +-should help track down the cause of the error. The line numbers given +-in the backtrace may not always be correct: @code{gtroff} can get +-confused by @code{as} or @code{am} requests while counting line numbers. +- +-@item -c +-Suppress color output. +- +-@item -C +-Enable compatibility mode. @xref{Implementation Differences}, for the +-list of incompatibilities between @code{groff} and @acronym{AT&T} +-@code{troff}. +- +-@item -d@var{c}@var{s} +-@itemx -d@var{name}=@var{s} +-Define @var{c} or @var{name} to be a string@tie{}@var{s}. +-@var{c}@tie{}must be a one-letter name; @var{name} can be of arbitrary +-length. All string assignments happen before loading any macro file +-(including the start-up file). +- +-@item -D@var{arg} +-Set default input encoding used by @code{preconv} to @var{arg}. Implies +-@option{-k}. +- +-@item -e +-Preprocess with @code{geqn}. +- +-@item -E +-Inhibit all error messages. +- +-@item -f@var{fam} +-Use @var{fam} as the default font family. @xref{Font Families}. +- +-@item -F@var{dir} +-Search @file{@var{dir}} for subdirectories @file{dev@var{name}} +-(@var{name} is the name of the device), for the @file{DESC} file, and +-for font files before looking in the standard directories (@pxref{Font +-Directories}). This option is passed to all pre- and postprocessors +-using the @env{GROFF_FONT_PATH} environment variable. +- +-@item -g +-Preprocess with @code{ggrn}. +- +-@item -G +-Preprocess with @code{grap}. Implies @option{-p}. +- +-@item -h +-Print a help message. +- +-@item -i +-Read the standard input after all the named input files have been +-processed. +- +-@item -I@var{dir} +-This option may be used to specify a directory to search for files. +-It is passed to the following programs: +- +-@itemize +-@item +-@code{gsoelim} (see @ref{gsoelim} for more details); +-it also implies @code{groff}'s @option{-s} option. +- +-@item +-@code{gtroff}; it is used to search files named in the @code{psbb} and +-@code{so} requests. +- +-@item +-@code{grops}; it is used to search files named in the +-@w{@code{\X'ps: import}} and @w{@code{\X'ps: file}} escapes. +-@end itemize +- +-The current directory is always searched first. This option may be +-specified more than once; the directories are searched in the order +-specified. No directory search is performed for files specified using +-an absolute path. +- +-@item -j +-Preprocess with @code{gchem}. Implies @option{-p}. +- +-@item -k +-Preprocess with @code{preconv}. This is run before any other +-preprocessor. Please refer to @code{preconv}'s manual page for its +-behaviour if no @option{-K} (or @option{-D}) option is specified. +- +-@item -K@var{arg} +-Set input encoding used by preconv to @var{arg}. Implies @option{-k}. +- +-@item -l +-Send the output to a spooler for printing. The command used for this is +-specified by the @code{print} command in the device description file +-(see @ref{Font Files}, for more info). If not present, @option{-l} is +-ignored. +- +-@item -L@var{arg} +-Pass @var{arg} to the spooler. Each argument should be passed with a +-separate @option{-L} option. Note that @code{groff} does not prepend a +-@samp{-} to @var{arg} before passing it to the postprocessor. If the +-@code{print} keyword in the device description file is missing, +-@option{-L} is ignored. +- +-@item -m@var{name} +-Read in the file @file{@var{name}.tmac}. Normally @code{groff} searches +-for this in its macro directories. If it isn't found, it tries +-@file{tmac.@var{name}} (searching in the same directories). +- +-@item -M@var{dir} +-Search directory @file{@var{dir}} for macro files before the standard +-directories (@pxref{Macro Directories}). +- +-@item -n@var{num} +-Number the first page @var{num}. +- +-@item -N +-Don't allow newlines with @code{eqn} delimiters. This is the same as +-the @option{-N} option in @code{geqn}. +- +-@item -o@var{list} +-@cindex print current page register (@code{.P}) +-Output only pages in @var{list}, which is a comma-separated list of page +-ranges; @samp{@var{n}} means print page@tie{}@var{n}, +-@samp{@var{m}-@var{n}} means print every page between @var{m} +-and@tie{}@var{n}, @samp{-@var{n}} means print every page up +-to@tie{}@var{n}, @samp{@var{n}-} means print every page beginning +-with@tie{}@var{n}. @code{gtroff} exits after printing the last page in +-the list. All the ranges are inclusive on both ends. +- +-Within @code{gtroff}, this information can be extracted with the +-@samp{.P} register. @xref{Built-in Registers}. +- +-If your document restarts page numbering at the beginning of each +-chapter, then @code{gtroff} prints the specified page range for each +-chapter. +- +-@item -p +-Preprocess with @code{gpic}. +- +-@item -P@var{arg} +-Pass @var{arg} to the postprocessor. Each argument should be passed +-with a separate @option{-P} option. Note that @code{groff} does not +-prepend @samp{-} to @var{arg} before passing it to the postprocessor. +- +-@item -r@var{c}@var{n} +-@itemx -r@var{name}=@var{n} +-Set number register@tie{}@var{c} or @var{name} to the +-value@tie{}@var{n}. @var{c}@tie{}must be a one-letter name; @var{name} +-can be of arbitrary length. @var{n}@tie{}can be any @code{gtroff} +-numeric expression. All register assignments happen before loading any +-macro file (including the start-up file). +- +-@item -R +-Preprocess with @code{grefer}. No mechanism is provided for passing +-arguments to @code{grefer} because most @code{grefer} options have +-equivalent commands that can be included in the file. @xref{grefer}, +-for more details. +- +-@pindex troffrc +-@pindex troffrc-end +-Note that @code{gtroff} also accepts a @option{-R} option, which is not +-accessible via @code{groff}. This option prevents the loading of the +-@file{troffrc} and @file{troffrc-end} files. +- +-@item -s +-Preprocess with @code{gsoelim}. +- +-@item -S +-@cindex @code{open} request, and safer mode +-@cindex @code{opena} request, and safer mode +-@cindex @code{pso} request, and safer mode +-@cindex @code{sy} request, and safer mode +-@cindex @code{pi} request, and safer mode +-@cindex safer mode +-@cindex mode, safer +-Safer mode. Pass the @option{-S} option to @code{gpic} and disable the +-@code{open}, @code{opena}, @code{pso}, @code{sy}, and @code{pi} +-requests. For security reasons, this is enabled by default. +- +-@item -t +-Preprocess with @code{gtbl}. +- +-@item -T@var{dev} +-Prepare output for device @var{dev}. The default device is @samp{ps}, +-unless changed when @code{groff} was configured and built. The +-following are the output devices currently available: +- +-@table @code +-@item ps +-For @sc{PostScript} printers and previewers. +- +-@item pdf +-For PDF viewers or printers. +- +-@item dvi +-For @TeX{} DVI format. +- +-@item X75 +-For a 75@dmn{dpi} X11 previewer. +- +-@item X75-12 +-For a 75@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the +-document. +- +-@item X100 +-For a 100@dmn{dpi} X11 previewer. +- +-@item X100-12 +-For a 100@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the +-document. +- +-@item ascii +-@cindex encoding, output, @acronym{ASCII} +-@cindex @acronym{ASCII}, output encoding +-@cindex output encoding, @acronym{ASCII} +-For typewriter-like devices using the (7-bit) @acronym{ASCII} +-character set. +- +-@item latin1 +-@cindex encoding, output, @w{latin-1} (ISO @w{8859-1}) +-@cindex @w{latin-1} (ISO @w{8859-1}), output encoding +-@cindex ISO @w{8859-1} (@w{latin-1}), output encoding +-@cindex output encoding, @w{latin-1} (ISO @w{8859-1}) +-For typewriter-like devices that support the @w{Latin-1} +-(ISO@tie{}@w{8859-1}) character set. +- +-@item utf8 +-@cindex encoding, output, @w{utf-8} +-@cindex @w{utf-8}, output encoding +-@cindex output encoding, @w{utf-8} +-For typewriter-like devices that use the Unicode (ISO@tie{}10646) +-character set with @w{UTF-8} encoding. +- +-@item cp1047 +-@cindex encoding, output, @acronym{EBCDIC} +-@cindex @acronym{EBCDIC}, output encoding +-@cindex output encoding, @acronym{EBCDIC} +-@cindex encoding, output, cp1047 +-@cindex cp1047, output encoding +-@cindex output encoding, cp1047 +-@cindex IBM cp1047 output encoding +-For typewriter-like devices that use the @acronym{EBCDIC} encoding IBM +-cp1047. +- +-@item lj4 +-For HP LaserJet4-compatible (or other PCL5-compatible) printers. +- +-@item lbp +-For Canon @acronym{CAPSL} printers (@w{LBP-4} and @w{LBP-8} series laser +-printers). +- +-@pindex pre-grohtml +-@pindex post-grohtml +-@cindex @code{grohtml}, the program +-@item html +-@itemx xhtml +-To produce @acronym{HTML} and @acronym{XHTML} output, respectively. +-Note that this driver consists of two parts, a preprocessor +-(@code{pre-grohtml}) and a postprocessor (@code{post-grohtml}). +-@end table +- +-@cindex output device name string register (@code{.T}) +-@cindex output device usage number register (@code{.T}) +-The predefined @code{gtroff} string register @code{.T} contains the +-current output device; the read-only number register @code{.T} is set +-to@tie{}1 if this option is used (which is always true if @code{groff} +-is used to call @code{gtroff}). @xref{Built-in Registers}. +- +-The postprocessor to be used for a device is specified by the +-@code{postpro} command in the device description file. (@xref{Font +-Files}, for more info.) This can be overridden with the @option{-X} +-option. +- +-@item -U +-@cindex mode, unsafe +-@cindex unsafe mode +-Unsafe mode. This enables the @code{open}, @code{opena}, @code{pso}, +-@code{sy}, and @code{pi} requests. +- +-@item -w@var{name} +-Enable warning @var{name}. Available warnings are described in +-@ref{Debugging}. Multiple @option{-w} options are allowed. +- +-@item -W@var{name} +-Inhibit warning @var{name}. Multiple @option{-W} options are allowed. +- +-@item -v +-Make programs run by @code{groff} print out their version number. +- +-@item -V +-Print the pipeline on @code{stdout} instead of executing it. If +-specified more than once, print the pipeline on @code{stderr} and +-execute it. +- +-@item -X +-Preview with @code{gxditview} instead of using the usual postprocessor. +-This is unlikely to produce good results except with @option{-Tps}. +- +-Note that this is not the same as using @option{-TX75} or +-@option{-TX100} to view a document with @code{gxditview}: The former +-uses the metrics of the specified device, whereas the latter uses +-X-specific fonts and metrics. +- +-@item -z +-Suppress output from @code{gtroff}. Only error messages are printed. +- +-@item -Z +-Do not postprocess the output of @code{gtroff}. Normally @code{groff} +-automatically runs the appropriate postprocessor. +-@end table +- +- +-@c ===================================================================== +- +-@node Environment, Macro Directories, Groff Options, Invoking groff +-@section Environment +-@cindex environment variables +-@cindex variables in environment +- +-There are also several environment variables (of the operating system, +-not within @code{gtroff}) that can modify the behavior of @code{groff}. +- +-@table @code +-@item GROFF_BIN_PATH +-@tindex GROFF_BIN_PATH@r{, environment variable} +-This search path, followed by @code{PATH}, is used for commands executed +-by @code{groff}. +- +-@item GROFF_COMMAND_PREFIX +-@tindex GROFF_COMMAND_PREFIX@r{, environment variable} +-@cindex command prefix +-@cindex prefix, for commands +-If this is set to@tie{}@var{X}, then @code{groff} runs +-@code{@var{X}troff} instead of @code{gtroff}. This also applies to +-@code{tbl}, @code{pic}, @code{eqn}, @code{grn}, @code{chem}, +-@code{refer}, and @code{soelim}. It does not apply to @code{grops}, +-@code{grodvi}, @code{grotty}, @code{pre-grohtml}, @code{post-grohtml}, +-@code{preconv}, @code{grolj4}, @code{gropdf}, and @code{gxditview}. +- +-The default command prefix is determined during the installation +-process. If a non-GNU troff system is found, prefix @samp{g} is used, +-none otherwise. +- +-@item GROFF_ENCODING +-@tindex GROFF_ENCODING@r{, environment variable} +-The value of this environment value is passed to the @code{preconv} +-preprocessor to select the encoding of input files. Setting this option +-implies @code{groff}'s command line option @option{-k} (this is, +-@code{groff} actually always calls @code{preconv}). If set without a +-value, @code{groff} calls @code{preconv} without arguments. An explicit +-@option{-K} command line option overrides the value of +-@env{GROFF_ENCODING}. See the manual page of @code{preconv} for details. +- +-@item GROFF_FONT_PATH +-@tindex GROFF_FONT_PATH@r{, environment variable} +-A colon-separated list of directories in which to search for the +-@code{dev}@var{name} directory (before the default directories are +-tried). @xref{Font Directories}. +- +-@item GROFF_TMAC_PATH +-@tindex GROFF_TMAC_PATH@r{, environment variable} +-A colon-separated list of directories in which to search for macro files +-(before the default directories are tried). @xref{Macro Directories}. +- +-@item GROFF_TMPDIR +-@tindex GROFF_TMPDIR@r{, environment variable} +-@tindex TMPDIR@r{, environment variable} +-The directory in which @code{groff} creates temporary files. If this is +-not set and @env{TMPDIR} is set, temporary files are created in that +-directory. Otherwise temporary files are created in a system-dependent +-default directory (on Unix and GNU/Linux systems, this is usually +-@file{/tmp}). @code{grops}, @code{grefer}, @code{pre-grohtml}, and +-@code{post-grohtml} can create temporary files in this directory. +- +-@item GROFF_TYPESETTER +-@tindex GROFF_TYPESETTER@r{, environment variable} +-The default output device. +-@end table +- +-Note that MS-DOS and MS-Windows ports of @code{groff} use semi-colons, +-rather than colons, to separate the directories in the lists described +-above. +- +- +-@c ===================================================================== +- +-@node Macro Directories, Font Directories, Environment, Invoking groff +-@section Macro Directories +-@cindex macro directories +-@cindex directories for macros +-@cindex searching macros +-@cindex macros, searching +- +-All macro file names must be named @code{@var{name}.tmac} or +-@code{tmac.@var{name}} to make the @option{-m@var{name}} command line +-option work. The @code{mso} request doesn't have this restriction; any +-file name can be used, and @code{gtroff} won't try to append or prepend +-the @samp{tmac} string. +- +-@cindex tmac, directory +-@cindex directory, for tmac files +-@cindex tmac, path +-@cindex path, for tmac files +-@cindex searching macro files +-@cindex macro files, searching +-@cindex files, macro, searching +-Macro files are kept in the @dfn{tmac directories}, all of which +-constitute the @dfn{tmac path}. The elements of the search path for +-macro files are (in that order): +- +-@itemize @bullet +-@item +-The directories specified with @code{gtroff}'s or @code{groff}'s +-@option{-M} command line option. +- +-@item +-@tindex GROFF_TMAC_PATH@r{, environment variable} +-The directories given in the @env{GROFF_TMAC_PATH} environment variable. +- +-@item +-@cindex safer mode +-@cindex mode, safer +-@cindex unsafe mode +-@cindex mode, unsafe +-@cindex current directory +-@cindex directory, current +-The current directory (only if in unsafe mode using the @option{-U} +-command line switch). +- +-@item +-@cindex home directory +-@cindex directory, home +-The home directory. +- +-@item +-@cindex site-specific directory +-@cindex directory, site-specific +-@cindex platform-specific directory +-@cindex directory, platform-specific +-A platform-dependent directory, a site-specific (platform-independent) +-directory, and the main tmac directory; the default locations are +- +-@Example +-/usr/local/lib/groff/site-tmac +-/usr/local/share/groff/site-tmac +-/usr/local/share/groff/1.22.3/tmac +-@endExample +- +-@noindent +-assuming that the version of @code{groff} is 1.22.3, and the +-installation prefix was @file{/usr/local}. It is possible to fine-tune +-those directories during the installation process. +-@end itemize +- +- +-@c ===================================================================== +- +-@node Font Directories, Paper Size, Macro Directories, Invoking groff +-@section Font Directories +-@cindex font directories +-@cindex directories for fonts +-@cindex searching fonts +-@cindex fonts, searching +- +-Basically, there is no restriction how font files for @code{groff} are +-named and how long font names are; however, to make the font family +-mechanism work (@pxref{Font Families}), fonts within a family should +-start with the family name, followed by the shape. For example, the +-Times family uses @samp{T} for the family name and @samp{R}, @samp{B}, +-@samp{I}, and @samp{BI} to indicate the shapes `roman', `bold', +-`italic', and `bold italic', respectively. Thus the final font names +-are @samp{TR}, @samp{TB}, @samp{TI}, and @samp{TBI}. +- +-@cindex font path +-@cindex path, for font files +-All font files are kept in the @dfn{font directories}, which constitute +-the @dfn{font path}. The file search functions always append the +-directory @code{dev}@var{name}, where @var{name} is the name of the +-output device. Assuming, say, DVI output, and @file{/foo/bar} as a font +-directory, the font files for @code{grodvi} must be in +-@file{/foo/bar/devdvi}. +- +-The elements of the search path for font files are (in that order): +- +-@itemize @bullet +-@item +-The directories specified with @code{gtroff}'s or @code{groff}'s +-@option{-F} command line option. All device drivers and some +-preprocessors also have this option. +- +-@item +-@tindex GROFF_FONT_PATH@r{, environment variable} +-The directories given in the @env{GROFF_FONT_PATH} environment variable. +- +-@item +-@cindex site-specific directory +-@cindex directory, site-specific +-A site-specific directory and the main font directory; the default +-locations are +- +-@Example +-/usr/local/share/groff/site-font +-/usr/local/share/groff/1.22.3/font +-@endExample +- +-@noindent +-assuming that the version of @code{groff} is 1.22.3, and the +-installation prefix was @file{/usr/local}. It is possible to fine-tune +-those directories during the installation process. +-@end itemize +- +- +-@c ===================================================================== +- +-@node Paper Size, Invocation Examples, Font Directories, Invoking groff +-@section Paper Size +-@cindex paper size +-@cindex size, paper +-@cindex landscape page orientation +-@cindex orientation, landscape +-@cindex page orientation, landscape +- +-In groff, the page size for @code{gtroff} and for output devices are +-handled separately. @xref{Page Layout}, for vertical manipulation of +-the page size. @xref{Line Layout}, for horizontal changes. +- +-A default paper size can be set in the device's @file{DESC} file. Most +-output devices also have a command line option @option{-p} to override +-the default paper size and option @option{-l} to use landscape +-orientation. @xref{DESC File Format}, for a description of the +-@code{papersize} keyword, which takes the same argument as @option{-p}. +- +-@pindex papersize.tmac +-@pindex troffrc +-A convenient shorthand to set a particular paper size for @code{gtroff} +-is command line option @option{-dpaper=@var{size}}. This defines string +-@code{paper}, which is processed in file @file{papersize.tmac} (loaded in +-the start-up file @file{troffrc} by default). Possible values for +-@var{size} are the same as the predefined values for the +-@code{papersize} keyword (but only in lowercase) except +-@code{a7}-@code{d7}. An appended @samp{l} (ell) character denotes +-landscape orientation. +- +-For example, use the following for PS output on A4 paper in landscape +-orientation: +- +-@Example +-groff -Tps -dpaper=a4l -P-pa4 -P-l -ms foo.ms > foo.ps +-@endExample +- +-Note that it is up to the particular macro package to respect default +-page dimensions set in this way (most do). +- +- +-@c ===================================================================== +- +-@node Invocation Examples, , Paper Size, Invoking groff +-@section Invocation Examples +-@cindex invocation examples +-@cindex examples of invocation +- +-This section lists several common uses of @code{groff} and the +-corresponding command lines. +- +-@Example +-groff file +-@endExample +- +-@noindent +-This command processes @file{file} without a macro package or a +-preprocessor. The output device is the default, @samp{ps}, and the +-output is sent to @code{stdout}. +- +-@Example +-groff -t -mandoc -Tascii file | less +-@endExample +- +-@noindent +-This is basically what a call to the @code{man} program does. +-@code{gtroff} processes the manual page @file{file} with the +-@file{mandoc} macro file (which in turn either calls the @file{man} or +-the @file{mdoc} macro package), using the @code{tbl} preprocessor and +-the @acronym{ASCII} output device. Finally, the @code{less} pager +-displays the result. +- +-@Example +-groff -X -m me file +-@endExample +- +-@noindent +-Preview @file{file} with @code{gxditview}, using the @file{me} macro +-package. Since no @option{-T} option is specified, use the default +-device (@samp{ps}). Note that you can either say @w{@samp{-m me}} or +-@w{@samp{-me}}; the latter is an anachronism from the early days of +-@acronym{UNIX}.@footnote{The same is true for the other main macro +-packages that come with @code{groff}: @file{man}, @file{mdoc}, +-@file{ms}, @file{mm}, and @file{mandoc}. This won't work in general; +-for example, to load @file{trace.tmac}, either @samp{-mtrace} or +-@w{@samp{-m trace}} must be used.} +- +-@Example +-groff -man -rD1 -z file +-@endExample +- +-@noindent +-Check @file{file} with the @file{man} macro package, forcing +-double-sided printing -- don't produce any output. +- +-@menu +-* grog:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node grog, , Invocation Examples, Invocation Examples +-@subsection @code{grog} +- +-@pindex grog +-@code{grog} reads files, guesses which of the @code{groff} preprocessors +-and/or macro packages are required for formatting them, and prints the +-@code{groff} command including those options on the standard output. It +-generates one or more of the options @option{-e}, @option{-man}, +-@option{-me}, @option{-mm}, @option{-mom}, @option{-ms}, @option{-mdoc}, +-@option{-mdoc-old}, @option{-p}, @option{-R}, @option{-g}, @option{-G}, +-@option{-s}, and @option{-t}. +- +-A special file name@tie{}@file{-} refers to the standard input. +-Specifying no files also means to read the standard input. Any +-specified options are included in the printed command. No space is +-allowed between options and their arguments. The only options +-recognized are @option{-C} (which is also passed on) to enable +-compatibility mode, and @option{-v} to print the version number and +-exit. +- +-For example, +- +-@Example +-grog -Tdvi paper.ms +-@endExample +- +-@noindent +-guesses the appropriate command to print @file{paper.ms} and then prints +-it to the command line after adding the @option{-Tdvi} option. For +-direct execution, enclose the call to @code{grog} in backquotes at the +-@acronym{UNIX} shell prompt: +- +-@Example +-`grog -Tdvi paper.ms` > paper.dvi +-@endExample +- +-@noindent +-As seen in the example, it is still necessary to redirect the output to +-something meaningful (i.e.@: either a file or a pager program like +-@code{less}). +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Tutorial for Macro Users, Macro Packages, Invoking groff, Top +-@chapter Tutorial for Macro Users +-@cindex tutorial for macro users +-@cindex macros, tutorial for users +-@cindex user's tutorial for macros +-@cindex user's macro tutorial +- +-Most users tend to use a macro package to format their papers. This +-means that the whole breadth of @code{groff} is not necessary for most +-people. This chapter covers the material needed to efficiently use a +-macro package. +- +-@menu +-* Basics:: +-* Common Features:: +-@end menu +- +- +-@c ===================================================================== +- +-@node Basics, Common Features, Tutorial for Macro Users, Tutorial for Macro Users +-@section Basics +-@cindex basics of macros +-@cindex macro basics +- +-This section covers some of the basic concepts necessary to understand +-how to use a macro package.@footnote{This section is derived from +-@cite{Writing Papers with nroff using -me} by Eric P.@tie{}Allman.} +-References are made throughout to more detailed information, if desired. +- +-@code{gtroff} reads an input file prepared by the user and outputs a +-formatted document suitable for publication or framing. The input +-consists of text, or words to be printed, and embedded commands +-(@dfn{requests} and @dfn{escapes}), which tell @code{gtroff} how to +-format the output. For more detail on this, see @ref{Embedded +-Commands}. +- +-The word @dfn{argument} is used in this chapter to mean a word or number +-that appears on the same line as a request, and which modifies the +-meaning of that request. For example, the request +- +-@Example +-.sp +-@endExample +- +-@noindent +-spaces one line, but +- +-@Example +-.sp 4 +-@endExample +- +-@noindent +-spaces four lines. The number@tie{}4 is an argument to the @code{sp} +-request, which says to space four lines instead of one. Arguments are +-separated from the request and from each other by spaces (@emph{no} +-tabs). More details on this can be found in @ref{Request and Macro +-Arguments}. +- +-The primary function of @code{gtroff} is to collect words from input +-lines, fill output lines with those words, justify the right-hand margin +-by inserting extra spaces in the line, and output the result. For +-example, the input: +- +-@Example +-Now is the time +-for all good men +-to come to the aid +-of their party. +-Four score and seven +-years ago, etc. +-@endExample +- +-@noindent +-is read, packed onto output lines, and justified to produce: +- +-@quotation +-Now is the time for all good men to come to the aid of their party. +-Four score and seven years ago, etc. +-@end quotation +- +-@cindex break +-@cindex line break +-Sometimes a new output line should be started even though the current +-line is not yet full; for example, at the end of a paragraph. To do +-this it is possible to cause a @dfn{break}, which starts a new output +-line. Some requests cause a break automatically, as normally do blank +-input lines and input lines beginning with a space. +- +-Not all input lines are text to be formatted. Some input lines are +-requests that describe how to format the text. Requests always have a +-period (@samp{.}) or an apostrophe (@samp{'}) as the first character of +-the input line. +- +-The text formatter also does more complex things, such as automatically +-numbering pages, skipping over page boundaries, putting footnotes in the +-correct place, and so forth. +- +-Here are a few hints for preparing text for input to @code{gtroff}. +- +-@itemize @bullet +-@item +-First, keep the input lines short. Short input lines are easier to +-edit, and @code{gtroff} packs words onto longer lines anyhow. +- +-@item +-In keeping with this, it is helpful to begin a new line after every +-comma or phrase, since common corrections are to add or delete sentences +-or phrases. +- +-@item +-End each sentence with two spaces -- or better, start each sentence on a +-new line. @code{gtroff} recognizes characters that usually end a +-sentence, and inserts sentence space accordingly. +- +-@item +-Do not hyphenate words at the end of lines -- @code{gtroff} is smart +-enough to hyphenate words as needed, but is not smart enough to take +-hyphens out and join a word back together. Also, words such as +-``mother-in-law'' should not be broken over a line, since then a space +-can occur where not wanted, such as ``@w{mother- in}-law''. +-@end itemize +- +-@cindex double-spacing (@code{ls}) +-@cindex spacing +-@code{gtroff} double-spaces output text automatically if you use the +-request @w{@samp{.ls 2}}. Reactivate single-spaced mode by typing +-@w{@samp{.ls 1}}.@footnote{If you need finer granularity of the vertical +-space, use the @code{pvs} request (@pxref{Changing Type Sizes}).} +- +-A number of requests allow to change the way the output looks, sometimes +-called the @dfn{layout} of the output page. Most of these requests +-adjust the placing of @dfn{whitespace} (blank lines or spaces). +- +-@cindex new page (@code{bp}) +-The @code{bp} request starts a new page, causing a line break. +- +-@cindex blank line (@code{sp}) +-@cindex empty line (@code{sp}) +-@cindex line, empty (@code{sp}) +-The request @w{@samp{.sp @var{N}}} leaves @var{N}@tie{}lines of blank +-space. @var{N}@tie{}can be omitted (meaning skip a single line) or can +-be of the form @var{N}i (for @var{N}@tie{}inches) or @var{N}c (for +-@var{N}@tie{}centimeters). For example, the input: +- +-@Example +-.sp 1.5i +-My thoughts on the subject +-.sp +-@endExample +- +-@noindent +-leaves one and a half inches of space, followed by the line ``My +-thoughts on the subject'', followed by a single blank line (more +-measurement units are available, see @ref{Measurements}). +- +-@cindex centering lines (@code{ce}) +-@cindex lines, centering (@code{ce}) +-Text lines can be centered by using the @code{ce} request. The line +-after @code{ce} is centered (horizontally) on the page. To center more +-than one line, use @w{@samp{.ce @var{N}}} (where @var{N} is the number +-of lines to center), followed by the @var{N}@tie{}lines. To center many +-lines without counting them, type: +- +-@Example +-.ce 1000 +-lines to center +-.ce 0 +-@endExample +- +-@noindent +-The @w{@samp{.ce 0}} request tells @code{groff} to center zero more +-lines, in other words, stop centering. +- +-@cindex line break (@code{br}) +-@cindex break (@code{br}) +-All of these requests cause a break; that is, they always start a new +-line. To start a new line without performing any other action, use +-@code{br}. +- +- +-@c ===================================================================== +- +-@node Common Features, , Basics, Tutorial for Macro Users +-@section Common Features +-@cindex common features +-@cindex features, common +- +-@code{gtroff} provides very low-level operations for formatting a +-document. There are many common routine operations that are done in +-all documents. These common operations are written into @dfn{macros} +-and collected into a @dfn{macro package}. +- +-All macro packages provide certain common capabilities that fall into +-the following categories. +- +-@menu +-* Paragraphs:: +-* Sections and Chapters:: +-* Headers and Footers:: +-* Page Layout Adjustment:: +-* Displays:: +-* Footnotes and Annotations:: +-* Table of Contents:: +-* Indices:: +-* Paper Formats:: +-* Multiple Columns:: +-* Font and Size Changes:: +-* Predefined Strings:: +-* Preprocessor Support:: +-* Configuration and Customization:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Paragraphs, Sections and Chapters, Common Features, Common Features +-@subsection Paragraphs +-@cindex paragraphs +- +-One of the most common and most used capability is starting a paragraph. +-There are a number of different types of paragraphs, any of which can be +-initiated with macros supplied by the macro package. Normally, +-paragraphs start with a blank line and the first line indented, like the +-text in this manual. There are also block style paragraphs, which omit +-the indentation: +- +-@Example +-Some men look at constitutions with sanctimonious +-reverence, and deem them like the ark of the covenant, too +-sacred to be touched. +-@endExample +- +-@noindent +-And there are also indented paragraphs, which begin with a tag or label +-at the margin and the remaining text indented. +- +-@Example +-one This is the first paragraph. Notice how the first +- line of the resulting paragraph lines up with the +- other lines in the paragraph. +-@endExample +- +-@Example +-longlabel +- This paragraph had a long label. The first +- character of text on the first line does not line up +- with the text on second and subsequent lines, +- although they line up with each other. +-@endExample +- +-A variation of this is a bulleted list. +- +-@Example +-. Bulleted lists start with a bullet. It is possible +- to use other glyphs instead of the bullet. In nroff +- mode using the ASCII character set for output, a dot +- is used instead of a real bullet. +-@endExample +- +-@c --------------------------------------------------------------------- +- +-@node Sections and Chapters, Headers and Footers, Paragraphs, Common Features +-@subsection Sections and Chapters +- +-Most macro packages supply some form of section headers. The simplest +-kind is simply the heading on a line by itself in bold type. Others +-supply automatically numbered section heading or different heading +-styles at different levels. Some, more sophisticated, macro packages +-supply macros for starting chapters and appendices. +- +-@c --------------------------------------------------------------------- +- +-@node Headers and Footers, Page Layout Adjustment, Sections and Chapters, Common Features +-@subsection Headers and Footers +- +-Every macro package gives some way to manipulate the @dfn{headers} and +-@dfn{footers} (also called @dfn{titles}) on each page. This is text put +-at the top and bottom of each page, respectively, which contain data +-like the current page number, the current chapter title, and so on. Its +-appearance is not affected by the running text. Some packages allow for +-different ones on the even and odd pages (for material printed in a book +-form). +- +-The titles are called @dfn{three-part titles}, that is, there is a +-left-justified part, a centered part, and a right-justified part. An +-automatically generated page number may be put in any of these fields +-with the @samp{%} character (see @ref{Page Layout}, for more details). +- +-@c --------------------------------------------------------------------- +- +-@node Page Layout Adjustment, Displays, Headers and Footers, Common Features +-@subsection Page Layout +- +-Most macro packages let the user specify top and bottom margins and +-other details about the appearance of the printed pages. +- +-@c --------------------------------------------------------------------- +- +-@node Displays, Footnotes and Annotations, Page Layout Adjustment, Common Features +-@subsection Displays +-@cindex displays +- +-@dfn{Displays} are sections of text to be set off from the body of the +-paper. Major quotes, tables, and figures are types of displays, as are +-all the examples used in this document. +- +-@cindex quotes, major +-@cindex major quotes +-@dfn{Major quotes} are quotes that are several lines long, and hence +-are set in from the rest of the text without quote marks around them. +- +-@cindex list +-A @dfn{list} is an indented, single-spaced, unfilled display. Lists +-should be used when the material to be printed should not be filled and +-justified like normal text, such as columns of figures or the examples +-used in this paper. +- +-@cindex keep +-A @dfn{keep} is a display of lines that are kept on a single page if +-possible. An example for a keep might be a diagram. Keeps differ from +-lists in that lists may be broken over a page boundary whereas keeps are +-not. +- +-@cindex keep, floating +-@cindex floating keep +-@dfn{Floating keeps} move relative to the text. Hence, they are good +-for things that are referred to by name, such as ``See figure@tie{}3''. +-A floating keep appears at the bottom of the current page if it fits; +-otherwise, it appears at the top of the next page. Meanwhile, the +-surrounding text `flows' around the keep, thus leaving no blank areas. +- +-@c --------------------------------------------------------------------- +- +-@node Footnotes and Annotations, Table of Contents, Displays, Common Features +-@subsection Footnotes and Annotations +-@cindex footnotes +-@cindex annotations +- +-There are a number of requests to save text for later printing. +- +-@dfn{Footnotes} are printed at the bottom of the current page. +- +-@cindex delayed text +-@dfn{Delayed text} is very similar to a footnote except that it is +-printed when called for explicitly. This allows a list of references to +-appear (for example) at the end of each chapter, as is the convention in +-some disciplines. +- +-Most macro packages that supply this functionality also supply a means +-of automatically numbering either type of annotation. +- +-@c --------------------------------------------------------------------- +- +-@node Table of Contents, Indices, Footnotes and Annotations, Common Features +-@subsection Table of Contents +-@cindex table of contents +-@cindex contents, table of +- +-@dfn{Tables of contents} are a type of delayed text having a tag +-(usually the page number) attached to each entry after a row of dots. +-The table accumulates throughout the paper until printed, usually after +-the paper has ended. Many macro packages provide the ability to have +-several tables of contents (e.g.@: a standard table of contents, a list +-of tables, etc). +- +-@c --------------------------------------------------------------------- +- +-@node Indices, Paper Formats, Table of Contents, Common Features +-@subsection Indices +-@cindex index, in macro package +- +-While some macro packages use the term @dfn{index}, none actually +-provide that functionality. The facilities they call indices are +-actually more appropriate for tables of contents. +- +-@pindex makeindex +-To produce a real index in a document, external tools like the +-@code{makeindex} program are necessary. +- +-@c --------------------------------------------------------------------- +- +-@node Paper Formats, Multiple Columns, Indices, Common Features +-@subsection Paper Formats +-@cindex paper formats +- +-Some macro packages provide stock formats for various kinds of +-documents. Many of them provide a common format for the title and +-opening pages of a technical paper. The @file{mm} macros in particular +-provide formats for letters and memoranda. +- +-@c --------------------------------------------------------------------- +- +-@node Multiple Columns, Font and Size Changes, Paper Formats, Common Features +-@subsection Multiple Columns +- +-Some macro packages (but not @file{man}) provide the ability to have two +-or more columns on a page. +- +-@c --------------------------------------------------------------------- +- +-@node Font and Size Changes, Predefined Strings, Multiple Columns, Common Features +-@subsection Font and Size Changes +- +-The built-in font and size functions are not always intuitive, so all +-macro packages provide macros to make these operations simpler. +- +-@c --------------------------------------------------------------------- +- +-@node Predefined Strings, Preprocessor Support, Font and Size Changes, Common Features +-@subsection Predefined Strings +- +-Most macro packages provide various predefined strings for a variety of +-uses; examples are sub- and superscripts, printable dates, quotes and +-various special characters. +- +-@c --------------------------------------------------------------------- +- +-@node Preprocessor Support, Configuration and Customization, Predefined Strings, Common Features +-@subsection Preprocessor Support +- +-All macro packages provide support for various preprocessors and may +-extend their functionality. +- +-For example, all macro packages mark tables (which are processed with +-@code{gtbl}) by placing them between @code{TS} and @code{TE} macros. +-The @file{ms} macro package has an option, @samp{.TS@tie{}H}, that +-prints a caption at the top of a new page (when the table is too long to +-fit on a single page). +- +-@c --------------------------------------------------------------------- +- +-@node Configuration and Customization, , Preprocessor Support, Common Features +-@subsection Configuration and Customization +- +-Some macro packages provide means of customizing many of the details of +-how the package behaves. This ranges from setting the default type size +-to changing the appearance of section headers. +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Macro Packages, gtroff Reference, Tutorial for Macro Users, Top +-@chapter Macro Packages +-@cindex macro packages +-@cindex packages, macros +- +-This chapter documents the main macro packages that come with +-@code{groff}. +- +-Different main macro packages can't be used at the same time; for +-example +- +-@Example +-groff -m man foo.man -m ms bar.doc +-@endExample +- +-@noindent +-doesn't work. Note that option arguments are processed before +-non-option arguments; the above (failing) sample is thus reordered to +- +-@Example +-groff -m man -m ms foo.man bar.doc +-@endExample +- +-@menu +-* man:: +-* mdoc:: +-* ms:: +-* me:: +-* mm:: +-* mom:: +-@end menu +- +- +-@c ===================================================================== +- +-@node man, mdoc, Macro Packages, Macro Packages +-@section @file{man} +-@cindex manual pages +-@cindex man pages +-@pindex an.tmac +-@pindex man.tmac +-@pindex man-old.tmac +- +-This is the most popular and probably the most important macro package +-of @code{groff}. It is easy to use, and a vast majority of manual pages +-are based on it. +- +-@menu +-* Man options:: +-* Man usage:: +-* Man font macros:: +-* Miscellaneous man macros:: +-* Predefined man strings:: +-* Preprocessors in man pages:: +-* Optional man extensions:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Man options, Man usage, man, man +-@subsection Options +- +-The command line format for using the @file{man} macros with +-@code{groff} is: +- +-@Example +-groff -m man [ -rLL=@var{length} ] [ -rLT=@var{length} ] [ -rFT=@var{dist} ] +- [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [-rHY=@var{flags} ] +- [ -rP@var{nnn} ] [ -rS@var{xx} ] [ -rX@var{nnn} ] +- [ -rIN=@var{length} ] [ -rSN=@var{length} ] [ @var{files}@dots{} ] +-@endExample +- +-@noindent +-It is possible to use @samp{-man} instead of @w{@samp{-m man}}. +- +-@table @code +-@item -rcR=1 +-This option (the default if a TTY output device is used) creates a +-single, very long page instead of multiple pages. Use @code{-rcR=0} to +-disable it. +- +-@item -rC1 +-If more than one manual page is given on the command line, number the +-pages continuously, rather than starting each at@tie{}1. +- +-@item -rD1 +-Double-sided printing. Footers for even and odd pages are formatted +-differently. +- +-@item -rFT=@var{dist} +-Set the position of the footer text to @var{dist}. If positive, the +-distance is measured relative to the top of the page, otherwise it is +-relative to the bottom. The default is @minus{}0.5@dmn{i}. +- +-@item -rHY=@var{flags} +-Set hyphenation flags. Possible values are 1@tie{}to hyphenate without +-restrictions, 2@tie{}to not hyphenate the last word on a page, 4@tie{}to +-not hyphenate the last two characters of a word, and 8@tie{}to not +-hyphenate the first two characters of a word. These values are +-additive; the default is@tie{}14. +- +-@item -rIN=@var{length} +-Set the body text indentation to @var{length}. If not specified, the +-indentation defaults to 7@dmn{n} (7@tie{}characters) in nroff mode and +-7.2@dmn{n} otherwise. For nroff, this value should always be an integer +-multiple of unit @samp{n} to get consistent indentation. +- +-@item -rLL=@var{length} +-Set line length to @var{length}. If not specified, the line length is +-set to respect any value set by a prior @samp{ll} request (which +-@emph{must} be in effect when the @samp{TH} macro is invoked), if this +-differs from the built-in default for the formatter; otherwise it +-defaults to 78@dmn{n} in nroff mode (this is 78 characters per line) and +-6.5@dmn{i} in troff mode.@footnote{Note that the use of a @samp{.ll +-@var{length}} request to initialize the line length, prior to use of the +-@samp{TH} macro, is supported for backward compatibility with some +-versions of the @code{man} program. @emph{Always} use the +-@option{-rLL=@var{length}} option, or an equivalent @samp{.nr LL +-@var{length}} request, in preference to such a @samp{.ll @var{length}} +-request. In particular, note that in nroff mode, the request @samp{.ll +-65n}, (with any @var{length} expression that evaluates equal to +-65@dmn{n}, i.e., the formatter's default line length in nroff mode), +-does @emph{not} set the line length to 65@dmn{n} (it is adjusted to the +-@code{man} macro package's default setting of 78@dmn{n}), whereas the +-use of the @option{-rLL=65n} option, or the @samp{.nr LL 65n} request +-@emph{does} establish a line length of 65@dmn{n}.} +- +-@item -rLT=@var{length} +-Set title length to @var{length}. If not specified, the title length +-defaults to the line length. +- +-@item -rP@var{nnn} +-Page numbering starts with @var{nnn} rather than with@tie{}1. +- +-@item -rS@var{xx} +-Use @var{xx} (which can be 10, 11, or@tie{}12@dmn{pt}) as the base +-document font size instead of the default value of@tie{}10@dmn{pt}. +- +-@item -rSN=@var{length} +-Set the indentation for sub-subheadings to @var{length}. If not +-specified, the indentation defaults to 3@dmn{n}. +- +-@item -rX@var{nnn} +-After page @var{nnn}, number pages as @var{nnn}a, @var{nnn}b, +-@var{nnn}c, etc. For example, the option @option{-rX2} produces the +-following page numbers: 1, 2, 2a, 2b, 2c, etc. +-@end table +- +-@c --------------------------------------------------------------------- +- +-@node Man usage, Man font macros, Man options, man +-@subsection Usage +-@cindex @code{man} macros +-@cindex macros for manual pages [@code{man}] +- +-@pindex man.local +-This section describes the available macros for manual pages. For +-further customization, put additional macros and requests into the file +-@file{man.local}, which is loaded immediately after the @file{man} +-package. +- +-@Defmac {TH, title section [@Var{extra1} [@Var{extra2} [@Var{extra3}]]], man} +-Set the title of the man page to @var{title} and the section to +-@var{section}, which must have a value between 1 and@tie{}8. The value +-of @var{section} may also have a string appended, e.g.@: @samp{.pm}, to +-indicate a specific subsection of the man pages. +- +-Both @var{title} and @var{section} are positioned at the left and right +-in the header line (with @var{section} in parentheses immediately +-appended to @var{title}. @var{extra1} is positioned in the middle of +-the footer line. @var{extra2} is positioned at the left in the footer +-line (or at the left on even pages and at the right on odd pages if +-double-sided printing is active). @var{extra3} is centered in the +-header line. +- +-For @acronym{HTML} and @acronym{XHTML} output, headers and footers are +-completely suppressed. +- +-Additionally, this macro starts a new page; the new line number +-is@tie{}1 again (except if the @option{-rC1} option is given on the +-command line) -- this feature is intended only for formatting multiple +-man pages; a single man page should contain exactly one @code{TH} macro +-at the beginning of the file. +-@endDefmac +- +-@Defmac {SH, [@Var{heading}], man} +-Set up an unnumbered section heading sticking out to the left. Prints +-out all the text following @code{SH} up to the end of the line (or the +-text in the next line if there is no argument to @code{SH}) in bold face +-(or the font specified by the string @code{HF}), one size larger than +-the base document size. Additionally, the left margin and the +-indentation for the following text is reset to its default value. +-@endDefmac +- +-@Defmac {SS, [@Var{heading}], man} +-Set up an unnumbered (sub)section heading. Prints out all the text +-following @code{SS} up to the end of the line (or the text in the next +-line if there is no argument to @code{SS}) in bold face (or the font +-specified by the string @code{HF}), at the same size as the base +-document size. Additionally, the left margin and the indentation for +-the following text is reset to its default value. +-@endDefmac +- +-@Defmac {TP, [@Var{nnn}], man} +-Set up an indented paragraph with label. The indentation is set to +-@var{nnn} if that argument is supplied (the default unit is @samp{n} if +-omitted), otherwise it is set to the previous indentation value +-specified with @code{TP}, @code{IP}, or @code{HP} (or to the default +-value if none of them have been used yet). +- +-The first line of text following this macro is interpreted as a string +-to be printed flush-left, as it is appropriate for a label. It is not +-interpreted as part of a paragraph, so there is no attempt to fill the +-first line with text from the following input lines. Nevertheless, if +-the label is not as wide as the indentation the paragraph starts at the +-same line (but indented), continuing on the following lines. If the +-label is wider than the indentation the descriptive part of the +-paragraph begins on the line following the label, entirely indented. +-Note that neither font shape nor font size of the label is set to a +-default value; on the other hand, the rest of the text has default font +-settings. +-@endDefmac +- +-@DefmacList {LP, , man} +-@DefmacItemx {PP, , man} +-@DefmacListEndx {P, , man} +-These macros are mutual aliases. Any of them causes a line break at the +-current position, followed by a vertical space downwards by the amount +-specified by the @code{PD} macro. The font size and shape are reset to +-the default value (10@dmn{pt} roman if no @option{-rS} option is given +-on the command line). Finally, the current left margin and the +-indentation is restored. +-@endDefmac +- +-@Defmac {IP, [@Var{designator} [@Var{nnn}]], man} +-Set up an indented paragraph, using @var{designator} as a tag to mark +-its beginning. The indentation is set to @var{nnn} if that argument is +-supplied (default unit is @samp{n}), otherwise it is set to the previous +-indentation value specified with @code{TP}, @code{IP}, or @code{HP} (or +-the default value if none of them have been used yet). Font size and +-face of the paragraph (but not the designator) are reset to their +-default values. +- +-To start an indented paragraph with a particular indentation but without +-a designator, use @samp{""} (two double quotes) as the first argument of +-@code{IP}. +- +-For example, to start a paragraph with bullets as the designator and +-4@tie{}en indentation, write +- +-@Example +-.IP \(bu 4 +-@endExample +-@endDefmac +- +-@Defmac {HP, [@Var{nnn}], man} +-@cindex hanging indentation [@code{man}] +-@cindex @code{man} macros, hanging indentation +-Set up a paragraph with hanging left indentation. The indentation is +-set to @var{nnn} if that argument is supplied (default unit is +-@samp{n}), otherwise it is set to the previous indentation value +-specified with @code{TP}, @code{IP}, or @code{HP} (or the default value +-if non of them have been used yet). Font size and face are reset to +-their default values. +-@endDefmac +- +-@Defmac {RS, [@Var{nnn}], man} +-@cindex left margin, how to move [@code{man}] +-@cindex @code{man} macros, moving left margin +-Move the left margin to the right by the value @var{nnn} if specified +-(default unit is @samp{n}); otherwise it is set to the previous +-indentation value specified with @code{TP}, @code{IP}, or @code{HP} (or +-to the default value if none of them have been used yet). The +-indentation value is then set to the default. +- +-Calls to the @code{RS} macro can be nested. +-@endDefmac +- +-@Defmac {RE, [@Var{nnn}], man} +-Move the left margin back to level @var{nnn}, restoring the previous +-left margin. If no argument is given, it moves one level back. The +-first level (i.e., no call to @code{RS} yet) has number@tie{}1, and each +-call to @code{RS} increases the level by@tie{}1. +-@endDefmac +- +-@cindex line breaks, with vertical space [@code{man}] +-@cindex @code{man} macros, line breaks with vertical space +-To summarize, the following macros cause a line break with the insertion +-of vertical space (which amount can be changed with the @code{PD} +-macro): @code{SH}, @code{SS}, @code{TP}, @code{LP} (@code{PP}, +-@code{P}), @code{IP}, and @code{HP}. +- +-@cindex line breaks, without vertical space [@code{man}] +-@cindex @code{man} macros, line breaks without vertical space +-The macros @code{RS} and @code{RE} also cause a break but do not insert +-vertical space. +- +-@cindex default indentation, resetting [@code{man}] +-@cindex indentaion, resetting to default [@code{man}] +-@cindex @code{man} macros, resetting default indentation +-Finally, the macros @code{SH}, @code{SS}, @code{LP} (@code{PP}, +-@code{P}), and @code{RS} reset the indentation to its default value. +- +-@c --------------------------------------------------------------------- +- +-@node Man font macros, Miscellaneous man macros, Man usage, man +-@subsection Macros to set fonts +-@cindex font selection [@code{man}] +-@cindex @code{man} macros, how to set fonts +- +-The standard font is roman; the default text size is 10@tie{}point. If +-command line option @option{-rS=@var{n}} is given, use @var{n}@dmn{pt} +-as the default text size. +- +-@Defmac {SM, [@Var{text}], man} +-Set the text on the same line or the text on the next line in a font +-that is one point size smaller than the default font. +-@endDefmac +- +-@Defmac {SB, [@Var{text}], man} +-@cindex bold face [@code{man}] +-@cindex @code{man} macros, bold face +-Set the text on the same line or the text on the next line in bold face +-font, one point size smaller than the default font. +-@endDefmac +- +-@Defmac {BI, text, man} +-Set its arguments alternately in bold face and italic, without a space +-between the arguments. Thus, +- +-@Example +-.BI this "word and" that +-@endExample +- +-@noindent +-produces ``thisword andthat'' with ``this'' and ``that'' in bold face, +-and ``word and'' in italics. +-@endDefmac +- +-@Defmac {IB, text, man} +-Set its arguments alternately in italic and bold face, without a space +-between the arguments. +-@endDefmac +- +-@Defmac {RI, text, man} +-Set its arguments alternately in roman and italic, without a space +-between the arguments. +-@endDefmac +- +-@Defmac {IR, text, man} +-Set its arguments alternately in italic and roman, without a space +-between the arguments. +-@endDefmac +- +-@Defmac {BR, text, man} +-Set its arguments alternately in bold face and roman, without a space +-between the arguments. +-@endDefmac +- +-@Defmac {RB, text, man} +-Set its arguments alternately in roman and bold face, without a space +-between the arguments. +-@endDefmac +- +-@Defmac {B, [@Var{text}], man} +-Set @var{text} in bold face. If no text is present on the line where +-the macro is called, then the text of the next line appears in bold +-face. +-@endDefmac +- +-@Defmac {I, [@Var{text}], man} +-@cindex italic fonts [@code{man}] +-@cindex @code{man} macros, italic fonts +-Set @var{text} in italic. If no text is present on the line where the +-macro is called, then the text of the next line appears in italic. +-@endDefmac +- +-@c --------------------------------------------------------------------- +- +-@node Miscellaneous man macros, Predefined man strings, Man font macros, man +-@subsection Miscellaneous macros +- +-@pindex grohtml +-@cindex @code{man} macros, default indentation +-@cindex default indentation [@code{man}] +-The default indentation is 7.2@dmn{n} in troff mode and 7@dmn{n} in +-nroff mode except for @code{grohtml}, which ignores indentation. +- +-@Defmac {DT, , man} +-@cindex tab stops [@code{man}] +-@cindex @code{man} macros, tab stops +-Set tabs every 0.5@tie{}inches. Since this macro is always executed +-during a call to the @code{TH} macro, it makes sense to call it only if +-the tab positions have been changed. +-@endDefmac +- +-@Defmac {PD, [@Var{nnn}], man} +-@cindex empty space before a paragraph [@code{man}] +-@cindex @code{man} macros, empty space before a paragraph +-Adjust the empty space before a new paragraph (or section). The +-optional argument gives the amount of space (default unit is @samp{v}); +-without parameter, the value is reset to its default value (1@tie{}line +-in nroff mode, 0.4@dmn{v}@tie{}otherwise). +- +-This affects the macros @code{SH}, @code{SS}, @code{TP}, @code{LP} (as +-well as @code{PP} and @code{P}), @code{IP}, and @code{HP}. +-@endDefmac +- +-The following two macros are included for BSD compatibility. +- +-@Defmac {AT, [@Var{system} [@Var{release}]], man} +-@cindex @code{man}macros, BSD compatibility +-Alter the footer for use with @acronym{AT&T} manpages. This command +-exists only for compatibility; don't use it. The first argument +-@var{system} can be: +- +-@table @code +-@item 3 +-7th Edition (the default) +- +-@item 4 +-System III +- +-@item 5 +-System V +-@end table +- +-An optional second argument @var{release} to @code{AT} specifies the +-release number (such as ``System V Release 3''). +-@endDefmac +- +-@Defmac {UC, [@Var{version}], man} +-@cindex @code{man}macros, BSD compatibility +-Alters the footer for use with BSD manpages. This command exists only +-for compatibility; don't use it. The argument can be: +- +-@table @code +-@item 3 +-3rd Berkeley Distribution (the default) +- +-@item 4 +-4th Berkeley Distribution +- +-@item 5 +-4.2 Berkeley Distribution +- +-@item 6 +-4.3 Berkeley Distribution +- +-@item 7 +-4.4 Berkeley Distribution +-@end table +-@endDefmac +- +-@c --------------------------------------------------------------------- +- +-@node Predefined man strings, Preprocessors in man pages, Miscellaneous man macros, man +-@subsection Predefined strings +- +-The following strings are defined: +- +-@Defstr {S, man} +-Switch back to the default font size. +-@endDefstr +- +-@Defstr {HF, man} +-The typeface used for headings. +-The default is @samp{B}. +-@endDefstr +- +-@Defstr {R, man} +-The `registered' sign. +-@endDefstr +- +-@Defstr {Tm, man} +-The `trademark' sign. +-@endDefstr +- +-@DefstrList {lq, man} +-@DefstrListEndx {rq, man} +-@cindex @code{lq} glyph, and @code{lq} string [@code{man}] +-@cindex @code{rq} glyph, and @code{rq} string [@code{man}] +-Left and right quote. This is equal to @code{\(lq} and @code{\(rq}, +-respectively. +-@endDefstr +- +-@c --------------------------------------------------------------------- +- +-@node Preprocessors in man pages, Optional man extensions, Predefined man strings, man +-@subsection Preprocessors in @file{man} pages +- +-@cindex preprocessor, calling convention +-@cindex calling convention of preprocessors +-If a preprocessor like @code{gtbl} or @code{geqn} is needed, it has +-become common usage to make the first line of the man page look like +-this: +- +-@Example +-'\" @var{word} +-@endExample +- +-@pindex geqn@r{, invocation in manual pages} +-@pindex grefer@r{, invocation in manual pages} +-@pindex gtbl@r{, invocation in manual pages} +-@pindex man@r{, invocation of preprocessors} +-@noindent +-Note the single space character after the double quote. @var{word} +-consists of letters for the needed preprocessors: @samp{e} for +-@code{geqn}, @samp{r} for @code{grefer}, @samp{t} for @code{gtbl}. +-Modern implementations of the @code{man} program read this first line +-and automatically call the right preprocessor(s). +- +-@c --------------------------------------------------------------------- +- +-@node Optional man extensions, , Preprocessors in man pages, man +-@subsection Optional @file{man} extensions +- +-@pindex man.local +-Use the file @file{man.local} for local extensions to the @code{man} +-macros or for style changes. +- +-@unnumberedsubsubsec Custom headers and footers +-@cindex @code{man} macros, custom headers and footers +- +-In groff versions 1.18.2 and later, you can specify custom headers and +-footers by redefining the following macros in @file{man.local}. +- +-@Defmac {PT, , man} +-Control the content of the headers. Normally, the header prints the +-command name and section number on either side, and the optional fifth +-argument to @code{TH} in the center. +-@endDefmac +- +-@Defmac {BT, , man} +-Control the content of the footers. Normally, the footer prints the +-page number and the third and fourth arguments to @code{TH}. +- +-Use the @code{FT} number register to specify the footer position. The +-default is @minus{}0.5@dmn{i}. +-@endDefmac +- +-@unnumberedsubsubsec Ultrix-specific man macros +-@cindex Ultrix-specific @code{man} macros +-@cindex @code{man} macros, Ultrix-specific +- +-@pindex man.ultrix +-The @code{groff} source distribution includes a file named +-@file{man.ultrix}, containing macros compatible with the Ultrix variant +-of @code{man}. Copy this file into @file{man.local} (or use the +-@code{mso} request to load it) to enable the following macros. +- +-@Defmac {CT, @Var{key}, man} +-Print @samp{}. +-@endDefmac +- +-@Defmac {CW, , man} +-Print subsequent text using the constant width (Courier) typeface. +-@endDefmac +- +-@Defmac {Ds, , man} +-Begin a non-filled display. +-@endDefmac +- +-@Defmac {De, , man} +-End a non-filled display started with @code{Ds}. +-@endDefmac +- +-@Defmac {EX, [@Var{indent}], man} +-Begin a non-filled display using the constant width (Courier) typeface. +-Use the optional @var{indent} argument to indent the display. +-@endDefmac +- +-@Defmac {EE, , man} +-End a non-filled display started with @code{EX}. +-@endDefmac +- +-@Defmac {G, [@Var{text}], man} +-Set @var{text} in Helvetica. If no text is present on the line where +-the macro is called, then the text of the next line appears in +-Helvetica. +-@endDefmac +- +-@Defmac {GL, [@Var{text}], man} +-Set @var{text} in Helvetica Oblique. If no text is present on the line +-where the macro is called, then the text of the next line appears in +-Helvetica Oblique. +-@endDefmac +- +-@Defmac {HB, [@Var{text}], man} +-Set @var{text} in Helvetica Bold. If no text is present on the line +-where the macro is called, then all text up to the next @code{HB} +-appears in Helvetica Bold. +-@endDefmac +- +-@Defmac {TB, [@Var{text}], man} +-Identical to @code{HB}. +-@endDefmac +- +-@Defmac {MS, @Var{title} @Var{sect} [@Var{punct}], man} +-Set a manpage reference in Ultrix format. The @var{title} is in Courier +-instead of italic. Optional punctuation follows the section number +-without an intervening space. +-@endDefmac +- +-@Defmac {NT, [@code{C}] [@Var{title}], man} +-Begin a note. Print the optional @Var{title}, or the word ``Note'', +-centered on the page. Text following the macro makes up the body of the +-note, and is indented on both sides. If the first argument is @code{C}, +-the body of the note is printed centered (the second argument replaces +-the word ``Note'' if specified). +-@endDefmac +- +-@Defmac {NE, , man} +-End a note begun with @code{NT}. +-@endDefmac +- +-@Defmac {PN, @Var{path} [@Var{punct}], man} +-Set the path name in constant width (Courier), followed by optional +-punctuation. +-@endDefmac +- +-@Defmac {Pn, [@Var{punct}] @Var{path} [@Var{punct}], man} +-If called with two arguments, identical to @code{PN}. If called with +-three arguments, set the second argument in constant width (Courier), +-bracketed by the first and third arguments in the current font. +-@endDefmac +- +-@Defmac {R, , man} +-Switch to roman font and turn off any underlining in effect. +-@endDefmac +- +-@Defmac {RN, , man} +-Print the string @samp{}. +-@endDefmac +- +-@Defmac {VS, [@code{4}], man} +-Start printing a change bar in the margin if the number@tie{}@code{4} is +-specified. Otherwise, this macro does nothing. +-@endDefmac +- +-@Defmac {VE, , man} +-End printing the change bar begun by @code{VS}. +-@endDefmac +- +-@unnumberedsubsubsec Simple example +- +-The following example @file{man.local} file alters the @code{SH} macro +-to add some extra vertical space before printing the heading. Headings +-are printed in Helvetica Bold. +- +-@Example +-.\" Make the heading fonts Helvetica +-.ds HF HB +-. +-.\" Put more whitespace in front of headings. +-.rn SH SH-orig +-.de SH +-. if t .sp (u;\\n[PD]*2) +-. SH-orig \\$* +-.. +-@endExample +- +- +-@c ===================================================================== +- +-@node mdoc, ms, man, Macro Packages +-@section @file{mdoc} +-@cindex @code{mdoc} macros +- +-@c XXX documentation +-@c XXX this is a placeholder until we get stuff knocked into shape +-See the @cite{groff_mdoc(7)} man page (type @command{man groff_mdoc} +-at the command line). +- +- +-@c ===================================================================== +- +-@node ms, me, mdoc, Macro Packages +-@section @file{ms} +-@cindex @code{ms} macros +- +-The @file{-ms} macros are suitable for reports, letters, books, user +-manuals, and so forth. The package provides macros for cover pages, +-section headings, paragraphs, lists, footnotes, pagination, and a table +-of contents. +- +-@menu +-* ms Intro:: +-* General ms Structure:: +-* ms Document Control Registers:: +-* ms Cover Page Macros:: +-* ms Body Text:: +-* ms Page Layout:: +-* Differences from AT&T ms:: +-* Naming Conventions:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node ms Intro, General ms Structure, ms, ms +-@subsection Introduction to @file{ms} +- +-The original @file{-ms} macros were included with @acronym{AT&T} +-@code{troff} as well as the @file{man} macros. While the @file{man} +-package is intended for brief documents that can be read on-line as well +-as printed, the @file{ms} macros are suitable for longer documents that +-are meant to be printed rather than read on-line. +- +-The @file{ms} macro package included with @code{groff} is a complete, +-bottom-up re-implementation. Several macros (specific to @acronym{AT&T} +-or Berkeley) are not included, while several new commands are. +-@xref{Differences from AT&T ms}, for more information. +- +-@c --------------------------------------------------------------------- +- +-@node General ms Structure, ms Document Control Registers, ms Intro, ms +-@subsection General structure of an @file{ms} document +-@cindex @code{ms} macros, general structure +- +-The @file{ms} macro package expects a certain amount of structure, but +-not as much as packages such as @file{man} or @file{mdoc}. +- +-The simplest documents can begin with a paragraph macro (such as +-@code{LP} or @code{PP}), and consist of text separated by paragraph +-macros or even blank lines. Longer documents have a structure as +-follows: +- +-@table @strong +-@item Document type +-If you invoke the @code{RP} (report) macro on the first line of the +-document, @code{groff} prints the cover page information on its own +-page; otherwise it prints the information on the first page with your +-document text immediately following. Other document formats found in +-@acronym{AT&T} @code{troff} are specific to @acronym{AT&T} or Berkeley, +-and are not supported in @code{groff}. +- +-@item Format and layout +-By setting number registers, you can change your document's type (font +-and size), margins, spacing, headers and footers, and footnotes. +-@xref{ms Document Control Registers}, for more details. +- +-@item Cover page +-A cover page consists of a title, the author's name and institution, an +-abstract, and the date.@footnote{Actually, only the title is required.} +-@xref{ms Cover Page Macros}, for more details. +- +-@item Body +-Following the cover page is your document. You can use the @file{ms} +-macros to write reports, letters, books, and so forth. The package is +-designed for structured documents, consisting of paragraphs interspersed +-with headings and augmented by lists, footnotes, tables, and other +-common constructs. @xref{ms Body Text}, for more details. +- +-@item Table of contents +-Longer documents usually include a table of contents, which you can +-invoke by placing the @code{TC} macro at the end of your document. The +-@file{ms} macros have minimal indexing facilities, consisting of the +-@code{IX} macro, which prints an entry on standard error. Printing the +-table of contents at the end is necessary since @code{groff} is a +-single-pass text formatter, thus it cannot determine the page number of +-each section until that section has actually been set and printed. +-Since @file{ms} output is intended for hardcopy, you can manually +-relocate the pages containing the table of contents between the cover +-page and the body text after printing. +-@end table +- +-@c --------------------------------------------------------------------- +- +-@node ms Document Control Registers, ms Cover Page Macros, General ms Structure, ms +-@subsection Document control registers +-@cindex @code{ms} macros, document control registers +- +-The following is a list of document control number registers. For the +-sake of consistency, set registers related to margins at the beginning +-of your document, or just after the @code{RP} macro. You can set other +-registers later in your document, but you should keep them together at +-the beginning to make them easy to find and edit as necessary. +- +-@unnumberedsubsubsec Margin Settings +- +-@Defmpreg {PO, ms} +-Defines the page offset (i.e., the left margin). There is no explicit +-right margin setting; the combination of the @code{PO} and @code{LL} +-registers implicitly define the right margin width. +- +-Effective: next page. +- +-Default value: 1@dmn{i}. +-@endDefmpreg +- +-@Defmpreg {LL, ms} +-Defines the line length (i.e., the width of the body text). +- +-Effective: next paragraph. +- +-Default: 6@dmn{i}. +-@endDefmpreg +- +-@Defmpreg {LT, ms} +-Defines the title length (i.e., the header and footer width). This +-is usually the same as @code{LL}, but not necessarily. +- +-Effective: next paragraph. +- +-Default: 6@dmn{i}. +-@endDefmpreg +- +-@Defmpreg {HM, ms} +-Defines the header margin height at the top of the page. +- +-Effective: next page. +- +-Default: 1@dmn{i}. +-@endDefmpreg +- +-@Defmpreg {FM, ms} +-Defines the footer margin height at the bottom of the page. +- +-Effective: next page. +- +-Default: 1@dmn{i}. +-@endDefmpreg +- +-@unnumberedsubsubsec Text Settings +- +-@Defmpreg {PS, ms} +-Defines the point size of the body text. If the value is larger than or +-equal to 1000, divide it by 1000 to get a fractional point size. For +-example, @samp{.nr PS 10250} sets the document's point size to +-10.25@dmn{p}. +- +-Effective: next paragraph. +- +-Default: 10@dmn{p}. +-@endDefmpreg +- +-@Defmpreg {VS, ms} +-Defines the space between lines (line height plus leading). If the +-value is larger than or equal to 1000, divide it by 1000 to get a +-fractional point size. Due to backwards compatibility, @code{VS} must +-be smaller than 40000 (this is 40.0@dmn{p}). +- +-Effective: next paragraph. +- +-Default: 12@dmn{p}. +-@endDefmpreg +- +-@Defmpreg {PSINCR, ms} +-Defines an increment in point size, which is applied to section headings +-at nesting levels below the value specified in @code{GROWPS}. The value +-of @code{PSINCR} should be specified in points, with the @dmn{p} scaling +-factor, and may include a fractional component; for example, +-@w{@samp{.nr PSINCR 1.5p}} sets a point size increment of 1.5@dmn{p}. +- +-Effective: next section heading. +- +-Default: 1@dmn{p}. +-@endDefmpreg +- +-@Defmpreg {GROWPS, ms} +-Defines the heading level below which the point size increment set by +-@code{PSINCR} becomes effective. Section headings at and above the +-level specified by @code{GROWPS} are printed at the point size set by +-@code{PS}; for each level below the value of @code{GROWPS}, the point +-size is increased in steps equal to the value of @code{PSINCR}. Setting +-@code{GROWPS} to any value less than@tie{}2 disables the incremental +-heading size feature. +- +-Effective: next section heading. +- +-Default: 0. +-@endDefmpreg +- +-@Defmpreg {HY, ms} +-Defines the hyphenation level. @code{HY} sets safely the value of the +-low-level @code{hy} register. Setting the value of @code{HY} to@tie{}0 +-is equivalent to using the @code{nh} request. +- +-Effective: next paragraph. +- +-Default: 14. +-@endDefmpreg +- +-@Defmpreg {FAM, ms} +-Defines the font family used to typeset the document. +- +-Effective: next paragraph. +- +-Default: as defined in the output device. +-@endDefmpreg +- +-@unnumberedsubsubsec Paragraph Settings +- +-@Defmpreg {PI, ms} +-Defines the initial indentation of a (@code{PP} macro) paragraph. +- +-Effective: next paragraph. +- +-Default: 5@dmn{n}. +-@endDefmpreg +- +-@Defmpreg {PD, ms} +-Defines the space between paragraphs. +- +-Effective: next paragraph. +- +-Default: 0.3@dmn{v}. +-@endDefmpreg +- +-@Defmpreg {QI, ms} +-Defines the indentation on both sides of a quoted (@code{QP} macro) +-paragraph. +- +-Effective: next paragraph. +- +-Default: 5@dmn{n}. +-@endDefmpreg +- +-@Defmpreg {PORPHANS, ms} +-Defines the minimum number of initial lines of any paragraph that +-should be kept together, to avoid orphan lines at the bottom of a page. +-If a new paragraph is started close to the bottom of a page, and there +-is insufficient space to accommodate @code{PORPHANS} lines before an +-automatic page break, then the page break is forced, before the start of +-the paragraph. +- +-Effective: next paragraph. +- +-Default: 1. +-@endDefmpreg +- +-@Defmpreg {HORPHANS, ms} +-Defines the minimum number of lines of the following paragraph that +-should be kept together with any section heading introduced by the +-@code{NH} or @code{SH} macros. If a section heading is placed close to +-the bottom of a page, and there is insufficient space to accommodate +-both the heading and at least @code{HORPHANS} lines of the following +-paragraph, before an automatic page break, then the page break is forced +-before the heading. +- +-Effective: next paragraph. +- +-Default: 1. +-@endDefmpreg +- +-@unnumberedsubsubsec Footnote Settings +- +-@Defmpreg {FL, ms} +-Defines the length of a footnote. +- +-Effective: next footnote. +- +-Default: @math{@code{@\n[LL]} * 5 / 6}. +-@endDefmpreg +- +-@Defmpreg {FI, ms} +-Defines the footnote indentation. +- +-Effective: next footnote. +- +-Default: 2@dmn{n}. +-@endDefmpreg +- +-@Defmpreg {FF, ms} +-The footnote format: +-@table @code +-@item 0 +-Print the footnote number as a superscript; indent the footnote +-(default). +- +-@item 1 +-Print the number followed by a period (like 1.@:) and indent the +-footnote. +- +-@item 2 +-Like 1, without an indentation. +- +-@item 3 +-Like 1, but print the footnote number as a hanging paragraph. +-@end table +- +-Effective: next footnote. +- +-Default: 0. +-@endDefmpreg +- +-@Defmpreg {FPS, ms} +-Defines the footnote point size. If the value is larger than or equal +-to 1000, divide it by 1000 to get a fractional point size. +- +-Effective: next footnote. +- +-Default: @math{@code{@\n[PS]} - 2}. +-@endDefmpreg +- +-@Defmpreg {FVS, ms} +-Defines the footnote vertical spacing. If the value is larger than or +-equal to 1000, divide it by 1000 to get a fractional point size. +- +-Effective: next footnote. +- +-Default: @math{@code{@\n[FPS]} + 2}. +-@endDefmpreg +- +-@Defmpreg {FPD, ms} +-Defines the footnote paragraph spacing. +- +-Effective: next footnote. +- +-Default: @math{@code{@\n[PD]} / 2}. +-@endDefmpreg +- +-@unnumberedsubsubsec Miscellaneous Number Registers +- +-@Defmpreg {MINGW, ms} +-Defines the minimum width between columns in a multi-column document. +- +-Effective: next page. +- +-Default: 2@dmn{n}. +-@endDefmpreg +- +-@Defmpreg {DD, ms} +-Sets the vertical spacing before and after a display, a @code{tbl} table, an +-@code{eqn} equation, or a @code{pic} image. +- +-Effective: next paragraph. +- +-Default: 0.5@dmn{v}. +-@endDefmpreg +- +-@c --------------------------------------------------------------------- +- +-@node ms Cover Page Macros, ms Body Text, ms Document Control Registers, ms +-@subsection Cover page macros +-@cindex @code{ms} macros, cover page +-@cindex cover page macros, [@code{ms}] +- +-Use the following macros to create a cover page for your document in the +-order shown. +- +-@Defmac {RP, [@code{no}], ms} +-Specifies the report format for your document. The report format +-creates a separate cover page. The default action (no @code{RP} macro) +-is to print a subset of the cover page on page@tie{}1 of your document. +- +-If you use the word @code{no} as an optional argument, @code{groff} +-prints a title page but does not repeat any of the title page +-information (title, author, abstract, etc.@:) on page@tie{}1 of the +-document. +-@endDefmac +- +-@Defmac {P1, , ms} +-(P-one) Prints the header on page@tie{}1. The default is to suppress +-the header. +-@endDefmac +- +-@Defmac {DA, [@dots{}], ms} +-(optional) Prints the current date, or the arguments to the macro if +-any, on the title page (if specified) and in the footers. This is the +-default for @code{nroff}. +-@endDefmac +- +-@Defmac {ND, [@dots{}], ms} +-(optional) Prints the current date, or the arguments to the macro if +-any, on the title page (if specified) but not in the footers. This is +-the default for @code{troff}. +-@endDefmac +- +-@Defmac {TL, , ms} +-Specifies the document title. @code{groff} collects text following the +-@code{TL} macro into the title, until reaching the author name or +-abstract. +-@endDefmac +- +-@Defmac {AU, , ms} +-Specifies the author's name, which appears on the line (or lines) +-immediately following. You can specify multiple authors as follows: +- +-@Example +-.AU +-John Doe +-.AI +-University of West Bumblefuzz +-.AU +-Martha Buck +-.AI +-Monolithic Corporation +- +-... +-@endExample +-@endDefmac +- +-@Defmac {AI, , ms} +-Specifies the author's institution. You can specify multiple +-institutions in the same way that you specify multiple authors. +-@endDefmac +- +-@Defmac {AB, [@code{no}], ms} +-Begins the abstract. The default is to print the word +-@acronym{ABSTRACT}, centered and in italics, above the text of the +-abstract. The word @code{no} as an optional argument suppresses this +-heading. +-@endDefmac +- +-@Defmac {AE, , ms} +-Ends the abstract. +-@endDefmac +- +-The following is example mark-up for a title page. +-@cindex title page, example markup +-@cindex example markup, title page +- +-@CartoucheExample +-.RP +-.TL +-The Inevitability of Code Bloat +-in Commercial and Free Software +-.AU +-J. Random Luser +-.AI +-University of West Bumblefuzz +-.AB +-This report examines the long-term growth +-of the code bases in two large, popular software +-packages; the free Emacs and the commercial +-Microsoft Word. +-While differences appear in the type or order +-of features added, due to the different +-methodologies used, the results are the same +-in the end. +-.PP +-The free software approach is shown to be +-superior in that while free software can +-become as bloated as commercial offerings, +-free software tends to have fewer serious +-bugs and the added features are in line with +-user demand. +-.AE +- +-... the rest of the paper follows ... +-@endCartoucheExample +- +-@c --------------------------------------------------------------------- +- +-@node ms Body Text, ms Page Layout, ms Cover Page Macros, ms +-@subsection Body text +-@cindex @code{ms} macros, body text +- +-This section describes macros used to mark up the body of your document. +-Examples include paragraphs, sections, and other groups. +- +-@menu +-* Paragraphs in ms:: +-* Headings in ms:: +-* Highlighting in ms:: +-* Lists in ms:: +-* Indentation values in ms:: +-* Tabstops in ms:: +-* ms Displays and Keeps:: +-* ms Insertions:: +-* Example multi-page table:: +-* ms Footnotes:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Paragraphs in ms, Headings in ms, ms Body Text, ms Body Text +-@subsubsection Paragraphs +-@cindex @code{ms} macros, paragraph handling +- +-The following paragraph types are available. +- +-@Defmac {PP, , ms} +-Sets a paragraph with an initial indentation. +-@endDefmac +- +-@Defmac {LP, , ms} +-Sets a paragraph without an initial indentation. +-@endDefmac +- +-@Defmac {QP, , ms} +-Sets a paragraph that is indented at both left and right margins. The +-effect is identical to the @acronym{HTML} @code{
    } element. +-The next paragraph or heading returns margins to normal. +-@endDefmac +- +-@Defmac {XP, , ms} +-Sets a paragraph whose lines are indented, except for the first line. +-This is a Berkeley extension. +-@endDefmac +- +-The following markup uses all four paragraph macros. +- +-@CartoucheExample +-.NH 2 +-Cases used in the study +-.LP +-The following software and versions were +-considered for this report. +-.PP +-For commercial software, we chose +-.B "Microsoft Word for Windows" , +-starting with version 1.0 through the +-current version (Word 2000). +-.PP +-For free software, we chose +-.B Emacs , +-from its first appearance as a standalone +-editor through the current version (v20). +-See [Bloggs 2002] for details. +-.QP +-Franklin's Law applied to software: +-software expands to outgrow both +-RAM and disk space over time. +-.LP +-Bibliography: +-.XP +-Bloggs, Joseph R., +-.I "Everyone's a Critic" , +-Underground Press, March 2002. +-A definitive work that answers all questions +-and criticisms about the quality and usability of +-free software. +-@endCartoucheExample +- +-The @code{PORPHANS} register (@pxref{ms Document Control Registers}) +-operates in conjunction with each of these macros, to inhibit the +-printing of orphan lines at the bottom of any page. +- +-@c --------------------------------------------------------------------- +- +-@node Headings in ms, Highlighting in ms, Paragraphs in ms, ms Body Text +-@subsubsection Headings +-@cindex @code{ms} macros, headings +- +-Use headings to create a hierarchical structure for your document. The +-@file{ms} macros print headings in @strong{bold}, using the same font +-family and point size as the body text. +- +-The following describes the heading macros: +- +-@DefmacList {NH, @Var{curr-level}, ms} +-@DefmacListEnd {NH, @t{S} @Var{level0} @dots{}, ms} +-Numbered heading. The argument is either a numeric argument to indicate +-the level of the heading, or the letter@tie{}@code{S} followed by +-numeric arguments to set the heading level explicitly. +- +-If you specify heading levels out of sequence, such as invoking +-@samp{.NH 3} after @samp{.NH 1}, @code{groff} prints a warning on +-standard error. +-@endDefmac +- +-@DefstrList {SN, ms} +-@DefstrItemx {SN-DOT, ms} +-@DefstrListEndx {SN-NO-DOT, ms} +-After invocation of @code{NH}, the assigned section number is made +-available in the strings @code{SN-DOT} (as it appears in a printed +-section heading with default formatting, followed by a terminating +-period), and @code{SN-NO-DOT} (with the terminating period omitted). +-The string @code{SN} is also defined, as an alias for @code{SN-DOT}; if +-preferred, you may redefine it as an alias for @code{SN-NO-DOT}, by +-including the initialization +-@Example +-.als SN SN-NO-DOT +-@endExample +- +-@noindent +-at any time @strong{before} you would like the change to take effect. +-@endDefstr +- +-@Defstr {SN-STYLE, ms} +-You may control the style used to print section numbers, within numbered +-section headings, by defining an appropriate alias for the string +-@code{SN-STYLE}. The default style, in which the printed section number +-is followed by a terminating period, is obtained by defining the alias +- +-@Example +-.als SN-STYLE SN-DOT +-@endExample +- +-@noindent +-If you prefer to omit the terminating period, from section numbers +-appearing in numbered section headings, you may define the alias +- +-@Example +-.als SN-STYLE SN-NO-DOT +-@endExample +- +-@noindent +-Any such change in section numbering style becomes effective from the +-next use of @code{.NH}, following redefinition of the alias for +-@code{SN-STYLE}. +-@endDefstr +- +-@Defmac {SH, [@Var{match-level}], ms} +-Unnumbered subheading. +- +-The optional @var{match-level} argument is a GNU extension. It is a +-number indicating the level of the heading, in a manner analogous to the +-@var{curr-level} argument to @code{.NH}. Its purpose is to match the +-point size, at which the heading is printed, to the size of a numbered +-heading at the same level, when the @code{GROWPS} and @code{PSINCR} +-heading size adjustment mechanism is in effect. @xref{ms Document +-Control Registers}. +-@endDefmac +- +-The @code{HORPHANS} register (@pxref{ms Document Control Registers}) +-operates in conjunction with the @code{NH} and @code{SH} macros, to +-inhibit the printing of orphaned section headings at the bottom of any +-page. +- +-@c --------------------------------------------------------------------- +- +-@node Highlighting in ms, Lists in ms, Headings in ms, ms Body Text +-@subsubsection Highlighting +-@cindex @code{ms} macros, highlighting +- +-The @file{ms} macros provide a variety of methods to highlight or +-emphasize text: +- +-@Defmac {B, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} +-Sets its first argument in @strong{bold type}. If you specify a second +-argument, @code{groff} prints it in the previous font after the bold +-text, with no intervening space (this allows you to set punctuation +-after the highlighted text without highlighting the punctuation). +-Similarly, it prints the third argument (if any) in the previous font +-@strong{before} the first argument. For example, +- +-@Example +-.B foo ) ( +-@endExample +- +-prints (@strong{foo}). +- +-If you give this macro no arguments, @code{groff} prints all text +-following in bold until the next highlighting, paragraph, or heading +-macro. +-@endDefmac +- +-@Defmac {R, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} +-Sets its first argument in roman (or regular) type. It operates +-similarly to the @code{B}@tie{}macro otherwise. +-@endDefmac +- +-@Defmac {I, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} +-Sets its first argument in @emph{italic type}. It operates similarly +-to the @code{B}@tie{}macro otherwise. +-@endDefmac +- +-@Defmac {CW, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} +-Sets its first argument in a @code{constant width face}. It operates +-similarly to the @code{B}@tie{}macro otherwise. +-@endDefmac +- +-@Defmac {BI, [@Var{txt} [@Var{post} [@Var{pre}]]], ms} +-Sets its first argument in bold italic type. It operates similarly to +-the @code{B}@tie{}macro otherwise. +-@endDefmac +- +-@Defmac {BX, [@Var{txt}], ms} +-Prints its argument and draws a box around it. If you want to box a +-string that contains spaces, use a digit-width space (@code{\0}). +-@endDefmac +- +-@Defmac {UL, [@Var{txt} [@Var{post}]], ms} +-Prints its first argument with an underline. If you specify a second +-argument, @code{groff} prints it in the previous font after the +-underlined text, with no intervening space. +-@endDefmac +- +-@Defmac {LG, , ms} +-Prints all text following in larger type (two points larger than the +-current point size) until the next font size, highlighting, paragraph, +-or heading macro. You can specify this macro multiple times to +-enlarge the point size as needed. +-@endDefmac +- +-@Defmac {SM, , ms} +-Prints all text following in smaller type (two points smaller than the +-current point size) until the next type size, highlighting, paragraph, +-or heading macro. You can specify this macro multiple times to reduce +-the point size as needed. +-@endDefmac +- +-@Defmac {NL, , ms} +-Prints all text following in the normal point size (that is, the value +-of the @code{PS} register). +-@endDefmac +- +-@DefstrList {@Lbrace{}, ms} +-@DefstrListEndx {@Rbrace{}, ms} +-Text enclosed with @code{\*@{} and @code{\*@}} is printed as a +-superscript. +-@endDefstr +- +-@c --------------------------------------------------------------------- +- +-@node Lists in ms, Indentation values in ms, Highlighting in ms, ms Body Text +-@subsubsection Lists +-@cindex @code{ms} macros, lists +- +-The @code{IP} macro handles duties for all lists. +- +-@Defmac {IP, [@Var{marker} [@Var{width}]], ms} +-The @var{marker} is usually a bullet glyph (@code{\[bu]}) for unordered +-lists, a number (or auto-incrementing number register) for numbered +-lists, or a word or phrase for indented (glossary-style) lists. +- +-The @var{width} specifies the indentation for the body of each list +-item; its default unit is @samp{n}. Once specified, the indentation +-remains the same for all list items in the document until specified +-again. +- +-The @code{PORPHANS} register (@pxref{ms Document Control Registers}) +-operates in conjunction with the @code{IP} macro, to inhibit the +-printing of orphaned list markers at the bottom of any page. +-@endDefmac +- +-The following is an example of a bulleted list. +-@cindex example markup, bulleted list [@code{ms}] +-@cindex bulleted list, example markup [@code{ms}] +- +-@Example +-A bulleted list: +-.IP \[bu] 2 +-lawyers +-.IP \[bu] +-guns +-.IP \[bu] +-money +-@endExample +- +-Produces: +- +-@Example +-A bulleted list: +- +-o lawyers +- +-o guns +- +-o money +-@endExample +- +-The following is an example of a numbered list. +-@cindex example markup, numbered list [@code{ms}] +-@cindex numbered list, example markup [@code{ms}] +- +-@Example +-.nr step 1 1 +-A numbered list: +-.IP \n[step] 3 +-lawyers +-.IP \n+[step] +-guns +-.IP \n+[step] +-money +-@endExample +- +-Produces: +- +-@Example +-A numbered list: +- +-1. lawyers +- +-2. guns +- +-3. money +-@endExample +- +-Note the use of the auto-incrementing number register in this example. +- +-The following is an example of a glossary-style list. +-@cindex example markup, glossary-style list [@code{ms}] +-@cindex glossary-style list, example markup [@code{ms}] +- +-@Example +-A glossary-style list: +-.IP lawyers 0.4i +-Two or more attorneys. +-.IP guns +-Firearms, preferably +-large-caliber. +-.IP money +-Gotta pay for those +-lawyers and guns! +-@endExample +- +-Produces: +- +-@Example +-A glossary-style list: +- +-lawyers +- Two or more attorneys. +- +-guns Firearms, preferably large-caliber. +- +-money +- Gotta pay for those lawyers and guns! +-@endExample +- +-In the last example, the @code{IP} macro places the definition on the +-same line as the term if it has enough space; otherwise, it breaks to +-the next line and starts the definition below the term. This may or may +-not be the effect you want, especially if some of the definitions break +-and some do not. The following examples show two possible ways to force +-a break. +- +-The first workaround uses the @code{br} request to force a break after +-printing the term or label. +- +-@CartoucheExample +-A glossary-style list: +-.IP lawyers 0.4i +-Two or more attorneys. +-.IP guns +-.br +-Firearms, preferably large-caliber. +-.IP money +-Gotta pay for those lawyers and guns! +-@endCartoucheExample +- +-The second workaround uses the @code{\p} escape to force the break. +-Note the space following the escape; this is important. If you omit the +-space, @code{groff} prints the first word on the same line as the term +-or label (if it fits) @strong{then} breaks the line. +- +-@CartoucheExample +-A glossary-style list: +-.IP lawyers 0.4i +-Two or more attorneys. +-.IP guns +-\p Firearms, preferably large-caliber. +-.IP money +-Gotta pay for those lawyers and guns! +-@endCartoucheExample +- +-To set nested lists, use the @code{RS} and @code{RE} macros. +-@xref{Indentation values in ms}, for more information. +-@cindex @code{ms} macros, nested lists +-@cindex nested lists [@code{ms}] +- +-For example: +- +-@CartoucheExample +-.IP \[bu] 2 +-Lawyers: +-.RS +-.IP \[bu] +-Dewey, +-.IP \[bu] +-Cheatham, +-.IP \[bu] +-and Howe. +-.RE +-.IP \[bu] +-Guns +-@endCartoucheExample +- +-Produces: +- +-@Example +-o Lawyers: +- +- o Dewey, +- +- o Cheatham, +- +- o and Howe. +- +-o Guns +-@endExample +- +-@c --------------------------------------------------------------------- +- +-@node Indentation values in ms, Tabstops in ms, Lists in ms, ms Body Text +-@subsubsection Indentation values +- +-In many situations, you may need to indentation a section of text while +-still wrapping and filling. @xref{Lists in ms}, for an example of +-nested lists. +- +-@DefmacList {RS, , ms} +-@DefmacListEndx {RE, , ms} +-These macros begin and end an indented section. The @code{PI} register +-controls the amount of indentation, allowing the indented text to line +-up under hanging and indented paragraphs. +-@endDefmac +- +-@xref{ms Displays and Keeps}, for macros to indentation and turn off +-filling. +- +-@c --------------------------------------------------------------------- +- +-@node Tabstops in ms, ms Displays and Keeps, Indentation values in ms, ms Body Text +-@subsubsection Tab Stops +- +-Use the @code{ta} request to define tab stops as needed. @xref{Tabs and +-Fields}. +- +-@Defmac {TA, , ms} +-Use this macro to reset the tab stops to the default for @file{ms} +-(every 5n). You can redefine the @code{TA} macro to create a different +-set of default tab stops. +-@endDefmac +- +-@c --------------------------------------------------------------------- +- +-@node ms Displays and Keeps, ms Insertions, Tabstops in ms, ms Body Text +-@subsubsection Displays and keeps +-@cindex @code{ms} macros, displays +-@cindex @code{ms} macros, keeps +-@cindex keeps [@code{ms}] +-@cindex displays [@code{ms}] +- +-Use displays to show text-based examples or figures (such as code +-listings). +- +-Displays turn off filling, so lines of code are displayed as-is without +-inserting @code{br} requests in between each line. Displays can be +-@dfn{kept} on a single page, or allowed to break across pages. +- +-@DefmacList {DS, @t{L}, ms} +-@DefmacItemx {LD, , ms} +-@DefmacListEndx {DE, , ms} +-Left-justified display. The @samp{.DS L} call generates a page break, +-if necessary, to keep the entire display on one page. The @code{LD} +-macro allows the display to break across pages. The @code{DE} macro +-ends the display. +-@endDefmac +- +-@DefmacList {DS, @t{I}, ms} +-@DefmacItemx {ID, , ms} +-@DefmacListEndx {DE, , ms} +-Indents the display as defined by the @code{DI} register. The @samp{.DS +-I} call generates a page break, if necessary, to keep the entire display +-on one page. The @code{ID} macro allows the display to break across +-pages. The @code{DE} macro ends the display. +-@endDefmac +- +-@DefmacList {DS, @t{B}, ms} +-@DefmacItemx {BD, , ms} +-@DefmacListEndx {DE, , ms} +-Sets a block-centered display: the entire display is left-justified, but +-indented so that the longest line in the display is centered on the +-page. The @samp{.DS B} call generates a page break, if necessary, to +-keep the entire display on one page. The @code{BD} macro allows the +-display to break across pages. The @code{DE} macro ends the display. +-@endDefmac +- +-@DefmacList {DS, @t{C}, ms} +-@DefmacItemx {CD, , ms} +-@DefmacListEndx {DE, , ms} +-Sets a centered display: each line in the display is centered. The +-@samp{.DS C} call generates a page break, if necessary, to keep the +-entire display on one page. The @code{CD} macro allows the display to +-break across pages. The @code{DE} macro ends the display. +-@endDefmac +- +-@DefmacList {DS, @t{R}, ms} +-@DefmacItemx {RD, , ms} +-@DefmacListEndx {DE, , ms} +-Right-justifies each line in the display. The @samp{.DS R} call +-generates a page break, if necessary, to keep the entire display on one +-page. The @code{RD} macro allows the display to break across pages. +-The @code{DE} macro ends the display. +-@endDefmac +- +-@DefmacList {Ds, , ms} +-@DefmacListEndx {De, , ms} +-These two macros were formerly provided as aliases for @code{DS} and +-@code{DE}, respectively. They have been removed, and should no longer +-be used. The original implementations of @code{DS} and @code{DE} are +-retained, and should be used instead. X11 documents that actually use +-@code{Ds} and @code{De} always load a specific macro file from the X11 +-distribution (@file{macros.t}) that provides proper definitions for the +-two macros. +-@endDefmac +- +-On occasion, you may want to @dfn{keep} other text together on a page. +-For example, you may want to keep two paragraphs together, or a +-paragraph that refers to a table (or list, or other item) immediately +-following. The @file{ms} macros provide the @code{KS} and @code{KE} +-macros for this purpose. +- +-@DefmacList {KS, , ms} +-@DefmacListEndx {KE, , ms} +-The @code{KS} macro begins a block of text to be kept on a single page, +-and the @code{KE} macro ends the block. +-@endDefmac +- +-@DefmacList {KF, , ms} +-@DefmacListEndx {KE, , ms} +-Specifies a @dfn{floating keep}; if the keep cannot fit on the current +-page, @code{groff} holds the contents of the keep and allows text +-following the keep (in the source file) to fill in the remainder of the +-current page. When the page breaks, whether by an explicit @code{bp} +-request or by reaching the end of the page, @code{groff} prints the +-floating keep at the top of the new page. This is useful for printing +-large graphics or tables that do not need to appear exactly where +-specified. +-@endDefmac +- +-You can also use the @code{ne} request to force a page break if there is +-not enough vertical space remaining on the page. +- +-Use the following macros to draw a box around a section of text (such as +-a display). +- +-@DefmacList {B1, , ms} +-@DefmacListEndx {B2, , ms} +-Marks the beginning and ending of text that is to have a box drawn +-around it. The @code{B1} macro begins the box; the @code{B2} macro ends +-it. Text in the box is automatically placed in a diversion (keep). +-@endDefmac +- +-@c --------------------------------------------------------------------- +- +-@node ms Insertions, Example multi-page table, ms Displays and Keeps, ms Body Text +-@subsubsection Tables, figures, equations, and references +-@cindex @code{ms} macros, tables +-@cindex @code{ms} macros, figures +-@cindex @code{ms} macros, equations +-@cindex @code{ms} macros, references +-@cindex tables [@code{ms}] +-@cindex figures [@code{ms}] +-@cindex equations [@code{ms}] +-@cindex references [@code{ms}] +- +-The @file{ms} macros support the standard @code{groff} preprocessors: +-@code{tbl}, @code{pic}, @code{eqn}, and @code{refer}. +-@pindex tbl +-@pindex pic +-@pindex eqn +-@pindex refer +-You mark text meant for preprocessors by enclosing it in pairs of tags +-as follows. +- +-@DefmacList {TS, [@code{H}], ms} +-@DefmacListEndx {TE, , ms} +-Denotes a table, to be processed by the @code{tbl} preprocessor. The +-optional argument@tie{}@code{H} to @code{TS} instructs @code{groff} to +-create a running header with the information up to the @code{TH} macro. +-@code{groff} prints the header at the beginning of the table; if the +-table runs onto another page, @code{groff} prints the header on the next +-page as well. +-@endDefmac +- +-@DefmacList {PS, , ms} +-@DefmacListEndx {PE, , ms} +-Denotes a graphic, to be processed by the @code{pic} preprocessor. You +-can create a @code{pic} file by hand, using the @acronym{AT&T} +-@code{pic} manual available on the Web as a reference, or by using a +-graphics program such as @code{xfig}. +-@endDefmac +- +-@DefmacList {EQ, [@Var{align}], ms} +-@DefmacListEndx {EN, , ms} +-Denotes an equation, to be processed by the @code{eqn} preprocessor. +-The optional @var{align} argument can be @code{C}, @code{L}, +-or@tie{}@code{I} to center (the default), left-justify, or indent the +-equation. +-@endDefmac +- +-@DefmacList {[, , ms} +-@DefmacListEndx {], , ms} +-Denotes a reference, to be processed by the @code{refer} preprocessor. +-The GNU @cite{refer(1)} man page provides a comprehensive reference to +-the preprocessor and the format of the bibliographic database. +-@endDefmac +- +-@menu +-* Example multi-page table:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Example multi-page table, ms Footnotes, ms Insertions, ms Body Text +-@subsubsection An example multi-page table +-@cindex example markup, multi-page table [@code{ms}] +-@cindex multi-page table, example markup [@code{ms}] +- +-The following is an example of how to set up a table that may print +-across two or more pages. +- +-@CartoucheExample +-.TS H +-allbox expand; +-cb | cb . +-Text ...of heading... +-_ +-.TH +-.T& +-l | l . +-... the rest of the table follows... +-.CW +-.TE +-@endCartoucheExample +- +-@c --------------------------------------------------------------------- +- +-@node ms Footnotes, , Example multi-page table, ms Body Text +-@subsubsection Footnotes +-@cindex @code{ms} macros, footnotes +-@cindex footnotes [@code{ms}] +- +-The @file{ms} macro package has a flexible footnote system. You can +-specify either numbered footnotes or symbolic footnotes (that is, using +-a marker such as a dagger symbol). +- +-@Defstr {*, ms} +-Specifies the location of a numbered footnote marker in the text. +-@endDefesc +- +-@DefmacList {FS, , ms} +-@DefmacListEndx {FE, , ms} +-Specifies the text of the footnote. The default action is to create a +-numbered footnote; you can create a symbolic footnote by specifying a +-@dfn{mark} glyph (such as @code{\[dg]} for the dagger glyph) in the body +-text and as an argument to the @code{FS} macro, followed by the text of +-the footnote and the @code{FE} macro. +-@endDefmac +- +-You can control how @code{groff} prints footnote numbers by changing the +-value of the @code{FF} register. @xref{ms Document Control Registers}. +- +-@cindex footnotes, and keeps [@code{ms}] +-@cindex keeps, and footnotes [@code{ms}] +-@cindex footnotes, and displays [@code{ms}] +-@cindex displays, and footnotes [@code{ms}] +-Footnotes can be safely used within keeps and displays, but you should +-avoid using numbered footnotes within floating keeps. You can set a +-second @code{\**} marker between a @code{\**} and its corresponding +-@code{.FS} entry; as long as each @code{FS} macro occurs @emph{after} +-the corresponding @code{\**} and the occurrences of @code{.FS} are in +-the same order as the corresponding occurrences of @code{\**}. +- +-@c --------------------------------------------------------------------- +- +-@node ms Page Layout, Differences from AT&T ms, ms Body Text, ms +-@subsection Page layout +-@cindex @code{ms} macros, page layout +-@cindex page layout [@code{ms}] +- +-The default output from the @file{ms} macros provides a minimalist page +-layout: it prints a single column, with the page number centered at the +-top of each page. It prints no footers. +- +-You can change the layout by setting the proper number registers and +-strings. +- +-@menu +-* ms Headers and Footers:: +-* ms Margins:: +-* ms Multiple Columns:: +-* ms TOC:: +-* ms Strings and Special Characters:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node ms Headers and Footers, ms Margins, ms Page Layout, ms Page Layout +-@subsubsection Headers and footers +-@cindex @code{ms} macros, headers +-@cindex @code{ms} macros, footers +-@cindex headers [@code{ms}] +-@cindex footers [@code{ms}] +- +-For documents that do not distinguish between odd and even pages, set +-the following strings: +- +-@DefstrList {LH, ms} +-@DefstrItemx {CH, ms} +-@DefstrListEndx {RH, ms} +-Sets the left, center, and right headers. +-@endDefstr +- +-@DefstrList {LF, ms} +-@DefstrItemx {CF, ms} +-@DefstrListEndx {RF, ms} +-Sets the left, center, and right footers. +-@endDefstr +- +-For documents that need different information printed in the even and +-odd pages, use the following macros: +- +-@DefmacList {OH, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} +-@DefmacItemx {EH, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} +-@DefmacItemx {OF, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} +-@DefmacListEndx {EF, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}, ms} +-The @code{OH} and @code{EH} macros define headers for the odd and even +-pages; the @code{OF} and @code{EF} macros define footers for the odd and +-even pages. This is more flexible than defining the individual strings. +- +-You can replace the quote (@code{'}) marks with any character not +-appearing in the header or footer text. +-@endDefmac +- +-To specify custom header and footer processing, redefine the following +-macros: +- +-@DefmacList {PT,, ms} +-@DefmacItemx {HD,, ms} +-@DefmacListEndx {BT,, ms} +-The @code{PT} macro defines a custom header; the @code{BT} macro defines +-a custom footer. These macros must handle odd/even/first page +-differences if necessary. +- +-The @code{HD} macro defines additional header processing to take place +-after executing the @code{PT} macro. +-@endDefmac +- +-@c --------------------------------------------------------------------- +- +-@node ms Margins, ms Multiple Columns, ms Headers and Footers, ms Page Layout +-@subsubsection Margins +-@cindex @code{ms} macros, margins +- +-You control margins using a set of number registers. @xref{ms Document +-Control Registers}, for details. +- +-@c --------------------------------------------------------------------- +- +-@node ms Multiple Columns, ms TOC, ms Margins, ms Page Layout +-@subsubsection Multiple columns +-@cindex @code{ms} macros, multiple columns +-@cindex multiple columns [@code{ms}] +- +-The @file{ms} macros can set text in as many columns as do reasonably +-fit on the page. The following macros are available; all of them force +-a page break if a multi-column mode is already set. However, if the +-current mode is single-column, starting a multi-column mode does +-@emph{not} force a page break. +- +-@Defmac {1C, , ms} +-Single-column mode. +-@endDefmac +- +-@Defmac {2C, , ms} +-Two-column mode. +-@endDefmac +- +-@Defmac {MC, [@Var{width} [@Var{gutter}]], ms} +-Multi-column mode. If you specify no arguments, it is equivalent to the +-@code{2C} macro. Otherwise, @var{width} is the width of each column and +-@var{gutter} is the space between columns. The @code{MINGW} number +-register controls the default gutter width. +-@endDefmac +- +-@c --------------------------------------------------------------------- +- +-@node ms TOC, ms Strings and Special Characters, ms Multiple Columns, ms Page Layout +-@subsubsection Creating a table of contents +-@cindex @code{ms} macros, creating table of contents +-@cindex table of contents, creating [@code{ms}] +- +-The facilities in the @file{ms} macro package for creating a table of +-contents are semi-automated at best. Assuming that you want the table +-of contents to consist of the document's headings, you need to repeat +-those headings wrapped in @code{XS} and @code{XE} macros. +- +-@DefmacList {XS, [@Var{page}], ms} +-@DefmacItemx {XA, [@Var{page}], ms} +-@DefmacListEndx {XE, , ms} +-These macros define a table of contents or an individual entry in the +-table of contents, depending on their use. The macros are very simple; +-they cannot indent a heading based on its level. The easiest way to +-work around this is to add tabs to the table of contents string. The +-following is an example: +- +-@CartoucheExample +-.NH 1 +-Introduction +-.XS +-Introduction +-.XE +-.LP +-... +-.CW +-.NH 2 +-Methodology +-.XS +-Methodology +-.XE +-.LP +-... +-@endCartoucheExample +- +-You can manually create a table of contents by beginning with the +-@code{XS} macro for the first entry, specifying the page number for that +-entry as the argument to @code{XS}. Add subsequent entries using the +-@code{XA} macro, specifying the page number for that entry as the +-argument to @code{XA}. The following is an example: +- +-@CartoucheExample +-.XS 1 +-Introduction +-.XA 2 +-A Brief History of the Universe +-.XA 729 +-Details of Galactic Formation +-... +-.XE +-@endCartoucheExample +-@endDefmac +- +-@Defmac {TC, [@code{no}], ms} +-Prints the table of contents on a new page, setting the page number +-to@tie{}@strong{i} (Roman lowercase numeral one). You should usually +-place this macro at the end of the file, since @code{groff} is a +-single-pass formatter and can only print what has been collected up to +-the point that the @code{TC} macro appears. +- +-The optional argument @code{no} suppresses printing the title specified +-by the string register @code{TOC}. +-@endDefmac +- +-@Defmac {PX, [@code{no}], ms} +-Prints the table of contents on a new page, using the current page +-numbering sequence. Use this macro to print a manually-generated table +-of contents at the beginning of your document. +- +-The optional argument @code{no} suppresses printing the title specified +-by the string register @code{TOC}. +-@endDefmac +- +-The @cite{Groff and Friends HOWTO} includes a @code{sed} script that +-automatically inserts @code{XS} and @code{XE} macro entries after each +-heading in a document. +- +-Altering the @code{NH} macro to automatically build the table of +-contents is perhaps initially more difficult, but would save a great +-deal of time in the long run if you use @file{ms} regularly. +- +-@c --------------------------------------------------------------------- +- +-@node ms Strings and Special Characters, , ms TOC, ms Page Layout +-@subsubsection Strings and Special Characters +-@cindex @code{ms} macros, strings +-@cindex @code{ms} macros, special characters +-@cindex @code{ms} macros, accent marks +-@cindex accent marks [@code{ms}] +-@cindex special characters [@code{ms}] +-@cindex strings [@code{ms}] +- +-The @file{ms} macros provide the following predefined strings. You can +-change the string definitions to help in creating documents in languages +-other than English. +- +-@Defstr {REFERENCES, ms} +-Contains the string printed at the beginning of the references +-(bibliography) page. The default is @samp{References}. +-@endDefstr +- +-@Defstr {ABSTRACT, ms} +-Contains the string printed at the beginning of the abstract. The +-default is @samp{ABSTRACT}. +-@endDefstr +- +-@Defstr {TOC, ms} +-Contains the string printed at the beginning of the table of contents. +-@endDefstr +- +-@DefstrList {MONTH1, ms} +-@DefstrItemx {MONTH2, ms} +-@DefstrItemx {MONTH3, ms} +-@DefstrItemx {MONTH4, ms} +-@DefstrItemx {MONTH5, ms} +-@DefstrItemx {MONTH6, ms} +-@DefstrItemx {MONTH7, ms} +-@DefstrItemx {MONTH8, ms} +-@DefstrItemx {MONTH9, ms} +-@DefstrItemx {MONTH10, ms} +-@DefstrItemx {MONTH11, ms} +-@DefstrListEndx {MONTH12, ms} +-Prints the full name of the month in dates. The default is +-@samp{January}, @samp{February}, etc. +-@endDefstr +- +-The following special characters are available@footnote{For an +-explanation what special characters are see @ref{Special Characters}.}: +- +-@Defstr {-, ms} +-Prints an em dash. +-@endDefstr +- +-@DefstrList {Q, ms} +-@DefstrListEndx {U, ms} +-Prints typographer's quotes in troff, and plain quotes in nroff. +-@code{\*Q} is the left quote and @code{\*U} is the right quote. +-@endDefstr +- +-Improved accent marks are available in the @file{ms} macros. +- +-@Defmac {AM, , ms} +-Specify this macro at the beginning of your document to enable extended +-accent marks and special characters. This is a Berkeley extension. +- +-To use the accent marks, place them @strong{after} the character being +-accented. +- +-Note that groff's native support for accents is superior to the +-following definitions. +-@endDefmac +- +-The following accent marks are available after invoking the @code{AM} +-macro: +- +-@Defstr {', ms} +-Acute accent. +-@endDefstr +- +-@Defstr {`, ms} +-Grave accent. +-@endDefstr +- +-@Defstr {^, ms} +-Circumflex. +-@endDefstr +- +-@Defstr {\,, ms} +-Cedilla. +-@endDefstr +- +-@Defstr {~, ms} +-Tilde. +-@endDefstr +- +-@deffn String @t{\*[:]} +-@ifnotinfo +-@stindex : @r{[}ms@r{]} +-@end ifnotinfo +-@ifinfo +-@stindex \*[@r{}] @r{[}ms@r{]} +-@end ifinfo +-Umlaut. +-@end deffn +- +-@Defstr {v, ms} +-Hacek. +-@endDefstr +- +-@Defstr {_, ms} +-Macron (overbar). +-@endDefstr +- +-@Defstr {., ms} +-Underdot. +-@endDefstr +- +-@Defstr {o, ms} +-Ring above. +-@endDefstr +- +-The following are standalone characters available after invoking the +-@code{AM} macro: +- +-@Defstr {?, ms} +-Upside-down question mark. +-@endDefstr +- +-@Defstr {!, ms} +-Upside-down exclamation point. +-@endDefstr +- +-@Defstr {8, ms} +-German ligature. +-@endDefstr +- +-@Defstr {3, ms} +-Yogh. +-@endDefstr +- +-@Defstr {Th, ms} +-Uppercase thorn. +-@endDefstr +- +-@Defstr {th, ms} +-Lowercase thorn. +-@endDefstr +- +-@Defstr {D-, ms} +-Uppercase eth. +-@endDefstr +- +-@Defstr {d-, ms} +-Lowercase eth. +-@endDefstr +- +-@Defstr {q, ms} +-Hooked o. +-@endDefstr +- +-@Defstr {ae, ms} +-Lowercase ligature. +-@endDefstr +- +-@Defstr {Ae, ms} +-Uppercase ligature. +-@endDefstr +- +-@c --------------------------------------------------------------------- +- +-@node Differences from AT&T ms, Naming Conventions, ms Page Layout, ms +-@subsection Differences from @acronym{AT&T} @file{ms} +-@cindex @code{ms} macros, differences from @acronym{AT&T} +-@cindex @acronym{AT&T} @code{troff}, @code{ms} macro package differences +- +-This section lists the (minor) differences between the @code{groff -ms} +-macros and @acronym{AT&T} @code{troff -ms} macros. +- +-@itemize @bullet +-@item +-The internals of @code{groff -ms} differ from the internals of +-@acronym{AT&T} @code{troff -ms}. Documents that depend upon +-implementation details of @acronym{AT&T} @code{troff -ms} may not format +-properly with @code{groff -ms}. +- +-@item +-The general error-handling policy of @code{groff -ms} is to detect and +-report errors, rather than silently to ignore them. +- +-@item +-@code{groff -ms} does not work in compatibility mode (this is, with the +-@option{-C} option). +- +-@item +-There is no special support for typewriter-like devices. +- +-@item +-@code{groff -ms} does not provide cut marks. +- +-@item +-Multiple line spacing is not supported. Use a larger vertical spacing +-instead. +- +-@item +-Some @acronym{UNIX} @code{ms} documentation says that the @code{CW} and +-@code{GW} number registers can be used to control the column width and +-gutter width, respectively. These number registers are not used in +-@code{groff -ms}. +- +-@item +-Macros that cause a reset (paragraphs, headings, etc.@:) may change the +-indentation. Macros that change the indentation do not increment or +-decrement the indentation, but rather set it absolutely. This can cause +-problems for documents that define additional macros of their own. The +-solution is to use not the @code{in} request but instead the @code{RS} +-and @code{RE} macros. +- +-@item +-To make @code{groff -ms} use the default page offset (which also +-specifies the left margin), the @code{PO} register must stay undefined +-until the first @file{-ms} macro is evaluated. This implies that +-@code{PO} should not be used early in the document, unless it is changed +-also: Remember that accessing an undefined register automatically +-defines it. +-@end itemize +- +-@Defmpreg {GS, ms} +-This number register is set to@tie{}1 by the @code{groff -ms} macros, +-but it is not used by the @code{AT&T} @code{troff -ms} macros. +-Documents that need to determine whether they are being formatted with +-@code{AT&T} @code{troff -ms} or @code{groff -ms} should use this number +-register. +-@endDefmpreg +- +-Emulations of a few ancient Bell Labs macros can be re-enabled by +-calling the otherwise undocumented @code{SC} section-header macro. +-Calling @code{SC} enables @code{UC} for marking up a product or +-application name, and the pair @code{P1}/@code{P2} for surrounding code +-example displays. +- +-These are not enabled by default because (a)@tie{}they were not +-documented, in the original @code{ms} manual, and (b)@tie{}the @code{P1} +-and @code{UC} macros collide with different macros with the same names +-in the Berkeley version of @code{ms}. +- +-These @code{groff} emulations are sufficient to give back the 1976 +-Kernighan@tie{}& Cherry paper @cite{Typsetting Mathematics -- User's +-Guide} its section headings, and restore some text that had gone missing +-as arguments of undefined macros. No warranty express or implied is +-given as to how well the typographic details these produce match the +-original Bell Labs macros. +- +-@menu +-* Missing ms Macros:: +-* Additional ms Macros:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Missing ms Macros, Additional ms Macros, Differences from AT&T ms, Differences from AT&T ms +-@subsubsection @code{troff} macros not appearing in @code{groff} +- +-Macros missing from @code{groff -ms} are cover page macros specific to +-Bell Labs and Berkeley. The macros known to be missing are: +- +-@table @code +-@item .TM +-Technical memorandum; a cover sheet style +- +-@item .IM +-Internal memorandum; a cover sheet style +- +-@item .MR +-Memo for record; a cover sheet style +- +-@item .MF +-Memo for file; a cover sheet style +- +-@item .EG +-Engineer's notes; a cover sheet style +- +-@item .TR +-Computing Science Tech Report; a cover sheet style +- +-@item .OK +-Other keywords +- +-@item .CS +-Cover sheet information +- +-@item .MH +-A cover sheet macro +-@end table +- +-@c --------------------------------------------------------------------- +- +-@node Additional ms Macros, , Missing ms Macros, Differences from AT&T ms +-@subsubsection @code{groff} macros not appearing in @acronym{AT&T} @code{troff} +- +-The @code{groff -ms} macros have a few minor extensions compared to the +-@acronym{AT&T} @code{troff -ms} macros. +- +-@Defmac {AM, , ms} +-Improved accent marks. @xref{ms Strings and Special Characters}, for +-details. +-@endDefmac +- +-@Defmac {DS, @t{I}, ms} +-Indented display. The default behavior of @acronym{AT&T} @code{troff +--ms} was to indent; the @code{groff} default prints displays flush left +-with the body text. +-@endDefmac +- +-@Defmac {CW, , ms} +-Print text in @code{constant width} (Courier) font. +-@endDefmac +- +-@Defmac {IX, , ms} +-Indexing term (printed on standard error). You can write a script to +-capture and process an index generated in this manner. +-@endDefmac +- +-The following additional number registers +-appear in @code{groff -ms}: +- +-@Defmpreg {MINGW, ms} +-Specifies a minimum space between columns (for multi-column output); +-this takes the place of the @code{GW} register that was documented but +-apparently not implemented in @acronym{AT&T} @code{troff}. +-@endDefmpreg +- +-Several new string registers are available as well. You can change +-these to handle (for example) the local language. @xref{ms Strings and +-Special Characters}, for details. +- +-@c --------------------------------------------------------------------- +- +-@node Naming Conventions, , Differences from AT&T ms, ms +-@subsection Naming Conventions +-@cindex @code{ms} macros, naming conventions +-@cindex naming conventions, @code{ms} macros +- +-The following conventions are used for names of macros, strings and +-number registers. External names available to documents that use the +-@code{groff -ms} macros contain only uppercase letters and digits. +- +-Internally the macros are divided into modules; naming conventions are +-as follows: +- +-@itemize @bullet +-@item +-Names used only within one module are of the form +-@var{module}@code{*}@var{name}. +- +-@item +-Names used outside the module in which they are defined are of the form +-@var{module}@code{@@}@var{name}. +- +-@item +-Names associated with a particular environment are of the form +-@var{environment}@code{:}@var{name}; these are used only within the +-@code{par} module. +- +-@item +-@var{name} does not have a module prefix. +- +-@item +-Constructed names used to implement arrays are of the form +-@var{array}@code{!}@var{index}. +-@end itemize +- +-Thus the groff ms macros reserve the following names: +- +-@itemize @bullet +-@item +-Names containing the characters @code{*}, @code{@@}, and@tie{}@code{:}. +- +-@item +-Names containing only uppercase letters and digits. +-@end itemize +- +- +-@c ===================================================================== +- +-@node me, mm, ms, Macro Packages +-@section @file{me} +-@cindex @code{me} macro package +- +-@c XXX documentation +-@c XXX this is a placeholder until we get stuff knocked into shape +-See the @file{meintro.me} and @file{meref.me} documents in groff's +-@file{doc} directory. +- +- +-@c ===================================================================== +- +-@node mm, mom, me, Macro Packages +-@section @file{mm} +-@cindex @code{mm} macro package +- +-@c XXX documentation +-@c XXX this is a placeholder until we get stuff knocked into shape +-See the @cite{groff_mm(7)} man page (type @command{man groff_mm} at the +-command line). +- +- +-@c ===================================================================== +- +-@node mom, , mm, Macro Packages +-@section @file{mom} +-@cindex @code{mom} macro package +- +-@c XXX documentation +-@c XXX this is a placeholder until we get stuff knocked into shape +-See the @cite{groff_mom(7)} man page (type @command{man groff_mom} at +-the command line), which gives a short overview and a link to its +-extensive documentation in HTML format. +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node gtroff Reference, Preprocessors, Macro Packages, Top +-@chapter @code{gtroff} Reference +-@cindex reference, @code{gtroff} +-@cindex @code{gtroff}, reference +- +-This chapter covers @strong{all} of the facilities of @code{gtroff}. +-Users of macro packages may skip it if not interested in details. +- +- +-@menu +-* Text:: +-* Measurements:: +-* Expressions:: +-* Identifiers:: +-* Embedded Commands:: +-* Registers:: +-* Manipulating Filling and Adjusting:: +-* Manipulating Hyphenation:: +-* Manipulating Spacing:: +-* Tabs and Fields:: +-* Character Translations:: +-* Troff and Nroff Mode:: +-* Line Layout:: +-* Line Control:: +-* Page Layout:: +-* Page Control:: +-* Fonts and Symbols:: +-* Sizes:: +-* Strings:: +-* Conditionals and Loops:: +-* Writing Macros:: +-* Page Motions:: +-* Drawing Requests:: +-* Traps:: +-* Diversions:: +-* Environments:: +-* Suppressing output:: +-* Colors:: +-* I/O:: +-* Postprocessor Access:: +-* Miscellaneous:: +-* Gtroff Internals:: +-* Debugging:: +-* Implementation Differences:: +-@end menu +- +- +-@c ===================================================================== +- +-@node Text, Measurements, gtroff Reference, gtroff Reference +-@section Text +-@cindex text, @code{gtroff} processing +- +-@code{gtroff} input files contain text with control commands +-interspersed throughout. But, even without control codes, @code{gtroff} +-still does several things with the input text: +- +-@itemize @bullet +-@item +-filling and adjusting +- +-@item +-adding additional space after sentences +- +-@item +-hyphenating +- +-@item +-inserting implicit line breaks +-@end itemize +- +-@menu +-* Filling and Adjusting:: +-* Hyphenation:: +-* Sentences:: +-* Tab Stops:: +-* Implicit Line Breaks:: +-* Input Conventions:: +-* Input Encodings:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Filling and Adjusting, Hyphenation, Text, Text +-@subsection Filling and Adjusting +-@cindex filling +-@cindex adjusting +- +-When @code{gtroff} reads text, it collects words from the input and fits +-as many of them together on one output line as it can. This is known as +-@dfn{filling}. +- +-@cindex leading spaces +-@cindex spaces, leading and trailing +-@cindex extra spaces +-@cindex trailing spaces +-Once @code{gtroff} has a @dfn{filled} line, it tries to @dfn{adjust} it. +-This means it widens the spacing between words until the text reaches +-the right margin (in the default adjustment mode). Extra spaces between +-words are preserved, but spaces at the end of lines are ignored. Spaces +-at the front of a line cause a @dfn{break} (breaks are explained in +-@ref{Implicit Line Breaks}). +- +-@xref{Manipulating Filling and Adjusting}. +- +-@c --------------------------------------------------------------------- +- +-@node Hyphenation, Sentences, Filling and Adjusting, Text +-@subsection Hyphenation +-@cindex hyphenation +- +-Since the odds are not great for finding a set of words, for every +-output line, which fit nicely on a line without inserting excessive +-amounts of space between words, @code{gtroff} hyphenates words so that +-it can justify lines without inserting too much space between words. It +-uses an internal hyphenation algorithm (a simplified version of the +-algorithm used within @TeX{}) to indicate which words can be hyphenated +-and how to do so. When a word is hyphenated, the first part of the word +-is added to the current filled line being output (with an attached +-hyphen), and the other portion is added to the next line to be filled. +- +-@xref{Manipulating Hyphenation}. +- +-@c --------------------------------------------------------------------- +- +-@node Sentences, Tab Stops, Hyphenation, Text +-@subsection Sentences +-@cindex sentences +- +-Although it is often debated, some typesetting rules say there should be +-different amounts of space after various punctuation marks. For +-example, the @cite{Chicago typsetting manual} says that a period at the +-end of a sentence should have twice as much space following it as would +-a comma or a period as part of an abbreviation. +- +-@c XXX exact citation of Chicago manual +- +-@cindex sentence space +-@cindex space between sentences +-@cindex french-spacing +-@code{gtroff} does this by flagging certain characters (normally +-@samp{!}, @samp{?}, and @samp{.}) as @dfn{end-of-sentence} characters. +-When @code{gtroff} encounters one of these characters at the end of a +-line, it appends a normal space followed by a @dfn{sentence space} in +-the formatted output. (This justifies one of the conventions mentioned +-in @ref{Input Conventions}.) +- +-@cindex transparent characters +-@cindex character, transparent +-@cindex @code{dg} glyph, at end of sentence +-@cindex @code{rq} glyph, at end of sentence +-@cindex @code{cq} glyph, at end of sentence +-@cindex @code{"}, at end of sentence +-@cindex @code{'}, at end of sentence +-@cindex @code{)}, at end of sentence +-@cindex @code{]}, at end of sentence +-@cindex @code{*}, at end of sentence +-In addition, the following characters and symbols are treated +-transparently while handling end-of-sentence characters: @samp{"}, +-@samp{'}, @samp{)}, @samp{]}, @samp{*}, @code{\[dg]}, @code{\[rq]}, and +-@code{\[cq]}. +- +-See the @code{cflags} request in @ref{Using Symbols}, for more details. +- +-@cindex @code{\&}, at end of sentence +-To prevent the insertion of extra space after an end-of-sentence +-character (at the end of a line), append @code{\&}. +- +-@c --------------------------------------------------------------------- +- +-@node Tab Stops, Implicit Line Breaks, Sentences, Text +-@subsection Tab Stops +-@cindex tab stops +-@cindex stops, tabulator +-@cindex tab character +-@cindex character, tabulator +- +-@cindex @acronym{EBCDIC} encoding +-@cindex encoding, @acronym{EBCDIC} +-@code{gtroff} translates @dfn{tabulator characters}, also called +-@dfn{tabs} (normally code point @acronym{ASCII} @code{0x09} or +-@acronym{EBCDIC} @code{0x05}), in the input into movements to the next +-tabulator stop. These tab stops are initially located every half inch +-across the page. Using this, simple tables can be made easily. +-However, it can often be deceptive as the appearance (and width) of the +-text on a terminal and the results from @code{gtroff} can vary greatly. +- +-Also, a possible sticking point is that lines beginning with tab +-characters are still filled, again producing unexpected results. For +-example, the following input +- +-@multitable {12345678} {12345678} {12345678} {12345678} +-@item +-@tab 1 @tab 2 @tab 3 +-@item +-@tab @tab 4 @tab 5 +-@end multitable +- +-@noindent +-produces +- +-@multitable {12345678} {12345678} {12345678} {12345678} {12345678} {12345678} {12345678} +-@item +-@tab 1 @tab 2 @tab 3 @tab @tab 4 @tab 5 +-@end multitable +- +-@xref{Tabs and Fields}. +- +-@c --------------------------------------------------------------------- +- +-@node Implicit Line Breaks, Input Conventions, Tab Stops, Text +-@subsection Implicit Line Breaks +-@cindex implicit line breaks +-@cindex implicit breaks of lines +-@cindex line, implicit breaks +-@cindex break, implicit +-@cindex line break +- +-An important concept in @code{gtroff} is the @dfn{break}. When a break +-occurs, @code{gtroff} outputs the partially filled line (unjustified), +-and resumes collecting and filling text on the next output line. +- +-@cindex blank line +-@cindex empty line +-@cindex line, blank +-@cindex blank line macro (@code{blm}) +-There are several ways to cause a break in @code{gtroff}. A blank line +-not only causes a break, but it also outputs a one-line vertical space +-(effectively a blank line). Note that this behaviour can be modified +-with the blank line macro request @code{blm}. @xref{Blank Line Traps}. +- +-@cindex fill mode +-@cindex mode, fill +-@cindex leading spaces macro (@code{lsm}) +-A line that begins with a space causes a break and the space is output +-at the beginning of the next line. Note that this space isn't adjusted, +-even in fill mode; however, the behaviour can be modified with the +-leading spaces macro request @code{lsm}. @xref{Leading Spaces Traps}. +- +-The end of file also causes a break -- otherwise the last line of the +-document may vanish! +- +-Certain requests also cause breaks, implicitly or explicitly. This is +-discussed in @ref{Manipulating Filling and Adjusting}. +- +-@c --------------------------------------------------------------------- +- +-@node Input Conventions, Input Encodings, Implicit Line Breaks, Text +-@subsection Input Conventions +-@cindex input conventions +-@cindex conventions for input +- +-Since @code{gtroff} does filling automatically, it is traditional in +-@code{groff} not to try and type things in as nicely formatted +-paragraphs. These are some conventions commonly used when typing +-@code{gtroff} text: +- +-@itemize @bullet +-@item +-Break lines after punctuation, particularly at the end of a sentence and +-in other logical places. Keep separate phrases on lines by themselves, +-as entire phrases are often added or deleted when editing. +- +-@item +-Try to keep lines less than 40-60@tie{}characters, to allow space for +-inserting more text. +- +-@item +-Do not try to do any formatting in a @acronym{WYSIWYG} manner (i.e., +-don't try using spaces to get proper indentation). +-@end itemize +- +-@c --------------------------------------------------------------------- +- +-@node Input Encodings, , Input Conventions, Text +-@subsection Input Encodings +- +-Currently, the following input encodings are available. +- +-@table @asis +-@item cp1047 +-@cindex encoding, input, @acronym{EBCDIC} +-@cindex @acronym{EBCDIC}, input encoding +-@cindex input encoding, @acronym{EBCDIC} +-@cindex encoding, input, cp1047 +-@cindex cp1047, input encoding +-@cindex input encoding, cp1047 +-@cindex IBM cp1047 input encoding +-@pindex cp1047.tmac +-This input encoding works only on @acronym{EBCDIC} platforms (and vice +-versa, the other input encodings don't work with @acronym{EBCDIC}); the +-file @file{cp1047.tmac} is by default loaded at start-up. +- +-@item latin-1 +-@cindex encoding, input, @w{latin-1} (ISO @w{8859-1}) +-@cindex @w{latin-1} (ISO @w{8859-1}), input encoding +-@cindex ISO @w{8859-1} (@w{latin-1}), input encoding +-@cindex input encoding, @w{latin-1} (ISO @w{8859-1}) +-@pindex latin1.tmac +-This is the default input encoding on non-@acronym{EBCDIC} platforms; +-the file @file{latin1.tmac} is loaded at start-up. +- +-@item latin-2 +-@cindex encoding, input, @w{latin-2} (ISO @w{8859-2}) +-@cindex @w{latin-2} (ISO @w{8859-2}), input encoding +-@cindex ISO @w{8859-2} (@w{latin-2}), input encoding +-@cindex input encoding, @w{latin-2} (ISO @w{8859-2}) +-@pindex latin2.tmac +-To use this encoding, either say @w{@samp{.mso latin2.tmac}} at the very +-beginning of your document or use @samp{-mlatin2} as a command line +-argument for @code{groff}. +- +-@item latin-5 +-@cindex encoding, input, @w{latin-5} (ISO @w{8859-9}) +-@cindex @w{latin-2} (ISO @w{8859-9}), input encoding +-@cindex ISO @w{8859-9} (@w{latin-2}), input encoding +-@cindex input encoding, @w{latin-2} (ISO @w{8859-9}) +-@pindex latin2.tmac +-For Turkish. Either say @w{@samp{.mso latin9.tmac}} at the very +-beginning of your document or use @samp{-mlatin9} as a command line +-argument for @code{groff}. +- +-@item latin-9 (latin-0) +-@cindex encoding, input, @w{latin-9} (@w{latin-0}, ISO @w{8859-15}) +-@cindex @w{latin-9} (@w{latin-0}, ISO @w{8859-15}), input encoding +-@cindex ISO @w{8859-15} (@w{latin-9}, @w{latin-0}), input encoding +-@cindex input encoding, @w{latin-9} (@w{latin-9}, ISO @w{8859-15}) +-@pindex latin9.tmac +-This encoding is intended (at least in Europe) to replace @w{latin-1} +-encoding. The main difference to @w{latin-1} is that @w{latin-9} +-contains the Euro character. To use this encoding, either say +-@w{@samp{.mso latin9.tmac}} at the very beginning of your document or +-use @samp{-mlatin9} as a command line argument for @code{groff}. +-@end table +- +-Note that it can happen that some input encoding characters are not +-available for a particular output device. For example, saying +- +-@Example +-groff -Tlatin1 -mlatin9 ... +-@endExample +- +-@noindent +-fails if you use the Euro character in the input. Usually, this +-limitation is present only for devices that have a limited set of +-output glyphs (e.g.@: @option{-Tascii} and @option{-Tlatin1}); for other +-devices it is usually sufficient to install proper fonts that contain +-the necessary glyphs. +- +-@pindex freeeuro.pfa +-@pindex ec.tmac +-Due to the importance of the Euro glyph in Europe, the groff package now +-comes with a @sc{PostScript} font called @file{freeeuro.pfa}, which +-provides various glyph shapes for the Euro. In other words, +-@w{latin-9} encoding is supported for the @option{-Tps} device out of +-the box (@w{latin-2} isn't). +- +-By its very nature, @option{-Tutf8} supports all input encodings; +-@option{-Tdvi} has support for both @w{latin-2} and @w{latin-9} if the +-command line @option{-mec} is used also to load the file @file{ec.tmac} +-(which flips to the EC fonts). +- +- +-@c ===================================================================== +- +-@node Measurements, Expressions, Text, gtroff Reference +-@section Measurements +-@cindex measurements +-@cindex scaling indicator +-@cindex indicator, scaling +- +-@cindex units of measurement +-@cindex basic unit (@code{u}) +-@cindex machine unit (@code{u}) +-@cindex measurement unit +-@cindex @code{u} unit +-@cindex unit, @code{u} +-@code{gtroff} (like many other programs) requires numeric parameters to +-specify various measurements. Most numeric parameters@footnote{those +-that specify vertical or horizontal motion or a type size} may have a +-@dfn{measurement unit} attached. These units are specified as a single +-character that immediately follows the number or expression. Each of +-these units are understood, by @code{gtroff}, to be a multiple of its +-@dfn{basic unit}. So, whenever a different measurement unit is +-specified @code{gtroff} converts this into its @dfn{basic units}. This +-basic unit, represented by a @samp{u}, is a device dependent measurement, +-which is quite small, ranging from 1/75@dmn{th} to 1/72000@dmn{th} of an +-inch. The values may be given as fractional numbers; however, +-fractional basic units are always rounded to integers. +- +-Some of the measurement units are completely independent of any of the +-current settings (e.g.@: type size) of @code{gtroff}. +- +-@table @code +-@item i +-@cindex inch unit (@code{i}) +-@cindex @code{i} unit +-@cindex unit, @code{i} +-Inches. An antiquated measurement unit still in use in certain +-backwards countries with incredibly low-cost computer equipment. One +-inch is equal to@tie{}2.54@dmn{cm}. +- +-@item c +-@cindex centimeter unit (@code{c}) +-@cindex @code{c} unit +-@cindex unit, @code{c} +-Centimeters. One centimeter is equal to@tie{}0.3937@dmn{in}. +- +-@item p +-@cindex point unit (@code{p}) +-@cindex @code{p} unit +-@cindex unit, @code{p} +-Points. This is a typesetter's measurement used for measure type size. +-It is 72@tie{}points to an inch. +- +-@item P +-@cindex pica unit (@code{P}) +-@cindex @code{P} unit +-@cindex unit, @code{P} +-Pica. Another typesetting measurement. 6@tie{}Picas to an inch (and +-12@tie{}points to a pica). +- +-@item s +-@itemx z +-@cindex @code{s} unit +-@cindex unit, @code{s} +-@cindex @code{z} unit +-@cindex unit, @code{z} +-@xref{Fractional Type Sizes}, for a discussion of these units. +- +-@item f +-@cindex @code{f} unit +-@cindex unit, @code{f} +-Fractions. Value is 65536. +-@xref{Colors}, for usage. +-@end table +- +-The other measurements understood by @code{gtroff} depend on settings +-currently in effect in @code{gtroff}. These are very useful for +-specifying measurements that should look proper with any size of text. +- +-@table @code +-@item m +-@cindex em unit (@code{m}) +-@cindex @code{m} unit +-@cindex unit, @code{m} +-Ems. This unit is equal to the current font size in points. So called +-because it is @emph{approximately} the width of the letter@tie{}@samp{m} +-in the current font. +- +-@item n +-@cindex en unit (@code{n}) +-@cindex @code{n} unit +-@cindex unit, @code{n} +-Ens. In @code{groff}, this is half of an em. +- +-@item v +-@cindex vertical space unit (@code{v}) +-@cindex space, vertical, unit (@code{v}) +-@cindex @code{v} unit +-@cindex unit, @code{v} +-Vertical space. This is equivalent to the current line spacing. +-@xref{Sizes}, for more information about this. +- +-@item M +-@cindex @code{M} unit +-@cindex unit, @code{M} +-100ths of an em. +-@end table +- +-@menu +-* Default Units:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Default Units, , Measurements, Measurements +-@subsection Default Units +-@cindex default units +-@cindex units, default +- +-Many requests take a default unit. While this can be helpful at times, +-it can cause strange errors in some expressions. For example, the line +-length request expects em units. Here are several attempts to get a +-line length of 3.5@tie{}inches and their results: +- +-@Example +-3.5i @result{} 3.5i +-7/2 @result{} 0i +-7/2i @result{} 0i +-(7 / 2)u @result{} 0i +-7i/2 @result{} 0.1i +-7i/2u @result{} 3.5i +-@endExample +- +-@noindent +-Everything is converted to basic units first. In the above example it +-is assumed that 1@dmn{i} equals@tie{}240@dmn{u}, and 1@dmn{m} +-equals@tie{}10@dmn{p} (thus 1@dmn{m} equals@tie{}33@dmn{u}). The value +-7@dmn{i}/2 is first handled as 7@dmn{i}/2@dmn{m}, then converted to +-1680@dmn{u}/66@dmn{u}, which is 25@dmn{u}, and this is approximately +-0.1@dmn{i}. As can be seen, a scaling indicator after a closing +-parenthesis is simply ignored. +- +-@cindex measurements, specifying safely +-Thus, the safest way to specify measurements is to always attach a +-scaling indicator. If you want to multiply or divide by a certain +-scalar value, use @samp{u} as the unit for that value. +- +- +-@c ===================================================================== +- +-@node Expressions, Identifiers, Measurements, gtroff Reference +-@section Expressions +-@cindex expressions +- +-@code{gtroff} has most arithmetic operators common to other languages: +- +-@itemize @bullet +-@item +-@cindex arithmetic operators +-@cindex operators, arithmetic +-@opindex + +-@opindex - +-@opindex / +-@opindex * +-@opindex % +-Arithmetic: @samp{+} (addition), @samp{-} (subtraction), @samp{/} +-(division), @samp{*} (multiplication), @samp{%} (modulo). +- +-@code{gtroff} only provides integer arithmetic. The internal type used +-for computing results is @samp{int}, which is usually a 32@dmn{bit} +-signed integer. +- +-@item +-@cindex comparison operators +-@cindex operators, comparison +-@opindex < +-@opindex > +-@opindex >= +-@opindex <= +-@opindex = +-@opindex == +-Comparison: @samp{<} (less than), @samp{>} (greater than), @samp{<=} +-(less than or equal), @samp{>=} (greater than or equal), @samp{=} +-(equal), @samp{==} (the same as @samp{=}). +- +-@item +-@cindex logical operators +-@cindex operators, logical +-@opindex & +-@ifnotinfo +-@opindex : +-@end ifnotinfo +-@ifinfo +-@opindex @r{} +-@end ifinfo +-Logical: @samp{&} (logical and), @samp{:} (logical or). +- +-@item +-@cindex unary operators +-@cindex operators, unary +-@opindex - +-@opindex + +-@opindex ! +-@cindex @code{if} request, and the @samp{!} operator +-@cindex @code{while} request, and the @samp{!} operator +-Unary operators: @samp{-} (negating, i.e.@: changing the sign), @samp{+} +-(just for completeness; does nothing in expressions), @samp{!} (logical +-not; this works only within @code{if} and @code{while} +-requests).@footnote{Note that, for example, @samp{!(-1)} evaluates to +-`true' because @code{gtroff} treats both negative numbers and zero as +-`false'.} See below for the use of unary operators in motion requests. +- +-@cindex logical not, limitation in expression +-@cindex expression, limitation of logical not in +-The logical not operator, +-as described above, +-works only within @code{if} and @code{while} requests. +-Furthermore, it may appear +-only at the beginning of an expression, +-and negates the entire expression. +-Attempting to insert the @samp{!} operator +-within the expression results in a +-@samp{numeric expression expected} warning. This +-maintains compatibility +-with old versions of @code{troff}. +- +-Example: +- +-@Example +-.nr X 1 +-.nr Y 0 +-.\" This does not work as expected +-.if (\n[X])&(!\n[Y]) .nop X only +-. +-.\" Use this construct instead +-.if (\n[X]=1)&(\n[Y]=0) .nop X only +-@endExample +- +-@item +-@cindex extremum operators (@code{>?}, @code{?}, @code{? +-@opindex ?} (maximum), @samp{? \n[y]) +-@endExample +- +-@noindent +-The register@tie{}@code{z} now contains@tie{}5. +- +-@item +-@cindex scaling operator +-@cindex operator, scaling +-Scaling: @code{(@var{c};@var{e})}. Evaluate@tie{}@var{e} +-using@tie{}@var{c} as the default scaling indicator. If @var{c} is +-missing, ignore scaling indicators in the evaluation of@tie{}@var{e}. +-@end itemize +- +-@cindex parentheses +-@cindex order of evaluation in expressions +-@cindex expression, order of evaluation +-@opindex ( +-@opindex ) +-Parentheses may be used as in any other language. However, in +-@code{gtroff} they are necessary to ensure order of evaluation. +-@code{gtroff} has no operator precedence; expressions are evaluated left +-to right. This means that @code{gtroff} evaluates @samp{3+5*4} as if it +-were parenthesized like @samp{(3+5)*4}, not as @samp{3+(5*4)}, as might +-be expected. +- +-@cindex @code{+}, and page motion +-@cindex @code{-}, and page motion +-@cindex motion operators +-@cindex operators, motion +-For many requests that cause a motion on the page, the unary operators +-@samp{+} and @samp{-} work differently if leading an expression. They +-then indicate a motion relative to the current position (down or up, +-respectively). +- +-@cindex @code{|}, and page motion +-@cindex absolute position operator (@code{|}) +-@cindex position, absolute, operator (@code{|}) +-Similarly, a leading @samp{|} operator indicates an absolute position. +-For vertical movements, it specifies the distance from the top of the +-page; for horizontal movements, it gives the distance from the beginning +-of the @emph{input} line. +- +-@cindex @code{bp} request, using @code{+} and@tie{}@code{-} +-@cindex @code{in} request, using @code{+} and@tie{}@code{-} +-@cindex @code{ll} request, using @code{+} and@tie{}@code{-} +-@cindex @code{lt} request, using @code{+} and@tie{}@code{-} +-@cindex @code{nm} request, using @code{+} and@tie{}@code{-} +-@cindex @code{nr} request, using @code{+} and@tie{}@code{-} +-@cindex @code{pl} request, using @code{+} and@tie{}@code{-} +-@cindex @code{pn} request, using @code{+} and@tie{}@code{-} +-@cindex @code{po} request, using @code{+} and@tie{}@code{-} +-@cindex @code{ps} request, using @code{+} and@tie{}@code{-} +-@cindex @code{pvs} request, using @code{+} and@tie{}@code{-} +-@cindex @code{rt} request, using @code{+} and@tie{}@code{-} +-@cindex @code{ti} request, using @code{+} and@tie{}@code{-} +-@cindex @code{\H}, using @code{+} and@tie{}@code{-} +-@cindex @code{\R}, using @code{+} and@tie{}@code{-} +-@cindex @code{\s}, using @code{+} and@tie{}@code{-} +-@samp{+} and @samp{-} are also treated differently by the following +-requests and escapes: @code{bp}, @code{in}, @code{ll}, @code{lt}, +-@code{nm}, @code{nr}, @code{pl}, @code{pn}, @code{po}, @code{ps}, +-@code{pvs}, @code{rt}, @code{ti}, @code{\H}, @code{\R}, and @code{\s}. +-Here, leading plus and minus signs indicate increments and decrements. +- +-@xref{Setting Registers}, for some examples. +- +-@Defesc {\\B, ', anything, '} +-@cindex numeric expression, valid +-@cindex valid numeric expression +-Return@tie{}1 if @var{anything} is a valid numeric expression; or@tie{}0 +-if @var{anything} is empty or not a valid numeric expression. +-@endDefesc +- +-@cindex space characters, in expressions +-@cindex expressions, and space characters +-Due to the way arguments are parsed, spaces are not allowed in +-expressions, unless the entire expression is surrounded by parentheses. +- +-@xref{Request and Macro Arguments}, and @ref{Conditionals and Loops}. +- +- +-@c ===================================================================== +- +-@node Identifiers, Embedded Commands, Expressions, gtroff Reference +-@section Identifiers +-@cindex identifiers +- +-Like any other language, @code{gtroff} has rules for properly formed +-@dfn{identifiers}. In @code{gtroff}, an identifier can be made up of +-almost any printable character, with the exception of the following +-characters: +- +-@itemize @bullet +-@item +-@cindex whitespace characters +-@cindex newline character +-@cindex character, whitespace +-Whitespace characters (spaces, tabs, and newlines). +- +-@item +-@cindex character, backspace +-@cindex backspace character +-@cindex @acronym{EBCDIC} encoding of backspace +-Backspace (@acronym{ASCII}@tie{}@code{0x08} or +-@acronym{EBCDIC}@tie{}@code{0x16}) and character code @code{0x01}. +- +-@item +-@cindex invalid input characters +-@cindex input characters, invalid +-@cindex characters, invalid input +-@cindex Unicode +-The following input characters are invalid and are ignored if +-@code{groff} runs on a machine based on @acronym{ASCII}, causing a +-warning message of type @samp{input} (see @ref{Debugging}, for more +-details): @code{0x00}, @code{0x0B}, @code{0x0D}-@code{0x1F}, +-@code{0x80}-@code{0x9F}. +- +-And here are the invalid input characters if @code{groff} runs on an +-@acronym{EBCDIC} host: @code{0x00}, @code{0x08}, @code{0x09}, +-@code{0x0B}, @code{0x0D}-@code{0x14}, @code{0x17}-@code{0x1F}, +-@code{0x30}-@code{0x3F}. +- +-Currently, some of these reserved codepoints are used internally, thus +-making it non-trivial to extend @code{gtroff} to cover Unicode or other +-character sets and encodings that use characters of these ranges. +- +-Note that invalid characters are removed before parsing; an identifier +-@code{foo}, followed by an invalid character, followed by @code{bar} is +-treated as @code{foobar}. +-@end itemize +- +-For example, any of the following is valid. +- +-@Example +-br +-PP +-(l +-end-list +-@@_ +-@endExample +- +-@cindex @code{]}, as part of an identifier +-@noindent +-Note that identifiers longer than two characters with a closing bracket +-(@samp{]}) in its name can't be accessed with escape sequences that +-expect an identifier as a parameter. For example, @samp{\[foo]]} +-accesses the glyph @samp{foo}, followed by @samp{]}, whereas +-@samp{\C'foo]'} really asks for glyph @samp{foo]}. +- +-@cindex @code{refer}, and macro names starting with @code{[} or @code{]} +-@cindex @code{[}, macro names starting with, and @code{refer} +-@cindex @code{]}, macro names starting with, and @code{refer} +-@cindex macro names, starting with @code{[} or @code{]}, and @code{refer} +-To avoid problems with the @code{refer} preprocessor, macro names should +-not start with @samp{[} or @samp{]}. Due to backwards compatibility, +-everything after @samp{.[} and @samp{.]} is handled as a special +-argument to @code{refer}. For example, @samp{.[foo} makes @code{refer} +-to start a reference, using @samp{foo} as a parameter. +- +-@Defesc {\\A, ', ident, '} +-Test whether an identifier @var{ident} is valid in @code{gtroff}. It +-expands to the character@tie{}1 or@tie{}0 according to whether its +-argument (usually delimited by quotes) is or is not acceptable as the +-name of a string, macro, diversion, number register, environment, or +-font. It returns@tie{}0 if no argument is given. This is useful for +-looking up user input in some sort of associative table. +- +-@Example +-\A'end-list' +- @result{} 1 +-@endExample +-@endDefesc +- +-@xref{Escapes}, for details on parameter delimiting characters. +- +-Identifiers in @code{gtroff} can be any length, but, in some contexts, +-@code{gtroff} needs to be told where identifiers end and text begins +-(and in different ways depending on their length): +- +-@itemize @bullet +-@item +-Single character. +- +-@cindex @code{(}, starting a two-character identifier +-@item +-Two characters. Must be prefixed with @samp{(} in some situations. +- +-@cindex @code{[}, starting an identifier +-@cindex @code{]}, ending an identifier +-@item +-Arbitrary length (@code{gtroff} only). Must be bracketed with @samp{[} +-and@tie{}@samp{]} in some situations. Any length identifier can be put +-in brackets. +-@end itemize +- +-@cindex undefined identifiers +-@cindex identifiers, undefined +-Unlike many other programming languages, undefined identifiers are +-silently ignored or expanded to nothing. When @code{gtroff} finds an +-undefined identifier, it emits a warning, doing the following: +- +-@itemize @bullet +-@item +-If the identifier is a string, macro, or diversion, @code{gtroff} +-defines it as empty. +- +-@item +-If the identifier is a number register, @code{gtroff} defines it with a +-value of@tie{}0. +-@end itemize +- +-@xref{Warnings}., @ref{Interpolating Registers}, and @ref{Strings}. +- +-Note that macros, strings, and diversions share the same name space. +- +-@Example +-.de xxx +-. nop foo +-.. +-. +-.di xxx +-bar +-.br +-.di +-. +-.xxx +- @result{} bar +-@endExample +- +-@noindent +-As can be seen in the previous example, @code{gtroff} reuses the +-identifier @samp{xxx}, changing it from a macro to a diversion. No +-warning is emitted! The contents of the first macro definition is lost. +- +-@xref{Interpolating Registers}, and @ref{Strings}. +- +- +-@c ===================================================================== +- +-@node Embedded Commands, Registers, Identifiers, gtroff Reference +-@section Embedded Commands +-@cindex embedded commands +-@cindex commands, embedded +- +-Most documents need more functionality beyond filling, adjusting and +-implicit line breaking. In order to gain further functionality, +-@code{gtroff} allows commands to be embedded into the text, in two ways. +- +-The first is a @dfn{request} that takes up an entire line, and does +-some large-scale operation (e.g.@: break lines, start new pages). +- +-The other is an @dfn{escape} that can be usually embedded anywhere in +-the text; most requests can accept it even as an argument. Escapes +-generally do more minor operations like sub- and superscripts, print a +-symbol, etc. +- +-@menu +-* Requests:: +-* Macros:: +-* Escapes:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Requests, Macros, Embedded Commands, Embedded Commands +-@subsection Requests +-@cindex requests +- +-@cindex control character (@code{.}) +-@cindex character, control (@code{.}) +-@cindex no-break control character (@code{'}) +-@cindex character, no-break control (@code{'}) +-@cindex control character, no-break (@code{'}) +-A request line begins with a control character, which is either a single +-quote (@samp{'}, the @dfn{no-break control character}) or a period +-(@samp{.}, the normal @dfn{control character}). These can be changed; +-see @ref{Character Translations}, for details. After this there may be +-optional tabs or spaces followed by an identifier, which is the name of +-the request. This may be followed by any number of space-separated +-arguments (@emph{no} tabs here). +- +-@cindex structuring source code of documents or macro packages +-@cindex documents, structuring the source code +-@cindex macro packages, structuring the source code +-Since a control character followed by whitespace only is ignored, it is +-common practice to use this feature for structuring the source code of +-documents or macro packages. +- +-@Example +-.de foo +-. tm This is foo. +-.. +-. +-. +-.de bar +-. tm This is bar. +-.. +-@endExample +- +-@cindex blank line +-@cindex blank line macro (@code{blm}) +-Another possibility is to use the blank line macro request @code{blm} by +-assigning an empty macro to it. +- +-@Example +-.de do-nothing +-.. +-.blm do-nothing \" activate blank line macro +- +-.de foo +-. tm This is foo. +-.. +- +- +-.de bar +-. tm This is bar. +-.. +- +-.blm \" deactivate blank line macro +-@endExample +- +-@xref{Blank Line Traps}. +- +-@cindex zero width space character (@code{\&}) +-@cindex character, zero width space (@code{\&}) +-@cindex space character, zero width (@code{\&}) +-@cindex @code{\&}, escaping control characters +-To begin a line with a control character without it being interpreted, +-precede it with @code{\&}. This represents a zero width space, which +-means it does not affect the output. +- +-In most cases the period is used as a control character. Several +-requests cause a break implicitly; using the single quote control +-character prevents this. +- +-@Defreg {.br} +-A read-only number register, which is set to@tie{}1 if a macro is called +-with the normal control character (as defined with the @code{cc} +-request), and set to@tie{}0 otherwise. +- +-@cindex modifying requests +-@cindex requests, modifying +-This allows to reliably modify requests. +- +-@Example +-.als bp*orig bp +-.de bp +-. tm before bp +-. ie \\n[.br] .bp*orig +-. el 'bp*orig +-. tm after bp +-.. +-@endExample +- +-Using this register outside of a macro makes no sense (it always returns +-zero in such cases). +- +-If a macro is called as a string (this is, using @code{\*}), the value +-of the @code{.br} register is inherited from the calling macro. +-@endDefreg +- +-@menu +-* Request and Macro Arguments:: +-@end menu +- +-@node Request and Macro Arguments, , Requests, Requests +-@subsubsection Request and Macro Arguments +-@cindex request arguments +-@cindex macro arguments +-@cindex arguments to requests and macros +- +-@cindex tabs, and macro arguments +-@cindex macro arguments, and tabs +-@cindex arguments to macros, and tabs +-Arguments to requests and macros are processed much like the shell: +-The line is split into arguments according to +-spaces.@footnote{Plan@tie{}9's @code{troff} implementation also allows +-tabs for argument separation -- @code{gtroff} intentionally doesn't +-support this.} +- +-@cindex spaces, in a macro argument +-An argument to a macro that is intended to contain spaces can either be +-enclosed in double quotes, or have the spaces @dfn{escaped} with +-backslashes. This is @emph{not} true for requests. +- +-Here are a few examples for a hypothetical macro @code{uh}: +- +-@Example +-.uh The Mouse Problem +-.uh "The Mouse Problem" +-.uh The\ Mouse\ Problem +-@endExample +- +-@cindex @code{\~}, difference to @code{\@key{SP}} +-@cindex @code{\@key{SP}}, difference to @code{\~} +-@noindent +-The first line is the @code{uh} macro being called with 3 arguments, +-@samp{The}, @samp{Mouse}, and @samp{Problem}. The latter two have the +-same effect of calling the @code{uh} macro with one argument, @samp{The +-Mouse Problem}.@footnote{The last solution, i.e., using escaped spaces, +-is ``classical'' in the sense that it can be found in most @code{troff} +-documents. Nevertheless, it is not optimal in all situations, since +-@w{@samp{\ }} inserts a fixed-width, non-breaking space character that +-can't stretch. @code{gtroff} provides a different command @code{\~} to +-insert a stretchable, non-breaking space.} +- +-@cindex @code{"}, in a macro argument +-@cindex double quote, in a macro argument +-A double quote that isn't preceded by a space doesn't start a macro +-argument. If not closing a string, it is printed literally. +- +-For example, +- +-@Example +-.xxx a" "b c" "de"fg" +-@endExample +- +-@noindent +-has the arguments @samp{a"}, @w{@samp{b c}}, @samp{de}, and @samp{fg"}. +-Don't rely on this obscure behaviour! +- +-There are two possibilities to get a double quote reliably. +- +-@itemize @bullet +-@item +-Enclose the whole argument with double quotes and use two consecutive +-double quotes to represent a single one. This traditional solution has +-the disadvantage that double quotes don't survive argument expansion +-again if called in compatibility mode (using the @option{-C} option of +-@code{groff}): +- +-@Example +-.de xx +-. tm xx: `\\$1' `\\$2' `\\$3' +-. +-. yy "\\$1" "\\$2" "\\$3" +-.. +-.de yy +-. tm yy: `\\$1' `\\$2' `\\$3' +-.. +-.xx A "test with ""quotes""" . +- @result{} xx: `A' `test with "quotes"' `.' +- @result{} yy: `A' `test with ' `quotes""' +-@endExample +- +-@noindent +-If not in compatibility mode, you get the expected result +- +-@Example +-xx: `A' `test with "quotes"' `.' +-yy: `A' `test with "quotes"' `.' +-@endExample +- +-@noindent +-since @code{gtroff} preserves the input level. +- +-@item +-Use the double quote glyph @code{\(dq}. This works with and without +-compatibility mode enabled since @code{gtroff} doesn't convert +-@code{\(dq} back to a double quote input character. +- +-Note that this method won't work with @acronym{UNIX} @code{troff} in +-general since the glyph `dq' isn't defined normally. +-@end itemize +- +-@cindex @code{ds} request, and double quotes +-Double quotes in the @code{ds} request are handled differently. +-@xref{Strings}, for more details. +- +-@c --------------------------------------------------------------------- +- +-@node Macros, Escapes, Requests, Embedded Commands +-@subsection Macros +-@cindex macros +- +-@code{gtroff} has a @dfn{macro} facility for defining a series of lines +-that can be invoked by name. They are called in the same manner as +-requests -- arguments also may be passed basically in the same manner. +- +-@xref{Writing Macros}, and @ref{Request and Macro Arguments}. +- +-@c --------------------------------------------------------------------- +- +-@node Escapes, , Macros, Embedded Commands +-@subsection Escapes +-@cindex escapes +- +-Escapes may occur anywhere in the input to @code{gtroff}. They usually +-begin with a backslash and are followed by a single character, which +-indicates the function to be performed. The escape character can be +-changed; see @ref{Character Translations}. +- +-Escape sequences that require an identifier as a parameter accept three +-possible syntax forms. +- +-@itemize @bullet +-@item +-The next single character is the identifier. +- +-@cindex @code{(}, starting a two-character identifier +-@item +-If this single character is an opening parenthesis, take the following +-two characters as the identifier. Note that there is no closing +-parenthesis after the identifier. +- +-@cindex @code{[}, starting an identifier +-@cindex @code{]}, ending an identifier +-@item +-If this single character is an opening bracket, take all characters +-until a closing bracket as the identifier. +-@end itemize +- +-@noindent +-Examples: +- +-@Example +-\fB +-\n(XX +-\*[TeX] +-@endExample +- +-@cindex @code{'}, delimiting arguments +-@cindex argument delimiting characters +-@cindex characters, argument delimiting +-@cindex delimiting characters for arguments +-Other escapes may require several arguments and/or some special format. +-In such cases the argument is traditionally enclosed in single quotes +-(and quotes are always used in this manual for the definitions of escape +-sequences). The enclosed text is then processed according to what that +-escape expects. Example: +- +-@Example +-\l'1.5i\(bu' +-@endExample +- +-@cindex @code{\o}, possible quote characters +-@cindex @code{\b}, possible quote characters +-@cindex @code{\X}, possible quote characters +-Note that the quote character can be replaced with any other character +-that does not occur in the argument (even a newline or a space +-character) in the following escapes: @code{\o}, @code{\b}, and +-@code{\X}. This makes e.g. +- +-@Example +-A caf +-\o +-e\' +- +- +-in Paris +- @result{} A caf in Paris +-@endExample +- +-@noindent +-possible, but it is better not to use this feature to avoid confusion. +- +-@cindex @code{\%}, used as delimiter +-@cindex @code{\@key{SP}}, used as delimiter +-@cindex @code{\|}, used as delimiter +-@cindex @code{\^}, used as delimiter +-@cindex @code{\@{}, used as delimiter +-@cindex @code{\@}}, used as delimiter +-@cindex @code{\'}, used as delimiter +-@cindex @code{\`}, used as delimiter +-@cindex @code{\-}, used as delimiter +-@cindex @code{\_}, used as delimiter +-@cindex @code{\!}, used as delimiter +-@cindex @code{\?}, used as delimiter +-@cindex @code{\)}, used as delimiter +-@cindex @code{\/}, used as delimiter +-@cindex @code{\,}, used as delimiter +-@cindex @code{\&}, used as delimiter +-@ifnotinfo +-@cindex @code{\:}, used as delimiter +-@end ifnotinfo +-@ifinfo +-@cindex @code{\@r{}}, used as delimiter +-@end ifinfo +-@cindex @code{\~}, used as delimiter +-@cindex @code{\0}, used as delimiter +-@cindex @code{\a}, used as delimiter +-@cindex @code{\c}, used as delimiter +-@cindex @code{\d}, used as delimiter +-@cindex @code{\e}, used as delimiter +-@cindex @code{\E}, used as delimiter +-@cindex @code{\p}, used as delimiter +-@cindex @code{\r}, used as delimiter +-@cindex @code{\t}, used as delimiter +-@cindex @code{\u}, used as delimiter +-The following escapes sequences (which are handled similarly to +-characters since they don't take a parameter) are also allowed as +-delimiters: @code{\%}, @w{@samp{\ }}, @code{\|}, @code{\^}, @code{\@{}, +-@code{\@}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, +-@code{\?}, @code{\)}, @code{\/}, @code{\,}, @code{\&}, @code{\:}, +-@code{\~}, @code{\0}, @code{\a}, @code{\c}, @code{\d}, @code{\e}, +-@code{\E}, @code{\p}, @code{\r}, @code{\t}, and @code{\u}. Again, don't +-use these if possible. +- +-@cindex @code{\A}, allowed delimiters +-@cindex @code{\B}, allowed delimiters +-@cindex @code{\Z}, allowed delimiters +-@cindex @code{\C}, allowed delimiters +-@cindex @code{\w}, allowed delimiters +-No newline characters as delimiters are allowed in the following +-escapes: @code{\A}, @code{\B}, @code{\Z}, @code{\C}, and @code{\w}. +- +-@cindex @code{\D}, allowed delimiters +-@cindex @code{\h}, allowed delimiters +-@cindex @code{\H}, allowed delimiters +-@cindex @code{\l}, allowed delimiters +-@cindex @code{\L}, allowed delimiters +-@cindex @code{\N}, allowed delimiters +-@cindex @code{\R}, allowed delimiters +-@cindex @code{\s}, allowed delimiters +-@cindex @code{\S}, allowed delimiters +-@cindex @code{\v}, allowed delimiters +-@cindex @code{\x}, allowed delimiters +-Finally, the escapes @code{\D}, @code{\h}, @code{\H}, @code{\l}, +-@code{\L}, @code{\N}, @code{\R}, @code{\s}, @code{\S}, @code{\v}, and +-@code{\x} can't use the following characters as delimiters: +- +-@itemize @bullet +-@item +-@cindex numbers, and delimiters +-@cindex digits, and delimiters +-The digits @code{0}-@code{9}. +- +-@item +-@cindex operators, as delimiters +-@cindex @code{+}, as delimiter +-@cindex @code{-}, as delimiter +-@cindex @code{/}, as delimiter +-@cindex @code{*}, as delimiter +-@cindex @code{%}, as delimiter +-@cindex @code{<}, as delimiter +-@cindex @code{>}, as delimiter +-@cindex @code{=}, as delimiter +-@cindex @code{&}, as delimiter +-@ifnotinfo +-@cindex @code{:}, as delimiter +-@end ifnotinfo +-@ifinfo +-@cindex , as delimiter +-@end ifinfo +-@cindex @code{(}, as delimiter +-@cindex @code{)}, as delimiter +-@cindex @code{.}, as delimiter +-The (single-character) operators @samp{+-/*%<>=&:().}. +- +-@item +-@cindex space character +-@cindex character, space +-@cindex tab character +-@cindex character, tab +-@cindex newline character +-@cindex character, newline +-The space, tab, and newline characters. +- +-@item +-@cindex @code{\%}, used as delimiter +-@ifnotinfo +-@cindex @code{\:}, used as delimiter +-@end ifnotinfo +-@ifinfo +-@cindex @code{\@r{}}, used as delimiter +-@end ifinfo +-@cindex @code{\@{}, used as delimiter +-@cindex @code{\@}}, used as delimiter +-@cindex @code{\'}, used as delimiter +-@cindex @code{\`}, used as delimiter +-@cindex @code{\-}, used as delimiter +-@cindex @code{\_}, used as delimiter +-@cindex @code{\!}, used as delimiter +-@cindex @code{\/}, used as delimiter +-@cindex @code{\c}, used as delimiter +-@cindex @code{\e}, used as delimiter +-@cindex @code{\p}, used as delimiter +-All escape sequences except @code{\%}, @code{\:}, @code{\@{}, +-@code{\@}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, +-@code{\/}, @code{\c}, @code{\e}, and @code{\p}. +-@end itemize +- +-@cindex printing backslash (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) +-@cindex backslash, printing (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) +-To have a backslash (actually, the current escape character) appear in +-the output several escapes are defined: @code{\\}, @code{\e} or +-@code{\E}. These are very similar, and only differ with respect to +-being used in macros or diversions. @xref{Character Translations}, for +-an exact description of those escapes. +- +-@xref{Implementation Differences}, @ref{Copy-in Mode}, and +-@ref{Diversions}, @ref{Identifiers}, for more information. +- +-@menu +-* Comments:: +-@end menu +- +-@node Comments, , Escapes, Escapes +-@subsubsection Comments +-@cindex comments +- +-Probably one of the most@footnote{Unfortunately, this is a lie. But +-hopefully future @code{gtroff} hackers will believe it @code{:-)}} +-common forms of escapes is the comment. +- +-@Defesc {\\", , , } +-Start a comment. Everything to the end of the input line is ignored. +- +-This may sound simple, but it can be tricky to keep the comments from +-interfering with the appearance of the final output. +- +-@cindex @code{ds}, @code{ds1} requests, and comments +-@cindex @code{as}, @code{as1} requests, and comments +-If the escape is to the right of some text or a request, that portion of +-the line is ignored, but the space leading up to it is noticed by +-@code{gtroff}. This only affects the @code{ds} and @code{as} request +-and its variants. +- +-@cindex tabs, before comments +-@cindex comments, lining up with tabs +-One possibly irritating idiosyncracy is that tabs must not be used to +-line up comments. Tabs are not treated as whitespace between the +-request and macro arguments. +- +-@cindex undefined request +-@cindex request, undefined +-A comment on a line by itself is treated as a blank line, because after +-eliminating the comment, that is all that remains: +- +-@Example +-Test +-\" comment +-Test +-@endExample +- +-@noindent +-produces +- +-@Example +-Test +- +-Test +-@endExample +- +-To avoid this, it is common to start the line with @code{.\"}, which +-causes the line to be treated as an undefined request and thus ignored +-completely. +- +-@cindex @code{'}, as a comment +-Another commenting scheme seen sometimes is three consecutive single +-quotes (@code{'''}) at the beginning of a line. This works, but +-@code{gtroff} gives a warning about an undefined macro (namely +-@code{''}), which is harmless, but irritating. +-@endDefesc +- +-@Defesc {\\#, , , } +-To avoid all this, @code{gtroff} has a new comment mechanism using the +-@code{\#} escape. This escape works the same as @code{\"} except that +-the newline is also ignored: +- +-@Example +-Test +-\# comment +-Test +-@endExample +- +-@noindent +-produces +- +-@Example +-Test Test +-@endExample +- +-@noindent +-as expected. +-@endDefesc +- +-@Defreq {ig, [@Var{end}]} +-Ignore all input until @code{gtroff} encounters the macro named +-@code{.}@var{end} on a line by itself (or @code{..} if @var{end} is not +-specified). This is useful for commenting out large blocks of text: +- +-@Example +-text text text... +-.ig +-This is part of a large block +-of text that has been +-temporarily(?) commented out. +- +-We can restore it simply by removing +-the .ig request and the ".." at the +-end of the block. +-.. +-More text text text... +-@endExample +- +-@noindent +-produces +- +-@Example +-text text text@dots{} More text text text@dots{} +-@endExample +- +-@noindent +-Note that the commented-out block of text does not cause a break. +- +-@cindex @code{ig} request, and copy-in mode +-@cindex copy-in mode, and @code{ig} request +-@cindex mode, copy-in, and @code{ig} request +-@cindex @code{ig} request, and auto-increment +-@cindex auto-increment, and @code{ig} request +-The input is read in copy-mode; auto-incremented registers @emph{are} +-affected (@pxref{Auto-increment}). +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Registers, Manipulating Filling and Adjusting, Embedded Commands, gtroff Reference +-@section Registers +-@cindex registers +- +-Numeric variables in @code{gtroff} are called @dfn{registers}. There +-are a number of built-in registers, supplying anything from the date to +-details of formatting parameters. +- +-@xref{Identifiers}, for details on register identifiers. +- +-@menu +-* Setting Registers:: +-* Interpolating Registers:: +-* Auto-increment:: +-* Assigning Formats:: +-* Built-in Registers:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Setting Registers, Interpolating Registers, Registers, Registers +-@subsection Setting Registers +-@cindex setting registers (@code{nr}, @code{\R}) +-@cindex registers, setting (@code{nr}, @code{\R}) +- +-Define or set registers using the @code{nr} request or the @code{\R} +-escape. +- +-Although the following requests and escapes can be used to create +-registers, simply using an undefined register will cause it to be +-set to zero. +- +-@DefreqList {nr, ident value} +-@DefescListEndx {\\R, ', ident value, '} +-Set number register @var{ident} to @var{value}. If @var{ident} doesn't +-exist, @code{gtroff} creates it. +- +-The argument to @code{\R} usually has to be enclosed in quotes. +-@xref{Escapes}, for details on parameter delimiting characters. +- +-The @code{\R} escape doesn't produce an input token in @code{gtroff}; +-in other words, it vanishes completely after @code{gtroff} has +-processed it. +- +-For example, the following two lines are equivalent: +- +-@Example +-.nr a (((17 + (3 * 4))) % 4) +-\R'a (((17 + (3 * 4))) % 4)' +- @result{} 1 +-@endExample +- +-Note that the complete transparency of @code{\R} can cause surprising +-effects if you use number registers like @code{.k}, which get evaluated +-at the time they are accessed. +- +-@Example +-.ll 1.6i +-. +-aaa bbb ccc ddd eee fff ggg hhh\R':k \n[.k]' +-.tm :k == \n[:k] +- @result{} :k == 126950 +-. +-.br +-. +-aaa bbb ccc ddd eee fff ggg hhh\h'0'\R':k \n[.k]' +-.tm :k == \n[:k] +- @result{} :k == 15000 +-@endExample +- +-If you process this with the @sc{PostScript} device (@code{-Tps}), +-there will be a line break eventually after @code{ggg} in both input +-lines. However, after processing the space after @code{ggg}, the +-partially collected line is not overfull yet, so @code{troff} +-continues to collect input until it sees the space (or in this case, +-the newline) after @code{hhh}. At this point, the line is longer +-than the line length, and the line gets broken. +- +-In the first input line, since the @code{\R} escape leaves no traces, +-the check for the overfull line hasn't been done yet at the point where +-@code{\R} gets handled, and you get a value for the @code{.k} number +-register that is even greater than the current line length. +- +-In the second input line, the insertion of @code{\h'0'} to emit an +-invisible zero-width space forces @code{troff} to check the line length, +-which in turn causes the start of a new output line. Now @code{.k} +-returns the expected value. +-@endDefreq +- +-Both @code{nr} and @code{\R} have two additional special forms to +-increment or decrement a register. +- +-@DefreqList {nr, ident @t{+}@Var{value}} +-@DefreqItem {nr, ident @t{-}@Var{value}} +-@DefescItemx {\\R, ', ident @t{+}value, '} +-@DefescListEnd {\\R, ', ident @t{-}value, '} +-Increment (decrement) register @var{ident} by @var{value}. +- +-@Example +-.nr a 1 +-.nr a +1 +-\na +- @result{} 2 +-@endExample +- +-@cindex negating register values +-To assign the negated value of a register to another register, some care +-must be taken to get the desired result: +- +-@Example +-.nr a 7 +-.nr b 3 +-.nr a -\nb +-\na +- @result{} 4 +-.nr a (-\nb) +-\na +- @result{} -3 +-@endExample +- +-@noindent +-The surrounding parentheses prevent the interpretation of the minus sign +-as a decrementing operator. An alternative is to start the assignment +-with a @samp{0}: +- +-@Example +-.nr a 7 +-.nr b -3 +-.nr a \nb +-\na +- @result{} 4 +-.nr a 0\nb +-\na +- @result{} -3 +-@endExample +-@endDefreq +- +-@Defreq {rr, ident} +-@cindex removing number register (@code{rr}) +-@cindex number register, removing (@code{rr}) +-@cindex register, removing (@code{rr}) +-Remove number register @var{ident}. If @var{ident} doesn't exist, the +-request is ignored. +-@endDefreq +- +-@Defreq {rnn, ident1 ident2} +-@cindex renaming number register (@code{rnn}) +-@cindex number register, renaming (@code{rnn}) +-@cindex register, renaming (@code{rnn}) +-Rename number register @var{ident1} to @var{ident2}. If either +-@var{ident1} or @var{ident2} doesn't exist, the request is ignored. +-@endDefreq +- +-@Defreq {aln, ident1 ident2} +-@cindex alias, number register, creating (@code{aln}) +-@cindex creating alias, for number register (@code{aln}) +-@cindex number register, creating alias (@code{aln}) +-@cindex register, creating alias (@code{aln}) +-Create an alias @var{ident1} for a number register @var{ident2}. The +-new name and the old name are exactly equivalent. If @var{ident1} is +-undefined, a warning of type @samp{reg} is generated, and the request is +-ignored. @xref{Debugging}, for information about warnings. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Interpolating Registers, Auto-increment, Setting Registers, Registers +-@subsection Interpolating Registers +-@cindex interpolating registers (@code{\n}) +-@cindex registers, interpolating (@code{\n}) +- +-Numeric registers can be accessed via the @code{\n} escape. +- +-@DefescList {\\n, , i, } +-@DefescItem {\\n, @Lparen{}, id, } +-@DefescListEnd {\\n, @Lbrack{}, ident, @Rbrack{}} +-@cindex nested assignments +-@cindex assignments, nested +-@cindex indirect assignments +-@cindex assignments, indirect +-Interpolate number register with name @var{ident} (one-character +-name@tie{}@var{i}, two-character name @var{id}). This means that the +-value of the register is expanded in-place while @code{gtroff} is +-parsing the input line. Nested assignments (also called indirect +-assignments) are possible. +- +-@Example +-.nr a 5 +-.nr as \na+\na +-\n(as +- @result{} 10 +-@endExample +- +-@Example +-.nr a1 5 +-.nr ab 6 +-.ds str b +-.ds num 1 +-\n[a\n[num]] +- @result{} 5 +-\n[a\*[str]] +- @result{} 6 +-@endExample +-@endDefesc +- +-@c --------------------------------------------------------------------- +- +-@node Auto-increment, Assigning Formats, Interpolating Registers, Registers +-@subsection Auto-increment +-@cindex auto-increment +-@cindex increment, automatic +- +-Number registers can also be auto-incremented and auto-decremented. The +-increment or decrement value can be specified with a third argument to +-the @code{nr} request or @code{\R} escape. +- +-@Defreq {nr, ident value incr} +-@cindex @code{\R}, difference to @code{nr} +-Set number register @var{ident} to @var{value}; the increment for +-auto-incrementing is set to @var{incr}. Note that the @code{\R} escape +-doesn't support this notation. +-@endDefreq +- +-To activate auto-incrementing, the escape @code{\n} has a special syntax +-form. +- +-@DefescList {\\n, +, i, } +-@DefescItem {\\n, -, i, } +-@DefescItem {\\n, @Lparen{}+, id, } +-@DefescItem {\\n, @Lparen{}-, id, } +-@DefescItem {\\n, +@Lparen{}, id, } +-@DefescItem {\\n, -@Lparen{}, id, } +-@DefescItem {\\n, @Lbrack{}+, ident, @Rbrack{}} +-@DefescItem {\\n, @Lbrack{}-, ident, @Rbrack{}} +-@DefescItem {\\n, +@Lbrack{}, ident, @Rbrack{}} +-@DefescListEnd {\\n, -@Lbrack{}, ident, @Rbrack{}} +-Before interpolating, increment or decrement @var{ident} (one-character +-name@tie{}@var{i}, two-character name @var{id}) by the auto-increment +-value as specified with the @code{nr} request (or the @code{\R} escape). +-If no auto-increment value has been specified, these syntax forms are +-identical to @code{\n}. +-@endDefesc +- +-For example, +- +-@Example +-.nr a 0 1 +-.nr xx 0 5 +-.nr foo 0 -2 +-\n+a, \n+a, \n+a, \n+a, \n+a +-.br +-\n-(xx, \n-(xx, \n-(xx, \n-(xx, \n-(xx +-.br +-\n+[foo], \n+[foo], \n+[foo], \n+[foo], \n+[foo] +-@endExample +- +-@noindent +-produces +- +-@Example +-1, 2, 3, 4, 5 +--5, -10, -15, -20, -25 +--2, -4, -6, -8, -10 +-@endExample +- +-@cindex increment value without changing the register +-@cindex value, incrementing without changing the register +-To change the increment value without changing the value of a register +-(@var{a} in the example), the following can be used: +- +-@Example +-.nr a \na 10 +-@endExample +- +-@c --------------------------------------------------------------------- +- +-@node Assigning Formats, Built-in Registers, Auto-increment, Registers +-@subsection Assigning Formats +-@cindex assigning formats (@code{af}) +-@cindex formats, assigning (@code{af}) +- +-When a register is used, it is always textually replaced (or +-interpolated) with a representation of that number. This output format +-can be changed to a variety of formats (numbers, Roman numerals, etc.). +-This is done using the @code{af} request. +- +-@Defreq {af, ident format} +-Change the output format of a number register. The first argument +-@var{ident} is the name of the number register to be changed, and the +-second argument @var{format} is the output format. The following output +-formats are available: +- +-@table @code +-@item 1 +-Decimal arabic numbers. This is the default format: 0, 1, 2, +-3,@tie{}@enddots{} +- +-@item 0@dots{}0 +-Decimal numbers with as many digits as specified. So, @samp{00} would +-result in printing numbers as 01, 02, 03,@tie{}@enddots{} +- +-In fact, any digit instead of zero does work; @code{gtroff} only counts +-how many digits are specified. As a consequence, @code{af}'s default +-format @samp{1} could be specified as @samp{0} also (and exactly this is +-returned by the @code{\g} escape, see below). +- +-@item I +-@cindex Roman numerals +-@cindex numerals, Roman +-Upper-case Roman numerals: 0, I, II, III, IV,@tie{}@enddots{} +- +-@item i +-Lower-case Roman numerals: 0, i, ii, iii, iv,@tie{}@enddots{} +- +-@item A +-Upper-case letters: 0, A, B, C, @dots{},@tie{}Z, AA, AB,@tie{}@enddots{} +- +-@item a +-Lower-case letters: 0, a, b, c, @dots{},@tie{}z, aa, ab,@tie{}@enddots{} +-@end table +- +-Omitting the number register format causes a warning of type +-@samp{missing}. @xref{Debugging}, for more details. Specifying a +-nonexistent format causes an error. +- +-The following example produces @samp{10, X, j, 010}: +- +-@Example +-.nr a 10 +-.af a 1 \" the default format +-\na, +-.af a I +-\na, +-.af a a +-\na, +-.af a 001 +-\na +-@endExample +- +-@cindex Roman numerals, maximum and minimum +-@cindex maximum values of Roman numerals +-@cindex minimum values of Roman numerals +-The largest number representable for the @samp{i} and @samp{I} formats +-is 39999 (or @minus{}39999); @acronym{UNIX} @code{troff} uses @samp{z} +-and @samp{w} to represent 10000 and 5000 in Roman numerals, and so does +-@code{gtroff}. Currently, the correct glyphs of Roman numeral five +-thousand and Roman numeral ten thousand (Unicode code points +-@code{U+2182} and @code{U+2181}, respectively) are not available. +- +-If @var{ident} doesn't exist, it is created. +- +-@cindex read-only register, changing format +-@cindex changing format, and read-only registers +-Changing the output format of a read-only register causes an error. It +-is necessary to first copy the register's value to a writeable register, +-then apply the @code{af} request to this other register. +-@endDefreq +- +-@DefescList {\\g, , i, } +-@DefescItem {\\g, @Lparen{}, id, } +-@DefescListEnd {\\g, @Lbrack{}, ident, @Rbrack{}} +-@cindex format of register (@code{\g}) +-@cindex register, format (@code{\g}) +-Return the current format of the specified register @var{ident} +-(one-character name@tie{}@var{i}, two-character name @var{id}). For +-example, @samp{\ga} after the previous example would produce the string +-@samp{000}. If the register hasn't been defined yet, nothing is +-returned. +-@endDefesc +- +-@c --------------------------------------------------------------------- +- +-@node Built-in Registers, , Assigning Formats, Registers +-@subsection Built-in Registers +-@cindex built-in registers +-@cindex registers, built-in +- +-The following lists some built-in registers that are not described +-elsewhere in this manual. Any register that begins with a @samp{.} is +-read-only. A complete listing of all built-in registers can be found in +-@ref{Register Index}. +- +-@table @code +-@item \n[.F] +-@cindex current input file name register (@code{.F}) +-@cindex input file name, current, register (@code{.F}) +-@vindex .F +-This string-valued register returns the current input file name. +- +-@item \n[.H] +-@cindex horizontal resolution register (@code{.H}) +-@cindex resolution, horizontal, register (@code{.H}) +-@vindex .H +-Horizontal resolution in basic units. +- +-@item \n[.R] +-@cindex number of registers register (@code{.R}) +-@cindex registers, number of, register (@code{.R}) +-@vindex .R +-The number of number registers available. This is always 10000 in +-GNU@tie{}@code{troff}; it exists for backward compatibility. +- +-@item \n[.U] +-@cindex safer mode +-@cindex mode, safer +-@cindex unsafe mode +-@cindex mode, unsafe +-@vindex .U +-If @code{gtroff} is called with the @option{-U} command line option to +-activate unsafe mode, the number register @code{.U} is set to@tie{}1, +-and to zero otherwise. @xref{Groff Options}. +- +-@item \n[.V] +-@cindex vertical resolution register (@code{.V}) +-@cindex resolution, vertical, register (@code{.V}) +-@vindex .V +-Vertical resolution in basic units. +- +-@item \n[seconds] +-@cindex seconds, current time (@code{seconds}) +-@cindex time, current, seconds (@code{seconds}) +-@cindex current time, seconds (@code{seconds}) +-@vindex seconds +-The number of seconds after the minute, normally in the range@tie{}0 +-to@tie{}59, but can be up to@tie{}61 to allow for leap seconds. +-Initialized at start-up of @code{gtroff}. +- +-@item \n[minutes] +-@cindex minutes, current time (@code{minutes}) +-@cindex time, current, minutes (@code{minutes}) +-@cindex current time, minutes (@code{minutes}) +-@vindex minutes +-The number of minutes after the hour, in the range@tie{}0 to@tie{}59. +-Initialized at start-up of @code{gtroff}. +- +-@item \n[hours] +-@cindex hours, current time (@code{hours}) +-@cindex time, current, hours (@code{hours}) +-@cindex current time, hours (@code{hours}) +-@vindex hours +-The number of hours past midnight, in the range@tie{}0 to@tie{}23. +-Initialized at start-up of @code{gtroff}. +- +-@item \n[dw] +-@cindex day of the week register (@code{dw}) +-@cindex date, day of the week register (@code{dw}) +-@vindex dw +-Day of the week (1-7). +- +-@item \n[dy] +-@cindex day of the month register (@code{dy}) +-@cindex date, day of the month register (@code{dy}) +-@vindex dy +-Day of the month (1-31). +- +-@item \n[mo] +-@cindex month of the year register (@code{mo}) +-@cindex date, month of the year register (@code{mo}) +-@vindex mo +-Current month (1-12). +- +-@item \n[year] +-@cindex date, year register (@code{year}, @code{yr}) +-@cindex year, current, register (@code{year}, @code{yr}) +-@vindex year +-The current year. +- +-@item \n[yr] +-@vindex yr +-The current year minus@tie{}1900. Unfortunately, the documentation of +-@acronym{UNIX} Version@tie{}7's @code{troff} had a year@tie{}2000 bug: +-It incorrectly claimed that @code{yr} contains the last two digits of +-the year. That claim has never been true of either @acronym{AT&T} +-@code{troff} or GNU @code{troff}. Old @code{troff} input that looks +-like this: +- +-@Example +-'\" The following line stopped working after 1999 +-This document was formatted in 19\n(yr. +-@endExample +- +-@noindent +-can be corrected as follows: +- +-@Example +-This document was formatted in \n[year]. +-@endExample +- +-@noindent +-or, to be portable to older @code{troff} versions, as follows: +- +-@Example +-.nr y4 1900+\n(yr +-This document was formatted in \n(y4. +-@endExample +- +-@item \n[.c] +-@vindex .c +-@itemx \n[c.] +-@vindex c. +-@cindex input line number register (@code{.c}, @code{c.}) +-@cindex line number, input, register (@code{.c}, @code{c.}) +-The current @emph{input} line number. Register @samp{.c} is read-only, +-whereas @samp{c.} (a @code{gtroff} extension) is writable also, +-affecting both @samp{.c} and @samp{c.}. +- +-@item \n[ln] +-@vindex ln +-@cindex output line number register (@code{ln}) +-@cindex line number, output, register (@code{ln}) +-The current @emph{output} line number after a call to the @code{nm} +-request to activate line numbering. +- +-@xref{Miscellaneous}, for more information about line numbering. +- +-@item \n[.x] +-@vindex .x +-@cindex major version number register (@code{.x}) +-@cindex version number, major, register (@code{.x}) +-The major version number. For example, if the version number is 1.03 +-then @code{.x} contains@tie{}@samp{1}. +- +-@item \n[.y] +-@vindex .y +-@cindex minor version number register (@code{.y}) +-@cindex version number, minor, register (@code{.y}) +-The minor version number. For example, if the version number is 1.03 +-then @code{.y} contains@tie{}@samp{03}. +- +-@item \n[.Y] +-@vindex .Y +-@cindex revision number register (@code{.Y}) +-The revision number of @code{groff}. +- +-@item \n[$$] +-@vindex $$ +-@cindex process ID of @code{gtroff} register (@code{$$}) +-@cindex @code{gtroff}, process ID register (@code{$$}) +-The process ID of @code{gtroff}. +- +-@item \n[.g] +-@vindex .g +-@cindex @code{gtroff}, identification register (@code{.g}) +-@cindex GNU-specific register (@code{.g}) +-Always@tie{}1. Macros should use this to determine whether they are +-running under GNU @code{troff}. +- +-@item \n[.A] +-@vindex .A +-@cindex @acronym{ASCII} approximation output register (@code{.A}) +-If the command line option @option{-a} is used to produce an +-@acronym{ASCII} approximation of the output, this is set to@tie{}1, zero +-otherwise. @xref{Groff Options}. +- +-@item \n[.O] +-@vindex .O +-This read-only register is set to the suppression nesting level (see +-escapes @code{\O}). @xref{Suppressing output}. +- +-@item \n[.P] +-@vindex .P +-This register is set to@tie{}1 (and to@tie{}0 otherwise) if the current +-page is actually being printed, i.e., if the @option{-o} option is being +-used to only print selected pages. @xref{Groff Options}, for more +-information. +- +-@item \n[.T] +-@vindex .T +-If @code{gtroff} is called with the @option{-T} command line option, the +-number register @code{.T} is set to@tie{}1, and zero otherwise. +-@xref{Groff Options}. +- +-@item \*[.T] +-@stindex .T +-@cindex output device name string register (@code{.T}) +-A single read-write string register that contains the current output +-device (for example, @samp{latin1} or @samp{ps}). This is the only +-string register defined by @code{gtroff}. +-@end table +- +- +-@c ===================================================================== +- +-@node Manipulating Filling and Adjusting, Manipulating Hyphenation, Registers, gtroff Reference +-@section Manipulating Filling and Adjusting +-@cindex manipulating filling and adjusting +-@cindex filling and adjusting, manipulating +-@cindex adjusting and filling, manipulating +-@cindex justifying text +-@cindex text, justifying +- +-@cindex break +-@cindex line break +-@cindex @code{bp} request, causing implicit linebreak +-@cindex @code{ce} request, causing implicit linebreak +-@cindex @code{cf} request, causing implicit linebreak +-@cindex @code{fi} request, causing implicit linebreak +-@cindex @code{fl} request, causing implicit linebreak +-@cindex @code{in} request, causing implicit linebreak +-@cindex @code{nf} request, causing implicit linebreak +-@cindex @code{rj} request, causing implicit linebreak +-@cindex @code{sp} request, causing implicit linebreak +-@cindex @code{ti} request, causing implicit linebreak +-@cindex @code{trf} request, causing implicit linebreak +-Various ways of causing @dfn{breaks} were given in @ref{Implicit Line +-Breaks}. The @code{br} request likewise causes a break. Several other +-requests also cause breaks, but implicitly. These are @code{bp}, +-@code{ce}, @code{cf}, @code{fi}, @code{fl}, @code{in}, @code{nf}, +-@code{rj}, @code{sp}, @code{ti}, and @code{trf}. +- +-@Defreq {br, } +-Break the current line, i.e., the input collected so far is emitted +-without adjustment. +- +-If the no-break control character is used, @code{gtroff} suppresses the +-break: +- +-@Example +-a +-'br +-b +- @result{} a b +-@endExample +-@endDefreq +- +-Initially, @code{gtroff} fills and adjusts text to both margins. +-Filling can be disabled via the @code{nf} request and re-enabled with +-the @code{fi} request. +- +-@DefreqList {fi, } +-@DefregListEndx {.u} +-@cindex fill mode (@code{fi}) +-@cindex mode, fill (@code{fi}) +-Activate fill mode (which is the default). This request implicitly +-enables adjusting; it also inserts a break in the text currently being +-filled. The read-only number register @code{.u} is set to@tie{}1. +- +-The fill mode status is associated with the current environment +-(@pxref{Environments}). +- +-See @ref{Line Control}, for interaction with the @code{\c} escape. +-@endDefreq +- +-@Defreq {nf, } +-@cindex no-fill mode (@code{nf}) +-@cindex mode, no-fill (@code{nf}) +-Activate no-fill mode. Input lines are output as-is, retaining line +-breaks and ignoring the current line length. This command implicitly +-disables adjusting; it also causes a break. The number register +-@code{.u} is set to@tie{}0. +- +-The fill mode status is associated with the current environment +-(@pxref{Environments}). +- +-See @ref{Line Control}, for interaction with the @code{\c} escape. +-@endDefreq +- +-@DefreqList {ad, [@Var{mode}]} +-@DefregListEndx {.j} +-Set adjusting mode. +- +-Activation and deactivation of adjusting is done implicitly with calls +-to the @code{fi} or @code{nf} requests. +- +-@var{mode} can have one of the following values: +- +-@table @code +-@item l +-@cindex ragged-right +-Adjust text to the left margin. This produces what is traditionally +-called ragged-right text. +- +-@item r +-@cindex ragged-left +-Adjust text to the right margin, producing ragged-left text. +- +-@item c +-@cindex centered text +-@cindex @code{ce} request, difference to @samp{.ad@tie{}c} +-Center filled text. This is different to the @code{ce} request, which +-only centers text without filling. +- +-@item b +-@itemx n +-Justify to both margins. This is the default used by @code{gtroff}. +-@end table +- +-Finally, @var{mode} can be the numeric argument returned by the +-@code{.j} register. +- +-Using @code{ad} without argument is the same as saying +-@w{@code{.ad \[.j]}}. In particular, @code{gtroff} adjusts lines +-in the same way it did before adjusting was deactivated (with a call +-to @code{na}, say). For example, this input code +- +-@Example +-.de AD +-. br +-. ad \\$1 +-.. +-. +-.de NA +-. br +-. na +-.. +-. +-textA +-.AD r +-.nr ad \n[.j] +-textB +-.AD c +-textC +-.NA +-textD +-.AD \" back to centering +-textE +-.AD \n[ad] \" back to right justifying +-textF +-@endExample +- +-@noindent +-produces the following output: +- +-@Example +-textA +- textB +- textC +-textD +- textE +- textF +-@endExample +- +-@cindex adjustment mode register (@code{.j}) +-As just demonstrated, the current adjustment mode is available in the +-read-only number register @code{.j}; it can be stored and +-subsequently used to set adjustment. +- +-The adjustment mode status is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@Defreq {na, } +-Disable adjusting. This request won't change the current adjustment +-mode: A subsequent call to @code{ad} uses the previous adjustment +-setting. +- +-The adjustment mode status is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@DefreqList {brp, } +-@DefescListEndx {\\p, , , } +-Adjust the current line and cause a break. +- +-In most cases this produces very ugly results since @code{gtroff} +-doesn't have a sophisticated paragraph building algorithm (as @TeX{} +-have, for example); instead, @code{gtroff} fills and adjusts a paragraph +-line by line: +- +-@Example +-This is an uninteresting sentence. +-This is an uninteresting sentence.\p +-This is an uninteresting sentence. +-@endExample +- +-@noindent +-is formatted as +- +-@Example +-This is an uninteresting sentence. This is an +-uninteresting sentence. +-This is an uninteresting sentence. +-@endExample +-@endDefreq +- +-@DefreqList {ss, word_space_size [@Var{sentence_space_size}]} +-@DefregItemx {.ss} +-@DefregListEndx {.sss} +-@cindex word space size register (@code{.ss}) +-@cindex size of word space register (@code{.ss}) +-@cindex space between words register (@code{.ss}) +-@cindex sentence space size register (@code{.sss}) +-@cindex size of sentence space register (@code{.sss}) +-@cindex space between sentences register (@code{.sss}) +-Change the size of a space between words. It takes its units as one +-twelfth of the space width parameter for the current font. Initially +-both the @var{word_space_size} and @var{sentence_space_size} +-are@tie{}12. In fill mode, the values specify the minimum distance. +- +-@cindex fill mode +-@cindex mode, fill +-If two arguments are given to the @code{ss} request, the second argument +-sets the sentence space size. If the second argument is not given, +-sentence space size is set to @var{word_space_size}. The sentence space +-size is used in two circumstances: If the end of a sentence occurs at +-the end of a line in fill mode, then both an inter-word space and a +-sentence space are added; if two spaces follow the end of a sentence in +-the middle of a line, then the second space is a sentence space. If a +-second argument is never given to the @code{ss} request, the behaviour +-of @acronym{UNIX} @code{troff} is the same as that exhibited by GNU +-@code{troff}. In GNU @code{troff}, as in @acronym{UNIX} @code{troff}, a +-sentence should always be followed by either a newline or two spaces. +- +-The read-only number registers @code{.ss} and @code{.sss} hold the +-values of the parameters set by the first and second arguments of the +-@code{ss} request. +- +-The word space and sentence space values are associated with the current +-environment (@pxref{Environments}). +- +-Contrary to @acronym{AT&T} @code{troff}, this request is @emph{not} +-ignored if a TTY output device is used; the given values are then +-rounded down to a multiple of@tie{}12 (@pxref{Implementation +-Differences}). +- +-The request is ignored if there is no parameter. +- +-@cindex discardable horizontal space +-@cindex space, discardable, horizontal +-@cindex horizontal discardable space +-Another useful application of the @code{ss} request is to insert +-discardable horizontal space, i.e., space that is discarded at a line +-break. For example, paragraph-style footnotes could be separated this +-way: +- +-@Example +-.ll 4.5i +-1.\ This is the first footnote.\c +-.ss 48 +-.nop +-.ss 12 +-2.\ This is the second footnote. +-@endExample +- +-@noindent +-The result: +- +-@Example +-1. This is the first footnote. 2. This +-is the second footnote. +-@endExample +- +-@noindent +-Note that the @code{\h} escape produces unbreakable space. +-@endDefreq +- +-@DefreqList {ce, [@Var{nnn}]} +-@DefregListEndx {.ce} +-@cindex centering lines (@code{ce}) +-@cindex lines, centering (@code{ce}) +-Center text. While the @w{@samp{.ad c}} request also centers text, it +-fills the text as well. @code{ce} does not fill the text it affects. +-This request causes a break. The number of lines still to be centered +-is associated with the current environment (@pxref{Environments}). +- +-The following example demonstrates the differences. Here the input: +- +-@Example +-.ll 4i +-.ce 1000 +-This is a small text fragment that shows the differences +-between the `.ce' and the `.ad c' request. +-.ce 0 +- +-.ad c +-This is a small text fragment that shows the differences +-between the `.ce' and the `.ad c' request. +-@endExample +- +-@noindent +-And here the result: +- +-@Example +- This is a small text fragment that +- shows the differences +-between the `.ce' and the `.ad c' request. +- +- This is a small text fragment that +-shows the differences between the `.ce' +- and the `.ad c' request. +-@endExample +- +-With no arguments, @code{ce} centers the next line of text. @var{nnn} +-specifies the number of lines to be centered. If the argument is zero +-or negative, centering is disabled. +- +-The basic length for centering text is the line length (as set with the +-@code{ll} request) minus the indentation (as set with the @code{in} +-request). Temporary indentation is ignored. +- +-As can be seen in the previous example, it is a common idiom to turn on +-centering for a large number of lines, and to turn off centering after +-text to be centered. This is useful for any request that takes a +-number of lines as an argument. +- +-The @code{.ce} read-only number register contains the number of lines +-remaining to be centered, as set by the @code{ce} request. +-@endDefreq +- +-@DefreqList {rj, [@Var{nnn}]} +-@DefregListEndx {.rj} +-@cindex justifying text (@code{rj}) +-@cindex text, justifying (@code{rj}) +-@cindex right-justifying (@code{rj}) +-Justify unfilled text to the right margin. Arguments are identical to +-the @code{ce} request. The @code{.rj} read-only number register is the +-number of lines to be right-justified as set by the @code{rj} request. +-This request causes a break. The number of lines still to be +-right-justified is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Manipulating Hyphenation, Manipulating Spacing, Manipulating Filling and Adjusting, gtroff Reference +-@section Manipulating Hyphenation +-@cindex manipulating hyphenation +-@cindex hyphenation, manipulating +- +-Here a description of requests that influence hyphenation. +- +-@DefreqList {hy, [@Var{mode}]} +-@DefregListEndx {.hy} +-Enable hyphenation. The request has an optional numeric argument, +-@var{mode}, to restrict hyphenation if necessary: +- +-@table @code +-@item 1 +-The default argument if @var{mode} is omitted. Hyphenate without +-restrictions. This is also the start-up value of @code{gtroff}. +- +-@item 2 +-Do not hyphenate the last word on a page or column. +- +-@item 4 +-Do not hyphenate the last two characters of a word. +- +-@item 8 +-Do not hyphenate the first two characters of a word. +-@end table +- +-Values in the previous table are additive. For example, the +-value@tie{}12 causes @code{gtroff} to neither hyphenate the last two nor +-the first two characters of a word. +- +-@cindex hyphenation restrictions register (@code{.hy}) +-The current hyphenation restrictions can be found in the read-only +-number register @samp{.hy}. +- +-The hyphenation mode is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@Defreq {nh, } +-Disable hyphenation (i.e., set the hyphenation mode to zero). Note that +-the hyphenation mode of the last call to @code{hy} is not remembered. +- +-The hyphenation mode is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@DefreqList {hlm, [@Var{nnn}]} +-@DefregItemx {.hlm} +-@DefregListEndx {.hlc} +-@cindex explicit hyphen (@code{\%}) +-@cindex hyphen, explicit (@code{\%}) +-@cindex consecutive hyphenated lines (@code{hlm}) +-@cindex lines, consecutive hyphenated (@code{hlm}) +-@cindex hyphenated lines, consecutive (@code{hlm}) +-Set the maximum number of consecutive hyphenated lines to @var{nnn}. If +-this number is negative, there is no maximum. The default value +-is@tie{}@minus{}1 if @var{nnn} is omitted. This value is associated +-with the current environment (@pxref{Environments}). Only lines output +-from a given environment count towards the maximum associated with that +-environment. Hyphens resulting from @code{\%} are counted; explicit +-hyphens are not. +- +-The current setting of @code{hlm} is available in the @code{.hlm} +-read-only number register. Also the number of immediately preceding +-consecutive hyphenated lines are available in the read-only number +-register @samp{.hlc}. +-@endDefreq +- +-@Defreq {hw, word1 word2 @dots{}} +-Define how @var{word1}, @var{word2}, etc.@: are to be hyphenated. The +-words must be given with hyphens at the hyphenation points. For +-example: +- +-@Example +-.hw in-sa-lub-rious +-@endExample +- +-@noindent +-Besides the space character, any character whose hyphenation code value +-is zero can be used to separate the arguments of @code{hw} (see the +-documentation for the @code{hcode} request below for more information). +-In addition, this request can be used more than once. +- +-Hyphenation exceptions specified with the @code{hw} request are +-associated with the current hyphenation language; it causes an error if +-there is no current hyphenation language. +- +-This request is ignored if there is no parameter. +- +-In old versions of @code{troff} there was a limited amount of space to +-store such information; fortunately, with @code{gtroff}, this is no +-longer a restriction. +-@endDefreq +- +-@DefescList {\\%, , , } +-@deffnx Escape @t{\:} +-@ifnotinfo +-@esindex \: +-@end ifnotinfo +-@ifinfo +-@esindex \@r{} +-@end ifinfo +-@cindex hyphenation character (@code{\%}) +-@cindex character, hyphenation (@code{\%}) +-@cindex disabling hyphenation (@code{\%}) +-@cindex hyphenation, disabling (@code{\%}) +-To tell @code{gtroff} how to hyphenate words on the fly, use the +-@code{\%} escape, also known as the @dfn{hyphenation character}. +-Preceding a word with this character prevents it from being +-hyphenated; putting it inside a word indicates to @code{gtroff} that +-the word may be hyphenated at that point. Note that this mechanism +-only affects that one occurrence of the word; to change the +-hyphenation of a word for the entire document, use the @code{hw} +-request. +- +-The @code{\:} escape inserts a zero-width break point (that is, the word +-breaks but without adding a hyphen). +- +-@Example +-... check the /var/log/\:httpd/\:access_log file ... +-@endExample +- +-@cindex @code{\X}, followed by @code{\%} +-@cindex @code{\Y}, followed by @code{\%} +-@cindex @code{\%}, following @code{\X} or @code{\Y} +-Note that @code{\X} and @code{\Y} start a word, that is, the @code{\%} +-escape in (say) @w{@samp{\X'...'\%foobar}} and +-@w{@samp{\Y'...'\%foobar}} no longer prevents hyphenation but inserts a +-hyphenation point at the beginning of @samp{foobar}; most likely this +-isn't what you want to do. +-@endDefesc +- +-@Defreq {hc, [@Var{char}]} +-Change the hyphenation character to @var{char}. This character then +-works the same as the @code{\%} escape, and thus, no longer appears in +-the output. Without an argument, @code{hc} resets the hyphenation +-character to be @code{\%} (the default) only. +- +-The hyphenation character is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@DefreqList {hpf, pattern_file} +-@DefreqItemx {hpfa, pattern_file} +-@DefreqListEndx {hpfcode, a b [c d @dots{}]} +-@cindex hyphenation patterns (@code{hpf}) +-@cindex patterns for hyphenation (@code{hpf}) +-Read in a file of hyphenation patterns. This file is searched for in +-the same way as @file{@var{name}.tmac} (or @file{tmac.@var{name}}) is +-searched for if the @option{-m@var{name}} option is specified. +- +-It should have the same format as (simple) @TeX{} patterns files. More +-specifically, the following scanning rules are implemented. +- +-@itemize @bullet +-@item +-A percent sign starts a comment (up to the end of the line) even if +-preceded by a backslash. +- +-@item +-No support for `digraphs' like @code{\$}. +- +-@item +-@code{^^@var{xx}} (@var{x} is 0-9 or a-f) and @code{^^@var{x}} +-(character code of @var{x} in the range 0-127) are recognized; other use +-of @code{^} causes an error. +- +-@item +-No macro expansion. +- +-@item +-@code{hpf} checks for the expression @code{\patterns@{@dots{}@}} +-(possibly with whitespace before and after the braces). Everything +-between the braces is taken as hyphenation patterns. Consequently, +-@code{@{} and @code{@}} are not allowed in patterns. +- +-@item +-Similarly, @code{\hyphenation@{@dots{}@}} gives a list of hyphenation +-exceptions. +- +-@item +-@code{\endinput} is recognized also. +- +-@item +-For backwards compatibility, if @code{\patterns} is missing, the whole +-file is treated as a list of hyphenation patterns (only recognizing the +-@code{%} character as the start of a comment). +-@end itemize +- +-If no @code{hpf} request is specified (either in the document or in a +-macro package), @code{gtroff} won't hyphenate at all. +- +-The @code{hpfa} request appends a file of patterns to the current list. +- +-The @code{hpfcode} request defines mapping values for character codes in +-hyphenation patterns. @code{hpf} or @code{hpfa} then apply the mapping +-(after reading the patterns) before replacing or appending them to the +-current list of patterns. Its arguments are pairs of character codes -- +-integers from 0 to@tie{}255. The request maps character +-code@tie{}@var{a} to code@tie{}@var{b}, code@tie{}@var{c} to +-code@tie{}@var{d}, and so on. You can use character codes that would +-be invalid otherwise. By default, everything maps to itself except +-letters `A' to `Z', which map to `a' to `z'. +- +- +-@pindex troffrc +-@pindex troffrc-end +-@pindex hyphen.us +-@pindex hyphenex.us +-The set of hyphenation patterns is associated with the current language +-set by the @code{hla} request. The @code{hpf} request is usually +-invoked by the @file{troffrc} or @file{troffrc-end} file; by default, +-@file{troffrc} loads hyphenation patterns and exceptions for American +-English (in files @file{hyphen.us} and @file{hyphenex.us}). +- +-A second call to @code{hpf} (for the same language) replaces the +-hyphenation patterns with the new ones. +- +-Invoking @code{hpf} causes an error if there is no current hyphenation +-language. +-@endDefreq +- +-@Defreq {hcode, c1 code1 [c2 code2 @dots{}]} +-@cindex hyphenation code (@code{hcode}) +-@cindex code, hyphenation (@code{hcode}) +-Set the hyphenation code of character @var{c1} to @var{code1}, that of +-@var{c2} to @var{code2}, etc. A hyphenation code must be a single input +-character (not a special character) other than a digit or a space. +- +-To make hyphenation work, hyphenation codes must be set up. At +-start-up, groff only assigns hyphenation codes to the letters +-@samp{a}-@samp{z} (mapped to themselves) and to the letters +-@samp{A}-@samp{Z} (mapped to @samp{a}-@samp{z}); all other hyphenation +-codes are set to zero. Normally, hyphenation patterns contain only +-lowercase letters, which should be applied regardless of case. In +-other words, the words `FOO' and `Foo' should be hyphenated exactly the +-same way as the word `foo' is hyphenated, and this is what @code{hcode} +-is good for. Words that contain other letters won't be hyphenated +-properly if the corresponding hyphenation patterns actually do contain +-them. For example, the following @code{hcode} requests are necessary to +-assign hyphenation codes to the letters @samp{} (this is needed +-for German): +- +-@Example +-.hcode +-.hcode +-.hcode +-.hcode +-@endExample +- +-Without those assignments, groff treats German words like +-@w{`Kindergrten'} (the plural form of `kindergarten') as two substrings +-@w{`kinderg'} and @w{`rten'} because the hyphenation code of the +-umlaut@tie{}a is zero by default. There is a German hyphenation pattern +-that covers @w{`kinder'}, so groff finds the hyphenation `kin-der'. +-The other two hyphenation points (`kin-der-gr-ten') are missed. +- +-This request is ignored if it has no parameter. +-@endDefreq +- +-@DefreqList {hym, [@Var{length}]} +-@DefregListEndx {.hym} +-@cindex hyphenation margin (@code{hym}) +-@cindex margin for hyphenation (@code{hym}) +-@cindex @code{ad} request, and hyphenation margin +-Set the (right) hyphenation margin to @var{length}. If the current +-adjustment mode is not @samp{b} or @samp{n}, the line is not hyphenated +-if it is shorter than @var{length}. Without an argument, the +-hyphenation margin is reset to its default value, which is@tie{}0. The +-default scaling indicator for this request is @samp{m}. The hyphenation +-margin is associated with the current environment +-(@pxref{Environments}). +- +-A negative argument resets the hyphenation margin to zero, emitting a +-warning of type @samp{range}. +- +-@cindex hyphenation margin register (@code{.hym}) +-The current hyphenation margin is available in the @code{.hym} read-only +-number register. +-@endDefreq +- +-@DefreqList {hys, [@Var{hyphenation_space}]} +-@DefregListEndx {.hys} +-@cindex hyphenation space (@code{hys}) +-@cindex @code{ad} request, and hyphenation space +-Set the hyphenation space to @var{hyphenation_space}. If the current +-adjustment mode is @samp{b} or @samp{n}, don't hyphenate the line if it +-can be justified by adding no more than @var{hyphenation_space} extra +-space to each word space. Without argument, the hyphenation space is +-set to its default value, which is@tie{}0. The default scaling +-indicator for this request is @samp{m}. The hyphenation space is +-associated with the current environment (@pxref{Environments}). +- +-A negative argument resets the hyphenation space to zero, emitting a +-warning of type @samp{range}. +- +-@cindex hyphenation space register (@code{.hys}) +-The current hyphenation space is available in the @code{.hys} read-only +-number register. +-@endDefreq +- +-@Defreq {shc, [@Var{glyph}]} +-@cindex soft hyphen character, setting (@code{shc}) +-@cindex character, soft hyphen, setting (@code{shc}) +-@cindex glyph, soft hyphen (@code{hy}) +-@cindex soft hyphen glyph (@code{hy}) +-@cindex @code{char} request, and soft hyphen character +-@cindex @code{tr} request, and soft hyphen character +-Set the @dfn{soft hyphen character} to @var{glyph}.@footnote{@dfn{Soft +-hyphen character} is a misnomer since it is an output glyph.} If the +-argument is omitted, the soft hyphen character is set to the default +-glyph @code{\(hy} (this is the start-up value of @code{gtroff} also). +-The soft hyphen character is the glyph that is inserted when a word is +-hyphenated at a line break. If the soft hyphen character does not exist +-in the font of the character immediately preceding a potential break +-point, then the line is not broken at that point. Neither definitions +-(specified with the @code{char} request) nor translations (specified +-with the @code{tr} request) are considered when finding the soft hyphen +-character. +-@endDefreq +- +-@DefreqList {hla, language} +-@DefregListEndx {.hla} +-@cindex @code{hpf} request, and hyphenation language +-@cindex @code{hw} request, and hyphenation language +-@pindex troffrc +-@pindex troffrc-end +-Set the current hyphenation language to the string @var{language}. +-Hyphenation exceptions specified with the @code{hw} request and +-hyphenation patterns specified with the @code{hpf} and @code{hpfa} +-requests are both associated with the current hyphenation language. The +-@code{hla} request is usually invoked by the @file{troffrc} or the +-@file{troffrc-end} files; @file{troffrc} sets the default language to +-@samp{us}. +- +-@cindex hyphenation language register (@code{.hla}) +-The current hyphenation language is available as a string in the +-read-only number register @samp{.hla}. +- +-@Example +-.ds curr_language \n[.hla] +-\*[curr_language] +- @result{} us +-@endExample +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Manipulating Spacing, Tabs and Fields, Manipulating Hyphenation, gtroff Reference +-@section Manipulating Spacing +-@cindex manipulating spacing +-@cindex spacing, manipulating +- +-@Defreq {sp, [@Var{distance}]} +-Space downwards @var{distance}. With no argument it advances +-1@tie{}line. A negative argument causes @code{gtroff} to move up the +-page the specified distance. If the argument is preceded by a @samp{|} +-then @code{gtroff} moves that distance from the top of the page. This +-request causes a line break, and that adds the current line spacing to +-the space you have just specified. The default scaling indicator is +-@samp{v}. +- +-For convenience you may wish to use the following macros to set the +-height of the next line at a given distance from the top or the bottom +-of the page: +- +-@Example +-.de y-from-top-down +-. sp |\\$1-\\n[.v]u +-.. +-. +-.de y-from-bot-up +-. sp |\\n[.p]u-\\$1-\\n[.v]u +-.. +-@endExample +- +-@noindent +-A call to @samp{.y-from-bot-up 10c} means that the bottom of the next +-line will be at 10@dmn{cm} from the paper edge at the bottom. +- +-If a vertical trap is sprung during execution of @code{sp}, the amount +-of vertical space after the trap is discarded. For example, this +- +-@Example +-.de xxx +-.. +-. +-.wh 0 xxx +-. +-.pl 5v +-foo +-.sp 2 +-bar +-.sp 50 +-baz +-@endExample +- +-@noindent +-results in +- +-@Example +-foo +- +- +-bar +- +-baz +-@endExample +- +-@cindex @code{sp} request, and traps +-@cindex discarded space in traps +-@cindex space, discarded, in traps +-@cindex traps, and discarded space +-The amount of discarded space is available in the number register +-@code{.trunc}. +- +-To protect @code{sp} against vertical traps, use the @code{vpt} request: +- +-@Example +-.vpt 0 +-.sp -3 +-.vpt 1 +-@endExample +-@endDefreq +- +-@DefreqList {ls, [@Var{nnn}]} +-@DefregListEndx {.L} +-@cindex double-spacing (@code{ls}) +-Output @w{@var{nnn}@minus{}1} blank lines after each line of text. With +-no argument, @code{gtroff} uses the previous value before the last +-@code{ls} call. +- +-@Example +-.ls 2 \" This causes double-spaced output +-.ls 3 \" This causes triple-spaced output +-.ls \" Again double-spaced +-@endExample +- +-The line spacing is associated with the current environment +-(@pxref{Environments}). +- +-@cindex line spacing register (@code{.L}) +-The read-only number register @code{.L} contains the current line +-spacing setting. +-@endDefreq +- +-@xref{Changing Type Sizes}, for the requests @code{vs} and @code{pvs} as +-alternatives to @code{ls}. +- +-@DefescList {\\x, ', spacing, '} +-@DefregListEndx {.a} +-Sometimes, extra vertical spacing is only needed occasionally, e.g.@: to +-allow space for a tall construct (like an equation). The @code{\x} +-escape does this. The escape is given a numerical argument, usually +-enclosed in quotes (like @samp{\x'3p'}); the default scaling indicator +-is @samp{v}. If this number is positive extra vertical space is +-inserted below the current line. A negative number adds space above. +-If this escape is used multiple times on the same line, the maximum of +-the values is used. +- +-@xref{Escapes}, for details on parameter delimiting characters. +- +-@cindex extra post-vertical line space register (@code{.a}) +-The @code{.a} read-only number register contains the most recent +-(nonnegative) extra vertical line space. +- +-Using @code{\x} can be necessary in combination with the @code{\b} +-escape, as the following example shows. +- +-@Example +-This is a test with the \[rs]b escape. +-.br +-This is a test with the \[rs]b escape. +-.br +-This is a test with \b'xyz'\x'-1m'\x'1m'. +-.br +-This is a test with the \[rs]b escape. +-.br +-This is a test with the \[rs]b escape. +-@endExample +- +-@noindent +-produces +- +-@Example +-This is a test with the \b escape. +-This is a test with the \b escape. +- x +-This is a test with y. +- z +-This is a test with the \b escape. +-This is a test with the \b escape. +-@endExample +-@endDefesc +- +-@DefreqList {ns, } +-@DefreqItemx {rs, } +-@DefregListEndx {.ns} +-@cindex @code{sp} request, and no-space mode +-@cindex no-space mode (@code{ns}) +-@cindex mode, no-space (@code{ns}) +-@cindex blank lines, disabling +-@cindex lines, blank, disabling +-Enable @dfn{no-space mode}. In this mode, spacing (either via @code{sp} +-or via blank lines) is disabled. The @code{bp} request to advance to +-the next page is also disabled, except if it is accompanied by a page +-number (see @ref{Page Control}, for more information). This mode ends +-when actual text is output or the @code{rs} request is encountered, which +-ends no-space mode. The read-only number register @code{.ns} is set +-to@tie{}1 as long as no-space mode is active. +- +-This request is useful for macros that conditionally insert vertical +-space before the text starts (for example, a paragraph macro could +-insert some space except when it is the first paragraph after a section +-header). +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Tabs and Fields, Character Translations, Manipulating Spacing, gtroff Reference +-@section Tabs and Fields +-@cindex tabs, and fields +-@cindex fields, and tabs +- +-@cindex @acronym{EBCDIC} encoding of a tab +-A tab character (@acronym{ASCII} char@tie{}9, @acronym{EBCDIC} +-char@tie{}5) causes a horizontal movement to the next tab stop (much +-like it did on a typewriter). +- +-@Defesc {\\t, , , } +-@cindex tab character, non-interpreted (@code{\t}) +-@cindex character, tab, non-interpreted (@code{\t}) +-@cindex @code{\t}, and copy-in mode +-@cindex copy-in mode, and @code{\t} +-@cindex mode, copy-in, and @code{\t} +-This escape is a non-interpreted tab character. In copy mode +-(@pxref{Copy-in Mode}), @code{\t} is the same as a real tab character. +-@endDefesc +- +-@DefreqList {ta, [@Var{n1} @Var{n2} @dots{} @Var{nn} @t{T} @Var{r1} @Var{r2} @dots{} @Var{rn}]} +-@DefregListEndx {.tabs} +-Change tab stop positions. This request takes a series of tab +-specifiers as arguments (optionally divided into two groups with the +-letter @samp{T}) that indicate where each tab stop is to be (overriding +-any previous settings). +- +-Tab stops can be specified absolutely, i.e., as the distance from the +-left margin. For example, the following sets 6@tie{}tab stops every one +-inch. +- +-@Example +-.ta 1i 2i 3i 4i 5i 6i +-@endExample +- +-Tab stops can also be specified using a leading @samp{+}, which means +-that the specified tab stop is set relative to the previous tab stop. +-For example, the following is equivalent to the previous example. +- +-@Example +-.ta 1i +1i +1i +1i +1i +1i +-@endExample +- +-@code{gtroff} supports an extended syntax to specify repeat values after +-the @samp{T} mark (these values are always taken as relative) -- this is +-the usual way to specify tabs set at equal intervals. The following is, +-yet again, the same as the previous examples. It does even more since +-it defines an infinite number of tab stops separated by one inch. +- +-@Example +-.ta T 1i +-@endExample +- +-Now we are ready to interpret the full syntax given at the beginning: +-Set tabs at positions @var{n1}, @var{n2}, @dots{}, @var{nn} and then set +-tabs at @var{nn}+@var{r1}, @var{nn}+@var{r2}, @dots{}, @var{nn}+@var{rn} +-and then at @var{nn}+@var{rn}+@var{r1}, @var{nn}+@var{rn}+@var{r2}, +-@dots{}, @var{nn}+@var{rn}+@var{rn}, and so on. +- +-Example: @samp{4c +6c T 3c 5c 2c} is equivalent to @samp{4c 10c 13c 18c +-20c 23c 28c 30c @dots{}}. +- +-The material in each tab column (i.e., the column between two tab stops) +-may be justified to the right or left or centered in the column. This +-is specified by appending @samp{R}, @samp{L}, or @samp{C} to the tab +-specifier. The default justification is @samp{L}. Example: +- +-@Example +-.ta 1i 2iC 3iR +-@endExample +- +-Some notes: +- +-@itemize @bullet +-@item +-The default unit of the @code{ta} request is @samp{m}. +- +-@item +-A tab stop is converted into a non-breakable horizontal movement that +-can be neither stretched nor squeezed. For example, +- +-@Example +-.ds foo a\tb\tc +-.ta T 5i +-\*[foo] +-@endExample +- +-@noindent +-creates a single line, which is a bit longer than 10@tie{}inches (a +-string is used to show exactly where the tab characters are). Now +-consider the following: +- +-@Example +-.ds bar a\tb b\tc +-.ta T 5i +-\*[bar] +-@endExample +- +-@noindent +-@code{gtroff} first converts the tab stops of the line into unbreakable +-horizontal movements, then splits the line after the second @samp{b} +-(assuming a sufficiently short line length). Usually, this isn't what +-the user wants. +- +-@item +-Superfluous tabs (i.e., tab characters that do not correspond to a tab +-stop) are ignored except the first one, which delimits the characters +-belonging to the last tab stop for right-justifying or centering. +-Consider the following example +- +-@Example +-.ds Z foo\tbar\tfoo +-.ds ZZ foo\tbar\tfoobar +-.ds ZZZ foo\tbar\tfoo\tbar +-.ta 2i 4iR +-\*[Z] +-.br +-\*[ZZ] +-.br +-\*[ZZZ] +-.br +-@endExample +- +-@noindent +-which produces the following output: +- +-@Example +-foo bar foo +-foo bar foobar +-foo bar foobar +-@endExample +- +-@noindent +-The first line right-justifies the second `foo' relative to the tab +-stop. The second line right-justifies `foobar'. The third line finally +-right-justifies only `foo' because of the additional tab character, which +-marks the end of the string belonging to the last defined tab stop. +- +-@item +-Tab stops are associated with the current environment +-(@pxref{Environments}). +- +-@item +-Calling @code{ta} without an argument removes all tab stops. +- +-@item +-@cindex tab stops, for TTY output devices +-The start-up value of @code{gtroff} is @w{@samp{T 0.8i}}. +-@end itemize +- +-@cindex tab settings register (@code{.tabs}) +-The read-only number register @code{.tabs} contains a string +-representation of the current tab settings suitable for use as an +-argument to the @code{ta} request. +- +-@Example +-.ds tab-string \n[.tabs] +-\*[tab-string] +- @result{} T120u +-@endExample +- +-@cindex @code{.S} register, Plan@tie{}9 alias for @code{.tabs} +-@cindex @code{.tabs} register, Plan@tie{}9 alias (@code{.S}) +-The @code{troff} version of the Plan@tie{}9 operating system uses +-register @code{.S} for the same purpose. +-@endDefreq +- +-@Defreq {tc, [@Var{fill-glyph}]} +-@cindex tab repetition character (@code{tc}) +-@cindex character, tab repetition (@code{tc}) +-@cindex glyph, tab repetition (@code{tc}) +-Normally @code{gtroff} fills the space to the next tab stop with +-whitespace. This can be changed with the @code{tc} request. With no +-argument @code{gtroff} reverts to using whitespace, which is the +-default. The value of this @dfn{tab repetition character} is associated +-with the current environment (@pxref{Environments}).@footnote{@dfn{Tab +-repetition character} is a misnomer since it is an output glyph.} +-@endDefreq +- +-@DefreqList {linetabs, n} +-@DefregListEndx {.linetabs} +-@cindex tab, line-tabs mode +-@cindex line-tabs mode +-@cindex mode, line-tabs +-If @var{n} is missing or not zero, enable @dfn{line-tabs} mode, or +-disable it otherwise (the default). In line-tabs mode, @code{gtroff} +-computes tab distances relative to the (current) output line instead of +-the input line. +- +-For example, the following code: +- +-@Example +-.ds x a\t\c +-.ds y b\t\c +-.ds z c +-.ta 1i 3i +-\*x +-\*y +-\*z +-@endExample +- +-@noindent +-in normal mode, results in the output +- +-@Example +-a b c +-@endExample +- +-@noindent +-in line-tabs mode, the same code outputs +- +-@Example +-a b c +-@endExample +- +-Line-tabs mode is associated with the current environment. The +-read-only register @code{.linetabs} is set to@tie{}1 if in line-tabs +-mode, and 0 in normal mode. +-@endDefreq +- +-@menu +-* Leaders:: +-* Fields:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Leaders, Fields, Tabs and Fields, Tabs and Fields +-@subsection Leaders +-@cindex leaders +- +-Sometimes it may may be desirable to use the @code{tc} request to fill a +-particular tab stop with a given glyph (for example dots in a table of +-contents), but also normal tab stops on the rest of the line. For this +-@code{gtroff} provides an alternate tab mechanism, called @dfn{leaders}, +-which does just that. +- +-@cindex leader character +-A leader character (character code@tie{}1) behaves similarly to a tab +-character: It moves to the next tab stop. The only difference is that +-for this movement, the fill glyph defaults to a period character and not +-to space. +- +-@Defesc {\\a, , , } +-@cindex leader character, non-interpreted (@code{\a}) +-@cindex character, leader, non-interpreted (@code{\a}) +-@cindex @code{\a}, and copy-in mode +-@cindex copy-in mode, and @code{\a} +-@cindex mode, copy-in, and @code{\a} +-This escape is a non-interpreted leader character. In copy mode +-(@pxref{Copy-in Mode}), @code{\a} is the same as a real leader +-character. +-@endDefesc +- +-@Defreq {lc, [@Var{fill-glyph}]} +-@cindex leader repetition character (@code{lc}) +-@cindex character, leader repetition (@code{lc}) +-@cindex glyph, leader repetition (@code{lc}) +-Declare the @dfn{leader repetition character}.@footnote{@dfn{Leader +-repetition character} is a misnomer since it is an output glyph.} +-Without an argument, leaders act the same as tabs (i.e., using +-whitespace for filling). @code{gtroff}'s start-up value is a dot +-(@samp{.}). The value of the leader repetition character is associated +-with the current environment (@pxref{Environments}). +-@endDefreq +- +-@cindex table of contents +-@cindex contents, table of +-For a table of contents, to name an example, tab stops may be defined so +-that the section number is one tab stop, the title is the second with +-the remaining space being filled with a line of dots, and then the page +-number slightly separated from the dots. +- +-@Example +-.ds entry 1.1\tFoo\a\t12 +-.lc . +-.ta 1i 5i +.25i +-\*[entry] +-@endExample +- +-@noindent +-This produces +- +-@Example +-1.1 Foo.......................................... 12 +-@endExample +- +-@c --------------------------------------------------------------------- +- +-@node Fields, , Leaders, Tabs and Fields +-@subsection Fields +-@cindex fields +- +-@cindex field delimiting character (@code{fc}) +-@cindex delimiting character, for fields (@code{fc}) +-@cindex character, field delimiting (@code{fc}) +-@cindex field padding character (@code{fc}) +-@cindex padding character, for fields (@code{fc}) +-@cindex character, field padding (@code{fc}) +-@dfn{Fields} are a more general way of laying out tabular data. A field +-is defined as the data between a pair of @dfn{delimiting characters}. +-It contains substrings that are separated by @dfn{padding characters}. +-The width of a field is the distance on the @emph{input} line from the +-position where the field starts to the next tab stop. A padding +-character inserts stretchable space similar to @TeX{}'s @code{\hss} +-command (thus it can even be negative) to make the sum of all substring +-lengths plus the stretchable space equal to the field width. If more +-than one padding character is inserted, the available space is evenly +-distributed among them. +- +-@Defreq {fc, [@Var{delim-char} [@Var{padding-char}]]} +-Define a delimiting and a padding character for fields. If the latter +-is missing, the padding character defaults to a space character. If +-there is no argument at all, the field mechanism is disabled (which is +-the default). Note that contrary to e.g.@: the tab repetition +-character, delimiting and padding characters are @emph{not} associated +-to the current environment (@pxref{Environments}). +- +-Example: +- +-@Example +-.fc # ^ +-.ta T 3i +-#foo^bar^smurf# +-.br +-#foo^^bar^smurf# +-@endExample +- +-@noindent +-and here the result: +- +-@Example +-foo bar smurf +-foo bar smurf +-@endExample +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Character Translations, Troff and Nroff Mode, Tabs and Fields, gtroff Reference +-@section Character Translations +-@cindex character translations +-@cindex translations of characters +- +-@cindex control character, changing (@code{cc}) +-@cindex character, control, changing (@code{cc}) +-@cindex no-break control character, changing (@code{c2}) +-@cindex character, no-break control, changing (@code{c2}) +-@cindex control character, no-break, changing (@code{c2}) +-The control character (@samp{.}) and the no-break control character +-(@samp{'}) can be changed with the @code{cc} and @code{c2} requests, +-respectively. +- +-@Defreq {cc, [@Var{c}]} +-Set the control character to@tie{}@var{c}. With no argument the default +-control character @samp{.} is restored. The value of the control +-character is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@Defreq {c2, [@Var{c}]} +-Set the no-break control character to@tie{}@var{c}. With no argument +-the default control character @samp{'} is restored. The value of the +-no-break control character is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@xref{Requests}. +- +-@Defreq {eo, } +-@cindex disabling @code{\} (@code{eo}) +-@cindex @code{\}, disabling (@code{eo}) +-Disable the escape mechanism completely. After executing this request, +-the backslash character @samp{\} no longer starts an escape sequence. +- +-This request can be very helpful in writing macros since it is not +-necessary then to double the escape character. Here an example: +- +-@Example +-.\" This is a simplified version of the +-.\" .BR request from the man macro package +-.eo +-.de BR +-. ds result \& +-. while (\n[.$] >= 2) \@{\ +-. as result \fB\$1\fR\$2 +-. shift 2 +-. \@} +-. if \n[.$] .as result \fB\$1 +-\*[result] +-. ft R +-.. +-.ec +-@endExample +-@endDefreq +- +-@Defreq {ec, [@Var{c}]} +-@cindex escape character, changing (@code{ec}) +-@cindex character, escape, changing (@code{ec}) +-Set the escape character to@tie{}@var{c}. With no argument the default +-escape character @samp{\} is restored. It can be also used to re-enable +-the escape mechanism after an @code{eo} request. +- +-Note that changing the escape character globally likely breaks macro +-packages since @code{gtroff} has no mechanism to `intern' macros, i.e., +-to convert a macro definition into an internal form that is independent +-of its representation (@TeX{} has this mechanism). If a macro is +-called, it is executed literally. +-@endDefreq +- +-@DefreqList {ecs, } +-@DefreqListEndx {ecr, } +-The @code{ecs} request saves the current escape character in an internal +-register. Use this request in combination with the @code{ec} request to +-temporarily change the escape character. +- +-The @code{ecr} request restores the escape character saved with +-@code{ecs}. Without a previous call to @code{ecs}, this request sets +-the escape character to @code{\}. +-@endDefreq +- +-@DefescList {\\\\, , , } +-@DefescItemx {\\e, , , } +-@DefescListEndx {\\E, , , } +-Print the current escape character (which is the backslash character +-@samp{\} by default). +- +-@code{\\} is a `delayed' backslash; more precisely, it is the default +-escape character followed by a backslash, which no longer has special +-meaning due to the leading escape character. It is @emph{not} an escape +-sequence in the usual sense! In any unknown escape sequence +-@code{\@var{X}} the escape character is ignored and @var{X} is printed. +-But if @var{X} is equal to the current escape character, no warning is +-emitted. +- +-@cindex @code{\E}, and copy-in mode +-@cindex copy-in mode, and @code{\E} +-@cindex mode, copy-in, and @code{\E} +-As a consequence, only at top-level or in a diversion a backslash glyph +-is printed; in copy-in mode, it expands to a single backslash, which then +-combines with the following character to an escape sequence. +- +-The @code{\E} escape differs from @code{\e} by printing an escape +-character that is not interpreted in copy mode. Use this to define +-strings with escapes that work when used in copy mode (for example, as a +-macro argument). The following example defines strings to begin and end +-a superscript: +- +-@Example +-.ds @{ \v'-.3m'\s'\En[.s]*60/100' +-.ds @} \s0\v'.3m' +-@endExample +- +-Another example to demonstrate the differences between the various +-escape sequences, using a strange escape character, @samp{-}. +- +-@Example +-.ec - +-.de xxx +---A'123' +-.. +-.xxx +- @result{} -A'foo' +-@endExample +- +-@noindent +-The result is surprising for most users, expecting @samp{1} since +-@samp{foo} is a valid identifier. What has happened? As mentioned +-above, the leading escape character makes the following character +-ordinary. Written with the default escape character the sequence +-@samp{--} becomes @samp{\-} -- this is the minus sign. +- +-If the escape character followed by itself is a valid escape sequence, +-only @code{\E} yields the expected result: +- +-@Example +-.ec - +-.de xxx +--EA'123' +-.. +-.xxx +- @result{} 1 +-@endExample +-@endDefesc +- +-@Defesc {\\., , , } +-Similar to @code{\\}, the sequence @code{\.} isn't a real escape +-sequence. As before, a warning message is suppressed if the escape +-character is followed by a dot, and the dot itself is printed. +- +-@Example +-.de foo +-. nop foo +-. +-. de bar +-. nop bar +-\\.. +-. +-.. +-.foo +-.bar +- @result{} foo bar +-@endExample +- +-@noindent +-The first backslash is consumed while the macro is read, and the second +-is swallowed while executing macro @code{foo}. +-@endDefesc +- +-A @dfn{translation} is a mapping of an input character to an output +-glyph. The mapping occurs at output time, i.e., the input character +-gets assigned the metric information of the mapped output character +-right before input tokens are converted to nodes (@pxref{Gtroff +-Internals}, for more on this process). +- +-@DefreqList {tr, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} +-@DefreqListEndx {trin, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} +-Translate character @var{a} to glyph@tie{}@var{b}, character @var{c} to +-glyph@tie{}@var{d}, etc. If there is an odd number of arguments, the +-last one is translated to an unstretchable space (@w{@samp{\ }}). +- +-The @code{trin} request is identical to @code{tr}, but when you unformat +-a diversion with @code{asciify} it ignores the translation. +-@xref{Diversions}, for details about the @code{asciify} request. +- +-Some notes: +- +-@itemize @bullet +-@item +-@cindex @code{\(}, and translations +-@cindex @code{\[}, and translations +-@cindex @code{\'}, and translations +-@cindex @code{\`}, and translations +-@cindex @code{\-}, and translations +-@cindex @code{\_}, and translations +-@cindex @code{\C}, and translations +-@cindex @code{\N}, and translations +-@cindex @code{char} request, and translations +-@cindex special characters +-@cindex character, special +-@cindex numbered glyph (@code{\N}) +-@cindex glyph, numbered (@code{\N}) +-Special characters (@code{\(@var{xx}}, @code{\[@var{xxx}]}, +-@code{\C'@var{xxx}'}, @code{\'}, @code{\`}, @code{\-}, @code{\_}), +-glyphs defined with the @code{char} request, and numbered glyphs +-(@code{\N'@var{xxx}'}) can be translated also. +- +-@item +-@cindex @code{\e}, and translations +-The @code{\e} escape can be translated also. +- +-@item +-@cindex @code{\%}, and translations +-@cindex @code{\~}, and translations +-Characters can be mapped onto the @code{\%} and @code{\~} escapes (but +-@code{\%} and @code{\~} can't be mapped onto another glyph). +- +-@item +-@cindex backspace character, and translations +-@cindex character, backspace, and translations +-@cindex leader character, and translations +-@cindex character, leader, and translations +-@cindex newline character, and translations +-@cindex character, newline, and translations +-@cindex tab character, and translations +-@cindex character, tab, and translations +-@cindex @code{\a}, and translations +-@cindex @code{\t}, and translations +-The following characters can't be translated: space (with one exception, +-see below), backspace, newline, leader (and @code{\a}), tab (and +-@code{\t}). +- +-@item +-@cindex @code{shc} request, and translations +-Translations are not considered for finding the soft hyphen character +-set with the @code{shc} request. +- +-@item +-@cindex @code{\&}, and translations +-The pair @samp{@var{c}\&} (this is an arbitrary character@tie{}@var{c} +-followed by the zero width space character) maps this character to +-nothing. +- +-@Example +-.tr a\& +-foo bar +- @result{} foo br +-@endExample +- +-@noindent +-It is even possible to map the space character to nothing: +- +-@Example +-.tr aa \& +-foo bar +- @result{} foobar +-@endExample +- +-@noindent +-As shown in the example, the space character can't be the first +-character/glyph pair as an argument of @code{tr}. Additionally, it is +-not possible to map the space character to any other glyph; requests +-like @w{@samp{.tr aa x}} undo @w{@samp{.tr aa \&}} instead. +- +-If justification is active, lines are justified in spite of the `empty' +-space character (but there is no minimal distance, i.e.@: the space +-character, between words). +- +-@item +-After an output glyph has been constructed (this happens at the moment +-immediately before the glyph is appended to an output glyph list, either +-by direct output, in a macro, diversion, or string), it is no longer +-affected by @code{tr}. +- +-@item +-Translating character to glyphs where one of them or both are undefined +-is possible also; @code{tr} does not check whether the entities in its +-argument do exist. +- +-@xref{Gtroff Internals}. +- +-@item +-@code{troff} no longer has a hard-coded dependency on @w{Latin-1}; all +-@code{char@var{XXX}} entities have been removed from the font +-description files. This has a notable consequence that shows up in +-warnings like @code{can't find character with input code @var{XXX}} if +-the @code{tr} request isn't handled properly. +- +-Consider the following translation: +- +-@Example +-.tr +-@endExample +- +-@noindent +-This maps input character @code{} onto glyph @code{}, which is +-identical to glyph @code{char201}. But this glyph intentionally doesn't +-exist! Instead, @code{\[char201]} is treated as an input character +-entity and is by default mapped onto @code{\['E]}, and @code{gtroff} +-doesn't handle translations of translations. +- +-The right way to write the above translation is +- +-@Example +-.tr \['E] +-@endExample +- +-@noindent +-In other words, the first argument of @code{tr} should be an input +-character or entity, and the second one a glyph entity. +- +-@item +-Without an argument, the @code{tr} request is ignored. +-@end itemize +-@endDefreq +- +-@Defreq {trnt, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} +-@cindex @code{\!}, and @code{trnt} +-@code{trnt} is the same as the @code{tr} request except that the +-translations do not apply to text that is transparently throughput into +-a diversion with @code{\!}. @xref{Diversions}, for more information. +- +-For example, +- +-@Example +-.tr ab +-.di x +-\!.tm a +-.di +-.x +-@endExample +- +-@noindent +-prints @samp{b} to the standard error stream; if @code{trnt} is used +-instead of @code{tr} it prints @samp{a}. +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Troff and Nroff Mode, Line Layout, Character Translations, gtroff Reference +-@section Troff and Nroff Mode +-@cindex troff mode +-@cindex mode, troff +-@cindex nroff mode +-@cindex mode, nroff +- +-Originally, @code{nroff} and @code{troff} were two separate programs, +-the former for TTY output, the latter for everything else. With GNU +-@code{troff}, both programs are merged into one executable, sending its +-output to a device driver (@code{grotty} for TTY devices, @code{grops} +-for @sc{PostScript}, etc.)@: which interprets the intermediate output of +-@code{gtroff}. For @acronym{UNIX} @code{troff} it makes sense to talk +-about @dfn{Nroff mode} and @dfn{Troff mode} since the differences are +-hardcoded. For GNU @code{troff}, this distinction is not appropriate +-because @code{gtroff} simply takes the information given in the font +-files for a particular device without handling requests specially if a +-TTY output device is used. +- +-Usually, a macro package can be used with all output devices. +-Nevertheless, it is sometimes necessary to make a distinction between +-TTY and non-TTY devices: @code{gtroff} provides two built-in conditions +-@samp{n} and @samp{t} for the @code{if}, @code{ie}, and @code{while} +-requests to decide whether @code{gtroff} shall behave like @code{nroff} +-or like @code{troff}. +- +-@Defreq {troff, } +-@pindex troffrc +-@pindex troffrc-end +-Make the @samp{t} built-in condition true (and the @samp{n} built-in +-condition false) for @code{if}, @code{ie}, and @code{while} conditional +-requests. This is the default if @code{gtroff} (@emph{not} +-@code{groff}) is started with the @option{-R} switch to avoid loading of +-the start-up files @file{troffrc} and @file{troffrc-end}. Without +-@option{-R}, @code{gtroff} stays in troff mode if the output device is +-not a TTY (e.g.@: `ps'). +-@endDefreq +- +-@Defreq {nroff, } +-@pindex tty.tmac +-Make the @samp{n} built-in condition true (and the @samp{t} built-in +-condition false) for @code{if}, @code{ie}, and @code{while} conditional +-requests. This is the default if @code{gtroff} uses a TTY output +-device; the code for switching to nroff mode is in the file +-@file{tty.tmac}, which is loaded by the start-up file @code{troffrc}. +-@endDefreq +- +-@xref{Conditionals and Loops}, for more details on built-in conditions. +- +- +-@c ===================================================================== +- +-@node Line Layout, Line Control, Troff and Nroff Mode, gtroff Reference +-@section Line Layout +-@cindex line layout +-@cindex layout, line +- +-@cindex dimensions, line +-@cindex line dimensions +-The following drawing shows the dimensions that @code{gtroff} uses for +-placing a line of output onto the page. They are labeled with the +-request that manipulates each dimension. +- +-@Example +- -->| in |<-- +- |<-----------ll------------>| +- +----+----+----------------------+----+ +- | : : : | +- +----+----+----------------------+----+ +--->| po |<-- +- |<--------paper width---------------->| +-@endExample +- +-@noindent +-These dimensions are: +- +-@ftable @code +-@item po +-@cindex left margin (@code{po}) +-@cindex margin, left (@code{po}) +-@cindex page offset (@code{po}) +-@cindex offset, page (@code{po}) +-@dfn{Page offset} -- this is the leftmost position of text on the final +-output, defining the @dfn{left margin}. +- +-@item in +-@cindex indentation (@code{in}) +-@cindex line indentation (@code{in}) +-@dfn{Indentation} -- this is the distance from the left margin where +-text is printed. +- +-@item ll +-@cindex line length (@code{ll}) +-@cindex length of line (@code{ll}) +-@dfn{Line length} -- this is the distance from the left margin to right +-margin. +-@end ftable +- +-A simple demonstration: +- +-@Example +-.ll 3i +-This is text without indentation. +-The line length has been set to 3\~inch. +-.in +.5i +-.ll -.5i +-Now the left and right margins are both increased. +-.in +-.ll +-Calling .in and .ll without parameters restore +-the previous values. +-@endExample +- +-Result: +- +-@Example +-This is text without indenta- +-tion. The line length has +-been set to 3 inch. +- Now the left and +- right margins are +- both increased. +-Calling .in and .ll without +-parameters restore the previ- +-ous values. +-@endExample +- +-@DefreqList {po, [@Var{offset}]} +-@DefreqItem {po, @t{+}@Var{offset}} +-@DefreqItem {po, @t{-}@Var{offset}} +-@DefregListEndx {.o} +-@pindex troffrc +-Set horizontal page offset to @var{offset} (or increment or decrement +-the current value by @var{offset}). Note that this request does not +-cause a break, so changing the page offset in the middle of text being +-filled may not yield the expected result. The initial value is +-1@dmn{i}. For TTY output devices, it is set to 0 in the startup file +-@file{troffrc}; the default scaling indicator is @samp{m} (and not +-@samp{v} as incorrectly documented in the original @acronym{UNIX} troff +-manual). +- +-The current page offset can be found in the read-only number register +-@samp{.o}. +- +-If @code{po} is called without an argument, the page offset is reset to +-the previous value before the last call to @code{po}. +- +-@Example +-.po 3i +-\n[.o] +- @result{} 720 +-.po -1i +-\n[.o] +- @result{} 480 +-.po +-\n[.o] +- @result{} 720 +-@endExample +-@endDefreq +- +-@DefreqList {in, [@Var{indent}]} +-@DefreqItem {in, @t{+}@Var{indent}} +-@DefreqItem {in, @t{-}@Var{indent}} +-@DefregListEndx {.i} +-Set indentation to @var{indent} (or increment or decrement the current +-value by @var{indent}). This request causes a break. Initially, there +-is no indentation. +- +-If @code{in} is called without an argument, the indentation is reset to +-the previous value before the last call to @code{in}. The default +-scaling indicator is @samp{m}. +- +-The indentation is associated with the current environment +-(@pxref{Environments}). +- +-If a negative indentation value is specified (which is not allowed), +-@code{gtroff} emits a warning of type @samp{range} and sets the +-indentation to zero. +- +-The effect of @code{in} is delayed until a partially collected line (if +-it exists) is output. A temporary indentation value is reset to zero +-also. +- +-The current indentation (as set by @code{in}) can be found in the +-read-only number register @samp{.i}. +-@endDefreq +- +-@DefreqList {ti, offset} +-@DefreqItem {ti, @t{+}@Var{offset}} +-@DefreqItem {ti, @t{-}@Var{offset}} +-@DefregListEndx {.in} +-Temporarily indent the next output line by @var{offset}. If an +-increment or decrement value is specified, adjust the temporary +-indentation relative to the value set by the @code{in} request. +- +-This request causes a break; its value is associated with the current +-environment (@pxref{Environments}). The default scaling indicator is +-@samp{m}. A call of @code{ti} without an argument is ignored. +- +-If the total indentation value is negative (which is not allowed), +-@code{gtroff} emits a warning of type @samp{range} and sets the +-temporary indentation to zero. `Total indentation' is either +-@var{offset} if specified as an absolute value, or the temporary plus +-normal indentation, if @var{offset} is given as a relative value. +- +-The effect of @code{ti} is delayed until a partially collected line (if +-it exists) is output. +- +-The read-only number register @code{.in} is the indentation that applies +-to the current output line. +- +-The difference between @code{.i} and @code{.in} is that the latter takes +-into account whether a partially collected line still uses the old +-indentation value or a temporary indentation value is active. +-@endDefreq +- +-@DefreqList {ll, [@Var{length}]} +-@DefreqItem {ll, @t{+}@Var{length}} +-@DefreqItem {ll, @t{-}@Var{length}} +-@DefregItemx {.l} +-@DefregListEndx {.ll} +-Set the line length to @var{length} (or increment or decrement the +-current value by @var{length}). Initially, the line length is set to +-6.5@dmn{i}. The effect of @code{ll} is delayed until a partially +-collected line (if it exists) is output. The default scaling indicator +-is @samp{m}. +- +-If @code{ll} is called without an argument, the line length is reset to +-the previous value before the last call to @code{ll}. If a negative +-line length is specified (which is not allowed), @code{gtroff} emits a +-warning of type @samp{range} and sets the line length to zero. +- +-The line length is associated with the current environment +-(@pxref{Environments}). +- +-@cindex line length register (@code{.l}) +-The current line length (as set by @code{ll}) can be found in the +-read-only number register @samp{.l}. The read-only number register +-@code{.ll} is the line length that applies to the current output line. +- +-Similar to @code{.i} and @code{.in}, the difference between @code{.l} +-and @code{.ll} is that the latter takes into account whether a partially +-collected line still uses the old line length value. +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Line Control, Page Layout, Line Layout, gtroff Reference +-@section Line Control +-@cindex line control +-@cindex control, line +- +-It is important to understand how @code{gtroff} handles input and output +-lines. +- +-Many escapes use positioning relative to the input line. For example, +-this +- +-@Example +-This is a \h'|1.2i'test. +- +-This is a +-\h'|1.2i'test. +-@endExample +- +-@noindent +-produces +- +-@Example +-This is a test. +- +-This is a test. +-@endExample +- +-The main usage of this feature is to define macros that act exactly at +-the place where called. +- +-@Example +-.\" A simple macro to underline a word +-.de underline +-. nop \\$1\l'|0\[ul]' +-.. +-@endExample +- +-@noindent +-In the above example, @samp{|0} specifies a negative distance from the +-current position (at the end of the just emitted argument @code{\$1}) +-back to the beginning of the input line. Thus, the @samp{\l} escape +-draws a line from right to left. +- +-@cindex input line continuation (@code{\}) +-@cindex line, input, continuation (@code{\}) +-@cindex continuation, input line (@code{\}) +-@cindex output line, continuation (@code{\c}) +-@cindex line, output, continuation (@code{\c}) +-@cindex continuation, output line (@code{\c}) +-@cindex interrupted line +-@cindex line, interrupted +-@code{gtroff} makes a difference between input and output line +-continuation; the latter is also called @dfn{interrupting} a line. +- +-@DefescList {\\@key{RET}, , ,} +-@DefescItemx {\\c, , ,} +-@DefregListEndx {.int} +-Continue a line. @code{\@key{RET}} (this is a backslash at the end of a +-line immediately followed by a newline) works on the input level, +-suppressing the effects of the following newline in the input. +- +-@Example +-This is a \ +-.test +- @result{} This is a .test +-@endExample +- +-The @samp{|} operator is also affected. +- +-@cindex @code{\R}, after @code{\c} +-@code{\c} works on the output level. Anything after this escape on the +-same line is ignored except @code{\R}, which works as usual. Anything +-before @code{\c} on the same line is appended to the current partial +-output line. The next non-command line after an interrupted line counts +-as a new input line. +- +-The visual results depend on whether no-fill mode is active. +- +-@itemize @bullet +-@item +-@cindex @code{\c}, and no-fill mode +-@cindex no-fill mode, and @code{\c} +-@cindex mode, no-fill, and @code{\c} +-If no-fill mode is active (using the @code{nf} request), the next input +-text line after @code{\c} is handled as a continuation of the same input +-text line. +- +-@Example +-.nf +-This is a \c +-test. +- @result{} This is a test. +-@endExample +- +-@item +-@cindex @code{\c}, and fill mode +-@cindex fill mode, and @code{\c} +-@cindex mode, fill, and @code{\c} +-If fill mode is active (using the @code{fi} request), a word interrupted +-with @code{\c} is continued with the text on the next input text line, +-without an intervening space. +- +-@Example +-This is a te\c +-st. +- @result{} This is a test. +-@endExample +-@end itemize +- +-Note that an intervening control line that causes a break is stronger +-than @code{\c}, flushing out the current partial line in the usual way. +- +-@cindex interrupted line register (@code{.int}) +-The @code{.int} register contains a positive value if the last output +-line was interrupted with @code{\c}; this is associated with the current +-environment (@pxref{Environments}). +-@endDefesc +- +- +-@c ===================================================================== +- +-@node Page Layout, Page Control, Line Control, gtroff Reference +-@section Page Layout +-@cindex page layout +-@cindex layout, page +- +-@code{gtroff} provides some very primitive operations for controlling +-page layout. +- +-@DefreqList {pl, [@Var{length}]} +-@DefreqItem {pl, @t{+}@Var{length}} +-@DefreqItem {pl, @t{-}@Var{length}} +-@DefregListEndx {.p} +-@cindex page length (@code{pl}) +-@cindex length of page (@code{pl}) +-Set the @dfn{page length} to @var{length} (or increment or decrement the +-current value by @var{length}). This is the length of the physical +-output page. The default scaling indicator is @samp{v}. +- +-@cindex page length register (@code{.p}) +-The current setting can be found in the read-only number register +-@samp{.p}. +- +-@cindex top margin +-@cindex margin, top +-@cindex bottom margin +-@cindex margin, bottom +-Note that this only specifies the size of the page, not the top and +-bottom margins. Those are not set by @code{gtroff} directly. +-@xref{Traps}, for further information on how to do this. +- +-Negative @code{pl} values are possible also, but not very useful: No +-trap is sprung, and each line is output on a single page (thus +-suppressing all vertical spacing). +- +-If no argument or an invalid argument is given, @code{pl} sets the page +-length to 11@dmn{i}. +-@endDefreq +- +-@cindex headers +-@cindex footers +-@cindex titles +-@code{gtroff} provides several operations that help in setting up top +-and bottom titles (or headers and footers). +- +-@Defreq {tl, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}} +-@cindex title line (@code{tl}) +-@cindex three-part title (@code{tl}) +-@cindex page number character (@code{%}) +-Print a @dfn{title line}. It consists of three parts: a left justified +-portion, a centered portion, and a right justified portion. The +-argument separator @samp{'} can be replaced with any character not +-occurring in the title line. The @samp{%} character is replaced with +-the current page number. This character can be changed with the +-@code{pc} request (see below). +- +-Without argument, @code{tl} is ignored. +- +-Some notes: +- +-@itemize @bullet +-@item +-The line length set by the @code{ll} request is not honoured by +-@code{tl}; use the @code{lt} request (described below) instead, to +-control line length for text set by @code{tl}. +- +-@item +-A title line is not restricted to the top or bottom of a page. +- +-@item +-@code{tl} prints the title line immediately, ignoring a partially filled +-line (which stays untouched). +- +-@item +-It is not an error to omit closing delimiters. For example, +-@w{@samp{.tl /foo}} is equivalent to @w{@samp{.tl /foo///}}: It prints a +-title line with the left justified word @samp{foo}; the centered and +-right justfied parts are empty. +- +-@item +-@code{tl} accepts the same parameter delimiting characters as the +-@code{\A} escape; see @ref{Escapes}. +-@end itemize +-@endDefreq +- +-@DefreqList {lt, [@Var{length}]} +-@DefreqItem {lt, @t{+}@Var{length}} +-@DefreqItem {lt, @t{-}@Var{length}} +-@DefregListEndx {.lt} +-@cindex length of title line (@code{lt}) +-@cindex title line, length (@code{lt}) +-@cindex title line length register (@code{.lt}) +-The title line is printed using its own line length, which is specified +-(or incremented or decremented) with the @code{lt} request. Initially, +-the title line length is set to 6.5@dmn{i}. If a negative line length +-is specified (which is not allowed), @code{gtroff} emits a warning of +-type @samp{range} and sets the title line length to zero. The default +-scaling indicator is @samp{m}. If @code{lt} is called without an +-argument, the title length is reset to the previous value before the +-last call to @code{lt}. +- +-The current setting of this is available in the @code{.lt} read-only +-number register; it is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@DefreqList {pn, page} +-@DefreqItem {pn, @t{+}@Var{page}} +-@DefreqItem {pn, @t{-}@Var{page}} +-@DefregListEndx {.pn} +-@cindex page number (@code{pn}) +-@cindex number, page (@code{pn}) +-Change (increase or decrease) the page number of the @emph{next} page. +-The only argument is the page number; the request is ignored without a +-parameter. +- +-The read-only number register @code{.pn} contains the number of the next +-page: either the value set by a @code{pn} request, or the number of the +-current page plus@tie{}1. +-@endDefreq +- +-@Defreq {pc, [@Var{char}]} +-@cindex changing the page number character (@code{pc}) +-@cindex page number character, changing (@code{pc}) +-@vindex % +-Change the page number character (used by the @code{tl} request) to a +-different character. With no argument, this mechanism is disabled. +-Note that this doesn't affect the number register@tie{}@code{%}. +-@endDefreq +- +-@xref{Traps}. +- +- +-@c ===================================================================== +- +-@node Page Control, Fonts and Symbols, Page Layout, gtroff Reference +-@section Page Control +-@cindex page control +-@cindex control, page +- +-@DefreqList {bp, [@Var{page}]} +-@DefreqItem {bp, @t{+}@Var{page}} +-@DefreqItem {bp, @t{-}@Var{page}} +-@DefregListEndx {%} +-@cindex new page (@code{bp}) +-@cindex page, new (@code{bp}) +-Stop processing the current page and move to the next page. This +-request causes a break. It can also take an argument to set (increase, +-decrease) the page number of the next page (which actually becomes the +-current page after @code{bp} has finished). The difference between +-@code{bp} and @code{pn} is that @code{pn} does not cause a break or +-actually eject a page. @xref{Page Layout}. +- +-@Example +-.de newpage \" define macro +-'bp \" begin page +-'sp .5i \" vertical space +-.tl 'left top'center top'right top' \" title +-'sp .3i \" vertical space +-.. \" end macro +-@endExample +- +-@cindex @code{bp} request, and top-level diversion +-@cindex top-level diversion, and @code{bp} +-@cindex diversion, top-level, and @code{bp} +-@code{bp} has no effect if not called within the top-level diversion +-(@pxref{Diversions}). +- +-@cindex page number register (@code{%}) +-@cindex current page number (@code{%}) +-The read-write register@tie{}@code{%} holds the current page number. +- +-The number register @code{.pe} is set to@tie{}1 while @code{bp} is +-active. @xref{Page Location Traps}. +-@endDefreq +- +-@Defreq {ne, [@Var{space}]} +-@cindex orphan lines, preventing with @code{ne} +-@cindex conditional page break (@code{ne}) +-@cindex page break, conditional (@code{ne}) +-It is often necessary to force a certain amount of space before a new +-page occurs. This is most useful to make sure that there is not a +-single @dfn{orphan} line left at the bottom of a page. The @code{ne} +-request ensures that there is a certain distance, specified by the first +-argument, before the next page is triggered (see @ref{Traps}, for +-further information). The default scaling indicator for @code{ne} is +-@samp{v}; the default value of @var{space} is@tie{}1@dmn{v} if no +-argument is given. +- +-For example, to make sure that no fewer than 2@tie{}lines get orphaned, +-do the following before each paragraph: +- +-@Example +-.ne 2 +-text text text +-@endExample +- +-@code{ne} then automatically causes a page break if there is space for +-one line only. +-@endDefreq +- +-@DefreqList {sv, [@Var{space}]} +-@DefreqListEndx {os, } +-@cindex @code{ne} request, comparison with @code{sv} +-@code{sv} is similar to the @code{ne} request; it reserves the specified +-amount of vertical space. If the desired amount of space exists before +-the next trap (or the bottom page boundary if no trap is set), the space +-is output immediately (ignoring a partially filled line, which stays +-untouched). If there is not enough space, it is stored for later output +-via the @code{os} request. The default value is@tie{}1@dmn{v} if no +-argument is given; the default scaling indicator is @samp{v}. +- +-@cindex @code{sv} request, and no-space mode +-@cindex @code{os} request, and no-space mode +-Both @code{sv} and @code{os} ignore no-space mode. While the @code{sv} +-request allows negative values for @var{space}, @code{os} ignores them. +-@endDefreq +- +-@Defreg {nl} +-@cindex current vertical position (@code{nl}) +-@cindex vertical position, current (@code{nl}) +-@cindex position, vertical, current (@code{nl}) +-This register contains the current vertical position. If the vertical +-position is zero and the top of page transition hasn't happened yet, +-@code{nl} is set to negative value. @code{gtroff} itself does this at +-the very beginning of a document before anything has been printed, but +-the main usage is to plant a header trap on a page if this page has +-already started. +- +-Consider the following: +- +-@Example +-.de xxx +-. sp +-. tl ''Header'' +-. sp +-.. +-. +-First page. +-.bp +-.wh 0 xxx +-.nr nl (-1) +-Second page. +-@endExample +- +-@noindent +-Result: +- +-@Example +-First page. +- +-... +- +- Header +- +-Second page. +- +-... +-@endExample +- +-@noindent +-Without resetting @code{nl} to a negative value, the just planted trap +-would be active beginning with the @emph{next} page, not the current +-one. +- +-@xref{Diversions}, for a comparison with the @code{.h} and @code{.d} +-registers. +-@endDefreg +- +- +-@c ===================================================================== +- +-@node Fonts and Symbols, Sizes, Page Control, gtroff Reference +-@section Fonts and Symbols +-@cindex fonts +- +-@code{gtroff} can switch fonts at any point in the text. +- +-The basic set of fonts is @samp{R}, @samp{I}, @samp{B}, and @samp{BI}. +-These are Times Roman, Italic, Bold, and Bold Italic. For non-TTY +-devices, there is also at least one symbol font that contains various +-special symbols (Greek, mathematics). +- +-@menu +-* Changing Fonts:: +-* Font Families:: +-* Font Positions:: +-* Using Symbols:: +-* Character Classes:: +-* Special Fonts:: +-* Artificial Fonts:: +-* Ligatures and Kerning:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Changing Fonts, Font Families, Fonts and Symbols, Fonts and Symbols +-@subsection Changing Fonts +-@cindex fonts +- +-@DefreqList {ft, [@Var{font}]} +-@DefescItemx {\\f, , f, } +-@DefescItem {\\f, @Lparen{}, fn, } +-@DefescItem {\\f, @Lbrack{}, font, @Rbrack{}} +-@DefregListEndx {.sty} +-@cindex changing fonts (@code{ft}, @code{\f}) +-@cindex fonts, changing (@code{ft}, @code{\f}) +-@cindex @code{sty} request, and changing fonts +-@cindex @code{fam} request, and changing fonts +-@cindex @code{\F}, and changing fonts +-@kindex styles +-@kindex family +-@pindex DESC +-The @code{ft} request and the @code{\f} escape change the current font +-to @var{font} (one-character name@tie{}@var{f}, two-character name +-@var{fn}). +- +-If @var{font} is a style name (as set with the @code{sty} request or +-with the @code{styles} command in the @file{DESC} file), use it within +-the current font family (as set with the @code{fam} request, @code{\F} +-escape, or with the @code{family} command in the @file{DESC} file). +- +-It is not possible to switch to a font with the name @samp{DESC} +-(whereas this name could be used as a style name; however, this is not +-recommended). +- +-@cindex previous font (@code{ft}, @code{\f[]}, @code{\fP}) +-@cindex font, previous (@code{ft}, @code{\f[]}, @code{\fP}) +-With no argument or using @samp{P} as an argument, @code{.ft} switches +-to the previous font. Use @code{\f[]} to do this with the escape. The +-old syntax forms @code{\fP} or @code{\f[P]} are also supported. +- +-Fonts are generally specified as upper-case strings, which are usually +-1@tie{}to 4 characters representing an abbreviation or acronym of the +-font name. This is no limitation, just a convention. +- +-The example below produces two identical lines. +- +-@Example +-eggs, bacon, +-.ft B +-spam +-.ft +-and sausage. +- +-eggs, bacon, \fBspam\fP and sausage. +-@endExample +- +-Note that @code{\f} doesn't produce an input token in @code{gtroff}. As +-a consequence, it can be used in requests like @code{mc} (which expects +-a single character as an argument) to change the font on the fly: +- +-@Example +-.mc \f[I]x\f[] +-@endExample +- +-The current style name is available in the read-only number register +-@samp{.sty} (this is a string-valued register); if the current font +-isn't a style, the empty string is returned. It is associated with the +-current environment. +- +-@xref{Font Positions}, for an alternative syntax. +-@endDefreq +- +-@Defreq {ftr, f [@Var{g}]} +-@cindex font translation (@code{ftr}) +-@cindex @code{ft} request, and font translations +-@cindex @code{ul} request, and font translations +-@cindex @code{bd} request, and font translations +-@cindex @code{\f}, and font translations +-@cindex @code{cs} request, and font translations +-@cindex @code{tkf} request, and font translations +-@cindex @code{special} request, and font translations +-@cindex @code{fspecial} request, and font translations +-@cindex @code{fp} request, and font translations +-@cindex @code{sty} request, and font translations +-@cindex @code{if} request, and font translations +-@cindex @code{ie} request, and font translations +-@cindex @code{while} request, and font translations +-Translate font@tie{}@var{f} to font@tie{}@var{g}. Whenever a font +-named@tie{}@var{f} is referred to in a @code{\f} escape sequence, in the +-@code{F} and @code{S} conditional operators, or in the @code{ft}, +-@code{ul}, @code{bd}, @code{cs}, @code{tkf}, @code{special}, +-@code{fspecial}, @code{fp}, or @code{sty} requests, font@tie{}@var{g} is +-used. If @var{g} is missing or equal to@tie{}@var{f} the translation is +-undone. +- +-Note that it is not possible to chain font translations. Example: +- +-@Example +-.ftr XXX TR +-.ftr XXX YYY +-.ft XXX +- @result{} warning: can't find font `XXX' +-@endExample +-@endDefreq +- +-@DefreqList {fzoom, f [@Var{zoom}]} +-@DefregListEndx {.zoom} +-@cindex magnification of a font (@code{fzoom}) +-@cindex font, magnification (@code{fzoom}) +-@cindex zoom factor of a font (@code{fzoom}) +-@cindex factor, zoom, of a font (@code{fzoom}) +-@cindex font, zoom factor (@code{fzoom}) +-@cindex optical size of a font +-@cindex font, optical size +-@cindex size, optical, of a font +-Set magnification of font@tie{}@var{f} to factor @var{zoom}, which must +-be a non-negative integer multiple of 1/1000th. This request is useful +-to adjust the optical size of a font in relation to the others. In the +-example below, font @code{CR} is magnified by 10% (the zoom factor is +-thus 1.1). +- +-@Example +-.fam P +-.fzoom CR 1100 +-.ps 12 +-Palatino and \f[CR]Courier\f[] +-@endExample +- +-A missing or zero value of @var{zoom} is the same as a value of 1000, +-which means no magnification. @var{f}@tie{}must be a real font name, +-not a style. +- +-Note that the magnification of a font is completely transparent to +-troff; a change of the zoom factor doesn't cause any effect except that +-the dimensions of glyphs, (word) spaces, kerns, etc., of the affected +-font are adjusted accordingly. +- +-The zoom factor of the current font is available in the read-only number +-register @samp{.zoom}, in multiples of 1/1000th. It returns zero if +-there is no magnification. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Font Families, Font Positions, Changing Fonts, Fonts and Symbols +-@subsection Font Families +-@cindex font families +-@cindex families, font +-@cindex font styles +-@cindex styles, font +- +-Due to the variety of fonts available, @code{gtroff} has added the +-concept of @dfn{font families} and @dfn{font styles}. The fonts are +-specified as the concatenation of the font family and style. Specifying +-a font without the family part causes @code{gtroff} to use that style of +-the current family. +- +-@cindex PostScript fonts +-@cindex fonts, PostScript +-Currently, fonts for the devices @option{-Tps}, @option{-Tpdf}, +-@option{-Tdvi}, @option{-Tlj4}, @option{-Tlbp}, and the X11 fonts are +-set up to this mechanism. By default, @code{gtroff} uses the Times +-family with the four styles @samp{R}, @samp{I}, @samp{B}, and @samp{BI}. +- +-This way, it is possible to use the basic four fonts and to select a +-different font family on the command line (@pxref{Groff Options}). +- +-@DefreqList {fam, [@Var{family}]} +-@DefregItemx {.fam} +-@DefescItemx {\\F, , f, } +-@DefescItem {\\F, @Lparen{}, fm, } +-@DefescItem {\\F, @Lbrack{}, family, @Rbrack{}} +-@DefregListEndx {.fn} +-@cindex changing font family (@code{fam}, @code{\F}) +-@cindex font family, changing (@code{fam}, @code{\F}) +-Switch font family to @var{family} (one-character name@tie{}@var{f}, +-two-character name @var{fm}). If no argument is given, switch back to +-the previous font family. Use @code{\F[]} to do this with the escape. +-Note that @code{\FP} doesn't work; it selects font family @samp{P} +-instead. +- +-The value at start-up is @samp{T}. The current font family is available +-in the read-only number register @samp{.fam} (this is a string-valued +-register); it is associated with the current environment. +- +-@Example +-spam, +-.fam H \" helvetica family +-spam, \" used font is family H + style R = HR +-.ft B \" family H + style B = font HB +-spam, +-.fam T \" times family +-spam, \" used font is family T + style B = TB +-.ft AR \" font AR (not a style) +-baked beans, +-.ft R \" family T + style R = font TR +-and spam. +-@endExample +- +-Note that @code{\F} doesn't produce an input token in @code{gtroff}. As +-a consequence, it can be used in requests like @code{mc} (which expects +-a single character as an argument) to change the font family on the fly: +- +-@Example +-.mc \F[P]x\F[] +-@endExample +- +-The @samp{.fn} register contains the current @dfn{real font name} of the +-current font. This is a string-valued register. If the current font is +-a style, the value of @code{\n[.fn]} is the proper concatenation of +-family and style name. +-@endDefreq +- +-@Defreq {sty, n style} +-@cindex changing font style (@code{sty}) +-@cindex font style, changing (@code{sty}) +-@cindex @code{cs} request, and font styles +-@cindex @code{bd} request, and font styles +-@cindex @code{tkf} request, and font styles +-@cindex @code{uf} request, and font styles +-@cindex @code{fspecial} request, and font styles +-Associate @var{style} with font position@tie{}@var{n}. A font position +-can be associated either with a font or with a style. The current font +-is the index of a font position and so is also either a font or a style. +-If it is a style, the font that is actually used is the font which name +-is the concatenation of the name of the current family and the name of +-the current style. For example, if the current font is@tie{}1 and font +-position@tie{}1 is associated with style @samp{R} and the current font +-family is @samp{T}, then font @samp{TR} is used. If the current font is +-not a style, then the current family is ignored. If the requests +-@code{cs}, @code{bd}, @code{tkf}, @code{uf}, or @code{fspecial} are +-applied to a style, they are instead applied to the member of the +-current family corresponding to that style. +- +-@var{n}@tie{}must be a non-negative integer value. +- +-@pindex DESC +-@kindex styles +-The default family can be set with the @option{-f} option (@pxref{Groff +-Options}). The @code{styles} command in the @file{DESC} file controls +-which font positions (if any) are initially associated with styles +-rather than fonts. For example, the default setting for @sc{PostScript} +-fonts +- +-@Example +-styles R I B BI +-@endExample +- +-@noindent +-is equivalent to +- +-@Example +-.sty 1 R +-.sty 2 I +-.sty 3 B +-.sty 4 BI +-@endExample +- +-@code{fam} and @code{\F} always check whether the current font position +-is valid; this can give surprising results if the current font position +-is associated with a style. +- +-In the following example, we want to access the @sc{PostScript} font +-@code{FooBar} from the font family @code{Foo}: +- +-@Example +-.sty \n[.fp] Bar +-.fam Foo +- @result{} warning: can't find font `FooR' +-@endExample +- +-@noindent +-The default font position at start-up is@tie{}1; for the @sc{PostScript} +-device, this is associated with style @samp{R}, so @code{gtroff} tries +-to open @code{FooR}. +- +-A solution to this problem is to use a dummy font like the following: +- +-@Example +-.fp 0 dummy TR \" set up dummy font at position 0 +-.sty \n[.fp] Bar \" register style `Bar' +-.ft 0 \" switch to font at position 0 +-.fam Foo \" activate family `Foo' +-.ft Bar \" switch to font `FooBar' +-@endExample +- +-@xref{Font Positions}. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Font Positions, Using Symbols, Font Families, Fonts and Symbols +-@subsection Font Positions +-@cindex font positions +-@cindex positions, font +- +-For the sake of old phototypesetters and compatibility with old versions +-of @code{troff}, @code{gtroff} has the concept of font @dfn{positions}, +-on which various fonts are mounted. +- +-@DefreqList {fp, pos font [@Var{external-name}]} +-@DefregItemx {.f} +-@DefregListEndx {.fp} +-@cindex mounting font (@code{fp}) +-@cindex font, mounting (@code{fp}) +-Mount font @var{font} at position @var{pos} (which must be a +-non-negative integer). This numeric position can then be referred to +-with font changing commands. When @code{gtroff} starts it is using font +-position@tie{}1 (which must exist; position@tie{}0 is unused usually at +-start-up). +- +-@cindex font position register (@code{.f}) +-The current font in use, as a font position, is available in the +-read-only number register @samp{.f}. This can be useful to remember the +-current font for later recall. It is associated with the current +-environment (@pxref{Environments}). +- +-@Example +-.nr save-font \n[.f] +-.ft B +-... text text text ... +-.ft \n[save-font] +-@endExample +- +-@cindex next free font position register (@code{.fp}) +-The number of the next free font position is available in the read-only +-number register @samp{.fp}. This is useful when mounting a new font, +-like so: +- +-@Example +-.fp \n[.fp] NEATOFONT +-@endExample +- +-@pindex DESC@r{, and font mounting} +-Fonts not listed in the @file{DESC} file are automatically mounted on +-the next available font position when they are referenced. If a font is +-to be mounted explicitly with the @code{fp} request on an unused font +-position, it should be mounted on the first unused font position, which +-can be found in the @code{.fp} register. Although @code{gtroff} does +-not enforce this strictly, it is not allowed to mount a font at a +-position whose number is much greater (approx.@: 1000 positions) than +-that of any currently used position. +- +-The @code{fp} request has an optional third argument. This argument +-gives the external name of the font, which is used for finding the font +-description file. The second argument gives the internal name of the +-font, which is used to refer to the font in @code{gtroff} after it has +-been mounted. If there is no third argument then the internal name is +-used as the external name. This feature makes it possible to use fonts +-with long names in compatibility mode. +-@endDefreq +- +-Both the @code{ft} request and the @code{\f} escape have alternative +-syntax forms to access font positions. +- +-@DefreqList {ft, nnn} +-@DefescItemx {\\f, , n, } +-@DefescItem {\\f, @Lparen{}, nn, } +-@DefescListEnd {\\f, @Lbrack{}, nnn, @Rbrack{}} +-@cindex changing font position (@code{\f}) +-@cindex font position, changing (@code{\f}) +-@cindex @code{sty} request, and font positions +-@cindex @code{fam} request, and font positions +-@cindex @code{\F}, and font positions +-@kindex styles +-@kindex family +-@pindex DESC +-Change the current font position to @var{nnn} (one-digit +-position@tie{}@var{n}, two-digit position @var{nn}), which must be a +-non-negative integer. +- +-If @var{nnn} is associated with a style (as set with the @code{sty} +-request or with the @code{styles} command in the @file{DESC} file), use +-it within the current font family (as set with the @code{fam} request, +-the @code{\F} escape, or with the @code{family} command in the +-@file{DESC} file). +- +-@Example +-this is font 1 +-.ft 2 +-this is font 2 +-.ft \" switch back to font 1 +-.ft 3 +-this is font 3 +-.ft +-this is font 1 again +-@endExample +- +-@xref{Changing Fonts}, for the standard syntax form. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Using Symbols, Character Classes, Font Positions, Fonts and Symbols +-@subsection Using Symbols +-@cindex using symbols +-@cindex symbols, using +- +-@cindex glyph +-@cindex character +-@cindex ligature +-A @dfn{glyph} is a graphical representation of a @dfn{character}. While +-a character is an abstract entity containing semantic information, a +-glyph is something that can be actually seen on screen or paper. It is +-possible that a character has multiple glyph representation forms (for +-example, the character `A' can be either written in a roman or an italic +-font, yielding two different glyphs); sometimes more than one character +-maps to a single glyph (this is a @dfn{ligature} -- the most common is +-`fi'). +- +-@cindex symbol +-@cindex special fonts +-@kindex fonts +-@pindex DESC +-@cindex @code{special} request, and glyph search order +-@cindex @code{fspecial} request, and glyph search order +-A @dfn{symbol} is simply a named glyph. Within @code{gtroff}, all glyph +-names of a particular font are defined in its font file. If the user +-requests a glyph not available in this font, @code{gtroff} looks up an +-ordered list of @dfn{special fonts}. By default, the @sc{PostScript} +-output device supports the two special fonts @samp{SS} (slanted symbols) +-and @samp{S} (symbols) (the former is looked up before the latter). +-Other output devices use different names for special fonts. Fonts +-mounted with the @code{fonts} keyword in the @file{DESC} file are +-globally available. To install additional special fonts locally (i.e.@: +-for a particular font), use the @code{fspecial} request. +- +-Here the exact rules how @code{gtroff} searches a given symbol: +- +-@itemize @bullet +-@item +-If the symbol has been defined with the @code{char} request, use it. +-This hides a symbol with the same name in the current font. +- +-@item +-Check the current font. +- +-@item +-If the symbol has been defined with the @code{fchar} request, use it. +- +-@item +-Check whether the current font has a font-specific list of special +-fonts; test all fonts in the order of appearance in the last +-@code{fspecial} call if appropriate. +- +-@item +-If the symbol has been defined with the @code{fschar} request for the +-current font, use it. +- +-@item +-Check all fonts in the order of appearance in the last @code{special} +-call. +- +-@item +-If the symbol has been defined with the @code{schar} request, use it. +- +-@item +-As a last resort, consult all fonts loaded up to now for special fonts +-and check them, starting with the lowest font number. Note that this +-can sometimes lead to surprising results since the @code{fonts} line in +-the @file{DESC} file often contains empty positions, which are filled +-later on. For example, consider the following: +- +-@Example +-fonts 3 0 0 FOO +-@endExample +- +-@noindent +-This mounts font @code{foo} at font position@tie{}3. We assume that +-@code{FOO} is a special font, containing glyph @code{foo}, and that no +-font has been loaded yet. The line +- +-@Example +-.fspecial BAR BAZ +-@endExample +- +-@noindent +-makes font @code{BAZ} special only if font @code{BAR} is active. We +-further assume that @code{BAZ} is really a special font, i.e., the font +-description file contains the @code{special} keyword, and that it also +-contains glyph @code{foo} with a special shape fitting to font +-@code{BAR}. After executing @code{fspecial}, font @code{BAR} is loaded +-at font position@tie{}1, and @code{BAZ} at position@tie{}2. +- +-We now switch to a new font @code{XXX}, trying to access glyph +-@code{foo} that is assumed to be missing. There are neither +-font-specific special fonts for @code{XXX} nor any other fonts made +-special with the @code{special} request, so @code{gtroff} starts the +-search for special fonts in the list of already mounted fonts, with +-increasing font positions. Consequently, it finds @code{BAZ} before +-@code{FOO} even for @code{XXX}, which is not the intended behaviour. +-@end itemize +- +-@xref{Font Files}, and @ref{Special Fonts}, for more details. +- +-@cindex list of available glyphs (@cite{groff_char(7)} man page) +-@cindex available glyphs, list (@cite{groff_char(7)} man page) +-@cindex glyphs, available, list (@cite{groff_char(7)} man page) +-The list of available symbols is device dependent; see the +-@cite{groff_char(7)} man page for a complete list of all glyphs. For +-example, say +- +-@Example +-man -Tdvi groff_char > groff_char.dvi +-@endExample +- +-@noindent +-for a list using the default DVI fonts (not all versions of the +-@code{man} program support the @option{-T} option). If you want to use +-an additional macro package to change the used fonts, @code{groff} must +-be called directly: +- +-@Example +-groff -Tdvi -mec -man groff_char.7 > groff_char.dvi +-@endExample +- +-@cindex composite glyph names +-@cindex glyph names, composite +-@cindex groff glyph list (GGL) +-@cindex GGL (groff glyph list) +-@cindex adobe glyph list (AGL) +-@cindex AGL (adobe glyph list) +-Glyph names not listed in groff_char(7) are derived algorithmically, +-using a simplified version of the Adobe Glyph List (AGL) algorithm, which +-is described in +-@uref{http://partners.adobe.com@//public@//developer@//opentype@//index_glyph.html}. +-The (frozen) set of glyph names that can't be derived algorithmically +-is called @dfn{groff glyph list (GGL)}. +- +-@itemize @bullet +-@item +-A glyph for Unicode character U+@var{XXXX}[@var{X}[@var{X}]], which is +-not a composite character is named +-@code{u@var{XXXX}@r{[}@var{X}@r{[}@var{X}@r{]]}}. @var{X} must be an +-uppercase hexadecimal digit. Examples: @code{u1234}, @code{u008E}, +-@code{u12DB8}. The largest Unicode value is 0x10FFFF. There must be at +-least four @code{X} digits; if necessary, add leading zeroes (after the +-@samp{u}). No zero padding is allowed for character codes greater than +-0xFFFF. Surrogates (i.e., Unicode values greater than 0xFFFF +-represented with character codes from the surrogate area U+D800-U+DFFF) +-are not allowed too. +- +-@item +-A glyph representing more than a single input character is named +- +-@display +-@samp{u} @var{component1} @samp{_} @var{component2} @samp{_} @var{component3} @dots{} +-@end display +- +-@noindent +-Example: @code{u0045_0302_0301}. +- +-For simplicity, all Unicode characters that are composites must be +-decomposed maximally (this is normalization form@tie{}D in the Unicode +-standard); for example, @code{u00CA_0301} is not a valid glyph name +-since U+00CA (@sc{latin capital letter e with circumflex}) can be +-further decomposed into U+0045 (@sc{latin capital letter e}) and U+0302 +-(@sc{combining circumflex accent}). @code{u0045_0302_0301} is thus the +-glyph name for U+1EBE, @sc{latin capital letter e with circumflex and +-acute}. +- +-@item +-groff maintains a table to decompose all algorithmically derived glyph +-names that are composites itself. For example, @code{u0100} (@sc{latin +-letter a with macron}) is automatically decomposed into +-@code{u0041_0304}. Additionally, a glyph name of the GGL is preferred +-to an algorithmically derived glyph name; groff also automatically does +-the mapping. Example: The glyph @code{u0045_0302} is mapped to +-@code{^E}. +- +-@item +-glyph names of the GGL can't be used in composite glyph names; for +-example, @code{^E_u0301} is invalid. +-@end itemize +- +-@DefescList {\\, @Lparen{}, nm, } +-@DefescItem {\\, @Lbrack{}, name, @Rbrack{}} +-@DefescListEnd {\\, @Lbrack{}, component1 component2 @dots{}, @Rbrack{}} +-Insert a symbol @var{name} (two-character name @var{nm}) or a composite +-glyph with component glyphs @var{component1}, @var{component2}, +-@enddots{} There is no special syntax for one-character names -- the +-natural form @samp{\@var{n}} would collide with escapes.@footnote{Note +-that a one-character symbol is not the same as an input character, i.e., +-the character @code{a} is not the same as @code{\[a]}. By default, +-@code{groff} defines only a single one-character symbol, @code{\[-]}; it +-is usually accessed as @code{\-}. On the other hand, @code{gtroff} has +-the special feature that @code{\[char@var{XXX}]} is the same as the +-input character with character code @var{XXX}. For example, +-@code{\[char97]} is identical to the letter @code{a} if @acronym{ASCII} +-encoding is active.} +- +-If @var{name} is undefined, a warning of type @samp{char} is generated, +-and the escape is ignored. @xref{Debugging}, for information about +-warnings. +- +-groff resolves @code{\[...]} with more than a single component as +-follows: +- +-@itemize @bullet +-@item +-Any component that is found in the GGL is converted to the +-@code{u@var{XXXX}} form. +- +-@item +-Any component @code{u@var{XXXX}} that is found in the list of +-decomposable glyphs is decomposed. +- +-@item +-The resulting elements are then concatenated with @samp{_} in between, +-dropping the leading @samp{u} in all elements but the first. +-@end itemize +- +-No check for the existence of any component (similar to @code{tr} +-request) is done. +- +-Examples: +- +-@table @code +-@item \[A ho] +-@samp{A} maps to @code{u0041}, @samp{ho} maps to @code{u02DB}, thus the +-final glyph name would be @code{u0041_02DB}. Note this is not the +-expected result: The ogonek glyph @samp{ho} is a spacing ogonek, but for +-a proper composite a non-spacing ogonek (U+0328) is necessary. Looking +-into the file @file{composite.tmac} one can find @w{@samp{.composite ho +-u0328}}, which changes the mapping of @samp{ho} while a composite glyph +-name is constructed, causing the final glyph name to be +-@code{u0041_0328}. +- +-@item \[^E u0301] +-@itemx \[^E aa] +-@itemx \[E a^ aa] +-@itemx \[E ^ '] +-@samp{^E} maps to @code{u0045_0302}, thus the final glyph name is +-@code{u0045_0302_0301} in all forms (assuming proper calls of the +-@code{composite} request). +-@end table +- +-It is not possible to define glyphs with names like @w{@samp{A ho}} +-within a groff font file. This is not really a limitation; instead, you +-have to define @code{u0041_0328}. +-@endDefesc +- +-@Defesc {\\C, ', xxx, '} +-@cindex named character (@code{\C}) +-@cindex character, named (@code{\C}) +-Typeset the glyph named @var{xxx}.@footnote{@code{\C} is actually a +-misnomer since it accesses an output glyph.} Normally it is more +-convenient to use @code{\[@var{xxx}]}, but @code{\C} has the advantage +-that it is compatible with newer versions of @acronym{AT&T} @code{troff} +-and is available in compatibility mode. +-@endDefesc +- +-@Defreq {composite, from to} +-@pindex composite.tmac +-Map glyph name @var{from} to glyph name @var{to} if it is used in +-@code{\[...]} with more than one component. See above for examples. +- +-This mapping is based on glyph names only; no check for the existence of +-either glyph is done. +- +-A set of default mappings for many accents can be found in the file +-@file{composite.tmac}, which is loaded at start-up. +-@endDefreq +- +-@Defesc {\\N, ', n, '} +-@cindex numbered glyph (@code{\N}) +-@cindex glyph, numbered (@code{\N}) +-@cindex @code{char} request, used with @code{\N} +-@cindex Unicode +-Typeset the glyph with code@tie{}@var{n} in the current font +-(@code{n}@tie{}is @strong{not} the input character code). The number +-@var{n}@tie{}can be any non-negative decimal integer. Most devices only +-have glyphs with codes between 0 and@tie{}255; the Unicode output device +-uses codes in the range 0--65535. If the current font does not contain +-a glyph with that code, special fonts are @emph{not} searched. The +-@code{\N} escape sequence can be conveniently used in conjunction with +-the @code{char} request: +- +-@Example +-.char \[phone] \f[ZD]\N'37' +-@endExample +- +-@noindent +-@pindex DESC +-@cindex unnamed glyphs +-@cindex glyphs, unnamed +-The code of each glyph is given in the fourth column in the font +-description file after the @code{charset} command. It is possible to +-include unnamed glyphs in the font description file by using a name of +-@samp{---}; the @code{\N} escape sequence is the only way to use these. +- +-No kerning is applied to glyphs accessed with @code{\N}. +-@endDefesc +- +-Some escape sequences directly map onto special glyphs. +- +-@Defesc {\\', , , } +-This is a backslash followed by the apostrophe character, +-@acronym{ASCII} character @code{0x27} (@acronym{EBCDIC} character +-@code{0x7D}). The same as @code{\[aa]}, the acute accent. +-@endDefesc +- +-@Defesc {\\`, , , } +-This is a backslash followed by @acronym{ASCII} character @code{0x60} +-(@acronym{EBCDIC} character @code{0x79} usually). The same as +-@code{\[ga]}, the grave accent. +-@endDefesc +- +-@Defesc {\\-, , , } +-This is the same as @code{\[-]}, the minus sign in the current font. +-@endDefesc +- +-@Defesc {\\_, , , } +-This is the same as @code{\[ul]}, the underline character. +-@endDefesc +- +-@Defreq {cflags, n c1 c2 @dots{}} +-@cindex glyph properties (@code{cflags}) +-@cindex character properties (@code{cflags}) +-@cindex properties of glyphs (@code{cflags}) +-@cindex properties of characters (@code{cflags}) +-Input characters and symbols have certain properties associated with +-it.@footnote{Note that the output glyphs themselves don't have such +-properties. For @code{gtroff}, a glyph is a numbered box with a given +-width, depth, and height, nothing else. All manipulations with the +-@code{cflags} request work on the input level.} These properties can be +-modified with the @code{cflags} request. The first argument is the sum +-of the desired flags and the remaining arguments are the characters or +-symbols to have those properties. It is possible to omit the spaces +-between the characters or symbols. Instead of single characters or +-symbols you can also use character classes (see @ref{Character Classes} +-for more details). +- +-@table @code +-@item 1 +-@cindex end-of-sentence characters +-@cindex characters, end-of-sentence +-The character ends sentences (initially characters @samp{.?!} have this +-property). +- +-@item 2 +-@cindex hyphenating characters +-@cindex characters, hyphenation +-Lines can be broken before the character (initially no characters have +-this property). This only works if both the characters before and after +-have non-zero hyphenation codes (as set with the @code{hcode} request). +-Use value@tie{}64 to override this behaviour. +- +-@item 4 +-@cindex @code{hy} glyph, and @code{cflags} +-@cindex @code{em} glyph, and @code{cflags} +-Lines can be broken after the character (initially the character +-@samp{-} and the symbols @samp{\[hy]} and @samp{\[em]} have this +-property). This only works if both the characters before and after have +-non-zero hyphenation codes (as set with the @code{hcode} request). Use +-value@tie{}64 to override this behaviour. +- +-@item 8 +-@cindex overlapping characters +-@cindex characters, overlapping +-@cindex @code{ul} glyph, and @code{cflags} +-@cindex @code{rn} glyph, and @code{cflags} +-@cindex @code{ru} glyph, and @code{cflags} +-@cindex @code{radicalex} glyph, and @code{cflags} +-@cindex @code{sqrtex} glyph, and @code{cflags} +-The character overlaps horizontally if used as a horizontal line +-building element. Initially the symbols @samp{\[ul]}, @samp{\[rn]}, +-@samp{\[ru]}, @samp{\[radicalex]}, and @samp{\[sqrtex]} have this +-property. +- +-@item 16 +-@cindex @code{br} glyph, and @code{cflags} +-The character overlaps vertically if used as vertical line building +-element. Initially symbol @samp{\[br]} has this property. +- +-@item 32 +-@cindex transparent characters +-@cindex character, transparent +-@cindex @code{"}, at end of sentence +-@cindex @code{'}, at end of sentence +-@cindex @code{)}, at end of sentence +-@cindex @code{]}, at end of sentence +-@cindex @code{*}, at end of sentence +-@cindex @code{dg} glyph, at end of sentence +-@cindex @code{rq} glyph, at end of sentence +-@cindex @code{cq} glyph, at end of sentence +-An end-of-sentence character followed by any number of characters with +-this property is treated as the end of a sentence if followed by a +-newline or two spaces; in other words the character is @dfn{transparent} +-for the purposes of end-of-sentence recognition -- this is the same as +-having a zero space factor in @TeX{} (initially characters @samp{"')]*} +-and the symbols @samp{\[dg]}, @samp{\[rq]}, and @samp{\[cq]} have this +-property). +- +-@item 64 +-Ignore hyphenation code values of the surrounding characters. Use this +-in combination with values 2 and@tie{}4 (initially no characters have +-this property). For example, if you need an automatic break point after +-the hyphen in number ranges like `3000-5000', insert +- +-@Example +-.cflags 68 - +-@endExample +- +-@noindent +-into your document. Note, however, that this can lead to bad layout if +-done without thinking; in most situations, a better solution instead of +-changing the @code{cflags} value is to insert @code{\:} right after the +-hyphen at the places that really need a break point. +- +-@item 128 +-Prohibit a line break before the character, but allow a line break after +-the character. This works only in combination with flags 256 and 512 +-(see below) and has no effect otherwise. +- +-@item 256 +-Prohibit a line break after the character, but allow a line break before +-the character. This works only in combination with flags 128 and 512 +-(see below) and has no effect otherwise. +- +-@item 512 +-Allow line break before or after the character. This works only in +-combination with flags 128 and 256 and has no effect otherwise. +- +-Contrary to flag values 2 and@tie{}4, the flags 128, 256, and 512 work +-pairwise. If, for example, the left character has value 512, and the +-right character 128, no line break gets inserted. If we use +-value@tie{}6 instead for the left character, a line break after the +-character can't be suppressed since the right neighbour character +-doesn't get examined. +-@end table +-@endDefreq +- +-@DefreqList {char, g [@Var{string}]} +-@DefreqItemx {fchar, g [@Var{string}]} +-@DefreqItemx {fschar, f g [@Var{string}]} +-@DefreqListEndx {schar, g [@Var{string}]} +-@cindex defining character (@code{char}) +-@cindex defining fallback character (@code{fchar}, @code{fschar}, @code{schar}) +-@cindex character, defining (@code{char}) +-@cindex character, defining fallback (@code{fchar}, @code{fschar}, @code{schar}) +-@cindex fallback character, defining (@code{fchar}, @code{fschar}, @code{schar}) +-@cindex creating new characters (@code{char}) +-@cindex defining symbol (@code{char}) +-@cindex symbol, defining (@code{char}) +-@cindex defining glyph (@code{char}) +-@cindex glyph, defining (@code{char}) +-@cindex escape character, while defining glyph +-@cindex character, escape, while defining glyph +-@cindex @code{tr} request, and glyph definitions +-@cindex @code{cp} request, and glyph definitions +-@cindex @code{rc} request, and glyph definitions +-@cindex @code{lc} request, and glyph definitions +-@cindex @code{\l}, and glyph definitions +-@cindex @code{\L}, and glyph definitions +-@cindex @code{\&}, and glyph definitions +-@cindex @code{\e}, and glyph definitions +-@cindex @code{hcode} request, and glyph definitions +-Define a new glyph@tie{}@var{g} to be @var{string} (which can be +-empty).@footnote{@code{char} is a misnomer since an output glyph is +-defined.} Every time glyph@tie{}@var{g} needs to be printed, +-@var{string} is processed in a temporary environment and the result is +-wrapped up into a single object. Compatibility mode is turned off and +-the escape character is set to @samp{\} while @var{string} is being +-processed. Any emboldening, constant spacing or track kerning is +-applied to this object rather than to individual characters in +-@var{string}. +- +-A glyph defined by these requests can be used just like a normal glyph +-provided by the output device. In particular, other characters can be +-translated to it with the @code{tr} or @code{trin} requests; it can be +-made the leader character by the @code{lc} request; repeated patterns +-can be drawn with the glyph using the @code{\l} and @code{\L} escape +-sequences; words containing the glyph can be hyphenated correctly if the +-@code{hcode} request is used to give the glyph's symbol a hyphenation +-code. +- +-There is a special anti-recursion feature: Use of @code{g} within the +-glyph's definition is handled like normal characters and symbols not +-defined with @code{char}. +- +-Note that the @code{tr} and @code{trin} requests take precedence if +-@code{char} accesses the same symbol. +- +-@Example +-.tr XY +-X +- @result{} Y +-.char X Z +-X +- @result{} Y +-.tr XX +-X +- @result{} Z +-@endExample +- +-The @code{fchar} request defines a fallback glyph: @code{gtroff} only +-checks for glyphs defined with @code{fchar} if it cannot find the glyph +-in the current font. @code{gtroff} carries out this test before +-checking special fonts. +- +-@code{fschar} defines a fallback glyph for font@tie{}@var{f}: +-@code{gtroff} checks for glyphs defined with @code{fschar} after the +-list of fonts declared as font-specific special fonts with the +-@code{fspecial} request, but before the list of fonts declared as global +-special fonts with the @code{special} request. +- +-Finally, the @code{schar} request defines a global fallback glyph: +-@code{gtroff} checks for glyphs defined with @code{schar} after the list +-of fonts declared as global special fonts with the @code{special} +-request, but before the already mounted special fonts. +- +-@xref{Using Symbols}, for a detailed description of the glyph searching +-mechanism in @code{gtroff}. +-@endDefreq +- +-@DefreqList {rchar, c1 c2 @dots{}} +-@DefreqListEndx {rfschar, f c1 c2 @dots{}} +-@cindex removing glyph definition (@code{rchar}, @code{rfschar}) +-@cindex glyph, removing definition (@code{rchar}, @code{rfschar}) +-@cindex fallback glyph, removing definition (@code{rchar}, @code{rfschar}) +-Remove the definitions of glyphs @var{c1}, @var{c2},@tie{}@enddots{} +-This undoes the effect of a @code{char}, @code{fchar}, or @code{schar} +-request. +- +-It is possible to omit the whitespace between arguments. +- +-The request @code{rfschar} removes glyph definitions defined with +-@code{fschar} for glyph@tie{}f. +-@endDefreq +- +-@xref{Special Characters}. +- +-@c --------------------------------------------------------------------- +- +-@node Character Classes, Special Fonts, Using Symbols, Fonts and Symbols +-@subsection Character Classes +-@cindex character classes +-@cindex classes, character +- +-Classes are particularly useful for East Asian languages such as +-Chinese, Japanese, and Korean, where the number of needed characters is +-much larger than in European languages, and where large sets of +-characters share the same properties. +- +-@Defreq {class, n c1 c2 @dots{}} +-@cindex character class (@code{class}) +-@cindex defining character class (@code{class}) +-@cindex class of characters (@code{class}) +-In @code{groff}, a @dfn{character class} (or simply ``class'') is a set +-of characters, grouped by some user aspect. The @code{class} request +-defines such classes so that other requests can refer to all characters +-belonging to this set with a single class name. Currently, only the +-@code{cflags} request can handle character classes. +- +-A @code{class} request takes a class name followed by a list of +-entities. In its simplest form, the entities are characters or symbols: +- +-@Example +-.class [prepunct] , : ; > @} +-@endExample +- +-Since class and glyph names share the same namespace, it is recommended +-to start and end the class name with @code{[} and @code{]}, +-respectively, to avoid collisions with normal @code{groff} symbols (and +-symbols defined by the user). In particular, the presence of @code{]} +-in the symbol name intentionally prevents the usage of @code{\[...]}, +-thus you must use the @code{\C} escape to access a class with such a +-name. +- +-@cindex GGL (groff glyph list) +-@cindex groff glyph list (GGL) +-You can also use a special character range notation, consisting of a +-start character or symbol, followed by @samp{-}, and an end character or +-symbol. Internally, @code{gtroff} converts these two symbol names to +-Unicode values (according to the groff glyph gist), which then give the +-start and end value of the range. If that fails, the class definition +-is skipped. +- +-Finally, classes can be nested, too. +- +-Here is a more complex example: +- +-@Example +-.class [prepunctx] \C'[prepunct]' \[u2013]-\[u2016] +-@endExample +- +-The class @samp{prepunctx} now contains the contents of the class +-@code{prepunct} as defined above (the set @samp{, : ; > @}}), and +-characters in the range between @code{U+2013} and @code{U+2016}. +- +-If you want to add @samp{-} to a class, it must be the first character +-value in the argument list, otherwise it gets misinterpreted as a range. +- +-Note that it is not possible to use class names within range +-definitions. +- +-Typical use of the @code{class} request is to control line-breaking and +-hyphenation rules as defined by the @code{cflags} request. For example, +-to inhibit line breaks before the characters belonging to the +-@code{prepunctx} class, you can write: +- +-@Example +-.cflags 2 \C'[prepunctx]' +-@endExample +- +-See the @code{cflags} request in @ref{Using Symbols}, for more details. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Special Fonts, Artificial Fonts, Character Classes, Fonts and Symbols +-@subsection Special Fonts +-@cindex special fonts +-@cindex fonts, special +- +-Special fonts are those that @code{gtroff} searches when it cannot find +-the requested glyph in the current font. The Symbol font is usually a +-special font. +- +-@code{gtroff} provides the following two requests to add more special +-fonts. @xref{Using Symbols}, for a detailed description of the glyph +-searching mechanism in @code{gtroff}. +- +-Usually, only non-TTY devices have special fonts. +- +-@DefreqList {special, [@Var{s1} @Var{s2} @dots{}]} +-@DefreqListEndx {fspecial, f [@Var{s1} @Var{s2} @dots{}]} +-@kindex fonts +-@pindex DESC +-Use the @code{special} request to define special fonts. Initially, this +-list is empty. +- +-Use the @code{fspecial} request to designate special fonts only when +-font@tie{}@var{f} is active. Initially, this list is empty. +- +-Previous calls to @code{special} or @code{fspecial} are overwritten; +-without arguments, the particular list of special fonts is set to empty. +-Special fonts are searched in the order they appear as arguments. +- +-All fonts that appear in a call to @code{special} or @code{fspecial} +-are loaded. +- +-@xref{Using Symbols}, for the exact search order of glyphs. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Artificial Fonts, Ligatures and Kerning, Special Fonts, Fonts and Symbols +-@subsection Artificial Fonts +-@cindex artificial fonts +-@cindex fonts, artificial +- +-There are a number of requests and escapes for artificially creating +-fonts. These are largely vestiges of the days when output devices did +-not have a wide variety of fonts, and when @code{nroff} and @code{troff} +-were separate programs. Most of them are no longer necessary in GNU +-@code{troff}. Nevertheless, they are supported. +- +-@DefescList {\\H, ', height, '} +-@DefescItem {\\H, ', @t{+}height, '} +-@DefescItem {\\H, ', @t{-}height, '} +-@DefregListEndx {.height} +-@cindex changing the font height (@code{\H}) +-@cindex font height, changing (@code{\H}) +-@cindex height, font, changing (@code{\H}) +-Change (increment, decrement) the height of the current font, but not +-the width. If @var{height} is zero, restore the original height. +-Default scaling indicator is @samp{z}. +- +-The read-only number register @code{.height} contains the font height as +-set by @code{\H}. +- +-Currently, only the @option{-Tps} and @option{-Tpdf} devices support +-this feature. +- +-Note that @code{\H} doesn't produce an input token in @code{gtroff}. As +-a consequence, it can be used in requests like @code{mc} (which expects +-a single character as an argument) to change the font on the fly: +- +-@Example +-.mc \H'+5z'x\H'0' +-@endExample +- +-In compatibility mode, @code{gtroff} behaves differently: If an +-increment or decrement is used, it is always taken relative to the +-current point size and not relative to the previously selected font +-height. Thus, +- +-@Example +-.cp 1 +-\H'+5'test \H'+5'test +-@endExample +- +-@noindent +-prints the word @samp{test} twice with the same font height (five points +-larger than the current font size). +-@endDefesc +- +-@DefescList {\\S, ', slant, '} +-@DefregListEndx {.slant} +-@cindex changing the font slant (@code{\S}) +-@cindex font slant, changing (@code{\S}) +-@cindex slant, font, changing (@code{\S}) +-Slant the current font by @var{slant} degrees. Positive values slant to +-the right. Only integer values are possible. +- +-The read-only number register @code{.slant} contains the font slant as +-set by @code{\S}. +- +-Currently, only the @option{-Tps} and @option{-Tpdf} devices support +-this feature. +- +-Note that @code{\S} doesn't produce an input token in @code{gtroff}. As +-a consequence, it can be used in requests like @code{mc} (which expects +-a single character as an argument) to change the font on the fly: +- +-@Example +-.mc \S'20'x\S'0' +-@endExample +- +-This request is incorrectly documented in the original @acronym{UNIX} +-troff manual; the slant is always set to an absolute value. +-@endDefesc +- +-@Defreq {ul, [@Var{lines}]} +-@cindex underlining (@code{ul}) +-The @code{ul} request normally underlines subsequent lines if a TTY +-output device is used. Otherwise, the lines are printed in italics +-(only the term `underlined' is used in the following). The single +-argument is the number of input lines to be underlined; with no +-argument, the next line is underlined. If @var{lines} is zero or +-negative, stop the effects of @code{ul} (if it was active). Requests +-and empty lines do not count for computing the number of underlined +-input lines, even if they produce some output like @code{tl}. Lines +-inserted by macros (e.g.@: invoked by a trap) do count. +- +-At the beginning of @code{ul}, the current font is stored and the +-underline font is activated. Within the span of a @code{ul} request, it +-is possible to change fonts, but after the last line affected by +-@code{ul} the saved font is restored. +- +-This number of lines still to be underlined is associated with the +-current environment (@pxref{Environments}). The underline font can be +-changed with the @code{uf} request. +- +-@c XXX @xref should be changed to grotty +- +-@c @xref{Troff and Nroff Mode}, for a discussion how underlining is +-@c implemented in for TTY output devices, and which problems can arise. +- +-The @code{ul} request does not underline spaces. +-@endDefreq +- +-@Defreq {cu, [@Var{lines}]} +-@cindex continuous underlining (@code{cu}) +-@cindex underlining, continuous (@code{cu}) +-The @code{cu} request is similar to @code{ul} but underlines spaces as +-well (if a TTY output device is used). +-@endDefreq +- +-@Defreq {uf, font} +-@cindex underline font (@code{uf}) +-@cindex font for underlining (@code{uf}) +-Set the underline font (globally) used by @code{ul} and @code{cu}. By +-default, this is the font at position@tie{}2. @var{font} can be either +-a non-negative font position or the name of a font. +-@endDefreq +- +-@DefreqList {bd, font [@Var{offset}]} +-@DefreqItem {bd, font1 font2 [@Var{offset}]} +-@DefregListEndx {.b} +-@cindex imitating bold face (@code{bd}) +-@cindex bold face, imitating (@code{bd}) +-Artificially create a bold font by printing each glyph twice, slightly +-offset. +- +-Two syntax forms are available. +- +-@itemize @bullet +-@item +-Imitate a bold font unconditionally. The first argument specifies the +-font to embolden, and the second is the number of basic units, minus +-one, by which the two glyphs are offset. If the second argument is +-missing, emboldening is turned off. +- +-@var{font} can be either a non-negative font position or the name of a +-font. +- +-@var{offset} is available in the @code{.b} read-only register if a +-special font is active; in the @code{bd} request, its default unit is +-@samp{u}. +- +-@cindex @code{fspecial} request, and imitating bold +-@kindex special +-@cindex embolding of special fonts +-@cindex special fonts, emboldening +-@item +-Imitate a bold form conditionally. Embolden @var{font1} by @var{offset} +-only if font @var{font2} is the current font. This command can be +-issued repeatedly to set up different emboldening values for different +-current fonts. If the second argument is missing, emboldening is turned +-off for this particular current font. +- +-This affects special fonts only (either set up with the @code{special} +-command in font files or with the @code{fspecial} request). +-@end itemize +-@endDefreq +- +-@Defreq {cs, font [@Var{width} [@Var{em-size}]]} +-@cindex constant glyph space mode (@code{cs}) +-@cindex mode for constant glyph space (@code{cs}) +-@cindex glyph, constant space +-@cindex @code{ps} request, and constant glyph space mode +-Switch to and from @dfn{constant glyph space mode}. If activated, the +-width of every glyph is @math{@var{width}/36} ems. The em size is given +-absolutely by @var{em-size}; if this argument is missing, the em value +-is taken from the current font size (as set with the @code{ps} request) +-when the font is effectively in use. Without second and third argument, +-constant glyph space mode is deactivated. +- +-Default scaling indicator for @var{em-size} is @samp{z}; @var{width} is +-an integer. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Ligatures and Kerning, , Artificial Fonts, Fonts and Symbols +-@subsection Ligatures and Kerning +-@cindex ligatures and kerning +-@cindex kerning and ligatures +- +-Ligatures are groups of characters that are run together, i.e, producing +-a single glyph. For example, the letters `f' and `i' can form a +-ligature `fi' as in the word `file'. This produces a cleaner look +-(albeit subtle) to the printed output. Usually, ligatures are not +-available in fonts for TTY output devices. +- +-Most @sc{PostScript} fonts support the fi and fl ligatures. The C/A/T +-typesetter that was the target of @acronym{AT&T} @code{troff} also +-supported `ff', `ffi', and `ffl' ligatures. Advanced typesetters or +-`expert' fonts may include ligatures for `ft' and `ct', although GNU +-@code{troff} does not support these (yet). +- +-Only the current font is checked for ligatures and kerns; neither +-special fonts nor entities defined with the @code{char} request (and its +-siblings) are taken into account. +- +-@DefreqList {lg, [@Var{flag}]} +-@DefregListEndx {.lg} +-@cindex activating ligatures (@code{lg}) +-@cindex ligatures, activating (@code{lg}) +-@cindex ligatures enabled register (@code{.lg}) +-Switch the ligature mechanism on or off; if the parameter is non-zero or +-missing, ligatures are enabled, otherwise disabled. Default is on. The +-current ligature mode can be found in the read-only number register +-@code{.lg} (set to 1 or@tie{}2 if ligatures are enabled, +-0@tie{}otherwise). +- +-Setting the ligature mode to@tie{}2 enables the two-character ligatures +-(fi, fl, and ff) and disables the three-character ligatures (ffi and +-ffl). +-@endDefreq +- +-@dfn{Pairwise kerning} is another subtle typesetting mechanism that +-modifies the distance between a glyph pair to improve readability. In +-most cases (but not always) the distance is decreased. +-@iftex +-For example, compare the combination of the letters `V' and `A'. With +-kerning, `VA' is printed. Without kerning it appears as `V@w{}A'. +-@end iftex +-Typewriter-like fonts and fonts for terminals where all glyphs have the +-same width don't use kerning. +- +-@DefreqList {kern, [@Var{flag}]} +-@DefregListEndx {.kern} +-@cindex activating kerning (@code{kern}) +-@cindex kerning, activating (@code{kern}) +-@cindex kerning enabled register (@code{.kern}) +-Switch kerning on or off. If the parameter is non-zero or missing, +-enable pairwise kerning, otherwise disable it. The read-only number +-register @code{.kern} is set to@tie{}1 if pairwise kerning is enabled, +-0@tie{}otherwise. +- +-@cindex zero width space character (@code{\&}) +-@cindex character, zero width space (@code{\&}) +-@cindex space character, zero width (@code{\&}) +-If the font description file contains pairwise kerning information, +-glyphs from that font are kerned. Kerning between two glyphs can be +-inhibited by placing @code{\&} between them: @samp{V\&A}. +- +-@xref{Font File Format}. +-@endDefreq +- +-@cindex track kerning +-@cindex kerning, track +-@dfn{Track kerning} expands or reduces the space between glyphs. This +-can be handy, for example, if you need to squeeze a long word onto a +-single line or spread some text to fill a narrow column. It must be +-used with great care since it is usually considered bad typography if +-the reader notices the effect. +- +-@Defreq {tkf, f s1 n1 s2 n2} +-@cindex activating track kerning (@code{tkf}) +-@cindex track kerning, activating (@code{tkf}) +-Enable track kerning for font@tie{}@var{f}. If the current font +-is@tie{}@var{f} the width of every glyph is increased by an amount +-between @var{n1} and @var{n2} (@var{n1}, @var{n2} can be negative); if +-the current point size is less than or equal to @var{s1} the width is +-increased by @var{n1}; if it is greater than or equal to @var{s2} the +-width is increased by @var{n2}; if the point size is greater than or +-equal to @var{s1} and less than or equal to @var{s2} the increase in +-width is a linear function of the point size. +- +-The default scaling indicator is @samp{z} for @var{s1} and @var{s2}, +-@samp{p} for @var{n1} and @var{n2}. +- +-Note that the track kerning amount is added even to the rightmost glyph +-in a line; for large values it is thus recommended to increase the line +-length by the same amount to compensate it. +-@endDefreq +- +-Sometimes, when typesetting letters of different fonts, more or less +-space at such boundaries are needed. There are two escapes to help with +-this. +- +-@Defesc {\\/, , , } +-@cindex italic correction (@code{\/}) +-@cindex correction, italic (@code{\/}) +-@cindex correction between italic and roman glyph (@code{\/}, @code{\,}) +-@cindex roman glyph, correction after italic glyph (@code{\/}) +-@cindex italic glyph, correction before roman glyph (@code{\/}) +-@cindex glyph, italic correction (@code{\/}) +-Increase the width of the preceding glyph so that the spacing between +-that glyph and the following glyph is correct if the following glyph is +-a roman glyph. For example, if an italic@tie{}@code{f} is immediately +-followed by a roman right parenthesis, then in many fonts the top right +-portion of the@tie{}@code{f} overlaps the top left of the right +-parenthesis. Use this escape sequence whenever an italic glyph is +-immediately followed by a roman glyph without any intervening space. +-This small amount of space is also called @dfn{italic correction}. +- +-@iftex +-@c can't use @Example...@endExample here +-@example +-@group +-\f[I]f\f[R]) +- @result{} {@it f}@r{)} +-\f[I]f\/\f[R]) +- @result{} @i{f}@r{)} +-@end group +-@end example +-@end iftex +-@endDefesc +- +-@Defesc {\\\,, , , } +-@cindex left italic correction (@code{\,}) +-@cindex correction, left italic (@code{\,}) +-@cindex glyph, left italic correction (@code{\,}) +-@cindex roman glyph, correction before italic glyph (@code{\,}) +-@cindex italic glyph, correction after roman glyph (@code{\,}) +-Modify the spacing of the following glyph so that the spacing between +-that glyph and the preceding glyph is correct if the preceding glyph is +-a roman glyph. Use this escape sequence whenever a roman glyph is +-immediately followed by an italic glyph without any intervening space. +-In analogy to above, this space could be called @dfn{left italic +-correction}, but this term isn't used widely. +- +-@iftex +-@c can't use @Example...@endExample here +-@example +-@group +-q\f[I]f +- @result{} @r{q}@i{f} +-q\,\f[I]f +- @result{} @r{q}@math{@ptexcomma}@i{f} +-@end group +-@end example +-@end iftex +-@endDefesc +- +-@Defesc {\\&, , , } +-Insert a zero-width character, which is invisible. Its intended use is +-to stop interaction of a character with its surrounding. +- +-@itemize @bullet +-@item +-It prevents the insertion of extra space after an end-of-sentence +-character. +- +-@Example +-Test. +-Test. +- @result{} Test. Test. +-Test.\& +-Test. +- @result{} Test. Test. +-@endExample +- +-@item +-It prevents interpretation of a control character at the beginning of an +-input line. +- +-@Example +-.Test +- @result{} warning: `Test' not defined +-\&.Test +- @result{} .Test +-@endExample +- +-@item +-It prevents kerning between two glyphs. +- +-@iftex +-@c can't use @Example...@endExample here +-@example +-@group +-VA +- @result{} @r{VA} +-V\&A +- @result{} @r{V@w{}A} +-@end group +-@end example +-@end iftex +- +-@item +-It is needed to map an arbitrary character to nothing in the @code{tr} +-request (@pxref{Character Translations}). +-@end itemize +-@endDefesc +- +-@Defesc {\\), , , } +-This escape is similar to @code{\&} except that it behaves like a +-character declared with the @code{cflags} request to be transparent for +-the purposes of an end-of-sentence character. +- +-Its main usage is in macro definitions to protect against arguments +-starting with a control character. +- +-@Example +-.de xxx +-\)\\$1 +-.. +-.de yyy +-\&\\$1 +-.. +-This is a test.\c +-.xxx ' +-This is a test. +- @result{}This is a test.' This is a test. +-This is a test.\c +-.yyy ' +-This is a test. +- @result{}This is a test.' This is a test. +-@endExample +-@endDefesc +- +- +-@c ===================================================================== +- +-@node Sizes, Strings, Fonts and Symbols, gtroff Reference +-@section Sizes +-@cindex sizes +- +-@cindex baseline +-@cindex type size +-@cindex size of type +-@cindex vertical spacing +-@cindex spacing, vertical +-@code{gtroff} uses two dimensions with each line of text, type size and +-vertical spacing. The @dfn{type size} is approximately the height of +-the tallest glyph.@footnote{This is usually the parenthesis. Note that +-in most cases the real dimensions of the glyphs in a font are @emph{not} +-related to its type size! For example, the standard @sc{PostScript} +-font families `Times Roman', `Helvetica', and `Courier' can't be used +-together at 10@dmn{pt}; to get acceptable output, the size of +-`Helvetica' has to be reduced by one point, and the size of `Courier' +-must be increased by one point.} @dfn{Vertical spacing} is the amount +-of space @code{gtroff} allows for a line of text; normally, this is +-about 20%@tie{}larger than the current type size. Ratios smaller than +-this can result in hard-to-read text; larger than this, it spreads the +-text out more vertically (useful for term papers). By default, +-@code{gtroff} uses 10@tie{}point type on 12@tie{}point spacing. +- +-@cindex leading +-The difference between type size and vertical spacing is known, by +-typesetters, as @dfn{leading} (this is pronounced `ledding'). +- +-@menu +-* Changing Type Sizes:: +-* Fractional Type Sizes:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Changing Type Sizes, Fractional Type Sizes, Sizes, Sizes +-@subsection Changing Type Sizes +- +-@DefreqList {ps, [@Var{size}]} +-@DefreqItem {ps, @t{+}@Var{size}} +-@DefreqItem {ps, @t{-}@Var{size}} +-@DefescItemx {\\s, , size, } +-@DefregListEndx {.s} +-@cindex changing type sizes (@code{ps}, @code{\s}) +-@cindex type sizes, changing (@code{ps}, @code{\s}) +-@cindex point sizes, changing (@code{ps}, @code{\s}) +-Use the @code{ps} request or the @code{\s} escape to change (increase, +-decrease) the type size (in points). Specify @var{size} as either an +-absolute point size, or as a relative change from the current size. The +-size@tie{}0 (for both @code{.ps} and @code{\s}), or no argument (for +-@code{.ps} only), goes back to the previous size. +- +-Default scaling indicator of @code{size} is @samp{z}. If @code{size} is +-negative, it is set to 1@dmn{u}. +- +-@cindex type size registers (@code{.s}, @code{.ps}) +-@cindex point size registers (@code{.s}, @code{.ps}) +-The read-only number register @code{.s} returns the point size in points +-as a decimal fraction. This is a string. To get the point size in +-scaled points, use the @code{.ps} register instead. +- +-@code{.s} is associated with the current environment +-(@pxref{Environments}). +- +-@Example +-snap, snap, +-.ps +2 +-grin, grin, +-.ps +2 +-wink, wink, \s+2nudge, nudge,\s+8 say no more! +-.ps 10 +-@endExample +- +-The @code{\s} escape may be called in a variety of ways. Much like +-other escapes there must be a way to determine where the argument ends +-and the text begins. Any of the following forms are valid: +- +-@table @code +-@item \s@var{n} +-Set the point size to @var{n}@tie{}points. @var{n}@tie{}must be either +-0 or in the range 4 to@tie{}39. +- +-@item \s+@var{n} +-@itemx \s-@var{n} +-Increase or decrease the point size by @var{n}@tie{}points. +-@var{n}@tie{}must be exactly one digit. +- +-@item \s(@var{nn} +-Set the point size to @var{nn}@tie{}points. @var{nn} must be exactly +-two digits. +- +-@item \s+(@var{nn} +-@itemx \s-(@var{nn} +-@itemx \s(+@var{nn} +-@itemx \s(-@var{nn} +-Increase or decrease the point size by @var{nn}@tie{}points. @var{nn} +-must be exactly two digits. +-@end table +- +-Note that @code{\s} doesn't produce an input token in @code{gtroff}. As +-a consequence, it can be used in requests like @code{mc} (which expects +-a single character as an argument) to change the font on the fly: +- +-@Example +-.mc \s[20]x\s[0] +-@endExample +- +-@xref{Fractional Type Sizes}, for yet another syntactical form of using +-the @code{\s} escape. +-@endDefreq +- +-@Defreq {sizes, s1 s2 @dots{} sn [0]} +-Some devices may only have certain permissible sizes, in which case +-@code{gtroff} rounds to the nearest permissible size. The @file{DESC} +-file specifies which sizes are permissible for the device. +- +-Use the @code{sizes} request to change the permissible sizes for the +-current output device. Arguments are in scaled points; the +-@code{sizescale} line in the @file{DESC} file for the output device +-provides the scaling factor. For example, if the scaling factor is +-1000, then the value 12000 is 12@tie{}points. +- +-Each argument can be a single point size (such as @samp{12000}), or a +-range of sizes (such as @samp{4000-72000}). You can optionally end the +-list with a zero. +-@endDefreq +- +-@DefreqList {vs, [@Var{space}]} +-@DefreqItem {vs, @t{+}@Var{space}} +-@DefreqItem {vs, @t{-}@Var{space}} +-@DefregListEndx {.v} +-@cindex changing vertical line spacing (@code{vs}) +-@cindex vertical line spacing, changing (@code{vs}) +-@cindex vertical line spacing register (@code{.v}) +-Change (increase, decrease) the vertical spacing by @var{space}. The +-default scaling indicator is @samp{p}. +- +-If @code{vs} is called without an argument, the vertical spacing is +-reset to the previous value before the last call to @code{vs}. +- +-@cindex @code{.V} register, and @code{vs} +-@code{gtroff} creates a warning of type @samp{range} if @var{space} is +-negative; the vertical spacing is then set to smallest positive value, +-the vertical resolution (as given in the @code{.V} register). +- +-Note that @w{@samp{.vs 0}} isn't saved in a diversion since it doesn't +-result in a vertical motion. You explicitly have to repeat this command +-before inserting the diversion. +- +-The read-only number register @code{.v} contains the current vertical +-spacing; it is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@cindex vertical line spacing, effective value +-The effective vertical line spacing consists of four components. +-Breaking a line causes the following actions (in the given order). +- +-@itemize @bullet +-@item +-@cindex extra pre-vertical line space (@code{\x}) +-@cindex line space, extra pre-vertical (@code{\x}) +-Move the current point vertically by the @dfn{extra pre-vertical line +-space}. This is the minimum value of all @code{\x} escapes with a +-negative argument in the current output line. +- +-@item +-Move the current point vertically by the vertical line spacing as set +-with the @code{vs} request. +- +-@item +-Output the current line. +- +-@item +-@cindex extra post-vertical line space (@code{\x}) +-@cindex line space, extra post-vertical (@code{\x}) +-Move the current point vertically by the @dfn{extra post-vertical line +-space}. This is the maximum value of all @code{\x} escapes with a +-positive argument in the line that has just been output. +- +-@item +-@cindex post-vertical line spacing +-@cindex line spacing, post-vertical (@code{pvs}) +-Move the current point vertically by the @dfn{post-vertical line +-spacing} as set with the @code{pvs} request. +-@end itemize +- +-@cindex double-spacing (@code{vs}, @code{pvs}) +-It is usually better to use @code{vs} or @code{pvs} instead of @code{ls} +-to produce double-spaced documents: @code{vs} and @code{pvs} have a +-finer granularity for the inserted vertical space compared to @code{ls}; +-furthermore, certain preprocessors assume single-spacing. +- +-@xref{Manipulating Spacing}, for more details on the @code{\x} escape +-and the @code{ls} request. +- +-@DefreqList {pvs, [@Var{space}]} +-@DefreqItem {pvs, @t{+}@Var{space}} +-@DefreqItem {pvs, @t{-}@Var{space}} +-@DefregListEndx {.pvs} +-@cindex @code{ls} request, alternative to (@code{pvs}) +-@cindex post-vertical line spacing, changing (@code{pvs}) +-@cindex post-vertical line spacing register (@code{.pvs}) +-Change (increase, decrease) the post-vertical spacing by @var{space}. +-The default scaling indicator is @samp{p}. +- +-If @code{pvs} is called without an argument, the post-vertical spacing +-is reset to the previous value before the last call to @code{pvs}. +- +-@code{gtroff} creates a warning of type @samp{range} if @var{space} is +-zero or negative; the vertical spacing is then set to zero. +- +-The read-only number register @code{.pvs} contains the current +-post-vertical spacing; it is associated with the current environment +-(@pxref{Environments}). +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Fractional Type Sizes, , Changing Type Sizes, Sizes +-@subsection Fractional Type Sizes +-@cindex fractional type sizes +-@cindex fractional point sizes +-@cindex type sizes, fractional +-@cindex point sizes, fractional +-@cindex sizes, fractional +- +-@cindex @code{s} unit +-@cindex unit, @code{s} +-@cindex @code{z} unit +-@cindex unit, @code{z} +-@cindex @code{ps} request, with fractional type sizes +-@cindex @code{cs} request, with fractional type sizes +-@cindex @code{tkf} request, with fractional type sizes +-@cindex @code{\H}, with fractional type sizes +-@cindex @code{\s}, with fractional type sizes +-A @dfn{scaled point} is equal to @math{1/@var{sizescale}} points, where +-@var{sizescale} is specified in the @file{DESC} file (1@tie{}by +-default). There is a new scale indicator @samp{z}, which has the effect +-of multiplying by @var{sizescale}. Requests and escape sequences in +-@code{gtroff} interpret arguments that represent a point size as being +-in units of scaled points, but they evaluate each such argument using a +-default scale indicator of @samp{z}. Arguments treated in this way are +-the argument to the @code{ps} request, the third argument to the +-@code{cs} request, the second and fourth arguments to the @code{tkf} +-request, the argument to the @code{\H} escape sequence, and those +-variants of the @code{\s} escape sequence that take a numeric expression +-as their argument (see below). +- +-For example, suppose @var{sizescale} is@tie{}1000; then a scaled point +-is equivalent to a millipoint; the request @w{@samp{.ps 10.25}} is +-equivalent to @w{@samp{.ps 10.25z}} and thus sets the point size to +-10250@tie{}scaled points, which is equal to 10.25@tie{}points. +- +-@code{gtroff} disallows the use of the @samp{z} scale indicator in +-instances where it would make no sense, such as a numeric expression +-whose default scale indicator was neither @samp{u} nor @samp{z}. +-Similarly it would make no sense to use a scaling indicator other than +-@samp{z} or @samp{u} in a numeric expression whose default scale +-indicator was @samp{z}, and so @code{gtroff} disallows this as well. +- +-There is also new scale indicator @samp{s}, which multiplies by the +-number of units in a scaled point. So, for example, @samp{\n[.ps]s} is +-equal to @samp{1m}. Be sure not to confuse the @samp{s} and @samp{z} +-scale indicators. +- +-@Defreg {.ps} +-A read-only number register returning the point size in scaled points. +- +-@code{.ps} is associated with the current environment +-(@pxref{Environments}). +-@endDefreg +- +-@DefregList {.psr} +-@DefregListEndx {.sr} +-@cindex last-requested point size registers (@code{.psr}, @code{.sr}) +-@cindex point size registers, last-requested (@code{.psr}, @code{.sr}) +-@cindex @code{.ps} register, in comparison with @code{.psr} +-@cindex @code{.s} register, in comparison with @code{.sr} +-The last-requested point size in scaled points is contained in the +-@code{.psr} read-only number register. The last requested point size in +-points as a decimal fraction can be found in @code{.sr}. This is a +-string-valued read-only number register. +- +-Note that the requested point sizes are device-independent, whereas the +-values returned by the @code{.ps} and @code{.s} registers are not. For +-example, if a point size of 11@dmn{pt} is requested, and a @code{sizes} +-request (or a @code{sizescale} line in a @file{DESC} file) specifies +-10.95@dmn{pt} instead, this value is actually used. +- +-Both registers are associated with the current environment +-(@pxref{Environments}). +-@endDefreg +- +-The @code{\s} escape has the following syntax for working with +-fractional type sizes: +- +-@table @code +-@item \s[@var{n}] +-@itemx \s'@var{n}' +-Set the point size to @var{n}@tie{}scaled points; @var{n}@tie{}is a +-numeric expression with a default scale indicator of @samp{z}. +- +-@item \s[+@var{n}] +-@itemx \s[-@var{n}] +-@itemx \s+[@var{n}] +-@itemx \s-[@var{n}] +-@itemx \s'+@var{n}' +-@itemx \s'-@var{n}' +-@itemx \s+'@var{n}' +-@itemx \s-'@var{n}' +-Increase or or decrease the point size by @var{n}@tie{}scaled points; +-@var{n}@tie{}is a numeric expression (which may start with a minus sign) +-with a default scale indicator of @samp{z}. +-@end table +- +-@xref{Font Files}. +- +- +-@c ===================================================================== +- +-@node Strings, Conditionals and Loops, Sizes, gtroff Reference +-@section Strings +-@cindex strings +- +-@code{gtroff} has string variables, which are entirely for user +-convenience (i.e.@: there are no built-in strings exept @code{.T}, but +-even this is a read-write string variable). +- +-Although the following requests can be used to create strings, +-simply using an undefined string will cause it to be defined as empty. +-@xref{Identifiers}. +- +-@DefreqList {ds, name [@Var{string}]} +-@DefreqItemx {ds1, name [@Var{string}]} +-@DefescItemx {\\*, , n, } +-@DefescItem {\\*, @Lparen{}, nm, } +-@DefescListEnd {\\*, @Lbrack{}, name arg1 arg2 @dots{}, @Rbrack{}} +-@cindex string interpolation (@code{\*}) +-@cindex string expansion (@code{\*}) +-@cindex interpolation of strings (@code{\*}) +-@cindex expansion of strings (@code{\*}) +-@cindex string arguments +-@cindex arguments, of strings +-Define and access a string variable @var{name} (one-character +-name@tie{}@var{n}, two-character name @var{nm}). If @var{name} already +-exists, @code{ds} overwrites the previous definition. Only the syntax +-form using brackets can take arguments that are handled identically to +-macro arguments; the single exception is that a closing bracket as an +-argument must be enclosed in double quotes. @xref{Request and Macro +-Arguments}, and @ref{Parameters}. +- +-Example: +- +-@Example +-.ds foo a \\$1 test +-. +-This is \*[foo nice]. +- @result{} This is a nice test. +-@endExample +- +-The @code{\*} escape @dfn{interpolates} (expands in-place) a +-previously-defined string variable. To be more precise, the stored +-string is pushed onto the input stack, which is then parsed by +-@code{gtroff}. Similar to number registers, it is possible to nest +-strings, i.e., string variables can be called within string variables. +- +-If the string named by the @code{\*} escape does not exist, it is +-defined as empty, and a warning of type @samp{mac} is emitted (see +-@ref{Debugging}, for more details). +- +-@cindex comments, with @code{ds} +-@cindex @code{ds} request, and comments +-@strong{Caution:} Unlike other requests, the second argument to the +-@code{ds} request takes up the entire line including trailing spaces. +-This means that comments on a line with such a request can introduce +-unwanted space into a string. +- +-@Example +-.ds UX \s-1UNIX\s0\u\s-3tm\s0\d \" UNIX trademark +-@endExample +- +-@noindent +-Instead the comment should be put on another line or have the comment +-escape adjacent with the end of the string. +- +-@Example +-.ds UX \s-1UNIX\s0\u\s-3tm\s0\d\" UNIX trademark +-@endExample +- +-@cindex trailing quotes +-@cindex quotes, trailing +-@cindex leading spaces with @code{ds} +-@cindex spaces with @code{ds} +-@cindex @code{ds} request, and leading spaces +-To produce leading space the string can be started with a double quote. +-No trailing quote is needed; in fact, any trailing quote is included in +-your string. +- +-@Example +-.ds sign " Yours in a white wine sauce, +-@endExample +- +-@cindex multi-line strings +-@cindex strings, multi-line +-@cindex newline character, in strings, escaping +-@cindex escaping newline characters, in strings +-Strings are not limited to a single line of text. A string can span +-several lines by escaping the newlines with a backslash. The resulting +-string is stored @emph{without} the newlines. +- +-@Example +-.ds foo lots and lots \ +-of text are on these \ +-next several lines +-@endExample +- +-It is not possible to have real newlines in a string. To put a single +-double quote character into a string, use two consecutive double quote +-characters. +- +-The @code{ds1} request turns off compatibility mode while interpreting a +-string. To be more precise, a @dfn{compatibility save} input token is +-inserted at the beginning of the string, and a @dfn{compatibility +-restore} input token at the end. +- +-@Example +-.nr xxx 12345 +-.ds aa The value of xxx is \\n[xxx]. +-.ds1 bb The value of xxx ix \\n[xxx]. +-. +-.cp 1 +-. +-\*(aa +- @result{} warning: number register `[' not defined +- @result{} The value of xxx is 0xxx]. +-\*(bb +- @result{} The value of xxx ix 12345. +-@endExample +- +-@cindex name space, common, of macros, diversions, and strings +-@cindex common name space of macros, diversions, and strings +-@cindex macros, shared name space with strings and diversions +-@cindex strings, shared name space with macros and diversions +-@cindex diversions, shared name space with macros and strings +-Strings, macros, and diversions (and boxes) share the same name space. +-Internally, even the same mechanism is used to store them. This has +-some interesting consequences. For example, it is possible to call a +-macro with string syntax and vice versa. +- +-@Example +-.de xxx +-a funny test. +-.. +-This is \*[xxx] +- @result{} This is a funny test. +- +-.ds yyy a funny test +-This is +-.yyy +- @result{} This is a funny test. +-@endExample +- +-In particular, interpolating a string does not hide existing macro +-arguments. Thus in a macro, a more efficient way of doing +- +-@Example +-.xx \\$@@ +-@endExample +- +-@noindent +-is +- +-@Example +-\\*[xx]\\ +-@endExample +- +-@noindent +-Note that the latter calling syntax doesn't change the value of +-@code{\$0}, which is then inherited from the calling macro. +- +-Diversions and boxes can be also called with string syntax. +- +-Another consequence is that you can copy one-line diversions or boxes to +-a string. +- +-@Example +-.di xxx +-a \fItest\fR +-.br +-.di +-.ds yyy This is \*[xxx]\c +-\*[yyy]. +- @result{} @r{This is a }@i{test}. +-@endExample +- +-@noindent +-As the previous example shows, it is possible to store formatted output +-in strings. The @code{\c} escape prevents the insertion of an +-additional blank line in the output. +- +-Copying diversions longer than a single output line produces unexpected +-results. +- +-@Example +-.di xxx +-a funny +-.br +-test +-.br +-.di +-.ds yyy This is \*[xxx]\c +-\*[yyy]. +- @result{} test This is a funny. +-@endExample +- +-Usually, it is not predictable whether a diversion contains one or more +-output lines, so this mechanism should be avoided. With @acronym{UNIX} +-@code{troff}, this was the only solution to strip off a final newline +-from a diversion. Another disadvantage is that the spaces in the copied +-string are already formatted, making them unstretchable. This can cause +-ugly results. +- +-@cindex stripping final newline in diversions +-@cindex diversion, stripping final newline +-@cindex final newline, stripping in diversions +-@cindex newline, final, stripping in diversions +-@cindex horizontal space, unformatting +-@cindex space, horizontal, unformatting +-@cindex unformatting horizontal space +-A clean solution to this problem is available in GNU @code{troff}, using +-the requests @code{chop} to remove the final newline of a diversion, and +-@code{unformat} to make the horizontal spaces stretchable again. +- +-@Example +-.box xxx +-a funny +-.br +-test +-.br +-.box +-.chop xxx +-.unformat xxx +-This is \*[xxx]. +- @result{} This is a funny test. +-@endExample +- +-@xref{Gtroff Internals}, for more information. +-@endDefreq +- +-@DefreqList {as, name [@Var{string}]} +-@DefreqListEndx {as1, name [@Var{string}]} +-@cindex appending to a string (@code{as}) +-@cindex string, appending (@code{as}) +-The @code{as} request is similar to @code{ds} but appends @var{string} +-to the string stored as @var{name} instead of redefining it. If +-@var{name} doesn't exist yet, it is created. +- +-@Example +-.as sign " with shallots, onions and garlic, +-@endExample +- +-The @code{as1} request is similar to @code{as}, but compatibility mode +-is switched off while the appended string is interpreted. To be more +-precise, a @dfn{compatibility save} input token is inserted at the +-beginning of the appended string, and a @dfn{compatibility restore} +-input token at the end. +-@endDefreq +- +-Rudimentary string manipulation routines are given with the next two +-requests. +- +-@Defreq {substring, str n1 [@Var{n2}]} +-@cindex substring (@code{substring}) +-Replace the string named @var{str} with the substring defined by the +-indices @var{n1} and @var{n2}. The first character in the string has +-index@tie{}0. If @var{n2} is omitted, it is implicitly set to the +-largest valid value (the string length minus one). If the index value +-@var{n1} or @var{n2} is negative, it is counted from the end of the +-string, going backwards: The last character has index@tie{}@minus{}1, +-the character before the last character has index@tie{}@minus{}2, etc. +- +-@Example +-.ds xxx abcdefgh +-.substring xxx 1 -4 +-\*[xxx] +- @result{} bcde +-.substring xxx 2 +-\*[xxx] +- @result{} de +-@endExample +-@endDefreq +- +-@Defreq {length, reg str} +-@cindex length of a string (@code{length}) +-@cindex string, length of (@code{length}) +-@cindex @code{length} request, and copy-in mode +-@cindex copy-in mode, and @code{length} request +-@cindex mode, copy-in, and @code{length} request +-Compute the number of characters of @var{str} and return it in the +-number register @var{reg}. If @var{reg} doesn't exist, it is created. +-@code{str} is read in copy mode. +- +-@Example +-.ds xxx abcd\h'3i'efgh +-.length yyy \*[xxx] +-\n[yyy] +- @result{} 14 +-@endExample +-@endDefreq +- +-@Defreq {rn, xx yy} +-@cindex renaming request (@code{rn}) +-@cindex request, renaming (@code{rn}) +-@cindex renaming macro (@code{rn}) +-@cindex macro, renaming (@code{rn}) +-@cindex renaming string (@code{rn}) +-@cindex string, renaming (@code{rn}) +-@cindex renaming diversion (@code{rn}) +-@cindex diversion, renaming (@code{rn}) +-Rename the request, macro, diversion, or string @var{xx} to @var{yy}. +-@endDefreq +- +-@Defreq {rm, xx} +-@cindex removing request (@code{rm}) +-@cindex request, removing (@code{rm}) +-@cindex removing macro (@code{rm}) +-@cindex macro, removing (@code{rm}) +-@cindex removing string (@code{rm}) +-@cindex string, removing (@code{rm}) +-@cindex removing diversion (@code{rm}) +-@cindex diversion, removing (@code{rm}) +-Remove the request, macro, diversion, or string @var{xx}. @code{gtroff} +-treats subsequent invocations as if the object had never been defined. +-@endDefreq +- +-@anchor{als} +-@Defreq {als, new old} +-@cindex alias, string, creating (@code{als}) +-@cindex alias, macro, creating (@code{als}) +-@cindex alias, diversion, creating (@code{als}) +-@cindex creating alias, for string (@code{als}) +-@cindex creating alias, for macro (@code{als}) +-@cindex creating alias, for diversion (@code{als}) +-@cindex string, creating alias (@code{als}) +-@cindex macro, creating alias (@code{als}) +-@cindex diversion, creating alias (@code{als}) +-Create an alias named @var{new} for the request, string, macro, or +-diversion object named @var{old}. The new name and the old name are +-exactly equivalent (it is similar to a hard rather than a soft link). If +-@var{old} is undefined, @code{gtroff} generates a warning of type +-@samp{mac} and ignores the request. +- +-To understand how the @code{als} request works it is probably best to +-think of two different pools: one pool for objects (macros, strings, +-etc.), and another one for names. As soon as an object is defined, +-@code{gtroff} adds it to the object pool, adds its name to the name +-pool, and creates a link between them. When @code{als} creates an +-alias, it adds a new name to the name pool that gets linked to the same +-object as the old name. +- +-Now consider this example. +- +-@Example +-.de foo +-.. +-. +-.als bar foo +-. +-.de bar +-. foo +-.. +-. +-.bar +- @result{} input stack limit exceeded +-@endExample +- +-@noindent +-The definition of macro @code{bar} replaces the old object this name is +-linked to. However, the alias to @code{foo} is still active! In +-other words, @code{foo} is still linked to the same object as +-@code{bar}, and the result of calling @code{bar} is an infinite, +-recursive loop that finally leads to an error. +- +-@cindex alias, string, removing (@code{rm}) +-@cindex alias, macro, removing (@code{rm}) +-@cindex alias, diversion, removing (@code{rm}) +-@cindex removing alias, for string (@code{rm}) +-@cindex removing alias, for macro (@code{rm}) +-@cindex removing alias, for diversion (@code{rm}) +-@cindex string, removing alias (@code{rm}) +-@cindex macro, removing alias (@code{rm}) +-@cindex diversion, removing alias (@code{rm}) +-To undo an alias, simply call @code{rm} on the aliased name. The object +-itself is not destroyed until there are no more aliases. +-@endDefreq +- +-@Defreq {chop, xx} +-Remove (chop) the last character from the macro, string, or diversion +-named @var{xx}. This is useful for removing the newline from the end of +-diversions that are to be interpolated as strings. This command can be +-used repeatedly; see @ref{Gtroff Internals}, for details on nodes +-inserted additionally by @code{gtroff}. +-@endDefreq +- +-@xref{Identifiers}, and @ref{Comments}. +- +- +-@c ===================================================================== +- +-@node Conditionals and Loops, Writing Macros, Strings, gtroff Reference +-@section Conditionals and Loops +-@cindex conditionals and loops +-@cindex loops and conditionals +- +-@menu +-* Operators in Conditionals:: +-* if-else:: +-* while:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Operators in Conditionals, if-else, Conditionals and Loops, Conditionals and Loops +-@subsection Operators in Conditionals +- +-@cindex @code{if} request, operators to use with +-@cindex @code{ie} request, operators to use with +-@cindex @code{while} request, operators to use with +-In @code{if}, @code{ie}, and @code{while} requests, in addition to ordinary +-@ref{Expressions}, there are several more operators available: +- +-@table @code +-@item e +-@itemx o +-True if the current page is even or odd numbered (respectively). +- +-@item n +-@cindex conditional output for terminal (TTY) +-@cindex TTY, conditional output for +-@cindex terminal, conditional output for +-True if the document is being processed in nroff mode (i.e., the +-@code{.nroff} command has been issued). @xref{Troff and Nroff Mode}. +- +-@item t +-True if the document is being processed in troff mode (i.e., the +-@code{.troff} command has been issued). @xref{Troff and Nroff Mode}. +- +-@item v +-Always false. This condition is for compatibility with other +-@code{troff} versions only (identifying a @code{-Tversatec} device). +- +-@item '@var{xxx}'@var{yyy}' +-True if the output produced by @var{xxx} is equal to the output produced +-by @var{yyy}. Other characters can be used in place of the single +-quotes; the same set of delimiters as for the @code{\D} escape is used +-(@pxref{Escapes}). @code{gtroff} formats @var{xxx} and @var{yyy} in +-separate environments; after the comparison the resulting data is +-discarded. +- +-@Example +-.ie "|"\fR|\fP" \ +-true +-.el \ +-false +- @result{} true +-@endExample +- +-@noindent +-The resulting motions, glyph sizes, and fonts have to +-match,@footnote{The created output nodes must be identical. +-@xref{Gtroff Internals}.} and not the individual motion, size, and font +-requests. In the previous example, @samp{|} and @samp{\fR|\fP} both +-result in a roman @samp{|} glyph with the same point size and at the +-same location on the page, so the strings are equal. If +-@samp{.ft@tie{}I} had been added before the @samp{.ie}, the result would +-be ``false'' because (the first) @samp{|} produces an italic @samp{|} +-rather than a roman one. +- +-@cindex string comparison +-@cindex comparison of strings +-To compare strings without processing, surround the data with @code{\?}. +- +-@Example +-.ie "\?|\?"\?\fR|\fP\?" \ +-true +-.el \ +-false +- @result{} false +-@endExample +- +-@cindex @code{\?}, and copy-in mode +-@cindex copy-in mode, and @code{\?} +-@cindex mode, copy-in, and @code{\?} +-@noindent +-Since data protected with @code{\?} is read in copy-in mode it is even +-possible to use incomplete input without causing an error. +- +-@Example +-.ds a \[ +-.ds b \[ +-.ie '\?\*a\?'\?\*b\?' \ +-true +-.el \ +-false +- @result{} true +-@endExample +- +-@item r @var{xxx} +-True if there is a number register named @var{xxx}. +- +-@item d @var{xxx} +-True if there is a string, macro, diversion, or request named @var{xxx}. +- +-@item m @var{xxx} +-True if there is a color named @var{xxx}. +- +-@item c @var{g} +-True if there is a glyph @var{g} available@footnote{The name of this +-conditional operator is a misnomer since it tests names of output +-glyphs.}; @var{g} is either an @acronym{ASCII} character or a special +-character (@code{\N'@var{xxx}'}, @code{\(@var{gg}} or +-@code{\[@var{ggg}]}); the condition is also true if @var{g} has been +-defined by the @code{char} request. +- +-@item F @var{font} +-True if a font named @var{font} exists. @var{font} is handled as if it +-was opened with the @code{ft} request (this is, font translation and +-styles are applied), without actually mounting it. +- +-This test doesn't load the complete font but only its header to verify +-its validity. +- +-@item S @var{style} +-True if style @var{style} has been registered. Font translation is +-applied. +-@end table +- +-Note that these operators can't be combined with other operators like +-@samp{:} or @samp{&}; only a leading @samp{!} (without whitespace +-between the exclamation mark and the operator) can be used to negate the +-result. +- +-@Example +-.nr xxx 1 +-.ie !r xxx \ +-true +-.el \ +-false +- @result{} false +-@endExample +- +-A whitespace after @samp{!} always evaluates to zero (this bizarre +-behaviour is due to compatibility with @acronym{UNIX} @code{troff}). +- +-@Example +-.nr xxx 1 +-.ie ! r xxx \ +-true +-.el \ +-false +- @result{} r xxx true +-@endExample +- +-It is possible to omit the whitespace before the argument to the +-@samp{r}, @samp{d}, and @samp{c} operators. +- +-@xref{Expressions}. +- +-@c --------------------------------------------------------------------- +- +-@node if-else, while, Operators in Conditionals, Conditionals and Loops +-@subsection if-else +-@cindex if-else +- +-@code{gtroff} has if-then-else constructs like other languages, although +-the formatting can be painful. +- +-@Defreq {if, expr anything} +- +-Evaluate the expression @var{expr}, and executes @var{anything} (the +-remainder of the line) if @var{expr} evaluates to a value greater than +-zero (true). @var{anything} is interpreted as though it was on a line +-by itself (except that leading spaces are swallowed). +-@xref{Operators in Conditionals}, for more info. +- +-@Example +-.nr xxx 1 +-.nr yyy 2 +-.if ((\n[xxx] == 1) & (\n[yyy] == 2)) true +- @result{} true +-@endExample +-@endDefreq +- +-@Defreq {nop, anything} +-Executes @var{anything}. This is similar to @code{.if@tie{}1}. +-@endDefreq +- +-@DefreqList {ie, expr anything} +-@DefreqListEndx {el, anything} +-Use the @code{ie} and @code{el} requests to write an if-then-else. The +-first request is the `if' part and the latter is the `else' part. +- +-@Example +-.ie n .ls 2 \" double-spacing in nroff +-.el .ls 1 \" single-spacing in troff +-@endExample +-@endDefreq +- +-@c there is a bug in makeinfo <= 4.1a: you can't have `@{' as an argument +-@c to @deffn +-@c +-@c and in 4.2 you still can't use @{ in macros. +- +-@c @DefescList {\@{, , , } +-@c @DefescListEnd {\@}, , , } +-@deffn Escape @t{\@{} +-@deffnx Escape @t{\@}} +-@esindex \@{ +-@esindex \@} +-@cindex begin of conditional block (@code{\@{}) +-@cindex end of conditional block (@code{\@}}) +-@cindex conditional block, begin (@code{\@{}) +-@cindex conditional block, end (@code{\@}}) +-@cindex block, conditional, begin (@code{\@{}) +-@cindex block, condititional, end (@code{\@}}) +-In many cases, an if (or if-else) construct needs to execute more than +-one request. This can be done using the escapes @code{\@{} (which must +-start the first line) and @code{\@}} (which must end the last line). +- +-@Example +-.ie t \@{\ +-. ds lq `` +-. ds rq '' +-.\@} +-.el \@{\ +-. ds lq "" +-. ds rq "" +-.\@} +-@endExample +-@c @endDefesc +-@end deffn +- +-@xref{Expressions}. +- +-@c --------------------------------------------------------------------- +- +-@node while, , if-else, Conditionals and Loops +-@subsection while +-@cindex while +- +-@code{gtroff} provides a looping construct using the @code{while} +-request, which is used much like the @code{if} (and related) requests. +- +-@Defreq {while, expr anything} +-Evaluate the expression @var{expr}, and repeatedly execute +-@var{anything} (the remainder of the line) until @var{expr} evaluates +-to@tie{}0. +- +-@Example +-.nr a 0 1 +-.while (\na < 9) \@{\ +-\n+a, +-.\@} +-\n+a +- @result{} 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 +-@endExample +- +-Some remarks. +- +-@cindex @code{de} request, and @code{while} +-@itemize @bullet +-@item +-The body of a @code{while} request is treated like the body of a +-@code{de} request: @code{gtroff} temporarily stores it in a macro that +-is deleted after the loop has been exited. It can considerably slow +-down a macro if the body of the @code{while} request (within the macro) +-is large. Each time the macro is executed, the @code{while} body is +-parsed and stored again as a temporary macro. +- +-@Example +-.de xxx +-. nr num 10 +-. while (\\n[num] > 0) \@{\ +-. \" many lines of code +-. nr num -1 +-. \@} +-.. +-@endExample +- +-@cindex recursive macros +-@cindex macros, recursive +-@noindent +-The traditional and ofter better solution (@acronym{UNIX} @code{troff} +-doesn't have the @code{while} request) is to use a recursive macro +-instead that is parsed only once during its definition. +- +-@Example +-.de yyy +-. if (\\n[num] > 0) \@{\ +-. \" many lines of code +-. nr num -1 +-. yyy +-. \@} +-.. +-. +-.de xxx +-. nr num 10 +-. yyy +-.. +-@endExample +- +-@noindent +-Note that the number of available recursion levels is set to@tie{}1000 +-(this is a compile-time constant value of @code{gtroff}). +- +-@item +-The closing brace of a @code{while} body must end a line. +- +-@Example +-.if 1 \@{\ +-. nr a 0 1 +-. while (\n[a] < 10) \@{\ +-. nop \n+[a] +-.\@}\@} +- @result{} unbalanced \@{ \@} +-@endExample +-@end itemize +-@endDefreq +- +-@Defreq {break, } +-@cindex @code{while} request, confusing with @code{br} +-@cindex @code{break} request, in a @code{while} loop +-@cindex @code{continue} request, in a @code{while} loop +-Break out of a @code{while} loop. Be sure not to confuse this with the +-@code{br} request (causing a line break). +-@endDefreq +- +-@Defreq {continue, } +-Finish the current iteration of a @code{while} loop, immediately +-restarting the next iteration. +-@endDefreq +- +-@xref{Expressions}. +- +- +-@c ===================================================================== +- +-@node Writing Macros, Page Motions, Conditionals and Loops, gtroff Reference +-@section Writing Macros +-@cindex writing macros +-@cindex macros, writing +- +-A @dfn{macro} is a collection of text and embedded commands that can be +-invoked multiple times. Use macros to define common operations. +-@xref{Strings}, for a (limited) alternative syntax to call macros. +- +-Although the following requests can be used to create macros, +-simply using an undefined macro will cause it to be defined as empty. +-@xref{Identifiers}. +- +-@DefreqList {de, name [@Var{end}]} +-@DefreqItemx {de1, name [@Var{end}]} +-@DefreqItemx {dei, name [@Var{end}]} +-@DefreqListEndx {dei1, name [@Var{end}]} +-Define a new macro named @var{name}. @code{gtroff} copies subsequent +-lines (starting with the next one) into an internal buffer until it +-encounters the line @samp{..} (two dots). If the optional second +-argument to @code{de} is present it is used as the macro closure +-request instead of @samp{..}. +- +-There can be whitespace after the first dot in the line containing the +-ending token (either @samp{.} or macro @samp{@var{end}}). Don't insert +-a tab character immediately after the @samp{..}, otherwise it isn't +-recognized as the end-of-macro symbol.@footnote{While it is possible to +-define and call a macro @samp{.} with +- +-@Example +-.de . +-. tm foo +-.. +-. +-.. \" This calls macro `.'! +-@endExample +- +-@noindent +-you can't use this as the end-of-macro macro: during a macro definition, +-@samp{..} is never handled as a call to @samp{.}, even if you say +-@samp{.de foo .} explicitly.} +- +-Here a small example macro called @samp{P} that causes a break and +-inserts some vertical space. It could be used to separate paragraphs. +- +-@Example +-.de P +-. br +-. sp .8v +-.. +-@endExample +- +-The following example defines a macro within another. Remember that +-expansion must be protected twice; once for reading the macro and once +-for executing. +- +-@Example +-\# a dummy macro to avoid a warning +-.de end +-.. +-. +-.de foo +-. de bar end +-. nop \f[B]Hallo \\\\$1!\f[] +-. end +-.. +-. +-.foo +-.bar Joe +- @result{} @b{Hallo Joe!} +-@endExample +- +-@noindent +-Since @code{\f} has no expansion, it isn't necessary to protect its +-backslash. Had we defined another macro within @code{bar} that takes a +-parameter, eight backslashes would be necessary before @samp{$1}. +- +-The @code{de1} request turns off compatibility mode while executing the +-macro. On entry, the current compatibility mode is saved and restored +-at exit. +- +-@Example +-.nr xxx 12345 +-. +-.de aa +-The value of xxx is \\n[xxx]. +-.. +-.de1 bb +-The value of xxx ix \\n[xxx]. +-.. +-. +-.cp 1 +-. +-.aa +- @result{} warning: number register `[' not defined +- @result{} The value of xxx is 0xxx]. +-.bb +- @result{} The value of xxx ix 12345. +-@endExample +- +-The @code{dei} request defines a macro indirectly. That is, it expands +-strings whose names are @var{name} or @var{end} before performing the +-append. +- +-This: +- +-@Example +-.ds xx aa +-.ds yy bb +-.dei xx yy +-@endExample +- +-@noindent +-is equivalent to: +- +-@Example +-.de aa bb +-@endExample +- +-The @code{dei1} request is similar to @code{dei} but with compatibility +-mode switched off during execution of the defined macro. +- +-If compatibility mode is on, @code{de} (and @code{dei}) behave similar +-to @code{de1} (and @code{dei1}): A `compatibility save' token is +-inserted at the beginning, and a `compatibility restore' token at the +-end, with compatibility mode switched on during execution. @xref{Gtroff +-Internals}, for more information on switching compatibility mode on and +-off in a single document. +- +-@pindex trace.tmac +-Using @file{trace.tmac}, you can trace calls to @code{de} and +-@code{de1}. +- +-Note that macro identifiers are shared with identifiers for strings and +-diversions. +- +-@xref{als,,the description of the @code{als} request}, for possible +-pitfalls if redefining a macro that has been aliased. +-@endDefreq +- +-@DefreqList {am, name [@Var{end}]} +-@DefreqItemx {am1, name [@Var{end}]} +-@DefreqItemx {ami, name [@Var{end}]} +-@DefreqListEndx {ami1, name [@Var{end}]} +-@cindex appending to a macro (@code{am}) +-@cindex macro, appending (@code{am}) +-Works similarly to @code{de} except it appends onto the macro named +-@var{name}. So, to make the previously defined @samp{P} macro actually +-do indented instead of block paragraphs, add the necessary code to the +-existing macro like this: +- +-@Example +-.am P +-.ti +5n +-.. +-@endExample +- +-The @code{am1} request turns off compatibility mode while executing the +-appended macro piece. To be more precise, a @dfn{compatibility save} +-input token is inserted at the beginning of the appended code, and a +-@dfn{compatibility restore} input token at the end. +- +-The @code{ami} request appends indirectly, meaning that @code{gtroff} +-expands strings whose names are @var{name} or @var{end} before +-performing the append. +- +-The @code{ami1} request is similar to @code{ami} but compatibility mode +-is switched off during execution of the defined macro. +- +-@pindex trace.tmac +-Using @file{trace.tmac}, you can trace calls to @code{am} and +-@code{am1}. +-@endDefreq +- +-@xref{Strings}, for the @code{als} and @code{rn} request to create an +-alias and rename a macro, respectively. +- +-The @code{de}, @code{am}, @code{di}, @code{da}, @code{ds}, and @code{as} +-requests (together with its variants) only create a new object if the +-name of the macro, diversion or string diversion is currently undefined +-or if it is defined to be a request; normally they modify the value of +-an existing object. +- +-@Defreq {return, [@Var{anything}]} +-Exit a macro, immediately returning to the caller. +- +-If called with an argument, exit twice, namely the current macro and the +-macro one level higher. This is used to define a wrapper macro for +-@code{return} in @file{trace.tmac}. +-@endDefreq +- +-@menu +-* Copy-in Mode:: +-* Parameters:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Copy-in Mode, Parameters, Writing Macros, Writing Macros +-@subsection Copy-in Mode +-@cindex copy mode +-@cindex copy-in mode +-@cindex mode, copy +-@cindex mode, copy-in +- +-@cindex @code{\n}, when reading text for a macro +-@cindex @code{\$}, when reading text for a macro +-@cindex @code{\*}, when reading text for a macro +-@cindex @code{\\}, when reading text for a macro +-@cindex \@key{RET}, when reading text for a macro +-When @code{gtroff} reads in the text for a macro, string, or diversion, +-it copies the text (including request lines, but excluding escapes) into +-an internal buffer. Escapes are converted into an internal form, except +-for @code{\n}, @code{\$}, @code{\*}, @code{\\} and @code{\@key{RET}}, +-which are evaluated and inserted into the text where the escape was +-located. This is known as @dfn{copy-in} mode or @dfn{copy} mode. +- +-What this means is that you can specify when these escapes are to be +-evaluated (either at copy-in time or at the time of use) by insulating +-the escapes with an extra backslash. Compare this to the @code{\def} +-and @code{\edef} commands in @TeX{}. +- +-The following example prints the numbers 20 and@tie{}10: +- +-@Example +-.nr x 20 +-.de y +-.nr x 10 +-\&\nx +-\&\\nx +-.. +-.y +-@endExample +- +-@c --------------------------------------------------------------------- +- +-@node Parameters, , Copy-in Mode, Writing Macros +-@subsection Parameters +-@cindex parameters +- +-The arguments to a macro or string can be examined using a variety of +-escapes. +- +-@Defreg {.$} +-@cindex number of arguments register (@code{.$}) +-The number of arguments passed to a macro or string. This is a +-read-only number register. +- +-Note that the @code{shift} request can change its value. +-@endDefreg +- +-Any individual argument can be retrieved with one of the following +-escapes: +- +-@DefescList {\\$, , n, } +-@DefescItem {\\$, @Lparen{}, nn, } +-@DefescListEnd {\\$, @Lbrack{}, nnn, @Rbrack{}} +-@cindex copy-in mode, and macro arguments +-@cindex mode, copy-in, and macro arguments +-@cindex macro, arguments (@code{\$}) +-@cindex arguments, macro (@code{\$}) +-Retrieve the @var{n}@dmn{th}, @var{nn}@dmn{th} or @var{nnn}@dmn{th} +-argument. As usual, the first form only accepts a single number (larger +-than zero), the second a two-digit number (larger or equal to@tie{}10), +-and the third any positive integer value (larger than zero). Macros and +-strings can have an unlimited number of arguments. Note that due to +-copy-in mode, use two backslashes on these in actual use to prevent +-interpolation until the macro is actually invoked. +-@endDefesc +- +-@Defreq {shift, [@Var{n}]} +-Shift the arguments 1@tie{}position, or as many positions as specified +-by its argument. After executing this request, argument@tie{}@var{i} +-becomes argument @math{@var{i}-@var{n}}; arguments 1 to@tie{}@var{n} are +-no longer available. Shifting by negative amounts is currently +-undefined. +- +-The register @code{.$} is adjusted accordingly. +-@endDefreq +- +-@DefescList {\\$*, , , } +-@DefescListEndx {\\$@@, , , } +-In some cases it is convenient to use all of the arguments at once (for +-example, to pass the arguments along to another macro). The @code{\$*} +-escape concatenates all the arguments separated by spaces. A similar +-escape is @code{\$@@}, which concatenates all the arguments with each +-surrounded by double quotes, and separated by spaces. If not in +-compatibility mode, the input level of double quotes is preserved (see +-@ref{Request and Macro Arguments}). +-@endDefesc +- +-@Defesc {\\$^, , , } +-Handle the parameters of a macro as if they were an argument to the +-@code{ds} or similar requests. +- +-@Example +-.de foo +-. tm $1=`\\$1' +-. tm $2=`\\$2' +-. tm $*=`\\$*' +-. tm $@@=`\\$@@' +-. tm $^=`\\$^' +-.. +-.foo " This is a "test" +- @result{} $1=` This is a ' +- @result{} $2=`test"' +- @result{} $*=` This is a test"' +- @result{} $@@=`" This is a " "test""' +- @result{} $^=`" This is a "test"' +-@endExample +- +-This escape is useful mainly for macro packages like @file{trace.tmac}, +-which redefines some requests and macros for debugging purposes. +-@endDefesc +- +-@Defesc {\\$0, , , } +-@cindex macro name register (@code{\$0}) +-@cindex @code{als} request, and @code{\$0} +-The name used to invoke the current macro. The @code{als} request can +-make a macro have more than one name. +- +-If a macro is called as a string (within another macro), the value of +-@code{\$0} isn't changed. +- +-@Example +-.de foo +-. tm \\$0 +-.. +-.als foo bar +-. +-@endExample +-@Example +-.de aaa +-. foo +-.. +-.de bbb +-. bar +-.. +-.de ccc +-\\*[foo]\\ +-.. +-.de ddd +-\\*[bar]\\ +-.. +-. +-@endExample +-@Example +-.aaa +- @result{} foo +-.bbb +- @result{} bar +-.ccc +- @result{} ccc +-.ddd +- @result{} ddd +-@endExample +-@endDefesc +- +-@xref{Request and Macro Arguments}. +- +- +-@c ===================================================================== +- +-@node Page Motions, Drawing Requests, Writing Macros, gtroff Reference +-@section Page Motions +-@cindex page motions +-@cindex motions, page +- +-@xref{Manipulating Spacing}, for a discussion of the main request for +-vertical motion, @code{sp}. +- +-@DefreqList {mk, [@Var{reg}]} +-@DefreqListEndx {rt, [@Var{dist}]} +-@cindex marking vertical page location (@code{mk}) +-@cindex page location, vertical, marking (@code{mk}) +-@cindex location, vertical, page, marking (@code{mk}) +-@cindex vertical page location, marking (@code{mk}) +-@cindex returning to marked vertical page location (@code{rt}) +-@cindex page location, vertical, returning to marked (@code{rt}) +-@cindex location, vertical, page, returning to marked (@code{rt}) +-@cindex vertical page location, returning to marked (@code{rt}) +-The request @code{mk} can be used to mark a location on a page, for +-movement to later. This request takes a register name as an argument in +-which to store the current page location. With no argument it stores +-the location in an internal register. The results of this can be used +-later by the @code{rt} or the @code{sp} request (or the @code{\v} +-escape). +- +-The @code{rt} request returns @emph{upwards} to the location marked with +-the last @code{mk} request. If used with an argument, return to a +-position which distance from the top of the page is @var{dist} (no +-previous call to @code{mk} is necessary in this case). Default scaling +-indicator is @samp{v}. +- +-Here a primitive solution for a two-column macro. +- +-@Example +-.nr column-length 1.5i +-.nr column-gap 4m +-.nr bottom-margin 1m +-. +-@endExample +-@Example +-.de 2c +-. br +-. mk +-. ll \\n[column-length]u +-. wh -\\n[bottom-margin]u 2c-trap +-. nr right-side 0 +-.. +-. +-@endExample +-@Example +-.de 2c-trap +-. ie \\n[right-side] \@{\ +-. nr right-side 0 +-. po -(\\n[column-length]u + \\n[column-gap]u) +-. \" remove trap +-. wh -\\n[bottom-margin]u +-. \@} +-. el \@{\ +-. \" switch to right side +-. nr right-side 1 +-. po +(\\n[column-length]u + \\n[column-gap]u) +-. rt +-. \@} +-.. +-. +-@endExample +-@Example +-.pl 1.5i +-.ll 4i +-This is a small test that shows how the +-rt request works in combination with mk. +- +-.2c +-Starting here, text is typeset in two columns. +-Note that this implementation isn't robust +-and thus not suited for a real two-column +-macro. +-@endExample +- +-Result: +- +-@Example +-This is a small test that shows how the +-rt request works in combination with mk. +- +-Starting here, isn't robust +-text is typeset and thus not +-in two columns. suited for a +-Note that this real two-column +-implementation macro. +-@endExample +-@endDefreq +- +-The following escapes give fine control of movements about the page. +- +-@Defesc {\\v, ', e, '} +-@cindex vertical motion (@code{\v}) +-@cindex motion, vertical (@code{\v}) +-Move vertically, usually from the current location on the page (if no +-absolute position operator @samp{|} is used). The argument@tie{}@var{e} +-specifies the distance to move; positive is downwards and negative +-upwards. The default scaling indicator for this escape is @samp{v}. +-Beware, however, that @code{gtroff} continues text processing at the +-point where the motion ends, so you should always balance motions to +-avoid interference with text processing. +- +-@code{\v} doesn't trigger a trap. This can be quite useful; for +-example, consider a page bottom trap macro that prints a marker in the +-margin to indicate continuation of a footnote or something similar. +-@endDefesc +- +-There are some special-case escapes for vertical motion. +- +-@Defesc {\\r, , , } +-Move upwards@tie{}1@dmn{v}. +-@endDefesc +- +-@Defesc {\\u, , , } +-Move upwards@tie{}.5@dmn{v}. +-@endDefesc +- +-@Defesc {\\d, , , } +-Move down@tie{}.5@dmn{v}. +-@endDefesc +- +-@Defesc {\\h, ', e, '} +-@cindex inserting horizontal space (@code{\h}) +-@cindex horizontal space (@code{\h}) +-@cindex space, horizontal (@code{\h}) +-@cindex horizontal motion (@code{\h}) +-@cindex motion, horizontal (@code{\h}) +-Move horizontally, usually from the current location (if no absolute +-position operator @samp{|} is used). The expression@tie{}@var{e} +-indicates how far to move: positive is rightwards and negative +-leftwards. The default scaling indicator for this escape is @samp{m}. +- +-This horizontal space is not discarded at the end of a line. To insert +-discardable space of a certain length use the @code{ss} request. +-@endDefesc +- +-There are a number of special-case escapes for horizontal motion. +- +-@Defesc {\\@key{SP}, , , } +-@cindex space, unbreakable +-@cindex unbreakable space +-An unbreakable and unpaddable (i.e.@: not expanded during filling) +-space. (Note: This is a backslash followed by a space.) +-@endDefesc +- +-@Defesc {\\~, , , } +-An unbreakable space that stretches like a normal inter-word space when +-a line is adjusted. +-@endDefesc +- +-@Defesc {\\|, , , } +-A 1/6@dmn{th} em space. Ignored for TTY output devices (rounded to +-zero). +- +-However, if there is a glyph defined in the current font file with name +-@code{\|} (note the leading backslash), the width of this glyph is used +-instead (even for TTYs). +-@endDefesc +- +-@Defesc {\\^, , , } +-A 1/12@dmn{th} em space. Ignored for TTY output devices (rounded to +-zero). +- +-However, if there is a glyph defined in the current font file with name +-@code{\^} (note the leading backslash), the width of this glyph is used +-instead (even for TTYs). +-@endDefesc +- +-@Defesc {\\0, , , } +-@cindex space, width of a digit (@code{\0}) +-@cindex digit width space (@code{\0}) +-A space the size of a digit. +-@endDefesc +- +-The following string sets the @TeX{} logo: +- +-@Example +-.ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X +-@endExample +- +-@DefescList {\\w, ', text, '} +-@DefregItemx {st} +-@DefregItemx {sb} +-@DefregItemx {rst} +-@DefregItemx {rsb} +-@DefregItemx {ct} +-@DefregItemx {ssc} +-@DefregListEndx {skw} +-@cindex width escape (@code{\w}) +-Return the width of the specified @var{text} in basic units. This +-allows horizontal movement based on the width of some arbitrary text +-(e.g.@: given as an argument to a macro). +- +-@Example +-The length of the string `abc' is \w'abc'u. +- @result{} The length of the string `abc' is 72u. +-@endExample +- +-Font changes may occur in @var{text}, which don't affect current +-settings. +- +-After use, @code{\w} sets several registers: +- +-@table @code +-@item st +-@itemx sb +-The highest and lowest point of the baseline, respectively, in +-@var{text}. +- +-@item rst +-@itemx rsb +-Like the @code{st} and @code{sb} registers, but takes account of the +-heights and depths of glyphs. In other words, this gives the highest +-and lowest point of @var{text}. Values below the baseline are negative. +- +-@item ct +-Defines the kinds of glyphs occurring in @var{text}: +- +-@table @asis +-@item 0 +-only short glyphs, no descenders or tall glyphs. +- +-@item 1 +-at least one descender. +- +-@item 2 +-at least one tall glyph. +- +-@item 3 +-at least one each of a descender and a tall glyph. +-@end table +- +-@item ssc +-The amount of horizontal space (possibly negative) that should be added +-to the last glyph before a subscript. +- +-@item skw +-How far to right of the center of the last glyph in the @code{\w} +-argument, the center of an accent from a roman font should be placed +-over that glyph. +-@end table +-@endDefesc +- +-@DefescList {\\k, , p, } +-@DefescItem {\\k, @Lparen{}, ps, } +-@DefescListEnd {\\k, @Lbrack{}, position, @Rbrack{}} +-@cindex saving horizontal input line position (@code{\k}) +-@cindex horizontal input line position, saving (@code{\k}) +-@cindex input line position, horizontal, saving (@code{\k}) +-@cindex position, horizontal input line, saving (@code{\k}) +-@cindex line, input, horizontal position, saving (@code{\k}) +-Store the current horizontal position in the @emph{input} line in number +-register with name @var{position} (one-character name@tie{}@var{p}, +-two-character name @var{ps}). Use this, for example, to return to the +-beginning of a string for highlighting or other decoration. +-@endDefesc +- +-@Defreg {hp} +-@cindex horizontal input line position register (@code{hp}) +-@cindex input line, horizontal position, register (@code{hp}) +-@cindex position, horizontal, in input line, register (@code{hp}) +-@cindex line, input, horizontal position, register (@code{hp}) +-The current horizontal position at the input line. +-@endDefreg +- +-@Defreg {.k} +-@cindex horizontal output line position register (@code{.k}) +-@cindex output line, horizontal position, register (@code{.k}) +-@cindex position, horizontal, in output line, register (@code{.k}) +-@cindex line, output, horizontal position, register (@code{.k}) +-A read-only number register containing the current horizontal output +-position (relative to the current indentation). +-@endDefreg +- +-@Defesc {\\o, ', abc, '} +-@cindex overstriking glyphs (@code{\o}) +-@cindex glyphs, overstriking (@code{\o}) +-Overstrike glyphs @var{a}, @var{b}, @var{c}, @dots{}; the glyphs are +-centered, and the resulting spacing is the largest width of the affected +-glyphs. +-@endDefesc +- +-@Defesc {\\z, , g, } +-@cindex zero-width printing (@code{\z}, @code{\Z}) +-@cindex printing, zero-width (@code{\z}, @code{\Z}) +-Print glyph @var{g} with zero width, i.e., without spacing. Use this to +-overstrike glyphs left-aligned. +-@endDefesc +- +-@Defesc {\\Z, ', anything, '} +-@cindex zero-width printing (@code{\z}, @code{\Z}) +-@cindex printing, zero-width (@code{\z}, @code{\Z}) +-Print @var{anything}, then restore the horizontal and vertical position. +-The argument may not contain tabs or leaders. +- +-The following is an example of a strike-through macro: +- +-@Example +-.de ST +-.nr ww \w'\\$1' +-\Z@@\v'-.25m'\l'\\n[ww]u'@@\\$1 +-.. +-. +-This is +-.ST "a test" +-an actual emergency! +-@endExample +-@endDefesc +- +- +-@c ===================================================================== +- +-@node Drawing Requests, Traps, Page Motions, gtroff Reference +-@section Drawing Requests +-@cindex drawing requests +-@cindex requests for drawing +- +-@code{gtroff} provides a number of ways to draw lines and other figures +-on the page. Used in combination with the page motion commands (see +-@ref{Page Motions}, for more info), a wide variety of figures can be +-drawn. However, for complex drawings these operations can be quite +-cumbersome, and it may be wise to use graphic preprocessors like +-@code{gpic} or @code{ggrn}. @xref{gpic}, and @ref{ggrn}, for more +-information. +- +-All drawing is done via escapes. +- +-@DefescList {\\l, ', l, '} +-@DefescListEnd {\\l, ', lg, '} +-@cindex drawing horizontal lines (@code{\l}) +-@cindex horizontal line, drawing (@code{\l}) +-@cindex line, horizontal, drawing (@code{\l}) +-Draw a line horizontally. @var{l} is the length of the line to be +-drawn. If it is positive, start the line at the current location and +-draw to the right; its end point is the new current location. Negative +-values are handled differently: The line starts at the current location +-and draws to the left, but the current location doesn't move. +- +-@var{l} can also be specified absolutely (i.e.@: with a leading +-@samp{|}), which draws back to the beginning of the input line. Default +-scaling indicator is @samp{m}. +- +-@cindex underscore glyph (@code{\[ru]}) +-@cindex glyph, underscore (@code{\[ru]}) +-@cindex line drawing glyph +-@cindex glyph, for line drawing +-The optional second parameter@tie{}@var{g} is a glyph to draw the line +-with. If this second argument is not specified, @code{gtroff} uses the +-underscore glyph, @code{\[ru]}. +- +-@cindex zero width space character (@code{\&}) +-@cindex character, zero width space (@code{\&}) +-@cindex space character, zero width (@code{\&}) +-To separate the two arguments (to prevent @code{gtroff} from +-interpreting a drawing glyph as a scaling indicator if the glyph is +-represented by a single character) use @code{\&}. +- +-Here a small useful example: +- +-@Example +-.de box +-\[br]\\$*\[br]\l'|0\[rn]'\l'|0\[ul]' +-.. +-@endExample +- +-@noindent +-Note that this works by outputting a box rule (a vertical line), then +-the text given as an argument and then another box rule. Finally, the +-line drawing escapes both draw from the current location to the +-beginning of the @emph{input} line -- this works because the line length +-is negative, not moving the current point. +-@endDefesc +- +-@DefescList {\\L, ', l, '} +-@DefescListEnd {\\L, ', lg, '} +-@cindex drawing vertical lines (@code{\L}) +-@cindex vertical line drawing (@code{\L}) +-@cindex line, vertical, drawing (@code{\L}) +-@cindex line drawing glyph +-@cindex glyph for line drawing +-@cindex box rule glyph (@code{\[br]}) +-@cindex glyph, box rule (@code{\[br]}) +-Draw vertical lines. Its parameters are similar to the @code{\l} +-escape, except that the default scaling indicator is @samp{v}. The +-movement is downwards for positive values, and upwards for negative +-values. The default glyph is the box rule glyph, @code{\[br]}. As with +-the vertical motion escapes, text processing blindly continues where the +-line ends. +- +-@Example +-This is a \L'3v'test. +-@endExample +- +-@noindent +-Here the result, produced with @code{grotty}. +- +-@Example +-This is a +- | +- | +- |test. +-@endExample +-@endDefesc +- +-@Defesc {\\D, ', command arg @dots{}, '} +-The @code{\D} escape provides a variety of drawing functions. Note that +-on character devices, only vertical and horizontal lines are supported +-within @code{grotty}; other devices may only support a subset of the +-available drawing functions. +- +-The default scaling indicator for all subcommands of @code{\D} is +-@samp{m} for horizontal distances and @samp{v} for vertical ones. +-Exceptions are @w{@code{\D'f @dots{}'}} and @w{@code{\D't @dots{}'}}, +-which use @code{u} as the default, and @w{@code{\D'F@var{x} @dots{}'}}, +-which arguments are treated similar to the @code{defcolor} request. +- +-@table @code +-@item \D'l @var{dx} @var{dy}' +-@cindex line, drawing (@w{@code{\D'l @dots{}'}}) +-@cindex drawing a line (@w{@code{\D'l @dots{}'}}) +-Draw a line from the current location to the relative point specified by +-(@var{dx},@var{dy}), where positive values mean down and right, +-respectively. The end point of the line is the new current location. +- +-The following example is a macro for creating a box around a text +-string; for simplicity, the box margin is taken as a fixed value, +-0.2@dmn{m}. +- +-@Example +-.de BOX +-. nr @@wd \w'\\$1' +-\h'.2m'\ +-\h'-.2m'\v'(.2m - \\n[rsb]u)'\ +-\D'l 0 -(\\n[rst]u - \\n[rsb]u + .4m)'\ +-\D'l (\\n[@@wd]u + .4m) 0'\ +-\D'l 0 (\\n[rst]u - \\n[rsb]u + .4m)'\ +-\D'l -(\\n[@@wd]u + .4m) 0'\ +-\h'.2m'\v'-(.2m - \\n[rsb]u)'\ +-\\$1\ +-\h'.2m' +-.. +-@endExample +- +-@noindent +-First, the width of the string is stored in register @code{@@wd}. Then, +-four lines are drawn to form a box, properly offset by the box margin. +-The registers @code{rst} and @code{rsb} are set by the @code{\w} escape, +-containing the largest height and depth of the whole string. +- +-@item \D'c @var{d}' +-@cindex circle, drawing (@w{@code{\D'c @dots{}'}}) +-@cindex drawing a circle (@w{@code{\D'c @dots{}'}}) +-Draw a circle with a diameter of@tie{}@var{d} with the leftmost point at +-the current position. After drawing, the current location is positioned +-at the rightmost point of the circle. +- +-@item \D'C @var{d}' +-@cindex circle, solid, drawing (@w{@code{\D'C @dots{}'}}) +-@cindex drawing a solid circle (@w{@code{\D'C @dots{}'}}) +-@cindex solid circle, drawing (@w{@code{\D'C @dots{}'}}) +-Draw a solid circle with the same parameters and behaviour as an +-outlined circle. No outline is drawn. +- +-@item \D'e @var{x} @var{y}' +-@cindex drawing an ellipse (@w{@code{\D'e @dots{}'}}) +-@cindex ellipse, drawing (@w{@code{\D'e @dots{}'}}) +-Draw an ellipse with a horizontal diameter of @var{x} and a vertical +-diameter of @var{y} with the leftmost point at the current position. +-After drawing, the current location is positioned at the rightmost point +-of the ellipse. +- +-@item \D'E @var{x} @var{y}' +-@cindex ellipse, solid, drawing (@w{@code{\D'E @dots{}'}}) +-@cindex drawing a solid ellipse (@w{@code{\D'E @dots{}'}}) +-@cindex solid ellipse, drawing (@w{@code{\D'E @dots{}'}}) +-Draw a solid ellipse with the same parameters and behaviour as an +-outlined ellipse. No outline is drawn. +- +-@item \D'a @var{dx1} @var{dy1} @var{dx2} @var{dy2}' +-@cindex arc, drawing (@w{@code{\D'a @dots{}'}}) +-@cindex drawing an arc (@w{@code{\D'a @dots{}'}}) +-Draw an arc clockwise from the current location through the two +-specified relative locations (@var{dx1},@var{dy1}) and +-(@var{dx2},@var{dy2}). The coordinates of the first point are relative +-to the current position, and the coordinates of the second point are +-relative to the first point. After drawing, the current position is +-moved to the final point of the arc. +- +-@item \D'~ @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}' +-@cindex drawing a spline (@w{@code{\D'~ @dots{}'}}) +-@cindex spline, drawing (@w{@code{\D'~ @dots{}'}}) +-Draw a spline from the current location to the relative point +-(@var{dx1},@var{dy1}) and then to (@var{dx2},@var{dy2}), and so on. The +-current position is moved to the terminal point of the drawn curve. +- +-@item \D'f @var{n}' +-@cindex gray shading (@w{@code{\D'f @dots{}'}}) +-@cindex shading filled objects (@w{@code{\D'f @dots{}'}}) +-Set the shade of gray to be used for filling solid objects +-to@tie{}@var{n}; @var{n}@tie{}must be an integer between 0 +-and@tie{}1000, where 0 corresponds solid white and 1000 to solid black, +-and values in between correspond to intermediate shades of gray. This +-applies only to solid circles, solid ellipses, and solid polygons. By +-default, a level of 1000 is used. +- +-Despite of being silly, the current point is moved horizontally to the +-right by@tie{}@var{n}. +- +-@cindex @w{@code{\D'f @dots{}'}} and horizontal resolution +-Don't use this command! It has the serious drawback that it is always +-rounded to the next integer multiple of the horizontal resolution (the +-value of the @code{hor} keyword in the @file{DESC} file). Use @code{\M} +-(@pxref{Colors}) or @w{@code{\D'Fg @dots{}'}} instead. +- +-@item \D'p @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}' +-@cindex drawing a polygon (@w{@code{\D'p @dots{}'}}) +-@cindex polygon, drawing (@w{@code{\D'p @dots{}'}}) +-Draw a polygon from the current location to the relative position +-(@var{dx1},@var{dy1}) and then to (@var{dx2},@var{dy2}) and so on. When +-the specified data points are exhausted, a line is drawn back to the +-starting point. The current position is changed by adding the sum of +-all arguments with odd index to the actual horizontal position and the +-even ones to the vertical position. +- +-@item \D'P @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{}' +-@cindex polygon, solid, drawing (@w{@code{\D'P @dots{}'}}) +-@cindex drawing a solid polygon (@w{@code{\D'P @dots{}'}}) +-@cindex solid polygon, drawing (@w{@code{\D'P @dots{}'}}) +-Draw a solid polygon with the same parameters and behaviour as an +-outlined polygon. No outline is drawn. +- +-Here a better variant of the box macro to fill the box with some color. +-Note that the box must be drawn before the text since colors in +-@code{gtroff} are not transparent; the filled polygon would hide the +-text completely. +- +-@Example +-.de BOX +-. nr @@wd \w'\\$1' +-\h'.2m'\ +-\h'-.2m'\v'(.2m - \\n[rsb]u)'\ +-\M[lightcyan]\ +-\D'P 0 -(\\n[rst]u - \\n[rsb]u + .4m) \ +- (\\n[@@wd]u + .4m) 0 \ +- 0 (\\n[rst]u - \\n[rsb]u + .4m) \ +- -(\\n[@@wd]u + .4m) 0'\ +-\h'.2m'\v'-(.2m - \\n[rsb]u)'\ +-\M[]\ +-\\$1\ +-\h'.2m' +-.. +-@endExample +- +-If you want a filled polygon that has exactly the same size as an +-unfilled one, you must draw both an unfilled and a filled polygon. A +-filled polygon is always smaller than an unfilled one because the latter +-uses straight lines with a given line thickness to connect the polygon's +-corners, while the former simply fills the area defined by the +-coordinates. +- +-@Example +-\h'1i'\v'1i'\ +-\# increase line thickness +-\Z'\D't 5p''\ +-\# draw unfilled polygon +-\Z'\D'p 3 3 -6 0''\ +-\# draw filled polygon +-\Z'\D'P 3 3 -6 0'' +-@endExample +- +-@item \D't @var{n}' +-@cindex line thickness (@w{@code{\D't @dots{}'}}) +-@cindex thickness of lines (@w{@code{\D't @dots{}'}}) +-Set the current line thickness to @var{n}@tie{}machine units. A value +-of zero selects the smallest available line thickness. A negative value +-makes the line thickness proportional to the current point size (this is +-the default behaviour of @acronym{AT&T} @code{troff}). +- +-Despite of being silly, the current point is moved horizontally to the +-right by@tie{}@var{n}. +- +-@item \D'F@var{scheme} @var{color_components}' +-@cindex unnamed fill colors (@code{\D'F@dots{}'}) +-@cindex fill colors, unnamed (@code{\D'F@dots{}'}) +-@cindex colors, fill, unnamed (@code{\D'F@dots{}'}) +-Change current fill color. @var{scheme} is a single letter denoting the +-color scheme: @samp{r} (rgb), @samp{c} (cmy), @samp{k} (cmyk), @samp{g} +-(gray), or @samp{d} (default color). The color components use exactly +-the same syntax as in the @code{defcolor} request (@pxref{Colors}); the +-command @code{\D'Fd'} doesn't take an argument. +- +-@emph{No} position changing! +- +-Examples: +- +-@Example +-\D'Fg .3' \" same gray as \D'f 700' +-\D'Fr #0000ff' \" blue +-@endExample +-@end table +-@endDefesc +- +-@xref{Graphics Commands}. +- +-@Defesc {\\b, ', string, '} +-@cindex pile, glyph (@code{\b}) +-@cindex glyph pile (@code{\b}) +-@cindex stacking glyphs (@code{\b}) +-@dfn{Pile} a sequence of glyphs vertically, and center it vertically on +-the current line. Use it to build large brackets and braces. +- +-Here an example how to create a large opening brace: +- +-@Example +-\b'\[lt]\[bv]\[lk]\[bv]\[lb]' +-@endExample +- +-@cindex @code{\b}, limitations +-@cindex limitations of @code{\b} escape +-The first glyph is on the top, the last glyph in @var{string} is at the +-bottom. Note that @code{gtroff} separates the glyphs vertically by +-1@dmn{m}, and the whole object is centered 0.5@dmn{m} above the current +-baseline; the largest glyph width is used as the width for the whole +-object. This rather unflexible positioning algorithm doesn't work with +-@option{-Tdvi} since the bracket pieces vary in height for this device. +-Instead, use the @code{eqn} preprocessor. +- +-@xref{Manipulating Spacing}, how to adjust the vertical spacing with the +-@code{\x} escape. +-@endDefesc +- +- +-@c ===================================================================== +- +-@node Traps, Diversions, Drawing Requests, gtroff Reference +-@section Traps +-@cindex traps +- +-@dfn{Traps} are locations that, when reached, call a specified macro. +-These traps can occur at a given location on the page, at a given +-location in the current diversion, at a blank line, after a certain +-number of input lines, or at the end of input. +- +-@cindex planting a trap +-@cindex trap, planting +-Setting a trap is also called @dfn{planting}. +-@cindex trap, springing +-@cindex springing a trap +-It is also said that a trap is @dfn{sprung} if the associated macro is +-executed. +- +-@menu +-* Page Location Traps:: +-* Diversion Traps:: +-* Input Line Traps:: +-* Blank Line Traps:: +-* Leading Spaces Traps:: +-* End-of-input Traps:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Page Location Traps, Diversion Traps, Traps, Traps +-@subsection Page Location Traps +-@cindex page location traps +-@cindex traps, page location +- +-@dfn{Page location traps} perform an action when @code{gtroff} reaches +-or passes a certain vertical location on the page. Page location traps +-have a variety of purposes, including: +- +-@itemize +-@item +-setting headers and footers +- +-@item +-setting body text in multiple columns +- +-@item +-setting footnotes +-@end itemize +- +-@DefreqList {vpt, flag} +-@DefregListEndx {.vpt} +-@cindex enabling vertical position traps (@code{vpt}) +-@cindex vertical position traps, enabling (@code{vpt}) +-@cindex vertical position trap enable register (@code{.vpt}) +-Enable vertical position traps if @var{flag} is non-zero, or disables +-them otherwise. Vertical position traps are traps set by the @code{wh} +-or @code{dt} requests. Traps set by the @code{it} request are not +-vertical position traps. The parameter that controls whether vertical +-position traps are enabled is global. Initially vertical position traps +-are enabled. The current setting of this is available in the +-@code{.vpt} read-only number register. +- +-Note that a page can't be ejected if @code{vpt} is set to zero. +-@endDefreq +- +-@Defreq {wh, dist [@Var{macro}]} +-Set a page location trap. Non-negative values for @var{dist} set the +-trap relative to the top of the page; negative values set the trap +-relative to the bottom of the page. Default scaling indicator is +-@samp{v}; values of @var{dist} are always rounded to be multiples of the +-vertical resolution (as given in register @code{.V}). +- +-@var{macro} is the name of the macro to execute when the trap is sprung. +-If @var{macro} is missing, remove the first trap (if any) at @var{dist}. +- +-@cindex page headers +-@cindex page footers +-@cindex headers +-@cindex footers +-The following is a simple example of how many macro packages set headers +-and footers. +- +-@Example +-.de hd \" Page header +-' sp .5i +-. tl 'Title''date' +-' sp .3i +-.. +-. +-.de fo \" Page footer +-' sp 1v +-. tl ''%'' +-' bp +-.. +-. +-.wh 0 hd \" trap at top of the page +-.wh -1i fo \" trap one inch from bottom +-@endExample +- +-A trap at or below the bottom of the page is ignored; it can be made +-active by either moving it up or increasing the page length so that the +-trap is on the page. +- +-Negative trap values always use the @emph{current} page length; they are +-not converted to an absolute vertical position: +- +-@Example +-.pl 5i +-.wh -1i xx +-.ptr +- @result{} xx -240 +-.pl 100i +-.ptr +- @result{} xx -240 +-@endExample +- +-It is possible to have more than one trap at the same location; to do +-so, the traps must be defined at different locations, then moved +-together with the @code{ch} request; otherwise the second trap would +-replace the first one. Earlier defined traps hide later defined traps +-if moved to the same position (the many empty lines caused by the +-@code{bp} request are omitted in the following example): +- +-@Example +-.de a +-. nop a +-.. +-.de b +-. nop b +-.. +-.de c +-. nop c +-.. +-. +-.wh 1i a +-.wh 2i b +-.wh 3i c +-.bp +- @result{} a b c +-@endExample +-@Example +-.ch b 1i +-.ch c 1i +-.bp +- @result{} a +-@endExample +-@Example +-.ch a 0.5i +-.bp +- @result{} a b +-@endExample +-@endDefreq +- +-@Defreg {.t} +-@cindex distance to next trap register (@code{.t}) +-@cindex trap, distance, register (@code{.t}) +-A read-only number register holding the distance to the next trap. +- +-If there are no traps between the current position and the bottom of the +-page, it contains the distance to the page bottom. In a diversion, the +-distance to the page bottom is infinite (the returned value is the +-biggest integer that can be represented in @code{groff}) if there are +-no diversion traps. +-@endDefreg +- +-@Defreq {ch, macro [@Var{dist}]} +-@cindex changing trap location (@code{ch}) +-@cindex trap, changing location (@code{ch}) +-Change the location of a trap. The first argument is the name of the +-macro to be invoked at the trap, and the second argument is the new +-location for the trap (note that the parameters are specified in +-opposite order as in the @code{wh} request). This is useful for +-building up footnotes in a diversion to allow more space at the bottom +-of the page for them. +- +-Default scaling indicator for @var{dist} is @samp{v}. If @var{dist} is +-missing, the trap is removed. +- +-@c XXX +- +-@ignore +-@Example +-... (simplified) footnote example ... +-@endExample +-@end ignore +-@endDefreq +- +-@Defreg {.ne} +-The read-only number register @code{.ne} contains the amount of space +-that was needed in the last @code{ne} request that caused a trap to be +-sprung. Useful in conjunction with the @code{.trunc} register. +-@xref{Page Control}, for more information. +- +-Since the @code{.ne} register is only set by traps it doesn't make much +-sense to use it outside of trap macros. +-@endDefreg +- +-@Defreg {.trunc} +-@cindex @code{ne} request, and the @code{.trunc} register +-@cindex truncated vertical space register (@code{.trunc}) +-A read-only register containing the amount of vertical space truncated +-by the most recently sprung vertical position trap, or, if the trap was +-sprung by an @code{ne} request, minus the amount of vertical motion +-produced by the @code{ne} request. In other words, at the point a trap +-is sprung, it represents the difference of what the vertical position +-would have been but for the trap, and what the vertical position +-actually is. +- +-Since the @code{.trunc} register is only set by traps it doesn't make +-much sense to use it outside of trap macros. +-@endDefreg +- +-@Defreg {.pe} +-@cindex @code{bp} request, and traps (@code{.pe}) +-@cindex traps, sprung by @code{bp} request (@code{.pe}) +-@cindex page ejecting register (@code{.pe}) +-A read-only register that is set to@tie{}1 while a page is ejected with +-the @code{bp} request (or by the end of input). +- +-Outside of traps this register is always zero. In the following +-example, only the second call to@tie{}@code{x} is caused by @code{bp}. +- +-@Example +-.de x +-\&.pe=\\n[.pe] +-.br +-.. +-.wh 1v x +-.wh 4v x +-A line. +-.br +-Another line. +-.br +- @result{} A line. +- .pe=0 +- Another line. +- +- .pe=1 +-@endExample +-@endDefreg +- +-@cindex diversions, and traps +-@cindex traps, and diversions +-An important fact to consider while designing macros is that diversions +-and traps do not interact normally. For example, if a trap invokes a +-header macro (while outputting a diversion) that tries to change the +-font on the current page, the effect is not visible before the diversion +-has completely been printed (except for input protected with @code{\!} +-or @code{\?}) since the data in the diversion is already formatted. In +-most cases, this is not the expected behaviour. +- +-@c --------------------------------------------------------------------- +- +-@node Diversion Traps, Input Line Traps, Page Location Traps, Traps +-@subsection Diversion Traps +-@cindex diversion traps +-@cindex traps, diversion +- +-@Defreq {dt, [@Var{dist} @Var{macro}]} +-@cindex @code{.t} register, and diversions +-@cindex setting diversion trap (@code{dt}) +-@cindex diversion trap, setting (@code{dt}) +-@cindex trap, diversion, setting (@code{dt}) +-Set a trap @emph{within} a diversion. @var{dist} is the location of the +-trap (identical to the @code{wh} request; default scaling indicator is +-@samp{v}) and @var{macro} is the name of the macro to be invoked. If +-called without arguments, the diversion trap is removed. +- +-Note that there exists only a single diversion trap. +- +-The number register @code{.t} still works within diversions. +-@xref{Diversions}, for more information. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Input Line Traps, Blank Line Traps, Diversion Traps, Traps +-@subsection Input Line Traps +-@cindex input line traps +-@cindex traps, input line +- +-@DefreqList {it, n macro} +-@DefreqListEndx {itc, n macro} +-@cindex setting input line trap (@code{it}) +-@cindex input line trap, setting (@code{it}) +-@cindex trap, input line, setting (@code{it}) +-Set an input line trap. @var{n}@tie{}is the number of lines of input +-that may be read before springing the trap, @var{macro} is the macro to +-be invoked. Request lines are not counted as input lines. +- +-For example, one possible use is to have a macro that prints the next +-@var{n}@tie{}lines in a bold font. +- +-@Example +-.de B +-. it \\$1 B-end +-. ft B +-.. +-. +-.de B-end +-. ft R +-.. +-@endExample +- +-@cindex input line traps and interrupted lines (@code{itc}) +-@cindex interrupted lines and input line traps (@code{itc}) +-@cindex traps, input line, and interrupted lines (@code{itc}) +-@cindex lines, interrupted, and input line traps (@code{itc}) +-The @code{itc} request is identical except that an interrupted text line +-(ending with @code{\c}) is not counted as a separate line. +- +-Both requests are associated with the current environment +-(@pxref{Environments}); switching to another environment disables the +-current input trap, and going back reactivates it, restoring the number +-of already processed lines. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Blank Line Traps, Leading Spaces Traps, Input Line Traps, Traps +-@subsection Blank Line Traps +-@cindex blank line traps +-@cindex traps, blank line +- +-@Defreq {blm, macro} +-@cindex blank line macro (@code{blm}) +-Set a blank line trap. @code{gtroff} executes @var{macro} when it +-encounters a blank line in the input file. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node Leading Spaces Traps, End-of-input Traps, Blank Line Traps, Traps +-@subsection Leading Spaces Traps +-@cindex leading spaces traps +-@cindex traps, leading spaces +- +-@DefreqList {lsm, macro} +-@DefregItemx {lsn} +-@DefregListEndx {lss} +-@cindex leading spaces macro (@code{lsm}) +-Set a leading spaces trap. @code{gtroff} executes @var{macro} when it +-encounters leading spaces in an input line; the implicit line break +-that normally happens in this case is suppressed. A line consisting +-of spaces only, however, is treated as an empty line, possibly subject +-to an empty line macro set with the @code{blm} request. +- +-Leading spaces are removed from the input line before calling the +-leading spaces macro. The number of removed spaces is stored in +-register @code{lsn}; the horizontal space that would be emitted if +-there was no leading space macro is stored in register @code{lss}. +-Note that @code{lsn} and @code{lss} are available even if no leading +-space macro has been set. +- +-The first thing a leading space macro sees is a token. However, some +-escapes like @code{\f} or @code{\m} are handled on the fly (see +-@ref{Gtroff Internals}, for a complete list) without creating a token +-at all. Consider that a line starts with two spaces followed by +-@code{\fIfoo}. While skipping the spaces @code{\fI} is handled too so +-that groff's current font is properly set to @samp{I}, but the leading +-space macro only sees @code{foo}, without the preceding @code{\fI}. +-If the macro should see the font escape you have to `protect' it with +-something that creates a token, for example with @code{\&\fIfoo}. +-@endDefreq +- +-@c --------------------------------------------------------------------- +- +-@node End-of-input Traps, , Leading Spaces Traps, Traps +-@subsection End-of-input Traps +-@cindex end-of-input traps +-@cindex traps, end-of-input +- +-@Defreq {em, macro} +-@cindex setting end-of-input trap (@code{em}) +-@cindex end-of-input trap, setting (@code{em}) +-@cindex trap, end-of-input, setting (@code{em}) +-@cindex end-of-input macro (@code{em}) +-@cindex macro, end-of-input (@code{em}) +-Set a trap at the end of input. @var{macro} is executed after the last +-line of the input file has been processed. +- +-For example, if the document had to have a section at the bottom of the +-last page for someone to approve it, the @code{em} request could be +-used. +- +-@Example +-.de approval +-\c +-. ne 3v +-. sp (\\n[.t]u - 3v) +-. in +4i +-. lc _ +-. br +-Approved:\t\a +-. sp +-Date:\t\t\a +-.. +-. +-.em approval +-@endExample +- +-The @code{\c} in the above example needs explanation. For historical +-reasons (and for compatibility with @acronym{AT&T} @code{troff}), the +-end macro exits as soon as it causes a page break and no remaining +-data is in the partially collected line. +- +-Let us assume that there is no @code{\c} in the above @code{approval} +-macro, and that the page is full and has been ended with, say, a +-@code{br} request. The @code{ne} request now causes the start of a new +-page, which in turn makes @code{troff} exit immediately for the reasons +-just described. In most situations this is not intended. +- +-To always force processing the whole end macro independently of this +-behaviour it is thus advisable to insert something that starts an +-empty partially filled line (@code{\c}) whenever there is a chance that +-a page break can happen. In the above example, the call of the +-@code{ne} request assures that the remaining code stays on the same +-page, so we have to insert @code{\c} only once. +- +-The next example shows how to append three lines, then starting a new +-page unconditionally. Since @w{@samp{.ne 1}} doesn't give the desired +-effect -- there is always one line available or we are already at the +-beginning of the next page -- we temporarily increase the page length +-by one line so that we can use @w{@samp{.ne 2}}. +- +-@Example +-.de EM +-.pl +1v +-\c +-.ne 2 +-line one +-.br +-\c +-.ne 2 +-line two +-.br +-\c +-.ne 2 +-line three +-.br +-.pl -1v +-\c +-'bp +-.. +-.em EM +-@endExample +- +-Note that this specific feature affects only the first potential page +-break caused by the end macro; further page breaks emitted by the end +-macro are handled normally. +- +-Another possible use of the @code{em} request is to make @code{gtroff} +-emit a single large page instead of multiple pages. For example, one +-may want to produce a long plain-text file for reading on-screen. The +-idea is to set the page length at the beginning of the document to a +-very large value to hold all the text, and automatically adjust it to +-the exact height of the document after the text has been output. +- +-@Example +-.de adjust-page-length +-. br +-. pl \\n[nl]u \" \n[nl] holds the current page length +-.. +-. +-.de single-page-mode +-. pl 99999 +-. em adjust-page-length +-.. +-. +-.\" activate the above code +-.single-page-mode +-@endExample +- +-Since only one end-of-input trap does exist and other macro packages +-may already use it, care must be taken not to break the mechanism. A +-simple solution would be to append the above macro to the macro +-package's end-of-input macro using the @code{.am} request. +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Diversions, Environments, Traps, gtroff Reference +-@section Diversions +-@cindex diversions +- +-In @code{gtroff} it is possible to @dfn{divert} text into a named +-storage area. Due to the similarity to defining macros it is sometimes +-said to be stored in a macro. This is used for saving text for output +-at a later time, which is useful for keeping blocks of text on the same +-page, footnotes, tables of contents, and indices. +- +-@cindex top-level diversion +-@cindex diversion, top-level +-For orthogonality it is said that @code{gtroff} is in the @dfn{top-level +-diversion} if no diversion is active (i.e., the data is diverted to the +-output device). +- +-Although the following requests can be used to create diversions, +-simply using an undefined diversion will cause it to be defined as empty. +-@xref{Identifiers}. +- +-@DefreqList {di, macro} +-@DefreqListEndx {da, macro} +-@cindex beginning diversion (@code{di}) +-@cindex diversion, beginning (@code{di}) +-@cindex ending diversion (@code{di}) +-@cindex diversion, ending (@code{di}) +-@cindex appending to a diversion (@code{da}) +-@cindex diversion, appending (@code{da}) +-Begin a diversion. Like the @code{de} request, it takes an argument of +-a macro name to divert subsequent text into. The @code{da} macro +-appends to an existing diversion. +- +-@code{di} or @code{da} without an argument ends the diversion. +- +-The current partially-filled line is included into the diversion. See +-the @code{box} request below for an example. Note that switching to +-another (empty) environment (with the @code{ev} request) avoids the +-inclusion of the current partially-filled line. +-@endDefreq +- +-@DefreqList {box, macro} +-@DefreqListEndx {boxa, macro} +-Begin (or append to) a diversion like the @code{di} and @code{da} +-requests. The difference is that @code{box} and @code{boxa} do not +-include a partially-filled line in the diversion. +- +-Compare this: +- +-@Example +-Before the box. +-.box xxx +-In the box. +-.br +-.box +-After the box. +-.br +- @result{} Before the box. After the box. +-.xxx +- @result{} In the box. +-@endExample +- +-@noindent +-with this: +- +-@Example +-Before the diversion. +-.di yyy +-In the diversion. +-.br +-.di +-After the diversion. +-.br +- @result{} After the diversion. +-.yyy +- @result{} Before the diversion. In the diversion. +-@endExample +- +-@code{box} or @code{boxa} without an argument ends the diversion. +-@endDefreq +- +-@DefregList {.z} +-@DefregListEndx {.d} +-@cindex @code{nl} register, and @code{.d} +-@cindex nested diversions +-@cindex diversion, nested +-@cindex diversion name register (@code{.z}) +-@cindex vertical position in diversion register (@code{.d}) +-@cindex position, vertical, in diversion, register (@code{.d}) +-@cindex diversion, vertical position in, register (@code{.d}) +-Diversions may be nested. The read-only number register @code{.z} +-contains the name of the current diversion (this is a string-valued +-register). The read-only number register @code{.d} contains the current +-vertical place in the diversion. If not in a diversion it is the same +-as register @code{nl}. +-@endDefreg +- +-@Defreg {.h} +-@cindex high-water mark register (@code{.h}) +-@cindex mark, high-water, register (@code{.h}) +-@cindex position of lowest text line (@code{.h}) +-@cindex text line, position of lowest (@code{.h}) +-The @dfn{high-water mark} on the current page. It corresponds to the +-text baseline of the lowest line on the page. This is a read-only +-register. +- +-@Example +-.tm .h==\n[.h], nl==\n[nl] +- @result{} .h==0, nl==-1 +-This is a test. +-.br +-.sp 2 +-.tm .h==\n[.h], nl==\n[nl] +- @result{} .h==40, nl==120 +-@endExample +- +-@cindex @code{.h} register, difference to @code{nl} +-@cindex @code{nl} register, difference to @code{.h} +-@noindent +-As can be seen in the previous example, empty lines are not considered +-in the return value of the @code{.h} register. +-@endDefreg +- +-@DefregList {dn} +-@DefregListEndx {dl} +-@cindex @code{dn} register, and @code{da} (@code{boxa}) +-@cindex @code{dl} register, and @code{da} (@code{boxa}) +-@cindex @code{da} request, and @code{dn} (@code{dl}) +-@cindex @code{boxa} request, and @code{dn} (@code{dl}) +-After completing a diversion, the read-write number registers @code{dn} +-and @code{dl} contain the vertical and horizontal size of the diversion. +-Note that only the just processed lines are counted: For the computation +-of @code{dn} and @code{dl}, the requests @code{da} and @code{boxa} are +-handled as if @code{di} and @code{box} had been used -- lines that have +-been already stored in a macro are not taken into account. +- +-@Example +-.\" Center text both horizontally & vertically +-. +-.\" Enclose macro definitions in .eo and .ec +-.\" to avoid the doubling of the backslash +-.eo +-.\" macro .(c starts centering mode +-.de (c +-. br +-. ev (c +-. evc 0 +-. in 0 +-. nf +-. di @@c +-.. +-@endExample +-@Example +-.\" macro .)c terminates centering mode +-.de )c +-. br +-. ev +-. di +-. nr @@s (((\n[.t]u - \n[dn]u) / 2u) - 1v) +-. sp \n[@@s]u +-. ce 1000 +-. @@c +-. ce 0 +-. sp \n[@@s]u +-. br +-. fi +-. rr @@s +-. rm @@s +-. rm @@c +-.. +-.\" End of macro definitions, restore escape mechanism +-.ec +-@endExample +-@endDefreg +- +-@DefescList {\\!, , , } +-@DefescListEndx {\\?, , anything, \\?} +-@cindex transparent output (@code{\!}, @code{\?}) +-@cindex output, transparent (@code{\!}, @code{\?}) +-Prevent requests, macros, and escapes from being interpreted when read +-into a diversion. Both escapes take the given text and +-@dfn{transparently} embed it into the diversion. This is useful for +-macros that shouldn't be invoked until the diverted text is actually +-output. +- +-The @code{\!} escape transparently embeds text up to and including the +-end of the line. The @code{\?} escape transparently embeds text until +-the next occurrence of the @code{\?} escape. Example: +- +-@Example +-\?@var{anything}\? +-@endExample +- +-@cindex @code{\?}, and copy-in mode +-@cindex copy-in mode, and @code{\?} +-@cindex mode, copy-in, and @code{\?} +-@cindex @code{\!}, and copy-in mode +-@cindex copy-in mode, and @code{\!} +-@cindex mode, copy-in, and @code{\!} +-@noindent +-@var{anything} may not contain newlines; use @code{\!} to embed +-newlines in a diversion. The escape sequence @code{\?} is also +-recognized in copy mode and turned into a single internal code; it is +-this code that terminates @var{anything}. Thus the following example +-prints@tie{}4. +- +-@Example +-.nr x 1 +-.nf +-.di d +-\?\\?\\\\?\\\\\\\\nx\\\\?\\?\? +-.di +-.nr x 2 +-.di e +-.d +-.di +-.nr x 3 +-.di f +-.e +-.di +-.nr x 4 +-.f +-@endExample +- +-Both escapes read the data in copy mode. +- +-@cindex @code{\!}, in top-level diversion +-@cindex top-level diversion, and @code{\!} +-@cindex diversion, top-level, and @code{\!} +-If @code{\!} is used in the top-level diversion, its argument is +-directly embedded into the @code{gtroff} intermediate output. This can +-be used for example to control a postprocessor that processes the data +-before it is sent to the device driver. +- +-@cindex @code{\?}, in top-level diversion +-@cindex top-level diversion, and @code{\?} +-@cindex diversion, top-level, and @code{\?} +-The @code{\?} escape used in the top-level diversion produces no output +-at all; its argument is simply ignored. +-@endDefesc +- +-@cindex @code{\!}, and @code{output} request +-@cindex @code{output} request, and @code{\!} +-@cindex @code{output} request, and copy-in mode +-@cindex copy-in mode, and @code{output} request +-@cindex mode, copy-in, and @code{output} request +-@Defreq {output, string} +-Emit @var{string} directly to the @code{gtroff} intermediate output +-(subject to copy mode interpretation); this is similar to @code{\!} used +-at the top level. An initial double quote in @var{string} is stripped +-off to allow initial blanks. +- +-This request can't be used before the first page has started -- if you +-get an error, simply insert @code{.br} before the @code{output} request. +- +-Without argument, @code{output} is ignored. +- +-Use with caution! It is normally only needed for mark-up used by a +-postprocessor that does something with the output before sending it to +-the output device, filtering out @var{string} again. +-@endDefreq +- +-@Defreq {asciify, div} +-@cindex unformatting diversions (@code{asciify}) +-@cindex diversion, unformatting (@code{asciify}) +-@cindex @code{trin} request, and @code{asciify} +-@dfn{Unformat} the diversion specified by @var{div} in such a way that +-@acronym{ASCII} characters, characters translated with the @code{trin} +-request, space characters, and some escape sequences that were formatted +-and diverted are treated like ordinary input characters when the +-diversion is reread. It can be also used for gross hacks; for example, +-the following sets register@tie{}@code{n} to@tie{}1. +- +-@Example +-.tr @@. +-.di x +-@@nr n 1 +-.br +-.di +-.tr @@@@ +-.asciify x +-.x +-@endExample +- +-Note that @code{asciify} cannot return all items in a diversion back +-to their source equivalent, nodes such as @code{\N[...]} will still +-remain as nodes, so the result cannot be guaranteed to be a pure string. +- +-@xref{Copy-in Mode}. +-@endDefreq +- +-@Defreq {unformat, div} +-Like @code{asciify}, unformat the specified diversion. However, +-@code{unformat} only unformats spaces and tabs between words. +-Unformatted tabs are treated as input tokens, and spaces are stretchable +-again. +- +-The vertical size of lines is not preserved; glyph information (font, +-font size, space width, etc.)@: is retained. +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Environments, Suppressing output, Diversions, gtroff Reference +-@section Environments +-@cindex environments +- +-It happens frequently that some text should be printed in a certain +-format regardless of what may be in effect at the time, for example, in +-a trap invoked macro to print headers and footers. To solve this +-@code{gtroff} processes text in @dfn{environments}. An environment +-contains most of the parameters that control text processing. It is +-possible to switch amongst these environments; by default @code{gtroff} +-processes text in environment@tie{}0. The following is the information +-kept in an environment. +- +-@itemize @bullet +-@item +-font parameters (size, family, style, glyph height and slant, space and +-sentence space size) +- +-@item +-page parameters (line length, title length, vertical spacing, line +-spacing, indentation, line numbering, centering, right-justifying, +-underlining, hyphenation data) +- +-@item +-fill and adjust mode +- +-@item +-tab stops, tab and leader characters, escape character, no-break and +-hyphen indicators, margin character data +- +-@item +-partially collected lines +- +-@item +-input traps +- +-@item +-drawing and fill colours +-@end itemize +- +-These environments may be given arbitrary names (see @ref{Identifiers}, +-for more info). Old versions of @code{troff} only had environments +-named @samp{0}, @samp{1}, and @samp{2}. +- +-@DefreqList {ev, [@Var{env}]} +-@DefregListEndx {.ev} +-@cindex switching environments (@code{ev}) +-@cindex environment, switching (@code{ev}) +-@cindex environment number/name register (@code{.ev}) +-Switch to another environment. The argument @var{env} is the name of +-the environment to switch to. With no argument, @code{gtroff} switches +-back to the previous environment. There is no limit on the number of +-named environments; they are created the first time that they are +-referenced. The @code{.ev} read-only register contains the name or +-number of the current environment. This is a string-valued register. +- +-Note that a call to @code{ev} (with argument) pushes the previously +-active environment onto a stack. If, say, environments @samp{foo}, +-@samp{bar}, and @samp{zap} are called (in that order), the first +-@code{ev} request without parameter switches back to environment +-@samp{bar} (which is popped off the stack), and a second call switches +-back to environment @samp{foo}. +- +-Here is an example: +- +-@Example +-.ev footnote-env +-.fam N +-.ps 6 +-.vs 8 +-.ll -.5i +-.ev +- +-... +- +-.ev footnote-env +-\(dg Note the large, friendly letters. +-.ev +-@endExample +-@endDefreq +- +-@Defreq {evc, env} +-@cindex copying environment (@code{evc}) +-@cindex environment, copying (@code{evc}) +-Copy the environment @var{env} into the current environment. +- +-The following environment data is not copied: +- +-@itemize @bullet +-@item +-Partially filled lines. +- +-@item +-The status whether the previous line was interrupted. +- +-@item +-The number of lines still to center, or to right-justify, or to +-underline (with or without underlined spaces); they are set to zero. +- +-@item +-The status whether a temporary indentation is active. +- +-@item +-Input traps and its associated data. +- +-@item +-Line numbering mode is disabled; it can be reactivated with @w{@samp{.nm +-+0}}. +- +-@item +-The number of consecutive hyphenated lines (set to zero). +-@end itemize +-@endDefreq +- +-@DefregList {.w} +-@DefregItemx {.cht} +-@DefregItemx {.cdp} +-@DefregListEndx {.csk} +-@cindex environment, dimensions of last glyph (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk}) +-@cindex width, of last glyph (@code{.w}) +-@cindex height, of last glyph (@code{.cht}) +-@cindex depth, of last glyph (@code{.cdp}) +-@cindex skew, of last glyph (@code{.csk}) +-@cindex last glyph, dimensions (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk}) +-@cindex glyph, last, dimensions (@code{.w}, @code{.cht}, @code{.cdp}, @code{.csk}) +-The @code{\n[.w]} register contains the width of the last glyph added to +-the current environment. +- +-The @code{\n[.cht]} register contains the height of the last glyph added +-to the current environment. +- +-The @code{\n[.cdp]} register contains the depth of the last glyph added +-to the current environment. It is positive for glyphs extending below +-the baseline. +- +-The @code{\n[.csk]} register contains the @dfn{skew} (how far to the +-right of the glyph's center that @code{gtroff} should place an accent) +-of the last glyph added to the current environment. +-@endDefreg +- +-@Defreg {.n} +-@cindex environment, previous line length (@code{.n}) +-@cindex line length, previous (@code{.n}) +-@cindex length of previous line (@code{.n}) +-@cindex previous line length (@code{.n}) +-The @code{\n[.n]} register contains the length of the previous output +-line in the current environment. +-@endDefreg +- +- +-@c ===================================================================== +- +-@node Suppressing output, Colors, Environments, gtroff Reference +-@section Suppressing output +- +-@Defesc {\\O, , num, } +-@cindex suppressing output (@code{\O}) +-@cindex output, suppressing (@code{\O}) +-Disable or enable output depending on the value of @var{num}: +- +-@table @samp +-@item \O0 +-Disable any glyphs from being emitted to the device driver, provided +-that the escape occurs at the outer level (see @code{\O[3]} and +-@code{\O[4]}). Motion is not suppressed so effectively @code{\O[0]} +-means @emph{pen up}. +- +-@item \O1 +-Enable output of glyphs, provided that the escape occurs at the outer +-level. +-@end table +- +-@vindex opminx +-@vindex opminy +-@vindex opmaxx +-@vindex opmaxy +-@code{\O0} and @code{\O1} also reset the four registers @samp{opminx}, +-@samp{opminy}, @samp{opmaxx}, and @samp{opmaxy} to @minus{}1. +-@xref{Register Index}. These four registers mark the top left and +-bottom right hand corners of a box that encompasses all written glyphs. +- +-For example the input text: +- +-@Example +-Hello \O[0]world \O[1]this is a test. +-@endExample +- +-@noindent +-produces the following output: +- +-@Example +-Hello this is a test. +-@endExample +- +-@table @samp +-@item \O2 +-Provided that the escape occurs at the outer level, enable output of +-glyphs and also write out to @code{stderr} the page number and four +-registers encompassing the glyphs previously written since the last call +-to @code{\O}. +- +-@item \O3 +-Begin a nesting level. At start-up, @code{gtroff} is at outer level. +-The current level is contained within the read-only register @code{.O}. +-@xref{Built-in Registers}. +- +-@item \O4 +-End a nesting level. The current level is contained within the +-read-only register @code{.O}. @xref{Built-in Registers}. +- +-@item \O[5@var{P}@var{filename}] +-This escape is @code{grohtml} specific. Provided that this escape +-occurs at the outer nesting level write the @code{filename} to +-@code{stderr}. The position of the image, @var{P}, must be specified +-and must be one of @code{l}, @code{r}, @code{c}, or@tie{}@code{i} (left, +-right, centered, inline). @var{filename} is associated with the +-production of the next inline image. +-@end table +-@endDefesc +- +- +-@c ===================================================================== +- +-@node Colors, I/O, Suppressing output, gtroff Reference +-@section Colors +-@cindex colors +- +-@DefreqList {color, [@Var{n}]} +-@DefregListEndx {.color} +-If @var{n} is missing or non-zero, activate colors (this is the +-default); otherwise, turn it off. +- +-The read-only number register @code{.color} is@tie{}1 if colors are +-active, 0@tie{}otherwise. +- +-Internally, @code{color} sets a global flag; it does not produce a +-token. Similar to the @code{cp} request, you should use it at the +-beginning of your document to control color output. +- +-Colors can be also turned off with the @option{-c} command line option. +-@endDefreq +- +-@Defreq {defcolor, ident scheme color_components} +-Define color with name @var{ident}. @var{scheme} can be one of the +-following values: @code{rgb} (three components), @code{cmy} (three +-components), @code{cmyk} (four components), and @code{gray} or +-@code{grey} (one component). +- +-@cindex default color +-@cindex color, default +-Color components can be given either as a hexadecimal string or as +-positive decimal integers in the range 0--65535. A hexadecimal string +-contains all color components concatenated. It must start with either +-@code{#} or @code{##}; the former specifies hex values in the range +-0--255 (which are internally multiplied by@tie{}257), the latter in the +-range 0--65535. Examples: @code{#FFC0CB} (pink), @code{##ffff0000ffff} +-(magenta). The default color name @c{default} can't be redefined; its +-value is device-specific (usually black). It is possible that the +-default color for @code{\m} and @code{\M} is not identical. +- +-@cindex @code{f} unit, and colors +-@cindex unit, @code{f}, and colors +-A new scaling indicator@tie{}@code{f} has been introduced, which +-multiplies its value by 65536; this makes it convenient to specify color +-components as fractions in the range 0 to@tie{}1 (1f equals 65536u). +-Example: +- +-@Example +-.defcolor darkgreen rgb 0.1f 0.5f 0.2f +-@endExample +- +-Note that @code{f} is the default scaling indicator for the +-@code{defcolor} request, thus the above statement is equivalent to +- +-@Example +-.defcolor darkgreen rgb 0.1 0.5 0.2 +-@endExample +-@endDefreq +- +-@DefreqList {gcolor, [@Var{color}]} +-@DefescItemx {\\m, , c, } +-@DefescItem {\\m, @Lparen{}, co, } +-@DefescItem {\\m, @Lbrack{}, color, @Rbrack{}} +-@DefregListEndx {.m} +-Set (glyph) drawing color. The following examples show how to turn the +-next four words red. +- +-@Example +-.gcolor red +-these are in red +-.gcolor +-and these words are in black. +-@endExample +- +-@Example +-\m[red]these are in red\m[] and these words are in black. +-@endExample +- +-The escape @code{\m[]} returns to the previous color, as does a call to +-@code{gcolor} without an argument. +- +-@cindex drawing color name register (@code{.m}) +-@cindex name, drawing color, register (@code{.m}) +-@cindex color name, drawing, register (@code{.m}) +-The name of the current drawing color is available in the read-only, +-string-valued number register @samp{.m}. +- +-The drawing color is associated with the current environment +-(@pxref{Environments}). +- +-Note that @code{\m} doesn't produce an input token in @code{gtroff}. As +-a consequence, it can be used in requests like @code{mc} (which expects +-a single character as an argument) to change the color on the fly: +- +-@Example +-.mc \m[red]x\m[] +-@endExample +-@endDefesc +- +-@DefreqList {fcolor, [@Var{color}]} +-@DefescItemx {\\M, , c, } +-@DefescItem {\\M, @Lparen{}, co, } +-@DefescItem {\\M, @Lbrack{}, color, @Rbrack{}} +-@DefregListEndx {.M} +-Set fill (background) color for filled objects drawn with the +-@code{\D'@dots{}'} commands. +- +-A red ellipse can be created with the following code: +- +-@Example +-\M[red]\h'0.5i'\D'E 2i 1i'\M[] +-@endExample +- +-The escape @code{\M[]} returns to the previous fill color, as does a +-call to @code{fcolor} without an argument. +- +-@cindex background color name register (@code{.M}) +-@cindex name, background color, register (@code{.M}) +-@cindex color name, background, register (@code{.M}) +-@cindex fill color name register (@code{.M}) +-@cindex name, fill color, register (@code{.M}) +-@cindex color name, fill, register (@code{.M}) +-The name of the current fill (background) color is available in the +-read-only, string-valued number register @samp{.M}. +- +-The fill color is associated with the current environment +-(@pxref{Environments}). +- +-Note that @code{\M} doesn't produce an input token in @code{gtroff}. +-@endDefesc +- +- +-@c ===================================================================== +- +-@node I/O, Postprocessor Access, Colors, gtroff Reference +-@section I/O +-@cindex i/o +-@cindex input and output requests +-@cindex requests for input and output +-@cindex output and input requests +- +-@code{gtroff} has several requests for including files: +- +-@Defreq {so, file} +-@cindex including a file (@code{so}) +-@cindex file, inclusion (@code{so}) +-Read in the specified @var{file} and includes it in place of the +-@code{so} request. This is quite useful for large documents, e.g.@: +-keeping each chapter in a separate file. @xref{gsoelim}, for more +-information. +- +-Since @code{gtroff} replaces the @code{so} request with the contents of +-@code{file}, it makes a difference whether the data is terminated with a +-newline or not: Assuming that file @file{xxx} contains the word +-@samp{foo} without a final newline, this +- +-@Example +-This is +-.so xxx +-bar +-@endExample +- +-@noindent +-yields @samp{This is foobar}. +- +-The search path for @var{file} can be controlled with the @option{-I} +-command line option. +-@endDefreq +- +-@Defreq {pso, command} +-Read the standard output from the specified @var{command} and includes +-it in place of the @code{pso} request. +- +-@cindex safer mode +-@cindex mode, safer +-@cindex unsafe mode +-@cindex mode, unsafe +-This request causes an error if used in safer mode (which is the +-default). Use @code{groff}'s or @code{troff}'s @option{-U} option to +-activate unsafe mode. +- +-The comment regarding a final newline for the @code{so} request is valid +-for @code{pso} also. +-@endDefreq +- +-@Defreq {mso, file} +-Identical to the @code{so} request except that @code{gtroff} searches +-for the specified @var{file} in the same directories as macro files for +-the the @option{-m} command line option. If the file name to be +-included has the form @file{@var{name}.tmac} and it isn't found, +-@code{mso} tries to include @file{tmac.@var{name}} and vice versa. +-If the file does not exist, a warning of type @samp{file} is emitted. +-@xref{Debugging}, for information about warnings. +-@endDefreq +- +-@DefreqList {trf, file} +-@DefreqListEndx {cf, file} +-@cindex transparent output (@code{cf}, @code{trf}) +-@cindex output, transparent (@code{cf}, @code{trf}) +-@cindex @code{cf} request, and copy-in mode +-@cindex copy-in mode, and @code{cf} request +-@cindex mode, copy-in, and @code{cf} request +-@cindex @code{trf} request, and copy-in mode +-@cindex copy-in mode, and @code{trf} request +-@cindex mode, copy-in, and @code{trf} request +-Transparently output the contents of @var{file}. Each line is output as +-if it were preceded by @code{\!}; however, the lines are @emph{not} +-subject to copy mode interpretation. If the file does not end with a +-newline, then a newline is added (@code{trf} only). For example, to +-define a macro@tie{}@code{x} containing the contents of +-file@tie{}@file{f}, use +- +-@Example +-.ev 1 +-.di x +-.trf f +-.di +-.ev +-@endExample +- +-@noindent +-The calls to @code{ev} prevent that the current partial input line +-becomes part of the diversion. +- +-Both @code{trf} and @code{cf}, when used in a diversion, embeds an +-object in the diversion which, when reread, causes the contents of +-@var{file} to be transparently copied through to the output. In +-@acronym{UNIX} @code{troff}, the contents of @var{file} is immediately +-copied through to the output regardless of whether there is a current +-diversion; this behaviour is so anomalous that it must be considered a +-bug. +- +-@cindex @code{trf} request, and invalid characters +-@cindex characters, invalid for @code{trf} request +-@cindex invalid characters for @code{trf} request +- +-While @code{cf} copies the contents of @var{file} completely +-unprocessed, @code{trf} disallows characters such as NUL that are not +-valid @code{gtroff} input characters (@pxref{Identifiers}). +- +-For @code{cf}, within a diversion, `completely unprocessed' means that +-each line of a file to be inserted is handled as if it were preceded by +-@code{\!\\!}. +- +-Both requests cause a line break. +-@endDefreq +- +-@Defreq {nx, [@Var{file}]} +-@cindex processing next file (@code{nx}) +-@cindex file, processing next (@code{nx}) +-@cindex next file, processing (@code{nx}) +-Force @code{gtroff} to continue processing of the file specified as an +-argument. If no argument is given, immediately jump to the end of file. +-@endDefreq +- +-@Defreq {rd, [@Var{prompt} [@Var{arg1} @Var{arg2} @dots{}]]} +-@cindex reading from standard input (@code{rd}) +-@cindex standard input, reading from (@code{rd}) +-@cindex input, standard, reading from (@code{rd}) +-Read from standard input, and include what is read as though it were +-part of the input file. Text is read until a blank line is encountered. +- +-If standard input is a TTY input device (keyboard), write @var{prompt} +-to standard error, followed by a colon (or send BEL for a beep if no +-argument is given). +- +-Arguments after @var{prompt} are available for the input. For example, +-the line +- +-@Example +-.rd data foo bar +-@endExample +- +-with the input @w{@samp{This is \$2.}} prints +- +-@Example +-This is bar. +-@endExample +-@endDefreq +- +-@cindex form letters +-@cindex letters, form +-Using the @code{nx} and @code{rd} requests, it is easy to set up form +-letters. The form letter template is constructed like this, putting the +-following lines into a file called @file{repeat.let}: +- +-@Example +-.ce +-\*(td +-.sp 2 +-.nf +-.rd +-.sp +-.rd +-.fi +-Body of letter. +-.bp +-.nx repeat.let +-@endExample +- +-@cindex @code{ex} request, used with @code{nx} and @code{rd} +-@noindent +-When this is run, a file containing the following lines should be +-redirected in. Note that requests included in this file are executed as +-though they were part of the form letter. The last block of input is +-the @code{ex} request, which tells @code{groff} to stop processing. If +-this was not there, @code{groff} would not know when to stop. +- +-@Example +-Trent A. Fisher +-708 NW 19th Av., #202 +-Portland, OR 97209 +- +-Dear Trent, +- +-Len Adollar +-4315 Sierra Vista +-San Diego, CA 92103 +- +-Dear Mr. Adollar, +- +-.ex +-@endExample +- +-@Defreq {pi, pipe} +-Pipe the output of @code{gtroff} to the shell command(s) specified by +-@var{pipe}. This request must occur before @code{gtroff} has a chance +-to print anything. +- +-@cindex safer mode +-@cindex mode, safer +-@cindex unsafe mode +-@cindex mode, unsafe +-@code{pi} causes an error if used in safer mode (which is the default). +-Use @code{groff}'s or @code{troff}'s @option{-U} option to activate +-unsafe mode. +- +-Multiple calls to @code{pi} are allowed, acting as a chain. For +-example, +- +-@Example +-.pi foo +-.pi bar +-... +-@endExample +- +-is the same as @w{@samp{.pi foo | bar}}. +- +-@cindex @code{groff}, and @code{pi} request +-@cindex @code{pi} request, and @code{groff} +-Note that the intermediate output format of @code{gtroff} is piped to +-the specified commands. Consequently, calling @code{groff} without the +-@option{-Z} option normally causes a fatal error. +-@endDefreq +- +-@DefreqList {sy, cmds} +-@DefregListEndx {systat} +-Execute the shell command(s) specified by @var{cmds}. The output is not +-saved anyplace, so it is up to the user to do so. +- +-@cindex safer mode +-@cindex mode, safer +-@cindex unsafe mode +-@cindex mode, unsafe +-This request causes an error if used in safer mode (which is the +-default). Use @code{groff}'s or @code{troff}'s @option{-U} option to +-activate unsafe mode. +- +-For example, the following code fragment introduces the current time +-into a document: +- +-@cindex time, current +-@cindex current time +-@pindex perl +-@Example +-.sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\ +- (localtime(time))[2,1,0]' > /tmp/x\n[$$] +-.so /tmp/x\n[$$] +-.sy rm /tmp/x\n[$$] +-\nH:\nM:\nS +-@endExample +- +-@noindent +-Note that this works by having the @code{perl} script (run by @code{sy}) +-print out the @code{nr} requests that set the number registers +-@code{H}, @code{M}, and @code{S}, and then reads those commands in with +-the @code{so} request. +- +-For most practical purposes, the number registers @code{seconds}, +-@code{minutes}, and @code{hours}, which are initialized at start-up of +-@code{gtroff}, should be sufficient. Use the @code{af} request to get a +-formatted output: +- +-@Example +-.af hours 00 +-.af minutes 00 +-.af seconds 00 +-\n[hours]:\n[minutes]:\n[seconds] +-@endExample +- +-@cindex @code{system()} return value register (@code{systat}) +-The @code{systat} read-write number register contains the return value +-of the @code{system()} function executed by the last @code{sy} request. +-@endDefreq +- +-@DefreqList {open, stream file} +-@DefreqListEndx {opena, stream file} +-@cindex opening file (@code{open}) +-@cindex file, opening (@code{open}) +-@cindex appending to a file (@code{opena}) +-@cindex file, appending to (@code{opena}) +-Open the specified @var{file} for writing and associates the specified +-@var{stream} with it. +- +-The @code{opena} request is like @code{open}, but if the file exists, +-append to it instead of truncating it. +- +-@cindex safer mode +-@cindex mode, safer +-@cindex unsafe mode +-@cindex mode, unsafe +-Both @code{open} and @code{opena} cause an error if used in safer mode +-(which is the default). Use @code{groff}'s or @code{troff}'s +-@option{-U} option to activate unsafe mode. +-@endDefreq +- +-@DefreqList {write, stream data} +-@DefreqListEndx {writec, stream data} +-@cindex copy-in mode, and @code{write} request +-@cindex @code{write} request, and copy-in mode +-@cindex mode, copy-in, and @code{write} request +-@cindex copy-in mode, and @code{writec} request +-@cindex @code{writec} request, and copy-in mode +-@cindex mode, copy-in, and @code{writec} request +-@cindex writing to file (@code{write}, @code{writec}) +-@cindex file, writing to (@code{write}, @code{writec}) +-Write to the file associated with the specified @var{stream}. The +-stream must previously have been the subject of an open request. The +-remainder of the line is interpreted as the @code{ds} request reads its +-second argument: A leading @samp{"} is stripped, and it is read in +-copy-in mode. +- +-The @code{writec} request is like @code{write}, but only @code{write} +-appends a newline to the data. +-@endDefreq +- +-@Defreq {writem, stream xx} +-@cindex @code{asciify} request, and @code{writem} +-Write the contents of the macro or string @var{xx} to the file +-associated with the specified @var{stream}. +- +-@cindex @code{writem} request, and copy-in mode +-@cindex copy-in mode, and @code{writem} request +-@cindex mode, copy-in, and @code{writem} request +-@var{xx} is read in copy mode, i.e., already formatted elements are +-ignored. Consequently, diversions must be unformatted with the +-@code{asciify} request before calling @code{writem}. Usually, this +-means a loss of information. +-@endDefreq +- +-@Defreq {close, stream} +-@cindex closing file (@code{close}) +-@cindex file, closing (@code{close}) +-Close the specified @var{stream}; the stream is no longer an acceptable +-argument to the @code{write} request. +- +-Here a simple macro to write an index entry. +- +-@Example +-.open idx test.idx +-. +-.de IX +-. write idx \\n[%] \\$* +-.. +-. +-.IX test entry +-. +-.close idx +-@endExample +-@endDefreq +- +-@DefescList {\\V, , e, } +-@DefescItem {\\V, @Lparen{}, ev, } +-@DefescListEnd {\\V, @Lbrack{}, env, @Rbrack{}} +-@cindex @code{\V}, and copy-in mode +-@cindex copy-in mode, and @code{\V} +-@cindex mode, copy-in, and @code{\V} +-Interpolate the contents of the specified environment variable @var{env} +-(one-character name@tie{}@var{e}, two-character name @var{ev}) as +-returned by the function @code{getenv}. @code{\V} is interpreted in +-copy-in mode. +-@endDefesc +- +- +-@c ===================================================================== +- +-@node Postprocessor Access, Miscellaneous, I/O, gtroff Reference +-@section Postprocessor Access +-@cindex postprocessor access +-@cindex access of postprocessor +- +-There are two escapes that give information directly to the +-postprocessor. This is particularly useful for embedding +-@sc{PostScript} into the final document. +- +-@DefreqList {device, xxx} +-@DefescListEndx {\\X, ', xxx, '} +-Embeds its argument into the @code{gtroff} output preceded with +-@w{@samp{x X}}. +- +-@cindex @code{\&}, in @code{\X} +-@cindex @code{\)}, in @code{\X} +-@cindex @code{\%}, in @code{\X} +-@ifnotinfo +-@cindex @code{\:}, in @code{\X} +-@end ifnotinfo +-@ifinfo +-@cindex @code{\@r{}}, in @code{\X} +-@end ifinfo +-The escapes @code{\&}, @code{\)}, @code{\%}, and @code{\:} are ignored +-within @code{\X}, @w{@samp{\ }} and @code{\~} are converted to single +-space characters. All other escapes (except @code{\\}, which produces a +-backslash) cause an error. +- +-@cindex @code{device} request, and copy-in mode +-@cindex copy-in mode, and @code{device} request +-@cindex mode, copy-in, and @code{device} request +-Contrary to @code{\X}, the @code{device} request simply processes its +-argument in copy mode (@pxref{Copy-in Mode}). +- +-@kindex use_charnames_in_special +-@pindex DESC@r{, and @code{use_charnames_in_special}} +-@cindex @code{\X}, and special characters +-If the @samp{use_charnames_in_special} keyword is set in the @file{DESC} +-file, special characters no longer cause an error; they are simply +-output verbatim. Additionally, the backslash is represented as +-@code{\\}. +- +-@samp{use_charnames_in_special} is currently used by @code{grohtml} +-only. +-@endDefesc +- +-@DefreqList {devicem, xx} +-@DefescItemx {\\Y, , n, } +-@DefescItem {\\Y, @Lparen{}, nm, } +-@DefescListEnd {\\Y, @Lbrack{}, name, @Rbrack{}} +-This is approximately equivalent to @samp{\X'\*[@var{name}]'} +-(one-character name@tie{}@var{n}, two-character name @var{nm}). +-However, the contents of the string or macro @var{name} are not +-interpreted; also it is permitted for @var{name} to have been defined as +-a macro and thus contain newlines (it is not permitted for the argument +-to @code{\X} to contain newlines). The inclusion of newlines requires +-an extension to the @acronym{UNIX} @code{troff} output format, and +-confuses drivers that do not know about this extension (@pxref{Device +-Control Commands}). +-@endDefesc +- +-@xref{Output Devices}. +- +- +-@c ===================================================================== +- +-@node Miscellaneous, Gtroff Internals, Postprocessor Access, gtroff Reference +-@section Miscellaneous +- +-This section documents parts of @code{gtroff} that cannot (yet) be +-categorized elsewhere in this manual. +- +-@Defreq {nm, [@Var{start} [@Var{inc} [@Var{space} [@Var{indent}]]]]} +-@cindex printing line numbers (@code{nm}) +-@cindex line numbers, printing (@code{nm}) +-@cindex numbers, line, printing (@code{nm}) +-Print line numbers. @var{start} is the line number of the @emph{next} +-output line. @var{inc} indicates which line numbers are printed. For +-example, the value@tie{}5 means to emit only line numbers that are +-multiples of@tie{}5; this defaults to@tie{}1. @var{space} is the space +-to be left between the number and the text; this defaults to one digit +-space. The fourth argument is the indentation of the line numbers, +-defaulting to zero. Both @var{space} and @var{indent} are given as +-multiples of digit spaces; they can be negative also. Without any +-arguments, line numbers are turned off. +- +-@code{gtroff} reserves three digit spaces for the line number (which is +-printed right-justified) plus the amount given by @var{indent}; the +-output lines are concatenated to the line numbers, separated by +-@var{space}, and @emph{without} reducing the line length. Depending on +-the value of the horizontal page offset (as set with the @code{po} +-request), line numbers that are longer than the reserved space stick +-out to the left, or the whole line is moved to the right. +- +-Parameters corresponding to missing arguments are not changed; any +-non-digit argument (to be more precise, any argument starting with a +-character valid as a delimiter for identifiers) is also treated as +-missing. +- +-If line numbering has been disabled with a call to @code{nm} without an +-argument, it can be reactivated with @samp{.nm +0}, using the previously +-active line numbering parameters. +- +-The parameters of @code{nm} are associated with the current environment +-(@pxref{Environments}). The current output line number is available in +-the number register @code{ln}. +- +-@Example +-.po 1m +-.ll 2i +-This test shows how line numbering works with groff. +-.nm 999 +-This test shows how line numbering works with groff. +-.br +-.nm xxx 3 2 +-.ll -\w'0'u +-This test shows how line numbering works with groff. +-.nn 2 +-This test shows how line numbering works with groff. +-@endExample +- +-@noindent +-And here the result: +- +-@Example +- This test shows how +- line numbering works +- 999 with groff. This +-1000 test shows how line +-1001 numbering works with +-1002 groff. +- This test shows how +- line numbering +- works with groff. +- This test shows how +-1005 line numbering +- works with groff. +-@endExample +-@endDefreq +- +-@Defreq {nn, [@Var{skip}]} +-Temporarily turn off line numbering. The argument is the number of +-lines not to be numbered; this defaults to@tie{}1. +-@endDefreq +- +-@Defreq {mc, glyph [@Var{dist}]} +-@cindex margin glyph (@code{mc}) +-@cindex glyph, for margins (@code{mc}) +-Print a @dfn{margin character} to the right of the +-text.@footnote{@dfn{Margin character} is a misnomer since it is an +-output glyph.} The first argument is the glyph to be printed. The +-second argument is the distance away from the right margin. If missing, +-the previously set value is used; default is 10@dmn{pt}). For text +-lines that are too long (that is, longer than the text length plus +-@var{dist}), the margin character is directly appended to the lines. +- +-With no arguments the margin character is turned off. If this occurs +-before a break, no margin character is printed. +- +-For compatibility with @acronym{AT&T} @code{troff}, a call to @code{mc} +-to set the margin character can't be undone immediately; at least one +-line gets a margin character. Thus +- +-@Example +-.ll 1i +-.mc \[br] +-.mc +-xxx +-.br +-xxx +-@endExample +- +-@noindent +-produces +- +-@Example +-xxx | +-xxx +-@endExample +- +-@cindex @code{tl} request, and @code{mc} +-For empty lines and lines produced by the @code{tl} request no margin +-character is emitted. +- +-The margin character is associated with the current environment +-(@pxref{Environments}). +- +-@pindex nrchbar +-@pindex changebar +-This is quite useful for indicating text that has changed, and, in fact, +-there are programs available for doing this (they are called +-@code{nrchbar} and @code{changebar} and can be found in any +-@samp{comp.sources.unix} archive). +- +-@Example +-.ll 3i +-.mc | +-This paragraph is highlighted with a margin +-character. +-.sp +-Note that vertical space isn't marked. +-.br +-\& +-.br +-But we can fake it with `\&'. +-@endExample +- +-Result: +- +-@Example +-This paragraph is highlighted | +-with a margin character. | +- +-Note that vertical space isn't | +-marked. | +- | +-But we can fake it with `\&'. | +-@endExample +-@endDefreq +- +-@DefreqList {psbb, filename} +-@DefregItemx {llx} +-@DefregItemx {lly} +-@DefregItemx {urx} +-@DefregListEndx {ury} +-@cindex PostScript, bounding box +-@cindex bounding box +-Retrieve the bounding box of the @sc{PostScript} image found in +-@var{filename}. The file must conform to Adobe's @dfn{Document +-Structuring Conventions} (DSC); the command searches for a +-@code{%%BoundingBox} comment and extracts the bounding box values into +-the number registers @code{llx}, @code{lly}, @code{urx}, and @code{ury}. +-If an error occurs (for example, @code{psbb} cannot find the +-@code{%%BoundingBox} comment), it sets the four number registers to +-zero. +- +-The search path for @var{filename} can be controlled with the +-@option{-I} command line option. +-@endDefreq +- +- +-@c ===================================================================== +- +-@node Gtroff Internals, Debugging, Miscellaneous, gtroff Reference +-@section @code{gtroff} Internals +- +-@cindex input token +-@cindex token, input +-@cindex output node +-@cindex node, output +-@code{gtroff} processes input in three steps. One or more input +-characters are converted to an @dfn{input token}.@footnote{Except the +-escapes @code{\f}, @code{\F}, @code{\H}, @code{\m}, @code{\M}, +-@code{\R}, @code{\s}, and @code{\S}, which are processed immediately if +-not in copy-in mode.} Then, one or more input tokens are converted to +-an @dfn{output node}. Finally, output nodes are converted to the +-intermediate output language understood by all output devices. +- +-Actually, before step one happens, @code{gtroff} converts certain escape +-sequences into reserved input characters (not accessible by the user); +-such reserved characters are used for other internal processing also -- +-this is the very reason why not all characters are valid input. +-@xref{Identifiers}, for more on this topic. +- +-For example, the input string @samp{fi\[:u]} is converted into a +-character token @samp{f}, a character token @samp{i}, and a special +-token @samp{:u} (representing u@tie{}umlaut). Later on, the character +-tokens @samp{f} and @samp{i} are merged to a single output node +-representing the ligature glyph @samp{fi} (provided the current font has +-a glyph for this ligature); the same happens with @samp{:u}. All output +-glyph nodes are `processed', which means that they are invariably +-associated with a given font, font size, advance width, etc. During the +-formatting process, @code{gtroff} itself adds various nodes to control +-the data flow. +- +-Macros, diversions, and strings collect elements in two chained lists: a +-list of input tokens that have been passed unprocessed, and a list of +-output nodes. Consider the following the diversion. +- +-@Example +-.di xxx +-a +-\!b +-c +-.br +-.di +-@endExample +- +-@noindent +-It contains these elements. +- +-@multitable {@i{vertical size node}} {token list} {element number} +-@item node list @tab token list @tab element number +- +-@item @i{line start node} @tab --- @tab 1 +-@item @i{glyph node @code{a}} @tab --- @tab 2 +-@item @i{word space node} @tab --- @tab 3 +-@item --- @tab @code{b} @tab 4 +-@item --- @tab @code{\n} @tab 5 +-@item @i{glyph node @code{c}} @tab --- @tab 6 +-@item @i{vertical size node} @tab --- @tab 7 +-@item @i{vertical size node} @tab --- @tab 8 +-@item --- @tab @code{\n} @tab 9 +-@end multitable +- +-@cindex @code{\v}, internal representation +-@noindent +-Elements 1, 7, and@tie{}8 are inserted by @code{gtroff}; the latter two +-(which are always present) specify the vertical extent of the last line, +-possibly modified by @code{\x}. The @code{br} request finishes the +-current partial line, inserting a newline input token, which is +-subsequently converted to a space when the diversion is reread. Note +-that the word space node has a fixed width that isn't stretchable +-anymore. To convert horizontal space nodes back to input tokens, use +-the @code{unformat} request. +- +-Macros only contain elements in the token list (and the node list is +-empty); diversions and strings can contain elements in both lists. +- +-Note that the @code{chop} request simply reduces the number of elements +-in a macro, string, or diversion by one. Exceptions are +-@dfn{compatibility save} and @dfn{compatibility ignore} input tokens, +-which are ignored. The @code{substring} request also ignores those +-input tokens. +- +-Some requests like @code{tr} or @code{cflags} work on glyph identifiers +-only; this means that the associated glyph can be changed without +-destroying this association. This can be very helpful for substituting +-glyphs. In the following example, we assume that glyph @samp{foo} isn't +-available by default, so we provide a substitution using the +-@code{fchar} request and map it to input character @samp{x}. +- +-@Example +-.fchar \[foo] foo +-.tr x \[foo] +-@endExample +- +-@noindent +-Now let us assume that we install an additional special font @samp{bar} +-that has glyph @samp{foo}. +- +-@Example +-.special bar +-.rchar \[foo] +-@endExample +- +-@noindent +-Since glyphs defined with @code{fchar} are searched before glyphs in +-special fonts, we must call @code{rchar} to remove the definition of the +-fallback glyph. Anyway, the translation is still active; @samp{x} now +-maps to the real glyph @samp{foo}. +- +-@cindex compatibility mode, and parameters +-@cindex mode, compatibility, and parameters +-@cindex arguments, and compatibility mode +-@cindex parameters, and compatibility mode +-@cindex macro arguments, and compatibility mode +-@cindex request arguments, and compatibility mode +-Macro and request arguments preserve the compatibility mode: +- +-@Example +-.cp 1 \" switch to compatibility mode +-.de xx +-\\$1 +-.. +-.cp 0 \" switch compatibility mode off +-.xx caf\['e] +- @result{} caf +-@endExample +- +-@noindent +-Since compatibility mode is on while @code{de} is called, the macro +-@code{xx} activates compatibility mode while executing. Argument +-@code{$1} can still be handled properly because it inherits the +-compatibility mode status which was active at the point where @code{xx} +-is called. +- +-After expansion of the parameters, the compatibility save and restore +-tokens are removed. +- +- +-@c ===================================================================== +- +-@node Debugging, Implementation Differences, Gtroff Internals, gtroff Reference +-@section Debugging +-@cindex debugging +- +-@code{gtroff} is not easy to debug, but there are some useful features +-and strategies for debugging. +- +-@Defreq {lf, line [@Var{filename}]} +-@pindex soelim +-@cindex multi-file documents +-@cindex documents, multi-file +-@cindex setting input line number (@code{lf}) +-@cindex input line number, setting (@code{lf}) +-@cindex number, input line, setting (@code{lf}) +-Change the line number and optionally the file name @code{gtroff} shall +-use for error and warning messages. @var{line} is the input line number +-of the @emph{next} line. +- +-Without argument, the request is ignored. +- +-This is a debugging aid for documents that are split into many files, +-then put together with @code{soelim} and other preprocessors. Usually, +-it isn't invoked manually. +- +-Note that other @code{troff} implementations (including the original +-@acronym{AT&T} version) handle @code{lf} differently. For them, +-@var{line} changes the line number of the @emph{current} line. +-@endDefreq +- +-@DefreqList {tm, string} +-@DefreqItemx {tm1, string} +-@DefreqListEndx {tmc, string} +-@cindex printing to stderr (@code{tm}, @code{tm1}, @code{tmc}) +-@cindex stderr, printing to (@code{tm}, @code{tm1}, @code{tmc}) +-Send @var{string} to the standard error output; this is very useful for +-printing debugging messages among other things. +- +-@cindex @code{tm} request, and copy-in mode +-@cindex copy-in mode, and @code{tm} request +-@cindex mode, copy-in, and @code{tm} request +-@cindex @code{tm1} request, and copy-in mode +-@cindex copy-in mode, and @code{tm1} request +-@cindex mode, copy-in, and @code{tm1} request +-@cindex @code{tmc} request, and copy-in mode +-@cindex copy-in mode, and @code{tmc} request +-@cindex mode, copy-in, and @code{tmc} request +-@var{string} is read in copy mode. +- +-The @code{tm} request ignores leading spaces of @var{string}; @code{tm1} +-handles its argument similar to the @code{ds} request: a leading double +-quote in @var{string} is stripped to allow initial blanks. +- +-The @code{tmc} request is similar to @code{tm1} but does not append a +-newline (as is done in @code{tm} and @code{tm1}). +-@endDefreq +- +-@Defreq {ab, [@Var{string}]} +-@cindex aborting (@code{ab}) +-Similar to the @code{tm} request, except that it causes @code{gtroff} to +-stop processing. With no argument it prints @samp{User Abort.} to +-standard error. +-@endDefreq +- +-@Defreq {ex, } +-@cindex @code{ex} request, use in debugging +-@cindex exiting (@code{ex}) +-The @code{ex} request also causes @code{gtroff} to stop processing; see +-also @ref{I/O}. +-@endDefreq +- +-When doing something involved it is useful to leave the debugging +-statements in the code and have them turned on by a command line flag. +- +-@Example +-.if \n(DB .tm debugging output +-@endExample +- +-@noindent +-To activate these statements say +- +-@Example +-groff -rDB=1 file +-@endExample +- +-If it is known in advance that there are many errors and no useful +-output, @code{gtroff} can be forced to suppress formatted output with +-the @option{-z} flag. +- +-@Defreq {pev, } +-@cindex dumping environments (@code{pev}) +-@cindex environments, dumping (@code{pev}) +-Print the contents of the current environment and all the currently +-defined environments (both named and numbered) on @code{stderr}. +-@endDefreq +- +-@Defreq {pm, } +-@cindex dumping symbol table (@code{pm}) +-@cindex symbol table, dumping (@code{pm}) +-Print the entire symbol table on @code{stderr}. Names of all defined +-macros, strings, and diversions are print together with their size in +-bytes. Since @code{gtroff} sometimes adds nodes by itself, the returned +-size can be larger than expected. +- +-This request differs from @acronym{UNIX} @code{troff}: @code{gtroff} +-reports the sizes of diversions, ignores an additional argument to print +-only the total of the sizes, and the size isn't returned in blocks of +-128 characters. +-@endDefreq +- +-@Defreq {pnr, } +-@cindex dumping number registers (@code{pnr}) +-@cindex number registers, dumping (@code{pnr}) +-Print the names and contents of all currently defined number registers +-on @code{stderr}. +-@endDefreq +- +-@Defreq {ptr, } +-@cindex dumping traps (@code{ptr}) +-@cindex traps, dumping (@code{ptr}) +-Print the names and positions of all traps (not including input line +-traps and diversion traps) on @code{stderr}. Empty slots in the page +-trap list are printed as well, because they can affect the priority of +-subsequently planted traps. +-@endDefreq +- +-@Defreq {fl, } +-@cindex flush output (@code{fl}) +-@cindex output, flush (@code{fl}) +-@cindex interactive use of @code{gtroff} +-@cindex @code{gtroff}, interactive use +-Instruct @code{gtroff} to flush its output immediately. The intent is +-for interactive use, but this behaviour is currently not implemented in +-@code{gtroff}. Contrary to @acronym{UNIX} @code{troff}, TTY output is +-sent to a device driver also (@code{grotty}), making it non-trivial to +-communicate interactively. +- +-This request causes a line break. +-@endDefreq +- +-@Defreq {backtrace, } +-@cindex backtrace of input stack (@code{backtrace}) +-@cindex input stack, backtrace (@code{backtrace}) +-Print a backtrace of the input stack to the standard error stream. +- +-Consider the following in file @file{test}: +- +-@Example +-.de xxx +-. backtrace +-.. +-.de yyy +-. xxx +-.. +-. +-.yyy +-@endExample +- +-@noindent +-On execution, @code{gtroff} prints the following: +- +-@Example +-test:2: backtrace: macro `xxx' +-test:5: backtrace: macro `yyy' +-test:8: backtrace: file `test' +-@endExample +- +-The option @option{-b} of @code{gtroff} internally calls a variant of +-this request on each error and warning. +-@endDefreq +- +-@Defreg {slimit} +-@cindex input stack, setting limit +-Use the @code{slimit} number register to set the maximum number of +-objects on the input stack. If @code{slimit} is less than or equal +-to@tie{}0, there is no limit set. With no limit, a buggy recursive +-macro can exhaust virtual memory. +- +-The default value is 1000; this is a compile-time constant. +-@endDefreg +- +-@Defreq {warnscale, si} +-Set the scaling indicator used in warnings to @var{si}. Valid values +-for @var{si} are @samp{u}, @samp{i}, @samp{c}, @samp{p}, and @samp{P}. +-At startup, it is set to @samp{i}. +-@endDefreq +- +-@Defreq {spreadwarn, [@Var{limit}]} +-Make @code{gtroff} emit a warning if the additional space inserted for +-each space between words in an output line is larger or equal to +-@var{limit}. A negative value is changed to zero; no argument toggles +-the warning on and off without changing @var{limit}. The default +-scaling indicator is @samp{m}. At startup, @code{spreadwarn} is +-deactivated, and @var{limit} is set to 3@dmn{m}. +- +-For example, +- +-@Example +-.spreadwarn 0.2m +-@endExample +- +-@noindent +-causes a warning if @code{gtroff} must add 0.2@dmn{m} or more for each +-interword space in a line. +- +-This request is active only if text is justified to both margins (using +-@w{@samp{.ad b}}). +-@endDefreq +- +-@cindex warnings +-@code{gtroff} has command line options for printing out more warnings +-(@option{-w}) and for printing backtraces (@option{-b}) when a warning +-or an error occurs. The most verbose level of warnings is @option{-ww}. +- +-@DefreqList {warn, [@Var{flags}]} +-@DefregListEndx {.warn} +-@cindex level of warnings (@code{warn}) +-@cindex warnings, level (@code{warn}) +-Control the level of warnings checked for. The @var{flags} are the sum +-of the numbers associated with each warning that is to be enabled; all +-other warnings are disabled. The number associated with each warning is +-listed below. For example, @w{@code{.warn 0}} disables all warnings, +-and @w{@code{.warn 1}} disables all warnings except that about missing +-glyphs. If no argument is given, all warnings are enabled. +- +-The read-only number register @code{.warn} contains the current warning +-level. +-@endDefreq +- +-@menu +-* Warnings:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Warnings, , Debugging, Debugging +-@subsection Warnings +-@cindex warnings +- +-The warnings that can be given to @code{gtroff} are divided into the +-following categories. The name associated with each warning is used by +-the @option{-w} and @option{-W} options; the number is used by the +-@code{warn} request and by the @code{.warn} register. +- +-@table @samp +-@item char +-@itemx 1 +-Non-existent glyphs.@footnote{@code{char} is a misnomer since it reports +-missing glyphs -- there aren't missing input characters, only invalid +-ones.} This is enabled by default. +- +-@item number +-@itemx 2 +-Invalid numeric expressions. This is enabled by default. +-@xref{Expressions}. +- +-@item break +-@itemx 4 +-@cindex fill mode +-@cindex mode, fill +-In fill mode, lines that could not be broken so that their length was +-less than the line length. This is enabled by default. +- +-@item delim +-@itemx 8 +-Missing or mismatched closing delimiters. +- +-@item el +-@itemx 16 +-@cindex @code{ie} request, and warnings +-@cindex @code{el} request, and warnings +-Use of the @code{el} request with no matching @code{ie} request. +-@xref{if-else}. +- +-@item scale +-@itemx 32 +-Meaningless scaling indicators. +- +-@item range +-@itemx 64 +-Out of range arguments. +- +-@item syntax +-@itemx 128 +-Dubious syntax in numeric expressions. +- +-@item di +-@itemx 256 +-@cindex @code{di} request, and warnings +-@cindex @code{da} request, and warnings +-Use of @code{di} or @code{da} without an argument when there is no +-current diversion. +- +-@item mac +-@itemx 512 +-@cindex @code{de}, @code{de1}, @code{dei} requests, and warnings +-@cindex @code{am}, @code{am1}, @code{ami} requests, and warnings +-@cindex @code{ds}, @code{ds1} requests, and warnings +-@cindex @code{as}, @code{as1} requests, and warnings +-@cindex @code{di} request, and warnings +-@cindex @code{da} request, and warnings +-@cindex @code{box}, @code{boxa} requests, and warnings +-@cindex @code{\*}, and warnings +-Use of undefined strings, macros and diversions. When an undefined +-string, macro, or diversion is used, that string is automatically +-defined as empty. So, in most cases, at most one warning is given for +-each name. +- +-@item reg +-@itemx 1024 +-@cindex @code{nr} request, and warnings +-@cindex @code{\R}, and warnings +-@cindex @code{\n}, and warnings +-Use of undefined number registers. When an undefined number register is +-used, that register is automatically defined to have a value of@tie{}0. +-So, in most cases, at most one warning is given for use of a particular +-name. +- +-@item tab +-@itemx 2048 +-@cindex @code{\t}, and warnings +-Use of a tab character where a number was expected. +- +-@item right-brace +-@itemx 4096 +-@cindex @code{\@}}, and warnings +-Use of @code{\@}} where a number was expected. +- +-@item missing +-@itemx 8192 +-Requests that are missing non-optional arguments. +- +-@item input +-@itemx 16384 +-Invalid input characters. +- +-@item escape +-@itemx 32768 +-Unrecognized escape sequences. When an unrecognized escape sequence +-@code{\@var{X}} is encountered, the escape character is ignored, and +-@var{X} is printed. +- +-@item space +-@itemx 65536 +-@cindex compatibility mode +-Missing space between a request or macro and its argument. This warning +-is given when an undefined name longer than two characters is +-encountered, and the first two characters of the name make a defined +-name. The request or macro is not invoked. When this warning is given, +-no macro is automatically defined. This is enabled by default. This +-warning never occurs in compatibility mode. +- +-@item font +-@itemx 131072 +-Non-existent fonts. This is enabled by default. +- +-@item ig +-@itemx 262144 +-Invalid escapes in text ignored with the @code{ig} request. These are +-conditions that are errors when they do not occur in ignored text. +- +-@item color +-@itemx 524288 +-Color related warnings. +- +-@item file +-@itemx 1048576 +-Missing files. The @code{mso} request gives this warning when the +-requested macro file does not exist. This is enabled by default. +- +-@item all +-All warnings except @samp{di}, @samp{mac} and @samp{reg}. It is +-intended that this covers all warnings that are useful with traditional +-macro packages. +- +-@item w +-All warnings. +-@end table +- +- +-@c ===================================================================== +- +-@node Implementation Differences, , Debugging, gtroff Reference +-@section Implementation Differences +-@cindex implementation differences +-@cindex differences in implementation +-@cindex incompatibilities with @acronym{AT&T} @code{troff} +-@cindex compatibility mode +-@cindex mode, compatibility +- +-GNU @code{troff} has a number of features that cause incompatibilities +-with documents written with old versions of @code{troff}. +- +-@cindex long names +-@cindex names, long +-Long names cause some incompatibilities. @acronym{UNIX} @code{troff} +-interprets +- +-@Example +-.dsabcd +-@endExample +- +-@cindex @code{\*}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\n}, incompatibilities with @acronym{AT&T} @code{troff} +-@noindent +-as defining a string @samp{ab} with contents @samp{cd}. Normally, GNU +-@code{troff} interprets this as a call of a macro named @code{dsabcd}. +-Also @acronym{UNIX} @code{troff} interprets @code{\*[} or @code{\n[} as +-references to a string or number register called @samp{[}. In GNU +-@code{troff}, however, this is normally interpreted as the start of a +-long name. In compatibility mode GNU @code{troff} interprets long names +-in the traditional way (which means that they are not recognized as +-names). +- +-@DefreqList {cp, [@Var{n}]} +-@DefreqItemx {do, cmd} +-@DefregListEndx {.C} +-If @var{n} is missing or non-zero, turn on compatibility mode; +-otherwise, turn it off. +- +-The read-only number register @code{.C} is@tie{}1 if compatibility mode +-is on, 0@tie{}otherwise. +- +-Compatibility mode can be also turned on with the @option{-C} command +-line option. +- +-The @code{do} request turns off compatibility mode while executing its +-arguments as a @code{gtroff} command. However, it does not turn off +-compatibility mode while processing the macro itself. To do that, use +-the @code{de1} request (or manipulate the @code{.C} register manually). +-@xref{Writing Macros}. +- +-@Example +-.do fam T +-@endExample +- +-@noindent +-executes the @code{fam} request when compatibility mode is enabled. +- +-@code{gtroff} restores the previous compatibility setting before +-interpreting any files sourced by the @var{cmd}. +-@endDefreq +- +-@cindex input level in delimited arguments +-@cindex delimited arguments, incompatibilities with @acronym{AT&T} @code{troff} +-Two other features are controlled by @option{-C}. If not in +-compatibility mode, GNU @code{troff} preserves the input level in +-delimited arguments: +- +-@Example +-.ds xx ' +-\w'abc\*(xxdef' +-@endExample +- +-@noindent +-In compatibility mode, the string @samp{72def'} is returned; without +-@option{-C} the resulting string is @samp{168} (assuming a TTY output +-device). +- +-@cindex @code{\f}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\H}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\s}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\S}, incompatibilities with @acronym{AT&T} @code{troff} +-Finally, the escapes @code{\f}, @code{\H}, @code{\m}, @code{\M}, +-@code{\R}, @code{\s}, and @code{\S} are transparent for recognizing the +-beginning of a line only in compatibility mode (this is a rather obscure +-feature). For example, the code +- +-@Example +-.de xx +-Hallo! +-.. +-\fB.xx\fP +-@endExample +- +-@noindent +-prints @samp{Hallo!} in bold face if in compatibility mode, and +-@samp{.xx} in bold face otherwise. +- +-@cindex @code{\A}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\|}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\^}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\&}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\@{}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\@}}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\@key{SP}}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\'}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\`}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\-}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\_}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\!}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\%}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\c}, incompatibilities with @acronym{AT&T} @code{troff} +-GNU @code{troff} does not allow the use of the escape sequences +-@code{\|}, @code{\^}, @code{\&}, @code{\@{}, @code{\@}}, +-@code{\@key{SP}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, +-@code{\%}, and @code{\c} in names of strings, macros, diversions, number +-registers, fonts or environments; @acronym{UNIX} @code{troff} does. The +-@code{\A} escape sequence (@pxref{Identifiers}) may be helpful in +-avoiding use of these escape sequences in names. +- +-@cindex fractional point sizes +-@cindex fractional type sizes +-@cindex point sizes, fractional +-@cindex type sizes, fractional +-@cindex sizes, fractional +-@cindex @code{ps} request, incompatibilities with @acronym{AT&T} @code{troff} +-Fractional point sizes cause one noteworthy incompatibility. In +-@acronym{UNIX} @code{troff} the @code{ps} request ignores scale +-indicators and thus +- +-@Example +-.ps 10u +-@endExample +- +-@noindent +-sets the point size to 10@tie{}points, whereas in GNU @code{troff} it +-sets the point size to 10@tie{}scaled points. @xref{Fractional Type +-Sizes}, for more information. +- +-@cindex @code{bd} request, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{cs} request, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{tr} request, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{fp} request, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex input characters and output glyphs, compatibility with @acronym{AT&T} @code{troff} +-@cindex output glyphs, and input characters,compatibility with @acronym{AT&T} @code{troff} +-@cindex characters, input, and output glyphs, compatibility with @acronym{AT&T} @code{troff} +-@cindex glyphs, output, and input characters, compatibility with @acronym{AT&T} @code{troff} +-In GNU @code{troff} there is a fundamental difference between +-(unformatted) input characters and (formatted) output glyphs. +-Everything that affects how a glyph is output is stored with the glyph +-node; once a glyph node has been constructed it is unaffected by any +-subsequent requests that are executed, including @code{bd}, @code{cs}, +-@code{tkf}, @code{tr}, or @code{fp} requests. Normally glyphs are +-constructed from input characters at the moment immediately before the +-glyph is added to the current output line. Macros, diversions and +-strings are all, in fact, the same type of object; they contain lists of +-input characters and glyph nodes in any combination. A glyph node does +-not behave like an input character for the purposes of macro processing; +-it does not inherit any of the special properties that the input +-character from which it was constructed might have had. For example, +- +-@Example +-.di x +-\\\\ +-.br +-.di +-.x +-@endExample +- +-@cindex printing backslash (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) +-@cindex backslash, printing (@code{\\}, @code{\e}, @code{\E}, @code{\[rs]}) +-@cindex @code{\e}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\!}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex @code{\?}, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex transparent output, incompatibilities with @acronym{AT&T} @code{troff} +-@cindex output, transparent, incompatibilities with @acronym{AT&T} @code{troff} +-@noindent +-prints @samp{\\} in GNU @code{troff}; each pair of input backslashes is +-turned into one output backslash and the resulting output backslashes +-are not interpreted as escape characters when they are reread. +-@acronym{UNIX} @code{troff} would interpret them as escape characters +-when they were reread and would end up printing one @samp{\}. The +-correct way to obtain a printable backslash is to use the @code{\e} +-escape sequence: This always prints a single instance of the current +-escape character, regardless of whether or not it is used in a +-diversion; it also works in both GNU @code{troff} and @acronym{UNIX} +-@code{troff}.@footnote{To be completely independent of the current +-escape character, use @code{\(rs}, which represents a reverse solidus +-(backslash) glyph.} To store, for some reason, an escape sequence in a +-diversion that is interpreted when the diversion is reread, either use +-the traditional @code{\!} transparent output facility, or, if this is +-unsuitable, the new @code{\?} escape sequence. +- +-@xref{Diversions}, and @ref{Gtroff Internals}, for more information. +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Preprocessors, Output Devices, gtroff Reference, Top +-@chapter Preprocessors +-@cindex preprocessors +- +-This chapter describes all preprocessors that come with @code{groff} or +-which are freely available. +- +-@menu +-* geqn:: +-* gtbl:: +-* gpic:: +-* ggrn:: +-* grap:: +-* gchem:: +-* grefer:: +-* gsoelim:: +-* preconv:: +-@end menu +- +- +-@c ===================================================================== +- +-@node geqn, gtbl, Preprocessors, Preprocessors +-@section @code{geqn} +-@cindex @code{eqn}, the program +-@cindex @code{geqn}, the program +- +-@c XXX +- +-@menu +-* Invoking geqn:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking geqn, , geqn, geqn +-@subsection Invoking @code{geqn} +-@cindex invoking @code{geqn} +-@cindex @code{geqn}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node gtbl, gpic, geqn, Preprocessors +-@section @code{gtbl} +-@cindex @code{tbl}, the program +-@cindex @code{gtbl}, the program +- +-@c XXX +- +-@menu +-* Invoking gtbl:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking gtbl, , gtbl, gtbl +-@subsection Invoking @code{gtbl} +-@cindex invoking @code{gtbl} +-@cindex @code{gtbl}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node gpic, ggrn, gtbl, Preprocessors +-@section @code{gpic} +-@cindex @code{pic}, the program +-@cindex @code{gpic}, the program +- +-@c XXX +- +-@menu +-* Invoking gpic:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking gpic, , gpic, gpic +-@subsection Invoking @code{gpic} +-@cindex invoking @code{gpic} +-@cindex @code{gpic}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node ggrn, grap, gpic, Preprocessors +-@section @code{ggrn} +-@cindex @code{grn}, the program +-@cindex @code{ggrn}, the program +- +-@c XXX +- +-@menu +-* Invoking ggrn:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking ggrn, , ggrn, ggrn +-@subsection Invoking @code{ggrn} +-@cindex invoking @code{ggrn} +-@cindex @code{ggrn}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node grap, gchem, ggrn, Preprocessors +-@section @code{grap} +-@cindex @code{grap}, the program +- +-A free implementation of @code{grap}, written by Ted Faber, +-is available as an extra package from the following address: +- +-@display +-@uref{http://www.lunabase.org/~faber/Vault/software/grap/} +-@end display +- +- +-@c ===================================================================== +- +-@node gchem, grefer, grap, Preprocessors +-@section @code{gchem} +-@cindex @code{chem}, the program +-@cindex @code{gchem}, the program +- +-@c XXX +- +-@menu +-* Invoking gchem:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking gchem, , gchem, gchem +-@subsection Invoking @code{gchem} +-@cindex invoking @code{gchem} +-@cindex @code{gchem}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node grefer, gsoelim, gchem, Preprocessors +-@section @code{grefer} +-@cindex @code{refer}, the program +-@cindex @code{grefer}, the program +- +-@c XXX +- +-@menu +-* Invoking grefer:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grefer, , grefer, grefer +-@subsection Invoking @code{grefer} +-@cindex invoking @code{grefer} +-@cindex @code{grefer}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node gsoelim, preconv, grefer, Preprocessors +-@section @code{gsoelim} +-@cindex @code{soelim}, the program +-@cindex @code{gsoelim}, the program +- +-@c XXX +- +-@menu +-* Invoking gsoelim:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking gsoelim, , gsoelim, gsoelim +-@subsection Invoking @code{gsoelim} +-@cindex invoking @code{gsoelim} +-@cindex @code{gsoelim}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +- +-@node preconv, , gsoelim, Preprocessors +-@section @code{preconv} +-@cindex @code{preconv}, the program +- +-@c XXX +- +-@menu +-* Invoking preconv:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking preconv, , preconv, preconv +-@subsection Invoking @code{preconv} +-@cindex invoking @code{preconv} +-@cindex @code{preconv}, invoking +- +-@c XXX +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Output Devices, File formats, Preprocessors, Top +-@chapter Output Devices +-@cindex output devices +-@cindex devices for output +- +-@c XXX +- +-@menu +-* Special Characters:: +-* grotty:: +-* grops:: +-* gropdf:: +-* grodvi:: +-* grolj4:: +-* grolbp:: +-* grohtml:: +-* gxditview:: +-@end menu +- +- +-@c ===================================================================== +- +-@node Special Characters, grotty, Output Devices, Output Devices +-@section Special Characters +-@cindex special characters +-@cindex characters, special +- +-@c XXX +- +-@xref{Font Files}. +- +- +-@c ===================================================================== +- +-@node grotty, grops, Special Characters, Output Devices +-@section @code{grotty} +-@cindex @code{grotty}, the program +- +-The postprocessor @code{grotty} translates the output from GNU +-@code{troff} into a form suitable for typewriter-like devices. It is +-fully documented on its manual page, @cite{grotty(1)}. +- +-@menu +-* Invoking grotty:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grotty, , grotty, grotty +-@subsection Invoking @code{grotty} +-@cindex invoking @code{grotty} +-@cindex @code{grotty}, invoking +- +-The postprocessor @command{grotty} accepts the following command-line +-options: +- +-@table @option +-@item -b +-Do not overstrike bold glyphs. Ignored if @option{-c} isn't used. +- +-@item -B +-Do not underline bold-italic glyphs. Ignored if @option{-c} isn't +-used. +- +-@item -c +-Use overprint and disable colours for printing on legacy Teletype +-printers (see below). +- +-@item -d +-Do not render lines (this is, ignore all @code{\D} escapes). +- +-@item -f +-Use form feed control characters in the output. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font and device description files, given the +-target device @var{name}. +- +-@item -h +-Use horizontal tabs for sequences of 8 space characters. +- +-@item -i +-Request italic glyphs from the terminal. Ignored if @option{-c} is +-active. +- +-@item -o +-Do not overstrike. +- +-@item -r +-Highlight italic glyphs. Ignored if @option{-c} is active. +- +-@item -u +-Do not underline italic glyphs. Ignored if @option{-c} isn't used. +- +-@item -U +-Do not overstrike bold-italic glyphs. Ignored if @option{-c} isn't +-used. +- +-@item -v +-Print the version number. +-@end table +- +-@pindex less +-@cindex Teletype +-@cindex ISO 6249 SGR +-@cindex terminal control sequences +-@cindex control sequences, for terminals +-The @option{-c} mode for TTY output devices means that underlining is +-done by emitting sequences of @samp{_} and @samp{^H} (the backspace +-character) before the actual character. Literally, this is printing +-an underline character, then moving the caret back one character +-position, and printing the actual character at the same position as +-the underline character (similar to a typewriter). Usually, a modern +-terminal can't interpret this (and the original Teletype machines for +-which this sequence was appropriate are no longer in use). You need +-a pager program like @code{less} that translates this into +-ISO@tie{}6429 SGR sequences to control terminals. +- +- +-@c ===================================================================== +- +-@node grops, gropdf, grotty, Output Devices +-@section @code{grops} +-@cindex @code{grops}, the program +- +-The postprocessor @command{grops} translates the output from GNU +-@command{troff} into a form suitable for Adobe @sc{PostScript} +-devices. It is fully documented on its manual page, @cite{grops(1)}. +- +- +-@menu +-* Invoking grops:: +-* Embedding PostScript:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grops, Embedding PostScript, grops, grops +-@subsection Invoking @code{grops} +-@cindex invoking @code{grops} +-@cindex @code{grops}, invoking +- +-The postprocessor @code{grops} accepts the following command-line +-options: +- +-@table @option +-@item -b@var{flags} +-Use backward compatibility settings given by @var{flags} as +-documented in the @cite{grops(1)} manual page. Overrides the command +-@option{broken} in the @file{DESC} file. +- +-@item -c@var{n} +-Print @var{n} copies of each page. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font, prologue and device description files, +-given the target device @var{name}, usually @strong{ps}. +- +-@item -g +-Tell the printer to guess the page length. Useful for printing +-vertically centered pages when the paper dimensions are determined at +-print time. +- +-@item -I@var{path} @dots{} +-Consider the directory @file{@var{path}} for searching included files +-specified with relative paths. The current directory is searched as +-fallback. +- +-@item -l +-Use landscape orientation. +- +-@item -m +-Use manual feed. +- +-@item -p@var{papersize} +-Set the page dimensions. Overrides the commands @option{papersize}, +-@option{paperlength}, and @option{paperwidth} in the @file{DESC} +-file. See the @cite{groff_font(5)} manual page for details. +- +-@item -P@var{prologue} +-Use the @var{prologue} in the font path as the prologue instead of +-the default @file{prologue}. Overrides the environment variable +-@env{GROPS_PROLOGUE}. +- +-@item -w@var{n} +-Set the line thickness to @var{n}/1000@dmn{em}. Overrides the +-default value @var{n} = 40. +- +-@item -v +-Print the version number. +-@end table +- +-@c --------------------------------------------------------------------- +- +-@node Embedding PostScript, , Invoking grops, grops +-@subsection Embedding @sc{PostScript} +-@cindex embedding PostScript +-@cindex PostScript, embedding +- +-The escape sequence +- +-@code{\X'ps: import @var{file} @var{llx} @var{lly} @var{urx} @var{ury} +- @var{width} [@var{height}]'} +- +-@noindent +-places a rectangle of the specified @var{width} containing the +-@sc{PostScript} drawing from file @var{file} bound by the box from +-@var{llx} @var{lly} to @var{urx} @var{ury} (in @sc{PostScript} +-coordinates) at the insertion point. If @var{height} is not +-specified, the embedded drawing is scaled proportionally. +- +-@xref{Miscellaneous}, for the @code{psbb} request, which automatically +-generates the bounding box. +- +-This escape sequence is used internally by the macro @code{PSPIC} +-(see the @cite{groff_tmac(5)} manual page). +- +- +-@c ===================================================================== +- +-@node gropdf, grodvi, grops, Output Devices +-@section @code{gropdf} +-@cindex @code{gropdf}, the program +- +-The postprocessor @command{gropdf} translates the output from GNU +-@command{troff} into a form suitable for Adobe PDF devices. It is fully +-documented on its manual page, @cite{gropdf(1)}. +- +-@menu +-* Invoking gropdf:: +-* Embedding PDF:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking gropdf, Embedding PDF, gropdf, gropdf +-@subsection Invoking @code{gropdf} +-@cindex invoking @code{gropdf} +-@cindex @code{gropdf}, invoking +- +-The postprocessor @code{gropdf} accepts the following command-line +-options: +- +-@table @option +-@item -d +-Produce uncompressed PDFs that include debugging comments. +- +-@item -e +-This forces @code{gropdf} to embed all used fonts in the PDF, +-even if they are one of the 14 base Adobe fonts. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font, prologue and device description files, +-given the target device @var{name}, usually @strong{pdf}. +- +-@item -y@var{foundry} +-This forces the use of a different font foundry. +- +-@item -l +-Use landscape orientation. +- +-@item -p@var{papersize} +-Set the page dimensions. Overrides the commands @option{papersize}, +-@option{paperlength}, and @option{paperwidth} in the @file{DESC} +-file. See the @cite{groff_font(5)} manual page for details. +- +-@item -v +-Print the version number. +- +-@item -s +-Append a comment line to end of PDF showing statistics, i.e. number of +-pages in document. Ghostscript's @cite{ps2pdf(1)} complains about this +-line if it is included, but works anyway. +- +-@item -u@var{filename} +-@code{gropdf} normally includes a ToUnicode CMap with any font created +-using @file{text.enc} as the encoding file, this makes it easier to +-search for words that contain ligatures. You can include your own CMap +-by specifying a @var{filename} or have no CMap at all by omitting the +-@var{filename}. +-@end table +- +-@c --------------------------------------------------------------------- +- +-@node Embedding PDF, , Invoking gropdf, gropdf +-@subsection Embedding PDF +-@cindex embedding PDF +-@cindex PDF, embedding +- +-The escape sequence +- +-@code{\X'pdf: pdfpic @var{file} @var{alignment} @var{width} [@var{height}] +- [@var{linelength}]'} +- +-@noindent +-places a rectangle of the specified @var{width} containing the PDF +-drawing from file @var{file} of desired @var{width} and @var{height} (if +-@var{height} is missing or zero then it is scaled proportionally). If +-@var{alignment} is @code{-L} the drawing is left aligned. If it is +-@code{-C} or @code{-R} a @var{linelength} greater than the width of the +-drawing is required as well. If @var{width} is specified as zero then +-the width is scaled in proportion to the height. +- +- +-@c ===================================================================== +- +-@node grodvi, grolj4, gropdf, Output Devices +-@section @code{grodvi} +-@cindex @code{grodvi}, the program +- +-The postprocessor @command{grodvi} translates the output from GNU +-@command{troff} into the @strong{DVI} output format compatible with +-the @strong{@TeX{}} document preparation system. It is fully +-documented on its manual page, @cite{grodvi(1)}. +- +-@menu +-* Invoking grodvi:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grodvi, , grodvi, grodvi +-@subsection Invoking @code{grodvi} +-@cindex invoking @code{grodvi} +-@cindex @code{grodvi}, invoking +- +-The postprocessor @code{grodvi} accepts the following command-line +-options: +- +-@table @option +-@item -d +-Do not use @strong{tpic} specials to implement drawing commands. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font and device description files, given the +-target device @var{name}, usually @strong{dvi}. +- +-@item -l +-Use landscape orientation. +- +-@item -p@var{papersize} +-Set the page dimensions. Overrides the commands @option{papersize}, +-@option{paperlength}, and @option{paperwidth} in the @file{DESC} +-file. See @cite{groff_font(5)} manual page for details. +- +-@item -v +-Print the version number. +- +-@item -w@var{n} +-Set the line thickness to @var{n}/1000@dmn{em}. Overrides the +-default value @var{n} = 40. +-@end table +- +- +-@c ===================================================================== +- +-@node grolj4, grolbp, grodvi, Output Devices +-@section @code{grolj4} +-@cindex @code{grolj4}, the program +- +-The postprocessor @command{grolj4} translates the output from GNU +-@command{troff} into the @strong{PCL5} output format suitable for +-printing on a @strong{HP LaserJet@tie{}4} printer. It is fully +-documented on its manual page, @cite{grolj4(1)}. +- +-@menu +-* Invoking grolj4:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grolj4, , grolj4, grolj4 +-@subsection Invoking @code{grolj4} +-@cindex invoking @code{grolj4} +-@cindex @code{grolj4}, invoking +- +-The postprocessor @code{grolj4} accepts the following command-line +-options: +- +-@table @option +-@item -c@var{n} +-Print @var{n} copies of each page. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font and device description files, given the +-target device @var{name}, usually @strong{lj4}. +- +-@item -l +-Use landscape orientation. +- +-@item -p@var{size} +-Set the page dimensions. Valid values for @var{size} are: +-@code{letter}, @code{legal}, @code{executive}, @code{a4}, +-@code{com10}, @code{monarch}, @code{c5}, @code{b5}, @code{d1}. +- +-@item -v +-Print the version number. +- +-@item -w@var{n} +-Set the line thickness to @var{n}/1000@dmn{em}. Overrides the +-default value @var{n} = 40. +-@end table +- +-The special drawing command @code{\D'R @var{dh} @var{dv}'} draws a +-horizontal rectangle from the current position to the position at +-offset (@var{dh},@var{dv}). +- +- +-@c ===================================================================== +- +-@node grolbp, grohtml, grolj4, Output Devices +-@section @code{grolbp} +-@cindex @code{grolbp}, the program +- +-The postprocessor @command{grolbp} translates the output from GNU +-@command{troff} into the @strong{LBP} output format suitable for +-printing on @strong{Canon CAPSL} printers. It is fully documented on +-its manual page, @cite{grolbp(1)}. +- +-@menu +-* Invoking grolbp:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grolbp, , grolbp, grolbp +-@subsection Invoking @code{grolbp} +-@cindex invoking @code{grolbp} +-@cindex @code{grolbp}, invoking +- +-The postprocessor @code{grolbp} accepts the following command-line +-options: +- +-@table @option +-@item -c@var{n} +-Print @var{n} copies of each page. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font, prologue and device description files, +-given the target device @var{name}, usually @strong{lbp}. +- +-@item -l +-Use landscape orientation. +- +-@item -o@var{orientation} +-Use the @var{orientation} specified: @code{portrait} or +-@code{landscape}. +- +-@item -p@var{papersize} +-Set the page dimensions. See @cite{groff_font(5)} manual page for +-details. +- +-@item -w@var{n} +-Set the line thickness to @var{n}/1000@dmn{em}. Overrides the +-default value @var{n} = 40. +- +-@item -v +-Print the version number. +- +-@item -h +-Print command-line help. +-@end table +- +- +-@c ===================================================================== +- +-@node grohtml, gxditview, grolbp, Output Devices +-@section @code{grohtml} +-@cindex @code{grohtml}, the program +- +-The @code{grohtml} front end (which consists of a preprocessor, +-@code{pre-grohtml}, and a device driver, @code{post-grohtml}) translates +-the output of GNU @code{troff} to @acronym{HTML}. Users should always +-invoke @code{grohtml} via the @code{groff} command with a @code{\-Thtml} +-option. If no files are given, @code{grohtml} will read the standard +-input. A filename of @code{-} will also cause @code{grohtml} to read +-the standard input. @acronym{HTML} output is written to the standard +-output. When @code{grohtml} is run by @code{groff}, options can be +-passed to @code{grohtml} using @code{groff}'s @option{-P} option. +- +-@code{grohtml} invokes @code{groff} twice. In the first pass, pictures, +-equations, and tables are rendered using the @code{ps} device, and in +-the second pass @acronym{HTML} output is generated by the @code{html} +-device. +- +-@code{grohtml} always writes output in @code{UTF-8} encoding and has +-built-in entities for all non-composite unicode characters. In spite of +-this, @code{groff} may issue warnings about unknown special characters +-if they can't be found during the first pass. Such warnings can be +-safely ignored unless the special characters appear inside a table or +-equation, in which case glyphs for these characters must be defined for +-the @code{ps} device as well. +- +-This output device is fully documented on its manual page, +-@cite{grohtml(1)}. +- +-@menu +-* Invoking grohtml:: +-* grohtml specific registers and strings:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking grohtml, grohtml specific registers and strings, grohtml, grohtml +-@subsection Invoking @code{grohtml} +-@cindex invoking @code{grohtml} +-@cindex @code{grohtml}, invoking +- +-The postprocessor @code{grohtml} accepts the following command-line +-options: +- +-@table @option +-@item -a@var{bits} +-Use this number of @var{bits} (= 1, 2 or 4) for text antialiasing. +-Default: @var{bits} = 4. +- +-@item -a0 +-Do not use text antialiasing. +- +-@item -b +-Use white background. +- +-@item -D@var{dir} +-Store rendered images in the directory @file{@var{dir}}. +- +-@item -F@var{dir} +-Put the directory @file{@var{dir}/dev@var{name}} in front of the +-search path for the font, prologue and device description files, +-given the target device @var{name}, usually @strong{html}. +- +-@item -g@var{bits} +-Use this number of @var{bits} (= 1, 2 or 4) for antialiasing of +-drawings. Default: @var{bits} = 4. +- +-@item -g0 +-Do not use antialiasing for drawings. +- +-@item -h +-Use the @code{B} element for section headings. +- +-@item -i@var{resolution} +-Use the @var{resolution} for rendered images. Default: +-@var{resolution} = 100@dmn{dpi}. +- +-@item -I@var{stem} +-Set the images' @var{stem name}. Default: @var{stem} = +-@file{grohtml-@var{XXX}} (@var{XXX} is the process ID). +- +-@item -j@var{stem} +-Place each section in a separate file called +-@file{@var{stem}-@var{n}.html} (where @var{n} is a generated section +-number). +- +-@item -l +-Do not generate the table of contents. +- +-@item -n +-Generate simple fragment identifiers. +- +-@item -o@var{offset} +-Use vertical paddding @var{offset} for images. +- +-@item -p +-Display the page rendering progress to @code{stderr}. +- +-@item -r +-Do not use horizontal rules to separate headers and footers. +- +-@item -s@var{size} +-Set the base font size, to be modified using the elements @code{BIG} +-and @code{SMALL}. +- +-@item -S@var{level} +-Generate separate files for sections at level @var{level}. +- +-@item -v +-Print the version number. +- +-@item -V +-Generate a validator button at the bottom. +- +-@item -y +-Generate a signature of groff after the validator button, if any. +-@end table +- +- +-@c --------------------------------------------------------------------- +- +-@node grohtml specific registers and strings, , Invoking grohtml, grohtml +-@subsection @code{grohtml} specific registers and strings +-@cindex registers specific to @code{grohtml} +-@cindex strings specific to @code{grohtml} +-@cindex @code{grohtml}, registers and strings +- +-@DefmpregList {ps4html, grohtml} +-@DefstrListEndx {www-image-template, grohtml} +-The registers @code{ps4html} and @code{www-image-template} are defined +-by the @code{pre-grohtml} preprocessor. @code{pre-grohtml} reads in the +-@code{troff} input, marks up the inline equations and passes the result +-firstly to +- +-@Example +-troff -Tps -rps4html=1 -dwww-image-template=@var{template} +-@endExample +- +-@noindent +-and secondly to +- +-@Example +-troff -Thtml +-@endExample +- +-@noindent +-or +- +-@Example +-troff -Txhtml +-@endExample +- +-@cindex MathML +-The @sc{PostScript} device is used to create all the image files (for +-@option{-Thtml}; if @option{-Txhtml} is used, all equations are passed +-to @code{geqn} to produce @acronym{MathML}, and the register +-@code{ps4html} enables the macro sets to ignore floating keeps, footers, +-and headings. +- +-The register @code{www-image-template} is set to the user specified +-template name or the default name. +-@endDefmpreg +- +- +-@c ===================================================================== +- +-@node gxditview, , grohtml, Output Devices +-@section @code{gxditview} +-@cindex @code{gxditview}, the program +- +-@c XXX +- +-@menu +-* Invoking gxditview:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Invoking gxditview, , gxditview, gxditview +-@subsection Invoking @code{gxditview} +-@cindex invoking @code{gxditview} +-@cindex @code{gxditview}, invoking +- +-@c XXX +-@c X11's xditview +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node File formats, Installation, Output Devices, Top +-@chapter File formats +-@cindex file formats +-@cindex formats, file +- +-All files read and written by @code{gtroff} are text files. The +-following two sections describe their format. +- +-@menu +-* gtroff Output:: +-* Font Files:: +-@end menu +- +- +-@c ===================================================================== +- +-@node gtroff Output, Font Files, File formats, File formats +-@section @code{gtroff} Output +-@cindex @code{gtroff}, output +-@cindex output, @code{gtroff} +- +-This section describes the intermediate output format of GNU +-@code{troff}. This output is produced by a run of @code{gtroff} before +-it is fed into a device postprocessor program. +- +-As @code{groff} is a wrapper program around @code{gtroff} that +-automatically calls a postprocessor, this output does not show up +-normally. This is why it is called @dfn{intermediate}. @code{groff} +-provides the option @option{-Z} to inhibit postprocessing, such that the +-produced intermediate output is sent to standard output just like +-calling @code{gtroff} manually. +- +-@cindex troff output +-@cindex output, troff +-@cindex intermediate output +-@cindex output, intermediate +-Here, the term @dfn{troff output} describes what is output by +-@code{gtroff}, while @dfn{intermediate output} refers to the language +-that is accepted by the parser that prepares this output for the +-postprocessors. This parser is smarter on whitespace and implements +-obsolete elements for compatibility, otherwise both formats are the +-same.@footnote{The parser and postprocessor for intermediate output can +-be found in the file@* +-@file{@var{groff-source-dir}/src/libs/libdriver/input.cpp}.} +- +-The main purpose of the intermediate output concept is to facilitate the +-development of postprocessors by providing a common programming +-interface for all devices. It has a language of its own that is +-completely different from the @code{gtroff} language. While the +-@code{gtroff} language is a high-level programming language for text +-processing, the intermediate output language is a kind of low-level +-assembler language by specifying all positions on the page for writing +-and drawing. +- +-The intermediate output produced by @code{gtroff} is fairly readable, +-while output from @acronym{AT&T} @code{troff} is rather hard to +-understand because of strange habits that are still supported, but not +-used any longer by @code{gtroff}. +- +-@menu +-* Language Concepts:: +-* Command Reference:: +-* Intermediate Output Examples:: +-* Output Language Compatibility:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node Language Concepts, Command Reference, gtroff Output, gtroff Output +-@subsection Language Concepts +- +-During the run of @code{gtroff}, the input data is cracked down to the +-information on what has to be printed at what position on the intended +-device. So the language of the intermediate output format can be quite +-small. Its only elements are commands with and without arguments. In +-this section, the term @dfn{command} always refers to the intermediate +-output language, and never to the @code{gtroff} language used for +-document formatting. There are commands for positioning and text +-writing, for drawing, and for device controlling. +- +-@menu +-* Separation:: +-* Argument Units:: +-* Document Parts:: +-@end menu +- +-@node Separation, Argument Units, Language Concepts, Language Concepts +-@subsubsection Separation +- +-@acronym{AT&T} @code{troff} output has strange requirements on +-whitespace. The @code{gtroff} output parser, however, is smart about +-whitespace by making it maximally optional. The whitespace characters, +-i.e., the tab, space, and newline characters, always have a syntactical +-meaning. They are never printable because spacing within the output is +-always done by positioning commands. +- +-Any sequence of space or tab characters is treated as a single +-@dfn{syntactical space}. It separates commands and arguments, but is +-only required when there would occur a clashing between the command code +-and the arguments without the space. Most often, this happens when +-variable-length command names, arguments, argument lists, or command +-clusters meet. Commands and arguments with a known, fixed length need +-not be separated by syntactical space. +- +-A line break is a syntactical element, too. Every command argument can +-be followed by whitespace, a comment, or a newline character. Thus a +-@dfn{syntactical line break} is defined to consist of optional +-syntactical space that is optionally followed by a comment, and a +-newline character. +- +-The normal commands, those for positioning and text, consist of a single +-letter taking a fixed number of arguments. For historical reasons, the +-parser allows to stack such commands on the same line, but fortunately, +-in @code{gtroff}'s intermediate output, every command with at least one +-argument is followed by a line break, thus providing excellent +-readability. +- +-The other commands -- those for drawing and device controlling -- have a +-more complicated structure; some recognize long command names, and some +-take a variable number of arguments. So all @samp{D} and @samp{x} +-commands were designed to request a syntactical line break after their +-last argument. Only one command, @w{@samp{x X}}, has an argument that +-can stretch over several lines; all other commands must have all of +-their arguments on the same line as the command, i.e., the arguments may +-not be split by a line break. +- +-Empty lines (these are lines containing only space and/or a comment), +-can occur everywhere. They are just ignored. +- +-@node Argument Units, Document Parts, Separation, Language Concepts +-@subsubsection Argument Units +- +-Some commands take integer arguments that are assumed to represent +-values in a measurement unit, but the letter for the corresponding scale +-indicator is not written with the output command arguments. Most +-commands assume the scale indicator @samp{u}, the basic unit of the +-device, some use @samp{z}, the scaled point unit of the device, while +-others, such as the color commands, expect plain integers. +- +-Note that single characters can have the eighth bit set, as can the +-names of fonts and special characters. The names of characters and +-fonts can be of arbitrary length. A character that is to be printed is +-always in the current font. +- +-A string argument is always terminated by the next whitespace character +-(space, tab, or newline); an embedded @samp{#} character is regarded as +-part of the argument, not as the beginning of a comment command. An +-integer argument is already terminated by the next non-digit character, +-which then is regarded as the first character of the next argument or +-command. +- +-@node Document Parts, , Argument Units, Language Concepts +-@subsubsection Document Parts +- +-A correct intermediate output document consists of two parts, the +-@dfn{prologue} and the @dfn{body}. +- +-The task of the prologue is to set the general device parameters using +-three exactly specified commands. @code{gtroff}'s prologue is +-guaranteed to consist of the following three lines (in that order): +- +-@Example +-x T @var{device} +-x res @var{n} @var{h} @var{v} +-x init +-@endExample +- +-@noindent +-with the arguments set as outlined in @ref{Device Control Commands}. +-Note that the parser for the intermediate output format is able to +-swallow additional whitespace and comments as well even in the prologue. +- +-The body is the main section for processing the document data. +-Syntactically, it is a sequence of any commands different from the ones +-used in the prologue. Processing is terminated as soon as the first +-@w{@samp{x stop}} command is encountered; the last line of any +-@code{gtroff} intermediate output always contains such a command. +- +-Semantically, the body is page oriented. A new page is started by a +-@samp{p} command. Positioning, writing, and drawing commands are always +-done within the current page, so they cannot occur before the first +-@samp{p} command. Absolute positioning (by the @samp{H} and @samp{V} +-commands) is done relative to the current page; all other positioning is +-done relative to the current location within this page. +- +-@c --------------------------------------------------------------------- +- +-@node Command Reference, Intermediate Output Examples, Language Concepts, gtroff Output +-@subsection Command Reference +- +-This section describes all intermediate output commands, both from +-@acronym{AT&T} @code{troff} as well as the @code{gtroff} extensions. +- +-@menu +-* Comment Command:: +-* Simple Commands:: +-* Graphics Commands:: +-* Device Control Commands:: +-* Obsolete Command:: +-@end menu +- +-@node Comment Command, Simple Commands, Command Reference, Command Reference +-@subsubsection Comment Command +- +-@table @code +-@item #@var{anything}@angles{end of line} +-A comment. Ignore any characters from the @samp{#} character up to the +-next newline character. +- +-This command is the only possibility for commenting in the intermediate +-output. Each comment can be preceded by arbitrary syntactical space; +-every command can be terminated by a comment. +-@end table +- +-@node Simple Commands, Graphics Commands, Comment Command, Command Reference +-@subsubsection Simple Commands +- +-The commands in this subsection have a command code consisting of a +-single character, taking a fixed number of arguments. Most of them are +-commands for positioning and text writing. These commands are smart +-about whitespace. Optionally, syntactical space can be inserted before, +-after, and between the command letter and its arguments. All of these +-commands are stackable, i.e., they can be preceded by other simple +-commands or followed by arbitrary other commands on the same line. A +-separating syntactical space is only necessary when two integer +-arguments would clash or if the preceding argument ends with a string +-argument. +- +-@table @code +-@ignore +-.if (\n[@USE_ENV_STACK] == 1) \{\ +-.command { +-Open a new environment by copying the actual device configuration data +-to the environment stack. +-. +-The current environment is setup by the device specification and +-manipulated by the setting commands. +-. +-. +-.command } +-Close the actual environment (opened by a preceding +-.BR { \~command) +-and restore the previous environment from the environment +-stack as the actual device configuration data. +-. +-\} \" endif @USE_ENV_STACK +-@end ignore +- +-@item C @var{xxx}@angles{whitespace} +-Print a special character named @var{xxx}. The trailing syntactical +-space or line break is necessary to allow glyph names of arbitrary +-length. The glyph is printed at the current print position; the glyph's +-size is read from the font file. The print position is not changed. +- +-@item c @var{g} +-Print glyph@tie{}@var{g} at the current print +-position;@footnote{@samp{c} is actually a misnomer since it outputs a +-glyph.} the glyph's size is read from the font file. The print position +-is not changed. +- +-@item f @var{n} +-Set font to font number@tie{}@var{n} (a non-negative integer). +- +-@item H @var{n} +-Move right to the absolute vertical position@tie{}@var{n} (a +-non-negative integer in basic units @samp{u} relative to left edge of +-current page. +- +-@item h @var{n} +-Move @var{n} (a non-negative integer) basic units @samp{u} horizontally +-to the right. The original @acronym{UNIX} troff manual allows negative +-values for @var{n} also, but @code{gtroff} doesn't use this. +- +-@item m @var{color-scheme} @r{[}@var{component} @dots{}@r{]} +-Set the color for text (glyphs), line drawing, and the outline of +-graphic objects using different color schemes; the analoguous command +-for the filling color of graphic objects is @samp{DF}. The color +-components are specified as integer arguments between 0 and 65536. The +-number of color components and their meaning vary for the different +-color schemes. These commands are generated by @code{gtroff}'s escape +-sequence @code{\m}. No position changing. These commands are a +-@code{gtroff} extension. +- +-@table @code +-@item mc @var{cyan} @var{magenta} @var{yellow} +-Set color using the CMY color scheme, having the 3@tie{}color components +-@var{cyan}, @var{magenta}, and @var{yellow}. +- +-@item md +-Set color to the default color value (black in most cases). No +-component arguments. +- +-@item mg @var{gray} +-Set color to the shade of gray given by the argument, an integer between +-0 (black) and 65536 (white). +- +-@item mk @var{cyan} @var{magenta} @var{yellow} @var{black} +-Set color using the CMYK color scheme, having the 4@tie{}color +-components @var{cyan}, @var{magenta}, @var{yellow}, and @var{black}. +- +-@item mr @var{red} @var{green} @var{blue} +-Set color using the RGB color scheme, having the 3@tie{}color components +-@var{red}, @var{green}, and @var{blue}. +-@end table +- +-@item N @var{n} +-Print glyph with index@tie{}@var{n} (a non-negative integer) of the +-current font. This command is a @code{gtroff} extension. +- +-@item n @var{b} @var{a} +-Inform the device about a line break, but no positioning is done by this +-command. In @acronym{AT&T} @code{troff}, the integer arguments @var{b} +-and@tie{}@var{a} informed about the space before and after the current +-line to make the intermediate output more human readable without +-performing any action. In @code{groff}, they are just ignored, but they +-must be provided for compatibility reasons. +- +-@item p @var{n} +-Begin a new page in the outprint. The page number is set +-to@tie{}@var{n}. This page is completely independent of pages formerly +-processed even if those have the same page number. The vertical +-position on the outprint is automatically set to@tie{}0. All +-positioning, writing, and drawing is always done relative to a page, so +-a @samp{p} command must be issued before any of these commands. +- +-@item s @var{n} +-Set point size to @var{n}@tie{}scaled points (this is unit @samp{z}). +-@acronym{AT&T} @code{troff} used the unit points (@samp{p}) instead. +-@xref{Output Language Compatibility}. +- +-@item t @var{xxx}@angles{whitespace} +-@itemx t @var{xxx} @var{dummy-arg}@angles{whitespace} +-Print a word, i.e., a sequence of characters @var{xxx} representing +-output glyphs which names are single characters, terminated by a space +-character or a line break; an optional second integer argument is +-ignored (this allows the formatter to generate an even number of +-arguments). The first glyph should be printed at the current position, +-the current horizontal position should then be increased by the width of +-the first glyph, and so on for each glyph. The widths of the glyphs are +-read from the font file, scaled for the current point size, and rounded +-to a multiple of the horizontal resolution. Special characters cannot +-be printed using this command (use the @samp{C} command for special +-characters). This command is a @code{gtroff} extension; it is only used +-for devices whose @file{DESC} file contains the @code{tcommand} keyword +-(@pxref{DESC File Format}). +- +-@item u @var{n} @var{xxx}@angles{whitespace} +-Print word with track kerning. This is the same as the @samp{t} command +-except that after printing each glyph, the current horizontal position +-is increased by the sum of the width of that glyph and@tie{}@var{n} (an +-integer in basic units @samp{u}). This command is a @code{gtroff} +-extension; it is only used for devices whose @file{DESC} file contains +-the @code{tcommand} keyword (@pxref{DESC File Format}). +- +-@item V @var{n} +-Move down to the absolute vertical position@tie{}@var{n} (a non-negative +-integer in basic units @samp{u}) relative to upper edge of current page. +- +-@item v @var{n} +-Move @var{n}@tie{}basic units @samp{u} down (@var{n} is a non-negative +-integer). The original @acronym{UNIX} troff manual allows negative +-values for @var{n} also, but @code{gtroff} doesn't use this. +- +-@item w +-Informs about a paddable white space to increase readability. The +-spacing itself must be performed explicitly by a move command. +-@end table +- +-@node Graphics Commands, Device Control Commands, Simple Commands, Command Reference +-@subsubsection Graphics Commands +- +-Each graphics or drawing command in the intermediate output starts with +-the letter @samp{D}, followed by one or two characters that specify a +-subcommand; this is followed by a fixed or variable number of integer +-arguments that are separated by a single space character. A @samp{D} +-command may not be followed by another command on the same line (apart +-from a comment), so each @samp{D} command is terminated by a syntactical +-line break. +- +-@code{gtroff} output follows the classical spacing rules (no space +-between command and subcommand, all arguments are preceded by a single +-space character), but the parser allows optional space between the +-command letters and makes the space before the first argument optional. +-As usual, each space can be any sequence of tab and space characters. +- +-Some graphics commands can take a variable number of arguments. In this +-case, they are integers representing a size measured in basic units +-@samp{u}. The arguments called @var{h1}, @var{h2}, @dots{}, @var{hn} +-stand for horizontal distances where positive means right, negative +-left. The arguments called @var{v1}, @var{v2}, @dots{}, @var{vn} stand +-for vertical distances where positive means down, negative up. All +-these distances are offsets relative to the current location. +- +-Each graphics command directly corresponds to a similar @code{gtroff} +-@code{\D} escape sequence. @xref{Drawing Requests}. +- +-Unknown @samp{D} commands are assumed to be device-specific. Its +-arguments are parsed as strings; the whole information is then sent to +-the postprocessor. +- +-In the following command reference, the syntax element @angles{line +-break} means a syntactical line break as defined above. +- +-@table @code +-@item D~ @var{h1} @var{v1} @var{h2} @var{v2} @dots{} @var{hn} @var{vn}@angles{line break} +-Draw B-spline from current position to offset (@var{h1},@var{v1}), then +-to offset (@var{h2},@var{v2}), if given, etc.@: up to +-(@var{hn},@var{vn}). This command takes a variable number of argument +-pairs; the current position is moved to the terminal point of the drawn +-curve. +- +-@item Da @var{h1} @var{v1} @var{h2} @var{v2}@angles{line break} +-Draw arc from current position to +-(@var{h1},@var{v1})@math{+}(@var{h2},@var{v2}) with center at +-(@var{h1},@var{v1}); then move the current position to the final point +-of the arc. +- +-@item DC @var{d}@angles{line break} +-@itemx DC @var{d} @var{dummy-arg}@angles{line break} +-Draw a solid circle using the current fill color with +-diameter@tie{}@var{d} (integer in basic units @samp{u}) with leftmost +-point at the current position; then move the current position to the +-rightmost point of the circle. An optional second integer argument is +-ignored (this allows the formatter to generate an even number of +-arguments). This command is a @code{gtroff} extension. +- +-@item Dc @var{d}@angles{line break} +-Draw circle line with diameter@tie{}@var{d} (integer in basic units +-@samp{u}) with leftmost point at the current position; then move the +-current position to the rightmost point of the circle. +- +-@item DE @var{h} @var{v}@angles{line break} +-Draw a solid ellipse in the current fill color with a horizontal +-diameter of@tie{}@var{h} and a vertical diameter of@tie{}@var{v} (both +-integers in basic units @samp{u}) with the leftmost point at the current +-position; then move to the rightmost point of the ellipse. This command +-is a @code{gtroff} extension. +- +-@item De @var{h} @var{v}@angles{line break} +-Draw an outlined ellipse with a horizontal diameter of@tie{}@var{h} and +-a vertical diameter of@tie{}@var{v} (both integers in basic units +-@samp{u}) with the leftmost point at current position; then move to the +-rightmost point of the ellipse. +- +-@item DF @var{color-scheme} @r{[}@var{component} @dots{}@r{]}@angles{line break} +-Set fill color for solid drawing objects using different color schemes; +-the analoguous command for setting the color of text, line graphics, and +-the outline of graphic objects is @samp{m}. The color components are +-specified as integer arguments between 0 and 65536. The number of color +-components and their meaning vary for the different color schemes. +-These commands are generated by @code{gtroff}'s escape sequences +-@w{@code{\D'F @dots{}'}} and @code{\M} (with no other corresponding +-graphics commands). No position changing. This command is a +-@code{gtroff} extension. +- +-@table @code +-@item DFc @var{cyan} @var{magenta} @var{yellow}@angles{line break} +-Set fill color for solid drawing objects using the CMY color scheme, +-having the 3@tie{}color components @var{cyan}, @var{magenta}, and +-@var{yellow}. +- +-@item DFd@angles{line break} +-Set fill color for solid drawing objects to the default fill color value +-(black in most cases). No component arguments. +- +-@item DFg @var{gray}@angles{line break} +-Set fill color for solid drawing objects to the shade of gray given by +-the argument, an integer between 0 (black) and 65536 (white). +- +-@item DFk @var{cyan} @var{magenta} @var{yellow} @var{black}@angles{line break} +-Set fill color for solid drawing objects using the CMYK color scheme, +-having the 4@tie{}color components @var{cyan}, @var{magenta}, +-@var{yellow}, and @var{black}. +- +-@item DFr @var{red} @var{green} @var{blue}@angles{line break} +-Set fill color for solid drawing objects using the RGB color scheme, +-having the 3@tie{}color components @var{red}, @var{green}, and +-@var{blue}. +-@end table +- +-@item Df @var{n}@angles{line break} +-The argument@tie{}@var{n} must be an integer in the range @math{-32767} +-to 32767. +- +-@table @asis +-@item @math{0 @value{LE} @var{n} @value{LE} 1000} +-Set the color for filling solid drawing objects to a shade of gray, +-where 0 corresponds to solid white, 1000 (the default) to solid black, +-and values in between to intermediate shades of gray; this is obsoleted +-by command @samp{DFg}. +- +-@item @math{@var{n} < 0} or @math{@var{n} > 1000} +-Set the filling color to the color that is currently being used for the +-text and the outline, see command @samp{m}. For example, the command +-sequence +- +-@Example +-mg 0 0 65536 +-Df -1 +-@endExample +- +-@noindent +-sets all colors to blue. +-@end table +- +-@noindent +-No position changing. This command is a @code{gtroff} extension. +- +-@item Dl @var{h} @var{v}@angles{line break} +-Draw line from current position to offset (@var{h},@var{v}) (integers in +-basic units @samp{u}); then set current position to the end of the drawn +-line. +- +-@item Dp @var{h1} @var{v1} @var{h2} @var{v2} @dots{} @var{hn} @var{vn}@angles{line break} +-Draw a polygon line from current position to offset (@var{h1},@var{v1}), +-from there to offset (@var{h2},@var{v2}), etc.@: up to offset +-(@var{hn},@var{vn}), and from there back to the starting position. For +-historical reasons, the position is changed by adding the sum of all +-arguments with odd index to the actual horizontal position and the even +-ones to the vertical position. Although this doesn't make sense it is +-kept for compatibility. +-@ignore +-As the polygon is closed, the end of drawing is the starting point, so +-the position doesn't change. +-@end ignore +-This command is a @code{gtroff} extension. +- +-@item Dp @var{h1} @var{v1} @var{h2} @var{v2} @dots{} @var{hn} @var{vn}@angles{line break} +-Draw a solid polygon in the current fill color rather than an outlined +-polygon, using the same arguments and positioning as the corresponding +-@samp{Dp} command. +-@ignore +-No position changing. +-@end ignore +-This command is a @code{gtroff} extension. +- +-@item Dt @var{n}@angles{line break} +-Set the current line thickness to@tie{}@var{n} (an integer in basic +-units @samp{u}) if @math{@var{n}>0}; if @math{@var{n}=0} select the +-smallest available line thickness; if @math{@var{n}<0} set the line +-thickness proportional to the point size (this is the default before the +-first @samp{Dt} command was specified). For historical reasons, the +-horizontal position is changed by adding the argument to the actual +-horizontal position, while the vertical position is not changed. +-Although this doesn't make sense it is kept for compatibility. +-@ignore +-No position changing. +-@end ignore +-This command is a @code{gtroff} extension. +-@end table +- +-@node Device Control Commands, Obsolete Command, Graphics Commands, Command Reference +-@subsubsection Device Control Commands +- +-Each device control command starts with the letter @samp{x}, followed by +-a space character (optional or arbitrary space or tab in @code{gtroff}) +-and a subcommand letter or word; each argument (if any) must be preceded +-by a syntactical space. All @samp{x} commands are terminated by a +-syntactical line break; no device control command can be followed by +-another command on the same line (except a comment). +- +-The subcommand is basically a single letter, but to increase +-readability, it can be written as a word, i.e., an arbitrary sequence of +-characters terminated by the next tab, space, or newline character. All +-characters of the subcommand word but the first are simply ignored. For +-example, @code{gtroff} outputs the initialization command @w{@samp{x i}} +-as @w{@samp{x init}} and the resolution command @w{@samp{x r}} as +-@w{@samp{x res}}. +- +-In the following, the syntax element @angles{line break} means a +-syntactical line break (@pxref{Separation}). +- +-@table @code +-@item xF @var{name}@angles{line break} +-The @samp{F} stands for @var{Filename}. +- +-Use @var{name} as the intended name for the current file in error +-reports. This is useful for remembering the original file name when +-@code{gtroff} uses an internal piping mechanism. The input file is not +-changed by this command. This command is a @code{gtroff} extension. +- +-@item xf @var{n} @var{s}@angles{line break} +-The @samp{f} stands for @var{font}. +- +-Mount font position@tie{}@var{n} (a non-negative integer) with font +-named@tie{}@var{s} (a text word). @xref{Font Positions}. +- +-@item xH @var{n}@angles{line break} +-The @samp{H} stands for @var{Height}. +- +-Set glyph height to@tie{}@var{n} (a positive integer in scaled points +-@samp{z}). @acronym{AT&T} @code{troff} uses the unit points (@samp{p}) +-instead. @xref{Output Language Compatibility}. +- +-@item xi@angles{line break} +-The @samp{i} stands for @var{init}. +- +-Initialize device. This is the third command of the prologue. +- +-@item xp@angles{line break} +-The @samp{p} stands for @var{pause}. +- +-Parsed but ignored. The original @acronym{UNIX} troff manual writes +- +-@display +-pause device, can be restarted +-@end display +- +-@item xr @var{n} @var{h} @var{v}@angles{line break} +-The @samp{r} stands for @var{resolution}. +- +-Resolution is@tie{}@var{n}, while @var{h} is the minimal horizontal +-motion, and @var{v} the minimal vertical motion possible with this +-device; all arguments are positive integers in basic units @samp{u} per +-inch. This is the second command of the prologue. +- +-@item xS @var{n}@angles{line break} +-The @samp{S} stands for @var{Slant}. +- +-Set slant to@tie{}@var{n} (an integer in basic units @samp{u}). +- +-@item xs@angles{line break} +-The @samp{s} stands for @var{stop}. +- +-Terminates the processing of the current file; issued as the last +-command of any intermediate troff output. +- +-@item xt@angles{line break} +-The @samp{t} stands for @var{trailer}. +- +-Generate trailer information, if any. In @var{gtroff}, this is actually +-just ignored. +- +-@item xT @var{xxx}@angles{line break} +-The @samp{T} stands for @var{Typesetter}. +- +-Set name of device to word @var{xxx}, a sequence of characters ended by +-the next white space character. The possible device names coincide with +-those from the @code{groff} @option{-T} option. This is the first +-command of the prologue. +- +-@item xu @var{n}@angles{line break} +-The @samp{u} stands for @var{underline}. +- +-Configure underlining of spaces. If @var{n} is@tie{}1, start +-underlining of spaces; if @var{n} is@tie{}0, stop underlining of spaces. +-This is needed for the @code{cu} request in nroff mode and is ignored +-otherwise. This command is a @code{gtroff} extension. +- +-@item xX @var{anything}@angles{line break} +-The @samp{x} stands for @var{X-escape}. +- +-Send string @var{anything} uninterpreted to the device. If the line +-following this command starts with a @samp{+} character this line is +-interpreted as a continuation line in the following sense. The @samp{+} +-is ignored, but a newline character is sent instead to the device, the +-rest of the line is sent uninterpreted. The same applies to all +-following lines until the first character of a line is not a @samp{+} +-character. This command is generated by the @code{gtroff} escape +-sequence @code{\X}. The line-continuing feature is a @code{gtroff} +-extension. +-@end table +- +-@node Obsolete Command, , Device Control Commands, Command Reference +-@subsubsection Obsolete Command +-In @acronym{AT&T} @code{troff} output, the writing of a single glyph is +-mostly done by a very strange command that combines a horizontal move +-and a single character giving the glyph name. It doesn't have a command +-code, but is represented by a 3-character argument consisting of exactly +-2@tie{}digits and a character. +- +-@table @asis +-@item @var{dd}@var{g} +-Move right @var{dd} (exactly two decimal digits) basic units @samp{u}, +-then print glyph@tie{}@var{g} (represented as a single character). +- +-In @code{gtroff}, arbitrary syntactical space around and within this +-command is allowed to be added. Only when a preceding command on the +-same line ends with an argument of variable length a separating space is +-obligatory. In @acronym{AT&T} @code{troff}, large clusters of these and +-other commands are used, mostly without spaces; this made such output +-almost unreadable. +-@end table +- +-For modern high-resolution devices, this command does not make sense +-because the width of the glyphs can become much larger than two decimal +-digits. In @code{gtroff}, this is only used for the devices @code{X75}, +-@code{X75-12}, @code{X100}, and @code{X100-12}. For other devices, the +-commands @samp{t} and @samp{u} provide a better functionality. +- +-@c --------------------------------------------------------------------- +- +-@node Intermediate Output Examples, Output Language Compatibility, Command Reference, gtroff Output +-@subsection Intermediate Output Examples +- +-This section presents the intermediate output generated from the same +-input for three different devices. The input is the sentence @samp{hell +-world} fed into @code{gtroff} on the command line. +- +-@table @asis +-@item High-resolution device @code{ps} +- +-This is the standard output of @code{gtroff} if no @option{-T} option is +-given. +- +-@example +-@group +-shell> echo "hell world" | groff -Z -T ps +- +-x T ps +-x res 72000 1 1 +-x init +-@end group +-p1 +-x font 5 TR +-f5 +-s10000 +-V12000 +-H72000 +-thell +-wh2500 +-tw +-H96620 +-torld +-n12000 0 +-@group +-x trailer +-V792000 +-x stop +-@end group +-@end example +- +-@noindent +-This output can be fed into @code{grops} to get its representation as a +-@sc{PostScript} file. +- +-@item Low-resolution device @code{latin1} +- +-This is similar to the high-resolution device except that the +-positioning is done at a minor scale. Some comments (lines starting +-with @samp{#}) were added for clarification; they were not generated by +-the formatter. +- +-@example +-@group +-shell> echo "hell world" | groff -Z -T latin1 +- +-# prologue +-x T latin1 +-x res 240 24 40 +-x init +-@end group +-# begin a new page +-p1 +-# font setup +-x font 1 R +-f1 +-s10 +-# initial positioning on the page +-V40 +-H0 +-# write text `hell' +-thell +-# inform about space, and issue a horizontal jump +-wh24 +-# write text `world' +-tworld +-# announce line break, but do nothing because ... +-n40 0 +-@group +-# ... the end of the document has been reached +-x trailer +-V2640 +-x stop +-@end group +-@end example +- +-@noindent +-This output can be fed into @code{grotty} to get a formatted text +-document. +- +-@item @acronym{AT&T} @code{troff} output +-Since a computer monitor has a very low resolution compared to modern +-printers the intermediate output for the X@tie{}Window devices can use +-the jump-and-write command with its 2-digit displacements. +- +-@example +-@group +-shell> echo "hell world" | groff -Z -T X100 +- +-x T X100 +-x res 100 1 1 +-x init +-@end group +-p1 +-x font 5 TR +-f5 +-s10 +-V16 +-H100 +-# write text with jump-and-write commands +-ch07e07l03lw06w11o07r05l03dh7 +-n16 0 +-@group +-x trailer +-V1100 +-x stop +-@end group +-@end example +- +-@noindent +-This output can be fed into @code{xditview} or @code{gxditview} for +-displaying in@tie{}X. +- +-Due to the obsolete jump-and-write command, the text clusters in the +-@acronym{AT&T} @code{troff} output are almost unreadable. +-@end table +- +-@c --------------------------------------------------------------------- +- +-@node Output Language Compatibility, , Intermediate Output Examples, gtroff Output +-@subsection Output Language Compatibility +- +-The intermediate output language of @acronym{AT&T} @code{troff} was +-first documented in the @acronym{UNIX} troff manual, with later +-additions documented in @cite{A Typesetter-indenpendent TROFF}, written +-by Brian Kernighan. +- +-The @code{gtroff} intermediate output format is compatible with this +-specification except for the following features. +- +-@itemize @bullet +-@item +-The classical quasi device independence is not yet implemented. +- +-@item +-The old hardware was very different from what we use today. So the +-@code{groff} devices are also fundamentally different from the ones +-in @acronym{AT&T} @code{troff}. For example, the @acronym{AT&T} +-@sc{PostScript} device is called @code{post} and has a resolution of +-only 720 units per inch, suitable for printers 20 years ago, while +-@code{groff}'s @code{ps} device has a resolution of 72000 units per +-inch. Maybe, by implementing some rescaling mechanism similar to the +-classical quasi device independence, @code{groff} could emulate +-@acronym{AT&T}'s @code{post} device. +- +-@item +-The B-spline command @samp{D~} is correctly handled by the intermediate +-output parser, but the drawing routines aren't implemented in some of +-the postprocessor programs. +- +-@item +-The argument of the commands @samp{s} and @w{@samp{x H}} has the +-implicit unit scaled point @samp{z} in @code{gtroff}, while +-@acronym{AT&T} @code{troff} has point (@samp{p}). This isn't an +-incompatibility but a compatible extension, for both units coincide for +-all devices without a @code{sizescale} parameter in the @file{DESC} +-file, including all postprocessors from @acronym{AT&T} and +-@code{groff}'s text devices. The few @code{groff} devices with a +-@code{sizescale} parameter either do not exist for @acronym{AT&T} +-@code{troff}, have a different name, or seem to have a different +-resolution. So conflicts are very unlikely. +- +-@item +-The position changing after the commands @samp{Dp}, @samp{DP}, and +-@samp{Dt} is illogical, but as old versions of @code{gtroff} used this +-feature it is kept for compatibility reasons. +- +-@ignore +-Temporarily, there existed some confusion on the positioning after the +-@samp{D} commands that are groff extensions. This has been clarified by +-establishing the classical rule for all @code{groff} drawing commands: +- +-@itemize +-@item +-The position after a graphic object has been drawn is at its end; for +-circles and ellipses, the `end' is at the right side. +- +-@item +-From this, the positionings specified for the drawing commands above +-follow quite naturally. +-@end itemize +-@end ignore +- +-@end itemize +- +- +-@c ===================================================================== +- +-@node Font Files, , gtroff Output, File formats +-@section Font Files +-@cindex font files +-@cindex files, font +- +-The @code{gtroff} font format is roughly a superset of the +-@code{ditroff} font format (as used in later versions of @acronym{AT&T} +-@code{troff} and its descendants). Unlike the @code{ditroff} font +-format, there is no associated binary format; all files are text +-files.@footnote{Plan@tie{}9 @code{troff} has also abandoned the binary +-format.} The font files for device @var{name} are stored in a directory +-@file{dev@var{name}}. There are two types of file: a device description +-file called @file{DESC} and for each font@tie{}@var{f} a font file +-called@tie{}@file{@var{f}}. +- +-@menu +-* DESC File Format:: +-* Font File Format:: +-@end menu +- +-@c --------------------------------------------------------------------- +- +-@node DESC File Format, Font File Format, Font Files, Font Files +-@subsection @file{DESC} File Format +-@cindex @file{DESC} file, format +-@cindex font description file, format +-@cindex format of font description file +-@pindex DESC@r{ file format} +- +-The @file{DESC} file can contain the following types of line. Except +-for the @code{charset} keyword, which must comes last (if at all), the +-order of the lines is not important. Later entries in the file, +-however, override previous values. +- +-@table @code +-@item charset +-@kindex charset +-This line and everything following in the file are ignored. It is +-allowed for the sake of backwards compatibility. +- +-@item family @var{fam} +-@kindex family +-The default font family is @var{fam}. +- +-@item fonts @var{n} @var{F1} @var{F2} @var{F3} @dots{} @var{Fn} +-@kindex fonts +-Fonts @var{F1} @dots{} @var{Fn} are mounted in the font positions +-@var{m}+1, @dots{}, @var{m}+@var{n} where @var{m} is the number of +-styles. This command may extend over more than one line. A font name +-of@tie{}0 means no font is mounted on the corresponding font position. +- +-@item hor @var{n} +-@kindex hor +-@cindex horizontal resolution +-@cindex resolution, horizontal +-The horizontal resolution is @var{n}@tie{}machine units. All horizontal +-quantities are rounded to be multiples of this value. +- +-@item image_generator @var{string} +-@kindex image_generator +-@cindex PostScript, PNG image generation +-@cindex PNG image generation from PostScript +-Needed for @code{grohtml} only. It specifies the program to generate +-PNG images from @sc{PostScript} input. Under GNU/Linux this is +-usually @code{gs} but under other systems (notably cygwin) it might +-be set to another name. +- +-@item paperlength @var{n} +-@kindex paperlength +-The physical vertical dimension of the output medium in machine units. +-This isn't used by @code{troff} itself but by output devices. +-Deprecated. Use @code{papersize} instead. +- +-@item papersize @var{string} @dots{} +-@kindex papersize +-Select a paper size. Valid values for @var{string} are the ISO paper +-types @code{A0}-@code{A7}, @code{B0}-@code{B7}, @code{C0}-@code{C7}, +-@code{D0}-@code{D7}, @code{DL}, and the US paper types @code{letter}, +-@code{legal}, @code{tabloid}, @code{ledger}, @code{statement}, +-@code{executive}, @code{com10}, and @code{monarch}. Case is not +-significant for @var{string} if it holds predefined paper types. +-Alternatively, @var{string} can be a file name (e.g.@: +-@file{/etc/papersize}); if the file can be opened, @code{groff} reads +-the first line and tests for the above paper sizes. Finally, +-@var{string} can be a custom paper size in the format +-@code{@var{length},@var{width}} (no spaces before and after the comma). +-Both @var{length} and @var{width} must have a unit appended; valid +-values are @samp{i} for inches, @samp{C} for centimeters, @samp{p} for +-points, and @samp{P} for picas. Example: @code{12c,235p}. An argument +-that starts with a digit is always treated as a custom paper format. +-@code{papersize} sets both the vertical and horizontal dimension of the +-output medium. +- +-More than one argument can be specified; @code{groff} scans from left to +-right and uses the first valid paper specification. +- +-@item paperwidth @var{n} +-@kindex paperwidth +-The physical horizontal dimension of the output medium in machine units. +-This isn't used by @code{troff} itself but by output devices. +-Deprecated. Use @code{papersize} instead. +- +-@item pass_filenames +-@kindex pass_filenames +-Tell @code{gtroff} to emit the name of the source file currently being +-processed. This is achieved by the intermediate output command +-@samp{F}. Currently, this is only used by the @code{grohtml} output +-device. +- +-@item postpro @var{program} +-@kindex postpro +-Call @var{program} as a postprocessor. For example, the line +- +-@Example +-postpro grodvi +-@endExample +- +-@noindent +-in the file @file{devdvi/DESC} makes @code{groff} call @code{grodvi} if +-option @option{-Tdvi} is given (and @option{-Z} isn't used). +- +-@item prepro @var{program} +-@kindex prepro +-Call @var{program} as a preprocessor. Currently, this keyword is used +-by @code{groff} with option @option{-Thtml} or @option{-Txhtml} only. +- +-@item print @var{program} +-@kindex print +-Use @var{program} as a spooler program for printing. If omitted, the +-@option{-l} and @option{-L} options of @code{groff} are ignored. +- +-@item res @var{n} +-@kindex res +-@cindex device resolution +-@cindex resolution, device +-There are @var{n}@tie{}machine units per inch. +- +-@item sizes @var{s1} @var{s2} @dots{} @var{sn} 0 +-@kindex sizes +-This means that the device has fonts at @var{s1}, @var{s2}, @dots{} +-@var{sn} scaled points. The list of sizes must be terminated by@tie{}0 +-(this is digit zero). Each @var{si} can also be a range of sizes +-@var{m}-@var{n}. The list can extend over more than one line. +- +-@item sizescale @var{n} +-@kindex sizescale +-The scale factor for point sizes. By default this has a value +-of@tie{}1. One scaled point is equal to one point/@var{n}. The +-arguments to the @code{unitwidth} and @code{sizes} commands are given in +-scaled points. @xref{Fractional Type Sizes}, for more information. +- +-@item styles @var{S1} @var{S2} @dots{} @var{Sm} +-@kindex styles +-The first @var{m}@tie{}font positions are associated with styles +-@var{S1} @dots{} @var{Sm}. +- +-@item tcommand +-@kindex tcommand +-This means that the postprocessor can handle the @samp{t} and @samp{u} +-intermediate output commands. +- +-@item unicode +-@kindex unicode +-Indicate that the output device supports the complete Unicode +-repertoire. Useful only for devices that produce @emph{character +-entities} instead of glyphs. +- +-If @code{unicode} is present, no @code{charset} section is required in +-the font description files since the Unicode handling built into +-@code{groff} is used. However, if there are entries in a @code{charset} +-section, they either override the default mappings for those particular +-characters or add new mappings (normally for composite characters). +- +-This is used for @option{-Tutf8}, @option{-Thtml}, and @option{-Txhtml}. +- +-@item unitwidth @var{n} +-@kindex unitwidth +-Quantities in the font files are given in machine units for fonts whose +-point size is @var{n}@tie{}scaled points. +- +-@item unscaled_charwidths +-@kindex unscaled_charwidths +-Make the font handling module always return unscaled character widths. +-Needed for the @code{grohtml} device. +- +-@item use_charnames_in_special +-@kindex use_charnames_in_special +-This command indicates that @code{gtroff} should encode special +-characters inside special commands. Currently, this is only used by the +-@code{grohtml} output device. @xref{Postprocessor Access}. +- +-@item vert @var{n} +-@kindex vert +-@cindex vertical resolution +-@cindex resolution, vertical +-The vertical resolution is @var{n}@tie{}machine units. All vertical +-quantities are rounded to be multiples of this value. +-@end table +- +-The @code{res}, @code{unitwidth}, @code{fonts}, and @code{sizes} lines +-are mandatory. Other commands are ignored by @code{gtroff} but may be +-used by postprocessors to store arbitrary information about the device +-in the @file{DESC} file. +- +-@kindex spare1 +-@kindex spare2 +-@kindex biggestfont +-Here a list of obsolete keywords that are recognized by @code{groff} +-but completely ignored: @code{spare1}, @code{spare2}, +-@code{biggestfont}. +- +-@c --------------------------------------------------------------------- +- +-@node Font File Format, , DESC File Format, Font Files +-@subsection Font File Format +-@cindex font file, format +-@cindex font description file, format +-@cindex format of font files +-@cindex format of font description files +- +-A @dfn{font file}, also (and probably better) called a @dfn{font +-description file}, has two sections. The first section is a sequence of +-lines each containing a sequence of blank delimited words; the first +-word in the line is a key, and subsequent words give a value for that +-key. +- +-@table @code +-@item name @var{f} +-@kindex name +-The name of the font is@tie{}@var{f}. +- +-@item spacewidth @var{n} +-@kindex spacewidth +-The normal width of a space is@tie{}@var{n}. +- +-@item slant @var{n} +-@kindex slant +-The glyphs of the font have a slant of @var{n}@tie{}degrees. (Positive +-means forward.) +- +-@item ligatures @var{lig1} @var{lig2} @dots{} @var{lign} [0] +-@kindex ligatures +-Glyphs @var{lig1}, @var{lig2}, @dots{}, @var{lign} are ligatures; +-possible ligatures are @samp{ff}, @samp{fi}, @samp{fl}, @samp{ffi} and +-@samp{ffl}. For backwards compatibility, the list of ligatures may be +-terminated with a@tie{}0. The list of ligatures may not extend over +-more than one line. +- +-@item special +-@cindex special fonts +-@kindex special +-The font is @dfn{special}; this means that when a glyph is requested +-that is not present in the current font, it is searched for in any +-special fonts that are mounted. +-@end table +- +-Other commands are ignored by @code{gtroff} but may be used by +-postprocessors to store arbitrary information about the font in the font +-file. +- +-@cindex comments in font files +-@cindex font files, comments +-@kindex # +-The first section can contain comments, which start with the @samp{#} +-character and extend to the end of a line. +- +-The second section contains one or two subsections. It must contain a +-@code{charset} subsection and it may also contain a @code{kernpairs} +-subsection. These subsections can appear in any order. Each subsection +-starts with a word on a line by itself. +- +-@kindex charset +-The word @code{charset} starts the character set +-subsection.@footnote{This keyword is misnamed since it starts a list of +-ordered glyphs, not characters.} The @code{charset} line is followed by +-a sequence of lines. Each line gives information for one glyph. A line +-comprises a number of fields separated by blanks or tabs. The format is +- +-@quotation +-@var{name} @var{metrics} @var{type} @var{code} [@var{entity-name}] +-[@code{--} @var{comment}] +-@end quotation +- +-@cindex 8-bit input +-@cindex input, 8-bit +-@cindex accessing unnamed glyphs with @code{\N} +-@cindex unnamed glyphs, accessing with @code{\N} +-@cindex characters, unnamed, accessing with @code{\N} +-@cindex glyphs, unnamed, accessing with @code{\N} +-@kindex --- +-@noindent +-@var{name} identifies the glyph name@footnote{The distinction between +-input, characters, and output, glyphs, is not clearly separated in the +-terminology of @code{groff}; for example, the @code{char} request should +-be called @code{glyph} since it defines an output entity.}: If +-@var{name} is a single character@tie{}@var{c} then it corresponds to the +-@code{gtroff} input character@tie{}@var{c}; if it is of the form +-@samp{\@var{c}} where @var{c} is a single character, then it corresponds +-to the special character @code{\[@var{c}]}; otherwise it corresponds to +-the special character @samp{\[@var{name}]}. If it is exactly two +-characters @var{xx} it can be entered as @samp{\(@var{xx}}. Note that +-single-letter special characters can't be accessed as @samp{\@var{c}}; +-the only exception is @samp{\-}, which is identical to @code{\[-]}. +- +-@code{gtroff} supports 8-bit input characters; however some utilities +-have difficulties with eight-bit characters. For this reason, there is +-a convention that the entity name @samp{char@var{n}} is equivalent to +-the single input character whose code is@tie{}@var{n}. For example, +-@samp{char163} would be equivalent to the character with code@tie{}163, +-which is the pounds sterling sign in the ISO@tie{}@w{Latin-1} character +-set. You shouldn't use @samp{char@var{n}} entities in font description +-files since they are related to input, not output. Otherwise, you get +-hard-coded connections between input and output encoding, which prevents +-use of different (input) character sets. +- +-The name @samp{---} is special and indicates that the glyph is unnamed; +-such glyphs can only be used by means of the @code{\N} escape sequence +-in @code{gtroff}. +- +-The @var{type} field gives the glyph type: +- +-@table @code +-@item 1 +-the glyph has a descender, for example, @samp{p}; +- +-@item 2 +-the glyph has an ascender, for example, @samp{b}; +- +-@item 3 +-the glyph has both an ascender and a descender, for example, @samp{(}. +-@end table +- +-The @var{code} field gives the code that the postprocessor uses to +-print the glyph. The glyph can also be input to @code{gtroff} using +-this code by means of the @code{\N} escape sequence. @var{code} can be +-any integer. If it starts with @samp{0} it is interpreted as octal; if +-it starts with @samp{0x} or @samp{0X} it is interpreted as hexadecimal. +-Note, however, that the @code{\N} escape sequence only accepts a decimal +-integer. +- +-The @var{entity-name} field gives an @acronym{ASCII} string identifying +-the glyph that the postprocessor uses to print the @code{gtroff} glyph +-@var{name}. This field is optional and has been introduced so that the +-@code{grohtml} device driver can encode its character set. For example, +-the glyph @samp{\[Po]} is represented as @samp{£} in +-@acronym{HTML} 4.0. +- +-Anything on the line after the @var{entity-name} field resp.@: after +-@samp{--} is ignored. +- +-The @var{metrics} field has the form: +- +-@display +-@group +-@var{width}[@code{,}@var{height}[@code{,}@var{depth}[@code{,}@var{italic-correction} +- [@code{,}@var{left-italic-correction}[@code{,}@var{subscript-correction}]]]]] +-@end group +-@end display +- +-@noindent +-There must not be any spaces between these subfields (it has been split +-here into two lines for better legibility only). Missing subfields are +-assumed to be@tie{}0. The subfields are all decimal integers. Since +-there is no associated binary format, these values are not required to +-fit into a variable of type @samp{char} as they are in @code{ditroff}. +-The @var{width} subfield gives the width of the glyph. The @var{height} +-subfield gives the height of the glyph (upwards is positive); if a glyph +-does not extend above the baseline, it should be given a zero height, +-rather than a negative height. The @var{depth} subfield gives the depth +-of the glyph, that is, the distance from the baseline to the lowest +-point below the baseline to which the glyph extends (downwards is +-positive); if a glyph does not extend below the baseline, it should be +-given a zero depth, rather than a negative depth. The +-@var{italic-correction} subfield gives the amount of space that should +-be added after the glyph when it is immediately to be followed by a +-glyph from a roman font. The @var{left-italic-correction} subfield +-gives the amount of space that should be added before the glyph when it +-is immediately to be preceded by a glyph from a roman font. The +-@var{subscript-correction} gives the amount of space that should be +-added after a glyph before adding a subscript. This should be less than +-the italic correction. +- +-A line in the @code{charset} section can also have the format +- +-@Example +-@var{name} " +-@endExample +- +-@noindent +-This indicates that @var{name} is just another name for the glyph +-mentioned in the preceding line. +- +-@kindex kernpairs +-The word @code{kernpairs} starts the kernpairs section. This contains a +-sequence of lines of the form: +- +-@Example +-@var{c1} @var{c2} @var{n} +-@endExample +- +-@noindent +-This means that when glyph @var{c1} appears next to glyph @var{c2} the +-space between them should be increased by@tie{}@var{n}. Most entries in +-the kernpairs section have a negative value for@tie{}@var{n}. +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Installation, Copying This Manual, File formats, Top +-@chapter Installation +-@cindex installation +- +-@c XXX +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Copying This Manual, Request Index, Installation, Top +-@appendix Copying This Manual +- +-@include fdl.texi +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Request Index, Escape Index, Copying This Manual, Top +-@appendix Request Index +- +-Requests appear without the leading control character (normally either +-@samp{.} or @samp{'}). +- +-@printindex rq +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Escape Index, Operator Index, Request Index, Top +-@appendix Escape Index +- +-Any escape sequence @code{\@var{X}} with @var{X} not in the list below +-emits a warning, printing glyph @var{X}. +- +-@printindex es +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Operator Index, Register Index, Escape Index, Top +-@appendix Operator Index +- +-@printindex op +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Register Index, Macro Index, Operator Index, Top +-@appendix Register Index +- +-The macro package or program a specific register belongs to is appended in +-brackets. +- +-A register name@tie{}@code{x} consisting of exactly one character can be +-accessed as @samp{\nx}. A register name @code{xx} consisting of exactly +-two characters can be accessed as @samp{\n(xx}. Register names +-@code{xxx} of any length can be accessed as @samp{\n[xxx]}. +- +-@printindex vr +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Macro Index, String Index, Register Index, Top +-@appendix Macro Index +- +-The macro package a specific macro belongs to is appended in brackets. +-They appear without the leading control character (normally @samp{.}). +- +-@printindex ma +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node String Index, Glyph Name Index, Macro Index, Top +-@appendix String Index +- +-The macro package or program a specific string belongs to is appended in +-brackets. +- +-A string name@tie{}@code{x} consisting of exactly one character can be +-accessed as @samp{\*x}. A string name @code{xx} consisting of exactly +-two characters can be accessed as @samp{\*(xx}. String names @code{xxx} +-of any length can be accessed as @samp{\*[xxx]}. +- +- +-@printindex st +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Glyph Name Index, Font File Keyword Index, String Index, Top +-@appendix Glyph Name Index +- +-A glyph name @code{xx} consisting of exactly two characters can be +-accessed as @samp{\(xx}. Glyph names @code{xxx} of any length can be +-accessed as @samp{\[xxx]}. +- +-@c XXX +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Font File Keyword Index, Program and File Index, Glyph Name Index, Top +-@appendix Font File Keyword Index +- +-@printindex ky +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Program and File Index, Concept Index, Font File Keyword Index, Top +-@appendix Program and File Index +- +-@printindex pg +- +- +- +-@c ===================================================================== +-@c ===================================================================== +- +-@node Concept Index, , Program and File Index, Top +-@appendix Concept Index +- +-@printindex cp +- +- +-@bye +- +-@c Local Variables: +-@c mode: texinfo +-@c coding: latin-1 +-@c End: +diff -Nuar groff-1.22.3.old/doc/Makefile.in groff-1.22.3/doc/Makefile.in +--- groff-1.22.3.old/doc/Makefile.in 2014-11-04 10:38:35.561519796 +0200 ++++ groff-1.22.3/doc/Makefile.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,177 +0,0 @@ +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# Written by Werner Lemberg +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +- +- +-# Use this file to produce documentation in various formats; e.g. you can +-# say +-# +-# make groff.pdf +-# +-# to get the groff texinfo manual as a PDF file. +-# +-# Note that you have to compile the groff package first. +- +- +-srcdir=@srcdir@ +-top_srcdir=@abs_top_srcdir@ +-VPATH=@srcdir@ +-top_builddir=@abs_top_builddir@ +-pnmtops=@pnmtops_nosetpage@ +- +-# These may be overridden if cross-compiling. +-TROFFBIN=$(top_builddir)/src/roff/troff/troff +-GROFFBIN=$(top_builddir)/src/roff/groff/groff +-GROFF_BIN_PATH=`echo $(groff_bin_dirs) \ +- | LANG=C LC_ALL=C sed -e 's| *|:|g'` +- +-# info files are distributed with the groff package, so makeinfo is +-# usually not needed (however, to build from the repo you NEED it!) +-MAKEINFO=@MAKEINFO@ +- +-# Users who want to print out the groff manual are expected to have a +-# working TeX installation. Note that texi2dvi properly honours the +-# `MAKEINFO' environment variable. +-TEXI2DVI=texi2dvi +- +-groff_bin_dirs=\ +- $(top_builddir)/src/roff/groff \ +- $(top_builddir)/src/roff/troff \ +- $(top_builddir)/src/preproc/preconv \ +- $(top_builddir)/src/preproc/pic \ +- $(top_builddir)/src/preproc/eqn \ +- $(top_builddir)/src/preproc/tbl \ +- $(top_builddir)/src/preproc/grn \ +- $(top_builddir)/src/preproc/refer \ +- $(top_builddir)/src/preproc/soelim \ +- $(top_builddir)/src/preproc/html \ +- $(top_builddir)/src/devices/grops \ +- $(top_builddir)/src/devices/gropdf \ +- $(top_builddir)/src/devices/grodvi \ +- $(top_builddir)/src/devices/grotty \ +- $(top_builddir)/src/devices/grolj4 \ +- $(top_builddir)/src/devices/grolbp \ +- $(top_builddir)/src/devices/grohtml +- +-version=`cat $(top_srcdir)/VERSION` +-# No additional number if revision is zero. +-revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` +- +-FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font +-TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac +- +-TROFF=$(TROFFBIN) $(TFLAG) $(FFLAG) -ww +-GROFF=\ +- LANG=C \ +- LC_ALL=C \ +- sed -e "s;@VERSION@;$(version)$(revision);" $< \ +- | GROFF_COMMAND_PREFIX= \ +- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ +- $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww +- +-imagedir=img +- +-.SUFFIXES: .me .ms .ps .html .txt .texinfo .dvi .pdf .xhtml +-.PHONY: all prepare_examples clean distclean realclean extraclean +- +-# For simplicity, we always call preconv, grn, and eqn. +-.me.txt: +- $(GROFF) -k -Tutf8 -ge -me >$@ +-.me.ps: +- $(GROFF) -k -Tps -ge -me >$@ +- +-.ms.html: +- $(GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \ +- -P-D$(imagedir) -P-V -Thtml -ms >$@ +-.ms.txt: +- $(GROFF) -Tascii -ms -mwww >$@ +-.ms.ps: +- $(GROFF) -Tps -ms -mwww >$@ +- +-.texinfo.txt: +- LANG=C \ +- LC_ALL=C \ +- $(MAKEINFO) --enable-encoding -I$(srcdir) --plaintext -o $@ $< +-.texinfo.dvi: +- LANG=C \ +- LC_ALL=C \ +- MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e $< +-.texinfo.pdf: +- LANG=C \ +- LC_ALL=C \ +- MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e --pdf $< +-.texinfo.html: +- LANG=C \ +- LC_ALL=C \ +- $(MAKEINFO) --enable-encoding -I$(srcdir) --html --no-split $< \ +- && $(SHELL) $(srcdir)/fixinfo.sh $@ +- +-all: prepare_examples +- +-prepare_examples: grnexmpl.g groff.css +- test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g . +- test -f groff.css || cp $(srcdir)/groff.css . +- +-groff.info: groff.texinfo +- $(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo +- +-gnu.eps: gnu.xpm +- xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | $(pnmtops) -noturn >$@ +- +-pic.html: pic.ms +- $(GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \ +- -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \ +- -Thtml -P-V -ms >$@ +- +-webpage.html: webpage.ms gnu.eps groff.css +- $(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \ +- -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \ +- -P-D$(imagedir) -Thtml -ms >$@ +- +-webpage.ps: gnu.eps +- +-grnexmpl.ps: grnexmpl.me grnexmpl.g +- +-split-html: +- LANG=C \ +- LC_ALL=C \ +- $(MAKEINFO) --enable-encoding -I$(srcdir) --html groff.texinfo \ +- && for f in groff/*; do $(SHELL) $(srcdir)/fixinfo.sh $$f; done +- +-clean: +- rm -f *.ps *.html *.txt core +- rm -f *.aux *.dvi *.pdf *.log *.toc texput.log +- rm -f *.cp *.cps *.cv *.cn *.es *.ess *.fn *.fns *.ky *.kys \ +- *.ma *.mas *.op *.ops *.pg *.pgs *.rq *.rqs *.st *.sts \ +- *.tp *.tps *.tr *.vr *.vrs *.xhtml +- -rm -rf img +- +-distclean: clean +- +-realclean: distclean +- rm -f *.png *.eps +- +-extraclean: distclean +- rm -f core *~ \#* junk temp grot +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/doc/Makefile.sub groff-1.22.3/doc/Makefile.sub +--- groff-1.22.3.old/doc/Makefile.sub 2014-11-04 10:38:35.561519796 +0200 ++++ groff-1.22.3/doc/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,296 +0,0 @@ +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# Written by Werner Lemberg +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +- +-# These may be overridden if cross-compiling. +-GROFFBIN=$(top_builddir)/src/roff/groff/groff +-GROFF_BIN_PATH=`echo $(groff_bin_dirs) | sed -e 's| *|$(SH_SEP)|g'` +- +-groff_bin_dirs=\ +- $(top_builddir)/src/roff/groff \ +- $(top_builddir)/src/roff/troff \ +- $(top_builddir)/src/preproc/preconv \ +- $(top_builddir)/src/preproc/pic \ +- $(top_builddir)/src/preproc/eqn \ +- $(top_builddir)/src/preproc/tbl \ +- $(top_builddir)/src/preproc/grn \ +- $(top_builddir)/src/preproc/refer \ +- $(top_builddir)/src/preproc/soelim \ +- $(top_builddir)/src/preproc/html \ +- $(top_builddir)/src/devices/grops \ +- $(top_builddir)/src/devices/gropdf \ +- $(top_builddir)/src/devices/grohtml +- +-FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font +-TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac +- +-GROFF=\ +- sed -e "s;@VERSION@;$(version)$(revision);" $< \ +- | GROFF_COMMAND_PREFIX= \ +- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \ +- $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww +- +-DOCFILES=\ +- meref.me \ +- meintro.me \ +- meintro_fr.me \ +- pic.ms +- +-PROCESSEDDOCFILES=\ +- meref.ps \ +- meintro.ps \ +- meintro_fr.ps \ +- pic.ps +- +-HTMLDOCFILES=\ +- pic.html +- +-HTMLDOCFILESALL=\ +- pic*.html +- +-HTMLDOCIMAGEFILES=\ +- pic* +- +-EXAMPLEFILES=\ +- webpage.ms \ +- groff.css \ +- grnexmpl.g \ +- grnexmpl.me +- +-PROCESSEDEXAMPLEFILES=\ +- webpage.ps \ +- grnexmpl.ps +- +-HTMLEXAMPLEFILES=\ +- webpage.html +- +-HTMLEXAMPLEFILESALL=\ +- webpage*.html +- +-HTMLEXAMPLEIMAGEFILES=\ +- webpage* +- +-imagedir=img +-htmldocimagedir=$(htmldocdir)/$(imagedir) +-exampleimagedir=$(exampledir)/$(imagedir) +- +-MOSTLYCLEANADD=\ +- $(PROCESSEDDOCFILES) \ +- $(PROCESSEDEXAMPLEFILES) \ +- $(HTMLEXAMPLEFILESALL) \ +- $(HTMLDOCFILESALL) \ +- groff.aux groff.cp* groff.dvi groff.es* groff.fn* groff.html groff.ky* \ +- groff.log groff.ma* groff.op* groff.pdf groff.pg* groff.ps groff.rq* \ +- groff.st* groff.toc groff.tp groff.vr* \ +- examples.stamp +- +-MOSTLYCLEANDIRADD=\ +- $(imagedir) +- +-MOSTLYCLEANNOTSRCDIRADD=\ +- groff.css \ +- grnexmpl.g \ +- groff.info \ +- groff-*.info \ +- gnu.eps +- +-RM=rm -f +- +-.SUFFIXES: .me .ms .ps .html +- +-# For simplicity, we always call preconv, grn, and eqn. +-.me.ps: +- $(GROFF) -k -Tps -ge -me >$@ +- +-.ms.html: +- $(GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \ +- -P-D$(imagedir) -P-V -Thtml -ms >$@ +-.ms.ps: +- $(GROFF) -Tps -ms -mwww >$@ +- +-all: $(make_otherdoc) \ +- $(make_infodoc) \ +- $(make_htmldoc) \ +- $(make_examples) \ +- $(make_htmlexamples) +- +-otherdoc: $(PROCESSEDDOCFILES) +-infodoc: groff.info +-htmldoc: $(HTMLDOCFILES) +- +-examples: examples.stamp $(PROCESSEDEXAMPLEFILES) +- +-html_examples: $(HTMLEXAMPLEFILES) +- +-examples.stamp: grnexmpl.g groff.css gnu.eps +- test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g . +- test -f groff.css || cp $(srcdir)/groff.css . +- if test ! -f gnu.eps; then \ +- if test -f $(srcdir)/gnu.eps; then \ +- cp $(srcdir)/gnu.eps .; \ +- elif test -f $(top_builddir)/contrib/pdfmark/gnu.eps; then \ +- cp $(top_builddir)/contrib/pdfmark/gnu.eps .; \ +- fi; \ +- fi +- echo timestamp > $@ +- +-groff.info: groff.texinfo +- $(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo +- +-gnu.eps: gnu.xpm +- xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 \ +- | $(pnmtops_nosetpage) -noturn -rle >$@ +- +-pic.html: pic.ms +- $(GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \ +- -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \ +- -Thtml -P-V -ms >$@ +- +-webpage.html: webpage.ms gnu.eps groff.css +- $(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \ +- -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \ +- -P-D$(imagedir) -Thtml -ms >$@ +- +-webpage.ps: gnu.eps +- +-grnexmpl.ps: grnexmpl.me grnexmpl.g +- +-distfiles: groff.info gnu.eps +- +-install_data: install_always $(make_install_otherdoc) \ +- $(make_install_infodoc) $(make_install_htmldoc) \ +- $(make_install_examples) +- +-install_always: +- -test -d $(DESTDIR)$(docdir) || $(mkinstalldirs) $(DESTDIR)$(docdir) +- +-install_otherdoc: install_always $(DOCFILES) $(PROCESSEDDOCFILES) +- for f in $(DOCFILES); do \ +- $(RM) $(DESTDIR)$(docdir)/$$f; \ +- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \ +- done +- for f in $(PROCESSEDDOCFILES); do \ +- $(RM) $(DESTDIR)$(docdir)/$$f; \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \ +- done +- +-install_infodoc: install_always groff.info +-# Prefer info files in builddir over srcdir; we test for +-# the existence of `groff.info'. +- -test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir) +- d=.; test -f "groff.info" || d=$(srcdir); \ +- for p in $$d/groff.info `ls $$d/groff.info*`; do \ +- f=`basename $$p`; \ +- $(RM) $(DESTDIR)$(infodir)/$$f; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/$$f; \ +- done +- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \ +- $(DESTDIR)$(infodir)/groff.info +- +-install_htmldoc: install_always $(HTMLDOCFILES) +- -test -d $(DESTDIR)$(htmldocdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(htmldocdir) +- for f in `ls $(HTMLDOCFILESALL)`; do \ +- $(RM) $(DESTDIR)$(htmldocdir)/$$f; \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(htmldocdir)/$$f; \ +- done +- -test -d $(DESTDIR)$(htmldocimagedir) \ +- || $(mkinstalldirs) $(DESTDIR)$(htmldocimagedir) +- $(RM) $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES) +- $(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) \ +- $(DESTDIR)$(htmldocimagedir) +- +-install_examples: install_always install_examples_always \ +- $(make_install_htmlexamples) +- +-install_examples_always: gnu.eps $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) +-# Prefer gnu.eps in builddir over srcdir. +- -test -d $(DESTDIR)$(exampledir) \ +- || $(mkinstalldirs) $(DESTDIR)$(exampledir) +- d=.; test -f "gnu.eps" || d=$(srcdir); \ +- $(RM) $(DESTDIR)$(exampledir)/gnu.eps; \ +- $(INSTALL_DATA) $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps +- for f in $(EXAMPLEFILES); do \ +- $(RM) $(DESTDIR)$(exampledir)/$$f; \ +- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \ +- done +- for f in $(PROCESSEDEXAMPLEFILES); do \ +- $(RM) $(DESTDIR)$(exampledir)/$$f; \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \ +- done +- +-install_htmlexamples: install_examples_always $(HTMLEXAMPLEFILES) +- for f in `ls $(HTMLEXAMPLEFILESALL)`; do \ +- $(RM) $(DESTDIR)$(exampledir)/$$f; \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \ +- done +- -test -d $(DESTDIR)$(exampleimagedir) \ +- || $(mkinstalldirs) $(DESTDIR)$(exampleimagedir) +- $(RM) $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES) +- $(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) \ +- $(DESTDIR)$(exampleimagedir) +- +-uninstall_sub: uninstall_always \ +- $(make_uninstall_infodoc) $(make_uninstall_htmldoc) \ +- $(make_uninstall_examples) +- +-uninstall_always: +- -for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \ +- $(RM) $(DESTDIR)$(docdir)/$$f; \ +- done +- +-uninstall_infodoc: uninstall_always +- -$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)$(infodir) \ +- $(DESTDIR)$(infodir)/groff.info +- -for f in groff `ls groff.info*`; do \ +- $(RM) $(DESTDIR)$(infodir)/$$f; \ +- done +- +-uninstall_htmldoc: uninstall_always +- -for f in `ls $(HTMLDOCFILESALL)`; do \ +- $(RM) $(DESTDIR)$(htmldocdir)/$$f; \ +- done +- $(RM) $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES) +- -test -d $(DESTDIR)$(htmldocimagedir) && \ +- rmdir $(DESTDIR)$(htmldocimagedir) +- +-uninstall_examples: uninstall_always uninstall_examples_always \ +- $(make_uninstall_htmlexamples) +- -test -d $(DESTDIR)$(exampledir) && \ +- rmdir $(DESTDIR)$(exampledir) +- +-uninstall_examples_always: +- -for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES); do \ +- $(RM) $(DESTDIR)$(exampledir)/$$f; \ +- done +- $(RM) $(DESTDIR)$(exampledir)/gnu.eps +- +-uninstall_htmlexamples: uninstall_examples_always +- -for f in `ls $(HTMLEXAMPLEFILESALL)`; do \ +- $(RM) $(DESTDIR)$(exampledir)/$$f; \ +- done +- $(RM) $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES) +- -test -d $(DESTDIR)$(exampleimagedir) && \ +- rmdir $(DESTDIR)$(exampleimagedir) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/doc/texinfo.tex groff-1.22.3/doc/texinfo.tex +--- groff-1.22.3.old/doc/texinfo.tex 2014-11-04 10:38:35.563519771 +0200 ++++ groff-1.22.3/doc/texinfo.tex 1970-01-01 02:00:00.000000000 +0200 +@@ -1,10183 +0,0 @@ +-% 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{2014-10-29.10} +-% +-% 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, 2014 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 . +-% +-% 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 % 0: top marks (\last...) +- \noexpand\or \the\toks4 \the\toks6 % 1: bottom marks (default, \prev...) +- \noexpand\else \the\toks8 % 2: color marks +- }% +-} +-% \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). +- \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars} +- % +- \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi +- \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% +- % +- \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi +- \global\setbox\footlinebox = \vbox{\commmonheadfootline \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 `\^^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 using ideas from 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. The dark red here is dark enough to print on paper as +- % nearly black, but still distinguishable for online viewing. We use +- % black by default, though. +- \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 black for everything. +- \def\urlcolor{\rgbBlack} +- \def\linkcolor{\rgbBlack} +- \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{17pt}} +-\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\ifx\next\.% +- \else\ifx\next\comma% +- \else\ptexslash +- \fi\fi\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. +-% (But see \codedashfinish below.) +-% 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 +- % Given -foo (with a single dash), we do not want to allow a break +- % after the hyphen. +- \global\let\codedashprev=\codedash +- % +- \codex +- } +- % +- \gdef\codedash{\futurelet\next\codedashfinish} +- \gdef\codedashfinish{% +- \normaldash % always output the dash character itself. +- % +- % Now, output a discretionary to allow a line break, unless +- % (a) the next character is a -, or +- % (b) the preceding character is a -. +- % E.g., given --posix, we do not want to allow a break after either -. +- % Given --foo-bar, we do want to allow a break between the - and the b. +- \ifx\next\codedash \else +- \ifx\codedashprev\codedash +- \else \discretionary{}{}{}\fi +- \fi +- % we need the space after the = for the case when \next itself is a +- % space token; it would get swallowed otherwise. As in @code{- a}. +- \global\let\codedashprev= \next +- } +-} +-\def\normaldash{-} +-% +-\def\codex #1{\tclose{#1}\endgroup} +- +-\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') aka @url 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. +- +-% TeX-only option to allow changing PDF output to show only the second +-% arg (if given), and not the url (which is then just the link target). +-\newif\ifurefurlonlylink +- +-% The main macro is \urefbreak, which allows breaking at expected +-% places within the url. (There used to be another version, which +-% didn't support automatic breaking.) +-\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}% look for second arg +- \ifdim\wd0 > 0pt +- \ifpdf +- \ifurefurlonlylink +- % PDF plus option to not display url, show just arg +- \unhbox0 +- \else +- % PDF, normally display both arg and url for consistency, +- % visibility, if the pdf is eventually used to print, etc. +- \unhbox0\ (\urefcode{#1})% +- \fi +- \else +- \unhbox0\ (\urefcode{#1})% DVI, always show arg 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\urefprestretchamount{.13em} +-\def\urefpoststretchamount{.1em} +-\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax} +-\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax} +-% +-\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 +-} +-% +-% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if +-% FMTNAME is tex, else ELSE-TEXT. +-\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} +-\long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{% +- \def\inlinefmtname{#1}% +- \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\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. +-} +- +-% @inlineifset{VAR, TEXT} expands TEXT if VAR is @set. +-% +-\long\def\inlineifset#1{\doinlineifset #1,\finish} +-\long\def\doinlineifset#1,#2,\finish{% +- \def\inlinevarname{#1}% +- \expandafter\ifx\csname SET\inlinevarname\endcsname\relax +- \else\ignorespaces#2\fi +-} +- +-% @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set. +-% +-\long\def\inlineifclear#1{\doinlineifclear #1,\finish} +-\long\def\doinlineifclear#1,#2,\finish{% +- \def\inlinevarname{#1}% +- \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi +-} +- +- +-\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 so 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 . +- % +- \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 below 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 +- \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings +- \global\everytab={\bf}% can't use \headitemfont since the parsing differs +- \the\everytab % for the first item +-}% +-% +-% default for tables with no headings. +-\let\headitemcrhook=\relax +-% +-% 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={}% Reset from possible headitem. +- \global\colcount=0 % Reset the column counter. +- % +- % Check for saved footnotes, etc.: +- \checkinserts +- % +- % Perhaps a \nobreak, then reset: +- \headitemcrhook +- \global\let\headitemcrhook=\relax +- }% +- }% +- % +- \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). +-% +-% Unfortunately, this has the consequence that when _ is in the *value* +-% of an @set, it does not print properly in the roman fonts (get the cmr +-% dot accent at position 126 instead). No fix comes to mind, and it's +-% been this way since 2003 or earlier, so just ignore it. +-% +-\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 the special treatment we need for `@end ifset,' we call +-% \makecond and then 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 use @lbracechar and @rbracechar? +- \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 +- % This 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 +- % +- % Consider: +- % @macro mkind{arg1,arg2} +- % @cindex \arg2\ +- % @end macro +- % @mkind{foo, bar} +- % The space after the comma will end up in the temporary definition +- % that we make for arg2 (see \parsemargdef ff.). We want all this to be +- % expanded for the sake of the index, so we end up just seeing "bar". +- \let\xeatspaces = \eatspaces +-} +- +-% For testing: output @{ and @} in index sort strings as \{ and \}. +-\newif\ifusebracesinindexes +- +-% \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 }. +- \ifusebracesinindexes +- \def\lbracechar{\lbracecmd}% +- \def\rbracechar{\rbracecmd}% +- \else +- \def\lbracechar{|a}% +- \def\rbracechar{|b}% +- \fi +- \let\{=\lbracechar +- \let\}=\rbracechar +- % +- % +- % 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 to achieve this: TeX expands \the only once, +- % simply yielding the contents of . (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. +-% Not used for @heading series. +-% +-% To test against our argument. +-\def\Ynothingkeyword{Ynothing} +-\def\Yappendixkeyword{Yappendix} +-\def\Yomitfromtockeyword{Yomitfromtoc} +-% +-\def\chapmacro#1#2#3{% +- \checkenv{}% chapters, etc., should not start inside an environment. +- % +- % 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 of the title, +-% #2 is the section level (sec/subsec/subsubsec), +-% #3 is the section type (Ynumbered, Ynothing, Yappendix, Yomitfromtoc), +-% #4 is the section number. +-% +-\def\seckeyword{sec} +-% +-\def\sectionheading#1#2#3#4{% +- {% +- \def\sectionlevel{#2}% +- \def\temptype{#3}% +- % +- % It is ok for the @heading series commands to appear inside an +- % environment (it's been historically allowed, though the logic is +- % dubious), but not the others. +- \ifx\temptype\Yomitfromtockeyword\else +- \checkenv{}% non-@*heading should not be in an environment. +- \fi +- % +- % Switch to the right set of fonts. +- \csname #2fonts\endcsname \rmisbold +- % +- % 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. +- \global\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 +- \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 % we've made it 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 +- % +- % 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 +- \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % 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. Don't stretch around special +-% characters in urls in this environment, since the stretch at the right +-% should be enough. +-\envdef\raggedright{% +- \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax +- \def\urefprestretchamount{0pt}% +- \def\urefpoststretchamount{0pt}% +-} +-\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{...} +-% If we want to allow any 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'{'#1'}'{#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 +-% 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 is 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 +- % +- % Nested footnotes are not supported in TeX, that would take a lot +- % more work. (\startsavinginserts does not suffice.) +- \let\footnote=\errfootnote +- % +- % 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 +- +-\def\errfootnote{% +- \errhelp=\EMsimple +- \errmessage{Nested footnotes not supported in texinfo.tex, +- even though they work in makeinfo; sorry} +-} +- +-% 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{% +- \tex % read txi-??.tex file in plain TeX. +- % Read the file by the name they passed if it exists. +- \let_ = \normalunderscore % normal _ character for filename test +- \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 +-} +-% +-% 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\activetilde{{\tt\char126}} \let~ = \activetilde +-\chardef\hat=`\^ +-\catcode`\^=\active \def\activehat{{\tt \hat}} \let^ = \activehat +- +-\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\activeless{{\tt \less}}\let< = \activeless +-\chardef \gtr=`\> +-\catcode`\>=\active \def\activegtr{{\tt \gtr}}\let> = \activegtr +-\catcode`\+=\active \def+{{\tt \char 43}} +-\catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix +- +-% used for headline/footline in the output routine, in case the page +-% breaks in the middle of an @tex block. +-\def\texinfochars{% +- \let< = \activeless +- \let> = \activegtr +- \let~ = \activetilde +- \let^ = \activehat +- \markupsetuplqdefault \markupsetuprqdefault +- \let\b = \strong +- \let\i = \smartitalic +- % in principle, all other definitions in \tex have to be undone too. +-} +- +-% 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 +diff -Nuar groff-1.22.3.old/font/devascii/devascii.am groff-1.22.3/font/devascii/devascii.am +--- groff-1.22.3.old/font/devascii/devascii.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devascii/devascii.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,46 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devascii_srcdir = $(top_srcdir)/font/devascii ++DEVASCIIFONTS = R I B BI ++DEVASCIIFONTSFILES = \ ++ font/devascii/R font/devascii/I font/devascii/B font/devascii/BI ++ ++DEVASCIIRES = 240 ++DEVASCIICPI = 10 ++DEVASCIILPI = 6 ++ ++devasciifontdir = $(fontdir)/devascii ++devasciifont_DATA = $(DEVASCIIFONTSFILES) font/devascii/DESC ++MOSTLYCLEANFILES += $(DEVASCIIFONTSFILES) font/devascii/DESC ++EXTRA_DIST += \ ++ font/devascii/R.proto \ ++ font/devascii/DESC.proto ++ ++$(DEVASCIIFONTSFILES): $(devascii_srcdir)/R.proto ++ @echo Making $@ ++ $(MKDIR_P) `dirname $@` ++ $(RM) $@ ++ $(SHELL) $(GENFONTSSH) $(devascii_srcdir)/R.proto \ ++ $(DEVASCIIRES) $(DEVASCIICPI) `basename $@` > $@ ++ ++font/devascii/DESC: $(devascii_srcdir)/DESC.proto ++ @echo Making $@ ++ $(MKDIR_P) `dirname $@` ++ $(SHELL) $(GENDESCSH) $(devascii_srcdir)/DESC.proto \ ++ $(DEVASCIIRES) $(DEVASCIICPI) $(DEVASCIILPI) $(DEVASCIIFONTS) > $@ +diff -Nuar groff-1.22.3.old/font/devascii/.gitignore groff-1.22.3/font/devascii/.gitignore +--- groff-1.22.3.old/font/devascii/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devascii/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++B ++BI ++DESC ++I ++R +diff -Nuar groff-1.22.3.old/font/devascii/Makefile.sub groff-1.22.3/font/devascii/Makefile.sub +--- groff-1.22.3.old/font/devascii/Makefile.sub 2014-11-04 10:38:35.401521797 +0200 ++++ groff-1.22.3/font/devascii/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,68 +0,0 @@ +-# Makefile.sub for `font devascii' +-# +-# File position: /font/devascii/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=ascii +-FONTS=R I B BI +-DEVFILES=$(FONTS) DESC +-MOSTLYCLEANADD=$(FONTS) DESC +- +-RES=240 +-CPI=10 +-LPI=6 +- +-RM=rm -f +- +-$(FONTS): R.proto +- @echo Making $@ +- @$(RM) $@ +- @charwidth=`expr $(RES) / $(CPI)` ; \ +- sed -e "s/^name [A-Z]*$$/name $@/" \ +- -e \ +- "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \ +- -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \ +- -e "s/^internalname .*$$/internalname $@/" \ +- -e "/^internalname/s/BI/3/" \ +- -e "/^internalname/s/B/2/" \ +- -e "/^internalname/s/I/1/" \ +- -e "/^internalname .*[^ 0-9]/d" \ +- $(srcdir)/R.proto >$@ +- +-DESC: DESC.proto +- @echo Making $@ +- @sed -e "s/^res .*$$/res $(RES)/" \ +- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ +- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ +- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ +- $(srcdir)/DESC.proto >$@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devcp1047/devcp1047.am groff-1.22.3/font/devcp1047/devcp1047.am +--- groff-1.22.3.old/font/devcp1047/devcp1047.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devcp1047/devcp1047.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devcp1047_srcdir = $(top_srcdir)/font/devcp1047 ++DEVCP1047FONTS = R I B BI ++DEVCP1047FONTSFILES = \ ++ font/devcp1047/R font/devcp1047/I font/devcp1047/B font/devcp1047/BI ++ ++DEVCP1047RES = 240 ++DEVCP1047CPI = 10 ++DEVCP1047LPI = 6 ++ ++devcp1047fontdir = $(fontdir)/devcp1047 ++devcp1047font_DATA = $(DEVCP1047FONTSFILES) font/devcp1047/DESC ++MOSTLYCLEANFILES += $(DEVCP1047FONTSFILES) font/devcp1047/DESC ++EXTRA_DIST += font/devcp1047/R.proto font/devcp1047/DESC.proto ++ ++$(DEVCP1047FONTSFILES): $(devcp1047_srcdir)/R.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(RM) $@ ++ @$(SHELL) $(GENFONTSSH) $(devcp1047_srcdir)/R.proto \ ++ $(DEVCP1047RES) $(DEVCP1047CPI) `basename $@` > $@ ++ ++font/devcp1047/DESC: $(devcp1047_srcdir)/DESC.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(SHELL) $(GENDESCSH) $(devcp1047_srcdir)/DESC.proto \ ++ $(DEVCP1047RES) $(DEVCP1047CPI) $(DEVCP1047LPI) $(DEVCP1047FONTS) > $@ +diff -Nuar groff-1.22.3.old/font/devcp1047/.gitignore groff-1.22.3/font/devcp1047/.gitignore +--- groff-1.22.3.old/font/devcp1047/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devcp1047/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++B ++BI ++DESC ++I ++R +diff -Nuar groff-1.22.3.old/font/devcp1047/Makefile.sub groff-1.22.3/font/devcp1047/Makefile.sub +--- groff-1.22.3.old/font/devcp1047/Makefile.sub 2014-11-04 10:38:35.414521634 +0200 ++++ groff-1.22.3/font/devcp1047/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,68 +0,0 @@ +-# Makefile.sub for `font devcp1047' +-# +-# File position: /font/devcp1047/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=cp1047 +-FONTS=R I B BI +-DEVFILES=$(FONTS) DESC +-MOSTLYCLEANADD=$(FONTS) DESC +- +-RES=240 +-CPI=10 +-LPI=6 +- +-RM=rm -f +- +-$(FONTS): R.proto +- @echo Making $@ +- @$(RM) $@ +- @charwidth=`expr $(RES) / $(CPI)` ; \ +- sed -e "s/^name [A-Z]*$$/name $@/" \ +- -e \ +- "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \ +- -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \ +- -e "s/^internalname .*$$/internalname $@/" \ +- -e "/^internalname/s/BI/3/" \ +- -e "/^internalname/s/B/2/" \ +- -e "/^internalname/s/I/1/" \ +- -e "/^internalname .*[^ 0-9]/d" \ +- $(srcdir)/R.proto >$@ +- +-DESC: DESC.proto +- @echo Making $@ +- @sed -e "s/^res .*$$/res $(RES)/" \ +- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ +- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ +- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ +- $(srcdir)/DESC.proto >$@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devdvi/devdvi.am groff-1.22.3/font/devdvi/devdvi.am +--- groff-1.22.3.old/font/devdvi/devdvi.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devdvi/devdvi.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,90 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devdvi_srcdir = $(top_srcdir)/font/devdvi ++DEVDVIFONTFILES = \ ++ font/devdvi/TR \ ++ font/devdvi/TI \ ++ font/devdvi/TB \ ++ font/devdvi/TBI \ ++ font/devdvi/CW \ ++ font/devdvi/CWI \ ++ font/devdvi/HR \ ++ font/devdvi/HI \ ++ font/devdvi/HB \ ++ font/devdvi/HBI \ ++ font/devdvi/TREC \ ++ font/devdvi/TIEC \ ++ font/devdvi/TBEC \ ++ font/devdvi/TBIEC \ ++ font/devdvi/CWEC \ ++ font/devdvi/CWIEC \ ++ font/devdvi/HREC \ ++ font/devdvi/HIEC \ ++ font/devdvi/HBEC \ ++ font/devdvi/HBIEC \ ++ font/devdvi/TRTC \ ++ font/devdvi/TITC \ ++ font/devdvi/TBTC \ ++ font/devdvi/TBITC \ ++ font/devdvi/CWTC \ ++ font/devdvi/CWITC \ ++ font/devdvi/HRTC \ ++ font/devdvi/HITC \ ++ font/devdvi/HBTC \ ++ font/devdvi/HBITC \ ++ font/devdvi/MI \ ++ font/devdvi/S \ ++ font/devdvi/EX \ ++ font/devdvi/SA \ ++ font/devdvi/SB \ ++ font/devdvi/SC ++devdvifontdir = $(fontdir)/devdvi ++devdvifont_DATA = $(DEVDVIFONTFILES) font/devdvi/DESC ++ ++DEVDVIGENFILES = \ ++ font/devdvi/generate/Makefile \ ++ font/devdvi/generate/msam.map \ ++ font/devdvi/generate/msbm.map \ ++ font/devdvi/generate/texb.map \ ++ font/devdvi/generate/texex.map \ ++ font/devdvi/generate/texi.map \ ++ font/devdvi/generate/texmi.map \ ++ font/devdvi/generate/texr.map \ ++ font/devdvi/generate/texsy.map \ ++ font/devdvi/generate/textt.map \ ++ font/devdvi/generate/textex.map \ ++ font/devdvi/generate/ec.map \ ++ font/devdvi/generate/tc.map \ ++ font/devdvi/generate/CompileFonts ++devdvigendir = $(fontdir)/devdvi/generate ++devdvigen_DATA = $(DEVDVIGENFILES) ++ ++EXTRA_DIST += $(DEVDVIFONTFILES) $(DEVDVIGENFILES) font/devdvi/DESC.in ++MOSTLYCLEANFILES += font/devdvi/DESC ++ ++font/devdvi/DESC: $(devdvi_srcdir)/DESC.in ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @cat $(devdvi_srcdir)/DESC.in >$@ ++ @if test "$(PAGE)" = A4; then \ ++ echo "papersize a4" >>$@; \ ++ else \ ++ echo "papersize letter" >>$@; \ ++ fi ++ @test -z '$(DVIPRINT)' || echo print '$(DVIPRINT)' >>$@ +diff -Nuar groff-1.22.3.old/font/devdvi/.gitignore groff-1.22.3/font/devdvi/.gitignore +--- groff-1.22.3.old/font/devdvi/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devdvi/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++DESC +diff -Nuar groff-1.22.3.old/font/devdvi/Makefile.sub groff-1.22.3/font/devdvi/Makefile.sub +--- groff-1.22.3.old/font/devdvi/Makefile.sub 2014-11-04 10:38:35.350522434 +0200 ++++ groff-1.22.3/font/devdvi/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,58 +0,0 @@ +-# Makefile.sub for `font devdvi' +-# +-# File position: /font/devdvi/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=dvi +-DEVFILES=DESC \ +- TR TI TB TBI CW CWI HR HI HB HBI \ +- TREC TIEC TBEC TBIEC CWEC CWIEC HREC HIEC HBEC HBIEC \ +- TRTC TITC TBTC TBITC CWTC CWITC HRTC HITC HBTC HBITC \ +- MI S EX SA SB SC \ +- generate/Makefile \ +- generate/msam.map generate/msbm.map \ +- generate/texb.map generate/texex.map generate/texi.map generate/texmi.map \ +- generate/texr.map generate/texsy.map generate/textt.map generate/textex.map \ +- generate/ec.map generate/tc.map +-DEVSCRIPTS=generate/CompileFonts +- +-MOSTLYCLEANADD=DESC +- +-DESC: DESC.in +- cat $(srcdir)/DESC.in >DESC +- if test "$(PAGE)" = A4; then \ +- echo "papersize a4" >>DESC; \ +- else \ +- echo "papersize letter" >>DESC; \ +- fi +- test -z '$(DVIPRINT)' || echo print '$(DVIPRINT)' >>DESC +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devhtml/devhtml.am groff-1.22.3/font/devhtml/devhtml.am +--- groff-1.22.3.old/font/devhtml/devhtml.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devhtml/devhtml.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,56 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devhtml_srcdir = $(top_srcdir)/font/devhtml ++DEVHTMLFONTS = R I B BI CR CI CB CBI S ++DEVHTMLFONTSFILES = \ ++ font/devhtml/R \ ++ font/devhtml/I \ ++ font/devhtml/B \ ++ font/devhtml/BI \ ++ font/devhtml/CR \ ++ font/devhtml/CI \ ++ font/devhtml/CB \ ++ font/devhtml/CBI \ ++ font/devhtml/S ++ ++DEVHTMLRES = 240 ++DEVHTMLCPI = 10 ++DEVHTMLLPI = 6 ++ ++devhtmlfontdir = $(fontdir)/devhtml ++devhtmlfont_DATA = $(DEVHTMLFONTSFILES) font/devhtml/DESC ++MOSTLYCLEANFILES += $(DEVHTMLFONTSFILES) font/devhtml/DESC ++EXTRA_DIST += \ ++ font/devhtml/R.proto \ ++ font/devhtml/DESC.proto \ ++ font/devhtml/R.in ++ ++$(DEVHTMLFONTSFILES): $(devhtml_srcdir)/R.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(RM) $@ ++ @$(SHELL) $(GENFONTSSH) $(devhtml_srcdir)/R.proto \ ++ $(DEVHTMLRES) $(DEVHTMLCPI) `basename $@` > $@ ++ ++font/devhtml/DESC: $(devhtml_srcdir)/DESC.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(SHELL) $(GENDESCSH) $(devhtml_srcdir)/DESC.proto \ ++ $(DEVHTMLRES) $(DEVHTMLCPI) $(DEVHTMLLPI) $(DEVHTMLFONTS) > $@ ++ @echo "image_generator $(GHOSTSCRIPT)" >> $@ +diff -Nuar groff-1.22.3.old/font/devhtml/.gitignore groff-1.22.3/font/devhtml/.gitignore +--- groff-1.22.3.old/font/devhtml/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devhtml/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,10 @@ ++B ++BI ++CB ++CBI ++CI ++CR ++DESC ++I ++R ++S +diff -Nuar groff-1.22.3.old/font/devhtml/Makefile.sub groff-1.22.3/font/devhtml/Makefile.sub +--- groff-1.22.3.old/font/devhtml/Makefile.sub 2014-11-04 10:38:35.356522359 +0200 ++++ groff-1.22.3/font/devhtml/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,71 +0,0 @@ +-# Makefile.sub for `font devhtml' +-# +-# File position: /font/devhtml/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=html +-PROTOFONTS=R I B BI CR CI CB CBI +-FONTS=$(PROTOFONTS) S +-DEVFILES=$(FONTS) DESC +-MOSTLYCLEANADD=$(FONTS) DESC +- +-RES=240 +-CPI=10 +-LPI=6 +- +-RM=rm -f +- +-$(FONTS): R.proto +- @echo Making $@ +- @$(RM) $@ +- @charwidth=`expr $(RES) / $(CPI)` ; \ +- sed -e "s/^name [A-Z]*$$/name $@/" \ +- -e \ +- "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \ +- -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \ +- -e "s/^internalname .*$$/internalname $@/" \ +- -e "/^internalname/s/CR/4/" \ +- -e "/^internalname/s/BI/3/" \ +- -e "/^internalname/s/B/2/" \ +- -e "/^internalname/s/I/1/" \ +- -e "/^internalname .*[^ 0-9]/d" \ +- $(srcdir)/R.proto >$@ +- +-DESC: DESC.proto +- @echo Making $@ +- @sed -e "s/^res .*$$/res $(RES)/" \ +- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ +- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ +- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ +- $(srcdir)/DESC.proto >$@ +- @echo "image_generator $(GHOSTSCRIPT)" >> $@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devlatin1/devlatin1.am groff-1.22.3/font/devlatin1/devlatin1.am +--- groff-1.22.3.old/font/devlatin1/devlatin1.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devlatin1/devlatin1.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devlatin1_srcdir = $(top_srcdir)/font/devlatin1 ++DEVLATIN1FONTS = R I B BI ++DEVLATIN1FONTSFILES = \ ++ font/devlatin1/R font/devlatin1/I font/devlatin1/B font/devlatin1/BI ++ ++DEVLATIN1RES = 240 ++DEVLATIN1CPI = 10 ++DEVLATIN1LPI = 6 ++ ++devlatin1fontdir = $(fontdir)/devlatin1 ++devlatin1font_DATA = $(DEVLATIN1FONTSFILES) font/devlatin1/DESC ++MOSTLYCLEANFILES += $(DEVLATIN1FONTSFILES) font/devlatin1/DESC ++EXTRA_DIST += font/devlatin1/R.proto font/devlatin1/DESC.proto ++ ++$(DEVLATIN1FONTSFILES): $(devlatin1_srcdir)/R.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(RM) $@ ++ @$(SHELL) $(GENFONTSSH) $(devlatin1_srcdir)/R.proto \ ++ $(DEVLATIN1RES) $(DEVLATIN1CPI) `basename $@` > $@ ++ ++font/devlatin1/DESC: $(devlatin1_srcdir)/DESC.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(SHELL) $(GENDESCSH) $(devlatin1_srcdir)/DESC.proto \ ++ $(DEVLATIN1RES) $(DEVLATIN1CPI) $(DEVLATIN1LPI) $(DEVLATIN1FONTS) > $@ +diff -Nuar groff-1.22.3.old/font/devlatin1/.gitignore groff-1.22.3/font/devlatin1/.gitignore +--- groff-1.22.3.old/font/devlatin1/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devlatin1/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++B ++BI ++DESC ++I ++R +diff -Nuar groff-1.22.3.old/font/devlatin1/Makefile.sub groff-1.22.3/font/devlatin1/Makefile.sub +--- groff-1.22.3.old/font/devlatin1/Makefile.sub 2014-11-04 10:38:35.405521747 +0200 ++++ groff-1.22.3/font/devlatin1/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,65 +0,0 @@ +-# Makefile.sub for `font devlatin1' +-# +-# File position: /font/devlatin1/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=latin1 +-FONTS=R I B BI +-DEVFILES=$(FONTS) DESC +-MOSTLYCLEANADD=$(FONTS) DESC +- +-RES=240 +-CPI=10 +-LPI=6 +- +-RM=rm -f +- +-$(FONTS): R.proto +- @echo Making $@ +- @$(RM) $@ +- @charwidth=`expr $(RES) / $(CPI)` ; \ +- sed -e "s/^name [A-Z]*$$/name $@/" \ +- -e \ +- "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \ +- -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \ +- -e "s/^internalname .*$$/internalname $@/" \ +- -e "/^internalname/s/BI/3/" \ +- -e "/^internalname/s/B/2/" \ +- -e "/^internalname/s/I/1/" \ +- -e "/^internalname .*[^ 0-9]/d" \ +- $(srcdir)/R.proto >$@ +- +-DESC: DESC.proto +- @echo Making $@ +- @sed -e "s/^res .*$$/res $(RES)/" \ +- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ +- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ +- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ +- $(srcdir)/DESC.proto >$@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devlbp/devlbp.am groff-1.22.3/font/devlbp/devlbp.am +--- groff-1.22.3.old/font/devlbp/devlbp.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devlbp/devlbp.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,54 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++LBPPRINT=$(PSPRINT) ++devlbp_srcdir = $(top_srcdir)/font/devlbp ++DEVLBPFONTFILES = \ ++ font/devlbp/HB \ ++ font/devlbp/HBI \ ++ font/devlbp/HI \ ++ font/devlbp/HR \ ++ font/devlbp/HNB \ ++ font/devlbp/HNBI \ ++ font/devlbp/HNI \ ++ font/devlbp/HNR \ ++ font/devlbp/TB \ ++ font/devlbp/TBI \ ++ font/devlbp/TI \ ++ font/devlbp/TR \ ++ font/devlbp/CR \ ++ font/devlbp/CB \ ++ font/devlbp/CI \ ++ font/devlbp/ER \ ++ font/devlbp/EB \ ++ font/devlbp/EI ++devlbpfontdir = $(fontdir)/devlbp ++devlbpfont_DATA = $(DEVLBPFONTFILES) font/devlbp/DESC ++EXTRA_DIST += $(DEVLBPFONTFILES) font/devlbp/DESC.in ++MOSTLYCLEANFILES += font/devlbp/DESC ++ ++font/devlbp/DESC: $(devlbp_srcdir)/DESC.in ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @cat $(devlbp_srcdir)/DESC.in >$@ ++ @if test "$(PAGE)" = A4; then \ ++ echo "papersize a4" >>$@; \ ++ else \ ++ echo "papersize letter" >>$@; \ ++ fi ++ @test -z '$(LBPPRINT)' || echo print '$(LBPPRINT)' >>$@ +diff -Nuar groff-1.22.3.old/font/devlbp/.gitignore groff-1.22.3/font/devlbp/.gitignore +--- groff-1.22.3.old/font/devlbp/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devlbp/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++DESC +diff -Nuar groff-1.22.3.old/font/devlbp/Makefile.sub groff-1.22.3/font/devlbp/Makefile.sub +--- groff-1.22.3.old/font/devlbp/Makefile.sub 2014-11-04 10:38:35.396521859 +0200 ++++ groff-1.22.3/font/devlbp/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,54 +0,0 @@ +-# Makefile.sub for `font devlbp' +-# +-# File position: /font/devlbp/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=lbp +-LBPPRINT=$(PSPRINT) +-DEVFILES=DESC \ +- HB HBI HI HR \ +- HNB HNBI HNI HNR \ +- TB TBI TI TR \ +- CR CB CI \ +- ER EB EI +- +-MOSTLYCLEANADD=DESC +- +-DESC: DESC.in +- cat $(srcdir)/DESC.in >DESC +- if test "$(PAGE)" = A4; then \ +- echo "papersize a4" >>DESC; \ +- else \ +- echo "papersize letter" >>DESC; \ +- fi +- test -z '$(LBPPRINT)' || echo print '$(LBPPRINT)' >>DESC +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devlj4/devlj4.am groff-1.22.3/font/devlj4/devlj4.am +--- groff-1.22.3.old/font/devlj4/devlj4.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devlj4/devlj4.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,104 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devlj4_srcdir = $(top_srcdir)/font/devlj4 ++LJ4RES = 1200 ++LJ4PRINT = $(PSPRINT) ++DEVLJ4FONTFILES = \ ++ font/devlj4/AB \ ++ font/devlj4/ABI \ ++ font/devlj4/AI \ ++ font/devlj4/AR \ ++ font/devlj4/ALBB \ ++ font/devlj4/ALBR \ ++ font/devlj4/AOB \ ++ font/devlj4/AOI \ ++ font/devlj4/AOR \ ++ font/devlj4/CB \ ++ font/devlj4/CBI \ ++ font/devlj4/CI \ ++ font/devlj4/CR \ ++ font/devlj4/GB \ ++ font/devlj4/GBI \ ++ font/devlj4/GI \ ++ font/devlj4/GR \ ++ font/devlj4/LGB \ ++ font/devlj4/LGI \ ++ font/devlj4/LGR \ ++ font/devlj4/OB \ ++ font/devlj4/OBI \ ++ font/devlj4/OI \ ++ font/devlj4/OR \ ++ font/devlj4/TB \ ++ font/devlj4/TBI \ ++ font/devlj4/TI \ ++ font/devlj4/TR \ ++ font/devlj4/TNRB \ ++ font/devlj4/TNRBI \ ++ font/devlj4/TNRI \ ++ font/devlj4/TNRR \ ++ font/devlj4/UB \ ++ font/devlj4/UBI \ ++ font/devlj4/UI \ ++ font/devlj4/UR \ ++ font/devlj4/UCB \ ++ font/devlj4/UCBI \ ++ font/devlj4/UCI \ ++ font/devlj4/UCR \ ++ font/devlj4/CLARENDON \ ++ font/devlj4/CORONET \ ++ font/devlj4/MARIGOLD \ ++ font/devlj4/S \ ++ font/devlj4/SYMBOL \ ++ font/devlj4/WINGDINGS ++ ++devlj4fontdir = $(fontdir)/devlj4 ++dist_devlj4font_DATA = $(DEVLJ4FONTFILES) ++nodist_devlj4font_DATA = font/devlj4/DESC ++ ++DEVLJ4GENFILES = \ ++ font/devlj4/generate/Makefile \ ++ font/devlj4/generate/special.map \ ++ font/devlj4/generate/symbol.map \ ++ font/devlj4/generate/text.map \ ++ font/devlj4/generate/wingdings.map \ ++ font/devlj4/generate/special.awk ++devlj4fontgendir = $(devlj4fontdir)/generate ++dist_devlj4fontgen_DATA = $(DEVLJ4GENFILES) ++ ++EXTRA_DIST += font/devlj4/DESC.in ++ ++MOSTLYCLEANFILES += font/devlj4/DESC ++ ++font/devlj4/DESC: $(devlj4_srcdir)/DESC.in ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @echo "res $(LJ4RES)" >$@ ++ @echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>$@ ++ @cat $(devlj4_srcdir)/DESC.in >>$@ ++ @if test "$(PAGE)" = A4; then \ ++ echo "papersize a4" >>$@; \ ++ else \ ++ echo "papersize letter" >>$@; \ ++ fi ++ @test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>$@ ++ ++fonts: devlj4_fonts ++devlj4_fonts: hpftodit font/devlj4/DESC ++ $(MAKE) -f $(devlj4_srcdir)/generate/Makefile \ ++ srcdir=$(devlj4_srcdir)/generate HPFTODIT=$(top_builddir)/hpftodit +diff -Nuar groff-1.22.3.old/font/devlj4/.gitignore groff-1.22.3/font/devlj4/.gitignore +--- groff-1.22.3.old/font/devlj4/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devlj4/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++DESC +diff -Nuar groff-1.22.3.old/font/devlj4/Makefile.sub groff-1.22.3/font/devlj4/Makefile.sub +--- groff-1.22.3.old/font/devlj4/Makefile.sub 2014-11-04 10:38:35.387521972 +0200 ++++ groff-1.22.3/font/devlj4/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,77 +0,0 @@ +-# Makefile.sub for `font devlj4' +-# +-# File position: /font/devlj4/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# Written by Werner Lemberg and +-# Bernd Warken . +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `groffer' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=lj4 +-LJ4RES=1200 +-LJ4PRINT=$(PSPRINT) +-DEVFILES=DESC \ +- AB ABI AI AR \ +- ALBB ALBR \ +- AOB AOI AOR \ +- CB CBI CI CR \ +- GB GBI GI GR \ +- LGB LGI LGR \ +- OB OBI OI OR \ +- TB TBI TI TR \ +- TNRB TNRBI TNRI TNRR \ +- UB UBI UI UR \ +- UCB UCBI UCI UCR \ +- CLARENDON CORONET MARIGOLD S \ +- SYMBOL WINGDINGS \ +- generate/Makefile \ +- generate/special.map \ +- generate/symbol.map \ +- generate/text.map \ +- generate/wingdings.map \ +- generate/special.awk +- +-MOSTLYCLEANADD=DESC +- +-DESC: DESC.in +- echo "res $(LJ4RES)" >DESC +- echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>DESC +- cat $(srcdir)/DESC.in >>DESC +- if test "$(PAGE)" = A4; then \ +- echo "papersize a4" >>DESC; \ +- else \ +- echo "papersize letter" >>DESC; \ +- fi +- test -z '$(LJ4PRINT)' || echo print '$(LJ4PRINT)' >>DESC +- +-fonts: +- $(MAKE) -f $(srcdir)/generate/Makefile srcdir=$(srcdir)/generate \ +- HPFTODIT=$(top_builddir)/src/utils/hpftodit/hpftodit +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devpdf/devpdf.am groff-1.22.3/font/devpdf/devpdf.am +--- groff-1.22.3.old/font/devpdf/devpdf.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devpdf/devpdf.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,167 @@ ++# Copyright (C) 2011-2014 Free Software Foundation, Inc. ++# Free Software Foundation, Inc. ++# Original Makefile.sub Written ++# by Deri James ++# Automake migration by Bertrand Garrigues ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++devpdf_srcdir = $(top_srcdir)/font/devpdf ++GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf && grep -l internalname * | grep -v devpdf.am` ++ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*` ++MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*` ++ ++MOSTLYCLEANFILES += \ ++ font/devpdf/download \ ++ font/devpdf/DESC \ ++ font/devpdf/Foundry \ ++ font/devpdf/build_font_files \ ++ font/devpdf/util/BuildFoundries ++ ++devpdffontdir = $(fontdir)/devpdf ++devpdffont_DATA = \ ++ font/devpdf/DESC \ ++ font/devpdf/Foundry ++ ++devpdffontencdir = $(devpdffontdir)/enc ++devpdffontenc_DATA = font/devpdf/enc/text.enc ++ ++devpdffontmapdir = $(devpdffontdir)/map ++DEVPDFFONTMAP_1 = \ ++ font/devpdf/map/dingbats.map \ ++ font/devpdf/map/symbolchars \ ++ font/devpdf/map/textmap ++DEVPDFFONTMAP_2 = font/devpdf/map/symbolmap ++devpdffontmap_DATA = $(DEVPDFFONTMAP_1) $(DEVPDFFONTMAP_2) ++ ++devpdffontutildir = $(devpdffontdir)/util ++nodist_devpdffontutil_DATA = font/devpdf/util/BuildFoundries ++ ++EXTRA_DIST += \ ++ font/devpdf/DESC.in \ ++ font/devpdf/Foundry.in \ ++ font/devpdf/util/BuildFoundries.pl ++ ++font/devpdf/enc/text.enc: ++ @$(MKDIR_P) $(top_builddir)/font/devpdf/enc ++ cp -f $(top_srcdir)/font/devps/text.enc \ ++ $(top_builddir)/font/devpdf/enc ++ ++font/devpdf/map/symbolmap: ++ @$(MKDIR_P) $(top_builddir)/font/devpdf/map ++ @cp -f $(top_srcdir)/font/devps/symbolmap \ ++ $(top_builddir)/font/devpdf/map ++ ++$(DEVPDFFONTMAP_1): ++ @$(MKDIR_P) $(top_builddir)/font/devpdf/map ++ @cp -f $(top_srcdir)/font/devps/generate/`basename $@` \ ++ $(top_builddir)/font/devpdf/map ++ ++font/devpdf/util/BuildFoundries: shdeps.sed $(devpdf_srcdir)/util/BuildFoundries.pl ++ @echo Making $@ ++ @$(MKDIR_P) $(top_builddir)/font/devpdf/util ++ @$(RM) $(top_builddir)/font/devpdf/util/BuildFoundries ++ @if test -n "$(PERL)"; then \ ++ sed -f $(SH_DEPS_SED_SCRIPT) \ ++ -e "s|/usr/bin/perl|$(PERL)|" \ ++ -e "s|[@]GROFF_GHOSTSCRIPT_INTERPRETERS[@]|$(GHOSTSCRIPT)|" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]GROFF_FONT_DIR[@]|$(fontdir)|" \ ++ $(devpdf_srcdir)/util/BuildFoundries.pl \ ++ >$(top_builddir)/font/devpdf/util/BuildFoundries ;\ ++ else \ ++ sed -f $(SH_DEPS_SED_SCRIPT) \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]GROFF_FONT_DIR[@]|$(fontdir)|" \ ++ $(devpdf_srcdir)/util/BuildFoundries.pl \ ++ >$(top_builddir)/font/devpdf/util/BuildFoundries ;\ ++ fi ++ @chmod +x $(top_builddir)/font/devpdf/util/BuildFoundries ++ ++font/devpdf/DESC: $(devpdf_srcdir)/DESC.in ++ @echo Making $@ ++ @$(MKDIR_P) $(top_builddir)/font/devpdf ++ @$(RM) $(top_builddir)/font/devpdf/DESC ++ @cat $(devpdf_srcdir)/DESC.in >$(top_builddir)/font/devpdf/DESC ++ @if test "$(PAGE)" = A4; then \ ++ echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \ ++ else \ ++ echo "papersize letter" >>$(top_builddir)/font/devpdf/DESC; \ ++ fi ++ ++font/devpdf/Foundry: ++ @$(RM) $(top_builddir)/font/devpdf/Foundry ++ @cat $(devpdf_srcdir)/Foundry.in >$(top_builddir)/font/devpdf/Foundry ++ ++all: font/devpdf/build_font_files ++ ++# PATH : path to find afmtodit. We add $(abs_top_builddir) because afmtodit is ++# built in the top builddir. ++font/devpdf/build_font_files: afmtodit font/devpdf/DESC $(devpdffontenc_DATA) $(devpdffontmap_DATA) $(devpdffont_DATA) font/devpdf/util/BuildFoundries ++ @echo Making all fonts ++ @$(RM) $@ ++ @$(MKDIR_P) $(top_builddir)/font/devpdf ++ @echo "# foundry ps name psfile" > $(top_builddir)/font/devpdf/download ++ PATH="$(abs_top_builddir)$(GROFF_PATH_SEPARATOR)$(abs_top_builddir)/build-aux$(GROFF_PATH_SEPARATOR)$(PATH)" \ ++ $(abs_top_builddir)/font/devpdf/util/BuildFoundries $(abs_top_builddir)/font/devpdf \ ++ '$(abs_top_srcdir)/font/devps : $(abs_top_builddir)/font/devps' \ ++ >> $(top_builddir)/font/devpdf/download ++ @touch $@ ++ ++mostlyclean-local: mostlyclean_devpdf_extra ++mostlyclean_devpdf_extra: ++ @echo Cleaning font/devpdf ++ rm -rf $(top_builddir)/font/devpdf/enc $(top_builddir)/font/devpdf/map; ++ if test -d $(top_builddir)/font/devpdf; then \ ++ for f in $(GROFF_FONT_FILES); do \ ++ rm -f $(top_builddir)/font/devpdf/$$f; \ ++ done; \ ++ fi ++ ++install-data-local: install_devpdf ++install_devpdf: ++ @echo Installing devpdf files ++ -@test -d $(DESTDIR)$(devpdffontdir)/util \ ++ || $(mkinstalldirs) $(DESTDIR)$(devpdffontdir)/util ++ @for f in $(GROFF_FONT_FILES); do \ ++ $(RM) $(DESTDIR)$(devpdffontdir)/$$f; \ ++ if test -f $$f; then \ ++ $(INSTALL_DATA) $$f $(DESTDIR)$(devpdffontdir)/$$f; \ ++ else \ ++ $(INSTALL_DATA) $(top_builddir)/font/devpdf/$$f $(DESTDIR)$(devpdffontdir)/$$f; \ ++ fi; \ ++ done ++ $(INSTALL_DATA) $(top_builddir)/font/devpdf/download $(DESTDIR)$(devpdffontdir)/ ++ ++uninstall_groffdirs: uninstall_devpdf ++uninstall_devpdf: ++ @echo Uninstalling devpdf files ++ if test -d $(DESTDIR)$(devpdffontdir); then \ ++ for f in $(GROFF_FONT_FILES); do \ ++ rm -f $(DESTDIR)$(devpdffontdir)/$$f; \ ++ done; \ ++ if test -d $(DESTDIR)$(devpdffontutildir); then \ ++ rmdir $(DESTDIR)$(devpdffontutildir); \ ++ fi; \ ++ if test -d $(DESTDIR)$(devpdffontencdir); then \ ++ rmdir $(DESTDIR)$(devpdffontencdir); \ ++ fi; \ ++ if test -d $(DESTDIR)$(devpdffontmapdir); then \ ++ rmdir $(DESTDIR)$(devpdffontmapdir); \ ++ fi; \ ++ rm -f $(DESTDIR)$(devpdffontdir)/download; \ ++ rmdir $(DESTDIR)$(devpdffontdir); \ ++ fi +diff -Nuar groff-1.22.3.old/font/devpdf/Makefile.sub groff-1.22.3/font/devpdf/Makefile.sub +--- groff-1.22.3.old/font/devpdf/Makefile.sub 2014-11-04 10:38:35.427521472 +0200 ++++ groff-1.22.3/font/devpdf/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,139 +0,0 @@ +-# Makefile.sub for `font devpdf' +-# +-# File position: /font/devpdf/Makefile.sub +-# +-# Copyright (C) 2011-2014 Free Software Foundation, Inc. +-# Written by Deri James +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +- +-DEV=pdf +-GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \ +- && find * -maxdepth 0 -type f ! -name 'Makefile.sub*' \ +- -exec grep -l internalname {} \;` +-ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*` +-MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*` +- +-MOSTLYCLEANADD=\ +- download \ +- DESC \ +- Foundry \ +- util/BuildFoundries \ +- $(GROFF_FONT_FILES) \ +- $(ENC_FILES) \ +- $(MAP_FILES) +- +-MOSTLYCLEANDIRADD=enc map +- +-DEVFILES=\ +- Foundry +- +-#DEVSCRIPTS=util/BuildFoundries +- +-DISTFILES=\ +- $(DEVFILES) \ +- $(DEVSCRIPTS) +- +-RM=rm -f +- +-all: DESC +- +-DESC: DESC.in +- $(RM) DESC +- cat $(srcdir)/DESC.in >$(top_builddir)/font/devpdf/DESC +- if test "$(PAGE)" = A4; then \ +- echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \ +- else \ +- echo "papersize letter" >>$(top_builddir)/font/devpdf/DESC; \ +- fi +- $(RM) Foundry +- cat $(srcdir)/Foundry.in >$(top_builddir)/font/devpdf/Foundry +- -test -d $(top_builddir)/font/devpdf/enc \ +- || $(mkinstalldirs) $(top_builddir)/font/devpdf/enc +- -test -d $(top_builddir)/font/devpdf/map \ +- || $(mkinstalldirs) $(top_builddir)/font/devpdf/map +- cp -f $(top_srcdir)/font/devps/text.enc \ +- $(top_builddir)/font/devpdf/enc +- cp -f $(top_srcdir)/font/devps/symbolmap \ +- $(top_builddir)/font/devpdf/map +- cp -f $(top_srcdir)/font/devps/generate/dingbats.map \ +- $(top_builddir)/font/devpdf/map +- cp -f $(top_srcdir)/font/devps/generate/textmap \ +- $(top_builddir)/font/devpdf/map +- cp -f $(top_srcdir)/font/devps/generate/symbolchars \ +- $(top_builddir)/font/devpdf/map +- -test -d util || $(mkinstalldirs) util +- $(RM) util/BuildFoundries +- if test -n "$(PERL)"; then \ +- sed -f $(SH_DEPS_SED_SCRIPT) \ +- -e "s|/usr/bin/perl|$(PERL)|" \ +- -e "s|@GROFF_GHOSTSCRIPT_INTERPRETERS@|$(GHOSTSCRIPT)|" \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \ +- $(srcdir)/util/BuildFoundries.pl \ +- >$(top_builddir)/font/devpdf/util/BuildFoundries ;\ +- else \ +- sed -f $(SH_DEPS_SED_SCRIPT) \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \ +- $(srcdir)/util/BuildFoundries.pl \ +- >$(top_builddir)/font/devpdf/util/BuildFoundries ;\ +- fi +- chmod +x util/BuildFoundries +- echo "# foundry ps name psfile" > $(top_builddir)/font/devpdf/download +- PATH="$(top_builddir)/src/utils/afmtodit:$(GROFF_PATH_SEPARATOR)$(PATH)" \ +- util/BuildFoundries $(top_builddir)/font/devpdf \ +- '$(top_srcdir)/font/devps : $(top_builddir)/font/devps' \ +- >> $(top_builddir)/font/devpdf/download +- +-install_data: +- -test -d $(DESTDIR)$(fontsubdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir) +- -test -d $(DESTDIR)$(fontsubdir)/enc \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/enc +- -test -d $(DESTDIR)$(fontsubdir)/map \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/map +- -test -d $(DESTDIR)$(fontsubdir)/util \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/util +- for f in $(MOSTLYCLEANADD); do \ +- $(RM) $(DESTDIR)$(fontsubdir)/$$f; \ +- if test -f $$f; then \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \ +- else \ +- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \ +- fi; \ +- done +- +-uninstall_sub: +- -for f in $(MOSTLYCLEANADD); do \ +- $(RM) $(DESTDIR)$(fontsubdir)/$$f; \ +- done +- -d=$(DESTDIR)$(fontsubdir)/enc; \ +- if test -d $$d; then rmdir $$d; fi +- -d=$(DESTDIR)$(fontsubdir)/map; \ +- if test -d $$d; then rmdir $$d; fi +- -d=$(DESTDIR)$(fontsubdir)/util; \ +- if test -d $$d; then rmdir $$d; fi +- -d=$(DESTDIR)$(fontsubdir); \ +- if test -d $$d; then rmdir $$d; fi +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devps/devps.am groff-1.22.3/font/devps/devps.am +--- groff-1.22.3.old/font/devps/devps.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devps/devps.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,170 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devps_srcdir = $(top_srcdir)/font/devps ++devps_builddir = $(top_builddir)/font/devps ++DEVPSFONTFILES = \ ++ font/devps/S \ ++ font/devps/SS \ ++ font/devps/ZD \ ++ font/devps/ZDR \ ++ font/devps/ZCMI \ ++ font/devps/AB \ ++ font/devps/ABI \ ++ font/devps/AI \ ++ font/devps/AR \ ++ font/devps/BMB \ ++ font/devps/BMBI \ ++ font/devps/BMI \ ++ font/devps/BMR \ ++ font/devps/CB \ ++ font/devps/CBI \ ++ font/devps/CI \ ++ font/devps/CR \ ++ font/devps/HB \ ++ font/devps/HBI \ ++ font/devps/HI \ ++ font/devps/HR \ ++ font/devps/HNB \ ++ font/devps/HNBI \ ++ font/devps/HNI \ ++ font/devps/HNR \ ++ font/devps/NB \ ++ font/devps/NBI \ ++ font/devps/NI \ ++ font/devps/NR \ ++ font/devps/PB \ ++ font/devps/PBI \ ++ font/devps/PI \ ++ font/devps/PR \ ++ font/devps/TB \ ++ font/devps/TBI \ ++ font/devps/TI \ ++ font/devps/TR \ ++ font/devps/EURO \ ++ font/devps/freeeuro.pfa \ ++ font/devps/freeeuro.afm \ ++ font/devps/text.enc \ ++ font/devps/download ++ ++DEVPSFONTFILES_GENERATED = \ ++ font/devps/DESC \ ++ font/devps/prologue \ ++ font/devps/zapfdr.pfa \ ++ font/devps/symbolsl.pfa ++devpsfontdir = $(fontdir)/devps ++dist_devpsfont_DATA = $(DEVPSFONTFILES) ++nodist_devpsfont_DATA = $(DEVPSFONTFILES_GENERATED) ++ ++# these files will be installed in oldfontdir ++OLDDEVPSFONTFILES = \ ++ font/devps/old/S \ ++ font/devps/old/SS \ ++ font/devps/old/CB \ ++ font/devps/old/CBI \ ++ font/devps/old/CI \ ++ font/devps/old/CR \ ++ font/devps/old/HB \ ++ font/devps/old/HBI \ ++ font/devps/old/HI \ ++ font/devps/old/HR \ ++ font/devps/old/HNB \ ++ font/devps/old/HNBI \ ++ font/devps/old/HNI \ ++ font/devps/old/HNR \ ++ font/devps/old/NB \ ++ font/devps/old/NBI \ ++ font/devps/old/NI \ ++ font/devps/old/NR \ ++ font/devps/old/PB \ ++ font/devps/old/PBI \ ++ font/devps/old/PI \ ++ font/devps/old/PR \ ++ font/devps/old/TB \ ++ font/devps/old/TBI \ ++ font/devps/old/TI \ ++ font/devps/old/TR \ ++ font/devps/old/symbol.afm \ ++ font/devps/old/symbolsl.afm \ ++ font/devps/old/zapfdr.afm \ ++ font/devps/old/zapfdr.ps ++olddevpsfontdir = $(oldfontdir)/devps ++dist_olddevpsfont_DATA = $(OLDDEVPSFONTFILES) ++ ++# Files installed in $(devfontdir)/generate ++DEVPSGENFILES = \ ++ font/devps/generate/Makefile \ ++ font/devps/generate/dingbats.map \ ++ font/devps/generate/dingbats.rmap \ ++ font/devps/generate/lgreekmap \ ++ font/devps/generate/symbolchars \ ++ font/devps/generate/symbolsl.afm \ ++ font/devps/generate/textmap ++DEVPSGENSCRIPTS = \ ++ font/devps/generate/afmname \ ++ font/devps/generate/symbol.sed ++devpsgendir = $(devpsfontdir)/generate ++dist_devpsgen_DATA = $(DEVPSGENFILES) $(DEVPSGENSCRIPTS) ++ ++MOSTLYCLEANFILES += $(DEVPSFONTFILES_GENERATED) ++EXTRA_DIST += \ ++ font/devps/symbolmap \ ++ font/devps/DESC.in \ ++ font/devps/prologue.ps \ ++ font/devps/psstrip.sed \ ++ font/devps/symbol.afm \ ++ font/devps/symbolsl.ps \ ++ font/devps/zapfdr.afm \ ++ font/devps/zapfdr.ps \ ++ font/devps/generate/freeeuro.sfd \ ++ font/devps/generate/make-zapfdr \ ++ font/devps/generate/symbolsl.awk \ ++ font/devps/generate/sfdtopfa.pe \ ++ font/devps/generate/zapfdr.sed ++ ++font/devps/DESC: $(devps_srcdir)/DESC.in ++ @$(MKDIR_P) font/devps ++ @cat $(devps_srcdir)/DESC.in >$@ ++ @echo broken $(BROKEN_SPOOLER_FLAGS) >>$@ ++ @if test "$(PAGE)" = A4; then \ ++ echo "papersize a4" >>$@; \ ++ else \ ++ echo "papersize letter" >>$@; \ ++ fi ++ @test -z '$(PSPRINT)' || echo print '$(PSPRINT)' >>$@ ++ ++fonts: devps_fonts ++# We add top_builddir to the PATH in case the only afmtodit available is the ++# one in the current build. ++devps_fonts: afmtodit font/devps/DESC ++ PATH=$(top_builddir)$(GROFF_PATH_SEPARATOR)$(PATH) \ ++ $(MAKE) -f $(devps_srcdir)/generate/Makefile \ ++ srcdir=$(devps_srcdir)/generate DESC=$(devps_srcdir)/DESC.in ++ ++font/devps/prologue: $(devps_srcdir)/prologue.ps ++ @$(MKDIR_P) font/devps ++ $(RM) $@ ++ sed -f $(devps_srcdir)/psstrip.sed $? >$@ ++font/devps/zapfdr.pfa: $(devps_srcdir)/zapfdr.ps ++ @$(MKDIR_P) font/devps ++ $(RM) $@ ++ sed -f $(devps_srcdir)/psstrip.sed $? >$@ ++font/devps/symbolsl.pfa: $(devps_srcdir)/symbolsl.ps ++ @$(MKDIR_P) font/devps ++ $(RM) $@ ++ sed -f $(devps_srcdir)/psstrip.sed $? >$@ +diff -Nuar groff-1.22.3.old/font/devps/.gitignore groff-1.22.3/font/devps/.gitignore +--- groff-1.22.3.old/font/devps/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devps/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++DESC ++prologue ++symbolsl.pfa ++zapfdr.pfa +diff -Nuar groff-1.22.3.old/font/devps/Makefile.sub groff-1.22.3/font/devps/Makefile.sub +--- groff-1.22.3.old/font/devps/Makefile.sub 2014-11-04 10:38:35.340522559 +0200 ++++ groff-1.22.3/font/devps/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,92 +0,0 @@ +-# Makefile.sub for `font devps' +- +-# File position: /font/devps/Makefile.sub +- +-# Copyright (C) 2014 Free Software Foundation, Inc. +- +-# This file is part of `groffer' which is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 +-# . +- +-######################################################################## +- +-DEV=ps +-DISTFILES=\ +- S SS \ +- ZD ZDR ZCMI \ +- AB ABI AI AR \ +- BMB BMBI BMI BMR \ +- CB CBI CI CR \ +- HB HBI HI HR \ +- HNB HNBI HNI HNR \ +- NB NBI NI NR \ +- PB PBI PI PR \ +- TB TBI TI TR \ +- EURO freeeuro.pfa freeeuro.afm \ +- text.enc download +-# these files must be in a subdirectory called `old' +-OLDDISTFILES=\ +- S SS \ +- CB CBI CI CR \ +- HB HBI HI HR \ +- HNB HNBI HNI HNR \ +- NB NBI NI NR \ +- PB PBI PI PR \ +- TB TBI TI TR \ +- symbol.afm symbolsl.afm \ +- zapfdr.afm zapfdr.ps +- +-PSFILES=prologue symbolsl.pfa zapfdr.pfa +-DEVGENFILES=generate/Makefile generate/dingbats.map \ +- generate/dingbats.rmap generate/lgreekmap \ +- generate/symbolchars generate/symbolsl.afm generate/textmap +-DEVGENSCRIPTS=generate/afmname generate/symbol.sed +-DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES) +-OLDDEVFILES=$(OLDDISTFILES) +-DEVSCRIPTS=$(DEVGENSCRIPTS) +- +-MOSTLYCLEANADD=DESC $(PSFILES) +- +-RM=rm -f +- +-DESC: DESC.in +- cat $(srcdir)/DESC.in >DESC +- echo broken $(BROKEN_SPOOLER_FLAGS) >>DESC +- if test "$(PAGE)" = A4; then \ +- echo "papersize a4" >>DESC; \ +- else \ +- echo "papersize letter" >>DESC; \ +- fi +- test -z '$(PSPRINT)' || echo print '$(PSPRINT)' >>DESC +- +-fonts: DESC +- $(MAKE) -f $(srcdir)/generate/Makefile \ +- srcdir=$(srcdir)/generate DESC=$(srcdir)/DESC.in +- +-prologue: prologue.ps +-zapfdr.pfa: zapfdr.ps +-symbolsl.pfa: symbolsl.ps +- +-$(PSFILES): +- $(RM) $@ +- sed -f $(srcdir)/psstrip.sed $? >$@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devutf8/devutf8.am groff-1.22.3/font/devutf8/devutf8.am +--- groff-1.22.3.old/font/devutf8/devutf8.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devutf8/devutf8.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,48 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++devutf8_srcdir = $(top_srcdir)/font/devutf8 ++DEVUTF8FONTS = R I B BI ++DEVUTF8FONTSFILES = \ ++ font/devutf8/R font/devutf8/I font/devutf8/B font/devutf8/BI ++ ++DEVUTF8RES = 240 ++DEVUTF8CPI = 10 ++DEVUTF8LPI = 6 ++ ++devutf8fontdir = $(fontdir)/devutf8 ++devutf8font_DATA = $(DEVUTF8FONTSFILES) font/devutf8/DESC ++MOSTLYCLEANFILES += $(DEVUTF8FONTSFILES) font/devutf8/DESC ++EXTRA_DIST += \ ++ font/devutf8/R.proto \ ++ font/devutf8/DESC.proto \ ++ font/devutf8/NOTES \ ++ font/devutf8/R.in ++ ++$(DEVUTF8FONTSFILES): $(devutf8_srcdir)/R.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(RM) $@ ++ @$(SHELL) $(GENFONTSSH) $(devutf8_srcdir)/R.proto \ ++ $(DEVUTF8RES) $(DEVUTF8CPI) `basename $@` > $@ ++ ++font/devutf8/DESC: $(devutf8_srcdir)/DESC.proto ++ @echo Making $@ ++ @$(MKDIR_P) `dirname $@` ++ @$(SHELL) $(GENDESCSH) $(devutf8_srcdir)/DESC.proto \ ++ $(DEVUTF8RES) $(DEVUTF8CPI) $(DEVUTF8LPI) $(DEVUTF8FONTS) > $@ +diff -Nuar groff-1.22.3.old/font/devutf8/.gitignore groff-1.22.3/font/devutf8/.gitignore +--- groff-1.22.3.old/font/devutf8/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devutf8/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++B ++BI ++DESC ++I ++R +diff -Nuar groff-1.22.3.old/font/devutf8/Makefile.sub groff-1.22.3/font/devutf8/Makefile.sub +--- groff-1.22.3.old/font/devutf8/Makefile.sub 2014-11-04 10:38:35.410521684 +0200 ++++ groff-1.22.3/font/devutf8/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,65 +0,0 @@ +-# Makefile.sub for `font devutf8' +-# +-# File position: /font/devutf8/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=utf8 +-FONTS=R I B BI +-DEVFILES=$(FONTS) DESC +-MOSTLYCLEANADD=$(FONTS) DESC +- +-RES=240 +-CPI=10 +-LPI=6 +- +-RM=rm -f +- +-$(FONTS): R.proto +- @echo Making $@ +- @$(RM) $@ +- @charwidth=`expr $(RES) / $(CPI)` ; \ +- sed -e "s/^name [A-Z]*$$/name $@/" \ +- -e \ +- "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \ +- -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \ +- -e "s/^internalname .*$$/internalname $@/" \ +- -e "/^internalname/s/BI/3/" \ +- -e "/^internalname/s/B/2/" \ +- -e "/^internalname/s/I/1/" \ +- -e "/^internalname .*[^ 0-9]/d" \ +- $(srcdir)/R.proto >$@ +- +-DESC: DESC.proto +- @echo Making $@ +- @sed -e "s/^res .*$$/res $(RES)/" \ +- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ +- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ +- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ +- $(srcdir)/DESC.proto >$@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devX100/devX100.am groff-1.22.3/font/devX100/devX100.am +--- groff-1.22.3.old/font/devX100/devX100.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devX100/devX100.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff'. ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++DEVX100FONTS = \ ++ font/devX100/DESC \ ++ font/devX100/TR \ ++ font/devX100/TI \ ++ font/devX100/TB \ ++ font/devX100/TBI \ ++ font/devX100/CR \ ++ font/devX100/CI \ ++ font/devX100/CB \ ++ font/devX100/CBI \ ++ font/devX100/HR \ ++ font/devX100/HI \ ++ font/devX100/HB \ ++ font/devX100/HBI \ ++ font/devX100/NR \ ++ font/devX100/NI \ ++ font/devX100/NB \ ++ font/devX100/NBI \ ++ font/devX100/S ++ ++if !WITHOUT_X11 ++devX100fontdir = $(fontdir)/devX100 ++devX100font_DATA = $(DEVX100FONTS) ++endif ++ ++EXTRA_DIST += $(DEVX100FONTS) +diff -Nuar groff-1.22.3.old/font/devX100/Makefile.sub groff-1.22.3/font/devX100/Makefile.sub +--- groff-1.22.3.old/font/devX100/Makefile.sub 2014-11-04 10:38:35.373522147 +0200 ++++ groff-1.22.3/font/devX100/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,37 +0,0 @@ +-# Makefile.sub for `font devX100' +-# +-# File position: /font/devX100/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=X100 +-DEVFILES=DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devX100-12/devX100-12.am groff-1.22.3/font/devX100-12/devX100-12.am +--- groff-1.22.3.old/font/devX100-12/devX100-12.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devX100-12/devX100-12.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff'. ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++DEVX10012FONTS = \ ++ font/devX100-12/DESC \ ++ font/devX100-12/TR \ ++ font/devX100-12/TI \ ++ font/devX100-12/TB \ ++ font/devX100-12/TBI \ ++ font/devX100-12/CR \ ++ font/devX100-12/CI \ ++ font/devX100-12/CB \ ++ font/devX100-12/CBI \ ++ font/devX100-12/HR \ ++ font/devX100-12/HI \ ++ font/devX100-12/HB \ ++ font/devX100-12/HBI \ ++ font/devX100-12/NR \ ++ font/devX100-12/NI \ ++ font/devX100-12/NB \ ++ font/devX100-12/NBI \ ++ font/devX100-12/S ++ ++if !WITHOUT_X11 ++devX10012fontdir = $(fontdir)/devX100-12 ++devX10012font_DATA = $(DEVX10012FONTS) ++endif ++ ++EXTRA_DIST += $(DEVX10012FONTS) +diff -Nuar groff-1.22.3.old/font/devX100-12/Makefile.sub groff-1.22.3/font/devX100-12/Makefile.sub +--- groff-1.22.3.old/font/devX100-12/Makefile.sub 2014-11-04 10:38:35.379522072 +0200 ++++ groff-1.22.3/font/devX100-12/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,37 +0,0 @@ +-# Makefile.sub for `font devX100-12' +-# +-# File position: /font/devX100-12/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=X100-12 +-DEVFILES=DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devX75/devX75.am groff-1.22.3/font/devX75/devX75.am +--- groff-1.22.3.old/font/devX75/devX75.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devX75/devX75.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++DEVX75FONTS = \ ++ font/devX75/DESC \ ++ font/devX75/TR \ ++ font/devX75/TI \ ++ font/devX75/TB \ ++ font/devX75/TBI \ ++ font/devX75/CR \ ++ font/devX75/CI \ ++ font/devX75/CB \ ++ font/devX75/CBI \ ++ font/devX75/HR \ ++ font/devX75/HI \ ++ font/devX75/HB \ ++ font/devX75/HBI \ ++ font/devX75/NR \ ++ font/devX75/NI \ ++ font/devX75/NB \ ++ font/devX75/NBI \ ++ font/devX75/S ++ ++if !WITHOUT_X11 ++devX75fontdir = $(fontdir)/devX75 ++devX75font_DATA = $(DEVX75FONTS) ++endif ++ ++EXTRA_DIST += $(DEVX75FONTS) +diff -Nuar groff-1.22.3.old/font/devX75/Makefile.sub groff-1.22.3/font/devX75/Makefile.sub +--- groff-1.22.3.old/font/devX75/Makefile.sub 2014-11-04 10:38:35.361522297 +0200 ++++ groff-1.22.3/font/devX75/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,37 +0,0 @@ +-# Makefile.sub for `font devX75' +-# +-# File position: /font/devX75/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=X75 +-DEVFILES=DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/devX75-12/devX75-12.am groff-1.22.3/font/devX75-12/devX75-12.am +--- groff-1.22.3.old/font/devX75-12/devX75-12.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/devX75-12/devX75-12.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,42 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++DEVX7512FONTS = \ ++ font/devX75-12/DESC \ ++ font/devX75-12/TR \ ++ font/devX75-12/TI \ ++ font/devX75-12/TB \ ++ font/devX75-12/TBI \ ++ font/devX75-12/CR \ ++ font/devX75-12/CI \ ++ font/devX75-12/CB \ ++ font/devX75-12/CBI \ ++ font/devX75-12/HR \ ++ font/devX75-12/HI \ ++ font/devX75-12/HB \ ++ font/devX75-12/HBI \ ++ font/devX75-12/NR \ ++ font/devX75-12/NI \ ++ font/devX75-12/NB \ ++ font/devX75-12/NBI \ ++ font/devX75-12/S ++if !WITHOUT_X11 ++devX7512fontdir = $(fontdir)/devX75-12 ++devX7512font_DATA = $(DEVX7512FONTS) ++endif ++EXTRA_DIST += $(DEVX7512FONTS) +diff -Nuar groff-1.22.3.old/font/devX75-12/Makefile.sub groff-1.22.3/font/devX75-12/Makefile.sub +--- groff-1.22.3.old/font/devX75-12/Makefile.sub 2014-11-04 10:38:35.367522222 +0200 ++++ groff-1.22.3/font/devX75-12/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,37 +0,0 @@ +-# Makefile.sub for `font devX75-12' +-# +-# File position: /font/devX75-12/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-DEV=X75-12 +-DEVFILES=DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/font/scripts/gendesc.sh groff-1.22.3/font/scripts/gendesc.sh +--- groff-1.22.3.old/font/scripts/gendesc.sh 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/scripts/gendesc.sh 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,18 @@ ++#!/bin/sh ++# Usage: gendesc.sh ++if test -z "$1" || test -z "$2" || test -z "$3" || test -z "$4" || \ ++ test -z "$5"; then ++ echo "genfonts.sh: missing parameter"; exit 255; ++fi ++INPUT=$1 ++RES=$2 ++CPI=$3 ++LPI=$4 ++shift 4 ++NBFONTS=`echo $#` ++FONTS=`echo $*` ++sed -e "s/^res .*$/res $RES/" \ ++ -e "s/^hor .*$/hor `expr $RES / $CPI`/" \ ++ -e "s/^vert .*$/vert `expr $RES / $LPI`/" \ ++ -e "s/^fonts .*$/fonts $NBFONTS $FONTS/" \ ++ $INPUT +diff -Nuar groff-1.22.3.old/font/scripts/genfonts.sh groff-1.22.3/font/scripts/genfonts.sh +--- groff-1.22.3.old/font/scripts/genfonts.sh 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/scripts/genfonts.sh 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,23 @@ ++#!/bin/sh -xv ++# Usage: ++# genfonts.sh ++if test -z "$1" || test -z "$2" || test -z "$3" || test -z "$4"; then ++ echo "genfonts.sh: missing parameter"; exit 255; ++fi ++ ++INPUT=$1 ++RES=$2 ++CPI=$3 ++FONT=$4 ++charwidth=`expr $RES / $CPI` ; ++sed -e "s|^name [A-Z]*$|name $FONT|" \ ++ -e \ ++ "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $charwidth /" \ ++ -e "s/^spacewidth [0-9][0-9]*$/spacewidth $charwidth/" \ ++ -e "s|^internalname .*$|internalname $FONT|" \ ++ -e "/^internalname/s/CR/4/" \ ++ -e "/^internalname/s/BI/3/" \ ++ -e "/^internalname/s/B/2/" \ ++ -e "/^internalname/s/I/1/" \ ++ -e "/^internalname .*[^ 0-9]/d" \ ++ $INPUT +diff -Nuar groff-1.22.3.old/font/scripts/scripts.am groff-1.22.3/font/scripts/scripts.am +--- groff-1.22.3.old/font/scripts/scripts.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/font/scripts/scripts.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++# Scripts for font files generation ++GENFONTSSH=$(top_srcdir)/font/scripts/genfonts.sh ++GENDESCSH = $(top_srcdir)/font/scripts/gendesc.sh ++EXTRA_DIST += $(GENFONTSSH) $(GENDESCSH) +diff -Nuar groff-1.22.3.old/.gitignore groff-1.22.3/.gitignore +--- groff-1.22.3.old/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,95 @@ ++*.[oan] ++*.hpp ++*.output ++*.pdf ++*-s ++.dirstamp ++.deps ++/Makefile ++/Makefile.in ++stamp-* ++/aclocal.m4 ++/autom4te.cache ++/build-aux ++/configure ++/config.log ++/src/include/stamp-h1 ++/font/devpdf/[A-Z]* ++/gnulib_m4 ++/INSTALL ++/lib ++/maint.mk ++/src/include/config.hin ++/GNUmakefile ++/README-release ++/addftinfo ++/afmtodit ++/charset.alias ++/chem ++/contrib/hdtbl/hdmisc.tmac ++/contrib/hdtbl/hdtbl.tmac ++/contrib/mom/om.tmac ++/defs.h ++/eqn ++/eqn2graph ++/font/devpdf/build_font_files ++/font/devpdf/download ++/font/devpdf/enc/ ++/font/devpdf/map/ ++/font/devpdf/util/BuildFoundries ++/gdiffmk ++/gideal ++/glilypond ++/gnu.eps ++/gperl ++/gpinyin ++/grap2graph ++/grn ++/grodvi ++/groff ++/groff_opts.tmp ++/groff_opts_no_arg.txt ++/groff_opts_with_arg.txt ++/groffer ++/grog ++/grolbp ++/grolj4 ++/gropdf ++/grops ++/grotty ++/gxditview ++/hpftodit ++/indxbib ++/lkbib ++/lookbib ++/mmroff ++/neqn ++/nroff ++/pdfmom ++/pdfroff ++/pdfroff-*/ ++/penguin.ps ++/pfbtops ++/pic ++/pic2graph ++/post-grohtml ++/pre-grohtml ++/preconv ++/ref-add.sed ++/ref-del.sed ++/refer ++/roff2dvi ++/roff2html ++/roff2pdf ++/roff2ps ++/roff2text ++/roff2x ++/shdeps.sed ++/soelim ++/tbl ++/test-groff ++/test-suite.log ++/tfmtodit ++/troff ++/xtotroff ++/gendef.sh +diff -Nuar groff-1.22.3.old/.gitmodules groff-1.22.3/.gitmodules +--- groff-1.22.3.old/.gitmodules 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/.gitmodules 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++[submodule "gnulib"] ++ path = gnulib ++ url = git://git.sv.gnu.org/gnulib.git +diff -Nuar groff-1.22.3.old/INSTALL groff-1.22.3/INSTALL +--- groff-1.22.3.old/INSTALL 2014-11-04 10:38:35.144525010 +0200 ++++ groff-1.22.3/INSTALL 1970-01-01 02:00:00.000000000 +0200 +@@ -1,140 +0,0 @@ +- Copyright 1997-2014 Free Software Foundation, Inc. +- +- 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 contains information that supplements the generic +-installation instructions in file `INSTALL.gen'. +- +- +-Normal Installation +-=================== +- +-The simplest way to compile groff is: +- +- 1. `cd' to the directory containing groff's source code and type +- `./configure' to configure groff for your system. If you are +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. +- +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. +- +- 2. Type `make' to compile groff. +- +- 3. Type `sudo make install' to install the groff programs and any +- data files and documentation. `make install' is the only step for +- which you need `root' access; this is done by `sudo'. +- +- 4. You can remove the groff 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 groff for +- a different kind of computer), type `make distclean'. +- +- +-External Installation +-===================== +- +-It is also possible to perform the whole installation process outside +-of the source code directory. In this case a whole external build +-directory structure is created without changing any parts of the source +-code tree. This is useful if the source code is read-only or if +-several different installations, such as for multiple architectures, +-should be constructed. +- +-As an example we assume that the source code of the `groff' code is in +-`/usr/local/src/groff', and that the build process should be done +-within the directory `/home/my/groff.compile'. +- +- 0. Create `/home/my/groff.compile' and change to that directory. +- +- 1. Call `/usr/local/src/groff/configure' in that directory to +- configure groff for your system. If you are using `csh' on an old +- version of System V, you might need to type `sh +- /usr/local/src/groff/configure' instead. +- +- 2. Type `make' to compile groff in that directory. +- +- 3. Type `sudo make install' to install the groff programs and any +- data files and documentation. +- +- 4. You can remove the groff binaries and object files from the +- build 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'. +- +- +-Special Platforms +-================= +- +-For instructions how to build groff with DJGPP tools for MS-DOS and +-MS-Windows, see the file arch/djgpp/README. +- +-For instructions how to build groff with the MinGW tools for +-MS-Windows, see the file README.MinGW. +- +- +-Miscellaneous +-============= +- +-groff is written in C++, so you need a C++ compiler. The C++ source +-files use a suffix of `.cpp', so your C++ compiler must be able to +-handle this. If you don't already have a C++ compiler, we suggest gcc +-2.7.1 or later (gcc version 2 includes GNU C++ as well as GNU C). From +-gcc 2.5, it is no longer necessary to install libg++: the C++ header +-files needed by groff are created by the gcc installation process. To +-override configure's choice of C++ compiler, you can set the CXX +-environment variable. +- +-If you have a library that provides a faster malloc than your system's +-usual malloc, it is good idea to include it in LIBS. For example, +-using the malloc that comes with GNU Emacs version 20 can give a +-worthwhile (and sometimes spectacular) performance improvement. +- +-Many programs within the `groff' system are written in the Perl +-language. So you need a `perl' program with the least version of +-`v5.6.1'. +- +- +-If you want A4 or letter paper format and the configure script produces +-an incorrect guess, say +- +- PAGE=xxx ./configure +- +-where `xxx' should be either `A4' or `letter'. Note that this only +-affects the paper selection of some device drivers like grops (which +-can be still overridden on the command line). For compatibility with +-ditroff, the default page length in gtroff is always 11 inches. The +-page length can be changed with the `pl' request. +- +-When you have built groff but not installed yet, you can use the +-test-groff script to try groff out on one of the man pages. (Use the +-.n files not the .man files.) The test-groff script sets up environment +-variables to allow groff to run without being installed. For example, +-you could do +- +- ./test-groff -man -Tascii src/roff/groff/groff.n | less +- +-to display the groff(1) man page with the `less' pager. +- +-To get a DVI, PDF, or HTML version of the groff texinfo manual, say +-`make groff.dvi', `make groff.pdf', or `make groff.html', respectively, +-in the `doc' subdirectory (after configuring the groff package). Note +-that you need texinfo version 4.8 as a prerequisite. +- +-If you have problems, read the PROBLEMS file. If this doesn't help +-and you need support, please contact the `groff' mailing list. If you +-think that you have found a bug, please submit a report in our bug +-tracker at +- +- https://savannah.gnu.org/projects/groff +- +-Alternative, but less preferable, you may send a bug report using the +-form in the file BUG-REPORT. +- +-##### Emacs settings +-Local Variables: +-mode: text +-End: +diff -Nuar groff-1.22.3.old/INSTALL.extra groff-1.22.3/INSTALL.extra +--- groff-1.22.3.old/INSTALL.extra 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/INSTALL.extra 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,140 @@ ++ Copyright 1997-2014 Free Software Foundation, Inc. ++ ++ 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 contains information that supplements the generic ++installation instructions in file `INSTALL'. ++ ++ ++Normal Installation ++=================== ++ ++The simplest way to compile groff is: ++ ++ 1. `cd' to the directory containing groff's source code and type ++ `./configure' to configure groff for your system. If you are ++ using `csh' on an old version of System V, you might need to type ++ `sh ./configure' instead to prevent `csh' from trying to execute ++ `configure' itself. ++ ++ Running `configure' takes awhile. While running, it prints some ++ messages telling which features it is checking for. ++ ++ 2. Type `make' to compile groff. ++ ++ 3. Type `sudo make install' to install the groff programs and any ++ data files and documentation. `make install' is the only step for ++ which you need `root' access; this is done by `sudo'. ++ ++ 4. You can remove the groff 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 groff for ++ a different kind of computer), type `make distclean'. ++ ++ ++External Installation ++===================== ++ ++It is also possible to perform the whole installation process outside ++of the source code directory. In this case a whole external build ++directory structure is created without changing any parts of the source ++code tree. This is useful if the source code is read-only or if ++several different installations, such as for multiple architectures, ++should be constructed. ++ ++As an example we assume that the source code of the `groff' code is in ++`/usr/local/src/groff', and that the build process should be done ++within the directory `/home/my/groff.compile'. ++ ++ 0. Create `/home/my/groff.compile' and change to that directory. ++ ++ 1. Call `/usr/local/src/groff/configure' in that directory to ++ configure groff for your system. If you are using `csh' on an old ++ version of System V, you might need to type `sh ++ /usr/local/src/groff/configure' instead. ++ ++ 2. Type `make' to compile groff in that directory. ++ ++ 3. Type `sudo make install' to install the groff programs and any ++ data files and documentation. ++ ++ 4. You can remove the groff binaries and object files from the ++ build 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'. ++ ++ ++Special Platforms ++================= ++ ++For instructions how to build groff with DJGPP tools for MS-DOS and ++MS-Windows, see the file arch/djgpp/README. ++ ++For instructions how to build groff with the MinGW tools for ++MS-Windows, see the file README.MinGW. ++ ++ ++Miscellaneous ++============= ++ ++groff is written in C++, so you need a C++ compiler. The C++ source ++files use a suffix of `.cpp', so your C++ compiler must be able to ++handle this. If you don't already have a C++ compiler, we suggest gcc ++2.7.1 or later (gcc version 2 includes GNU C++ as well as GNU C). From ++gcc 2.5, it is no longer necessary to install libg++: the C++ header ++files needed by groff are created by the gcc installation process. To ++override configure's choice of C++ compiler, you can set the CXX ++environment variable. ++ ++If you have a library that provides a faster malloc than your system's ++usual malloc, it is good idea to include it in LIBS. For example, ++using the malloc that comes with GNU Emacs version 20 can give a ++worthwhile (and sometimes spectacular) performance improvement. ++ ++Many programs within the `groff' system are written in the Perl ++language. So you need a `perl' program with the least version of ++`v5.6.1'. ++ ++ ++If you want A4 or letter paper format and the configure script produces ++an incorrect guess, say ++ ++ PAGE=xxx ./configure ++ ++where `xxx' should be either `A4' or `letter'. Note that this only ++affects the paper selection of some device drivers like grops (which ++can be still overridden on the command line). For compatibility with ++ditroff, the default page length in gtroff is always 11 inches. The ++page length can be changed with the `pl' request. ++ ++When you have built groff but not installed yet, you can use the ++test-groff script to try groff out on one of the man pages. (Use the ++.n files not the .man files.) The test-groff script sets up environment ++variables to allow groff to run without being installed. For example, ++you could do ++ ++ ./test-groff -man -Tascii src/roff/groff/groff.n | less ++ ++to display the groff(1) man page with the `less' pager. ++ ++To get a DVI, PDF, or HTML version of the groff texinfo manual, say ++`make groff.dvi', `make groff.pdf', or `make groff.html', respectively, ++in the `doc' subdirectory (after configuring the groff package). Note ++that you need texinfo version 4.8 as a prerequisite. ++ ++If you have problems, read the PROBLEMS file. If this doesn't help ++and you need support, please contact the `groff' mailing list. If you ++think that you have found a bug, please submit a report in our bug ++tracker at ++ ++ https://savannah.gnu.org/projects/groff ++ ++Alternative, but less preferable, you may send a bug report using the ++form in the file BUG-REPORT. ++ ++##### Emacs settings ++Local Variables: ++mode: text ++End: +diff -Nuar groff-1.22.3.old/INSTALL.REPO groff-1.22.3/INSTALL.REPO +--- groff-1.22.3.old/INSTALL.REPO 2014-11-04 10:38:35.144525010 +0200 ++++ groff-1.22.3/INSTALL.REPO 2015-04-23 20:57:03.000000000 +0300 +@@ -5,31 +5,71 @@ + the copyright notice and this notice are preserved. + + This file contains information that supplements the generic +-installation instructions in file `INSTALL.gen'. It is meant for ++installation instructions in file `INSTALL'. It is meant for + people building directly from the development repository, rather than + a release or snapshot tarball. + + If you want to start compiling the `groff' system with an existing +-script `configure' you won't need the information in this file. ++script `configure' you won't need the information in this file. You ++need them only if you want to build groff from the git repository. + +-But if you want to use the `GNU autotools' (`aclocal', `autoreconf') +-for creating the following and some more files: ++1. Initial build ++---------------- + +- aclocal.m4 +- configure +- Makefile ++You will need autoconf version and 2.65 or higher and automake version ++1.12.2 or higher. These minimal versions are set in the bootstrap.conf ++file. ++ ++On operating systems supporting concurrent installation of multiple ++versions of the autotools, set the following environment variables: ++ ++ export AUTOMAKE_VERSION=1.12 ++ export AUTOCONF_VERSION=2.65 ++ ++First invoke the bootstrap script: ++ ++ $ ./bootstrap ++ ++This will: ++ ++ - clone the gnulib repository as a git submodule in 'gnulib', add ++ the needed gnulib sources files in 'lib', add the needed gnulib m4 ++ macros in 'gnulib_m4' ++ ++ - Invoke autoreconf that will call all the `GNU autotools' ++ (`aclocal', `autoconf', `automake') in the right order for ++ creating the following files: ++ ++ -- INSTALL (a symlink to gnulib's INSTALL file) ++ -- Makefile.in ++ -- aclocal.m4 ++ -- autom4te.cache/ ++ -- build-aux/ (that contains all the helper scripts) ++ -- configure ++ -- src/include/config.hin ++ ++Note that aclocal.m4 is generated and the groff m4 macros are included ++via the acinclude.m4 file. ++ ++At this point you can invoke the `configure' script (that generates ++the `config.status' script; it is the `config.status' script generates ++the Makefile) and call 'make' to build the groff project. You can do ++it in the source tree: ++ ++ $ ./configure ++ $ make ++ ++You can also build groff in an out of source build tree, which is cleaner: ++ ++ $ mkdir build ++ $ cd build ++ $ ../configure ++ $ make + +-To update file `aclocal.m4', run the shell command ++Note that parallel build is also supported and make can be invoked ++with the -j option, which will greatly speed up the build. + +- $ aclocal -I m4 +- +-To recreate the files `configure' and `Makefile', use the shell +-command +- +- $ autoreconf -I m4 +- +-The option `-I m4' is necessary. It refers to the subdirectory `m4' +-that has files with m4 macro definitions needed by the `autotools'. ++Notes: + + If you use an old `autoreconf' version < 2.69, there might be an error + warning like: +@@ -44,23 +84,28 @@ + Just ignore this. It doesn't occur in the actual versions of + `autoreconf'. + +-You may even use the shell command + +- $ autoconf -I m4 + +-instead of `autoreconf', but that will ignore some features. So +-`autoreconf' is better. ++2. Modification of autotools files ++---------------------------------- ++ ++Previously, when groff used `autoconf' only and not `automake', you ++had to invoke manually the autotools, depending on what you ++modified. For example, to change the file `aclocal.m4', you had to run ++the shell command 'aclocal -I m4', to recreate the files `configure' ++and `Makefile', you had to use the command 'autoreconf -I m4'. ++ ++Now, as groff uses `automake', you don't need to run `autoreconf'. If ++you make some changes in Makefile.am or configure.ac, all the files ++that need to be updated will be regenerated when you execute `make'. ++ ++ ++ ++3. Quick start on the usage of `automake' in groff ++-------------------------------------------------- ++ ++A little document explaining the basics of automake and its usage in ++groff is available in doc/automake.mom. It is currently not ++automatically generated, to build it: + +-`automake' is not used currently, however, we plan to convert the +-build system accordingly. If you have experience in creating +-`Makefile.am' files we would be glad if you could help us in the +-conversion process. Please contact the groff mailing list. +- +-After the use of the `GNU autotools', the usual compilation should +-work. If the run of `configure' produces error reports you have +-produced errors in the `autotools' modification. +- +-##### Emacs settings +-Local Variables: +-mode: text +-End: ++pdfmom automake.mom > automake.pdf +diff -Nuar groff-1.22.3.old/install-sh groff-1.22.3/install-sh +--- groff-1.22.3.old/install-sh 2014-11-04 10:38:35.144525010 +0200 ++++ groff-1.22.3/install-sh 1970-01-01 02:00:00.000000000 +0200 +@@ -1,501 +0,0 @@ +-#!/bin/sh +-# install - install a program, script, or datafile +- +-scriptversion=2013-12-25.23; # UTC +- +-# This originates from X11R5 (mit/util/scripts/install.sh), which was +-# later released in X11R6 (xc/config/util/install.sh) with the +-# following copyright and license. +-# +-# Copyright (C) 1994 X Consortium +-# +-# Permission is hereby granted, free of charge, to any person obtaining a copy +-# of this software and associated documentation files (the "Software"), to +-# deal in the Software without restriction, including without limitation the +-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +-# sell copies of the Software, and to permit persons to whom the Software is +-# furnished to do so, subject to the following conditions: +-# +-# The above copyright notice and this permission notice shall be included in +-# all copies or substantial portions of the Software. +-# +-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-# +-# Except as contained in this notice, the name of the X Consortium shall not +-# be used in advertising or otherwise to promote the sale, use or other deal- +-# ings in this Software without prior written authorization from the X Consor- +-# tium. +-# +-# +-# FSF changes to this file are in the public domain. +-# +-# Calling this script install-sh is preferred over install.sh, to prevent +-# 'make' implicit rules from creating a file called install from it +-# when there is no Makefile. +-# +-# This script is compatible with the BSD install script, but was written +-# from scratch. +- +-tab=' ' +-nl=' +-' +-IFS=" $tab$nl" +- +-# Set DOITPROG to "echo" to test this script. +- +-doit=${DOITPROG-} +-doit_exec=${doit:-exec} +- +-# Put in absolute file names if you don't have them in your path; +-# or use environment vars. +- +-chgrpprog=${CHGRPPROG-chgrp} +-chmodprog=${CHMODPROG-chmod} +-chownprog=${CHOWNPROG-chown} +-cmpprog=${CMPPROG-cmp} +-cpprog=${CPPROG-cp} +-mkdirprog=${MKDIRPROG-mkdir} +-mvprog=${MVPROG-mv} +-rmprog=${RMPROG-rm} +-stripprog=${STRIPPROG-strip} +- +-posix_mkdir= +- +-# Desired mode of installed file. +-mode=0755 +- +-chgrpcmd= +-chmodcmd=$chmodprog +-chowncmd= +-mvcmd=$mvprog +-rmcmd="$rmprog -f" +-stripcmd= +- +-src= +-dst= +-dir_arg= +-dst_arg= +- +-copy_on_change=false +-is_target_a_directory=possibly +- +-usage="\ +-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +- or: $0 [OPTION]... SRCFILES... DIRECTORY +- or: $0 [OPTION]... -t DIRECTORY SRCFILES... +- or: $0 [OPTION]... -d DIRECTORIES... +- +-In the 1st form, copy SRCFILE to DSTFILE. +-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +-In the 4th, create DIRECTORIES. +- +-Options: +- --help display this help and exit. +- --version display version info and exit. +- +- -c (ignored) +- -C install only if different (preserve the last data modification time) +- -d create directories instead of installing files. +- -g GROUP $chgrpprog installed files to GROUP. +- -m MODE $chmodprog installed files to MODE. +- -o USER $chownprog installed files to USER. +- -s $stripprog installed files. +- -t DIRECTORY install into DIRECTORY. +- -T report an error if DSTFILE is a directory. +- +-Environment variables override the default commands: +- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG +- RMPROG STRIPPROG +-" +- +-while test $# -ne 0; do +- case $1 in +- -c) ;; +- +- -C) copy_on_change=true;; +- +- -d) dir_arg=true;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift;; +- +- --help) echo "$usage"; exit $?;; +- +- -m) mode=$2 +- case $mode in +- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) +- echo "$0: invalid mode: $mode" >&2 +- exit 1;; +- esac +- shift;; +- +- -o) chowncmd="$chownprog $2" +- shift;; +- +- -s) stripcmd=$stripprog;; +- +- -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) is_target_a_directory=never;; +- +- --version) echo "$0 $scriptversion"; exit $?;; +- +- --) shift +- break;; +- +- -*) 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. +- # Otherwise, the last argument is the destination. Remove it from $@. +- for arg +- do +- if test -n "$dst_arg"; then +- # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dst_arg" +- shift # fnord +- fi +- shift # arg +- dst_arg=$arg +- # Protect names problematic for 'test' and other utilities. +- case $dst_arg in +- -* | [=\(\)!]) dst_arg=./$dst_arg;; +- esac +- done +-fi +- +-if test $# -eq 0; then +- if test -z "$dir_arg"; then +- echo "$0: no input file specified." >&2 +- exit 1 +- fi +- # It's OK to call 'install-sh -d' without argument. +- # This can happen when creating conditional directories. +- exit 0 +-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 +- trap "ret=141; $do_exit" 13 +- trap "ret=143; $do_exit" 15 +- +- # Set umask so as not to create temps with too-generous modes. +- # However, 'strip' requires both read and write access to temps. +- case $mode in +- # Optimize common cases. +- *644) cp_umask=133;; +- *755) cp_umask=22;; +- +- *[0-7]) +- if test -z "$stripcmd"; then +- u_plus_rw= +- else +- u_plus_rw='% 200' +- fi +- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; +- *) +- if test -z "$stripcmd"; then +- u_plus_rw= +- else +- u_plus_rw=,u+rw +- fi +- cp_umask=$mode$u_plus_rw;; +- esac +-fi +- +-for src +-do +- # Protect names problematic for 'test' and other utilities. +- case $src in +- -* | [=\(\)!]) src=./$src;; +- esac +- +- if test -n "$dir_arg"; then +- dst=$src +- dstdir=$dst +- test -d "$dstdir" +- dstdir_status=$? +- else +- +- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command +- # might cause directories to be created, which would be especially bad +- # if $src (and thus $dsttmp) contains '*'. +- if test ! -f "$src" && test ! -d "$src"; then +- echo "$0: $src does not exist." >&2 +- exit 1 +- fi +- +- if test -z "$dst_arg"; then +- echo "$0: no destination specified." >&2 +- exit 1 +- fi +- dst=$dst_arg +- +- # 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 "$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 +- dstdir=`dirname "$dst"` +- test -d "$dstdir" +- dstdir_status=$? +- fi +- fi +- +- obsolete_mkdir_used=false +- +- 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;; +- esac +- +- if +- $posix_mkdir && ( +- umask $mkdir_umask && +- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" +- ) +- then : +- else +- +- # The umask is ridiculous, or mkdir does not conform to POSIX, +- # or it failed possibly due to a race condition. Create the +- # directory the slow way, step by step, checking for races as we go. +- +- case $dstdir in +- /*) prefix='/';; +- [-=\(\)!]*) prefix='./';; +- *) prefix='';; +- esac +- +- oIFS=$IFS +- IFS=/ +- set -f +- set fnord $dstdir +- shift +- 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/ +- 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 +- fi +- fi +- fi +- +- if test -n "$dir_arg"; then +- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && +- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && +- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || +- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 +- else +- +- # Make a couple of temp file names in the proper directory. +- dsttmp=$dstdir/_inst.$$_ +- rmtmp=$dstdir/_rm.$$_ +- +- # Trap to clean up those temp files at exit. +- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 +- +- # Copy the file name to the temp name. +- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && +- +- # and set any options; do chmod last to preserve setuid bits. +- # +- # If any of these fail, we abort the whole thing. If we want to +- # ignore errors from any of these, just make sure not to ignore +- # errors from the above "$doit $cpprog $src $dsttmp" command. +- # +- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && +- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && +- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && +- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && +- +- # 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` && +- set -f && +- set X $old && old=:$2:$4:$5:$6 && +- set X $new && new=:$2:$4:$5:$6 && +- set +f && +- test "$old" = "$new" && +- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 +- then +- rm -f "$dsttmp" +- else +- # Rename the file to the real destination. +- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || +- +- # The rename failed, perhaps because mv can't rename something else +- # 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" +- } +- fi || exit 1 +- +- trap '' 0 +- fi +-done +- +-# Local variables: +-# 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 -Nuar groff-1.22.3.old/m4/groff.m4 groff-1.22.3/m4/groff.m4 +--- groff-1.22.3.old/m4/groff.m4 2014-11-04 10:38:35.568519709 +0200 ++++ groff-1.22.3/m4/groff.m4 2015-04-23 20:57:03.000000000 +0300 +@@ -148,7 +148,11 @@ + # We need makeinfo 4.8 or newer. + + AC_DEFUN([GROFF_MAKEINFO], +- [if test $docadd_info = yes; then ++ # By default automake will set MAKEINFO to MAKEINFO = ${SHELL} /build-aux/missing makeinfo.As we need a more precise ++ # check of makeinfo version, we don't use it. ++ [MAKEINFO= ++ if test $docadd_info = yes; then + missing= + AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo]) + if test -z "$MAKEINFO"; then +@@ -173,13 +177,13 @@ + infofile=doc/groff.info + test -f ${infofile} || infofile=${srcdir}/${infofile} + if test ! -f ${infofile} \ +- || test ${srcdir}/doc/groff.texinfo -nt ${infofile}; then ++ || test ${srcdir}/doc/groff.texi -nt ${infofile}; then + AC_MSG_ERROR($missing + [Get the `texinfo' package version 4.8 or newer.]) + else + AC_MSG_WARN($missing + [Get the `texinfo' package version 4.8 or newer if you want to convert +-`groff.texinfo' into a PDF or HTML document.]) ++`groff.texi' into a PDF or HTML document.]) + fi + fi + +@@ -195,8 +199,8 @@ + AC_SUBST([MAKEINFO]) + AC_SUBST([make_infodoc]) + AC_SUBST([make_install_infodoc]) +- AC_SUBST([make_uninstall_infodoc])]) +- ++ AC_SUBST([make_uninstall_infodoc]) ++ AC_SUBST([makeinfo_version_numeric])]) + + # The following programs are needed for grohtml. + +@@ -902,6 +906,8 @@ + AC_SUBST([tmac_wrap])]) + + ++# Searching if a non-GNU Troff is installed. The built-in register ++# \n[.g] is always 1 in GNU Troff. + AC_DEFUN([GROFF_G], + [AC_MSG_CHECKING([for existing troff installation]) + if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then +@@ -998,18 +1004,12 @@ + case "$host_os" in + *mingw*) + make_winscripts=winscripts +- make_install_winscripts=install_winscripts +- make_uninstall_winscripts=uninstall_winscripts + AC_MSG_RESULT([yes]) ;; + *) + make_winscripts= +- make_install_winscripts= +- make_uninstall_winscripts= + AC_MSG_RESULT([no]) ;; + esac +- AC_SUBST([make_winscripts]) +- AC_SUBST([make_install_winscripts]) +- AC_SUBST([make_uninstall_winscripts])]) ++ AC_SUBST([make_winscripts])]) + + + # Check whether we need a declaration for a function. +@@ -1353,3 +1353,22 @@ + AC_DEFUN([GROFF_REFERDIR_DEFAULT], + referdir=$libprogramdir/refer + AC_SUBST([referdir])) ++ ++# Check for xpmtoppm, for gnu.eps generation ++AC_DEFUN([GROFF_PROG_XPMTOPPM], ++ [AC_CHECK_PROG([XPMTOPPM], [xpmtoppm], [found], [missing])]) ++ ++# Check for make builtin variable RM ++AC_DEFUN([GROFF_MAKE_RM], ++ [AC_MSG_CHECKING(whether make has builtin variable RM) ++cat < test_make_rm.mk ++all: ++ @if test -n "\$(RM)"; then \ ++ echo "yes"; \ ++ else \ ++ echo "no"; \ ++ fi ++EOF ++ groff_is_rm_defined=`make -sf test_make_rm.mk` ++ AC_MSG_RESULT([$groff_is_rm_defined]) ++ rm -f test_make_rm.mk]) +diff -Nuar groff-1.22.3.old/Makefile groff-1.22.3/Makefile +--- groff-1.22.3.old/Makefile 2014-11-04 10:39:21.025951413 +0200 ++++ groff-1.22.3/Makefile 1970-01-01 02:00:00.000000000 +0200 +@@ -1,34 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.init +-# +-SHELL=/bin/sh +- +-.PHONY: all +-all: +- $(SHELL) configure +- $(MAKE) all +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.am groff-1.22.3/Makefile.am +--- groff-1.22.3.old/Makefile.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/Makefile.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,857 @@ ++# # Copyright (C) 1989-2014 Free Software Foundation, Inc. ++# Free Software Foundation, Inc. ++# Original Makefile.in written by James Clark (jjc@jclark.com) ++# Migrated to Automake by Bertrand Garrigues ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++# ++# Makefile.am ++# ++ ++# The variables that are listed in the following comments will be ++# automatically set by automake in the generated Makefile.in ++ ++# SHELL ++ ++# PACKAGE_TARNAME ++ ++# srcdir ++ ++# top_srcdir ++ ++# VPATH ++ ++# top_builddir ++ ++# HOST ++# `HOST' is the canonical host specification, ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++ ++# `RT_SEP' is the operating system's native PATH SEPARATOR CHAR, which ++# is to be used in runtime PATHs compiled into groff executables. ++RT_SEP=@GROFF_PATH_SEPARATOR@ ++ ++# `SH_SEP' is a alternative PATH SEPARATOR CHAR, to be used in shell ++# scripts and makefile rules; it may be the same as `RT_SEP', but, ++# particularly in some Microsoft environments, it may differ. ++SH_SEP=@PATH_SEPARATOR@ ++ ++# GLIBC2 ++# `GLIBC21' is yes if the host operating system uses GNU libc 2.1 or newer, ++# otherwise no. ++ ++ ++# VERSION is set by automake, based on what is passed to AC_INIT. We ++# pass GROFF_VERSION_STRING to it, which skips the revision if set to ++# 0. ++ ++# PAGE ++# Define `page' to be letter if your PostScript printer uses 8.5x11 ++# paper (USA) and define it to be A4, if it uses A4 paper (rest of the ++# world). ++ ++# GHOSTSCRIPT ++# The name of the ghostscript program. Normally, gs, on GNU/Linux ++# but it might be different on MS-DOS/MS-WIN32 systems. ++ ++# ALT_GHOSTSCRIPT_PROGS ++# `ALT_GHOSTSCRIPT_PROGS' specifies a list alternative names, ++# which can be tried if `GHOSTSCRIPT' cannot be found at run time. ++ ++# ALT_AWK_PROGS ++# Similarly, `ALT_AWK_PROGS' specifies a list of alternative names, ++# which can be tried at run time, to identify the awk program. ++ ++# BROKEN_SPOOLER_FLAGS ++# Normally the Postscript driver, grops, produces output that conforms ++# to version 3.0 of the Adobe Document Structuring Conventions. ++# Unfortunately some spoolers and previewers can't handle such output. ++# The BROKEN_SPOOLER_FLAGS variable tells grops what it should do to ++# make its output acceptable to such programs. This variable controls ++# only the default behaviour of grops; the behaviour can be changed at ++# runtime by the grops -b option (and so by groff -P-b). ++# Use a value of 0 if your spoolers and previewers are able to handle ++# conforming PostScript correctly. ++# Add 1 if no %%{Begin,End}DocumentSetup comments should be generated; ++# this is needed for early versions of TranScript that get confused by ++# anything between the %%EndProlog line and the first %%Page: comment. ++# Add 2 if lines in included files beginning with %! should be ++# stripped out; this is needed for the OpenWindows 2.0 pageview previewer. ++# Add 4 if %%Page, %%Trailer and %%EndProlog comments should be ++# stripped out of included files; this is needed for spoolers that ++# don't understand the %%{Begin,End}Document comments. I suspect this ++# includes early versions of TranScript. ++# Add 8 if the first line of the PostScript output should be %!PS-Adobe-2.0 ++# rather than %!PS-Adobe-3.0; this is needed when using Sun's Newsprint ++# with a printer that requires page reversal. ++ ++ ++# `DEVICE' is the default device. ++DEVICE=ps ++ ++# XDEVIDIRS ++# `XDEVDIRS' is either `font/devX{75,100}{,-12}' or empty. ++ ++# XPROGDIRS ++# `XPROGDIRS' is either `src/devices/xditview src/utils/xtotroff' or empty. ++ ++# XLIBDIRS ++# `XLIBDIRS' is either `src/libs/libxutil' or empty. ++ ++# `TTYDEVDIRS' is either `font/devascii font/devlatin1' (for ++# ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8. ++TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8 ++ ++# OTHERDEVDIRS ++# `OTHERDEVDIRS' is either `font/devlj4 font/devlbp' (for ASCII) or ++# empty (for EBCDIC). ++ ++# PSPRINT ++# `PSPRINT' is the command to use for printing a PostScript file, ++# for example `lpr'. ++ ++# DVIPRINT ++# `DVIPRINT' is the command to use for printing a TeX dvi file, ++# for example `lpr -d'. ++ ++# g ++# Prefix for names of programs that have Unix counterparts. ++# For example, if `g' is `g' then troff will be installed as ++# gtroff. This doesn't affect programs like grops or groff that have ++# no Unix counterparts. Note that the groff versions of eqn and tbl ++# will not work with Unix troff. ++ ++# prefix ++# exec_prefix ++# Common prefix for installation directories. ++# Used in definitions of exec_prefix, datasubdir, fontpath, manroot. ++# This must already exist when you do make install. ++ ++# bindir ++# `bindir' says where to install executables. ++ ++# libdir ++# `libdir' says where to install platform-dependent data. ++ ++# libprogramdir ++# `libprogramdir' is $(libdir)/groff ++ ++# `datasubdir' says where to install platform-independent data files. ++# datadir ++# datarootdir ++dataprogramdir=$(datadir)/groff ++datasubdir=$(dataprogramdir)/$(VERSION) ++ ++# infodir ++# `infodir' says where to install info files. ++ ++# docdir ++# `docdir' says where to install documentation files. The default ++# location is ${datarootdir}/doc/${PACKAGE}, but we add the version ++docdir=$(datarootdir)/doc/${PACKAGE}-$(VERSION) ++ ++# `exampledir' says where to install example files. ++exampledir=$(docdir)/examples ++ ++# `htmldocdir' says where to install documentation in HTML format. ++htmldocdir=$(docdir)/html ++ ++# `pdfdocdir' says where to install documentation in PDF format. ++pdfdocdir=$(docdir)/pdf ++ ++# `fontdir' says where to install dev*/*. ++fontdir=$(datasubdir)/font ++ ++# `oldfontdir' says where to install old font sets (as dev*/*). ++oldfontdir=$(datasubdir)/oldfont ++ ++# `localfontdir' says where local fonts will be installed (as dev*/*). ++localfontdir=$(dataprogramdir)/site-font ++ ++# `legacyfontdir' is for compatibility with non-GNU troff. ++legacyfontdir=/usr/lib/font ++ ++# `fontpath' says where to look for dev*/*. ++fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir) ++ ++# `tmacdir' says where to install macros. ++tmacdir=$(datasubdir)/tmac ++ ++# `systemtmacdir' says where to install platform-dependent macros. ++systemtmacdir=$(libprogramdir)/site-tmac ++ ++# `localtmacdir' says where local files will be installed. ++localtmacdir=$(dataprogramdir)/site-tmac ++ ++# appresdir ++# `appresdir' says where to install the application resource file for ++# gxditview. ++ ++# groffer_dir ++# glilypond_dir ++# grog_dir ++# gpinyin_dir ++ ++# `tmacpath' says where to look for macro files. ++# The current directory will be prepended in unsafe mode only; the home ++# directory will be always added. ++# `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the ++# current nor in the home directory. ++tmacpath=$(systemtmacdir)$(RT_SEP)$(localtmacdir)$(RT_SEP)$(tmacdir) ++ ++# sys_tmac_prefix ++# `sys_tmac_prefix' is prefix (if any) for system macro packages. ++ ++# pnmtops_nosetpage ++# `pnmtops_nosetpage' is the command to be run to generate an eps ++# file. Some versions of pnmtops provide the -nosetpage option. ++# We detect this and use it if present. ++ ++# tmac_wrap ++# `tmac_wrap' is list of system macro packages that should be made ++# available to groff by creating a corresponding macro package ++# in the groff macro directory that references the system macro ++# package. ++ ++# If there is a groff version of a macro package listed in $(tmac_wrap), ++# then the groff version will be installed with a prefix of this. ++# Don't make this empty. ++tmac_prefix=g ++ ++# The groff -mm macros will be available as -m$(tmac_m_prefix)m. ++tmac_m_prefix=\ ++ `for i in $(tmac_wrap) ""; do case "$$i" in m) echo $(tmac_prefix);; esac; done` ++# The groff -ms macros will be available as -m$(tmac_s_prefix)s. ++tmac_s_prefix=\ ++ `for i in $(tmac_wrap) ""; do case "$$i" in s) echo $(tmac_prefix);; esac; done` ++# The groff -man macros will be available as -m$(tmac_an_prefix)an. ++tmac_an_prefix=\ ++ `for i in $(tmac_wrap) ""; do case "$$i" in an) echo $(tmac_prefix);; esac; done` ++ ++# Extension to be used for refer index files. Index files are not ++# sharable between different architectures, so you might want to use ++# different suffixes for different architectures. Choose an extension ++# that doesn't conflict with refer or any other indexing program. ++indexext=.i ++ ++# Directory containing the default index for refer. ++indexdir=/usr/dict/papers ++ ++# The filename (without suffix) of the default index for refer. ++indexname=Ind ++ ++# common_words_file is a file containing a list of common words. ++# If your system provides /usr/lib/eign it will be copied onto this, ++# otherwise the supplied eign file will be used. ++common_words_file=$(datasubdir)/eign ++ ++# mandir ++# `manroot' is the root of the man page directory tree. ++manroot=$(mandir) ++ ++# `man1ext' is the man section for user commands. ++man1ext=1 ++man1dir=$(manroot)/man$(man1ext) ++ ++# `man5ext' is the man section for file formats. ++man5ext=5 ++man5dir=$(manroot)/man$(man5ext) ++ ++# `man7ext' is the man section for macros. ++man7ext=7 ++man7dir=$(manroot)/man$(man7ext) ++ ++# doc_dist_target_ok ++# `dist' target is disallowed in some `configure' combinations. ++ ++# The configure script checks whether the user wants the info documentation. ++# For the repo version this mechanism also suppresses building via `makeinfo'. ++# make_infodoc ++# make_install_infodoc ++# make_uninstall_infodoc ++ ++# The configure script checks whether all necessary utility programs for ++# grohtml are available -- only then we can build the HTML documentation. ++# make_htmldoc ++# make_install_htmldoc ++# make_uninstall_htmldoc ++ ++# make_htmlexamples ++# make_install_htmlexamples ++# make_uninstall_htmlexamples ++ ++# The configure script also checks whether all necessary utility programs ++# for pdfroff are available -- only then we can build PDF documentation. ++# make_pdfdoc ++# make_install_pdfdoc ++# make_uninstall_pdfdoc ++ ++# make_pdfexamples ++# make_install_pdfexamples ++# make_uninstall_pdfexamples ++ ++# `other' documentation, e.g., `meref.me' and `pic.ms', as well as their ++# generated counterparts.. ++# make_otherdoc ++# make_install_otherdoc ++# make_uninstall_otherdoc ++ ++# `examples' -- a generic switch, but the generated examples are furtherly ++# subdivided to catch HTML and PDF production availability. ++# make_examples ++# make_install_examples ++# make_uninstall_examples ++ ++# Windows `.cmd' files ++# make_winscripts ++# make_install_winscripts ++# make_uninstall_winscripts ++ ++# All the previous installation directories, when used, are prefixed with ++# $(DESTDIR) during install and uninstall, to support staged installations. ++ ++# config.h might set the following defines: ++# ++# WORDS_BIGENDIAN if your target platform is big-endian ++# IS_EBCDIC_HOST if the host's encoding is EBCDIC ++# ++# HAVE_DIRECT_H if you have ++# HAVE_DIRENT_H if you have ++# HAVE_CC_INTTYPES_H if you have a C++ ++# HAVE_PROCESS_H if you have ++# HAVE_LIMITS_H if you have ++# HAVE_CC_LIMITS_H if you have a C++ ++# HAVE_MATH_H if you have ++# HAVE_CC_OSFCN_H if you have a C++ ++# HAVE_STDDEF_H if you have ++# HAVE_STDLIB_H if you have ++# HAVE_STRING_H if you have ++# HAVE_STRINGS_H if you have ++# HAVE_SYS_DIR_H if you have ++# HAVE_SYS_PARAM_H if you have ++# HAVE_SYS_STAT_H if you have ++# HAVE_SYS_TIME_H if you have ++# HAVE_SYS_TYPES_H if you have ++# HAVE_UNISTD_H if you have ++# ++# HAVE_FMOD if you have fmod() ++# HAVE_GETCWD if you have getcwd() ++# HAVE_GETTIMEOFDAY if you have gettimeofday() ++# HAVE_ICONV if you have iconv() ++# HAVE_ISATTY if you have isatty() ++# HAVE_KILL if you have kill() ++# HAVE_LANGINFO_CODESET if you have nl_langinfo() ++# HAVE_MKSTEMP if you have mkstemp() ++# HAVE_MMAP if you have mmap() ++# HAVE_PUTENV if you have putenv() ++# HAVE_RENAME if you have rename() ++# HAVE_SETLOCALE if you have setlocale() ++# HAVE_SNPRINTF if you have snprintf() ++# HAVE_STRCASECMP if you have strcasecmp() ++# HAVE_STRNCASECMP if you have strncasecmp() ++# HAVE_STRERROR if you have strerror() ++# HAVE_STRSEP if you have strsep() ++# HAVE_STRTOL if you have strtol() ++# HAVE_SYMLINK if you have symlink() ++# HAVE_VSNPRINTF if you have vsnprintf() ++# ++# NEED_DECLARATION_GETTIMEOFTODAY ++# if your C++ doesn't declare ++# gettimeofday() ++# NEED_DECLARATION_HYPOT if your C++ doesn't declare hypot() ++# NEED_DECLARATION_PCLOSE if your C++ doesn't declare pclose() ++# NEED_DECLARATION_POPEN if your C++ doesn't declare popen() ++# NEED_DECLARATION_PUTENV if your C++ doesn't declare ++# putenv() ++# NEED_DECLARATION_RAND if your C++ doesn't declare rand() ++# NEED_DECLARATION_SNPRINTF if your C++ doesn't declare ++# snprintf() ++# NEED_DECLARATION_SRAND if your C++ doesn't declare srand() ++# NEED_DECLARATION_STRCASECMP if your C++ doesn't declare ++# strcasecmp() ++# NEED_DECLARATION_STRNCASECMP ++# if your C++ doesn't declare ++# strncasecmp() ++# NEED_DECLARATION_VFPRINTF if your C++ doesn't declare ++# vfprintf() ++# NEED_DECLARATION_VSNPRINTF if your C++ doesn't declare ++# vsnprintf() ++# ++# HAVE_DECL_GETC_UNLOCKED if you have getc_unlocked() ++# HAVE_DECL_SYS_SIGLIST if you have sys_siglist[] ++# ++# HAVE_STRUCT_EXCEPTION if defines struct exception ++# HAVE_SYS_NERR if you have sysnerr in or ++# HAVE_SYS_ERRLIST if you have sys_errlist in or ++# ++# ICONV_CONST=const if declaration of iconv() needs const ++# LONG_FOR_TIME_T if localtime() takes a long * not a time_t * ++# RETSIGTYPE=int if signal handlers return int not void ++# RET_TYPE_SRAND_IS_VOID if srand() returns void not int ++# ++# WCOREFLAG=0200 if the 0200 bit of the status returned by ++# wait() indicates whether a core image was ++# produced for a process that was terminated ++# by a signal ++# ++# HAVE_WORKING_O_NOATIME define if 's O_NOATIME flag works ++# HAVE_WORKING_O_NOFOLLOW define if 's O_NOFOLLOW flag works ++# ++# uintmax_t= define to `unsigned long' or `unsigned long ++# long' if does not exist ++# ++# TRADITIONAL_CPP if your C++ compiler uses a traditional ++# (Reiser) preprocessor ++# ARRAY_DELETE_NEEDS_SIZE if your C++ doesn't understand `delete []' ++# ++# PAGE=A4 if the the printer's page size is A4 ++# GHOSTSCRIPT=gs the name (and directory if required) of the ++# ghostscript program ++ ++# Include ++# ++# {fmod,getcwd,mkstemp,putenv,snprintf,strcasecmp, ++# strerror,strncasecmp,strtol}.$(OBJEXT) ++# ++# LIBOBJS ++# in LIBOBJS if your C library is missing the corresponding function. ++# vsnprintf is defined in the snprintf.$(OBJEXT) module. ++ ++# `CCC' is the compiler for C++ (.cpp) files. ++CCC=@CXX@ ++# CC ++# CFLAGS ++# CPPFLAGS ++# LDFLAGS ++ ++# X_CFLAGS ++# X_LIBS ++# X_EXTRA_LIBS ++# X_PRE_LIBS ++ ++# YACC ++ ++# GREP ++# EGREP ++ ++# MAKEINFO ++ ++# EXEEXT ++# OBJEXT ++# LIBEXT ++# LIBS ++# LIBM ++# LIBICONV ++# RANLIB ++# INSTALL ++# INSTALL_PROGRAM ++# INSTALL_SCRIPT ++# INSTALL_DATA ++# INSTALL_INFO ++# LN_S ++ ++AR=ar ++ETAGS=etags ++ETAGSFLAGS= ++# Flag that tells etags to assume C++. ++ETAGSCCFLAG=-C ++# Full path to perl. ++# PERL ++# PERLVERSION ++# Sed command with which to edit sh scripts. ++# SH_SCRIPT_SED_CMD ++# Sed script to deal with OS dependencies in sh scripts. ++SH_DEPS_SED_SCRIPT=$(top_builddir)/shdeps.sed ++ ++# The program to create directory hierarchies. ++# mkinstalldirs is now in gnulib/build-aux ++ ++PURIFY=purify ++PURIFYCCFLAGS= ++#PURIFYCCFLAGS=-g++=yes \ ++# -collector=`dirname \`$(CCC) -print-libgcc-file-name\``/ld ++ ++# Add groff and gnulib m4 macros ++ACLOCAL_AMFLAGS = -I m4 -I gnulib_m4 ++ ++# Common preprocessor flags: gnulib includes, common includes in ++# src/include, and config.h that is generated in the build tree ++AM_CPPFLAGS = \ ++ -I$(top_srcdir)/src/include \ ++ -I$(top_srcdir)/lib \ ++ -I$(top_builddir)/src/include \ ++ -I$(top_builddir)/lib ++ ++# The following Automake variables will be overloaded by the various ++# .am files ++bin_PROGRAMS = ++nobase_bin_PROGRAMS = ++bin_SCRIPTS = ++dist_bin_SCRIPTS = ++MOSTLYCLEANFILES = ++MOSTLYCLEANADD = ++noinst_LIBRARIES = ++BUILT_SOURCES = ++CLEANFILES = ++# gnulib asks to include this file ++EXTRA_DIST = gnulib_m4/gnulib-cache.m4 ++FONTFILES = ++PREFIXMAN1 = ++PREFIXMAN5 = ++PREFIXMAN7 = ++man1_MANS = ++man5_MANS = ++man7_MANS = ++ ++# for lex/yacc ++AM_YFLAGS = -d -v ++ ++SUFFIXES = ++ ++# tests launched by make check ++check_SCRIPTS = ++check_PROGRAMS = ++TESTS = ++AM_TESTS_ENVIRONMENT = \ ++ abs_top_srcdir=$(abs_top_srcdir) \ ++ abs_top_builddir=$(abs_top_builddir) \ ++ export abs_top_srcdir abs_top_builddir; ++ ++# We use Automake's Uniform Naming Scheme. ++# ++# prefixexecbin_PROGRAMS is the list of programs that may have a ++# NAMEPREFIX if an existing non-GNU troff system was detected. ++# ++# This is done by the m4 macro GROFF_G that checks for the presence of ++# GNU Troff built-in \n[.g] macro. If a Unix Troff binary was ++# detected, the following programs and scripts names will have a 'g' ++# prefix: chem, tbl, eqn, neqn, pic, soleimm grn, refer, lookbib, ++# troff, nroff. Also, PROG_PREFIX will be set to 'g' in the generated ++# header defs.h so that these programs could be called correctly. ++# ++# prefixexecbindir is used to temporary install these programs. They ++# are then moved to bindir during the install-exec-hook. Same thing ++# for the scripts. ++NAMEPREFIX=$(g) ++prefixexecbin_PROGRAMS = ++prefixexecbin_SCRIPTS = ++if USEPROGRAMPREFIX ++# We use datadir because the uninstall rule for the PROGRAMS attempt ++# to cd into prefixexecbindir, and thus if prefixexecbindir is removed ++# two consecutive uninstall would fail ++prefixexecbindir = $(datadir) ++else ++prefixexecbindir = $(bindir) ++endif ++ ++# Path to binaries and flags used by contribs and doc to generated doc. ++# These may be overridden if cross-compiling. ++GROFFBIN = $(abs_top_builddir)/groff ++GROFF_BIN_PATH = $(abs_top_builddir) ++PDFMOMBIN = $(abs_top_builddir)/pdfmom ++FFLAG=-F$(abs_top_builddir)/font -F$(abs_top_srcdir)/font ++TFLAG=-M$(abs_top_builddir)/tmac -M$(abs_top_srcdir)/tmac ++ ++# make builtin variable RM ++if MAKE_DONT_HAVE_RM ++RM = rm -f ++endif ++ ++# Non-recursive makefile system. See Automake manual '7.3 An ++# Alternative Approach to Subdirectories'. We use a single Makefile.am ++# that includes other .am files, rather than using SUBDIRS. Note that ++# relative paths in the following .am files are relative to the top ++# source directory. ++ ++include $(top_srcdir)/lib/gnulib.mk ++include $(top_srcdir)/arch/mingw/mingw.am ++include $(top_srcdir)/arch/misc/misc.am ++include $(top_srcdir)/contrib/chem/chem.am ++include $(top_srcdir)/contrib/eqn2graph/eqn2graph.am ++include $(top_srcdir)/contrib/gdiffmk/gdiffmk.am ++include $(top_srcdir)/contrib/glilypond/glilypond.am ++include $(top_srcdir)/contrib/gperl/gperl.am ++include $(top_srcdir)/contrib/gpinyin/gpinyin.am ++include $(top_srcdir)/contrib/grap2graph/grap2graph.am ++include $(top_srcdir)/contrib/groff_filenames/groff_filenames.am ++include $(top_srcdir)/contrib/groffer/groffer.am ++include $(top_srcdir)/contrib/hdtbl/hdtbl.am ++include $(top_srcdir)/contrib/mm/mm.am ++include $(top_srcdir)/contrib/mom/mom.am ++include $(top_srcdir)/contrib/pdfmark/pdfmark.am ++include $(top_srcdir)/contrib/pic2graph/pic2graph.am ++include $(top_srcdir)/doc/doc.am ++include $(top_srcdir)/font/devX100/devX100.am ++include $(top_srcdir)/font/devX100-12/devX100-12.am ++include $(top_srcdir)/font/devX75/devX75.am ++include $(top_srcdir)/font/devX75-12/devX75-12.am ++include $(top_srcdir)/font/devascii/devascii.am ++include $(top_srcdir)/font/devcp1047/devcp1047.am ++include $(top_srcdir)/font/devdvi/devdvi.am ++include $(top_srcdir)/font/devhtml/devhtml.am ++include $(top_srcdir)/font/devlatin1/devlatin1.am ++include $(top_srcdir)/font/devlbp/devlbp.am ++include $(top_srcdir)/font/devlj4/devlj4.am ++include $(top_srcdir)/font/devpdf/devpdf.am ++include $(top_srcdir)/font/devps/devps.am ++include $(top_srcdir)/font/devutf8/devutf8.am ++include $(top_srcdir)/font/scripts/scripts.am ++include $(top_srcdir)/man/man.am ++include $(top_srcdir)/src/include/include.am ++include $(top_srcdir)/src/libs/libbib/libbib.am ++include $(top_srcdir)/src/libs/libdriver/libdriver.am ++include $(top_srcdir)/src/libs/libgroff/libgroff.am ++include $(top_srcdir)/src/libs/libxutil/libxutil.am ++include $(top_srcdir)/src/devices/grodvi/grodvi.am ++include $(top_srcdir)/src/devices/grohtml/grohtml.am ++include $(top_srcdir)/src/devices/grolbp/grolbp.am ++include $(top_srcdir)/src/devices/grolj4/grolj4.am ++include $(top_srcdir)/src/devices/gropdf/gropdf.am ++include $(top_srcdir)/src/devices/grops/grops.am ++include $(top_srcdir)/src/devices/grotty/grotty.am ++include $(top_srcdir)/src/devices/xditview/xditview.am ++include $(top_srcdir)/src/preproc/eqn/eqn.am ++include $(top_srcdir)/src/preproc/grn/grn.am ++include $(top_srcdir)/src/preproc/html/html.am ++include $(top_srcdir)/src/preproc/pic/pic.am ++include $(top_srcdir)/src/preproc/preconv/preconv.am ++include $(top_srcdir)/src/preproc/refer/refer.am ++include $(top_srcdir)/src/preproc/soelim/soelim.am ++include $(top_srcdir)/src/preproc/tbl/tbl.am ++include $(top_srcdir)/src/roff/groff/groff.am ++include $(top_srcdir)/src/roff/grog/grog.am ++include $(top_srcdir)/src/roff/nroff/nroff.am ++include $(top_srcdir)/src/roff/troff/troff.am ++include $(top_srcdir)/src/utils/addftinfo/addftinfo.am ++include $(top_srcdir)/src/utils/afmtodit/afmtodit.am ++include $(top_srcdir)/src/utils/hpftodit/hpftodit.am ++include $(top_srcdir)/src/utils/indxbib/indxbib.am ++include $(top_srcdir)/src/utils/lkbib/lkbib.am ++include $(top_srcdir)/src/utils/lookbib/lookbib.am ++include $(top_srcdir)/src/utils/pfbtops/pfbtops.am ++include $(top_srcdir)/src/utils/tfmtodit/tfmtodit.am ++include $(top_srcdir)/src/utils/xtotroff/xtotroff.am ++include $(top_srcdir)/tmac/tmac.am ++ ++# Adding defs.h to BUILT_SOURCES will ensure that it will be built on ++# make all or make check before all other targets. However, if another ++# target is built from a clean build tree, (for example make groff) ++# the files in BUILT_SOURCES will not be built first. That is why ++# additional dependencies where added in the .am files that lists ++# objects that use defs (for exmaple in groff.am: ++# src/roff/groff/groff.$(OBJEXT): defs.h) ++BUILT_SOURCES += defs.h ++ ++# Same thing for gnulib's localcharset.c and configmake.h: gnulib uses ++# BUILT_SOURCES only, adding the following makes 'make lib/libgnu.a' ++# possible ++lib/localcharset.$(OBJEXT): lib/configmake.h ++ ++# if there is a name prefix we install the man pages by hand ++all: generate_man_files ++install-data-hook: install-prefix-man ++uninstall-hook: uninstall-prefix-man ++if USEPROGRAMPREFIX ++generate_man_files: $(PREFIXMAN1) ++install-prefix-man: ++ for f in $(PREFIXMAN1); do \ ++ manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \ ++ cp -f $$f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \ ++ done ++ for f in $(PREFIXMAN5); do \ ++ manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \ ++ cp -f $$f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \ ++ done ++ for f in $(PREFIXMAN7); do \ ++ manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \ ++ cp -f $$f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \ ++ done ++uninstall-prefix-man: ++ for f in $(PREFIXMAN1); do \ ++ manfile_final_name=`basename $$f | sed 's/n$$/1/'`; \ ++ rm -f $(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$manfile_final_name; \ ++ done ++ for f in $(PREFIXMAN5); do \ ++ manfile_final_name=`basename $$f | sed 's/n$$/5/'`; \ ++ rm -f $(DESTDIR)$(man5dir)/$(NAMEPREFIX)$$manfile_final_name; \ ++ done ++ for f in $(PREFIXMAN7); do \ ++ manfile_final_name=`basename $$f | sed 's/n$$/7/'`; \ ++ rm -f $(DESTDIR)$(man7dir)/$(NAMEPREFIX)$$manfile_final_name; \ ++ done ++else ++man1_MANS += $(PREFIXMAN1) ++man1_MANS += $(PREFIXMAN5) ++man1_MANS += $(PREFIXMAN7) ++install-prefix-man: ++uninstall-prefix-man: ++generate_man_files: ++endif ++ ++# Hook to create the 'current' symlink ++install-data-hook: create_current_symlink ++create_current_symlink: ++ cd $(DESTDIR)$(dataprogramdir); \ ++ rm -f current; \ ++ $(LN_S) $(VERSION) current ++ ++# Hook to move the binaries that potentially have a prefix from ++# prefixexecbindir to bindir. ++install-exec-hook: move_binaries_with_prefix ++move_binaries_with_prefix: ++if USEPROGRAMPREFIX ++ if test -n "$(NAMEPREFIX)"; then \ ++ for f in $(prefixexecbin_PROGRAMS) $(prefixexecbin_SCRIPTS); do \ ++ mv -f $(DESTDIR)$(prefixexecbindir)/$$f$(EXEEXT) \ ++ $(DESTDIR)$(bindir)/$(NAMEPREFIX)$$f$(EXEEXT); \ ++ done \ ++ fi ++endif ++ ++# Always create the site-font directory as a guide to the user. ++install-data-hook: install_site_font ++install_site_font: ++ -test -d $(DESTDIR)$(localfontdir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(localfontdir) ++ ++# Create systemtmacdir if not present ++install-data-hook: install_tmacdir ++install_tmacdir: ++ -test -d $(DESTDIR)$(systemtmacdir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(systemtmacdir) ++ ++# directories specific to groff ++uninstall-hook: uninstall_groffdirs ++uninstall_groffdirs: ++ if test -d $(DESTDIR)$(datasubdir); then \ ++ rm -rf $(DESTDIR)$(fontdir); \ ++ rm -rf $(DESTDIR)$(oldfontdir); \ ++ rmdir $(DESTDIR)$(datasubdir); \ ++ fi ++ if test -d $(DESTDIR)$(dataprogramdir); then \ ++ if test -h $(DESTDIR)$(dataprogramdir)/current; then \ ++ rm -f $(DESTDIR)$(dataprogramdir)/current; \ ++ fi; \ ++ if test -d $(DESTDIR)$(localfontdir); then \ ++ rm -f $(DESTDIR)$(localfontdir)/*; \ ++ rmdir $(DESTDIR)$(localfontdir); \ ++ fi; \ ++ rmdir $(DESTDIR)$(dataprogramdir); \ ++ fi ++ if test -d $(DESTDIR)$(grog_dir); then \ ++ rmdir $(DESTDIR)$(grog_dir); \ ++ fi ++ if test -d $(DESTDIR)$(libprogramdir); then \ ++ if test -d $(DESTDIR)$(systemtmacdir); then \ ++ rm -f $(DESTDIR)$(systemtmacdir)/*; \ ++ rmdir $(DESTDIR)$(systemtmacdir); \ ++ fi; \ ++ rmdir $(DESTDIR)$(libprogramdir); \ ++ fi ++ if test -d $(DESTDIR)$(docdir); then \ ++ if test -d $(DESTDIR)$(exampledir); then \ ++ rmdir $(DESTDIR)$(exampledir); \ ++ fi; \ ++ if test -d $(DESTDIR)$(htmldocdir); then \ ++ rmdir $(DESTDIR)$(htmldocdir); \ ++ fi; \ ++ rmdir $(DESTDIR)$(docdir); \ ++ fi ++ ++# Uninstall program that have a 'g' prefix ++uninstall-hook: uninstall_binaries_with_prefix ++uninstall_binaries_with_prefix: ++if USEPROGRAMPREFIX ++ if test -n "$(NAMEPREFIX)"; then \ ++ for f in $(prefixexecbin_PROGRAMS) $(prefixexecbin_SCRIPTS); do \ ++ rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$$f$(EXEEXT); \ ++ done; \ ++ fi ++endif ++ ++# Other files that should be present in the distribution tarball. ++EXTRA_DIST += \ ++ BUG-REPORT \ ++ ChangeLog.115 \ ++ ChangeLog.116 \ ++ ChangeLog.117 \ ++ ChangeLog.118 \ ++ ChangeLog.119 \ ++ ChangeLog.120 \ ++ ChangeLog.121 \ ++ FDL \ ++ FOR-RELEASE \ ++ gendef.sh \ ++ INSTALL.REPO \ ++ INSTALL.extra \ ++ INSTALL.gen \ ++ LICENSES \ ++ MANIFEST \ ++ mdate.sh \ ++ MORE.STUFF \ ++ PROBLEMS \ ++ PROJECTS \ ++ README.MinGW \ ++ TESTS \ ++ arch/djgpp \ ++ font/util/make-Rproto ++ ++MOSTLYCLEANFILES += $(prefixexecbin_SCRIPTS) $(bin_SCRIPTS) \ ++ $(man1_MANS) $(man5_MANS) $(man7_MANS) \ ++ $(PREFIXMAN1) $(PREFIXMAN5) $(PREFIXMAN7) \ ++ test-groff ++ ++# Rule to build .man files. The brackets around the @ are used to prevent the ++# substitution of the variable by automake. ++.man.n: ++ @echo Making $@ from $< ++ rm -f $@ ++ $(MKDIR_P) `dirname $@` ++ @LC_ALL=C \ ++ sed -e "s|[@]APPRESDIR[@]|$(appresdir)|g" \ ++ -e "s|[@]BINDIR[@]|$(bindir)|g" \ ++ -e "s|[@]BROKEN_SPOOLER_FLAGS[@]|$(BROKEN_SPOOLER_FLAGS)|g" \ ++ -e "s|[@]COMMON_WORDS_FILE[@]|$(common_words_file)|g" \ ++ -e "s|[@]DATASUBDIR[@]|$(datasubdir)|g" \ ++ -e "s|[@]DEFAULT_INDEX[@]|$(indexdir)/$(indexname)|g" \ ++ -e "s|[@]DEFAULT_INDEX_NAME[@]|$(indexname)|g" \ ++ -e "s|[@]DEVICE[@]|$(DEVICE)|g" \ ++ -e "s|[@]DOCDIR[@]|$(docdir)|g" \ ++ -e "s|[@]EXAMPLEDIR[@]|$(exampledir)|g" \ ++ -e "s|[@]FONTDIR[@]|$(fontdir)|g" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s![@]G[@]!`echo $(g) | tr [a-z] [A-Z]`!g" \ ++ -e "s|[@]HTMLDOCDIR[@]|$(htmldocdir)|g" \ ++ -e "s|[@]INDEX_SUFFIX[@]|$(indexext)|g" \ ++ -e "s|[@]LEGACYFONTDIR[@]|$(legacyfontdir)|g" \ ++ -e "s|[@]LOCALFONTDIR[@]|$(localfontdir)|g" \ ++ -e "s|[@]LOCALMACRODIR[@]|$(localtmacdir)|g" \ ++ -e "s|[@]MACRODIR[@]|$(tmacdir)|g" \ ++ -e "s|[@]MAN1EXT[@]|$(man1ext)|g" \ ++ -e "s|[@]MAN5EXT[@]|$(man5ext)|g" \ ++ -e "s|[@]MAN7EXT[@]|$(man7ext)|g" \ ++ -e "s|[@]MDATE[@]|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \ ++ -e "s|[@]OLDFONTDIR[@]|$(oldfontdir)|g" \ ++ -e "s|[@]PDFDOCDIR[@]|$(pdfdocdir)|g" \ ++ -e "s|[@]SYSTEMMACRODIR[@]|$(systemtmacdir)|g" \ ++ -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \ ++ -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \ ++ -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \ ++ -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|g" \ ++ $< >$@ +diff -Nuar groff-1.22.3.old/Makefile.ccpg groff-1.22.3/Makefile.ccpg +--- groff-1.22.3.old/Makefile.ccpg 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.ccpg 1970-01-01 02:00:00.000000000 +0200 +@@ -1,61 +0,0 @@ +-# Copyright (C) 1992-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.ccpg +-# +-MAKEFILEPARTS=\ +- $(top_srcdir)/Makefile.comm \ +- $(top_builddir)/Makefile.cfg \ +- $(srcdir)/Makefile.sub \ +- $(top_srcdir)/Makefile.ccpg \ +- Makefile.dep +- +-all: $(PROG) $(MANPAGES) +- +-$(PROG): $(OBJS) $(XLIBS) +- $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(EXTRA_LDFLAGS) $(LIBS) $(MLIB) +- +-install_bin: install_prog +-install_prog: $(PROG) +-install_data: install_man +-install_man: $(MANPAGES) +-uninstall_sub: uninstall_prog uninstall_man +-depend: depend_src +-depend.temp: $(GENSRCS) $(YTABC) +-distfiles: $(YTABC) +-TAGS: TAGS_src +-TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS) +-Makefile: $(MAKEFILEPARTS) +-Makefile.dep: +- touch Makefile.dep +-$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION \ +- $(top_srcdir)/REVISION +- +-pure: $(PROG).pure +- +-$(PROG).pure: $(OBJS) $(XLIBS) +- $(PURIFY) $(PURIFYCCFLAGS) \ +- $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.comm groff-1.22.3/Makefile.comm +--- groff-1.22.3.old/Makefile.comm 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.comm 1970-01-01 02:00:00.000000000 +0200 +@@ -1,354 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.comm +-# +-INCLUDES=-I. -I$(srcdir) \ +- -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \ +- -I$(top_builddir)/src/libs/gnulib/lib +-ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS) +-COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c +-ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS) +-COMPILE.c=$(CC) $(ALL_CFLAGS) -c +-LINK.cpp=$(CCC) $(CCFLAGS) $(LDFLAGS) +-LINK.c=$(CC) $(CFLAGS) $(LDFLAGS) +-LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT) +-LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT) +-LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT) +-LIBXUTIL=$(top_builddir)/src/libs/libxutil/libxutil.$(LIBEXT) +-LIBGNU=$(top_builddir)/src/libs/gnulib/lib/libgnu.$(LIBEXT) +-MLIB= +-XLIBS= +-YTABH= +-YTABC= +-GRAM= +-LIBCLEAN= +-MOSTLYCLEANADD= +-MOSTLYCLEANDIRADD= +-MOSTLYCLEANNOTSRCDIRADD= +-MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS) $(GENHDRS) \ +- depend.temp core y.output $(MOSTLYCLEANADD) +-CLEANFILES=$(LIBCLEAN) +-DISTCLEANFILES=TAGS Makefile Makefile.dep +-REALCLEANFILES=$(YTABC) $(YTABH) +-NAMEPREFIX= +-HDRS= +-MANPAGES=$(MAN1) $(MAN5) $(MAN7) +-MANCLEAN=$(MANPAGES) +-fontsubdir=$(fontdir)/dev$(DEV) +-oldfontsubdir=$(oldfontdir)/dev$(DEV) +- +-all do_install install_bin install_data TAGS depend distfiles uninstall_sub: +- +-do_install: install_bin install_data +-uninstall: uninstall_sub +-pure: +-fonts: +- +-.PHONY: all clean distclean mostlyclean realclean extraclean depend distfiles +-.PHONY: install install_bin install_data +-.PHONY: uninstall uninstall_sub +-.PHONY: pure fonts +- +-mostlyclean: +- rm -f $(MOSTLYCLEANFILES) +- -rm -rf $(MOSTLYCLEANDIRADD) +- -@if test "`cd $(srcdir); pwd`" != "`pwd`"; then \ +- rm -f $(MOSTLYCLEANNOTSRCDIRADD); \ +- fi +- +-clean: mostlyclean +- rm -f $(CLEANFILES) +- +-distclean: clean +- rm -f $(DISTCLEANFILES) +- -@if test "`cd $(srcdir); pwd`" != "`pwd`"; then \ +- rm -f $(YTABC) $(YTABH); \ +- fi +- +-realclean: distclean +- rm -f $(REALCLEANFILES) +- +-extraclean: distclean +- rm -f \#* *~ =* core junk grot temp tmp tem *.new *.old *.orig +- +-.SUFFIXES: +-.SUFFIXES: .o .obj .cpp .c .y .man .n +- +-.cpp.o: +- $(COMPILE.cpp) $(EXTRA_CCFLAGS) $< +- +-.c.o: +- $(COMPILE.c) $(EXTRA_CFLAGS) $< +- +-.cpp.obj: +- $(COMPILE.cpp) $(EXTRA_CCFLAGS) $< +- +-.c.obj: +- $(COMPILE.c) $(EXTRA_CFLAGS) $< +- +-.y.cpp: +- if test -n "$(YTABH)"; then \ +- $(YACC) $(YACCFLAGS) -d $<; \ +- else \ +- $(YACC) $(YACCFLAGS) $<; \ +- fi +- -test -f y.tab.h && mv y.tab.h y_tab.h +- -test -f y.tab.c && mv y.tab.c y_tab.c +- sed "s/^#line \(.*\) \"y.tab.c\"/#line \1 \"$(YTABC)\"/" \ +- < y_tab.c > $(YTABC) +- rm -f y_tab.c +- test -z "$(YTABH)" || mv y_tab.h $(YTABH) +- +-# The next rule is needed for make of Solaris 2.5.1 to override its +-# built-in .y.o rule (which takes precedence over the .y.cpp rule above). +-.y.o: +- if test -n "$(YTABH)"; then \ +- $(YACC) $(YACCFLAGS) -d $<; \ +- else \ +- $(YACC) $(YACCFLAGS) $<; \ +- fi +- -test -f y.tab.h && mv y.tab.h y_tab.h +- -test -f y.tab.c && mv y.tab.c y_tab.c +- mv y_tab.c $(YTABC) +- test -z "$(YTABH)" || mv y_tab.h $(YTABH) +- $(COMPILE.cpp) $(EXTRA_CCFLAGS) $(YTABC) +- +-.man.n: +- @echo Making $@ from $< +- @rm -f $@ +- @LC_ALL=C \ +- sed -e "s|@APPRESDIR@|$(appresdir)|g" \ +- -e "s|@BINDIR@|$(bindir)|g" \ +- -e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \ +- -e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \ +- -e "s|@DATASUBDIR@|$(datasubdir)|g" \ +- -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \ +- -e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \ +- -e "s|@DEVICE@|$(DEVICE)|g" \ +- -e "s|@DOCDIR@|$(docdir)|g" \ +- -e "s|@EXAMPLEDIR@|$(exampledir)|g" \ +- -e "s|@FONTDIR@|$(fontdir)|g" \ +- -e "s|@g@|$(g)|g" \ +- -e "s!@G@!`echo $(g) | tr [a-z] [A-Z]`!g" \ +- -e "s|@HTMLDOCDIR@|$(htmldocdir)|g" \ +- -e "s|@INDEX_SUFFIX@|$(indexext)|g" \ +- -e "s|@LEGACYFONTDIR@|$(legacyfontdir)|g" \ +- -e "s|@LOCALFONTDIR@|$(localfontdir)|g" \ +- -e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \ +- -e "s|@MACRODIR@|$(tmacdir)|g" \ +- -e "s|@MAN1EXT@|$(man1ext)|g" \ +- -e "s|@MAN5EXT@|$(man5ext)|g" \ +- -e "s|@MAN7EXT@|$(man7ext)|g" \ +- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \ +- -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \ +- -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \ +- -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \ +- -e "s|@TMAC_AN_PREFIX@|$(tmac_an_prefix)|g" \ +- -e "s|@TMAC_M_PREFIX@|$(tmac_m_prefix)|g" \ +- -e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \ +- -e "s|@TMAC_S_PREFIX@|$(tmac_s_prefix)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|g" \ +- $< >$@ +- +-.PHONY: install_man +-install_man: +- -test -d $(DESTDIR)$(manroot) || $(mkinstalldirs) $(DESTDIR)$(manroot) +- -test -d $(DESTDIR)$(man1dir) || $(mkinstalldirs) $(DESTDIR)$(man1dir) +- @-pages="$(MAN1)"; \ +- for p in $$pages; do \ +- prog=`basename $$p .n`; \ +- target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \ +- rm -f $$target; \ +- echo $(INSTALL_DATA) $$p $$target; \ +- $(INSTALL_DATA) $$p $$target; \ +- done +- -test -d $(DESTDIR)$(man5dir) || $(mkinstalldirs) $(DESTDIR)$(man5dir) +- @-pages="$(MAN5)"; \ +- for p in $$pages; do \ +- target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \ +- rm -f $$target; \ +- echo $(INSTALL_DATA) $$p $$target; \ +- $(INSTALL_DATA) $$p $$target; \ +- done +- -test -d $(DESTDIR)$(man7dir) || $(mkinstalldirs) $(DESTDIR)$(man7dir) +- @-pages="$(MAN7)"; \ +- for p in $$pages; do \ +- target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \ +- rm -f $$target; \ +- echo $(INSTALL_DATA) $$p $$target; \ +- $(INSTALL_DATA) $$p $$target; \ +- done +- +-.PHONY: uninstall_man +-uninstall_man: +- @-pages="$(MAN1)"; \ +- for p in $$pages; do \ +- target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX); \ +- target=$$target`basename $$p .n`.$(man1ext); \ +- echo rm -f $$target; \ +- rm -f $$target; \ +- done +- @-pages="$(MAN5)"; \ +- for p in $$pages; do \ +- target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \ +- echo rm -f $$target; \ +- rm -f $$target; \ +- done +- @-pages="$(MAN7)"; \ +- for p in $$pages; do \ +- target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \ +- echo rm -f $$target; \ +- rm -f $$target; \ +- done +- +-.PHONY: install_prog +-install_prog: +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG) +- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG) +- +-.PHONY: uninstall_prog +-uninstall_prog: +- rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG) +- +-.PHONY: install_dev +-install_dev: +- -test -d $(DESTDIR)$(datadir) \ +- || $(mkinstalldirs) $(DESTDIR)$(datadir) +- -test -d $(DESTDIR)$(dataprogramdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir) +- -test -d $(DESTDIR)$(datasubdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(datasubdir) +- -test -d $(DESTDIR)$(fontdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(fontdir) +- -test -d $(DESTDIR)$(fontsubdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir) +- -if test -d $(srcdir)/generate; then \ +- test -d $(DESTDIR)$(fontsubdir)/generate \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate; \ +- fi +- -if test -d $(srcdir)/enc; then \ +- test -d $(DESTDIR)$(fontsubdir)/enc \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/enc; \ +- fi +- -if test -d $(srcdir)/map; then \ +- test -d $(DESTDIR)$(fontsubdir)/map \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/map; \ +- fi +- -if test -d $(srcdir)/util; then \ +- test -d $(DESTDIR)$(fontsubdir)/util \ +- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/util; \ +- fi +- -if test -d $(srcdir)/old; then \ +- test -d $(DESTDIR)$(oldfontdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(oldfontdir); \ +- test -d $(DESTDIR)$(oldfontsubdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(oldfontsubdir); \ +- fi +- -test -z "$(DEVFILES)" \ +- || for f in ""$(DEVFILES); do \ +- rm -f $(DESTDIR)$(fontsubdir)/$$f; \ +- if test -f $$f; then \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \ +- else \ +- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \ +- fi; \ +- done +- -test -z "$(OLDDEVFILES)" \ +- || for f in ""$(OLDDEVFILES); do \ +- rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \ +- $(INSTALL_DATA) $(srcdir)/old/$$f \ +- $(DESTDIR)$(oldfontsubdir)/$$f; \ +- done +- -test -z "$(DEVSCRIPTS)" \ +- || for f in ""$(DEVSCRIPTS); do \ +- rm -f $(DESTDIR)$(fontsubdir)/$$f; \ +- if test -f $$f; then \ +- $(INSTALL_SCRIPT) $$f $(DESTDIR)$(fontsubdir)/$$f; \ +- else \ +- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \ +- fi; \ +- done +- +-.PHONY: uninstall_dev +-uninstall_dev: +- -test -z "$(DEVFILES)$(DEVSCRIPTS)" \ +- || for f in ""$(DEVFILES) $(DEVSCRIPTS); do \ +- rm -f $(DESTDIR)$(fontsubdir)/$$f; \ +- done +- -test -z "$(OLDDEVFILES)" \ +- || for f in ""$(OLDDEVFILES); do \ +- rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \ +- done +- -d=$(DESTDIR)$(fontsubdir)/generate;\ +- if test -d $$d; then rmdir $$d; fi +- -d=$(DESTDIR)$(fontsubdir)/enc;\ +- if test -d $$d; then rmdir $$d; fi +- -d=$(DESTDIR)$(fontsubdir)/map;\ +- if test -d $$d; then rmdir $$d; fi +- -d=$(DESTDIR)$(fontsubdir)/util;\ +- if test -d $$d; then rmdir $$d; fi +- -test -d $(DESTDIR)$(fontsubdir) $$ \ +- rmdir $(DESTDIR)$(fontsubdir) +- -d=$(DESTDIR)$(oldfontsubdir);\ +- if test -d $$d; then rmdir $$d; fi +- +-.PHONY: depend_src +-depend_src: depend.temp +- mv depend.temp Makefile.dep +- +-depend.temp: FORCE +- > depend.temp +- if test -f "$(srcdir)/$(YTABC)"; then \ +- ytabc="$(srcdir)/$(YTABC)"; \ +- else \ +- ytabc="$(YTABC)"; \ +- fi; \ +- test -z "$(CCSRCS)$(YTABC)" \ +- || $(CCC) $(ALL_CCFLAGS) $(EXTRA_CCFLAGS) -MM $(CCSRCS) $$ytabc \ +- >>depend.temp +- test -z "$(CSRCS)" \ +- || $(CC) $(ALL_CFLAGS) $(EXTRA_CFLAGS) -MM $(CSRCS) >>depend.temp +- test -z "$(YTABH)" \ +- || (sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend1.temp; \ +- mv depend1.temp depend.temp) +- +-.PHONY: TAGS_src +-TAGS_src: +- $(ETAGS) $(ETAGSFLAGS) $(CCSRCS) $(CSRCS) +- test -z "$(GRAM)$(HDRS)" \ +- || $(ETAGS) $(ETAGSFLAGS) -a $(ETAGSCCFLAG) $(GRAM) $(HDRS) +- +-# This rule is only considered for the subdir_Makefile target. +-Makefile: +- echo srcdir=$(srcdir) >Makefile +- echo VPATH=$(VPATH) >>Makefile +- cat $(MAKEFILEPARTS) /dev/null >>Makefile +- +-FORCE: +- +-.NOEXPORT: +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.cpg groff-1.22.3/Makefile.cpg +--- groff-1.22.3.old/Makefile.cpg 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.cpg 1970-01-01 02:00:00.000000000 +0200 +@@ -1,55 +0,0 @@ +-# Copyright (C) 1992-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.cpg +-# +-MAKEFILEPARTS=\ +- $(top_srcdir)/Makefile.comm \ +- $(top_builddir)/Makefile.cfg \ +- $(srcdir)/Makefile.sub \ +- $(top_srcdir)/Makefile.cpg \ +- Makefile.dep +- +-all: $(PROG) $(MANPAGES) +- +-$(PROG): $(OBJS) $(XLIBS) +- $(LINK.c) -o $@ $(OBJS) $(XLIBS) $(EXTRA_LDFLAGS) $(LIBS) $(MLIB) +- +-install_bin: install_prog +-install_prog: $(PROG) +-install_data: install_man +-install_man: $(MANPAGES) +-uninstall_sub: uninstall_prog uninstall_man +-depend: depend_src +-depend.temp: $(GENSRCS) $(YTABC) +-distfiles: $(YTABC) +-TAGS: TAGS_src +-TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS) +-Makefile: $(MAKEFILEPARTS) +-Makefile.dep: +- touch Makefile.dep +-$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION \ +- $(top_srcdir)/REVISION +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.dev groff-1.22.3/Makefile.dev +--- groff-1.22.3.old/Makefile.dev 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.dev 1970-01-01 02:00:00.000000000 +0200 +@@ -1,32 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.dev +-# +-all: $(DEVFILES) $(DEVSCRIPTS) +-install_data: install_dev +-uninstall_sub: uninstall_dev +-install_dev: $(DEVFILES) $(DEVSCRIPTS) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.in groff-1.22.3/Makefile.in +--- groff-1.22.3.old/Makefile.in 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1066 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.in +-# +-SHELL=@SHELL@ +- +-PACKAGE_TARNAME=@PACKAGE_TARNAME@ +- +-srcdir=@srcdir@ +-top_srcdir=@abs_top_srcdir@ +-VPATH=@srcdir@ +-top_builddir=@abs_top_builddir@ +- +-# `HOST' is the canonical host specification, +-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +-# or +-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +-HOST=@host@ +- +-# `RT_SEP' is the operating system's native PATH SEPARATOR CHAR, which +-# is to be used in runtime PATHs compiled into groff executables. +-RT_SEP=@GROFF_PATH_SEPARATOR@ +- +-# `SH_SEP' is a alternative PATH SEPARATOR CHAR, to be used in shell +-# scripts and makefile rules; it may be the same as `RT_SEP', but, +-# particularly in some Microsoft environments, it may differ. +-SH_SEP=@PATH_SEPARATOR@ +- +-# `GLIBC21' is yes if the host operating system uses GNU libc 2.1 or newer, +-# otherwise no. +-GLIBC21=@GLIBC21@ +- +-version=`cat $(top_srcdir)/VERSION` +-# No additional number if revision is zero. +-revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` +- +-# Define `page' to be letter if your PostScript printer uses 8.5x11 +-# paper (USA) and define it to be A4, if it uses A4 paper (rest of the +-# world). +-PAGE=@PAGE@ +- +-# The name of the ghostscript program. Normally, gs, on GNU/Linux +-# but it might be different on MS-DOS/MS-WIN32 systems. +-GHOSTSCRIPT=@GHOSTSCRIPT@ +- +-# `ALT_GHOSTSCRIPT_PROGS' specifies a list alternative names, +-# which can be tried if `GHOSTSCRIPT' cannot be found at run time. +-ALT_GHOSTSCRIPT_PROGS=@ALT_GHOSTSCRIPT_PROGS@ +- +-# Similarly, `ALT_AWK_PROGS' specifies a list of alternative names, +-# which can be tried at run time, to identify the awk program. +-ALT_AWK_PROGS=@ALT_AWK_PROGS@ +- +-# Normally the Postscript driver, grops, produces output that conforms +-# to version 3.0 of the Adobe Document Structuring Conventions. +-# Unfortunately some spoolers and previewers can't handle such output. +-# The BROKEN_SPOOLER_FLAGS variable tells grops what it should do to +-# make its output acceptable to such programs. This variable controls +-# only the default behaviour of grops; the behaviour can be changed at +-# runtime by the grops -b option (and so by groff -P-b). +-# Use a value of 0 if your spoolers and previewers are able to handle +-# conforming PostScript correctly. +-# Add 1 if no %%{Begin,End}DocumentSetup comments should be generated; +-# this is needed for early versions of TranScript that get confused by +-# anything between the %%EndProlog line and the first %%Page: comment. +-# Add 2 if lines in included files beginning with %! should be +-# stripped out; this is needed for the OpenWindows 2.0 pageview previewer. +-# Add 4 if %%Page, %%Trailer and %%EndProlog comments should be +-# stripped out of included files; this is needed for spoolers that +-# don't understand the %%{Begin,End}Document comments. I suspect this +-# includes early versions of TranScript. +-# Add 8 if the first line of the PostScript output should be %!PS-Adobe-2.0 +-# rather than %!PS-Adobe-3.0; this is needed when using Sun's Newsprint +-# with a printer that requires page reversal. +-BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@ +- +-# `DEVICE' is the default device. +-DEVICE=ps +- +-# `XDEVDIRS' is either `font/devX{75,100}{,-12}' or empty. +-XDEVDIRS=@XDEVDIRS@ +- +-# `XPROGDIRS' is either `src/devices/xditview src/utils/xtotroff' or empty. +-XPROGDIRS=@XPROGDIRS@ +- +-# `XLIBDIRS' is either `src/libs/libxutil' or empty. +-XLIBDIRS=@XLIBDIRS@ +- +-# `TTYDEVDIRS' is either `font/devascii font/devlatin1' (for +-# ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8. +-TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8 +- +-# `OTHERDEVDIRS' is either `font/devlj4 font/devlbp' (for ASCII) or +-# empty (for EBCDIC). +-OTHERDEVDIRS=@OTHERDEVDIRS@ +- +-# `PSPRINT' is the command to use for printing a PostScript file, +-# for example `lpr'. +-PSPRINT=@PSPRINT@ +- +-# `DVIPRINT' is the command to use for printing a TeX dvi file, +-# for example `lpr -d'. +-DVIPRINT=@DVIPRINT@ +- +-# Prefix for names of programs that have Unix counterparts. +-# For example, if `g' is `g' then troff will be installed as +-# gtroff. This doesn't affect programs like grops or groff that have +-# no Unix counterparts. Note that the groff versions of eqn and tbl +-# will not work with Unix troff. +-g=@g@ +- +-# Common prefix for installation directories. +-# Used in definitions of exec_prefix, datasubdir, fontpath, manroot. +-# This must already exist when you do make install. +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +- +-# `bindir' says where to install executables. +-bindir=@bindir@ +- +-# `libdir' says where to install platform-dependent data. +-libdir=@libdir@ +-libprogramdir=$(libdir)/groff +- +-# `datasubdir' says where to install platform-independent data files. +-datadir=@datadir@ +-datarootdir=@datarootdir@ +-dataprogramdir=$(datadir)/groff +-datasubdir=$(dataprogramdir)/$(version)$(revision) +- +-# `infodir' says where to install info files. +-infodir=@infodir@ +- +-# `docdir' says where to install documentation files. +-docdir=@docdir@ +- +-# `exampledir' says where to install example files. +-exampledir=$(docdir)/examples +- +-# `htmldocdir' says where to install documentation in HTML format. +-htmldocdir=$(docdir)/html +- +-# `pdfdocdir' says where to install documentation in PDF format. +-pdfdocdir=$(docdir)/pdf +- +-# `fontdir' says where to install dev*/*. +-fontdir=$(datasubdir)/font +- +-# `oldfontdir' says where to install old font sets (as dev*/*). +-oldfontdir=$(datasubdir)/oldfont +- +-# `localfontdir' says where local fonts will be installed (as dev*/*). +-localfontdir=$(dataprogramdir)/site-font +- +-# `legacyfontdir' is for compatibility with non-GNU troff. +-legacyfontdir=/usr/lib/font +- +-# `fontpath' says where to look for dev*/*. +-fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir) +- +-# `tmacdir' says where to install macros. +-tmacdir=$(datasubdir)/tmac +- +-# `systemtmacdir' says where to install platform-dependent macros. +-systemtmacdir=$(libprogramdir)/site-tmac +- +-# `localtmacdir' says where local files will be installed. +-localtmacdir=$(dataprogramdir)/site-tmac +- +-# `appresdir' says where to install the application resource file for +-# gxditview. +-appresdir=@appresdir@ +- +-glilypond_dir=@glilypond_dir@ +-gpinyin_dir=@gpinyin_dir@ +-groffer_dir=@groffer_dir@ +-grog_dir=@grog_dir@ +-libprogramdir=@libprogramdir@ +-referdir=@referdir@ +- +-# `tmacpath' says where to look for macro files. +-# The current directory will be prepended in unsafe mode only; the home +-# directory will be always added. +-# `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the +-# current nor in the home directory. +-tmacpath=$(systemtmacdir)$(RT_SEP)$(localtmacdir)$(RT_SEP)$(tmacdir) +- +-# `sys_tmac_prefix' is prefix (if any) for system macro packages. +-sys_tmac_prefix=@sys_tmac_prefix@ +- +-# `pnmtops_nosetpage' is the command to be run to generate an eps +-# file. Some versions of pnmtops provide the -nosetpage option. +-# We detect this and use it if present. +-pnmtops_nosetpage=@pnmtops_nosetpage@ +- +-# `tmac_wrap' is list of system macro packages that should be made +-# available to groff by creating a corresponding macro package +-# in the groff macro directory that references the system macro +-# package. +-tmac_wrap=@tmac_wrap@ +- +-# If there is a groff version of a macro package listed in $(tmac_wrap), +-# then the groff version will be installed with a prefix of this. +-# Don't make this empty. +-tmac_prefix=g +- +-# The groff -mm macros will be available as -m$(tmac_m_prefix)m. +-tmac_m_prefix=\ +- `for i in $(tmac_wrap) ""; do case "$$i" in m) echo $(tmac_prefix);; esac; done` +-# The groff -ms macros will be available as -m$(tmac_s_prefix)s. +-tmac_s_prefix=\ +- `for i in $(tmac_wrap) ""; do case "$$i" in s) echo $(tmac_prefix);; esac; done` +-# The groff -man macros will be available as -m$(tmac_an_prefix)an. +-tmac_an_prefix=\ +- `for i in $(tmac_wrap) ""; do case "$$i" in an) echo $(tmac_prefix);; esac; done` +- +-# Extension to be used for refer index files. Index files are not +-# sharable between different architectures, so you might want to use +-# different suffixes for different architectures. Choose an extension +-# that doesn't conflict with refer or any other indexing program. +-indexext=.i +- +-# Directory containing the default index for refer. +-indexdir=/usr/dict/papers +- +-# The filename (without suffix) of the default index for refer. +-indexname=Ind +- +-# common_words_file is a file containing a list of common words. +-# If your system provides /usr/lib/eign it will be copied onto this, +-# otherwise the supplied eign file will be used. +-common_words_file=$(datasubdir)/eign +- +-# `manroot' is the root of the man page directory tree. +-mandir=@mandir@ +-manroot=$(mandir) +- +-# `man1ext' is the man section for user commands. +-man1ext=1 +-man1dir=$(manroot)/man$(man1ext) +- +-# `man5ext' is the man section for file formats. +-man5ext=5 +-man5dir=$(manroot)/man$(man5ext) +- +-# `man7ext' is the man section for macros. +-man7ext=7 +-man7dir=$(manroot)/man$(man7ext) +- +-# `dist' target is disallowed in some `configure' combinations. +-doc_dist_target_ok=@doc_dist_target_ok@ +- +-# The configure script checks whether the user wants the info documentation. +-# For the repo version this mechanism also suppresses building via `makeinfo'. +-make_infodoc=@make_infodoc@ +-make_install_infodoc=@make_install_infodoc@ +-make_uninstall_infodoc=@make_uninstall_infodoc@ +- +-# The configure script checks whether all necessary utility programs for +-# grohtml are available -- only then we can build the HTML documentation. +-make_htmldoc=@make_htmldoc@ +-make_install_htmldoc=@make_install_htmldoc@ +-make_uninstall_htmldoc=@make_uninstall_htmldoc@ +- +-make_htmlexamples=@make_htmlexamples@ +-make_install_htmlexamples=@make_install_htmlexamples@ +-make_uninstall_htmlexamples=@make_uninstall_htmlexamples@ +- +-# However, there may always be some prebuild HTML documentation +-make_install_shipped_htmldoc=@make_install_shipped_htmldoc@ +-make_uninstall_shipped_htmldoc=@make_uninstall_shipped_htmldoc@ +- +-# The configure script also checks whether all necessary utility programs +-# for pdfroff are available -- only then we can build PDF documentation. +-make_pdfdoc=@make_pdfdoc@ +-make_install_pdfdoc=@make_install_pdfdoc@ +-make_uninstall_pdfdoc=@make_uninstall_pdfdoc@ +- +-make_pdfexamples=@make_pdfexamples@ +-make_install_pdfexamples=@make_install_pdfexamples@ +-make_uninstall_pdfexamples=@make_uninstall_pdfexamples@ +- +-# `other' documentation, e.g., `meref.me' and `pic.ms', as well as their +-# generated counterparts.. +-make_otherdoc=@make_otherdoc@ +-make_install_otherdoc=@make_install_otherdoc@ +-make_uninstall_otherdoc=@make_uninstall_otherdoc@ +- +-# `examples' -- a generic switch, but the generated examples are furtherly +-# subdivided to catch HTML and PDF production availability. +-make_examples=@make_examples@ +-make_install_examples=@make_install_examples@ +-make_uninstall_examples=@make_uninstall_examples@ +- +-# Windows `.cmd' files +-make_winscripts=@make_winscripts@ +-make_install_winscripts=@make_install_winscripts@ +-make_uninstall_winscripts=@make_uninstall_winscripts@ +- +-# All the previous installation directories, when used, are prefixed with +-# $(DESTDIR) during install and uninstall, to support staged installations. +- +-# DEFINES should include the following: +-# +-# -DWORDS_BIGENDIAN if your target platform is big-endian +-# -DIS_EBCDIC_HOST if the host's encoding is EBCDIC +-# +-# -DHAVE_DIRECT_H if you have +-# -DHAVE_DIRENT_H if you have +-# -DHAVE_CC_INTTYPES_H if you have a C++ +-# -DHAVE_PROCESS_H if you have +-# -DHAVE_LIMITS_H if you have +-# -DHAVE_CC_LIMITS_H if you have a C++ +-# -DHAVE_MATH_H if you have +-# -DHAVE_CC_OSFCN_H if you have a C++ +-# -DHAVE_STDDEF_H if you have +-# -DHAVE_STDLIB_H if you have +-# -DHAVE_STRING_H if you have +-# -DHAVE_STRINGS_H if you have +-# -DHAVE_SYS_DIR_H if you have +-# -DHAVE_SYS_PARAM_H if you have +-# -DHAVE_SYS_STAT_H if you have +-# -DHAVE_SYS_TIME_H if you have +-# -DHAVE_SYS_TYPES_H if you have +-# -DHAVE_UNISTD_H if you have +-# +-# -DHAVE_FMOD if you have fmod() +-# -DHAVE_GETCWD if you have getcwd() +-# -DHAVE_GETTIMEOFDAY if you have gettimeofday() +-# -DHAVE_ICONV if you have iconv() +-# -DHAVE_ISATTY if you have isatty() +-# -DHAVE_KILL if you have kill() +-# -DHAVE_LANGINFO_CODESET if you have nl_langinfo() +-# -DHAVE_MKSTEMP if you have mkstemp() +-# -DHAVE_MMAP if you have mmap() +-# -DHAVE_PUTENV if you have putenv() +-# -DHAVE_RENAME if you have rename() +-# -DHAVE_SETLOCALE if you have setlocale() +-# -DHAVE_SNPRINTF if you have snprintf() +-# -DHAVE_STRCASECMP if you have strcasecmp() +-# -DHAVE_STRNCASECMP if you have strncasecmp() +-# -DHAVE_STRERROR if you have strerror() +-# -DHAVE_STRSEP if you have strsep() +-# -DHAVE_STRTOL if you have strtol() +-# -DHAVE_SYMLINK if you have symlink() +-# -DHAVE_VSNPRINTF if you have vsnprintf() +-# +-# -DNEED_DECLARATION_GETTIMEOFTODAY +-# if your C++ doesn't declare +-# gettimeofday() +-# -DNEED_DECLARATION_HYPOT if your C++ doesn't declare hypot() +-# -DNEED_DECLARATION_PCLOSE if your C++ doesn't declare pclose() +-# -DNEED_DECLARATION_POPEN if your C++ doesn't declare popen() +-# -DNEED_DECLARATION_PUTENV if your C++ doesn't declare +-# putenv() +-# -DNEED_DECLARATION_RAND if your C++ doesn't declare rand() +-# -DNEED_DECLARATION_SNPRINTF if your C++ doesn't declare +-# snprintf() +-# -DNEED_DECLARATION_SRAND if your C++ doesn't declare srand() +-# -DNEED_DECLARATION_STRCASECMP if your C++ doesn't declare +-# strcasecmp() +-# -DNEED_DECLARATION_STRNCASECMP +-# if your C++ doesn't declare +-# strncasecmp() +-# -DNEED_DECLARATION_VFPRINTF if your C++ doesn't declare +-# vfprintf() +-# -DNEED_DECLARATION_VSNPRINTF if your C++ doesn't declare +-# vsnprintf() +-# +-# -DHAVE_DECL_GETC_UNLOCKED if you have getc_unlocked() +-# -DHAVE_DECL_SYS_SIGLIST if you have sys_siglist[] +-# +-# -DHAVE_STRUCT_EXCEPTION if defines struct exception +-# -DHAVE_SYS_NERR if you have sysnerr in or +-# -DHAVE_SYS_ERRLIST if you have sys_errlist in or +-# +-# -DICONV_CONST=const if declaration of iconv() needs const +-# -DLONG_FOR_TIME_T if localtime() takes a long * not a time_t * +-# -DRETSIGTYPE=int if signal handlers return int not void +-# -DRET_TYPE_SRAND_IS_VOID if srand() returns void not int +-# +-# -DWCOREFLAG=0200 if the 0200 bit of the status returned by +-# wait() indicates whether a core image was +-# produced for a process that was terminated +-# by a signal +-# +-# -DHAVE_WORKING_O_NOATIME define if 's O_NOATIME flag works +-# -DHAVE_WORKING_O_NOFOLLOW define if 's O_NOFOLLOW flag works +-# +-# -Duintmax_t= define to `unsigned long' or `unsigned long +-# long' if does not exist +-# +-# -DTRADITIONAL_CPP if your C++ compiler uses a traditional +-# (Reiser) preprocessor +-# -DARRAY_DELETE_NEEDS_SIZE if your C++ doesn't understand `delete []' +-# +-# -DPAGE=A4 if the the printer's page size is A4 +-# -DGHOSTSCRIPT=gs the name (and directory if required) of the +-# ghostscript program +-# +-DEFINES=@DEFS@ +- +-# Include +-# +-# {fmod,getcwd,mkstemp,putenv,snprintf,strcasecmp, +-# strerror,strncasecmp,strtol}.$(OBJEXT) +-# +-# in LIBOBJS if your C library is missing the corresponding function. +-# vsnprintf is defined in the snprintf.$(OBJEXT) module. +-LIBOBJS=@LIBOBJS@ +- +-# `CCC' is the compiler for C++ (.cpp) files. +-CCC=@CXX@ +-CC=@CC@ +-# CCDEFINES are definitions for C++ compilations. +-CCDEFINES=$(DEFINES) +-# CDEFINES are definitions for C compilations. +-CDEFINES=$(DEFINES) +- +-CCFLAGS=@CXXFLAGS@ +-CFLAGS=@CFLAGS@ +-CPPFLAGS=@CPPFLAGS@ +-LDFLAGS=@LDFLAGS@ +- +-X_CFLAGS=@X_CFLAGS@ +-X_LIBS=@X_LIBS@ +-X_EXTRA_LIBS=@X_EXTRA_LIBS@ +-X_PRE_LIBS=@X_PRE_LIBS@ +- +-YACC=@YACC@ +-YACCFLAGS=-v +- +-GREP=@GREP@ +-EGREP=@EGREP@ +- +-MAKEINFO=@MAKEINFO@ +- +-EXEEXT=@EXEEXT@ +-OBJEXT=@OBJEXT@ +-LIBEXT=@LIBEXT@ +-LIBS=@LIBS@ +-LIBM=@LIBM@ +-LIBICONV=@LIBICONV@ +-RANLIB=@RANLIB@ +-INSTALL=@INSTALL@ +-INSTALL_PROGRAM=@INSTALL_PROGRAM@ +-INSTALL_SCRIPT=@INSTALL_SCRIPT@ +-INSTALL_DATA=@INSTALL_DATA@ +-INSTALL_INFO=@INSTALL_INFO@ +-LN_S=@LN_S@ +-AR=ar +-ETAGS=etags +-ETAGSFLAGS= +-# Flag that tells etags to assume C++. +-ETAGSCCFLAG=-C +-# Full path to perl. +-PERL=@PERL@ +-PERLVERSION=@PERLVERSION@ +-# Sed command with which to edit sh scripts. +-SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ +-# Sed script to deal with OS dependencies in sh scripts. +-SH_DEPS_SED_SCRIPT=$(top_builddir)/arch/misc/shdeps.sed +- +-# The program to create directory hierarchies. +-mkinstalldirs= $(SHELL) $(top_srcdir)/mkinstalldirs +- +-PURIFY=purify +-PURIFYCCFLAGS= +-#PURIFYCCFLAGS=-g++=yes \ +-# -collector=`dirname \`$(CCC) -print-libgcc-file-name\``/ld +- +-# Passing down MAKEOVERRIDES prevents $(MAKE) from containing a second +-# copy of $(MDEFINES) when making individual directories; this could +-# cause the argument list to become too long on some systems. +-MDEFINES=\ +- "ALT_AWK_PROGS=$(ALT_AWK_PROGS)" \ +- "ALT_GHOSTSCRIPT_PROGS=$(ALT_GHOSTSCRIPT_PROGS)" \ +- "AR=$(AR)" \ +- "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \ +- "CC=$(CC)" \ +- "CCC=$(CCC)" \ +- "CCDEFINES=$(CCDEFINES)" \ +- "CCFLAGS=$(CCFLAGS)" \ +- "CDEFINES=$(CDEFINES)" \ +- "CFLAGS=$(CFLAGS)" \ +- "CPPFLAGS=$(CPPFLAGS)" \ +- "DEVICE=$(DEVICE)" \ +- "DVIPRINT=$(DVIPRINT)" \ +- "EGREP=$(EGREP)" \ +- "ETAGS=$(ETAGS)" \ +- "ETAGSCCFLAG=$(ETAGSCCFLAG)" \ +- "ETAGSFLAGS=$(ETAGSFLAGS)" \ +- "EXEEXT=$(EXEEXT)" \ +- "GLIBC21=$(GLIBC21)" \ +- "GREP=$(GREP)" \ +- "HOST=$(HOST)" \ +- "INSTALL_DATA=$(INSTALL_DATA)" \ +- "INSTALL_INFO=$(INSTALL_INFO)" \ +- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ +- "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ +- "LDFLAGS=$(LDFLAGS)" \ +- "LIBEXT=$(LIBEXT)" \ +- "LIBICONV=$(LIBICONV)" \ +- "LIBM=$(LIBM)" \ +- "LIBOBJS=$(LIBOBJS)" \ +- "LIBS=$(LIBS)" \ +- "MAKEINFO=$(MAKEINFO)" \ +- "MAKEOVERRIDES=$(MAKEOVERRIDES)" \ +- "OBJEXT=$(OBJEXT)" \ +- "OTHERDEVDIRS=$(OTHERDEVDIRS)" \ +- "PAGE=$(PAGE)" \ +- "PERL=$(PERL)" \ +- "PERLVERSION=$(PERLVERSION)" \ +- "GHOSTSCRIPT=$(GHOSTSCRIPT)" \ +- "PSPRINT=$(PSPRINT)" \ +- "PURIFY=$(PURIFY)" \ +- "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \ +- "RANLIB=$(RANLIB)" \ +- "RT_SEP=$(RT_SEP)" \ +- "SH_SEP=$(SH_SEP)" \ +- "SHELL=$(SHELL)" \ +- "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \ +- "SH_DEPS_SED_SCRIPT=$(SH_DEPS_SED_SCRIPT)" \ +- "TTYDEVDIRS=$(TTYDEVDIRS)" \ +- "XDEVDIRS=$(XDEVDIRS)" \ +- "XLIBDIRS=$(XLIBDIRS)" \ +- "XPROGDIRS=$(XPROGDIRS)" \ +- "X_CFLAGS=$(X_CFLAGS)" \ +- "X_LIBS=$(X_LIBS)" \ +- "X_EXTRA_LIBS=$(X_EXTRA_LIBS)" \ +- "X_PRE_LIBS=$(X_PRE_LIBS)" \ +- "YACC=$(YACC)" \ +- "YACCFLAGS=$(YACCFLAGS)" \ +- "appresdir=$(appresdir)" \ +- "groffer_dir=$(groffer_dir)" \ +- "gpinyin_dir=$(gpinyin_dir)" \ +- "glilypond_dir=$(glilypond_dir)" \ +- "grog_dir=$(grog_dir)" \ +- "referdir=$(referdir)" \ +- "bindir=$(bindir)" \ +- "common_words_file=$(common_words_file)" \ +- "datadir=$(datadir)" \ +- "dataprogramdir=$(dataprogramdir)" \ +- "datasubdir=$(datasubdir)" \ +- "docdir=$(docdir)" \ +- "exampledir=$(exampledir)" \ +- "exec_prefix=$(exec_prefix)" \ +- "fontdir=$(fontdir)" \ +- "fontpath=$(fontpath)" \ +- "g=$(g)" \ +- "htmldocdir=$(htmldocdir)" \ +- "pdfdocdir=$(pdfdocdir)" \ +- "indexdir=$(indexdir)" \ +- "indexext=$(indexext)" \ +- "indexname=$(indexname)" \ +- "infodir=$(infodir)" \ +- "legacyfontdir=$(legacyfontdir)" \ +- "libdir=$(libdir)" \ +- "libprogramdir=$(libprogramdir)" \ +- "localfontdir=$(localfontdir)" \ +- "localtmacdir=$(localtmacdir)" \ +- "make_infodoc=$(make_infodoc)" \ +- "make_install_infodoc=$(make_install_infodoc)" \ +- "make_uninstall_infodoc=$(make_uninstall_infodoc)" \ +- "make_htmldoc=$(make_htmldoc)" \ +- "make_install_htmldoc=$(make_install_htmldoc)" \ +- "make_uninstall_htmldoc=$(make_uninstall_htmldoc)" \ +- "make_htmlexamples=$(make_htmlexamples)" \ +- "make_install_htmlexamples=$(make_install_htmlexamples)" \ +- "make_uninstall_htmlexamples=$(make_uninstall_htmlexamples)" \ +- "make_install_shipped_htmldoc=$(make_install_shipped_htmldoc)" \ +- "make_uninstall_shipped_htmldoc=$(make_uninstall_shipped_htmldoc)" \ +- "make_pdfdoc=$(make_pdfdoc)" \ +- "make_install_pdfdoc=$(make_install_pdfdoc)" \ +- "make_uninstall_pdfdoc=$(make_uninstall_pdfdoc)" \ +- "make_pdfexamples=$(make_pdfexamples)" \ +- "make_install_pdfexamples=$(make_install_pdfexamples)" \ +- "make_uninstall_pdfexamples=$(make_uninstall_pdfexamples)" \ +- "make_otherdoc=$(make_otherdoc)" \ +- "make_install_otherdoc=$(make_install_otherdoc)" \ +- "make_uninstall_otherdoc=$(make_uninstall_otherdoc)" \ +- "make_examples=$(make_examples)" \ +- "make_install_examples=$(make_install_examples)" \ +- "make_uninstall_examples=$(make_uninstall_examples)" \ +- "make_winscripts=$(make_winscripts)" \ +- "make_install_winscripts=$(make_install_winscripts)" \ +- "make_uninstall_winscripts=$(make_uninstall_winscripts)" \ +- "man1dir=$(man1dir)" \ +- "man1ext=$(man1ext)" \ +- "man5dir=$(man5dir)" \ +- "man5ext=$(man5ext)" \ +- "man7dir=$(man7dir)" \ +- "man7ext=$(man7ext)" \ +- "manroot=$(manroot)" \ +- "mkinstalldirs=$(mkinstalldirs)" \ +- "oldfontdir=$(oldfontdir)" \ +- "pnmtops_nosetpage=$(pnmtops_nosetpage)" \ +- "prefix=$(prefix)" \ +- "revision=$(revision)" \ +- "sys_tmac_prefix=$(sys_tmac_prefix)" \ +- "systemtmacdir=$(systemtmacdir)" \ +- "tmac_an_prefix=$(tmac_an_prefix)" \ +- "tmac_m_prefix=$(tmac_m_prefix)" \ +- "tmac_s_prefix=$(tmac_s_prefix)" \ +- "tmac_wrap=$(tmac_wrap)" \ +- "tmacdir=$(tmacdir)" \ +- "tmacpath=$(tmacpath)" \ +- "top_builddir=$(top_builddir)" \ +- "top_srcdir=$(top_srcdir)" \ +- "version=$(version)" +- +-MAKE_K_FLAG=`for f in x $(MAKEFLAGS); do \ +- case $$f in \ +- *=* | --[!k]*);; \ +- *k*) echo ' -k ';; \ +- esac; \ +- done` +- +-INCDIRS=\ +- src/include +-LIBDIRS=\ +- src/libs/libgroff \ +- src/libs/libdriver \ +- src/libs/libbib \ +- $(XLIBDIRS) +-ALLLIBDIRS=\ +- src/libs/libgroff \ +- src/libs/libdriver \ +- src/libs/libbib \ +- src/libs/libxutil +-CCPROGDIRS=\ +- src/roff/groff \ +- src/roff/troff \ +- src/preproc/preconv \ +- src/preproc/tbl \ +- src/preproc/pic \ +- src/preproc/eqn \ +- src/preproc/grn \ +- src/preproc/refer \ +- src/preproc/soelim \ +- src/preproc/html \ +- src/devices/grops \ +- src/devices/grotty \ +- src/devices/grodvi \ +- src/devices/grolj4 \ +- src/devices/grohtml \ +- src/devices/grolbp \ +- src/utils/tfmtodit \ +- src/utils/hpftodit \ +- src/utils/lookbib \ +- src/utils/indxbib \ +- src/utils/lkbib \ +- src/utils/addftinfo +-CPROGDIRS=\ +- src/utils/pfbtops +-SHPROGDIRS=\ +- src/devices/gropdf +-PROGDEPDIRS=\ +- arch/misc +-PROGDIRS=\ +- $(PROGDEPDIRS) \ +- $(CCPROGDIRS) \ +- $(CPROGDIRS) \ +- $(SHPROGDIRS) \ +- $(XPROGDIRS) +-ALLPROGDIRS=\ +- $(PROGDEPDIRS) \ +- $(CCPROGDIRS) \ +- $(CPROGDIRS) \ +- $(SHPROGDIRS) \ +- src/devices/xditview \ +- src/utils/xtotroff +-DEVDIRS=\ +- font/devps \ +- font/devdvi \ +- font/devhtml +-ALLTTYDEVDIRS=\ +- font/devascii \ +- font/devlatin1 \ +- font/devutf8 \ +- font/devcp1047 +-# `doc' must be processed before `contrib/pdfmark', +-# pdf stuff must be processed before `contrib/mom', +-# devpdf fonts depends on `afmtodit' +-OTHERDIRS=\ +- src/utils/afmtodit \ +- font/devpdf \ +- arch/mingw \ +- contrib/chem \ +- contrib/eqn2graph \ +- contrib/gdiffmk \ +- contrib/glilypond \ +- contrib/gperl \ +- contrib/gpinyin \ +- contrib/grap2graph \ +- contrib/groff_filenames \ +- contrib/groffer \ +- contrib/hdtbl \ +- contrib/mm \ +- contrib/pdfmark \ +- contrib/pic2graph \ +- contrib/mom \ +- doc \ +- man \ +- src/roff/grog \ +- src/roff/nroff \ +- tmac +- +-# OTHERDIRS is handled specially in the `$(TARGETS)' rule to avoid +-# dependency problems with parallel builds. +-ALLDIRS=\ +- $(INCDIRS) \ +- $(LIBDIRS) \ +- $(PROGDIRS) \ +- $(DEVDIRS) \ +- $(XDEVDIRS) \ +- $(OTHERDEVDIRS) \ +- $(TTYDEVDIRS) +-# $(OTHERDIRS) +-EXTRADIRS=\ +- font/devps/generate \ +- font/devdvi/generate \ +- font/devlj4/generate \ +- doc +-NOMAKEDIRS=\ +- m4 \ +- arch/djgpp \ +- contrib/chem/examples \ +- contrib/chem/examples/122 \ +- contrib/hdtbl/examples \ +- contrib/mm/examples \ +- contrib/mm/mm \ +- contrib/mom/examples \ +- contrib/mom/momdoc \ +- contrib/gdiffmk/tests \ +- src/libs/snprintf \ +- src/libs/gnulib/lib \ +- src/libs/gnulib/lib/uniwidth \ +- src/libs/gnulib/m4 \ +- src/libs/gnulib/build-aux \ +- src/libs/gnulib/build-aux/snippet \ +- src/libs/gnulib \ +- font/devps/old \ +- font/devpdf/util \ +- font/util +-GNULIBDIRS=\ +- src/libs/gnulib +-DISTDIRS=\ +- $(INCDIRS) \ +- $(ALLLIBDIRS) \ +- $(ALLPROGDIRS) \ +- $(DEVDIRS) \ +- $(XDEVDIRS) \ +- $(OTHERDEVDIRS) \ +- $(ALLTTYDEVDIRS) \ +- $(OTHERDIRS) \ +- $(EXTRADIRS) \ +- $(NOMAKEDIRS) \ +- $(GNULIBDIRS) +-TARGETS=\ +- all \ +- install_bin install_data \ +- clean distclean mostlyclean realclean extraclean \ +- distfiles \ +- TAGS \ +- depend \ +- uninstall_sub \ +- fonts +- +-# This ENVSETUP gork is required by the DJGPP build on Windows 9X, +-# where Make needs to be case-sensitive to find files like BI and VERSION. +-ENVSETUP=\ +- if test -f $(srcdir)/makefile.ccpg* && \ +- test -f $(srcdir)/Makefile.ccpg*; then \ +- FNCASE=y; export FNCASE; \ +- else :; \ +- fi +- +-do=all +-dodirs=$(ALLDIRS) $(OTHERDIRS) dot +-# Default target for subdir_Makefile +-subdir=src/roff/troff +- +-$(TARGETS): +- @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(ALLDIRS) +- @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(OTHERDIRS) dot +- +-clean: clean-gnulib +-clean-gnulib: +- @$(ENVSETUP); cd src/libs/gnulib; $(MAKE) $(MAKE_K_FLAG) clean +- +-distclean: distclean-gnulib +-distclean-gnulib: +- @$(ENVSETUP); cd src/libs/gnulib; $(MAKE) $(MAKE_K_FLAG) distclean +- rm -rf src/libs/gnulib/autom4te.cache +- +-dot: FORCE +- @$(ENVSETUP); \ +- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \ +- -f $(top_srcdir)/Makefile.comm \ +- -f $(top_srcdir)/Makefile.sub $(do) +- +-$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS) $(GNULIBDIRS) +- @$(ENVSETUP); \ +- if test $(srcdir) = .; then \ +- srcdir=.; \ +- else \ +- srcdir=$(top_srcdir)/$@; \ +- fi; \ +- test -d $@ || $(mkinstalldirs) $@; \ +- cd $@; \ +- test -f Makefile.dep || touch Makefile.dep; \ +- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ +- -f $(top_srcdir)/Makefile.comm \ +- -f $$srcdir/Makefile.sub \ +- -f $(top_srcdir)/Makefile.lib \ +- -f Makefile.dep $(do) +- +-$(CPROGDIRS) $(XPROGDIRS): FORCE $(LIBDIRS) +- @$(ENVSETUP); \ +- if test $(srcdir) = .; then \ +- srcdir=.; \ +- else \ +- srcdir=$(top_srcdir)/$@; \ +- fi; \ +- test -d $@ || $(mkinstalldirs) $@; \ +- cd $@; \ +- test -f Makefile.dep || touch Makefile.dep; \ +- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ +- -f $(top_srcdir)/Makefile.comm \ +- -f $$srcdir/Makefile.sub \ +- -f $(top_srcdir)/Makefile.cpg \ +- -f Makefile.dep $(do) +- +-$(CCPROGDIRS): FORCE $(LIBDIRS) +- @$(ENVSETUP); \ +- if test $(srcdir) = .; then \ +- srcdir=.; \ +- else \ +- srcdir=$(top_srcdir)/$@; \ +- fi; \ +- test -d $@ || $(mkinstalldirs) $@; \ +- cd $@; \ +- test -f Makefile.dep || touch Makefile.dep; \ +- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ +- -f $(top_srcdir)/Makefile.comm \ +- -f $$srcdir/Makefile.sub \ +- -f $(top_srcdir)/Makefile.ccpg \ +- -f Makefile.dep $(do) +- +-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \ +- $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) +- @$(ENVSETUP); \ +- if test $(srcdir) = .; then \ +- srcdir=.; \ +- else \ +- srcdir=$(top_srcdir)/$@; \ +- fi; \ +- test -d $@ || $(mkinstalldirs) $@; \ +- cd $@; \ +- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ +- -f $(top_srcdir)/Makefile.comm \ +- -f $$srcdir/Makefile.sub \ +- -f $(top_srcdir)/Makefile.dev $(do) +- +-$(GNULIBDIRS): FORCE +- @$(ENVSETUP); \ +- if test $(srcdir) = .; then \ +- srcdir=.; \ +- else \ +- srcdir=$(top_srcdir)/$@; \ +- fi; \ +- test -d $@ || $(mkinstalldirs) $@; \ +- case $(do) in \ +- all) \ +- cd $@; \ +- args=`$(top_builddir)/config.status --config`; \ +- test -f Makefile \ +- || eval $$srcdir/configure "$$args" --srcdir=$$srcdir; \ +- $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ +- esac +- +-$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS) +- +-$(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) $(OTHERDIRS): FORCE +- @$(ENVSETUP); \ +- if test $(srcdir) = .; then \ +- srcdir=.; \ +- else \ +- srcdir=$(top_srcdir)/$@; \ +- fi; \ +- test -d $@ || $(mkinstalldirs) $@; \ +- cd $@; \ +- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \ +- -f $(top_srcdir)/Makefile.comm \ +- -f $$srcdir/Makefile.sub \ +- -f $(top_srcdir)/Makefile.man $(do) +- +-.PHONY: dist +-dist: +- if test "${doc_dist_target_ok}" != yes; then \ +- echo "The \`dist' target is not applicable to this configuration"; \ +- exit 1; \ +- fi +- -rm -fr tmp +- rm -f groff-$(version)$(revision).tar.gz +- mkdir tmp +- for d in $(DISTDIRS); do \ +- $(mkinstalldirs) tmp/$$d; \ +- done +- cp Makefile tmp +- -cp * tmp 2>/dev/null +- -for d in $(DISTDIRS); do \ +- (cd tmp/$$d; \ +- cp $(top_srcdir)/$$d/* . 2>/dev/null;); \ +- done +- cd tmp; $(MAKE) srcdir=. VPATH=. distfiles +- cd tmp; $(MAKE) srcdir=. VPATH=. extraclean +- for d in $(EXTRADIRS); do \ +- (cd tmp/$$d; \ +- if test -f Makefile; then \ +- $(MAKE) extraclean; \ +- else \ +- $(MAKE) -f $(top_builddir)/$$d/Makefile extraclean; \ +- fi); \ +- done +- for d in $(GNULIBDIRS); do \ +- (cd tmp/$$d; \ +- if test -f config.status; then \ +- ./config.status; \ +- fi; \ +- if test -f Makefile; then \ +- $(MAKE) distclean; \ +- else \ +- $(MAKE) -f $(top_builddir)/$$d/Makefile distclean; \ +- fi; \ +- rm -rf autom4te.cache); \ +- done +- rm -f tmp/Makefile +- cp Makefile.init tmp/Makefile +- mv tmp groff-$(version)$(revision) +- tar cfh - groff-$(version)$(revision) \ +- | gzip -c >groff-$(version)$(revision).tar.gz +- rm -fr groff-$(version)$(revision) +- +-# $(PROGDIRS): libgroff +-# grops grotty grodvi: libdriver +-# refer lookbib indxbib lkbib: libbib +-# $(LIBDIRS) $(PROGDIRS): include +- +-.PHONY: $(ALLDIRS) dot $(TARGETS) FORCE +- +-# Create a Makefile in $(subdir). This is useful for development since it +-# avoids running make recursively. +-subdir_Makefile: Makefile.cfg +- $(MAKE) do=Makefile $(subdir) +- +-Makefile.cfg: Makefile +- >Makefile.cfg +- for var in $(MDEFINES); do \ +- echo "$$var" >>Makefile.cfg; \ +- done +- +-Makefile: Makefile.in +- $(SHELL) config.status +- +-.PHONY: install +-install: +- -test -d $(DESTDIR)$(prefix) \ +- || $(mkinstalldirs) $(DESTDIR)$(prefix) +- @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) \ +- do=do_install $(dodirs) +- cd $(DESTDIR)$(dataprogramdir); \ +- rm -f current; \ +- $(LN_S) $(version)$(revision) current +- +-.PHONY: uninstall +-uninstall: uninstall_sub uninstall_dirs +- +-.PHONY: uninstall_dirs +-# Use `rmdir' here so that the directories are only removed if they are empty. +-uninstall_dirs: +- rm -f $(DESTDIR)$(dataprogramdir)/current +- -rmdir \ +- $(DESTDIR)$(man1dir) \ +- $(DESTDIR)$(man5dir) \ +- $(DESTDIR)$(man7dir) \ +- $(DESTDIR)$(manroot) \ +- $(DESTDIR)$(tmacdir) \ +- $(DESTDIR)$(systemtmacdir) \ +- $(DESTDIR)$(localtmacdir) \ +- $(DESTDIR)$(fontdir) \ +- $(DESTDIR)$(localfontdir) \ +- $(DESTDIR)$(oldfontdir) \ +- $(DESTDIR)$(bindir) \ +- $(DESTDIR)$(datasubdir) \ +- $(DESTDIR)$(dataprogramdir) \ +- $(DESTDIR)$(libprogramdir) \ +- $(DESTDIR)$(libdir) \ +- $(DESTDIR)$(infodir) \ +- $(DESTDIR)$(exampledir) \ +- $(DESTDIR)$(htmldocdir) \ +- $(DESTDIR)$(pdfdocdir) \ +- $(DESTDIR)$(docdir) \ +- $(DESTDIR)$(datadir)/doc/groff \ +- $(DESTDIR)$(datadir)/doc \ +- $(DESTDIR)$(datadir) 2>/dev/null || : +- +-.PHONY: check +-check: +- @echo There is no validation suite for this package. +- +-#check: site.exp docheck +-#.PHONY: docheck +- +-#docheck: +-# if $(SHELL) -c "runtest --version" > /dev/null 2>&1; then \ +-# runtest; \ +-# else \ +-# echo "WARNING: could not find \`runtest'" 1>&2; \ +-# fi +- +-# This snippet has been taken from the automake package. +- +-#site.exp: +-# @echo "Making a new site.exp file..." +-# @echo "## these variables are automatically generated by make ##" >site.tmp +-# @echo "# Do not edit here. If you wish to override these values" >>site.tmp +-# @echo "# edit the last section" >>site.tmp +-# @echo "set tool groff" >>site.tmp +-# @echo "set srcdir $(srcdir)/testsuite" >>site.tmp +-# @echo "set objdir `pwd`" >> site.tmp +-# @echo "## All variables above are generated by configure. Do not edit! ##" >> site.tmp +-# @test ! -f site.exp \ +-# || sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp +-# @rm -f site.bak +-# @test ! -f site.exp || mv site.exp site.bak +-# @mv site.tmp site.exp +- +-FORCE: +- +-.NOEXPORT: +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.init groff-1.22.3/Makefile.init +--- groff-1.22.3.old/Makefile.init 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.init 1970-01-01 02:00:00.000000000 +0200 +@@ -1,34 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.init +-# +-SHELL=/bin/sh +- +-.PHONY: all +-all: +- $(SHELL) configure +- $(MAKE) all +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.lib groff-1.22.3/Makefile.lib +--- groff-1.22.3.old/Makefile.lib 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.lib 1970-01-01 02:00:00.000000000 +0200 +@@ -1,48 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.lib +-# +-LIBCLEAN=lib$(LIB).$(LIBEXT) +-MAKEFILEPARTS=\ +- $(top_srcdir)/Makefile.comm \ +- $(top_builddir)/Makefile.cfg \ +- $(srcdir)/Makefile.sub \ +- $(top_srcdir)/Makefile.lib \ +- Makefile.dep +- +-all: lib$(LIB).$(LIBEXT) +- +-lib$(LIB).$(LIBEXT): $(OBJS) +- $(AR) r $@ $? +- $(RANLIB) $@ +- +-depend: depend_src +-depend.temp: $(GENSRCS) +-TAGS: $(CCSRCS) $(CSRCS) +-Makefile: $(MAKEFILEPARTS) +-Makefile.dep: +- touch Makefile.dep +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.man groff-1.22.3/Makefile.man +--- groff-1.22.3.old/Makefile.man 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.man 1970-01-01 02:00:00.000000000 +0200 +@@ -1,34 +0,0 @@ +-# Copyright (C) 1992-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.man +-# +-all: $(MANPAGES) +-install_data: install_man +-install_man: $(MANPAGES) +-uninstall_sub: uninstall_man +-$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION \ +- $(top_srcdir)/REVISION +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/Makefile.sub groff-1.22.3/Makefile.sub +--- groff-1.22.3.old/Makefile.sub 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,83 +0,0 @@ +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-# Makefile.sub +-# +-DISTCLEANFILES=\ +- Makefile \ +- config.cache \ +- config.log \ +- config.status \ +- groff.log \ +- groff.sum \ +- src/include/config.h \ +- site.bak \ +- site.exp \ +- stamp-h \ +- test-groff +- +-MOSTLYCLEANADD=\ +- Makefile.cfg \ +- conftest* +- +-M4MACROS=\ +- $(srcdir)/m4/ax_compare_version.m4 \ +- $(srcdir)/m4/ax_prog_perl_version.m4 \ +- $(srcdir)/m4/codeset.m4 \ +- $(srcdir)/m4/fcntl-o.m4 \ +- $(srcdir)/m4/glibc21.m4 \ +- $(srcdir)/m4/groff.m4 \ +- $(srcdir)/m4/iconv.m4 \ +- $(srcdir)/m4/lib-ld.m4 \ +- $(srcdir)/m4/lib-link.m4 \ +- $(srcdir)/m4/lib-prefix.m4 \ +- $(srcdir)/m4/localcharset.m4 +- +-distfiles: configure +- +-$(srcdir)/configure: configure.ac $(srcdir)/aclocal.m4 +- cd $(srcdir) && autoconf && rm -rf autom4te.cache +- +-$(srcdir)/aclocal.m4: $(M4MACROS) +- cd $(srcdir) && aclocal -I m4 +- +-config.status: configure +- $(SHELL) config.status --recheck +- +-# autoheader might not change config.hin, so touch a stamp file. +-$(srcdir)/config.hin: stamp-h.in +-$(srcdir)/stamp-h.in: configure.ac $(srcdir)/aclocal.m4 +- cd $(srcdir) && autoheader +- echo timestamp > $(srcdir)/stamp-h.in +- +-config.h: stamp-h +-stamp-h: config.hin config.status +- $(SHELL) config.status +- +-# Always create the site-font directory as a guide to the user. +-install_data: +- -test -d $(DESTDIR)$(localfontdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(localfontdir) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/man/ditroff.man groff-1.22.3/man/ditroff.man +--- groff-1.22.3.old/man/ditroff.man 2014-11-04 10:38:35.517520346 +0200 ++++ groff-1.22.3/man/ditroff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -7,7 +7,7 @@ + . + . + .de co +-Copyright \[co] 2001-2014 Free Software Foundation, Inc. ++Copyright \(co 2001-2014 Free Software Foundation, Inc. + + This file is part of groff, the GNU roff type-setting system. + +@@ -68,27 +68,27 @@ + creating an intermediate output format for troff that can be fed into + postprocessor programs which actually do the printout on the device. + . +-Kernighan\[aq]s version marks what is known as ++Kernighan\(aqs version marks what is known as + .I classical troff + today. + . +-In order to distinguish it from Ossanna\[aq]s original mono-device ++In order to distinguish it from Ossanna\(aqs original mono-device + version, it was called + .I ditroff + .RI ( d "evice " i "ndependent " troff ) +-on some systems, though this naming isn\[aq]t mentioned in the ++on some systems, though this naming isn\(aqt mentioned in the + classical documentation. + . + . + .P +-Today, any existing roff system is based on Kernighan\[aq]s ++Today, any existing roff system is based on Kernighan\(aqs + multi-device troff. + . + The distinction between + .I troff + and + .I ditroff +-isn\[aq]t necessary any longer, for each modern ++isn\(aqt necessary any longer, for each modern + .I troff + provides already the complete functionality of + .IR ditroff . +@@ -116,7 +116,7 @@ + .TP + .I [CSTR\~#54] + The 1992 revision of the +-.I Nroff/Troff User\[aq]s Manual ++.I Nroff/Troff User\(aqs Manual + by + .I J.\& F.\& Ossanna + and +diff -Nuar groff-1.22.3.old/man/.gitignore groff-1.22.3/man/.gitignore +--- groff-1.22.3.old/man/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/man/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,8 @@ ++ditroff.n ++groff.n ++groff_char.n ++groff_diff.n ++groff_font.n ++groff_out.n ++groff_tmac.n ++roff.n +diff -Nuar groff-1.22.3.old/man/groff_char.man groff-1.22.3/man/groff_char.man +--- groff-1.22.3.old/man/groff_char.man 2014-11-04 10:38:35.517520346 +0200 ++++ groff-1.22.3/man/groff_char.man 2015-04-23 20:57:03.000000000 +0300 +@@ -808,7 +808,7 @@ + glyphs. + . + For this reason, the four glyphs \[oq]lf\[cq], \[oq]rf\[cq], +-\[o]lc\[cq], and \[oq]rc\[cq] are not unified with similarly looking ++\[oq]lc\[cq], and \[oq]rc\[cq] are not unified with similarly looking + bracket pieces. + . + In +diff -Nuar groff-1.22.3.old/man/groff_diff.man groff-1.22.3/man/groff_diff.man +--- groff-1.22.3.old/man/groff_diff.man 2014-11-04 10:38:35.517520346 +0200 ++++ groff-1.22.3/man/groff_diff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -9,6 +9,10 @@ + .\" Installed position: /share/man/man7/groff_diff.7 + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .de co + Copyright \[co] 1989-2014 Free Software Foundation, Inc. + . +@@ -3964,6 +3968,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" -------------------------------------------------------------------- + .\" Emacs variables + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/man/groff.man groff-1.22.3/man/groff.man +--- groff-1.22.3.old/man/groff.man 2014-11-04 10:38:35.518520334 +0200 ++++ groff-1.22.3/man/groff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -13,7 +13,7 @@ + .de co + This file is part of groff, the GNU roff type-setting system. + +-Copyright \[co] 2000-2014 Free Software Foundation, Inc. ++Copyright \(co 2000-2014 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 or +diff -Nuar groff-1.22.3.old/man/groff_out.man groff-1.22.3/man/groff_out.man +--- groff-1.22.3.old/man/groff_out.man 2014-11-04 10:38:35.518520334 +0200 ++++ groff-1.22.3/man/groff_out.man 2015-04-23 20:57:03.000000000 +0300 +@@ -9,6 +9,10 @@ + .\" Installed position: /share/man/man5/groff_out.5 + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" License and authors + .\" -------------------------------------------------------------------- +@@ -2002,6 +2006,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" -------------------------------------------------------------------- + .\" Emacs settings + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/man/groff_tmac.man groff-1.22.3/man/groff_tmac.man +--- groff-1.22.3.old/man/groff_tmac.man 2014-11-04 10:38:35.518520334 +0200 ++++ groff-1.22.3/man/groff_tmac.man 2015-04-23 20:57:03.000000000 +0300 +@@ -7,6 +7,10 @@ + .\" Source file position: /man/groff_tmac.man + .\" Installed position: /share/man/man5/groff_tmac.5 + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legalese + .\" -------------------------------------------------------------------- +@@ -1269,3 +1273,14 @@ + .SH AUTHOR + .\" -------------------------------------------------------------------- + .au ++. ++..cp \n[groff_C] ++. ++. ++.\" -------------------------------------------------------------------- ++.\" Emacs settings ++.\" -------------------------------------------------------------------- ++. ++.\" Local Variables: ++.\" mode: nroff ++.\" End: +diff -Nuar groff-1.22.3.old/man/Makefile.sub groff-1.22.3/man/Makefile.sub +--- groff-1.22.3.old/man/Makefile.sub 2014-11-04 10:38:35.518520334 +0200 ++++ groff-1.22.3/man/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,45 +0,0 @@ +-# Makefile.sub for `man' +-# +-# File position: /man/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-MAN5=\ +- groff_font.n \ +- groff_out.n \ +- groff_tmac.n +-MAN7=\ +- ditroff.n \ +- groff_char.n \ +- groff_diff.n \ +- groff.n \ +- roff.n +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/man/man.am groff-1.22.3/man/man.am +--- groff-1.22.3.old/man/man.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/man/man.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,42 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `groff' ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++man5_MANS += \ ++ man/groff_font.n \ ++ man/groff_out.n \ ++ man/groff_tmac.n ++man7_MANS += \ ++ man/ditroff.n \ ++ man/groff_char.n \ ++ man/groff_diff.n \ ++ man/groff.n \ ++ man/roff.n ++EXTRA_DIST += \ ++ man/groff_font.man \ ++ man/groff_out.man \ ++ man/groff_tmac.man \ ++ man/ditroff.man \ ++ man/groff_char.man \ ++ man/groff_diff.man \ ++ man/groff.man \ ++ man/roff.man ++ ++# Case of out-of-source build: we must create the 'man' directory. ++BUILT_SOURCES += man ++man: ++ $(MKDIR_P) $(top_builddir)/man +diff -Nuar groff-1.22.3.old/man/roff.man groff-1.22.3/man/roff.man +--- groff-1.22.3.old/man/roff.man 2014-11-04 10:38:35.518520334 +0200 ++++ groff-1.22.3/man/roff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -5,6 +5,11 @@ + . + .\" this is man-page roff.7 + . ++. ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legalese + .\" -------------------------------------------------------------------- +@@ -1359,6 +1364,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" -------------------------------------------------------------------- + .\" Emacs setup + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/mkinstalldirs groff-1.22.3/mkinstalldirs +--- groff-1.22.3.old/mkinstalldirs 2014-11-04 10:38:35.145524997 +0200 ++++ groff-1.22.3/mkinstalldirs 1970-01-01 02:00:00.000000000 +0200 +@@ -1,162 +0,0 @@ +-#! /bin/sh +-# mkinstalldirs --- make directory hierarchy +- +-scriptversion=2009-04-28.21; # UTC +- +-# Original author: Noah Friedman +-# Created: 1993-05-16 +-# Public domain. +-# +-# This file is maintained in Automake, please report +-# bugs to or send patches to +-# . +- +-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 ." +- +-# 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 -Nuar groff-1.22.3.old/README.git groff-1.22.3/README.git +--- groff-1.22.3.old/README.git 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/README.git 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++This file is not distributed and is given to the bootstrap script to ++be sure that this script is invoked on a source tree checked out from ++the git repository and not from a tarball. +diff -Nuar groff-1.22.3.old/src/devices/grodvi/.gitignore groff-1.22.3/src/devices/grodvi/.gitignore +--- groff-1.22.3.old/src/devices/grodvi/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grodvi/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++grodvi ++grodvi.n +diff -Nuar groff-1.22.3.old/src/devices/grodvi/grodvi.am groff-1.22.3/src/devices/grodvi/grodvi.am +--- groff-1.22.3.old/src/devices/grodvi/grodvi.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grodvi/grodvi.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,28 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += grodvi ++grodvi_SOURCES = src/devices/grodvi/dvi.cpp ++grodvi_LDADD = \ ++ libdriver.a \ ++ libgroff.a \ ++ lib/libgnu.a $(LIBM) ++man1_MANS += src/devices/grodvi/grodvi.n ++EXTRA_DIST += src/devices/grodvi/grodvi.man ++ ++ +diff -Nuar groff-1.22.3.old/src/devices/grodvi/grodvi.man groff-1.22.3/src/devices/grodvi/grodvi.man +--- groff-1.22.3.old/src/devices/grodvi/grodvi.man 2014-11-04 10:38:35.270523434 +0200 ++++ groff-1.22.3/src/devices/grodvi/grodvi.man 2015-04-23 20:57:03.000000000 +0300 +@@ -5,7 +5,7 @@ + . + .\" copying (license) + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/devices/grodvi/Makefile.sub groff-1.22.3/src/devices/grodvi/Makefile.sub +--- groff-1.22.3.old/src/devices/grodvi/Makefile.sub 2014-11-04 10:38:35.270523434 +0200 ++++ groff-1.22.3/src/devices/grodvi/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,41 +0,0 @@ +-# Makefile.sub for `grodvi' +-# +-# File position: /src/devices/grodvi/Makefile.sub +-# +-# Copyright (C) 2014 +-# Free Software Foundation, Inc. +-# +-# Last update: 2 Sep 2014 +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=grodvi$(EXEEXT) +-MAN1=grodvi.n +-XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=dvi.$(OBJEXT) +-CCSRCS=$(srcdir)/dvi.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/grohtml/.gitignore groff-1.22.3/src/devices/grohtml/.gitignore +--- groff-1.22.3.old/src/devices/grohtml/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grohtml/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++grohtml.n ++post-grohtml +diff -Nuar groff-1.22.3.old/src/devices/grohtml/grohtml.am groff-1.22.3/src/devices/grohtml/grohtml.am +--- groff-1.22.3.old/src/devices/grohtml/grohtml.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grohtml/grohtml.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,34 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += post-grohtml ++post_grohtml_SOURCES = \ ++ src/devices/grohtml/post-html.cpp \ ++ src/devices/grohtml/html-table.cpp \ ++ src/devices/grohtml/html-text.cpp \ ++ src/devices/grohtml/output.cpp \ ++ src/devices/grohtml/html.h \ ++ src/devices/grohtml/html-text.h \ ++ src/devices/grohtml/html-table.h ++ ++post_grohtml_LDADD = $(LIBM) \ ++ libdriver.a \ ++ libgroff.a \ ++ lib/libgnu.a ++man1_MANS += src/devices/grohtml/grohtml.n ++EXTRA_DIST += src/devices/grohtml/grohtml.man +diff -Nuar groff-1.22.3.old/src/devices/grohtml/grohtml.man groff-1.22.3/src/devices/grohtml/grohtml.man +--- groff-1.22.3.old/src/devices/grohtml/grohtml.man 2014-11-04 10:38:35.279523322 +0200 ++++ groff-1.22.3/src/devices/grohtml/grohtml.man 2015-04-23 20:57:03.000000000 +0300 +@@ -5,7 +5,7 @@ + . + .\" license + .de co +-Copyright \[co] 1999-2014 Free Software Foundation, Inc. ++Copyright \(co 1999-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of this + manual provided the copyright notice and this permission notice are +@@ -102,7 +102,7 @@ + options can be passed to + .B grohtml + using +-.BR groff \[aq]s ++.BR groff \(aqs + .B \-P + option. + . +@@ -126,7 +126,7 @@ + all non-composite unicode characters. + . + In spite of this, groff may issue warnings about unknown special +-characters if they can\[aq]t be found during the first pass. ++characters if they can\(aqt be found during the first pass. + . + Such warnings can be safely ignored unless the special characters + appear inside a table or equation. +@@ -269,7 +269,7 @@ + . + Without the option the anchor value is the textual heading. + . +-This can cause problems when a heading contains a \[oq]?\[cq] on older ++This can cause problems when a heading contains a \(oq?\(cqa on older + versions of some browsers (Netscape). + . + This flag is automatically turned on if a heading contains an image. +diff -Nuar groff-1.22.3.old/src/devices/grohtml/Makefile.sub groff-1.22.3/src/devices/grohtml/Makefile.sub +--- groff-1.22.3.old/src/devices/grohtml/Makefile.sub 2014-11-04 10:38:35.279523322 +0200 ++++ groff-1.22.3/src/devices/grohtml/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,50 +0,0 @@ +-# Makefile.sub for `grohtml' +-# +-# File position: /src/devices/grohtml/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=post-grohtml$(EXEEXT) +-MAN1=grohtml.n +-XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=\ +- post-html.$(OBJEXT) \ +- html-table.$(OBJEXT) \ +- html-text.$(OBJEXT) \ +- output.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/post-html.cpp \ +- $(srcdir)/html-table.cpp \ +- $(srcdir)/html-text.cpp \ +- $(srcdir)/output.cpp +-HDRS=\ +- $(srcdir)/html.h \ +- $(srcdir)/html-table.h \ +- $(srcdir)/html-text.h +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/grolbp/.gitignore groff-1.22.3/src/devices/grolbp/.gitignore +--- groff-1.22.3.old/src/devices/grolbp/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grolbp/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++grolbp ++grolbp.n +diff -Nuar groff-1.22.3.old/src/devices/grolbp/grolbp.am groff-1.22.3/src/devices/grolbp/grolbp.am +--- groff-1.22.3.old/src/devices/grolbp/grolbp.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grolbp/grolbp.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,30 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += grolbp ++grolbp_SOURCES = \ ++ src/devices/grolbp/lbp.cpp \ ++ src/devices/grolbp/lbp.h \ ++ src/devices/grolbp/charset.h ++ ++grolbp_LDADD = $(LIBM) \ ++ libdriver.a \ ++ libgroff.a \ ++ lib/libgnu.a ++man1_MANS += src/devices/grolbp/grolbp.n ++EXTRA_DIST += src/devices/grolbp/grolbp.man +diff -Nuar groff-1.22.3.old/src/devices/grolbp/grolbp.man groff-1.22.3/src/devices/grolbp/grolbp.man +--- groff-1.22.3.old/src/devices/grolbp/grolbp.man 2014-11-04 10:38:35.284523259 +0200 ++++ groff-1.22.3/src/devices/grolbp/grolbp.man 2015-04-23 20:57:03.000000000 +0300 +@@ -10,7 +10,7 @@ + . + .\" license + .de co +-Copyright \[co] 1994-2014 Free Software Foundation, Inc. ++Copyright \(co 1994-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -112,7 +112,7 @@ + . + Note that there can be whitespace between a one-letter option and its + argument; on the other hand, there must be whitespace and/or an equal sign +-(\[oq]=\[cq]) between a long-name option and its argument. ++(\(oq=\(cq) between a long-name option and its argument. + . + .TP + .BI \-c numcopies +@@ -143,7 +143,7 @@ + .BI \-\-orientation= orientation + Print the document with + .I orientation +-orientation, which must be \[oq]portrait\[cq] or \[oq]landscape\[cq]. ++orientation, which must be \(oqportrait\(cq or \(oqlandscape\(cq. + . + .TP + .BI \-w width +@@ -153,7 +153,7 @@ + .I width + thousandths of an em. + . +-If this option isn\[aq]t specified, the line thickness defaults to 0.04\~em. ++If this option isn\(aqt specified, the line thickness defaults to 0.04\~em. + . + .TP + .B \-v +@@ -348,9 +348,9 @@ + indicating the font styles Roman, Italic and Bold respectively. + . + .IP +-For instance, if the printer\[aq]s ++For instance, if the printer\(aqs + .I font listing A +-shows font \[oq]Nelite12I.ISO_USA\[cq], the corresponding entry in the ++shows font \(oqNelite12I.ISO_USA\(cq, the corresponding entry in the + font description file is + .sp 1 + .in +2m +@@ -367,14 +367,14 @@ + .IP \(bu + For scalable fonts, + .I printer_font_name +-is identical to the font name as it appears in the printer\[aq]s ++is identical to the font name as it appears in the printer\(aqs + .IR "font listing A" . + . + .IP +-For instance, to select the \[oq]Swiss\[cq] font in bold style, which +-appears in the printer\[aq]s ++For instance, to select the \(oqSwiss\(cq font in bold style, which ++appears in the printer\(aqs + .I font listing A +-as \[oq]Swiss-Bold\[cq], the required ++as \(oqSwiss-Bold\(cq, the required + .B lbpname + command line is + .sp 1 +diff -Nuar groff-1.22.3.old/src/devices/grolbp/Makefile.sub groff-1.22.3/src/devices/grolbp/Makefile.sub +--- groff-1.22.3.old/src/devices/grolbp/Makefile.sub 2014-11-04 10:38:35.284523259 +0200 ++++ groff-1.22.3/src/devices/grolbp/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,38 +0,0 @@ +-# Makefile.sub for `grolbp' +-# +-# File position: /src/devices/grolbp/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=grolbp$(EXEEXT) +-MAN1=grolbp.n +-XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=lbp.$(OBJEXT) +-CCSRCS=$(srcdir)/lbp.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/grolj4/.gitignore groff-1.22.3/src/devices/grolj4/.gitignore +--- groff-1.22.3.old/src/devices/grolj4/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grolj4/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++Makefile.dep ++grolj4 ++grolj4.n ++lj4_font.n +diff -Nuar groff-1.22.3.old/src/devices/grolj4/grolj4.am groff-1.22.3/src/devices/grolj4/grolj4.am +--- groff-1.22.3.old/src/devices/grolj4/grolj4.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grolj4/grolj4.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,30 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += grolj4 ++grolj4_SOURCES = src/devices/grolj4/lj4.cpp ++grolj4_LDADD = $(LIBM) \ ++ libdriver.a \ ++ libgroff.a \ ++ lib/libgnu.a ++man1_MANS += src/devices/grolj4/grolj4.n ++man5_MANS += src/devices/grolj4/lj4_font.n ++EXTRA_DIST += \ ++ src/devices/grolj4/grolj4.man \ ++ src/devices/grolj4/lj4_font.man ++ +diff -Nuar groff-1.22.3.old/src/devices/grolj4/grolj4.man groff-1.22.3/src/devices/grolj4/grolj4.man +--- groff-1.22.3.old/src/devices/grolj4/grolj4.man 2014-11-04 10:38:35.274523384 +0200 ++++ groff-1.22.3/src/devices/grolj4/grolj4.man 2015-04-23 20:57:03.000000000 +0300 +@@ -6,7 +6,7 @@ + . + .\" license + .de co +-Copyright \[co] 1994-2014 Free Software Foundation, Inc. ++Copyright \(co 1994-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -127,7 +127,7 @@ + .I n + thousandths of an em. + . +-If this option isn\[aq]t specified, the line thickness defaults to ++If this option isn\(aqt specified, the line thickness defaults to + 0.04\~em. + . + .TP +diff -Nuar groff-1.22.3.old/src/devices/grolj4/lj4_font.man groff-1.22.3/src/devices/grolj4/lj4_font.man +--- groff-1.22.3.old/src/devices/grolj4/lj4_font.man 2014-11-04 10:38:35.274523384 +0200 ++++ groff-1.22.3/src/devices/grolj4/lj4_font.man 2015-04-23 20:57:03.000000000 +0300 +@@ -6,7 +6,7 @@ + . + .\" license + .de co +-Copyright \[co] 2004-2014 Free Software Foundation, Inc. ++Copyright \(co 2004-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/devices/grolj4/Makefile.sub groff-1.22.3/src/devices/grolj4/Makefile.sub +--- groff-1.22.3.old/src/devices/grolj4/Makefile.sub 2014-11-04 10:38:35.274523384 +0200 ++++ groff-1.22.3/src/devices/grolj4/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `grolj4' +-# +-# File position: /src/devices/grolj4/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=grolj4$(EXEEXT) +-MAN1=grolj4.n +-MAN5=lj4_font.n +-XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=lj4.$(OBJEXT) +-CCSRCS=$(srcdir)/lj4.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/gropdf/gropdf.am groff-1.22.3/src/devices/gropdf/gropdf.am +--- groff-1.22.3.old/src/devices/gropdf/gropdf.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/gropdf/gropdf.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,49 @@ ++# Copyright (C) 2011-2014 ++# Free Software Foundation, Inc. ++# Original Makefile.sub written by Deri James . ++# Automake migration by Bertrand Garrigues ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++gropdf_dir = $(top_srcdir)/src/devices/gropdf ++ ++bin_SCRIPTS += gropdf pdfmom ++EXTRA_DIST += \ ++ src/devices/gropdf/TODO \ ++ src/devices/gropdf/gropdf.pl \ ++ src/devices/gropdf/pdfmom.pl \ ++ src/devices/gropdf/gropdf.man \ ++ src/devices/gropdf/pdfmom.man ++ ++man1_MANS += \ ++ src/devices/gropdf/gropdf.n \ ++ src/devices/gropdf/pdfmom.n ++ ++gropdf: $(gropdf_dir)/gropdf.pl $(SH_DEPS_SED_SCRIPT) ++ $(RM) $@ ++ sed -f $(SH_DEPS_SED_SCRIPT) \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]PERL[@]|$(PERL)|" \ ++ -e "s|[@]GROFF_FONT_DIR[@]|$(fontpath)|" \ ++ -e "s|[@]RT_SEP[@]|$(RT_SEP)|" $(gropdf_dir)/gropdf.pl >$@ ++ chmod +x $@ ++ ++pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT) ++ $(RM) $@ ++ sed -f $(SH_DEPS_SED_SCRIPT) \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]PERL[@]|$(PERL)|" $(gropdf_dir)/pdfmom.pl >$@ ++ chmod +x $@ +diff -Nuar groff-1.22.3.old/src/devices/gropdf/gropdf.man groff-1.22.3/src/devices/gropdf/gropdf.man +--- groff-1.22.3.old/src/devices/gropdf/gropdf.man 2014-11-04 10:38:35.319522822 +0200 ++++ groff-1.22.3/src/devices/gropdf/gropdf.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,10 @@ + gropdf \- PDF driver for groff + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" license + .de co + Copyright \[co] 2011-2014 Free Software Foundation, Inc. +@@ -994,7 +998,7 @@ + Foo-Bar-Bold.pfa is \[oq]XY-Foo-Bar-Bold\[cq] (the PS font name is + stored in the + .B internalname +-field in the \[oq]FBB\[cq] file) and belongs to foundry \[oq]F\[]cq] ++field in the \[oq]FBB\[cq] file) and belongs to foundry \[oq]F\[cq] + thus the following line should be added to \[oq]download\[cq]: + . + .RS +@@ -1103,6 +1107,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/devices/gropdf/gropdf.pl groff-1.22.3/src/devices/gropdf/gropdf.pl +--- groff-1.22.3.old/src/devices/gropdf/gropdf.pl 2014-11-04 10:38:35.319522822 +0200 ++++ groff-1.22.3/src/devices/gropdf/gropdf.pl 2015-04-23 20:57:03.000000000 +0300 +@@ -2,8 +2,8 @@ + # + # gropdf : PDF post processor for groff + # +-# Copyright (C) 2011-2014 Free Software Foundation, Inc. +-# Written by Deri James ++# Copyright (C) 2011-2015 Free Software Foundation, Inc. ++# Written by Deri James + # + # This file is part of groff. + # +@@ -22,7 +22,24 @@ + + use strict; + use Getopt::Long qw(:config bundling); +-use Compress::Zlib; ++ ++my $gotzlib=0; ++ ++my $rc = eval ++{ ++ require Compress::Zlib; ++ Compress::Zlib->import(); ++ 1; ++}; ++ ++if($rc) ++{ ++ $gotzlib=1; ++} ++else ++{ ++ Msg(0,"Perl module Compress::Zlib not available - cannot compress this pdf"); ++} + + my %cfg; + +@@ -465,7 +482,7 @@ + sub PDFDate + { + my $dt=shift; +- return(sprintf("D:%04d%02d%02d%02d%02d%02d% +02d'00'",$dt->[5]+1900,$dt->[4]+1,$dt->[3],$dt->[2],$dt->[1],$dt->[0],( localtime time() + 3600*( 12 - (gmtime)[2] ) )[2] - 12)); ++ return(sprintf("D:%04d%02d%02d%02d%02d%02d%+03d'00'",$dt->[5]+1900,$dt->[4]+1,$dt->[3],$dt->[2],$dt->[1],$dt->[0],( localtime time() + 3600*( 12 - (gmtime)[2] ) )[2] - 12)); + } + + sub ToPoints +@@ -767,7 +784,10 @@ + } + elsif ($pdfmark=~m/(.+) \/OUT/) + { +- my @xwds=split(' ',"<< $1 >>"); ++ my $t=$1; ++ $t=~s/\\\) /\\\\\) /g; ++ $t=~s/\\e/\\\\/g; ++ my @xwds=split(' ',"<< $t >>"); + my $out=ParsePDFValue(\@xwds); + + my $this=[$out,[]]; +@@ -1404,7 +1424,7 @@ + sysseek(PD,$o->{STREAMPOS}->[0],0); + Msg(0,'Failed to read all the stream') if $l != sysread(PD,$o->{STREAM},$l); + +- if (exists($o->{OBJ}->{'Filter'}) and $o->{OBJ}->{'Filter'} eq '/FlateDecode') ++ if ($gotzlib and exists($o->{OBJ}->{'Filter'}) and $o->{OBJ}->{'Filter'} eq '/FlateDecode') + { + $o->{STREAM}=Compress::Zlib::uncompress($o->{STREAM}); + delete($o->{OBJ }->{'Filter'}); +@@ -1889,7 +1909,7 @@ + $obj[$ono]->{XREF}=$fct; + if (exists($obj[$ono]->{STREAM})) + { +- if (!$debug && !exists($obj[$ono]->{DATA}->{'Filter'})) ++ if ($gotzlib && !$debug && !exists($obj[$ono]->{DATA}->{'Filter'})) + { + $obj[$ono]->{STREAM}=Compress::Zlib::compress($obj[$ono]->{STREAM}); + $obj[$ono]->{DATA}->{'Filter'}=['/FlateDecode']; +@@ -2121,14 +2141,31 @@ + {'Type' => '/Font', + 'Subtype' => '/Type1', + 'BaseFont' => '/'.$fnt{internalname}, ++ 'Widths' => $fnt{WID}, ++ 'FirstChar' => 0, ++ 'LastChar' => $lastchr, + 'Encoding' => BuildObj($objct+1, + {'Type' => '/Encoding', + 'Differences' => $fnt{GNO} + } +- ) ++ ), ++ 'FontDescriptor' => BuildObj($objct+2, ++ {'Type' => '/FontDescriptor', ++ 'FontName' => '/'.$fnt{internalname}, ++ 'Flags' => $t1flags, ++ 'FontBBox' => \@fntbbox, ++ 'ItalicAngle' => $slant, ++ 'Ascent' => $ascent, ++ 'Descent' => $fntbbox[1], ++ 'CapHeight' => $capheight, ++ 'StemV' => 0, ++ 'CharSet' => "($charset)", ++ } ++ ) + } + ); +- $objct+=1; ++ ++ $objct+=2; + $fontlst{$fontno}->{NM}='/F'.$fontno; + $pages->{'Resources'}->{'Font'}->{'F'.$fontno}=$fontlst{$fontno}->{OBJ}; + $fontlst{$fontno}->{FNT}=\%fnt; +@@ -3029,6 +3066,7 @@ + my $txt=shift; + my $w=0; + my $ck=0; ++ $txt=~s/^\\(\d\d\d)/chr($1)/e; + + foreach my $c (split('',$txt)) + { +@@ -3223,7 +3261,7 @@ + { + $fnt->{GNM}->{$chnm}=$unused++; + $fnt->{GNO}->[$unused]=$fnt->{GNO}->[$ch+1]; +- $fnt->{WID}->[$unused]=$fnt->{WID}->[$ch+1]; ++ $fnt->{WID}->[$unused]=$fnt->{WID}->[$ch]; + $ch=$unused-1; + return($ch); + } +diff -Nuar groff-1.22.3.old/src/devices/gropdf/Makefile.sub groff-1.22.3/src/devices/gropdf/Makefile.sub +--- groff-1.22.3.old/src/devices/gropdf/Makefile.sub 2014-11-04 10:38:35.319522822 +0200 ++++ groff-1.22.3/src/devices/gropdf/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,75 +0,0 @@ +-# Makefile.sub for `gropdf' +-# +-# File position: /src/devices/gropbf/Makefile.sub +-# +-# Copyright (C) 2011-2014 Free Software Foundation, Inc. +-# Written by Deri James +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-######################################################################## +- +-MAN1=\ +- gropdf.n \ +- pdfmom.n +- +-CMDFILES=\ +- gropdf \ +- pdfmom +- +-MOSTLYCLEANADD=\ +- gropdf \ +- pdfmom \ +- $(MAN1) +- +-RM=rm -f +- +-all: gropdf pdfmom +- +- +-gropdf: gropdf.pl $(SH_DEPS_SED_SCRIPT) +- $(RM) $@ +- sed -f $(SH_DEPS_SED_SCRIPT) \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "s|@PERL@|$(PERL)|" \ +- -e "s|@GROFF_FONT_DIR@|$(fontpath)|" \ +- -e "s|@RT_SEP@|$(RT_SEP)|" $(srcdir)/gropdf.pl >$@ +- chmod +x $@ +- +-pdfmom: pdfmom.pl $(SH_DEPS_SED_SCRIPT) +- $(RM) $@ +- sed -f $(SH_DEPS_SED_SCRIPT) \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "s|@PERL@|$(PERL)|" $(srcdir)/pdfmom.pl >$@ +- chmod +x $@ +- +-install_data: +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- for f in $(CMDFILES); do \ +- $(RM) $(DESTDIR)$(bindir)/$$f; \ +- $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \ +- done +- +-uninstall_sub: +- -for f in $(CMDFILES); do $(RM) $(DESTDIR)$(bindir)/$$f; done +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/gropdf/pdfmom.man groff-1.22.3/src/devices/gropdf/pdfmom.man +--- groff-1.22.3.old/src/devices/gropdf/pdfmom.man 2014-11-04 10:38:35.319522822 +0200 ++++ groff-1.22.3/src/devices/gropdf/pdfmom.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2012-2014 Free Software Foundation, Inc. ++Copyright \(co 2012-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -77,7 +77,7 @@ + .B \-Tpdf + option (which is the default), + .B pdfmom +-processes files using groff\[aq]s native PDF driver, ++processes files using groff\(aqs native PDF driver, + .BR gropdf . + . + If +@@ -85,7 +85,7 @@ + is given, processing is passed over to + .BR pdfroff , + which uses +-.BR groff \[aq]s ++.BR groff \(aqs + PostScript driver. + . + In either case, multiple runs of the source file are peformed in +@@ -144,7 +144,7 @@ + .P + .RS 2 + \&.\|.\|.: +-.B can\[aq]t transparently output node at top level ++.B can\(aqt transparently output node at top level + .RE + . + .P +diff -Nuar groff-1.22.3.old/src/devices/grops/.gitignore groff-1.22.3/src/devices/grops/.gitignore +--- groff-1.22.3.old/src/devices/grops/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grops/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++grops ++grops.n +diff -Nuar groff-1.22.3.old/src/devices/grops/grops.am groff-1.22.3/src/devices/grops/grops.am +--- groff-1.22.3.old/src/devices/grops/grops.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grops/grops.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,32 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += grops ++grops_SOURCES = \ ++ src/devices/grops/ps.cpp \ ++ src/devices/grops/psrm.cpp \ ++ src/devices/grops/ps.h ++grops_LDADD = $(LIBM) \ ++ libdriver.a \ ++ libgroff.a \ ++ lib/libgnu.a ++man1_MANS += src/devices/grops/grops.n ++EXTRA_DIST += \ ++ src/devices/grops/grops.man \ ++ src/devices/grops/psfig.diff \ ++ src/devices/grops/TODO +diff -Nuar groff-1.22.3.old/src/devices/grops/grops.man groff-1.22.3/src/devices/grops/grops.man +--- groff-1.22.3.old/src/devices/grops/grops.man 2014-11-04 10:38:35.259523572 +0200 ++++ groff-1.22.3/src/devices/grops/grops.man 2015-04-23 20:57:03.000000000 +0300 +@@ -3,6 +3,10 @@ + grops \- PostScript driver for groff + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" license + .de co + Copyright \[co] 1989-2014 Free Software Foundation, Inc. +@@ -1494,6 +1498,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/devices/grops/Makefile.sub groff-1.22.3/src/devices/grops/Makefile.sub +--- groff-1.22.3.old/src/devices/grops/Makefile.sub 2014-11-04 10:38:35.260523559 +0200 ++++ groff-1.22.3/src/devices/grops/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,44 +0,0 @@ +-# Makefile.sub for `grops' +-# +-# File position: /src/devices/grops/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=grops$(EXEEXT) +-MAN1=grops.n +-XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=\ +- ps.$(OBJEXT) \ +- psrm.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/ps.cpp \ +- $(srcdir)/psrm.cpp +-HDRS=\ +- $(srcdir)/ps.h +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/grotty/.gitignore groff-1.22.3/src/devices/grotty/.gitignore +--- groff-1.22.3.old/src/devices/grotty/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grotty/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++grotty ++grotty.n +diff -Nuar groff-1.22.3.old/src/devices/grotty/grotty.am groff-1.22.3/src/devices/grotty/grotty.am +--- groff-1.22.3.old/src/devices/grotty/grotty.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/grotty/grotty.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,28 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += grotty ++grotty_SOURCES = src/devices/grotty/tty.cpp ++grotty_LDADD = $(LIBM) \ ++ libdriver.a \ ++ libgroff.a \ ++ lib/libgnu.a ++man1_MANS += src/devices/grotty/grotty.n ++EXTRA_DIST += \ ++ src/devices/grotty/grotty.man \ ++ src/devices/grotty/TODO +diff -Nuar groff-1.22.3.old/src/devices/grotty/grotty.man groff-1.22.3/src/devices/grotty/grotty.man +--- groff-1.22.3.old/src/devices/grotty/grotty.man 2014-11-04 10:38:35.264523509 +0200 ++++ groff-1.22.3/src/devices/grotty/grotty.man 2015-04-23 20:57:03.000000000 +0300 +@@ -6,7 +6,7 @@ + . + .\" license + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/devices/grotty/Makefile.sub groff-1.22.3/src/devices/grotty/Makefile.sub +--- groff-1.22.3.old/src/devices/grotty/Makefile.sub 2014-11-04 10:38:35.265523497 +0200 ++++ groff-1.22.3/src/devices/grotty/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,38 +0,0 @@ +-# Makefile.sub for `grotty' +-# +-# File position: /src/devices/grotty/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=grotty$(EXEEXT) +-MAN1=grotty.n +-XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=tty.$(OBJEXT) +-CCSRCS=$(srcdir)/tty.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/xditview/.gitignore groff-1.22.3/src/devices/xditview/.gitignore +--- groff-1.22.3.old/src/devices/xditview/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/xditview/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++Makefile.dep ++GXditview-ad.h ++gxditview.n ++gxditview +diff -Nuar groff-1.22.3.old/src/devices/xditview/gxditview.man groff-1.22.3/src/devices/xditview/gxditview.man +--- groff-1.22.3.old/src/devices/xditview/gxditview.man 2014-11-04 10:38:35.326522734 +0200 ++++ groff-1.22.3/src/devices/xditview/gxditview.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989, Massachusetts Institute of Technology. ++Copyright \(co 1989, Massachusetts Institute of Technology. + .br + See + .BR X (7) +diff -Nuar groff-1.22.3.old/src/devices/xditview/Makefile.sub groff-1.22.3/src/devices/xditview/Makefile.sub +--- groff-1.22.3.old/src/devices/xditview/Makefile.sub 2014-11-04 10:38:35.326522734 +0200 ++++ groff-1.22.3/src/devices/xditview/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,89 +0,0 @@ +-# Makefile.sub for `xditview' +-# +-# File position: /src/devices/xditview/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=gxditview$(EXEEXT) +-MAN1=gxditview.n +-MLIB=$(LIBM) +-XLIBS=$(LIBXUTIL) +-EXTRA_CFLAGS=$(X_CFLAGS) -Dlint +-EXTRA_LDFLAGS=$(X_LIBS) $(X_PRE_LIBS) -lXaw -lXmu -lXt -lX11 $(X_EXTRA_LIBS) +-OBJS=\ +- device.$(OBJEXT) \ +- draw.$(OBJEXT) \ +- Dvi.$(OBJEXT) \ +- font.$(OBJEXT) \ +- lex.$(OBJEXT) \ +- page.$(OBJEXT) \ +- parse.$(OBJEXT) \ +- xditview.$(OBJEXT) +-CSRCS=\ +- $(srcdir)/device.c \ +- $(srcdir)/draw.c \ +- $(srcdir)/Dvi.c \ +- $(srcdir)/font.c \ +- $(srcdir)/lex.c \ +- $(srcdir)/page.c \ +- $(srcdir)/parse.c \ +- $(srcdir)/xditview.c +-HDRS=\ +- $(srcdir)/device.h \ +- $(srcdir)/Dvi.h \ +- $(srcdir)/DviP.h \ +- $(srcdir)/Menu.h +-GENHDRS=GXditview-ad.h +-RM=rm -f +- +-all depend: $(GENHDRS) +- +-GXditview-ad.h: $(srcdir)/GXditview.ad +- @echo Making $@ +- $(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad > $@ +- +-install_data: $(srcdir)/GXditview.ad $(srcdir)/GXditview-color.ad +- -test -d $(DESTDIR)$(appresdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(appresdir) +- if test -f $(DESTDIR)$(appresdir)/GXditview; then \ +- mv $(DESTDIR)$(appresdir)/GXditview \ +- $(DESTDIR)$(appresdir)/GXditview.old; \ +- fi +- if test -f $(DESTDIR)$(appresdir)/GXditview-color; then \ +- mv $(DESTDIR)$(appresdir)/GXditview-color \ +- $(DESTDIR)$(appresdir)/GXditview-color.old; \ +- fi +- $(INSTALL_DATA) $(srcdir)/GXditview.ad \ +- $(DESTDIR)$(appresdir)/GXditview +- $(INSTALL_DATA) $(srcdir)/GXditview-color.ad \ +- $(DESTDIR)$(appresdir)/GXditview-color +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(appresdir)/GXditview +- $(RM) $(DESTDIR)$(appresdir)/GXditview-color +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/devices/xditview/xditview.am groff-1.22.3/src/devices/xditview/xditview.am +--- groff-1.22.3.old/src/devices/xditview/xditview.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/devices/xditview/xditview.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,108 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++GXDITVIEWSOURCES = \ ++ src/devices/xditview/device.c \ ++ src/devices/xditview/draw.c \ ++ src/devices/xditview/Dvi.c \ ++ src/devices/xditview/font.c \ ++ src/devices/xditview/lex.c \ ++ src/devices/xditview/page.c \ ++ src/devices/xditview/parse.c \ ++ src/devices/xditview/xditview.c \ ++ src/devices/xditview/device.h \ ++ src/devices/xditview/DviP.h \ ++ src/devices/xditview/Menu.h \ ++ src/devices/xditview/Dvi.h ++ ++if WITHOUT_X11 ++EXTRA_DIST += $(GXDITVIEWSOURCES) ++else ++xditview_srcdir = $(top_srcdir)/src/devices/xditview ++bin_PROGRAMS += gxditview ++gxditview_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) -Dlint \ ++ -I$(top_builddir)/src/devices/xditview ++gxditview_LDADD = $(X_LIBS) $(X_PRE_LIBS) -lXaw -lXmu -lXt -lX11 \ ++ $(X_EXTRA_LIBS) $(LIBM) libxutil.a ++XDITVIEW_GENHDRS = src/devices/xditview/GXditview-ad.h ++gxditview_SOURCES = $(GXDITVIEWSOURCES) ++nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS) ++CLEANFILES += $(XDITVIEW_GENHDRS) ++ ++man1_MANS += src/devices/xditview/gxditview.n ++ ++# Because we defined gxditview_CPPFLAGS, automake renames all the xditview's ++# objects, adding an "gxditview-" prefix. ++src/devices/xditview/gxditview-device.$(OBJEXT): defs.h ++src/devices/xditview/gxditview-xditview.$(OBJEXT): $(XDITVIEW_GENHDRS) ++ ++src/devices/xditview/GXditview-ad.h: $(xditview_srcdir)/GXditview.ad ++ @echo Making $@ ++ $(SHELL) $(xditview_srcdir)/ad2c $(xditview_srcdir)/GXditview.ad > $@ ++endif ++ ++EXTRA_DIST += \ ++ src/devices/xditview/ad2c \ ++ src/devices/xditview/ChangeLog \ ++ src/devices/xditview/DESC.in \ ++ src/devices/xditview/FontMap \ ++ src/devices/xditview/GXditview-color.ad \ ++ src/devices/xditview/GXditview.ad \ ++ src/devices/xditview/README \ ++ src/devices/xditview/TODO \ ++ src/devices/xditview/gray1.bm \ ++ src/devices/xditview/gray2.bm \ ++ src/devices/xditview/gray3.bm \ ++ src/devices/xditview/gray4.bm \ ++ src/devices/xditview/gray5.bm \ ++ src/devices/xditview/gray6.bm \ ++ src/devices/xditview/gray7.bm \ ++ src/devices/xditview/gray8.bm \ ++ src/devices/xditview/xdit.bm \ ++ src/devices/xditview/xdit_mask.bm \ ++ src/devices/xditview/gxditview.man ++ ++# Custom installation of GXditview.ad and GXditview-color.ad ++install-data-local: install_xditview ++uninstall-local: uninstall_xditview ++ ++if WITHOUT_X11 ++install_xditview: ++uninstall_xditview: ++else ++install_xditview: $(xditview_srcdir)/GXditview.ad $(xditview_srcdir)/GXditview-color.ad ++ -test -d $(DESTDIR)$(appresdir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(appresdir) ++ if test -f $(DESTDIR)$(appresdir)/GXditview; then \ ++ mv $(DESTDIR)$(appresdir)/GXditview \ ++ $(DESTDIR)$(appresdir)/GXditview.old; \ ++ fi ++ if test -f $(DESTDIR)$(appresdir)/GXditview-color; then \ ++ mv $(DESTDIR)$(appresdir)/GXditview-color \ ++ $(DESTDIR)$(appresdir)/GXditview-color.old; \ ++ fi ++ $(INSTALL_DATA) $(xditview_srcdir)/GXditview.ad \ ++ $(DESTDIR)$(appresdir)/GXditview ++ $(INSTALL_DATA) $(xditview_srcdir)/GXditview-color.ad \ ++ $(DESTDIR)$(appresdir)/GXditview-color ++ ++uninstall_xditview: ++ rm -f $(DESTDIR)$(appresdir)/GXditview ++ rm -f $(DESTDIR)$(appresdir)/GXditview-color ++ ++endif +diff -Nuar groff-1.22.3.old/src/include/config.hin groff-1.22.3/src/include/config.hin +--- groff-1.22.3.old/src/include/config.hin 2014-11-04 10:38:35.160524810 +0200 ++++ groff-1.22.3/src/include/config.hin 1970-01-01 02:00:00.000000000 +0200 +@@ -1,292 +0,0 @@ +-/* src/include/config.hin. Generated from configure.ac by autoheader. */ +- +-/* Define if building universal (internal helper macro) */ +-#undef AC_APPLE_UNIVERSAL_BUILD +- +-/* Define if your C++ doesn't understand `delete []'. */ +-#undef ARRAY_DELETE_NEEDS_SIZE +- +-/* Define if you have a C++ . */ +-#undef HAVE_CC_INTTYPES_H +- +-/* Define if you have a C++ . */ +-#undef HAVE_CC_LIMITS_H +- +-/* Define if you have a C++ . */ +-#undef HAVE_CC_OSFCN_H +- +-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you +- don't. */ +-#undef HAVE_DECL_GETC_UNLOCKED +- +-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you +- don't. */ +-#undef HAVE_DECL_SYS_SIGLIST +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_DIRECT_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_DIRENT_H +- +-/* Define to 1 if you have the `fmod' function. */ +-#undef HAVE_FMOD +- +-/* Define to 1 if you have the `getcwd' function. */ +-#undef HAVE_GETCWD +- +-/* Define to 1 if you have the `getpagesize' function. */ +-#undef HAVE_GETPAGESIZE +- +-/* Define to 1 if you have the `gettimeofday' function. */ +-#undef HAVE_GETTIMEOFDAY +- +-/* Define if you have the iconv() function and it works. */ +-#undef HAVE_ICONV +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_INTTYPES_H +- +-/* Define to 1 if you have the `isatty' function. */ +-#undef HAVE_ISATTY +- +-/* Define to 1 if you have the `kill' function. */ +-#undef HAVE_KILL +- +-/* Define if you have and nl_langinfo(CODESET). */ +-#undef HAVE_LANGINFO_CODESET +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_LIMITS_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_MATH_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_MEMORY_H +- +-/* Define if you have mkstemp(). */ +-#undef HAVE_MKSTEMP +- +-/* Define to 1 if you have a working `mmap' system call. */ +-#undef HAVE_MMAP +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_PROCESS_H +- +-/* Define to 1 if you have the `putenv' function. */ +-#undef HAVE_PUTENV +- +-/* Define to 1 if you have the `rename' function. */ +-#undef HAVE_RENAME +- +-/* Define to 1 if you have the `setlocale' function. */ +-#undef HAVE_SETLOCALE +- +-/* Define to 1 if you have the `snprintf' function. */ +-#undef HAVE_SNPRINTF +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDDEF_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDINT_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDLIB_H +- +-/* Define to 1 if you have the `strcasecmp' function. */ +-#undef HAVE_STRCASECMP +- +-/* Define to 1 if you have the `strerror' function. */ +-#undef HAVE_STRERROR +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STRINGS_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STRING_H +- +-/* Define to 1 if you have the `strncasecmp' function. */ +-#undef HAVE_STRNCASECMP +- +-/* Define to 1 if you have the `strsep' function. */ +-#undef HAVE_STRSEP +- +-/* Define to 1 if you have the `strtol' function. */ +-#undef HAVE_STRTOL +- +-/* Define if defines struct exception. */ +-#undef HAVE_STRUCT_EXCEPTION +- +-/* Define to 1 if you have the `symlink' function. */ +-#undef HAVE_SYMLINK +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_DIR_H +- +-/* Define if you have sys_errlist in , , or . */ +-#undef HAVE_SYS_ERRLIST +- +-/* Define if you have sys_nerr in , , or . */ +-#undef HAVE_SYS_NERR +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_PARAM_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_STAT_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TIME_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TYPES_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_UNISTD_H +- +-/* Define to 1 if you have the `vsnprintf' function. */ +-#undef HAVE_VSNPRINTF +- +-/* Define to 1 if O_NOATIME works. */ +-#undef HAVE_WORKING_O_NOATIME +- +-/* Define to 1 if O_NOFOLLOW works. */ +-#undef HAVE_WORKING_O_NOFOLLOW +- +-/* Define as const if the declaration of iconv() needs const. */ +-#undef ICONV_CONST +- +-/* Define if the host's encoding is EBCDIC. */ +-#undef IS_EBCDIC_HOST +- +-/* Define if localtime() takes a long * not a time_t *. */ +-#undef LONG_FOR_TIME_T +- +-/* Define if your C++ doesn't declare gettimeofday(). */ +-#undef NEED_DECLARATION_GETTIMEOFDAY +- +-/* Define if your C++ doesn't declare hypot(). */ +-#undef NEED_DECLARATION_HYPOT +- +-/* Define if your C++ doesn't declare pclose(). */ +-#undef NEED_DECLARATION_PCLOSE +- +-/* Define if your C++ doesn't declare popen(). */ +-#undef NEED_DECLARATION_POPEN +- +-/* Define if your C++ doesn't declare putenv(). */ +-#undef NEED_DECLARATION_PUTENV +- +-/* Define if your C++ doesn't declare rand(). */ +-#undef NEED_DECLARATION_RAND +- +-/* Define if your C++ doesn't declare snprintf(). */ +-#undef NEED_DECLARATION_SNPRINTF +- +-/* Define if your C++ doesn't declare srand(). */ +-#undef NEED_DECLARATION_SRAND +- +-/* Define if your C++ doesn't declare strcasecmp(). */ +-#undef NEED_DECLARATION_STRCASECMP +- +-/* Define if your C++ doesn't declare strncasecmp(). */ +-#undef NEED_DECLARATION_STRNCASECMP +- +-/* Define if your C++ doesn't declare vfprintf(). */ +-#undef NEED_DECLARATION_VFPRINTF +- +-/* Define if your C++ doesn't declare vsnprintf(). */ +-#undef NEED_DECLARATION_VSNPRINTF +- +-/* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT +- +-/* Define to the full name of this package. */ +-#undef PACKAGE_NAME +- +-/* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING +- +-/* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME +- +-/* Define to the home page for this package. */ +-#undef PACKAGE_URL +- +-/* Define to the version of this package. */ +-#undef PACKAGE_VERSION +- +-/* Define if the printer's page size is A4. */ +-#undef PAGEA4 +- +-/* Define as the return type of signal handlers (`int' or `void'). */ +-#undef RETSIGTYPE +- +-/* Define if srand() returns void not int. */ +-#undef RET_TYPE_SRAND_IS_VOID +- +-/* Define to 1 if you have the ANSI C header files. */ +-#undef STDC_HEADERS +- +-/* Define if your C++ compiler uses a traditional (Reiser) preprocessor. */ +-#undef TRADITIONAL_CPP +- +-/* Enable extensions on AIX 3, Interix. */ +-#ifndef _ALL_SOURCE +-# undef _ALL_SOURCE +-#endif +-/* Enable GNU extensions on systems that have them. */ +-#ifndef _GNU_SOURCE +-# undef _GNU_SOURCE +-#endif +-/* Enable threading extensions on Solaris. */ +-#ifndef _POSIX_PTHREAD_SEMANTICS +-# undef _POSIX_PTHREAD_SEMANTICS +-#endif +-/* Enable extensions on HP NonStop. */ +-#ifndef _TANDEM_SOURCE +-# undef _TANDEM_SOURCE +-#endif +-/* Enable general extensions on Solaris. */ +-#ifndef __EXTENSIONS__ +-# undef __EXTENSIONS__ +-#endif +- +- +-/* Define if the 0200 bit of the status returned by wait() indicates whether a +- core image was produced for a process that was terminated by a signal. */ +-#undef WCOREFLAG +- +-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most +- significant byte first (like Motorola and SPARC, unlike Intel). */ +-#if defined AC_APPLE_UNIVERSAL_BUILD +-# if defined __BIG_ENDIAN__ +-# define WORDS_BIGENDIAN 1 +-# endif +-#else +-# ifndef WORDS_BIGENDIAN +-# undef WORDS_BIGENDIAN +-# endif +-#endif +- +-/* Define to 1 if the X Window System is missing or not being used. */ +-#undef X_DISPLAY_MISSING +- +-/* Define to 1 if on MINIX. */ +-#undef _MINIX +- +-/* Define to 2 if the system does not provide POSIX.1 features except with +- this defined. */ +-#undef _POSIX_1_SOURCE +- +-/* Define if -D_POSIX_SOURCE is necessary. */ +-#undef _POSIX_SOURCE +- +-/* Define if you have ISC 3.x or 4.x. */ +-#undef _SYSV3 +- +-/* Define uintmax_t to `unsigned long' or `unsigned long long' if +- does not exist. */ +-#undef uintmax_t +diff -Nuar groff-1.22.3.old/src/include/.gitignore groff-1.22.3/src/include/.gitignore +--- groff-1.22.3.old/src/include/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/include/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++config.h ++defs.h +diff -Nuar groff-1.22.3.old/src/include/include.am groff-1.22.3/src/include/include.am +--- groff-1.22.3.old/src/include/include.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/include/include.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,42 @@ ++# Automake rules for `include' ++# ++# File position: /src/include/include.am ++# ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# ++# `groff' 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. ++# ++# `groff' 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 ++# . ++# ++######################################################################## ++ ++nodist_noinst_HEADERS = defs.h ++CLEANFILES += defs.h ++defs.h: config.status ++ @$(SHELL) $(top_srcdir)/gendef.sh defs.h \ ++ "PROG_PREFIX=\"$(g)\"" \ ++ "DEVICE=\"$(DEVICE)\"" \ ++ "INSTALLPATH=\"$(prefix)\"" \ ++ "BINPATH=\"$(bindir)\"" \ ++ "FONTPATH=\"$(fontpath)\"" \ ++ "MACROPATH=\"$(tmacpath)\"" \ ++ "INDEX_SUFFIX=\"$(indexext)\"" \ ++ "COMMON_WORDS_FILE=\"$(common_words_file)\"" \ ++ "DEFAULT_INDEX_DIR=\"$(indexdir)\"" \ ++ "DEFAULT_INDEX_NAME=\"$(indexname)\"" \ ++ "DEFAULT_INDEX=\"$(indexdir)/$(indexname)\"" ++ ++dist-hook: dist_include ++dist_include: ++ chmod u+w $(distdir)/src/include ++ cp -f $(top_srcdir)/src/include/*.h $(distdir)/src/include +diff -Nuar groff-1.22.3.old/src/include/lf.h groff-1.22.3/src/include/lf.h +--- groff-1.22.3.old/src/include/lf.h 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/include/lf.h 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,21 @@ ++// -*- C++ -*- ++/* Copyright (C) 2014 Free Software Foundation, Inc. ++ Written by Werner Lemberg (wl@gnu.org) ++ ++This file is part of groff. ++ ++groff 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. ++ ++groff 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 . */ ++ ++int interpret_lf_args(const char *p); ++void normalize_for_lf (string &fn); +diff -Nuar groff-1.22.3.old/src/include/lib.h groff-1.22.3/src/include/lib.h +--- groff-1.22.3.old/src/include/lib.h 2014-11-04 10:38:35.161524797 +0200 ++++ groff-1.22.3/src/include/lib.h 2015-04-23 20:57:03.000000000 +0300 +@@ -98,8 +98,6 @@ + size_t file_name_max(const char *fname); + size_t path_name_max(); + +-int interpret_lf_args(const char *p); +- + extern char invalid_char_table[]; + + inline int invalid_input_char(int c) +diff -Nuar groff-1.22.3.old/src/include/Makefile.sub groff-1.22.3/src/include/Makefile.sub +--- groff-1.22.3.old/src/include/Makefile.sub 2014-11-04 10:38:35.161524797 +0200 ++++ groff-1.22.3/src/include/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,82 +0,0 @@ +-# Makefile.sub for `include' +-# +-# File position: /src/include/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-HDRS=\ +- assert.h \ +- cmap.h \ +- cset.h \ +- color.h \ +- device.h \ +- driver.h \ +- DviChar.h \ +- errarg.h \ +- error.h \ +- font.h \ +- geometry.h \ +- getopt.h \ +- getopt_int.h \ +- gettext.h \ +- htmlhint.h \ +- index.h \ +- lib.h \ +- macropath.h \ +- nonposix.h \ +- posix.h \ +- printer.h \ +- ptable.h \ +- refid.h \ +- relocate.h \ +- search.h \ +- searchpath.h \ +- stringclass.h \ +- symbol.h \ +- unicode.h \ +- XFontName.h +-GENHDRS=defs.h +- +-all depend: $(GENHDRS) +- +-defs.h: FORCE +- @$(SHELL) $(top_srcdir)/gendef.sh defs.h \ +- "PROG_PREFIX=\"$(g)\"" \ +- "DEVICE=\"$(DEVICE)\"" \ +- "INSTALLPATH=\"$(prefix)\"" \ +- "BINPATH=\"$(bindir)\"" \ +- "FONTPATH=\"$(fontpath)\"" \ +- "MACROPATH=\"$(tmacpath)\"" \ +- "INDEX_SUFFIX=\"$(indexext)\"" \ +- "COMMON_WORDS_FILE=\"$(common_words_file)\"" \ +- "DEFAULT_INDEX_DIR=\"$(indexdir)\"" \ +- "DEFAULT_INDEX_NAME=\"$(indexname)\"" \ +- "DEFAULT_INDEX=\"$(indexdir)/$(indexname)\"" +- +-FORCE: +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/aclocal.m4 groff-1.22.3/src/libs/gnulib/aclocal.m4 +--- groff-1.22.3.old/src/libs/gnulib/aclocal.m4 2014-11-04 10:38:35.674518384 +0200 ++++ groff-1.22.3/src/libs/gnulib/aclocal.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1174 +0,0 @@ +-# generated automatically by aclocal 1.14 -*- Autoconf -*- +- +-# Copyright (C) 1996-2013 Free Software Foundation, Inc. +- +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +-[m4_warning([this file was generated for autoconf 2.69. +-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. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# 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' +-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], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) +- +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) +- +-# AM_SET_CURRENT_AUTOMAKE_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])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +- +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- +- +-# Copyright (C) 2001-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +-# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. +-# +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir +-# +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is '.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. +-# +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. +-# +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# 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` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ([2.52])dnl +- m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' +-else +- $1_TRUE='#' +- $1_FALSE= +-fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +-# Copyright (C) 1999-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +- +-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +- +- +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], +- [$1], [CXX], [depcc="$CXX" am_compiler_list=], +- [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], +- [$1], [UPC], [depcc="$UPC" am_compiler_list=], +- [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named 'D' -- because '-MD' means "put the output +- # in D". +- rm -rf conftest.dir +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac]) +- +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with +- # Solaris 10 /bin/sh. +- echo '/* dummy */' > sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- # We check with '-c' and '-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle '-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs. +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" +- case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; +- nosideeffect) +- # After this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested. +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- msvc7 | msvc7msys | msvisualcpp | msvcmsys) +- # This compiler won't grok '-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; +- none) break ;; +- esac +- if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- +- +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) +- +- +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE([dependency-tracking], [dnl +-AS_HELP_STRING( +- [--enable-dependency-tracking], +- [do not reject slow dependency extractors]) +-AS_HELP_STRING( +- [--disable-dependency-tracking], +- [speeds up one-time build])]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +- am__nodep='_no' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-AC_SUBST([am__nodep])dnl +-_AM_SUBST_NOTMAKE([am__nodep])dnl +-]) +- +-# Generate code to set up dependency tracking. -*- Autoconf -*- +- +-# Copyright (C) 1999-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +- +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Older Autoconf quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named 'Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running 'make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "$am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +- done +-} +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS +- +- +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each '.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) +- +-# Do all the work for Automake. -*- Autoconf -*- +- +-# Copyright (C) 1996-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. +- +-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +-m4_define([AC_PROG_CC], +-m4_defn([AC_PROG_CC]) +-[_AM_PROG_CC_C_O +-]) +- +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.65])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[AC_DIAGNOSE([obsolete], +- [$0: two- and three-arguments forms are deprecated.]) +-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if( +- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), +- [ok:ok],, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) +- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +- +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +-AM_MISSING_PROG([AUTOCONF], [autoconf]) +-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +-AM_MISSING_PROG([AUTOHEADER], [autoheader]) +-AM_MISSING_PROG([MAKEINFO], [makeinfo]) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-# For better backward compatibility. To be removed once Automake 1.9.x +-# dies out for good. For more background, see: +-# +-# +-AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +-# We need awk for the "check" target. 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 +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES([CC])], +- [m4_define([AC_PROG_CC], +- m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES([CXX])], +- [m4_define([AC_PROG_CXX], +- m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES([OBJC])], +- [m4_define([AC_PROG_OBJC], +- m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +- [_AM_DEPENDENCIES([OBJCXX])], +- [m4_define([AC_PROG_OBJCXX], +- m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +-]) +-AC_REQUIRE([AM_SILENT_RULES])dnl +-dnl The testsuite driver may need to know about EXEEXT, so add the +-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +- +-# POSIX will say in a future version that running "rm -f" with no argument +-# is OK; and we want to be able to make that assumption in our Makefile +-# recipes. So use an aggressive probe to check that the usage we want is +-# actually supported "in the wild" to an acceptable degree. +-# See automake bug#10828. +-# To make any issue more visible, cause the running configure to be aborted +-# by default if the 'rm' program in use doesn't match our expectations; the +-# user can still override this though. +-if rm -f && rm -fr && rm -rf; then : OK; else +- cat >&2 <<'END' +-Oops! +- +-Your 'rm' program seems unable to run without file operands specified +-on the command line, even when the '-f' option is present. This is contrary +-to the behaviour of most rm programs out there, and not conforming with +-the upcoming POSIX standard: +- +-Please tell bug-automake@gnu.org about your system, including the value +-of your $PATH and any error possibly output before this message. This +-can help us improve future automake versions. +- +-END +- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then +- echo 'Configuration will proceed anyway, since you have set the' >&2 +- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 +- echo >&2 +- else +- cat >&2 <<'END' +-Aborting the configuration process, to ensure you take notice of the issue. +- +-You can download and install GNU coreutils to get an 'rm' implementation +-that behaves properly: . +- +-If you want to complete the configuration process using your problematic +-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +-to "yes", and re-run configure. +- +-END +- AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) +- fi +-fi]) +- +-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +- +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. +- +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +- +-# Copyright (C) 2001-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +-AC_SUBST([install_sh])]) +- +-# Copyright (C) 2003-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) +- +-# Check to see how 'make' treats includes. -*- Autoconf -*- +- +-# Copyright (C) 2001-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo this is the am__doit target +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from 'make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) +- +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +- +-# Copyright (C) 1997-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it is modern enough. +-# If it is, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# Use eval to expand $SHELL +-if eval "$MISSING --is-lightweight"; then +- am_missing_run="$MISSING " +-else +- am_missing_run= +- AC_MSG_WARN(['missing' script is too old or missing]) +-fi +-]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright (C) 2001-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# -------------------- +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) +- +-# _AM_SET_OPTIONS(OPTIONS) +-# ------------------------ +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +- +-# Copyright (C) 1999-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# _AM_PROG_CC_C_O +-# --------------- +-# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +-# to automatically call this. +-AC_DEFUN([_AM_PROG_CC_C_O], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([compile])dnl +-AC_LANG_PUSH([C])dnl +-AC_CACHE_CHECK( +- [whether $CC understands -c and -o together], +- [am_cv_prog_cc_c_o], +- [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) +- # Make sure it works both with $CC and with simple cc. +- # Following AC_PROG_CC_C_O, we do the test twice because some +- # compilers refuse to overwrite an existing .o file with -o, +- # though they will create one. +- am_cv_prog_cc_c_o=yes +- for am_i in 1 2; do +- if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ +- && test -f conftest2.$ac_objext; then +- : OK +- else +- am_cv_prog_cc_c_o=no +- break +- fi +- done +- rm -f core conftest* +- unset am_i]) +-if test "$am_cv_prog_cc_c_o" != yes; then +- # Losing compiler, so override with the script. +- # FIXME: It is wrong to rewrite CC. +- # But if we don't then we get into trouble of one sort or another. +- # A longer-term fix would be to have automake use am__CC in this case, +- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" +- CC="$am_aux_dir/compile $CC" +-fi +-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. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_RUN_LOG(COMMAND) +-# ------------------- +-# Run COMMAND, save the exit status in ac_status, and log it. +-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +-AC_DEFUN([AM_RUN_LOG], +-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD +- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- (exit $ac_status); }]) +- +-# Check to make sure that the build environment is sane. -*- Autoconf -*- +- +-# Copyright (C) 1996-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +-esac +- +-# Do 'set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- am_has_slept=no +- for am_try in 1 2; do +- echo "timestamp, slept: $am_has_slept" > conftest.file +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +- alias in your environment]) +- fi +- if test "$[2]" = conftest.file || test $am_try -eq 2; then +- break +- fi +- # Just in case. +- sleep 1 +- am_has_slept=yes +- done +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT([yes]) +-# If we didn't sleep, we still need to ensure time stamps of config.status and +-# generated files are strictly newer. +-am_sleep_pid= +-if grep 'slept: no' conftest.file >/dev/null 2>&1; then +- ( sleep 1 ) & +- am_sleep_pid=$! +-fi +-AC_CONFIG_COMMANDS_PRE( +- [AC_MSG_CHECKING([that generated files are newer than configure]) +- if test -n "$am_sleep_pid"; then +- # Hide warnings about reused PIDs. +- wait $am_sleep_pid 2>/dev/null +- fi +- AC_MSG_RESULT([done])]) +-rm -f conftest.file +-]) +- +-# Copyright (C) 2009-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_SILENT_RULES([DEFAULT]) +-# -------------------------- +-# Enable less verbose build rules; with the default set to DEFAULT +-# ("yes" being less verbose, "no" or empty being verbose). +-AC_DEFUN([AM_SILENT_RULES], +-[AC_ARG_ENABLE([silent-rules], [dnl +-AS_HELP_STRING( +- [--enable-silent-rules], +- [less verbose build output (undo: "make V=1")]) +-AS_HELP_STRING( +- [--disable-silent-rules], +- [verbose build output (undo: "make V=0")])dnl +-]) +-case $enable_silent_rules in @%:@ ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +-esac +-dnl +-dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +-dnl do not support nested variable expansions. +-dnl See automake bug#9928 and bug#10237. +-am_make=${MAKE-make} +-AC_CACHE_CHECK([whether $am_make supports nested variables], +- [am_cv_make_support_nested_variables], +- [if AS_ECHO([['TRUE=$(BAR$(V)) +-BAR0=false +-BAR1=true +-V=1 +-am__doit: +- @$(TRUE) +-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then +- am_cv_make_support_nested_variables=yes +-else +- am_cv_make_support_nested_variables=no +-fi]) +-if test $am_cv_make_support_nested_variables = yes; then +- dnl Using '$V' instead of '$(V)' breaks IRIX make. +- AM_V='$(V)' +- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +-else +- AM_V=$AM_DEFAULT_VERBOSITY +- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +-fi +-AC_SUBST([AM_V])dnl +-AM_SUBST_NOTMAKE([AM_V])dnl +-AC_SUBST([AM_DEFAULT_V])dnl +-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +-AM_BACKSLASH='\' +-AC_SUBST([AM_BACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +-]) +- +-# Copyright (C) 2001-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor 'install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in "make install-strip", and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using 'strip' when the user +-# run "make install-strip". However 'strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the 'STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# Copyright (C) 2006-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) +- +-# AM_SUBST_NOTMAKE(VARIABLE) +-# -------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +- +-# Check how to create a tarball. -*- Autoconf -*- +- +-# Copyright (C) 2004-2013 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of 'v7', 'ustar', or 'pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-# +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. Yes, it's still used +-# in the wild :-( We should find a proper way to deprecate it ... +-AC_SUBST([AMTAR], ['$${TAR-tar}']) +- +-# We'll loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +- +-m4_if([$1], [v7], +- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +- +- [m4_case([$1], +- [ustar], +- [# The POSIX 1988 'ustar' format is defined with fixed-size fields. +- # There is notably a 21 bits limit for the UID and the GID. In fact, +- # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 +- # and bug#13588). +- am_max_uid=2097151 # 2^21 - 1 +- am_max_gid=$am_max_uid +- # The $UID and $GID variables are not portable, so we need to resort +- # to the POSIX-mandated id(1) utility. Errors in the 'id' calls +- # below are definitely unexpected, so allow the users to see them +- # (that is, avoid stderr redirection). +- am_uid=`id -u || echo unknown` +- am_gid=`id -g || echo unknown` +- AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) +- if test $am_uid -le $am_max_uid; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- _am_tools=none +- fi +- AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) +- if test $am_gid -le $am_max_gid; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- _am_tools=none +- fi], +- +- [pax], +- [], +- +- [m4_fatal([Unknown tar format])]) +- +- AC_MSG_CHECKING([how to create a $1 tar archive]) +- +- # Go ahead even if we have the value already cached. We do so because we +- # need to set the values for the 'am__tar' and 'am__untar' variables. +- _am_tools=${am_cv_prog_tar_$1-$_am_tools} +- +- for _am_tool in $_am_tools; do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac +- +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break +- +- # tar/untar a dummy directory, and stop if the command works. +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break +- fi +- done +- rm -rf conftest.dir +- +- AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +- AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +- +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR +- +-m4_include([m4/00gnulib.m4]) +-m4_include([m4/codeset.m4]) +-m4_include([m4/configmake.m4]) +-m4_include([m4/extensions.m4]) +-m4_include([m4/extern-inline.m4]) +-m4_include([m4/fcntl-o.m4]) +-m4_include([m4/glibc21.m4]) +-m4_include([m4/gnulib-common.m4]) +-m4_include([m4/include_next.m4]) +-m4_include([m4/inttypes-pri.m4]) +-m4_include([m4/inttypes.m4]) +-m4_include([m4/libunistring-base.m4]) +-m4_include([m4/localcharset.m4]) +-m4_include([m4/longlong.m4]) +-m4_include([m4/multiarch.m4]) +-m4_include([m4/onceonly.m4]) +-m4_include([m4/stdbool.m4]) +-m4_include([m4/stddef_h.m4]) +-m4_include([m4/stdint.m4]) +-m4_include([m4/warn-on-use.m4]) +-m4_include([m4/wchar_h.m4]) +-m4_include([m4/wchar_t.m4]) +-m4_include([m4/wctype_h.m4]) +-m4_include([m4/wcwidth.m4]) +-m4_include([m4/wint_t.m4]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/compile groff-1.22.3/src/libs/gnulib/build-aux/compile +--- groff-1.22.3.old/src/libs/gnulib/build-aux/compile 2014-11-04 10:38:35.646518734 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/compile 1970-01-01 02:00:00.000000000 +0200 +@@ -1,347 +0,0 @@ +-#! /bin/sh +-# Wrapper for compilers which do not understand '-c -o'. +- +-scriptversion=2012-10-14.11; # UTC +- +-# Copyright (C) 1999-2013 Free Software Foundation, Inc. +-# Written by Tom Tromey . +-# +-# 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 . +- +-# 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 or send patches to +-# . +- +-nl=' +-' +- +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent tools from complaining about whitespace usage. +-IFS=" "" $nl" +- +-file_conv= +- +-# func_file_conv build_file lazy +-# Convert a $build file to $host form and store it in $file +-# Currently only supports Windows hosts. If the determined conversion +-# type is listed in (the comma separated) LAZY, no conversion will +-# take place. +-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/,$2, in +- *,$file_conv,*) +- ;; +- 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_cl_dashL linkdir +-# Make cl look for libraries in LINKDIR +-func_cl_dashL () +-{ +- func_file_conv "$1" +- if test -z "$lib_path"; then +- lib_path=$file +- else +- lib_path="$lib_path;$file" +- fi +- linker_opts="$linker_opts -LIBPATH:$file" +-} +- +-# func_cl_dashl library +-# Do a library search-path lookup for cl +-func_cl_dashl () +-{ +- lib=$1 +- found=no +- save_IFS=$IFS +- IFS=';' +- for dir in $lib_path $LIB +- do +- IFS=$save_IFS +- if $shared && test -f "$dir/$lib.dll.lib"; then +- found=yes +- lib=$dir/$lib.dll.lib +- break +- fi +- if test -f "$dir/$lib.lib"; then +- found=yes +- lib=$dir/$lib.lib +- break +- fi +- if test -f "$dir/lib$lib.a"; then +- found=yes +- lib=$dir/lib$lib.a +- break +- fi +- done +- IFS=$save_IFS +- +- if test "$found" != yes; then +- lib=$lib.lib +- fi +-} +- +-# func_cl_wrapper cl arg... +-# Adjust compile command to suit cl +-func_cl_wrapper () +-{ +- # Assume a capable shell +- lib_path= +- shared=: +- linker_opts= +- for arg +- do +- if test -n "$eat"; then +- eat= +- else +- case $1 in +- -o) +- # configure might choose to run compile as 'compile cc -o foo foo.c'. +- eat=1 +- case $2 in +- *.o | *.[oO][bB][jJ]) +- func_file_conv "$2" +- set x "$@" -Fo"$file" +- shift +- ;; +- *) +- func_file_conv "$2" +- set x "$@" -Fe"$file" +- shift +- ;; +- esac +- ;; +- -I) +- eat=1 +- func_file_conv "$2" mingw +- set x "$@" -I"$file" +- shift +- ;; +- -I*) +- func_file_conv "${1#-I}" mingw +- set x "$@" -I"$file" +- shift +- ;; +- -l) +- eat=1 +- func_cl_dashl "$2" +- set x "$@" "$lib" +- shift +- ;; +- -l*) +- func_cl_dashl "${1#-l}" +- set x "$@" "$lib" +- shift +- ;; +- -L) +- eat=1 +- func_cl_dashL "$2" +- ;; +- -L*) +- func_cl_dashL "${1#-L}" +- ;; +- -static) +- shared=false +- ;; +- -Wl,*) +- arg=${1#-Wl,} +- save_ifs="$IFS"; IFS=',' +- for flag in $arg; do +- IFS="$save_ifs" +- linker_opts="$linker_opts $flag" +- done +- IFS="$save_ifs" +- ;; +- -Xlinker) +- eat=1 +- linker_opts="$linker_opts $2" +- ;; +- -*) +- set x "$@" "$1" +- shift +- ;; +- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) +- func_file_conv "$1" +- set x "$@" -Tp"$file" +- shift +- ;; +- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) +- func_file_conv "$1" mingw +- set x "$@" "$file" +- shift +- ;; +- *) +- set x "$@" "$1" +- shift +- ;; +- esac +- fi +- shift +- done +- if test -n "$linker_opts"; then +- linker_opts="-link$linker_opts" +- fi +- exec "$@" $linker_opts +- exit 1 +-} +- +-eat= +- +-case $1 in +- '') +- echo "$0: No command. Try '$0 --help' for more information." 1>&2 +- exit 1; +- ;; +- -h | --h*) +- cat <<\EOF +-Usage: compile [--help] [--version] PROGRAM [ARGS] +- +-Wrapper for compilers which do not understand '-c -o'. +-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +-arguments, and rename the output as expected. +- +-If you are trying to build a whole package this is not the +-right script to run: please start by reading the file 'INSTALL'. +- +-Report bugs to . +-EOF +- exit $? +- ;; +- -v | --v*) +- echo "compile $scriptversion" +- exit $? +- ;; +- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) +- func_cl_wrapper "$@" # Doesn't return... +- ;; +-esac +- +-ofile= +-cfile= +- +-for arg +-do +- if test -n "$eat"; then +- eat= +- else +- case $1 in +- -o) +- # configure might choose to run compile as 'compile cc -o foo foo.c'. +- # So we strip '-o arg' only if arg is an object. +- eat=1 +- case $2 in +- *.o | *.obj) +- ofile=$2 +- ;; +- *) +- set x "$@" -o "$2" +- shift +- ;; +- esac +- ;; +- *.c) +- cfile=$1 +- set x "$@" "$1" +- shift +- ;; +- *) +- set x "$@" "$1" +- shift +- ;; +- esac +- fi +- shift +-done +- +-if test -z "$ofile" || test -z "$cfile"; then +- # If no '-o' option was seen then we might have been invoked from a +- # pattern rule where we don't need one. That is ok -- this is a +- # normal compilation that the losing compiler can handle. If no +- # '.c' file was seen then we are probably linking. That is also +- # ok. +- exec "$@" +-fi +- +-# Name of file we expect compiler to create. +-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` +- +-# Create the lock directory. +-# Note: use '[/\\:.-]' here to ensure that we don't use the same name +-# that we are using for the .o file. Also, base the name on the expected +-# object file name, since that is what matters with a parallel build. +-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +-while true; do +- if mkdir "$lockdir" >/dev/null 2>&1; then +- break +- fi +- sleep 1 +-done +-# FIXME: race condition here if user kills between mkdir and trap. +-trap "rmdir '$lockdir'; exit 1" 1 2 15 +- +-# Run the compile. +-"$@" +-ret=$? +- +-if test -f "$cofile"; then +- test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +-elif test -f "${cofile}bj"; then +- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +-fi +- +-rmdir "$lockdir" +-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: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/config.guess groff-1.22.3/src/libs/gnulib/build-aux/config.guess +--- groff-1.22.3.old/src/libs/gnulib/build-aux/config.guess 2014-11-04 10:38:35.646518734 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/config.guess 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1420 +0,0 @@ +-#! /bin/sh +-# Attempt to guess a canonical system name. +-# Copyright 1992-2014 Free Software Foundation, Inc. +- +-timestamp='2014-03-23' +- +-# 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 +-# 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 . +-# +-# 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 Exception is an additional permission under section 7 +-# of the GNU General Public License, version 3 ("GPLv3"). +-# +-# Originally written by Per Bothner. +-# +-# 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 +-# +-# Please send patches with a ChangeLog entry to config-patches@gnu.org. +- +- +-me=`echo "$0" | sed -e 's,.*/,,'` +- +-usage="\ +-Usage: $0 [OPTION] +- +-Output the configuration name of the system \`$me' is run on. +- +-Operation modes: +- -h, --help print this help, then exit +- -t, --time-stamp print date of last modification, then exit +- -v, --version print version number, then exit +- +-Report bugs and patches to ." +- +-version="\ +-GNU config.guess ($timestamp) +- +-Originally written by Per Bothner. +-Copyright 1992-2014 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." +- +-help=" +-Try \`$me --help' for more information." +- +-# Parse command line +-while test $# -gt 0 ; do +- case $1 in +- --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit ;; +- --version | -v ) +- echo "$version" ; exit ;; +- --help | --h* | -h ) +- echo "$usage"; exit ;; +- -- ) # Stop option processing +- shift; break ;; +- - ) # Use stdin as input. +- break ;; +- -* ) +- echo "$me: invalid option $1$help" >&2 +- exit 1 ;; +- * ) +- break ;; +- esac +-done +- +-if test $# != 0; then +- echo "$me: too many arguments$help" >&2 +- exit 1 +-fi +- +-trap 'exit 1' 1 2 15 +- +-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +-# compiler to aid in system detection is discouraged as it requires +-# temporary files to be created and, as you can see below, it is a +-# headache to deal with in a portable fashion. +- +-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +-# use `HOST_CC' if defined, but it is deprecated. +- +-# Portable tmp directory creation inspired by the Autoconf team. +- +-set_cc_for_build=' +-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +-: ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || +- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || +- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || +- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +-dummy=$tmp/dummy ; +-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +-case $CC_FOR_BUILD,$HOST_CC,$CC in +- ,,) echo "int x;" > $dummy.c ; +- for c in cc gcc c89 c99 ; do +- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +- CC_FOR_BUILD="$c"; break ; +- fi ; +- done ; +- if test x"$CC_FOR_BUILD" = x ; then +- CC_FOR_BUILD=no_compiler_found ; +- fi +- ;; +- ,,*) CC_FOR_BUILD=$CC ;; +- ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ; set_cc_for_build= ;' +- +-# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +-# (ghazi@noc.rutgers.edu 1994-08-24) +-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +- PATH=$PATH:/.attbin ; export PATH +-fi +- +-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +- +-case "${UNAME_SYSTEM}" in +-Linux|GNU|GNU/*) +- # If the system lacks a compiler, then just pick glibc. +- # We could probably try harder. +- LIBC=gnu +- +- eval $set_cc_for_build +- cat <<-EOF > $dummy.c +- #include +- #if defined(__UCLIBC__) +- LIBC=uclibc +- #elif defined(__dietlibc__) +- LIBC=dietlibc +- #else +- LIBC=gnu +- #endif +- EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` +- ;; +-esac +- +-# Note: order is significant - the case branches are not exclusive. +- +-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +- *:NetBSD:*:*) +- # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, +- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently +- # switched to ELF, *-*-netbsd* would select the old +- # object file format. This provides both forward +- # compatibility and a consistent mechanism for selecting the +- # object file format. +- # +- # 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)` +- 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 ;; +- *) machine=${UNAME_MACHINE_ARCH}-unknown ;; +- esac +- # The Operating System including object format, if it has switched +- # to ELF recently, or will in the future. +- case "${UNAME_MACHINE_ARCH}" in +- arm*|i386|m68k|ns32k|sh3*|sparc|vax) +- eval $set_cc_for_build +- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep -q __ELF__ +- then +- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). +- # Return netbsd for either. FIX? +- os=netbsd +- else +- os=netbsdelf +- fi +- ;; +- *) +- os=netbsd +- ;; +- esac +- # The OS release +- # Debian GNU/NetBSD machines have a different userland, and +- # thus, need a distinct triplet. However, they do not need +- # kernel version information, so it can be replaced with a +- # suitable tag, in the style of linux-gnu. +- case "${UNAME_VERSION}" in +- Debian*) +- release='-gnu' +- ;; +- *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- ;; +- 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}" +- exit ;; +- *:Bitrig:*:*) +- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` +- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} +- exit ;; +- *:OpenBSD:*:*) +- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` +- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +- exit ;; +- *:ekkoBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} +- exit ;; +- *:SolidBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} +- exit ;; +- macppc:MirBSD:*:*) +- echo powerpc-unknown-mirbsd${UNAME_RELEASE} +- exit ;; +- *:MirBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +- exit ;; +- alpha:OSF1:*:*) +- case $UNAME_RELEASE in +- *4.0) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- ;; +- *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` +- ;; +- esac +- # According to Compaq, /usr/sbin/psrinfo has been available on +- # OSF/1 and Tru64 systems produced since 1995. I hope that +- # covers most systems running today. This code pipes the CPU +- # types through head -n 1, so we only detect the type of CPU 0. +- 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" ;; +- "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; +- "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; +- "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; +- "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; +- "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; +- "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; +- "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; +- "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; +- "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; +- "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; +- "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; +- "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; +- "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; +- "EV7.9 (21364A)") +- 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'` +- # Reset EXIT trap before exiting to avoid spurious non-zero exit code. +- exitcode=$? +- trap '' 0 +- exit $exitcode ;; +- Alpha\ *:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # Should we change UNAME_MACHINE based on the output of uname instead +- # of the specific Alpha model? +- echo alpha-pc-interix +- exit ;; +- 21064:Windows_NT:50:3) +- echo alpha-dec-winnt3.5 +- exit ;; +- Amiga*:UNIX_System_V:4.0:*) +- echo m68k-unknown-sysv4 +- exit ;; +- *:[Aa]miga[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-amigaos +- exit ;; +- *:[Mm]orph[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-morphos +- exit ;; +- *:OS/390:*:*) +- echo i370-ibm-openedition +- exit ;; +- *:z/VM:*:*) +- echo s390-ibm-zvmoe +- exit ;; +- *:OS400:*:*) +- echo powerpc-ibm-os400 +- exit ;; +- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) +- echo arm-acorn-riscix${UNAME_RELEASE} +- exit ;; +- arm*:riscos:*:*|arm*:RISCOS:*:*) +- echo arm-unknown-riscos +- exit ;; +- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +- echo hppa1.1-hitachi-hiuxmpp +- exit ;; +- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) +- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. +- if test "`(/bin/universe) 2>/dev/null`" = att ; then +- echo pyramid-pyramid-sysv3 +- else +- echo pyramid-pyramid-bsd +- fi +- exit ;; +- NILE*:*:*:dcosx) +- echo pyramid-pyramid-svr4 +- exit ;; +- DRS?6000:unix:4.0:6*) +- echo sparc-icl-nx6 +- exit ;; +- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) +- case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7; exit ;; +- esac ;; +- s390x:SunOS:*:*) +- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4H:SunOS:5.*:*) +- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) +- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) +- echo i386-pc-auroraux${UNAME_RELEASE} +- exit ;; +- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- eval $set_cc_for_build +- 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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ +- grep IS_64BIT_ARCH >/dev/null +- then +- SUN_ARCH="x86_64" +- fi +- fi +- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4*:SunOS:6*:*) +- # According to config.sub, this is the proper way to canonicalize +- # SunOS6. Hard to guess exactly what SunOS6 will be like, but +- # it's likely to be more like Solaris than SunOS4. +- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- sun4*:SunOS:*:*) +- case "`/usr/bin/arch -k`" in +- Series*|S4*) +- UNAME_RELEASE=`uname -v` +- ;; +- esac +- # Japanese Language versions have a version number like `4.1.3-JL'. +- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit ;; +- sun3*:SunOS:*:*) +- echo m68k-sun-sunos${UNAME_RELEASE} +- 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 +- case "`/bin/arch`" in +- sun3) +- echo m68k-sun-sunos${UNAME_RELEASE} +- ;; +- sun4) +- echo sparc-sun-sunos${UNAME_RELEASE} +- ;; +- esac +- exit ;; +- aushp:SunOS:*:*) +- echo sparc-auspex-sunos${UNAME_RELEASE} +- exit ;; +- # The situation for MiNT is a little confusing. The machine name +- # can be virtually everything (everything which is not +- # "atarist" or "atariste" at least should have a processor +- # > m68000). The system name ranges from "MiNT" over "FreeMiNT" +- # to the lowercase version "mint" (or "freemint"). Finally +- # the system name "TOS" denotes a system which is actually not +- # MiNT. But MiNT is downward compatible to TOS, so this should +- # be no problem. +- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; +- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; +- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; +- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; +- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; +- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; +- m68k:machten:*:*) +- echo m68k-apple-machten${UNAME_RELEASE} +- exit ;; +- powerpc:machten:*:*) +- echo powerpc-apple-machten${UNAME_RELEASE} +- exit ;; +- RISC*:Mach:*:*) +- echo mips-dec-mach_bsd4.3 +- exit ;; +- RISC*:ULTRIX:*:*) +- echo mips-dec-ultrix${UNAME_RELEASE} +- exit ;; +- VAX*:ULTRIX*:*:*) +- echo vax-dec-ultrix${UNAME_RELEASE} +- exit ;; +- 2020:CLIX:*:* | 2430:CLIX:*:*) +- echo clipper-intergraph-clix${UNAME_RELEASE} +- exit ;; +- mips:*:*:UMIPS | mips:*:*:RISCos) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +-#ifdef __cplusplus +-#include /* for printf() prototype */ +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +- #if defined (host_mips) && defined (MIPSEB) +- #if defined (SYSTYPE_SYSV) +- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); +- #endif +- #if defined (SYSTYPE_SVR4) +- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); +- #endif +- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) +- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); +- #endif +- #endif +- exit (-1); +- } +-EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && +- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && +- SYSTEM_NAME=`$dummy $dummyarg` && +- { echo "$SYSTEM_NAME"; exit; } +- echo mips-mips-riscos${UNAME_RELEASE} +- exit ;; +- Motorola:PowerMAX_OS:*:*) +- echo powerpc-motorola-powermax +- exit ;; +- Motorola:*:4.3:PL8-*) +- echo powerpc-harris-powermax +- exit ;; +- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) +- echo powerpc-harris-powermax +- exit ;; +- Night_Hawk:Power_UNIX:*:*) +- echo powerpc-harris-powerunix +- exit ;; +- m88k:CX/UX:7*:*) +- echo m88k-harris-cxux7 +- exit ;; +- m88k:*:4*:R4*) +- echo m88k-motorola-sysv4 +- exit ;; +- m88k:*:3*:R3*) +- echo m88k-motorola-sysv3 +- exit ;; +- AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] +- then +- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +- [ ${TARGET_BINARY_INTERFACE}x = x ] +- then +- echo m88k-dg-dgux${UNAME_RELEASE} +- else +- echo m88k-dg-dguxbcs${UNAME_RELEASE} +- fi +- else +- echo i586-dg-dgux${UNAME_RELEASE} +- fi +- exit ;; +- M88*:DolphinOS:*:*) # DolphinOS (SVR3) +- echo m88k-dolphin-sysv3 +- exit ;; +- M88*:*:R3*:*) +- # Delta 88k system running SVR3 +- echo m88k-motorola-sysv3 +- exit ;; +- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) +- echo m88k-tektronix-sysv3 +- exit ;; +- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) +- echo m68k-tektronix-bsd +- exit ;; +- *:IRIX*:*:*) +- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit ;; +- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' +- i*86:AIX:*:*) +- echo i386-ibm-aix +- exit ;; +- ia64:AIX:*:*) +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` +- else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} +- fi +- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit ;; +- *:AIX:2:3) +- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- +- main() +- { +- if (!__power_pc()) +- exit(1); +- puts("powerpc-ibm-aix3.2.5"); +- exit(0); +- } +-EOF +- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` +- then +- echo "$SYSTEM_NAME" +- else +- echo rs6000-ibm-aix3.2.5 +- fi +- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then +- echo rs6000-ibm-aix3.2.4 +- else +- echo rs6000-ibm-aix3.2 +- fi +- exit ;; +- *:AIX:*:[4567]) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` +- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then +- IBM_ARCH=rs6000 +- else +- IBM_ARCH=powerpc +- fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` +- else +- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} +- fi +- echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit ;; +- *:AIX:*:*) +- echo rs6000-ibm-aix +- exit ;; +- ibmrt:4.4BSD:*|romp-ibm:BSD:*) +- echo romp-ibm-bsd4.4 +- exit ;; +- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and +- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit ;; # report: romp-ibm BSD 4.3 +- *:BOSX:*:*) +- echo rs6000-bull-bosx +- exit ;; +- DPX/2?00:B.O.S.:*:*) +- echo m68k-bull-sysv3 +- exit ;; +- 9000/[34]??:4.3bsd:1.*:*) +- echo m68k-hp-bsd +- exit ;; +- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) +- echo m68k-hp-bsd4.4 +- exit ;; +- 9000/[34678]??:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- case "${UNAME_MACHINE}" in +- 9000/31? ) HP_ARCH=m68000 ;; +- 9000/[34]?? ) HP_ARCH=m68k ;; +- 9000/[678][0-9][0-9]) +- if [ -x /usr/bin/getconf ]; then +- 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 +- 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 +- esac ;; +- esac +- fi +- if [ "${HP_ARCH}" = "" ]; then +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } +-EOF +- (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" ] +- then +- eval $set_cc_for_build +- +- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating +- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler +- # generating 64-bit code. GNU and HP use different nomenclature: +- # +- # $ CC_FOR_BUILD=cc ./config.guess +- # => hppa2.0w-hp-hpux11.23 +- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess +- # => hppa64-hp-hpux11.23 +- +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep -q __LP64__ +- then +- HP_ARCH="hppa2.0w" +- else +- HP_ARCH="hppa64" +- fi +- fi +- echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit ;; +- ia64:HP-UX:*:*) +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- echo ia64-hp-hpux${HPUX_REV} +- exit ;; +- 3050*:HI-UX:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- int +- main () +- { +- long cpu = sysconf (_SC_CPU_VERSION); +- /* The order matters, because CPU_IS_HP_MC68K erroneously returns +- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct +- results, however. */ +- if (CPU_IS_PA_RISC (cpu)) +- { +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; +- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; +- default: puts ("hppa-hitachi-hiuxwe2"); break; +- } +- } +- else if (CPU_IS_HP_MC68K (cpu)) +- puts ("m68k-hitachi-hiuxwe2"); +- else puts ("unknown-hitachi-hiuxwe2"); +- exit (0); +- } +-EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && +- { echo "$SYSTEM_NAME"; exit; } +- echo unknown-hitachi-hiuxwe2 +- exit ;; +- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) +- echo hppa1.1-hp-bsd +- exit ;; +- 9000/8??:4.3bsd:*:*) +- echo hppa1.0-hp-bsd +- exit ;; +- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) +- echo hppa1.0-hp-mpeix +- exit ;; +- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) +- echo hppa1.1-hp-osf +- exit ;; +- hp8??:OSF1:*:*) +- echo hppa1.0-hp-osf +- exit ;; +- i*86:OSF1:*:*) +- if [ -x /usr/sbin/sysversion ] ; then +- echo ${UNAME_MACHINE}-unknown-osf1mk +- else +- echo ${UNAME_MACHINE}-unknown-osf1 +- fi +- exit ;; +- parisc*:Lites*:*:*) +- echo hppa1.1-hp-lites +- exit ;; +- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) +- echo c1-convex-bsd +- exit ;; +- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit ;; +- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) +- echo c34-convex-bsd +- exit ;; +- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) +- echo c38-convex-bsd +- exit ;; +- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) +- echo c4-convex-bsd +- exit ;; +- CRAY*Y-MP:*:*:*) +- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*[A-Z]90:*:*:*) +- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ +- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ +- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ +- -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*TS:*:*:*) +- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*T3E:*:*:*) +- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- CRAY*SV1:*:*:*) +- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit ;; +- *:UNICOS/mp:*:*) +- 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_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/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; +- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) +- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit ;; +- sparc*:BSD/OS:*:*) +- echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit ;; +- *:BSD/OS:*:*) +- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit ;; +- *:FreeBSD:*:*) +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- case ${UNAME_PROCESSOR} in +- amd64) +- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; +- *) +- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; +- esac +- exit ;; +- i*:CYGWIN*:*) +- echo ${UNAME_MACHINE}-pc-cygwin +- exit ;; +- *:MINGW64*:*) +- echo ${UNAME_MACHINE}-pc-mingw64 +- exit ;; +- *:MINGW*:*) +- echo ${UNAME_MACHINE}-pc-mingw32 +- exit ;; +- *:MSYS*:*) +- echo ${UNAME_MACHINE}-pc-msys +- exit ;; +- i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 +- exit ;; +- i*:PW*:*) +- echo ${UNAME_MACHINE}-pc-pw32 +- exit ;; +- *:Interix*:*) +- case ${UNAME_MACHINE} in +- x86) +- echo i586-pc-interix${UNAME_RELEASE} +- exit ;; +- authenticamd | genuineintel | EM64T) +- echo x86_64-unknown-interix${UNAME_RELEASE} +- exit ;; +- IA64) +- echo ia64-unknown-interix${UNAME_RELEASE} +- exit ;; +- esac ;; +- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) +- echo i${UNAME_MACHINE}-pc-mks +- exit ;; +- 8664:Windows_NT:*) +- echo x86_64-pc-mks +- exit ;; +- i*:Windows_NT*:* | Pentium*:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +- # UNAME_MACHINE based on the output of uname instead of i386? +- echo i586-pc-interix +- exit ;; +- i*:UWIN*:*) +- echo ${UNAME_MACHINE}-pc-uwin +- exit ;; +- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) +- echo x86_64-unknown-cygwin +- exit ;; +- p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin +- exit ;; +- prep*:SunOS:5.*:*) +- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; +- *:GNU:*:*) +- # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- 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} +- exit ;; +- i*86:Minix:*:*) +- echo ${UNAME_MACHINE}-pc-minix +- exit ;; +- aarch64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- aarch64_be:Linux:*:*) +- UNAME_MACHINE=aarch64_be +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- arc:Linux:*:* | arceb:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- arm*:Linux:*:*) +- eval $set_cc_for_build +- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep -q __ARM_EABI__ +- then +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- else +- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep -q __ARM_PCS_VFP +- then +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi +- else +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf +- fi +- fi +- exit ;; +- avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- cris:Linux:*:*) +- echo ${UNAME_MACHINE}-axis-linux-${LIBC} +- exit ;; +- crisv32:Linux:*:*) +- echo ${UNAME_MACHINE}-axis-linux-${LIBC} +- exit ;; +- frv:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- hexagon:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- i*86:Linux:*:*) +- echo ${UNAME_MACHINE}-pc-linux-${LIBC} +- exit ;; +- ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- mips:Linux:*:* | mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef ${UNAME_MACHINE} +- #undef ${UNAME_MACHINE}el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=${UNAME_MACHINE}el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=${UNAME_MACHINE} +- #else +- CPU= +- #endif +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } +- ;; +- openrisc*:Linux:*:*) +- echo or1k-unknown-linux-${LIBC} +- exit ;; +- or32:Linux:*:* | or1k*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- padre:Linux:*:*) +- echo sparc-unknown-linux-${LIBC} +- exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-${LIBC} +- exit ;; +- parisc:Linux:*:* | hppa:Linux:*:*) +- # Look for CPU level +- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; +- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; +- *) echo hppa-unknown-linux-${LIBC} ;; +- esac +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-${LIBC} +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-${LIBC} +- exit ;; +- ppc64le:Linux:*:*) +- echo powerpc64le-unknown-linux-${LIBC} +- exit ;; +- ppcle:Linux:*:*) +- echo powerpcle-unknown-linux-${LIBC} +- exit ;; +- s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux-${LIBC} +- exit ;; +- sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- tile*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-${LIBC} +- exit ;; +- x86_64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} +- exit ;; +- i*86:DYNIX/ptx:4*:*) +- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +- # earlier versions are messed up and put the nodename in both +- # sysname and nodename. +- echo i386-sequent-sysv4 +- exit ;; +- i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, +- # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. +- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit ;; +- i*86:OS/2:*:*) +- # If we were able to find `uname', then EMX Unix compatibility +- # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit ;; +- i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop +- exit ;; +- i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos +- exit ;; +- i*86:syllable:*:*) +- echo ${UNAME_MACHINE}-pc-syllable +- exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- i*86:*DOS:*:*) +- echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit ;; +- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) +- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` +- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} +- else +- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} +- fi +- exit ;; +- i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. +- case `/bin/uname -X | grep "^Machine"` in +- *486*) UNAME_MACHINE=i486 ;; +- *Pentium) UNAME_MACHINE=i586 ;; +- *Pent*|*Celeron) UNAME_MACHINE=i686 ;; +- esac +- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit ;; +- i*86:*:3.2:*) +- if test -f /usr/options/cb.name; then +- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then +- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` +- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ +- && UNAME_MACHINE=i586 +- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ +- && UNAME_MACHINE=i686 +- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ +- && UNAME_MACHINE=i686 +- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL +- else +- echo ${UNAME_MACHINE}-pc-sysv32 +- fi +- exit ;; +- pc:*:*:*) +- # Left here for compatibility: +- # 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 +- # this is a cross-build. +- echo i586-pc-msdosdjgpp +- exit ;; +- Intel:Mach:3*:*) +- echo i386-pc-mach3 +- exit ;; +- paragon:*:*:*) +- echo i860-intel-osf1 +- exit ;; +- i860:*:4.*:*) # i860-SVR4 +- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then +- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 +- else # Add other i860-SVR4 vendors below as they are discovered. +- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 +- fi +- exit ;; +- mini*:CTIX:SYS*5:*) +- # "miniframe" +- echo m68010-convergent-sysv +- exit ;; +- mc68k:UNIX:SYSTEM5:3.51m) +- echo m68k-convergent-sysv +- exit ;; +- M680?0:D-NIX:5.3:*) +- echo m68k-diab-dnix +- exit ;; +- M68*:*:R3V[5678]*:*) +- test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; +- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) +- OS_REL='' +- test -r /etc/.relid \ +- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4.3${OS_REL}; exit; } +- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; +- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; +- NCR*:*:4.2:* | MPRAS*:*:4.2:*) +- OS_REL='.3' +- test -r /etc/.relid \ +- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4.3${OS_REL}; exit; } +- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } +- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ +- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; +- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) +- echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- mc68030:UNIX_System_V:4.*:*) +- echo m68k-atari-sysv4 +- exit ;; +- TSUNAMI:LynxOS:2.*:*) +- echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- rs6000:LynxOS:2.*:*) +- echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) +- echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit ;; +- SM[BE]S:UNIX_SV:*:*) +- echo mips-dde-sysv${UNAME_RELEASE} +- exit ;; +- RM*:ReliantUNIX-*:*:*) +- echo mips-sni-sysv4 +- exit ;; +- RM*:SINIX-*:*:*) +- echo mips-sni-sysv4 +- exit ;; +- *:SINIX-*:*:*) +- if uname -p 2>/dev/null >/dev/null ; then +- UNAME_MACHINE=`(uname -p) 2>/dev/null` +- echo ${UNAME_MACHINE}-sni-sysv4 +- else +- echo ns32k-sni-sysv +- fi +- exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; +- *:UNIX_System_V:4*:FTX*) +- # From Gerald Hewes . +- # How about differentiating between stratus architectures? -djm +- echo hppa1.1-stratus-sysv4 +- exit ;; +- *:*:*:FTX*) +- # From seanf@swdc.stratus.com. +- echo i860-stratus-sysv4 +- exit ;; +- i*86:VOS:*:*) +- # From Paul.Green@stratus.com. +- echo ${UNAME_MACHINE}-stratus-vos +- exit ;; +- *:VOS:*:*) +- # From Paul.Green@stratus.com. +- echo hppa1.1-stratus-vos +- exit ;; +- mc68*:A/UX:*:*) +- echo m68k-apple-aux${UNAME_RELEASE} +- exit ;; +- news*:NEWS-OS:6*:*) +- echo mips-sony-newsos6 +- exit ;; +- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) +- if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} +- else +- echo mips-unknown-sysv${UNAME_RELEASE} +- fi +- exit ;; +- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. +- echo powerpc-be-beos +- exit ;; +- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. +- echo powerpc-apple-beos +- exit ;; +- BePC:BeOS:*:*) # BeOS running on Intel PC compatible. +- echo i586-pc-beos +- exit ;; +- BePC:Haiku:*:*) # Haiku running on Intel PC compatible. +- echo i586-pc-haiku +- exit ;; +- x86_64:Haiku:*:*) +- echo x86_64-unknown-haiku +- exit ;; +- SX-4:SUPER-UX:*:*) +- echo sx4-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-5:SUPER-UX:*:*) +- echo sx5-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-6:SUPER-UX:*:*) +- echo sx6-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-7:SUPER-UX:*:*) +- echo sx7-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-8:SUPER-UX:*:*) +- echo sx8-nec-superux${UNAME_RELEASE} +- exit ;; +- SX-8R:SUPER-UX:*:*) +- echo sx8r-nec-superux${UNAME_RELEASE} +- exit ;; +- Power*:Rhapsody:*:*) +- echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit ;; +- *:Rhapsody:*:*) +- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit ;; +- *:Darwin:*:*) +- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown +- eval $set_cc_for_build +- if test "$UNAME_PROCESSOR" = unknown ; then +- UNAME_PROCESSOR=powerpc +- fi +- 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 +- UNAME_PROCESSOR=i386 +- UNAME_MACHINE=pc +- fi +- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit ;; +- *:QNX:*:4*) +- echo i386-pc-qnx +- exit ;; +- NEO-?:NONSTOP_KERNEL:*:*) +- echo neo-tandem-nsk${UNAME_RELEASE} +- exit ;; +- NSE-*:NONSTOP_KERNEL:*:*) +- echo nse-tandem-nsk${UNAME_RELEASE} +- exit ;; +- NSR-?:NONSTOP_KERNEL:*:*) +- echo nsr-tandem-nsk${UNAME_RELEASE} +- exit ;; +- *:NonStop-UX:*:*) +- echo mips-compaq-nonstopux +- exit ;; +- BS2000:POSIX*:*:*) +- echo bs2000-siemens-sysv +- exit ;; +- DS/*:UNIX_System_V:*:*) +- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit ;; +- *:Plan9:*:*) +- # "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 +- UNAME_MACHINE=i386 +- else +- UNAME_MACHINE="$cputype" +- fi +- echo ${UNAME_MACHINE}-unknown-plan9 +- exit ;; +- *:TOPS-10:*:*) +- echo pdp10-unknown-tops10 +- exit ;; +- *:TENEX:*:*) +- echo pdp10-unknown-tenex +- exit ;; +- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) +- echo pdp10-dec-tops20 +- exit ;; +- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) +- echo pdp10-xkl-tops20 +- exit ;; +- *:TOPS-20:*:*) +- echo pdp10-unknown-tops20 +- exit ;; +- *:ITS:*:*) +- echo pdp10-unknown-its +- exit ;; +- SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} +- exit ;; +- *:DragonFly:*:*) +- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit ;; +- *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` +- case "${UNAME_MACHINE}" in +- A*) echo alpha-dec-vms ; exit ;; +- I*) echo ia64-dec-vms ; exit ;; +- V*) echo vax-dec-vms ; exit ;; +- esac ;; +- *:XENIX:*:SysV) +- echo i386-pc-xenix +- exit ;; +- i*86:skyos:*:*) +- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' +- exit ;; +- i*86:rdos:*:*) +- echo ${UNAME_MACHINE}-pc-rdos +- exit ;; +- i*86:AROS:*:*) +- echo ${UNAME_MACHINE}-pc-aros +- exit ;; +- x86_64:VMkernel:*:*) +- echo ${UNAME_MACHINE}-unknown-esx +- exit ;; +-esac +- +-cat >&2 < in order to provide the needed +-information to handle your system. +- +-config.guess timestamp = $timestamp +- +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` +- +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null` +- +-hostinfo = `(hostinfo) 2>/dev/null` +-/bin/universe = `(/bin/universe) 2>/dev/null` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +-/bin/arch = `(/bin/arch) 2>/dev/null` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +- +-UNAME_MACHINE = ${UNAME_MACHINE} +-UNAME_RELEASE = ${UNAME_RELEASE} +-UNAME_SYSTEM = ${UNAME_SYSTEM} +-UNAME_VERSION = ${UNAME_VERSION} +-EOF +- +-exit 1 +- +-# Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) +-# time-stamp-start: "timestamp='" +-# time-stamp-format: "%:y-%02m-%02d" +-# time-stamp-end: "'" +-# End: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/config.sub groff-1.22.3/src/libs/gnulib/build-aux/config.sub +--- groff-1.22.3.old/src/libs/gnulib/build-aux/config.sub 2014-11-04 10:38:35.646518734 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/config.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1805 +0,0 @@ +-#! /bin/sh +-# Configuration validation subroutine script. +-# Copyright 1992-2014 Free Software Foundation, Inc. +- +-timestamp='2014-09-26' +- +-# 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 +-# 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 . +-# +-# 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 Exception is an additional permission under section 7 +-# of the GNU General Public License, version 3 ("GPLv3"). +- +- +-# Please send patches with a ChangeLog entry to config-patches@gnu.org. +-# +-# Configuration subroutine to validate and canonicalize a configuration type. +-# Supply the specified configuration type as an argument. +-# If it is invalid, we print an error message on stderr and exit with code 1. +-# 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 +- +-# This file is supposed to be the same for all GNU packages +-# and recognize all the CPU types, system types and aliases +-# that are meaningful with *any* GNU software. +-# Each package is responsible for reporting which valid configurations +-# it does not support. The user should be able to distinguish +-# a failure to support a valid configuration from a meaningless +-# configuration. +- +-# The goal of this file is to map all the various variations of a given +-# machine specification into a single specification in the form: +-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +-# or in some cases, the newer four-part form: +-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +-# It is wrong to echo any other type of specification. +- +-me=`echo "$0" | sed -e 's,.*/,,'` +- +-usage="\ +-Usage: $0 [OPTION] CPU-MFR-OPSYS +- $0 [OPTION] ALIAS +- +-Canonicalize a configuration name. +- +-Operation modes: +- -h, --help print this help, then exit +- -t, --time-stamp print date of last modification, then exit +- -v, --version print version number, then exit +- +-Report bugs and patches to ." +- +-version="\ +-GNU config.sub ($timestamp) +- +-Copyright 1992-2014 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." +- +-help=" +-Try \`$me --help' for more information." +- +-# Parse command line +-while test $# -gt 0 ; do +- case $1 in +- --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit ;; +- --version | -v ) +- echo "$version" ; exit ;; +- --help | --h* | -h ) +- echo "$usage"; exit ;; +- -- ) # Stop option processing +- shift; break ;; +- - ) # Use stdin as input. +- break ;; +- -* ) +- echo "$me: invalid option $1$help" +- exit 1 ;; +- +- *local*) +- # First pass through any local machine types. +- echo $1 +- exit ;; +- +- * ) +- break ;; +- esac +-done +- +-case $# in +- 0) echo "$me: missing argument$help" >&2 +- exit 1;; +- 1) ;; +- *) echo "$me: too many arguments$help" >&2 +- exit 1;; +-esac +- +-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +-# Here we must recognize all the valid KERNEL-OS combinations. +-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* | \ +- storm-chaos* | os2-emx* | rtmk-nova*) +- os=-$maybe_os +- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` +- ;; +- android-linux) +- os=-linux-android +- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown +- ;; +- *) +- basic_machine=`echo $1 | sed 's/-[^-]*$//'` +- if [ $basic_machine != $1 ] +- then os=`echo $1 | sed 's/.*-/-/'` +- else os=; fi +- ;; +-esac +- +-### Let's recognize common machines as not being operating systems so +-### that things like config.sub decstation-3100 work. We also +-### recognize some manufacturers as not being operating systems, so we +-### can provide default operating systems below. +-case $os in +- -sun*os*) +- # Prevent following clause from handling this invalid input. +- ;; +- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ +- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ +- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ +- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ +- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ +- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze*) +- os= +- basic_machine=$1 +- ;; +- -bluegene*) +- os=-cnk +- ;; +- -sim | -cisco | -oki | -wec | -winbond) +- os= +- basic_machine=$1 +- ;; +- -scout) +- ;; +- -wrs) +- os=-vxworks +- basic_machine=$1 +- ;; +- -chorusos*) +- os=-chorusos +- basic_machine=$1 +- ;; +- -chorusrdb) +- os=-chorusrdb +- basic_machine=$1 +- ;; +- -hiux*) +- os=-hiuxwe2 +- ;; +- -sco6) +- os=-sco5v6 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco5) +- os=-sco3.2v5 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco4) +- os=-sco3.2v4 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco3.2.[4-9]*) +- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco3.2v[4-9]*) +- # Don't forget version if it is 3.2v4 or newer. +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco5v6*) +- # Don't forget version if it is 3.2v4 or newer. +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco*) +- os=-sco3.2v2 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -udk*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -isc) +- os=-isc2.2 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -clix*) +- basic_machine=clipper-intergraph +- ;; +- -isc*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -lynx*178) +- os=-lynxos178 +- ;; +- -lynx*5) +- os=-lynxos5 +- ;; +- -lynx*) +- os=-lynxos +- ;; +- -ptx*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` +- ;; +- -windowsnt*) +- os=`echo $os | sed -e 's/windowsnt/winnt/'` +- ;; +- -psos*) +- os=-psos +- ;; +- -mint | -mint[0-9]*) +- basic_machine=m68k-atari +- os=-mint +- ;; +-esac +- +-# Decode aliases for certain CPU-COMPANY combinations. +-case $basic_machine in +- # Recognize the basic CPU types without company name. +- # Some are omitted here because they have special meanings below. +- 1750a | 580 \ +- | a29k \ +- | aarch64 | aarch64_be \ +- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ +- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ +- | am33_2.0 \ +- | arc | arceb \ +- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ +- | avr | avr32 \ +- | be32 | be64 \ +- | bfin \ +- | c4x | c8051 | clipper \ +- | d10v | d30v | dlx | dsp16xx \ +- | epiphany \ +- | fido | fr30 | frv \ +- | 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 \ +- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ +- | mips | mipsbe | mipseb | mipsel | mipsle \ +- | mips16 \ +- | mips64 | mips64el \ +- | mips64octeon | mips64octeonel \ +- | mips64orion | mips64orionel \ +- | mips64r5900 | mips64r5900el \ +- | mips64vr | mips64vrel \ +- | mips64vr4100 | mips64vr4100el \ +- | mips64vr4300 | mips64vr4300el \ +- | mips64vr5000 | mips64vr5000el \ +- | mips64vr5900 | mips64vr5900el \ +- | mipsisa32 | mipsisa32el \ +- | mipsisa32r2 | mipsisa32r2el \ +- | mipsisa32r6 | mipsisa32r6el \ +- | mipsisa64 | mipsisa64el \ +- | mipsisa64r2 | mipsisa64r2el \ +- | mipsisa64r6 | mipsisa64r6el \ +- | mipsisa64sb1 | mipsisa64sb1el \ +- | mipsisa64sr71k | mipsisa64sr71kel \ +- | mipsr5900 | mipsr5900el \ +- | mipstx39 | mipstx39el \ +- | mn10200 | mn10300 \ +- | moxie \ +- | mt \ +- | msp430 \ +- | nds32 | nds32le | nds32be \ +- | nios | nios2 | nios2eb | nios2el \ +- | ns16k | ns32k \ +- | open8 | or1k | or1knd | or32 \ +- | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle \ +- | 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 \ +- | sh64 | sh64le \ +- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ +- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu \ +- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ +- | ubicom32 \ +- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ +- | we32k \ +- | x86 | xc16x | xstormy16 | xtensa \ +- | z8k | z80) +- basic_machine=$basic_machine-unknown +- ;; +- c54x) +- basic_machine=tic54x-unknown +- ;; +- c55x) +- basic_machine=tic55x-unknown +- ;; +- c6x) +- basic_machine=tic6x-unknown +- ;; +- leon|leon[3-9]) +- basic_machine=sparc-$basic_machine +- ;; +- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) +- basic_machine=$basic_machine-unknown +- os=-none +- ;; +- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) +- ;; +- ms1) +- basic_machine=mt-unknown +- ;; +- +- strongarm | thumb | xscale) +- basic_machine=arm-unknown +- ;; +- xgate) +- basic_machine=$basic_machine-unknown +- os=-none +- ;; +- xscaleeb) +- basic_machine=armeb-unknown +- ;; +- +- xscaleel) +- basic_machine=armel-unknown +- ;; +- +- # We use `pc' rather than `unknown' +- # because (1) that's what they normally are, and +- # (2) the word "unknown" tends to confuse beginning users. +- i*86 | x86_64) +- basic_machine=$basic_machine-pc +- ;; +- # Object if more than one company name word. +- *-*-*) +- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +- exit 1 +- ;; +- # Recognize the basic CPU types with company name. +- 580-* \ +- | a29k-* \ +- | aarch64-* | aarch64_be-* \ +- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ +- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ +- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* | avr32-* \ +- | be32-* | be64-* \ +- | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* \ +- | c8051-* | clipper-* | craynv-* | cydra-* \ +- | d10v-* | d30v-* | dlx-* \ +- | 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-* \ +- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ +- | microblaze-* | microblazeel-* \ +- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ +- | mips16-* \ +- | mips64-* | mips64el-* \ +- | mips64octeon-* | mips64octeonel-* \ +- | mips64orion-* | mips64orionel-* \ +- | mips64r5900-* | mips64r5900el-* \ +- | mips64vr-* | mips64vrel-* \ +- | mips64vr4100-* | mips64vr4100el-* \ +- | mips64vr4300-* | mips64vr4300el-* \ +- | mips64vr5000-* | mips64vr5000el-* \ +- | mips64vr5900-* | mips64vr5900el-* \ +- | mipsisa32-* | mipsisa32el-* \ +- | mipsisa32r2-* | mipsisa32r2el-* \ +- | mipsisa32r6-* | mipsisa32r6el-* \ +- | mipsisa64-* | mipsisa64el-* \ +- | mipsisa64r2-* | mipsisa64r2el-* \ +- | mipsisa64r6-* | mipsisa64r6el-* \ +- | mipsisa64sb1-* | mipsisa64sb1el-* \ +- | mipsisa64sr71k-* | mipsisa64sr71kel-* \ +- | mipsr5900-* | mipsr5900el-* \ +- | mipstx39-* | mipstx39el-* \ +- | mmix-* \ +- | mt-* \ +- | msp430-* \ +- | nds32-* | nds32le-* | nds32be-* \ +- | nios-* | nios2-* | nios2eb-* | nios2el-* \ +- | none-* | np1-* | ns16k-* | ns32k-* \ +- | open8-* \ +- | or1k*-* \ +- | orion-* \ +- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ +- | pyramid-* \ +- | 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?-* \ +- | tahoe-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ +- | tile*-* \ +- | tron-* \ +- | ubicom32-* \ +- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ +- | vax-* \ +- | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* \ +- | xstormy16-* | xtensa*-* \ +- | ymp-* \ +- | z8k-* | z80-*) +- ;; +- # Recognize the basic CPU types without company name, with glob match. +- xtensa*) +- basic_machine=$basic_machine-unknown +- ;; +- # Recognize the various machine names and aliases which stand +- # for a CPU type and a company and sometimes even an OS. +- 386bsd) +- basic_machine=i386-unknown +- os=-bsd +- ;; +- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) +- basic_machine=m68000-att +- ;; +- 3b*) +- basic_machine=we32k-att +- ;; +- a29khif) +- basic_machine=a29k-amd +- os=-udi +- ;; +- abacus) +- basic_machine=abacus-unknown +- ;; +- adobe68k) +- basic_machine=m68010-adobe +- os=-scout +- ;; +- alliant | fx80) +- basic_machine=fx80-alliant +- ;; +- altos | altos3068) +- basic_machine=m68k-altos +- ;; +- am29k) +- basic_machine=a29k-none +- os=-bsd +- ;; +- amd64) +- basic_machine=x86_64-pc +- ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- amdahl) +- basic_machine=580-amdahl +- os=-sysv +- ;; +- amiga | amiga-*) +- basic_machine=m68k-unknown +- ;; +- amigaos | amigados) +- basic_machine=m68k-unknown +- os=-amigaos +- ;; +- amigaunix | amix) +- basic_machine=m68k-unknown +- os=-sysv4 +- ;; +- apollo68) +- basic_machine=m68k-apollo +- os=-sysv +- ;; +- apollo68bsd) +- basic_machine=m68k-apollo +- os=-bsd +- ;; +- aros) +- basic_machine=i386-pc +- os=-aros +- ;; +- aux) +- basic_machine=m68k-apple +- os=-aux +- ;; +- balance) +- basic_machine=ns32k-sequent +- os=-dynix +- ;; +- blackfin) +- basic_machine=bfin-unknown +- os=-linux +- ;; +- blackfin-*) +- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` +- os=-linux +- ;; +- bluegene*) +- basic_machine=powerpc-ibm +- os=-cnk +- ;; +- c54x-*) +- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- c55x-*) +- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- c6x-*) +- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- c90) +- basic_machine=c90-cray +- os=-unicos +- ;; +- cegcc) +- basic_machine=arm-unknown +- os=-cegcc +- ;; +- convex-c1) +- basic_machine=c1-convex +- os=-bsd +- ;; +- convex-c2) +- basic_machine=c2-convex +- os=-bsd +- ;; +- convex-c32) +- basic_machine=c32-convex +- os=-bsd +- ;; +- convex-c34) +- basic_machine=c34-convex +- os=-bsd +- ;; +- convex-c38) +- basic_machine=c38-convex +- os=-bsd +- ;; +- cray | j90) +- basic_machine=j90-cray +- os=-unicos +- ;; +- craynv) +- basic_machine=craynv-cray +- os=-unicosmp +- ;; +- cr16 | cr16-*) +- basic_machine=cr16-unknown +- os=-elf +- ;; +- crds | unos) +- basic_machine=m68k-crds +- ;; +- crisv32 | crisv32-* | etraxfs*) +- basic_machine=crisv32-axis +- ;; +- cris | cris-* | etrax*) +- basic_machine=cris-axis +- ;; +- crx) +- basic_machine=crx-unknown +- os=-elf +- ;; +- da30 | da30-*) +- basic_machine=m68k-da30 +- ;; +- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) +- basic_machine=mips-dec +- ;; +- decsystem10* | dec10*) +- basic_machine=pdp10-dec +- os=-tops10 +- ;; +- decsystem20* | dec20*) +- basic_machine=pdp10-dec +- os=-tops20 +- ;; +- delta | 3300 | motorola-3300 | motorola-delta \ +- | 3300-motorola | delta-motorola) +- basic_machine=m68k-motorola +- ;; +- delta88) +- basic_machine=m88k-motorola +- os=-sysv3 +- ;; +- dicos) +- basic_machine=i686-pc +- os=-dicos +- ;; +- djgpp) +- basic_machine=i586-pc +- os=-msdosdjgpp +- ;; +- dpx20 | dpx20-*) +- basic_machine=rs6000-bull +- os=-bosx +- ;; +- dpx2* | dpx2*-bull) +- basic_machine=m68k-bull +- os=-sysv3 +- ;; +- ebmon29k) +- basic_machine=a29k-amd +- os=-ebmon +- ;; +- elxsi) +- basic_machine=elxsi-elxsi +- os=-bsd +- ;; +- encore | umax | mmax) +- basic_machine=ns32k-encore +- ;; +- es1800 | OSE68k | ose68k | ose | OSE) +- basic_machine=m68k-ericsson +- os=-ose +- ;; +- fx2800) +- basic_machine=i860-alliant +- ;; +- genix) +- basic_machine=ns32k-ns +- ;; +- gmicro) +- basic_machine=tron-gmicro +- os=-sysv +- ;; +- go32) +- basic_machine=i386-pc +- os=-go32 +- ;; +- h3050r* | hiux*) +- basic_machine=hppa1.1-hitachi +- os=-hiuxwe2 +- ;; +- h8300hms) +- basic_machine=h8300-hitachi +- os=-hms +- ;; +- h8300xray) +- basic_machine=h8300-hitachi +- os=-xray +- ;; +- h8500hms) +- basic_machine=h8500-hitachi +- os=-hms +- ;; +- harris) +- basic_machine=m88k-harris +- os=-sysv3 +- ;; +- hp300-*) +- basic_machine=m68k-hp +- ;; +- hp300bsd) +- basic_machine=m68k-hp +- os=-bsd +- ;; +- hp300hpux) +- basic_machine=m68k-hp +- os=-hpux +- ;; +- hp3k9[0-9][0-9] | hp9[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hp9k2[0-9][0-9] | hp9k31[0-9]) +- basic_machine=m68000-hp +- ;; +- hp9k3[2-9][0-9]) +- basic_machine=m68k-hp +- ;; +- hp9k6[0-9][0-9] | hp6[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hp9k7[0-79][0-9] | hp7[0-79][0-9]) +- basic_machine=hppa1.1-hp +- ;; +- hp9k78[0-9] | hp78[0-9]) +- # FIXME: really hppa2.0-hp +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) +- # FIXME: really hppa2.0-hp +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[0-9][13679] | hp8[0-9][13679]) +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[0-9][0-9] | hp8[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hppa-next) +- os=-nextstep3 +- ;; +- hppaosf) +- basic_machine=hppa1.1-hp +- os=-osf +- ;; +- hppro) +- basic_machine=hppa1.1-hp +- os=-proelf +- ;; +- i370-ibm* | ibm*) +- basic_machine=i370-ibm +- ;; +- i*86v32) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv32 +- ;; +- i*86v4*) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv4 +- ;; +- i*86v) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv +- ;; +- i*86sol2) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-solaris2 +- ;; +- i386mach) +- basic_machine=i386-mach +- os=-mach +- ;; +- i386-vsta | vsta) +- basic_machine=i386-unknown +- os=-vsta +- ;; +- iris | iris4d) +- basic_machine=mips-sgi +- case $os in +- -irix*) +- ;; +- *) +- os=-irix4 +- ;; +- esac +- ;; +- isi68 | isi) +- 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 +- ;; +- m68knommu-*) +- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` +- os=-linux +- ;; +- m88k-omron*) +- basic_machine=m88k-omron +- ;; +- magnum | m3230) +- basic_machine=mips-mips +- os=-sysv +- ;; +- merlin) +- basic_machine=ns32k-utek +- os=-sysv +- ;; +- microblaze*) +- basic_machine=microblaze-xilinx +- ;; +- mingw64) +- basic_machine=x86_64-pc +- os=-mingw64 +- ;; +- mingw32) +- basic_machine=i686-pc +- os=-mingw32 +- ;; +- mingw32ce) +- basic_machine=arm-unknown +- os=-mingw32ce +- ;; +- miniframe) +- basic_machine=m68000-convergent +- ;; +- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) +- basic_machine=m68k-atari +- os=-mint +- ;; +- mips3*-*) +- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` +- ;; +- mips3*) +- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown +- ;; +- monitor) +- basic_machine=m68k-rom68k +- os=-coff +- ;; +- morphos) +- basic_machine=powerpc-unknown +- os=-morphos +- ;; +- moxiebox) +- basic_machine=moxie-unknown +- os=-moxiebox +- ;; +- msdos) +- basic_machine=i386-pc +- os=-msdos +- ;; +- ms1-*) +- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` +- ;; +- msys) +- basic_machine=i686-pc +- os=-msys +- ;; +- mvs) +- basic_machine=i370-ibm +- os=-mvs +- ;; +- nacl) +- basic_machine=le32-unknown +- os=-nacl +- ;; +- ncr3000) +- basic_machine=i486-ncr +- os=-sysv4 +- ;; +- netbsd386) +- basic_machine=i386-unknown +- os=-netbsd +- ;; +- netwinder) +- basic_machine=armv4l-rebel +- os=-linux +- ;; +- news | news700 | news800 | news900) +- basic_machine=m68k-sony +- os=-newsos +- ;; +- news1000) +- basic_machine=m68030-sony +- os=-newsos +- ;; +- news-3600 | risc-news) +- basic_machine=mips-sony +- os=-newsos +- ;; +- necv70) +- basic_machine=v70-nec +- os=-sysv +- ;; +- next | m*-next ) +- basic_machine=m68k-next +- case $os in +- -nextstep* ) +- ;; +- -ns2*) +- os=-nextstep2 +- ;; +- *) +- os=-nextstep3 +- ;; +- esac +- ;; +- nh3000) +- basic_machine=m68k-harris +- os=-cxux +- ;; +- nh[45]000) +- basic_machine=m88k-harris +- os=-cxux +- ;; +- nindy960) +- basic_machine=i960-intel +- os=-nindy +- ;; +- mon960) +- basic_machine=i960-intel +- os=-mon960 +- ;; +- nonstopux) +- basic_machine=mips-compaq +- os=-nonstopux +- ;; +- np1) +- basic_machine=np1-gould +- ;; +- neo-tandem) +- basic_machine=neo-tandem +- ;; +- nse-tandem) +- basic_machine=nse-tandem +- ;; +- nsr-tandem) +- basic_machine=nsr-tandem +- ;; +- op50n-* | op60c-*) +- basic_machine=hppa1.1-oki +- os=-proelf +- ;; +- openrisc | openrisc-*) +- basic_machine=or32-unknown +- ;; +- os400) +- basic_machine=powerpc-ibm +- os=-os400 +- ;; +- OSE68000 | ose68000) +- basic_machine=m68000-ericsson +- os=-ose +- ;; +- os68k) +- basic_machine=m68k-none +- os=-os68k +- ;; +- pa-hitachi) +- basic_machine=hppa1.1-hitachi +- os=-hiuxwe2 +- ;; +- paragon) +- basic_machine=i860-intel +- os=-osf +- ;; +- parisc) +- basic_machine=hppa-unknown +- os=-linux +- ;; +- parisc-*) +- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` +- os=-linux +- ;; +- pbd) +- basic_machine=sparc-tti +- ;; +- pbb) +- basic_machine=m68k-tti +- ;; +- pc532 | pc532-*) +- basic_machine=ns32k-pc532 +- ;; +- pc98) +- basic_machine=i386-pc +- ;; +- pc98-*) +- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentium | p5 | k5 | k6 | nexgen | viac3) +- basic_machine=i586-pc +- ;; +- pentiumpro | p6 | 6x86 | athlon | athlon_*) +- basic_machine=i686-pc +- ;; +- pentiumii | pentium2 | pentiumiii | pentium3) +- basic_machine=i686-pc +- ;; +- pentium4) +- basic_machine=i786-pc +- ;; +- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) +- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentiumpro-* | p6-* | 6x86-* | athlon-*) +- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) +- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentium4-*) +- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pn) +- basic_machine=pn-gould +- ;; +- power) basic_machine=power-ibm +- ;; +- ppc | ppcbe) basic_machine=powerpc-unknown +- ;; +- ppc-* | ppcbe-*) +- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppcle | powerpclittle | ppc-le | powerpc-little) +- basic_machine=powerpcle-unknown +- ;; +- ppcle-* | powerpclittle-*) +- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppc64) basic_machine=powerpc64-unknown +- ;; +- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppc64le | powerpc64little | ppc64-le | powerpc64-little) +- basic_machine=powerpc64le-unknown +- ;; +- ppc64le-* | powerpc64little-*) +- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ps2) +- basic_machine=i386-ibm +- ;; +- pw32) +- basic_machine=i586-unknown +- os=-pw32 +- ;; +- rdos | rdos64) +- basic_machine=x86_64-pc +- os=-rdos +- ;; +- rdos32) +- basic_machine=i386-pc +- os=-rdos +- ;; +- rom68k) +- basic_machine=m68k-rom68k +- os=-coff +- ;; +- rm[46]00) +- basic_machine=mips-siemens +- ;; +- rtpc | rtpc-*) +- basic_machine=romp-ibm +- ;; +- s390 | s390-*) +- basic_machine=s390-ibm +- ;; +- s390x | s390x-*) +- basic_machine=s390x-ibm +- ;; +- sa29200) +- basic_machine=a29k-amd +- os=-udi +- ;; +- sb1) +- basic_machine=mipsisa64sb1-unknown +- ;; +- sb1el) +- basic_machine=mipsisa64sb1el-unknown +- ;; +- sde) +- basic_machine=mipsisa32-sde +- os=-elf +- ;; +- sei) +- basic_machine=mips-sei +- os=-seiux +- ;; +- sequent) +- basic_machine=i386-sequent +- ;; +- sh) +- basic_machine=sh-hitachi +- os=-hms +- ;; +- sh5el) +- basic_machine=sh5le-unknown +- ;; +- sh64) +- basic_machine=sh64-unknown +- ;; +- sparclite-wrs | simso-wrs) +- basic_machine=sparclite-wrs +- os=-vxworks +- ;; +- sps7) +- basic_machine=m68k-bull +- os=-sysv2 +- ;; +- spur) +- basic_machine=spur-unknown +- ;; +- st2000) +- basic_machine=m68k-tandem +- ;; +- stratus) +- basic_machine=i860-stratus +- os=-sysv4 +- ;; +- strongarm-* | thumb-*) +- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- sun2) +- basic_machine=m68000-sun +- ;; +- sun2os3) +- basic_machine=m68000-sun +- os=-sunos3 +- ;; +- sun2os4) +- basic_machine=m68000-sun +- os=-sunos4 +- ;; +- sun3os3) +- basic_machine=m68k-sun +- os=-sunos3 +- ;; +- sun3os4) +- basic_machine=m68k-sun +- os=-sunos4 +- ;; +- sun4os3) +- basic_machine=sparc-sun +- os=-sunos3 +- ;; +- sun4os4) +- basic_machine=sparc-sun +- os=-sunos4 +- ;; +- sun4sol2) +- basic_machine=sparc-sun +- os=-solaris2 +- ;; +- sun3 | sun3-*) +- basic_machine=m68k-sun +- ;; +- sun4) +- basic_machine=sparc-sun +- ;; +- sun386 | sun386i | roadrunner) +- basic_machine=i386-sun +- ;; +- sv1) +- basic_machine=sv1-cray +- os=-unicos +- ;; +- symmetry) +- basic_machine=i386-sequent +- os=-dynix +- ;; +- t3e) +- basic_machine=alphaev5-cray +- os=-unicos +- ;; +- t90) +- basic_machine=t90-cray +- os=-unicos +- ;; +- tile*) +- basic_machine=$basic_machine-unknown +- os=-linux-gnu +- ;; +- tx39) +- basic_machine=mipstx39-unknown +- ;; +- tx39el) +- basic_machine=mipstx39el-unknown +- ;; +- toad1) +- basic_machine=pdp10-xkl +- os=-tops20 +- ;; +- tower | tower-32) +- basic_machine=m68k-ncr +- ;; +- tpf) +- basic_machine=s390x-ibm +- os=-tpf +- ;; +- udi29k) +- basic_machine=a29k-amd +- os=-udi +- ;; +- ultra3) +- basic_machine=a29k-nyu +- os=-sym1 +- ;; +- v810 | necv810) +- basic_machine=v810-nec +- os=-none +- ;; +- vaxv) +- basic_machine=vax-dec +- os=-sysv +- ;; +- vms) +- basic_machine=vax-dec +- os=-vms +- ;; +- vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; +- vxworks960) +- basic_machine=i960-wrs +- os=-vxworks +- ;; +- vxworks68) +- basic_machine=m68k-wrs +- os=-vxworks +- ;; +- vxworks29k) +- basic_machine=a29k-wrs +- os=-vxworks +- ;; +- w65*) +- basic_machine=w65-wdc +- os=-none +- ;; +- w89k-*) +- basic_machine=hppa1.1-winbond +- os=-proelf +- ;; +- xbox) +- basic_machine=i686-pc +- os=-mingw32 +- ;; +- xps | xps100) +- basic_machine=xps100-honeywell +- ;; +- xscale-* | xscalee[bl]-*) +- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` +- ;; +- ymp) +- basic_machine=ymp-cray +- os=-unicos +- ;; +- z8k-*-coff) +- basic_machine=z8k-unknown +- os=-sim +- ;; +- z80-*-coff) +- basic_machine=z80-unknown +- os=-sim +- ;; +- none) +- basic_machine=none-none +- os=-none +- ;; +- +-# Here we handle the default manufacturer of certain CPU types. It is in +-# some cases the only manufacturer, in others, it is the most popular. +- w89k) +- basic_machine=hppa1.1-winbond +- ;; +- op50n) +- basic_machine=hppa1.1-oki +- ;; +- op60c) +- basic_machine=hppa1.1-oki +- ;; +- romp) +- basic_machine=romp-ibm +- ;; +- mmix) +- basic_machine=mmix-knuth +- ;; +- rs6000) +- basic_machine=rs6000-ibm +- ;; +- vax) +- basic_machine=vax-dec +- ;; +- pdp10) +- # there are many clones, so DEC is not a safe bet +- basic_machine=pdp10-unknown +- ;; +- pdp11) +- basic_machine=pdp11-dec +- ;; +- we32k) +- basic_machine=we32k-att +- ;; +- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) +- basic_machine=sh-unknown +- ;; +- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +- basic_machine=sparc-sun +- ;; +- cydra) +- basic_machine=cydra-cydrome +- ;; +- orion) +- basic_machine=orion-highlevel +- ;; +- orion105) +- basic_machine=clipper-highlevel +- ;; +- mac | mpw | mac-mpw) +- basic_machine=m68k-apple +- ;; +- pmac | pmac-mpw) +- basic_machine=powerpc-apple +- ;; +- *-unknown) +- # Make sure to match an already-canonicalized machine name. +- ;; +- *) +- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +- exit 1 +- ;; +-esac +- +-# Here we canonicalize certain aliases for manufacturers. +-case $basic_machine in +- *-digital*) +- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +- ;; +- *-commodore*) +- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` +- ;; +- *) +- ;; +-esac +- +-# Decode manufacturer-specific aliases for certain operating systems. +- +-if [ x"$os" != x"" ] +-then +-case $os in +- # First match some system type aliases +- # that might get confused with valid system types. +- # -solaris* is a basic system type, with this one exception. +- -auroraux) +- os=-auroraux +- ;; +- -solaris1 | -solaris1.*) +- os=`echo $os | sed -e 's|solaris1|sunos4|'` +- ;; +- -solaris) +- os=-solaris2 +- ;; +- -svr4*) +- os=-sysv4 +- ;; +- -unixware*) +- os=-sysv4.2uw +- ;; +- -gnu/linux*) +- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` +- ;; +- # First accept the basic system types. +- # The portable systems comes first. +- # Each alternative MUST END IN A *, to match a version number. +- # -sysv* is not here because it comes later, after sysvr4. +- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ +- | -sym* | -kopensolaris* | -plan9* \ +- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* | -aros* \ +- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -bitrig* | -openbsd* | -solidbsd* \ +- | -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* \ +- | -linux-newlib* | -linux-musl* | -linux-uclibc* \ +- | -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* | -tirtos*) +- # Remember, each alternative MUST END IN *, to match a version number. +- ;; +- -qnx*) +- case $basic_machine in +- x86-* | i*86-*) +- ;; +- *) +- os=-nto$os +- ;; +- esac +- ;; +- -nto-qnx*) +- ;; +- -nto*) +- os=`echo $os | sed -e 's|nto|nto-qnx|'` +- ;; +- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ +- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) +- ;; +- -mac*) +- os=`echo $os | sed -e 's|mac|macos|'` +- ;; +- -linux-dietlibc) +- os=-linux-dietlibc +- ;; +- -linux*) +- os=`echo $os | sed -e 's|linux|linux-gnu|'` +- ;; +- -sunos5*) +- os=`echo $os | sed -e 's|sunos5|solaris2|'` +- ;; +- -sunos6*) +- os=`echo $os | sed -e 's|sunos6|solaris3|'` +- ;; +- -opened*) +- os=-openedition +- ;; +- -os400*) +- os=-os400 +- ;; +- -wince*) +- os=-wince +- ;; +- -osfrose*) +- os=-osfrose +- ;; +- -osf*) +- os=-osf +- ;; +- -utek*) +- os=-bsd +- ;; +- -dynix*) +- os=-bsd +- ;; +- -acis*) +- os=-aos +- ;; +- -atheos*) +- os=-atheos +- ;; +- -syllable*) +- os=-syllable +- ;; +- -386bsd) +- os=-bsd +- ;; +- -ctix* | -uts*) +- os=-sysv +- ;; +- -nova*) +- os=-rtmk-nova +- ;; +- -ns2 ) +- os=-nextstep2 +- ;; +- -nsk*) +- os=-nsk +- ;; +- # Preserve the version number of sinix5. +- -sinix5.*) +- os=`echo $os | sed -e 's|sinix|sysv|'` +- ;; +- -sinix*) +- os=-sysv4 +- ;; +- -tpf*) +- os=-tpf +- ;; +- -triton*) +- os=-sysv3 +- ;; +- -oss*) +- os=-sysv3 +- ;; +- -svr4) +- os=-sysv4 +- ;; +- -svr3) +- os=-sysv3 +- ;; +- -sysvr4) +- os=-sysv4 +- ;; +- # This must come after -sysvr4. +- -sysv*) +- ;; +- -ose*) +- os=-ose +- ;; +- -es1800*) +- os=-ose +- ;; +- -xenix) +- os=-xenix +- ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- os=-mint +- ;; +- -aros*) +- os=-aros +- ;; +- -zvmoe) +- os=-zvmoe +- ;; +- -dicos*) +- os=-dicos +- ;; +- -nacl*) +- ;; +- -none) +- ;; +- *) +- # Get rid of the `-' at the beginning of $os. +- os=`echo $os | sed 's/[^-]*-//'` +- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 +- exit 1 +- ;; +-esac +-else +- +-# Here we handle the default operating systems that come with various machines. +-# The value should be what the vendor currently ships out the door with their +-# machine or put another way, the most popular os provided with the machine. +- +-# Note that if you're going to try to match "-MANUFACTURER" here (say, +-# "-sun"), then you have to tell the case statement up towards the top +-# that MANUFACTURER isn't an operating system. Otherwise, code above +-# will signal an error saying that MANUFACTURER isn't an operating +-# system, and we'll never get to this point. +- +-case $basic_machine in +- score-*) +- os=-elf +- ;; +- spu-*) +- os=-elf +- ;; +- *-acorn) +- os=-riscix1.2 +- ;; +- arm*-rebel) +- os=-linux +- ;; +- arm*-semi) +- os=-aout +- ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; +- c8051-*) +- os=-elf +- ;; +- hexagon-*) +- os=-elf +- ;; +- tic54x-*) +- os=-coff +- ;; +- tic55x-*) +- os=-coff +- ;; +- tic6x-*) +- os=-coff +- ;; +- # This must come before the *-dec entry. +- pdp10-*) +- os=-tops20 +- ;; +- pdp11-*) +- os=-none +- ;; +- *-dec | vax-*) +- os=-ultrix4.2 +- ;; +- m68*-apollo) +- os=-domain +- ;; +- i386-sun) +- os=-sunos4.0.2 +- ;; +- m68000-sun) +- os=-sunos3 +- ;; +- m68*-cisco) +- os=-aout +- ;; +- mep-*) +- os=-elf +- ;; +- mips*-cisco) +- os=-elf +- ;; +- mips*-*) +- os=-elf +- ;; +- or32-*) +- os=-coff +- ;; +- *-tti) # must be before sparc entry or we get the wrong os. +- os=-sysv3 +- ;; +- sparc-* | *-sun) +- os=-sunos4.1.1 +- ;; +- *-be) +- os=-beos +- ;; +- *-haiku) +- os=-haiku +- ;; +- *-ibm) +- os=-aix +- ;; +- *-knuth) +- os=-mmixware +- ;; +- *-wec) +- os=-proelf +- ;; +- *-winbond) +- os=-proelf +- ;; +- *-oki) +- os=-proelf +- ;; +- *-hp) +- os=-hpux +- ;; +- *-hitachi) +- os=-hiux +- ;; +- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) +- os=-sysv +- ;; +- *-cbm) +- os=-amigaos +- ;; +- *-dg) +- os=-dgux +- ;; +- *-dolphin) +- os=-sysv3 +- ;; +- m68k-ccur) +- os=-rtu +- ;; +- m88k-omron*) +- os=-luna +- ;; +- *-next ) +- os=-nextstep +- ;; +- *-sequent) +- os=-ptx +- ;; +- *-crds) +- os=-unos +- ;; +- *-ns) +- os=-genix +- ;; +- i370-*) +- os=-mvs +- ;; +- *-next) +- os=-nextstep3 +- ;; +- *-gould) +- os=-sysv +- ;; +- *-highlevel) +- os=-bsd +- ;; +- *-encore) +- os=-bsd +- ;; +- *-sgi) +- os=-irix +- ;; +- *-siemens) +- os=-sysv4 +- ;; +- *-masscomp) +- os=-rtu +- ;; +- f30[01]-fujitsu | f700-fujitsu) +- os=-uxpv +- ;; +- *-rom68k) +- os=-coff +- ;; +- *-*bug) +- os=-coff +- ;; +- *-apple) +- os=-macos +- ;; +- *-atari*) +- os=-mint +- ;; +- *) +- os=-none +- ;; +-esac +-fi +- +-# Here we handle the case where we know the os, and the CPU type, but not the +-# manufacturer. We pick the logical manufacturer. +-vendor=unknown +-case $basic_machine in +- *-unknown) +- case $os in +- -riscix*) +- vendor=acorn +- ;; +- -sunos*) +- vendor=sun +- ;; +- -cnk*|-aix*) +- vendor=ibm +- ;; +- -beos*) +- vendor=be +- ;; +- -hpux*) +- vendor=hp +- ;; +- -mpeix*) +- vendor=hp +- ;; +- -hiux*) +- vendor=hitachi +- ;; +- -unos*) +- vendor=crds +- ;; +- -dgux*) +- vendor=dg +- ;; +- -luna*) +- vendor=omron +- ;; +- -genix*) +- vendor=ns +- ;; +- -mvs* | -opened*) +- vendor=ibm +- ;; +- -os400*) +- vendor=ibm +- ;; +- -ptx*) +- vendor=sequent +- ;; +- -tpf*) +- vendor=ibm +- ;; +- -vxsim* | -vxworks* | -windiss*) +- vendor=wrs +- ;; +- -aux*) +- vendor=apple +- ;; +- -hms*) +- vendor=hitachi +- ;; +- -mpw* | -macos*) +- vendor=apple +- ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- vendor=atari +- ;; +- -vos*) +- vendor=stratus +- ;; +- esac +- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` +- ;; +-esac +- +-echo $basic_machine$os +-exit +- +-# Local variables: +-# eval: (add-hook 'write-file-hooks 'time-stamp) +-# time-stamp-start: "timestamp='" +-# time-stamp-format: "%:y-%02m-%02d" +-# time-stamp-end: "'" +-# End: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/depcomp groff-1.22.3/src/libs/gnulib/build-aux/depcomp +--- groff-1.22.3.old/src/libs/gnulib/build-aux/depcomp 2014-11-04 10:38:35.646518734 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/depcomp 1970-01-01 02:00:00.000000000 +0200 +@@ -1,756 +0,0 @@ +-#! /bin/sh +-# depcomp - compile a program generating dependencies as side-effects +- +-scriptversion=2013-05-30.07; # UTC +- +-# Copyright (C) 1999-2013 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 . +- +-# 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. +- +-# Originally written by Alexandre Oliva . +- +-case $1 in +- '') +- echo "$0: No command. Try '$0 --help' for more information." 1>&2 +- exit 1; +- ;; +- -h | --h*) +- cat <<\EOF +-Usage: depcomp [--help] [--version] PROGRAM [ARGS] +- +-Run PROGRAMS ARGS to compile a file, generating dependencies +-as side-effects. +- +-Environment variables: +- depmode Dependency tracking mode. +- source Source file read by 'PROGRAMS ARGS'. +- object Object file output by 'PROGRAMS ARGS'. +- DEPDIR directory where to store dependencies. +- depfile Dependency file to output. +- tmpdepfile Temporary file to use when outputting dependencies. +- libtool Whether libtool is used (yes/no). +- +-Report bugs to . +-EOF +- exit $? +- ;; +- -v | --v*) +- echo "depcomp $scriptversion" +- exit $? +- ;; +-esac +- +-# Get the directory component of the given path, and save it in the +-# global variables '$dir'. Note that this directory component will +-# be either empty or ending with a '/' character. This is deliberate. +-set_dir_from () +-{ +- case $1 in +- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; +- *) dir=;; +- esac +-} +- +-# Get the suffix-stripped basename of the given path, and save it the +-# global variable '$base'. +-set_base_from () +-{ +- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +-} +- +-# If no dependency file was actually created by the compiler invocation, +-# we still have to create a dummy depfile, to avoid errors with the +-# Makefile "include basename.Plo" scheme. +-make_dummy_depfile () +-{ +- echo "#dummy" > "$depfile" +-} +- +-# Factor out some common post-processing of the generated depfile. +-# Requires the auxiliary global variable '$tmpdepfile' to be set. +-aix_post_process_depfile () +-{ +- # If the compiler actually managed to produce a dependency file, +- # post-process it. +- if test -f "$tmpdepfile"; then +- # Each line is of the form 'foo.o: dependency.h'. +- # Do two passes, one to just change these to +- # $object: dependency.h +- # and one to simply output +- # dependency.h: +- # which is needed to avoid the deleted-header problem. +- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" +- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" +- } > "$depfile" +- rm -f "$tmpdepfile" +- else +- make_dummy_depfile +- fi +-} +- +-# A tabulation character. +-tab=' ' +-# A newline character. +-nl=' +-' +-# Character ranges might be problematic outside the C locale. +-# These definitions help. +-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +-lower=abcdefghijklmnopqrstuvwxyz +-digits=0123456789 +-alpha=${upper}${lower} +- +-if test -z "$depmode" || test -z "$source" || test -z "$object"; then +- echo "depcomp: Variables source, object and depmode must be set" 1>&2 +- exit 1 +-fi +- +-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +-depfile=${depfile-`echo "$object" | +- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} +- +-rm -f "$tmpdepfile" +- +-# Avoid interferences from the environment. +-gccflag= dashmflag= +- +-# Some modes work just like other modes, but use different flags. We +-# parameterize here, but still list the modes in the big case below, +-# to make depend.m4 easier to write. Note that we *cannot* use a case +-# here, because this file can only contain one case statement. +-if test "$depmode" = hp; then +- # HP compiler uses -M and no extra arg. +- gccflag=-M +- depmode=gcc +-fi +- +-if test "$depmode" = dashXmstdout; then +- # This is just like dashmstdout with a different argument. +- dashmflag=-xM +- depmode=dashmstdout +-fi +- +-cygpath_u="cygpath -u -f -" +-if test "$depmode" = msvcmsys; then +- # This is just like msvisualcpp but w/o cygpath translation. +- # Just convert the backslash-escaped backslashes to single forward +- # slashes to satisfy depend.m4 +- cygpath_u='sed s,\\\\,/,g' +- depmode=msvisualcpp +-fi +- +-if test "$depmode" = msvc7msys; then +- # This is just like msvc7 but w/o cygpath translation. +- # Just convert the backslash-escaped backslashes to single forward +- # slashes to satisfy depend.m4 +- cygpath_u='sed s,\\\\,/,g' +- depmode=msvc7 +-fi +- +-if test "$depmode" = xlc; then +- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. +- gccflag=-qmakedep=gcc,-MF +- depmode=gcc +-fi +- +-case "$depmode" in +-gcc3) +-## gcc 3 implements dependency tracking that does exactly what +-## we want. Yay! Note: for some reason libtool 1.4 doesn't like +-## it if -MD -MP comes after the -MF stuff. Hmm. +-## Unfortunately, FreeBSD c89 acceptance of flags depends upon +-## the command line argument order; so add the flags where they +-## appear in depend2.am. Note that the slowdown incurred here +-## affects only configure: in makefiles, %FASTDEP% shortcuts this. +- for arg +- do +- case $arg in +- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; +- *) set fnord "$@" "$arg" ;; +- esac +- shift # fnord +- shift # $arg +- done +- "$@" +- stat=$? +- if test $stat -ne 0; then +- rm -f "$tmpdepfile" +- exit $stat +- fi +- mv "$tmpdepfile" "$depfile" +- ;; +- +-gcc) +-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +-## (see the conditional assignment to $gccflag above). +-## There are various ways to get dependency output from gcc. Here's +-## why we pick this rather obscure method: +-## - Don't want to use -MD because we'd like the dependencies to end +-## up in a subdir. Having to rename by hand is ugly. +-## (We might end up doing this anyway to support other compilers.) +-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +-## -MM, not -M (despite what the docs say). Also, it might not be +-## supported by the other compilers which use the 'gcc' depmode. +-## - Using -M directly means running the compiler twice (even worse +-## than renaming). +- if test -z "$gccflag"; then +- gccflag=-MD, +- fi +- "$@" -Wp,"$gccflag$tmpdepfile" +- stat=$? +- if test $stat -ne 0; then +- rm -f "$tmpdepfile" +- exit $stat +- fi +- rm -f "$depfile" +- echo "$object : \\" > "$depfile" +- # The second -e expression handles DOS-style file names with drive +- # letters. +- sed -e 's/^[^:]*: / /' \ +- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +-## This next piece of magic avoids the "deleted header file" problem. +-## The problem is that when a header file which appears in a .P file +-## is deleted, the dependency causes make to die (because there is +-## typically no way to rebuild the header). We avoid this by adding +-## dummy dependencies for each header file. Too bad gcc doesn't do +-## this for us directly. +-## Some versions of gcc put a space before the ':'. On the theory +-## that the space means something, we add a space to the output as +-## well. hp depmode also adds that space, but also prefixes the VPATH +-## to the object. Take care to not repeat it in the output. +-## Some versions of the HPUX 10.20 sed can't process this invocation +-## correctly. Breaking it into two sed invocations is a workaround. +- tr ' ' "$nl" < "$tmpdepfile" \ +- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ +- | sed -e 's/$/ :/' >> "$depfile" +- rm -f "$tmpdepfile" +- ;; +- +-hp) +- # This case exists only to let depend.m4 do its work. It works by +- # looking at the text of this script. This case will never be run, +- # since it is checked for above. +- exit 1 +- ;; +- +-xlc) +- # This case exists only to let depend.m4 do its work. It works by +- # looking at the text of this script. This case will never be run, +- # since it is checked for above. +- exit 1 +- ;; +- +-aix) +- # The C for AIX Compiler uses -M and outputs the dependencies +- # in a .u file. In older versions, this file always lives in the +- # current directory. Also, the AIX compiler puts '$object:' at the +- # start of each line; $object doesn't have directory information. +- # Version 6 uses the directory in both cases. +- set_dir_from "$object" +- set_base_from "$object" +- if test "$libtool" = yes; then +- tmpdepfile1=$dir$base.u +- tmpdepfile2=$base.u +- tmpdepfile3=$dir.libs/$base.u +- "$@" -Wc,-M +- else +- tmpdepfile1=$dir$base.u +- tmpdepfile2=$dir$base.u +- tmpdepfile3=$dir$base.u +- "$@" -M +- fi +- stat=$? +- if test $stat -ne 0; then +- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" +- exit $stat +- fi +- +- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" +- do +- test -f "$tmpdepfile" && break +- done +- aix_post_process_depfile +- ;; +- +-tcc) +- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 +- # FIXME: That version still under development at the moment of writing. +- # Make that this statement remains true also for stable, released +- # versions. +- # It will wrap lines (doesn't matter whether long or short) with a +- # trailing '\', as in: +- # +- # foo.o : \ +- # foo.c \ +- # foo.h \ +- # +- # It will put a trailing '\' even on the last line, and will use leading +- # spaces rather than leading tabs (at least since its commit 0394caf7 +- # "Emit spaces for -MD"). +- "$@" -MD -MF "$tmpdepfile" +- stat=$? +- if test $stat -ne 0; then +- rm -f "$tmpdepfile" +- exit $stat +- fi +- rm -f "$depfile" +- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. +- # We have to change lines of the first kind to '$object: \'. +- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" +- # And for each line of the second kind, we have to emit a 'dep.h:' +- # dummy dependency, to avoid the deleted-header problem. +- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" +- rm -f "$tmpdepfile" +- ;; +- +-## The order of this option in the case statement is important, since the +-## shell code in configure will try each of these formats in the order +-## listed in this file. A plain '-MD' option would be understood by many +-## compilers, so we must ensure this comes after the gcc and icc options. +-pgcc) +- # Portland's C compiler understands '-MD'. +- # Will always output deps to 'file.d' where file is the root name of the +- # source file under compilation, even if file resides in a subdirectory. +- # The object file name does not affect the name of the '.d' file. +- # pgcc 10.2 will output +- # foo.o: sub/foo.c sub/foo.h +- # and will wrap long lines using '\' : +- # foo.o: sub/foo.c ... \ +- # sub/foo.h ... \ +- # ... +- set_dir_from "$object" +- # Use the source, not the object, to determine the base name, since +- # that's sadly what pgcc will do too. +- set_base_from "$source" +- tmpdepfile=$base.d +- +- # For projects that build the same source file twice into different object +- # files, the pgcc approach of using the *source* file root name can cause +- # problems in parallel builds. Use a locking strategy to avoid stomping on +- # the same $tmpdepfile. +- lockdir=$base.d-lock +- trap " +- echo '$0: caught signal, cleaning up...' >&2 +- rmdir '$lockdir' +- exit 1 +- " 1 2 13 15 +- numtries=100 +- i=$numtries +- while test $i -gt 0; do +- # mkdir is a portable test-and-set. +- if mkdir "$lockdir" 2>/dev/null; then +- # This process acquired the lock. +- "$@" -MD +- stat=$? +- # Release the lock. +- rmdir "$lockdir" +- break +- else +- # If the lock is being held by a different process, wait +- # until the winning process is done or we timeout. +- while test -d "$lockdir" && test $i -gt 0; do +- sleep 1 +- i=`expr $i - 1` +- done +- fi +- i=`expr $i - 1` +- done +- trap - 1 2 13 15 +- if test $i -le 0; then +- echo "$0: failed to acquire lock after $numtries attempts" >&2 +- echo "$0: check lockdir '$lockdir'" >&2 +- exit 1 +- fi +- +- if test $stat -ne 0; then +- rm -f "$tmpdepfile" +- exit $stat +- fi +- rm -f "$depfile" +- # Each line is of the form `foo.o: dependent.h', +- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. +- # Do two passes, one to just change these to +- # `$object: dependent.h' and one to simply `dependent.h:'. +- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" +- # Some versions of the HPUX 10.20 sed can't process this invocation +- # correctly. Breaking it into two sed invocations is a workaround. +- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ +- | sed -e 's/$/ :/' >> "$depfile" +- rm -f "$tmpdepfile" +- ;; +- +-hp2) +- # The "hp" stanza above does not work with aCC (C++) and HP's ia64 +- # compilers, which have integrated preprocessors. The correct option +- # to use with these is +Maked; it writes dependencies to a file named +- # 'foo.d', which lands next to the object file, wherever that +- # happens to be. +- # Much of this is similar to the tru64 case; see comments there. +- set_dir_from "$object" +- set_base_from "$object" +- if test "$libtool" = yes; then +- tmpdepfile1=$dir$base.d +- tmpdepfile2=$dir.libs/$base.d +- "$@" -Wc,+Maked +- else +- tmpdepfile1=$dir$base.d +- tmpdepfile2=$dir$base.d +- "$@" +Maked +- fi +- stat=$? +- if test $stat -ne 0; then +- rm -f "$tmpdepfile1" "$tmpdepfile2" +- exit $stat +- fi +- +- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" +- do +- test -f "$tmpdepfile" && break +- done +- if test -f "$tmpdepfile"; then +- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" +- # Add 'dependent.h:' lines. +- sed -ne '2,${ +- s/^ *// +- s/ \\*$// +- s/$/:/ +- p +- }' "$tmpdepfile" >> "$depfile" +- else +- make_dummy_depfile +- fi +- rm -f "$tmpdepfile" "$tmpdepfile2" +- ;; +- +-tru64) +- # The Tru64 compiler uses -MD to generate dependencies as a side +- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. +- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put +- # dependencies in 'foo.d' instead, so we check for that too. +- # Subdirectories are respected. +- set_dir_from "$object" +- set_base_from "$object" +- +- if test "$libtool" = yes; then +- # Libtool generates 2 separate objects for the 2 libraries. These +- # two compilations output dependencies in $dir.libs/$base.o.d and +- # in $dir$base.o.d. We have to check for both files, because +- # one of the two compilations can be disabled. We should prefer +- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is +- # automatically cleaned when .libs/ is deleted, while ignoring +- # the former would cause a distcleancheck panic. +- tmpdepfile1=$dir$base.o.d # libtool 1.5 +- tmpdepfile2=$dir.libs/$base.o.d # Likewise. +- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 +- "$@" -Wc,-MD +- else +- tmpdepfile1=$dir$base.d +- tmpdepfile2=$dir$base.d +- tmpdepfile3=$dir$base.d +- "$@" -MD +- fi +- +- stat=$? +- if test $stat -ne 0; then +- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" +- exit $stat +- fi +- +- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" +- do +- test -f "$tmpdepfile" && break +- done +- # Same post-processing that is required for AIX mode. +- aix_post_process_depfile +- ;; +- +-msvc7) +- if test "$libtool" = yes; then +- showIncludes=-Wc,-showIncludes +- else +- showIncludes=-showIncludes +- fi +- "$@" $showIncludes > "$tmpdepfile" +- stat=$? +- grep -v '^Note: including file: ' "$tmpdepfile" +- if test $stat -ne 0; then +- rm -f "$tmpdepfile" +- exit $stat +- fi +- rm -f "$depfile" +- echo "$object : \\" > "$depfile" +- # The first sed program below extracts the file names and escapes +- # backslashes for cygpath. The second sed program outputs the file +- # name when reading, but also accumulates all include files in the +- # hold buffer in order to output them again at the end. This only +- # works with sed implementations that can handle large buffers. +- sed < "$tmpdepfile" -n ' +-/^Note: including file: *\(.*\)/ { +- s//\1/ +- s/\\/\\\\/g +- p +-}' | $cygpath_u | sort -u | sed -n ' +-s/ /\\ /g +-s/\(.*\)/'"$tab"'\1 \\/p +-s/.\(.*\) \\/\1:/ +-H +-$ { +- s/.*/'"$tab"'/ +- G +- p +-}' >> "$depfile" +- echo >> "$depfile" # make sure the fragment doesn't end with a backslash +- rm -f "$tmpdepfile" +- ;; +- +-msvc7msys) +- # This case exists only to let depend.m4 do its work. It works by +- # looking at the text of this script. This case will never be run, +- # since it is checked for above. +- exit 1 +- ;; +- +-#nosideeffect) +- # This comment above is used by automake to tell side-effect +- # dependency tracking mechanisms from slower ones. +- +-dashmstdout) +- # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout, regardless of -o. +- "$@" || exit $? +- +- # Remove the call to Libtool. +- if test "$libtool" = yes; then +- while test "X$1" != 'X--mode=compile'; do +- shift +- done +- shift +- fi +- +- # Remove '-o $object'. +- IFS=" " +- for arg +- do +- case $arg in +- -o) +- shift +- ;; +- $object) +- shift +- ;; +- *) +- set fnord "$@" "$arg" +- shift # fnord +- shift # $arg +- ;; +- esac +- done +- +- test -z "$dashmflag" && dashmflag=-M +- # Require at least two characters before searching for ':' +- # in the target name. This is to cope with DOS-style filenames: +- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. +- "$@" $dashmflag | +- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" +- rm -f "$depfile" +- cat < "$tmpdepfile" > "$depfile" +- # Some versions of the HPUX 10.20 sed can't process this sed invocation +- # correctly. Breaking it into two sed invocations is a workaround. +- tr ' ' "$nl" < "$tmpdepfile" \ +- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ +- | sed -e 's/$/ :/' >> "$depfile" +- rm -f "$tmpdepfile" +- ;; +- +-dashXmstdout) +- # This case only exists to satisfy depend.m4. It is never actually +- # run, as this mode is specially recognized in the preamble. +- exit 1 +- ;; +- +-makedepend) +- "$@" || exit $? +- # Remove any Libtool call +- if test "$libtool" = yes; then +- while test "X$1" != 'X--mode=compile'; do +- shift +- done +- shift +- fi +- # X makedepend +- shift +- cleared=no eat=no +- for arg +- do +- case $cleared in +- no) +- set ""; shift +- cleared=yes ;; +- esac +- if test $eat = yes; then +- eat=no +- continue +- fi +- case "$arg" in +- -D*|-I*) +- set fnord "$@" "$arg"; shift ;; +- # Strip any option that makedepend may not understand. Remove +- # the object too, otherwise makedepend will parse it as a source file. +- -arch) +- eat=yes ;; +- -*|$object) +- ;; +- *) +- set fnord "$@" "$arg"; shift ;; +- esac +- done +- obj_suffix=`echo "$object" | sed 's/^.*\././'` +- touch "$tmpdepfile" +- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" +- rm -f "$depfile" +- # makedepend may prepend the VPATH from the source file name to the object. +- # No need to regex-escape $object, excess matching of '.' is harmless. +- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" +- # Some versions of the HPUX 10.20 sed can't process the last invocation +- # correctly. Breaking it into two sed invocations is a workaround. +- sed '1,2d' "$tmpdepfile" \ +- | tr ' ' "$nl" \ +- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ +- | sed -e 's/$/ :/' >> "$depfile" +- rm -f "$tmpdepfile" "$tmpdepfile".bak +- ;; +- +-cpp) +- # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout. +- "$@" || exit $? +- +- # Remove the call to Libtool. +- if test "$libtool" = yes; then +- while test "X$1" != 'X--mode=compile'; do +- shift +- done +- shift +- fi +- +- # Remove '-o $object'. +- IFS=" " +- for arg +- do +- case $arg in +- -o) +- shift +- ;; +- $object) +- shift +- ;; +- *) +- set fnord "$@" "$arg" +- shift # fnord +- shift # $arg +- ;; +- esac +- done +- +- "$@" -E \ +- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ +- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ +- | sed '$ s: \\$::' > "$tmpdepfile" +- rm -f "$depfile" +- echo "$object : \\" > "$depfile" +- cat < "$tmpdepfile" >> "$depfile" +- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" +- rm -f "$tmpdepfile" +- ;; +- +-msvisualcpp) +- # Important note: in order to support this mode, a compiler *must* +- # always write the preprocessed file to stdout. +- "$@" || exit $? +- +- # Remove the call to Libtool. +- if test "$libtool" = yes; then +- while test "X$1" != 'X--mode=compile'; do +- shift +- done +- shift +- fi +- +- IFS=" " +- for arg +- do +- case "$arg" in +- -o) +- shift +- ;; +- $object) +- shift +- ;; +- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") +- set fnord "$@" +- shift +- shift +- ;; +- *) +- set fnord "$@" "$arg" +- shift +- shift +- ;; +- esac +- done +- "$@" -E 2>/dev/null | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" +- rm -f "$depfile" +- echo "$object : \\" > "$depfile" +- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" +- echo "$tab" >> "$depfile" +- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" +- rm -f "$tmpdepfile" +- ;; +- +-msvcmsys) +- # This case exists only to let depend.m4 do its work. It works by +- # looking at the text of this script. This case will never be run, +- # since it is checked for above. +- exit 1 +- ;; +- +-none) +- exec "$@" +- ;; +- +-*) +- echo "Unknown depmode $depmode" 1>&2 +- exit 1 +- ;; +-esac +- +-exit 0 +- +-# 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 -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/install-sh groff-1.22.3/src/libs/gnulib/build-aux/install-sh +--- groff-1.22.3.old/src/libs/gnulib/build-aux/install-sh 2014-11-04 10:38:35.646518734 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/install-sh 1970-01-01 02:00:00.000000000 +0200 +@@ -1,501 +0,0 @@ +-#!/bin/sh +-# install - install a program, script, or datafile +- +-scriptversion=2013-12-25.23; # UTC +- +-# This originates from X11R5 (mit/util/scripts/install.sh), which was +-# later released in X11R6 (xc/config/util/install.sh) with the +-# following copyright and license. +-# +-# Copyright (C) 1994 X Consortium +-# +-# Permission is hereby granted, free of charge, to any person obtaining a copy +-# of this software and associated documentation files (the "Software"), to +-# deal in the Software without restriction, including without limitation the +-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +-# sell copies of the Software, and to permit persons to whom the Software is +-# furnished to do so, subject to the following conditions: +-# +-# The above copyright notice and this permission notice shall be included in +-# all copies or substantial portions of the Software. +-# +-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-# +-# Except as contained in this notice, the name of the X Consortium shall not +-# be used in advertising or otherwise to promote the sale, use or other deal- +-# ings in this Software without prior written authorization from the X Consor- +-# tium. +-# +-# +-# FSF changes to this file are in the public domain. +-# +-# Calling this script install-sh is preferred over install.sh, to prevent +-# 'make' implicit rules from creating a file called install from it +-# when there is no Makefile. +-# +-# This script is compatible with the BSD install script, but was written +-# from scratch. +- +-tab=' ' +-nl=' +-' +-IFS=" $tab$nl" +- +-# Set DOITPROG to "echo" to test this script. +- +-doit=${DOITPROG-} +-doit_exec=${doit:-exec} +- +-# Put in absolute file names if you don't have them in your path; +-# or use environment vars. +- +-chgrpprog=${CHGRPPROG-chgrp} +-chmodprog=${CHMODPROG-chmod} +-chownprog=${CHOWNPROG-chown} +-cmpprog=${CMPPROG-cmp} +-cpprog=${CPPROG-cp} +-mkdirprog=${MKDIRPROG-mkdir} +-mvprog=${MVPROG-mv} +-rmprog=${RMPROG-rm} +-stripprog=${STRIPPROG-strip} +- +-posix_mkdir= +- +-# Desired mode of installed file. +-mode=0755 +- +-chgrpcmd= +-chmodcmd=$chmodprog +-chowncmd= +-mvcmd=$mvprog +-rmcmd="$rmprog -f" +-stripcmd= +- +-src= +-dst= +-dir_arg= +-dst_arg= +- +-copy_on_change=false +-is_target_a_directory=possibly +- +-usage="\ +-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +- or: $0 [OPTION]... SRCFILES... DIRECTORY +- or: $0 [OPTION]... -t DIRECTORY SRCFILES... +- or: $0 [OPTION]... -d DIRECTORIES... +- +-In the 1st form, copy SRCFILE to DSTFILE. +-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +-In the 4th, create DIRECTORIES. +- +-Options: +- --help display this help and exit. +- --version display version info and exit. +- +- -c (ignored) +- -C install only if different (preserve the last data modification time) +- -d create directories instead of installing files. +- -g GROUP $chgrpprog installed files to GROUP. +- -m MODE $chmodprog installed files to MODE. +- -o USER $chownprog installed files to USER. +- -s $stripprog installed files. +- -t DIRECTORY install into DIRECTORY. +- -T report an error if DSTFILE is a directory. +- +-Environment variables override the default commands: +- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG +- RMPROG STRIPPROG +-" +- +-while test $# -ne 0; do +- case $1 in +- -c) ;; +- +- -C) copy_on_change=true;; +- +- -d) dir_arg=true;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift;; +- +- --help) echo "$usage"; exit $?;; +- +- -m) mode=$2 +- case $mode in +- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) +- echo "$0: invalid mode: $mode" >&2 +- exit 1;; +- esac +- shift;; +- +- -o) chowncmd="$chownprog $2" +- shift;; +- +- -s) stripcmd=$stripprog;; +- +- -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) is_target_a_directory=never;; +- +- --version) echo "$0 $scriptversion"; exit $?;; +- +- --) shift +- break;; +- +- -*) 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. +- # Otherwise, the last argument is the destination. Remove it from $@. +- for arg +- do +- if test -n "$dst_arg"; then +- # $@ is not empty: it contains at least $arg. +- set fnord "$@" "$dst_arg" +- shift # fnord +- fi +- shift # arg +- dst_arg=$arg +- # Protect names problematic for 'test' and other utilities. +- case $dst_arg in +- -* | [=\(\)!]) dst_arg=./$dst_arg;; +- esac +- done +-fi +- +-if test $# -eq 0; then +- if test -z "$dir_arg"; then +- echo "$0: no input file specified." >&2 +- exit 1 +- fi +- # It's OK to call 'install-sh -d' without argument. +- # This can happen when creating conditional directories. +- exit 0 +-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 +- trap "ret=141; $do_exit" 13 +- trap "ret=143; $do_exit" 15 +- +- # Set umask so as not to create temps with too-generous modes. +- # However, 'strip' requires both read and write access to temps. +- case $mode in +- # Optimize common cases. +- *644) cp_umask=133;; +- *755) cp_umask=22;; +- +- *[0-7]) +- if test -z "$stripcmd"; then +- u_plus_rw= +- else +- u_plus_rw='% 200' +- fi +- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; +- *) +- if test -z "$stripcmd"; then +- u_plus_rw= +- else +- u_plus_rw=,u+rw +- fi +- cp_umask=$mode$u_plus_rw;; +- esac +-fi +- +-for src +-do +- # Protect names problematic for 'test' and other utilities. +- case $src in +- -* | [=\(\)!]) src=./$src;; +- esac +- +- if test -n "$dir_arg"; then +- dst=$src +- dstdir=$dst +- test -d "$dstdir" +- dstdir_status=$? +- else +- +- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command +- # might cause directories to be created, which would be especially bad +- # if $src (and thus $dsttmp) contains '*'. +- if test ! -f "$src" && test ! -d "$src"; then +- echo "$0: $src does not exist." >&2 +- exit 1 +- fi +- +- if test -z "$dst_arg"; then +- echo "$0: no destination specified." >&2 +- exit 1 +- fi +- dst=$dst_arg +- +- # 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 "$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 +- dstdir=`dirname "$dst"` +- test -d "$dstdir" +- dstdir_status=$? +- fi +- fi +- +- obsolete_mkdir_used=false +- +- 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;; +- esac +- +- if +- $posix_mkdir && ( +- umask $mkdir_umask && +- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" +- ) +- then : +- else +- +- # The umask is ridiculous, or mkdir does not conform to POSIX, +- # or it failed possibly due to a race condition. Create the +- # directory the slow way, step by step, checking for races as we go. +- +- case $dstdir in +- /*) prefix='/';; +- [-=\(\)!]*) prefix='./';; +- *) prefix='';; +- esac +- +- oIFS=$IFS +- IFS=/ +- set -f +- set fnord $dstdir +- shift +- 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/ +- 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 +- fi +- fi +- fi +- +- if test -n "$dir_arg"; then +- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && +- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && +- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || +- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 +- else +- +- # Make a couple of temp file names in the proper directory. +- dsttmp=$dstdir/_inst.$$_ +- rmtmp=$dstdir/_rm.$$_ +- +- # Trap to clean up those temp files at exit. +- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 +- +- # Copy the file name to the temp name. +- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && +- +- # and set any options; do chmod last to preserve setuid bits. +- # +- # If any of these fail, we abort the whole thing. If we want to +- # ignore errors from any of these, just make sure not to ignore +- # errors from the above "$doit $cpprog $src $dsttmp" command. +- # +- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && +- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && +- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && +- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && +- +- # 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` && +- set -f && +- set X $old && old=:$2:$4:$5:$6 && +- set X $new && new=:$2:$4:$5:$6 && +- set +f && +- test "$old" = "$new" && +- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 +- then +- rm -f "$dsttmp" +- else +- # Rename the file to the real destination. +- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || +- +- # The rename failed, perhaps because mv can't rename something else +- # 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" +- } +- fi || exit 1 +- +- trap '' 0 +- fi +-done +- +-# Local variables: +-# 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 -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/missing groff-1.22.3/src/libs/gnulib/build-aux/missing +--- groff-1.22.3.old/src/libs/gnulib/build-aux/missing 2014-11-04 10:38:35.646518734 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/missing 1970-01-01 02:00:00.000000000 +0200 +@@ -1,330 +0,0 @@ +-#! /bin/sh +-# Common stub for a few missing GNU programs while installing. +- +-scriptversion=2014-09-17.17; # UTC +- +-# Copyright (C) 1996-2014 Free Software Foundation, Inc. +-# Originally by Fran,cois Pinard , 1996. +- +-# 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 . +- +-# 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. +- +-if test $# -eq 0; then +- echo 1>&2 "Try '$0 --help' for more information" +- exit 1 +-fi +- +-run=: +-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +-sed_minuso='s/.* -o \([^ ]*\).*/\1/p' +- +-# In the cases where this matters, 'missing' is being run in the +-# srcdir already. +-if test -f configure.ac; then +- configure_ac=configure.ac +-else +- configure_ac=configure.in +-fi +- +-msg="missing on your system" +- +-case $1 in +---run) +- # Try to run requested program, and just exit if it succeeds. +- run= +- shift +- "$@" && exit 0 +- # Exit code 63 means version mismatch. This often happens +- # when the user try to use an ancient version of a tool on +- # a file that requires a minimum version. In this case we +- # we should proceed has if the program had been absent, or +- # if --run hadn't been passed. +- if test $? = 63; then +- run=: +- msg="probably too old" +- fi +- ;; +- +- -h|--h|--he|--hel|--help) +- echo "\ +-$0 [OPTION]... PROGRAM [ARGUMENT]... +- +-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +-error status if there is no known handling for PROGRAM. +- +-Options: +- -h, --help display this help and exit +- -v, --version output version information and exit +- --run try to run the given command, and emulate it if it fails +- +-Supported PROGRAM values: +- aclocal touch file 'aclocal.m4' +- autoconf touch file 'configure' +- autoheader touch file 'config.h.in' +- autom4te touch the output file, or create a stub one +- automake touch all 'Makefile.in' files +- bison create 'y.tab.[ch]', if possible, from existing .[ch] +- flex create 'lex.yy.c', if possible, from existing .c +- help2man touch the output file +- lex create 'lex.yy.c', if possible, from existing .c +- makeinfo touch the output file +- yacc create 'y.tab.[ch]', if possible, from existing .[ch] +- +-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +-'g' are ignored when checking the name. +- +-Send bug reports to ." +- exit $? +- ;; +- +- -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing $scriptversion (GNU Automake)" +- exit $? +- ;; +- +- -*) +- echo 1>&2 "$0: Unknown '$1' option" +- echo 1>&2 "Try '$0 --help' for more information" +- exit 1 +- ;; +- +-esac +- +-# normalize program name to check for. +-program=`echo "$1" | sed ' +- s/^gnu-//; t +- s/^gnu//; t +- s/^g//; t'` +- +-# Now exit if we have it, but it failed. Also exit now if we +-# don't have it and --version was passed (most likely to detect +-# the program). This is about non-GNU programs, so use $1 not +-# $program. +-case $1 in +- lex*|yacc*) +- # Not GNU programs, they don't have --version. +- ;; +- +- *) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then +- # Could not run --version or --help. This is probably someone +- # running '$TOOL --version' or '$TOOL --help' to check whether +- # $TOOL exists and not knowing $TOOL uses missing. +- exit 1 +- fi +- ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case $program in +- aclocal*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified 'acinclude.m4' or '${configure_ac}'. You might want +- to install the Automake and Perl packages. Grab them from +- any GNU archive site." +- touch aclocal.m4 +- ;; +- +- autoconf*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified '${configure_ac}'. You might want to install the +- Autoconf and GNU m4 packages. Grab them from any GNU +- archive site." +- touch configure +- ;; +- +- autoheader*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified 'acconfig.h' or '${configure_ac}'. You might want +- to install the Autoconf and GNU m4 packages. Grab them +- from any GNU archive site." +- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` +- test -z "$files" && files="config.h" +- touch_files= +- for f in $files; do +- case $f in +- *:*) touch_files="$touch_files "`echo "$f" | +- sed -e 's/^[^:]*://' -e 's/:.*//'`;; +- *) touch_files="$touch_files $f.in";; +- esac +- done +- touch $touch_files +- ;; +- +- automake*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. +- You might want to install the Automake and Perl packages. +- Grab them from any GNU archive site." +- find . -type f -name Makefile.am -print | +- sed 's/\.am$/.in/' | +- while read f; do touch "$f"; done +- ;; +- +- autom4te*) +- echo 1>&2 "\ +-WARNING: '$1' is needed, but is $msg. +- You might have modified some files without having the +- proper tools for further handling them. +- You can get '$1' as part of Autoconf from any GNU +- archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo "#! /bin/sh" +- echo "# Created by GNU Automake missing as a replacement of" +- echo "# $ $@" +- echo "exit 0" +- chmod +x $file +- exit 1 +- fi +- ;; +- +- bison*|yacc*) +- echo 1>&2 "\ +-WARNING: '$1' $msg. You should only need it if +- you modified a '.y' file. You may need the Bison package +- in order for those modifications to take effect. You can get +- Bison from any GNU archive site." +- rm -f y.tab.c y.tab.h +- if test $# -ne 1; then +- eval LASTARG=\${$#} +- case $LASTARG in +- *.y) +- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.c +- fi +- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" y.tab.h +- fi +- ;; +- esac +- fi +- if test ! -f y.tab.h; then +- echo >y.tab.h +- fi +- if test ! -f y.tab.c; then +- echo 'main() { return 0; }' >y.tab.c +- fi +- ;; +- +- lex*|flex*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified a '.l' file. You may need the Flex package +- in order for those modifications to take effect. You can get +- Flex from any GNU archive site." +- rm -f lex.yy.c +- if test $# -ne 1; then +- eval LASTARG=\${$#} +- case $LASTARG in +- *.l) +- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if test -f "$SRCFILE"; then +- cp "$SRCFILE" lex.yy.c +- fi +- ;; +- esac +- fi +- if test ! -f lex.yy.c; then +- echo 'main() { return 0; }' >lex.yy.c +- fi +- ;; +- +- help2man*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified a dependency of a manual page. You may need the +- Help2man package in order for those modifications to take +- effect. You can get Help2man from any GNU archive site." +- +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -f "$file"; then +- touch $file +- else +- test -z "$file" || exec >$file +- echo ".ab help2man is required to generate this page" +- exit $? +- fi +- ;; +- +- makeinfo*) +- echo 1>&2 "\ +-WARNING: '$1' is $msg. You should only need it if +- you modified a '.texi' or '.texinfo' file, or any other file +- indirectly affecting the aspect of the manual. The spurious +- call might also be the consequence of using a buggy 'make' (AIX, +- DU, IRIX). You might want to install the Texinfo package or +- the GNU make package. Grab either from any GNU archive site." +- # The file to touch is that specified with -o ... +- file=`echo "$*" | sed -n "$sed_output"` +- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` +- if test -z "$file"; then +- # ... or it is the one specified with @setfilename ... +- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n ' +- /^@setfilename/{ +- s/.* \([^ ]*\) *$/\1/ +- p +- q +- }' $infile` +- # ... or it is derived from the source name (dir/f.texi becomes f.info) +- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info +- fi +- # If the file does not exist, the user really needs makeinfo; +- # let's fail without touching anything. +- test -f $file || exit 1 +- touch $file +- ;; +- +- *) +- echo 1>&2 "\ +-WARNING: '$1' is needed, and is $msg. +- You might have modified some files without having the +- proper tools for further handling them. Check the 'README' file, +- it often tells you about the needed prerequisites for installing +- this package. You may also peek at any GNU archive site, in case +- some other package would contain this missing '$1' program." +- exit 1 +- ;; +-esac +- +-exit 0 +- +-# Local variables: +-# 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 -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/snippet/arg-nonnull.h groff-1.22.3/src/libs/gnulib/build-aux/snippet/arg-nonnull.h +--- groff-1.22.3.old/src/libs/gnulib/build-aux/snippet/arg-nonnull.h 2014-11-04 10:38:35.650518684 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/snippet/arg-nonnull.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,26 +0,0 @@ +-/* A C macro for declaring that specific arguments must not be NULL. +- Copyright (C) 2009-2014 Free Software Foundation, Inc. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools +- that the values passed as arguments n, ..., m must be non-NULL pointers. +- n = 1 stands for the first argument, n = 2 for the second argument etc. */ +-#ifndef _GL_ARG_NONNULL +-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 +-# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) +-# else +-# define _GL_ARG_NONNULL(params) +-# endif +-#endif +diff -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/snippet/c++defs.h groff-1.22.3/src/libs/gnulib/build-aux/snippet/c++defs.h +--- groff-1.22.3.old/src/libs/gnulib/build-aux/snippet/c++defs.h 2014-11-04 10:38:35.650518684 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/snippet/c++defs.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,271 +0,0 @@ +-/* C++ compatible function declaration macros. +- Copyright (C) 2010-2014 Free Software Foundation, Inc. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-#ifndef _GL_CXXDEFS_H +-#define _GL_CXXDEFS_H +- +-/* The three most frequent use cases of these macros are: +- +- * For providing a substitute for a function that is missing on some +- platforms, but is declared and works fine on the platforms on which +- it exists: +- +- #if @GNULIB_FOO@ +- # if !@HAVE_FOO@ +- _GL_FUNCDECL_SYS (foo, ...); +- # endif +- _GL_CXXALIAS_SYS (foo, ...); +- _GL_CXXALIASWARN (foo); +- #elif defined GNULIB_POSIXCHECK +- ... +- #endif +- +- * For providing a replacement for a function that exists on all platforms, +- but is broken/insufficient and needs to be replaced on some platforms: +- +- #if @GNULIB_FOO@ +- # if @REPLACE_FOO@ +- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +- # undef foo +- # define foo rpl_foo +- # endif +- _GL_FUNCDECL_RPL (foo, ...); +- _GL_CXXALIAS_RPL (foo, ...); +- # else +- _GL_CXXALIAS_SYS (foo, ...); +- # endif +- _GL_CXXALIASWARN (foo); +- #elif defined GNULIB_POSIXCHECK +- ... +- #endif +- +- * For providing a replacement for a function that exists on some platforms +- but is broken/insufficient and needs to be replaced on some of them and +- is additionally either missing or undeclared on some other platforms: +- +- #if @GNULIB_FOO@ +- # if @REPLACE_FOO@ +- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +- # undef foo +- # define foo rpl_foo +- # endif +- _GL_FUNCDECL_RPL (foo, ...); +- _GL_CXXALIAS_RPL (foo, ...); +- # else +- # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ +- _GL_FUNCDECL_SYS (foo, ...); +- # endif +- _GL_CXXALIAS_SYS (foo, ...); +- # endif +- _GL_CXXALIASWARN (foo); +- #elif defined GNULIB_POSIXCHECK +- ... +- #endif +-*/ +- +-/* _GL_EXTERN_C declaration; +- performs the declaration with C linkage. */ +-#if defined __cplusplus +-# define _GL_EXTERN_C extern "C" +-#else +-# define _GL_EXTERN_C extern +-#endif +- +-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); +- declares a replacement function, named rpl_func, with the given prototype, +- consisting of return type, parameters, and attributes. +- Example: +- _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) +- _GL_ARG_NONNULL ((1))); +- */ +-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ +- _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) +-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ +- _GL_EXTERN_C rettype rpl_func parameters_and_attributes +- +-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); +- declares the system function, named func, with the given prototype, +- consisting of return type, parameters, and attributes. +- Example: +- _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) +- _GL_ARG_NONNULL ((1))); +- */ +-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ +- _GL_EXTERN_C rettype func parameters_and_attributes +- +-/* _GL_CXXALIAS_RPL (func, rettype, parameters); +- declares a C++ alias called GNULIB_NAMESPACE::func +- that redirects to rpl_func, if GNULIB_NAMESPACE is defined. +- Example: +- _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); +- */ +-#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ +- _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- rettype (*const func) parameters = ::rpl_func; \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); +- is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); +- except that the C function rpl_func may have a slightly different +- declaration. A cast is used to silence the "invalid conversion" error +- that would otherwise occur. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- rettype (*const func) parameters = \ +- reinterpret_cast(::rpl_func); \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_SYS (func, rettype, parameters); +- declares a C++ alias called GNULIB_NAMESPACE::func +- that redirects to the system provided function func, if GNULIB_NAMESPACE +- is defined. +- Example: +- _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); +- */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +- /* If we were to write +- rettype (*const func) parameters = ::func; +- like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls +- better (remove an indirection through a 'static' pointer variable), +- but then the _GL_CXXALIASWARN macro below would cause a warning not only +- for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ +-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- static rettype (*func) parameters = ::func; \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); +- is like _GL_CXXALIAS_SYS (func, rettype, parameters); +- except that the C function func may have a slightly different declaration. +- A cast is used to silence the "invalid conversion" error that would +- otherwise occur. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- static rettype (*func) parameters = \ +- reinterpret_cast(::func); \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); +- is like _GL_CXXALIAS_SYS (func, rettype, parameters); +- except that the C function is picked among a set of overloaded functions, +- namely the one with rettype2 and parameters2. Two consecutive casts +- are used to silence the "cannot find a match" and "invalid conversion" +- errors that would otherwise occur. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +- /* The outer cast must be a reinterpret_cast. +- The inner cast: When the function is defined as a set of overloaded +- functions, it works as a static_cast<>, choosing the designated variant. +- When the function is defined as a single variant, it works as a +- reinterpret_cast<>. The parenthesized cast syntax works both ways. */ +-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- static rettype (*func) parameters = \ +- reinterpret_cast( \ +- (rettype2(*)parameters2)(::func)); \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIASWARN (func); +- causes a warning to be emitted when ::func is used but not when +- GNULIB_NAMESPACE::func is used. func must be defined without overloaded +- variants. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIASWARN(func) \ +- _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) +-# define _GL_CXXALIASWARN_1(func,namespace) \ +- _GL_CXXALIASWARN_2 (func, namespace) +-/* To work around GCC bug , +- we enable the warning only when not optimizing. */ +-# if !__OPTIMIZE__ +-# define _GL_CXXALIASWARN_2(func,namespace) \ +- _GL_WARN_ON_USE (func, \ +- "The symbol ::" #func " refers to the system function. " \ +- "Use " #namespace "::" #func " instead.") +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-# define _GL_CXXALIASWARN_2(func,namespace) \ +- extern __typeof__ (func) func +-# else +-# define _GL_CXXALIASWARN_2(func,namespace) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-# endif +-#else +-# define _GL_CXXALIASWARN(func) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); +- causes a warning to be emitted when the given overloaded variant of ::func +- is used but not when GNULIB_NAMESPACE::func is used. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ +- _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ +- GNULIB_NAMESPACE) +-# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ +- _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) +-/* To work around GCC bug , +- we enable the warning only when not optimizing. */ +-# if !__OPTIMIZE__ +-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ +- _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ +- "The symbol ::" #func " refers to the system function. " \ +- "Use " #namespace "::" #func " instead.") +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ +- extern __typeof__ (func) func +-# else +-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-# endif +-#else +-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-#endif /* _GL_CXXDEFS_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/build-aux/snippet/warn-on-use.h groff-1.22.3/src/libs/gnulib/build-aux/snippet/warn-on-use.h +--- groff-1.22.3.old/src/libs/gnulib/build-aux/snippet/warn-on-use.h 2014-11-04 10:38:35.651518671 +0200 ++++ groff-1.22.3/src/libs/gnulib/build-aux/snippet/warn-on-use.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,109 +0,0 @@ +-/* A C macro for emitting warnings if a function is used. +- Copyright (C) 2010-2014 Free Software Foundation, Inc. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-/* _GL_WARN_ON_USE (function, "literal string") issues a declaration +- for FUNCTION which will then trigger a compiler warning containing +- the text of "literal string" anywhere that function is called, if +- supported by the compiler. If the compiler does not support this +- feature, the macro expands to an unused extern declaration. +- +- This macro is useful for marking a function as a potential +- portability trap, with the intent that "literal string" include +- instructions on the replacement function that should be used +- instead. However, one of the reasons that a function is a +- portability trap is if it has the wrong signature. Declaring +- FUNCTION with a different signature in C is a compilation error, so +- this macro must use the same type as any existing declaration so +- that programs that avoid the problematic FUNCTION do not fail to +- compile merely because they included a header that poisoned the +- function. But this implies that _GL_WARN_ON_USE is only safe to +- use if FUNCTION is known to already have a declaration. Use of +- this macro implies that there must not be any other macro hiding +- the declaration of FUNCTION; but undefining FUNCTION first is part +- of the poisoning process anyway (although for symbols that are +- provided only via a macro, the result is a compilation error rather +- than a warning containing "literal string"). Also note that in +- C++, it is only safe to use if FUNCTION has no overloads. +- +- For an example, it is possible to poison 'getline' by: +- - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], +- [getline]) in configure.ac, which potentially defines +- HAVE_RAW_DECL_GETLINE +- - adding this code to a header that wraps the system : +- #undef getline +- #if HAVE_RAW_DECL_GETLINE +- _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" +- "not universally present; use the gnulib module getline"); +- #endif +- +- It is not possible to directly poison global variables. But it is +- possible to write a wrapper accessor function, and poison that +- (less common usage, like &environ, will cause a compilation error +- rather than issue the nice warning, but the end result of informing +- the developer about their portability problem is still achieved): +- #if HAVE_RAW_DECL_ENVIRON +- static char ***rpl_environ (void) { return &environ; } +- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); +- # undef environ +- # define environ (*rpl_environ ()) +- #endif +- */ +-#ifndef _GL_WARN_ON_USE +- +-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +-/* A compiler attribute is available in gcc versions 4.3.0 and later. */ +-# define _GL_WARN_ON_USE(function, message) \ +-extern __typeof__ (function) function __attribute__ ((__warning__ (message))) +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-/* Verify the existence of the function. */ +-# define _GL_WARN_ON_USE(function, message) \ +-extern __typeof__ (function) function +-# else /* Unsupported. */ +-# define _GL_WARN_ON_USE(function, message) \ +-_GL_WARN_EXTERN_C int _gl_warn_on_use +-# endif +-#endif +- +-/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") +- is like _GL_WARN_ON_USE (function, "string"), except that the function is +- declared with the given prototype, consisting of return type, parameters, +- and attributes. +- This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does +- not work in this case. */ +-#ifndef _GL_WARN_ON_USE_CXX +-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +-extern rettype function parameters_and_attributes \ +- __attribute__ ((__warning__ (msg))) +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-/* Verify the existence of the function. */ +-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +-extern rettype function parameters_and_attributes +-# else /* Unsupported. */ +-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +-_GL_WARN_EXTERN_C int _gl_warn_on_use +-# endif +-#endif +- +-/* _GL_WARN_EXTERN_C declaration; +- performs the declaration with C linkage. */ +-#ifndef _GL_WARN_EXTERN_C +-# if defined __cplusplus +-# define _GL_WARN_EXTERN_C extern "C" +-# else +-# define _GL_WARN_EXTERN_C extern +-# endif +-#endif +diff -Nuar groff-1.22.3.old/src/libs/gnulib/config.h.in groff-1.22.3/src/libs/gnulib/config.h.in +--- groff-1.22.3.old/src/libs/gnulib/config.h.in 2014-11-04 10:38:35.675518371 +0200 ++++ groff-1.22.3/src/libs/gnulib/config.h.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,457 +0,0 @@ +-/* config.h.in. Generated from configure.ac by autoheader. */ +- +-/* Define to the number of bits in type 'ptrdiff_t'. */ +-#undef BITSIZEOF_PTRDIFF_T +- +-/* Define to the number of bits in type 'sig_atomic_t'. */ +-#undef BITSIZEOF_SIG_ATOMIC_T +- +-/* Define to the number of bits in type 'size_t'. */ +-#undef BITSIZEOF_SIZE_T +- +-/* Define to the number of bits in type 'wchar_t'. */ +-#undef BITSIZEOF_WCHAR_T +- +-/* Define to the number of bits in type 'wint_t'. */ +-#undef BITSIZEOF_WINT_T +- +-/* Define to 1 when the gnulib module wcwidth should be tested. */ +-#undef GNULIB_TEST_WCWIDTH +- +-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you +- don't. */ +-#undef HAVE_DECL_GETC_UNLOCKED +- +-/* Define to 1 if you have the declaration of `towlower', and to 0 if you +- don't. */ +-#undef HAVE_DECL_TOWLOWER +- +-/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you +- don't. */ +-#undef HAVE_DECL_WCWIDTH +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_FEATURES_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_INTTYPES_H +- +-/* Define to 1 if you have the 'iswcntrl' function. */ +-#undef HAVE_ISWCNTRL +- +-/* Define if you have and nl_langinfo(CODESET). */ +-#undef HAVE_LANGINFO_CODESET +- +-/* Define to 1 if the system has the type 'long long int'. */ +-#undef HAVE_LONG_LONG_INT +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_MEMORY_H +- +-/* Define to 1 if btowc is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_BTOWC +- +-/* Define to 1 if imaxabs is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_IMAXABS +- +-/* Define to 1 if imaxdiv is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_IMAXDIV +- +-/* Define to 1 if iswctype is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_ISWCTYPE +- +-/* Define to 1 if mbrlen is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_MBRLEN +- +-/* Define to 1 if mbrtowc is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_MBRTOWC +- +-/* Define to 1 if mbsinit is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_MBSINIT +- +-/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_MBSNRTOWCS +- +-/* Define to 1 if mbsrtowcs is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_MBSRTOWCS +- +-/* Define to 1 if strtoimax is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_STRTOIMAX +- +-/* Define to 1 if strtoumax is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_STRTOUMAX +- +-/* Define to 1 if towctrans is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_TOWCTRANS +- +-/* Define to 1 if wcpcpy is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCPCPY +- +-/* Define to 1 if wcpncpy is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCPNCPY +- +-/* Define to 1 if wcrtomb is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCRTOMB +- +-/* Define to 1 if wcscasecmp is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCASECMP +- +-/* Define to 1 if wcscat is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCAT +- +-/* Define to 1 if wcschr is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCHR +- +-/* Define to 1 if wcscmp is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCMP +- +-/* Define to 1 if wcscoll is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCOLL +- +-/* Define to 1 if wcscpy is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCPY +- +-/* Define to 1 if wcscspn is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSCSPN +- +-/* Define to 1 if wcsdup is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSDUP +- +-/* Define to 1 if wcslen is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSLEN +- +-/* Define to 1 if wcsncasecmp is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSNCASECMP +- +-/* Define to 1 if wcsncat is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSNCAT +- +-/* Define to 1 if wcsncmp is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSNCMP +- +-/* Define to 1 if wcsncpy is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSNCPY +- +-/* Define to 1 if wcsnlen is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSNLEN +- +-/* Define to 1 if wcsnrtombs is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSNRTOMBS +- +-/* Define to 1 if wcspbrk is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSPBRK +- +-/* Define to 1 if wcsrchr is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSRCHR +- +-/* Define to 1 if wcsrtombs is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSRTOMBS +- +-/* Define to 1 if wcsspn is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSSPN +- +-/* Define to 1 if wcsstr is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSSTR +- +-/* Define to 1 if wcstok is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSTOK +- +-/* Define to 1 if wcswidth is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSWIDTH +- +-/* Define to 1 if wcsxfrm is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCSXFRM +- +-/* Define to 1 if wctob is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCTOB +- +-/* Define to 1 if wctrans is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCTRANS +- +-/* Define to 1 if wctype is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCTYPE +- +-/* Define to 1 if wcwidth is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WCWIDTH +- +-/* Define to 1 if wmemchr is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WMEMCHR +- +-/* Define to 1 if wmemcmp is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WMEMCMP +- +-/* Define to 1 if wmemcpy is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WMEMCPY +- +-/* Define to 1 if wmemmove is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WMEMMOVE +- +-/* Define to 1 if wmemset is declared even after undefining macros. */ +-#undef HAVE_RAW_DECL_WMEMSET +- +-/* Define to 1 if 'sig_atomic_t' is a signed integer type. */ +-#undef HAVE_SIGNED_SIG_ATOMIC_T +- +-/* Define to 1 if 'wchar_t' is a signed integer type. */ +-#undef HAVE_SIGNED_WCHAR_T +- +-/* Define to 1 if 'wint_t' is a signed integer type. */ +-#undef HAVE_SIGNED_WINT_T +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDINT_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDLIB_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STRINGS_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STRING_H +- +-/* Define to 1 if you have the 'symlink' function. */ +-#undef HAVE_SYMLINK +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_BITYPES_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_INTTYPES_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_STAT_H +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TYPES_H +- +-/* Define to 1 if you have the `towlower' function. */ +-#undef HAVE_TOWLOWER +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_UNISTD_H +- +-/* Define to 1 if the system has the type 'unsigned long long int'. */ +-#undef HAVE_UNSIGNED_LONG_LONG_INT +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_WCHAR_H +- +-/* Define if you have the 'wchar_t' type. */ +-#undef HAVE_WCHAR_T +- +-/* Define to 1 if you have the header file. */ +-#undef HAVE_WCTYPE_H +- +-/* Define to 1 if you have the 'wcwidth' function. */ +-#undef HAVE_WCWIDTH +- +-/* Define if you have the 'wint_t' type. */ +-#undef HAVE_WINT_T +- +-/* Define to 1 if O_NOATIME works. */ +-#undef HAVE_WORKING_O_NOATIME +- +-/* Define to 1 if O_NOFOLLOW works. */ +-#undef HAVE_WORKING_O_NOFOLLOW +- +-/* Define to 1 if the system has the type `_Bool'. */ +-#undef HAVE__BOOL +- +-/* Name of package */ +-#undef PACKAGE +- +-/* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT +- +-/* Define to the full name of this package. */ +-#undef PACKAGE_NAME +- +-/* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING +- +-/* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME +- +-/* Define to the home page for this package. */ +-#undef PACKAGE_URL +- +-/* Define to the version of this package. */ +-#undef PACKAGE_VERSION +- +-/* Define if exists and defines unusable PRI* macros. */ +-#undef PRI_MACROS_BROKEN +- +-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type +- 'ptrdiff_t'. */ +-#undef PTRDIFF_T_SUFFIX +- +-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type +- 'sig_atomic_t'. */ +-#undef SIG_ATOMIC_T_SUFFIX +- +-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type +- 'size_t'. */ +-#undef SIZE_T_SUFFIX +- +-/* Define to 1 if you have the ANSI C header files. */ +-#undef STDC_HEADERS +- +-/* Enable extensions on AIX 3, Interix. */ +-#ifndef _ALL_SOURCE +-# undef _ALL_SOURCE +-#endif +-/* Enable general extensions on OS X. */ +-#ifndef _DARWIN_C_SOURCE +-# undef _DARWIN_C_SOURCE +-#endif +-/* Enable GNU extensions on systems that have them. */ +-#ifndef _GNU_SOURCE +-# undef _GNU_SOURCE +-#endif +-/* Enable threading extensions on Solaris. */ +-#ifndef _POSIX_PTHREAD_SEMANTICS +-# undef _POSIX_PTHREAD_SEMANTICS +-#endif +-/* Enable extensions on HP NonStop. */ +-#ifndef _TANDEM_SOURCE +-# undef _TANDEM_SOURCE +-#endif +-/* Enable X/Open extensions if necessary. HP-UX 11.11 defines +- mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of +- whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +-#ifndef _XOPEN_SOURCE +-# undef _XOPEN_SOURCE +-#endif +-/* Enable general extensions on Solaris. */ +-#ifndef __EXTENSIONS__ +-# undef __EXTENSIONS__ +-#endif +- +- +-/* Version number of package */ +-#undef VERSION +- +-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type +- 'wchar_t'. */ +-#undef WCHAR_T_SUFFIX +- +-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type +- 'wint_t'. */ +-#undef WINT_T_SUFFIX +- +-/* Define to 1 if on MINIX. */ +-#undef _MINIX +- +-/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */ +-#undef _NETBSD_SOURCE +- +-/* The _Noreturn keyword of C11. */ +-#if ! (defined _Noreturn \ +- || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) +-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ +- || 0x5110 <= __SUNPRO_C) +-# define _Noreturn __attribute__ ((__noreturn__)) +-# elif defined _MSC_VER && 1200 <= _MSC_VER +-# define _Noreturn __declspec (noreturn) +-# else +-# define _Noreturn +-# endif +-#endif +- +- +-/* Define to 2 if the system does not provide POSIX.1 features except with +- this defined. */ +-#undef _POSIX_1_SOURCE +- +-/* Define to 1 if you need to in order for 'stat' and other things to work. */ +-#undef _POSIX_SOURCE +- +-/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. +- _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. +- _GL_INLINE_HEADER_BEGIN contains useful stuff to put +- in an include file, before uses of _GL_INLINE. +- It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, +- when FOO is an inline function in the header; see +- . +- _GL_INLINE_HEADER_END contains useful stuff to put +- in the same include file, after uses of _GL_INLINE. +- +- Suppress the use of extern inline on Apple's platforms, +- as Libc-825.25 (2012-09-19) is incompatible with it; see +- . +- Perhaps Apple will fix this some day. */ +-#if ((__GNUC__ \ +- ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ +- : 199901L <= __STDC_VERSION__) \ +- && !defined __APPLE__) +-# define _GL_INLINE inline +-# define _GL_EXTERN_INLINE extern inline +-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +-# if __GNUC_GNU_INLINE__ +- /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +-# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +-# else +-# define _GL_INLINE extern inline +-# endif +-# define _GL_EXTERN_INLINE extern +-#else +-# define _GL_INLINE static _GL_UNUSED +-# define _GL_EXTERN_INLINE static _GL_UNUSED +-#endif +- +-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +-# define _GL_INLINE_HEADER_CONST_PRAGMA +-# else +-# define _GL_INLINE_HEADER_CONST_PRAGMA \ +- _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +-# endif +-# define _GL_INLINE_HEADER_BEGIN \ +- _Pragma ("GCC diagnostic push") \ +- _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ +- _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ +- _GL_INLINE_HEADER_CONST_PRAGMA +-# define _GL_INLINE_HEADER_END \ +- _Pragma ("GCC diagnostic pop") +-#else +-# define _GL_INLINE_HEADER_BEGIN +-# define _GL_INLINE_HEADER_END +-#endif +- +-/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports +- the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of +- earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. +- __APPLE__ && __MACH__ test for Mac OS X. +- __APPLE_CC__ tests for the Apple compiler and its version. +- __STDC_VERSION__ tests for the C99 mode. */ +-#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +-# define __GNUC_STDC_INLINE__ 1 +-#endif +- +-/* Define as a marker that can be attached to declarations that might not +- be used. This helps to reduce warnings, such as from +- GCC -Wunused-parameter. */ +-#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +-# define _GL_UNUSED __attribute__ ((__unused__)) +-#else +-# define _GL_UNUSED +-#endif +-/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name +- is a misnomer outside of parameter lists. */ +-#define _UNUSED_PARAMETER_ _GL_UNUSED +- +-/* The __pure__ attribute was added in gcc 2.96. */ +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) +-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +-#else +-# define _GL_ATTRIBUTE_PURE /* empty */ +-#endif +- +-/* The __const__ attribute was added in gcc 2.95. */ +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +-#else +-# define _GL_ATTRIBUTE_CONST /* empty */ +-#endif +- +diff -Nuar groff-1.22.3.old/src/libs/gnulib/configure groff-1.22.3/src/libs/gnulib/configure +--- groff-1.22.3.old/src/libs/gnulib/configure 2014-11-04 10:38:35.676518359 +0200 ++++ groff-1.22.3/src/libs/gnulib/configure 1970-01-01 02:00:00.000000000 +0200 +@@ -1,9840 +0,0 @@ +-#! /bin/sh +-# Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69 for dummy 0. +-# +-# +-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +-# +-# +-# This configure script is free software; the Free Software Foundation +-# gives unlimited permission to copy, distribute and modify it. +-## -------------------- ## +-## M4sh Initialization. ## +-## -------------------- ## +- +-# Be more Bourne compatible +-DUALCASE=1; export DUALCASE # for MKS sh +-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 +-else +- case `(set -o) 2>/dev/null` in #( +- *posix*) : +- set -o posix ;; #( +- *) : +- ;; +-esac +-fi +- +- +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-# Prefer a ksh shell builtin over an external printf program on Solaris, +-# but without wasting forks for bash or zsh. +-if test -z "$BASH_VERSION$ZSH_VERSION" \ +- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='print -r --' +- as_echo_n='print -rn --' +-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in #( +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } +-fi +- +- +-# IFS +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent editors from complaining about space-tab. +-# (If _AS_PATH_WALK were called with IFS unset, it would disable word +-# splitting by setting IFS to empty value.) +-IFS=" "" $as_nl" +- +-# Find who we are. Look in the path if we contain no directory separator. +-as_myself= +-case $0 in #(( +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' +-# in which case we are not to be found in the path. +-if test "x$as_myself" = x; then +- as_myself=$0 +-fi +-if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- exit 1 +-fi +- +-# Unset variables that we do not need and which cause bugs (e.g. in +-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +-# suppresses any "Segmentation fault" message there. '((' could +-# trigger a bug in pdksh 5.2.14. +-for as_var in BASH_ENV ENV MAIL MAILPATH +-do eval test x\${$as_var+set} = xset \ +- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +-done +-PS1='$ ' +-PS2='> ' +-PS4='+ ' +- +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE +- +-# CDPATH. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +-# Use a proper internal environment variable to ensure we don't fall +- # into an infinite loop, continuously re-executing ourselves. +- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then +- _as_can_reexec=no; export _as_can_reexec; +- # We cannot yet assume a decent shell, so we have to provide a +-# neutralization value for shells without unset; and this also +-# works around shells that cannot unset nonexistent variables. +-# Preserve -v and -x to the replacement shell. +-BASH_ENV=/dev/null +-ENV=/dev/null +-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +-case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +-esac +-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +-# Admittedly, this is quite paranoid, since all the known shells bail +-# out after a failed `exec'. +-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +-as_fn_exit 255 +- fi +- # We don't want this to propagate to other subprocesses. +- { _as_can_reexec=; unset _as_can_reexec;} +-if test "x$CONFIG_SHELL" = x; then +- as_bourne_compatible="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 +-else +- case \`(set -o) 2>/dev/null\` in #( +- *posix*) : +- set -o posix ;; #( +- *) : +- ;; +-esac +-fi +-" +- as_required="as_fn_return () { (exit \$1); } +-as_fn_success () { as_fn_return 0; } +-as_fn_failure () { as_fn_return 1; } +-as_fn_ret_success () { return 0; } +-as_fn_ret_failure () { return 1; } +- +-exitcode=0 +-as_fn_success || { exitcode=1; echo as_fn_success failed.; } +-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +- +-else +- exitcode=1; echo positional parameters were not saved. +-fi +-test x\$exitcode = x0 || exit 1 +-test -x / || exit 1" +- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO +- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO +- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && +- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +-test \$(( 1 + 1 )) = 2 || exit 1" +- if (eval "$as_required") 2>/dev/null; then : +- as_have_required=yes +-else +- as_have_required=no +-fi +- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : +- +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_found=false +-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- as_found=: +- case $as_dir in #( +- /*) +- for as_base in sh bash ksh sh5; do +- # Try only shells that exist, to save several forks. +- as_shell=$as_dir/$as_base +- if { test -f "$as_shell" || test -f "$as_shell.exe"; } && +- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : +- CONFIG_SHELL=$as_shell as_have_required=yes +- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : +- break 2 +-fi +-fi +- done;; +- esac +- as_found=false +-done +-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && +- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : +- CONFIG_SHELL=$SHELL as_have_required=yes +-fi; } +-IFS=$as_save_IFS +- +- +- if test "x$CONFIG_SHELL" != x; then : +- export CONFIG_SHELL +- # We cannot yet assume a decent shell, so we have to provide a +-# neutralization value for shells without unset; and this also +-# works around shells that cannot unset nonexistent variables. +-# Preserve -v and -x to the replacement shell. +-BASH_ENV=/dev/null +-ENV=/dev/null +-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +-case $- in # (((( +- *v*x* | *x*v* ) as_opts=-vx ;; +- *v* ) as_opts=-v ;; +- *x* ) as_opts=-x ;; +- * ) as_opts= ;; +-esac +-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +-# Admittedly, this is quite paranoid, since all the known shells bail +-# out after a failed `exec'. +-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +-exit 255 +-fi +- +- if test x$as_have_required = xno; then : +- $as_echo "$0: This script requires a shell more modern than all" +- $as_echo "$0: the shells that I found on your system." +- if test x${ZSH_VERSION+set} = xset ; then +- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" +- $as_echo "$0: be upgraded to zsh 4.3.4 or later." +- else +- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +-$0: including any error possibly output before this +-$0: message. Then install a modern shell, or manually run +-$0: the script under such a shell if you do have one." +- fi +- exit 1 +-fi +-fi +-fi +-SHELL=${CONFIG_SHELL-/bin/sh} +-export SHELL +-# Unset more variables known to interfere with behavior of common tools. +-CLICOLOR_FORCE= GREP_OPTIONS= +-unset CLICOLOR_FORCE GREP_OPTIONS +- +-## --------------------- ## +-## M4sh Shell Functions. ## +-## --------------------- ## +-# as_fn_unset VAR +-# --------------- +-# Portably unset VAR. +-as_fn_unset () +-{ +- { eval $1=; unset $1;} +-} +-as_unset=as_fn_unset +- +-# as_fn_set_status STATUS +-# ----------------------- +-# Set $? to STATUS, without forking. +-as_fn_set_status () +-{ +- return $1 +-} # as_fn_set_status +- +-# as_fn_exit STATUS +-# ----------------- +-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +-as_fn_exit () +-{ +- set +e +- as_fn_set_status $1 +- exit $1 +-} # as_fn_exit +- +-# as_fn_mkdir_p +-# ------------- +-# Create "$as_dir" as a directory, including parents if necessary. +-as_fn_mkdir_p () +-{ +- +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || eval $as_mkdir_p || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" +- +- +-} # as_fn_mkdir_p +- +-# as_fn_executable_p FILE +-# ----------------------- +-# Test if FILE is an executable regular file. +-as_fn_executable_p () +-{ +- test -f "$1" && test -x "$1" +-} # as_fn_executable_p +-# as_fn_append VAR VALUE +-# ---------------------- +-# Append the text in VALUE to the end of the definition contained in VAR. Take +-# advantage of any shell optimizations that allow amortized linear growth over +-# repeated appends, instead of the typical quadratic growth present in naive +-# implementations. +-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +- eval 'as_fn_append () +- { +- eval $1+=\$2 +- }' +-else +- as_fn_append () +- { +- eval $1=\$$1\$2 +- } +-fi # as_fn_append +- +-# as_fn_arith ARG... +-# ------------------ +-# Perform arithmetic evaluation on the ARGs, and store the result in the +-# global $as_val. Take advantage of shells that can avoid forks. The arguments +-# must be portable across $(()) and expr. +-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +- eval 'as_fn_arith () +- { +- as_val=$(( $* )) +- }' +-else +- as_fn_arith () +- { +- as_val=`expr "$@" || test $? -eq 1` +- } +-fi # as_fn_arith +- +- +-# as_fn_error STATUS ERROR [LINENO LOG_FD] +-# ---------------------------------------- +-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with STATUS, using 1 if that was 0. +-as_fn_error () +-{ +- as_status=$1; test $as_status -eq 0 && as_status=1 +- if test "$4"; then +- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 +- fi +- $as_echo "$as_me: error: $2" >&2 +- as_fn_exit $as_status +-} # as_fn_error +- +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +- +- as_lineno_1=$LINENO as_lineno_1a=$LINENO +- as_lineno_2=$LINENO as_lineno_2a=$LINENO +- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && +- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { +- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } +- +- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have +- # already done that, so ensure we don't try to do so again and fall +- # in an infinite loop. This has already happened in practice. +- _as_can_reexec=no; export _as_can_reexec +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in #((((( +--n*) +- case `echo 'xy\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- xy) ECHO_C='\c';; +- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null +- ECHO_T=' ';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null +-fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -pR'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -pR' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +- as_ln_s='cp -pR' +- fi +-else +- as_ln_s='cp -pR' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +- +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p='mkdir -p "$as_dir"' +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi +- +-as_test_x='test -x' +-as_executable_p=as_fn_executable_p +- +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +-test -n "$DJDIR" || exec 7<&0 &1 +- +-# Name of the host. +-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +-# so uname gets run too. +-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +- +-# +-# Initializations. +-# +-ac_default_prefix=/usr/local +-ac_clean_files= +-ac_config_libobj_dir=. +-LIBOBJS= +-cross_compiling=no +-subdirs= +-MFLAGS= +-MAKEFLAGS= +- +-# Identity of this package. +-PACKAGE_NAME='dummy' +-PACKAGE_TARNAME='dummy' +-PACKAGE_VERSION='0' +-PACKAGE_STRING='dummy 0' +-PACKAGE_BUGREPORT='' +-PACKAGE_URL='' +- +-# Factoring default headers for most tests. +-ac_includes_default="\ +-#include +-#ifdef HAVE_SYS_TYPES_H +-# include +-#endif +-#ifdef HAVE_SYS_STAT_H +-# include +-#endif +-#ifdef STDC_HEADERS +-# include +-# include +-#else +-# ifdef HAVE_STDLIB_H +-# include +-# endif +-#endif +-#ifdef HAVE_STRING_H +-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +-# include +-# endif +-# include +-#endif +-#ifdef HAVE_STRINGS_H +-# include +-#endif +-#ifdef HAVE_INTTYPES_H +-# include +-#endif +-#ifdef HAVE_STDINT_H +-# include +-#endif +-#ifdef HAVE_UNISTD_H +-# include +-#endif" +- +-gl_header_list= +-gl_func_list= +-ac_subst_vars='gl_LTLIBOBJS +-gl_LIBOBJS +-am__EXEEXT_FALSE +-am__EXEEXT_TRUE +-LTLIBOBJS +-LIBOBJS +-LIBGNU_LTLIBDEPS +-LIBGNU_LIBDEPS +-REPLACE_TOWLOWER +-REPLACE_ISWCNTRL +-HAVE_WCTYPE_H +-NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H +-NEXT_WCTYPE_H +-HAVE_ISWCNTRL +-REPLACE_ISWBLANK +-HAVE_WCTRANS_T +-HAVE_WCTYPE_T +-HAVE_ISWBLANK +-GNULIB_TOWCTRANS +-GNULIB_WCTRANS +-GNULIB_ISWCTYPE +-GNULIB_WCTYPE +-GNULIB_ISWBLANK +-HAVE_WINT_T +-HAVE_FEATURES_H +-NEXT_AS_FIRST_DIRECTIVE_WCHAR_H +-NEXT_WCHAR_H +-REPLACE_WCSWIDTH +-REPLACE_WCWIDTH +-REPLACE_WCSNRTOMBS +-REPLACE_WCSRTOMBS +-REPLACE_WCRTOMB +-REPLACE_MBSNRTOWCS +-REPLACE_MBSRTOWCS +-REPLACE_MBRLEN +-REPLACE_MBRTOWC +-REPLACE_MBSINIT +-REPLACE_WCTOB +-REPLACE_BTOWC +-REPLACE_MBSTATE_T +-HAVE_DECL_WCWIDTH +-HAVE_DECL_WCTOB +-HAVE_WCSWIDTH +-HAVE_WCSTOK +-HAVE_WCSSTR +-HAVE_WCSPBRK +-HAVE_WCSSPN +-HAVE_WCSCSPN +-HAVE_WCSRCHR +-HAVE_WCSCHR +-HAVE_WCSDUP +-HAVE_WCSXFRM +-HAVE_WCSCOLL +-HAVE_WCSNCASECMP +-HAVE_WCSCASECMP +-HAVE_WCSNCMP +-HAVE_WCSCMP +-HAVE_WCSNCAT +-HAVE_WCSCAT +-HAVE_WCPNCPY +-HAVE_WCSNCPY +-HAVE_WCPCPY +-HAVE_WCSCPY +-HAVE_WCSNLEN +-HAVE_WCSLEN +-HAVE_WMEMSET +-HAVE_WMEMMOVE +-HAVE_WMEMCPY +-HAVE_WMEMCMP +-HAVE_WMEMCHR +-HAVE_WCSNRTOMBS +-HAVE_WCSRTOMBS +-HAVE_WCRTOMB +-HAVE_MBSNRTOWCS +-HAVE_MBSRTOWCS +-HAVE_MBRLEN +-HAVE_MBRTOWC +-HAVE_MBSINIT +-HAVE_BTOWC +-GNULIB_WCSWIDTH +-GNULIB_WCSTOK +-GNULIB_WCSSTR +-GNULIB_WCSPBRK +-GNULIB_WCSSPN +-GNULIB_WCSCSPN +-GNULIB_WCSRCHR +-GNULIB_WCSCHR +-GNULIB_WCSDUP +-GNULIB_WCSXFRM +-GNULIB_WCSCOLL +-GNULIB_WCSNCASECMP +-GNULIB_WCSCASECMP +-GNULIB_WCSNCMP +-GNULIB_WCSCMP +-GNULIB_WCSNCAT +-GNULIB_WCSCAT +-GNULIB_WCPNCPY +-GNULIB_WCSNCPY +-GNULIB_WCPCPY +-GNULIB_WCSCPY +-GNULIB_WCSNLEN +-GNULIB_WCSLEN +-GNULIB_WMEMSET +-GNULIB_WMEMMOVE +-GNULIB_WMEMCPY +-GNULIB_WMEMCMP +-GNULIB_WMEMCHR +-GNULIB_WCWIDTH +-GNULIB_WCSNRTOMBS +-GNULIB_WCSRTOMBS +-GNULIB_WCRTOMB +-GNULIB_MBSNRTOWCS +-GNULIB_MBSRTOWCS +-GNULIB_MBRLEN +-GNULIB_MBRTOWC +-GNULIB_MBSINIT +-GNULIB_WCTOB +-GNULIB_BTOWC +-LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE +-LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE +-LIBUNISTRING_UNIWIDTH_H +-LIBUNISTRING_UNITYPES_H +-NEXT_AS_FIRST_DIRECTIVE_STDDEF_H +-NEXT_STDDEF_H +-GL_GENERATE_STDDEF_H_FALSE +-GL_GENERATE_STDDEF_H_TRUE +-STDDEF_H +-HAVE_WCHAR_T +-REPLACE_NULL +-HAVE__BOOL +-GL_GENERATE_STDBOOL_H_FALSE +-GL_GENERATE_STDBOOL_H_TRUE +-STDBOOL_H +-LOCALCHARSET_TESTS_ENVIRONMENT +-GLIBC21 +-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H +-NEXT_INTTYPES_H +-UINT64_MAX_EQ_ULONG_MAX +-UINT32_MAX_LT_UINTMAX_MAX +-PRIPTR_PREFIX +-PRI_MACROS_BROKEN +-INT64_MAX_EQ_LONG_MAX +-INT32_MAX_LT_INTMAX_MAX +-REPLACE_STRTOIMAX +-HAVE_DECL_STRTOUMAX +-HAVE_DECL_STRTOIMAX +-HAVE_DECL_IMAXDIV +-HAVE_DECL_IMAXABS +-GNULIB_STRTOUMAX +-GNULIB_STRTOIMAX +-GNULIB_IMAXDIV +-GNULIB_IMAXABS +-GL_GENERATE_STDINT_H_FALSE +-GL_GENERATE_STDINT_H_TRUE +-STDINT_H +-WINT_T_SUFFIX +-WCHAR_T_SUFFIX +-SIG_ATOMIC_T_SUFFIX +-SIZE_T_SUFFIX +-PTRDIFF_T_SUFFIX +-HAVE_SIGNED_WINT_T +-HAVE_SIGNED_WCHAR_T +-HAVE_SIGNED_SIG_ATOMIC_T +-BITSIZEOF_WINT_T +-BITSIZEOF_WCHAR_T +-BITSIZEOF_SIG_ATOMIC_T +-BITSIZEOF_SIZE_T +-BITSIZEOF_PTRDIFF_T +-APPLE_UNIVERSAL_BUILD +-HAVE_SYS_BITYPES_H +-HAVE_SYS_INTTYPES_H +-HAVE_STDINT_H +-NEXT_AS_FIRST_DIRECTIVE_STDINT_H +-NEXT_STDINT_H +-PRAGMA_COLUMNS +-PRAGMA_SYSTEM_HEADER +-INCLUDE_NEXT_AS_FIRST_DIRECTIVE +-INCLUDE_NEXT +-HAVE_SYS_TYPES_H +-HAVE_INTTYPES_H +-HAVE_WCHAR_H +-HAVE_UNSIGNED_LONG_LONG_INT +-HAVE_LONG_LONG_INT +-pkglibexecdir +-runstatedir +-lispdir +-GL_COND_LIBTOOL_FALSE +-GL_COND_LIBTOOL_TRUE +-RANLIB +-ARFLAGS +-AR +-EGREP +-GREP +-CPP +-host_os +-host_vendor +-host_cpu +-host +-build_os +-build_vendor +-build_cpu +-build +-am__fastdepCC_FALSE +-am__fastdepCC_TRUE +-CCDEPMODE +-am__nodep +-AMDEPBACKSLASH +-AMDEP_FALSE +-AMDEP_TRUE +-am__quote +-am__include +-DEPDIR +-OBJEXT +-EXEEXT +-ac_ct_CC +-CPPFLAGS +-LDFLAGS +-CFLAGS +-CC +-AM_BACKSLASH +-AM_DEFAULT_VERBOSITY +-AM_DEFAULT_V +-AM_V +-am__untar +-am__tar +-AMTAR +-am__leading_dot +-SET_MAKE +-AWK +-mkdir_p +-MKDIR_P +-INSTALL_STRIP_PROGRAM +-STRIP +-install_sh +-MAKEINFO +-AUTOHEADER +-AUTOMAKE +-AUTOCONF +-ACLOCAL +-VERSION +-PACKAGE +-CYGPATH_W +-am__isrc +-INSTALL_DATA +-INSTALL_SCRIPT +-INSTALL_PROGRAM +-target_alias +-host_alias +-build_alias +-LIBS +-ECHO_T +-ECHO_N +-ECHO_C +-DEFS +-mandir +-localedir +-libdir +-psdir +-pdfdir +-dvidir +-htmldir +-infodir +-docdir +-oldincludedir +-includedir +-localstatedir +-sharedstatedir +-sysconfdir +-datadir +-datarootdir +-libexecdir +-sbindir +-bindir +-program_transform_name +-prefix +-exec_prefix +-PACKAGE_URL +-PACKAGE_BUGREPORT +-PACKAGE_STRING +-PACKAGE_VERSION +-PACKAGE_TARNAME +-PACKAGE_NAME +-PATH_SEPARATOR +-SHELL' +-ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-enable_silent_rules +-enable_dependency_tracking +-' +- ac_precious_vars='build_alias +-host_alias +-target_alias +-CC +-CFLAGS +-LDFLAGS +-LIBS +-CPPFLAGS +-CPP' +- +- +-# Initialize some variables set by options. +-ac_init_help= +-ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= +-# The variables have the same names as the options, with +-# dashes changed to underlines. +-cache_file=/dev/null +-exec_prefix=NONE +-no_create= +-no_recursion= +-prefix=NONE +-program_prefix=NONE +-program_suffix=NONE +-program_transform_name=s,x,x, +-silent= +-site= +-srcdir= +-verbose= +-x_includes=NONE +-x_libraries=NONE +- +-# Installation directory options. +-# These are left unexpanded so users can "make install exec_prefix=/foo" +-# and all the variables that are supposed to be based on exec_prefix +-# by default will actually change. +-# Use braces instead of parens because sh, perl, etc. also accept them. +-# (The list follows the same order as the GNU Coding Standards.) +-bindir='${exec_prefix}/bin' +-sbindir='${exec_prefix}/sbin' +-libexecdir='${exec_prefix}/libexec' +-datarootdir='${prefix}/share' +-datadir='${datarootdir}' +-sysconfdir='${prefix}/etc' +-sharedstatedir='${prefix}/com' +-localstatedir='${prefix}/var' +-includedir='${prefix}/include' +-oldincludedir='/usr/include' +-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +-infodir='${datarootdir}/info' +-htmldir='${docdir}' +-dvidir='${docdir}' +-pdfdir='${docdir}' +-psdir='${docdir}' +-libdir='${exec_prefix}/lib' +-localedir='${datarootdir}/locale' +-mandir='${datarootdir}/man' +- +-ac_prev= +-ac_dashdash= +-for ac_option +-do +- # If the previous option needs an argument, assign it. +- if test -n "$ac_prev"; then +- eval $ac_prev=\$ac_option +- ac_prev= +- continue +- fi +- +- case $ac_option in +- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *=) ac_optarg= ;; +- *) ac_optarg=yes ;; +- esac +- +- # Accept the important Cygnus configure options, so we can diagnose typos. +- +- case $ac_dashdash$ac_option in +- --) +- ac_dashdash=yes ;; +- +- -bindir | --bindir | --bindi | --bind | --bin | --bi) +- ac_prev=bindir ;; +- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir=$ac_optarg ;; +- +- -build | --build | --buil | --bui | --bu) +- ac_prev=build_alias ;; +- -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build_alias=$ac_optarg ;; +- +- -cache-file | --cache-file | --cache-fil | --cache-fi \ +- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) +- ac_prev=cache_file ;; +- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ +- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- cache_file=$ac_optarg ;; +- +- --config-cache | -C) +- cache_file=config.cache ;; +- +- -datadir | --datadir | --datadi | --datad) +- ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=*) +- datadir=$ac_optarg ;; +- +- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ +- | --dataroo | --dataro | --datar) +- ac_prev=datarootdir ;; +- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ +- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) +- datarootdir=$ac_optarg ;; +- +- -disable-* | --disable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid feature name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=no ;; +- +- -docdir | --docdir | --docdi | --doc | --do) +- ac_prev=docdir ;; +- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) +- docdir=$ac_optarg ;; +- +- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) +- ac_prev=dvidir ;; +- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) +- dvidir=$ac_optarg ;; +- +- -enable-* | --enable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid feature name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=\$ac_optarg ;; +- +- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ +- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +- | --exec | --exe | --ex) +- ac_prev=exec_prefix ;; +- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ +- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ +- | --exec=* | --exe=* | --ex=*) +- exec_prefix=$ac_optarg ;; +- +- -gas | --gas | --ga | --g) +- # Obsolete; use --with-gas. +- with_gas=yes ;; +- +- -help | --help | --hel | --he | -h) +- ac_init_help=long ;; +- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) +- ac_init_help=recursive ;; +- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) +- ac_init_help=short ;; +- +- -host | --host | --hos | --ho) +- ac_prev=host_alias ;; +- -host=* | --host=* | --hos=* | --ho=*) +- host_alias=$ac_optarg ;; +- +- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) +- ac_prev=htmldir ;; +- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ +- | --ht=*) +- htmldir=$ac_optarg ;; +- +- -includedir | --includedir | --includedi | --included | --include \ +- | --includ | --inclu | --incl | --inc) +- ac_prev=includedir ;; +- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ +- | --includ=* | --inclu=* | --incl=* | --inc=*) +- includedir=$ac_optarg ;; +- +- -infodir | --infodir | --infodi | --infod | --info | --inf) +- ac_prev=infodir ;; +- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir=$ac_optarg ;; +- +- -libdir | --libdir | --libdi | --libd) +- ac_prev=libdir ;; +- -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir=$ac_optarg ;; +- +- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ +- | --libexe | --libex | --libe) +- ac_prev=libexecdir ;; +- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ +- | --libexe=* | --libex=* | --libe=*) +- libexecdir=$ac_optarg ;; +- +- -localedir | --localedir | --localedi | --localed | --locale) +- ac_prev=localedir ;; +- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) +- localedir=$ac_optarg ;; +- +- -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst | --locals) +- ac_prev=localstatedir ;; +- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) +- localstatedir=$ac_optarg ;; +- +- -mandir | --mandir | --mandi | --mand | --man | --ma | --m) +- ac_prev=mandir ;; +- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir=$ac_optarg ;; +- +- -nfp | --nfp | --nf) +- # Obsolete; use --without-fp. +- with_fp=no ;; +- +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c | -n) +- no_create=yes ;; +- +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) +- no_recursion=yes ;; +- +- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ +- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ +- | --oldin | --oldi | --old | --ol | --o) +- ac_prev=oldincludedir ;; +- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ +- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ +- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir=$ac_optarg ;; +- +- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) +- ac_prev=prefix ;; +- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix=$ac_optarg ;; +- +- -program-prefix | --program-prefix | --program-prefi | --program-pref \ +- | --program-pre | --program-pr | --program-p) +- ac_prev=program_prefix ;; +- -program-prefix=* | --program-prefix=* | --program-prefi=* \ +- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) +- program_prefix=$ac_optarg ;; +- +- -program-suffix | --program-suffix | --program-suffi | --program-suff \ +- | --program-suf | --program-su | --program-s) +- ac_prev=program_suffix ;; +- -program-suffix=* | --program-suffix=* | --program-suffi=* \ +- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) +- program_suffix=$ac_optarg ;; +- +- -program-transform-name | --program-transform-name \ +- | --program-transform-nam | --program-transform-na \ +- | --program-transform-n | --program-transform- \ +- | --program-transform | --program-transfor \ +- | --program-transfo | --program-transf \ +- | --program-trans | --program-tran \ +- | --progr-tra | --program-tr | --program-t) +- ac_prev=program_transform_name ;; +- -program-transform-name=* | --program-transform-name=* \ +- | --program-transform-nam=* | --program-transform-na=* \ +- | --program-transform-n=* | --program-transform-=* \ +- | --program-transform=* | --program-transfor=* \ +- | --program-transfo=* | --program-transf=* \ +- | --program-trans=* | --program-tran=* \ +- | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name=$ac_optarg ;; +- +- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) +- ac_prev=pdfdir ;; +- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) +- pdfdir=$ac_optarg ;; +- +- -psdir | --psdir | --psdi | --psd | --ps) +- ac_prev=psdir ;; +- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) +- psdir=$ac_optarg ;; +- +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- silent=yes ;; +- +- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) +- ac_prev=sbindir ;; +- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +- | --sbi=* | --sb=*) +- sbindir=$ac_optarg ;; +- +- -sharedstatedir | --sharedstatedir | --sharedstatedi \ +- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +- | --sharedst | --shareds | --shared | --share | --shar \ +- | --sha | --sh) +- ac_prev=sharedstatedir ;; +- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ +- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ +- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ +- | --sha=* | --sh=*) +- sharedstatedir=$ac_optarg ;; +- +- -site | --site | --sit) +- ac_prev=site ;; +- -site=* | --site=* | --sit=*) +- site=$ac_optarg ;; +- +- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) +- ac_prev=srcdir ;; +- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir=$ac_optarg ;; +- +- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ +- | --syscon | --sysco | --sysc | --sys | --sy) +- ac_prev=sysconfdir ;; +- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ +- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +- sysconfdir=$ac_optarg ;; +- +- -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target_alias ;; +- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target_alias=$ac_optarg ;; +- +- -v | -verbose | --verbose | --verbos | --verbo | --verb) +- verbose=yes ;; +- +- -version | --version | --versio | --versi | --vers | -V) +- ac_init_version=: ;; +- +- -with-* | --with-*) +- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid package name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=\$ac_optarg ;; +- +- -without-* | --without-*) +- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` +- # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- as_fn_error $? "invalid package name: $ac_useropt" +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=no ;; +- +- --x) +- # Obsolete; use --with-x. +- with_x=yes ;; +- +- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ +- | --x-incl | --x-inc | --x-in | --x-i) +- ac_prev=x_includes ;; +- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ +- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) +- x_includes=$ac_optarg ;; +- +- -x-libraries | --x-libraries | --x-librarie | --x-librari \ +- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) +- ac_prev=x_libraries ;; +- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ +- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) +- x_libraries=$ac_optarg ;; +- +- -*) as_fn_error $? "unrecognized option: \`$ac_option' +-Try \`$0 --help' for more information" +- ;; +- +- *=*) +- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` +- # Reject names that are not valid shell variable names. +- case $ac_envvar in #( +- '' | [0-9]* | *[!_$as_cr_alnum]* ) +- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; +- esac +- eval $ac_envvar=\$ac_optarg +- export $ac_envvar ;; +- +- *) +- # FIXME: should be removed in autoconf 3.0. +- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 +- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 +- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" +- ;; +- +- esac +-done +- +-if test -n "$ac_prev"; then +- ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- as_fn_error $? "missing argument to $ac_option" +-fi +- +-if test -n "$ac_unrecognized_opts"; then +- case $enable_option_checking in +- no) ;; +- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; +- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; +- esac +-fi +- +-# Check all directory arguments for consistency. +-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 +-do +- eval ac_val=\$$ac_var +- # Remove trailing slashes. +- case $ac_val in +- */ ) +- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` +- eval $ac_var=\$ac_val;; +- esac +- # Be sure to have absolute directory names. +- case $ac_val in +- [\\/$]* | ?:[\\/]* ) continue;; +- NONE | '' ) case $ac_var in *prefix ) continue;; esac;; +- esac +- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +-done +- +-# There might be people who depend on the old broken behavior: `$host' +-# used to hold the argument of --host etc. +-# FIXME: To remove some day. +-build=$build_alias +-host=$host_alias +-target=$target_alias +- +-# FIXME: To remove some day. +-if test "x$host_alias" != x; then +- if test "x$build_alias" = x; then +- cross_compiling=maybe +- elif test "x$build_alias" != "x$host_alias"; then +- cross_compiling=yes +- fi +-fi +- +-ac_tool_prefix= +-test -n "$host_alias" && ac_tool_prefix=$host_alias- +- +-test "$silent" = yes && exec 6>/dev/null +- +- +-ac_pwd=`pwd` && test -n "$ac_pwd" && +-ac_ls_di=`ls -di .` && +-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- as_fn_error $? "working directory cannot be determined" +-test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- as_fn_error $? "pwd does not report name of working directory" +- +- +-# Find the source files, if location was not specified. +-if test -z "$srcdir"; then +- ac_srcdir_defaulted=yes +- # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$as_myself" || +-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_myself" : 'X\(//\)[^/]' \| \ +- X"$as_myself" : 'X\(//\)$' \| \ +- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_myself" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- srcdir=$ac_confdir +- if test ! -r "$srcdir/$ac_unique_file"; then +- srcdir=.. +- fi +-else +- ac_srcdir_defaulted=no +-fi +-if test ! -r "$srcdir/$ac_unique_file"; then +- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +-fi +-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +-ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" +- pwd)` +-# When building in place, set srcdir=. +-if test "$ac_abs_confdir" = "$ac_pwd"; then +- srcdir=. +-fi +-# Remove unnecessary trailing slashes from srcdir. +-# Double slashes in file names in object file debugging info +-# mess up M-x gdb in Emacs. +-case $srcdir in +-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +-esac +-for ac_var in $ac_precious_vars; do +- eval ac_env_${ac_var}_set=\${${ac_var}+set} +- eval ac_env_${ac_var}_value=\$${ac_var} +- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} +- eval ac_cv_env_${ac_var}_value=\$${ac_var} +-done +- +-# +-# Report the --help message. +-# +-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 dummy 0 to adapt to many kinds of systems. +- +-Usage: $0 [OPTION]... [VAR=VALUE]... +- +-To assign environment variables (e.g., CC, CFLAGS...), specify them as +-VAR=VALUE. See below for descriptions of some of the useful variables. +- +-Defaults for the options are specified in brackets. +- +-Configuration: +- -h, --help display this help and exit +- --help=short display options specific to this package +- --help=recursive display the short help of all the included packages +- -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking ...' messages +- --cache-file=FILE cache test results in FILE [disabled] +- -C, --config-cache alias for \`--cache-file=config.cache' +- -n, --no-create do not create output files +- --srcdir=DIR find the sources in DIR [configure dir or \`..'] +- +-Installation directories: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] +- +-By default, \`make install' will install all the files in +-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +-an installation prefix other than \`$ac_default_prefix' using \`--prefix', +-for instance \`--prefix=\$HOME'. +- +-For better control, use the options below. +- +-Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --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] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/dummy] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] +-_ACEOF +- +- cat <<\_ACEOF +- +-Program names: +- --program-prefix=PREFIX prepend PREFIX to installed program names +- --program-suffix=SUFFIX append SUFFIX to installed program names +- --program-transform-name=PROGRAM run sed PROGRAM on installed program names +- +-System types: +- --build=BUILD configure for building on BUILD [guessed] +- --host=HOST cross-compile to build programs to run on HOST [BUILD] +-_ACEOF +-fi +- +-if test -n "$ac_init_help"; then +- case $ac_init_help in +- short | recursive ) echo "Configuration of dummy 0:";; +- esac +- cat <<\_ACEOF +- +-Optional Features: +- --disable-option-checking ignore unrecognized --enable/--with options +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --enable-silent-rules less verbose build output (undo: "make V=1") +- --disable-silent-rules verbose build output (undo: "make V=0") +- --enable-dependency-tracking +- do not reject slow dependency extractors +- --disable-dependency-tracking +- speeds up one-time build +- +-Some influential environment variables: +- CC C compiler command +- CFLAGS C compiler flags +- LDFLAGS linker flags, e.g. -L if you have libraries in a +- nonstandard directory +- LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if +- you have headers in a nonstandard directory +- CPP C preprocessor +- +-Use these variables to override the choices made by `configure' or to help +-it to find libraries and programs with nonstandard names/locations. +- +-Report bugs to the package provider. +-_ACEOF +-ac_status=$? +-fi +- +-if test "$ac_init_help" = "recursive"; then +- # If there are subdirs, report their specific --help. +- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || +- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || +- continue +- ac_builddir=. +- +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; +-esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix +- +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +-esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +- +- cd "$ac_dir" || { ac_status=$?; continue; } +- # Check for guested configure. +- if test -f "$ac_srcdir/configure.gnu"; then +- echo && +- $SHELL "$ac_srcdir/configure.gnu" --help=recursive +- elif test -f "$ac_srcdir/configure"; then +- echo && +- $SHELL "$ac_srcdir/configure" --help=recursive +- else +- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 +- fi || ac_status=$? +- cd "$ac_pwd" || { ac_status=$?; break; } +- done +-fi +- +-test -n "$ac_init_help" && exit $ac_status +-if $ac_init_version; then +- cat <<\_ACEOF +-dummy configure 0 +-generated by GNU Autoconf 2.69 +- +-Copyright (C) 2012 Free Software Foundation, Inc. +-This configure script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it. +-_ACEOF +- exit +-fi +- +-## ------------------------ ## +-## Autoconf initialization. ## +-## ------------------------ ## +- +-# ac_fn_c_try_compile LINENO +-# -------------------------- +-# Try to compile conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_compile () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext +- if { { ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compile") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_compile +- +-# ac_fn_c_try_cpp LINENO +-# ---------------------- +-# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_cpp () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } > conftest.i && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_cpp +- +-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +-# ------------------------------------------------------- +-# Tests whether HEADER exists, giving a warning if it cannot be compiled using +-# the include files in INCLUDES and setting the cache variable VAR +-# accordingly. +-ac_fn_c_check_header_mongrel () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if eval \${$3+:} false; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +-$as_echo_n "checking $2 usability... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-#include <$2> +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_header_compiler=yes +-else +- ac_header_compiler=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +-$as_echo_n "checking $2 presence... " >&6; } +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <$2> +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- ac_header_preproc=yes +-else +- ac_header_preproc=no +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( +- yes:no: ) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +- ;; +- no:yes:* ) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +- ;; +-esac +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- eval "$3=\$ac_header_compiler" +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-fi +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_header_mongrel +- +-# ac_fn_c_try_run LINENO +-# ---------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +-# that executables *can* be run. +-ac_fn_c_try_run () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=$ac_status +-fi +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_run +- +-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +-# ------------------------------------------------------- +-# Tests whether HEADER exists and can be compiled using the include files in +-# INCLUDES, setting the cache variable VAR accordingly. +-ac_fn_c_check_header_compile () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-#include <$2> +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_header_compile +- +-# ac_fn_c_try_link LINENO +-# ----------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_link () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext conftest$ac_exeext +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- test -x conftest$ac_exeext +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_retval=1 +-fi +- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information +- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +- # interfere with the next link command; also delete a directory that is +- # left behind by Apple's compiler. We do this before executing the actions. +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_link +- +-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +-# -------------------------------------------- +-# Tries to find the compile-time value of EXPR in a program that includes +-# INCLUDES, setting VAR accordingly. Returns whether the value could be +-# computed +-ac_fn_c_compute_int () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- if test "$cross_compiling" = yes; then +- # Depending upon the size, compute the lo and hi bounds. +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-static int test_array [1 - 2 * !(($2) >= 0)]; +-test_array [0] = 0; +-return test_array [0]; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_lo=0 ac_mid=0 +- while :; do +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0; +-return test_array [0]; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_hi=$ac_mid; break +-else +- as_fn_arith $ac_mid + 1 && ac_lo=$as_val +- if test $ac_lo -le $ac_mid; then +- ac_lo= ac_hi= +- break +- fi +- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-static int test_array [1 - 2 * !(($2) < 0)]; +-test_array [0] = 0; +-return test_array [0]; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_hi=-1 ac_mid=-1 +- while :; do +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +-test_array [0] = 0; +-return test_array [0]; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_lo=$ac_mid; break +-else +- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val +- if test $ac_mid -le $ac_hi; then +- ac_lo= ac_hi= +- break +- fi +- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- done +-else +- ac_lo= ac_hi= +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-# Binary search between lo and hi bounds. +-while test "x$ac_lo" != "x$ac_hi"; do +- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0; +-return test_array [0]; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_hi=$ac_mid +-else +- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-case $ac_lo in #(( +-?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +-'') ac_retval=1 ;; +-esac +- else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-static long int longval () { return $2; } +-static unsigned long int ulongval () { return $2; } +-#include +-#include +-int +-main () +-{ +- +- FILE *f = fopen ("conftest.val", "w"); +- if (! f) +- return 1; +- if (($2) < 0) +- { +- long int i = longval (); +- if (i != ($2)) +- return 1; +- fprintf (f, "%ld", i); +- } +- else +- { +- unsigned long int i = ulongval (); +- if (i != ($2)) +- return 1; +- fprintf (f, "%lu", i); +- } +- /* Do not output a trailing newline, as this causes \r\n confusion +- on some platforms. */ +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- echo >>conftest.val; read $3 &5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Define $2 to an innocuous variant, in case declares $2. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $2 innocuous_$2 +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $2 (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $2 +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $2 (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$2 || defined __stub___$2 +-choke me +-#endif +- +-int +-main () +-{ +-return $2 (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_func +- +-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +-# --------------------------------------------- +-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +-# accordingly. +-ac_fn_c_check_decl () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- as_decl_name=`echo $2|sed 's/ *(.*//'` +- as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +-$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-#ifndef $as_decl_name +-#ifdef __cplusplus +- (void) $as_decl_use; +-#else +- (void) $as_decl_name; +-#endif +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_decl +- +-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +-# ------------------------------------------- +-# Tests whether TYPE exists after having included INCLUDES, setting cache +-# variable VAR accordingly. +-ac_fn_c_check_type () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- eval "$3=no" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-if (sizeof ($2)) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$4 +-int +-main () +-{ +-if (sizeof (($2))) +- return 0; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +-else +- eval "$3=yes" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_type +-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 dummy $as_me 0, which was +-generated by GNU Autoconf 2.69. Invocation command line was +- +- $ $0 $@ +- +-_ACEOF +-exec 5>>config.log +-{ +-cat <<_ASUNAME +-## --------- ## +-## Platform. ## +-## --------- ## +- +-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +-uname -m = `(uname -m) 2>/dev/null || echo unknown` +-uname -r = `(uname -r) 2>/dev/null || echo unknown` +-uname -s = `(uname -s) 2>/dev/null || echo unknown` +-uname -v = `(uname -v) 2>/dev/null || echo unknown` +- +-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` +- +-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +- +-_ASUNAME +- +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" +- done +-IFS=$as_save_IFS +- +-} >&5 +- +-cat >&5 <<_ACEOF +- +- +-## ----------- ## +-## Core tests. ## +-## ----------- ## +- +-_ACEOF +- +- +-# Keep a trace of the command line. +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Strip out --silent because we don't want to record it for future runs. +-# Also quote any args containing shell meta-characters. +-# Make two passes to allow for proper duplicate-argument suppression. +-ac_configure_args= +-ac_configure_args0= +-ac_configure_args1= +-ac_must_keep_next=false +-for ac_pass in 1 2 +-do +- for ac_arg +- do +- case $ac_arg in +- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil) +- continue ;; +- *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- case $ac_pass in +- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; +- 2) +- as_fn_append ac_configure_args1 " '$ac_arg'" +- if test $ac_must_keep_next = true; then +- ac_must_keep_next=false # Got value, back to normal. +- else +- case $ac_arg in +- *=* | --config-cache | -C | -disable-* | --disable-* \ +- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ +- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ +- | -with-* | --with-* | -without-* | --without-* | --x) +- case "$ac_configure_args0 " in +- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; +- esac +- ;; +- -* ) ac_must_keep_next=true ;; +- esac +- fi +- as_fn_append ac_configure_args " '$ac_arg'" +- ;; +- esac +- done +-done +-{ ac_configure_args0=; unset ac_configure_args0;} +-{ ac_configure_args1=; unset ac_configure_args1;} +- +-# When interrupted or exit'd, cleanup temporary files, and complete +-# config.log. We remove comments because anyway the quotes in there +-# would cause problems or look ugly. +-# WARNING: Use '\'' to represent an apostrophe within the trap. +-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +-trap 'exit_status=$? +- # Save into config.log some information that might help in debugging. +- { +- echo +- +- $as_echo "## ---------------- ## +-## Cache variables. ## +-## ---------------- ##" +- echo +- # The following way of writing the cache mishandles newlines in values, +-( +- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) { eval $ac_var=; unset $ac_var;} ;; +- esac ;; +- esac +- done +- (set) 2>&1 | +- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- sed -n \ +- "s/'\''/'\''\\\\'\'''\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" +- ;; #( +- *) +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) +- echo +- +- $as_echo "## ----------------- ## +-## Output variables. ## +-## ----------------- ##" +- echo +- for ac_var in $ac_subst_vars +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- +- if test -n "$ac_subst_files"; then +- $as_echo "## ------------------- ## +-## File substitutions. ## +-## ------------------- ##" +- echo +- for ac_var in $ac_subst_files +- do +- eval ac_val=\$$ac_var +- case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; +- esac +- $as_echo "$ac_var='\''$ac_val'\''" +- done | sort +- echo +- fi +- +- if test -s confdefs.h; then +- $as_echo "## ----------- ## +-## confdefs.h. ## +-## ----------- ##" +- echo +- cat confdefs.h +- echo +- fi +- test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" +- } >&5 +- rm -f core *.core core.conftest.* && +- rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +- exit $exit_status +-' 0 +-for ac_signal in 1 2 13 15; do +- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +-done +-ac_signal=0 +- +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -f -r conftest* confdefs.h +- +-$as_echo "/* confdefs.h */" > confdefs.h +- +-# Predefined preprocessor variables. +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_NAME "$PACKAGE_NAME" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_VERSION "$PACKAGE_VERSION" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_STRING "$PACKAGE_STRING" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +-_ACEOF +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE_URL "$PACKAGE_URL" +-_ACEOF +- +- +-# Let the site file select an alternate cache file if it wants to. +-# Prefer an explicitly selected file to automatically selected ones. +-ac_site_file1=NONE +-ac_site_file2=NONE +-if test -n "$CONFIG_SITE"; then +- # We do not want a PATH search for config.site. +- case $CONFIG_SITE in #(( +- -*) ac_site_file1=./$CONFIG_SITE;; +- */*) ac_site_file1=$CONFIG_SITE;; +- *) ac_site_file1=./$CONFIG_SITE;; +- esac +-elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site +-else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site +-fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" +-do +- test "x$ac_site_file" = xNONE && continue +- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +-$as_echo "$as_me: loading site script $ac_site_file" >&6;} +- sed 's/^/| /' "$ac_site_file" >&5 +- . "$ac_site_file" \ +- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "failed to load site script $ac_site_file +-See \`config.log' for more details" "$LINENO" 5; } +- fi +-done +- +-if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special files +- # actually), so we avoid doing that. DJGPP emulates it as a regular file. +- if test /dev/null != "$cache_file" && test -f "$cache_file"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +-$as_echo "$as_me: loading cache $cache_file" >&6;} +- case $cache_file in +- [\\/]* | ?:[\\/]* ) . "$cache_file";; +- *) . "./$cache_file";; +- esac +- fi +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} +- >$cache_file +-fi +- +-gl_header_list="$gl_header_list wchar.h" +-gl_header_list="$gl_header_list stdint.h" +-gl_header_list="$gl_header_list inttypes.h" +-gl_header_list="$gl_header_list unistd.h" +-gl_func_list="$gl_func_list symlink" +-gl_header_list="$gl_header_list features.h" +-gl_func_list="$gl_func_list iswcntrl" +-gl_header_list="$gl_header_list wctype.h" +-gl_func_list="$gl_func_list wcwidth" +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- eval ac_new_val=\$ac_env_${ac_var}_value +- case $ac_old_set,$ac_new_set in +- set,) +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,set) +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- ac_old_val_w=`echo x $ac_old_val` +- ac_new_val_w=`echo x $ac_new_val` +- if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- ac_cache_corrupted=: +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} +- eval $ac_var=\$ac_old_val +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} +- fi;; +- esac +- # Pass precious variables to config.status. +- if test "$ac_new_set" = set; then +- case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; +- *) ac_arg=$ac_var=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) as_fn_append ac_configure_args " '$ac_arg'" ;; +- esac +- fi +-done +-if $ac_cache_corrupted; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +-fi +-## -------------------- ## +-## Main body of script. ## +-## -------------------- ## +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-ac_aux_dir= +-for ac_dir in build-aux "$srcdir"/build-aux; do +- if test -f "$ac_dir/install-sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f "$ac_dir/install.sh"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- elif test -f "$ac_dir/shtool"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/shtool install -c" +- break +- fi +-done +-if test -z "$ac_aux_dir"; then +- as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 +-fi +- +-# These three variables are undocumented and unsupported, +-# and are intended to be withdrawn in a future Autoconf release. +-# They can cause serious problems if a builder's source tree is in a directory +-# whose full name contains unusual characters. +-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +- +- +-am__api_version='1.14' +- +-# Find a good install program. We prefer a C program (faster), +-# so one script is as good as another. But avoid the broken or +-# incompatible versions: +-# SysV /etc/install, /usr/sbin/install +-# SunOS /usr/etc/install +-# IRIX /sbin/install +-# AIX /bin/install +-# AmigaOS /C/install, which installs bootblocks on floppy discs +-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +-# AFS /usr/afsws/bin/install, which mishandles nonexistent args +-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +-# OS/2's system install, which has a completely different semantic +-# ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +-$as_echo_n "checking for a BSD-compatible install... " >&6; } +-if test -z "$INSTALL"; then +-if ${ac_cv_path_install+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in #(( +- ./ | .// | /[cC]/* | \ +- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ +- /usr/ucb/* ) ;; +- *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- # Don't use installbsd from OSF since it installs stuff as root +- # by default. +- for ac_prog in ginstall scoinst install; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then +- if test $ac_prog = install && +- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # AIX install. It has an incompatible calling convention. +- : +- elif test $ac_prog = install && +- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # program-specific install script used by HP pwplus--don't use. +- : +- else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi +- fi +- fi +- done +- done +- ;; +-esac +- +- done +-IFS=$as_save_IFS +- +-rm -rf conftest.one conftest.two conftest.dir +- +-fi +- if test "${ac_cv_path_install+set}" = set; then +- INSTALL=$ac_cv_path_install +- else +- # As a last resort, use the slow shell script. Don't cache a +- # value for INSTALL within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- INSTALL=$ac_install_sh +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } +- +-# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +-# It thinks the first close brace ends the variable substitution. +-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +- +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +- +-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[\\\"\#\$\&\'\`$am_lf]*) +- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +-esac +-case $srcdir in +- *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +-esac +- +-# Do 'set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- am_has_slept=no +- for am_try in 1 2; do +- echo "timestamp, slept: $am_has_slept" > conftest.file +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$*" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- if test "$*" != "X $srcdir/configure conftest.file" \ +- && test "$*" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +- alias in your environment" "$LINENO" 5 +- fi +- if test "$2" = conftest.file || test $am_try -eq 2; then +- break +- fi +- # Just in case. +- sleep 1 +- am_has_slept=yes +- done +- test "$2" = conftest.file +- ) +-then +- # Ok. +- : +-else +- as_fn_error $? "newly created file is older than distributed files! +-Check your system clock" "$LINENO" 5 +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-# If we didn't sleep, we still need to ensure time stamps of config.status and +-# generated files are strictly newer. +-am_sleep_pid= +-if grep 'slept: no' conftest.file >/dev/null 2>&1; then +- ( sleep 1 ) & +- am_sleep_pid=$! +-fi +- +-rm -f conftest.file +- +-test "$program_prefix" != NONE && +- program_transform_name="s&^&$program_prefix&;$program_transform_name" +-# Use a double $ so make ignores it. +-test "$program_suffix" != NONE && +- program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. +-# By default was `s,x,x', remove it if useless. +-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` +- +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# Use eval to expand $SHELL +-if eval "$MISSING --is-lightweight"; then +- am_missing_run="$MISSING " +-else +- am_missing_run= +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +-fi +- +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +- +-# Installed binaries are usually stripped using 'strip' when the user +-# run "make install-strip". However 'strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the 'STRIP' environment variable to overrule this program. +-if test "$cross_compiling" != no; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_STRIP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- STRIP=$ac_ct_STRIP +- fi +-else +- STRIP="$ac_cv_prog_STRIP" +-fi +- +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +-if test -z "$MKDIR_P"; then +- if ${ac_cv_path_mkdir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in mkdir gmkdir; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue +- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( +- 'mkdir (GNU coreutils) '* | \ +- 'mkdir (coreutils) '* | \ +- 'mkdir (fileutils) '4.1*) +- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext +- break 3;; +- esac +- done +- done +- done +-IFS=$as_save_IFS +- +-fi +- +- test -d ./--version && rmdir ./--version +- if test "${ac_cv_path_mkdir+set}" = set; then +- MKDIR_P="$ac_cv_path_mkdir -p" +- else +- # As a last resort, use the slow shell script. Don't cache a +- # value for MKDIR_P within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- MKDIR_P="$ac_install_sh -d" +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +-$as_echo "$MKDIR_P" >&6; } +- +-for ac_prog in gawk mawk nawk awk +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AWK+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$AWK"; then +- ac_cv_prog_AWK="$AWK" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AWK="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-AWK=$ac_cv_prog_AWK +-if test -n "$AWK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +-$as_echo "$AWK" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$AWK" && break +-done +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +-set x ${MAKE-make} +-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh +-all: +- @echo '@@@%%%=$(MAKE)=@@@%%%' +-_ACEOF +-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +-case `${MAKE-make} -f conftest.make 2>/dev/null` in +- *@@@%%%=?*=@@@%%%*) +- eval ac_cv_prog_make_${ac_make}_set=yes;; +- *) +- eval ac_cv_prog_make_${ac_make}_set=no;; +-esac +-rm -f conftest.make +-fi +-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- SET_MAKE= +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- SET_MAKE="MAKE=${MAKE-make}" +-fi +- +-rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +- +-# Check whether --enable-silent-rules was given. +-if test "${enable_silent_rules+set}" = set; then : +- enableval=$enable_silent_rules; +-fi +- +-case $enable_silent_rules in # ((( +- yes) AM_DEFAULT_VERBOSITY=0;; +- no) AM_DEFAULT_VERBOSITY=1;; +- *) AM_DEFAULT_VERBOSITY=1;; +-esac +-am_make=${MAKE-make} +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +-$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +-if ${am_cv_make_support_nested_variables+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if $as_echo 'TRUE=$(BAR$(V)) +-BAR0=false +-BAR1=true +-V=1 +-am__doit: +- @$(TRUE) +-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then +- am_cv_make_support_nested_variables=yes +-else +- am_cv_make_support_nested_variables=no +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +-$as_echo "$am_cv_make_support_nested_variables" >&6; } +-if test $am_cv_make_support_nested_variables = yes; then +- AM_V='$(V)' +- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +-else +- AM_V=$AM_DEFAULT_VERBOSITY +- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +-fi +-AM_BACKSLASH='\' +- +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- am__isrc=' -I$(srcdir)' +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 +- fi +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +- +- +-# Define the identity of the package. +- PACKAGE='dummy' +- VERSION='0' +- +- +-cat >>confdefs.h <<_ACEOF +-#define PACKAGE "$PACKAGE" +-_ACEOF +- +- +-cat >>confdefs.h <<_ACEOF +-#define VERSION "$VERSION" +-_ACEOF +- +-# Some tools Automake needs. +- +-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +- +- +-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +- +- +-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +- +- +-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} +- +- +-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +- +-# For better backward compatibility. To be removed once Automake 1.9.x +-# dies out for good. For more background, see: +-# +-# +-mkdir_p='$(MKDIR_P)' +- +-# We need awk for the "check" target. 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}' +- +- +-# We'll loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar pax cpio none' +- +-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +- +- +- +- +- +- +-# POSIX will say in a future version that running "rm -f" with no argument +-# is OK; and we want to be able to make that assumption in our Makefile +-# recipes. So use an aggressive probe to check that the usage we want is +-# actually supported "in the wild" to an acceptable degree. +-# See automake bug#10828. +-# To make any issue more visible, cause the running configure to be aborted +-# by default if the 'rm' program in use doesn't match our expectations; the +-# user can still override this though. +-if rm -f && rm -fr && rm -rf; then : OK; else +- cat >&2 <<'END' +-Oops! +- +-Your 'rm' program seems unable to run without file operands specified +-on the command line, even when the '-f' option is present. This is contrary +-to the behaviour of most rm programs out there, and not conforming with +-the upcoming POSIX standard: +- +-Please tell bug-automake@gnu.org about your system, including the value +-of your $PATH and any error possibly output before this message. This +-can help us improve future automake versions. +- +-END +- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then +- echo 'Configuration will proceed anyway, since you have set the' >&2 +- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 +- echo >&2 +- else +- cat >&2 <<'END' +-Aborting the configuration process, to ensure you take notice of the issue. +- +-You can download and install GNU coreutils to get an 'rm' implementation +-that behaves properly: . +- +-If you want to complete the configuration process using your problematic +-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +-to "yes", and re-run configure. +- +-END +- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 +- fi +-fi +- +-ac_config_headers="$ac_config_headers config.h" +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}gcc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="gcc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="${ac_tool_prefix}cc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- fi +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl.exe +- do +- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +-$as_echo "$CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$CC" && break +- done +-fi +-if test -z "$CC"; then +- ac_ct_CC=$CC +- for ac_prog in cl.exe +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_CC+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_CC="$ac_prog" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$ac_ct_CC" && break +-done +- +- if test "x$ac_ct_CC" = x; then +- CC="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- CC=$ac_ct_CC +- fi +-fi +- +-fi +- +- +-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "no acceptable C compiler found in \$PATH +-See \`config.log' for more details" "$LINENO" 5; } +- +-# Provide some information about the compiler. +-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +-for ac_option in --version -v -V -qversion; do +- { { ac_try="$ac_compiler $ac_option >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compiler $ac_option >&5") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- sed '10a\ +-... rest of stderr output deleted ... +- 10q' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- fi +- rm -f conftest.er1 conftest.err +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +-done +- +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +-# Try to create an executable without -o first, disregard a.out. +-# It will help us diagnose broken compilers, and finding out an intuition +-# of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +- +-# The possible output files: +-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +- +-ac_rmfiles= +-for ac_file in $ac_files +-do +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; +- * ) ac_rmfiles="$ac_rmfiles $ac_file";; +- esac +-done +-rm -f $ac_rmfiles +- +-if { { ac_try="$ac_link_default" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link_default") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then : +- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +-# in a Makefile. We should not override ac_cv_exeext if it was cached, +-# so that the user can short-circuit this test for compilers unknown to +-# Autoconf. +-for ac_file in $ac_files '' +-do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) +- ;; +- [ab].out ) +- # We found the default executable, but exeext='' is most +- # certainly right. +- break;; +- *.* ) +- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; +- then :; else +- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- fi +- # We set ac_cv_exeext here because the later test for it is not +- # safe: cross compilers may not add the suffix if given an `-o' +- # argument, so we may need to know it at that point already. +- # Even if this section looks crufty: it has the advantage of +- # actually working. +- break;; +- * ) +- break;; +- esac +-done +-test "$ac_cv_exeext" = no && ac_cv_exeext= +- +-else +- ac_file='' +-fi +-if test -z "$ac_file"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error 77 "C compiler cannot create executables +-See \`config.log' for more details" "$LINENO" 5; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } +-ac_exeext=$ac_cv_exeext +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +-$as_echo_n "checking for suffix of executables... " >&6; } +-if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then : +- # If both `conftest.exe' and `conftest' are `present' (well, observable) +-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +-# work properly (i.e., refer to `conftest.exe'), while it won't with +-# `rm'. +-for ac_file in conftest.exe conftest conftest.*; do +- test -f "$ac_file" || continue +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; +- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` +- break;; +- * ) break;; +- esac +-done +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot compute suffix of executables: cannot compile and link +-See \`config.log' for more details" "$LINENO" 5; } +-fi +-rm -f conftest conftest$ac_cv_exeext +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +-$as_echo "$ac_cv_exeext" >&6; } +- +-rm -f conftest.$ac_ext +-EXEEXT=$ac_cv_exeext +-ac_exeext=$EXEEXT +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; +- +- ; +- return 0; +-} +-_ACEOF +-ac_clean_files="$ac_clean_files conftest.out" +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-if test "$cross_compiling" != yes; then +- { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } +- if { ac_try='./conftest$ac_cv_exeext' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details" "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- +-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +-ac_clean_files=$ac_clean_files_save +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +-$as_echo_n "checking for suffix of object files... " >&6; } +-if ${ac_cv_objext+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.o conftest.obj +-if { { ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_compile") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then : +- for ac_file in conftest.o conftest.obj conftest.*; do +- test -f "$ac_file" || continue; +- case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; +- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` +- break;; +- esac +-done +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot compute suffix of object files: cannot compile +-See \`config.log' for more details" "$LINENO" 5; } +-fi +-rm -f conftest.$ac_cv_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +-$as_echo "$ac_cv_objext" >&6; } +-OBJEXT=$ac_cv_objext +-ac_objext=$OBJEXT +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +-if ${ac_cv_c_compiler_gnu+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-#ifndef __GNUC__ +- choke me +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_compiler_gnu=yes +-else +- ac_compiler_gnu=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_c_compiler_gnu=$ac_compiler_gnu +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +-$as_echo "$ac_cv_c_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GCC=yes +-else +- GCC= +-fi +-ac_test_CFLAGS=${CFLAGS+set} +-ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +-$as_echo_n "checking whether $CC accepts -g... " >&6; } +-if ${ac_cv_prog_cc_g+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_save_c_werror_flag=$ac_c_werror_flag +- ac_c_werror_flag=yes +- ac_cv_prog_cc_g=no +- CFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_g=yes +-else +- CFLAGS="" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +-else +- ac_c_werror_flag=$ac_save_c_werror_flag +- CFLAGS="-g" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_g=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_c_werror_flag=$ac_save_c_werror_flag +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +-$as_echo "$ac_cv_prog_cc_g" >&6; } +-if test "$ac_test_CFLAGS" = set; then +- CFLAGS=$ac_save_CFLAGS +-elif test $ac_cv_prog_cc_g = yes; then +- if test "$GCC" = yes; then +- CFLAGS="-g -O2" +- else +- CFLAGS="-g" +- fi +-else +- if test "$GCC" = yes; then +- CFLAGS="-O2" +- else +- CFLAGS= +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +-if ${ac_cv_prog_cc_c89+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_prog_cc_c89=no +-ac_save_CC=$CC +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-struct stat; +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +- +-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has +- function prototypes and stuff, but not '\xHH' hex character constants. +- These don't provoke an error unfortunately, instead are silently treated +- as 'x'. The following induces an error, until -std is added to get +- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an +- array size at least. It's necessary to write '\x00'==0 to get something +- that's true only with -std. */ +-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +- +-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters +- inside strings and character constants. */ +-#define FOO(x) 'x' +-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +- +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int +-main () +-{ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; +- return 0; +-} +-_ACEOF +-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ +- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_prog_cc_c89=$ac_arg +-fi +-rm -f core conftest.err conftest.$ac_objext +- test "x$ac_cv_prog_cc_c89" != "xno" && break +-done +-rm -f conftest.$ac_ext +-CC=$ac_save_CC +- +-fi +-# AC_CACHE_VAL +-case "x$ac_cv_prog_cc_c89" in +- x) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +-$as_echo "none needed" >&6; } ;; +- xno) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +-$as_echo "unsupported" >&6; } ;; +- *) +- CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +-esac +-if test "x$ac_cv_prog_cc_c89" != xno; then : +- +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +-if ${am_cv_prog_cc_c_o+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +- # Make sure it works both with $CC and with simple cc. +- # Following AC_PROG_CC_C_O, we do the test twice because some +- # compilers refuse to overwrite an existing .o file with -o, +- # though they will create one. +- am_cv_prog_cc_c_o=yes +- for am_i in 1 2; do +- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 +- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } \ +- && test -f conftest2.$ac_objext; then +- : OK +- else +- am_cv_prog_cc_c_o=no +- break +- fi +- done +- rm -f core conftest* +- unset am_i +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +-$as_echo "$am_cv_prog_cc_c_o" >&6; } +-if test "$am_cv_prog_cc_c_o" != yes; then +- # Losing compiler, so override with the script. +- # FIXME: It is wrong to rewrite CC. +- # But if we don't then we get into trouble of one sort or another. +- # A longer-term fix would be to have automake use am__CC in this case, +- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" +- CC="$am_aux_dir/compile $CC" +-fi +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-DEPDIR="${am__leading_dot}deps" +- +-ac_config_commands="$ac_config_commands depfiles" +- +- +-am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo this is the am__doit target +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +-$as_echo_n "checking for style of include used by $am_make... " >&6; } +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from 'make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac +-fi +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +-$as_echo "$_am_result" >&6; } +-rm -f confinc confmf +- +-# Check whether --enable-dependency-tracking was given. +-if test "${enable_dependency_tracking+set}" = set; then : +- enableval=$enable_dependency_tracking; +-fi +- +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +- am__nodep='_no' +-fi +- if test "x$enable_dependency_tracking" != xno; then +- AMDEP_TRUE= +- AMDEP_FALSE='#' +-else +- AMDEP_TRUE='#' +- AMDEP_FALSE= +-fi +- +- +- +-depcc="$CC" am_compiler_list= +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } +-if ${am_cv_CC_dependencies_compiler_type+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named 'D' -- because '-MD' means "put the output +- # in D". +- rm -rf conftest.dir +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_CC_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` +- fi +- am__universal=false +- case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac +- +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with +- # Solaris 10 /bin/sh. +- echo '/* dummy */' > sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- # We check with '-c' and '-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle '-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs. +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" +- case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; +- nosideeffect) +- # After this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested. +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- msvc7 | msvc7msys | msvisualcpp | msvcmsys) +- # This compiler won't grok '-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; +- none) break ;; +- esac +- if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_CC_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_CC_dependencies_compiler_type=none +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type +- +- if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then +- am__fastdepCC_TRUE= +- am__fastdepCC_FALSE='#' +-else +- am__fastdepCC_TRUE='#' +- am__fastdepCC_FALSE= +-fi +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +-set x ${MAKE-make} +-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh +-all: +- @echo '@@@%%%=$(MAKE)=@@@%%%' +-_ACEOF +-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +-case `${MAKE-make} -f conftest.make 2>/dev/null` in +- *@@@%%%=?*=@@@%%%*) +- eval ac_cv_prog_make_${ac_make}_set=yes;; +- *) +- eval ac_cv_prog_make_${ac_make}_set=no;; +-esac +-rm -f conftest.make +-fi +-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- SET_MAKE= +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- SET_MAKE="MAKE=${MAKE-make}" +-fi +- +- +-# For autobuild. +-# Make sure we can run config.sub. +-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +-$as_echo_n "checking build system type... " >&6; } +-if ${ac_cv_build+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_build_alias=$build_alias +-test "x$ac_build_alias" = x && +- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +-test "x$ac_build_alias" = x && +- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +-$as_echo "$ac_cv_build" >&6; } +-case $ac_cv_build in +-*-*-*) ;; +-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +-esac +-build=$ac_cv_build +-ac_save_IFS=$IFS; IFS='-' +-set x $ac_cv_build +-shift +-build_cpu=$1 +-build_vendor=$2 +-shift; shift +-# Remember, the first character of IFS is used to create $*, +-# except with old shells: +-build_os=$* +-IFS=$ac_save_IFS +-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +-$as_echo_n "checking host system type... " >&6; } +-if ${ac_cv_host+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "x$host_alias" = x; then +- ac_cv_host=$ac_cv_build +-else +- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +-$as_echo "$ac_cv_host" >&6; } +-case $ac_cv_host in +-*-*-*) ;; +-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +-esac +-host=$ac_cv_host +-ac_save_IFS=$IFS; IFS='-' +-set x $ac_cv_host +-shift +-host_cpu=$1 +-host_vendor=$2 +-shift; shift +-# Remember, the first character of IFS is used to create $*, +-# except with old shells: +-host_os=$* +-IFS=$ac_save_IFS +-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +- +- +- +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +-$as_echo_n "checking how to run the C preprocessor... " >&6; } +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= +-fi +-if test -z "$CPP"; then +- if ${ac_cv_prog_CPP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CPP needs to be expanded +- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- break +-fi +- +- done +- ac_cv_prog_CPP=$CPP +- +-fi +- CPP=$ac_cv_prog_CPP +-else +- ac_cv_prog_CPP=$CPP +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +-$as_echo "$CPP" >&6; } +-ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer to if __STDC__ is defined, since +- # exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- Syntax error +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- +-else +- # Broken: fails on valid input. +-continue +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- # Broken: success on invalid input. +-continue +-else +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.i conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then : +- +-else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details" "$LINENO" 5; } +-fi +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +-$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if ${ac_cv_path_GREP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$GREP"; then +- ac_path_GREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in grep ggrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_GREP" || continue +-# Check for GNU ac_path_GREP and select it if it is found. +- # Check for GNU $ac_path_GREP +-case `"$ac_path_GREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'GREP' >> "conftest.nl" +- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_GREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_GREP="$ac_path_GREP" +- ac_path_GREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_GREP_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_GREP"; then +- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +- fi +-else +- ac_cv_path_GREP=$GREP +-fi +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +-$as_echo "$ac_cv_path_GREP" >&6; } +- GREP="$ac_cv_path_GREP" +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +-$as_echo_n "checking for egrep... " >&6; } +-if ${ac_cv_path_EGREP+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +- then ac_cv_path_EGREP="$GREP -E" +- else +- if test -z "$EGREP"; then +- ac_path_EGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in egrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" +- as_fn_executable_p "$ac_path_EGREP" || continue +-# Check for GNU ac_path_EGREP and select it if it is found. +- # Check for GNU $ac_path_EGREP +-case `"$ac_path_EGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'EGREP' >> "conftest.nl" +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- as_fn_arith $ac_count + 1 && ac_count=$as_val +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_EGREP="$ac_path_EGREP" +- ac_path_EGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_EGREP_found && break 3 +- done +- done +- done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_EGREP"; then +- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 +- fi +-else +- ac_cv_path_EGREP=$EGREP +-fi +- +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +-$as_echo "$ac_cv_path_EGREP" >&6; } +- EGREP="$ac_cv_path_EGREP" +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5 +-$as_echo_n "checking for Minix Amsterdam compiler... " >&6; } +-if ${gl_cv_c_amsterdam_compiler+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#ifdef __ACK__ +-Amsterdam +-#endif +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "Amsterdam" >/dev/null 2>&1; then : +- gl_cv_c_amsterdam_compiler=yes +-else +- gl_cv_c_amsterdam_compiler=no +-fi +-rm -f conftest* +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5 +-$as_echo "$gl_cv_c_amsterdam_compiler" >&6; } +- if test -z "$AR"; then +- if test $gl_cv_c_amsterdam_compiler = yes; then +- AR='cc -c.a' +- if test -z "$ARFLAGS"; then +- ARFLAGS='-o' +- fi +- else +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_AR+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$AR"; then +- ac_cv_prog_AR="$AR" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-AR=$ac_cv_prog_AR +-if test -n "$AR"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +-$as_echo "$AR" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_AR"; then +- ac_ct_AR=$AR +- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_AR+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_AR"; then +- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_AR="ar" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_AR=$ac_cv_prog_ac_ct_AR +-if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +-$as_echo "$ac_ct_AR" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_AR" = x; then +- AR="ar" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- AR=$ac_ct_AR +- fi +-else +- AR="$ac_cv_prog_AR" +-fi +- +- if test -z "$ARFLAGS"; then +- ARFLAGS='cru' +- fi +- fi +- else +- if test -z "$ARFLAGS"; then +- ARFLAGS='cru' +- fi +- fi +- +- +- if test -z "$RANLIB"; then +- if test $gl_cv_c_amsterdam_compiler = yes; then +- RANLIB=':' +- else +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_RANLIB+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-RANLIB=$ac_cv_prog_RANLIB +-if test -n "$RANLIB"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +-$as_echo "$RANLIB" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_RANLIB"; then +- ac_ct_RANLIB=$RANLIB +- # Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_RANLIB"; then +- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +-if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +-$as_echo "$ac_ct_RANLIB" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_RANLIB" = x; then +- RANLIB=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- RANLIB=$ac_ct_RANLIB +- fi +-else +- RANLIB="$ac_cv_prog_RANLIB" +-fi +- +- fi +- fi +- +- +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } +-if ${ac_cv_header_stdc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-#include +-#include +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_header_stdc=yes +-else +- ac_cv_header_stdc=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then : +- +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif +- +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int +-main () +-{ +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- ac_cv_header_stdc=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 +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then +- +-$as_echo "#define STDC_HEADERS 1" >>confdefs.h +- +-fi +- +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +-" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" +-if test "x$ac_cv_header_minix_config_h" = xyes; then : +- MINIX=yes +-else +- MINIX= +-fi +- +- +- if test "$MINIX" = yes; then +- +-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h +- +- +-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h +- +- +-$as_echo "#define _MINIX 1" >>confdefs.h +- +- +-$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h +- +- fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } +-if ${ac_cv_safe_to_define___extensions__+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-# define __EXTENSIONS__ 1 +- $ac_includes_default +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_safe_to_define___extensions__=yes +-else +- ac_cv_safe_to_define___extensions__=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } +- test $ac_cv_safe_to_define___extensions__ = yes && +- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h +- +- $as_echo "#define _ALL_SOURCE 1" >>confdefs.h +- +- $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h +- +- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h +- +- $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h +- +- $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +-$as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; } +-if ${ac_cv_should_define__xopen_source+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_should_define__xopen_source=no +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include +- mbstate_t x; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #define _XOPEN_SOURCE 500 +- #include +- mbstate_t x; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_should_define__xopen_source=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +-$as_echo "$ac_cv_should_define__xopen_source" >&6; } +- test $ac_cv_should_define__xopen_source = yes && +- $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h +- +- +- +- +- +- +- +- +- if false; then +- GL_COND_LIBTOOL_TRUE= +- GL_COND_LIBTOOL_FALSE='#' +-else +- GL_COND_LIBTOOL_TRUE='#' +- GL_COND_LIBTOOL_FALSE= +-fi +- +-gl_cond_libtool=false +-gl_libdeps= +-gl_ltlibdeps= +- +- +-# Like AC_LIBOBJ, except that the module name goes +-# into gl_LIBOBJS instead of into LIBOBJS. +- +- +-# Like AC_REPLACE_FUNCS, except that the module name goes +-# into gl_LIBOBJS instead of into LIBOBJS. +- +- +-# Like AC_LIBSOURCES, except the directory where the source file is +-# expected is derived from the gnulib-tool parameterization, +-# and alloca is special cased (for the alloca-opt module). +-# We could also entirely rely on EXTRA_lib..._SOURCES. +- +- +- +- +- +- +- +- LIBC_FATAL_STDERR_=1 +- export LIBC_FATAL_STDERR_ +- +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +-$as_echo_n "checking for unsigned long long int... " >&6; } +-if ${ac_cv_type_unsigned_long_long_int+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_unsigned_long_long_int=yes +- if test "x${ac_cv_prog_cc_c99-no}" = xno; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- /* For now, do not test the preprocessor; as of 2007 there are too many +- implementations with broken preprocessors. Perhaps this can +- be revisited in 2012. In the meantime, code should not expect +- #if to work with literals wider than 32 bits. */ +- /* Test literals. */ +- long long int ll = 9223372036854775807ll; +- long long int nll = -9223372036854775807LL; +- unsigned long long int ull = 18446744073709551615ULL; +- /* Test constant expressions. */ +- typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) +- ? 1 : -1)]; +- typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 +- ? 1 : -1)]; +- int i = 63; +-int +-main () +-{ +-/* Test availability of runtime routines for shift and division. */ +- long long int llmax = 9223372036854775807ll; +- unsigned long long int ullmax = 18446744073709551615ull; +- return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) +- | (llmax / ll) | (llmax % ll) +- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) +- | (ullmax / ull) | (ullmax % ull)); +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- +-else +- ac_cv_type_unsigned_long_long_int=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +-$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } +- if test $ac_cv_type_unsigned_long_long_int = yes; then +- +-$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h +- +- fi +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +-$as_echo_n "checking for long long int... " >&6; } +-if ${ac_cv_type_long_long_int+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_type_long_long_int=yes +- if test "x${ac_cv_prog_cc_c99-no}" = xno; then +- ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int +- if test $ac_cv_type_long_long_int = yes; then +- if test "$cross_compiling" = yes; then : +- : +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- #ifndef LLONG_MAX +- # define HALF \ +- (1LL << (sizeof (long long int) * CHAR_BIT - 2)) +- # define LLONG_MAX (HALF - 1 + HALF) +- #endif +-int +-main () +-{ +-long long int n = 1; +- int i; +- for (i = 0; ; i++) +- { +- long long int m = n << i; +- if (m >> i != n) +- return 1; +- if (LLONG_MAX / 2 < m) +- break; +- } +- return 0; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- +-else +- ac_cv_type_long_long_int=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 +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +-$as_echo "$ac_cv_type_long_long_int" >&6; } +- if test $ac_cv_type_long_long_int = yes; then +- +-$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h +- +- fi +- +- +- +- +- +- for ac_header in $gl_header_list +-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" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 +-$as_echo_n "checking whether the preprocessor supports include_next... " >&6; } +-if ${gl_cv_have_include_next+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- rm -rf conftestd1a conftestd1b conftestd2 +- mkdir conftestd1a conftestd1b conftestd2 +- cat < conftestd1a/conftest.h +-#define DEFINED_IN_CONFTESTD1 +-#include_next +-#ifdef DEFINED_IN_CONFTESTD2 +-int foo; +-#else +-#error "include_next doesn't work" +-#endif +-EOF +- cat < conftestd1b/conftest.h +-#define DEFINED_IN_CONFTESTD1 +-#include +-#include_next +-#ifdef DEFINED_IN_CONFTESTD2 +-int foo; +-#else +-#error "include_next doesn't work" +-#endif +-EOF +- cat < conftestd2/conftest.h +-#ifndef DEFINED_IN_CONFTESTD1 +-#error "include_next test doesn't work" +-#endif +-#define DEFINED_IN_CONFTESTD2 +-EOF +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_have_include_next=yes +-else +- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_have_include_next=buggy +-else +- gl_cv_have_include_next=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$gl_save_CPPFLAGS" +- rm -rf conftestd1a conftestd1b conftestd2 +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 +-$as_echo "$gl_cv_have_include_next" >&6; } +- PRAGMA_SYSTEM_HEADER= +- if test $gl_cv_have_include_next = yes; then +- INCLUDE_NEXT=include_next +- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next +- if test -n "$GCC"; then +- PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' +- fi +- else +- if test $gl_cv_have_include_next = buggy; then +- INCLUDE_NEXT=include +- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next +- else +- INCLUDE_NEXT=include +- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include +- fi +- fi +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5 +-$as_echo_n "checking whether system header files limit the line length... " >&6; } +-if ${gl_cv_pragma_columns+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#ifdef __TANDEM +-choke me +-#endif +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "choke me" >/dev/null 2>&1; then : +- gl_cv_pragma_columns=yes +-else +- gl_cv_pragma_columns=no +-fi +-rm -f conftest* +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5 +-$as_echo "$gl_cv_pragma_columns" >&6; } +- if test $gl_cv_pragma_columns = yes; then +- PRAGMA_COLUMNS="#pragma COLUMNS 10000" +- else +- PRAGMA_COLUMNS= +- fi +- +- +- +- +- +- +- +- +- gl_cv_c_multiarch=no +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#ifndef __APPLE_CC__ +- not a universal capable compiler +- #endif +- typedef int dummy; +- +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- arch= +- prev= +- for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do +- if test -n "$prev"; then +- case $word in +- i?86 | x86_64 | ppc | ppc64) +- if test -z "$arch" || test "$arch" = "$word"; then +- arch="$word" +- else +- gl_cv_c_multiarch=yes +- fi +- ;; +- esac +- prev= +- else +- if test "x$word" = "x-arch"; then +- prev=arch +- fi +- fi +- done +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test $gl_cv_c_multiarch = yes; then +- APPLE_UNIVERSAL_BUILD=1 +- else +- APPLE_UNIVERSAL_BUILD=0 +- fi +- +- +- +- +- +- if test $ac_cv_type_long_long_int = yes; then +- HAVE_LONG_LONG_INT=1 +- else +- HAVE_LONG_LONG_INT=0 +- fi +- +- +- if test $ac_cv_type_unsigned_long_long_int = yes; then +- HAVE_UNSIGNED_LONG_LONG_INT=1 +- else +- HAVE_UNSIGNED_LONG_LONG_INT=0 +- fi +- +- +- +- : +- +- +- +- +- +- if test $ac_cv_header_wchar_h = yes; then +- HAVE_WCHAR_H=1 +- else +- HAVE_WCHAR_H=0 +- fi +- +- +- if test $ac_cv_header_inttypes_h = yes; then +- HAVE_INTTYPES_H=1 +- else +- HAVE_INTTYPES_H=0 +- fi +- +- +- if test $ac_cv_header_sys_types_h = yes; then +- HAVE_SYS_TYPES_H=1 +- else +- HAVE_SYS_TYPES_H=0 +- fi +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- +- +- if test $gl_cv_have_include_next = yes; then +- gl_cv_next_stdint_h='<'stdint.h'>' +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +-$as_echo_n "checking absolute name of ... " >&6; } +-if ${gl_cv_next_stdint_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test $ac_cv_header_stdint_h = yes; then +- +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +- case "$host_os" in +- aix*) gl_absname_cpp="$ac_cpp -C" ;; +- *) gl_absname_cpp="$ac_cpp" ;; +- esac +- +- case "$host_os" in +- mingw*) +- gl_dirsep_regex='[/\\]' +- ;; +- *) +- gl_dirsep_regex='\/' +- ;; +- esac +- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' +- +- gl_header_literal_regex=`echo 'stdint.h' \ +- | sed -e "$gl_make_literal_regex_sed"` +- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ +- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ +- s|^/[^/]|//&| +- p +- q +- }' +- gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | +- sed -n "$gl_absolute_header_sed"`'"' +- else +- gl_cv_next_stdint_h='<'stdint.h'>' +- fi +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5 +-$as_echo "$gl_cv_next_stdint_h" >&6; } +- fi +- NEXT_STDINT_H=$gl_cv_next_stdint_h +- +- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' +- gl_next_as_first_directive='<'stdint.h'>' +- else +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' +- gl_next_as_first_directive=$gl_cv_next_stdint_h +- fi +- NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive +- +- +- +- +- if test $ac_cv_header_stdint_h = yes; then +- HAVE_STDINT_H=1 +- else +- HAVE_STDINT_H=0 +- fi +- +- +- if test $ac_cv_header_stdint_h = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5 +-$as_echo_n "checking whether stdint.h conforms to C99... " >&6; } +-if ${gl_cv_header_working_stdint_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- gl_cv_header_working_stdint_h=no +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +-#include +-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ +-#if !(defined WCHAR_MIN && defined WCHAR_MAX) +-#error "WCHAR_MIN, WCHAR_MAX not defined in " +-#endif +- +- +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +- +-#ifdef INT8_MAX +-int8_t a1 = INT8_MAX; +-int8_t a1min = INT8_MIN; +-#endif +-#ifdef INT16_MAX +-int16_t a2 = INT16_MAX; +-int16_t a2min = INT16_MIN; +-#endif +-#ifdef INT32_MAX +-int32_t a3 = INT32_MAX; +-int32_t a3min = INT32_MIN; +-#endif +-#ifdef INT64_MAX +-int64_t a4 = INT64_MAX; +-int64_t a4min = INT64_MIN; +-#endif +-#ifdef UINT8_MAX +-uint8_t b1 = UINT8_MAX; +-#else +-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1]; +-#endif +-#ifdef UINT16_MAX +-uint16_t b2 = UINT16_MAX; +-#endif +-#ifdef UINT32_MAX +-uint32_t b3 = UINT32_MAX; +-#endif +-#ifdef UINT64_MAX +-uint64_t b4 = UINT64_MAX; +-#endif +-int_least8_t c1 = INT8_C (0x7f); +-int_least8_t c1max = INT_LEAST8_MAX; +-int_least8_t c1min = INT_LEAST8_MIN; +-int_least16_t c2 = INT16_C (0x7fff); +-int_least16_t c2max = INT_LEAST16_MAX; +-int_least16_t c2min = INT_LEAST16_MIN; +-int_least32_t c3 = INT32_C (0x7fffffff); +-int_least32_t c3max = INT_LEAST32_MAX; +-int_least32_t c3min = INT_LEAST32_MIN; +-int_least64_t c4 = INT64_C (0x7fffffffffffffff); +-int_least64_t c4max = INT_LEAST64_MAX; +-int_least64_t c4min = INT_LEAST64_MIN; +-uint_least8_t d1 = UINT8_C (0xff); +-uint_least8_t d1max = UINT_LEAST8_MAX; +-uint_least16_t d2 = UINT16_C (0xffff); +-uint_least16_t d2max = UINT_LEAST16_MAX; +-uint_least32_t d3 = UINT32_C (0xffffffff); +-uint_least32_t d3max = UINT_LEAST32_MAX; +-uint_least64_t d4 = UINT64_C (0xffffffffffffffff); +-uint_least64_t d4max = UINT_LEAST64_MAX; +-int_fast8_t e1 = INT_FAST8_MAX; +-int_fast8_t e1min = INT_FAST8_MIN; +-int_fast16_t e2 = INT_FAST16_MAX; +-int_fast16_t e2min = INT_FAST16_MIN; +-int_fast32_t e3 = INT_FAST32_MAX; +-int_fast32_t e3min = INT_FAST32_MIN; +-int_fast64_t e4 = INT_FAST64_MAX; +-int_fast64_t e4min = INT_FAST64_MIN; +-uint_fast8_t f1 = UINT_FAST8_MAX; +-uint_fast16_t f2 = UINT_FAST16_MAX; +-uint_fast32_t f3 = UINT_FAST32_MAX; +-uint_fast64_t f4 = UINT_FAST64_MAX; +-#ifdef INTPTR_MAX +-intptr_t g = INTPTR_MAX; +-intptr_t gmin = INTPTR_MIN; +-#endif +-#ifdef UINTPTR_MAX +-uintptr_t h = UINTPTR_MAX; +-#endif +-intmax_t i = INTMAX_MAX; +-uintmax_t j = UINTMAX_MAX; +- +-#include /* for CHAR_BIT */ +-#define TYPE_MINIMUM(t) \ +- ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) +-#define TYPE_MAXIMUM(t) \ +- ((t) ((t) 0 < (t) -1 \ +- ? (t) -1 \ +- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) +-struct s { +- int check_PTRDIFF: +- PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) +- && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) +- ? 1 : -1; +- /* Detect bug in FreeBSD 6.0 / ia64. */ +- int check_SIG_ATOMIC: +- SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) +- && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) +- ? 1 : -1; +- int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1; +- int check_WCHAR: +- WCHAR_MIN == TYPE_MINIMUM (wchar_t) +- && WCHAR_MAX == TYPE_MAXIMUM (wchar_t) +- ? 1 : -1; +- /* Detect bug in mingw. */ +- int check_WINT: +- WINT_MIN == TYPE_MINIMUM (wint_t) +- && WINT_MAX == TYPE_MAXIMUM (wint_t) +- ? 1 : -1; +- +- /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */ +- int check_UINT8_C: +- (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1; +- int check_UINT16_C: +- (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1; +- +- /* Detect bugs in OpenBSD 3.9 stdint.h. */ +-#ifdef UINT8_MAX +- int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1; +-#endif +-#ifdef UINT16_MAX +- int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1; +-#endif +-#ifdef UINT32_MAX +- int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1; +-#endif +-#ifdef UINT64_MAX +- int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1; +-#endif +- int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1; +- int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1; +- int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1; +- int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1; +- int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1; +- int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1; +- int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1; +- int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1; +- int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1; +- int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1; +- int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1; +-}; +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- if test "$cross_compiling" = yes; then : +- gl_cv_header_working_stdint_h=yes +- +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- +-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +-#include +- +- +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +- +-#include +-#include +-#define MVAL(macro) MVAL1(macro) +-#define MVAL1(expression) #expression +-static const char *macro_values[] = +- { +-#ifdef INT8_MAX +- MVAL (INT8_MAX), +-#endif +-#ifdef INT16_MAX +- MVAL (INT16_MAX), +-#endif +-#ifdef INT32_MAX +- MVAL (INT32_MAX), +-#endif +-#ifdef INT64_MAX +- MVAL (INT64_MAX), +-#endif +-#ifdef UINT8_MAX +- MVAL (UINT8_MAX), +-#endif +-#ifdef UINT16_MAX +- MVAL (UINT16_MAX), +-#endif +-#ifdef UINT32_MAX +- MVAL (UINT32_MAX), +-#endif +-#ifdef UINT64_MAX +- MVAL (UINT64_MAX), +-#endif +- NULL +- }; +- +-int +-main () +-{ +- +- const char **mv; +- for (mv = macro_values; *mv != NULL; mv++) +- { +- const char *value = *mv; +- /* Test whether it looks like a cast expression. */ +- if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0 +- || strncmp (value, "((unsigned short)"/*)*/, 17) == 0 +- || strncmp (value, "((unsigned char)"/*)*/, 16) == 0 +- || strncmp (value, "((int)"/*)*/, 6) == 0 +- || strncmp (value, "((signed short)"/*)*/, 15) == 0 +- || strncmp (value, "((signed char)"/*)*/, 14) == 0) +- return mv - macro_values + 1; +- } +- return 0; +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- gl_cv_header_working_stdint_h=yes +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 +-$as_echo "$gl_cv_header_working_stdint_h" >&6; } +- fi +- if test "$gl_cv_header_working_stdint_h" = yes; then +- STDINT_H= +- else +- for ac_header in sys/inttypes.h sys/bitypes.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" +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- if test $ac_cv_header_sys_inttypes_h = yes; then +- HAVE_SYS_INTTYPES_H=1 +- else +- HAVE_SYS_INTTYPES_H=0 +- fi +- +- if test $ac_cv_header_sys_bitypes_h = yes; then +- HAVE_SYS_BITYPES_H=1 +- else +- HAVE_SYS_BITYPES_H=0 +- fi +- +- +- +- +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- +- +- for gltype in ptrdiff_t size_t ; do +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 +-$as_echo_n "checking for bit size of $gltype... " >&6; } +-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +-#include "; then : +- +-else +- result=unknown +-fi +- +- eval gl_cv_bitsizeof_${gltype}=\$result +- +-fi +-eval ac_res=\$gl_cv_bitsizeof_${gltype} +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval result=\$gl_cv_bitsizeof_${gltype} +- if test $result = unknown; then +- result=0 +- fi +- GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- cat >>confdefs.h <<_ACEOF +-#define BITSIZEOF_${GLTYPE} $result +-_ACEOF +- +- eval BITSIZEOF_${GLTYPE}=\$result +- done +- +- +- fi +- +- +- for gltype in sig_atomic_t wchar_t wint_t ; do +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5 +-$as_echo_n "checking for bit size of $gltype... " >&6; } +-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result" " +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +-#include "; then : +- +-else +- result=unknown +-fi +- +- eval gl_cv_bitsizeof_${gltype}=\$result +- +-fi +-eval ac_res=\$gl_cv_bitsizeof_${gltype} +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval result=\$gl_cv_bitsizeof_${gltype} +- if test $result = unknown; then +- result=0 +- fi +- GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- cat >>confdefs.h <<_ACEOF +-#define BITSIZEOF_${GLTYPE} $result +-_ACEOF +- +- eval BITSIZEOF_${GLTYPE}=\$result +- done +- +- +- +- +- for gltype in sig_atomic_t wchar_t wint_t ; do +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5 +-$as_echo_n "checking whether $gltype is signed... " >&6; } +-if eval \${gl_cv_type_${gltype}_signed+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +- int verify[2 * (($gltype) -1 < ($gltype) 0) - 1]; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- result=yes +-else +- result=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- eval gl_cv_type_${gltype}_signed=\$result +- +-fi +-eval ac_res=\$gl_cv_type_${gltype}_signed +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval result=\$gl_cv_type_${gltype}_signed +- GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- if test "$result" = yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_SIGNED_${GLTYPE} 1 +-_ACEOF +- +- eval HAVE_SIGNED_${GLTYPE}=1 +- else +- eval HAVE_SIGNED_${GLTYPE}=0 +- fi +- done +- +- +- gl_cv_type_ptrdiff_t_signed=yes +- gl_cv_type_size_t_signed=no +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- +- +- for gltype in ptrdiff_t size_t ; do +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 +-$as_echo_n "checking for $gltype integer literal suffix... " >&6; } +-if eval \${gl_cv_type_${gltype}_suffix+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- eval gl_cv_type_${gltype}_suffix=no +- eval result=\$gl_cv_type_${gltype}_signed +- if test "$result" = yes; then +- glsufu= +- else +- glsufu=u +- fi +- for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do +- case $glsuf in +- '') gltype1='int';; +- l) gltype1='long int';; +- ll) gltype1='long long int';; +- i64) gltype1='__int64';; +- u) gltype1='unsigned int';; +- ul) gltype1='unsigned long int';; +- ull) gltype1='unsigned long long int';; +- ui64)gltype1='unsigned __int64';; +- esac +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +- extern $gltype foo; +- extern $gltype1 foo; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval gl_cv_type_${gltype}_suffix=\$glsuf +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- eval result=\$gl_cv_type_${gltype}_suffix +- test "$result" != no && break +- done +-fi +-eval ac_res=\$gl_cv_type_${gltype}_suffix +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- eval result=\$gl_cv_type_${gltype}_suffix +- test "$result" = no && result= +- eval ${GLTYPE}_SUFFIX=\$result +- cat >>confdefs.h <<_ACEOF +-#define ${GLTYPE}_SUFFIX $result +-_ACEOF +- +- done +- +- +- fi +- +- +- for gltype in sig_atomic_t wchar_t wint_t ; do +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5 +-$as_echo_n "checking for $gltype integer literal suffix... " >&6; } +-if eval \${gl_cv_type_${gltype}_suffix+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- eval gl_cv_type_${gltype}_suffix=no +- eval result=\$gl_cv_type_${gltype}_signed +- if test "$result" = yes; then +- glsufu= +- else +- glsufu=u +- fi +- for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do +- case $glsuf in +- '') gltype1='int';; +- l) gltype1='long int';; +- ll) gltype1='long long int';; +- i64) gltype1='__int64';; +- u) gltype1='unsigned int';; +- ul) gltype1='unsigned long int';; +- ull) gltype1='unsigned long long int';; +- ui64)gltype1='unsigned __int64';; +- esac +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +- +- extern $gltype foo; +- extern $gltype1 foo; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval gl_cv_type_${gltype}_suffix=\$glsuf +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- eval result=\$gl_cv_type_${gltype}_suffix +- test "$result" != no && break +- done +-fi +-eval ac_res=\$gl_cv_type_${gltype}_suffix +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- eval result=\$gl_cv_type_${gltype}_suffix +- test "$result" = no && result= +- eval ${GLTYPE}_SUFFIX=\$result +- cat >>confdefs.h <<_ACEOF +-#define ${GLTYPE}_SUFFIX $result +-_ACEOF +- +- done +- +- +- +- if test $BITSIZEOF_WINT_T -lt 32; then +- BITSIZEOF_WINT_T=32 +- fi +- +- STDINT_H=stdint.h +- fi +- +- if test -n "$STDINT_H"; then +- GL_GENERATE_STDINT_H_TRUE= +- GL_GENERATE_STDINT_H_FALSE='#' +-else +- GL_GENERATE_STDINT_H_TRUE='#' +- GL_GENERATE_STDINT_H_FALSE= +-fi +- +- +- +- +- +- +- +- +- GNULIB_IMAXABS=0; +- GNULIB_IMAXDIV=0; +- GNULIB_STRTOIMAX=0; +- GNULIB_STRTOUMAX=0; +- HAVE_DECL_IMAXABS=1; +- HAVE_DECL_IMAXDIV=1; +- HAVE_DECL_STRTOIMAX=1; +- HAVE_DECL_STRTOUMAX=1; +- REPLACE_STRTOIMAX=0; +- INT32_MAX_LT_INTMAX_MAX=1; +- INT64_MAX_EQ_LONG_MAX='defined _LP64'; +- PRI_MACROS_BROKEN=0; +- PRIPTR_PREFIX=__PRIPTR_PREFIX; +- UINT32_MAX_LT_UINTMAX_MAX=1; +- UINT64_MAX_EQ_ULONG_MAX='defined _LP64'; +- +- +- +- +- : +- +- +- +- +- +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- +- +- if test $gl_cv_have_include_next = yes; then +- gl_cv_next_inttypes_h='<'inttypes.h'>' +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +-$as_echo_n "checking absolute name of ... " >&6; } +-if ${gl_cv_next_inttypes_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test $ac_cv_header_inttypes_h = yes; then +- +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +- case "$host_os" in +- aix*) gl_absname_cpp="$ac_cpp -C" ;; +- *) gl_absname_cpp="$ac_cpp" ;; +- esac +- +- case "$host_os" in +- mingw*) +- gl_dirsep_regex='[/\\]' +- ;; +- *) +- gl_dirsep_regex='\/' +- ;; +- esac +- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' +- +- gl_header_literal_regex=`echo 'inttypes.h' \ +- | sed -e "$gl_make_literal_regex_sed"` +- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ +- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ +- s|^/[^/]|//&| +- p +- q +- }' +- gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | +- sed -n "$gl_absolute_header_sed"`'"' +- else +- gl_cv_next_inttypes_h='<'inttypes.h'>' +- fi +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5 +-$as_echo "$gl_cv_next_inttypes_h" >&6; } +- fi +- NEXT_INTTYPES_H=$gl_cv_next_inttypes_h +- +- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' +- gl_next_as_first_directive='<'inttypes.h'>' +- else +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' +- gl_next_as_first_directive=$gl_cv_next_inttypes_h +- fi +- NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H=$gl_next_as_first_directive +- +- +- +- +- +- +- +- +- for gl_func in imaxabs imaxdiv strtoimax strtoumax; do +- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 +-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +-if eval \${$as_gl_Symbol+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-int +-main () +-{ +-#undef $gl_func +- (void) $gl_func; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$as_gl_Symbol=yes" +-else +- eval "$as_gl_Symbol=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$as_gl_Symbol +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +-_ACEOF +- +- eval ac_cv_have_decl_$gl_func=yes +-fi +- done +- +- +- +- for ac_header in inttypes.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +-if test "x$ac_cv_header_inttypes_h" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_INTTYPES_H 1 +-_ACEOF +- +-fi +- +-done +- +- if test $ac_cv_header_inttypes_h = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5 +-$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; } +-if ${gt_cv_inttypes_pri_broken+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#ifdef PRId32 +-char *p = PRId32; +-#endif +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gt_cv_inttypes_pri_broken=no +-else +- gt_cv_inttypes_pri_broken=yes +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5 +-$as_echo "$gt_cv_inttypes_pri_broken" >&6; } +- fi +- if test "$gt_cv_inttypes_pri_broken" = yes; then +- +-cat >>confdefs.h <<_ACEOF +-#define PRI_MACROS_BROKEN 1 +-_ACEOF +- +- PRI_MACROS_BROKEN=1 +- else +- PRI_MACROS_BROKEN=0 +- fi +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 +-$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } +-if ${am_cv_langinfo_codeset+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-int +-main () +-{ +-char* cs = nl_langinfo(CODESET); return !cs; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- am_cv_langinfo_codeset=yes +-else +- am_cv_langinfo_codeset=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 +-$as_echo "$am_cv_langinfo_codeset" >&6; } +- if test $am_cv_langinfo_codeset = yes; then +- +-$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h +- +- fi +- +- +- +- +- +- +- +- +- +- +- for ac_func in $gl_func_list +-do : +- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- : +- +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5 +-$as_echo_n "checking for working fcntl.h... " >&6; } +-if ${gl_cv_header_working_fcntl_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- gl_cv_header_working_fcntl_h=cross-compiling +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- #include +- #if HAVE_UNISTD_H +- # include +- #else /* on Windows with MSVC */ +- # include +- # include +- # defined sleep(n) _sleep ((n) * 1000) +- #endif +- #include +- #ifndef O_NOATIME +- #define O_NOATIME 0 +- #endif +- #ifndef O_NOFOLLOW +- #define O_NOFOLLOW 0 +- #endif +- static int const constants[] = +- { +- O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND, +- O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY +- }; +- +-int +-main () +-{ +- +- int result = !constants; +- #if HAVE_SYMLINK +- { +- static char const sym[] = "conftest.sym"; +- if (symlink ("/dev/null", sym) != 0) +- result |= 2; +- else +- { +- int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); +- if (fd >= 0) +- { +- close (fd); +- result |= 4; +- } +- } +- if (unlink (sym) != 0 || symlink (".", sym) != 0) +- result |= 2; +- else +- { +- int fd = open (sym, O_RDONLY | O_NOFOLLOW); +- if (fd >= 0) +- { +- close (fd); +- result |= 4; +- } +- } +- unlink (sym); +- } +- #endif +- { +- static char const file[] = "confdefs.h"; +- int fd = open (file, O_RDONLY | O_NOATIME); +- if (fd < 0) +- result |= 8; +- else +- { +- struct stat st0; +- if (fstat (fd, &st0) != 0) +- result |= 16; +- else +- { +- char c; +- sleep (1); +- if (read (fd, &c, 1) != 1) +- result |= 24; +- else +- { +- if (close (fd) != 0) +- result |= 32; +- else +- { +- struct stat st1; +- if (stat (file, &st1) != 0) +- result |= 40; +- else +- if (st0.st_atime != st1.st_atime) +- result |= 64; +- } +- } +- } +- } +- } +- return result; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- gl_cv_header_working_fcntl_h=yes +-else +- case $? in #( +- 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( +- 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( +- 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( +- *) gl_cv_header_working_fcntl_h='no';; +- esac +-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: $gl_cv_header_working_fcntl_h" >&5 +-$as_echo "$gl_cv_header_working_fcntl_h" >&6; } +- +- case $gl_cv_header_working_fcntl_h in #( +- *O_NOATIME* | no | cross-compiling) ac_val=0;; #( +- *) ac_val=1;; +- esac +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_WORKING_O_NOATIME $ac_val +-_ACEOF +- +- +- case $gl_cv_header_working_fcntl_h in #( +- *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #( +- *) ac_val=1;; +- esac +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_WORKING_O_NOFOLLOW $ac_val +-_ACEOF +- +- +- +- ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" +-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then : +- ac_have_decl=1 +-else +- ac_have_decl=0 +-fi +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl +-_ACEOF +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5 +-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; } +-if ${ac_cv_gnu_library_2_1+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#ifdef __GNU_LIBRARY__ +- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) +- Lucky GNU user +- #endif +-#endif +-#ifdef __UCLIBC__ +- Lucky user +-#endif +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "Lucky" >/dev/null 2>&1; then : +- ac_cv_gnu_library_2_1=yes +-else +- ac_cv_gnu_library_2_1=no +-fi +-rm -f conftest* +- +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5 +-$as_echo "$ac_cv_gnu_library_2_1" >&6; } +- +- GLIBC21="$ac_cv_gnu_library_2_1" +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } +-if ${ac_cv_header_stdbool_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include +- #ifndef bool +- "error: bool is not defined" +- #endif +- #ifndef false +- "error: false is not defined" +- #endif +- #if false +- "error: false is not 0" +- #endif +- #ifndef true +- "error: true is not defined" +- #endif +- #if true != 1 +- "error: true is not 1" +- #endif +- #ifndef __bool_true_false_are_defined +- "error: __bool_true_false_are_defined is not defined" +- #endif +- +- struct s { _Bool s: 1; _Bool t; } s; +- +- char a[true == 1 ? 1 : -1]; +- char b[false == 0 ? 1 : -1]; +- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; +- char d[(bool) 0.5 == true ? 1 : -1]; +- /* See body of main program for 'e'. */ +- char f[(_Bool) 0.0 == false ? 1 : -1]; +- char g[true]; +- char h[sizeof (_Bool)]; +- char i[sizeof s.t]; +- enum { j = false, k = true, l = false * true, m = true * 256 }; +- /* The following fails for +- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ +- _Bool n[m]; +- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; +- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; +- /* Catch a bug in an HP-UX C compiler. See +- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html +- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html +- */ +- _Bool q = true; +- _Bool *pq = &q; +- +-int +-main () +-{ +- +- bool e = &s; +- *pq |= q; +- *pq |= ! q; +- /* Refer to every declared value, to avoid compiler optimizations. */ +- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l +- + !m + !n + !o + !p + !q + !pq); +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_header_stdbool_h=yes +-else +- ac_cv_header_stdbool_h=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +-$as_echo "$ac_cv_header_stdbool_h" >&6; } +- ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +-if test "x$ac_cv_type__Bool" = xyes; then : +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE__BOOL 1 +-_ACEOF +- +- +-fi +- +- +- +- REPLACE_NULL=0; +- HAVE_WCHAR_T=1; +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 +-$as_echo_n "checking for wchar_t... " >&6; } +-if ${gt_cv_c_wchar_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- wchar_t foo = (wchar_t)'\0'; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gt_cv_c_wchar_t=yes +-else +- gt_cv_c_wchar_t=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5 +-$as_echo "$gt_cv_c_wchar_t" >&6; } +- if test $gt_cv_c_wchar_t = yes; then +- +-$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h +- +- fi +- +- +- +- +- +- +- +-gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;} +-i\ +-0 +-q +-' +-gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;} +-i\ +-0 +-q +-' +-gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;} +-i\ +-0 +-q +-' +- +- +- if test "$HAVE_LIBUNISTRING" = yes; then +- LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"` +- LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"` +- LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"` +- fi +- +- +- GNULIB_BTOWC=0; +- GNULIB_WCTOB=0; +- GNULIB_MBSINIT=0; +- GNULIB_MBRTOWC=0; +- GNULIB_MBRLEN=0; +- GNULIB_MBSRTOWCS=0; +- GNULIB_MBSNRTOWCS=0; +- GNULIB_WCRTOMB=0; +- GNULIB_WCSRTOMBS=0; +- GNULIB_WCSNRTOMBS=0; +- GNULIB_WCWIDTH=0; +- GNULIB_WMEMCHR=0; +- GNULIB_WMEMCMP=0; +- GNULIB_WMEMCPY=0; +- GNULIB_WMEMMOVE=0; +- GNULIB_WMEMSET=0; +- GNULIB_WCSLEN=0; +- GNULIB_WCSNLEN=0; +- GNULIB_WCSCPY=0; +- GNULIB_WCPCPY=0; +- GNULIB_WCSNCPY=0; +- GNULIB_WCPNCPY=0; +- GNULIB_WCSCAT=0; +- GNULIB_WCSNCAT=0; +- GNULIB_WCSCMP=0; +- GNULIB_WCSNCMP=0; +- GNULIB_WCSCASECMP=0; +- GNULIB_WCSNCASECMP=0; +- GNULIB_WCSCOLL=0; +- GNULIB_WCSXFRM=0; +- GNULIB_WCSDUP=0; +- GNULIB_WCSCHR=0; +- GNULIB_WCSRCHR=0; +- GNULIB_WCSCSPN=0; +- GNULIB_WCSSPN=0; +- GNULIB_WCSPBRK=0; +- GNULIB_WCSSTR=0; +- GNULIB_WCSTOK=0; +- GNULIB_WCSWIDTH=0; +- HAVE_BTOWC=1; +- HAVE_MBSINIT=1; +- HAVE_MBRTOWC=1; +- HAVE_MBRLEN=1; +- HAVE_MBSRTOWCS=1; +- HAVE_MBSNRTOWCS=1; +- HAVE_WCRTOMB=1; +- HAVE_WCSRTOMBS=1; +- HAVE_WCSNRTOMBS=1; +- HAVE_WMEMCHR=1; +- HAVE_WMEMCMP=1; +- HAVE_WMEMCPY=1; +- HAVE_WMEMMOVE=1; +- HAVE_WMEMSET=1; +- HAVE_WCSLEN=1; +- HAVE_WCSNLEN=1; +- HAVE_WCSCPY=1; +- HAVE_WCPCPY=1; +- HAVE_WCSNCPY=1; +- HAVE_WCPNCPY=1; +- HAVE_WCSCAT=1; +- HAVE_WCSNCAT=1; +- HAVE_WCSCMP=1; +- HAVE_WCSNCMP=1; +- HAVE_WCSCASECMP=1; +- HAVE_WCSNCASECMP=1; +- HAVE_WCSCOLL=1; +- HAVE_WCSXFRM=1; +- HAVE_WCSDUP=1; +- HAVE_WCSCHR=1; +- HAVE_WCSRCHR=1; +- HAVE_WCSCSPN=1; +- HAVE_WCSSPN=1; +- HAVE_WCSPBRK=1; +- HAVE_WCSSTR=1; +- HAVE_WCSTOK=1; +- HAVE_WCSWIDTH=1; +- HAVE_DECL_WCTOB=1; +- HAVE_DECL_WCWIDTH=1; +- REPLACE_MBSTATE_T=0; +- REPLACE_BTOWC=0; +- REPLACE_WCTOB=0; +- REPLACE_MBSINIT=0; +- REPLACE_MBRTOWC=0; +- REPLACE_MBRLEN=0; +- REPLACE_MBSRTOWCS=0; +- REPLACE_MBSNRTOWCS=0; +- REPLACE_WCRTOMB=0; +- REPLACE_WCSRTOMBS=0; +- REPLACE_WCSNRTOMBS=0; +- REPLACE_WCWIDTH=0; +- REPLACE_WCSWIDTH=0; +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 +-$as_echo_n "checking whether uses 'inline' correctly... " >&6; } +-if ${gl_cv_header_wchar_h_correct_inline+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- gl_cv_header_wchar_h_correct_inline=yes +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #define wcstod renamed_wcstod +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#include +-#include +-#include +-#include +-extern int zero (void); +-int main () { return zero(); } +- +-_ACEOF +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- mv conftest.$ac_objext conftest1.$ac_objext +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #define wcstod renamed_wcstod +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#include +-#include +-#include +-#include +-int zero (void) { return 0; } +- +-_ACEOF +- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- mv conftest.$ac_objext conftest2.$ac_objext +- if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then +- : +- else +- gl_cv_header_wchar_h_correct_inline=no +- fi +- fi +- fi +- rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5 +-$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; } +- if test $gl_cv_header_wchar_h_correct_inline = no; then +- as_fn_error $? " cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS). +-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in +-C99 mode. You have four options: +- - Add the flag -fgnu89-inline to CC and reconfigure, or +- - Fix your include files, using parts of +- , or +- - Use a gcc version older than 4.3, or +- - Don't use the flags -std=c99 or -std=gnu99. +-Configuration aborted." "$LINENO" 5 +- fi +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- if test $ac_cv_header_features_h = yes; then +- HAVE_FEATURES_H=1 +- else +- HAVE_FEATURES_H=0 +- fi +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 +-$as_echo_n "checking for wint_t... " >&6; } +-if ${gt_cv_c_wint_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be included +- before . */ +-#include +-#include +-#include +-#include +- wint_t foo = (wchar_t)'\0'; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gt_cv_c_wint_t=yes +-else +- gt_cv_c_wint_t=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 +-$as_echo "$gt_cv_c_wint_t" >&6; } +- if test $gt_cv_c_wint_t = yes; then +- +-$as_echo "#define HAVE_WINT_T 1" >>confdefs.h +- +- fi +- +- +- GNULIB_ISWBLANK=0; +- GNULIB_WCTYPE=0; +- GNULIB_ISWCTYPE=0; +- GNULIB_WCTRANS=0; +- GNULIB_TOWCTRANS=0; +- HAVE_ISWBLANK=1; +- HAVE_WCTYPE_T=1; +- HAVE_WCTRANS_T=1; +- REPLACE_ISWBLANK=0; +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-gl_m4_base='m4' +- +- +- +- +- +- +- +- +- +-gl_source_base='lib' +- +- if test "x$datarootdir" = x; then +- datarootdir='${datadir}' +- +- fi +- if test "x$docdir" = x; then +- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +- +- fi +- if test "x$htmldir" = x; then +- htmldir='${docdir}' +- +- fi +- if test "x$dvidir" = x; then +- dvidir='${docdir}' +- +- fi +- if test "x$pdfdir" = x; then +- pdfdir='${docdir}' +- +- fi +- if test "x$psdir" = x; then +- psdir='${docdir}' +- +- fi +- if test "x$lispdir" = x; then +- lispdir='${datarootdir}/emacs/site-lisp' +- +- fi +- if test "x$localedir" = x; then +- localedir='${datarootdir}/locale' +- +- fi +- if test "x$runstatedir" = x; then +- runstatedir='${localstatedir}/run' +- +- fi +- +- pkglibexecdir='${libexecdir}/${PACKAGE}' +- +- +- +- +- +- +- +- +- PRIPTR_PREFIX= +- if test -n "$STDINT_H"; then +- PRIPTR_PREFIX='"l"' +- else +- for glpfx in '' l ll I64; do +- case $glpfx in +- '') gltype1='int';; +- l) gltype1='long int';; +- ll) gltype1='long long int';; +- I64) gltype1='__int64';; +- esac +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- extern intptr_t foo; +- extern $gltype1 foo; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- PRIPTR_PREFIX='"'$glpfx'"' +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- test -n "$PRIPTR_PREFIX" && break +- done +- fi +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether INT32_MAX < INTMAX_MAX" >&5 +-$as_echo_n "checking whether INT32_MAX < INTMAX_MAX... " >&6; } +-if ${gl_cv_test_INT32_MAX_LT_INTMAX_MAX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Work also in C++ mode. */ +- #define __STDC_LIMIT_MACROS 1 +- +- /* Work if build is not clean. */ +- #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H +- +- #include +- #if HAVE_STDINT_H +- #include +- #endif +- +- #if defined INT32_MAX && defined INTMAX_MAX +- #define CONDITION (INT32_MAX < INTMAX_MAX) +- #elif HAVE_LONG_LONG_INT +- #define CONDITION (sizeof (int) < sizeof (long long int)) +- #else +- #define CONDITION 0 +- #endif +- int test[CONDITION ? 1 : -1]; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_test_INT32_MAX_LT_INTMAX_MAX=yes +-else +- gl_cv_test_INT32_MAX_LT_INTMAX_MAX=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&5 +-$as_echo "$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; } +- if test $gl_cv_test_INT32_MAX_LT_INTMAX_MAX = yes; then +- INT32_MAX_LT_INTMAX_MAX=1; +- else +- INT32_MAX_LT_INTMAX_MAX=0; +- fi +- +- +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether INT64_MAX == LONG_MAX" >&5 +-$as_echo_n "checking whether INT64_MAX == LONG_MAX... " >&6; } +-if ${gl_cv_test_INT64_MAX_EQ_LONG_MAX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Work also in C++ mode. */ +- #define __STDC_LIMIT_MACROS 1 +- +- /* Work if build is not clean. */ +- #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H +- +- #include +- #if HAVE_STDINT_H +- #include +- #endif +- +- #if defined INT64_MAX +- #define CONDITION (INT64_MAX == LONG_MAX) +- #elif HAVE_LONG_LONG_INT +- #define CONDITION (sizeof (long long int) == sizeof (long int)) +- #else +- #define CONDITION 0 +- #endif +- int test[CONDITION ? 1 : -1]; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_test_INT64_MAX_EQ_LONG_MAX=yes +-else +- gl_cv_test_INT64_MAX_EQ_LONG_MAX=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&5 +-$as_echo "$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; } +- if test $gl_cv_test_INT64_MAX_EQ_LONG_MAX = yes; then +- INT64_MAX_EQ_LONG_MAX=1; +- else +- INT64_MAX_EQ_LONG_MAX=0; +- fi +- +- +- else +- INT64_MAX_EQ_LONG_MAX=-1 +- fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UINT32_MAX < UINTMAX_MAX" >&5 +-$as_echo_n "checking whether UINT32_MAX < UINTMAX_MAX... " >&6; } +-if ${gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Work also in C++ mode. */ +- #define __STDC_LIMIT_MACROS 1 +- +- /* Work if build is not clean. */ +- #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H +- +- #include +- #if HAVE_STDINT_H +- #include +- #endif +- +- #if defined UINT32_MAX && defined UINTMAX_MAX +- #define CONDITION (UINT32_MAX < UINTMAX_MAX) +- #elif HAVE_LONG_LONG_INT +- #define CONDITION (sizeof (unsigned int) < sizeof (unsigned long long int)) +- #else +- #define CONDITION 0 +- #endif +- int test[CONDITION ? 1 : -1]; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=yes +-else +- gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&5 +-$as_echo "$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; } +- if test $gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX = yes; then +- UINT32_MAX_LT_UINTMAX_MAX=1; +- else +- UINT32_MAX_LT_UINTMAX_MAX=0; +- fi +- +- +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UINT64_MAX == ULONG_MAX" >&5 +-$as_echo_n "checking whether UINT64_MAX == ULONG_MAX... " >&6; } +-if ${gl_cv_test_UINT64_MAX_EQ_ULONG_MAX+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Work also in C++ mode. */ +- #define __STDC_LIMIT_MACROS 1 +- +- /* Work if build is not clean. */ +- #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H +- +- #include +- #if HAVE_STDINT_H +- #include +- #endif +- +- #if defined UINT64_MAX +- #define CONDITION (UINT64_MAX == ULONG_MAX) +- #elif HAVE_LONG_LONG_INT +- #define CONDITION (sizeof (unsigned long long int) == sizeof (unsigned long int)) +- #else +- #define CONDITION 0 +- #endif +- int test[CONDITION ? 1 : -1]; +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=yes +-else +- gl_cv_test_UINT64_MAX_EQ_ULONG_MAX=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&5 +-$as_echo "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } +- if test $gl_cv_test_UINT64_MAX_EQ_ULONG_MAX = yes; then +- UINT64_MAX_EQ_ULONG_MAX=1; +- else +- UINT64_MAX_EQ_ULONG_MAX=0; +- fi +- +- +- else +- UINT64_MAX_EQ_ULONG_MAX=-1 +- fi +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- +- +- +- LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" +- +- +- +- +- +- # Define two additional variables used in the Makefile substitution. +- +- if test "$ac_cv_header_stdbool_h" = yes; then +- STDBOOL_H='' +- else +- STDBOOL_H='stdbool.h' +- fi +- +- if test -n "$STDBOOL_H"; then +- GL_GENERATE_STDBOOL_H_TRUE= +- GL_GENERATE_STDBOOL_H_FALSE='#' +-else +- GL_GENERATE_STDBOOL_H_TRUE='#' +- GL_GENERATE_STDBOOL_H_FALSE= +-fi +- +- +- if test "$ac_cv_type__Bool" = yes; then +- HAVE__BOOL=1 +- else +- HAVE__BOOL=0 +- fi +- +- +- +- +- +- STDDEF_H= +- if test $gt_cv_c_wchar_t = no; then +- HAVE_WCHAR_T=0 +- STDDEF_H=stddef.h +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 +-$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; } +-if ${gl_cv_decl_null_works+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- int test[2 * (sizeof NULL == sizeof (void *)) -1]; +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_decl_null_works=yes +-else +- gl_cv_decl_null_works=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5 +-$as_echo "$gl_cv_decl_null_works" >&6; } +- if test $gl_cv_decl_null_works = no; then +- REPLACE_NULL=1 +- STDDEF_H=stddef.h +- fi +- +- if test -n "$STDDEF_H"; then +- GL_GENERATE_STDDEF_H_TRUE= +- GL_GENERATE_STDDEF_H_FALSE='#' +-else +- GL_GENERATE_STDDEF_H_TRUE='#' +- GL_GENERATE_STDDEF_H_FALSE= +-fi +- +- if test -n "$STDDEF_H"; then +- +- +- +- +- +- +- +- +- if test $gl_cv_have_include_next = yes; then +- gl_cv_next_stddef_h='<'stddef.h'>' +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +-$as_echo_n "checking absolute name of ... " >&6; } +-if ${gl_cv_next_stddef_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +- case "$host_os" in +- aix*) gl_absname_cpp="$ac_cpp -C" ;; +- *) gl_absname_cpp="$ac_cpp" ;; +- esac +- +- case "$host_os" in +- mingw*) +- gl_dirsep_regex='[/\\]' +- ;; +- *) +- gl_dirsep_regex='\/' +- ;; +- esac +- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' +- +- gl_header_literal_regex=`echo 'stddef.h' \ +- | sed -e "$gl_make_literal_regex_sed"` +- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ +- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ +- s|^/[^/]|//&| +- p +- q +- }' +- gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | +- sed -n "$gl_absolute_header_sed"`'"' +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 +-$as_echo "$gl_cv_next_stddef_h" >&6; } +- fi +- NEXT_STDDEF_H=$gl_cv_next_stddef_h +- +- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' +- gl_next_as_first_directive='<'stddef.h'>' +- else +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' +- gl_next_as_first_directive=$gl_cv_next_stddef_h +- fi +- NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive +- +- +- +- +- fi +- +- +- +- +- if { test "$HAVE_LIBUNISTRING" != yes \ +- || { +- +- +- +- test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ +- || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ +- && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ +- || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ +- && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 +- } +- } +- } +- +- +- +- +- } +- }; then +- LIBUNISTRING_UNITYPES_H='unitypes.h' +- else +- LIBUNISTRING_UNITYPES_H= +- fi +- +- +- +- +- if { test "$HAVE_LIBUNISTRING" != yes \ +- || { +- +- +- +- test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ +- || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ +- && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ +- || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ +- && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 +- } +- } +- } +- +- +- +- +- } +- }; then +- LIBUNISTRING_UNIWIDTH_H='uniwidth.h' +- else +- LIBUNISTRING_UNIWIDTH_H= +- fi +- +- +- +- +- if { test "$HAVE_LIBUNISTRING" != yes \ +- || { +- +- +- +- test $LIBUNISTRING_VERSION_MAJOR -lt 0 \ +- || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ +- && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ +- || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ +- && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 +- } +- } +- } +- +- +- +- +- } +- }; then +- LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE= +- LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE='#' +-else +- LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE='#' +- LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE= +-fi +- +- +- +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- +- +- if test $gl_cv_have_include_next = yes; then +- gl_cv_next_wchar_h='<'wchar.h'>' +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +-$as_echo_n "checking absolute name of ... " >&6; } +-if ${gl_cv_next_wchar_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test $ac_cv_header_wchar_h = yes; then +- +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +- case "$host_os" in +- aix*) gl_absname_cpp="$ac_cpp -C" ;; +- *) gl_absname_cpp="$ac_cpp" ;; +- esac +- +- case "$host_os" in +- mingw*) +- gl_dirsep_regex='[/\\]' +- ;; +- *) +- gl_dirsep_regex='\/' +- ;; +- esac +- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' +- +- gl_header_literal_regex=`echo 'wchar.h' \ +- | sed -e "$gl_make_literal_regex_sed"` +- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ +- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ +- s|^/[^/]|//&| +- p +- q +- }' +- gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | +- sed -n "$gl_absolute_header_sed"`'"' +- else +- gl_cv_next_wchar_h='<'wchar.h'>' +- fi +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5 +-$as_echo "$gl_cv_next_wchar_h" >&6; } +- fi +- NEXT_WCHAR_H=$gl_cv_next_wchar_h +- +- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' +- gl_next_as_first_directive='<'wchar.h'>' +- else +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' +- gl_next_as_first_directive=$gl_cv_next_wchar_h +- fi +- NEXT_AS_FIRST_DIRECTIVE_WCHAR_H=$gl_next_as_first_directive +- +- +- +- +- if test $ac_cv_header_wchar_h = yes; then +- HAVE_WCHAR_H=1 +- else +- HAVE_WCHAR_H=0 +- fi +- +- +- +- +- +- if test $gt_cv_c_wint_t = yes; then +- HAVE_WINT_T=1 +- else +- HAVE_WINT_T=0 +- fi +- +- +- +- for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do +- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 +-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +-if eval \${$as_gl_Symbol+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) +-# include +-# include +-# include +-#endif +-#include +- +-int +-main () +-{ +-#undef $gl_func +- (void) $gl_func; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$as_gl_Symbol=yes" +-else +- eval "$as_gl_Symbol=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$as_gl_Symbol +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +-_ACEOF +- +- eval ac_cv_have_decl_$gl_func=yes +-fi +- done +- +- +- +- +- +- +- +- : +- +- +- +- +- +- if test $ac_cv_func_iswcntrl = yes; then +- HAVE_ISWCNTRL=1 +- else +- HAVE_ISWCNTRL=0 +- fi +- +- +- +- if test $gt_cv_c_wint_t = yes; then +- HAVE_WINT_T=1 +- else +- HAVE_WINT_T=0 +- fi +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- +- +- if test $gl_cv_have_include_next = yes; then +- gl_cv_next_wctype_h='<'wctype.h'>' +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +-$as_echo_n "checking absolute name of ... " >&6; } +-if ${gl_cv_next_wctype_h+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test $ac_cv_header_wctype_h = yes; then +- +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- +-_ACEOF +- case "$host_os" in +- aix*) gl_absname_cpp="$ac_cpp -C" ;; +- *) gl_absname_cpp="$ac_cpp" ;; +- esac +- +- case "$host_os" in +- mingw*) +- gl_dirsep_regex='[/\\]' +- ;; +- *) +- gl_dirsep_regex='\/' +- ;; +- esac +- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' +- +- gl_header_literal_regex=`echo 'wctype.h' \ +- | sed -e "$gl_make_literal_regex_sed"` +- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ +- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ +- s|^/[^/]|//&| +- p +- q +- }' +- gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | +- sed -n "$gl_absolute_header_sed"`'"' +- else +- gl_cv_next_wctype_h='<'wctype.h'>' +- fi +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5 +-$as_echo "$gl_cv_next_wctype_h" >&6; } +- fi +- NEXT_WCTYPE_H=$gl_cv_next_wctype_h +- +- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' +- gl_next_as_first_directive='<'wctype.h'>' +- else +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' +- gl_next_as_first_directive=$gl_cv_next_wctype_h +- fi +- NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive +- +- +- +- +- if test $ac_cv_header_wctype_h = yes; then +- if test $ac_cv_func_iswcntrl = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5 +-$as_echo_n "checking whether iswcntrl works... " >&6; } +-if ${gl_cv_func_iswcntrl_works+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test "$cross_compiling" = yes; then : +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +- #if __GNU_LIBRARY__ == 1 +- Linux libc5 i18n is broken. +- #endif +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_func_iswcntrl_works="guessing yes" +-else +- gl_cv_func_iswcntrl_works="guessing no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- /* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #include +- int main () { return iswprint ('x') == 0; } +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- gl_cv_func_iswcntrl_works=yes +-else +- gl_cv_func_iswcntrl_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 +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5 +-$as_echo "$gl_cv_func_iswcntrl_works" >&6; } +- fi +- HAVE_WCTYPE_H=1 +- else +- HAVE_WCTYPE_H=0 +- fi +- +- +- case "$gl_cv_func_iswcntrl_works" in +- *yes) REPLACE_ISWCNTRL=0 ;; +- *) REPLACE_ISWCNTRL=1 ;; +- esac +- +- +- if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then +- : +- fi +- +- if test $REPLACE_ISWCNTRL = 1; then +- REPLACE_TOWLOWER=1 +- else +- for ac_func in towlower +-do : +- ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" +-if test "x$ac_cv_func_towlower" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_TOWLOWER 1 +-_ACEOF +- +-fi +-done +- +- if test $ac_cv_func_towlower = yes; then +- REPLACE_TOWLOWER=0 +- else +- ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #if HAVE_WCTYPE_H +- # include +- #endif +- +-" +-if test "x$ac_cv_have_decl_towlower" = xyes; then : +- ac_have_decl=1 +-else +- ac_have_decl=0 +-fi +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_TOWLOWER $ac_have_decl +-_ACEOF +- +- if test $ac_cv_have_decl_towlower = yes; then +- REPLACE_TOWLOWER=1 +- else +- REPLACE_TOWLOWER=0 +- fi +- fi +- fi +- +- +- if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then +- : +- fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5 +-$as_echo_n "checking for wctype_t... " >&6; } +-if ${gl_cv_type_wctype_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #if HAVE_WCTYPE_H +- # include +- #endif +- wctype_t a; +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_type_wctype_t=yes +-else +- gl_cv_type_wctype_t=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5 +-$as_echo "$gl_cv_type_wctype_t" >&6; } +- if test $gl_cv_type_wctype_t = no; then +- HAVE_WCTYPE_T=0 +- fi +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5 +-$as_echo_n "checking for wctrans_t... " >&6; } +-if ${gl_cv_type_wctrans_t+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #include +- wctrans_t a; +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- gl_cv_type_wctrans_t=yes +-else +- gl_cv_type_wctrans_t=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5 +-$as_echo "$gl_cv_type_wctrans_t" >&6; } +- if test $gl_cv_type_wctrans_t = no; then +- HAVE_WCTRANS_T=0 +- fi +- +- +- for gl_func in wctype iswctype wctrans towctrans ; do +- as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 +-$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +-if eval \${$as_gl_Symbol+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) +-# include +-# include +-# include +-# include +-#endif +-#include +- +-int +-main () +-{ +-#undef $gl_func +- (void) $gl_func; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- eval "$as_gl_Symbol=yes" +-else +- eval "$as_gl_Symbol=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-eval ac_res=\$$as_gl_Symbol +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +-_ACEOF +- +- eval ac_cv_have_decl_$gl_func=yes +-fi +- done +- +- +- +- +- +- +- +- +- +- +- +- : +- +- +- +- +- +- +- : +- +- +- +- +- +- +- ac_fn_c_check_decl "$LINENO" "wcwidth" "ac_cv_have_decl_wcwidth" " +-/* AIX 3.2.5 declares wcwidth in . */ +-#include +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be included +- before . */ +-#include +-#include +-#include +-#include +- +-" +-if test "x$ac_cv_have_decl_wcwidth" = xyes; then : +- ac_have_decl=1 +-else +- ac_have_decl=0 +-fi +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_WCWIDTH $ac_have_decl +-_ACEOF +- +- if test $ac_cv_have_decl_wcwidth != yes; then +- HAVE_DECL_WCWIDTH=0 +- fi +- +- if test $ac_cv_func_wcwidth = yes; then +- HAVE_WCWIDTH=1 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcwidth works reasonably in UTF-8 locales" >&5 +-$as_echo_n "checking whether wcwidth works reasonably in UTF-8 locales... " >&6; } +-if ${gl_cv_func_wcwidth_works+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- if test "$cross_compiling" = yes; then : +- +- case "$host_os" in +- # Guess yes on glibc and AIX 7 systems. +- *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; +- *) gl_cv_func_wcwidth_works="guessing no";; +- esac +- +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-/* AIX 3.2.5 declares wcwidth in . */ +-#include +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be included +- before . */ +-#include +-#include +-#include +-#include +-#if !HAVE_DECL_WCWIDTH +-extern +-# ifdef __cplusplus +-"C" +-# endif +-int wcwidth (int); +-#endif +-int main () +-{ +- int result = 0; +- if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL) +- { +- if (wcwidth (0x0301) > 0) +- result |= 1; +- if (wcwidth (0x05B0) > 0) +- result |= 2; +- if (wcwidth (0x200B) > 0) +- result |= 4; +- } +- return result; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- gl_cv_func_wcwidth_works=yes +-else +- gl_cv_func_wcwidth_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 +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcwidth_works" >&5 +-$as_echo "$gl_cv_func_wcwidth_works" >&6; } +- case "$gl_cv_func_wcwidth_works" in +- *yes) ;; +- *no) REPLACE_WCWIDTH=1 ;; +- esac +- else +- HAVE_WCWIDTH=0 +- fi +- +- if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then +- +- +- +- +- +- +- +- +- gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext" +- +- fi +- +- +- +- +- +- GNULIB_WCWIDTH=1 +- +- +- +- +- +-$as_echo "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h +- +- +- +- +- +- +- +- +- +- +- +- +- LIBGNU_LIBDEPS="$gl_libdeps" +- +- LIBGNU_LTLIBDEPS="$gl_ltlibdeps" +- +- +- +-ac_config_files="$ac_config_files Makefile lib/Makefile m4/Makefile" +- +-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 +-# scripts and configure runs, see configure's option --config-cache. +-# It is not useful on other systems. If it contains results you don't +-# want to keep, you may remove or edit it. +-# +-# config.status only pays attention to the cache file if you give it +-# the --recheck option to rerun configure. +-# +-# `ac_cv_env_foo' variables (set or unset) will be overridden when +-# loading this file, other *unset* `ac_cv_foo' will be assigned the +-# following values. +- +-_ACEOF +- +-# The following way of writing the cache mishandles newlines in values, +-# but we know of no workaround that is simple, portable, and efficient. +-# So, we kill variables containing newlines. +-# Ultrix sh set writes to stderr and can't be redirected directly, +-# and sets the high bit in the cache file unless we assign to the vars. +-( +- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) { eval $ac_var=; unset $ac_var;} ;; +- esac ;; +- esac +- done +- +- (set) 2>&1 | +- case $as_nl`(ac_space=' '; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes: double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \. +- sed -n \ +- "s/'/'\\\\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; #( +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) | +- sed ' +- /^ac_cv_env_/b end +- t clear +- :clear +- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ +- t end +- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- :end' >>confcache +-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else +- if test -w "$cache_file"; then +- if test "x$cache_file" != "x/dev/null"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +-$as_echo "$as_me: updating cache $cache_file" >&6;} +- if test ! -f "$cache_file" || test -h "$cache_file"; then +- cat confcache >"$cache_file" +- else +- case $cache_file in #( +- */* | ?:*) +- mv -f confcache "$cache_file"$$ && +- mv -f "$cache_file"$$ "$cache_file" ;; #( +- *) +- mv -f confcache "$cache_file" ;; +- esac +- fi +- fi +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +- fi +-fi +-rm -f confcache +- +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-# Let make expand exec_prefix. +-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- +-DEFS=-DHAVE_CONFIG_H +- +-ac_libobjs= +-ac_ltlibobjs= +-U= +-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue +- # 1. Remove the extension, and $U if already installed. +- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` +- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR +- # will be set to the directory where LIBOBJS objects are built. +- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +-done +-LIBOBJS=$ac_libobjs +- +-LTLIBOBJS=$ac_ltlibobjs +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +-$as_echo_n "checking that generated files are newer than configure... " >&6; } +- if test -n "$am_sleep_pid"; then +- # Hide warnings about reused PIDs. +- wait $am_sleep_pid 2>/dev/null +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +-$as_echo "done" >&6; } +- if test -n "$EXEEXT"; then +- am__EXEEXT_TRUE= +- am__EXEEXT_FALSE='#' +-else +- am__EXEEXT_TRUE='#' +- am__EXEEXT_FALSE= +-fi +- +-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- as_fn_error $? "conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then +- as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then +- as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then +- as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then +- as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE}"; then +- as_fn_error $? "conditional \"LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +- +- gl_libobjs= +- gl_ltlibobjs= +- if test -n "$gl_LIBOBJS"; then +- # Remove the extension. +- sed_drop_objext='s/\.o$//;s/\.obj$//' +- for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do +- gl_libobjs="$gl_libobjs $i.$ac_objext" +- gl_ltlibobjs="$gl_ltlibobjs $i.lo" +- done +- fi +- gl_LIBOBJS=$gl_libobjs +- +- gl_LTLIBOBJS=$gl_ltlibobjs +- +- +- +-: "${CONFIG_STATUS=./config.status}" +-ac_write_fail=0 +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-as_write_fail=0 +-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +-#! $SHELL +-# Generated by $as_me. +-# Run this file to recreate the current configuration. +-# Compiler output produced by configure, useful for debugging +-# configure, is in config.log if it exists. +- +-debug=false +-ac_cs_recheck=false +-ac_cs_silent=false +- +-SHELL=\${CONFIG_SHELL-$SHELL} +-export SHELL +-_ASEOF +-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +-## -------------------- ## +-## M4sh Initialization. ## +-## -------------------- ## +- +-# Be more Bourne compatible +-DUALCASE=1; export DUALCASE # for MKS sh +-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 +-else +- case `(set -o) 2>/dev/null` in #( +- *posix*) : +- set -o posix ;; #( +- *) : +- ;; +-esac +-fi +- +- +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-# Prefer a ksh shell builtin over an external printf program on Solaris, +-# but without wasting forks for bash or zsh. +-if test -z "$BASH_VERSION$ZSH_VERSION" \ +- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='print -r --' +- as_echo_n='print -rn --' +-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in #( +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } +-fi +- +- +-# IFS +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent editors from complaining about space-tab. +-# (If _AS_PATH_WALK were called with IFS unset, it would disable word +-# splitting by setting IFS to empty value.) +-IFS=" "" $as_nl" +- +-# Find who we are. Look in the path if we contain no directory separator. +-as_myself= +-case $0 in #(( +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' +-# in which case we are not to be found in the path. +-if test "x$as_myself" = x; then +- as_myself=$0 +-fi +-if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- exit 1 +-fi +- +-# Unset variables that we do not need and which cause bugs (e.g. in +-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +-# suppresses any "Segmentation fault" message there. '((' could +-# trigger a bug in pdksh 5.2.14. +-for as_var in BASH_ENV ENV MAIL MAILPATH +-do eval test x\${$as_var+set} = xset \ +- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +-done +-PS1='$ ' +-PS2='> ' +-PS4='+ ' +- +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE +- +-# CDPATH. +-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +- +- +-# as_fn_error STATUS ERROR [LINENO LOG_FD] +-# ---------------------------------------- +-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +-# script with STATUS, using 1 if that was 0. +-as_fn_error () +-{ +- as_status=$1; test $as_status -eq 0 && as_status=1 +- if test "$4"; then +- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 +- fi +- $as_echo "$as_me: error: $2" >&2 +- as_fn_exit $as_status +-} # as_fn_error +- +- +-# as_fn_set_status STATUS +-# ----------------------- +-# Set $? to STATUS, without forking. +-as_fn_set_status () +-{ +- return $1 +-} # as_fn_set_status +- +-# as_fn_exit STATUS +-# ----------------- +-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +-as_fn_exit () +-{ +- set +e +- as_fn_set_status $1 +- exit $1 +-} # as_fn_exit +- +-# as_fn_unset VAR +-# --------------- +-# Portably unset VAR. +-as_fn_unset () +-{ +- { eval $1=; unset $1;} +-} +-as_unset=as_fn_unset +-# as_fn_append VAR VALUE +-# ---------------------- +-# Append the text in VALUE to the end of the definition contained in VAR. Take +-# advantage of any shell optimizations that allow amortized linear growth over +-# repeated appends, instead of the typical quadratic growth present in naive +-# implementations. +-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +- eval 'as_fn_append () +- { +- eval $1+=\$2 +- }' +-else +- as_fn_append () +- { +- eval $1=\$$1\$2 +- } +-fi # as_fn_append +- +-# as_fn_arith ARG... +-# ------------------ +-# Perform arithmetic evaluation on the ARGs, and store the result in the +-# global $as_val. Take advantage of shells that can avoid forks. The arguments +-# must be portable across $(()) and expr. +-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +- eval 'as_fn_arith () +- { +- as_val=$(( $* )) +- }' +-else +- as_fn_arith () +- { +- as_val=`expr "$@" || test $? -eq 1` +- } +-fi # as_fn_arith +- +- +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in #((((( +--n*) +- case `echo 'xy\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- xy) ECHO_C='\c';; +- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null +- ECHO_T=' ';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null +-fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -pR'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -pR' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +- as_ln_s='cp -pR' +- fi +-else +- as_ln_s='cp -pR' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +- +- +-# as_fn_mkdir_p +-# ------------- +-# Create "$as_dir" as a directory, including parents if necessary. +-as_fn_mkdir_p () +-{ +- +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || eval $as_mkdir_p || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" +- +- +-} # as_fn_mkdir_p +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p='mkdir -p "$as_dir"' +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi +- +- +-# as_fn_executable_p FILE +-# ----------------------- +-# Test if FILE is an executable regular file. +-as_fn_executable_p () +-{ +- test -f "$1" && test -x "$1" +-} # as_fn_executable_p +-as_test_x='test -x' +-as_executable_p=as_fn_executable_p +- +-# Sed expression to map a string onto a valid CPP name. +-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +-exec 6>&1 +-## ----------------------------------- ## +-## Main body of $CONFIG_STATUS script. ## +-## ----------------------------------- ## +-_ASEOF +-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# Save the log message, to keep $0 and so on meaningful, and to +-# report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. +-ac_log=" +-This file was extended by dummy $as_me 0, which was +-generated by GNU Autoconf 2.69. Invocation command line was +- +- CONFIG_FILES = $CONFIG_FILES +- CONFIG_HEADERS = $CONFIG_HEADERS +- CONFIG_LINKS = $CONFIG_LINKS +- CONFIG_COMMANDS = $CONFIG_COMMANDS +- $ $0 $@ +- +-on `(hostname || uname -n) 2>/dev/null | sed 1q` +-" +- +-_ACEOF +- +-case $ac_config_files in *" +-"*) set x $ac_config_files; shift; ac_config_files=$*;; +-esac +- +-case $ac_config_headers in *" +-"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +-esac +- +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-# Files that config.status was made for. +-config_files="$ac_config_files" +-config_headers="$ac_config_headers" +-config_commands="$ac_config_commands" +- +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-ac_cs_usage="\ +-\`$as_me' instantiates files and other configuration actions +-from templates according to the current configuration. Unless the files +-and actions are specified as TAGs, all are instantiated by default. +- +-Usage: $0 [OPTION]... [TAG]... +- +- -h, --help print this help, then exit +- -V, --version print version number and configuration settings, then exit +- --config print configuration, then exit +- -q, --quiet, --silent +- do not print progress messages +- -d, --debug don't remove temporary files +- --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE +- +-Configuration files: +-$config_files +- +-Configuration headers: +-$config_headers +- +-Configuration commands: +-$config_commands +- +-Report bugs to the package provider." +- +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +-ac_cs_version="\\ +-dummy config.status 0 +-configured by $0, generated by GNU Autoconf 2.69, +- with options \\"\$ac_cs_config\\" +- +-Copyright (C) 2012 Free Software Foundation, Inc. +-This config.status script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it." +- +-ac_pwd='$ac_pwd' +-srcdir='$srcdir' +-INSTALL='$INSTALL' +-MKDIR_P='$MKDIR_P' +-AWK='$AWK' +-test -n "\$AWK" || AWK=awk +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# The default lists apply if the user does not specify any file. +-ac_need_defaults=: +-while test $# != 0 +-do +- case $1 in +- --*=?*) +- ac_option=`expr "X$1" : 'X\([^=]*\)='` +- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` +- ac_shift=: +- ;; +- --*=) +- ac_option=`expr "X$1" : 'X\([^=]*\)='` +- ac_optarg= +- ac_shift=: +- ;; +- *) +- ac_option=$1 +- ac_optarg=$2 +- ac_shift=shift +- ;; +- esac +- +- case $ac_option in +- # Handling of the options. +- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) +- ac_cs_recheck=: ;; +- --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- $as_echo "$ac_cs_version"; exit ;; +- --config | --confi | --conf | --con | --co | --c ) +- $as_echo "$ac_cs_config"; exit ;; +- --debug | --debu | --deb | --de | --d | -d ) +- debug=: ;; +- --file | --fil | --fi | --f ) +- $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- '') as_fn_error $? "missing file argument" ;; +- esac +- as_fn_append CONFIG_FILES " '$ac_optarg'" +- ac_need_defaults=false;; +- --header | --heade | --head | --hea ) +- $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- as_fn_append CONFIG_HEADERS " '$ac_optarg'" +- ac_need_defaults=false;; +- --he | --h) +- # Conflict between --help and --header +- as_fn_error $? "ambiguous option: \`$1' +-Try \`$0 --help' for more information.";; +- --help | --hel | -h ) +- $as_echo "$ac_cs_usage"; exit ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil | --si | --s) +- ac_cs_silent=: ;; +- +- # This is an error. +- -*) as_fn_error $? "unrecognized option: \`$1' +-Try \`$0 --help' for more information." ;; +- +- *) as_fn_append ac_config_targets " $1" +- ac_need_defaults=false ;; +- +- esac +- shift +-done +- +-ac_configure_extra_args= +- +-if $ac_cs_silent; then +- exec 6>/dev/null +- ac_configure_extra_args="$ac_configure_extra_args --silent" +-fi +- +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-if \$ac_cs_recheck; then +- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +- shift +- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 +- CONFIG_SHELL='$SHELL' +- export CONFIG_SHELL +- exec "\$@" +-fi +- +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +- $as_echo "$ac_log" +-} >&5 +- +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-# +-# INIT-COMMANDS +-# +-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +- +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- +-# Handling of arguments. +-for ac_config_target in $ac_config_targets +-do +- case $ac_config_target in +- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; +- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; +- "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; +- +- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; +- esac +-done +- +- +-# If the user did not use the arguments to specify the items to instantiate, +-# then the envvar interface is used. Set only those that are not. +-# We use the long form for the default assignment because of an extremely +-# bizarre bug on SunOS 4.1.3. +-if $ac_need_defaults; then +- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +-fi +- +-# Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason against having it here, and in addition, +-# creating and moving files from /tmp can sometimes cause problems. +-# Hook for its removal unless debugging. +-# Note that there is a small window in which the directory will not be cleaned: +-# after its creation but before its name has been assigned to `$tmp'. +-$debug || +-{ +- tmp= ac_tmp= +- trap 'exit_status=$? +- : "${ac_tmp:=$tmp}" +- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +-' 0 +- trap 'as_fn_exit 1' 1 2 13 15 +-} +-# Create a (secure) tmp directory for tmp files. +- +-{ +- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -d "$tmp" +-} || +-{ +- tmp=./conf$$-$RANDOM +- (umask 077 && mkdir "$tmp") +-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +-ac_tmp=$tmp +- +-# Set up the scripts for CONFIG_FILES section. +-# No need to generate them if there are no CONFIG_FILES. +-# This happens for instance with `./config.status config.h'. +-if test -n "$CONFIG_FILES"; then +- +- +-ac_cr=`echo X | tr X '\015'` +-# On cygwin, bash can eat \r inside `` if the user requested igncr. +-# But we know of no other shell where ac_cr would be empty at this +-# point, so we can use a bashism as a fallback. +-if test "x$ac_cr" = x; then +- eval ac_cr=\$\'\\r\' +-fi +-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' +-else +- ac_cs_awk_cr=$ac_cr +-fi +- +-echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +-_ACEOF +- +- +-{ +- echo "cat >conf$$subs.awk <<_ACEOF" && +- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && +- echo "_ACEOF" +-} >conf$$subs.sh || +- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- . ./conf$$subs.sh || +- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +- +- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` +- if test $ac_delim_n = $ac_delim_num; then +- break +- elif $ac_last_try; then +- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +-rm -f conf$$subs.sh +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +-_ACEOF +-sed -n ' +-h +-s/^/S["/; s/!.*/"]=/ +-p +-g +-s/^[^!]*!// +-:repl +-t repl +-s/'"$ac_delim"'$// +-t delim +-:nl +-h +-s/\(.\{148\}\)..*/\1/ +-t more1 +-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +-p +-n +-b repl +-:more1 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t nl +-:delim +-h +-s/\(.\{148\}\)..*/\1/ +-t more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"/ +-p +-b +-:more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t delim +-' >$CONFIG_STATUS || ac_write_fail=1 +-rm -f conf$$subs.awk +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-_ACAWK +-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && +- for (key in S) S_is_set[key] = 1 +- FS = "" +- +-} +-{ +- line = $ 0 +- nfields = split(line, field, "@") +- substed = 0 +- len = length(field[1]) +- for (i = 2; i < nfields; i++) { +- key = field[i] +- keylen = length(key) +- if (S_is_set[key]) { +- value = S[key] +- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) +- len += length(value) + length(field[++i]) +- substed = 1 +- } else +- len += 1 + keylen +- } +- +- print line +-} +- +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then +- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +-else +- cat +-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ +- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +-_ACEOF +- +-# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +-# trailing colons and then remove the whole line if VPATH becomes empty +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +-h +-s/// +-s/^/:/ +-s/[ ]*$/:/ +-s/:\$(srcdir):/:/g +-s/:\${srcdir}:/:/g +-s/:@srcdir@:/:/g +-s/^:*// +-s/:*$// +-x +-s/\(=[ ]*\).*/\1/ +-G +-s/\n// +-s/^[^=]*=[ ]*$// +-}' +-fi +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-fi # test -n "$CONFIG_FILES" +- +-# Set up the scripts for CONFIG_HEADERS section. +-# No need to generate them if there are no CONFIG_HEADERS. +-# This happens for instance with `./config.status Makefile'. +-if test -n "$CONFIG_HEADERS"; then +-cat >"$ac_tmp/defines.awk" <<\_ACAWK || +-BEGIN { +-_ACEOF +- +-# Transform confdefs.h into an awk script `defines.awk', embedded as +-# here-document in config.status, that substitutes the proper values into +-# config.h.in to produce config.h. +- +-# Create a delimiter string that does not exist in confdefs.h, to ease +-# handling of long lines. +-ac_delim='%!_!# ' +-for ac_last_try in false false :; do +- ac_tt=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_tt"; then +- break +- elif $ac_last_try; then +- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +- +-# For the awk script, D is an array of macro values keyed by name, +-# likewise P contains macro parameters if any. Preserve backslash +-# newline sequences. +- +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-sed -n ' +-s/.\{148\}/&'"$ac_delim"'/g +-t rset +-:rset +-s/^[ ]*#[ ]*define[ ][ ]*/ / +-t def +-d +-:def +-s/\\$// +-t bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3"/p +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +-d +-:bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3\\\\\\n"\\/p +-t cont +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +-t cont +-d +-:cont +-n +-s/.\{148\}/&'"$ac_delim"'/g +-t clear +-:clear +-s/\\$// +-t bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/"/p +-d +-:bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +-b cont +-' >$CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- for (key in D) D_is_set[key] = 1 +- FS = "" +-} +-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { +- line = \$ 0 +- split(line, arg, " ") +- if (arg[1] == "#") { +- defundef = arg[2] +- mac1 = arg[3] +- } else { +- defundef = substr(arg[1], 2) +- mac1 = arg[2] +- } +- split(mac1, mac2, "(") #) +- macro = mac2[1] +- prefix = substr(line, 1, index(line, defundef) - 1) +- if (D_is_set[macro]) { +- # Preserve the white space surrounding the "#". +- print prefix "define", macro P[macro] D[macro] +- next +- } else { +- # Replace #undef with comments. This is necessary, for example, +- # in the case of _POSIX_SOURCE, which is predefined and required +- # on some systems where configure will not decide to define it. +- if (defundef == "undef") { +- print "/*", prefix defundef, macro, "*/" +- next +- } +- } +-} +-{ print } +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +-fi # test -n "$CONFIG_HEADERS" +- +- +-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +-shift +-for ac_tag +-do +- case $ac_tag in +- :[FHLC]) ac_mode=$ac_tag; continue;; +- esac +- case $ac_mode$ac_tag in +- :[FHL]*:*);; +- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; +- :[FH]-) ac_tag=-:-;; +- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +- esac +- ac_save_IFS=$IFS +- IFS=: +- set x $ac_tag +- IFS=$ac_save_IFS +- shift +- ac_file=$1 +- shift +- +- case $ac_mode in +- :L) ac_source=$1;; +- :[FH]) +- ac_file_inputs= +- for ac_f +- do +- case $ac_f in +- -) ac_f="$ac_tmp/stdin";; +- *) # Look for the file first in the build tree, then in the source tree +- # (if the path is not absolute). The absolute path cannot be DOS-style, +- # because $ac_f cannot contain `:'. +- test -f "$ac_f" || +- case $ac_f in +- [\\/$]*) false;; +- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; +- esac || +- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; +- esac +- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- as_fn_append ac_file_inputs " '$ac_f'" +- done +- +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- configure_input='Generated from '` +- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' +- `' by configure.' +- if test x"$ac_file" != x-; then +- configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +-$as_echo "$as_me: creating $ac_file" >&6;} +- fi +- # Neutralize special characters interpreted by sed in replacement strings. +- case $configure_input in #( +- *\&* | *\|* | *\\* ) +- ac_sed_conf_input=`$as_echo "$configure_input" | +- sed 's/[\\\\&|]/\\\\&/g'`;; #( +- *) ac_sed_conf_input=$configure_input;; +- esac +- +- case $ac_tag in +- *:-:* | *:-) cat >"$ac_tmp/stdin" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; +- esac +- ;; +- esac +- +- ac_dir=`$as_dirname -- "$ac_file" || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- as_dir="$ac_dir"; as_fn_mkdir_p +- ac_builddir=. +- +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; +-esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix +- +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +-esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +- +- +- case $ac_mode in +- :F) +- # +- # CONFIG_FILE +- # +- +- case $INSTALL in +- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; +- esac +- ac_MKDIR_P=$MKDIR_P +- case $MKDIR_P in +- [\\/$]* | ?:[\\/]* ) ;; +- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; +- esac +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# If the template does not know about datarootdir, expand it. +-# FIXME: This hack should be removed a few years after 2.60. +-ac_datarootdir_hack=; ac_datarootdir_seen= +-ac_sed_dataroot=' +-/datarootdir/ { +- p +- q +-} +-/@datadir@/p +-/@docdir@/p +-/@infodir@/p +-/@localedir@/p +-/@mandir@/p' +-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +-*datarootdir*) ac_datarootdir_seen=yes;; +-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- ac_datarootdir_hack=' +- s&@datadir@&$datadir&g +- s&@docdir@&$docdir&g +- s&@infodir@&$infodir&g +- s&@localedir@&$localedir&g +- s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; +-esac +-_ACEOF +- +-# Neutralize VPATH when `$srcdir' = `.'. +-# Shell code in configure.ac might set extrasub. +-# FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_sed_extra="$ac_vpsub +-$extrasub +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-:t +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s|@configure_input@|$ac_sed_conf_input|;t t +-s&@top_builddir@&$ac_top_builddir_sub&;t t +-s&@top_build_prefix@&$ac_top_build_prefix&;t t +-s&@srcdir@&$ac_srcdir&;t t +-s&@abs_srcdir@&$ac_abs_srcdir&;t t +-s&@top_srcdir@&$ac_top_srcdir&;t t +-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +-s&@builddir@&$ac_builddir&;t t +-s&@abs_builddir@&$ac_abs_builddir&;t t +-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +-s&@INSTALL@&$ac_INSTALL&;t t +-s&@MKDIR_P@&$ac_MKDIR_P&;t t +-$ac_datarootdir_hack +-" +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ +- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- +-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ +- "$ac_tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined" >&5 +-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined" >&2;} +- +- rm -f "$ac_tmp/stdin" +- case $ac_file in +- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; +- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; +- esac \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- ;; +- :H) +- # +- # CONFIG_HEADER +- # +- if test x"$ac_file" != x-; then +- { +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" +- } >"$ac_tmp/config.h" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +-$as_echo "$as_me: $ac_file is unchanged" >&6;} +- else +- rm -f "$ac_file" +- mv "$ac_tmp/config.h" "$ac_file" \ +- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +- fi +- else +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ +- || as_fn_error $? "could not create -" "$LINENO" 5 +- fi +-# Compute "$ac_file"'s index in $config_headers. +-_am_arg="$ac_file" +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$_am_arg" : 'X\(//\)[^/]' \| \ +- X"$_am_arg" : 'X\(//\)$' \| \ +- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$_am_arg" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'`/stamp-h$_am_stamp_count +- ;; +- +- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +-$as_echo "$as_me: executing $ac_file commands" >&6;} +- ;; +- esac +- +- +- case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || { +- # Older Autoconf quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named 'Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || +-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$mf" : 'X\(//\)[^/]' \| \ +- X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$mf" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running 'make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "$am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || +-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$file" : 'X\(//\)[^/]' \| \ +- X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- as_dir=$dirpart/$fdir; as_fn_mkdir_p +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +- done +-} +- ;; +- +- esac +-done # for ac_tag +- +- +-as_fn_exit 0 +-_ACEOF +-ac_clean_files=$ac_clean_files_save +- +-test $ac_write_fail = 0 || +- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 +- +- +-# configure is writing to config.log, and then calls config.status. +-# config.status does its own redirection, appending to config.log. +-# Unfortunately, on DOS this fails, as config.log is still kept open +-# by configure, so config.status won't be able to write to it; its +-# output is simply discarded. So we exec the FD to /dev/null, +-# effectively closing config.log, so it can be properly (re)opened and +-# appended to by config.status. When coming back to configure, we +-# need to make the FD available again. +-if test "$no_create" != yes; then +- ac_cs_success=: +- ac_config_status_args= +- test "$silent" = yes && +- ac_config_status_args="$ac_config_status_args --quiet" +- exec 5>/dev/null +- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false +- exec 5>>config.log +- # Use ||, not &&, to avoid exiting from the if with $? = 1, which +- # would make configure fail if this is the last instruction. +- $ac_cs_success || as_fn_exit 1 +-fi +-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +-fi +- +diff -Nuar groff-1.22.3.old/src/libs/gnulib/configure.ac groff-1.22.3/src/libs/gnulib/configure.ac +--- groff-1.22.3.old/src/libs/gnulib/configure.ac 2014-11-04 10:38:35.676518359 +0200 ++++ groff-1.22.3/src/libs/gnulib/configure.ac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,143 +0,0 @@ +-# Process this file with autoconf to produce a configure script. +-# +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 can find the license text of GPL2 in the internet at +-# . +- +-AC_INIT([dummy], [0]) +-AC_CONFIG_AUX_DIR([build-aux]) +-AM_INIT_AUTOMAKE +- +-AC_CONFIG_HEADERS([config.h]) +- +-AC_PROG_CC +-AC_PROG_INSTALL +-AC_PROG_MAKE_SET +- +-# For autobuild. +-AC_CANONICAL_BUILD +-AC_CANONICAL_HOST +- +-m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace +-m4_pattern_allow([^gl_ES$])dnl a valid locale name +-m4_pattern_allow([^gl_LIBOBJS$])dnl a variable +-m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable +- +-gl_PROG_AR_RANLIB +- +-AM_PROG_CC_C_O +- +-gl_USE_SYSTEM_EXTENSIONS +-AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) +-gl_cond_libtool=false +-gl_libdeps= +-gl_ltlibdeps= +-AC_DEFUN([gl_INIT], [ +-gl_m4_base='m4' +- m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) +- m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) +- m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) +- m4_pushdef([gl_LIBSOURCES_LIST], []) +- m4_pushdef([gl_LIBSOURCES_DIR], []) +- gl_COMMON +-gl_source_base='lib' +- gl_CONFIGMAKE_PREP +- AC_REQUIRE([gl_EXTERN_INLINE]) +- gl_INTTYPES_H +- gl_INTTYPES_INCOMPLETE +- gl_LOCALCHARSET +- LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" +- AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) +- gl_MULTIARCH +- AM_STDBOOL_H +- gl_STDDEF_H +- gl_STDINT_H +- gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) +- gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) +- gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) +- gl_WCHAR_H +- gl_WCTYPE_H +- gl_FUNC_WCWIDTH +- if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then +- AC_LIBOBJ([wcwidth]) +- fi +- gl_WCHAR_MODULE_INDICATOR([wcwidth]) +- m4_ifval(gl_LIBSOURCES_LIST, [ +- m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || +- for gl_file in ]gl_LIBSOURCES_LIST[ ; do +- if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then +- echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 +- exit 1 +- fi +- done])dnl +- m4_if(m4_sysval, [0], [], +- [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) +- ]) +- m4_popdef([gl_LIBSOURCES_DIR]) +- m4_popdef([gl_LIBSOURCES_LIST]) +- m4_popdef([AC_LIBSOURCES]) +- m4_popdef([AC_REPLACE_FUNCS]) +- m4_popdef([AC_LIBOBJ]) +- AC_CONFIG_COMMANDS_PRE([ +- gl_libobjs= +- gl_ltlibobjs= +- if test -n "$gl_LIBOBJS"; then +- # Remove the extension. +- sed_drop_objext='s/\.o$//;s/\.obj$//' +- for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do +- gl_libobjs="$gl_libobjs $i.$ac_objext" +- gl_ltlibobjs="$gl_ltlibobjs $i.lo" +- done +- fi +- AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) +- AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) +- ]) +- LIBGNU_LIBDEPS="$gl_libdeps" +- AC_SUBST([LIBGNU_LIBDEPS]) +- LIBGNU_LTLIBDEPS="$gl_ltlibdeps" +- AC_SUBST([LIBGNU_LTLIBDEPS]) +-]) +- +-# Like AC_LIBOBJ, except that the module name goes +-# into gl_LIBOBJS instead of into LIBOBJS. +-AC_DEFUN([gl_LIBOBJ], [ +- AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl +- gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" +-]) +- +-# Like AC_REPLACE_FUNCS, except that the module name goes +-# into gl_LIBOBJS instead of into LIBOBJS. +-AC_DEFUN([gl_REPLACE_FUNCS], [ +- m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl +- AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) +-]) +- +-# Like AC_LIBSOURCES, except the directory where the source file is +-# expected is derived from the gnulib-tool parameterization, +-# and alloca is special cased (for the alloca-opt module). +-# We could also entirely rely on EXTRA_lib..._SOURCES. +-AC_DEFUN([gl_LIBSOURCES], [ +- m4_foreach([_gl_NAME], [$1], [ +- m4_if(_gl_NAME, [alloca.c], [], [ +- m4_define([gl_LIBSOURCES_DIR], [lib]) +- m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) +- ]) +- ]) +-]) +- +-gl_INIT +- +-AC_CONFIG_FILES([Makefile lib/Makefile m4/Makefile]) +-AC_OUTPUT +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/config.charset groff-1.22.3/src/libs/gnulib/lib/config.charset +--- groff-1.22.3.old/src/libs/gnulib/lib/config.charset 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/config.charset 1970-01-01 02:00:00.000000000 +0200 +@@ -1,684 +0,0 @@ +-#! /bin/sh +-# Output a system dependent table of character encoding aliases. +-# +-# Copyright (C) 2000-2004, 2006-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 . +-# +-# The table consists of lines of the form +-# ALIAS CANONICAL +-# +-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)". +-# ALIAS is compared in a case sensitive way. +-# +-# CANONICAL is the GNU canonical name for this character encoding. +-# It must be an encoding supported by libiconv. Support by GNU libc is +-# also desirable. CANONICAL is case insensitive. Usually an upper case +-# MIME charset name is preferred. +-# The current list of GNU canonical charset names is as follows. +-# +-# name MIME? used by which systems +-# (darwin = Mac OS X, woe32 = native Windows) +-# +-# ASCII, ANSI_X3.4-1968 glibc solaris freebsd netbsd darwin cygwin +-# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin +-# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin +-# ISO-8859-3 Y glibc solaris cygwin +-# ISO-8859-4 Y osf solaris freebsd netbsd openbsd darwin +-# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin +-# ISO-8859-6 Y glibc aix hpux solaris cygwin +-# ISO-8859-7 Y glibc aix hpux irix osf solaris netbsd openbsd darwin cygwin +-# ISO-8859-8 Y glibc aix hpux osf solaris cygwin +-# ISO-8859-9 Y glibc aix hpux irix osf solaris darwin cygwin +-# ISO-8859-13 glibc netbsd openbsd darwin cygwin +-# ISO-8859-14 glibc cygwin +-# ISO-8859-15 glibc aix osf solaris freebsd netbsd openbsd darwin cygwin +-# KOI8-R Y glibc solaris freebsd netbsd openbsd darwin +-# KOI8-U Y glibc freebsd netbsd openbsd darwin cygwin +-# KOI8-T glibc +-# CP437 dos +-# CP775 dos +-# CP850 aix osf dos +-# CP852 dos +-# CP855 dos +-# CP856 aix +-# CP857 dos +-# CP861 dos +-# CP862 dos +-# CP864 dos +-# CP865 dos +-# CP866 freebsd netbsd openbsd darwin dos +-# CP869 dos +-# CP874 woe32 dos +-# CP922 aix +-# CP932 aix cygwin woe32 dos +-# CP943 aix +-# CP949 osf darwin woe32 dos +-# CP950 woe32 dos +-# CP1046 aix +-# CP1124 aix +-# CP1125 dos +-# CP1129 aix +-# CP1131 darwin +-# CP1250 woe32 +-# CP1251 glibc solaris netbsd openbsd darwin cygwin woe32 +-# CP1252 aix woe32 +-# CP1253 woe32 +-# CP1254 woe32 +-# CP1255 glibc woe32 +-# CP1256 woe32 +-# CP1257 woe32 +-# GB2312 Y glibc aix hpux irix solaris freebsd netbsd darwin +-# EUC-JP Y glibc aix hpux irix osf solaris freebsd netbsd darwin +-# EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin cygwin +-# EUC-TW glibc aix hpux irix osf solaris netbsd +-# BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin cygwin +-# BIG5-HKSCS glibc solaris darwin +-# GBK glibc aix osf solaris darwin cygwin woe32 dos +-# GB18030 glibc solaris netbsd darwin +-# SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin +-# JOHAB glibc solaris woe32 +-# TIS-620 glibc aix hpux osf solaris cygwin +-# VISCII Y glibc +-# TCVN5712-1 glibc +-# ARMSCII-8 glibc darwin +-# GEORGIAN-PS glibc cygwin +-# PT154 glibc +-# HP-ROMAN8 hpux +-# HP-ARABIC8 hpux +-# HP-GREEK8 hpux +-# HP-HEBREW8 hpux +-# HP-TURKISH8 hpux +-# HP-KANA8 hpux +-# DEC-KANJI osf +-# DEC-HANYU osf +-# UTF-8 Y glibc aix hpux osf solaris netbsd darwin cygwin +-# +-# Note: Names which are not marked as being a MIME name should not be used in +-# Internet protocols for information interchange (mail, news, etc.). +-# +-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications +-# must understand both names and treat them as equivalent. +-# +-# The first argument passed to this file is the canonical host specification, +-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +-# or +-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +- +-host="$1" +-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'` +-echo "# This file contains a table of character encoding aliases," +-echo "# suitable for operating system '${os}'." +-echo "# It was automatically generated from config.charset." +-# List of references, updated during installation: +-echo "# Packages using this file: " +-case "$os" in +- linux-gnulibc1*) +- # Linux libc5 doesn't have nl_langinfo(CODESET); therefore +- # localcharset.c falls back to using the full locale name +- # from the environment variables. +- echo "C ASCII" +- echo "POSIX ASCII" +- for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \ +- en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \ +- en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \ +- es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \ +- et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \ +- fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \ +- it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \ +- sv_FI sv_SE; do +- echo "$l ISO-8859-1" +- echo "$l.iso-8859-1 ISO-8859-1" +- echo "$l.iso-8859-15 ISO-8859-15" +- echo "$l.iso-8859-15@euro ISO-8859-15" +- echo "$l@euro ISO-8859-15" +- echo "$l.cp-437 CP437" +- echo "$l.cp-850 CP850" +- echo "$l.cp-1252 CP1252" +- echo "$l.cp-1252@euro CP1252" +- #echo "$l.atari-st ATARI-ST" # not a commonly used encoding +- echo "$l.utf-8 UTF-8" +- echo "$l.utf-8@euro UTF-8" +- done +- for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \ +- sl_SI sr sr_CS sr_YU; do +- echo "$l ISO-8859-2" +- echo "$l.iso-8859-2 ISO-8859-2" +- echo "$l.cp-852 CP852" +- echo "$l.cp-1250 CP1250" +- echo "$l.utf-8 UTF-8" +- done +- for l in mk mk_MK ru ru_RU; do +- echo "$l ISO-8859-5" +- echo "$l.iso-8859-5 ISO-8859-5" +- echo "$l.koi8-r KOI8-R" +- echo "$l.cp-866 CP866" +- echo "$l.cp-1251 CP1251" +- echo "$l.utf-8 UTF-8" +- done +- for l in ar ar_SA; do +- echo "$l ISO-8859-6" +- echo "$l.iso-8859-6 ISO-8859-6" +- echo "$l.cp-864 CP864" +- #echo "$l.cp-868 CP868" # not a commonly used encoding +- echo "$l.cp-1256 CP1256" +- echo "$l.utf-8 UTF-8" +- done +- for l in el el_GR gr gr_GR; do +- echo "$l ISO-8859-7" +- echo "$l.iso-8859-7 ISO-8859-7" +- echo "$l.cp-869 CP869" +- echo "$l.cp-1253 CP1253" +- echo "$l.cp-1253@euro CP1253" +- echo "$l.utf-8 UTF-8" +- echo "$l.utf-8@euro UTF-8" +- done +- for l in he he_IL iw iw_IL; do +- echo "$l ISO-8859-8" +- echo "$l.iso-8859-8 ISO-8859-8" +- echo "$l.cp-862 CP862" +- echo "$l.cp-1255 CP1255" +- echo "$l.utf-8 UTF-8" +- done +- for l in tr tr_TR; do +- echo "$l ISO-8859-9" +- echo "$l.iso-8859-9 ISO-8859-9" +- echo "$l.cp-857 CP857" +- echo "$l.cp-1254 CP1254" +- echo "$l.utf-8 UTF-8" +- done +- for l in lt lt_LT lv lv_LV; do +- #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name +- echo "$l ISO-8859-13" +- done +- for l in ru_UA uk uk_UA; do +- echo "$l KOI8-U" +- done +- for l in zh zh_CN; do +- #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name +- echo "$l GB2312" +- done +- for l in ja ja_JP ja_JP.EUC; do +- echo "$l EUC-JP" +- done +- for l in ko ko_KR; do +- echo "$l EUC-KR" +- done +- for l in th th_TH; do +- echo "$l TIS-620" +- done +- for l in fa fa_IR; do +- #echo "$l ISIRI-3342" # a broken encoding +- echo "$l.utf-8 UTF-8" +- done +- ;; +- linux* | *-gnu*) +- # With glibc-2.1 or newer, we don't need any canonicalization, +- # because glibc has iconv and both glibc and libiconv support all +- # GNU canonical names directly. Therefore, the Makefile does not +- # need to install the alias file at all. +- # The following applies only to glibc-2.0.x and older libcs. +- echo "ISO_646.IRV:1983 ASCII" +- ;; +- aix*) +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-6 ISO-8859-6" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-8 ISO-8859-8" +- echo "ISO8859-9 ISO-8859-9" +- echo "ISO8859-15 ISO-8859-15" +- echo "IBM-850 CP850" +- echo "IBM-856 CP856" +- echo "IBM-921 ISO-8859-13" +- echo "IBM-922 CP922" +- echo "IBM-932 CP932" +- echo "IBM-943 CP943" +- echo "IBM-1046 CP1046" +- echo "IBM-1124 CP1124" +- echo "IBM-1129 CP1129" +- echo "IBM-1252 CP1252" +- echo "IBM-eucCN GB2312" +- echo "IBM-eucJP EUC-JP" +- echo "IBM-eucKR EUC-KR" +- echo "IBM-eucTW EUC-TW" +- echo "big5 BIG5" +- echo "GBK GBK" +- echo "TIS-620 TIS-620" +- echo "UTF-8 UTF-8" +- ;; +- hpux*) +- echo "iso88591 ISO-8859-1" +- echo "iso88592 ISO-8859-2" +- echo "iso88595 ISO-8859-5" +- echo "iso88596 ISO-8859-6" +- echo "iso88597 ISO-8859-7" +- echo "iso88598 ISO-8859-8" +- echo "iso88599 ISO-8859-9" +- echo "iso885915 ISO-8859-15" +- echo "roman8 HP-ROMAN8" +- echo "arabic8 HP-ARABIC8" +- echo "greek8 HP-GREEK8" +- echo "hebrew8 HP-HEBREW8" +- echo "turkish8 HP-TURKISH8" +- echo "kana8 HP-KANA8" +- echo "tis620 TIS-620" +- echo "big5 BIG5" +- echo "eucJP EUC-JP" +- echo "eucKR EUC-KR" +- echo "eucTW EUC-TW" +- echo "hp15CN GB2312" +- #echo "ccdc ?" # what is this? +- echo "SJIS SHIFT_JIS" +- echo "utf8 UTF-8" +- ;; +- irix*) +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-9 ISO-8859-9" +- echo "eucCN GB2312" +- echo "eucJP EUC-JP" +- echo "eucKR EUC-KR" +- echo "eucTW EUC-TW" +- ;; +- osf*) +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-4 ISO-8859-4" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-8 ISO-8859-8" +- echo "ISO8859-9 ISO-8859-9" +- echo "ISO8859-15 ISO-8859-15" +- echo "cp850 CP850" +- echo "big5 BIG5" +- echo "dechanyu DEC-HANYU" +- echo "dechanzi GB2312" +- echo "deckanji DEC-KANJI" +- echo "deckorean EUC-KR" +- echo "eucJP EUC-JP" +- echo "eucKR EUC-KR" +- echo "eucTW EUC-TW" +- echo "GBK GBK" +- echo "KSC5601 CP949" +- echo "sdeckanji EUC-JP" +- echo "SJIS SHIFT_JIS" +- echo "TACTIS TIS-620" +- echo "UTF-8 UTF-8" +- ;; +- solaris*) +- echo "646 ASCII" +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-3 ISO-8859-3" +- echo "ISO8859-4 ISO-8859-4" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-6 ISO-8859-6" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-8 ISO-8859-8" +- echo "ISO8859-9 ISO-8859-9" +- echo "ISO8859-15 ISO-8859-15" +- echo "koi8-r KOI8-R" +- echo "ansi-1251 CP1251" +- echo "BIG5 BIG5" +- echo "Big5-HKSCS BIG5-HKSCS" +- echo "gb2312 GB2312" +- echo "GBK GBK" +- echo "GB18030 GB18030" +- echo "cns11643 EUC-TW" +- echo "5601 EUC-KR" +- echo "ko_KR.johap92 JOHAB" +- echo "eucJP EUC-JP" +- echo "PCK SHIFT_JIS" +- echo "TIS620.2533 TIS-620" +- #echo "sun_eu_greek ?" # what is this? +- echo "UTF-8 UTF-8" +- ;; +- freebsd* | os2*) +- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore +- # localcharset.c falls back to using the full locale name +- # from the environment variables. +- # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just +- # reuse FreeBSD's locale data for OS/2. +- echo "C ASCII" +- echo "US-ASCII ASCII" +- for l in la_LN lt_LN; do +- echo "$l.ASCII ASCII" +- done +- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ +- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \ +- lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do +- echo "$l.ISO_8859-1 ISO-8859-1" +- echo "$l.DIS_8859-15 ISO-8859-15" +- done +- for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do +- echo "$l.ISO_8859-2 ISO-8859-2" +- done +- for l in la_LN lt_LT; do +- echo "$l.ISO_8859-4 ISO-8859-4" +- done +- for l in ru_RU ru_SU; do +- echo "$l.KOI8-R KOI8-R" +- echo "$l.ISO_8859-5 ISO-8859-5" +- echo "$l.CP866 CP866" +- done +- echo "uk_UA.KOI8-U KOI8-U" +- echo "zh_TW.BIG5 BIG5" +- echo "zh_TW.Big5 BIG5" +- echo "zh_CN.EUC GB2312" +- echo "ja_JP.EUC EUC-JP" +- echo "ja_JP.SJIS SHIFT_JIS" +- echo "ja_JP.Shift_JIS SHIFT_JIS" +- echo "ko_KR.EUC EUC-KR" +- ;; +- netbsd*) +- echo "646 ASCII" +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-4 ISO-8859-4" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-13 ISO-8859-13" +- echo "ISO8859-15 ISO-8859-15" +- echo "eucCN GB2312" +- echo "eucJP EUC-JP" +- echo "eucKR EUC-KR" +- echo "eucTW EUC-TW" +- echo "BIG5 BIG5" +- echo "SJIS SHIFT_JIS" +- ;; +- openbsd*) +- echo "646 ASCII" +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-4 ISO-8859-4" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-13 ISO-8859-13" +- echo "ISO8859-15 ISO-8859-15" +- ;; +- darwin[56]*) +- # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore +- # localcharset.c falls back to using the full locale name +- # from the environment variables. +- echo "C ASCII" +- for l in en_AU en_CA en_GB en_US la_LN; do +- echo "$l.US-ASCII ASCII" +- done +- for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \ +- fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ +- nl_NL no_NO pt_PT sv_SE; do +- echo "$l ISO-8859-1" +- echo "$l.ISO8859-1 ISO-8859-1" +- echo "$l.ISO8859-15 ISO-8859-15" +- done +- for l in la_LN; do +- echo "$l.ISO8859-1 ISO-8859-1" +- echo "$l.ISO8859-15 ISO-8859-15" +- done +- for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do +- echo "$l.ISO8859-2 ISO-8859-2" +- done +- for l in la_LN lt_LT; do +- echo "$l.ISO8859-4 ISO-8859-4" +- done +- for l in ru_RU; do +- echo "$l.KOI8-R KOI8-R" +- echo "$l.ISO8859-5 ISO-8859-5" +- echo "$l.CP866 CP866" +- done +- for l in bg_BG; do +- echo "$l.CP1251 CP1251" +- done +- echo "uk_UA.KOI8-U KOI8-U" +- echo "zh_TW.BIG5 BIG5" +- echo "zh_TW.Big5 BIG5" +- echo "zh_CN.EUC GB2312" +- echo "ja_JP.EUC EUC-JP" +- echo "ja_JP.SJIS SHIFT_JIS" +- echo "ko_KR.EUC EUC-KR" +- ;; +- darwin*) +- # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is +- # useless: +- # - It returns the empty string when LANG is set to a locale of the +- # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8 +- # LC_CTYPE file. +- # - The environment variables LANG, LC_CTYPE, LC_ALL are not set by +- # the system; nl_langinfo(CODESET) returns "US-ASCII" in this case. +- # - The documentation says: +- # "... all code that calls BSD system routines should ensure +- # that the const *char parameters of these routines are in UTF-8 +- # encoding. All BSD system functions expect their string +- # parameters to be in UTF-8 encoding and nothing else." +- # It also says +- # "An additional caveat is that string parameters for files, +- # paths, and other file-system entities must be in canonical +- # UTF-8. In a canonical UTF-8 Unicode string, all decomposable +- # characters are decomposed ..." +- # but this is not true: You can pass non-decomposed UTF-8 strings +- # to file system functions, and it is the OS which will convert +- # them to decomposed UTF-8 before accessing the file system. +- # - The Apple Terminal application displays UTF-8 by default. +- # - However, other applications are free to use different encodings: +- # - xterm uses ISO-8859-1 by default. +- # - TextEdit uses MacRoman by default. +- # We prefer UTF-8 over decomposed UTF-8-MAC because one should +- # minimize the use of decomposed Unicode. Unfortunately, through the +- # Darwin file system, decomposed UTF-8 strings are leaked into user +- # space nevertheless. +- # Then there are also the locales with encodings other than US-ASCII +- # and UTF-8. These locales can be occasionally useful to users (e.g. +- # when grepping through ISO-8859-1 encoded text files), when all their +- # file names are in US-ASCII. +- echo "ISO8859-1 ISO-8859-1" +- echo "ISO8859-2 ISO-8859-2" +- echo "ISO8859-4 ISO-8859-4" +- echo "ISO8859-5 ISO-8859-5" +- echo "ISO8859-7 ISO-8859-7" +- echo "ISO8859-9 ISO-8859-9" +- echo "ISO8859-13 ISO-8859-13" +- echo "ISO8859-15 ISO-8859-15" +- echo "KOI8-R KOI8-R" +- echo "KOI8-U KOI8-U" +- echo "CP866 CP866" +- echo "CP949 CP949" +- echo "CP1131 CP1131" +- echo "CP1251 CP1251" +- echo "eucCN GB2312" +- echo "GB2312 GB2312" +- echo "eucJP EUC-JP" +- echo "eucKR EUC-KR" +- echo "Big5 BIG5" +- echo "Big5HKSCS BIG5-HKSCS" +- echo "GBK GBK" +- echo "GB18030 GB18030" +- echo "SJIS SHIFT_JIS" +- echo "ARMSCII-8 ARMSCII-8" +- echo "PT154 PT154" +- #echo "ISCII-DEV ?" +- echo "* UTF-8" +- ;; +- beos* | haiku*) +- # BeOS and Haiku have a single locale, and it has UTF-8 encoding. +- echo "* UTF-8" +- ;; +- msdosdjgpp*) +- # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore +- # localcharset.c falls back to using the full locale name +- # from the environment variables. +- echo "#" +- echo "# The encodings given here may not all be correct." +- echo "# If you find that the encoding given for your language and" +- echo "# country is not the one your DOS machine actually uses, just" +- echo "# correct it in this file, and send a mail to" +- echo "# Juan Manuel Guerrero " +- echo "# and Bruno Haible ." +- echo "#" +- echo "C ASCII" +- # ISO-8859-1 languages +- echo "ca CP850" +- echo "ca_ES CP850" +- echo "da CP865" # not CP850 ?? +- echo "da_DK CP865" # not CP850 ?? +- echo "de CP850" +- echo "de_AT CP850" +- echo "de_CH CP850" +- echo "de_DE CP850" +- echo "en CP850" +- echo "en_AU CP850" # not CP437 ?? +- echo "en_CA CP850" +- echo "en_GB CP850" +- echo "en_NZ CP437" +- echo "en_US CP437" +- echo "en_ZA CP850" # not CP437 ?? +- echo "es CP850" +- echo "es_AR CP850" +- echo "es_BO CP850" +- echo "es_CL CP850" +- echo "es_CO CP850" +- echo "es_CR CP850" +- echo "es_CU CP850" +- echo "es_DO CP850" +- echo "es_EC CP850" +- echo "es_ES CP850" +- echo "es_GT CP850" +- echo "es_HN CP850" +- echo "es_MX CP850" +- echo "es_NI CP850" +- echo "es_PA CP850" +- echo "es_PY CP850" +- echo "es_PE CP850" +- echo "es_SV CP850" +- echo "es_UY CP850" +- echo "es_VE CP850" +- echo "et CP850" +- echo "et_EE CP850" +- echo "eu CP850" +- echo "eu_ES CP850" +- echo "fi CP850" +- echo "fi_FI CP850" +- echo "fr CP850" +- echo "fr_BE CP850" +- echo "fr_CA CP850" +- echo "fr_CH CP850" +- echo "fr_FR CP850" +- echo "ga CP850" +- echo "ga_IE CP850" +- echo "gd CP850" +- echo "gd_GB CP850" +- echo "gl CP850" +- echo "gl_ES CP850" +- echo "id CP850" # not CP437 ?? +- echo "id_ID CP850" # not CP437 ?? +- echo "is CP861" # not CP850 ?? +- echo "is_IS CP861" # not CP850 ?? +- echo "it CP850" +- echo "it_CH CP850" +- echo "it_IT CP850" +- echo "lt CP775" +- echo "lt_LT CP775" +- echo "lv CP775" +- echo "lv_LV CP775" +- echo "nb CP865" # not CP850 ?? +- echo "nb_NO CP865" # not CP850 ?? +- echo "nl CP850" +- echo "nl_BE CP850" +- echo "nl_NL CP850" +- echo "nn CP865" # not CP850 ?? +- echo "nn_NO CP865" # not CP850 ?? +- echo "no CP865" # not CP850 ?? +- echo "no_NO CP865" # not CP850 ?? +- echo "pt CP850" +- echo "pt_BR CP850" +- echo "pt_PT CP850" +- echo "sv CP850" +- echo "sv_SE CP850" +- # ISO-8859-2 languages +- echo "cs CP852" +- echo "cs_CZ CP852" +- echo "hr CP852" +- echo "hr_HR CP852" +- echo "hu CP852" +- echo "hu_HU CP852" +- echo "pl CP852" +- echo "pl_PL CP852" +- echo "ro CP852" +- echo "ro_RO CP852" +- echo "sk CP852" +- echo "sk_SK CP852" +- echo "sl CP852" +- echo "sl_SI CP852" +- echo "sq CP852" +- echo "sq_AL CP852" +- echo "sr CP852" # CP852 or CP866 or CP855 ?? +- echo "sr_CS CP852" # CP852 or CP866 or CP855 ?? +- echo "sr_YU CP852" # CP852 or CP866 or CP855 ?? +- # ISO-8859-3 languages +- echo "mt CP850" +- echo "mt_MT CP850" +- # ISO-8859-5 languages +- echo "be CP866" +- echo "be_BE CP866" +- echo "bg CP866" # not CP855 ?? +- echo "bg_BG CP866" # not CP855 ?? +- echo "mk CP866" # not CP855 ?? +- echo "mk_MK CP866" # not CP855 ?? +- echo "ru CP866" +- echo "ru_RU CP866" +- echo "uk CP1125" +- echo "uk_UA CP1125" +- # ISO-8859-6 languages +- echo "ar CP864" +- echo "ar_AE CP864" +- echo "ar_DZ CP864" +- echo "ar_EG CP864" +- echo "ar_IQ CP864" +- echo "ar_IR CP864" +- echo "ar_JO CP864" +- echo "ar_KW CP864" +- echo "ar_MA CP864" +- echo "ar_OM CP864" +- echo "ar_QA CP864" +- echo "ar_SA CP864" +- echo "ar_SY CP864" +- # ISO-8859-7 languages +- echo "el CP869" +- echo "el_GR CP869" +- # ISO-8859-8 languages +- echo "he CP862" +- echo "he_IL CP862" +- # ISO-8859-9 languages +- echo "tr CP857" +- echo "tr_TR CP857" +- # Japanese +- echo "ja CP932" +- echo "ja_JP CP932" +- # Chinese +- echo "zh_CN GBK" +- echo "zh_TW CP950" # not CP938 ?? +- # Korean +- echo "kr CP949" # not CP934 ?? +- echo "kr_KR CP949" # not CP934 ?? +- # Thai +- echo "th CP874" +- echo "th_TH CP874" +- # Other +- echo "eo CP850" +- echo "eo_EO CP850" +- ;; +-esac +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/intprops.h groff-1.22.3/src/libs/gnulib/lib/intprops.h +--- groff-1.22.3.old/src/libs/gnulib/lib/intprops.h 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/intprops.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,320 +0,0 @@ +-/* intprops.h -- properties of integer types +- +- Copyright (C) 2001-2005, 2009-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 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 . */ +- +-/* Written by Paul Eggert. */ +- +-#ifndef _GL_INTPROPS_H +-#define _GL_INTPROPS_H +- +-#include +- +-/* Return an integer value, converted to the same type as the integer +- expression E after integer type promotion. V is the unconverted value. */ +-#define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) +- +-/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see +- . */ +-#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) +- +-/* The extra casts in the following macros work around compiler bugs, +- e.g., in Cray C 5.0.3.0. */ +- +-/* True if the arithmetic type T is an integer type. bool counts as +- an integer. */ +-#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) +- +-/* True if negative values of the signed integer type T use two's +- complement, ones' complement, or signed magnitude representation, +- respectively. Much GNU code assumes two's complement, but some +- people like to be portable to all possible C hosts. */ +-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) +-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) +-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) +- +-/* True if the signed integer expression E uses two's complement. */ +-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1) +- +-/* True if the arithmetic type T is signed. */ +-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) +- +-/* Return 1 if the integer expression E, after integer promotion, has +- a signed type. */ +-#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) +- +- +-/* Minimum and maximum values for integer types and expressions. These +- macros have undefined behavior if T is signed and has padding bits. +- If this is a problem for you, please let us know how to fix it for +- your host. */ +- +-/* The maximum and minimum values for the integer type T. */ +-#define TYPE_MINIMUM(t) \ +- ((t) (! TYPE_SIGNED (t) \ +- ? (t) 0 \ +- : TYPE_SIGNED_MAGNITUDE (t) \ +- ? ~ (t) 0 \ +- : ~ TYPE_MAXIMUM (t))) +-#define TYPE_MAXIMUM(t) \ +- ((t) (! TYPE_SIGNED (t) \ +- ? (t) -1 \ +- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) +- +-/* The maximum and minimum values for the type of the expression E, +- after integer promotion. E should not have side effects. */ +-#define _GL_INT_MINIMUM(e) \ +- (_GL_INT_SIGNED (e) \ +- ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e) \ +- : _GL_INT_CONVERT (e, 0)) +-#define _GL_INT_MAXIMUM(e) \ +- (_GL_INT_SIGNED (e) \ +- ? _GL_SIGNED_INT_MAXIMUM (e) \ +- : _GL_INT_NEGATE_CONVERT (e, 1)) +-#define _GL_SIGNED_INT_MAXIMUM(e) \ +- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) +- +- +-/* Return 1 if the __typeof__ keyword works. This could be done by +- 'configure', but for now it's easier to do it by hand. */ +-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ +- || (0x5110 <= __SUNPRO_C && !__STDC__)) +-# define _GL_HAVE___TYPEOF__ 1 +-#else +-# define _GL_HAVE___TYPEOF__ 0 +-#endif +- +-/* Return 1 if the integer type or expression T might be signed. Return 0 +- if it is definitely unsigned. This macro does not evaluate its argument, +- and expands to an integer constant expression. */ +-#if _GL_HAVE___TYPEOF__ +-# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t)) +-#else +-# define _GL_SIGNED_TYPE_OR_EXPR(t) 1 +-#endif +- +-/* Bound on length of the string representing an unsigned integer +- value representable in B bits. log10 (2.0) < 146/485. The +- smallest value of B where this bound is not tight is 2621. */ +-#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485) +- +-/* Bound on length of the string representing an integer type or expression T. +- Subtract 1 for the sign bit if T is signed, and then add 1 more for +- a minus sign if needed. +- +- Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 0 when its argument is +- signed, this macro may overestimate the true bound by one byte when +- applied to unsigned types of size 2, 4, 16, ... bytes. */ +-#define INT_STRLEN_BOUND(t) \ +- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ +- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ +- + _GL_SIGNED_TYPE_OR_EXPR (t)) +- +-/* Bound on buffer size needed to represent an integer type or expression T, +- including the terminating null. */ +-#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1) +- +- +-/* Range overflow checks. +- +- The INT__RANGE_OVERFLOW macros return 1 if the corresponding C +- operators might not yield numerically correct answers due to +- arithmetic overflow. They do not rely on undefined or +- implementation-defined behavior. Their implementations are simple +- and straightforward, but they are a bit harder to use than the +- INT__OVERFLOW macros described below. +- +- Example usage: +- +- long int i = ...; +- long int j = ...; +- if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX)) +- printf ("multiply would overflow"); +- else +- printf ("product is %ld", i * j); +- +- Restrictions on *_RANGE_OVERFLOW macros: +- +- These macros do not check for all possible numerical problems or +- undefined or unspecified behavior: they do not check for division +- by zero, for bad shift counts, or for shifting negative numbers. +- +- These macros may evaluate their arguments zero or multiple times, +- so the arguments should not have side effects. The arithmetic +- arguments (including the MIN and MAX arguments) must be of the same +- integer type after the usual arithmetic conversions, and the type +- must have minimum value MIN and maximum MAX. Unsigned types should +- use a zero MIN of the proper type. +- +- These macros are tuned for constant MIN and MAX. For commutative +- operations such as A + B, they are also tuned for constant B. */ +- +-/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. */ +-#define INT_ADD_RANGE_OVERFLOW(a, b, min, max) \ +- ((b) < 0 \ +- ? (a) < (min) - (b) \ +- : (max) - (b) < (a)) +- +-/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. */ +-#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max) \ +- ((b) < 0 \ +- ? (max) + (b) < (a) \ +- : (a) < (min) + (b)) +- +-/* Return 1 if - A would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. */ +-#define INT_NEGATE_RANGE_OVERFLOW(a, min, max) \ +- ((min) < 0 \ +- ? (a) < - (max) \ +- : 0 < (a)) +- +-/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. Avoid && and || as they tickle +- bugs in Sun C 5.11 2010/08/13 and other compilers; see +- . */ +-#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \ +- ((b) < 0 \ +- ? ((a) < 0 \ +- ? (a) < (max) / (b) \ +- : (b) == -1 \ +- ? 0 \ +- : (min) / (b) < (a)) \ +- : (b) == 0 \ +- ? 0 \ +- : ((a) < 0 \ +- ? (a) < (min) / (b) \ +- : (max) / (b) < (a))) +- +-/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. Do not check for division by zero. */ +-#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max) \ +- ((min) < 0 && (b) == -1 && (a) < - (max)) +- +-/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. Do not check for division by zero. +- Mathematically, % should never overflow, but on x86-like hosts +- INT_MIN % -1 traps, and the C standard permits this, so treat this +- as an overflow too. */ +-#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max) \ +- INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max) +- +-/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic. +- See above for restrictions. Here, MIN and MAX are for A only, and B need +- not be of the same type as the other arguments. The C standard says that +- behavior is undefined for shifts unless 0 <= B < wordwidth, and that when +- A is negative then A << B has undefined behavior and A >> B has +- implementation-defined behavior, but do not check these other +- restrictions. */ +-#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max) \ +- ((a) < 0 \ +- ? (a) < (min) >> (b) \ +- : (max) >> (b) < (a)) +- +- +-/* The _GL*_OVERFLOW macros have the same restrictions as the +- *_RANGE_OVERFLOW macros, except that they do not assume that operands +- (e.g., A and B) have the same type as MIN and MAX. Instead, they assume +- that the result (e.g., A + B) has that type. */ +-#define _GL_ADD_OVERFLOW(a, b, min, max) \ +- ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ +- : (a) < 0 ? (b) <= (a) + (b) \ +- : (b) < 0 ? (a) <= (a) + (b) \ +- : (a) + (b) < (b)) +-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ +- ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max) \ +- : (a) < 0 ? 1 \ +- : (b) < 0 ? (a) - (b) <= (a) \ +- : (a) < (b)) +-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ +- (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a)))) \ +- || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max)) +-#define _GL_DIVIDE_OVERFLOW(a, b, min, max) \ +- ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max) \ +- : (a) < 0 ? (b) <= (a) + (b) - 1 \ +- : (b) < 0 && (a) + (b) <= (a)) +-#define _GL_REMAINDER_OVERFLOW(a, b, min, max) \ +- ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max) \ +- : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b) \ +- : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max)) +- +-/* Return a nonzero value if A is a mathematical multiple of B, where +- A is unsigned, B is negative, and MAX is the maximum value of A's +- type. A's type must be the same as (A % B)'s type. Normally (A % +- -B == 0) suffices, but things get tricky if -B would overflow. */ +-#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max) \ +- (((b) < -_GL_SIGNED_INT_MAXIMUM (b) \ +- ? (_GL_SIGNED_INT_MAXIMUM (b) == (max) \ +- ? (a) \ +- : (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1)) \ +- : (a) % - (b)) \ +- == 0) +- +- +-/* Integer overflow checks. +- +- The INT__OVERFLOW macros return 1 if the corresponding C operators +- might not yield numerically correct answers due to arithmetic overflow. +- They work correctly on all known practical hosts, and do not rely +- on undefined behavior due to signed arithmetic overflow. +- +- Example usage: +- +- long int i = ...; +- long int j = ...; +- if (INT_MULTIPLY_OVERFLOW (i, j)) +- printf ("multiply would overflow"); +- else +- printf ("product is %ld", i * j); +- +- These macros do not check for all possible numerical problems or +- undefined or unspecified behavior: they do not check for division +- by zero, for bad shift counts, or for shifting negative numbers. +- +- These macros may evaluate their arguments zero or multiple times, so the +- arguments should not have side effects. +- +- These macros are tuned for their last argument being a constant. +- +- Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, +- A % B, and A << B would overflow, respectively. */ +- +-#define INT_ADD_OVERFLOW(a, b) \ +- _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) +-#define INT_SUBTRACT_OVERFLOW(a, b) \ +- _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) +-#define INT_NEGATE_OVERFLOW(a) \ +- INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) +-#define INT_MULTIPLY_OVERFLOW(a, b) \ +- _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW) +-#define INT_DIVIDE_OVERFLOW(a, b) \ +- _GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW) +-#define INT_REMAINDER_OVERFLOW(a, b) \ +- _GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW) +-#define INT_LEFT_SHIFT_OVERFLOW(a, b) \ +- INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \ +- _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) +- +-/* Return 1 if the expression A B would overflow, +- where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test, +- assuming MIN and MAX are the minimum and maximum for the result type. +- Arguments should be free of side effects. */ +-#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \ +- op_result_overflow (a, b, \ +- _GL_INT_MINIMUM (0 * (b) + (a)), \ +- _GL_INT_MAXIMUM (0 * (b) + (a))) +- +-#endif /* _GL_INTPROPS_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/inttypes.in.h groff-1.22.3/src/libs/gnulib/lib/inttypes.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/inttypes.in.h 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/inttypes.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1130 +0,0 @@ +-/* Copyright (C) 2006-2014 Free Software Foundation, Inc. +- Written by Paul Eggert, Bruno Haible, Derek Price. +- This file is part of gnulib. +- +- 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 . */ +- +-/* +- * ISO C 99 for platforms that lack it. +- * +- */ +- +-#if __GNUC__ >= 3 +-@PRAGMA_SYSTEM_HEADER@ +-#endif +-@PRAGMA_COLUMNS@ +- +-/* Include the original if it exists, and if this file +- has not been included yet or if this file includes gnulib stdint.h +- which in turn includes this file. +- The include_next requires a split double-inclusion guard. */ +-#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H +-# if @HAVE_INTTYPES_H@ +- +- /* Some pre-C++11 implementations need this. */ +-# if defined __cplusplus && ! defined __STDC_FORMAT_MACROS +-# define __STDC_FORMAT_MACROS 1 +-# endif +- +-# @INCLUDE_NEXT@ @NEXT_INTTYPES_H@ +-# endif +-#endif +- +-#if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H +-#define INTTYPES_H +- +-/* Include or the gnulib replacement. +- But avoid namespace pollution on glibc systems. */ +-#ifndef __GLIBC__ +-# include +-#endif +-/* Get CHAR_BIT. */ +-#include +- +-#if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) +-# error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to ." +-#endif +- +-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +- +-/* The definition of _GL_ARG_NONNULL is copied here. */ +- +-/* The definition of _GL_WARN_ON_USE is copied here. */ +- +-/* 7.8.1 Macros for format specifiers */ +- +-#if defined _TNS_R_TARGET +- /* Tandem NonStop R series and compatible platforms released before +- July 2005 support %Ld but not %lld. */ +-# define _LONG_LONG_FORMAT_PREFIX "L" +-#else +-# define _LONG_LONG_FORMAT_PREFIX "ll" +-#endif +- +-#if !defined PRId8 || @PRI_MACROS_BROKEN@ +-# undef PRId8 +-# ifdef INT8_MAX +-# define PRId8 "d" +-# endif +-#endif +-#if !defined PRIi8 || @PRI_MACROS_BROKEN@ +-# undef PRIi8 +-# ifdef INT8_MAX +-# define PRIi8 "i" +-# endif +-#endif +-#if !defined PRIo8 || @PRI_MACROS_BROKEN@ +-# undef PRIo8 +-# ifdef UINT8_MAX +-# define PRIo8 "o" +-# endif +-#endif +-#if !defined PRIu8 || @PRI_MACROS_BROKEN@ +-# undef PRIu8 +-# ifdef UINT8_MAX +-# define PRIu8 "u" +-# endif +-#endif +-#if !defined PRIx8 || @PRI_MACROS_BROKEN@ +-# undef PRIx8 +-# ifdef UINT8_MAX +-# define PRIx8 "x" +-# endif +-#endif +-#if !defined PRIX8 || @PRI_MACROS_BROKEN@ +-# undef PRIX8 +-# ifdef UINT8_MAX +-# define PRIX8 "X" +-# endif +-#endif +-#if !defined PRId16 || @PRI_MACROS_BROKEN@ +-# undef PRId16 +-# ifdef INT16_MAX +-# define PRId16 "d" +-# endif +-#endif +-#if !defined PRIi16 || @PRI_MACROS_BROKEN@ +-# undef PRIi16 +-# ifdef INT16_MAX +-# define PRIi16 "i" +-# endif +-#endif +-#if !defined PRIo16 || @PRI_MACROS_BROKEN@ +-# undef PRIo16 +-# ifdef UINT16_MAX +-# define PRIo16 "o" +-# endif +-#endif +-#if !defined PRIu16 || @PRI_MACROS_BROKEN@ +-# undef PRIu16 +-# ifdef UINT16_MAX +-# define PRIu16 "u" +-# endif +-#endif +-#if !defined PRIx16 || @PRI_MACROS_BROKEN@ +-# undef PRIx16 +-# ifdef UINT16_MAX +-# define PRIx16 "x" +-# endif +-#endif +-#if !defined PRIX16 || @PRI_MACROS_BROKEN@ +-# undef PRIX16 +-# ifdef UINT16_MAX +-# define PRIX16 "X" +-# endif +-#endif +-#if !defined PRId32 || @PRI_MACROS_BROKEN@ +-# undef PRId32 +-# ifdef INT32_MAX +-# define PRId32 "d" +-# endif +-#endif +-#if !defined PRIi32 || @PRI_MACROS_BROKEN@ +-# undef PRIi32 +-# ifdef INT32_MAX +-# define PRIi32 "i" +-# endif +-#endif +-#if !defined PRIo32 || @PRI_MACROS_BROKEN@ +-# undef PRIo32 +-# ifdef UINT32_MAX +-# define PRIo32 "o" +-# endif +-#endif +-#if !defined PRIu32 || @PRI_MACROS_BROKEN@ +-# undef PRIu32 +-# ifdef UINT32_MAX +-# define PRIu32 "u" +-# endif +-#endif +-#if !defined PRIx32 || @PRI_MACROS_BROKEN@ +-# undef PRIx32 +-# ifdef UINT32_MAX +-# define PRIx32 "x" +-# endif +-#endif +-#if !defined PRIX32 || @PRI_MACROS_BROKEN@ +-# undef PRIX32 +-# ifdef UINT32_MAX +-# define PRIX32 "X" +-# endif +-#endif +-#ifdef INT64_MAX +-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) +-# define _PRI64_PREFIX "l" +-# elif defined _MSC_VER || defined __MINGW32__ +-# define _PRI64_PREFIX "I64" +-# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +-# define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX +-# endif +-# if !defined PRId64 || @PRI_MACROS_BROKEN@ +-# undef PRId64 +-# define PRId64 _PRI64_PREFIX "d" +-# endif +-# if !defined PRIi64 || @PRI_MACROS_BROKEN@ +-# undef PRIi64 +-# define PRIi64 _PRI64_PREFIX "i" +-# endif +-#endif +-#ifdef UINT64_MAX +-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) +-# define _PRIu64_PREFIX "l" +-# elif defined _MSC_VER || defined __MINGW32__ +-# define _PRIu64_PREFIX "I64" +-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +-# define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX +-# endif +-# if !defined PRIo64 || @PRI_MACROS_BROKEN@ +-# undef PRIo64 +-# define PRIo64 _PRIu64_PREFIX "o" +-# endif +-# if !defined PRIu64 || @PRI_MACROS_BROKEN@ +-# undef PRIu64 +-# define PRIu64 _PRIu64_PREFIX "u" +-# endif +-# if !defined PRIx64 || @PRI_MACROS_BROKEN@ +-# undef PRIx64 +-# define PRIx64 _PRIu64_PREFIX "x" +-# endif +-# if !defined PRIX64 || @PRI_MACROS_BROKEN@ +-# undef PRIX64 +-# define PRIX64 _PRIu64_PREFIX "X" +-# endif +-#endif +- +-#if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIdLEAST8 +-# define PRIdLEAST8 "d" +-#endif +-#if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIiLEAST8 +-# define PRIiLEAST8 "i" +-#endif +-#if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIoLEAST8 +-# define PRIoLEAST8 "o" +-#endif +-#if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIuLEAST8 +-# define PRIuLEAST8 "u" +-#endif +-#if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIxLEAST8 +-# define PRIxLEAST8 "x" +-#endif +-#if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIXLEAST8 +-# define PRIXLEAST8 "X" +-#endif +-#if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIdLEAST16 +-# define PRIdLEAST16 "d" +-#endif +-#if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIiLEAST16 +-# define PRIiLEAST16 "i" +-#endif +-#if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIoLEAST16 +-# define PRIoLEAST16 "o" +-#endif +-#if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIuLEAST16 +-# define PRIuLEAST16 "u" +-#endif +-#if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIxLEAST16 +-# define PRIxLEAST16 "x" +-#endif +-#if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIXLEAST16 +-# define PRIXLEAST16 "X" +-#endif +-#if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIdLEAST32 +-# define PRIdLEAST32 "d" +-#endif +-#if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIiLEAST32 +-# define PRIiLEAST32 "i" +-#endif +-#if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIoLEAST32 +-# define PRIoLEAST32 "o" +-#endif +-#if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIuLEAST32 +-# define PRIuLEAST32 "u" +-#endif +-#if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIxLEAST32 +-# define PRIxLEAST32 "x" +-#endif +-#if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIXLEAST32 +-# define PRIXLEAST32 "X" +-#endif +-#ifdef INT64_MAX +-# if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIdLEAST64 +-# define PRIdLEAST64 PRId64 +-# endif +-# if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIiLEAST64 +-# define PRIiLEAST64 PRIi64 +-# endif +-#endif +-#ifdef UINT64_MAX +-# if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIoLEAST64 +-# define PRIoLEAST64 PRIo64 +-# endif +-# if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIuLEAST64 +-# define PRIuLEAST64 PRIu64 +-# endif +-# if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIxLEAST64 +-# define PRIxLEAST64 PRIx64 +-# endif +-# if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIXLEAST64 +-# define PRIXLEAST64 PRIX64 +-# endif +-#endif +- +-#if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIdFAST8 +-# if INT_FAST8_MAX > INT32_MAX +-# define PRIdFAST8 PRId64 +-# else +-# define PRIdFAST8 "d" +-# endif +-#endif +-#if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIiFAST8 +-# if INT_FAST8_MAX > INT32_MAX +-# define PRIiFAST8 PRIi64 +-# else +-# define PRIiFAST8 "i" +-# endif +-#endif +-#if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIoFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define PRIoFAST8 PRIo64 +-# else +-# define PRIoFAST8 "o" +-# endif +-#endif +-#if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIuFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define PRIuFAST8 PRIu64 +-# else +-# define PRIuFAST8 "u" +-# endif +-#endif +-#if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIxFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define PRIxFAST8 PRIx64 +-# else +-# define PRIxFAST8 "x" +-# endif +-#endif +-#if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@ +-# undef PRIXFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define PRIXFAST8 PRIX64 +-# else +-# define PRIXFAST8 "X" +-# endif +-#endif +-#if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIdFAST16 +-# if INT_FAST16_MAX > INT32_MAX +-# define PRIdFAST16 PRId64 +-# else +-# define PRIdFAST16 "d" +-# endif +-#endif +-#if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIiFAST16 +-# if INT_FAST16_MAX > INT32_MAX +-# define PRIiFAST16 PRIi64 +-# else +-# define PRIiFAST16 "i" +-# endif +-#endif +-#if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIoFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define PRIoFAST16 PRIo64 +-# else +-# define PRIoFAST16 "o" +-# endif +-#endif +-#if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIuFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define PRIuFAST16 PRIu64 +-# else +-# define PRIuFAST16 "u" +-# endif +-#endif +-#if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIxFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define PRIxFAST16 PRIx64 +-# else +-# define PRIxFAST16 "x" +-# endif +-#endif +-#if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@ +-# undef PRIXFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define PRIXFAST16 PRIX64 +-# else +-# define PRIXFAST16 "X" +-# endif +-#endif +-#if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIdFAST32 +-# if INT_FAST32_MAX > INT32_MAX +-# define PRIdFAST32 PRId64 +-# else +-# define PRIdFAST32 "d" +-# endif +-#endif +-#if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIiFAST32 +-# if INT_FAST32_MAX > INT32_MAX +-# define PRIiFAST32 PRIi64 +-# else +-# define PRIiFAST32 "i" +-# endif +-#endif +-#if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIoFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define PRIoFAST32 PRIo64 +-# else +-# define PRIoFAST32 "o" +-# endif +-#endif +-#if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIuFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define PRIuFAST32 PRIu64 +-# else +-# define PRIuFAST32 "u" +-# endif +-#endif +-#if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIxFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define PRIxFAST32 PRIx64 +-# else +-# define PRIxFAST32 "x" +-# endif +-#endif +-#if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@ +-# undef PRIXFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define PRIXFAST32 PRIX64 +-# else +-# define PRIXFAST32 "X" +-# endif +-#endif +-#ifdef INT64_MAX +-# if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIdFAST64 +-# define PRIdFAST64 PRId64 +-# endif +-# if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIiFAST64 +-# define PRIiFAST64 PRIi64 +-# endif +-#endif +-#ifdef UINT64_MAX +-# if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIoFAST64 +-# define PRIoFAST64 PRIo64 +-# endif +-# if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIuFAST64 +-# define PRIuFAST64 PRIu64 +-# endif +-# if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIxFAST64 +-# define PRIxFAST64 PRIx64 +-# endif +-# if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@ +-# undef PRIXFAST64 +-# define PRIXFAST64 PRIX64 +-# endif +-#endif +- +-#if !defined PRIdMAX || @PRI_MACROS_BROKEN@ +-# undef PRIdMAX +-# if @INT32_MAX_LT_INTMAX_MAX@ +-# define PRIdMAX PRId64 +-# else +-# define PRIdMAX "ld" +-# endif +-#endif +-#if !defined PRIiMAX || @PRI_MACROS_BROKEN@ +-# undef PRIiMAX +-# if @INT32_MAX_LT_INTMAX_MAX@ +-# define PRIiMAX PRIi64 +-# else +-# define PRIiMAX "li" +-# endif +-#endif +-#if !defined PRIoMAX || @PRI_MACROS_BROKEN@ +-# undef PRIoMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define PRIoMAX PRIo64 +-# else +-# define PRIoMAX "lo" +-# endif +-#endif +-#if !defined PRIuMAX || @PRI_MACROS_BROKEN@ +-# undef PRIuMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define PRIuMAX PRIu64 +-# else +-# define PRIuMAX "lu" +-# endif +-#endif +-#if !defined PRIxMAX || @PRI_MACROS_BROKEN@ +-# undef PRIxMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define PRIxMAX PRIx64 +-# else +-# define PRIxMAX "lx" +-# endif +-#endif +-#if !defined PRIXMAX || @PRI_MACROS_BROKEN@ +-# undef PRIXMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define PRIXMAX PRIX64 +-# else +-# define PRIXMAX "lX" +-# endif +-#endif +- +-#if !defined PRIdPTR || @PRI_MACROS_BROKEN@ +-# undef PRIdPTR +-# ifdef INTPTR_MAX +-# define PRIdPTR @PRIPTR_PREFIX@ "d" +-# endif +-#endif +-#if !defined PRIiPTR || @PRI_MACROS_BROKEN@ +-# undef PRIiPTR +-# ifdef INTPTR_MAX +-# define PRIiPTR @PRIPTR_PREFIX@ "i" +-# endif +-#endif +-#if !defined PRIoPTR || @PRI_MACROS_BROKEN@ +-# undef PRIoPTR +-# ifdef UINTPTR_MAX +-# define PRIoPTR @PRIPTR_PREFIX@ "o" +-# endif +-#endif +-#if !defined PRIuPTR || @PRI_MACROS_BROKEN@ +-# undef PRIuPTR +-# ifdef UINTPTR_MAX +-# define PRIuPTR @PRIPTR_PREFIX@ "u" +-# endif +-#endif +-#if !defined PRIxPTR || @PRI_MACROS_BROKEN@ +-# undef PRIxPTR +-# ifdef UINTPTR_MAX +-# define PRIxPTR @PRIPTR_PREFIX@ "x" +-# endif +-#endif +-#if !defined PRIXPTR || @PRI_MACROS_BROKEN@ +-# undef PRIXPTR +-# ifdef UINTPTR_MAX +-# define PRIXPTR @PRIPTR_PREFIX@ "X" +-# endif +-#endif +- +-#if !defined SCNd8 || @PRI_MACROS_BROKEN@ +-# undef SCNd8 +-# ifdef INT8_MAX +-# define SCNd8 "hhd" +-# endif +-#endif +-#if !defined SCNi8 || @PRI_MACROS_BROKEN@ +-# undef SCNi8 +-# ifdef INT8_MAX +-# define SCNi8 "hhi" +-# endif +-#endif +-#if !defined SCNo8 || @PRI_MACROS_BROKEN@ +-# undef SCNo8 +-# ifdef UINT8_MAX +-# define SCNo8 "hho" +-# endif +-#endif +-#if !defined SCNu8 || @PRI_MACROS_BROKEN@ +-# undef SCNu8 +-# ifdef UINT8_MAX +-# define SCNu8 "hhu" +-# endif +-#endif +-#if !defined SCNx8 || @PRI_MACROS_BROKEN@ +-# undef SCNx8 +-# ifdef UINT8_MAX +-# define SCNx8 "hhx" +-# endif +-#endif +-#if !defined SCNd16 || @PRI_MACROS_BROKEN@ +-# undef SCNd16 +-# ifdef INT16_MAX +-# define SCNd16 "hd" +-# endif +-#endif +-#if !defined SCNi16 || @PRI_MACROS_BROKEN@ +-# undef SCNi16 +-# ifdef INT16_MAX +-# define SCNi16 "hi" +-# endif +-#endif +-#if !defined SCNo16 || @PRI_MACROS_BROKEN@ +-# undef SCNo16 +-# ifdef UINT16_MAX +-# define SCNo16 "ho" +-# endif +-#endif +-#if !defined SCNu16 || @PRI_MACROS_BROKEN@ +-# undef SCNu16 +-# ifdef UINT16_MAX +-# define SCNu16 "hu" +-# endif +-#endif +-#if !defined SCNx16 || @PRI_MACROS_BROKEN@ +-# undef SCNx16 +-# ifdef UINT16_MAX +-# define SCNx16 "hx" +-# endif +-#endif +-#if !defined SCNd32 || @PRI_MACROS_BROKEN@ +-# undef SCNd32 +-# ifdef INT32_MAX +-# define SCNd32 "d" +-# endif +-#endif +-#if !defined SCNi32 || @PRI_MACROS_BROKEN@ +-# undef SCNi32 +-# ifdef INT32_MAX +-# define SCNi32 "i" +-# endif +-#endif +-#if !defined SCNo32 || @PRI_MACROS_BROKEN@ +-# undef SCNo32 +-# ifdef UINT32_MAX +-# define SCNo32 "o" +-# endif +-#endif +-#if !defined SCNu32 || @PRI_MACROS_BROKEN@ +-# undef SCNu32 +-# ifdef UINT32_MAX +-# define SCNu32 "u" +-# endif +-#endif +-#if !defined SCNx32 || @PRI_MACROS_BROKEN@ +-# undef SCNx32 +-# ifdef UINT32_MAX +-# define SCNx32 "x" +-# endif +-#endif +-#ifdef INT64_MAX +-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) +-# define _SCN64_PREFIX "l" +-# elif defined _MSC_VER || defined __MINGW32__ +-# define _SCN64_PREFIX "I64" +-# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +-# define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX +-# endif +-# if !defined SCNd64 || @PRI_MACROS_BROKEN@ +-# undef SCNd64 +-# define SCNd64 _SCN64_PREFIX "d" +-# endif +-# if !defined SCNi64 || @PRI_MACROS_BROKEN@ +-# undef SCNi64 +-# define SCNi64 _SCN64_PREFIX "i" +-# endif +-#endif +-#ifdef UINT64_MAX +-# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) +-# define _SCNu64_PREFIX "l" +-# elif defined _MSC_VER || defined __MINGW32__ +-# define _SCNu64_PREFIX "I64" +-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +-# define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX +-# endif +-# if !defined SCNo64 || @PRI_MACROS_BROKEN@ +-# undef SCNo64 +-# define SCNo64 _SCNu64_PREFIX "o" +-# endif +-# if !defined SCNu64 || @PRI_MACROS_BROKEN@ +-# undef SCNu64 +-# define SCNu64 _SCNu64_PREFIX "u" +-# endif +-# if !defined SCNx64 || @PRI_MACROS_BROKEN@ +-# undef SCNx64 +-# define SCNx64 _SCNu64_PREFIX "x" +-# endif +-#endif +- +-#if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNdLEAST8 +-# define SCNdLEAST8 "hhd" +-#endif +-#if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNiLEAST8 +-# define SCNiLEAST8 "hhi" +-#endif +-#if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNoLEAST8 +-# define SCNoLEAST8 "hho" +-#endif +-#if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNuLEAST8 +-# define SCNuLEAST8 "hhu" +-#endif +-#if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNxLEAST8 +-# define SCNxLEAST8 "hhx" +-#endif +-#if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNdLEAST16 +-# define SCNdLEAST16 "hd" +-#endif +-#if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNiLEAST16 +-# define SCNiLEAST16 "hi" +-#endif +-#if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNoLEAST16 +-# define SCNoLEAST16 "ho" +-#endif +-#if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNuLEAST16 +-# define SCNuLEAST16 "hu" +-#endif +-#if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNxLEAST16 +-# define SCNxLEAST16 "hx" +-#endif +-#if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNdLEAST32 +-# define SCNdLEAST32 "d" +-#endif +-#if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNiLEAST32 +-# define SCNiLEAST32 "i" +-#endif +-#if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNoLEAST32 +-# define SCNoLEAST32 "o" +-#endif +-#if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNuLEAST32 +-# define SCNuLEAST32 "u" +-#endif +-#if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNxLEAST32 +-# define SCNxLEAST32 "x" +-#endif +-#ifdef INT64_MAX +-# if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNdLEAST64 +-# define SCNdLEAST64 SCNd64 +-# endif +-# if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNiLEAST64 +-# define SCNiLEAST64 SCNi64 +-# endif +-#endif +-#ifdef UINT64_MAX +-# if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNoLEAST64 +-# define SCNoLEAST64 SCNo64 +-# endif +-# if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNuLEAST64 +-# define SCNuLEAST64 SCNu64 +-# endif +-# if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNxLEAST64 +-# define SCNxLEAST64 SCNx64 +-# endif +-#endif +- +-#if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNdFAST8 +-# if INT_FAST8_MAX > INT32_MAX +-# define SCNdFAST8 SCNd64 +-# elif INT_FAST8_MAX == 0x7fff +-# define SCNdFAST8 "hd" +-# elif INT_FAST8_MAX == 0x7f +-# define SCNdFAST8 "hhd" +-# else +-# define SCNdFAST8 "d" +-# endif +-#endif +-#if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNiFAST8 +-# if INT_FAST8_MAX > INT32_MAX +-# define SCNiFAST8 SCNi64 +-# elif INT_FAST8_MAX == 0x7fff +-# define SCNiFAST8 "hi" +-# elif INT_FAST8_MAX == 0x7f +-# define SCNiFAST8 "hhi" +-# else +-# define SCNiFAST8 "i" +-# endif +-#endif +-#if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNoFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define SCNoFAST8 SCNo64 +-# elif UINT_FAST8_MAX == 0xffff +-# define SCNoFAST8 "ho" +-# elif UINT_FAST8_MAX == 0xff +-# define SCNoFAST8 "hho" +-# else +-# define SCNoFAST8 "o" +-# endif +-#endif +-#if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNuFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define SCNuFAST8 SCNu64 +-# elif UINT_FAST8_MAX == 0xffff +-# define SCNuFAST8 "hu" +-# elif UINT_FAST8_MAX == 0xff +-# define SCNuFAST8 "hhu" +-# else +-# define SCNuFAST8 "u" +-# endif +-#endif +-#if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@ +-# undef SCNxFAST8 +-# if UINT_FAST8_MAX > UINT32_MAX +-# define SCNxFAST8 SCNx64 +-# elif UINT_FAST8_MAX == 0xffff +-# define SCNxFAST8 "hx" +-# elif UINT_FAST8_MAX == 0xff +-# define SCNxFAST8 "hhx" +-# else +-# define SCNxFAST8 "x" +-# endif +-#endif +-#if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNdFAST16 +-# if INT_FAST16_MAX > INT32_MAX +-# define SCNdFAST16 SCNd64 +-# elif INT_FAST16_MAX == 0x7fff +-# define SCNdFAST16 "hd" +-# else +-# define SCNdFAST16 "d" +-# endif +-#endif +-#if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNiFAST16 +-# if INT_FAST16_MAX > INT32_MAX +-# define SCNiFAST16 SCNi64 +-# elif INT_FAST16_MAX == 0x7fff +-# define SCNiFAST16 "hi" +-# else +-# define SCNiFAST16 "i" +-# endif +-#endif +-#if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNoFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define SCNoFAST16 SCNo64 +-# elif UINT_FAST16_MAX == 0xffff +-# define SCNoFAST16 "ho" +-# else +-# define SCNoFAST16 "o" +-# endif +-#endif +-#if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNuFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define SCNuFAST16 SCNu64 +-# elif UINT_FAST16_MAX == 0xffff +-# define SCNuFAST16 "hu" +-# else +-# define SCNuFAST16 "u" +-# endif +-#endif +-#if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@ +-# undef SCNxFAST16 +-# if UINT_FAST16_MAX > UINT32_MAX +-# define SCNxFAST16 SCNx64 +-# elif UINT_FAST16_MAX == 0xffff +-# define SCNxFAST16 "hx" +-# else +-# define SCNxFAST16 "x" +-# endif +-#endif +-#if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNdFAST32 +-# if INT_FAST32_MAX > INT32_MAX +-# define SCNdFAST32 SCNd64 +-# else +-# define SCNdFAST32 "d" +-# endif +-#endif +-#if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNiFAST32 +-# if INT_FAST32_MAX > INT32_MAX +-# define SCNiFAST32 SCNi64 +-# else +-# define SCNiFAST32 "i" +-# endif +-#endif +-#if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNoFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define SCNoFAST32 SCNo64 +-# else +-# define SCNoFAST32 "o" +-# endif +-#endif +-#if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNuFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define SCNuFAST32 SCNu64 +-# else +-# define SCNuFAST32 "u" +-# endif +-#endif +-#if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@ +-# undef SCNxFAST32 +-# if UINT_FAST32_MAX > UINT32_MAX +-# define SCNxFAST32 SCNx64 +-# else +-# define SCNxFAST32 "x" +-# endif +-#endif +-#ifdef INT64_MAX +-# if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNdFAST64 +-# define SCNdFAST64 SCNd64 +-# endif +-# if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNiFAST64 +-# define SCNiFAST64 SCNi64 +-# endif +-#endif +-#ifdef UINT64_MAX +-# if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNoFAST64 +-# define SCNoFAST64 SCNo64 +-# endif +-# if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNuFAST64 +-# define SCNuFAST64 SCNu64 +-# endif +-# if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@ +-# undef SCNxFAST64 +-# define SCNxFAST64 SCNx64 +-# endif +-#endif +- +-#if !defined SCNdMAX || @PRI_MACROS_BROKEN@ +-# undef SCNdMAX +-# if @INT32_MAX_LT_INTMAX_MAX@ +-# define SCNdMAX SCNd64 +-# else +-# define SCNdMAX "ld" +-# endif +-#endif +-#if !defined SCNiMAX || @PRI_MACROS_BROKEN@ +-# undef SCNiMAX +-# if @INT32_MAX_LT_INTMAX_MAX@ +-# define SCNiMAX SCNi64 +-# else +-# define SCNiMAX "li" +-# endif +-#endif +-#if !defined SCNoMAX || @PRI_MACROS_BROKEN@ +-# undef SCNoMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define SCNoMAX SCNo64 +-# else +-# define SCNoMAX "lo" +-# endif +-#endif +-#if !defined SCNuMAX || @PRI_MACROS_BROKEN@ +-# undef SCNuMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define SCNuMAX SCNu64 +-# else +-# define SCNuMAX "lu" +-# endif +-#endif +-#if !defined SCNxMAX || @PRI_MACROS_BROKEN@ +-# undef SCNxMAX +-# if @UINT32_MAX_LT_UINTMAX_MAX@ +-# define SCNxMAX SCNx64 +-# else +-# define SCNxMAX "lx" +-# endif +-#endif +- +-#if !defined SCNdPTR || @PRI_MACROS_BROKEN@ +-# undef SCNdPTR +-# ifdef INTPTR_MAX +-# define SCNdPTR @PRIPTR_PREFIX@ "d" +-# endif +-#endif +-#if !defined SCNiPTR || @PRI_MACROS_BROKEN@ +-# undef SCNiPTR +-# ifdef INTPTR_MAX +-# define SCNiPTR @PRIPTR_PREFIX@ "i" +-# endif +-#endif +-#if !defined SCNoPTR || @PRI_MACROS_BROKEN@ +-# undef SCNoPTR +-# ifdef UINTPTR_MAX +-# define SCNoPTR @PRIPTR_PREFIX@ "o" +-# endif +-#endif +-#if !defined SCNuPTR || @PRI_MACROS_BROKEN@ +-# undef SCNuPTR +-# ifdef UINTPTR_MAX +-# define SCNuPTR @PRIPTR_PREFIX@ "u" +-# endif +-#endif +-#if !defined SCNxPTR || @PRI_MACROS_BROKEN@ +-# undef SCNxPTR +-# ifdef UINTPTR_MAX +-# define SCNxPTR @PRIPTR_PREFIX@ "x" +-# endif +-#endif +- +-/* 7.8.2 Functions for greatest-width integer types */ +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-#if @GNULIB_IMAXABS@ +-# if !@HAVE_DECL_IMAXABS@ +-extern intmax_t imaxabs (intmax_t); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef imaxabs +-# if HAVE_RAW_DECL_IMAXABS +-_GL_WARN_ON_USE (imaxabs, "imaxabs is unportable - " +- "use gnulib module imaxabs for portability"); +-# endif +-#endif +- +-#if @GNULIB_IMAXDIV@ +-# if !@HAVE_DECL_IMAXDIV@ +-# if !GNULIB_defined_imaxdiv_t +-typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t; +-# define GNULIB_defined_imaxdiv_t 1 +-# endif +-extern imaxdiv_t imaxdiv (intmax_t, intmax_t); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef imaxdiv +-# if HAVE_RAW_DECL_IMAXDIV +-_GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - " +- "use gnulib module imaxdiv for portability"); +-# endif +-#endif +- +-#if @GNULIB_STRTOIMAX@ +-# if @REPLACE_STRTOIMAX@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef strtoimax +-# define strtoimax rpl_strtoimax +-# endif +-_GL_FUNCDECL_RPL (strtoimax, intmax_t, +- (const char *, char **, int) _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (strtoimax, intmax_t, (const char *, char **, int)); +-# else +-# if !@HAVE_DECL_STRTOIMAX@ +-# undef strtoimax +-_GL_FUNCDECL_SYS (strtoimax, intmax_t, +- (const char *, char **, int) _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (strtoimax, intmax_t, (const char *, char **, int)); +-# endif +-_GL_CXXALIASWARN (strtoimax); +-#elif defined GNULIB_POSIXCHECK +-# undef strtoimax +-# if HAVE_RAW_DECL_STRTOIMAX +-_GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - " +- "use gnulib module strtoimax for portability"); +-# endif +-#endif +- +-#if @GNULIB_STRTOUMAX@ +-# if !@HAVE_DECL_STRTOUMAX@ +-# undef strtoumax +-_GL_FUNCDECL_SYS (strtoumax, uintmax_t, +- (const char *, char **, int) _GL_ARG_NONNULL ((1))); +-# endif +-_GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int)); +-_GL_CXXALIASWARN (strtoumax); +-#elif defined GNULIB_POSIXCHECK +-# undef strtoumax +-# if HAVE_RAW_DECL_STRTOUMAX +-_GL_WARN_ON_USE (strtoumax, "strtoumax is unportable - " +- "use gnulib module strtoumax for portability"); +-# endif +-#endif +- +-/* Don't bother defining or declaring wcstoimax and wcstoumax, since +- wide-character functions like this are hardly ever useful. */ +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* !defined INTTYPES_H && !defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/localcharset.c groff-1.22.3/src/libs/gnulib/lib/localcharset.c +--- groff-1.22.3.old/src/libs/gnulib/lib/localcharset.c 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/localcharset.c 1970-01-01 02:00:00.000000000 +0200 +@@ -1,579 +0,0 @@ +-/* Determine a canonical name for the current locale's character encoding. +- +- Copyright (C) 2000-2006, 2008-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 . */ +- +-/* Written by Bruno Haible . */ +- +-#include +- +-/* Specification. */ +-#include "localcharset.h" +- +-#include +-#include +-#include +-#include +-#include +- +-#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET +-# define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ +-#endif +- +-#if defined _WIN32 || defined __WIN32__ +-# define WINDOWS_NATIVE +-# include +-#endif +- +-#if defined __EMX__ +-/* Assume EMX program runs on OS/2, even if compiled under DOS. */ +-# ifndef OS2 +-# define OS2 +-# endif +-#endif +- +-#if !defined WINDOWS_NATIVE +-# include +-# if HAVE_LANGINFO_CODESET +-# include +-# else +-# if 0 /* see comment below */ +-# include +-# endif +-# endif +-# ifdef __CYGWIN__ +-# define WIN32_LEAN_AND_MEAN +-# include +-# endif +-#elif defined WINDOWS_NATIVE +-# define WIN32_LEAN_AND_MEAN +-# include +-#endif +-#if defined OS2 +-# define INCL_DOS +-# include +-#endif +- +-/* For MB_CUR_MAX_L */ +-#if defined DARWIN7 +-# include +-#endif +- +-#if ENABLE_RELOCATABLE +-# include "relocatable.h" +-#else +-# define relocate(pathname) (pathname) +-#endif +- +-/* Get LIBDIR. */ +-#ifndef LIBDIR +-# include "configmake.h" +-#endif +- +-/* Define O_NOFOLLOW to 0 on platforms where it does not exist. */ +-#ifndef O_NOFOLLOW +-# define O_NOFOLLOW 0 +-#endif +- +-#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ +- /* Native Windows, Cygwin, OS/2, DOS */ +-# define ISSLASH(C) ((C) == '/' || (C) == '\\') +-#endif +- +-#ifndef DIRECTORY_SEPARATOR +-# define DIRECTORY_SEPARATOR '/' +-#endif +- +-#ifndef ISSLASH +-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) +-#endif +- +-#if HAVE_DECL_GETC_UNLOCKED +-# undef getc +-# define getc getc_unlocked +-#endif +- +-/* The following static variable is declared 'volatile' to avoid a +- possible multithread problem in the function get_charset_aliases. If we +- are running in a threaded environment, and if two threads initialize +- 'charset_aliases' simultaneously, both will produce the same value, +- and everything will be ok if the two assignments to 'charset_aliases' +- are atomic. But I don't know what will happen if the two assignments mix. */ +-#if __STDC__ != 1 +-# define volatile /* empty */ +-#endif +-/* Pointer to the contents of the charset.alias file, if it has already been +- read, else NULL. Its format is: +- ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ +-static const char * volatile charset_aliases; +- +-/* Return a pointer to the contents of the charset.alias file. */ +-static const char * +-get_charset_aliases (void) +-{ +- const char *cp; +- +- cp = charset_aliases; +- if (cp == NULL) +- { +-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__) +- const char *dir; +- const char *base = "charset.alias"; +- char *file_name; +- +- /* Make it possible to override the charset.alias location. This is +- necessary for running the testsuite before "make install". */ +- dir = getenv ("CHARSETALIASDIR"); +- if (dir == NULL || dir[0] == '\0') +- dir = relocate (LIBDIR); +- +- /* Concatenate dir and base into freshly allocated file_name. */ +- { +- size_t dir_len = strlen (dir); +- size_t base_len = strlen (base); +- int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); +- file_name = (char *) malloc (dir_len + add_slash + base_len + 1); +- if (file_name != NULL) +- { +- memcpy (file_name, dir, dir_len); +- if (add_slash) +- file_name[dir_len] = DIRECTORY_SEPARATOR; +- memcpy (file_name + dir_len + add_slash, base, base_len + 1); +- } +- } +- +- if (file_name == NULL) +- /* Out of memory. Treat the file as empty. */ +- cp = ""; +- else +- { +- int fd; +- +- /* Open the file. Reject symbolic links on platforms that support +- O_NOFOLLOW. This is a security feature. Without it, an attacker +- could retrieve parts of the contents (namely, the tail of the +- first line that starts with "* ") of an arbitrary file by placing +- a symbolic link to that file under the name "charset.alias" in +- some writable directory and defining the environment variable +- CHARSETALIASDIR to point to that directory. */ +- fd = open (file_name, +- O_RDONLY | (HAVE_WORKING_O_NOFOLLOW ? O_NOFOLLOW : 0)); +- if (fd < 0) +- /* File not found. Treat it as empty. */ +- cp = ""; +- else +- { +- FILE *fp; +- +- fp = fdopen (fd, "r"); +- if (fp == NULL) +- { +- /* Out of memory. Treat the file as empty. */ +- close (fd); +- cp = ""; +- } +- else +- { +- /* Parse the file's contents. */ +- char *res_ptr = NULL; +- size_t res_size = 0; +- +- for (;;) +- { +- int c; +- char buf1[50+1]; +- char buf2[50+1]; +- size_t l1, l2; +- char *old_res_ptr; +- +- c = getc (fp); +- if (c == EOF) +- break; +- if (c == '\n' || c == ' ' || c == '\t') +- continue; +- if (c == '#') +- { +- /* Skip comment, to end of line. */ +- do +- c = getc (fp); +- while (!(c == EOF || c == '\n')); +- if (c == EOF) +- break; +- continue; +- } +- ungetc (c, fp); +- if (fscanf (fp, "%50s %50s", buf1, buf2) < 2) +- break; +- l1 = strlen (buf1); +- l2 = strlen (buf2); +- old_res_ptr = res_ptr; +- if (res_size == 0) +- { +- res_size = l1 + 1 + l2 + 1; +- res_ptr = (char *) malloc (res_size + 1); +- } +- else +- { +- res_size += l1 + 1 + l2 + 1; +- res_ptr = (char *) realloc (res_ptr, res_size + 1); +- } +- if (res_ptr == NULL) +- { +- /* Out of memory. */ +- res_size = 0; +- free (old_res_ptr); +- break; +- } +- strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); +- strcpy (res_ptr + res_size - (l2 + 1), buf2); +- } +- fclose (fp); +- if (res_size == 0) +- cp = ""; +- else +- { +- *(res_ptr + res_size) = '\0'; +- cp = res_ptr; +- } +- } +- } +- +- free (file_name); +- } +- +-#else +- +-# if defined DARWIN7 +- /* To avoid the trouble of installing a file that is shared by many +- GNU packages -- many packaging systems have problems with this --, +- simply inline the aliases here. */ +- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" +- "ISO8859-2" "\0" "ISO-8859-2" "\0" +- "ISO8859-4" "\0" "ISO-8859-4" "\0" +- "ISO8859-5" "\0" "ISO-8859-5" "\0" +- "ISO8859-7" "\0" "ISO-8859-7" "\0" +- "ISO8859-9" "\0" "ISO-8859-9" "\0" +- "ISO8859-13" "\0" "ISO-8859-13" "\0" +- "ISO8859-15" "\0" "ISO-8859-15" "\0" +- "KOI8-R" "\0" "KOI8-R" "\0" +- "KOI8-U" "\0" "KOI8-U" "\0" +- "CP866" "\0" "CP866" "\0" +- "CP949" "\0" "CP949" "\0" +- "CP1131" "\0" "CP1131" "\0" +- "CP1251" "\0" "CP1251" "\0" +- "eucCN" "\0" "GB2312" "\0" +- "GB2312" "\0" "GB2312" "\0" +- "eucJP" "\0" "EUC-JP" "\0" +- "eucKR" "\0" "EUC-KR" "\0" +- "Big5" "\0" "BIG5" "\0" +- "Big5HKSCS" "\0" "BIG5-HKSCS" "\0" +- "GBK" "\0" "GBK" "\0" +- "GB18030" "\0" "GB18030" "\0" +- "SJIS" "\0" "SHIFT_JIS" "\0" +- "ARMSCII-8" "\0" "ARMSCII-8" "\0" +- "PT154" "\0" "PT154" "\0" +- /*"ISCII-DEV" "\0" "?" "\0"*/ +- "*" "\0" "UTF-8" "\0"; +-# endif +- +-# if defined VMS +- /* To avoid the troubles of an extra file charset.alias_vms in the +- sources of many GNU packages, simply inline the aliases here. */ +- /* The list of encodings is taken from the OpenVMS 7.3-1 documentation +- "Compaq C Run-Time Library Reference Manual for OpenVMS systems" +- section 10.7 "Handling Different Character Sets". */ +- cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" +- "ISO8859-2" "\0" "ISO-8859-2" "\0" +- "ISO8859-5" "\0" "ISO-8859-5" "\0" +- "ISO8859-7" "\0" "ISO-8859-7" "\0" +- "ISO8859-8" "\0" "ISO-8859-8" "\0" +- "ISO8859-9" "\0" "ISO-8859-9" "\0" +- /* Japanese */ +- "eucJP" "\0" "EUC-JP" "\0" +- "SJIS" "\0" "SHIFT_JIS" "\0" +- "DECKANJI" "\0" "DEC-KANJI" "\0" +- "SDECKANJI" "\0" "EUC-JP" "\0" +- /* Chinese */ +- "eucTW" "\0" "EUC-TW" "\0" +- "DECHANYU" "\0" "DEC-HANYU" "\0" +- "DECHANZI" "\0" "GB2312" "\0" +- /* Korean */ +- "DECKOREAN" "\0" "EUC-KR" "\0"; +-# endif +- +-# if defined WINDOWS_NATIVE || defined __CYGWIN__ +- /* To avoid the troubles of installing a separate file in the same +- directory as the DLL and of retrieving the DLL's directory at +- runtime, simply inline the aliases here. */ +- +- cp = "CP936" "\0" "GBK" "\0" +- "CP1361" "\0" "JOHAB" "\0" +- "CP20127" "\0" "ASCII" "\0" +- "CP20866" "\0" "KOI8-R" "\0" +- "CP20936" "\0" "GB2312" "\0" +- "CP21866" "\0" "KOI8-RU" "\0" +- "CP28591" "\0" "ISO-8859-1" "\0" +- "CP28592" "\0" "ISO-8859-2" "\0" +- "CP28593" "\0" "ISO-8859-3" "\0" +- "CP28594" "\0" "ISO-8859-4" "\0" +- "CP28595" "\0" "ISO-8859-5" "\0" +- "CP28596" "\0" "ISO-8859-6" "\0" +- "CP28597" "\0" "ISO-8859-7" "\0" +- "CP28598" "\0" "ISO-8859-8" "\0" +- "CP28599" "\0" "ISO-8859-9" "\0" +- "CP28605" "\0" "ISO-8859-15" "\0" +- "CP38598" "\0" "ISO-8859-8" "\0" +- "CP51932" "\0" "EUC-JP" "\0" +- "CP51936" "\0" "GB2312" "\0" +- "CP51949" "\0" "EUC-KR" "\0" +- "CP51950" "\0" "EUC-TW" "\0" +- "CP54936" "\0" "GB18030" "\0" +- "CP65001" "\0" "UTF-8" "\0"; +-# endif +-#endif +- +- charset_aliases = cp; +- } +- +- return cp; +-} +- +-/* Determine the current locale's character encoding, and canonicalize it +- into one of the canonical names listed in config.charset. +- The result must not be freed; it is statically allocated. +- If the canonical name cannot be determined, the result is a non-canonical +- name. */ +- +-#ifdef STATIC +-STATIC +-#endif +-const char * +-locale_charset (void) +-{ +- const char *codeset; +- const char *aliases; +- +-#if !(defined WINDOWS_NATIVE || defined OS2) +- +-# if HAVE_LANGINFO_CODESET +- +- /* Most systems support nl_langinfo (CODESET) nowadays. */ +- codeset = nl_langinfo (CODESET); +- +-# ifdef __CYGWIN__ +- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always +- returns "US-ASCII". Return the suffix of the locale name from the +- environment variables (if present) or the codepage as a number. */ +- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) +- { +- const char *locale; +- static char buf[2 + 10 + 1]; +- +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return +- it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- } +- +- /* The Windows API has a function returning the locale's codepage as a +- number: GetACP(). This encoding is used by Cygwin, unless the user +- has set the environment variable CYGWIN=codepage:oem (which very few +- people do). +- Output directed to console windows needs to be converted (to +- GetOEMCP() if the console is using a raster font, or to +- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does +- this conversion transparently (see winsup/cygwin/fhandler_console.cc), +- converting to GetConsoleOutputCP(). This leads to correct results, +- except when SetConsoleOutputCP has been called and a raster font is +- in use. */ +- sprintf (buf, "CP%u", GetACP ()); +- codeset = buf; +- } +-# endif +- +-# else +- +- /* On old systems which lack it, use setlocale or getenv. */ +- const char *locale = NULL; +- +- /* But most old systems don't have a complete set of locales. Some +- (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't +- use setlocale here; it would return "C" when it doesn't support the +- locale name the user has set. */ +-# if 0 +- locale = setlocale (LC_CTYPE, NULL); +-# endif +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- } +- +- /* On some old systems, one used to set locale = "iso8859_1". On others, +- you set it to "language_COUNTRY.charset". In any case, we resolve it +- through the charset.alias file. */ +- codeset = locale; +- +-# endif +- +-#elif defined WINDOWS_NATIVE +- +- static char buf[2 + 10 + 1]; +- +- /* The Windows API has a function returning the locale's codepage as +- a number, but the value doesn't change according to what the +- 'setlocale' call specified. So we use it as a last resort, in +- case the string returned by 'setlocale' doesn't specify the +- codepage. */ +- char *current_locale = setlocale (LC_ALL, NULL); +- char *pdot; +- +- /* If they set different locales for different categories, +- 'setlocale' will return a semi-colon separated list of locale +- values. To make sure we use the correct one, we choose LC_CTYPE. */ +- if (strchr (current_locale, ';')) +- current_locale = setlocale (LC_CTYPE, NULL); +- +- pdot = strrchr (current_locale, '.'); +- if (pdot) +- sprintf (buf, "CP%s", pdot + 1); +- else +- { +- /* The Windows API has a function returning the locale's codepage as a +- number: GetACP(). +- When the output goes to a console window, it needs to be provided in +- GetOEMCP() encoding if the console is using a raster font, or in +- GetConsoleOutputCP() encoding if it is using a TrueType font. +- But in GUI programs and for output sent to files and pipes, GetACP() +- encoding is the best bet. */ +- sprintf (buf, "CP%u", GetACP ()); +- } +- codeset = buf; +- +-#elif defined OS2 +- +- const char *locale; +- static char buf[2 + 10 + 1]; +- ULONG cp[3]; +- ULONG cplen; +- +- /* Allow user to override the codeset, as set in the operating system, +- with standard language environment variables. */ +- locale = getenv ("LC_ALL"); +- if (locale == NULL || locale[0] == '\0') +- { +- locale = getenv ("LC_CTYPE"); +- if (locale == NULL || locale[0] == '\0') +- locale = getenv ("LANG"); +- } +- if (locale != NULL && locale[0] != '\0') +- { +- /* If the locale name contains an encoding after the dot, return it. */ +- const char *dot = strchr (locale, '.'); +- +- if (dot != NULL) +- { +- const char *modifier; +- +- dot++; +- /* Look for the possible @... trailer and remove it, if any. */ +- modifier = strchr (dot, '@'); +- if (modifier == NULL) +- return dot; +- if (modifier - dot < sizeof (buf)) +- { +- memcpy (buf, dot, modifier - dot); +- buf [modifier - dot] = '\0'; +- return buf; +- } +- } +- +- /* Resolve through the charset.alias file. */ +- codeset = locale; +- } +- else +- { +- /* OS/2 has a function returning the locale's codepage as a number. */ +- if (DosQueryCp (sizeof (cp), cp, &cplen)) +- codeset = ""; +- else +- { +- sprintf (buf, "CP%u", cp[0]); +- codeset = buf; +- } +- } +- +-#endif +- +- if (codeset == NULL) +- /* The canonical name cannot be determined. */ +- codeset = ""; +- +- /* Resolve alias. */ +- for (aliases = get_charset_aliases (); +- *aliases != '\0'; +- aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1) +- if (strcmp (codeset, aliases) == 0 +- || (aliases[0] == '*' && aliases[1] == '\0')) +- { +- codeset = aliases + strlen (aliases) + 1; +- break; +- } +- +- /* Don't return an empty string. GNU libc and GNU libiconv interpret +- the empty string as denoting "the locale's character encoding", +- thus GNU libiconv would call this function a second time. */ +- if (codeset[0] == '\0') +- codeset = "ASCII"; +- +-#ifdef DARWIN7 +- /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8" +- (the default codeset) does not work when MB_CUR_MAX is 1. */ +- if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1) +- codeset = "ASCII"; +-#endif +- +- return codeset; +-} +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/localcharset.h groff-1.22.3/src/libs/gnulib/lib/localcharset.h +--- groff-1.22.3.old/src/libs/gnulib/lib/localcharset.h 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/localcharset.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,40 +0,0 @@ +-/* Determine a canonical name for the current locale's character encoding. +- Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc. +- This file is part of the GNU CHARSET Library. +- +- 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 . */ +- +-#ifndef _LOCALCHARSET_H +-#define _LOCALCHARSET_H +- +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +- +-/* Determine the current locale's character encoding, and canonicalize it +- into one of the canonical names listed in config.charset. +- The result must not be freed; it is statically allocated. +- If the canonical name cannot be determined, the result is a non-canonical +- name. */ +-extern const char * locale_charset (void); +- +- +-#ifdef __cplusplus +-} +-#endif +- +- +-#endif /* _LOCALCHARSET_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/Makefile.am groff-1.22.3/src/libs/gnulib/lib/Makefile.am +--- groff-1.22.3.old/src/libs/gnulib/lib/Makefile.am 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am 1970-01-01 02:00:00.000000000 +0200 +@@ -1,544 +0,0 @@ +-## DO NOT EDIT! GENERATED AUTOMATICALLY! +-## Process this file with automake to produce Makefile.in. +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# +-# 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 +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. +-# +-# This 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 file. If not, see . +-# +-# As a special exception to the GNU General Public License, +-# this file may be distributed as part of a program that +-# contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# Generated by gnulib-tool. +-# Reproduce by: gnulib-tool --import --dir=src/libs/gnulib --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl wcwidth +- +-AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects +- +-SUBDIRS = +-noinst_HEADERS = +-noinst_LIBRARIES = +-noinst_LTLIBRARIES = +-EXTRA_DIST = +-BUILT_SOURCES = +-SUFFIXES = +-MOSTLYCLEANFILES = core *.stackdump +-MOSTLYCLEANDIRS = +-CLEANFILES = +-DISTCLEANFILES = +-MAINTAINERCLEANFILES = +- +-AM_CPPFLAGS = +-AM_CFLAGS = +- +-noinst_LIBRARIES += libgnu.a +- +-libgnu_a_SOURCES = +-libgnu_a_LIBADD = $(gl_LIBOBJS) +-libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +-EXTRA_libgnu_a_SOURCES = +- +-## begin gnulib module configmake +- +-# Listed in the same order as the GNU makefile conventions, and +-# provided by autoconf 2.59c+. +-# The Automake-defined pkg* macros are appended, in the order +-# listed in the Automake 1.10a+ documentation. +-configmake.h: Makefile +- $(AM_V_GEN)rm -f $@-t && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- echo '#define PREFIX "$(prefix)"'; \ +- echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ +- echo '#define BINDIR "$(bindir)"'; \ +- echo '#define SBINDIR "$(sbindir)"'; \ +- echo '#define LIBEXECDIR "$(libexecdir)"'; \ +- echo '#define DATAROOTDIR "$(datarootdir)"'; \ +- echo '#define DATADIR "$(datadir)"'; \ +- echo '#define SYSCONFDIR "$(sysconfdir)"'; \ +- echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ +- echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ +- echo '#define INCLUDEDIR "$(includedir)"'; \ +- echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ +- echo '#define DOCDIR "$(docdir)"'; \ +- echo '#define INFODIR "$(infodir)"'; \ +- echo '#define HTMLDIR "$(htmldir)"'; \ +- echo '#define DVIDIR "$(dvidir)"'; \ +- echo '#define PDFDIR "$(pdfdir)"'; \ +- echo '#define PSDIR "$(psdir)"'; \ +- echo '#define LIBDIR "$(libdir)"'; \ +- echo '#define LISPDIR "$(lispdir)"'; \ +- echo '#define LOCALEDIR "$(localedir)"'; \ +- echo '#define MANDIR "$(mandir)"'; \ +- echo '#define MANEXT "$(manext)"'; \ +- echo '#define PKGDATADIR "$(pkgdatadir)"'; \ +- echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ +- echo '#define PKGLIBDIR "$(pkglibdir)"'; \ +- echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ +- } | sed '/""/d' > $@-t && \ +- mv -f $@-t $@ +- +-BUILT_SOURCES += configmake.h +-CLEANFILES += configmake.h configmake.h-t +- +-## end gnulib module configmake +- +-## begin gnulib module localcharset +- +-libgnu_a_SOURCES += localcharset.h localcharset.c +- +-# We need the following in order to install a simple file in $(libdir) +-# which is shared with other installed packages. We use a list of referencing +-# packages so that "make uninstall" will remove the file if and only if it +-# is not used by another installed package. +-# On systems with glibc-2.1 or newer, the file is redundant, therefore we +-# avoid installing it. +- +-all-local: charset.alias ref-add.sed ref-del.sed +- +-charset_alias = $(DESTDIR)$(libdir)/charset.alias +-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp +-install-exec-local: install-exec-localcharset +-install-exec-localcharset: all-local +- if test $(GLIBC21) = no; then \ +- case '$(host_os)' in \ +- darwin[56]*) \ +- need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ +- need_charset_alias=false ;; \ +- *) \ +- need_charset_alias=true ;; \ +- esac ; \ +- else \ +- need_charset_alias=false ; \ +- fi ; \ +- if $$need_charset_alias; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ +- fi ; \ +- if test -f $(charset_alias); then \ +- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +- rm -f $(charset_tmp) ; \ +- else \ +- if $$need_charset_alias; then \ +- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +- rm -f $(charset_tmp) ; \ +- fi ; \ +- fi +- +-uninstall-local: uninstall-localcharset +-uninstall-localcharset: all-local +- if test -f $(charset_alias); then \ +- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ +- if grep '^# Packages using this file: $$' $(charset_tmp) \ +- > /dev/null; then \ +- rm -f $(charset_alias); \ +- else \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ +- fi; \ +- rm -f $(charset_tmp); \ +- fi +- +-charset.alias: config.charset +- $(AM_V_GEN)rm -f t-$@ $@ && \ +- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \ +- mv t-$@ $@ +- +-SUFFIXES += .sed .sin +-.sin.sed: +- $(AM_V_GEN)rm -f t-$@ $@ && \ +- sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \ +- mv t-$@ $@ +- +-CLEANFILES += charset.alias ref-add.sed ref-del.sed +- +-EXTRA_DIST += config.charset ref-add.sin ref-del.sin +- +-## end gnulib module localcharset +- +-## begin gnulib module snippet/arg-nonnull +- +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +- +-BUILT_SOURCES += arg-nonnull.h +-# The arg-nonnull.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +-# off. +-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/GL_ARG_NONNULL/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +- > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t +- +-ARG_NONNULL_H=arg-nonnull.h +- +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h +- +-## end gnulib module snippet/arg-nonnull +- +-## begin gnulib module snippet/c++defs +- +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +- +-BUILT_SOURCES += c++defs.h +-# The c++defs.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/_GL_CXXDEFS/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/c++defs.h \ +- > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += c++defs.h c++defs.h-t +- +-CXXDEFS_H=c++defs.h +- +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h +- +-## end gnulib module snippet/c++defs +- +-## begin gnulib module snippet/warn-on-use +- +-BUILT_SOURCES += warn-on-use.h +-# The warn-on-use.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +-# off. +-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/^.ifndef/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +- > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t +- +-WARN_ON_USE_H=warn-on-use.h +- +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h +- +-## end gnulib module snippet/warn-on-use +- +-## begin gnulib module stddef +- +-BUILT_SOURCES += $(STDDEF_H) +- +-# We need the following in order to create when the system +-# doesn't have one that works with the given compiler. +-if GL_GENERATE_STDDEF_H +-stddef.h: stddef.in.h $(top_builddir)/config.status +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +- -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +- -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +- -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +- < $(srcdir)/stddef.in.h; \ +- } > $@-t && \ +- mv $@-t $@ +-else +-stddef.h: $(top_builddir)/config.status +- rm -f $@ +-endif +-MOSTLYCLEANFILES += stddef.h stddef.h-t +- +-EXTRA_DIST += stddef.in.h +- +-## end gnulib module stddef +- +-## begin gnulib module stdint +- +-BUILT_SOURCES += $(STDINT_H) +- +-# We need the following in order to create when the system +-# doesn't have one that works with the given compiler. +-if GL_GENERATE_STDINT_H +-stdint.h: stdint.in.h $(top_builddir)/config.status +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +- -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +- -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +- -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +- -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +- -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +- -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +- -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +- -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +- -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +- -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +- -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +- -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +- -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +- -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +- -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +- -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +- -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +- -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +- -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +- -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +- -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +- -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +- -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +- < $(srcdir)/stdint.in.h; \ +- } > $@-t && \ +- mv $@-t $@ +-else +-stdint.h: $(top_builddir)/config.status +- rm -f $@ +-endif +-MOSTLYCLEANFILES += stdint.h stdint.h-t +- +-EXTRA_DIST += stdint.in.h +- +-## end gnulib module stdint +- +-## begin gnulib module streq +- +- +-EXTRA_DIST += streq.h +- +-## end gnulib module streq +- +-## begin gnulib module unitypes +- +-BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) +- +-unitypes.h: unitypes.in.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- cat $(srcdir)/unitypes.in.h; \ +- } > $@-t && \ +- mv -f $@-t $@ +-MOSTLYCLEANFILES += unitypes.h unitypes.h-t +- +-EXTRA_DIST += unitypes.in.h +- +-## end gnulib module unitypes +- +-## begin gnulib module uniwidth/base +- +-BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H) +- +-uniwidth.h: uniwidth.in.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- cat $(srcdir)/uniwidth.in.h; \ +- } > $@-t && \ +- mv -f $@-t $@ +-MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t +- +-EXTRA_DIST += localcharset.h uniwidth.in.h +- +-## end gnulib module uniwidth/base +- +-## begin gnulib module uniwidth/width +- +-if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH +-libgnu_a_SOURCES += uniwidth/width.c +-endif +- +-EXTRA_DIST += uniwidth/cjk.h +- +-## end gnulib module uniwidth/width +- +-## begin gnulib module wchar +- +-BUILT_SOURCES += wchar.h +- +-# We need the following in order to create when the system +-# version does not work standalone. +-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +- -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ +- -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ +- -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ +- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ +- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ +- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ +- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ +- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ +- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ +- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ +- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ +- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ +- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ +- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ +- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ +- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ +- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ +- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ +- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ +- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ +- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ +- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ +- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ +- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ +- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ +- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ +- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ +- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ +- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ +- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ +- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ +- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ +- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ +- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ +- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ +- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ +- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ +- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ +- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ +- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ +- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ +- < $(srcdir)/wchar.in.h | \ +- sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ +- -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +- -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ +- -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ +- -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \ +- -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \ +- -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \ +- -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ +- -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ +- -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ +- -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ +- -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ +- -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ +- -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ +- -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ +- -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ +- -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ +- -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ +- -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ +- -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ +- -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ +- -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ +- -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ +- -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ +- -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ +- -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ +- -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ +- -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ +- -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ +- -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ +- -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ +- -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ +- -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ +- -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ +- -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ +- -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ +- -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ +- -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ +- -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ +- -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ +- | \ +- sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ +- -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ +- -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ +- -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ +- -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ +- -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ +- -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \ +- -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ +- -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ +- -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ +- -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ +- -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ +- -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ +- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +- -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +- } > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += wchar.h wchar.h-t +- +-EXTRA_DIST += wchar.in.h +- +-## end gnulib module wchar +- +-## begin gnulib module wctype-h +- +-BUILT_SOURCES += wctype.h +-libgnu_a_SOURCES += wctype-h.c +- +-# We need the following in order to create when the system +-# doesn't have one that works with the given compiler. +-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +- -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ +- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +- -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ +- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ +- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ +- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ +- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ +- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ +- -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ +- -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ +- -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ +- -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ +- -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ +- -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ +- -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ +- -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ +- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +- < $(srcdir)/wctype.in.h; \ +- } > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += wctype.h wctype.h-t +- +-EXTRA_DIST += wctype.in.h +- +-## end gnulib module wctype-h +- +-## begin gnulib module wcwidth +- +- +-EXTRA_DIST += wcwidth.c +- +-EXTRA_libgnu_a_SOURCES += wcwidth.c +- +-## end gnulib module wcwidth +- +- +-mostlyclean-local: mostlyclean-generic +- @for dir in '' $(MOSTLYCLEANDIRS); do \ +- if test -n "$$dir" && test -d $$dir; then \ +- echo "rmdir $$dir"; rmdir $$dir; \ +- fi; \ +- done; \ +- : +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/Makefile.in groff-1.22.3/src/libs/gnulib/lib/Makefile.in +--- groff-1.22.3.old/src/libs/gnulib/lib/Makefile.in 2014-11-04 10:38:35.629518946 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/Makefile.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1285 +0,0 @@ +-# Makefile.in generated by automake 1.14 from Makefile.am. +-# @configure_input@ +- +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. +- +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +- +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# +-# 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 +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. +-# +-# This 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 file. If not, see . +-# +-# As a special exception to the GNU General Public License, +-# this file may be distributed as part of a program that +-# contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# Generated by gnulib-tool. +-# Reproduce by: gnulib-tool --import --dir=src/libs/gnulib --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl wcwidth +- +- +- +-VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +-am__make_running_with_option = \ +- case $${target_option-} in \ +- ?) ;; \ +- *) echo "am__make_running_with_option: internal error: invalid" \ +- "target option '$${target_option-}' specified" >&2; \ +- exit 1;; \ +- esac; \ +- has_opt=no; \ +- sane_makeflags=$$MAKEFLAGS; \ +- if $(am__is_gnu_make); then \ +- sane_makeflags=$$MFLAGS; \ +- else \ +- case $$MAKEFLAGS in \ +- *\\[\ \ ]*) \ +- bs=\\; \ +- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ +- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ +- esac; \ +- fi; \ +- skip_next=no; \ +- strip_trailopt () \ +- { \ +- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ +- }; \ +- for flg in $$sane_makeflags; do \ +- test $$skip_next = yes && { skip_next=no; continue; }; \ +- case $$flg in \ +- *=*|--*) continue;; \ +- -*I) strip_trailopt 'I'; skip_next=yes;; \ +- -*I?*) strip_trailopt 'I';; \ +- -*O) strip_trailopt 'O'; skip_next=yes;; \ +- -*O?*) strip_trailopt 'O';; \ +- -*l) strip_trailopt 'l'; skip_next=yes;; \ +- -*l?*) strip_trailopt 'l';; \ +- -[dEDm]) skip_next=yes;; \ +- -[JT]) skip_next=yes;; \ +- esac; \ +- case $$flg in \ +- *$$target_option*) has_opt=yes; break;; \ +- esac; \ +- done; \ +- test $$has_opt = yes +-am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +-am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = @build@ +-host_triplet = @host@ +-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_1 = uniwidth/width.c +-subdir = lib +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ +- $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ +- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ +- $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ +- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ +- $(top_srcdir)/m4/include_next.m4 \ +- $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ +- $(top_srcdir)/m4/libunistring-base.m4 \ +- $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ +- $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \ +- $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ +- $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/warn-on-use.m4 \ +- $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ +- $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ +- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = +-LIBRARIES = $(noinst_LIBRARIES) +-AM_V_AR = $(am__v_AR_@AM_V@) +-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +-am__v_AR_0 = @echo " AR " $@; +-am__v_AR_1 = +-libgnu_a_AR = $(AR) $(ARFLAGS) +-am__DEPENDENCIES_1 = +-am__libgnu_a_SOURCES_DIST = localcharset.h localcharset.c \ +- uniwidth/width.c wctype-h.c +-am__dirstamp = $(am__leading_dot)dirstamp +-@LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT) +-am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) $(am__objects_1) \ +- wctype-h.$(OBJEXT) +-libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) +-LTLIBRARIES = $(noinst_LTLIBRARIES) +-AM_V_P = $(am__v_P_@AM_V@) +-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +-am__v_P_0 = false +-am__v_P_1 = : +-AM_V_GEN = $(am__v_GEN_@AM_V@) +-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +-am__v_GEN_0 = @echo " GEN " $@; +-am__v_GEN_1 = +-AM_V_at = $(am__v_at_@AM_V@) +-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +-am__v_at_0 = @ +-am__v_at_1 = +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +-am__depfiles_maybe = depfiles +-am__mv = mv -f +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-AM_V_CC = $(am__v_CC_@AM_V@) +-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +-am__v_CC_0 = @echo " CC " $@; +-am__v_CC_1 = +-CCLD = $(CC) +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-AM_V_CCLD = $(am__v_CCLD_@AM_V@) +-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +-am__v_CCLD_0 = @echo " CCLD " $@; +-am__v_CCLD_1 = +-SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) +-DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES) +-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ +- ctags-recursive dvi-recursive html-recursive info-recursive \ +- install-data-recursive install-dvi-recursive \ +- install-exec-recursive install-html-recursive \ +- install-info-recursive install-pdf-recursive \ +- install-ps-recursive install-recursive installcheck-recursive \ +- installdirs-recursive pdf-recursive ps-recursive \ +- tags-recursive uninstall-recursive +-am__can_run_installinfo = \ +- case $$AM_UPDATE_INFO_DIR in \ +- n|no|NO) false;; \ +- *) (install-info --version) >/dev/null 2>&1;; \ +- esac +-HEADERS = $(noinst_HEADERS) +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-am__recursive_targets = \ +- $(RECURSIVE_TARGETS) \ +- $(RECURSIVE_CLEAN_TARGETS) \ +- $(am__extra_recursive_targets) +-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ +- distdir +-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +-# Read a list of newline-separated strings from the standard input, +-# and print each of them once, without duplicates. Input order is +-# *not* preserved. +-am__uniquify_input = $(AWK) '\ +- BEGIN { nonempty = 0; } \ +- { items[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in items) print i; }; } \ +-' +-# Make sure the list of sources is unique. This is necessary because, +-# e.g., the same source file might be shared among _SOURCES variables +-# for different programs/libraries. +-am__define_uniq_tagged_files = \ +- list='$(am__tagged_files)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | $(am__uniquify_input)` +-ETAGS = etags +-CTAGS = ctags +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-pkglibexecdir = @pkglibexecdir@ +-ACLOCAL = @ACLOCAL@ +-AMTAR = @AMTAR@ +-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +-APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ +-AR = @AR@ +-ARFLAGS = @ARFLAGS@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ +-BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ +-BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ +-BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ +-BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-EXEEXT = @EXEEXT@ +-GLIBC21 = @GLIBC21@ +-GNULIB_BTOWC = @GNULIB_BTOWC@ +-GNULIB_IMAXABS = @GNULIB_IMAXABS@ +-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +-GNULIB_MBRLEN = @GNULIB_MBRLEN@ +-GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ +-GNULIB_MBSINIT = @GNULIB_MBSINIT@ +-GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ +-GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ +-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ +-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +-GNULIB_WCPCPY = @GNULIB_WCPCPY@ +-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ +-GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +-GNULIB_WCSCAT = @GNULIB_WCSCAT@ +-GNULIB_WCSCHR = @GNULIB_WCSCHR@ +-GNULIB_WCSCMP = @GNULIB_WCSCMP@ +-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +-GNULIB_WCSCPY = @GNULIB_WCSCPY@ +-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +-GNULIB_WCSDUP = @GNULIB_WCSDUP@ +-GNULIB_WCSLEN = @GNULIB_WCSLEN@ +-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ +-GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ +-GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +-GNULIB_WCSSPN = @GNULIB_WCSSPN@ +-GNULIB_WCSSTR = @GNULIB_WCSSTR@ +-GNULIB_WCSTOK = @GNULIB_WCSTOK@ +-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ +-GNULIB_WCTOB = @GNULIB_WCTOB@ +-GNULIB_WCTRANS = @GNULIB_WCTRANS@ +-GNULIB_WCTYPE = @GNULIB_WCTYPE@ +-GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +-GNULIB_WMEMSET = @GNULIB_WMEMSET@ +-GREP = @GREP@ +-HAVE_BTOWC = @HAVE_BTOWC@ +-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ +-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ +-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +-HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ +-HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +-HAVE_FEATURES_H = @HAVE_FEATURES_H@ +-HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ +-HAVE_ISWBLANK = @HAVE_ISWBLANK@ +-HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +-HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ +-HAVE_MBRLEN = @HAVE_MBRLEN@ +-HAVE_MBRTOWC = @HAVE_MBRTOWC@ +-HAVE_MBSINIT = @HAVE_MBSINIT@ +-HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +-HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ +-HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ +-HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ +-HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ +-HAVE_STDINT_H = @HAVE_STDINT_H@ +-HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +-HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +-HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ +-HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ +-HAVE_WCHAR_H = @HAVE_WCHAR_H@ +-HAVE_WCHAR_T = @HAVE_WCHAR_T@ +-HAVE_WCPCPY = @HAVE_WCPCPY@ +-HAVE_WCPNCPY = @HAVE_WCPNCPY@ +-HAVE_WCRTOMB = @HAVE_WCRTOMB@ +-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +-HAVE_WCSCAT = @HAVE_WCSCAT@ +-HAVE_WCSCHR = @HAVE_WCSCHR@ +-HAVE_WCSCMP = @HAVE_WCSCMP@ +-HAVE_WCSCOLL = @HAVE_WCSCOLL@ +-HAVE_WCSCPY = @HAVE_WCSCPY@ +-HAVE_WCSCSPN = @HAVE_WCSCSPN@ +-HAVE_WCSDUP = @HAVE_WCSDUP@ +-HAVE_WCSLEN = @HAVE_WCSLEN@ +-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +-HAVE_WCSNCAT = @HAVE_WCSNCAT@ +-HAVE_WCSNCMP = @HAVE_WCSNCMP@ +-HAVE_WCSNCPY = @HAVE_WCSNCPY@ +-HAVE_WCSNLEN = @HAVE_WCSNLEN@ +-HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +-HAVE_WCSPBRK = @HAVE_WCSPBRK@ +-HAVE_WCSRCHR = @HAVE_WCSRCHR@ +-HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +-HAVE_WCSSPN = @HAVE_WCSSPN@ +-HAVE_WCSSTR = @HAVE_WCSSTR@ +-HAVE_WCSTOK = @HAVE_WCSTOK@ +-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +-HAVE_WCSXFRM = @HAVE_WCSXFRM@ +-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ +-HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ +-HAVE_WINT_T = @HAVE_WINT_T@ +-HAVE_WMEMCHR = @HAVE_WMEMCHR@ +-HAVE_WMEMCMP = @HAVE_WMEMCMP@ +-HAVE_WMEMCPY = @HAVE_WMEMCPY@ +-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +-HAVE_WMEMSET = @HAVE_WMEMSET@ +-HAVE__BOOL = @HAVE__BOOL@ +-INCLUDE_NEXT = @INCLUDE_NEXT@ +-INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ +-INSTALL = @INSTALL@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ +-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ +-LDFLAGS = @LDFLAGS@ +-LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ +-LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ +-LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ +-LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ +-LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ +-LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ +-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ +-NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +-NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ +-NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ +-NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ +-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ +-NEXT_STDDEF_H = @NEXT_STDDEF_H@ +-NEXT_STDINT_H = @NEXT_STDINT_H@ +-NEXT_WCHAR_H = @NEXT_WCHAR_H@ +-NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ +-OBJEXT = @OBJEXT@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ +-PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ +-PRIPTR_PREFIX = @PRIPTR_PREFIX@ +-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ +-PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ +-RANLIB = @RANLIB@ +-REPLACE_BTOWC = @REPLACE_BTOWC@ +-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ +-REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +-REPLACE_MBRLEN = @REPLACE_MBRLEN@ +-REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +-REPLACE_MBSINIT = @REPLACE_MBSINIT@ +-REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +-REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +-REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +-REPLACE_NULL = @REPLACE_NULL@ +-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ +-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +-REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +-REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ +-REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +-REPLACE_WCTOB = @REPLACE_WCTOB@ +-REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ +-SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +-STDBOOL_H = @STDBOOL_H@ +-STDDEF_H = @STDDEF_H@ +-STDINT_H = @STDINT_H@ +-STRIP = @STRIP@ +-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ +-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +-VERSION = @VERSION@ +-WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ +-WINT_T_SUFFIX = @WINT_T_SUFFIX@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ +-ac_ct_CC = @ac_ct_CC@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-builddir = @builddir@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-gl_LIBOBJS = @gl_LIBOBJS@ +-gl_LTLIBOBJS = @gl_LTLIBOBJS@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-lispdir = @lispdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-runstatedir = @runstatedir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +-top_build_prefix = @top_build_prefix@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ +-AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects +-SUBDIRS = +-noinst_HEADERS = +-noinst_LIBRARIES = libgnu.a +-noinst_LTLIBRARIES = +-EXTRA_DIST = config.charset ref-add.sin ref-del.sin \ +- $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +- $(top_srcdir)/build-aux/snippet/c++defs.h \ +- $(top_srcdir)/build-aux/snippet/warn-on-use.h stddef.in.h \ +- stdint.in.h streq.h unitypes.in.h localcharset.h uniwidth.in.h \ +- uniwidth/cjk.h wchar.in.h wctype.in.h wcwidth.c +- +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +- +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +-BUILT_SOURCES = configmake.h arg-nonnull.h c++defs.h warn-on-use.h \ +- $(STDDEF_H) $(STDINT_H) $(LIBUNISTRING_UNITYPES_H) \ +- $(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h +-SUFFIXES = .sed .sin +-MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ +- c++defs.h c++defs.h-t warn-on-use.h warn-on-use.h-t stddef.h \ +- stddef.h-t stdint.h stdint.h-t unitypes.h unitypes.h-t \ +- uniwidth.h uniwidth.h-t wchar.h wchar.h-t wctype.h wctype.h-t +-MOSTLYCLEANDIRS = +-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ +- ref-del.sed +-DISTCLEANFILES = +-MAINTAINERCLEANFILES = +-AM_CPPFLAGS = +-AM_CFLAGS = +-libgnu_a_SOURCES = localcharset.h localcharset.c $(am__append_1) \ +- wctype-h.c +-libgnu_a_LIBADD = $(gl_LIBOBJS) +-libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +-EXTRA_libgnu_a_SOURCES = wcwidth.c +-charset_alias = $(DESTDIR)$(libdir)/charset.alias +-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp +-ARG_NONNULL_H = arg-nonnull.h +-CXXDEFS_H = c++defs.h +-WARN_ON_USE_H = warn-on-use.h +-all: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) all-recursive +- +-.SUFFIXES: +-.SUFFIXES: .sed .sin .c .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits lib/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnits lib/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): +- +-clean-noinstLIBRARIES: +- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +-uniwidth/$(am__dirstamp): +- @$(MKDIR_P) uniwidth +- @: > uniwidth/$(am__dirstamp) +-uniwidth/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) uniwidth/$(DEPDIR) +- @: > uniwidth/$(DEPDIR)/$(am__dirstamp) +-uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp) \ +- uniwidth/$(DEPDIR)/$(am__dirstamp) +- +-libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) +- $(AM_V_at)-rm -f libgnu.a +- $(AM_V_AR)$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) +- $(AM_V_at)$(RANLIB) libgnu.a +- +-clean-noinstLTLIBRARIES: +- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +- @list='$(noinst_LTLIBRARIES)'; \ +- locs=`for p in $$list; do echo $$p; done | \ +- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ +- sort -u`; \ +- test -z "$$locs" || { \ +- echo rm -f $${locs}; \ +- rm -f $${locs}; \ +- } +- +-mostlyclean-compile: +- -rm -f *.$(OBJEXT) +- -rm -f uniwidth/*.$(OBJEXT) +- +-distclean-compile: +- -rm -f *.tab.c +- +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@uniwidth/$(DEPDIR)/width.Po@am__quote@ +- +-.c.o: +-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +- +-.c.obj: +-@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +-@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +- +-# This directory's subdirectories are mostly independent; you can cd +-# into them and run 'make' without going through this Makefile. +-# To change the values of 'make' variables: instead of editing Makefiles, +-# (1) if the variable is set in 'config.status', edit 'config.status' +-# (which will cause the Makefiles to be regenerated when you run 'make'); +-# (2) otherwise, pass the desired values on the 'make' command line. +-$(am__recursive_targets): +- @fail=; \ +- if $(am__make_keepgoing); then \ +- failcom='fail=yes'; \ +- else \ +- failcom='exit 1'; \ +- fi; \ +- dot_seen=no; \ +- target=`echo $@ | sed s/-recursive//`; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- for subdir in $$list; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- dot_seen=yes; \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done; \ +- if test "$$dot_seen" = "no"; then \ +- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +- fi; test -z "$$fail" +- +-ID: $(am__tagged_files) +- $(am__define_uniq_tagged_files); mkid -fID $$unique +-tags: tags-recursive +-TAGS: tags +- +-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +- set x; \ +- here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +- include_option=--etags-include; \ +- empty_fix=.; \ +- else \ +- include_option=--include; \ +- empty_fix=; \ +- fi; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ +- fi; \ +- done; \ +- $(am__define_uniq_tagged_files); \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ +- fi +-ctags: ctags-recursive +- +-CTAGS: ctags +-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +- $(am__define_uniq_tagged_files); \ +- test -z "$(CTAGS_ARGS)$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" +-cscopelist: cscopelist-recursive +- +-cscopelist-am: $(am__tagged_files) +- list='$(am__tagged_files)'; \ +- case "$(srcdir)" in \ +- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ +- *) sdir=$(subdir)/$(srcdir) ;; \ +- esac; \ +- for i in $$list; do \ +- if test -f "$$i"; then \ +- echo "$(subdir)/$$i"; \ +- else \ +- echo "$$sdir/$$i"; \ +- fi; \ +- done >> $(top_builddir)/cscope.files +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- $(am__make_dryrun) \ +- || test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local +-installdirs: installdirs-recursive +-installdirs-am: +-install: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) install-recursive +-install-exec: install-exec-recursive +-install-data: install-data-recursive +-uninstall: uninstall-recursive +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-recursive +-install-strip: +- if test -z '$(STRIP)'; then \ +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- install; \ +- else \ +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ +- fi +-mostlyclean-generic: +- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) +- +-clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) +- -rm -f uniwidth/$(DEPDIR)/$(am__dirstamp) +- -rm -f uniwidth/$(am__dirstamp) +- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +-clean: clean-recursive +- +-clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ +- mostlyclean-am +- +-distclean: distclean-recursive +- -rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR) +- -rm -f Makefile +-distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-tags +- +-dvi: dvi-recursive +- +-dvi-am: +- +-html: html-recursive +- +-html-am: +- +-info: info-recursive +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-recursive +- +-install-dvi-am: +- +-install-exec-am: install-exec-local +- +-install-html: install-html-recursive +- +-install-html-am: +- +-install-info: install-info-recursive +- +-install-info-am: +- +-install-man: +- +-install-pdf: install-pdf-recursive +- +-install-pdf-am: +- +-install-ps: install-ps-recursive +- +-install-ps-am: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-recursive +- -rm -rf ./$(DEPDIR) uniwidth/$(DEPDIR) +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-recursive +- +-mostlyclean-am: mostlyclean-compile mostlyclean-generic \ +- mostlyclean-local +- +-pdf: pdf-recursive +- +-pdf-am: +- +-ps: ps-recursive +- +-ps-am: +- +-uninstall-am: uninstall-local +- +-.MAKE: $(am__recursive_targets) all check install install-am \ +- install-strip +- +-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ +- check check-am clean clean-generic clean-noinstLIBRARIES \ +- clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ +- distclean-compile distclean-generic distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-exec-local install-html \ +- install-html-am install-info install-info-am install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ +- uninstall-am uninstall-local +- +- +-# Listed in the same order as the GNU makefile conventions, and +-# provided by autoconf 2.59c+. +-# The Automake-defined pkg* macros are appended, in the order +-# listed in the Automake 1.10a+ documentation. +-configmake.h: Makefile +- $(AM_V_GEN)rm -f $@-t && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- echo '#define PREFIX "$(prefix)"'; \ +- echo '#define EXEC_PREFIX "$(exec_prefix)"'; \ +- echo '#define BINDIR "$(bindir)"'; \ +- echo '#define SBINDIR "$(sbindir)"'; \ +- echo '#define LIBEXECDIR "$(libexecdir)"'; \ +- echo '#define DATAROOTDIR "$(datarootdir)"'; \ +- echo '#define DATADIR "$(datadir)"'; \ +- echo '#define SYSCONFDIR "$(sysconfdir)"'; \ +- echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ +- echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ +- echo '#define INCLUDEDIR "$(includedir)"'; \ +- echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ +- echo '#define DOCDIR "$(docdir)"'; \ +- echo '#define INFODIR "$(infodir)"'; \ +- echo '#define HTMLDIR "$(htmldir)"'; \ +- echo '#define DVIDIR "$(dvidir)"'; \ +- echo '#define PDFDIR "$(pdfdir)"'; \ +- echo '#define PSDIR "$(psdir)"'; \ +- echo '#define LIBDIR "$(libdir)"'; \ +- echo '#define LISPDIR "$(lispdir)"'; \ +- echo '#define LOCALEDIR "$(localedir)"'; \ +- echo '#define MANDIR "$(mandir)"'; \ +- echo '#define MANEXT "$(manext)"'; \ +- echo '#define PKGDATADIR "$(pkgdatadir)"'; \ +- echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \ +- echo '#define PKGLIBDIR "$(pkglibdir)"'; \ +- echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \ +- } | sed '/""/d' > $@-t && \ +- mv -f $@-t $@ +- +-# We need the following in order to install a simple file in $(libdir) +-# which is shared with other installed packages. We use a list of referencing +-# packages so that "make uninstall" will remove the file if and only if it +-# is not used by another installed package. +-# On systems with glibc-2.1 or newer, the file is redundant, therefore we +-# avoid installing it. +- +-all-local: charset.alias ref-add.sed ref-del.sed +-install-exec-local: install-exec-localcharset +-install-exec-localcharset: all-local +- if test $(GLIBC21) = no; then \ +- case '$(host_os)' in \ +- darwin[56]*) \ +- need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ +- need_charset_alias=false ;; \ +- *) \ +- need_charset_alias=true ;; \ +- esac ; \ +- else \ +- need_charset_alias=false ; \ +- fi ; \ +- if $$need_charset_alias; then \ +- $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ +- fi ; \ +- if test -f $(charset_alias); then \ +- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +- rm -f $(charset_tmp) ; \ +- else \ +- if $$need_charset_alias; then \ +- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ +- rm -f $(charset_tmp) ; \ +- fi ; \ +- fi +- +-uninstall-local: uninstall-localcharset +-uninstall-localcharset: all-local +- if test -f $(charset_alias); then \ +- sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \ +- if grep '^# Packages using this file: $$' $(charset_tmp) \ +- > /dev/null; then \ +- rm -f $(charset_alias); \ +- else \ +- $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \ +- fi; \ +- rm -f $(charset_tmp); \ +- fi +- +-charset.alias: config.charset +- $(AM_V_GEN)rm -f t-$@ $@ && \ +- $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \ +- mv t-$@ $@ +-.sin.sed: +- $(AM_V_GEN)rm -f t-$@ $@ && \ +- sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \ +- mv t-$@ $@ +-# The arg-nonnull.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +-# off. +-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/GL_ARG_NONNULL/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +- > $@-t && \ +- mv $@-t $@ +-# The c++defs.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/_GL_CXXDEFS/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/c++defs.h \ +- > $@-t && \ +- mv $@-t $@ +-# The warn-on-use.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +-# off. +-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/^.ifndef/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +- > $@-t && \ +- mv $@-t $@ +- +-# We need the following in order to create when the system +-# doesn't have one that works with the given compiler. +-@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status +-@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +-@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +-@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +-@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +-@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +-@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ +-@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status +-@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ +- +-# We need the following in order to create when the system +-# doesn't have one that works with the given compiler. +-@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status +-@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +-@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +-@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +-@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ +-@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +-@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +-@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status +-@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ +- +-unitypes.h: unitypes.in.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- cat $(srcdir)/unitypes.in.h; \ +- } > $@-t && \ +- mv -f $@-t $@ +- +-uniwidth.h: uniwidth.in.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- cat $(srcdir)/uniwidth.in.h; \ +- } > $@-t && \ +- mv -f $@-t $@ +- +-# We need the following in order to create when the system +-# version does not work standalone. +-wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +- -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ +- -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ +- -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ +- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ +- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ +- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ +- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ +- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ +- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ +- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ +- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ +- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ +- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ +- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ +- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ +- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ +- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ +- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ +- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ +- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ +- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ +- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ +- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ +- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ +- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ +- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ +- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ +- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ +- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ +- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ +- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ +- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ +- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ +- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ +- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ +- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ +- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ +- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ +- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ +- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ +- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ +- < $(srcdir)/wchar.in.h | \ +- sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ +- -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +- -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ +- -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ +- -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \ +- -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \ +- -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \ +- -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ +- -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ +- -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ +- -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ +- -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ +- -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ +- -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ +- -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ +- -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ +- -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ +- -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ +- -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ +- -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ +- -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ +- -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ +- -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ +- -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ +- -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ +- -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ +- -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ +- -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ +- -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ +- -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ +- -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ +- -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ +- -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ +- -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ +- -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ +- -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ +- -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ +- -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ +- -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ +- -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ +- | \ +- sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ +- -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ +- -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ +- -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ +- -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ +- -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ +- -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \ +- -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ +- -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ +- -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ +- -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ +- -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ +- -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ +- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +- -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +- } > $@-t && \ +- mv $@-t $@ +- +-# We need the following in order to create when the system +-# doesn't have one that works with the given compiler. +-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +- $(AM_V_GEN)rm -f $@-t $@ && \ +- { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +- -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ +- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +- -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +- -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +- -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ +- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ +- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ +- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ +- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ +- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ +- -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ +- -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ +- -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ +- -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ +- -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ +- -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ +- -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ +- -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \ +- -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +- -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +- < $(srcdir)/wctype.in.h; \ +- } > $@-t && \ +- mv $@-t $@ +- +-mostlyclean-local: mostlyclean-generic +- @for dir in '' $(MOSTLYCLEANDIRS); do \ +- if test -n "$$dir" && test -d $$dir; then \ +- echo "rmdir $$dir"; rmdir $$dir; \ +- fi; \ +- done; \ +- : +- +-# 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. +-.NOEXPORT: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/ref-add.sin groff-1.22.3/src/libs/gnulib/lib/ref-add.sin +--- groff-1.22.3.old/src/libs/gnulib/lib/ref-add.sin 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/ref-add.sin 1970-01-01 02:00:00.000000000 +0200 +@@ -1,29 +0,0 @@ +-# Add this package to a list of references stored in a text file. +-# +-# Copyright (C) 2000, 2009-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 . +-# +-# Written by Bruno Haible . +-# +-/^# Packages using this file: / { +- s/# Packages using this file:// +- ta +- :a +- s/ @PACKAGE@ / @PACKAGE@ / +- tb +- s/ $/ @PACKAGE@ / +- :b +- s/^/# Packages using this file:/ +-} +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/ref-del.sin groff-1.22.3/src/libs/gnulib/lib/ref-del.sin +--- groff-1.22.3.old/src/libs/gnulib/lib/ref-del.sin 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/ref-del.sin 1970-01-01 02:00:00.000000000 +0200 +@@ -1,24 +0,0 @@ +-# Remove this package from a list of references stored in a text file. +-# +-# Copyright (C) 2000, 2009-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 . +-# +-# Written by Bruno Haible . +-# +-/^# Packages using this file: / { +- s/# Packages using this file:// +- s/ @PACKAGE@ / / +- s/^/# Packages using this file:/ +-} +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/stdbool.in.h groff-1.22.3/src/libs/gnulib/lib/stdbool.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/stdbool.in.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/stdbool.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,132 +0,0 @@ +-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. +- Written by Bruno Haible , 2001. +- +- 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 . */ +- +-#ifndef _GL_STDBOOL_H +-#define _GL_STDBOOL_H +- +-/* ISO C 99 for platforms that lack it. */ +- +-/* Usage suggestions: +- +- Programs that use should be aware of some limitations +- and standards compliance issues. +- +- Standards compliance: +- +- - must be #included before 'bool', 'false', 'true' +- can be used. +- +- - You cannot assume that sizeof (bool) == 1. +- +- - Programs should not undefine the macros bool, true, and false, +- as C99 lists that as an "obsolescent feature". +- +- Limitations of this substitute, when used in a C89 environment: +- +- - must be #included before the '_Bool' type can be used. +- +- - You cannot assume that _Bool is a typedef; it might be a macro. +- +- - Bit-fields of type 'bool' are not supported. Portable code +- should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'. +- +- - In C99, casts and automatic conversions to '_Bool' or 'bool' are +- performed in such a way that every nonzero value gets converted +- to 'true', and zero gets converted to 'false'. This doesn't work +- with this substitute. With this substitute, only the values 0 and 1 +- give the expected result when converted to _Bool' or 'bool'. +- +- - C99 allows the use of (_Bool)0.0 in constant expressions, but +- this substitute cannot always provide this property. +- +- Also, it is suggested that programs use 'bool' rather than '_Bool'; +- this isn't required, but 'bool' is more common. */ +- +- +-/* 7.16. Boolean type and values */ +- +-/* BeOS already #defines false 0, true 1. We use the same +- definitions below, but temporarily we have to #undef them. */ +-#if defined __BEOS__ && !defined __HAIKU__ +-# include /* defines bool but not _Bool */ +-# undef false +-# undef true +-#endif +- +-#ifdef __cplusplus +-# define _Bool bool +-# define bool bool +-#else +-# if defined __BEOS__ && !defined __HAIKU__ +- /* A compiler known to have 'bool'. */ +- /* If the compiler already has both 'bool' and '_Bool', we can assume they +- are the same types. */ +-# if !@HAVE__BOOL@ +-typedef bool _Bool; +-# endif +-# else +-# if !defined __GNUC__ +- /* If @HAVE__BOOL@: +- Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when +- the built-in _Bool type is used. See +- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html +- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html +- http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html +- Similar bugs are likely with other compilers as well; this file +- wouldn't be used if was working. +- So we override the _Bool type. +- If !@HAVE__BOOL@: +- Need to define _Bool ourselves. As 'signed char' or as an enum type? +- Use of a typedef, with SunPRO C, leads to a stupid +- "warning: _Bool is a keyword in ISO C99". +- Use of an enum type, with IRIX cc, leads to a stupid +- "warning(1185): enumerated type mixed with another type". +- Even the existence of an enum type, without a typedef, +- "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. +- The only benefit of the enum, debuggability, is not important +- with these compilers. So use 'signed char' and no enum. */ +-# define _Bool signed char +-# else +- /* With this compiler, trust the _Bool type if the compiler has it. */ +-# if !@HAVE__BOOL@ +- /* For the sake of symbolic names in gdb, define true and false as +- enum constants, not only as macros. +- It is tempting to write +- typedef enum { false = 0, true = 1 } _Bool; +- so that gdb prints values of type 'bool' symbolically. But then +- values of type '_Bool' might promote to 'int' or 'unsigned int' +- (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' +- (see ISO C 99 6.3.1.1.(2)). So add a negative value to the +- enum; this ensures that '_Bool' promotes to 'int'. */ +-typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; +-# endif +-# endif +-# endif +-# define bool _Bool +-#endif +- +-/* The other macros must be usable in preprocessor directives. */ +-#ifdef __cplusplus +-# define false false +-# define true true +-#else +-# define false 0 +-# define true 1 +-#endif +- +-#define __bool_true_false_are_defined 1 +- +-#endif /* _GL_STDBOOL_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/stddef.in.h groff-1.22.3/src/libs/gnulib/lib/stddef.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/stddef.in.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/stddef.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,86 +0,0 @@ +-/* A substitute for POSIX 2008 , for platforms that have issues. +- +- Copyright (C) 2009-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 . */ +- +-/* Written by Eric Blake. */ +- +-/* +- * POSIX 2008 for platforms that have issues. +- * +- */ +- +-#if __GNUC__ >= 3 +-@PRAGMA_SYSTEM_HEADER@ +-#endif +-@PRAGMA_COLUMNS@ +- +-#if defined __need_wchar_t || defined __need_size_t \ +- || defined __need_ptrdiff_t || defined __need_NULL \ +- || defined __need_wint_t +-/* Special invocation convention inside gcc header files. In +- particular, gcc provides a version of that blindly +- redefines NULL even when __need_wint_t was defined, even though +- wint_t is not normally provided by . Hence, we must +- remember if special invocation has ever been used to obtain wint_t, +- in which case we need to clean up NULL yet again. */ +- +-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) +-# ifdef __need_wint_t +-# undef _@GUARD_PREFIX@_STDDEF_H +-# define _GL_STDDEF_WINT_T +-# endif +-# @INCLUDE_NEXT@ @NEXT_STDDEF_H@ +-# endif +- +-#else +-/* Normal invocation convention. */ +- +-# ifndef _@GUARD_PREFIX@_STDDEF_H +- +-/* The include_next requires a split double-inclusion guard. */ +- +-# @INCLUDE_NEXT@ @NEXT_STDDEF_H@ +- +-# ifndef _@GUARD_PREFIX@_STDDEF_H +-# define _@GUARD_PREFIX@_STDDEF_H +- +-/* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ +-#if @REPLACE_NULL@ +-# undef NULL +-# ifdef __cplusplus +- /* ISO C++ says that the macro NULL must expand to an integer constant +- expression, hence '((void *) 0)' is not allowed in C++. */ +-# if __GNUG__ >= 3 +- /* GNU C++ has a __null macro that behaves like an integer ('int' or +- 'long') but has the same size as a pointer. Use that, to avoid +- warnings. */ +-# define NULL __null +-# else +-# define NULL 0L +-# endif +-# else +-# define NULL ((void *) 0) +-# endif +-#endif +- +-/* Some platforms lack wchar_t. */ +-#if !@HAVE_WCHAR_T@ +-# define wchar_t int +-#endif +- +-# endif /* _@GUARD_PREFIX@_STDDEF_H */ +-# endif /* _@GUARD_PREFIX@_STDDEF_H */ +-#endif /* __need_XXX */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/stdint.in.h groff-1.22.3/src/libs/gnulib/lib/stdint.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/stdint.in.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/stdint.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,636 +0,0 @@ +-/* Copyright (C) 2001-2014 Free Software Foundation, Inc. +- Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. +- This file is part of gnulib. +- +- 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, 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 . */ +- +-/* +- * ISO C 99 for platforms that lack it. +- * +- */ +- +-#ifndef _@GUARD_PREFIX@_STDINT_H +- +-#if __GNUC__ >= 3 +-@PRAGMA_SYSTEM_HEADER@ +-#endif +-@PRAGMA_COLUMNS@ +- +-/* When including a system file that in turn includes , +- use the system , not our substitute. This avoids +- problems with (for example) VMS, whose includes +- . */ +-#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H +- +-/* On Android (Bionic libc), includes this file before +- having defined 'time_t'. Therefore in this case avoid including +- other system header files; just include the system's . +- Ideally we should test __BIONIC__ here, but it is only defined after +- has been included; hence test __ANDROID__ instead. */ +-#if defined __ANDROID__ \ +- && defined _SYS_TYPES_H_ && !defined __need_size_t +-# @INCLUDE_NEXT@ @NEXT_STDINT_H@ +-#else +- +-/* Get those types that are already defined in other system include +- files, so that we can "#define int8_t signed char" below without +- worrying about a later system include file containing a "typedef +- signed char int8_t;" that will get messed up by our macro. Our +- macros should all be consistent with the system versions, except +- for the "fast" types and macros, which we recommend against using +- in public interfaces due to compiler differences. */ +- +-#if @HAVE_STDINT_H@ +-# if defined __sgi && ! defined __c99 +- /* Bypass IRIX's if in C89 mode, since it merely annoys users +- with "This header file is to be used only for c99 mode compilations" +- diagnostics. */ +-# define __STDINT_H__ +-# endif +- +- /* Some pre-C++11 implementations need this. */ +-# ifdef __cplusplus +-# ifndef __STDC_CONSTANT_MACROS +-# define __STDC_CONSTANT_MACROS 1 +-# endif +-# ifndef __STDC_LIMIT_MACROS +-# define __STDC_LIMIT_MACROS 1 +-# endif +-# endif +- +- /* Other systems may have an incomplete or buggy . +- Include it before , since any "#include " +- in would reinclude us, skipping our contents because +- _@GUARD_PREFIX@_STDINT_H is defined. +- The include_next requires a split double-inclusion guard. */ +-# @INCLUDE_NEXT@ @NEXT_STDINT_H@ +-#endif +- +-#if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H +-#define _@GUARD_PREFIX@_STDINT_H +- +-/* defines some of the stdint.h types as well, on glibc, +- IRIX 6.5, and OpenBSD 3.8 (via ). +- AIX 5.2 isn't needed and causes troubles. +- Mac OS X 10.4.6 includes (which is us), but +- relies on the system definitions, so include +- after @NEXT_STDINT_H@. */ +-#if @HAVE_SYS_TYPES_H@ && ! defined _AIX +-# include +-#endif +- +-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, +- LONG_MIN, LONG_MAX, ULONG_MAX. */ +-#include +- +-#if @HAVE_INTTYPES_H@ +- /* In OpenBSD 3.8, includes , which defines +- int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. +- also defines intptr_t and uintptr_t. */ +-# include +-#elif @HAVE_SYS_INTTYPES_H@ +- /* Solaris 7 has the types except the *_fast*_t types, and +- the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. */ +-# include +-#endif +- +-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ +- /* Linux libc4 >= 4.6.7 and libc5 have a that defines +- int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is +- included by . */ +-# include +-#endif +- +-#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H +- +-/* Minimum and maximum values for an integer type under the usual assumption. +- Return an unspecified value if BITS == 0, adding a check to pacify +- picky compilers. */ +- +-#define _STDINT_MIN(signed, bits, zero) \ +- ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero)) +- +-#define _STDINT_MAX(signed, bits, zero) \ +- ((signed) \ +- ? ~ _STDINT_MIN (signed, bits, zero) \ +- : /* The expression for the unsigned case. The subtraction of (signed) \ +- is a nop in the unsigned case and avoids "signed integer overflow" \ +- warnings in the signed case. */ \ +- ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) +- +-#if !GNULIB_defined_stdint_types +- +-/* 7.18.1.1. Exact-width integer types */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits. */ +- +-#undef int8_t +-#undef uint8_t +-typedef signed char gl_int8_t; +-typedef unsigned char gl_uint8_t; +-#define int8_t gl_int8_t +-#define uint8_t gl_uint8_t +- +-#undef int16_t +-#undef uint16_t +-typedef short int gl_int16_t; +-typedef unsigned short int gl_uint16_t; +-#define int16_t gl_int16_t +-#define uint16_t gl_uint16_t +- +-#undef int32_t +-#undef uint32_t +-typedef int gl_int32_t; +-typedef unsigned int gl_uint32_t; +-#define int32_t gl_int32_t +-#define uint32_t gl_uint32_t +- +-/* If the system defines INT64_MAX, assume int64_t works. That way, +- if the underlying platform defines int64_t to be a 64-bit long long +- int, the code below won't mistakenly define it to be a 64-bit long +- int, which would mess up C++ name mangling. We must use #ifdef +- rather than #if, to avoid an error with HP-UX 10.20 cc. */ +- +-#ifdef INT64_MAX +-# define GL_INT64_T +-#else +-/* Do not undefine int64_t if gnulib is not being used with 64-bit +- types, since otherwise it breaks platforms like Tandem/NSK. */ +-# if LONG_MAX >> 31 >> 31 == 1 +-# undef int64_t +-typedef long int gl_int64_t; +-# define int64_t gl_int64_t +-# define GL_INT64_T +-# elif defined _MSC_VER +-# undef int64_t +-typedef __int64 gl_int64_t; +-# define int64_t gl_int64_t +-# define GL_INT64_T +-# elif @HAVE_LONG_LONG_INT@ +-# undef int64_t +-typedef long long int gl_int64_t; +-# define int64_t gl_int64_t +-# define GL_INT64_T +-# endif +-#endif +- +-#ifdef UINT64_MAX +-# define GL_UINT64_T +-#else +-# if ULONG_MAX >> 31 >> 31 >> 1 == 1 +-# undef uint64_t +-typedef unsigned long int gl_uint64_t; +-# define uint64_t gl_uint64_t +-# define GL_UINT64_T +-# elif defined _MSC_VER +-# undef uint64_t +-typedef unsigned __int64 gl_uint64_t; +-# define uint64_t gl_uint64_t +-# define GL_UINT64_T +-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ +-# undef uint64_t +-typedef unsigned long long int gl_uint64_t; +-# define uint64_t gl_uint64_t +-# define GL_UINT64_T +-# endif +-#endif +- +-/* Avoid collision with Solaris 2.5.1 etc. */ +-#define _UINT8_T +-#define _UINT32_T +-#define _UINT64_T +- +- +-/* 7.18.1.2. Minimum-width integer types */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types +- are the same as the corresponding N_t types. */ +- +-#undef int_least8_t +-#undef uint_least8_t +-#undef int_least16_t +-#undef uint_least16_t +-#undef int_least32_t +-#undef uint_least32_t +-#undef int_least64_t +-#undef uint_least64_t +-#define int_least8_t int8_t +-#define uint_least8_t uint8_t +-#define int_least16_t int16_t +-#define uint_least16_t uint16_t +-#define int_least32_t int32_t +-#define uint_least32_t uint32_t +-#ifdef GL_INT64_T +-# define int_least64_t int64_t +-#endif +-#ifdef GL_UINT64_T +-# define uint_least64_t uint64_t +-#endif +- +-/* 7.18.1.3. Fastest minimum-width integer types */ +- +-/* Note: Other substitutes may define these types differently. +- It is not recommended to use these types in public header files. */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types +- are taken from the same list of types. The following code normally +- uses types consistent with glibc, as that lessens the chance of +- incompatibility with older GNU hosts. */ +- +-#undef int_fast8_t +-#undef uint_fast8_t +-#undef int_fast16_t +-#undef uint_fast16_t +-#undef int_fast32_t +-#undef uint_fast32_t +-#undef int_fast64_t +-#undef uint_fast64_t +-typedef signed char gl_int_fast8_t; +-typedef unsigned char gl_uint_fast8_t; +- +-#ifdef __sun +-/* Define types compatible with SunOS 5.10, so that code compiled under +- earlier SunOS versions works with code compiled under SunOS 5.10. */ +-typedef int gl_int_fast32_t; +-typedef unsigned int gl_uint_fast32_t; +-#else +-typedef long int gl_int_fast32_t; +-typedef unsigned long int gl_uint_fast32_t; +-#endif +-typedef gl_int_fast32_t gl_int_fast16_t; +-typedef gl_uint_fast32_t gl_uint_fast16_t; +- +-#define int_fast8_t gl_int_fast8_t +-#define uint_fast8_t gl_uint_fast8_t +-#define int_fast16_t gl_int_fast16_t +-#define uint_fast16_t gl_uint_fast16_t +-#define int_fast32_t gl_int_fast32_t +-#define uint_fast32_t gl_uint_fast32_t +-#ifdef GL_INT64_T +-# define int_fast64_t int64_t +-#endif +-#ifdef GL_UINT64_T +-# define uint_fast64_t uint64_t +-#endif +- +-/* 7.18.1.4. Integer types capable of holding object pointers */ +- +-#undef intptr_t +-#undef uintptr_t +-typedef long int gl_intptr_t; +-typedef unsigned long int gl_uintptr_t; +-#define intptr_t gl_intptr_t +-#define uintptr_t gl_uintptr_t +- +-/* 7.18.1.5. Greatest-width integer types */ +- +-/* Note: These types are compiler dependent. It may be unwise to use them in +- public header files. */ +- +-/* If the system defines INTMAX_MAX, assume that intmax_t works, and +- similarly for UINTMAX_MAX and uintmax_t. This avoids problems with +- assuming one type where another is used by the system. */ +- +-#ifndef INTMAX_MAX +-# undef INTMAX_C +-# undef intmax_t +-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +-typedef long long int gl_intmax_t; +-# define intmax_t gl_intmax_t +-# elif defined GL_INT64_T +-# define intmax_t int64_t +-# else +-typedef long int gl_intmax_t; +-# define intmax_t gl_intmax_t +-# endif +-#endif +- +-#ifndef UINTMAX_MAX +-# undef UINTMAX_C +-# undef uintmax_t +-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +-typedef unsigned long long int gl_uintmax_t; +-# define uintmax_t gl_uintmax_t +-# elif defined GL_UINT64_T +-# define uintmax_t uint64_t +-# else +-typedef unsigned long int gl_uintmax_t; +-# define uintmax_t gl_uintmax_t +-# endif +-#endif +- +-/* Verify that intmax_t and uintmax_t have the same size. Too much code +- breaks if this is not the case. If this check fails, the reason is likely +- to be found in the autoconf macros. */ +-typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) +- ? 1 : -1]; +- +-#define GNULIB_defined_stdint_types 1 +-#endif /* !GNULIB_defined_stdint_types */ +- +-/* 7.18.2. Limits of specified-width integer types */ +- +-/* 7.18.2.1. Limits of exact-width integer types */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits. */ +- +-#undef INT8_MIN +-#undef INT8_MAX +-#undef UINT8_MAX +-#define INT8_MIN (~ INT8_MAX) +-#define INT8_MAX 127 +-#define UINT8_MAX 255 +- +-#undef INT16_MIN +-#undef INT16_MAX +-#undef UINT16_MAX +-#define INT16_MIN (~ INT16_MAX) +-#define INT16_MAX 32767 +-#define UINT16_MAX 65535 +- +-#undef INT32_MIN +-#undef INT32_MAX +-#undef UINT32_MAX +-#define INT32_MIN (~ INT32_MAX) +-#define INT32_MAX 2147483647 +-#define UINT32_MAX 4294967295U +- +-#if defined GL_INT64_T && ! defined INT64_MAX +-/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0 +- evaluates the latter incorrectly in preprocessor expressions. */ +-# define INT64_MIN (- INTMAX_C (1) << 63) +-# define INT64_MAX INTMAX_C (9223372036854775807) +-#endif +- +-#if defined GL_UINT64_T && ! defined UINT64_MAX +-# define UINT64_MAX UINTMAX_C (18446744073709551615) +-#endif +- +-/* 7.18.2.2. Limits of minimum-width integer types */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types +- are the same as the corresponding N_t types. */ +- +-#undef INT_LEAST8_MIN +-#undef INT_LEAST8_MAX +-#undef UINT_LEAST8_MAX +-#define INT_LEAST8_MIN INT8_MIN +-#define INT_LEAST8_MAX INT8_MAX +-#define UINT_LEAST8_MAX UINT8_MAX +- +-#undef INT_LEAST16_MIN +-#undef INT_LEAST16_MAX +-#undef UINT_LEAST16_MAX +-#define INT_LEAST16_MIN INT16_MIN +-#define INT_LEAST16_MAX INT16_MAX +-#define UINT_LEAST16_MAX UINT16_MAX +- +-#undef INT_LEAST32_MIN +-#undef INT_LEAST32_MAX +-#undef UINT_LEAST32_MAX +-#define INT_LEAST32_MIN INT32_MIN +-#define INT_LEAST32_MAX INT32_MAX +-#define UINT_LEAST32_MAX UINT32_MAX +- +-#undef INT_LEAST64_MIN +-#undef INT_LEAST64_MAX +-#ifdef GL_INT64_T +-# define INT_LEAST64_MIN INT64_MIN +-# define INT_LEAST64_MAX INT64_MAX +-#endif +- +-#undef UINT_LEAST64_MAX +-#ifdef GL_UINT64_T +-# define UINT_LEAST64_MAX UINT64_MAX +-#endif +- +-/* 7.18.2.3. Limits of fastest minimum-width integer types */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types +- are taken from the same list of types. */ +- +-#undef INT_FAST8_MIN +-#undef INT_FAST8_MAX +-#undef UINT_FAST8_MAX +-#define INT_FAST8_MIN SCHAR_MIN +-#define INT_FAST8_MAX SCHAR_MAX +-#define UINT_FAST8_MAX UCHAR_MAX +- +-#undef INT_FAST16_MIN +-#undef INT_FAST16_MAX +-#undef UINT_FAST16_MAX +-#define INT_FAST16_MIN INT_FAST32_MIN +-#define INT_FAST16_MAX INT_FAST32_MAX +-#define UINT_FAST16_MAX UINT_FAST32_MAX +- +-#undef INT_FAST32_MIN +-#undef INT_FAST32_MAX +-#undef UINT_FAST32_MAX +-#ifdef __sun +-# define INT_FAST32_MIN INT_MIN +-# define INT_FAST32_MAX INT_MAX +-# define UINT_FAST32_MAX UINT_MAX +-#else +-# define INT_FAST32_MIN LONG_MIN +-# define INT_FAST32_MAX LONG_MAX +-# define UINT_FAST32_MAX ULONG_MAX +-#endif +- +-#undef INT_FAST64_MIN +-#undef INT_FAST64_MAX +-#ifdef GL_INT64_T +-# define INT_FAST64_MIN INT64_MIN +-# define INT_FAST64_MAX INT64_MAX +-#endif +- +-#undef UINT_FAST64_MAX +-#ifdef GL_UINT64_T +-# define UINT_FAST64_MAX UINT64_MAX +-#endif +- +-/* 7.18.2.4. Limits of integer types capable of holding object pointers */ +- +-#undef INTPTR_MIN +-#undef INTPTR_MAX +-#undef UINTPTR_MAX +-#define INTPTR_MIN LONG_MIN +-#define INTPTR_MAX LONG_MAX +-#define UINTPTR_MAX ULONG_MAX +- +-/* 7.18.2.5. Limits of greatest-width integer types */ +- +-#ifndef INTMAX_MAX +-# undef INTMAX_MIN +-# ifdef INT64_MAX +-# define INTMAX_MIN INT64_MIN +-# define INTMAX_MAX INT64_MAX +-# else +-# define INTMAX_MIN INT32_MIN +-# define INTMAX_MAX INT32_MAX +-# endif +-#endif +- +-#ifndef UINTMAX_MAX +-# ifdef UINT64_MAX +-# define UINTMAX_MAX UINT64_MAX +-# else +-# define UINTMAX_MAX UINT32_MAX +-# endif +-#endif +- +-/* 7.18.3. Limits of other integer types */ +- +-/* ptrdiff_t limits */ +-#undef PTRDIFF_MIN +-#undef PTRDIFF_MAX +-#if @APPLE_UNIVERSAL_BUILD@ +-# ifdef _LP64 +-# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) +-# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) +-# else +-# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0) +-# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) +-# endif +-#else +-# define PTRDIFF_MIN \ +- _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +-# define PTRDIFF_MAX \ +- _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +-#endif +- +-/* sig_atomic_t limits */ +-#undef SIG_ATOMIC_MIN +-#undef SIG_ATOMIC_MAX +-#define SIG_ATOMIC_MIN \ +- _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ +- 0@SIG_ATOMIC_T_SUFFIX@) +-#define SIG_ATOMIC_MAX \ +- _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ +- 0@SIG_ATOMIC_T_SUFFIX@) +- +- +-/* size_t limit */ +-#undef SIZE_MAX +-#if @APPLE_UNIVERSAL_BUILD@ +-# ifdef _LP64 +-# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) +-# else +-# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) +-# endif +-#else +-# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) +-#endif +- +-/* wchar_t limits */ +-/* Get WCHAR_MIN, WCHAR_MAX. +- This include is not on the top, above, because on OSF/1 4.0 we have a +- sequence of nested includes +- -> -> -> , and the latter includes +- and assumes its types are already defined. */ +-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-# include +-# include +-# include +-# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +-# include +-# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +-#endif +-#undef WCHAR_MIN +-#undef WCHAR_MAX +-#define WCHAR_MIN \ +- _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +-#define WCHAR_MAX \ +- _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +- +-/* wint_t limits */ +-#undef WINT_MIN +-#undef WINT_MAX +-#define WINT_MIN \ +- _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +-#define WINT_MAX \ +- _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +- +-/* 7.18.4. Macros for integer constants */ +- +-/* 7.18.4.1. Macros for minimum-width integer constants */ +-/* According to ISO C 99 Technical Corrigendum 1 */ +- +-/* Here we assume a standard architecture where the hardware integer +- types have 8, 16, 32, optionally 64 bits, and int is 32 bits. */ +- +-#undef INT8_C +-#undef UINT8_C +-#define INT8_C(x) x +-#define UINT8_C(x) x +- +-#undef INT16_C +-#undef UINT16_C +-#define INT16_C(x) x +-#define UINT16_C(x) x +- +-#undef INT32_C +-#undef UINT32_C +-#define INT32_C(x) x +-#define UINT32_C(x) x ## U +- +-#undef INT64_C +-#undef UINT64_C +-#if LONG_MAX >> 31 >> 31 == 1 +-# define INT64_C(x) x##L +-#elif defined _MSC_VER +-# define INT64_C(x) x##i64 +-#elif @HAVE_LONG_LONG_INT@ +-# define INT64_C(x) x##LL +-#endif +-#if ULONG_MAX >> 31 >> 31 >> 1 == 1 +-# define UINT64_C(x) x##UL +-#elif defined _MSC_VER +-# define UINT64_C(x) x##ui64 +-#elif @HAVE_UNSIGNED_LONG_LONG_INT@ +-# define UINT64_C(x) x##ULL +-#endif +- +-/* 7.18.4.2. Macros for greatest-width integer constants */ +- +-#ifndef INTMAX_C +-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +-# define INTMAX_C(x) x##LL +-# elif defined GL_INT64_T +-# define INTMAX_C(x) INT64_C(x) +-# else +-# define INTMAX_C(x) x##L +-# endif +-#endif +- +-#ifndef UINTMAX_C +-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +-# define UINTMAX_C(x) x##ULL +-# elif defined GL_UINT64_T +-# define UINTMAX_C(x) UINT64_C(x) +-# else +-# define UINTMAX_C(x) x##UL +-# endif +-#endif +- +-#endif /* _@GUARD_PREFIX@_STDINT_H */ +-#endif /* !(defined __ANDROID__ && ...) */ +-#endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/streq.h groff-1.22.3/src/libs/gnulib/lib/streq.h +--- groff-1.22.3.old/src/libs/gnulib/lib/streq.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/streq.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,176 +0,0 @@ +-/* Optimized string comparison. +- Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-/* Written by Bruno Haible . */ +- +-#ifndef _GL_STREQ_H +-#define _GL_STREQ_H +- +-#include +- +-/* STREQ_OPT allows to optimize string comparison with a small literal string. +- STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) +- is semantically equivalent to +- strcmp (s, "EUC-KR") == 0 +- just faster. */ +- +-/* Help GCC to generate good code for string comparisons with +- immediate strings. */ +-#if defined (__GNUC__) && defined (__OPTIMIZE__) +- +-static inline int +-streq9 (const char *s1, const char *s2) +-{ +- return strcmp (s1 + 9, s2 + 9) == 0; +-} +- +-static inline int +-streq8 (const char *s1, const char *s2, char s28) +-{ +- if (s1[8] == s28) +- { +- if (s28 == 0) +- return 1; +- else +- return streq9 (s1, s2); +- } +- else +- return 0; +-} +- +-static inline int +-streq7 (const char *s1, const char *s2, char s27, char s28) +-{ +- if (s1[7] == s27) +- { +- if (s27 == 0) +- return 1; +- else +- return streq8 (s1, s2, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq6 (const char *s1, const char *s2, char s26, char s27, char s28) +-{ +- if (s1[6] == s26) +- { +- if (s26 == 0) +- return 1; +- else +- return streq7 (s1, s2, s27, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq5 (const char *s1, const char *s2, char s25, char s26, char s27, char s28) +-{ +- if (s1[5] == s25) +- { +- if (s25 == 0) +- return 1; +- else +- return streq6 (s1, s2, s26, s27, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq4 (const char *s1, const char *s2, char s24, char s25, char s26, char s27, char s28) +-{ +- if (s1[4] == s24) +- { +- if (s24 == 0) +- return 1; +- else +- return streq5 (s1, s2, s25, s26, s27, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq3 (const char *s1, const char *s2, char s23, char s24, char s25, char s26, char s27, char s28) +-{ +- if (s1[3] == s23) +- { +- if (s23 == 0) +- return 1; +- else +- return streq4 (s1, s2, s24, s25, s26, s27, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq2 (const char *s1, const char *s2, char s22, char s23, char s24, char s25, char s26, char s27, char s28) +-{ +- if (s1[2] == s22) +- { +- if (s22 == 0) +- return 1; +- else +- return streq3 (s1, s2, s23, s24, s25, s26, s27, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq1 (const char *s1, const char *s2, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28) +-{ +- if (s1[1] == s21) +- { +- if (s21 == 0) +- return 1; +- else +- return streq2 (s1, s2, s22, s23, s24, s25, s26, s27, s28); +- } +- else +- return 0; +-} +- +-static inline int +-streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23, char s24, char s25, char s26, char s27, char s28) +-{ +- if (s1[0] == s20) +- { +- if (s20 == 0) +- return 1; +- else +- return streq1 (s1, s2, s21, s22, s23, s24, s25, s26, s27, s28); +- } +- else +- return 0; +-} +- +-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \ +- streq0 (s1, s2, s20, s21, s22, s23, s24, s25, s26, s27, s28) +- +-#else +- +-#define STREQ_OPT(s1,s2,s20,s21,s22,s23,s24,s25,s26,s27,s28) \ +- (strcmp (s1, s2) == 0) +- +-#endif +- +-#endif /* _GL_STREQ_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/unitypes.in.h groff-1.22.3/src/libs/gnulib/lib/unitypes.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/unitypes.in.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/unitypes.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,46 +0,0 @@ +-/* Elementary types and macros for the GNU UniString library. +- Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-#ifndef _UNITYPES_H +-#define _UNITYPES_H +- +-/* Get uint8_t, uint16_t, uint32_t. */ +-#include +- +-/* Type representing a Unicode character. */ +-typedef uint32_t ucs4_t; +- +-/* Attribute of a function whose result depends only on the arguments +- (not pointers!) and which has no side effects. */ +-#ifndef _UC_ATTRIBUTE_CONST +-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +-# define _UC_ATTRIBUTE_CONST __attribute__ ((__const__)) +-# else +-# define _UC_ATTRIBUTE_CONST +-# endif +-#endif +- +-/* Attribute of a function whose result depends only on the arguments +- (possibly pointers) and global memory, and which has no side effects. */ +-#ifndef _UC_ATTRIBUTE_PURE +-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) +-# define _UC_ATTRIBUTE_PURE __attribute__ ((__pure__)) +-# else +-# define _UC_ATTRIBUTE_PURE +-# endif +-#endif +- +-#endif /* _UNITYPES_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/uniwidth/cjk.h groff-1.22.3/src/libs/gnulib/lib/uniwidth/cjk.h +--- groff-1.22.3.old/src/libs/gnulib/lib/uniwidth/cjk.h 2014-11-04 10:38:35.635518871 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/uniwidth/cjk.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,37 +0,0 @@ +-/* Test for CJK encoding. +- Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc. +- Written by Bruno Haible , 2002. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-#include "streq.h" +- +-static int +-is_cjk_encoding (const char *encoding) +-{ +- if (0 +- /* Legacy Japanese encodings */ +- || STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0) +- /* Legacy Chinese encodings */ +- || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0) +- || STREQ_OPT (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0) +- || STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0) +- || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0) +- /* Legacy Korean encodings */ +- || STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) +- || STREQ_OPT (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0) +- || STREQ_OPT (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0)) +- return 1; +- return 0; +-} +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/uniwidth/width.c groff-1.22.3/src/libs/gnulib/lib/uniwidth/width.c +--- groff-1.22.3.old/src/libs/gnulib/lib/uniwidth/width.c 2014-11-04 10:38:35.635518871 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/uniwidth/width.c 1970-01-01 02:00:00.000000000 +0200 +@@ -1,368 +0,0 @@ +-/* Determine display width of Unicode character. +- Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc. +- Written by Bruno Haible , 2002. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-#include +- +-/* Specification. */ +-#include "uniwidth.h" +- +-#include "cjk.h" +- +-/* +- * Non-spacing attribute table. +- * Consists of: +- * - Non-spacing characters; generated from PropList.txt or +- * "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt" +- * - Format control characters; generated from +- * "grep '^[^;]*;[^;]*;Cf;' UnicodeData.txt" +- * - Zero width characters; generated from +- * "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt" +- */ +-static const unsigned char nonspacing_table_data[27*64] = { +- /* 0x0000-0x01ff */ +- 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */ +- 0xff, 0xff, 0xff, 0xff, 0x00, 0x20, 0x00, 0x00, /* 0x0080-0x00bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x013f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0140-0x017f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x01bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01c0-0x01ff */ +- /* 0x0200-0x03ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0200-0x023f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0240-0x027f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0280-0x02bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c0-0x02ff */ +- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x0300-0x033f */ +- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x0340-0x037f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0380-0x03bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x03c0-0x03ff */ +- /* 0x0400-0x05ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0400-0x043f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0440-0x047f */ +- 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04c0-0x04ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0500-0x053f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0540-0x057f */ +- 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */ +- 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */ +- /* 0x0600-0x07ff */ +- 0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ +- 0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */ +- 0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ +- 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */ +- 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */ +- 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */ +- /* 0x0800-0x09ff */ +- 0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */ +- 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */ +- 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */ +- 0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */ +- 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */ +- 0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */ +- /* 0x0a00-0x0bff */ +- 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */ +- 0x86, 0x39, 0x02, 0x00, 0x00, 0x00, 0x23, 0x00, /* 0x0a40-0x0a7f */ +- 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */ +- 0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0ac0-0x0aff */ +- 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */ +- 0x1e, 0x20, 0x40, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */ +- 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */ +- 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */ +- /* 0x0c00-0x0dff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */ +- 0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */ +- 0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */ +- 0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */ +- 0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */ +- /* 0x0e00-0x0fff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x07, /* 0x0e00-0x0e3f */ +- 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0e40-0x0e7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x1b, /* 0x0e80-0x0ebf */ +- 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */ +- 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */ +- 0xdf, 0xe0, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */ +- 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */ +- /* 0x1000-0x11ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */ +- 0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */ +- 0x64, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1180-0x11bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c0-0x11ff */ +- /* 0x1200-0x13ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1200-0x123f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1240-0x127f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */ +- 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */ +- /* 0x1600-0x17ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1600-0x163f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1640-0x167f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1680-0x16bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16c0-0x16ff */ +- 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, /* 0x1700-0x173f */ +- 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, /* 0x1740-0x177f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x3f, /* 0x1780-0x17bf */ +- 0x40, 0xfe, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x17c0-0x17ff */ +- /* 0x1800-0x19ff */ +- 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */ +- 0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */ +- /* 0x1a00-0x1bff */ +- 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */ +- 0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */ +- 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */ +- 0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */ +- 0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */ +- 0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */ +- /* 0x1c00-0x1dff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */ +- 0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x00, 0x00, /* 0x1cc0-0x1cff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */ +- 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xf0, /* 0x1dc0-0x1dff */ +- /* 0x2000-0x21ff */ +- 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */ +- 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */ +- 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, /* 0x20c0-0x20ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2140-0x217f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2180-0x21bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x21c0-0x21ff */ +- /* 0x2c00-0x2dff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, /* 0x2cc0-0x2cff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x2d40-0x2d7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */ +- 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */ +- /* 0x3000-0x31ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, /* 0x3000-0x303f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */ +- 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, /* 0x3080-0x30bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30c0-0x30ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3100-0x313f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3140-0x317f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3180-0x31bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */ +- /* 0xa600-0xa7ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa7c0-0xa7ff */ +- /* 0xa800-0xa9ff */ +- 0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */ +- 0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */ +- 0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */ +- 0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */ +- 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */ +- /* 0xaa00-0xabff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */ +- 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */ +- 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */ +- 0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x00, /* 0xabc0-0xabff */ +- /* 0xfa00-0xfbff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa80-0xfabf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfac0-0xfaff */ +- 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0xfb00-0xfb3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb40-0xfb7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */ +- /* 0xfe00-0xffff */ +- 0xff, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff00-0xff3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff40-0xff7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff80-0xffbf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, /* 0xffc0-0xffff */ +- /* 0x10000-0x101ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10000-0x1003f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10040-0x1007f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10080-0x100bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x100c0-0x100ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10100-0x1013f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10140-0x1017f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10180-0x101bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, /* 0x101c0-0x101ff */ +- /* 0x10a00-0x10bff */ +- 0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a80-0x10abf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b00-0x10b3f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */ +- /* 0x11000-0x111ff */ +- 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */ +- 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11040-0x1107f */ +- 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11100-0x1113f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11140-0x1117f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11180-0x111bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */ +- /* 0x1d000-0x1d1ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */ +- 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xf8, 0xff, /* 0x1d140-0x1d17f */ +- 0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */ +- /* 0x1d200-0x1d3ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d200-0x1d23f */ +- 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d240-0x1d27f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d280-0x1d2bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d2c0-0x1d2ff */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d300-0x1d33f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d340-0x1d37f */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d380-0x1d3bf */ +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* 0x1d3c0-0x1d3ff */ +-}; +-static const signed char nonspacing_table_ind[240] = { +- 0, 1, 2, 3, 4, 5, 6, 7, /* 0x0000-0x0fff */ +- 8, 9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */ +- 14, -1, -1, -1, -1, -1, 15, -1, /* 0x2000-0x2fff */ +- 16, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x4000-0x4fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x5000-0x5fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x6000-0x6fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x7000-0x7fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x8000-0x8fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x9000-0x9fff */ +- -1, -1, -1, 17, 18, 19, -1, -1, /* 0xa000-0xafff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb000-0xbfff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc000-0xcfff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd000-0xdfff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */ +- -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */ +- 22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */ +- 24, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x16000-0x16fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */ +- -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */ +- 25, 26, -1, -1, -1, -1, -1, -1 /* 0x1d000-0x1dfff */ +-}; +- +-/* Determine number of column positions required for UC. */ +-int +-uc_width (ucs4_t uc, const char *encoding) +-{ +- /* Test for non-spacing or control character. */ +- if ((uc >> 9) < 240) +- { +- int ind = nonspacing_table_ind[uc >> 9]; +- if (ind >= 0) +- if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1) +- { +- if (uc > 0 && uc < 0xa0) +- return -1; +- else +- return 0; +- } +- } +- else if ((uc >> 9) == (0xe0000 >> 9)) +- { +- if (uc >= 0xe0100) +- { +- if (uc <= 0xe01ef) +- return 0; +- } +- else +- { +- if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001) +- return 0; +- } +- } +- /* Test for double-width character. +- * Generated from "grep '^[^;]\{4,5\};[WF]' EastAsianWidth.txt" +- * and "grep '^[^;]\{4,5\};[^WF]' EastAsianWidth.txt" +- */ +- if (uc >= 0x1100 +- && ((uc < 0x1160) /* Hangul Jamo */ +- || (uc >= 0x2329 && uc < 0x232b) /* Angle Brackets */ +- || (uc >= 0x2e80 && uc < 0xa4d0 /* CJK ... Yi */ +- && !(uc == 0x303f) && !(uc >= 0x4dc0 && uc < 0x4e00)) +- || (uc >= 0xac00 && uc < 0xd7a4) /* Hangul Syllables */ +- || (uc >= 0xf900 && uc < 0xfb00) /* CJK Compatibility Ideographs */ +- || (uc >= 0xfe10 && uc < 0xfe20) /* Presentation Forms for Vertical */ +- || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */ +- || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */ +- || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */ +- || (uc >= 0x20000 && uc <= 0x2ffff) /* Supplementary Ideographic Plane */ +- || (uc >= 0x30000 && uc <= 0x3ffff) /* Tertiary Ideographic Plane */ +- ) ) +- return 2; +- /* In ancient CJK encodings, Cyrillic and most other characters are +- double-width as well. */ +- if (uc >= 0x00A1 && uc < 0xFF61 && uc != 0x20A9 +- && is_cjk_encoding (encoding)) +- return 2; +- return 1; +-} +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/uniwidth.in.h groff-1.22.3/src/libs/gnulib/lib/uniwidth.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/uniwidth.in.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/uniwidth.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,72 +0,0 @@ +-/* Display width functions. +- Copyright (C) 2001-2002, 2005, 2007, 2009-2014 Free Software Foundation, +- Inc. +- +- This program is free software: you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published +- by the Free Software Foundation; either version 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with this program. If not, see . */ +- +-#ifndef _UNIWIDTH_H +-#define _UNIWIDTH_H +- +-#include "unitypes.h" +- +-/* Get size_t. */ +-#include +- +-/* Get locale_charset() declaration. */ +-#include "localcharset.h" +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +- +-/* Display width. */ +- +-/* These functions are locale dependent. The encoding argument identifies +- the encoding (e.g. "ISO-8859-2" for Polish). */ +- +-/* Determine number of column positions required for UC. */ +-extern int +- uc_width (ucs4_t uc, const char *encoding) +- _UC_ATTRIBUTE_PURE; +- +-/* Determine number of column positions required for first N units +- (or fewer if S ends before this) in S. */ +-extern int +- u8_width (const uint8_t *s, size_t n, const char *encoding) +- _UC_ATTRIBUTE_PURE; +-extern int +- u16_width (const uint16_t *s, size_t n, const char *encoding) +- _UC_ATTRIBUTE_PURE; +-extern int +- u32_width (const uint32_t *s, size_t n, const char *encoding) +- _UC_ATTRIBUTE_PURE; +- +-/* Determine number of column positions required for S. */ +-extern int +- u8_strwidth (const uint8_t *s, const char *encoding) +- _UC_ATTRIBUTE_PURE; +-extern int +- u16_strwidth (const uint16_t *s, const char *encoding) +- _UC_ATTRIBUTE_PURE; +-extern int +- u32_strwidth (const uint32_t *s, const char *encoding) +- _UC_ATTRIBUTE_PURE; +- +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* _UNIWIDTH_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/verify.h groff-1.22.3/src/libs/gnulib/lib/verify.h +--- groff-1.22.3.old/src/libs/gnulib/lib/verify.h 2014-11-04 10:38:35.630518934 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/verify.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,279 +0,0 @@ +-/* Compile-time assert-like macros. +- +- Copyright (C) 2005-2006, 2009-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 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 . */ +- +-/* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ +- +-#ifndef _GL_VERIFY_H +-#define _GL_VERIFY_H +- +- +-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. +- This is supported by GCC 4.6.0 and later, in C mode, and its use +- here generates easier-to-read diagnostics when verify (R) fails. +- +- Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11. +- This will likely be supported by future GCC versions, in C++ mode. +- +- Use this only with GCC. If we were willing to slow 'configure' +- down we could also use it with other compilers, but since this +- affects only the quality of diagnostics, why bother? */ +-#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ +- && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ +- && !defined __cplusplus) +-# define _GL_HAVE__STATIC_ASSERT 1 +-#endif +-/* The condition (99 < __GNUC__) is temporary, until we know about the +- first G++ release that supports static_assert. */ +-#if (99 < __GNUC__) && defined __cplusplus +-# define _GL_HAVE_STATIC_ASSERT 1 +-#endif +- +-/* FreeBSD 9.1 , included by and lots of other +- system headers, defines a conflicting _Static_assert that is no +- better than ours; override it. */ +-#ifndef _GL_HAVE_STATIC_ASSERT +-# include +-# undef _Static_assert +-#endif +- +-/* Each of these macros verifies that its argument R is nonzero. To +- be portable, R should be an integer constant expression. Unlike +- assert (R), there is no run-time overhead. +- +- If _Static_assert works, verify (R) uses it directly. Similarly, +- _GL_VERIFY_TRUE works by packaging a _Static_assert inside a struct +- that is an operand of sizeof. +- +- The code below uses several ideas for C++ compilers, and for C +- compilers that do not support _Static_assert: +- +- * The first step is ((R) ? 1 : -1). Given an expression R, of +- integral or boolean or floating-point type, this yields an +- expression of integral type, whose value is later verified to be +- constant and nonnegative. +- +- * Next this expression W is wrapped in a type +- struct _gl_verify_type { +- unsigned int _gl_verify_error_if_negative: W; +- }. +- If W is negative, this yields a compile-time error. No compiler can +- deal with a bit-field of negative size. +- +- One might think that an array size check would have the same +- effect, that is, that the type struct { unsigned int dummy[W]; } +- would work as well. However, inside a function, some compilers +- (such as C++ compilers and GNU C) allow local parameters and +- variables inside array size expressions. With these compilers, +- an array size check would not properly diagnose this misuse of +- the verify macro: +- +- void function (int n) { verify (n < 0); } +- +- * For the verify macro, the struct _gl_verify_type will need to +- somehow be embedded into a declaration. To be portable, this +- declaration must declare an object, a constant, a function, or a +- typedef name. If the declared entity uses the type directly, +- such as in +- +- struct dummy {...}; +- typedef struct {...} dummy; +- extern struct {...} *dummy; +- extern void dummy (struct {...} *); +- extern struct {...} *dummy (void); +- +- two uses of the verify macro would yield colliding declarations +- if the entity names are not disambiguated. A workaround is to +- attach the current line number to the entity name: +- +- #define _GL_CONCAT0(x, y) x##y +- #define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +- extern struct {...} * _GL_CONCAT (dummy, __LINE__); +- +- But this has the problem that two invocations of verify from +- within the same macro would collide, since the __LINE__ value +- would be the same for both invocations. (The GCC __COUNTER__ +- macro solves this problem, but is not portable.) +- +- A solution is to use the sizeof operator. It yields a number, +- getting rid of the identity of the type. Declarations like +- +- extern int dummy [sizeof (struct {...})]; +- extern void dummy (int [sizeof (struct {...})]); +- extern int (*dummy (void)) [sizeof (struct {...})]; +- +- can be repeated. +- +- * Should the implementation use a named struct or an unnamed struct? +- Which of the following alternatives can be used? +- +- extern int dummy [sizeof (struct {...})]; +- extern int dummy [sizeof (struct _gl_verify_type {...})]; +- extern void dummy (int [sizeof (struct {...})]); +- extern void dummy (int [sizeof (struct _gl_verify_type {...})]); +- extern int (*dummy (void)) [sizeof (struct {...})]; +- extern int (*dummy (void)) [sizeof (struct _gl_verify_type {...})]; +- +- In the second and sixth case, the struct type is exported to the +- outer scope; two such declarations therefore collide. GCC warns +- about the first, third, and fourth cases. So the only remaining +- possibility is the fifth case: +- +- extern int (*dummy (void)) [sizeof (struct {...})]; +- +- * GCC warns about duplicate declarations of the dummy function if +- -Wredundant-decls is used. GCC 4.3 and later have a builtin +- __COUNTER__ macro that can let us generate unique identifiers for +- each dummy function, to suppress this warning. +- +- * This implementation exploits the fact that older versions of GCC, +- which do not support _Static_assert, also do not warn about the +- last declaration mentioned above. +- +- * GCC warns if -Wnested-externs is enabled and verify() is used +- within a function body; but inside a function, you can always +- arrange to use verify_expr() instead. +- +- * In C++, any struct definition inside sizeof is invalid. +- Use a template type to work around the problem. */ +- +-/* Concatenate two preprocessor tokens. */ +-#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +-#define _GL_CONCAT0(x, y) x##y +- +-/* _GL_COUNTER is an integer, preferably one that changes each time we +- use it. Use __COUNTER__ if it works, falling back on __LINE__ +- otherwise. __LINE__ isn't perfect, but it's better than a +- constant. */ +-#if defined __COUNTER__ && __COUNTER__ != __COUNTER__ +-# define _GL_COUNTER __COUNTER__ +-#else +-# define _GL_COUNTER __LINE__ +-#endif +- +-/* Generate a symbol with the given prefix, making it unique if +- possible. */ +-#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) +- +-/* Verify requirement R at compile-time, as an integer constant expression +- that returns 1. If R is false, fail at compile-time, preferably +- with a diagnostic that includes the string-literal DIAGNOSTIC. */ +- +-#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ +- (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) +- +-#ifdef __cplusplus +-# if !GNULIB_defined_struct__gl_verify_type +-template +- struct _gl_verify_type { +- unsigned int _gl_verify_error_if_negative: w; +- }; +-# define GNULIB_defined_struct__gl_verify_type 1 +-# endif +-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ +- _gl_verify_type<(R) ? 1 : -1> +-#elif defined _GL_HAVE__STATIC_ASSERT +-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ +- struct { \ +- _Static_assert (R, DIAGNOSTIC); \ +- int _gl_dummy; \ +- } +-#else +-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ +- struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +-#endif +- +-/* Verify requirement R at compile-time, as a declaration without a +- trailing ';'. If R is false, fail at compile-time, preferably +- with a diagnostic that includes the string-literal DIAGNOSTIC. +- +- Unfortunately, unlike C11, this implementation must appear as an +- ordinary declaration, and cannot appear inside struct { ... }. */ +- +-#ifdef _GL_HAVE__STATIC_ASSERT +-# define _GL_VERIFY _Static_assert +-#else +-# define _GL_VERIFY(R, DIAGNOSTIC) \ +- extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ +- [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +-#endif +- +-/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ +-#ifdef _GL_STATIC_ASSERT_H +-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert +-# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) +-# endif +-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert +-# define static_assert _Static_assert /* C11 requires this #define. */ +-# endif +-#endif +- +-/* @assert.h omit start@ */ +- +-/* Each of these macros verifies that its argument R is nonzero. To +- be portable, R should be an integer constant expression. Unlike +- assert (R), there is no run-time overhead. +- +- There are two macros, since no single macro can be used in all +- contexts in C. verify_true (R) is for scalar contexts, including +- integer constant expression contexts. verify (R) is for declaration +- contexts, e.g., the top level. */ +- +-/* Verify requirement R at compile-time, as an integer constant expression. +- Return 1. This is equivalent to verify_expr (R, 1). +- +- verify_true is obsolescent; please use verify_expr instead. */ +- +-#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +- +-/* Verify requirement R at compile-time. Return the value of the +- expression E. */ +- +-#define verify_expr(R, E) \ +- (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) +- +-/* Verify requirement R at compile-time, as a declaration without a +- trailing ';'. */ +- +-#define verify(R) _GL_VERIFY (R, "verify (" #R ")") +- +-#ifndef __has_builtin +-# define __has_builtin(x) 0 +-#endif +- +-/* Assume that R always holds. This lets the compiler optimize +- accordingly. R should not have side-effects; it may or may not be +- evaluated. Behavior is undefined if R is false. */ +- +-#if (__has_builtin (__builtin_unreachable) \ +- || 4 < __GNUC__ + (5 <= __GNUC_MINOR__)) +-# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) +-#elif 1200 <= _MSC_VER +-# define assume(R) __assume (R) +-#elif (defined lint \ +- && (__has_builtin (__builtin_trap) \ +- || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) +- /* Doing it this way helps various packages when configured with +- --enable-gcc-warnings, which compiles with -Dlint. It's nicer +- when 'assume' silences warnings even with older GCCs. */ +-# define assume(R) ((R) ? (void) 0 : __builtin_trap ()) +-#else +-# define assume(R) ((void) (0 && (R))) +-#endif +- +-/* @assert.h omit end@ */ +- +-#endif +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/wchar.in.h groff-1.22.3/src/libs/gnulib/lib/wchar.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/wchar.in.h 2014-11-04 10:38:35.631518921 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/wchar.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1028 +0,0 @@ +-/* A substitute for ISO C99 , for platforms that have issues. +- +- Copyright (C) 2007-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 . */ +- +-/* Written by Eric Blake. */ +- +-/* +- * ISO C 99 for platforms that have issues. +- * +- * +- * For now, this just ensures proper prerequisite inclusion order and +- * the declaration of wcwidth(). +- */ +- +-#if __GNUC__ >= 3 +-@PRAGMA_SYSTEM_HEADER@ +-#endif +-@PRAGMA_COLUMNS@ +- +-#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H +-/* Special invocation convention: +- - Inside glibc and uClibc header files. +- - On HP-UX 11.00 we have a sequence of nested includes +- -> -> , and the latter includes , +- once indirectly -> -> -> +- and once directly. In both situations 'wint_t' is not yet defined, +- therefore we cannot provide the function overrides; instead include only +- the system's . +- - On IRIX 6.5, similarly, we have an include -> , and +- the latter includes . But here, we have no way to detect whether +- is completely included or is still being included. */ +- +-#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ +- +-#else +-/* Normal invocation convention. */ +- +-#ifndef _@GUARD_PREFIX@_WCHAR_H +- +-#define _GL_ALREADY_INCLUDING_WCHAR_H +- +-#if @HAVE_FEATURES_H@ +-# include /* for __GLIBC__ */ +-#endif +- +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . +- In some builds of uClibc, is nonexistent and wchar_t is defined +- by . +- But avoid namespace pollution on glibc systems. */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) +-# include +-#endif +-#ifndef __GLIBC__ +-# include +-# include +-#endif +- +-/* Include the original if it exists. +- Some builds of uClibc lack it. */ +-/* The include_next requires a split double-inclusion guard. */ +-#if @HAVE_WCHAR_H@ +-# @INCLUDE_NEXT@ @NEXT_WCHAR_H@ +-#endif +- +-#undef _GL_ALREADY_INCLUDING_WCHAR_H +- +-#ifndef _@GUARD_PREFIX@_WCHAR_H +-#define _@GUARD_PREFIX@_WCHAR_H +- +-/* The __attribute__ feature is available in gcc versions 2.5 and later. +- The attribute __pure__ was added in gcc 2.96. */ +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) +-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +-#else +-# define _GL_ATTRIBUTE_PURE /* empty */ +-#endif +- +-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +- +-/* The definition of _GL_ARG_NONNULL is copied here. */ +- +-/* The definition of _GL_WARN_ON_USE is copied here. */ +- +- +-/* Define wint_t and WEOF. (Also done in wctype.in.h.) */ +-#if !@HAVE_WINT_T@ && !defined wint_t +-# define wint_t int +-# ifndef WEOF +-# define WEOF -1 +-# endif +-#else +-/* MSVC defines wint_t as 'unsigned short' in . +- This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be +- "unchanged by default argument promotions". Override it. */ +-# if defined _MSC_VER +-# if !GNULIB_defined_wint_t +-# include +-typedef unsigned int rpl_wint_t; +-# undef wint_t +-# define wint_t rpl_wint_t +-# define GNULIB_defined_wint_t 1 +-# endif +-# endif +-# ifndef WEOF +-# define WEOF ((wint_t) -1) +-# endif +-#endif +- +- +-/* Override mbstate_t if it is too small. +- On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for +- implementing mbrtowc for encodings like UTF-8. */ +-#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ +-# if !GNULIB_defined_mbstate_t +-typedef int rpl_mbstate_t; +-# undef mbstate_t +-# define mbstate_t rpl_mbstate_t +-# define GNULIB_defined_mbstate_t 1 +-# endif +-#endif +- +- +-/* Convert a single-byte character to a wide character. */ +-#if @GNULIB_BTOWC@ +-# if @REPLACE_BTOWC@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef btowc +-# define btowc rpl_btowc +-# endif +-_GL_FUNCDECL_RPL (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE); +-_GL_CXXALIAS_RPL (btowc, wint_t, (int c)); +-# else +-# if !@HAVE_BTOWC@ +-_GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (btowc, wint_t, (int c)); +-# endif +-_GL_CXXALIASWARN (btowc); +-#elif defined GNULIB_POSIXCHECK +-# undef btowc +-# if HAVE_RAW_DECL_BTOWC +-_GL_WARN_ON_USE (btowc, "btowc is unportable - " +- "use gnulib module btowc for portability"); +-# endif +-#endif +- +- +-/* Convert a wide character to a single-byte character. */ +-#if @GNULIB_WCTOB@ +-# if @REPLACE_WCTOB@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wctob +-# define wctob rpl_wctob +-# endif +-_GL_FUNCDECL_RPL (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE); +-_GL_CXXALIAS_RPL (wctob, int, (wint_t wc)); +-# else +-# if !defined wctob && !@HAVE_DECL_WCTOB@ +-/* wctob is provided by gnulib, or wctob exists but is not declared. */ +-_GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wctob, int, (wint_t wc)); +-# endif +-_GL_CXXALIASWARN (wctob); +-#elif defined GNULIB_POSIXCHECK +-# undef wctob +-# if HAVE_RAW_DECL_WCTOB +-_GL_WARN_ON_USE (wctob, "wctob is unportable - " +- "use gnulib module wctob for portability"); +-# endif +-#endif +- +- +-/* Test whether *PS is in the initial state. */ +-#if @GNULIB_MBSINIT@ +-# if @REPLACE_MBSINIT@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef mbsinit +-# define mbsinit rpl_mbsinit +-# endif +-_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps)); +-_GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps)); +-# else +-# if !@HAVE_MBSINIT@ +-_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps)); +-# endif +-_GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (mbsinit); +-#elif defined GNULIB_POSIXCHECK +-# undef mbsinit +-# if HAVE_RAW_DECL_MBSINIT +-_GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - " +- "use gnulib module mbsinit for portability"); +-# endif +-#endif +- +- +-/* Convert a multibyte character to a wide character. */ +-#if @GNULIB_MBRTOWC@ +-# if @REPLACE_MBRTOWC@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef mbrtowc +-# define mbrtowc rpl_mbrtowc +-# endif +-_GL_FUNCDECL_RPL (mbrtowc, size_t, +- (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +-_GL_CXXALIAS_RPL (mbrtowc, size_t, +- (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +-# else +-# if !@HAVE_MBRTOWC@ +-_GL_FUNCDECL_SYS (mbrtowc, size_t, +- (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +-# endif +-_GL_CXXALIAS_SYS (mbrtowc, size_t, +- (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (mbrtowc); +-#elif defined GNULIB_POSIXCHECK +-# undef mbrtowc +-# if HAVE_RAW_DECL_MBRTOWC +-_GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - " +- "use gnulib module mbrtowc for portability"); +-# endif +-#endif +- +- +-/* Recognize a multibyte character. */ +-#if @GNULIB_MBRLEN@ +-# if @REPLACE_MBRLEN@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef mbrlen +-# define mbrlen rpl_mbrlen +-# endif +-_GL_FUNCDECL_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +-_GL_CXXALIAS_RPL (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +-# else +-# if !@HAVE_MBRLEN@ +-_GL_FUNCDECL_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +-# endif +-_GL_CXXALIAS_SYS (mbrlen, size_t, (const char *s, size_t n, mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (mbrlen); +-#elif defined GNULIB_POSIXCHECK +-# undef mbrlen +-# if HAVE_RAW_DECL_MBRLEN +-_GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - " +- "use gnulib module mbrlen for portability"); +-# endif +-#endif +- +- +-/* Convert a string to a wide string. */ +-#if @GNULIB_MBSRTOWCS@ +-# if @REPLACE_MBSRTOWCS@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef mbsrtowcs +-# define mbsrtowcs rpl_mbsrtowcs +-# endif +-_GL_FUNCDECL_RPL (mbsrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-_GL_CXXALIAS_RPL (mbsrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t len, +- mbstate_t *ps)); +-# else +-# if !@HAVE_MBSRTOWCS@ +-_GL_FUNCDECL_SYS (mbsrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-# endif +-_GL_CXXALIAS_SYS (mbsrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t len, +- mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (mbsrtowcs); +-#elif defined GNULIB_POSIXCHECK +-# undef mbsrtowcs +-# if HAVE_RAW_DECL_MBSRTOWCS +-_GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - " +- "use gnulib module mbsrtowcs for portability"); +-# endif +-#endif +- +- +-/* Convert a string to a wide string. */ +-#if @GNULIB_MBSNRTOWCS@ +-# if @REPLACE_MBSNRTOWCS@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef mbsnrtowcs +-# define mbsnrtowcs rpl_mbsnrtowcs +-# endif +-_GL_FUNCDECL_RPL (mbsnrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t srclen, size_t len, +- mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-_GL_CXXALIAS_RPL (mbsnrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t srclen, size_t len, +- mbstate_t *ps)); +-# else +-# if !@HAVE_MBSNRTOWCS@ +-_GL_FUNCDECL_SYS (mbsnrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t srclen, size_t len, +- mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-# endif +-_GL_CXXALIAS_SYS (mbsnrtowcs, size_t, +- (wchar_t *dest, const char **srcp, size_t srclen, size_t len, +- mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (mbsnrtowcs); +-#elif defined GNULIB_POSIXCHECK +-# undef mbsnrtowcs +-# if HAVE_RAW_DECL_MBSNRTOWCS +-_GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - " +- "use gnulib module mbsnrtowcs for portability"); +-# endif +-#endif +- +- +-/* Convert a wide character to a multibyte character. */ +-#if @GNULIB_WCRTOMB@ +-# if @REPLACE_WCRTOMB@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcrtomb +-# define wcrtomb rpl_wcrtomb +-# endif +-_GL_FUNCDECL_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +-_GL_CXXALIAS_RPL (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +-# else +-# if !@HAVE_WCRTOMB@ +-_GL_FUNCDECL_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +-# endif +-_GL_CXXALIAS_SYS (wcrtomb, size_t, (char *s, wchar_t wc, mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (wcrtomb); +-#elif defined GNULIB_POSIXCHECK +-# undef wcrtomb +-# if HAVE_RAW_DECL_WCRTOMB +-_GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - " +- "use gnulib module wcrtomb for portability"); +-# endif +-#endif +- +- +-/* Convert a wide string to a string. */ +-#if @GNULIB_WCSRTOMBS@ +-# if @REPLACE_WCSRTOMBS@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcsrtombs +-# define wcsrtombs rpl_wcsrtombs +-# endif +-_GL_FUNCDECL_RPL (wcsrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-_GL_CXXALIAS_RPL (wcsrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t len, +- mbstate_t *ps)); +-# else +-# if !@HAVE_WCSRTOMBS@ +-_GL_FUNCDECL_SYS (wcsrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-# endif +-_GL_CXXALIAS_SYS (wcsrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t len, +- mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (wcsrtombs); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsrtombs +-# if HAVE_RAW_DECL_WCSRTOMBS +-_GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - " +- "use gnulib module wcsrtombs for portability"); +-# endif +-#endif +- +- +-/* Convert a wide string to a string. */ +-#if @GNULIB_WCSNRTOMBS@ +-# if @REPLACE_WCSNRTOMBS@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcsnrtombs +-# define wcsnrtombs rpl_wcsnrtombs +-# endif +-_GL_FUNCDECL_RPL (wcsnrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t srclen, size_t len, +- mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-_GL_CXXALIAS_RPL (wcsnrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t srclen, size_t len, +- mbstate_t *ps)); +-# else +-# if !@HAVE_WCSNRTOMBS@ +-_GL_FUNCDECL_SYS (wcsnrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t srclen, size_t len, +- mbstate_t *ps) +- _GL_ARG_NONNULL ((2))); +-# endif +-_GL_CXXALIAS_SYS (wcsnrtombs, size_t, +- (char *dest, const wchar_t **srcp, size_t srclen, size_t len, +- mbstate_t *ps)); +-# endif +-_GL_CXXALIASWARN (wcsnrtombs); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsnrtombs +-# if HAVE_RAW_DECL_WCSNRTOMBS +-_GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - " +- "use gnulib module wcsnrtombs for portability"); +-# endif +-#endif +- +- +-/* Return the number of screen columns needed for WC. */ +-#if @GNULIB_WCWIDTH@ +-# if @REPLACE_WCWIDTH@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcwidth +-# define wcwidth rpl_wcwidth +-# endif +-_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); +-_GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); +-# else +-# if !@HAVE_DECL_WCWIDTH@ +-/* wcwidth exists but is not declared. */ +-_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); +-# endif +-_GL_CXXALIASWARN (wcwidth); +-#elif defined GNULIB_POSIXCHECK +-# undef wcwidth +-# if HAVE_RAW_DECL_WCWIDTH +-_GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - " +- "use gnulib module wcwidth for portability"); +-# endif +-#endif +- +- +-/* Search N wide characters of S for C. */ +-#if @GNULIB_WMEMCHR@ +-# if !@HAVE_WMEMCHR@ +-_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n) +- _GL_ATTRIBUTE_PURE); +-# endif +- /* On some systems, this function is defined as an overloaded function: +- extern "C++" { +- const wchar_t * std::wmemchr (const wchar_t *, wchar_t, size_t); +- wchar_t * std::wmemchr (wchar_t *, wchar_t, size_t); +- } */ +-_GL_CXXALIAS_SYS_CAST2 (wmemchr, +- wchar_t *, (const wchar_t *, wchar_t, size_t), +- const wchar_t *, (const wchar_t *, wchar_t, size_t)); +-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ +- && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +-_GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +-_GL_CXXALIASWARN1 (wmemchr, const wchar_t *, +- (const wchar_t *s, wchar_t c, size_t n)); +-# else +-_GL_CXXALIASWARN (wmemchr); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef wmemchr +-# if HAVE_RAW_DECL_WMEMCHR +-_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - " +- "use gnulib module wmemchr for portability"); +-# endif +-#endif +- +- +-/* Compare N wide characters of S1 and S2. */ +-#if @GNULIB_WMEMCMP@ +-# if !@HAVE_WMEMCMP@ +-_GL_FUNCDECL_SYS (wmemcmp, int, +- (const wchar_t *s1, const wchar_t *s2, size_t n) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wmemcmp, int, +- (const wchar_t *s1, const wchar_t *s2, size_t n)); +-_GL_CXXALIASWARN (wmemcmp); +-#elif defined GNULIB_POSIXCHECK +-# undef wmemcmp +-# if HAVE_RAW_DECL_WMEMCMP +-_GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - " +- "use gnulib module wmemcmp for portability"); +-# endif +-#endif +- +- +-/* Copy N wide characters of SRC to DEST. */ +-#if @GNULIB_WMEMCPY@ +-# if !@HAVE_WMEMCPY@ +-_GL_FUNCDECL_SYS (wmemcpy, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wmemcpy, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-_GL_CXXALIASWARN (wmemcpy); +-#elif defined GNULIB_POSIXCHECK +-# undef wmemcpy +-# if HAVE_RAW_DECL_WMEMCPY +-_GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - " +- "use gnulib module wmemcpy for portability"); +-# endif +-#endif +- +- +-/* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for +- overlapping memory areas. */ +-#if @GNULIB_WMEMMOVE@ +-# if !@HAVE_WMEMMOVE@ +-_GL_FUNCDECL_SYS (wmemmove, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wmemmove, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-_GL_CXXALIASWARN (wmemmove); +-#elif defined GNULIB_POSIXCHECK +-# undef wmemmove +-# if HAVE_RAW_DECL_WMEMMOVE +-_GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " +- "use gnulib module wmemmove for portability"); +-# endif +-#endif +- +- +-/* Set N wide characters of S to C. */ +-#if @GNULIB_WMEMSET@ +-# if !@HAVE_WMEMSET@ +-_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +-_GL_CXXALIASWARN (wmemset); +-#elif defined GNULIB_POSIXCHECK +-# undef wmemset +-# if HAVE_RAW_DECL_WMEMSET +-_GL_WARN_ON_USE (wmemset, "wmemset is unportable - " +- "use gnulib module wmemset for portability"); +-# endif +-#endif +- +- +-/* Return the number of wide characters in S. */ +-#if @GNULIB_WCSLEN@ +-# if !@HAVE_WCSLEN@ +-_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); +-_GL_CXXALIASWARN (wcslen); +-#elif defined GNULIB_POSIXCHECK +-# undef wcslen +-# if HAVE_RAW_DECL_WCSLEN +-_GL_WARN_ON_USE (wcslen, "wcslen is unportable - " +- "use gnulib module wcslen for portability"); +-# endif +-#endif +- +- +-/* Return the number of wide characters in S, but at most MAXLEN. */ +-#if @GNULIB_WCSNLEN@ +-# if !@HAVE_WCSNLEN@ +-_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); +-_GL_CXXALIASWARN (wcsnlen); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsnlen +-# if HAVE_RAW_DECL_WCSNLEN +-_GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - " +- "use gnulib module wcsnlen for portability"); +-# endif +-#endif +- +- +-/* Copy SRC to DEST. */ +-#if @GNULIB_WCSCPY@ +-# if !@HAVE_WCSCPY@ +-_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +-# endif +-_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +-_GL_CXXALIASWARN (wcscpy); +-#elif defined GNULIB_POSIXCHECK +-# undef wcscpy +-# if HAVE_RAW_DECL_WCSCPY +-_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " +- "use gnulib module wcscpy for portability"); +-# endif +-#endif +- +- +-/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ +-#if @GNULIB_WCPCPY@ +-# if !@HAVE_WCPCPY@ +-_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +-# endif +-_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +-_GL_CXXALIASWARN (wcpcpy); +-#elif defined GNULIB_POSIXCHECK +-# undef wcpcpy +-# if HAVE_RAW_DECL_WCPCPY +-_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - " +- "use gnulib module wcpcpy for portability"); +-# endif +-#endif +- +- +-/* Copy no more than N wide characters of SRC to DEST. */ +-#if @GNULIB_WCSNCPY@ +-# if !@HAVE_WCSNCPY@ +-_GL_FUNCDECL_SYS (wcsncpy, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wcsncpy, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-_GL_CXXALIASWARN (wcsncpy); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsncpy +-# if HAVE_RAW_DECL_WCSNCPY +-_GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - " +- "use gnulib module wcsncpy for portability"); +-# endif +-#endif +- +- +-/* Copy no more than N characters of SRC to DEST, returning the address of +- the last character written into DEST. */ +-#if @GNULIB_WCPNCPY@ +-# if !@HAVE_WCPNCPY@ +-_GL_FUNCDECL_SYS (wcpncpy, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wcpncpy, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-_GL_CXXALIASWARN (wcpncpy); +-#elif defined GNULIB_POSIXCHECK +-# undef wcpncpy +-# if HAVE_RAW_DECL_WCPNCPY +-_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - " +- "use gnulib module wcpncpy for portability"); +-# endif +-#endif +- +- +-/* Append SRC onto DEST. */ +-#if @GNULIB_WCSCAT@ +-# if !@HAVE_WCSCAT@ +-_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +-# endif +-_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +-_GL_CXXALIASWARN (wcscat); +-#elif defined GNULIB_POSIXCHECK +-# undef wcscat +-# if HAVE_RAW_DECL_WCSCAT +-_GL_WARN_ON_USE (wcscat, "wcscat is unportable - " +- "use gnulib module wcscat for portability"); +-# endif +-#endif +- +- +-/* Append no more than N wide characters of SRC onto DEST. */ +-#if @GNULIB_WCSNCAT@ +-# if !@HAVE_WCSNCAT@ +-_GL_FUNCDECL_SYS (wcsncat, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wcsncat, wchar_t *, +- (wchar_t *dest, const wchar_t *src, size_t n)); +-_GL_CXXALIASWARN (wcsncat); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsncat +-# if HAVE_RAW_DECL_WCSNCAT +-_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " +- "use gnulib module wcsncat for portability"); +-# endif +-#endif +- +- +-/* Compare S1 and S2. */ +-#if @GNULIB_WCSCMP@ +-# if !@HAVE_WCSCMP@ +-_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); +-_GL_CXXALIASWARN (wcscmp); +-#elif defined GNULIB_POSIXCHECK +-# undef wcscmp +-# if HAVE_RAW_DECL_WCSCMP +-_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - " +- "use gnulib module wcscmp for portability"); +-# endif +-#endif +- +- +-/* Compare no more than N wide characters of S1 and S2. */ +-#if @GNULIB_WCSNCMP@ +-# if !@HAVE_WCSNCMP@ +-_GL_FUNCDECL_SYS (wcsncmp, int, +- (const wchar_t *s1, const wchar_t *s2, size_t n) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcsncmp, int, +- (const wchar_t *s1, const wchar_t *s2, size_t n)); +-_GL_CXXALIASWARN (wcsncmp); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsncmp +-# if HAVE_RAW_DECL_WCSNCMP +-_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " +- "use gnulib module wcsncmp for portability"); +-# endif +-#endif +- +- +-/* Compare S1 and S2, ignoring case. */ +-#if @GNULIB_WCSCASECMP@ +-# if !@HAVE_WCSCASECMP@ +-_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); +-_GL_CXXALIASWARN (wcscasecmp); +-#elif defined GNULIB_POSIXCHECK +-# undef wcscasecmp +-# if HAVE_RAW_DECL_WCSCASECMP +-_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " +- "use gnulib module wcscasecmp for portability"); +-# endif +-#endif +- +- +-/* Compare no more than N chars of S1 and S2, ignoring case. */ +-#if @GNULIB_WCSNCASECMP@ +-# if !@HAVE_WCSNCASECMP@ +-_GL_FUNCDECL_SYS (wcsncasecmp, int, +- (const wchar_t *s1, const wchar_t *s2, size_t n) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcsncasecmp, int, +- (const wchar_t *s1, const wchar_t *s2, size_t n)); +-_GL_CXXALIASWARN (wcsncasecmp); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsncasecmp +-# if HAVE_RAW_DECL_WCSNCASECMP +-_GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - " +- "use gnulib module wcsncasecmp for portability"); +-# endif +-#endif +- +- +-/* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE +- category of the current locale. */ +-#if @GNULIB_WCSCOLL@ +-# if !@HAVE_WCSCOLL@ +-_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); +-# endif +-_GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); +-_GL_CXXALIASWARN (wcscoll); +-#elif defined GNULIB_POSIXCHECK +-# undef wcscoll +-# if HAVE_RAW_DECL_WCSCOLL +-_GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - " +- "use gnulib module wcscoll for portability"); +-# endif +-#endif +- +- +-/* Transform S2 into array pointed to by S1 such that if wcscmp is applied +- to two transformed strings the result is the as applying 'wcscoll' to the +- original strings. */ +-#if @GNULIB_WCSXFRM@ +-# if !@HAVE_WCSXFRM@ +-_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); +-# endif +-_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); +-_GL_CXXALIASWARN (wcsxfrm); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsxfrm +-# if HAVE_RAW_DECL_WCSXFRM +-_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " +- "use gnulib module wcsxfrm for portability"); +-# endif +-#endif +- +- +-/* Duplicate S, returning an identical malloc'd string. */ +-#if @GNULIB_WCSDUP@ +-# if !@HAVE_WCSDUP@ +-_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +-# endif +-_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +-_GL_CXXALIASWARN (wcsdup); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsdup +-# if HAVE_RAW_DECL_WCSDUP +-_GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " +- "use gnulib module wcsdup for portability"); +-# endif +-#endif +- +- +-/* Find the first occurrence of WC in WCS. */ +-#if @GNULIB_WCSCHR@ +-# if !@HAVE_WCSCHR@ +-_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc) +- _GL_ATTRIBUTE_PURE); +-# endif +- /* On some systems, this function is defined as an overloaded function: +- extern "C++" { +- const wchar_t * std::wcschr (const wchar_t *, wchar_t); +- wchar_t * std::wcschr (wchar_t *, wchar_t); +- } */ +-_GL_CXXALIAS_SYS_CAST2 (wcschr, +- wchar_t *, (const wchar_t *, wchar_t), +- const wchar_t *, (const wchar_t *, wchar_t)); +-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ +- && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +-_GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc)); +-_GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc)); +-# else +-_GL_CXXALIASWARN (wcschr); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef wcschr +-# if HAVE_RAW_DECL_WCSCHR +-_GL_WARN_ON_USE (wcschr, "wcschr is unportable - " +- "use gnulib module wcschr for portability"); +-# endif +-#endif +- +- +-/* Find the last occurrence of WC in WCS. */ +-#if @GNULIB_WCSRCHR@ +-# if !@HAVE_WCSRCHR@ +-_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc) +- _GL_ATTRIBUTE_PURE); +-# endif +- /* On some systems, this function is defined as an overloaded function: +- extern "C++" { +- const wchar_t * std::wcsrchr (const wchar_t *, wchar_t); +- wchar_t * std::wcsrchr (wchar_t *, wchar_t); +- } */ +-_GL_CXXALIAS_SYS_CAST2 (wcsrchr, +- wchar_t *, (const wchar_t *, wchar_t), +- const wchar_t *, (const wchar_t *, wchar_t)); +-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ +- && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +-_GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc)); +-_GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc)); +-# else +-_GL_CXXALIASWARN (wcsrchr); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef wcsrchr +-# if HAVE_RAW_DECL_WCSRCHR +-_GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - " +- "use gnulib module wcsrchr for portability"); +-# endif +-#endif +- +- +-/* Return the length of the initial segmet of WCS which consists entirely +- of wide characters not in REJECT. */ +-#if @GNULIB_WCSCSPN@ +-# if !@HAVE_WCSCSPN@ +-_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); +-_GL_CXXALIASWARN (wcscspn); +-#elif defined GNULIB_POSIXCHECK +-# undef wcscspn +-# if HAVE_RAW_DECL_WCSCSPN +-_GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - " +- "use gnulib module wcscspn for portability"); +-# endif +-#endif +- +- +-/* Return the length of the initial segmet of WCS which consists entirely +- of wide characters in ACCEPT. */ +-#if @GNULIB_WCSSPN@ +-# if !@HAVE_WCSSPN@ +-_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); +-_GL_CXXALIASWARN (wcsspn); +-#elif defined GNULIB_POSIXCHECK +-# undef wcsspn +-# if HAVE_RAW_DECL_WCSSPN +-_GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - " +- "use gnulib module wcsspn for portability"); +-# endif +-#endif +- +- +-/* Find the first occurrence in WCS of any character in ACCEPT. */ +-#if @GNULIB_WCSPBRK@ +-# if !@HAVE_WCSPBRK@ +-_GL_FUNCDECL_SYS (wcspbrk, wchar_t *, +- (const wchar_t *wcs, const wchar_t *accept) +- _GL_ATTRIBUTE_PURE); +-# endif +- /* On some systems, this function is defined as an overloaded function: +- extern "C++" { +- const wchar_t * std::wcspbrk (const wchar_t *, const wchar_t *); +- wchar_t * std::wcspbrk (wchar_t *, const wchar_t *); +- } */ +-_GL_CXXALIAS_SYS_CAST2 (wcspbrk, +- wchar_t *, (const wchar_t *, const wchar_t *), +- const wchar_t *, (const wchar_t *, const wchar_t *)); +-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ +- && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +-_GL_CXXALIASWARN1 (wcspbrk, wchar_t *, +- (wchar_t *wcs, const wchar_t *accept)); +-_GL_CXXALIASWARN1 (wcspbrk, const wchar_t *, +- (const wchar_t *wcs, const wchar_t *accept)); +-# else +-_GL_CXXALIASWARN (wcspbrk); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef wcspbrk +-# if HAVE_RAW_DECL_WCSPBRK +-_GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - " +- "use gnulib module wcspbrk for portability"); +-# endif +-#endif +- +- +-/* Find the first occurrence of NEEDLE in HAYSTACK. */ +-#if @GNULIB_WCSSTR@ +-# if !@HAVE_WCSSTR@ +-_GL_FUNCDECL_SYS (wcsstr, wchar_t *, +- (const wchar_t *haystack, const wchar_t *needle) +- _GL_ATTRIBUTE_PURE); +-# endif +- /* On some systems, this function is defined as an overloaded function: +- extern "C++" { +- const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *); +- wchar_t * std::wcsstr (wchar_t *, const wchar_t *); +- } */ +-_GL_CXXALIAS_SYS_CAST2 (wcsstr, +- wchar_t *, (const wchar_t *, const wchar_t *), +- const wchar_t *, (const wchar_t *, const wchar_t *)); +-# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ +- && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +-_GL_CXXALIASWARN1 (wcsstr, wchar_t *, +- (wchar_t *haystack, const wchar_t *needle)); +-_GL_CXXALIASWARN1 (wcsstr, const wchar_t *, +- (const wchar_t *haystack, const wchar_t *needle)); +-# else +-_GL_CXXALIASWARN (wcsstr); +-# endif +-#elif defined GNULIB_POSIXCHECK +-# undef wcsstr +-# if HAVE_RAW_DECL_WCSSTR +-_GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - " +- "use gnulib module wcsstr for portability"); +-# endif +-#endif +- +- +-/* Divide WCS into tokens separated by characters in DELIM. */ +-#if @GNULIB_WCSTOK@ +-# if !@HAVE_WCSTOK@ +-_GL_FUNCDECL_SYS (wcstok, wchar_t *, +- (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); +-# endif +-_GL_CXXALIAS_SYS (wcstok, wchar_t *, +- (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); +-_GL_CXXALIASWARN (wcstok); +-#elif defined GNULIB_POSIXCHECK +-# undef wcstok +-# if HAVE_RAW_DECL_WCSTOK +-_GL_WARN_ON_USE (wcstok, "wcstok is unportable - " +- "use gnulib module wcstok for portability"); +-# endif +-#endif +- +- +-/* Determine number of column positions required for first N wide +- characters (or fewer if S ends before this) in S. */ +-#if @GNULIB_WCSWIDTH@ +-# if @REPLACE_WCSWIDTH@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# undef wcswidth +-# define wcswidth rpl_wcswidth +-# endif +-_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n) +- _GL_ATTRIBUTE_PURE); +-_GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n)); +-# else +-# if !@HAVE_WCSWIDTH@ +-_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n) +- _GL_ATTRIBUTE_PURE); +-# endif +-_GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); +-# endif +-_GL_CXXALIASWARN (wcswidth); +-#elif defined GNULIB_POSIXCHECK +-# undef wcswidth +-# if HAVE_RAW_DECL_WCSWIDTH +-_GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " +- "use gnulib module wcswidth for portability"); +-# endif +-#endif +- +- +-#endif /* _@GUARD_PREFIX@_WCHAR_H */ +-#endif /* _@GUARD_PREFIX@_WCHAR_H */ +-#endif +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/wctype-h.c groff-1.22.3/src/libs/gnulib/lib/wctype-h.c +--- groff-1.22.3.old/src/libs/gnulib/lib/wctype-h.c 2014-11-04 10:38:35.631518921 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/wctype-h.c 1970-01-01 02:00:00.000000000 +0200 +@@ -1,4 +0,0 @@ +-/* Normally this would be wctype.c, but that name's already taken. */ +-#include +-#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE +-#include "wctype.h" +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/wctype.in.h groff-1.22.3/src/libs/gnulib/lib/wctype.in.h +--- groff-1.22.3.old/src/libs/gnulib/lib/wctype.in.h 2014-11-04 10:38:35.631518921 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/wctype.in.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,523 +0,0 @@ +-/* A substitute for ISO C99 , for platforms that lack it. +- +- Copyright (C) 2006-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 . */ +- +-/* Written by Bruno Haible and Paul Eggert. */ +- +-/* +- * ISO C 99 for platforms that lack it. +- * +- * +- * iswctype, towctrans, towlower, towupper, wctrans, wctype, +- * wctrans_t, and wctype_t are not yet implemented. +- */ +- +-#ifndef _@GUARD_PREFIX@_WCTYPE_H +- +-#if __GNUC__ >= 3 +-@PRAGMA_SYSTEM_HEADER@ +-#endif +-@PRAGMA_COLUMNS@ +- +- +-/* +- * XXX: As soon as groff uses gnulib in a saner way (i.e., only a single +- * `config.h' file for the whole package) this file should be replaced +- * with an unpatched version, not containing the next #include line. +- */ +-#include "../config.h" +- +- +-#if @HAVE_WINT_T@ +-/* Solaris 2.5 has a bug: must be included before . +- Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-# include +-# include +-# include +-# include +-#endif +- +-/* mingw has declarations of towupper and towlower in as +- well . Include in advance to avoid rpl_ prefix +- being added to the declarations. */ +-#ifdef __MINGW32__ +-# include +-#endif +- +-/* Include the original if it exists. +- BeOS 5 has the functions but no . */ +-/* The include_next requires a split double-inclusion guard. */ +-#if @HAVE_WCTYPE_H@ +-# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@ +-#endif +- +-#ifndef _@GUARD_PREFIX@_WCTYPE_H +-#define _@GUARD_PREFIX@_WCTYPE_H +- +-#ifndef _GL_INLINE_HEADER_BEGIN +- #error "Please include config.h first." +-#endif +-_GL_INLINE_HEADER_BEGIN +-#ifndef _GL_WCTYPE_INLINE +-# define _GL_WCTYPE_INLINE _GL_INLINE +-#endif +- +-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +- +-/* The definition of _GL_WARN_ON_USE is copied here. */ +- +-/* Solaris 2.6 includes which includes which +- #defines a number of identifiers in the application namespace. Revert +- these #defines. */ +-#ifdef __sun +-# undef multibyte +-# undef eucw1 +-# undef eucw2 +-# undef eucw3 +-# undef scrw1 +-# undef scrw2 +-# undef scrw3 +-#endif +- +-/* Define wint_t and WEOF. (Also done in wchar.in.h.) */ +-#if !@HAVE_WINT_T@ && !defined wint_t +-# define wint_t int +-# ifndef WEOF +-# define WEOF -1 +-# endif +-#else +-/* MSVC defines wint_t as 'unsigned short' in . +- This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be +- "unchanged by default argument promotions". Override it. */ +-# if defined _MSC_VER +-# if !GNULIB_defined_wint_t +-# include +-typedef unsigned int rpl_wint_t; +-# undef wint_t +-# define wint_t rpl_wint_t +-# define GNULIB_defined_wint_t 1 +-# endif +-# endif +-# ifndef WEOF +-# define WEOF ((wint_t) -1) +-# endif +-#endif +- +- +-#if !GNULIB_defined_wctype_functions +- +-/* FreeBSD 4.4 to 4.11 has but lacks the functions. +- Linux libc5 has and the functions but they are broken. +- Assume all 11 functions (all isw* except iswblank) are implemented the +- same way, or not at all. */ +-# if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ +- +-/* IRIX 5.3 has macros but no functions, its isw* macros refer to an +- undefined variable _ctmp_ and to macros like _P, and they +- refer to system functions like _iswctype that are not in the +- standard C library. Rather than try to get ancient buggy +- implementations like this to work, just disable them. */ +-# undef iswalnum +-# undef iswalpha +-# undef iswblank +-# undef iswcntrl +-# undef iswdigit +-# undef iswgraph +-# undef iswlower +-# undef iswprint +-# undef iswpunct +-# undef iswspace +-# undef iswupper +-# undef iswxdigit +-# undef towlower +-# undef towupper +- +-/* Linux libc5 has and the functions but they are broken. */ +-# if @REPLACE_ISWCNTRL@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# define iswalnum rpl_iswalnum +-# define iswalpha rpl_iswalpha +-# define iswblank rpl_iswblank +-# define iswcntrl rpl_iswcntrl +-# define iswdigit rpl_iswdigit +-# define iswgraph rpl_iswgraph +-# define iswlower rpl_iswlower +-# define iswprint rpl_iswprint +-# define iswpunct rpl_iswpunct +-# define iswspace rpl_iswspace +-# define iswupper rpl_iswupper +-# define iswxdigit rpl_iswxdigit +-# endif +-# endif +-# if @REPLACE_TOWLOWER@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# define towlower rpl_towlower +-# define towupper rpl_towupper +-# endif +-# endif +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswalnum +-# else +-iswalnum +-# endif +- (wint_t wc) +-{ +- return ((wc >= '0' && wc <= '9') +- || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswalpha +-# else +-iswalpha +-# endif +- (wint_t wc) +-{ +- return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswblank +-# else +-iswblank +-# endif +- (wint_t wc) +-{ +- return wc == ' ' || wc == '\t'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswcntrl +-# else +-iswcntrl +-# endif +- (wint_t wc) +-{ +- return (wc & ~0x1f) == 0 || wc == 0x7f; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswdigit +-# else +-iswdigit +-# endif +- (wint_t wc) +-{ +- return wc >= '0' && wc <= '9'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswgraph +-# else +-iswgraph +-# endif +- (wint_t wc) +-{ +- return wc >= '!' && wc <= '~'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswlower +-# else +-iswlower +-# endif +- (wint_t wc) +-{ +- return wc >= 'a' && wc <= 'z'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswprint +-# else +-iswprint +-# endif +- (wint_t wc) +-{ +- return wc >= ' ' && wc <= '~'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswpunct +-# else +-iswpunct +-# endif +- (wint_t wc) +-{ +- return (wc >= '!' && wc <= '~' +- && !((wc >= '0' && wc <= '9') +- || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'))); +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswspace +-# else +-iswspace +-# endif +- (wint_t wc) +-{ +- return (wc == ' ' || wc == '\t' +- || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswupper +-# else +-iswupper +-# endif +- (wint_t wc) +-{ +- return wc >= 'A' && wc <= 'Z'; +-} +- +-_GL_WCTYPE_INLINE int +-# if @REPLACE_ISWCNTRL@ +-rpl_iswxdigit +-# else +-iswxdigit +-# endif +- (wint_t wc) +-{ +- return ((wc >= '0' && wc <= '9') +- || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); +-} +- +-_GL_WCTYPE_INLINE wint_t +-# if @REPLACE_TOWLOWER@ +-rpl_towlower +-# else +-towlower +-# endif +- (wint_t wc) +-{ +- return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); +-} +- +-_GL_WCTYPE_INLINE wint_t +-# if @REPLACE_TOWLOWER@ +-rpl_towupper +-# else +-towupper +-# endif +- (wint_t wc) +-{ +- return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc); +-} +- +-# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@) +-/* Only the iswblank function is missing. */ +- +-# if @REPLACE_ISWBLANK@ +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# define iswblank rpl_iswblank +-# endif +-_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc)); +-# else +-_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); +-# endif +- +-# endif +- +-# if defined __MINGW32__ +- +-/* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. +- The functions towlower and towupper are implemented in the MSVCRT library +- to take a wchar_t argument and return a wchar_t result. mingw declares +- these functions to take a wint_t argument and return a wint_t result. +- This means that: +- 1. When the user passes an argument outside the range 0x0000..0xFFFF, the +- function will look only at the lower 16 bits. This is allowed according +- to POSIX. +- 2. The return value is returned in the lower 16 bits of the result register. +- The upper 16 bits are random: whatever happened to be in that part of the +- result register. We need to fix this by adding a zero-extend from +- wchar_t to wint_t after the call. */ +- +-_GL_WCTYPE_INLINE wint_t +-rpl_towlower (wint_t wc) +-{ +- return (wint_t) (wchar_t) towlower (wc); +-} +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# define towlower rpl_towlower +-# endif +- +-_GL_WCTYPE_INLINE wint_t +-rpl_towupper (wint_t wc) +-{ +- return (wint_t) (wchar_t) towupper (wc); +-} +-# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +-# define towupper rpl_towupper +-# endif +- +-# endif /* __MINGW32__ */ +- +-# define GNULIB_defined_wctype_functions 1 +-#endif +- +-#if @REPLACE_ISWCNTRL@ +-_GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswlower, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswprint, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswpunct, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswspace, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswupper, int, (wint_t wc)); +-_GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); +-#else +-_GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswlower, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswprint, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswpunct, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswspace, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswupper, int, (wint_t wc)); +-_GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); +-#endif +-_GL_CXXALIASWARN (iswalnum); +-_GL_CXXALIASWARN (iswalpha); +-_GL_CXXALIASWARN (iswcntrl); +-_GL_CXXALIASWARN (iswdigit); +-_GL_CXXALIASWARN (iswgraph); +-_GL_CXXALIASWARN (iswlower); +-_GL_CXXALIASWARN (iswprint); +-_GL_CXXALIASWARN (iswpunct); +-_GL_CXXALIASWARN (iswspace); +-_GL_CXXALIASWARN (iswupper); +-_GL_CXXALIASWARN (iswxdigit); +- +-#if @GNULIB_ISWBLANK@ +-# if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@ +-_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); +-# else +-_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc)); +-# endif +-_GL_CXXALIASWARN (iswblank); +-#endif +- +-#if !@HAVE_WCTYPE_T@ +-# if !GNULIB_defined_wctype_t +-typedef void * wctype_t; +-# define GNULIB_defined_wctype_t 1 +-# endif +-#endif +- +-/* Get a descriptor for a wide character property. */ +-#if @GNULIB_WCTYPE@ +-# if !@HAVE_WCTYPE_T@ +-_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)); +-# endif +-_GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); +-_GL_CXXALIASWARN (wctype); +-#elif defined GNULIB_POSIXCHECK +-# undef wctype +-# if HAVE_RAW_DECL_WCTYPE +-_GL_WARN_ON_USE (wctype, "wctype is unportable - " +- "use gnulib module wctype for portability"); +-# endif +-#endif +- +-/* Test whether a wide character has a given property. +- The argument WC must be either a wchar_t value or WEOF. +- The argument DESC must have been returned by the wctype() function. */ +-#if @GNULIB_ISWCTYPE@ +-# if !@HAVE_WCTYPE_T@ +-_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc)); +-# endif +-_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc)); +-_GL_CXXALIASWARN (iswctype); +-#elif defined GNULIB_POSIXCHECK +-# undef iswctype +-# if HAVE_RAW_DECL_ISWCTYPE +-_GL_WARN_ON_USE (iswctype, "iswctype is unportable - " +- "use gnulib module iswctype for portability"); +-# endif +-#endif +- +-#if @REPLACE_TOWLOWER@ || defined __MINGW32__ +-_GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc)); +-_GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc)); +-#else +-_GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc)); +-_GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc)); +-#endif +-_GL_CXXALIASWARN (towlower); +-_GL_CXXALIASWARN (towupper); +- +-#if !@HAVE_WCTRANS_T@ +-# if !GNULIB_defined_wctrans_t +-typedef void * wctrans_t; +-# define GNULIB_defined_wctrans_t 1 +-# endif +-#endif +- +-/* Get a descriptor for a wide character case conversion. */ +-#if @GNULIB_WCTRANS@ +-# if !@HAVE_WCTRANS_T@ +-_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name)); +-# endif +-_GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); +-_GL_CXXALIASWARN (wctrans); +-#elif defined GNULIB_POSIXCHECK +-# undef wctrans +-# if HAVE_RAW_DECL_WCTRANS +-_GL_WARN_ON_USE (wctrans, "wctrans is unportable - " +- "use gnulib module wctrans for portability"); +-# endif +-#endif +- +-/* Perform a given case conversion on a wide character. +- The argument WC must be either a wchar_t value or WEOF. +- The argument DESC must have been returned by the wctrans() function. */ +-#if @GNULIB_TOWCTRANS@ +-# if !@HAVE_WCTRANS_T@ +-_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +-# endif +-_GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +-_GL_CXXALIASWARN (towctrans); +-#elif defined GNULIB_POSIXCHECK +-# undef towctrans +-# if HAVE_RAW_DECL_TOWCTRANS +-_GL_WARN_ON_USE (towctrans, "towctrans is unportable - " +- "use gnulib module towctrans for portability"); +-# endif +-#endif +- +-_GL_INLINE_HEADER_END +- +-#endif /* _@GUARD_PREFIX@_WCTYPE_H */ +-#endif /* _@GUARD_PREFIX@_WCTYPE_H */ +diff -Nuar groff-1.22.3.old/src/libs/gnulib/lib/wcwidth.c groff-1.22.3/src/libs/gnulib/lib/wcwidth.c +--- groff-1.22.3.old/src/libs/gnulib/lib/wcwidth.c 2014-11-04 10:38:35.631518921 +0200 ++++ groff-1.22.3/src/libs/gnulib/lib/wcwidth.c 1970-01-01 02:00:00.000000000 +0200 +@@ -1,50 +0,0 @@ +-/* Determine the number of screen columns needed for a character. +- Copyright (C) 2006-2007, 2010-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 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 . */ +- +-#include +- +-/* Specification. */ +-#include +- +-/* Get iswprint. */ +-#include +- +-#include "localcharset.h" +-#include "streq.h" +-#include "uniwidth.h" +- +-int +-wcwidth (wchar_t wc) +-#undef wcwidth +-{ +- /* In UTF-8 locales, use a Unicode aware width function. */ +- const char *encoding = locale_charset (); +- if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0 ,0)) +- { +- /* We assume that in a UTF-8 locale, a wide character is the same as a +- Unicode character. */ +- return uc_width (wc, encoding); +- } +- else +- { +- /* Otherwise, fall back to the system's wcwidth function. */ +-#if HAVE_WCWIDTH +- return wcwidth (wc); +-#else +- return wc == 0 ? 0 : iswprint (wc) ? 1 : -1; +-#endif +- } +-} +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/00gnulib.m4 groff-1.22.3/src/libs/gnulib/m4/00gnulib.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/00gnulib.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/00gnulib.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,46 +0,0 @@ +-# 00gnulib.m4 serial 3 +-dnl Copyright (C) 2009-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 This file must be named something that sorts before all other +-dnl gnulib-provided .m4 files. It is needed until such time as we can +-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and +-dnl m4_divert semantics. +- +-# Until autoconf 2.63, handling of the diversion stack required m4_init +-# to be called first; but this does not happen with aclocal. Wrapping +-# the entire execution in another layer of the diversion stack fixes this. +-# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4 +-# for whether it was FIFO or LIFO; in order to properly balance with +-# m4_init, we need to undo our push just before anything wrapped within +-# the m4_init body. The way to ensure this is to wrap both sides of +-# m4_init with a one-shot macro that does the pop at the right time. +-m4_ifndef([_m4_divert_diversion], +-[m4_divert_push([KILL]) +-m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])]) +-m4_define([m4_init], +- [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])]) +- +- +-# AC_DEFUN_ONCE([NAME], VALUE) +-# ---------------------------- +-# Define NAME to expand to VALUE on the first use (whether by direct +-# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses. +-# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This +-# definition is slower than the version in Autoconf 2.64, because it +-# can only use interfaces that existed since 2.59; but it achieves the +-# same effect. Quoting is necessary to avoid confusing Automake. +-m4_version_prereq([2.63.263], [], +-[m4_define([AC][_DEFUN_ONCE], +- [AC][_DEFUN([$1], +- [AC_REQUIRE([_gl_DEFUN_ONCE([$1])], +- [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl +-[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) +- +-# gl_00GNULIB +-# ----------- +-# Witness macro that this file has been included. Needed to force +-# Automake to include this file prior to all other gnulib .m4 files. +-AC_DEFUN([gl_00GNULIB]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/codeset.m4 groff-1.22.3/src/libs/gnulib/m4/codeset.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/codeset.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/codeset.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,23 +0,0 @@ +-# codeset.m4 serial 5 (gettext-0.18.2) +-dnl Copyright (C) 2000-2002, 2006, 2008-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 From Bruno Haible. +- +-AC_DEFUN([AM_LANGINFO_CODESET], +-[ +- AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], +- [AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include ]], +- [[char* cs = nl_langinfo(CODESET); return !cs;]])], +- [am_cv_langinfo_codeset=yes], +- [am_cv_langinfo_codeset=no]) +- ]) +- if test $am_cv_langinfo_codeset = yes; then +- AC_DEFINE([HAVE_LANGINFO_CODESET], [1], +- [Define if you have and nl_langinfo(CODESET).]) +- fi +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/configmake.m4 groff-1.22.3/src/libs/gnulib/m4/configmake.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/configmake.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/configmake.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,55 +0,0 @@ +-# configmake.m4 serial 2 +-dnl Copyright (C) 2010-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. +- +-# gl_CONFIGMAKE_PREP +-# ------------------ +-# Guarantee all of the standard directory variables, even when used with +-# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir +-# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b, +-# and runstatedir in 1.14.1). +-AC_DEFUN([gl_CONFIGMAKE_PREP], +-[ +- dnl Technically, datadir should default to datarootdir. But if +- dnl autoconf is too old to provide datarootdir, then reversing the +- dnl definition is a reasonable compromise. Only AC_SUBST a variable +- dnl if it was not already defined earlier by autoconf. +- if test "x$datarootdir" = x; then +- AC_SUBST([datarootdir], ['${datadir}']) +- fi +- dnl Copy the approach used in autoconf 2.60. +- if test "x$docdir" = x; then +- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], +- ['${datarootdir}/doc/${PACKAGE_TARNAME}'], +- ['${datarootdir}/doc/${PACKAGE}'])]) +- fi +- dnl The remaining variables missing from autoconf 2.59 are easier. +- if test "x$htmldir" = x; then +- AC_SUBST([htmldir], ['${docdir}']) +- fi +- if test "x$dvidir" = x; then +- AC_SUBST([dvidir], ['${docdir}']) +- fi +- if test "x$pdfdir" = x; then +- AC_SUBST([pdfdir], ['${docdir}']) +- fi +- if test "x$psdir" = x; then +- AC_SUBST([psdir], ['${docdir}']) +- fi +- if test "x$lispdir" = x; then +- AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp']) +- fi +- if test "x$localedir" = x; then +- AC_SUBST([localedir], ['${datarootdir}/locale']) +- fi +- dnl Added in autoconf 2.70 +- if test "x$runstatedir" = x; then +- AC_SUBST([runstatedir], ['${localstatedir}/run']) +- fi +- +- dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely +- dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. +- AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}']) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/extensions.m4 groff-1.22.3/src/libs/gnulib/m4/extensions.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/extensions.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/extensions.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,138 +0,0 @@ +-# serial 13 -*- Autoconf -*- +-# Enable extensions on systems that normally disable them. +- +-# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git +-# Autoconf. Perhaps we can remove this once we can assume Autoconf +-# 2.70 or later everywhere, but since Autoconf mutates rapidly +-# enough in this area it's likely we'll need to redefine +-# AC_USE_SYSTEM_EXTENSIONS for quite some time. +- +-# If autoconf reports a warning +-# warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS +-# or warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS +-# the fix is +-# 1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked +-# but always AC_REQUIREd, +-# 2) to ensure that for each occurrence of +-# AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +-# or +-# AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) +-# the corresponding gnulib module description has 'extensions' among +-# its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS +-# invocation occurs in gl_EARLY, not in gl_INIT. +- +-# AC_USE_SYSTEM_EXTENSIONS +-# ------------------------ +-# Enable extensions on systems that normally disable them, +-# typically due to standards-conformance issues. +-# +-# Remember that #undef in AH_VERBATIM gets replaced with #define by +-# AC_DEFINE. The goal here is to define all known feature-enabling +-# macros, then, if reports of conflicts are made, disable macros that +-# cause problems on some platforms (such as __EXTENSIONS__). +-AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], +-[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl +-AC_BEFORE([$0], [AC_RUN_IFELSE])dnl +- +- AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=]) +- if test "$MINIX" = yes; then +- AC_DEFINE([_POSIX_SOURCE], [1], +- [Define to 1 if you need to in order for 'stat' and other +- things to work.]) +- AC_DEFINE([_POSIX_1_SOURCE], [2], +- [Define to 2 if the system does not provide POSIX.1 features +- except with this defined.]) +- AC_DEFINE([_MINIX], [1], +- [Define to 1 if on MINIX.]) +- AC_DEFINE([_NETBSD_SOURCE], [1], +- [Define to 1 to make NetBSD features available. MINIX 3 needs this.]) +- fi +- +-dnl Use a different key than __EXTENSIONS__, as that name broke existing +-dnl configure.ac when using autoheader 2.62. +- AH_VERBATIM([USE_SYSTEM_EXTENSIONS], +-[/* Enable extensions on AIX 3, Interix. */ +-#ifndef _ALL_SOURCE +-# undef _ALL_SOURCE +-#endif +-/* Enable general extensions on OS X. */ +-#ifndef _DARWIN_C_SOURCE +-# undef _DARWIN_C_SOURCE +-#endif +-/* Enable GNU extensions on systems that have them. */ +-#ifndef _GNU_SOURCE +-# undef _GNU_SOURCE +-#endif +-/* Enable threading extensions on Solaris. */ +-#ifndef _POSIX_PTHREAD_SEMANTICS +-# undef _POSIX_PTHREAD_SEMANTICS +-#endif +-/* Enable extensions on HP NonStop. */ +-#ifndef _TANDEM_SOURCE +-# undef _TANDEM_SOURCE +-#endif +-/* Enable X/Open extensions if necessary. HP-UX 11.11 defines +- mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of +- whether compiling with -Ae or -D_HPUX_SOURCE=1. */ +-#ifndef _XOPEN_SOURCE +-# undef _XOPEN_SOURCE +-#endif +-/* Enable general extensions on Solaris. */ +-#ifndef __EXTENSIONS__ +-# undef __EXTENSIONS__ +-#endif +-]) +- AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], +- [ac_cv_safe_to_define___extensions__], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([[ +-# define __EXTENSIONS__ 1 +- ]AC_INCLUDES_DEFAULT])], +- [ac_cv_safe_to_define___extensions__=yes], +- [ac_cv_safe_to_define___extensions__=no])]) +- test $ac_cv_safe_to_define___extensions__ = yes && +- AC_DEFINE([__EXTENSIONS__]) +- AC_DEFINE([_ALL_SOURCE]) +- AC_DEFINE([_DARWIN_C_SOURCE]) +- AC_DEFINE([_GNU_SOURCE]) +- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) +- AC_DEFINE([_TANDEM_SOURCE]) +- AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], +- [ac_cv_should_define__xopen_source], +- [ac_cv_should_define__xopen_source=no +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([[ +- #include +- mbstate_t x;]])], +- [], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([[ +- #define _XOPEN_SOURCE 500 +- #include +- mbstate_t x;]])], +- [ac_cv_should_define__xopen_source=yes])])]) +- test $ac_cv_should_define__xopen_source = yes && +- AC_DEFINE([_XOPEN_SOURCE], [500]) +-])# AC_USE_SYSTEM_EXTENSIONS +- +-# gl_USE_SYSTEM_EXTENSIONS +-# ------------------------ +-# Enable extensions on systems that normally disable them, +-# typically due to standards-conformance issues. +-AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], +-[ +- dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS. +- dnl gnulib does not need it. But if it gets required by third-party macros +- dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a +- dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". +- dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE, +- dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck. +- AC_REQUIRE([AC_GNU_SOURCE]) +- +- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/extern-inline.m4 groff-1.22.3/src/libs/gnulib/m4/extern-inline.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/extern-inline.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/extern-inline.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,62 +0,0 @@ +-dnl 'extern inline' a la ISO C99. +- +-dnl Copyright 2012-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. +- +-AC_DEFUN([gl_EXTERN_INLINE], +-[ +- AH_VERBATIM([extern_inline], +-[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. +- _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. +- _GL_INLINE_HEADER_BEGIN contains useful stuff to put +- in an include file, before uses of _GL_INLINE. +- It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, +- when FOO is an inline function in the header; see +- . +- _GL_INLINE_HEADER_END contains useful stuff to put +- in the same include file, after uses of _GL_INLINE. +- +- Suppress the use of extern inline on Apple's platforms, +- as Libc-825.25 (2012-09-19) is incompatible with it; see +- . +- Perhaps Apple will fix this some day. */ +-#if ((__GNUC__ \ +- ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ +- : 199901L <= __STDC_VERSION__) \ +- && !defined __APPLE__) +-# define _GL_INLINE inline +-# define _GL_EXTERN_INLINE extern inline +-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +-# if __GNUC_GNU_INLINE__ +- /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +-# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +-# else +-# define _GL_INLINE extern inline +-# endif +-# define _GL_EXTERN_INLINE extern +-#else +-# define _GL_INLINE static _GL_UNUSED +-# define _GL_EXTERN_INLINE static _GL_UNUSED +-#endif +- +-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +-# define _GL_INLINE_HEADER_CONST_PRAGMA +-# else +-# define _GL_INLINE_HEADER_CONST_PRAGMA \ +- _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +-# endif +-# define _GL_INLINE_HEADER_BEGIN \ +- _Pragma ("GCC diagnostic push") \ +- _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ +- _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ +- _GL_INLINE_HEADER_CONST_PRAGMA +-# define _GL_INLINE_HEADER_END \ +- _Pragma ("GCC diagnostic pop") +-#else +-# define _GL_INLINE_HEADER_BEGIN +-# define _GL_INLINE_HEADER_END +-#endif]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/fcntl-o.m4 groff-1.22.3/src/libs/gnulib/m4/fcntl-o.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/fcntl-o.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/fcntl-o.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,134 +0,0 @@ +-# fcntl-o.m4 serial 4 +-dnl Copyright (C) 2006, 2009-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 Written by Paul Eggert. +- +-# Test whether the flags O_NOATIME and O_NOFOLLOW actually work. +-# Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise. +-# Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise. +-AC_DEFUN([gl_FCNTL_O_FLAGS], +-[ +- dnl Persuade glibc to define O_NOATIME and O_NOFOLLOW. +- dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes +- dnl AC_GNU_SOURCE. +- m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], +- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], +- [AC_REQUIRE([AC_GNU_SOURCE])]) +- +- AC_CHECK_HEADERS_ONCE([unistd.h]) +- AC_CHECK_FUNCS_ONCE([symlink]) +- AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], +- [AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +- #include +- #if HAVE_UNISTD_H +- # include +- #else /* on Windows with MSVC */ +- # include +- # include +- # defined sleep(n) _sleep ((n) * 1000) +- #endif +- #include +- #ifndef O_NOATIME +- #define O_NOATIME 0 +- #endif +- #ifndef O_NOFOLLOW +- #define O_NOFOLLOW 0 +- #endif +- static int const constants[] = +- { +- O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND, +- O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY +- }; +- ]], +- [[ +- int result = !constants; +- #if HAVE_SYMLINK +- { +- static char const sym[] = "conftest.sym"; +- if (symlink ("/dev/null", sym) != 0) +- result |= 2; +- else +- { +- int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); +- if (fd >= 0) +- { +- close (fd); +- result |= 4; +- } +- } +- if (unlink (sym) != 0 || symlink (".", sym) != 0) +- result |= 2; +- else +- { +- int fd = open (sym, O_RDONLY | O_NOFOLLOW); +- if (fd >= 0) +- { +- close (fd); +- result |= 4; +- } +- } +- unlink (sym); +- } +- #endif +- { +- static char const file[] = "confdefs.h"; +- int fd = open (file, O_RDONLY | O_NOATIME); +- if (fd < 0) +- result |= 8; +- else +- { +- struct stat st0; +- if (fstat (fd, &st0) != 0) +- result |= 16; +- else +- { +- char c; +- sleep (1); +- if (read (fd, &c, 1) != 1) +- result |= 24; +- else +- { +- if (close (fd) != 0) +- result |= 32; +- else +- { +- struct stat st1; +- if (stat (file, &st1) != 0) +- result |= 40; +- else +- if (st0.st_atime != st1.st_atime) +- result |= 64; +- } +- } +- } +- } +- } +- return result;]])], +- [gl_cv_header_working_fcntl_h=yes], +- [case $? in #( +- 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( +- 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( +- 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( +- *) gl_cv_header_working_fcntl_h='no';; +- esac], +- [gl_cv_header_working_fcntl_h=cross-compiling])]) +- +- case $gl_cv_header_working_fcntl_h in #( +- *O_NOATIME* | no | cross-compiling) ac_val=0;; #( +- *) ac_val=1;; +- esac +- AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val], +- [Define to 1 if O_NOATIME works.]) +- +- case $gl_cv_header_working_fcntl_h in #( +- *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #( +- *) ac_val=1;; +- esac +- AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val], +- [Define to 1 if O_NOFOLLOW works.]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/glibc21.m4 groff-1.22.3/src/libs/gnulib/m4/glibc21.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/glibc21.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/glibc21.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,34 +0,0 @@ +-# glibc21.m4 serial 5 +-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-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. +- +-# Test for the GNU C Library, version 2.1 or newer, or uClibc. +-# From Bruno Haible. +- +-AC_DEFUN([gl_GLIBC21], +- [ +- AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc], +- [ac_cv_gnu_library_2_1], +- [AC_EGREP_CPP([Lucky], +- [ +-#include +-#ifdef __GNU_LIBRARY__ +- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) +- Lucky GNU user +- #endif +-#endif +-#ifdef __UCLIBC__ +- Lucky user +-#endif +- ], +- [ac_cv_gnu_library_2_1=yes], +- [ac_cv_gnu_library_2_1=no]) +- ] +- ) +- AC_SUBST([GLIBC21]) +- GLIBC21="$ac_cv_gnu_library_2_1" +- ] +-) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/gnulib-cache.m4 groff-1.22.3/src/libs/gnulib/m4/gnulib-cache.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/gnulib-cache.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/gnulib-cache.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,47 +0,0 @@ +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# +-# 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 +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. +-# +-# This 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 file. If not, see . +-# +-# As a special exception to the GNU General Public License, +-# this file may be distributed as part of a program that +-# contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# Generated by gnulib-tool. +-# +-# This file represents the specification of how gnulib-tool is used. +-# It acts as a cache: It is written and read by gnulib-tool. +-# In projects that use version control, this file is meant to be put under +-# version control, like the configure.ac and various Makefile.am files. +- +- +-# Specification in the form of a command-line invocation: +-# gnulib-tool --import --dir=src/libs/gnulib --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl wcwidth +- +-# Specification in the form of a few gnulib-tool.m4 macro invocations: +-gl_LOCAL_DIR([]) +-gl_MODULES([ +- wcwidth +-]) +-gl_AVOID([]) +-gl_SOURCE_BASE([lib]) +-gl_M4_BASE([m4]) +-gl_PO_BASE([]) +-gl_DOC_BASE([doc]) +-gl_TESTS_BASE([tests]) +-gl_LIB([libgnu]) +-gl_MAKEFILE_NAME([]) +-gl_MACRO_PREFIX([gl]) +-gl_PO_DOMAIN([]) +-gl_WITNESS_C_MACRO([]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/gnulib-common.m4 groff-1.22.3/src/libs/gnulib/m4/gnulib-common.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/gnulib-common.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/gnulib-common.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,377 +0,0 @@ +-# gnulib-common.m4 serial 33 +-dnl Copyright (C) 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. +- +-# gl_COMMON +-# is expanded unconditionally through gnulib-tool magic. +-AC_DEFUN([gl_COMMON], [ +- dnl Use AC_REQUIRE here, so that the code is expanded once only. +- AC_REQUIRE([gl_00GNULIB]) +- AC_REQUIRE([gl_COMMON_BODY]) +-]) +-AC_DEFUN([gl_COMMON_BODY], [ +- AH_VERBATIM([_Noreturn], +-[/* The _Noreturn keyword of C11. */ +-#if ! (defined _Noreturn \ +- || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) +-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ +- || 0x5110 <= __SUNPRO_C) +-# define _Noreturn __attribute__ ((__noreturn__)) +-# elif defined _MSC_VER && 1200 <= _MSC_VER +-# define _Noreturn __declspec (noreturn) +-# else +-# define _Noreturn +-# endif +-#endif +-]) +- AH_VERBATIM([isoc99_inline], +-[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports +- the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of +- earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. +- __APPLE__ && __MACH__ test for Mac OS X. +- __APPLE_CC__ tests for the Apple compiler and its version. +- __STDC_VERSION__ tests for the C99 mode. */ +-#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +-# define __GNUC_STDC_INLINE__ 1 +-#endif]) +- AH_VERBATIM([unused_parameter], +-[/* Define as a marker that can be attached to declarations that might not +- be used. This helps to reduce warnings, such as from +- GCC -Wunused-parameter. */ +-#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +-# define _GL_UNUSED __attribute__ ((__unused__)) +-#else +-# define _GL_UNUSED +-#endif +-/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name +- is a misnomer outside of parameter lists. */ +-#define _UNUSED_PARAMETER_ _GL_UNUSED +- +-/* The __pure__ attribute was added in gcc 2.96. */ +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) +-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +-#else +-# define _GL_ATTRIBUTE_PURE /* empty */ +-#endif +- +-/* The __const__ attribute was added in gcc 2.95. */ +-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +-#else +-# define _GL_ATTRIBUTE_CONST /* empty */ +-#endif +-]) +- dnl Preparation for running test programs: +- dnl Tell glibc to write diagnostics from -D_FORTIFY_SOURCE=2 to stderr, not +- dnl to /dev/tty, so they can be redirected to log files. Such diagnostics +- dnl arise e.g., in the macros gl_PRINTF_DIRECTIVE_N, gl_SNPRINTF_DIRECTIVE_N. +- LIBC_FATAL_STDERR_=1 +- export LIBC_FATAL_STDERR_ +-]) +- +-# gl_MODULE_INDICATOR_CONDITION +-# expands to a C preprocessor expression that evaluates to 1 or 0, depending +-# whether a gnulib module that has been requested shall be considered present +-# or not. +-m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) +- +-# gl_MODULE_INDICATOR_SET_VARIABLE([modulename]) +-# sets the shell variable that indicates the presence of the given module to +-# a C preprocessor expression that will evaluate to 1. +-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], +-[ +- gl_MODULE_INDICATOR_SET_VARIABLE_AUX( +- [GNULIB_[]m4_translit([[$1]], +- [abcdefghijklmnopqrstuvwxyz./-], +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], +- [gl_MODULE_INDICATOR_CONDITION]) +-]) +- +-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX([variable]) +-# modifies the shell variable to include the gl_MODULE_INDICATOR_CONDITION. +-# The shell variable's value is a C preprocessor expression that evaluates +-# to 0 or 1. +-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX], +-[ +- m4_if(m4_defn([gl_MODULE_INDICATOR_CONDITION]), [1], +- [ +- dnl Simplify the expression VALUE || 1 to 1. +- $1=1 +- ], +- [gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([$1], +- [gl_MODULE_INDICATOR_CONDITION])]) +-]) +- +-# gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR([variable], [condition]) +-# modifies the shell variable to include the given condition. The shell +-# variable's value is a C preprocessor expression that evaluates to 0 or 1. +-AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE_AUX_OR], +-[ +- dnl Simplify the expression 1 || CONDITION to 1. +- if test "$[]$1" != 1; then +- dnl Simplify the expression 0 || CONDITION to CONDITION. +- if test "$[]$1" = 0; then +- $1=$2 +- else +- $1="($[]$1 || $2)" +- fi +- fi +-]) +- +-# gl_MODULE_INDICATOR([modulename]) +-# defines a C macro indicating the presence of the given module +-# in a location where it can be used. +-# | Value | Value | +-# | in lib/ | in tests/ | +-# --------------------------------------------+---------+-----------+ +-# Module present among main modules: | 1 | 1 | +-# --------------------------------------------+---------+-----------+ +-# Module present among tests-related modules: | 0 | 1 | +-# --------------------------------------------+---------+-----------+ +-# Module not present at all: | 0 | 0 | +-# --------------------------------------------+---------+-----------+ +-AC_DEFUN([gl_MODULE_INDICATOR], +-[ +- AC_DEFINE_UNQUOTED([GNULIB_]m4_translit([[$1]], +- [abcdefghijklmnopqrstuvwxyz./-], +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), +- [gl_MODULE_INDICATOR_CONDITION], +- [Define to a C preprocessor expression that evaluates to 1 or 0, +- depending whether the gnulib module $1 shall be considered present.]) +-]) +- +-# gl_MODULE_INDICATOR_FOR_TESTS([modulename]) +-# defines a C macro indicating the presence of the given module +-# in lib or tests. This is useful to determine whether the module +-# should be tested. +-# | Value | Value | +-# | in lib/ | in tests/ | +-# --------------------------------------------+---------+-----------+ +-# Module present among main modules: | 1 | 1 | +-# --------------------------------------------+---------+-----------+ +-# Module present among tests-related modules: | 1 | 1 | +-# --------------------------------------------+---------+-----------+ +-# Module not present at all: | 0 | 0 | +-# --------------------------------------------+---------+-----------+ +-AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], +-[ +- AC_DEFINE([GNULIB_TEST_]m4_translit([[$1]], +- [abcdefghijklmnopqrstuvwxyz./-], +- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___]), [1], +- [Define to 1 when the gnulib module $1 should be tested.]) +-]) +- +-# gl_ASSERT_NO_GNULIB_POSIXCHECK +-# asserts that there will never be a need to #define GNULIB_POSIXCHECK. +-# and thereby enables an optimization of configure and config.h. +-# Used by Emacs. +-AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], +-[ +- dnl Override gl_WARN_ON_USE_PREPARE. +- dnl But hide this definition from 'aclocal'. +- AC_DEFUN([gl_W][ARN_ON_USE_PREPARE], []) +-]) +- +-# gl_ASSERT_NO_GNULIB_TESTS +-# asserts that there will be no gnulib tests in the scope of the configure.ac +-# and thereby enables an optimization of config.h. +-# Used by Emacs. +-AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], +-[ +- dnl Override gl_MODULE_INDICATOR_FOR_TESTS. +- AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], []) +-]) +- +-# Test whether exists. +-# Set HAVE_FEATURES_H. +-AC_DEFUN([gl_FEATURES_H], +-[ +- AC_CHECK_HEADERS_ONCE([features.h]) +- if test $ac_cv_header_features_h = yes; then +- HAVE_FEATURES_H=1 +- else +- HAVE_FEATURES_H=0 +- fi +- AC_SUBST([HAVE_FEATURES_H]) +-]) +- +-# m4_foreach_w +-# is a backport of autoconf-2.59c's m4_foreach_w. +-# Remove this macro when we can assume autoconf >= 2.60. +-m4_ifndef([m4_foreach_w], +- [m4_define([m4_foreach_w], +- [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) +- +-# AS_VAR_IF(VAR, VALUE, [IF-MATCH], [IF-NOT-MATCH]) +-# ---------------------------------------------------- +-# Backport of autoconf-2.63b's macro. +-# Remove this macro when we can assume autoconf >= 2.64. +-m4_ifndef([AS_VAR_IF], +-[m4_define([AS_VAR_IF], +-[AS_IF([test x"AS_VAR_GET([$1])" = x""$2], [$3], [$4])])]) +- +-# gl_PROG_CC_C99 +-# Modifies the value of the shell variable CC in an attempt to make $CC +-# understand ISO C99 source code. +-# This is like AC_PROG_CC_C99, except that +-# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60, +-# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC +-# , +-# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99 +-# . +-# Remaining problems: +-# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options +-# to CC twice +-# . +-# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard. +-AC_DEFUN([gl_PROG_CC_C99], +-[ +- dnl Change that version number to the minimum Autoconf version that supports +- dnl mixing AC_PROG_CC_C99 calls with AC_PROG_CC_STDC calls. +- m4_version_prereq([9.0], +- [AC_REQUIRE([AC_PROG_CC_C99])], +- [AC_REQUIRE([AC_PROG_CC_STDC])]) +-]) +- +-# gl_PROG_AR_RANLIB +-# Determines the values for AR, ARFLAGS, RANLIB that fit with the compiler. +-# The user can set the variables AR, ARFLAGS, RANLIB if he wants to override +-# the values. +-AC_DEFUN([gl_PROG_AR_RANLIB], +-[ +- dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler +- dnl as "cc", and GCC as "gcc". They have different object file formats and +- dnl library formats. In particular, the GNU binutils programs ar, ranlib +- dnl produce libraries that work only with gcc, not with cc. +- AC_REQUIRE([AC_PROG_CC]) +- AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler], +- [ +- AC_EGREP_CPP([Amsterdam], +- [ +-#ifdef __ACK__ +-Amsterdam +-#endif +- ], +- [gl_cv_c_amsterdam_compiler=yes], +- [gl_cv_c_amsterdam_compiler=no]) +- ]) +- if test -z "$AR"; then +- if test $gl_cv_c_amsterdam_compiler = yes; then +- AR='cc -c.a' +- if test -z "$ARFLAGS"; then +- ARFLAGS='-o' +- fi +- else +- dnl Use the Automake-documented default values for AR and ARFLAGS, +- dnl but prefer ${host}-ar over ar (useful for cross-compiling). +- AC_CHECK_TOOL([AR], [ar], [ar]) +- if test -z "$ARFLAGS"; then +- ARFLAGS='cru' +- fi +- fi +- else +- if test -z "$ARFLAGS"; then +- ARFLAGS='cru' +- fi +- fi +- AC_SUBST([AR]) +- AC_SUBST([ARFLAGS]) +- if test -z "$RANLIB"; then +- if test $gl_cv_c_amsterdam_compiler = yes; then +- RANLIB=':' +- else +- dnl Use the ranlib program if it is available. +- AC_PROG_RANLIB +- fi +- fi +- AC_SUBST([RANLIB]) +-]) +- +-# AC_PROG_MKDIR_P +-# is a backport of autoconf-2.60's AC_PROG_MKDIR_P, with a fix +-# for interoperability with automake-1.9.6 from autoconf-2.62. +-# Remove this macro when we can assume autoconf >= 2.62 or +-# autoconf >= 2.60 && automake >= 1.10. +-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +-m4_ifndef([AC_AUTOCONF_VERSION],[ +-m4_ifdef([AC_PROG_MKDIR_P], [ +- dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed. +- m4_define([AC_PROG_MKDIR_P], +- m4_defn([AC_PROG_MKDIR_P])[ +- AC_SUBST([MKDIR_P])])], [ +- dnl For autoconf < 2.60: Backport of AC_PROG_MKDIR_P. +- AC_DEFUN_ONCE([AC_PROG_MKDIR_P], +- [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake +- MKDIR_P='$(mkdir_p)' +- AC_SUBST([MKDIR_P])])]) +-]) +- +-# AC_C_RESTRICT +-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, +-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ +-# works. +-# This definition can be removed once autoconf >= 2.62 can be assumed. +-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +-m4_ifndef([AC_AUTOCONF_VERSION],[ +-AC_DEFUN([AC_C_RESTRICT], +-[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], +- [ac_cv_c_restrict=no +- # The order here caters to the fact that C++ does not require restrict. +- for ac_kw in __restrict __restrict__ _Restrict restrict; do +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +- [[typedef int * int_ptr; +- int foo (int_ptr $ac_kw ip) { +- return ip[0]; +- }]], +- [[int s[1]; +- int * $ac_kw t = s; +- t[0] = 0; +- return foo(t)]])], +- [ac_cv_c_restrict=$ac_kw]) +- test "$ac_cv_c_restrict" != no && break +- done +- ]) +- AH_VERBATIM([restrict], +-[/* Define to the equivalent of the C99 'restrict' keyword, or to +- nothing if this is not supported. Do not define if restrict is +- supported directly. */ +-#undef restrict +-/* Work around a bug in Sun C++: it does not support _Restrict, even +- though the corresponding Sun C compiler does, which causes +- "#define restrict _Restrict" in the previous line. Perhaps some future +- version of Sun C++ will work with _Restrict; if so, it'll probably +- define __RESTRICT, just as Sun C does. */ +-#if defined __SUNPRO_CC && !defined __RESTRICT +-# define _Restrict +-#endif]) +- case $ac_cv_c_restrict in +- restrict) ;; +- no) AC_DEFINE([restrict], []) ;; +- *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; +- esac +-]) +-]) +- +-# gl_BIGENDIAN +-# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. +-# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some +-# macros invoke AC_C_BIGENDIAN with arguments. +-AC_DEFUN([gl_BIGENDIAN], +-[ +- AC_C_BIGENDIAN +-]) +- +-# gl_CACHE_VAL_SILENT(cache-id, command-to-set-it) +-# is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not +-# output a spurious "(cached)" mark in the midst of other configure output. +-# This macro should be used instead of AC_CACHE_VAL when it is not surrounded +-# by an AC_MSG_CHECKING/AC_MSG_RESULT pair. +-AC_DEFUN([gl_CACHE_VAL_SILENT], +-[ +- saved_as_echo_n="$as_echo_n" +- as_echo_n=':' +- AC_CACHE_VAL([$1], [$2]) +- as_echo_n="$saved_as_echo_n" +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/gnulib-comp.m4 groff-1.22.3/src/libs/gnulib/m4/gnulib-comp.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/gnulib-comp.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/gnulib-comp.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,278 +0,0 @@ +-# DO NOT EDIT! GENERATED AUTOMATICALLY! +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. +-# +-# 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 +-# the Free Software Foundation; either version 3 of the License, or +-# (at your option) any later version. +-# +-# This 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 file. If not, see . +-# +-# As a special exception to the GNU General Public License, +-# this file may be distributed as part of a program that +-# contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# Generated by gnulib-tool. +-# +-# This file represents the compiled summary of the specification in +-# gnulib-cache.m4. It lists the computed macro invocations that need +-# to be invoked from configure.ac. +-# In projects that use version control, this file can be treated like +-# other built files. +- +- +-# This macro should be invoked from src/libs/gnulib/configure.ac, in the section +-# "Checks for programs", right after AC_PROG_CC, and certainly before +-# any checks for libraries, header files, types and library functions. +-AC_DEFUN([gl_EARLY], +-[ +- m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace +- m4_pattern_allow([^gl_ES$])dnl a valid locale name +- m4_pattern_allow([^gl_LIBOBJS$])dnl a variable +- m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable +- AC_REQUIRE([gl_PROG_AR_RANLIB]) +- AC_REQUIRE([AM_PROG_CC_C_O]) +- # Code from module configmake: +- # Code from module extensions: +- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) +- # Code from module extern-inline: +- # Code from module include_next: +- # Code from module localcharset: +- # Code from module multiarch: +- # Code from module snippet/arg-nonnull: +- # Code from module snippet/c++defs: +- # Code from module snippet/warn-on-use: +- # Code from module stddef: +- # Code from module stdint: +- # Code from module streq: +- # Code from module unitypes: +- # Code from module uniwidth/base: +- # Code from module uniwidth/width: +- # Code from module wchar: +- # Code from module wctype-h: +- # Code from module wcwidth: +-]) +- +-# This macro should be invoked from src/libs/gnulib/configure.ac, in the section +-# "Check for header files, types and library functions". +-AC_DEFUN([gl_INIT], +-[ +- AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) +- gl_cond_libtool=false +- gl_libdeps= +- gl_ltlibdeps= +- gl_m4_base='m4' +- m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) +- m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) +- m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) +- m4_pushdef([gl_LIBSOURCES_LIST], []) +- m4_pushdef([gl_LIBSOURCES_DIR], []) +- gl_COMMON +- gl_source_base='lib' +- gl_CONFIGMAKE_PREP +- AC_REQUIRE([gl_EXTERN_INLINE]) +- gl_LOCALCHARSET +- LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" +- AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) +- gl_MULTIARCH +- gl_STDDEF_H +- gl_STDINT_H +- gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) +- gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) +- gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) +- gl_WCHAR_H +- gl_WCTYPE_H +- gl_FUNC_WCWIDTH +- if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then +- AC_LIBOBJ([wcwidth]) +- fi +- gl_WCHAR_MODULE_INDICATOR([wcwidth]) +- # End of code from modules +- m4_ifval(gl_LIBSOURCES_LIST, [ +- m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || +- for gl_file in ]gl_LIBSOURCES_LIST[ ; do +- if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then +- echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 +- exit 1 +- fi +- done])dnl +- m4_if(m4_sysval, [0], [], +- [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) +- ]) +- m4_popdef([gl_LIBSOURCES_DIR]) +- m4_popdef([gl_LIBSOURCES_LIST]) +- m4_popdef([AC_LIBSOURCES]) +- m4_popdef([AC_REPLACE_FUNCS]) +- m4_popdef([AC_LIBOBJ]) +- AC_CONFIG_COMMANDS_PRE([ +- gl_libobjs= +- gl_ltlibobjs= +- if test -n "$gl_LIBOBJS"; then +- # Remove the extension. +- sed_drop_objext='s/\.o$//;s/\.obj$//' +- for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do +- gl_libobjs="$gl_libobjs $i.$ac_objext" +- gl_ltlibobjs="$gl_ltlibobjs $i.lo" +- done +- fi +- AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) +- AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) +- ]) +- gltests_libdeps= +- gltests_ltlibdeps= +- m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) +- m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) +- m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) +- m4_pushdef([gltests_LIBSOURCES_LIST], []) +- m4_pushdef([gltests_LIBSOURCES_DIR], []) +- gl_COMMON +- gl_source_base='tests' +-changequote(,)dnl +- gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS +-changequote([, ])dnl +- AC_SUBST([gltests_WITNESS]) +- gl_module_indicator_condition=$gltests_WITNESS +- m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition]) +- m4_popdef([gl_MODULE_INDICATOR_CONDITION]) +- m4_ifval(gltests_LIBSOURCES_LIST, [ +- m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || +- for gl_file in ]gltests_LIBSOURCES_LIST[ ; do +- if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then +- echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 +- exit 1 +- fi +- done])dnl +- m4_if(m4_sysval, [0], [], +- [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) +- ]) +- m4_popdef([gltests_LIBSOURCES_DIR]) +- m4_popdef([gltests_LIBSOURCES_LIST]) +- m4_popdef([AC_LIBSOURCES]) +- m4_popdef([AC_REPLACE_FUNCS]) +- m4_popdef([AC_LIBOBJ]) +- AC_CONFIG_COMMANDS_PRE([ +- gltests_libobjs= +- gltests_ltlibobjs= +- if test -n "$gltests_LIBOBJS"; then +- # Remove the extension. +- sed_drop_objext='s/\.o$//;s/\.obj$//' +- for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do +- gltests_libobjs="$gltests_libobjs $i.$ac_objext" +- gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" +- done +- fi +- AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) +- AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) +- ]) +- LIBGNU_LIBDEPS="$gl_libdeps" +- AC_SUBST([LIBGNU_LIBDEPS]) +- LIBGNU_LTLIBDEPS="$gl_ltlibdeps" +- AC_SUBST([LIBGNU_LTLIBDEPS]) +-]) +- +-# Like AC_LIBOBJ, except that the module name goes +-# into gl_LIBOBJS instead of into LIBOBJS. +-AC_DEFUN([gl_LIBOBJ], [ +- AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl +- gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" +-]) +- +-# Like AC_REPLACE_FUNCS, except that the module name goes +-# into gl_LIBOBJS instead of into LIBOBJS. +-AC_DEFUN([gl_REPLACE_FUNCS], [ +- m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl +- AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)]) +-]) +- +-# Like AC_LIBSOURCES, except the directory where the source file is +-# expected is derived from the gnulib-tool parameterization, +-# and alloca is special cased (for the alloca-opt module). +-# We could also entirely rely on EXTRA_lib..._SOURCES. +-AC_DEFUN([gl_LIBSOURCES], [ +- m4_foreach([_gl_NAME], [$1], [ +- m4_if(_gl_NAME, [alloca.c], [], [ +- m4_define([gl_LIBSOURCES_DIR], [lib]) +- m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) +- ]) +- ]) +-]) +- +-# Like AC_LIBOBJ, except that the module name goes +-# into gltests_LIBOBJS instead of into LIBOBJS. +-AC_DEFUN([gltests_LIBOBJ], [ +- AS_LITERAL_IF([$1], [gltests_LIBSOURCES([$1.c])])dnl +- gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" +-]) +- +-# Like AC_REPLACE_FUNCS, except that the module name goes +-# into gltests_LIBOBJS instead of into LIBOBJS. +-AC_DEFUN([gltests_REPLACE_FUNCS], [ +- m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl +- AC_CHECK_FUNCS([$1], , [gltests_LIBOBJ($ac_func)]) +-]) +- +-# Like AC_LIBSOURCES, except the directory where the source file is +-# expected is derived from the gnulib-tool parameterization, +-# and alloca is special cased (for the alloca-opt module). +-# We could also entirely rely on EXTRA_lib..._SOURCES. +-AC_DEFUN([gltests_LIBSOURCES], [ +- m4_foreach([_gl_NAME], [$1], [ +- m4_if(_gl_NAME, [alloca.c], [], [ +- m4_define([gltests_LIBSOURCES_DIR], [tests]) +- m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) +- ]) +- ]) +-]) +- +-# This macro records the list of files which have been installed by +-# gnulib-tool and may be removed by future gnulib-tool invocations. +-AC_DEFUN([gl_FILE_LIST], [ +- build-aux/snippet/arg-nonnull.h +- build-aux/snippet/c++defs.h +- build-aux/snippet/warn-on-use.h +- lib/config.charset +- lib/localcharset.c +- lib/localcharset.h +- lib/ref-add.sin +- lib/ref-del.sin +- lib/stddef.in.h +- lib/stdint.in.h +- lib/streq.h +- lib/unitypes.in.h +- lib/uniwidth.in.h +- lib/uniwidth/cjk.h +- lib/uniwidth/width.c +- lib/wchar.in.h +- lib/wctype-h.c +- lib/wctype.in.h +- lib/wcwidth.c +- m4/00gnulib.m4 +- m4/codeset.m4 +- m4/configmake.m4 +- m4/extensions.m4 +- m4/extern-inline.m4 +- m4/fcntl-o.m4 +- m4/glibc21.m4 +- m4/gnulib-common.m4 +- m4/include_next.m4 +- m4/libunistring-base.m4 +- m4/localcharset.m4 +- m4/longlong.m4 +- m4/multiarch.m4 +- m4/onceonly.m4 +- m4/stddef_h.m4 +- m4/stdint.m4 +- m4/warn-on-use.m4 +- m4/wchar_h.m4 +- m4/wchar_t.m4 +- m4/wctype_h.m4 +- m4/wcwidth.m4 +- m4/wint_t.m4 +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/gnulib-tool.m4 groff-1.22.3/src/libs/gnulib/m4/gnulib-tool.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/gnulib-tool.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/gnulib-tool.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,57 +0,0 @@ +-# gnulib-tool.m4 serial 2 +-dnl Copyright (C) 2004-2005, 2009-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 The following macros need not be invoked explicitly. +-dnl Invoking them does nothing except to declare default arguments +-dnl for "gnulib-tool --import". +- +-dnl Usage: gl_LOCAL_DIR([DIR]) +-AC_DEFUN([gl_LOCAL_DIR], []) +- +-dnl Usage: gl_MODULES([module1 module2 ...]) +-AC_DEFUN([gl_MODULES], []) +- +-dnl Usage: gl_AVOID([module1 module2 ...]) +-AC_DEFUN([gl_AVOID], []) +- +-dnl Usage: gl_SOURCE_BASE([DIR]) +-AC_DEFUN([gl_SOURCE_BASE], []) +- +-dnl Usage: gl_M4_BASE([DIR]) +-AC_DEFUN([gl_M4_BASE], []) +- +-dnl Usage: gl_PO_BASE([DIR]) +-AC_DEFUN([gl_PO_BASE], []) +- +-dnl Usage: gl_DOC_BASE([DIR]) +-AC_DEFUN([gl_DOC_BASE], []) +- +-dnl Usage: gl_TESTS_BASE([DIR]) +-AC_DEFUN([gl_TESTS_BASE], []) +- +-dnl Usage: gl_WITH_TESTS +-AC_DEFUN([gl_WITH_TESTS], []) +- +-dnl Usage: gl_LIB([LIBNAME]) +-AC_DEFUN([gl_LIB], []) +- +-dnl Usage: gl_LGPL or gl_LGPL([VERSION]) +-AC_DEFUN([gl_LGPL], []) +- +-dnl Usage: gl_MAKEFILE_NAME([FILENAME]) +-AC_DEFUN([gl_MAKEFILE_NAME], []) +- +-dnl Usage: gl_LIBTOOL +-AC_DEFUN([gl_LIBTOOL], []) +- +-dnl Usage: gl_MACRO_PREFIX([PREFIX]) +-AC_DEFUN([gl_MACRO_PREFIX], []) +- +-dnl Usage: gl_PO_DOMAIN([DOMAIN]) +-AC_DEFUN([gl_PO_DOMAIN], []) +- +-dnl Usage: gl_VC_FILES([BOOLEAN]) +-AC_DEFUN([gl_VC_FILES], []) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/include_next.m4 groff-1.22.3/src/libs/gnulib/m4/include_next.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/include_next.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/include_next.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,270 +0,0 @@ +-# include_next.m4 serial 23 +-dnl Copyright (C) 2006-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 From Paul Eggert and Derek Price. +- +-dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER. +-dnl +-dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to +-dnl 'include' otherwise. +-dnl +-dnl INCLUDE_NEXT_AS_FIRST_DIRECTIVE expands to 'include_next' if the compiler +-dnl supports it in the special case that it is the first include directive in +-dnl the given file, or to 'include' otherwise. +-dnl +-dnl PRAGMA_SYSTEM_HEADER can be used in files that contain #include_next, +-dnl so as to avoid GCC warnings when the gcc option -pedantic is used. +-dnl '#pragma GCC system_header' has the same effect as if the file was found +-dnl through the include search path specified with '-isystem' options (as +-dnl opposed to the search path specified with '-I' options). Namely, gcc +-dnl does not warn about some things, and on some systems (Solaris and Interix) +-dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side +-dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead +-dnl of plain '__STDC__'. +-dnl +-dnl PRAGMA_COLUMNS can be used in files that override system header files, so +-dnl as to avoid compilation errors on HP NonStop systems when the gnulib file +-dnl is included by a system header file that does a "#pragma COLUMNS 80" (which +-dnl has the effect of truncating the lines of that file and all files that it +-dnl includes to 80 columns) and the gnulib file has lines longer than 80 +-dnl columns. +- +-AC_DEFUN([gl_INCLUDE_NEXT], +-[ +- AC_LANG_PREPROC_REQUIRE() +- AC_CACHE_CHECK([whether the preprocessor supports include_next], +- [gl_cv_have_include_next], +- [rm -rf conftestd1a conftestd1b conftestd2 +- mkdir conftestd1a conftestd1b conftestd2 +- dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on +- dnl AIX 6.1 support include_next when used as first preprocessor directive +- dnl in a file, but not when preceded by another include directive. Check +- dnl for this bug by including . +- dnl Additionally, with this same compiler, include_next is a no-op when +- dnl used in a header file that was included by specifying its absolute +- dnl file name. Despite these two bugs, include_next is used in the +- dnl compiler's . By virtue of the second bug, we need to use +- dnl include_next as well in this case. +- cat < conftestd1a/conftest.h +-#define DEFINED_IN_CONFTESTD1 +-#include_next +-#ifdef DEFINED_IN_CONFTESTD2 +-int foo; +-#else +-#error "include_next doesn't work" +-#endif +-EOF +- cat < conftestd1b/conftest.h +-#define DEFINED_IN_CONFTESTD1 +-#include +-#include_next +-#ifdef DEFINED_IN_CONFTESTD2 +-int foo; +-#else +-#error "include_next doesn't work" +-#endif +-EOF +- cat < conftestd2/conftest.h +-#ifndef DEFINED_IN_CONFTESTD1 +-#error "include_next test doesn't work" +-#endif +-#define DEFINED_IN_CONFTESTD2 +-EOF +- gl_save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" +-dnl We intentionally avoid using AC_LANG_SOURCE here. +- AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include ]], +- [gl_cv_have_include_next=yes], +- [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" +- AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include ]], +- [gl_cv_have_include_next=buggy], +- [gl_cv_have_include_next=no]) +- ]) +- CPPFLAGS="$gl_save_CPPFLAGS" +- rm -rf conftestd1a conftestd1b conftestd2 +- ]) +- PRAGMA_SYSTEM_HEADER= +- if test $gl_cv_have_include_next = yes; then +- INCLUDE_NEXT=include_next +- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next +- if test -n "$GCC"; then +- PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' +- fi +- else +- if test $gl_cv_have_include_next = buggy; then +- INCLUDE_NEXT=include +- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next +- else +- INCLUDE_NEXT=include +- INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include +- fi +- fi +- AC_SUBST([INCLUDE_NEXT]) +- AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE]) +- AC_SUBST([PRAGMA_SYSTEM_HEADER]) +- AC_CACHE_CHECK([whether system header files limit the line length], +- [gl_cv_pragma_columns], +- [dnl HP NonStop systems, which define __TANDEM, have this misfeature. +- AC_EGREP_CPP([choke me], +- [ +-#ifdef __TANDEM +-choke me +-#endif +- ], +- [gl_cv_pragma_columns=yes], +- [gl_cv_pragma_columns=no]) +- ]) +- if test $gl_cv_pragma_columns = yes; then +- PRAGMA_COLUMNS="#pragma COLUMNS 10000" +- else +- PRAGMA_COLUMNS= +- fi +- AC_SUBST([PRAGMA_COLUMNS]) +-]) +- +-# gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...) +-# ------------------------------------------ +-# For each arg foo.h, if #include_next works, define NEXT_FOO_H to be +-# ''; otherwise define it to be +-# '"///usr/include/foo.h"', or whatever other absolute file name is suitable. +-# Also, if #include_next works as first preprocessing directive in a file, +-# define NEXT_AS_FIRST_DIRECTIVE_FOO_H to be ''; otherwise define it to +-# be +-# '"///usr/include/foo.h"', or whatever other absolute file name is suitable. +-# That way, a header file with the following line: +-# #@INCLUDE_NEXT@ @NEXT_FOO_H@ +-# or +-# #@INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ @NEXT_AS_FIRST_DIRECTIVE_FOO_H@ +-# behaves (after sed substitution) as if it contained +-# #include_next +-# even if the compiler does not support include_next. +-# The three "///" are to pacify Sun C 5.8, which otherwise would say +-# "warning: #include of /usr/include/... may be non-portable". +-# Use '""', not '<>', so that the /// cannot be confused with a C99 comment. +-# Note: This macro assumes that the header file is not empty after +-# preprocessing, i.e. it does not only define preprocessor macros but also +-# provides some type/enum definitions or function/variable declarations. +-# +-# This macro also checks whether each header exists, by invoking +-# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument. +-AC_DEFUN([gl_CHECK_NEXT_HEADERS], +-[ +- gl_NEXT_HEADERS_INTERNAL([$1], [check]) +-]) +- +-# gl_NEXT_HEADERS(HEADER1 HEADER2 ...) +-# ------------------------------------ +-# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist. +-# This is suitable for headers like that are standardized by C89 +-# and therefore can be assumed to exist. +-AC_DEFUN([gl_NEXT_HEADERS], +-[ +- gl_NEXT_HEADERS_INTERNAL([$1], [assume]) +-]) +- +-# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS. +-AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], +-[ +- AC_REQUIRE([gl_INCLUDE_NEXT]) +- AC_REQUIRE([AC_CANONICAL_HOST]) +- +- m4_if([$2], [check], +- [AC_CHECK_HEADERS_ONCE([$1]) +- ]) +- +-dnl FIXME: gl_next_header and gl_header_exists must be used unquoted +-dnl until we can assume autoconf 2.64 or newer. +- m4_foreach_w([gl_HEADER_NAME], [$1], +- [AS_VAR_PUSHDEF([gl_next_header], +- [gl_cv_next_]m4_defn([gl_HEADER_NAME])) +- if test $gl_cv_have_include_next = yes; then +- AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) +- else +- AC_CACHE_CHECK( +- [absolute name of <]m4_defn([gl_HEADER_NAME])[>], +- m4_defn([gl_next_header]), +- [m4_if([$2], [check], +- [AS_VAR_PUSHDEF([gl_header_exists], +- [ac_cv_header_]m4_defn([gl_HEADER_NAME])) +- if test AS_VAR_GET(gl_header_exists) = yes; then +- AS_VAR_POPDEF([gl_header_exists]) +- ]) +- AC_LANG_CONFTEST( +- [AC_LANG_SOURCE( +- [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] +- )]) +- dnl AIX "xlc -E" and "cc -E" omit #line directives for header +- dnl files that contain only a #include of other header files and +- dnl no non-comment tokens of their own. This leads to a failure +- dnl to detect the absolute name of , , +- dnl and others. The workaround is to force preservation +- dnl of comments through option -C. This ensures all necessary +- dnl #line directives are present. GCC supports option -C as well. +- case "$host_os" in +- aix*) gl_absname_cpp="$ac_cpp -C" ;; +- *) gl_absname_cpp="$ac_cpp" ;; +- esac +-changequote(,) +- case "$host_os" in +- mingw*) +- dnl For the sake of native Windows compilers (excluding gcc), +- dnl treat backslash as a directory separator, like /. +- dnl Actually, these compilers use a double-backslash as +- dnl directory separator, inside the +- dnl # line "filename" +- dnl directives. +- gl_dirsep_regex='[/\\]' +- ;; +- *) +- gl_dirsep_regex='\/' +- ;; +- esac +- dnl A sed expression that turns a string into a basic regular +- dnl expression, for use within "/.../". +- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' +-changequote([,]) +- gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \ +- | sed -e "$gl_make_literal_regex_sed"` +- gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ +- s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ +-changequote(,)dnl +- s|^/[^/]|//&| +-changequote([,])dnl +- p +- q +- }' +- dnl eval is necessary to expand gl_absname_cpp. +- dnl Ultrix and Pyramid sh refuse to redirect output of eval, +- dnl so use subshell. +- AS_VAR_SET(gl_next_header, +- ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | +- sed -n "$gl_absolute_header_sed"`'"']) +- m4_if([$2], [check], +- [else +- AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) +- fi +- ]) +- ]) +- fi +- AC_SUBST( +- AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])), +- [AS_VAR_GET(gl_next_header)]) +- if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' +- gl_next_as_first_directive='<'gl_HEADER_NAME'>' +- else +- # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' +- gl_next_as_first_directive=AS_VAR_GET(gl_next_header) +- fi +- AC_SUBST( +- AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])), +- [$gl_next_as_first_directive]) +- AS_VAR_POPDEF([gl_next_header])]) +-]) +- +-# Autoconf 2.68 added warnings for our use of AC_COMPILE_IFELSE; +-# this fallback is safe for all earlier autoconf versions. +-m4_define_default([AC_LANG_DEFINES_PROVIDED]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/inttypes.m4 groff-1.22.3/src/libs/gnulib/m4/inttypes.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/inttypes.m4 2014-11-04 10:38:35.640518809 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/inttypes.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,157 +0,0 @@ +-# inttypes.m4 serial 26 +-dnl Copyright (C) 2006-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 From Derek Price, Bruno Haible. +-dnl Test whether is supported or must be substituted. +- +-AC_DEFUN([gl_INTTYPES_H], +-[ +- AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) +- gl_INTTYPES_PRI_SCN +-]) +- +-AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE], +-[ +- AC_REQUIRE([gl_STDINT_H]) +- AC_CHECK_HEADERS_ONCE([inttypes.h]) +- +- dnl Override always, so that the portability warnings work. +- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) +- gl_CHECK_NEXT_HEADERS([inttypes.h]) +- +- AC_REQUIRE([gl_MULTIARCH]) +- +- dnl Check for declarations of anything we want to poison if the +- dnl corresponding gnulib module is not in use. +- gl_WARN_ON_USE_PREPARE([[#include +- ]], [imaxabs imaxdiv strtoimax strtoumax]) +-]) +- +-# Ensure that the PRI* and SCN* macros are defined appropriately. +-AC_DEFUN([gl_INTTYPES_PRI_SCN], +-[ +- AC_REQUIRE([gt_INTTYPES_PRI]) +- +- PRIPTR_PREFIX= +- if test -n "$STDINT_H"; then +- dnl Using the gnulib . It always defines intptr_t to 'long'. +- PRIPTR_PREFIX='"l"' +- else +- dnl Using the system's . +- for glpfx in '' l ll I64; do +- case $glpfx in +- '') gltype1='int';; +- l) gltype1='long int';; +- ll) gltype1='long long int';; +- I64) gltype1='__int64';; +- esac +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([[#include +- extern intptr_t foo; +- extern $gltype1 foo;]])], +- [PRIPTR_PREFIX='"'$glpfx'"']) +- test -n "$PRIPTR_PREFIX" && break +- done +- fi +- AC_SUBST([PRIPTR_PREFIX]) +- +- gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( +- [INT32_MAX_LT_INTMAX_MAX], +- [defined INT32_MAX && defined INTMAX_MAX], +- [INT32_MAX < INTMAX_MAX], +- [sizeof (int) < sizeof (long long int)]) +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( +- [INT64_MAX_EQ_LONG_MAX], +- [defined INT64_MAX], +- [INT64_MAX == LONG_MAX], +- [sizeof (long long int) == sizeof (long int)]) +- else +- INT64_MAX_EQ_LONG_MAX=-1 +- fi +- gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( +- [UINT32_MAX_LT_UINTMAX_MAX], +- [defined UINT32_MAX && defined UINTMAX_MAX], +- [UINT32_MAX < UINTMAX_MAX], +- [sizeof (unsigned int) < sizeof (unsigned long long int)]) +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( +- [UINT64_MAX_EQ_ULONG_MAX], +- [defined UINT64_MAX], +- [UINT64_MAX == ULONG_MAX], +- [sizeof (unsigned long long int) == sizeof (unsigned long int)]) +- else +- UINT64_MAX_EQ_ULONG_MAX=-1 +- fi +-]) +- +-# Define the symbol $1 to be 1 if the condition is true, 0 otherwise. +-# If $2 is true, the condition is $3; otherwise if long long int is supported +-# approximate the condition with $4; otherwise, assume the condition is false. +-# The condition should work on all C99 platforms; the approximations should be +-# good enough to work on all practical pre-C99 platforms. +-# $2 is evaluated by the C preprocessor, $3 and $4 as compile-time constants. +-AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], +-[ +- AC_CACHE_CHECK([whether $3], +- [gl_cv_test_$1], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[/* Work also in C++ mode. */ +- #define __STDC_LIMIT_MACROS 1 +- +- /* Work if build is not clean. */ +- #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H +- +- #include +- #if HAVE_STDINT_H +- #include +- #endif +- +- #if $2 +- #define CONDITION ($3) +- #elif HAVE_LONG_LONG_INT +- #define CONDITION ($4) +- #else +- #define CONDITION 0 +- #endif +- int test[CONDITION ? 1 : -1];]])], +- [gl_cv_test_$1=yes], +- [gl_cv_test_$1=no])]) +- if test $gl_cv_test_$1 = yes; then +- $1=1; +- else +- $1=0; +- fi +- AC_SUBST([$1]) +-]) +- +-AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], +-[ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) +- gl_MODULE_INDICATOR_SET_VARIABLE([$1]) +-]) +- +-AC_DEFUN([gl_INTTYPES_H_DEFAULTS], +-[ +- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) +- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) +- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) +- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) +- dnl Assume proper GNU behavior unless another module says otherwise. +- HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) +- HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) +- HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) +- HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) +- REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX]) +- INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) +- INT64_MAX_EQ_LONG_MAX='defined _LP64'; AC_SUBST([INT64_MAX_EQ_LONG_MAX]) +- PRI_MACROS_BROKEN=0; AC_SUBST([PRI_MACROS_BROKEN]) +- PRIPTR_PREFIX=__PRIPTR_PREFIX; AC_SUBST([PRIPTR_PREFIX]) +- UINT32_MAX_LT_UINTMAX_MAX=1; AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX]) +- UINT64_MAX_EQ_ULONG_MAX='defined _LP64'; AC_SUBST([UINT64_MAX_EQ_ULONG_MAX]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/inttypes-pri.m4 groff-1.22.3/src/libs/gnulib/m4/inttypes-pri.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/inttypes-pri.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/inttypes-pri.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,42 +0,0 @@ +-# inttypes-pri.m4 serial 7 (gettext-0.18.2) +-dnl Copyright (C) 1997-2002, 2006, 2008-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 From Bruno Haible. +- +-AC_PREREQ([2.53]) +- +-# Define PRI_MACROS_BROKEN if exists and defines the PRI* +-# macros to non-string values. This is the case on AIX 4.3.3. +- +-AC_DEFUN([gt_INTTYPES_PRI], +-[ +- AC_CHECK_HEADERS([inttypes.h]) +- if test $ac_cv_header_inttypes_h = yes; then +- AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], +- [gt_cv_inttypes_pri_broken], +- [ +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[ +-#include +-#ifdef PRId32 +-char *p = PRId32; +-#endif +- ]], +- [[]])], +- [gt_cv_inttypes_pri_broken=no], +- [gt_cv_inttypes_pri_broken=yes]) +- ]) +- fi +- if test "$gt_cv_inttypes_pri_broken" = yes; then +- AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1], +- [Define if exists and defines unusable PRI* macros.]) +- PRI_MACROS_BROKEN=1 +- else +- PRI_MACROS_BROKEN=0 +- fi +- AC_SUBST([PRI_MACROS_BROKEN]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/libunistring-base.m4 groff-1.22.3/src/libs/gnulib/m4/libunistring-base.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/libunistring-base.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/libunistring-base.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,141 +0,0 @@ +-# libunistring-base.m4 serial 5 +-dnl Copyright (C) 2010-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 From Paolo Bonzini and Bruno Haible. +- +-dnl gl_LIBUNISTRING_MODULE([VERSION], [Module]) +-dnl Declares that the source files of Module should be compiled, unless we +-dnl are linking with libunistring and its version is >= the given VERSION. +-dnl Defines an automake conditional LIBUNISTRING_COMPILE_$MODULE that is +-dnl true if the source files of Module should be compiled. +-dnl This macro is to be used for public libunistring API, not for +-dnl undocumented API. +-dnl +-dnl You have to bump the VERSION argument to the next projected version +-dnl number each time you make a change that affects the behaviour of the +-dnl functions defined in Module (even if the sources of Module itself do not +-dnl change). +- +-AC_DEFUN([gl_LIBUNISTRING_MODULE], +-[ +- AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) +- dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from +- dnl gl_LIBUNISTRING_CORE if that macro has been run. +- AM_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]), +- [gl_LIBUNISTRING_VERSION_CMP([$1])]) +-]) +- +-dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile]) +-dnl Declares that HeaderFile should be created, unless we are linking +-dnl with libunistring and its version is >= the given VERSION. +-dnl HeaderFile should be relative to the lib directory and end in '.h'. +-dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty). +-dnl +-dnl When we are linking with the already installed libunistring and its version +-dnl is < VERSION, we create HeaderFile here, because we may compile functions +-dnl (via gl_LIBUNISTRING_MODULE above) that are not contained in the installed +-dnl version. +-dnl When we are linking with the already installed libunistring and its version +-dnl is > VERSION, we don't create HeaderFile here: it could cause compilation +-dnl errors in other libunistring header files if some types are missing. +-dnl +-dnl You have to bump the VERSION argument to the next projected version +-dnl number each time you make a non-comment change to the HeaderFile. +- +-AC_DEFUN([gl_LIBUNISTRING_LIBHEADER], +-[ +- AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE]) +- dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from +- dnl gl_LIBUNISTRING_CORE if that macro has been run. +- if gl_LIBUNISTRING_VERSION_CMP([$1]); then +- LIBUNISTRING_[]AS_TR_CPP([$2])='$2' +- else +- LIBUNISTRING_[]AS_TR_CPP([$2])= +- fi +- AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2])) +-]) +- +-dnl Miscellaneous preparations/initializations. +- +-AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE], +-[ +- dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point. +- m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])]) +- +- AC_REQUIRE([AC_PROG_AWK]) +- +-dnl Sed expressions to extract the parts of a version number. +-changequote(,) +-gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;} +-i\ +-0 +-q +-' +-gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;} +-i\ +-0 +-q +-' +-gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;} +-i\ +-0 +-q +-' +-changequote([,]) +- +- if test "$HAVE_LIBUNISTRING" = yes; then +- LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"` +- LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"` +- LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"` +- fi +-]) +- +-dnl gl_LIBUNISTRING_VERSION_CMP([VERSION]) +-dnl Expands to a shell statement that evaluates to true if LIBUNISTRING_VERSION +-dnl is less than the VERSION argument. +-AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP], +-[ { test "$HAVE_LIBUNISTRING" != yes \ +- || { +- dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least. +- AS_LITERAL_IF([$1], +- [dnl This is the optimized variant, that assumes the argument is a literal: +- m4_pushdef([requested_version_major], +- [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])]) +- m4_pushdef([requested_version_minor], +- [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])]) +- m4_pushdef([requested_version_subminor], +- [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])]) +- test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \ +- || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \ +- && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \ +- || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \ +- && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor +- } +- } +- } +- m4_popdef([requested_version_subminor]) +- m4_popdef([requested_version_minor]) +- m4_popdef([requested_version_major]) +- ], +- [dnl This is the unoptimized variant: +- requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"` +- requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"` +- requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"` +- test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \ +- || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \ +- && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \ +- || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \ +- && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor +- } +- } +- } +- ]) +- } +- }]) +- +-dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the +-dnl same as ORIG, otherwise to 0. +-m4_define([gl_LIBUNISTRING_ARG_OR_ZERO], [m4_if([$1], [$2], [0], [$1])]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/localcharset.m4 groff-1.22.3/src/libs/gnulib/m4/localcharset.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/localcharset.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/localcharset.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,17 +0,0 @@ +-# localcharset.m4 serial 7 +-dnl Copyright (C) 2002, 2004, 2006, 2009-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. +- +-AC_DEFUN([gl_LOCALCHARSET], +-[ +- dnl Prerequisites of lib/localcharset.c. +- AC_REQUIRE([AM_LANGINFO_CODESET]) +- AC_REQUIRE([gl_FCNTL_O_FLAGS]) +- AC_CHECK_DECLS_ONCE([getc_unlocked]) +- +- dnl Prerequisites of the lib/Makefile.am snippet. +- AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_REQUIRE([gl_GLIBC21]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/longlong.m4 groff-1.22.3/src/libs/gnulib/m4/longlong.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/longlong.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/longlong.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,113 +0,0 @@ +-# longlong.m4 serial 17 +-dnl Copyright (C) 1999-2007, 2009-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 From Paul Eggert. +- +-# Define HAVE_LONG_LONG_INT if 'long long int' works. +-# This fixes a bug in Autoconf 2.61, and can be faster +-# than what's in Autoconf 2.62 through 2.68. +- +-# Note: If the type 'long long int' exists but is only 32 bits large +-# (as on some very old compilers), HAVE_LONG_LONG_INT will not be +-# defined. In this case you can treat 'long long int' like 'long int'. +- +-AC_DEFUN([AC_TYPE_LONG_LONG_INT], +-[ +- AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) +- AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], +- [ac_cv_type_long_long_int=yes +- if test "x${ac_cv_prog_cc_c99-no}" = xno; then +- ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int +- if test $ac_cv_type_long_long_int = yes; then +- dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. +- dnl If cross compiling, assume the bug is not important, since +- dnl nobody cross compiles for this platform as far as we know. +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[@%:@include +- @%:@ifndef LLONG_MAX +- @%:@ define HALF \ +- (1LL << (sizeof (long long int) * CHAR_BIT - 2)) +- @%:@ define LLONG_MAX (HALF - 1 + HALF) +- @%:@endif]], +- [[long long int n = 1; +- int i; +- for (i = 0; ; i++) +- { +- long long int m = n << i; +- if (m >> i != n) +- return 1; +- if (LLONG_MAX / 2 < m) +- break; +- } +- return 0;]])], +- [], +- [ac_cv_type_long_long_int=no], +- [:]) +- fi +- fi]) +- if test $ac_cv_type_long_long_int = yes; then +- AC_DEFINE([HAVE_LONG_LONG_INT], [1], +- [Define to 1 if the system has the type 'long long int'.]) +- fi +-]) +- +-# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. +-# This fixes a bug in Autoconf 2.61, and can be faster +-# than what's in Autoconf 2.62 through 2.68. +- +-# Note: If the type 'unsigned long long int' exists but is only 32 bits +-# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT +-# will not be defined. In this case you can treat 'unsigned long long int' +-# like 'unsigned long int'. +- +-AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], +-[ +- AC_CACHE_CHECK([for unsigned long long int], +- [ac_cv_type_unsigned_long_long_int], +- [ac_cv_type_unsigned_long_long_int=yes +- if test "x${ac_cv_prog_cc_c99-no}" = xno; then +- AC_LINK_IFELSE( +- [_AC_TYPE_LONG_LONG_SNIPPET], +- [], +- [ac_cv_type_unsigned_long_long_int=no]) +- fi]) +- if test $ac_cv_type_unsigned_long_long_int = yes; then +- AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], +- [Define to 1 if the system has the type 'unsigned long long int'.]) +- fi +-]) +- +-# Expands to a C program that can be used to test for simultaneous support +-# of 'long long' and 'unsigned long long'. We don't want to say that +-# 'long long' is available if 'unsigned long long' is not, or vice versa, +-# because too many programs rely on the symmetry between signed and unsigned +-# integer types (excluding 'bool'). +-AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], +-[ +- AC_LANG_PROGRAM( +- [[/* For now, do not test the preprocessor; as of 2007 there are too many +- implementations with broken preprocessors. Perhaps this can +- be revisited in 2012. In the meantime, code should not expect +- #if to work with literals wider than 32 bits. */ +- /* Test literals. */ +- long long int ll = 9223372036854775807ll; +- long long int nll = -9223372036854775807LL; +- unsigned long long int ull = 18446744073709551615ULL; +- /* Test constant expressions. */ +- typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) +- ? 1 : -1)]; +- typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 +- ? 1 : -1)]; +- int i = 63;]], +- [[/* Test availability of runtime routines for shift and division. */ +- long long int llmax = 9223372036854775807ll; +- unsigned long long int ullmax = 18446744073709551615ull; +- return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) +- | (llmax / ll) | (llmax % ll) +- | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) +- | (ullmax / ull) | (ullmax % ull));]]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/Makefile.am groff-1.22.3/src/libs/gnulib/m4/Makefile.am +--- groff-1.22.3.old/src/libs/gnulib/m4/Makefile.am 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/Makefile.am 1970-01-01 02:00:00.000000000 +0200 +@@ -1,47 +0,0 @@ +-## Process this file with automake to produce Makefile.in. +- +-# Copyright (C) 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 . +- +-# 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. +- +-EXTRA_DIST = +-EXTRA_DIST += 00gnulib.m4 +-EXTRA_DIST += codeset.m4 +-EXTRA_DIST += configmake.m4 +-EXTRA_DIST += extensions.m4 +-EXTRA_DIST += extern-inline.m4 +-EXTRA_DIST += fcntl-o.m4 +-EXTRA_DIST += glibc21.m4 +-EXTRA_DIST += gnulib-common.m4 +-EXTRA_DIST += include_next.m4 +-EXTRA_DIST += inttypes-pri.m4 +-EXTRA_DIST += inttypes.m4 +-EXTRA_DIST += libunistring-base.m4 +-EXTRA_DIST += localcharset.m4 +-EXTRA_DIST += longlong.m4 +-EXTRA_DIST += multiarch.m4 +-EXTRA_DIST += stdbool.m4 +-EXTRA_DIST += stddef_h.m4 +-EXTRA_DIST += stdint.m4 +-EXTRA_DIST += warn-on-use.m4 +-EXTRA_DIST += wchar_h.m4 +-EXTRA_DIST += wchar_t.m4 +-EXTRA_DIST += wctype_h.m4 +-EXTRA_DIST += wcwidth.m4 +-EXTRA_DIST += wint_t.m4 +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/Makefile.in groff-1.22.3/src/libs/gnulib/m4/Makefile.in +--- groff-1.22.3.old/src/libs/gnulib/m4/Makefile.in 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/Makefile.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,608 +0,0 @@ +-# Makefile.in generated by automake 1.14 from Makefile.am. +-# @configure_input@ +- +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. +- +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +- +-# Copyright (C) 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 . +- +-# 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. +-VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +-am__make_running_with_option = \ +- case $${target_option-} in \ +- ?) ;; \ +- *) echo "am__make_running_with_option: internal error: invalid" \ +- "target option '$${target_option-}' specified" >&2; \ +- exit 1;; \ +- esac; \ +- has_opt=no; \ +- sane_makeflags=$$MAKEFLAGS; \ +- if $(am__is_gnu_make); then \ +- sane_makeflags=$$MFLAGS; \ +- else \ +- case $$MAKEFLAGS in \ +- *\\[\ \ ]*) \ +- bs=\\; \ +- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ +- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ +- esac; \ +- fi; \ +- skip_next=no; \ +- strip_trailopt () \ +- { \ +- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ +- }; \ +- for flg in $$sane_makeflags; do \ +- test $$skip_next = yes && { skip_next=no; continue; }; \ +- case $$flg in \ +- *=*|--*) continue;; \ +- -*I) strip_trailopt 'I'; skip_next=yes;; \ +- -*I?*) strip_trailopt 'I';; \ +- -*O) strip_trailopt 'O'; skip_next=yes;; \ +- -*O?*) strip_trailopt 'O';; \ +- -*l) strip_trailopt 'l'; skip_next=yes;; \ +- -*l?*) strip_trailopt 'l';; \ +- -[dEDm]) skip_next=yes;; \ +- -[JT]) skip_next=yes;; \ +- esac; \ +- case $$flg in \ +- *$$target_option*) has_opt=yes; break;; \ +- esac; \ +- done; \ +- test $$has_opt = yes +-am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +-am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = @build@ +-host_triplet = @host@ +-subdir = m4 +-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ +- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ +- $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ +- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ +- $(top_srcdir)/m4/include_next.m4 \ +- $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ +- $(top_srcdir)/m4/libunistring-base.m4 \ +- $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ +- $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \ +- $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ +- $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/warn-on-use.m4 \ +- $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ +- $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ +- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = +-AM_V_P = $(am__v_P_@AM_V@) +-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +-am__v_P_0 = false +-am__v_P_1 = : +-AM_V_GEN = $(am__v_GEN_@AM_V@) +-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +-am__v_GEN_0 = @echo " GEN " $@; +-am__v_GEN_1 = +-AM_V_at = $(am__v_at_@AM_V@) +-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +-am__v_at_0 = @ +-am__v_at_1 = +-SOURCES = +-DIST_SOURCES = +-am__can_run_installinfo = \ +- case $$AM_UPDATE_INFO_DIR in \ +- n|no|NO) false;; \ +- *) (install-info --version) >/dev/null 2>&1;; \ +- esac +-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-pkglibexecdir = @pkglibexecdir@ +-ACLOCAL = @ACLOCAL@ +-AMTAR = @AMTAR@ +-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +-APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ +-AR = @AR@ +-ARFLAGS = @ARFLAGS@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ +-BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ +-BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ +-BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ +-BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-EXEEXT = @EXEEXT@ +-GLIBC21 = @GLIBC21@ +-GNULIB_BTOWC = @GNULIB_BTOWC@ +-GNULIB_IMAXABS = @GNULIB_IMAXABS@ +-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +-GNULIB_MBRLEN = @GNULIB_MBRLEN@ +-GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ +-GNULIB_MBSINIT = @GNULIB_MBSINIT@ +-GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ +-GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ +-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ +-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +-GNULIB_WCPCPY = @GNULIB_WCPCPY@ +-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ +-GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +-GNULIB_WCSCAT = @GNULIB_WCSCAT@ +-GNULIB_WCSCHR = @GNULIB_WCSCHR@ +-GNULIB_WCSCMP = @GNULIB_WCSCMP@ +-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +-GNULIB_WCSCPY = @GNULIB_WCSCPY@ +-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +-GNULIB_WCSDUP = @GNULIB_WCSDUP@ +-GNULIB_WCSLEN = @GNULIB_WCSLEN@ +-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ +-GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ +-GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +-GNULIB_WCSSPN = @GNULIB_WCSSPN@ +-GNULIB_WCSSTR = @GNULIB_WCSSTR@ +-GNULIB_WCSTOK = @GNULIB_WCSTOK@ +-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ +-GNULIB_WCTOB = @GNULIB_WCTOB@ +-GNULIB_WCTRANS = @GNULIB_WCTRANS@ +-GNULIB_WCTYPE = @GNULIB_WCTYPE@ +-GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +-GNULIB_WMEMSET = @GNULIB_WMEMSET@ +-GREP = @GREP@ +-HAVE_BTOWC = @HAVE_BTOWC@ +-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ +-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ +-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +-HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ +-HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +-HAVE_FEATURES_H = @HAVE_FEATURES_H@ +-HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ +-HAVE_ISWBLANK = @HAVE_ISWBLANK@ +-HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +-HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ +-HAVE_MBRLEN = @HAVE_MBRLEN@ +-HAVE_MBRTOWC = @HAVE_MBRTOWC@ +-HAVE_MBSINIT = @HAVE_MBSINIT@ +-HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +-HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ +-HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ +-HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ +-HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ +-HAVE_STDINT_H = @HAVE_STDINT_H@ +-HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +-HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +-HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ +-HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ +-HAVE_WCHAR_H = @HAVE_WCHAR_H@ +-HAVE_WCHAR_T = @HAVE_WCHAR_T@ +-HAVE_WCPCPY = @HAVE_WCPCPY@ +-HAVE_WCPNCPY = @HAVE_WCPNCPY@ +-HAVE_WCRTOMB = @HAVE_WCRTOMB@ +-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +-HAVE_WCSCAT = @HAVE_WCSCAT@ +-HAVE_WCSCHR = @HAVE_WCSCHR@ +-HAVE_WCSCMP = @HAVE_WCSCMP@ +-HAVE_WCSCOLL = @HAVE_WCSCOLL@ +-HAVE_WCSCPY = @HAVE_WCSCPY@ +-HAVE_WCSCSPN = @HAVE_WCSCSPN@ +-HAVE_WCSDUP = @HAVE_WCSDUP@ +-HAVE_WCSLEN = @HAVE_WCSLEN@ +-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +-HAVE_WCSNCAT = @HAVE_WCSNCAT@ +-HAVE_WCSNCMP = @HAVE_WCSNCMP@ +-HAVE_WCSNCPY = @HAVE_WCSNCPY@ +-HAVE_WCSNLEN = @HAVE_WCSNLEN@ +-HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +-HAVE_WCSPBRK = @HAVE_WCSPBRK@ +-HAVE_WCSRCHR = @HAVE_WCSRCHR@ +-HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +-HAVE_WCSSPN = @HAVE_WCSSPN@ +-HAVE_WCSSTR = @HAVE_WCSSTR@ +-HAVE_WCSTOK = @HAVE_WCSTOK@ +-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +-HAVE_WCSXFRM = @HAVE_WCSXFRM@ +-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ +-HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ +-HAVE_WINT_T = @HAVE_WINT_T@ +-HAVE_WMEMCHR = @HAVE_WMEMCHR@ +-HAVE_WMEMCMP = @HAVE_WMEMCMP@ +-HAVE_WMEMCPY = @HAVE_WMEMCPY@ +-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +-HAVE_WMEMSET = @HAVE_WMEMSET@ +-HAVE__BOOL = @HAVE__BOOL@ +-INCLUDE_NEXT = @INCLUDE_NEXT@ +-INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ +-INSTALL = @INSTALL@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ +-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ +-LDFLAGS = @LDFLAGS@ +-LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ +-LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ +-LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ +-LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ +-LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ +-LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ +-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ +-NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +-NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ +-NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ +-NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ +-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ +-NEXT_STDDEF_H = @NEXT_STDDEF_H@ +-NEXT_STDINT_H = @NEXT_STDINT_H@ +-NEXT_WCHAR_H = @NEXT_WCHAR_H@ +-NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ +-OBJEXT = @OBJEXT@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ +-PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ +-PRIPTR_PREFIX = @PRIPTR_PREFIX@ +-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ +-PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ +-RANLIB = @RANLIB@ +-REPLACE_BTOWC = @REPLACE_BTOWC@ +-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ +-REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +-REPLACE_MBRLEN = @REPLACE_MBRLEN@ +-REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +-REPLACE_MBSINIT = @REPLACE_MBSINIT@ +-REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +-REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +-REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +-REPLACE_NULL = @REPLACE_NULL@ +-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ +-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +-REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +-REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ +-REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +-REPLACE_WCTOB = @REPLACE_WCTOB@ +-REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ +-SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +-STDBOOL_H = @STDBOOL_H@ +-STDDEF_H = @STDDEF_H@ +-STDINT_H = @STDINT_H@ +-STRIP = @STRIP@ +-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ +-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +-VERSION = @VERSION@ +-WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ +-WINT_T_SUFFIX = @WINT_T_SUFFIX@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ +-ac_ct_CC = @ac_ct_CC@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-builddir = @builddir@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-gl_LIBOBJS = @gl_LIBOBJS@ +-gl_LTLIBOBJS = @gl_LTLIBOBJS@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-lispdir = @lispdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-runstatedir = @runstatedir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +-top_build_prefix = @top_build_prefix@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ +-EXTRA_DIST = 00gnulib.m4 codeset.m4 configmake.m4 extensions.m4 \ +- extern-inline.m4 fcntl-o.m4 glibc21.m4 gnulib-common.m4 \ +- include_next.m4 inttypes-pri.m4 inttypes.m4 \ +- libunistring-base.m4 localcharset.m4 longlong.m4 multiarch.m4 \ +- stdbool.m4 stddef_h.m4 stdint.m4 warn-on-use.m4 wchar_h.m4 \ +- wchar_t.m4 wctype_h.m4 wcwidth.m4 wint_t.m4 +-all: all-am +- +-.SUFFIXES: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu m4/Makefile +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): +-tags TAGS: +- +-ctags CTAGS: +- +-cscope cscopelist: +- +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile +-installdirs: +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- if test -z '$(STRIP)'; then \ +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- install; \ +- else \ +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ +- fi +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-am +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-am +- -rm -f Makefile +-distclean-am: clean-am distclean-generic +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-html-am: +- +-info: info-am +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-am +- +-install-dvi-am: +- +-install-exec-am: +- +-install-html: install-html-am +- +-install-html-am: +- +-install-info: install-info-am +- +-install-info-am: +- +-install-man: +- +-install-pdf: install-pdf-am +- +-install-pdf-am: +- +-install-ps: install-ps-am +- +-install-ps-am: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: +- +-.MAKE: install-am install-strip +- +-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ +- ctags-am distclean distclean-generic distdir dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ +- pdf-am ps ps-am tags-am uninstall uninstall-am +- +- +-# 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. +-.NOEXPORT: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/multiarch.m4 groff-1.22.3/src/libs/gnulib/m4/multiarch.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/multiarch.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/multiarch.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,62 +0,0 @@ +-# multiarch.m4 serial 7 +-dnl Copyright (C) 2008-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. +- +-# Determine whether the compiler is or may be producing universal binaries. +-# +-# On Mac OS X 10.5 and later systems, the user 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" +-# +-# Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly. +- +-AC_DEFUN_ONCE([gl_MULTIARCH], +-[ +- dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. +- gl_cv_c_multiarch=no +- AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE( +- [[#ifndef __APPLE_CC__ +- not a universal capable compiler +- #endif +- typedef int dummy; +- ]])], +- [ +- dnl Check for potential -arch flags. It is not universal unless +- dnl there are at least two -arch flags with different values. +- arch= +- prev= +- for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do +- if test -n "$prev"; then +- case $word in +- i?86 | x86_64 | ppc | ppc64) +- if test -z "$arch" || test "$arch" = "$word"; then +- arch="$word" +- else +- gl_cv_c_multiarch=yes +- fi +- ;; +- esac +- prev= +- else +- if test "x$word" = "x-arch"; then +- prev=arch +- fi +- fi +- done +- ]) +- if test $gl_cv_c_multiarch = yes; then +- APPLE_UNIVERSAL_BUILD=1 +- else +- APPLE_UNIVERSAL_BUILD=0 +- fi +- AC_SUBST([APPLE_UNIVERSAL_BUILD]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/onceonly.m4 groff-1.22.3/src/libs/gnulib/m4/onceonly.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/onceonly.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/onceonly.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,104 +0,0 @@ +-# onceonly.m4 serial 9 +-dnl Copyright (C) 2002-2003, 2005-2006, 2008-2014 Free Software Foundation, +-dnl Inc. +-dnl +-dnl This file is free software; you can redistribute it and/or modify +-dnl it under the terms of the GNU General Public License as published by +-dnl the Free Software Foundation; either version 3 of the License, or +-dnl (at your option) any later version. +-dnl +-dnl This file is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-dnl GNU General Public License for more details. +-dnl +-dnl You should have received a copy of the GNU General Public License +-dnl along with this file. If not, see . +-dnl +-dnl As a special exception to the GNU General Public License, +-dnl this file may be distributed as part of a program +-dnl that contains a configuration script generated by Autoconf, under +-dnl the same distribution terms as the rest of that program. +- +-dnl This file defines some "once only" variants of standard autoconf macros. +-dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS +-dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS +-dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS +-dnl AC_REQUIRE([AC_FUNC_STRCOLL]) like AC_FUNC_STRCOLL +-dnl The advantage is that the check for each of the headers/functions/decls +-dnl will be put only once into the 'configure' file. It keeps the size of +-dnl the 'configure' file down, and avoids redundant output when 'configure' +-dnl is run. +-dnl The drawback is that the checks cannot be conditionalized. If you write +-dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi +-dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to +-dnl empty, and the check will be inserted before the body of the AC_DEFUNed +-dnl function. +- +-dnl The original code implemented AC_CHECK_HEADERS_ONCE and AC_CHECK_FUNCS_ONCE +-dnl in terms of AC_DEFUN and AC_REQUIRE. This implementation uses diversions to +-dnl named sections DEFAULTS and INIT_PREPARE in order to check all requested +-dnl headers at once, thus reducing the size of 'configure'. It is known to work +-dnl with autoconf 2.57..2.62 at least . The size reduction is ca. 9%. +- +-dnl Autoconf version 2.59 plus gnulib is required; this file is not needed +-dnl with Autoconf 2.60 or greater. But note that autoconf's implementation of +-dnl AC_CHECK_DECLS_ONCE expects a comma-separated list of symbols as first +-dnl argument! +-AC_PREREQ([2.59]) +- +-# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of +-# AC_CHECK_HEADERS(HEADER1 HEADER2 ...). +-AC_DEFUN([AC_CHECK_HEADERS_ONCE], [ +- : +- m4_foreach_w([gl_HEADER_NAME], [$1], [ +- AC_DEFUN([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME, +- [./-], [___])), [ +- m4_divert_text([INIT_PREPARE], +- [gl_header_list="$gl_header_list gl_HEADER_NAME"]) +- gl_HEADERS_EXPANSION +- AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])), +- [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.]) +- ]) +- AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(m4_translit(gl_HEADER_NAME, +- [./-], [___]))) +- ]) +-]) +-m4_define([gl_HEADERS_EXPANSION], [ +- m4_divert_text([DEFAULTS], [gl_header_list=]) +- AC_CHECK_HEADERS([$gl_header_list]) +- m4_define([gl_HEADERS_EXPANSION], []) +-]) +- +-# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of +-# AC_CHECK_FUNCS(FUNC1 FUNC2 ...). +-AC_DEFUN([AC_CHECK_FUNCS_ONCE], [ +- : +- m4_foreach_w([gl_FUNC_NAME], [$1], [ +- AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [ +- m4_divert_text([INIT_PREPARE], +- [gl_func_list="$gl_func_list gl_FUNC_NAME"]) +- gl_FUNCS_EXPANSION +- AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])), +- [Define to 1 if you have the ']m4_defn([gl_FUNC_NAME])[' function.]) +- ]) +- AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME])) +- ]) +-]) +-m4_define([gl_FUNCS_EXPANSION], [ +- m4_divert_text([DEFAULTS], [gl_func_list=]) +- AC_CHECK_FUNCS([$gl_func_list]) +- m4_define([gl_FUNCS_EXPANSION], []) +-]) +- +-# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of +-# AC_CHECK_DECLS(DECL1, DECL2, ...). +-AC_DEFUN([AC_CHECK_DECLS_ONCE], [ +- : +- m4_foreach_w([gl_DECL_NAME], [$1], [ +- AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [ +- AC_CHECK_DECLS(m4_defn([gl_DECL_NAME])) +- ]) +- AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME])) +- ]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/stdbool.m4 groff-1.22.3/src/libs/gnulib/m4/stdbool.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/stdbool.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/stdbool.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,100 +0,0 @@ +-# Check for stdbool.h that conforms to C99. +- +-dnl Copyright (C) 2002-2006, 2009-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. +- +-#serial 5 +- +-# Prepare for substituting if it is not supported. +- +-AC_DEFUN([AM_STDBOOL_H], +-[ +- AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) +- +- # Define two additional variables used in the Makefile substitution. +- +- if test "$ac_cv_header_stdbool_h" = yes; then +- STDBOOL_H='' +- else +- STDBOOL_H='stdbool.h' +- fi +- AC_SUBST([STDBOOL_H]) +- AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"]) +- +- if test "$ac_cv_type__Bool" = yes; then +- HAVE__BOOL=1 +- else +- HAVE__BOOL=0 +- fi +- AC_SUBST([HAVE__BOOL]) +-]) +- +-# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. +-AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) +- +-# This version of the macro is needed in autoconf <= 2.68. +- +-AC_DEFUN([AC_CHECK_HEADER_STDBOOL], +- [AC_CACHE_CHECK([for stdbool.h that conforms to C99], +- [ac_cv_header_stdbool_h], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[ +- #include +- #ifndef bool +- "error: bool is not defined" +- #endif +- #ifndef false +- "error: false is not defined" +- #endif +- #if false +- "error: false is not 0" +- #endif +- #ifndef true +- "error: true is not defined" +- #endif +- #if true != 1 +- "error: true is not 1" +- #endif +- #ifndef __bool_true_false_are_defined +- "error: __bool_true_false_are_defined is not defined" +- #endif +- +- struct s { _Bool s: 1; _Bool t; } s; +- +- char a[true == 1 ? 1 : -1]; +- char b[false == 0 ? 1 : -1]; +- char c[__bool_true_false_are_defined == 1 ? 1 : -1]; +- char d[(bool) 0.5 == true ? 1 : -1]; +- /* See body of main program for 'e'. */ +- char f[(_Bool) 0.0 == false ? 1 : -1]; +- char g[true]; +- char h[sizeof (_Bool)]; +- char i[sizeof s.t]; +- enum { j = false, k = true, l = false * true, m = true * 256 }; +- /* The following fails for +- HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ +- _Bool n[m]; +- char o[sizeof n == m * sizeof n[0] ? 1 : -1]; +- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; +- /* Catch a bug in an HP-UX C compiler. See +- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html +- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html +- */ +- _Bool q = true; +- _Bool *pq = &q; +- ]], +- [[ +- bool e = &s; +- *pq |= q; +- *pq |= ! q; +- /* Refer to every declared value, to avoid compiler optimizations. */ +- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l +- + !m + !n + !o + !p + !q + !pq); +- ]])], +- [ac_cv_header_stdbool_h=yes], +- [ac_cv_header_stdbool_h=no])]) +- AC_CHECK_TYPES([_Bool]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/stddef_h.m4 groff-1.22.3/src/libs/gnulib/m4/stddef_h.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/stddef_h.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/stddef_h.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,47 +0,0 @@ +-dnl A placeholder for POSIX 2008 , for platforms that have issues. +-# stddef_h.m4 serial 4 +-dnl Copyright (C) 2009-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. +- +-AC_DEFUN([gl_STDDEF_H], +-[ +- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- STDDEF_H= +- if test $gt_cv_c_wchar_t = no; then +- HAVE_WCHAR_T=0 +- STDDEF_H=stddef.h +- fi +- AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions], +- [gl_cv_decl_null_works], +- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +- int test[2 * (sizeof NULL == sizeof (void *)) -1]; +-]])], +- [gl_cv_decl_null_works=yes], +- [gl_cv_decl_null_works=no])]) +- if test $gl_cv_decl_null_works = no; then +- REPLACE_NULL=1 +- STDDEF_H=stddef.h +- fi +- AC_SUBST([STDDEF_H]) +- AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"]) +- if test -n "$STDDEF_H"; then +- gl_NEXT_HEADERS([stddef.h]) +- fi +-]) +- +-AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], +-[ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) +- gl_MODULE_INDICATOR_SET_VARIABLE([$1]) +-]) +- +-AC_DEFUN([gl_STDDEF_H_DEFAULTS], +-[ +- dnl Assume proper GNU behavior unless another module says otherwise. +- REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) +- HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/stdint.m4 groff-1.22.3/src/libs/gnulib/m4/stdint.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/stdint.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/stdint.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,484 +0,0 @@ +-# stdint.m4 serial 43 +-dnl Copyright (C) 2001-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 From Paul Eggert and Bruno Haible. +-dnl Test whether is supported or must be substituted. +- +-AC_DEFUN_ONCE([gl_STDINT_H], +-[ +- AC_PREREQ([2.59])dnl +- +- dnl Check for long long int and unsigned long long int. +- AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) +- if test $ac_cv_type_long_long_int = yes; then +- HAVE_LONG_LONG_INT=1 +- else +- HAVE_LONG_LONG_INT=0 +- fi +- AC_SUBST([HAVE_LONG_LONG_INT]) +- AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) +- if test $ac_cv_type_unsigned_long_long_int = yes; then +- HAVE_UNSIGNED_LONG_LONG_INT=1 +- else +- HAVE_UNSIGNED_LONG_LONG_INT=0 +- fi +- AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT]) +- +- dnl Check for , in the same way as gl_WCHAR_H does. +- AC_CHECK_HEADERS_ONCE([wchar.h]) +- if test $ac_cv_header_wchar_h = yes; then +- HAVE_WCHAR_H=1 +- else +- HAVE_WCHAR_H=0 +- fi +- AC_SUBST([HAVE_WCHAR_H]) +- +- dnl Check for . +- dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h. +- if test $ac_cv_header_inttypes_h = yes; then +- HAVE_INTTYPES_H=1 +- else +- HAVE_INTTYPES_H=0 +- fi +- AC_SUBST([HAVE_INTTYPES_H]) +- +- dnl Check for . +- dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h. +- if test $ac_cv_header_sys_types_h = yes; then +- HAVE_SYS_TYPES_H=1 +- else +- HAVE_SYS_TYPES_H=0 +- fi +- AC_SUBST([HAVE_SYS_TYPES_H]) +- +- gl_CHECK_NEXT_HEADERS([stdint.h]) +- if test $ac_cv_header_stdint_h = yes; then +- HAVE_STDINT_H=1 +- else +- HAVE_STDINT_H=0 +- fi +- AC_SUBST([HAVE_STDINT_H]) +- +- dnl Now see whether we need a substitute . +- if test $ac_cv_header_stdint_h = yes; then +- AC_CACHE_CHECK([whether stdint.h conforms to C99], +- [gl_cv_header_working_stdint_h], +- [gl_cv_header_working_stdint_h=no +- AC_COMPILE_IFELSE([ +- AC_LANG_PROGRAM([[ +-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +-#include +-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ +-#if !(defined WCHAR_MIN && defined WCHAR_MAX) +-#error "WCHAR_MIN, WCHAR_MAX not defined in " +-#endif +-] +-gl_STDINT_INCLUDES +-[ +-#ifdef INT8_MAX +-int8_t a1 = INT8_MAX; +-int8_t a1min = INT8_MIN; +-#endif +-#ifdef INT16_MAX +-int16_t a2 = INT16_MAX; +-int16_t a2min = INT16_MIN; +-#endif +-#ifdef INT32_MAX +-int32_t a3 = INT32_MAX; +-int32_t a3min = INT32_MIN; +-#endif +-#ifdef INT64_MAX +-int64_t a4 = INT64_MAX; +-int64_t a4min = INT64_MIN; +-#endif +-#ifdef UINT8_MAX +-uint8_t b1 = UINT8_MAX; +-#else +-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1]; +-#endif +-#ifdef UINT16_MAX +-uint16_t b2 = UINT16_MAX; +-#endif +-#ifdef UINT32_MAX +-uint32_t b3 = UINT32_MAX; +-#endif +-#ifdef UINT64_MAX +-uint64_t b4 = UINT64_MAX; +-#endif +-int_least8_t c1 = INT8_C (0x7f); +-int_least8_t c1max = INT_LEAST8_MAX; +-int_least8_t c1min = INT_LEAST8_MIN; +-int_least16_t c2 = INT16_C (0x7fff); +-int_least16_t c2max = INT_LEAST16_MAX; +-int_least16_t c2min = INT_LEAST16_MIN; +-int_least32_t c3 = INT32_C (0x7fffffff); +-int_least32_t c3max = INT_LEAST32_MAX; +-int_least32_t c3min = INT_LEAST32_MIN; +-int_least64_t c4 = INT64_C (0x7fffffffffffffff); +-int_least64_t c4max = INT_LEAST64_MAX; +-int_least64_t c4min = INT_LEAST64_MIN; +-uint_least8_t d1 = UINT8_C (0xff); +-uint_least8_t d1max = UINT_LEAST8_MAX; +-uint_least16_t d2 = UINT16_C (0xffff); +-uint_least16_t d2max = UINT_LEAST16_MAX; +-uint_least32_t d3 = UINT32_C (0xffffffff); +-uint_least32_t d3max = UINT_LEAST32_MAX; +-uint_least64_t d4 = UINT64_C (0xffffffffffffffff); +-uint_least64_t d4max = UINT_LEAST64_MAX; +-int_fast8_t e1 = INT_FAST8_MAX; +-int_fast8_t e1min = INT_FAST8_MIN; +-int_fast16_t e2 = INT_FAST16_MAX; +-int_fast16_t e2min = INT_FAST16_MIN; +-int_fast32_t e3 = INT_FAST32_MAX; +-int_fast32_t e3min = INT_FAST32_MIN; +-int_fast64_t e4 = INT_FAST64_MAX; +-int_fast64_t e4min = INT_FAST64_MIN; +-uint_fast8_t f1 = UINT_FAST8_MAX; +-uint_fast16_t f2 = UINT_FAST16_MAX; +-uint_fast32_t f3 = UINT_FAST32_MAX; +-uint_fast64_t f4 = UINT_FAST64_MAX; +-#ifdef INTPTR_MAX +-intptr_t g = INTPTR_MAX; +-intptr_t gmin = INTPTR_MIN; +-#endif +-#ifdef UINTPTR_MAX +-uintptr_t h = UINTPTR_MAX; +-#endif +-intmax_t i = INTMAX_MAX; +-uintmax_t j = UINTMAX_MAX; +- +-#include /* for CHAR_BIT */ +-#define TYPE_MINIMUM(t) \ +- ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) +-#define TYPE_MAXIMUM(t) \ +- ((t) ((t) 0 < (t) -1 \ +- ? (t) -1 \ +- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) +-struct s { +- int check_PTRDIFF: +- PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) +- && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) +- ? 1 : -1; +- /* Detect bug in FreeBSD 6.0 / ia64. */ +- int check_SIG_ATOMIC: +- SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) +- && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) +- ? 1 : -1; +- int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1; +- int check_WCHAR: +- WCHAR_MIN == TYPE_MINIMUM (wchar_t) +- && WCHAR_MAX == TYPE_MAXIMUM (wchar_t) +- ? 1 : -1; +- /* Detect bug in mingw. */ +- int check_WINT: +- WINT_MIN == TYPE_MINIMUM (wint_t) +- && WINT_MAX == TYPE_MAXIMUM (wint_t) +- ? 1 : -1; +- +- /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */ +- int check_UINT8_C: +- (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1; +- int check_UINT16_C: +- (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1; +- +- /* Detect bugs in OpenBSD 3.9 stdint.h. */ +-#ifdef UINT8_MAX +- int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1; +-#endif +-#ifdef UINT16_MAX +- int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1; +-#endif +-#ifdef UINT32_MAX +- int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1; +-#endif +-#ifdef UINT64_MAX +- int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1; +-#endif +- int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1; +- int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1; +- int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1; +- int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1; +- int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1; +- int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1; +- int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1; +- int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1; +- int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1; +- int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1; +- int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1; +-}; +- ]])], +- [dnl Determine whether the various *_MIN, *_MAX macros are usable +- dnl in preprocessor expression. We could do it by compiling a test +- dnl program for each of these macros. It is faster to run a program +- dnl that inspects the macro expansion. +- dnl This detects a bug on HP-UX 11.23/ia64. +- AC_RUN_IFELSE([ +- AC_LANG_PROGRAM([[ +-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ +-#include +-] +-gl_STDINT_INCLUDES +-[ +-#include +-#include +-#define MVAL(macro) MVAL1(macro) +-#define MVAL1(expression) #expression +-static const char *macro_values[] = +- { +-#ifdef INT8_MAX +- MVAL (INT8_MAX), +-#endif +-#ifdef INT16_MAX +- MVAL (INT16_MAX), +-#endif +-#ifdef INT32_MAX +- MVAL (INT32_MAX), +-#endif +-#ifdef INT64_MAX +- MVAL (INT64_MAX), +-#endif +-#ifdef UINT8_MAX +- MVAL (UINT8_MAX), +-#endif +-#ifdef UINT16_MAX +- MVAL (UINT16_MAX), +-#endif +-#ifdef UINT32_MAX +- MVAL (UINT32_MAX), +-#endif +-#ifdef UINT64_MAX +- MVAL (UINT64_MAX), +-#endif +- NULL +- }; +-]], [[ +- const char **mv; +- for (mv = macro_values; *mv != NULL; mv++) +- { +- const char *value = *mv; +- /* Test whether it looks like a cast expression. */ +- if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0 +- || strncmp (value, "((unsigned short)"/*)*/, 17) == 0 +- || strncmp (value, "((unsigned char)"/*)*/, 16) == 0 +- || strncmp (value, "((int)"/*)*/, 6) == 0 +- || strncmp (value, "((signed short)"/*)*/, 15) == 0 +- || strncmp (value, "((signed char)"/*)*/, 14) == 0) +- return mv - macro_values + 1; +- } +- return 0; +-]])], +- [gl_cv_header_working_stdint_h=yes], +- [], +- [dnl When cross-compiling, assume it works. +- gl_cv_header_working_stdint_h=yes +- ]) +- ]) +- ]) +- fi +- if test "$gl_cv_header_working_stdint_h" = yes; then +- STDINT_H= +- else +- dnl Check for , and for +- dnl (used in Linux libc4 >= 4.6.7 and libc5). +- AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) +- if test $ac_cv_header_sys_inttypes_h = yes; then +- HAVE_SYS_INTTYPES_H=1 +- else +- HAVE_SYS_INTTYPES_H=0 +- fi +- AC_SUBST([HAVE_SYS_INTTYPES_H]) +- if test $ac_cv_header_sys_bitypes_h = yes; then +- HAVE_SYS_BITYPES_H=1 +- else +- HAVE_SYS_BITYPES_H=0 +- fi +- AC_SUBST([HAVE_SYS_BITYPES_H]) +- +- gl_STDINT_TYPE_PROPERTIES +- STDINT_H=stdint.h +- fi +- AC_SUBST([STDINT_H]) +- AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) +-]) +- +-dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES) +-dnl Determine the size of each of the given types in bits. +-AC_DEFUN([gl_STDINT_BITSIZEOF], +-[ +- dnl Use a shell loop, to avoid bloating configure, and +- dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into +- dnl config.h.in, +- dnl - extra AC_SUBST calls, so that the right substitutions are made. +- m4_foreach_w([gltype], [$1], +- [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), +- [Define to the number of bits in type ']gltype['.])]) +- for gltype in $1 ; do +- AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}], +- [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT], +- [$2 +-#include ], [result=unknown]) +- eval gl_cv_bitsizeof_${gltype}=\$result +- ]) +- eval result=\$gl_cv_bitsizeof_${gltype} +- if test $result = unknown; then +- dnl Use a nonempty default, because some compilers, such as IRIX 5 cc, +- dnl do a syntax check even on unused #if conditions and give an error +- dnl on valid C code like this: +- dnl #if 0 +- dnl # if > 32 +- dnl # endif +- dnl #endif +- result=0 +- fi +- GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result]) +- eval BITSIZEOF_${GLTYPE}=\$result +- done +- m4_foreach_w([gltype], [$1], +- [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) +-]) +- +-dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES) +-dnl Determine the signedness of each of the given types. +-dnl Define HAVE_SIGNED_TYPE if type is signed. +-AC_DEFUN([gl_CHECK_TYPES_SIGNED], +-[ +- dnl Use a shell loop, to avoid bloating configure, and +- dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into +- dnl config.h.in, +- dnl - extra AC_SUBST calls, so that the right substitutions are made. +- m4_foreach_w([gltype], [$1], +- [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), +- [Define to 1 if ']gltype[' is a signed integer type.])]) +- for gltype in $1 ; do +- AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([$2[ +- int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])], +- result=yes, result=no) +- eval gl_cv_type_${gltype}_signed=\$result +- ]) +- eval result=\$gl_cv_type_${gltype}_signed +- GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- if test "$result" = yes; then +- AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1]) +- eval HAVE_SIGNED_${GLTYPE}=1 +- else +- eval HAVE_SIGNED_${GLTYPE}=0 +- fi +- done +- m4_foreach_w([gltype], [$1], +- [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) +-]) +- +-dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES) +-dnl Determine the suffix to use for integer constants of the given types. +-dnl Define t_SUFFIX for each such type. +-AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], +-[ +- dnl Use a shell loop, to avoid bloating configure, and +- dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into +- dnl config.h.in, +- dnl - extra AC_SUBST calls, so that the right substitutions are made. +- m4_foreach_w([gltype], [$1], +- [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX], +- [Define to l, ll, u, ul, ull, etc., as suitable for +- constants of type ']gltype['.])]) +- for gltype in $1 ; do +- AC_CACHE_CHECK([for $gltype integer literal suffix], +- [gl_cv_type_${gltype}_suffix], +- [eval gl_cv_type_${gltype}_suffix=no +- eval result=\$gl_cv_type_${gltype}_signed +- if test "$result" = yes; then +- glsufu= +- else +- glsufu=u +- fi +- for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do +- case $glsuf in +- '') gltype1='int';; +- l) gltype1='long int';; +- ll) gltype1='long long int';; +- i64) gltype1='__int64';; +- u) gltype1='unsigned int';; +- ul) gltype1='unsigned long int';; +- ull) gltype1='unsigned long long int';; +- ui64)gltype1='unsigned __int64';; +- esac +- AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([$2[ +- extern $gltype foo; +- extern $gltype1 foo;]])], +- [eval gl_cv_type_${gltype}_suffix=\$glsuf]) +- eval result=\$gl_cv_type_${gltype}_suffix +- test "$result" != no && break +- done]) +- GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` +- eval result=\$gl_cv_type_${gltype}_suffix +- test "$result" = no && result= +- eval ${GLTYPE}_SUFFIX=\$result +- AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result]) +- done +- m4_foreach_w([gltype], [$1], +- [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])]) +-]) +- +-dnl gl_STDINT_INCLUDES +-AC_DEFUN([gl_STDINT_INCLUDES], +-[[ +- /* BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +- #include +- #include +- #if HAVE_WCHAR_H +- # include +- # include +- # include +- #endif +-]]) +- +-dnl gl_STDINT_TYPE_PROPERTIES +-dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t +-dnl of interest to stdint.in.h. +-AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], +-[ +- AC_REQUIRE([gl_MULTIARCH]) +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- gl_STDINT_BITSIZEOF([ptrdiff_t size_t], +- [gl_STDINT_INCLUDES]) +- fi +- gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t], +- [gl_STDINT_INCLUDES]) +- gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t], +- [gl_STDINT_INCLUDES]) +- gl_cv_type_ptrdiff_t_signed=yes +- gl_cv_type_size_t_signed=no +- if test $APPLE_UNIVERSAL_BUILD = 0; then +- gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t], +- [gl_STDINT_INCLUDES]) +- fi +- gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t], +- [gl_STDINT_INCLUDES]) +- +- dnl If wint_t is smaller than 'int', it cannot satisfy the ISO C 99 +- dnl requirement that wint_t is "unchanged by default argument promotions". +- dnl In this case gnulib's and override wint_t. +- dnl Set the variable BITSIZEOF_WINT_T accordingly. +- if test $BITSIZEOF_WINT_T -lt 32; then +- BITSIZEOF_WINT_T=32 +- fi +-]) +- +-dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. +-dnl Remove this when we can assume autoconf >= 2.61. +-m4_ifdef([AC_COMPUTE_INT], [], [ +- AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) +-]) +- +-# Hey Emacs! +-# Local Variables: +-# indent-tabs-mode: nil +-# End: +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/warn-on-use.m4 groff-1.22.3/src/libs/gnulib/m4/warn-on-use.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/warn-on-use.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/warn-on-use.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,47 +0,0 @@ +-# warn-on-use.m4 serial 5 +-dnl Copyright (C) 2010-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. +- +-# gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES) +-# --------------------------------------- +-# For each whitespace-separated element in the list of NAMES, define +-# HAVE_RAW_DECL_name if the function has a declaration among INCLUDES +-# even after being undefined as a macro. +-# +-# See warn-on-use.h for some hints on how to poison function names, as +-# well as ideas on poisoning global variables and macros. NAMES may +-# include global variables, but remember that only functions work with +-# _GL_WARN_ON_USE. Typically, INCLUDES only needs to list a single +-# header, but if the replacement header pulls in other headers because +-# some systems declare functions in the wrong header, then INCLUDES +-# should do likewise. +-# +-# It is generally safe to assume declarations for functions declared +-# in the intersection of C89 and C11 (such as printf) without +-# needing gl_WARN_ON_USE_PREPARE. +-AC_DEFUN([gl_WARN_ON_USE_PREPARE], +-[ +- m4_foreach_w([gl_decl], [$2], +- [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])), +- [Define to 1 if ]m4_defn([gl_decl])[ is declared even after +- undefining macros.])])dnl +-dnl FIXME: gl_Symbol must be used unquoted until we can assume +-dnl autoconf 2.64 or newer. +- for gl_func in m4_flatten([$2]); do +- AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl +- AC_CACHE_CHECK([whether $gl_func is declared without a macro], +- gl_Symbol, +- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], +-[@%:@undef $gl_func +- (void) $gl_func;])], +- [AS_VAR_SET(gl_Symbol, [yes])], [AS_VAR_SET(gl_Symbol, [no])])]) +- AS_VAR_IF(gl_Symbol, [yes], +- [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) +- dnl shortcut - if the raw declaration exists, then set a cache +- dnl variable to allow skipping any later AC_CHECK_DECL efforts +- eval ac_cv_have_decl_$gl_func=yes]) +- AS_VAR_POPDEF([gl_Symbol])dnl +- done +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/wchar_h.m4 groff-1.22.3/src/libs/gnulib/m4/wchar_h.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/wchar_h.m4 2014-11-04 10:38:35.641518796 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/wchar_h.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,225 +0,0 @@ +-dnl A placeholder for ISO C99 , for platforms that have issues. +- +-dnl Copyright (C) 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. +- +-dnl Written by Eric Blake. +- +-# wchar_h.m4 serial 39 +- +-AC_DEFUN([gl_WCHAR_H], +-[ +- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) +- AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) +- dnl Prepare for creating substitute . +- dnl Check for (missing in Linux uClibc when built without wide +- dnl character support). +- dnl is always overridden, because of GNULIB_POSIXCHECK. +- gl_CHECK_NEXT_HEADERS([wchar.h]) +- if test $ac_cv_header_wchar_h = yes; then +- HAVE_WCHAR_H=1 +- else +- HAVE_WCHAR_H=0 +- fi +- AC_SUBST([HAVE_WCHAR_H]) +- +- AC_REQUIRE([gl_FEATURES_H]) +- +- AC_REQUIRE([gt_TYPE_WINT_T]) +- if test $gt_cv_c_wint_t = yes; then +- HAVE_WINT_T=1 +- else +- HAVE_WINT_T=0 +- fi +- AC_SUBST([HAVE_WINT_T]) +- +- dnl Check for declarations of anything we want to poison if the +- dnl corresponding gnulib module is not in use. +- gl_WARN_ON_USE_PREPARE([[ +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) +-# include +-# include +-# include +-#endif +-#include +- ]], +- [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb +- wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset +- wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp +- wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr +- wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth +- ]) +-]) +- +-dnl Check whether is usable at all. +-AC_DEFUN([gl_WCHAR_H_INLINE_OK], +-[ +- dnl Test whether suffers due to the transition from '__inline' to +- dnl 'gnu_inline'. See +- dnl and . In summary, +- dnl glibc version 2.5 or older, together with gcc version 4.3 or newer and +- dnl the option -std=c99 or -std=gnu99, leads to a broken . +- AC_CACHE_CHECK([whether uses 'inline' correctly], +- [gl_cv_header_wchar_h_correct_inline], +- [gl_cv_header_wchar_h_correct_inline=yes +- AC_LANG_CONFTEST([ +- AC_LANG_SOURCE([[#define wcstod renamed_wcstod +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#include +-#include +-#include +-#include +-extern int zero (void); +-int main () { return zero(); } +-]])]) +- if AC_TRY_EVAL([ac_compile]); then +- mv conftest.$ac_objext conftest1.$ac_objext +- AC_LANG_CONFTEST([ +- AC_LANG_SOURCE([[#define wcstod renamed_wcstod +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#include +-#include +-#include +-#include +-int zero (void) { return 0; } +-]])]) +- if AC_TRY_EVAL([ac_compile]); then +- mv conftest.$ac_objext conftest2.$ac_objext +- if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then +- : +- else +- gl_cv_header_wchar_h_correct_inline=no +- fi +- fi +- fi +- rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext +- ]) +- if test $gl_cv_header_wchar_h_correct_inline = no; then +- AC_MSG_ERROR([ cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS). +-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in +-C99 mode. You have four options: +- - Add the flag -fgnu89-inline to CC and reconfigure, or +- - Fix your include files, using parts of +- , or +- - Use a gcc version older than 4.3, or +- - Don't use the flags -std=c99 or -std=gnu99. +-Configuration aborted.]) +- fi +-]) +- +-AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], +-[ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) +- gl_MODULE_INDICATOR_SET_VARIABLE([$1]) +- dnl Define it also as a C macro, for the benefit of the unit tests. +- gl_MODULE_INDICATOR_FOR_TESTS([$1]) +-]) +- +-AC_DEFUN([gl_WCHAR_H_DEFAULTS], +-[ +- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) +- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) +- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) +- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) +- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) +- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) +- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) +- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) +- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) +- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) +- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) +- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) +- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) +- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) +- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) +- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) +- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) +- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) +- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) +- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) +- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) +- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) +- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) +- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) +- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) +- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) +- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) +- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) +- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) +- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) +- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) +- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) +- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) +- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) +- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) +- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) +- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) +- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) +- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) +- dnl Assume proper GNU behavior unless another module says otherwise. +- HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) +- HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) +- HAVE_MBRTOWC=1; AC_SUBST([HAVE_MBRTOWC]) +- HAVE_MBRLEN=1; AC_SUBST([HAVE_MBRLEN]) +- HAVE_MBSRTOWCS=1; AC_SUBST([HAVE_MBSRTOWCS]) +- HAVE_MBSNRTOWCS=1; AC_SUBST([HAVE_MBSNRTOWCS]) +- HAVE_WCRTOMB=1; AC_SUBST([HAVE_WCRTOMB]) +- HAVE_WCSRTOMBS=1; AC_SUBST([HAVE_WCSRTOMBS]) +- HAVE_WCSNRTOMBS=1; AC_SUBST([HAVE_WCSNRTOMBS]) +- HAVE_WMEMCHR=1; AC_SUBST([HAVE_WMEMCHR]) +- HAVE_WMEMCMP=1; AC_SUBST([HAVE_WMEMCMP]) +- HAVE_WMEMCPY=1; AC_SUBST([HAVE_WMEMCPY]) +- HAVE_WMEMMOVE=1; AC_SUBST([HAVE_WMEMMOVE]) +- HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) +- HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) +- HAVE_WCSNLEN=1; AC_SUBST([HAVE_WCSNLEN]) +- HAVE_WCSCPY=1; AC_SUBST([HAVE_WCSCPY]) +- HAVE_WCPCPY=1; AC_SUBST([HAVE_WCPCPY]) +- HAVE_WCSNCPY=1; AC_SUBST([HAVE_WCSNCPY]) +- HAVE_WCPNCPY=1; AC_SUBST([HAVE_WCPNCPY]) +- HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT]) +- HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT]) +- HAVE_WCSCMP=1; AC_SUBST([HAVE_WCSCMP]) +- HAVE_WCSNCMP=1; AC_SUBST([HAVE_WCSNCMP]) +- HAVE_WCSCASECMP=1; AC_SUBST([HAVE_WCSCASECMP]) +- HAVE_WCSNCASECMP=1; AC_SUBST([HAVE_WCSNCASECMP]) +- HAVE_WCSCOLL=1; AC_SUBST([HAVE_WCSCOLL]) +- HAVE_WCSXFRM=1; AC_SUBST([HAVE_WCSXFRM]) +- HAVE_WCSDUP=1; AC_SUBST([HAVE_WCSDUP]) +- HAVE_WCSCHR=1; AC_SUBST([HAVE_WCSCHR]) +- HAVE_WCSRCHR=1; AC_SUBST([HAVE_WCSRCHR]) +- HAVE_WCSCSPN=1; AC_SUBST([HAVE_WCSCSPN]) +- HAVE_WCSSPN=1; AC_SUBST([HAVE_WCSSPN]) +- HAVE_WCSPBRK=1; AC_SUBST([HAVE_WCSPBRK]) +- HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) +- HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) +- HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) +- HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) +- HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) +- REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) +- REPLACE_BTOWC=0; AC_SUBST([REPLACE_BTOWC]) +- REPLACE_WCTOB=0; AC_SUBST([REPLACE_WCTOB]) +- REPLACE_MBSINIT=0; AC_SUBST([REPLACE_MBSINIT]) +- REPLACE_MBRTOWC=0; AC_SUBST([REPLACE_MBRTOWC]) +- REPLACE_MBRLEN=0; AC_SUBST([REPLACE_MBRLEN]) +- REPLACE_MBSRTOWCS=0; AC_SUBST([REPLACE_MBSRTOWCS]) +- REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS]) +- REPLACE_WCRTOMB=0; AC_SUBST([REPLACE_WCRTOMB]) +- REPLACE_WCSRTOMBS=0; AC_SUBST([REPLACE_WCSRTOMBS]) +- REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) +- REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) +- REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/wchar_t.m4 groff-1.22.3/src/libs/gnulib/m4/wchar_t.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/wchar_t.m4 2014-11-04 10:38:35.642518784 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/wchar_t.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,24 +0,0 @@ +-# wchar_t.m4 serial 4 (gettext-0.18.2) +-dnl Copyright (C) 2002-2003, 2008-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 From Bruno Haible. +-dnl Test whether has the 'wchar_t' type. +-dnl Prerequisite: AC_PROG_CC +- +-AC_DEFUN([gt_TYPE_WCHAR_T], +-[ +- AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +- wchar_t foo = (wchar_t)'\0';]], +- [[]])], +- [gt_cv_c_wchar_t=yes], +- [gt_cv_c_wchar_t=no])]) +- if test $gt_cv_c_wchar_t = yes; then +- AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) +- fi +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/wctype_h.m4 groff-1.22.3/src/libs/gnulib/m4/wctype_h.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/wctype_h.m4 2014-11-04 10:38:35.642518784 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/wctype_h.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,209 +0,0 @@ +-# wctype_h.m4 serial 18 +- +-dnl A placeholder for ISO C99 , for platforms that lack it. +- +-dnl Copyright (C) 2006-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 Written by Paul Eggert. +- +-AC_DEFUN([gl_WCTYPE_H], +-[ +- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) +- AC_REQUIRE([AC_PROG_CC]) +- AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_CHECK_FUNCS_ONCE([iswcntrl]) +- if test $ac_cv_func_iswcntrl = yes; then +- HAVE_ISWCNTRL=1 +- else +- HAVE_ISWCNTRL=0 +- fi +- AC_SUBST([HAVE_ISWCNTRL]) +- +- AC_REQUIRE([gt_TYPE_WINT_T]) +- if test $gt_cv_c_wint_t = yes; then +- HAVE_WINT_T=1 +- else +- HAVE_WINT_T=0 +- fi +- AC_SUBST([HAVE_WINT_T]) +- +- gl_CHECK_NEXT_HEADERS([wctype.h]) +- if test $ac_cv_header_wctype_h = yes; then +- if test $ac_cv_func_iswcntrl = yes; then +- dnl Linux libc5 has an iswprint function that returns 0 for all arguments. +- dnl The other functions are likely broken in the same way. +- AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works], +- [ +- AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ +- /* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #include +- int main () { return iswprint ('x') == 0; } +- ]])], +- [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no], +- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +- #if __GNU_LIBRARY__ == 1 +- Linux libc5 i18n is broken. +- #endif]], [])], +- [gl_cv_func_iswcntrl_works="guessing yes"], +- [gl_cv_func_iswcntrl_works="guessing no"]) +- ]) +- ]) +- fi +- HAVE_WCTYPE_H=1 +- else +- HAVE_WCTYPE_H=0 +- fi +- AC_SUBST([HAVE_WCTYPE_H]) +- +- case "$gl_cv_func_iswcntrl_works" in +- *yes) REPLACE_ISWCNTRL=0 ;; +- *) REPLACE_ISWCNTRL=1 ;; +- esac +- AC_SUBST([REPLACE_ISWCNTRL]) +- +- if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then +- dnl Redefine all of iswcntrl, ..., iswxdigit in . +- : +- fi +- +- if test $REPLACE_ISWCNTRL = 1; then +- REPLACE_TOWLOWER=1 +- else +- AC_CHECK_FUNCS([towlower]) +- if test $ac_cv_func_towlower = yes; then +- REPLACE_TOWLOWER=0 +- else +- AC_CHECK_DECLS([towlower],,, +- [[/* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #if HAVE_WCTYPE_H +- # include +- #endif +- ]]) +- if test $ac_cv_have_decl_towlower = yes; then +- dnl On Minix 3.1.8, the system's declares towlower() and +- dnl towupper() although it does not have the functions. Avoid a +- dnl collision with gnulib's replacement. +- REPLACE_TOWLOWER=1 +- else +- REPLACE_TOWLOWER=0 +- fi +- fi +- fi +- AC_SUBST([REPLACE_TOWLOWER]) +- +- if test $HAVE_ISWCNTRL = 0 || test $REPLACE_TOWLOWER = 1; then +- dnl Redefine towlower, towupper in . +- : +- fi +- +- dnl We assume that the wctype() and iswctype() functions exist if and only +- dnl if the type wctype_t is defined in or in if that +- dnl exists. +- dnl HP-UX 11.00 declares all these in and lacks . +- AC_CACHE_CHECK([for wctype_t], [gl_cv_type_wctype_t], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[/* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #if HAVE_WCTYPE_H +- # include +- #endif +- wctype_t a; +- ]], +- [[]])], +- [gl_cv_type_wctype_t=yes], +- [gl_cv_type_wctype_t=no]) +- ]) +- if test $gl_cv_type_wctype_t = no; then +- HAVE_WCTYPE_T=0 +- fi +- +- dnl We assume that the wctrans() and towctrans() functions exist if and only +- dnl if the type wctrans_t is defined in . +- AC_CACHE_CHECK([for wctrans_t], [gl_cv_type_wctrans_t], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[/* Tru64 with Desktop Toolkit C has a bug: must be +- included before . +- BSD/OS 4.0.1 has a bug: , and +- must be included before . */ +- #include +- #include +- #include +- #include +- #include +- wctrans_t a; +- ]], +- [[]])], +- [gl_cv_type_wctrans_t=yes], +- [gl_cv_type_wctrans_t=no]) +- ]) +- if test $gl_cv_type_wctrans_t = no; then +- HAVE_WCTRANS_T=0 +- fi +- +- dnl Check for declarations of anything we want to poison if the +- dnl corresponding gnulib module is not in use. +- gl_WARN_ON_USE_PREPARE([[ +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be +- included before . */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) +-# include +-# include +-# include +-# include +-#endif +-#include +- ]], +- [wctype iswctype wctrans towctrans +- ]) +-]) +- +-AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], +-[ +- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. +- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) +- gl_MODULE_INDICATOR_SET_VARIABLE([$1]) +- dnl Define it also as a C macro, for the benefit of the unit tests. +- gl_MODULE_INDICATOR_FOR_TESTS([$1]) +-]) +- +-AC_DEFUN([gl_WCTYPE_H_DEFAULTS], +-[ +- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) +- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) +- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) +- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) +- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) +- dnl Assume proper GNU behavior unless another module says otherwise. +- HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) +- HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) +- HAVE_WCTRANS_T=1; AC_SUBST([HAVE_WCTRANS_T]) +- REPLACE_ISWBLANK=0; AC_SUBST([REPLACE_ISWBLANK]) +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/wcwidth.m4 groff-1.22.3/src/libs/gnulib/m4/wcwidth.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/wcwidth.m4 2014-11-04 10:38:35.642518784 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/wcwidth.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,101 +0,0 @@ +-# wcwidth.m4 serial 23 +-dnl Copyright (C) 2006-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. +- +-AC_DEFUN([gl_FUNC_WCWIDTH], +-[ +- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) +- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles +- +- dnl Persuade glibc to declare wcwidth(). +- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +- +- AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) +- +- AC_CHECK_HEADERS_ONCE([wchar.h]) +- AC_CHECK_FUNCS_ONCE([wcwidth]) +- +- AC_CHECK_DECLS([wcwidth], [], [], [[ +-/* AIX 3.2.5 declares wcwidth in . */ +-#include +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be included +- before . */ +-#include +-#include +-#include +-#include +-]]) +- if test $ac_cv_have_decl_wcwidth != yes; then +- HAVE_DECL_WCWIDTH=0 +- fi +- +- if test $ac_cv_func_wcwidth = yes; then +- HAVE_WCWIDTH=1 +- dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1. +- dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1. +- dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1. +- dnl This leads to bugs in 'ls' (coreutils). +- AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales], +- [gl_cv_func_wcwidth_works], +- [ +- AC_RUN_IFELSE( +- [AC_LANG_SOURCE([[ +-#include +-/* AIX 3.2.5 declares wcwidth in . */ +-#include +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be included +- before . */ +-#include +-#include +-#include +-#include +-#if !HAVE_DECL_WCWIDTH +-extern +-# ifdef __cplusplus +-"C" +-# endif +-int wcwidth (int); +-#endif +-int main () +-{ +- int result = 0; +- if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL) +- { +- if (wcwidth (0x0301) > 0) +- result |= 1; +- if (wcwidth (0x05B0) > 0) +- result |= 2; +- if (wcwidth (0x200B) > 0) +- result |= 4; +- } +- return result; +-}]])], +- [gl_cv_func_wcwidth_works=yes], +- [gl_cv_func_wcwidth_works=no], +- [ +-changequote(,)dnl +- case "$host_os" in +- # Guess yes on glibc and AIX 7 systems. +- *-gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; +- *) gl_cv_func_wcwidth_works="guessing no";; +- esac +-changequote([,])dnl +- ]) +- ]) +- case "$gl_cv_func_wcwidth_works" in +- *yes) ;; +- *no) REPLACE_WCWIDTH=1 ;; +- esac +- else +- HAVE_WCWIDTH=0 +- fi +- dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not +- dnl have the wcwidth function, then it does not declare it. +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/m4/wint_t.m4 groff-1.22.3/src/libs/gnulib/m4/wint_t.m4 +--- groff-1.22.3.old/src/libs/gnulib/m4/wint_t.m4 2014-11-04 10:38:35.642518784 +0200 ++++ groff-1.22.3/src/libs/gnulib/m4/wint_t.m4 1970-01-01 02:00:00.000000000 +0200 +@@ -1,32 +0,0 @@ +-# wint_t.m4 serial 5 (gettext-0.18.2) +-dnl Copyright (C) 2003, 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. +- +-dnl From Bruno Haible. +-dnl Test whether has the 'wint_t' type. +-dnl Prerequisite: AC_PROG_CC +- +-AC_DEFUN([gt_TYPE_WINT_T], +-[ +- AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM( +- [[ +-/* Tru64 with Desktop Toolkit C has a bug: must be included before +- . +- BSD/OS 4.0.1 has a bug: , and must be included +- before . */ +-#include +-#include +-#include +-#include +- wint_t foo = (wchar_t)'\0';]], +- [[]])], +- [gt_cv_c_wint_t=yes], +- [gt_cv_c_wint_t=no])]) +- if test $gt_cv_c_wint_t = yes; then +- AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) +- fi +-]) +diff -Nuar groff-1.22.3.old/src/libs/gnulib/Makefile.am groff-1.22.3/src/libs/gnulib/Makefile.am +--- groff-1.22.3.old/src/libs/gnulib/Makefile.am 2014-11-04 10:38:35.676518359 +0200 ++++ groff-1.22.3/src/libs/gnulib/Makefile.am 1970-01-01 02:00:00.000000000 +0200 +@@ -1,20 +0,0 @@ +-## Process this file with automake to produce Makefile.in. +- +-# Makefile.am +- +-# Copyright (C) 1994-2014 Free Software Foundation, Inc. +- +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even +-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-# PURPOSE. +- +-AUTOMAKE_OPTIONS = 1.5 foreign +- +-SUBDIRS = lib m4 +- +-ACLOCAL_AMFLAGS = -I m4 +diff -Nuar groff-1.22.3.old/src/libs/gnulib/Makefile.in groff-1.22.3/src/libs/gnulib/Makefile.in +--- groff-1.22.3.old/src/libs/gnulib/Makefile.in 2014-11-04 10:38:35.676518359 +0200 ++++ groff-1.22.3/src/libs/gnulib/Makefile.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1,972 +0,0 @@ +-# Makefile.in generated by automake 1.14 from Makefile.am. +-# @configure_input@ +- +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. +- +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +- +-# Makefile.am +- +-# Copyright (C) 1994-2014 Free Software Foundation, Inc. +- +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even +-# the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +-# PURPOSE. +-VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +-am__make_running_with_option = \ +- case $${target_option-} in \ +- ?) ;; \ +- *) echo "am__make_running_with_option: internal error: invalid" \ +- "target option '$${target_option-}' specified" >&2; \ +- exit 1;; \ +- esac; \ +- has_opt=no; \ +- sane_makeflags=$$MAKEFLAGS; \ +- if $(am__is_gnu_make); then \ +- sane_makeflags=$$MFLAGS; \ +- else \ +- case $$MAKEFLAGS in \ +- *\\[\ \ ]*) \ +- bs=\\; \ +- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ +- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ +- esac; \ +- fi; \ +- skip_next=no; \ +- strip_trailopt () \ +- { \ +- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ +- }; \ +- for flg in $$sane_makeflags; do \ +- test $$skip_next = yes && { skip_next=no; continue; }; \ +- case $$flg in \ +- *=*|--*) continue;; \ +- -*I) strip_trailopt 'I'; skip_next=yes;; \ +- -*I?*) strip_trailopt 'I';; \ +- -*O) strip_trailopt 'O'; skip_next=yes;; \ +- -*O?*) strip_trailopt 'O';; \ +- -*l) strip_trailopt 'l'; skip_next=yes;; \ +- -*l?*) strip_trailopt 'l';; \ +- -[dEDm]) skip_next=yes;; \ +- -[JT]) skip_next=yes;; \ +- esac; \ +- case $$flg in \ +- *$$target_option*) has_opt=yes; break;; \ +- esac; \ +- done; \ +- test $$has_opt = yes +-am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +-am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-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 build-aux/compile build-aux/config.guess \ +- build-aux/config.sub build-aux/depcomp build-aux/install-sh \ +- build-aux/missing $(top_srcdir)/build-aux/compile \ +- $(top_srcdir)/build-aux/config.guess \ +- $(top_srcdir)/build-aux/config.sub \ +- $(top_srcdir)/build-aux/install-sh \ +- $(top_srcdir)/build-aux/missing +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ +- $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \ +- $(top_srcdir)/m4/extensions.m4 \ +- $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ +- $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ +- $(top_srcdir)/m4/include_next.m4 \ +- $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ +- $(top_srcdir)/m4/libunistring-base.m4 \ +- $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ +- $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/onceonly.m4 \ +- $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ +- $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/warn-on-use.m4 \ +- $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ +- $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ +- $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/configure.ac +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno config.status.lineno +-mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = +-AM_V_P = $(am__v_P_@AM_V@) +-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +-am__v_P_0 = false +-am__v_P_1 = : +-AM_V_GEN = $(am__v_GEN_@AM_V@) +-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +-am__v_GEN_0 = @echo " GEN " $@; +-am__v_GEN_1 = +-AM_V_at = $(am__v_at_@AM_V@) +-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +-am__v_at_0 = @ +-am__v_at_1 = +-SOURCES = +-DIST_SOURCES = +-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ +- ctags-recursive dvi-recursive html-recursive info-recursive \ +- install-data-recursive install-dvi-recursive \ +- install-exec-recursive install-html-recursive \ +- install-info-recursive install-pdf-recursive \ +- install-ps-recursive install-recursive installcheck-recursive \ +- installdirs-recursive pdf-recursive ps-recursive \ +- tags-recursive uninstall-recursive +-am__can_run_installinfo = \ +- case $$AM_UPDATE_INFO_DIR in \ +- n|no|NO) false;; \ +- *) (install-info --version) >/dev/null 2>&1;; \ +- esac +-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ +- distclean-recursive maintainer-clean-recursive +-am__recursive_targets = \ +- $(RECURSIVE_TARGETS) \ +- $(RECURSIVE_CLEAN_TARGETS) \ +- $(am__extra_recursive_targets) +-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ +- cscope distdir dist dist-all distcheck +-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ +- $(LISP)config.h.in +-# Read a list of newline-separated strings from the standard input, +-# and print each of them once, without duplicates. Input order is +-# *not* preserved. +-am__uniquify_input = $(AWK) '\ +- BEGIN { nonempty = 0; } \ +- { items[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in items) print i; }; } \ +-' +-# Make sure the list of sources is unique. This is necessary because, +-# e.g., the same source file might be shared among _SOURCES variables +-# for different programs/libraries. +-am__define_uniq_tagged_files = \ +- list='$(am__tagged_files)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | $(am__uniquify_input)` +-ETAGS = etags +-CTAGS = ctags +-CSCOPE = cscope +-DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-distdir = $(PACKAGE)-$(VERSION) +-top_distdir = $(distdir) +-am__remove_distdir = \ +- if test -d "$(distdir)"; then \ +- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -rf "$(distdir)" \ +- || { sleep 5 && rm -rf "$(distdir)"; }; \ +- else :; fi +-am__post_remove_distdir = $(am__remove_distdir) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-DIST_TARGETS = dist-gzip +-distuninstallcheck_listfiles = find . -type f -print +-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ +- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +-distcleancheck_listfiles = find . -type f -print +-pkglibexecdir = @pkglibexecdir@ +-ACLOCAL = @ACLOCAL@ +-AMTAR = @AMTAR@ +-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +-APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ +-AR = @AR@ +-ARFLAGS = @ARFLAGS@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ +-BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ +-BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ +-BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ +-BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-EXEEXT = @EXEEXT@ +-GLIBC21 = @GLIBC21@ +-GNULIB_BTOWC = @GNULIB_BTOWC@ +-GNULIB_IMAXABS = @GNULIB_IMAXABS@ +-GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +-GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +-GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ +-GNULIB_MBRLEN = @GNULIB_MBRLEN@ +-GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ +-GNULIB_MBSINIT = @GNULIB_MBSINIT@ +-GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ +-GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ +-GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ +-GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +-GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +-GNULIB_WCPCPY = @GNULIB_WCPCPY@ +-GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ +-GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +-GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +-GNULIB_WCSCAT = @GNULIB_WCSCAT@ +-GNULIB_WCSCHR = @GNULIB_WCSCHR@ +-GNULIB_WCSCMP = @GNULIB_WCSCMP@ +-GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +-GNULIB_WCSCPY = @GNULIB_WCSCPY@ +-GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +-GNULIB_WCSDUP = @GNULIB_WCSDUP@ +-GNULIB_WCSLEN = @GNULIB_WCSLEN@ +-GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +-GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +-GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +-GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +-GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ +-GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +-GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +-GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ +-GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +-GNULIB_WCSSPN = @GNULIB_WCSSPN@ +-GNULIB_WCSSTR = @GNULIB_WCSSTR@ +-GNULIB_WCSTOK = @GNULIB_WCSTOK@ +-GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +-GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ +-GNULIB_WCTOB = @GNULIB_WCTOB@ +-GNULIB_WCTRANS = @GNULIB_WCTRANS@ +-GNULIB_WCTYPE = @GNULIB_WCTYPE@ +-GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +-GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +-GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +-GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +-GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +-GNULIB_WMEMSET = @GNULIB_WMEMSET@ +-GREP = @GREP@ +-HAVE_BTOWC = @HAVE_BTOWC@ +-HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ +-HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +-HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ +-HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +-HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ +-HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +-HAVE_FEATURES_H = @HAVE_FEATURES_H@ +-HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ +-HAVE_ISWBLANK = @HAVE_ISWBLANK@ +-HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +-HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ +-HAVE_MBRLEN = @HAVE_MBRLEN@ +-HAVE_MBRTOWC = @HAVE_MBRTOWC@ +-HAVE_MBSINIT = @HAVE_MBSINIT@ +-HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +-HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ +-HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ +-HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ +-HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ +-HAVE_STDINT_H = @HAVE_STDINT_H@ +-HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +-HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +-HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ +-HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ +-HAVE_WCHAR_H = @HAVE_WCHAR_H@ +-HAVE_WCHAR_T = @HAVE_WCHAR_T@ +-HAVE_WCPCPY = @HAVE_WCPCPY@ +-HAVE_WCPNCPY = @HAVE_WCPNCPY@ +-HAVE_WCRTOMB = @HAVE_WCRTOMB@ +-HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +-HAVE_WCSCAT = @HAVE_WCSCAT@ +-HAVE_WCSCHR = @HAVE_WCSCHR@ +-HAVE_WCSCMP = @HAVE_WCSCMP@ +-HAVE_WCSCOLL = @HAVE_WCSCOLL@ +-HAVE_WCSCPY = @HAVE_WCSCPY@ +-HAVE_WCSCSPN = @HAVE_WCSCSPN@ +-HAVE_WCSDUP = @HAVE_WCSDUP@ +-HAVE_WCSLEN = @HAVE_WCSLEN@ +-HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +-HAVE_WCSNCAT = @HAVE_WCSNCAT@ +-HAVE_WCSNCMP = @HAVE_WCSNCMP@ +-HAVE_WCSNCPY = @HAVE_WCSNCPY@ +-HAVE_WCSNLEN = @HAVE_WCSNLEN@ +-HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +-HAVE_WCSPBRK = @HAVE_WCSPBRK@ +-HAVE_WCSRCHR = @HAVE_WCSRCHR@ +-HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +-HAVE_WCSSPN = @HAVE_WCSSPN@ +-HAVE_WCSSTR = @HAVE_WCSSTR@ +-HAVE_WCSTOK = @HAVE_WCSTOK@ +-HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +-HAVE_WCSXFRM = @HAVE_WCSXFRM@ +-HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ +-HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +-HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ +-HAVE_WINT_T = @HAVE_WINT_T@ +-HAVE_WMEMCHR = @HAVE_WMEMCHR@ +-HAVE_WMEMCMP = @HAVE_WMEMCMP@ +-HAVE_WMEMCPY = @HAVE_WMEMCPY@ +-HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +-HAVE_WMEMSET = @HAVE_WMEMSET@ +-HAVE__BOOL = @HAVE__BOOL@ +-INCLUDE_NEXT = @INCLUDE_NEXT@ +-INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ +-INSTALL = @INSTALL@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ +-INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ +-LDFLAGS = @LDFLAGS@ +-LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ +-LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ +-LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ +-LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ +-LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ +-LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MKDIR_P = @MKDIR_P@ +-NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ +-NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +-NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ +-NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ +-NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ +-NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ +-NEXT_STDDEF_H = @NEXT_STDDEF_H@ +-NEXT_STDINT_H = @NEXT_STDINT_H@ +-NEXT_WCHAR_H = @NEXT_WCHAR_H@ +-NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ +-OBJEXT = @OBJEXT@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ +-PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ +-PRIPTR_PREFIX = @PRIPTR_PREFIX@ +-PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ +-PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ +-RANLIB = @RANLIB@ +-REPLACE_BTOWC = @REPLACE_BTOWC@ +-REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ +-REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ +-REPLACE_MBRLEN = @REPLACE_MBRLEN@ +-REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +-REPLACE_MBSINIT = @REPLACE_MBSINIT@ +-REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +-REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +-REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +-REPLACE_NULL = @REPLACE_NULL@ +-REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ +-REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +-REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +-REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ +-REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +-REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +-REPLACE_WCTOB = @REPLACE_WCTOB@ +-REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ +-SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ +-STDBOOL_H = @STDBOOL_H@ +-STDDEF_H = @STDDEF_H@ +-STDINT_H = @STDINT_H@ +-STRIP = @STRIP@ +-UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ +-UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +-VERSION = @VERSION@ +-WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ +-WINT_T_SUFFIX = @WINT_T_SUFFIX@ +-abs_builddir = @abs_builddir@ +-abs_srcdir = @abs_srcdir@ +-abs_top_builddir = @abs_top_builddir@ +-abs_top_srcdir = @abs_top_srcdir@ +-ac_ct_CC = @ac_ct_CC@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-builddir = @builddir@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-gl_LIBOBJS = @gl_LIBOBJS@ +-gl_LTLIBOBJS = @gl_LTLIBOBJS@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-lispdir = @lispdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-runstatedir = @runstatedir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-srcdir = @srcdir@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +-top_build_prefix = @top_build_prefix@ +-top_builddir = @top_builddir@ +-top_srcdir = @top_srcdir@ +-AUTOMAKE_OPTIONS = 1.5 foreign +-SUBDIRS = lib m4 +-ACLOCAL_AMFLAGS = -I m4 +-all: config.h +- $(MAKE) $(AM_MAKEFLAGS) all-recursive +- +-.SUFFIXES: +-am--refresh: Makefile +- @: +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ +- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- 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*) \ +- echo ' $(SHELL) ./config.status'; \ +- $(SHELL) ./config.status;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- $(SHELL) ./config.status --recheck +- +-$(top_srcdir)/configure: $(am__configure_deps) +- $(am__cd) $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +-$(am__aclocal_m4_deps): +- +-config.h: stamp-h1 +- @test -f $@ || rm -f stamp-h1 +- @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 +- +-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +- @rm -f stamp-h1 +- cd $(top_builddir) && $(SHELL) ./config.status config.h +-$(srcdir)/config.h.in: $(am__configure_deps) +- ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) +- rm -f stamp-h1 +- touch $@ +- +-distclean-hdr: +- -rm -f config.h stamp-h1 +- +-# This directory's subdirectories are mostly independent; you can cd +-# into them and run 'make' without going through this Makefile. +-# To change the values of 'make' variables: instead of editing Makefiles, +-# (1) if the variable is set in 'config.status', edit 'config.status' +-# (which will cause the Makefiles to be regenerated when you run 'make'); +-# (2) otherwise, pass the desired values on the 'make' command line. +-$(am__recursive_targets): +- @fail=; \ +- if $(am__make_keepgoing); then \ +- failcom='fail=yes'; \ +- else \ +- failcom='exit 1'; \ +- fi; \ +- dot_seen=no; \ +- target=`echo $@ | sed s/-recursive//`; \ +- case "$@" in \ +- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +- *) list='$(SUBDIRS)' ;; \ +- esac; \ +- for subdir in $$list; do \ +- echo "Making $$target in $$subdir"; \ +- if test "$$subdir" = "."; then \ +- dot_seen=yes; \ +- local_target="$$target-am"; \ +- else \ +- local_target="$$target"; \ +- fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || eval $$failcom; \ +- done; \ +- if test "$$dot_seen" = "no"; then \ +- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ +- fi; test -z "$$fail" +- +-ID: $(am__tagged_files) +- $(am__define_uniq_tagged_files); mkid -fID $$unique +-tags: tags-recursive +-TAGS: tags +- +-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +- set x; \ +- here=`pwd`; \ +- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ +- include_option=--etags-include; \ +- empty_fix=.; \ +- else \ +- include_option=--include; \ +- empty_fix=; \ +- fi; \ +- list='$(SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ +- fi; \ +- done; \ +- $(am__define_uniq_tagged_files); \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ +- fi +-ctags: ctags-recursive +- +-CTAGS: ctags +-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) +- $(am__define_uniq_tagged_files); \ +- test -z "$(CTAGS_ARGS)$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" +-cscope: cscope.files +- test ! -s cscope.files \ +- || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +-clean-cscope: +- -rm -f cscope.files +-cscope.files: clean-cscope cscopelist +-cscopelist: cscopelist-recursive +- +-cscopelist-am: $(am__tagged_files) +- list='$(am__tagged_files)'; \ +- case "$(srcdir)" in \ +- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ +- *) sdir=$(subdir)/$(srcdir) ;; \ +- esac; \ +- for i in $$list; do \ +- if test -f "$$i"; then \ +- echo "$(subdir)/$$i"; \ +- else \ +- echo "$$sdir/$$i"; \ +- fi; \ +- done >> $(top_builddir)/cscope.files +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- -rm -f cscope.out cscope.in.out cscope.po.out cscope.files +- +-distdir: $(DISTFILES) +- $(am__remove_distdir) +- test -d "$(distdir)" || mkdir "$(distdir)" +- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ +- list='$(DISTFILES)'; \ +- dist_files=`for file in $$list; do echo $$file; done | \ +- sed -e "s|^$$srcdirstrip/||;t" \ +- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ +- case $$dist_files in \ +- */*) $(MKDIR_P) `echo "$$dist_files" | \ +- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ +- sort -u` ;; \ +- esac; \ +- for file in $$dist_files; do \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- if test -d $$d/$$file; then \ +- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- $(am__make_dryrun) \ +- || test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -o \ +- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r "$(distdir)" +-dist-gzip: distdir +- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz +- $(am__post_remove_distdir) +- +-dist-bzip2: distdir +- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 +- $(am__post_remove_distdir) +- +-dist-lzip: distdir +- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz +- $(am__post_remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz +- $(am__post_remove_distdir) +- +-dist-tarZ: distdir +- @echo WARNING: "Support for shar distribution archives 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: "It will be removed altogether in Automake 2.0" >&2 +- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz +- $(am__post_remove_distdir) +- +-dist-zip: distdir +- -rm -f $(distdir).zip +- zip -rq $(distdir).zip $(distdir) +- $(am__post_remove_distdir) +- +-dist dist-all: +- $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' +- $(am__post_remove_distdir) +- +-# This target untars the dist file and tries a VPATH configuration. Then +-# it guarantees that the distribution is self-contained by making another +-# tarfile. +-distcheck: dist +- case '$(DIST_ARCHIVES)' in \ +- *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lz*) \ +- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ +- *.zip*) \ +- unzip $(distdir).zip ;;\ +- esac +- chmod -R a-w $(distdir) +- chmod u+w $(distdir) +- mkdir $(distdir)/_build $(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 --srcdir=.. --prefix="$$dc_install_base" \ +- $(AM_DISTCHECK_CONFIGURE_FLAGS) \ +- $(DISTCHECK_CONFIGURE_FLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) \ +- && $(MAKE) $(AM_MAKEFLAGS) dvi \ +- && $(MAKE) $(AM_MAKEFLAGS) check \ +- && $(MAKE) $(AM_MAKEFLAGS) install \ +- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +- && $(MAKE) $(AM_MAKEFLAGS) uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ +- distuninstallcheck \ +- && chmod -R a-w "$$dc_install_base" \ +- && ({ \ +- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ +- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ +- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ +- } || { rm -rf "$$dc_destdir"; exit 1; }) \ +- && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist \ +- && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(am__post_remove_distdir) +- @(echo "$(distdir) archives ready for distribution: "; \ +- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ +- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +-distuninstallcheck: +- @test -n '$(distuninstallcheck_dir)' || { \ +- echo 'ERROR: trying to run $@ with an empty' \ +- '$$(distuninstallcheck_dir)' >&2; \ +- exit 1; \ +- }; \ +- $(am__cd) '$(distuninstallcheck_dir)' || { \ +- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ +- exit 1; \ +- }; \ +- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ +- || { echo "ERROR: files left after uninstall:" ; \ +- if test -n "$(DESTDIR)"; then \ +- echo " (check DESTDIR support)"; \ +- fi ; \ +- $(distuninstallcheck_listfiles) ; \ +- exit 1; } >&2 +-distcleancheck: distclean +- @if test '$(srcdir)' = . ; then \ +- echo "ERROR: distcleancheck can only run from a VPATH build" ; \ +- exit 1 ; \ +- fi +- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ +- || { echo "ERROR: files left in build directory after distclean:" ; \ +- $(distcleancheck_listfiles) ; \ +- exit 1; } >&2 +-check-am: all-am +-check: check-recursive +-all-am: Makefile config.h +-installdirs: installdirs-recursive +-installdirs-am: +-install: install-recursive +-install-exec: install-exec-recursive +-install-data: install-data-recursive +-uninstall: uninstall-recursive +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-recursive +-install-strip: +- if test -z '$(STRIP)'; then \ +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- install; \ +- else \ +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ +- fi +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-clean: clean-recursive +- +-clean-am: clean-generic mostlyclean-am +- +-distclean: distclean-recursive +- -rm -f $(am__CONFIG_DISTCLEAN_FILES) +- -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags +- +-dvi: dvi-recursive +- +-dvi-am: +- +-html: html-recursive +- +-html-am: +- +-info: info-recursive +- +-info-am: +- +-install-data-am: +- +-install-dvi: install-dvi-recursive +- +-install-dvi-am: +- +-install-exec-am: +- +-install-html: install-html-recursive +- +-install-html-am: +- +-install-info: install-info-recursive +- +-install-info-am: +- +-install-man: +- +-install-pdf: install-pdf-recursive +- +-install-pdf-am: +- +-install-ps: install-ps-recursive +- +-install-ps-am: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-recursive +- -rm -f $(am__CONFIG_DISTCLEAN_FILES) +- -rm -rf $(top_srcdir)/autom4te.cache +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-recursive +- +-mostlyclean-am: mostlyclean-generic +- +-pdf: pdf-recursive +- +-pdf-am: +- +-ps: ps-recursive +- +-ps-am: +- +-uninstall-am: +- +-.MAKE: $(am__recursive_targets) all install-am install-strip +- +-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ +- am--refresh check check-am clean clean-cscope clean-generic \ +- cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ +- dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ +- distcheck distclean distclean-generic distclean-hdr \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ +- uninstall-am +- +- +-# 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. +-.NOEXPORT: +diff -Nuar groff-1.22.3.old/src/libs/libbib/.gitignore groff-1.22.3/src/libs/libbib/.gitignore +--- groff-1.22.3.old/src/libs/libbib/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libbib/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++Makefile.dep +diff -Nuar groff-1.22.3.old/src/libs/libbib/libbib.am groff-1.22.3/src/libs/libbib/libbib.am +--- groff-1.22.3.old/src/libs/libbib/libbib.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libbib/libbib.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,30 @@ ++# Automake rules for `libbib' ++# ++# File position: /src/libs/libbib/libbib.am ++# ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# ++# `groff' 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. ++# ++# `groff' 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 ++# . ++# ++######################################################################## ++ ++noinst_LIBRARIES += libbib.a ++libbib_a_SOURCES = \ ++ src/libs/libbib/common.cpp \ ++ src/libs/libbib/index.cpp \ ++ src/libs/libbib/linear.cpp \ ++ src/libs/libbib/search.cpp \ ++ src/libs/libbib/map.c ++src/libs/libbib/index.$(OBJEXT): defs.h +diff -Nuar groff-1.22.3.old/src/libs/libbib/Makefile.sub groff-1.22.3/src/libs/libbib/Makefile.sub +--- groff-1.22.3.old/src/libs/libbib/Makefile.sub 2014-11-04 10:38:35.183524522 +0200 ++++ groff-1.22.3/src/libs/libbib/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,46 +0,0 @@ +-# Makefile.sub for `libbib' +-# +-# File position: /src/libs/libbib/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-LIB=bib +-OBJS=\ +- common.$(OBJEXT) \ +- index.$(OBJEXT) \ +- linear.$(OBJEXT) \ +- search.$(OBJEXT) \ +- map.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/common.cpp \ +- $(srcdir)/index.cpp \ +- $(srcdir)/linear.cpp \ +- $(srcdir)/search.cpp +-CSRCS=\ +- $(srcdir)/map.c +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/libs/libdriver/.gitignore groff-1.22.3/src/libs/libdriver/.gitignore +--- groff-1.22.3.old/src/libs/libdriver/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libdriver/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++Makefile.dep +diff -Nuar groff-1.22.3.old/src/libs/libdriver/libdriver.am groff-1.22.3/src/libs/libdriver/libdriver.am +--- groff-1.22.3.old/src/libs/libdriver/libdriver.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libdriver/libdriver.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,26 @@ ++# Automake rules for `libdriver' ++# ++# File position: /src/libs/libdriver/libdriver.am ++# ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# ++# `groff' 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. ++# ++# `groff' 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 ++# . ++# ++######################################################################## ++ ++noinst_LIBRARIES += libdriver.a ++libdriver_a_SOURCES = \ ++ src/libs/libdriver/input.cpp \ ++ src/libs/libdriver/printer.cpp +diff -Nuar groff-1.22.3.old/src/libs/libdriver/Makefile.sub groff-1.22.3/src/libs/libdriver/Makefile.sub +--- groff-1.22.3.old/src/libs/libdriver/Makefile.sub 2014-11-04 10:38:35.178524584 +0200 ++++ groff-1.22.3/src/libs/libdriver/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `libdriver' +-# +-# File position: /src/libs/libdriver/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-LIB=driver +-OBJS=\ +- input.$(OBJEXT) \ +- printer.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/input.cpp \ +- $(srcdir)/printer.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/libs/libgroff/.gitignore groff-1.22.3/src/libs/libgroff/.gitignore +--- groff-1.22.3.old/src/libs/libgroff/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libgroff/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++Makefile.dep ++version.cpp ++ref-del.sed ++ref-add.sed ++charset.alias +diff -Nuar groff-1.22.3.old/src/libs/libgroff/glyphuni.cpp groff-1.22.3/src/libs/libgroff/glyphuni.cpp +--- groff-1.22.3.old/src/libs/libgroff/glyphuni.cpp 2014-11-04 10:38:35.169524697 +0200 ++++ groff-1.22.3/src/libs/libgroff/glyphuni.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -474,12 +474,6 @@ + { "bracerightbt", "23AD" }, + { "an", "23AF" }, + { "br", "2502" }, +- { "rk", "251D" }, +- { "lk", "2525" }, +- { "lt", "256D" }, +- { "rt", "256E" }, +- { "rb", "256F" }, +- { "lb", "2570" }, + { "sq", "25A1" }, + { "lz", "25CA" }, + { "ci", "25CB" }, +diff -Nuar groff-1.22.3.old/src/libs/libgroff/lf.cpp groff-1.22.3/src/libs/libgroff/lf.cpp +--- groff-1.22.3.old/src/libs/libgroff/lf.cpp 2014-11-04 10:38:35.170524684 +0200 ++++ groff-1.22.3/src/libs/libgroff/lf.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -22,6 +22,7 @@ + #include "lib.h" + #include "cset.h" + #include "stringclass.h" ++#include "lf.h" + + extern void change_filename(const char *); + extern void change_lineno(int); +@@ -60,3 +61,18 @@ + change_lineno(ln); + return 1; + } ++ ++#if defined(__MSDOS__) || (defined(_WIN32) && !defined(__CYGWIN__)) ++void normalize_for_lf (string &fn) ++{ ++ int fnlen = fn.length(); ++ for (int i = 0; i < fnlen; i++) { ++ if (fn[i] == '\\') ++ fn[i] = '/'; ++ } ++} ++#else ++void normalize_for_lf (string &) ++{ ++} ++#endif +diff -Nuar groff-1.22.3.old/src/libs/libgroff/libgroff.am groff-1.22.3/src/libs/libgroff/libgroff.am +--- groff-1.22.3.old/src/libs/libgroff/libgroff.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libgroff/libgroff.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,172 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++libgroff_srcdir = $(top_srcdir)/src/libs/libgroff ++noinst_LIBRARIES += libgroff.a ++libgroff_a_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ -D__GETOPT_PREFIX=groff_ \ ++ -DENABLE_RELOCATABLE=1 \ ++ -DLIBDIR=\"$(libdir)\" ++ ++# Build from OBJS ++libgroff_a_SOURCES = \ ++ src/libs/libgroff/assert.cpp \ ++ src/libs/libgroff/change_lf.cpp \ ++ src/libs/libgroff/cmap.cpp \ ++ src/libs/libgroff/color.cpp \ ++ src/libs/libgroff/cset.cpp\ ++ src/libs/libgroff/device.cpp \ ++ src/libs/libgroff/errarg.cpp \ ++ src/libs/libgroff/error.cpp \ ++ src/libs/libgroff/fatal.cpp \ ++ src/libs/libgroff/filename.cpp \ ++ src/libs/libgroff/font.cpp \ ++ src/libs/libgroff/fontfile.cpp \ ++ src/libs/libgroff/geometry.cpp \ ++ src/libs/libgroff/getopt.c \ ++ src/libs/libgroff/getopt1.c \ ++ src/libs/libgroff/glyphuni.cpp \ ++ src/libs/libgroff/htmlhint.cpp \ ++ src/libs/libgroff/hypot.cpp \ ++ src/libs/libgroff/iftoa.c \ ++ src/libs/libgroff/invalid.cpp \ ++ src/libs/libgroff/itoa.c \ ++ src/libs/libgroff/lf.cpp \ ++ src/libs/libgroff/lineno.cpp \ ++ src/libs/libgroff/localcharset.c \ ++ src/libs/libgroff/macropath.cpp \ ++ src/libs/libgroff/matherr.c \ ++ src/libs/libgroff/maxfilename.cpp \ ++ src/libs/libgroff/maxpathname.cpp \ ++ src/libs/libgroff/mksdir.cpp \ ++ src/libs/libgroff/nametoindex.cpp \ ++ src/libs/libgroff/new.cpp \ ++ src/libs/libgroff/paper.cpp \ ++ src/libs/libgroff/prime.cpp \ ++ src/libs/libgroff/progname.c \ ++ src/libs/libgroff/ptable.cpp \ ++ src/libs/libgroff/quotearg.c \ ++ src/libs/libgroff/relocate.cpp \ ++ src/libs/libgroff/searchpath.cpp \ ++ src/libs/libgroff/spawnvp.c \ ++ src/libs/libgroff/string.cpp \ ++ src/libs/libgroff/strsave.cpp \ ++ src/libs/libgroff/symbol.cpp \ ++ src/libs/libgroff/tmpfile.cpp \ ++ src/libs/libgroff/tmpname.cpp \ ++ src/libs/libgroff/unicode.cpp \ ++ src/libs/libgroff/uniglyph.cpp \ ++ src/libs/libgroff/uniuni.cpp \ ++ src/libs/libgroff/relocatable.h ++nodist_libgroff_a_SOURCES = src/libs/libgroff/version.cpp ++ ++# TODO: these .c files could be removed (use gnulib instead), same ++# thing for snprintf. ++EXTRA_DIST += \ ++ src/libs/libgroff/mkstemp.cpp \ ++ src/libs/libgroff/fmod.c \ ++ src/libs/libgroff/getcwd.c \ ++ src/libs/libgroff/putenv.c \ ++ src/libs/libgroff/strcasecmp.c \ ++ src/libs/libgroff/strerror.c \ ++ src/libs/libgroff/strncasecmp.c \ ++ src/libs/libgroff/strtol.c \ ++ src/libs/libgroff/config.charset \ ++ src/libs/libgroff/ref-add.sin \ ++ src/libs/libgroff/ref-del.sin \ ++ src/libs/libgroff/make-uniuni \ ++ src/libs/snprintf/snprintf.c ++ ++src_version=`cat $(top_srcdir)/VERSION` ++src_revision=`cat $(top_srcdir)/REVISION` ++ ++CLEANFILES += \ ++ src/libs/libgroff/version.cpp \ ++ charset.alias \ ++ ref-add.sed \ ++ ref-del.sed ++ ++# .o files have a 'libgroff_a-' prefix because we set libgroff_a_CPPFLAGS ++src/libs/libgroff/libgroff_a-device.$(OBJEXT): defs.h ++src/libs/libgroff/libgroff_a-fontfile.$(OBJEXT): defs.h ++src/libs/libgroff/libgroff_a-macropath.$(OBJEXT): defs.h ++src/libs/libgroff/libgroff_a-relocate.$(OBJEXT): defs.h ++ ++src/libs/libgroff/version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION ++ @echo Making version.cpp ++ @echo const char \*version_string = \"$(src_version)\"\; >$@ ++ @echo const char \*revision_string = \"$(src_revision)\"\; >>$@ ++ @echo extern \"C\" { >>$@ ++ @echo const char \*Version_string = \"$(src_version).$(src_revision)\"\; >>$@ ++ @echo } >>$@ \ ++ | sed -e 's/\.0\"/\"/' >>$@ ++ ++# Data for localcharset.c. Taken from libiconv/libcharset. ++ ++LIBGROFF_PACKAGE = groff ++ ++all: charset.alias ref-add.sed ref-del.sed ++ ++charset.alias: $(libgroff_srcdir)/config.charset ++ $(SHELL) $(libgroff_srcdir)/config.charset '$(HOST)' > t-$@ ++ mv t-$@ $@ ++ ++ref-add.sed : $(libgroff_srcdir)/ref-add.sin ++ sed -e '/^#/d' \ ++ -e 's/@''PACKAGE''@/$(LIBGROFF_PACKAGE)/g' $(libgroff_srcdir)/ref-add.sin > t-$@ ++ mv t-$@ $@ ++ ++ref-del.sed : $(libgroff_srcdir)/ref-del.sin ++ sed -e '/^#/d' \ ++ -e 's/@''PACKAGE''@/$(LIBGROFF_PACKAGE)/g' $(libgroff_srcdir)/ref-del.sin > t-$@ ++ mv t-$@ $@ ++ ++install-data-local: install_charset_data ++install_charset_data: ++ -test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) ++ if test -f $(DESTDIR)$(libdir)/charset.alias; then \ ++ sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \ ++ > $(DESTDIR)$(libdir)/t-charset.alias; \ ++ $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \ ++ $(DESTDIR)$(libdir)/charset.alias; \ ++ rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ ++ else \ ++ if test $(GLIBC21) = no; then \ ++ sed -f ref-add.sed charset.alias \ ++ > $(DESTDIR)$(libdir)/t-charset.alias; \ ++ $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \ ++ $(DESTDIR)$(libdir)/charset.alias; \ ++ rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ ++ fi; \ ++ fi ++ ++uninstall-local: uninstall_charset_data ++uninstall_charset_data: ++ -if test -f $(DESTDIR)$(libdir)/charset.alias; then \ ++ sed -f ref-del.sed $(DESTDIR)$(libdir)/charset.alias \ ++ > $(DESTDIR)$(libdir)/t-charset.alias; \ ++ if grep '^# Packages using this file: $$' \ ++ $(DESTDIR)$(libdir)/t-charset.alias > /dev/null; then \ ++ rm -f $(DESTDIR)$(libdir)/charset.alias; \ ++ else \ ++ $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \ ++ $(DESTDIR)$(libdir)/charset.alias; \ ++ fi; \ ++ rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ ++ fi +diff -Nuar groff-1.22.3.old/src/libs/libgroff/Makefile.sub groff-1.22.3/src/libs/libgroff/Makefile.sub +--- groff-1.22.3.old/src/libs/libgroff/Makefile.sub 2014-11-04 10:38:35.170524684 +0200 ++++ groff-1.22.3/src/libs/libgroff/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,223 +0,0 @@ +-# Makefile.sub for `libgroff' +-# +-# File position: /src/libs/libgroff/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-LIB=groff +-EXTRA_CFLAGS=-D__GETOPT_PREFIX=groff_ \ +- -DENABLE_RELOCATABLE=1 \ +- -DLIBDIR=\"$(libdir)\" +-OBJS=\ +- assert.$(OBJEXT) \ +- change_lf.$(OBJEXT) \ +- cmap.$(OBJEXT) \ +- color.$(OBJEXT) \ +- cset.$(OBJEXT) \ +- device.$(OBJEXT) \ +- errarg.$(OBJEXT) \ +- error.$(OBJEXT) \ +- fatal.$(OBJEXT) \ +- filename.$(OBJEXT) \ +- font.$(OBJEXT) \ +- fontfile.$(OBJEXT) \ +- geometry.$(OBJEXT) \ +- getopt.$(OBJEXT) \ +- getopt1.$(OBJEXT) \ +- glyphuni.$(OBJEXT) \ +- htmlhint.$(OBJEXT) \ +- hypot.$(OBJEXT) \ +- iftoa.$(OBJEXT) \ +- invalid.$(OBJEXT) \ +- itoa.$(OBJEXT) \ +- lf.$(OBJEXT) \ +- lineno.$(OBJEXT) \ +- localcharset.$(OBJEXT) \ +- macropath.$(OBJEXT) \ +- matherr.$(OBJEXT) \ +- maxfilename.$(OBJEXT) \ +- maxpathname.$(OBJEXT) \ +- mksdir.$(OBJEXT) \ +- nametoindex.$(OBJEXT) \ +- new.$(OBJEXT) \ +- paper.$(OBJEXT) \ +- prime.$(OBJEXT) \ +- progname.$(OBJEXT) \ +- ptable.$(OBJEXT) \ +- quotearg.$(OBJEXT) \ +- relocate.$(OBJEXT) \ +- searchpath.$(OBJEXT) \ +- spawnvp.$(OBJEXT) \ +- string.$(OBJEXT) \ +- strsave.$(OBJEXT) \ +- symbol.$(OBJEXT) \ +- tmpfile.$(OBJEXT) \ +- tmpname.$(OBJEXT) \ +- unicode.$(OBJEXT) \ +- uniglyph.$(OBJEXT) \ +- uniuni.$(OBJEXT) \ +- version.$(OBJEXT) \ +- $(LIBOBJS) +-CCSRCS=\ +- $(srcdir)/assert.cpp \ +- $(srcdir)/change_lf.cpp \ +- $(srcdir)/cmap.cpp \ +- $(srcdir)/color.cpp \ +- $(srcdir)/cset.cpp \ +- $(srcdir)/device.cpp \ +- $(srcdir)/errarg.cpp \ +- $(srcdir)/error.cpp \ +- $(srcdir)/fatal.cpp \ +- $(srcdir)/filename.cpp \ +- $(srcdir)/font.cpp \ +- $(srcdir)/fontfile.cpp \ +- $(srcdir)/geometry.cpp \ +- $(srcdir)/glyphuni.cpp \ +- $(srcdir)/htmlhint.cpp \ +- $(srcdir)/hypot.cpp \ +- $(srcdir)/invalid.cpp \ +- $(srcdir)/lf.cpp \ +- $(srcdir)/lineno.cpp \ +- $(srcdir)/macropath.cpp \ +- $(srcdir)/maxfilename.cpp \ +- $(srcdir)/maxpathname.cpp \ +- $(srcdir)/mksdir.cpp \ +- $(srcdir)/mkstemp.cpp \ +- $(srcdir)/nametoindex.cpp \ +- $(srcdir)/new.cpp \ +- $(srcdir)/paper.cpp \ +- $(srcdir)/prime.cpp \ +- $(srcdir)/ptable.cpp \ +- $(srcdir)/relocate.cpp \ +- $(srcdir)/searchpath.cpp \ +- $(srcdir)/string.cpp \ +- $(srcdir)/strsave.cpp \ +- $(srcdir)/symbol.cpp \ +- $(srcdir)/tmpfile.cpp \ +- $(srcdir)/tmpname.cpp \ +- $(srcdir)/unicode.cpp \ +- $(srcdir)/uniglyph.cpp \ +- $(srcdir)/uniuni.cpp \ +- version.cpp +-CSRCS=\ +- $(srcdir)/fmod.c \ +- $(srcdir)/getcwd.c \ +- $(srcdir)/getopt.c \ +- $(srcdir)/getopt1.c \ +- $(srcdir)/iftoa.c \ +- $(srcdir)/itoa.c \ +- $(srcdir)/localcharset.c \ +- $(srcdir)/matherr.c \ +- $(srcdir)/progname.c \ +- $(srcdir)/putenv.c \ +- $(srcdir)/quotearg.c \ +- $(srcdir)/spawnvp.c \ +- $(srcdir)/strcasecmp.c \ +- $(srcdir)/strerror.c \ +- $(srcdir)/strncasecmp.c \ +- $(srcdir)/strtol.c \ +- $(srcdir)/../snprintf/snprintf.c +-GENSRCS=\ +- version.cpp +-RM=rm -f +- +-src_version=`cat $(top_srcdir)/VERSION` +-src_revision=`cat $(top_srcdir)/REVISION` +- +-version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION +- @echo Making version.cpp +- @echo const char \*version_string = \"$(src_version)\"\; >$@ +- @echo const char \*revision_string = \"$(src_revision)\"\; >>$@ +- @echo extern \"C\" const char \*Version_string = \"$(src_version).$(src_revision)\"\; \ +- | sed -e 's/\.0\"/\"/' >>$@ +- +-# We have to avoid $(COMPILE.c) since we must not use groff's `assert.h' +-snprintf.$(OBJEXT): $(srcdir)/../snprintf/snprintf.c +- $(CC) -c $(CDEFINES) $(CFLAGS) $(CPPFLAGS) \ +- $(srcdir)/../snprintf/snprintf.c +- +-# Data for localcharset.c. Taken from libiconv/libcharset. +- +-all: charset.alias ref-add.sed ref-del.sed +- +-charset.alias: $(srcdir)/config.charset +- $(SHELL) $(srcdir)/config.charset '$(HOST)' > t-$@ +- mv t-$@ $@ +- +-PACKAGE=groff +- +-ref-add.sed : $(srcdir)/ref-add.sin +- sed -e '/^#/d' \ +- -e 's/@''PACKAGE''@/$(PACKAGE)/g' $(srcdir)/ref-add.sin > t-$@ +- mv t-$@ $@ +- +-ref-del.sed : $(srcdir)/ref-del.sin +- sed -e '/^#/d' \ +- -e 's/@''PACKAGE''@/$(PACKAGE)/g' $(srcdir)/ref-del.sin > t-$@ +- mv t-$@ $@ +- +-MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs +- +-install_data: install_charset_data +-install_charset_data: +- -test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir) +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \ +- > $(DESTDIR)$(libdir)/t-charset.alias; \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \ +- $(DESTDIR)$(libdir)/charset.alias; \ +- $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \ +- else \ +- if test $(GLIBC21) = no; then \ +- sed -f ref-add.sed charset.alias \ +- > $(DESTDIR)$(libdir)/t-charset.alias; \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \ +- $(DESTDIR)$(libdir)/charset.alias; \ +- $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \ +- fi; \ +- fi +- +-uninstall_sub: uninstall_charset_data +-uninstall_charset_data: +- -if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- sed -f ref-del.sed $(DESTDIR)$(libdir)/charset.alias \ +- > $(DESTDIR)$(libdir)/t-charset.alias; \ +- if grep '^# Packages using this file: $$' \ +- $(DESTDIR)$(libdir)/t-charset.alias > /dev/null; then \ +- $(RM) $(DESTDIR)$(libdir)/charset.alias; \ +- else \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \ +- $(DESTDIR)$(libdir)/charset.alias; \ +- fi; \ +- $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \ +- fi +- +-clean: clean_charset +-clean_charset: +- $(RM) charset.alias ref-add.sed ref-del.sed +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/libs/libgroff/make-uniuni groff-1.22.3/src/libs/libgroff/make-uniuni +--- groff-1.22.3.old/src/libs/libgroff/make-uniuni 2014-11-04 10:38:35.170524684 +0200 ++++ groff-1.22.3/src/libs/libgroff/make-uniuni 2015-04-23 20:57:03.000000000 +0300 +@@ -74,8 +74,7 @@ + # Write preamble. + cat < + + This file is part of groff. +diff -Nuar groff-1.22.3.old/src/libs/libgroff/uniglyph.cpp groff-1.22.3/src/libs/libgroff/uniglyph.cpp +--- groff-1.22.3.old/src/libs/libgroff/uniglyph.cpp 2014-11-04 10:38:35.172524659 +0200 ++++ groff-1.22.3/src/libs/libgroff/uniglyph.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -460,12 +460,6 @@ + //{ "23AD", "bracerightbt" }, + { "23AF", "an" }, + { "2502", "br" }, +- { "251D", "rk" }, +- { "2525", "lk" }, +- { "256D", "lt" }, +- { "256E", "rt" }, +- { "256F", "rb" }, +- { "2570", "lb" }, + { "25A1", "sq" }, + { "25CA", "lz" }, + { "25CB", "ci" }, +diff -Nuar groff-1.22.3.old/src/libs/libgroff/uniuni.cpp groff-1.22.3/src/libs/libgroff/uniuni.cpp +--- groff-1.22.3.old/src/libs/libgroff/uniuni.cpp 2014-11-04 10:38:35.173524647 +0200 ++++ groff-1.22.3/src/libs/libgroff/uniuni.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -18,8 +18,8 @@ + along with this program. If not, see . */ + + // This code has been algorithmically derived from the file +-// UnicodeData.txt, version 4.1.0, available from unicode.org, +-// on 2005-12-09. ++// UnicodeData.txt, version 7.0.0, available from unicode.org, ++// on 2014-12-16. + + #include "lib.h" + #include "stringclass.h" +@@ -446,6 +446,17 @@ + { "0FAC", "20FAB_0FB7" }, + { "0FB9", "20F90_0FB5" }, + { "1026", "21025_102E" }, ++ { "1B06", "21B05_1B35" }, ++ { "1B08", "21B07_1B35" }, ++ { "1B0A", "21B09_1B35" }, ++ { "1B0C", "21B0B_1B35" }, ++ { "1B0E", "21B0D_1B35" }, ++ { "1B12", "21B11_1B35" }, ++ { "1B3B", "21B3A_1B35" }, ++ { "1B3D", "21B3C_1B35" }, ++ { "1B40", "21B3E_1B35" }, ++ { "1B41", "21B3F_1B35" }, ++ { "1B43", "21B42_1B35" }, + { "1E00", "20041_0325" }, + { "1E01", "20061_0325" }, + { "1E02", "20042_0307" }, +@@ -1320,6 +1331,8 @@ + { "FA2B", "198FC" }, + { "FA2C", "19928" }, + { "FA2D", "19DB4" }, ++ { "FA2E", "190DE" }, ++ { "FA2F", "196B7" }, + { "FA30", "14FAE" }, + { "FA31", "150E7" }, + { "FA32", "1514D" }, +@@ -1379,6 +1392,9 @@ + { "FA68", "196E3" }, + { "FA69", "197FF" }, + { "FA6A", "1983B" }, ++ { "FA6B", "16075" }, ++ { "FA6C", "1242EE" }, ++ { "FA6D", "18218" }, + { "FA70", "14E26" }, + { "FA71", "151B5" }, + { "FA72", "15168" }, +@@ -1519,6 +1535,18 @@ + { "FB4C", "205D1_05BF" }, + { "FB4D", "205DB_05BF" }, + { "FB4E", "205E4_05BF" }, ++ { "1109A", "211099_110BA" }, ++ { "1109C", "21109B_110BA" }, ++ { "110AB", "2110A5_110BA" }, ++ { "1112E", "211131_11127" }, ++ { "1112F", "211132_11127" }, ++ { "1134B", "211347_1133E" }, ++ { "1134C", "211347_11357" }, ++ { "114BB", "2114B9_114BA" }, ++ { "114BC", "2114B9_114B0" }, ++ { "114BE", "2114B9_114BD" }, ++ { "115BA", "2115B8_115AF" }, ++ { "115BB", "2115B9_115AF" }, + { "1D15E", "21D157_1D165" }, + { "1D15F", "21D158_1D165" }, + { "1D160", "31D158_1D165_1D16E" }, +diff -Nuar groff-1.22.3.old/src/libs/libxutil/.gitignore groff-1.22.3/src/libs/libxutil/.gitignore +--- groff-1.22.3.old/src/libs/libxutil/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libxutil/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++Makefile.dep +diff -Nuar groff-1.22.3.old/src/libs/libxutil/libxutil.am groff-1.22.3/src/libs/libxutil/libxutil.am +--- groff-1.22.3.old/src/libs/libxutil/libxutil.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/libs/libxutil/libxutil.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,30 @@ ++# Automake rules for `libxutil' ++# ++# File position: /src/libs/libxutil/libxutil.am ++# ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# ++# `groff' 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. ++# ++# `groff' 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 ++# . ++# ++######################################################################## ++ ++if !WITHOUT_X11 ++noinst_LIBRARIES += libxutil.a ++libxutil_a_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) ++libxutil_a_SOURCES = \ ++ src/libs/libxutil/DviChar.c \ ++ src/libs/libxutil/XFontName.c \ ++ src/libs/libxutil/xmalloc.c ++endif +diff -Nuar groff-1.22.3.old/src/libs/libxutil/Makefile.sub groff-1.22.3/src/libs/libxutil/Makefile.sub +--- groff-1.22.3.old/src/libs/libxutil/Makefile.sub 2014-11-04 10:38:35.187524472 +0200 ++++ groff-1.22.3/src/libs/libxutil/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,42 +0,0 @@ +-# Makefile.sub for `libxutil' +-# +-# File position: /src/libs/libxutil/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-LIB=xutil +-EXTRA_CFLAGS=$(X_CFLAGS) +-OBJS=\ +- DviChar.$(OBJEXT) \ +- XFontName.$(OBJEXT) \ +- xmalloc.$(OBJEXT) +-CSRCS=\ +- $(srcdir)/DviChar.c \ +- $(srcdir)/XFontName.c \ +- $(srcdir)/xmalloc.c +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/eqn/eqn.am groff-1.22.3/src/preproc/eqn/eqn.am +--- groff-1.22.3.old/src/preproc/eqn/eqn.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/eqn/eqn.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,64 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += eqn ++prefixexecbin_SCRIPTS += neqn ++eqn_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ -I $(top_srcdir)/src/preproc/eqn \ ++ -I $(top_builddir)/src/preproc/eqn ++eqn_LDADD = $(LIBM) libgroff.a ++eqn_SOURCES = \ ++ src/preproc/eqn/main.cpp \ ++ src/preproc/eqn/lex.cpp \ ++ src/preproc/eqn/box.cpp \ ++ src/preproc/eqn/limit.cpp \ ++ src/preproc/eqn/list.cpp \ ++ src/preproc/eqn/over.cpp \ ++ src/preproc/eqn/text.cpp \ ++ src/preproc/eqn/script.cpp \ ++ src/preproc/eqn/mark.cpp \ ++ src/preproc/eqn/other.cpp \ ++ src/preproc/eqn/delim.cpp \ ++ src/preproc/eqn/sqrt.cpp \ ++ src/preproc/eqn/pile.cpp \ ++ src/preproc/eqn/special.cpp \ ++ src/preproc/eqn/eqn.ypp \ ++ src/preproc/eqn/box.h \ ++ src/preproc/eqn/pbox.h \ ++ src/preproc/eqn/eqn.h ++ ++PREFIXMAN1 += src/preproc/eqn/eqn.n src/preproc/eqn/neqn.n ++EXTRA_DIST += \ ++ src/preproc/eqn/TODO \ ++ src/preproc/eqn/neqn.sh \ ++ src/preproc/eqn/eqn.man \ ++ src/preproc/eqn/neqn.man ++ ++src/preproc/eqn/eqn-lex.$(OBJEXT): src/preproc/eqn/eqn.hpp ++CLEANFILES += \ ++ src/preproc/eqn/eqn.hpp \ ++ src/preproc/eqn/eqn.cpp \ ++ src/preproc/eqn/eqn.output ++ ++neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT) ++ $(RM) $@ ++ sed -e 's/[@]g[@]/$(g)/g' \ ++ -f $(SH_DEPS_SED_SCRIPT) \ ++ -e $(SH_SCRIPT_SED_CMD) $(top_srcdir)/src/preproc/eqn/neqn.sh >$@ ++ chmod +x $@ +diff -Nuar groff-1.22.3.old/src/preproc/eqn/eqn.cpp groff-1.22.3/src/preproc/eqn/eqn.cpp +--- groff-1.22.3.old/src/preproc/eqn/eqn.cpp 2014-11-04 10:38:38.327485217 +0200 ++++ groff-1.22.3/src/preproc/eqn/eqn.cpp 1970-01-01 02:00:00.000000000 +0200 +@@ -1,2163 +0,0 @@ +-/* A Bison parser, made by GNU Bison 3.0.2. */ +- +-/* Bison implementation for Yacc-like parsers in C +- +- Copyright (C) 1984, 1989-1990, 2000-2013 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 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 . */ +- +-/* As a special exception, you may create a larger work that contains +- part or all of the Bison parser skeleton and distribute that work +- under terms of your choice, so long as that work isn't itself a +- parser generator using the skeleton or a modified version thereof +- as a parser skeleton. Alternatively, if you modify or redistribute +- the parser skeleton itself, you may (at your option) remove this +- special exception, which will cause the skeleton and the resulting +- Bison output files to be licensed under the GNU General Public +- License without this special exception. +- +- This special exception was added by the Free Software Foundation in +- version 2.2 of Bison. */ +- +-/* C LALR(1) parser skeleton written by Richard Stallman, by +- simplifying the original so-called "semantic" parser. */ +- +-/* All symbols defined below should begin with yy or YY, to avoid +- infringing on user name space. This should be done even for local +- variables, as they might otherwise be expanded by user macros. +- There are some unavoidable exceptions within include files to +- define necessary library symbols; they are noted "INFRINGES ON +- USER NAME SPACE" below. */ +- +-/* Identify Bison output. */ +-#define YYBISON 1 +- +-/* Bison version. */ +-#define YYBISON_VERSION "3.0.2" +- +-/* Skeleton name. */ +-#define YYSKELETON_NAME "yacc.c" +- +-/* Pure parsers. */ +-#define YYPURE 0 +- +-/* Push parsers. */ +-#define YYPUSH 0 +- +-/* Pull parsers. */ +-#define YYPULL 1 +- +- +- +- +-/* Copy the first part of user declarations. */ +-#line 18 "eqn.y" /* yacc.c:339 */ +- +-#include +-#include +-#include +- +-#include "lib.h" +-#include "box.h" +-extern int non_empty_flag; +-int yylex(); +-void yyerror(const char *); +- +-#line 78 "eqn.cpp" /* yacc.c:339 */ +- +-# ifndef YY_NULLPTR +-# if defined __cplusplus && 201103L <= __cplusplus +-# define YY_NULLPTR nullptr +-# else +-# define YY_NULLPTR 0 +-# endif +-# endif +- +-/* Enabling verbose error messages. */ +-#ifdef YYERROR_VERBOSE +-# undef YYERROR_VERBOSE +-# define YYERROR_VERBOSE 1 +-#else +-# define YYERROR_VERBOSE 0 +-#endif +- +-/* In a future release of Bison, this section will be replaced +- by #include "y.tab.h". */ +-#ifndef YY_YY_Y_TAB_H_INCLUDED +-# define YY_YY_Y_TAB_H_INCLUDED +-/* Debug traces. */ +-#ifndef YYDEBUG +-# define YYDEBUG 0 +-#endif +-#if YYDEBUG +-extern int yydebug; +-#endif +- +-/* Token type. */ +-#ifndef YYTOKENTYPE +-# define YYTOKENTYPE +- enum yytokentype +- { +- OVER = 258, +- SMALLOVER = 259, +- SQRT = 260, +- SUB = 261, +- SUP = 262, +- LPILE = 263, +- RPILE = 264, +- CPILE = 265, +- PILE = 266, +- LEFT = 267, +- RIGHT = 268, +- TO = 269, +- FROM = 270, +- SIZE = 271, +- FONT = 272, +- ROMAN = 273, +- BOLD = 274, +- ITALIC = 275, +- FAT = 276, +- ACCENT = 277, +- BAR = 278, +- UNDER = 279, +- ABOVE = 280, +- TEXT = 281, +- QUOTED_TEXT = 282, +- FWD = 283, +- BACK = 284, +- DOWN = 285, +- UP = 286, +- MATRIX = 287, +- COL = 288, +- LCOL = 289, +- RCOL = 290, +- CCOL = 291, +- MARK = 292, +- LINEUP = 293, +- TYPE = 294, +- VCENTER = 295, +- PRIME = 296, +- SPLIT = 297, +- NOSPLIT = 298, +- UACCENT = 299, +- SPECIAL = 300, +- SPACE = 301, +- GFONT = 302, +- GSIZE = 303, +- DEFINE = 304, +- NDEFINE = 305, +- TDEFINE = 306, +- SDEFINE = 307, +- UNDEF = 308, +- IFDEF = 309, +- INCLUDE = 310, +- DELIM = 311, +- CHARTYPE = 312, +- SET = 313, +- GRFONT = 314, +- GBFONT = 315 +- }; +-#endif +-/* Tokens. */ +-#define OVER 258 +-#define SMALLOVER 259 +-#define SQRT 260 +-#define SUB 261 +-#define SUP 262 +-#define LPILE 263 +-#define RPILE 264 +-#define CPILE 265 +-#define PILE 266 +-#define LEFT 267 +-#define RIGHT 268 +-#define TO 269 +-#define FROM 270 +-#define SIZE 271 +-#define FONT 272 +-#define ROMAN 273 +-#define BOLD 274 +-#define ITALIC 275 +-#define FAT 276 +-#define ACCENT 277 +-#define BAR 278 +-#define UNDER 279 +-#define ABOVE 280 +-#define TEXT 281 +-#define QUOTED_TEXT 282 +-#define FWD 283 +-#define BACK 284 +-#define DOWN 285 +-#define UP 286 +-#define MATRIX 287 +-#define COL 288 +-#define LCOL 289 +-#define RCOL 290 +-#define CCOL 291 +-#define MARK 292 +-#define LINEUP 293 +-#define TYPE 294 +-#define VCENTER 295 +-#define PRIME 296 +-#define SPLIT 297 +-#define NOSPLIT 298 +-#define UACCENT 299 +-#define SPECIAL 300 +-#define SPACE 301 +-#define GFONT 302 +-#define GSIZE 303 +-#define DEFINE 304 +-#define NDEFINE 305 +-#define TDEFINE 306 +-#define SDEFINE 307 +-#define UNDEF 308 +-#define IFDEF 309 +-#define INCLUDE 310 +-#define DELIM 311 +-#define CHARTYPE 312 +-#define SET 313 +-#define GRFONT 314 +-#define GBFONT 315 +- +-/* Value type. */ +-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +-typedef union YYSTYPE YYSTYPE; +-union YYSTYPE +-{ +-#line 30 "eqn.y" /* yacc.c:355 */ +- +- char *str; +- box *b; +- pile_box *pb; +- matrix_box *mb; +- int n; +- column *col; +- +-#line 247 "eqn.cpp" /* yacc.c:355 */ +-}; +-# define YYSTYPE_IS_TRIVIAL 1 +-# define YYSTYPE_IS_DECLARED 1 +-#endif +- +- +-extern YYSTYPE yylval; +- +-int yyparse (void); +- +-#endif /* !YY_YY_Y_TAB_H_INCLUDED */ +- +-/* Copy the second part of user declarations. */ +- +-#line 262 "eqn.cpp" /* yacc.c:358 */ +- +-#ifdef short +-# undef short +-#endif +- +-#ifdef YYTYPE_UINT8 +-typedef YYTYPE_UINT8 yytype_uint8; +-#else +-typedef unsigned char yytype_uint8; +-#endif +- +-#ifdef YYTYPE_INT8 +-typedef YYTYPE_INT8 yytype_int8; +-#else +-typedef signed char yytype_int8; +-#endif +- +-#ifdef YYTYPE_UINT16 +-typedef YYTYPE_UINT16 yytype_uint16; +-#else +-typedef unsigned short int yytype_uint16; +-#endif +- +-#ifdef YYTYPE_INT16 +-typedef YYTYPE_INT16 yytype_int16; +-#else +-typedef short int yytype_int16; +-#endif +- +-#ifndef YYSIZE_T +-# ifdef __SIZE_TYPE__ +-# define YYSIZE_T __SIZE_TYPE__ +-# elif defined size_t +-# define YYSIZE_T size_t +-# elif ! defined YYSIZE_T +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YYSIZE_T size_t +-# else +-# define YYSIZE_T unsigned int +-# endif +-#endif +- +-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +- +-#ifndef YY_ +-# if defined YYENABLE_NLS && YYENABLE_NLS +-# if ENABLE_NLS +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YY_(Msgid) dgettext ("bison-runtime", Msgid) +-# endif +-# endif +-# ifndef YY_ +-# define YY_(Msgid) Msgid +-# endif +-#endif +- +-#ifndef YY_ATTRIBUTE +-# if (defined __GNUC__ \ +- && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ +- || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +-# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +-# else +-# define YY_ATTRIBUTE(Spec) /* empty */ +-# endif +-#endif +- +-#ifndef YY_ATTRIBUTE_PURE +-# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +-#endif +- +-#ifndef YY_ATTRIBUTE_UNUSED +-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +-#endif +- +-#if !defined _Noreturn \ +- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +-# if defined _MSC_VER && 1200 <= _MSC_VER +-# define _Noreturn __declspec (noreturn) +-# else +-# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +-# endif +-#endif +- +-/* Suppress unused-variable warnings by "using" E. */ +-#if ! defined lint || defined __GNUC__ +-# define YYUSE(E) ((void) (E)) +-#else +-# define YYUSE(E) /* empty */ +-#endif +- +-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +-/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ +- _Pragma ("GCC diagnostic push") \ +- _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +- _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +- _Pragma ("GCC diagnostic pop") +-#else +-# define YY_INITIAL_VALUE(Value) Value +-#endif +-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +-# define YY_IGNORE_MAYBE_UNINITIALIZED_END +-#endif +-#ifndef YY_INITIAL_VALUE +-# define YY_INITIAL_VALUE(Value) /* Nothing. */ +-#endif +- +- +-#if ! defined yyoverflow || YYERROR_VERBOSE +- +-/* The parser invokes alloca or malloc; define the necessary symbols. */ +- +-# ifdef YYSTACK_USE_ALLOCA +-# if YYSTACK_USE_ALLOCA +-# ifdef __GNUC__ +-# define YYSTACK_ALLOC __builtin_alloca +-# elif defined __BUILTIN_VA_ARG_INCR +-# include /* INFRINGES ON USER NAME SPACE */ +-# elif defined _AIX +-# define YYSTACK_ALLOC __alloca +-# elif defined _MSC_VER +-# include /* INFRINGES ON USER NAME SPACE */ +-# define alloca _alloca +-# else +-# define YYSTACK_ALLOC alloca +-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS +-# include /* INFRINGES ON USER NAME SPACE */ +- /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +-# ifndef EXIT_SUCCESS +-# define EXIT_SUCCESS 0 +-# endif +-# endif +-# endif +-# endif +-# endif +- +-# ifdef YYSTACK_ALLOC +- /* Pacify GCC's 'empty if-body' warning. */ +-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +-# ifndef YYSTACK_ALLOC_MAXIMUM +- /* The OS might guarantee only one guard page at the bottom of the stack, +- and a page size can be as small as 4096 bytes. So we cannot safely +- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number +- to allow for a few compiler-allocated temporary stack slots. */ +-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +-# endif +-# else +-# define YYSTACK_ALLOC YYMALLOC +-# define YYSTACK_FREE YYFREE +-# ifndef YYSTACK_ALLOC_MAXIMUM +-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +-# endif +-# if (defined __cplusplus && ! defined EXIT_SUCCESS \ +- && ! ((defined YYMALLOC || defined malloc) \ +- && (defined YYFREE || defined free))) +-# include /* INFRINGES ON USER NAME SPACE */ +-# ifndef EXIT_SUCCESS +-# define EXIT_SUCCESS 0 +-# endif +-# endif +-# ifndef YYMALLOC +-# define YYMALLOC malloc +-# if ! defined malloc && ! defined EXIT_SUCCESS +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +-# endif +-# endif +-# ifndef YYFREE +-# define YYFREE free +-# if ! defined free && ! defined EXIT_SUCCESS +-void free (void *); /* INFRINGES ON USER NAME SPACE */ +-# endif +-# endif +-# endif +-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +- +- +-#if (! defined yyoverflow \ +- && (! defined __cplusplus \ +- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) +- +-/* A type that is properly aligned for any stack member. */ +-union yyalloc +-{ +- yytype_int16 yyss_alloc; +- YYSTYPE yyvs_alloc; +-}; +- +-/* The size of the maximum gap between one aligned stack and the next. */ +-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +- +-/* The size of an array large to enough to hold all stacks, each with +- N elements. */ +-# define YYSTACK_BYTES(N) \ +- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ +- + YYSTACK_GAP_MAXIMUM) +- +-# define YYCOPY_NEEDED 1 +- +-/* Relocate STACK from its old location to the new one. The +- local variables YYSIZE and YYSTACKSIZE give the old and new number of +- elements in the stack, and YYPTR gives the new location of the +- stack. Advance YYPTR to a properly aligned location for the next +- stack. */ +-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ +- do \ +- { \ +- YYSIZE_T yynewbytes; \ +- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ +- Stack = &yyptr->Stack_alloc; \ +- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ +- yyptr += yynewbytes / sizeof (*yyptr); \ +- } \ +- while (0) +- +-#endif +- +-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +-/* Copy COUNT objects from SRC to DST. The source and destination do +- not overlap. */ +-# ifndef YYCOPY +-# if defined __GNUC__ && 1 < __GNUC__ +-# define YYCOPY(Dst, Src, Count) \ +- __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +-# else +-# define YYCOPY(Dst, Src, Count) \ +- do \ +- { \ +- YYSIZE_T yyi; \ +- for (yyi = 0; yyi < (Count); yyi++) \ +- (Dst)[yyi] = (Src)[yyi]; \ +- } \ +- while (0) +-# endif +-# endif +-#endif /* !YYCOPY_NEEDED */ +- +-/* YYFINAL -- State number of the termination state. */ +-#define YYFINAL 72 +-/* YYLAST -- Last index in YYTABLE. */ +-#define YYLAST 379 +- +-/* YYNTOKENS -- Number of terminals. */ +-#define YYNTOKENS 66 +-/* YYNNTS -- Number of nonterminals. */ +-#define YYNNTS 18 +-/* YYNRULES -- Number of rules. */ +-#define YYNRULES 75 +-/* YYNSTATES -- Number of states. */ +-#define YYNSTATES 142 +- +-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned +- by yylex, with out-of-bounds checking. */ +-#define YYUNDEFTOK 2 +-#define YYMAXUTOK 315 +- +-#define YYTRANSLATE(YYX) \ +- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) +- +-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM +- as returned by yylex, without out-of-bounds checking. */ +-static const yytype_uint8 yytranslate[] = +-{ +- 0, 2, 2, 2, 2, 2, 2, 2, 2, 63, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 61, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 64, 2, 65, 62, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, +- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60 +-}; +- +-#if YYDEBUG +- /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +-static const yytype_uint16 yyrline[] = +-{ +- 0, 121, 121, 123, 128, 130, 141, 143, 145, 150, +- 152, 154, 156, 158, 163, 165, 167, 169, 174, 176, +- 181, 183, 185, 190, 192, 194, 196, 198, 200, 202, +- 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, +- 224, 226, 228, 230, 232, 234, 236, 238, 240, 242, +- 244, 246, 248, 250, 252, 254, 259, 269, 271, 276, +- 278, 283, 285, 290, 292, 297, 299, 304, 306, 308, +- 310, 314, 316, 321, 323, 325 +-}; +-#endif +- +-#if YYDEBUG || YYERROR_VERBOSE || 0 +-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +- First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +-static const char *const yytname[] = +-{ +- "$end", "error", "$undefined", "OVER", "SMALLOVER", "SQRT", "SUB", +- "SUP", "LPILE", "RPILE", "CPILE", "PILE", "LEFT", "RIGHT", "TO", "FROM", +- "SIZE", "FONT", "ROMAN", "BOLD", "ITALIC", "FAT", "ACCENT", "BAR", +- "UNDER", "ABOVE", "TEXT", "QUOTED_TEXT", "FWD", "BACK", "DOWN", "UP", +- "MATRIX", "COL", "LCOL", "RCOL", "CCOL", "MARK", "LINEUP", "TYPE", +- "VCENTER", "PRIME", "SPLIT", "NOSPLIT", "UACCENT", "SPECIAL", "SPACE", +- "GFONT", "GSIZE", "DEFINE", "NDEFINE", "TDEFINE", "SDEFINE", "UNDEF", +- "IFDEF", "INCLUDE", "DELIM", "CHARTYPE", "SET", "GRFONT", "GBFONT", +- "'^'", "'~'", "'\\t'", "'{'", "'}'", "$accept", "top", "equation", +- "mark", "from_to", "sqrt_over", "script", "nonsup", "simple", "number", +- "pile_element_list", "pile_arg", "column_list", "column_element_list", +- "column_arg", "column", "text", "delim", YY_NULLPTR +-}; +-#endif +- +-# ifdef YYPRINT +-/* YYTOKNUM[NUM] -- (External) token number corresponding to the +- (internal) symbol number NUM (which must be that of a token). */ +-static const yytype_uint16 yytoknum[] = +-{ +- 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, +- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, +- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, +- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, +- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, +- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, +- 315, 94, 126, 9, 123, 125 +-}; +-# endif +- +-#define YYPACT_NINF -76 +- +-#define yypact_value_is_default(Yystate) \ +- (!!((Yystate) == (-76))) +- +-#define YYTABLE_NINF -1 +- +-#define yytable_value_is_error(Yytable_value) \ +- 0 +- +- /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing +- STATE-NUM. */ +-static const yytype_int16 yypact[] = +-{ +- 230, 269, 6, 6, 6, 6, 2, 14, 14, 308, +- 308, 308, 308, -76, -76, 14, 14, 14, 14, -50, +- 230, 230, 14, 308, 4, 23, 14, -76, -76, -76, +- 230, 24, 230, -76, -76, 70, -76, -76, 20, -76, +- -76, -76, 230, -44, -76, -76, -76, -76, -76, -76, +- -76, -76, 230, 308, 308, 57, 57, 57, 57, 308, +- 308, 308, 308, 3, -76, -76, 308, 57, -76, -76, +- 308, 130, -76, -76, 269, 269, 269, 269, 308, 308, +- 308, -76, -76, -76, 308, 230, -12, 230, 191, 57, +- 57, 57, 57, 57, 57, 8, 8, 8, 8, 12, +- -76, 57, 57, -76, -76, -76, -76, 79, -76, 335, +- -76, -76, -76, 230, -76, -6, 2, 230, 28, -76, +- -76, -76, -76, -76, -76, 269, 269, 308, 230, -76, +- -76, 230, -3, 230, -76, -76, -76, 230, -76, -2, +- 230, -76 +-}; +- +- /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. +- Performed when YYTABLE does not specify something else to do. Zero +- means the default is an error. */ +-static const yytype_uint8 yydefact[] = +-{ +- 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 23, 24, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 27, 28, 29, +- 0, 0, 3, 4, 6, 9, 14, 18, 20, 15, +- 71, 72, 0, 0, 32, 56, 33, 34, 31, 74, +- 75, 73, 0, 0, 0, 43, 44, 45, 46, 0, +- 0, 0, 0, 0, 7, 8, 0, 54, 25, 26, +- 0, 0, 1, 5, 0, 0, 0, 0, 0, 0, +- 0, 38, 39, 40, 0, 57, 0, 0, 37, 48, +- 47, 49, 50, 52, 51, 0, 0, 0, 0, 0, +- 61, 53, 55, 30, 16, 17, 10, 11, 21, 20, +- 19, 41, 42, 0, 59, 0, 0, 0, 0, 67, +- 68, 69, 70, 35, 62, 0, 0, 0, 58, 60, +- 36, 63, 0, 0, 12, 13, 22, 0, 65, 0, +- 64, 66 +-}; +- +- /* YYPGOTO[NTERM-NUM]. */ +-static const yytype_int8 yypgoto[] = +-{ +- -76, -76, 0, -17, -75, 1, -67, -13, 46, -7, +- 9, 13, -76, -47, 22, -4, -1, -29 +-}; +- +- /* YYDEFGOTO[NTERM-NUM]. */ +-static const yytype_int16 yydefgoto[] = +-{ +- -1, 31, 85, 33, 34, 35, 36, 37, 38, 43, +- 86, 44, 99, 132, 119, 100, 45, 52 +-}; +- +- /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If +- positive, shift that token. If negative, reduce the rule whose +- number is the opposite. If YYTABLE_NINF, syntax error. */ +-static const yytype_uint8 yytable[] = +-{ +- 32, 106, 39, 64, 65, 51, 53, 54, 59, 60, +- 61, 62, 110, 113, 63, 73, 46, 47, 48, 113, +- 87, 66, 137, 137, 72, 70, 78, 79, 40, 41, +- 71, 68, 40, 41, 40, 41, 95, 96, 97, 98, +- 40, 41, 80, 81, 82, 95, 96, 97, 98, 69, +- 134, 135, 88, 114, 73, 55, 56, 57, 58, 129, +- 136, 83, 138, 141, 84, 108, 49, 50, 73, 67, +- 42, 73, 117, 74, 75, 104, 105, 123, 107, 80, +- 81, 82, 74, 75, 76, 77, 139, 130, 118, 118, +- 118, 118, 133, 125, 126, 124, 115, 0, 83, 89, +- 90, 84, 0, 0, 0, 91, 92, 93, 94, 0, +- 0, 73, 101, 128, 73, 51, 102, 131, 120, 121, +- 122, 0, 0, 73, 109, 0, 111, 0, 0, 0, +- 112, 0, 0, 131, 0, 1, 0, 140, 2, 3, +- 4, 5, 6, 0, 0, 0, 7, 8, 9, 10, +- 11, 12, 0, 0, 0, 0, 13, 14, 15, 16, +- 17, 18, 19, 0, 0, 0, 0, 20, 21, 22, +- 23, 0, 24, 25, 0, 26, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 27, 28, 29, 30, 103, 1, 0, 0, 2, +- 3, 4, 5, 6, 116, 0, 0, 7, 8, 9, +- 10, 11, 12, 0, 0, 0, 0, 13, 14, 15, +- 16, 17, 18, 19, 0, 0, 0, 0, 20, 21, +- 22, 23, 0, 24, 25, 1, 26, 0, 2, 3, +- 4, 5, 6, 0, 0, 0, 7, 8, 9, 10, +- 11, 12, 27, 28, 29, 30, 13, 14, 15, 16, +- 17, 18, 19, 0, 0, 0, 0, 20, 21, 22, +- 23, 0, 24, 25, 1, 26, 0, 2, 3, 4, +- 5, 6, 0, 0, 0, 7, 8, 9, 10, 11, +- 12, 27, 28, 29, 30, 13, 14, 15, 16, 17, +- 18, 19, 0, 0, 0, 0, 0, 0, 22, 23, +- 0, 24, 25, 0, 26, 0, 2, 3, 4, 5, +- 6, 0, 0, 0, 7, 8, 9, 10, 11, 12, +- 27, 28, 29, 30, 13, 14, 15, 16, 17, 18, +- 19, 78, 127, 0, 0, 0, 0, 22, 23, 0, +- 24, 25, 0, 26, 0, 0, 0, 80, 81, 82, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 27, +- 28, 29, 30, 0, 0, 0, 83, 0, 0, 84 +-}; +- +-static const yytype_int16 yycheck[] = +-{ +- 0, 76, 1, 20, 21, 6, 7, 8, 15, 16, +- 17, 18, 79, 25, 64, 32, 3, 4, 5, 25, +- 64, 22, 25, 25, 0, 26, 6, 7, 26, 27, +- 30, 27, 26, 27, 26, 27, 33, 34, 35, 36, +- 26, 27, 22, 23, 24, 33, 34, 35, 36, 26, +- 125, 126, 52, 65, 71, 9, 10, 11, 12, 65, +- 127, 41, 65, 65, 44, 78, 64, 65, 85, 23, +- 64, 88, 64, 3, 4, 74, 75, 65, 77, 22, +- 23, 24, 3, 4, 14, 15, 133, 116, 95, 96, +- 97, 98, 64, 14, 15, 99, 87, -1, 41, 53, +- 54, 44, -1, -1, -1, 59, 60, 61, 62, -1, +- -1, 128, 66, 113, 131, 116, 70, 117, 96, 97, +- 98, -1, -1, 140, 78, -1, 80, -1, -1, -1, +- 84, -1, -1, 133, -1, 5, -1, 137, 8, 9, +- 10, 11, 12, -1, -1, -1, 16, 17, 18, 19, +- 20, 21, -1, -1, -1, -1, 26, 27, 28, 29, +- 30, 31, 32, -1, -1, -1, -1, 37, 38, 39, +- 40, -1, 42, 43, -1, 45, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 61, 62, 63, 64, 65, 5, -1, -1, 8, +- 9, 10, 11, 12, 13, -1, -1, 16, 17, 18, +- 19, 20, 21, -1, -1, -1, -1, 26, 27, 28, +- 29, 30, 31, 32, -1, -1, -1, -1, 37, 38, +- 39, 40, -1, 42, 43, 5, 45, -1, 8, 9, +- 10, 11, 12, -1, -1, -1, 16, 17, 18, 19, +- 20, 21, 61, 62, 63, 64, 26, 27, 28, 29, +- 30, 31, 32, -1, -1, -1, -1, 37, 38, 39, +- 40, -1, 42, 43, 5, 45, -1, 8, 9, 10, +- 11, 12, -1, -1, -1, 16, 17, 18, 19, 20, +- 21, 61, 62, 63, 64, 26, 27, 28, 29, 30, +- 31, 32, -1, -1, -1, -1, -1, -1, 39, 40, +- -1, 42, 43, -1, 45, -1, 8, 9, 10, 11, +- 12, -1, -1, -1, 16, 17, 18, 19, 20, 21, +- 61, 62, 63, 64, 26, 27, 28, 29, 30, 31, +- 32, 6, 7, -1, -1, -1, -1, 39, 40, -1, +- 42, 43, -1, 45, -1, -1, -1, 22, 23, 24, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, 61, +- 62, 63, 64, -1, -1, -1, 41, -1, -1, 44 +-}; +- +- /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing +- symbol of state STATE-NUM. */ +-static const yytype_uint8 yystos[] = +-{ +- 0, 5, 8, 9, 10, 11, 12, 16, 17, 18, +- 19, 20, 21, 26, 27, 28, 29, 30, 31, 32, +- 37, 38, 39, 40, 42, 43, 45, 61, 62, 63, +- 64, 67, 68, 69, 70, 71, 72, 73, 74, 71, +- 26, 27, 64, 75, 77, 82, 77, 77, 77, 64, +- 65, 82, 83, 82, 82, 74, 74, 74, 74, 75, +- 75, 75, 75, 64, 69, 69, 82, 74, 27, 26, +- 82, 68, 0, 69, 3, 4, 14, 15, 6, 7, +- 22, 23, 24, 41, 44, 68, 76, 64, 68, 74, +- 74, 74, 74, 74, 74, 33, 34, 35, 36, 78, +- 81, 74, 74, 65, 71, 71, 70, 71, 73, 74, +- 72, 74, 74, 25, 65, 76, 13, 64, 75, 80, +- 80, 80, 80, 65, 81, 14, 15, 7, 68, 65, +- 83, 68, 79, 64, 70, 70, 72, 25, 65, 79, +- 68, 65 +-}; +- +- /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +-static const yytype_uint8 yyr1[] = +-{ +- 0, 66, 67, 67, 68, 68, 69, 69, 69, 70, +- 70, 70, 70, 70, 71, 71, 71, 71, 72, 72, +- 73, 73, 73, 74, 74, 74, 74, 74, 74, 74, +- 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, +- 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, +- 74, 74, 74, 74, 74, 74, 75, 76, 76, 77, +- 77, 78, 78, 79, 79, 80, 80, 81, 81, 81, +- 81, 82, 82, 83, 83, 83 +-}; +- +- /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +-static const yytype_uint8 yyr2[] = +-{ +- 0, 2, 0, 1, 1, 2, 1, 2, 2, 1, +- 3, 3, 5, 5, 1, 2, 3, 3, 1, 3, +- 1, 3, 5, 1, 1, 2, 2, 1, 1, 1, +- 3, 2, 2, 2, 2, 4, 5, 3, 2, 2, +- 2, 3, 3, 2, 2, 2, 2, 3, 3, 3, +- 3, 3, 3, 3, 2, 3, 1, 1, 3, 3, +- 4, 1, 2, 1, 3, 3, 4, 2, 2, 2, +- 2, 1, 1, 1, 1, 1 +-}; +- +- +-#define yyerrok (yyerrstatus = 0) +-#define yyclearin (yychar = YYEMPTY) +-#define YYEMPTY (-2) +-#define YYEOF 0 +- +-#define YYACCEPT goto yyacceptlab +-#define YYABORT goto yyabortlab +-#define YYERROR goto yyerrorlab +- +- +-#define YYRECOVERING() (!!yyerrstatus) +- +-#define YYBACKUP(Token, Value) \ +-do \ +- if (yychar == YYEMPTY) \ +- { \ +- yychar = (Token); \ +- yylval = (Value); \ +- YYPOPSTACK (yylen); \ +- yystate = *yyssp; \ +- goto yybackup; \ +- } \ +- else \ +- { \ +- yyerror (YY_("syntax error: cannot back up")); \ +- YYERROR; \ +- } \ +-while (0) +- +-/* Error token number */ +-#define YYTERROR 1 +-#define YYERRCODE 256 +- +- +- +-/* Enable debugging if requested. */ +-#if YYDEBUG +- +-# ifndef YYFPRINTF +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YYFPRINTF fprintf +-# endif +- +-# define YYDPRINTF(Args) \ +-do { \ +- if (yydebug) \ +- YYFPRINTF Args; \ +-} while (0) +- +-/* This macro is provided for backward compatibility. */ +-#ifndef YY_LOCATION_PRINT +-# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +-#endif +- +- +-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +-do { \ +- if (yydebug) \ +- { \ +- YYFPRINTF (stderr, "%s ", Title); \ +- yy_symbol_print (stderr, \ +- Type, Value); \ +- YYFPRINTF (stderr, "\n"); \ +- } \ +-} while (0) +- +- +-/*----------------------------------------. +-| Print this symbol's value on YYOUTPUT. | +-`----------------------------------------*/ +- +-static void +-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +-{ +- FILE *yyo = yyoutput; +- YYUSE (yyo); +- if (!yyvaluep) +- return; +-# ifdef YYPRINT +- if (yytype < YYNTOKENS) +- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +-# endif +- YYUSE (yytype); +-} +- +- +-/*--------------------------------. +-| Print this symbol on YYOUTPUT. | +-`--------------------------------*/ +- +-static void +-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +-{ +- YYFPRINTF (yyoutput, "%s %s (", +- yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); +- +- yy_symbol_value_print (yyoutput, yytype, yyvaluep); +- YYFPRINTF (yyoutput, ")"); +-} +- +-/*------------------------------------------------------------------. +-| yy_stack_print -- Print the state stack from its BOTTOM up to its | +-| TOP (included). | +-`------------------------------------------------------------------*/ +- +-static void +-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +-{ +- YYFPRINTF (stderr, "Stack now"); +- for (; yybottom <= yytop; yybottom++) +- { +- int yybot = *yybottom; +- YYFPRINTF (stderr, " %d", yybot); +- } +- YYFPRINTF (stderr, "\n"); +-} +- +-# define YY_STACK_PRINT(Bottom, Top) \ +-do { \ +- if (yydebug) \ +- yy_stack_print ((Bottom), (Top)); \ +-} while (0) +- +- +-/*------------------------------------------------. +-| Report that the YYRULE is going to be reduced. | +-`------------------------------------------------*/ +- +-static void +-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) +-{ +- unsigned long int yylno = yyrline[yyrule]; +- int yynrhs = yyr2[yyrule]; +- int yyi; +- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", +- yyrule - 1, yylno); +- /* The symbols being reduced. */ +- for (yyi = 0; yyi < yynrhs; yyi++) +- { +- YYFPRINTF (stderr, " $%d = ", yyi + 1); +- yy_symbol_print (stderr, +- yystos[yyssp[yyi + 1 - yynrhs]], +- &(yyvsp[(yyi + 1) - (yynrhs)]) +- ); +- YYFPRINTF (stderr, "\n"); +- } +-} +- +-# define YY_REDUCE_PRINT(Rule) \ +-do { \ +- if (yydebug) \ +- yy_reduce_print (yyssp, yyvsp, Rule); \ +-} while (0) +- +-/* Nonzero means print parse trace. It is left uninitialized so that +- multiple parsers can coexist. */ +-int yydebug; +-#else /* !YYDEBUG */ +-# define YYDPRINTF(Args) +-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +-# define YY_STACK_PRINT(Bottom, Top) +-# define YY_REDUCE_PRINT(Rule) +-#endif /* !YYDEBUG */ +- +- +-/* YYINITDEPTH -- initial size of the parser's stacks. */ +-#ifndef YYINITDEPTH +-# define YYINITDEPTH 200 +-#endif +- +-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only +- if the built-in stack extension method is used). +- +- Do not make this value too large; the results are undefined if +- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) +- evaluated with infinite-precision integer arithmetic. */ +- +-#ifndef YYMAXDEPTH +-# define YYMAXDEPTH 10000 +-#endif +- +- +-#if YYERROR_VERBOSE +- +-# ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H +-# define yystrlen strlen +-# else +-/* Return the length of YYSTR. */ +-static YYSIZE_T +-yystrlen (const char *yystr) +-{ +- YYSIZE_T yylen; +- for (yylen = 0; yystr[yylen]; yylen++) +- continue; +- return yylen; +-} +-# endif +-# endif +- +-# ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +-# define yystpcpy stpcpy +-# else +-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in +- YYDEST. */ +-static char * +-yystpcpy (char *yydest, const char *yysrc) +-{ +- char *yyd = yydest; +- const char *yys = yysrc; +- +- while ((*yyd++ = *yys++) != '\0') +- continue; +- +- return yyd - 1; +-} +-# endif +-# endif +- +-# ifndef yytnamerr +-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary +- quotes and backslashes, so that it's suitable for yyerror. The +- heuristic is that double-quoting is unnecessary unless the string +- contains an apostrophe, a comma, or backslash (other than +- backslash-backslash). YYSTR is taken from yytname. If YYRES is +- null, do not copy; instead, return the length of what the result +- would have been. */ +-static YYSIZE_T +-yytnamerr (char *yyres, const char *yystr) +-{ +- if (*yystr == '"') +- { +- YYSIZE_T yyn = 0; +- char const *yyp = yystr; +- +- for (;;) +- switch (*++yyp) +- { +- case '\'': +- case ',': +- goto do_not_strip_quotes; +- +- case '\\': +- if (*++yyp != '\\') +- goto do_not_strip_quotes; +- /* Fall through. */ +- default: +- if (yyres) +- yyres[yyn] = *yyp; +- yyn++; +- break; +- +- case '"': +- if (yyres) +- yyres[yyn] = '\0'; +- return yyn; +- } +- do_not_strip_quotes: ; +- } +- +- if (! yyres) +- return yystrlen (yystr); +- +- return yystpcpy (yyres, yystr) - yyres; +-} +-# endif +- +-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message +- about the unexpected token YYTOKEN for the state stack whose top is +- YYSSP. +- +- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is +- not large enough to hold the message. In that case, also set +- *YYMSG_ALLOC to the required number of bytes. Return 2 if the +- required number of bytes is too large to store. */ +-static int +-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, +- yytype_int16 *yyssp, int yytoken) +-{ +- YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); +- YYSIZE_T yysize = yysize0; +- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; +- /* Internationalized format string. */ +- const char *yyformat = YY_NULLPTR; +- /* Arguments of yyformat. */ +- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; +- /* Number of reported tokens (one for the "unexpected", one per +- "expected"). */ +- int yycount = 0; +- +- /* There are many possibilities here to consider: +- - If this state is a consistent state with a default action, then +- the only way this function was invoked is if the default action +- is an error action. In that case, don't check for expected +- tokens because there are none. +- - The only way there can be no lookahead present (in yychar) is if +- this state is a consistent state with a default action. Thus, +- detecting the absence of a lookahead is sufficient to determine +- that there is no unexpected or expected token to report. In that +- case, just report a simple "syntax error". +- - Don't assume there isn't a lookahead just because this state is a +- consistent state with a default action. There might have been a +- previous inconsistent state, consistent state with a non-default +- action, or user semantic action that manipulated yychar. +- - Of course, the expected token list depends on states to have +- correct lookahead information, and it depends on the parser not +- to perform extra reductions after fetching a lookahead from the +- scanner and before detecting a syntax error. Thus, state merging +- (from LALR or IELR) and default reductions corrupt the expected +- token list. However, the list is correct for canonical LR with +- one exception: it will still contain any token that will not be +- accepted due to an error action in a later state. +- */ +- if (yytoken != YYEMPTY) +- { +- int yyn = yypact[*yyssp]; +- yyarg[yycount++] = yytname[yytoken]; +- if (!yypact_value_is_default (yyn)) +- { +- /* Start YYX at -YYN if negative to avoid negative indexes in +- YYCHECK. In other words, skip the first -YYN actions for +- this state because they are default actions. */ +- int yyxbegin = yyn < 0 ? -yyn : 0; +- /* Stay within bounds of both yycheck and yytname. */ +- int yychecklim = YYLAST - yyn + 1; +- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; +- int yyx; +- +- for (yyx = yyxbegin; yyx < yyxend; ++yyx) +- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR +- && !yytable_value_is_error (yytable[yyx + yyn])) +- { +- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) +- { +- yycount = 1; +- yysize = yysize0; +- break; +- } +- yyarg[yycount++] = yytname[yyx]; +- { +- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); +- if (! (yysize <= yysize1 +- && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) +- return 2; +- yysize = yysize1; +- } +- } +- } +- } +- +- switch (yycount) +- { +-# define YYCASE_(N, S) \ +- case N: \ +- yyformat = S; \ +- break +- YYCASE_(0, YY_("syntax error")); +- YYCASE_(1, YY_("syntax error, unexpected %s")); +- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); +- YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); +- YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); +- YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +-# undef YYCASE_ +- } +- +- { +- YYSIZE_T yysize1 = yysize + yystrlen (yyformat); +- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) +- return 2; +- yysize = yysize1; +- } +- +- if (*yymsg_alloc < yysize) +- { +- *yymsg_alloc = 2 * yysize; +- if (! (yysize <= *yymsg_alloc +- && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) +- *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; +- return 1; +- } +- +- /* Avoid sprintf, as that infringes on the user's name space. +- Don't have undefined behavior even if the translation +- produced a string with the wrong number of "%s"s. */ +- { +- char *yyp = *yymsg; +- int yyi = 0; +- while ((*yyp = *yyformat) != '\0') +- if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) +- { +- yyp += yytnamerr (yyp, yyarg[yyi++]); +- yyformat += 2; +- } +- else +- { +- yyp++; +- yyformat++; +- } +- } +- return 0; +-} +-#endif /* YYERROR_VERBOSE */ +- +-/*-----------------------------------------------. +-| Release the memory associated to this symbol. | +-`-----------------------------------------------*/ +- +-static void +-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +-{ +- YYUSE (yyvaluep); +- if (!yymsg) +- yymsg = "Deleting"; +- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); +- +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- YYUSE (yytype); +- YY_IGNORE_MAYBE_UNINITIALIZED_END +-} +- +- +- +- +-/* The lookahead symbol. */ +-int yychar; +- +-/* The semantic value of the lookahead symbol. */ +-YYSTYPE yylval; +-/* Number of syntax errors so far. */ +-int yynerrs; +- +- +-/*----------. +-| yyparse. | +-`----------*/ +- +-int +-yyparse (void) +-{ +- int yystate; +- /* Number of tokens to shift before error messages enabled. */ +- int yyerrstatus; +- +- /* The stacks and their tools: +- 'yyss': related to states. +- 'yyvs': related to semantic values. +- +- Refer to the stacks through separate pointers, to allow yyoverflow +- to reallocate them elsewhere. */ +- +- /* The state stack. */ +- yytype_int16 yyssa[YYINITDEPTH]; +- yytype_int16 *yyss; +- yytype_int16 *yyssp; +- +- /* The semantic value stack. */ +- YYSTYPE yyvsa[YYINITDEPTH]; +- YYSTYPE *yyvs; +- YYSTYPE *yyvsp; +- +- YYSIZE_T yystacksize; +- +- int yyn; +- int yyresult; +- /* Lookahead token as an internal (translated) token number. */ +- int yytoken = 0; +- /* The variables used to return semantic value and location from the +- action routines. */ +- YYSTYPE yyval; +- +-#if YYERROR_VERBOSE +- /* Buffer for error messages, and its allocated size. */ +- char yymsgbuf[128]; +- char *yymsg = yymsgbuf; +- YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +-#endif +- +-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) +- +- /* The number of symbols on the RHS of the reduced rule. +- Keep to zero when no symbol should be popped. */ +- int yylen = 0; +- +- yyssp = yyss = yyssa; +- yyvsp = yyvs = yyvsa; +- yystacksize = YYINITDEPTH; +- +- YYDPRINTF ((stderr, "Starting parse\n")); +- +- yystate = 0; +- yyerrstatus = 0; +- yynerrs = 0; +- yychar = YYEMPTY; /* Cause a token to be read. */ +- goto yysetstate; +- +-/*------------------------------------------------------------. +-| yynewstate -- Push a new state, which is found in yystate. | +-`------------------------------------------------------------*/ +- yynewstate: +- /* In all cases, when you get here, the value and location stacks +- have just been pushed. So pushing a state here evens the stacks. */ +- yyssp++; +- +- yysetstate: +- *yyssp = yystate; +- +- if (yyss + yystacksize - 1 <= yyssp) +- { +- /* Get the current used size of the three stacks, in elements. */ +- YYSIZE_T yysize = yyssp - yyss + 1; +- +-#ifdef yyoverflow +- { +- /* Give user a chance to reallocate the stack. Use copies of +- these so that the &'s don't force the real ones into +- memory. */ +- YYSTYPE *yyvs1 = yyvs; +- yytype_int16 *yyss1 = yyss; +- +- /* Each stack pointer address is followed by the size of the +- data in use in that stack, in bytes. This used to be a +- conditional around just the two extra args, but that might +- be undefined if yyoverflow is a macro. */ +- yyoverflow (YY_("memory exhausted"), +- &yyss1, yysize * sizeof (*yyssp), +- &yyvs1, yysize * sizeof (*yyvsp), +- &yystacksize); +- +- yyss = yyss1; +- yyvs = yyvs1; +- } +-#else /* no yyoverflow */ +-# ifndef YYSTACK_RELOCATE +- goto yyexhaustedlab; +-# else +- /* Extend the stack our own way. */ +- if (YYMAXDEPTH <= yystacksize) +- goto yyexhaustedlab; +- yystacksize *= 2; +- if (YYMAXDEPTH < yystacksize) +- yystacksize = YYMAXDEPTH; +- +- { +- yytype_int16 *yyss1 = yyss; +- union yyalloc *yyptr = +- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); +- if (! yyptr) +- goto yyexhaustedlab; +- YYSTACK_RELOCATE (yyss_alloc, yyss); +- YYSTACK_RELOCATE (yyvs_alloc, yyvs); +-# undef YYSTACK_RELOCATE +- if (yyss1 != yyssa) +- YYSTACK_FREE (yyss1); +- } +-# endif +-#endif /* no yyoverflow */ +- +- yyssp = yyss + yysize - 1; +- yyvsp = yyvs + yysize - 1; +- +- YYDPRINTF ((stderr, "Stack size increased to %lu\n", +- (unsigned long int) yystacksize)); +- +- if (yyss + yystacksize - 1 <= yyssp) +- YYABORT; +- } +- +- YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +- +- if (yystate == YYFINAL) +- YYACCEPT; +- +- goto yybackup; +- +-/*-----------. +-| yybackup. | +-`-----------*/ +-yybackup: +- +- /* Do appropriate processing given the current state. Read a +- lookahead token if we need one and don't already have one. */ +- +- /* First try to decide what to do without reference to lookahead token. */ +- yyn = yypact[yystate]; +- if (yypact_value_is_default (yyn)) +- goto yydefault; +- +- /* Not known => get a lookahead token if don't already have one. */ +- +- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ +- if (yychar == YYEMPTY) +- { +- YYDPRINTF ((stderr, "Reading a token: ")); +- yychar = yylex (); +- } +- +- if (yychar <= YYEOF) +- { +- yychar = yytoken = YYEOF; +- YYDPRINTF ((stderr, "Now at end of input.\n")); +- } +- else +- { +- yytoken = YYTRANSLATE (yychar); +- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); +- } +- +- /* If the proper action on seeing token YYTOKEN is to reduce or to +- detect an error, take that action. */ +- yyn += yytoken; +- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) +- goto yydefault; +- yyn = yytable[yyn]; +- if (yyn <= 0) +- { +- if (yytable_value_is_error (yyn)) +- goto yyerrlab; +- yyn = -yyn; +- goto yyreduce; +- } +- +- /* Count tokens shifted since error; after three, turn off error +- status. */ +- if (yyerrstatus) +- yyerrstatus--; +- +- /* Shift the lookahead token. */ +- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); +- +- /* Discard the shifted token. */ +- yychar = YYEMPTY; +- +- yystate = yyn; +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- *++yyvsp = yylval; +- YY_IGNORE_MAYBE_UNINITIALIZED_END +- +- goto yynewstate; +- +- +-/*-----------------------------------------------------------. +-| yydefault -- do the default action for the current state. | +-`-----------------------------------------------------------*/ +-yydefault: +- yyn = yydefact[yystate]; +- if (yyn == 0) +- goto yyerrlab; +- goto yyreduce; +- +- +-/*-----------------------------. +-| yyreduce -- Do a reduction. | +-`-----------------------------*/ +-yyreduce: +- /* yyn is the number of a rule to reduce with. */ +- yylen = yyr2[yyn]; +- +- /* If YYLEN is nonzero, implement the default value of the action: +- '$$ = $1'. +- +- Otherwise, the following line sets YYVAL to garbage. +- This behavior is undocumented and Bison +- users should not rely upon it. Assigning to YYVAL +- unconditionally makes the parser a bit smaller, and it avoids a +- GCC warning that YYVAL may be used uninitialized. */ +- yyval = yyvsp[1-yylen]; +- +- +- YY_REDUCE_PRINT (yyn); +- switch (yyn) +- { +- case 3: +-#line 124 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].b)->top_level(); non_empty_flag = 1; } +-#line 1488 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 4: +-#line 129 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[0].b); } +-#line 1494 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 5: +-#line 131 "eqn.y" /* yacc.c:1646 */ +- { +- list_box *lb = (yyvsp[-1].b)->to_list_box(); +- if (!lb) +- lb = new list_box((yyvsp[-1].b)); +- lb->append((yyvsp[0].b)); +- (yyval.b) = lb; +- } +-#line 1506 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 6: +-#line 142 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[0].b); } +-#line 1512 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 7: +-#line 144 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_mark_box((yyvsp[0].b)); } +-#line 1518 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 8: +-#line 146 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_lineup_box((yyvsp[0].b)); } +-#line 1524 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 9: +-#line 151 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[0].b); } +-#line 1530 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 10: +-#line 153 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_limit_box((yyvsp[-2].b), 0, (yyvsp[0].b)); } +-#line 1536 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 11: +-#line 155 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0); } +-#line 1542 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 12: +-#line 157 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_limit_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); } +-#line 1548 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 13: +-#line 159 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_limit_box((yyvsp[-4].b), make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0), 0); } +-#line 1554 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 14: +-#line 164 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[0].b); } +-#line 1560 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 15: +-#line 166 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_sqrt_box((yyvsp[0].b)); } +-#line 1566 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 16: +-#line 168 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_over_box((yyvsp[-2].b), (yyvsp[0].b)); } +-#line 1572 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 17: +-#line 170 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_small_over_box((yyvsp[-2].b), (yyvsp[0].b)); } +-#line 1578 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 18: +-#line 175 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[0].b); } +-#line 1584 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 19: +-#line 177 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_script_box((yyvsp[-2].b), 0, (yyvsp[0].b)); } +-#line 1590 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 20: +-#line 182 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[0].b); } +-#line 1596 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 21: +-#line 184 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_script_box((yyvsp[-2].b), (yyvsp[0].b), 0); } +-#line 1602 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 22: +-#line 186 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_script_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); } +-#line 1608 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 23: +-#line 191 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = split_text((yyvsp[0].str)); } +-#line 1614 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 24: +-#line 193 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new quoted_text_box((yyvsp[0].str)); } +-#line 1620 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 25: +-#line 195 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = split_text((yyvsp[0].str)); } +-#line 1626 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 26: +-#line 197 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new quoted_text_box((yyvsp[0].str)); } +-#line 1632 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 27: +-#line 199 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new half_space_box; } +-#line 1638 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 28: +-#line 201 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new space_box; } +-#line 1644 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 29: +-#line 203 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new tab_box; } +-#line 1650 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 30: +-#line 205 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[-1].b); } +-#line 1656 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 31: +-#line 207 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); } +-#line 1662 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 32: +-#line 209 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].pb)->set_alignment(LEFT_ALIGN); (yyval.b) = (yyvsp[0].pb); } +-#line 1668 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 33: +-#line 211 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].pb)->set_alignment(RIGHT_ALIGN); (yyval.b) = (yyvsp[0].pb); } +-#line 1674 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 34: +-#line 213 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); } +-#line 1680 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 35: +-#line 215 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = (yyvsp[-1].mb); } +-#line 1686 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 36: +-#line 217 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_delim_box((yyvsp[-3].str), (yyvsp[-2].b), (yyvsp[0].str)); } +-#line 1692 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 37: +-#line 219 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_delim_box((yyvsp[-1].str), (yyvsp[0].b), 0); } +-#line 1698 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 38: +-#line 221 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_overline_box((yyvsp[-1].b)); } +-#line 1704 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 39: +-#line 223 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_underline_box((yyvsp[-1].b)); } +-#line 1710 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 40: +-#line 225 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_prime_box((yyvsp[-1].b)); } +-#line 1716 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 41: +-#line 227 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_accent_box((yyvsp[-2].b), (yyvsp[0].b)); } +-#line 1722 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 42: +-#line 229 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_uaccent_box((yyvsp[-2].b), (yyvsp[0].b)); } +-#line 1728 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 43: +-#line 231 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new font_box(strsave(get_grfont()), (yyvsp[0].b)); } +-#line 1734 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 44: +-#line 233 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new font_box(strsave(get_gbfont()), (yyvsp[0].b)); } +-#line 1740 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 45: +-#line 235 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new font_box(strsave(get_gfont()), (yyvsp[0].b)); } +-#line 1746 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 46: +-#line 237 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new fat_box((yyvsp[0].b)); } +-#line 1752 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 47: +-#line 239 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new font_box((yyvsp[-1].str), (yyvsp[0].b)); } +-#line 1758 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 48: +-#line 241 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new size_box((yyvsp[-1].str), (yyvsp[0].b)); } +-#line 1764 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 49: +-#line 243 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new hmotion_box((yyvsp[-1].n), (yyvsp[0].b)); } +-#line 1770 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 50: +-#line 245 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new hmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); } +-#line 1776 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 51: +-#line 247 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new vmotion_box((yyvsp[-1].n), (yyvsp[0].b)); } +-#line 1782 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 52: +-#line 249 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new vmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); } +-#line 1788 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 53: +-#line 251 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].b)->set_spacing_type((yyvsp[-1].str)); (yyval.b) = (yyvsp[0].b); } +-#line 1794 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 54: +-#line 253 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = new vcenter_box((yyvsp[0].b)); } +-#line 1800 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 55: +-#line 255 "eqn.y" /* yacc.c:1646 */ +- { (yyval.b) = make_special_box((yyvsp[-1].str), (yyvsp[0].b)); } +-#line 1806 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 56: +-#line 260 "eqn.y" /* yacc.c:1646 */ +- { +- int n; +- if (sscanf((yyvsp[0].str), "%d", &n) == 1) +- (yyval.n) = n; +- a_delete (yyvsp[0].str); +- } +-#line 1817 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 57: +-#line 270 "eqn.y" /* yacc.c:1646 */ +- { (yyval.pb) = new pile_box((yyvsp[0].b)); } +-#line 1823 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 58: +-#line 272 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[-2].pb)->append((yyvsp[0].b)); (yyval.pb) = (yyvsp[-2].pb); } +-#line 1829 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 59: +-#line 277 "eqn.y" /* yacc.c:1646 */ +- { (yyval.pb) = (yyvsp[-1].pb); } +-#line 1835 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 60: +-#line 279 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[-1].pb)->set_space((yyvsp[-3].n)); (yyval.pb) = (yyvsp[-1].pb); } +-#line 1841 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 61: +-#line 284 "eqn.y" /* yacc.c:1646 */ +- { (yyval.mb) = new matrix_box((yyvsp[0].col)); } +-#line 1847 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 62: +-#line 286 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[-1].mb)->append((yyvsp[0].col)); (yyval.mb) = (yyvsp[-1].mb); } +-#line 1853 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 63: +-#line 291 "eqn.y" /* yacc.c:1646 */ +- { (yyval.col) = new column((yyvsp[0].b)); } +-#line 1859 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 64: +-#line 293 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[-2].col)->append((yyvsp[0].b)); (yyval.col) = (yyvsp[-2].col); } +-#line 1865 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 65: +-#line 298 "eqn.y" /* yacc.c:1646 */ +- { (yyval.col) = (yyvsp[-1].col); } +-#line 1871 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 66: +-#line 300 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[-1].col)->set_space((yyvsp[-3].n)); (yyval.col) = (yyvsp[-1].col); } +-#line 1877 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 67: +-#line 305 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); } +-#line 1883 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 68: +-#line 307 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].col)->set_alignment(LEFT_ALIGN); (yyval.col) = (yyvsp[0].col); } +-#line 1889 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 69: +-#line 309 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].col)->set_alignment(RIGHT_ALIGN); (yyval.col) = (yyvsp[0].col); } +-#line 1895 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 70: +-#line 311 "eqn.y" /* yacc.c:1646 */ +- { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); } +-#line 1901 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 71: +-#line 315 "eqn.y" /* yacc.c:1646 */ +- { (yyval.str) = (yyvsp[0].str); } +-#line 1907 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 72: +-#line 317 "eqn.y" /* yacc.c:1646 */ +- { (yyval.str) = (yyvsp[0].str); } +-#line 1913 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 73: +-#line 322 "eqn.y" /* yacc.c:1646 */ +- { (yyval.str) = (yyvsp[0].str); } +-#line 1919 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 74: +-#line 324 "eqn.y" /* yacc.c:1646 */ +- { (yyval.str) = strsave("{"); } +-#line 1925 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- case 75: +-#line 326 "eqn.y" /* yacc.c:1646 */ +- { (yyval.str) = strsave("}"); } +-#line 1931 "eqn.cpp" /* yacc.c:1646 */ +- break; +- +- +-#line 1935 "eqn.cpp" /* yacc.c:1646 */ +- default: break; +- } +- /* User semantic actions sometimes alter yychar, and that requires +- that yytoken be updated with the new translation. We take the +- approach of translating immediately before every use of yytoken. +- One alternative is translating here after every semantic action, +- but that translation would be missed if the semantic action invokes +- YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or +- if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an +- incorrect destructor might then be invoked immediately. In the +- case of YYERROR or YYBACKUP, subsequent parser actions might lead +- to an incorrect destructor call or verbose syntax error message +- before the lookahead is translated. */ +- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); +- +- YYPOPSTACK (yylen); +- yylen = 0; +- YY_STACK_PRINT (yyss, yyssp); +- +- *++yyvsp = yyval; +- +- /* Now 'shift' the result of the reduction. Determine what state +- that goes to, based on the state we popped back to and the rule +- number reduced by. */ +- +- yyn = yyr1[yyn]; +- +- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; +- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) +- yystate = yytable[yystate]; +- else +- yystate = yydefgoto[yyn - YYNTOKENS]; +- +- goto yynewstate; +- +- +-/*--------------------------------------. +-| yyerrlab -- here on detecting error. | +-`--------------------------------------*/ +-yyerrlab: +- /* Make sure we have latest lookahead translation. See comments at +- user semantic actions for why this is necessary. */ +- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); +- +- /* If not already recovering from an error, report this error. */ +- if (!yyerrstatus) +- { +- ++yynerrs; +-#if ! YYERROR_VERBOSE +- yyerror (YY_("syntax error")); +-#else +-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ +- yyssp, yytoken) +- { +- char const *yymsgp = YY_("syntax error"); +- int yysyntax_error_status; +- yysyntax_error_status = YYSYNTAX_ERROR; +- if (yysyntax_error_status == 0) +- yymsgp = yymsg; +- else if (yysyntax_error_status == 1) +- { +- if (yymsg != yymsgbuf) +- YYSTACK_FREE (yymsg); +- yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); +- if (!yymsg) +- { +- yymsg = yymsgbuf; +- yymsg_alloc = sizeof yymsgbuf; +- yysyntax_error_status = 2; +- } +- else +- { +- yysyntax_error_status = YYSYNTAX_ERROR; +- yymsgp = yymsg; +- } +- } +- yyerror (yymsgp); +- if (yysyntax_error_status == 2) +- goto yyexhaustedlab; +- } +-# undef YYSYNTAX_ERROR +-#endif +- } +- +- +- +- if (yyerrstatus == 3) +- { +- /* If just tried and failed to reuse lookahead token after an +- error, discard it. */ +- +- if (yychar <= YYEOF) +- { +- /* Return failure if at end of input. */ +- if (yychar == YYEOF) +- YYABORT; +- } +- else +- { +- yydestruct ("Error: discarding", +- yytoken, &yylval); +- yychar = YYEMPTY; +- } +- } +- +- /* Else will try to reuse lookahead token after shifting the error +- token. */ +- goto yyerrlab1; +- +- +-/*---------------------------------------------------. +-| yyerrorlab -- error raised explicitly by YYERROR. | +-`---------------------------------------------------*/ +-yyerrorlab: +- +- /* Pacify compilers like GCC when the user code never invokes +- YYERROR and the label yyerrorlab therefore never appears in user +- code. */ +- if (/*CONSTCOND*/ 0) +- goto yyerrorlab; +- +- /* Do not reclaim the symbols of the rule whose action triggered +- this YYERROR. */ +- YYPOPSTACK (yylen); +- yylen = 0; +- YY_STACK_PRINT (yyss, yyssp); +- yystate = *yyssp; +- goto yyerrlab1; +- +- +-/*-------------------------------------------------------------. +-| yyerrlab1 -- common code for both syntax error and YYERROR. | +-`-------------------------------------------------------------*/ +-yyerrlab1: +- yyerrstatus = 3; /* Each real token shifted decrements this. */ +- +- for (;;) +- { +- yyn = yypact[yystate]; +- if (!yypact_value_is_default (yyn)) +- { +- yyn += YYTERROR; +- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) +- { +- yyn = yytable[yyn]; +- if (0 < yyn) +- break; +- } +- } +- +- /* Pop the current state because it cannot handle the error token. */ +- if (yyssp == yyss) +- YYABORT; +- +- +- yydestruct ("Error: popping", +- yystos[yystate], yyvsp); +- YYPOPSTACK (1); +- yystate = *yyssp; +- YY_STACK_PRINT (yyss, yyssp); +- } +- +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- *++yyvsp = yylval; +- YY_IGNORE_MAYBE_UNINITIALIZED_END +- +- +- /* Shift the error token. */ +- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); +- +- yystate = yyn; +- goto yynewstate; +- +- +-/*-------------------------------------. +-| yyacceptlab -- YYACCEPT comes here. | +-`-------------------------------------*/ +-yyacceptlab: +- yyresult = 0; +- goto yyreturn; +- +-/*-----------------------------------. +-| yyabortlab -- YYABORT comes here. | +-`-----------------------------------*/ +-yyabortlab: +- yyresult = 1; +- goto yyreturn; +- +-#if !defined yyoverflow || YYERROR_VERBOSE +-/*-------------------------------------------------. +-| yyexhaustedlab -- memory exhaustion comes here. | +-`-------------------------------------------------*/ +-yyexhaustedlab: +- yyerror (YY_("memory exhausted")); +- yyresult = 2; +- /* Fall through. */ +-#endif +- +-yyreturn: +- if (yychar != YYEMPTY) +- { +- /* Make sure we have latest lookahead translation. See comments at +- user semantic actions for why this is necessary. */ +- yytoken = YYTRANSLATE (yychar); +- yydestruct ("Cleanup: discarding lookahead", +- yytoken, &yylval); +- } +- /* Do not reclaim the symbols of the rule whose action triggered +- this YYABORT or YYACCEPT. */ +- YYPOPSTACK (yylen); +- YY_STACK_PRINT (yyss, yyssp); +- while (yyssp != yyss) +- { +- yydestruct ("Cleanup: popping", +- yystos[*yyssp], yyvsp); +- YYPOPSTACK (1); +- } +-#ifndef yyoverflow +- if (yyss != yyssa) +- YYSTACK_FREE (yyss); +-#endif +-#if YYERROR_VERBOSE +- if (yymsg != yymsgbuf) +- YYSTACK_FREE (yymsg); +-#endif +- return yyresult; +-} +-#line 329 "eqn.y" /* yacc.c:1906 */ +- +diff -Nuar groff-1.22.3.old/src/preproc/eqn/eqn.man groff-1.22.3/src/preproc/eqn/eqn.man +--- groff-1.22.3.old/src/preproc/eqn/eqn.man 2014-11-04 10:38:35.232523909 +0200 ++++ groff-1.22.3/src/preproc/eqn/eqn.man 2015-04-23 20:57:03.000000000 +0300 +@@ -3,6 +3,10 @@ + @g@eqn \- format equations for troff or MathML + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" license (copying) + .de co + Copyright \[co] 1989-2014 Free Software Foundation, Inc. +@@ -341,7 +345,7 @@ + . + .TP + punctuation +-a punctuation character such as \[oq],\[cl]; ++a punctuation character such as \[oq],\[cq]; + . + .TP + inner +@@ -468,7 +472,7 @@ + about the math axis. + . + The math axis is the vertical position about which characters such as +-\[oq]\[pl]\[]cq and \[oq]\[mi]\[cq] are centered; also it is the ++\[oq]\[pl]\[cq] and \[oq]\[mi]\[cq] are centered; also it is the + vertical position used for the bar of fractions. + . + For example, +@@ -1401,6 +1405,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/preproc/eqn/eqn_tab.h groff-1.22.3/src/preproc/eqn/eqn_tab.h +--- groff-1.22.3.old/src/preproc/eqn/eqn_tab.h 2014-11-04 10:38:38.300485555 +0200 ++++ groff-1.22.3/src/preproc/eqn/eqn_tab.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,193 +0,0 @@ +-/* A Bison parser, made by GNU Bison 3.0.2. */ +- +-/* Bison interface for Yacc-like parsers in C +- +- Copyright (C) 1984, 1989-1990, 2000-2013 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 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 . */ +- +-/* As a special exception, you may create a larger work that contains +- part or all of the Bison parser skeleton and distribute that work +- under terms of your choice, so long as that work isn't itself a +- parser generator using the skeleton or a modified version thereof +- as a parser skeleton. Alternatively, if you modify or redistribute +- the parser skeleton itself, you may (at your option) remove this +- special exception, which will cause the skeleton and the resulting +- Bison output files to be licensed under the GNU General Public +- License without this special exception. +- +- This special exception was added by the Free Software Foundation in +- version 2.2 of Bison. */ +- +-#ifndef YY_YY_Y_TAB_H_INCLUDED +-# define YY_YY_Y_TAB_H_INCLUDED +-/* Debug traces. */ +-#ifndef YYDEBUG +-# define YYDEBUG 0 +-#endif +-#if YYDEBUG +-extern int yydebug; +-#endif +- +-/* Token type. */ +-#ifndef YYTOKENTYPE +-# define YYTOKENTYPE +- enum yytokentype +- { +- OVER = 258, +- SMALLOVER = 259, +- SQRT = 260, +- SUB = 261, +- SUP = 262, +- LPILE = 263, +- RPILE = 264, +- CPILE = 265, +- PILE = 266, +- LEFT = 267, +- RIGHT = 268, +- TO = 269, +- FROM = 270, +- SIZE = 271, +- FONT = 272, +- ROMAN = 273, +- BOLD = 274, +- ITALIC = 275, +- FAT = 276, +- ACCENT = 277, +- BAR = 278, +- UNDER = 279, +- ABOVE = 280, +- TEXT = 281, +- QUOTED_TEXT = 282, +- FWD = 283, +- BACK = 284, +- DOWN = 285, +- UP = 286, +- MATRIX = 287, +- COL = 288, +- LCOL = 289, +- RCOL = 290, +- CCOL = 291, +- MARK = 292, +- LINEUP = 293, +- TYPE = 294, +- VCENTER = 295, +- PRIME = 296, +- SPLIT = 297, +- NOSPLIT = 298, +- UACCENT = 299, +- SPECIAL = 300, +- SPACE = 301, +- GFONT = 302, +- GSIZE = 303, +- DEFINE = 304, +- NDEFINE = 305, +- TDEFINE = 306, +- SDEFINE = 307, +- UNDEF = 308, +- IFDEF = 309, +- INCLUDE = 310, +- DELIM = 311, +- CHARTYPE = 312, +- SET = 313, +- GRFONT = 314, +- GBFONT = 315 +- }; +-#endif +-/* Tokens. */ +-#define OVER 258 +-#define SMALLOVER 259 +-#define SQRT 260 +-#define SUB 261 +-#define SUP 262 +-#define LPILE 263 +-#define RPILE 264 +-#define CPILE 265 +-#define PILE 266 +-#define LEFT 267 +-#define RIGHT 268 +-#define TO 269 +-#define FROM 270 +-#define SIZE 271 +-#define FONT 272 +-#define ROMAN 273 +-#define BOLD 274 +-#define ITALIC 275 +-#define FAT 276 +-#define ACCENT 277 +-#define BAR 278 +-#define UNDER 279 +-#define ABOVE 280 +-#define TEXT 281 +-#define QUOTED_TEXT 282 +-#define FWD 283 +-#define BACK 284 +-#define DOWN 285 +-#define UP 286 +-#define MATRIX 287 +-#define COL 288 +-#define LCOL 289 +-#define RCOL 290 +-#define CCOL 291 +-#define MARK 292 +-#define LINEUP 293 +-#define TYPE 294 +-#define VCENTER 295 +-#define PRIME 296 +-#define SPLIT 297 +-#define NOSPLIT 298 +-#define UACCENT 299 +-#define SPECIAL 300 +-#define SPACE 301 +-#define GFONT 302 +-#define GSIZE 303 +-#define DEFINE 304 +-#define NDEFINE 305 +-#define TDEFINE 306 +-#define SDEFINE 307 +-#define UNDEF 308 +-#define IFDEF 309 +-#define INCLUDE 310 +-#define DELIM 311 +-#define CHARTYPE 312 +-#define SET 313 +-#define GRFONT 314 +-#define GBFONT 315 +- +-/* Value type. */ +-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +-typedef union YYSTYPE YYSTYPE; +-union YYSTYPE +-{ +-#line 30 "eqn.y" /* yacc.c:1909 */ +- +- char *str; +- box *b; +- pile_box *pb; +- matrix_box *mb; +- int n; +- column *col; +- +-#line 183 "y.tab.h" /* yacc.c:1909 */ +-}; +-# define YYSTYPE_IS_TRIVIAL 1 +-# define YYSTYPE_IS_DECLARED 1 +-#endif +- +- +-extern YYSTYPE yylval; +- +-int yyparse (void); +- +-#endif /* !YY_YY_Y_TAB_H_INCLUDED */ +diff -Nuar groff-1.22.3.old/src/preproc/eqn/eqn.y groff-1.22.3/src/preproc/eqn/eqn.y +--- groff-1.22.3.old/src/preproc/eqn/eqn.y 2014-11-04 10:38:35.232523909 +0200 ++++ groff-1.22.3/src/preproc/eqn/eqn.y 1970-01-01 02:00:00.000000000 +0200 +@@ -1,329 +0,0 @@ +-/* Copyright (C) 1989-2014 Free Software Foundation, Inc. +- Written by James Clark (jjc@jclark.com) +- +-This file is part of groff. +- +-groff 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. +- +-groff 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 . */ +-%{ +-#include +-#include +-#include +- +-#include "lib.h" +-#include "box.h" +-extern int non_empty_flag; +-int yylex(); +-void yyerror(const char *); +-%} +- +-%union { +- char *str; +- box *b; +- pile_box *pb; +- matrix_box *mb; +- int n; +- column *col; +-} +- +-%token OVER +-%token SMALLOVER +-%token SQRT +-%token SUB +-%token SUP +-%token LPILE +-%token RPILE +-%token CPILE +-%token PILE +-%token LEFT +-%token RIGHT +-%token TO +-%token FROM +-%token SIZE +-%token FONT +-%token ROMAN +-%token BOLD +-%token ITALIC +-%token FAT +-%token ACCENT +-%token BAR +-%token UNDER +-%token ABOVE +-%token TEXT +-%token QUOTED_TEXT +-%token FWD +-%token BACK +-%token DOWN +-%token UP +-%token MATRIX +-%token COL +-%token LCOL +-%token RCOL +-%token CCOL +-%token MARK +-%token LINEUP +-%token TYPE +-%token VCENTER +-%token PRIME +-%token SPLIT +-%token NOSPLIT +-%token UACCENT +-%token SPECIAL +- +-/* these are handled in the lexer */ +-%token SPACE +-%token GFONT +-%token GSIZE +-%token DEFINE +-%token NDEFINE +-%token TDEFINE +-%token SDEFINE +-%token UNDEF +-%token IFDEF +-%token INCLUDE +-%token DELIM +-%token CHARTYPE +-%token SET +-%token GRFONT +-%token GBFONT +- +-/* The original eqn manual says that `left' is right associative. It's lying. +-Consider `left ( ~ left ( ~ right ) right )'. */ +- +-%right LEFT +-%left RIGHT +-%right LPILE RPILE CPILE PILE TEXT QUOTED_TEXT MATRIX MARK LINEUP '^' '~' '\t' '{' SPLIT NOSPLIT +-%right FROM TO +-%left SQRT OVER SMALLOVER +-%right SUB SUP +-%right ROMAN BOLD ITALIC FAT FONT SIZE FWD BACK DOWN UP TYPE VCENTER SPECIAL +-%right BAR UNDER PRIME +-%left ACCENT UACCENT +- +-%type mark from_to sqrt_over script simple equation nonsup +-%type number +-%type text delim +-%type pile_element_list pile_arg +-%type column_list +-%type
    column column_arg column_element_list +- +-%% +-top: +- /* empty */ +- | equation +- { $1->top_level(); non_empty_flag = 1; } +- ; +- +-equation: +- mark +- { $$ = $1; } +- | equation mark +- { +- list_box *lb = $1->to_list_box(); +- if (!lb) +- lb = new list_box($1); +- lb->append($2); +- $$ = lb; +- } +- ; +- +-mark: +- from_to +- { $$ = $1; } +- | MARK mark +- { $$ = make_mark_box($2); } +- | LINEUP mark +- { $$ = make_lineup_box($2); } +- ; +- +-from_to: +- sqrt_over %prec FROM +- { $$ = $1; } +- | sqrt_over TO from_to +- { $$ = make_limit_box($1, 0, $3); } +- | sqrt_over FROM sqrt_over +- { $$ = make_limit_box($1, $3, 0); } +- | sqrt_over FROM sqrt_over TO from_to +- { $$ = make_limit_box($1, $3, $5); } +- | sqrt_over FROM sqrt_over FROM from_to +- { $$ = make_limit_box($1, make_limit_box($3, $5, 0), 0); } +- ; +- +-sqrt_over: +- script +- { $$ = $1; } +- | SQRT sqrt_over +- { $$ = make_sqrt_box($2); } +- | sqrt_over OVER sqrt_over +- { $$ = make_over_box($1, $3); } +- | sqrt_over SMALLOVER sqrt_over +- { $$ = make_small_over_box($1, $3); } +- ; +- +-script: +- nonsup +- { $$ = $1; } +- | simple SUP script +- { $$ = make_script_box($1, 0, $3); } +- ; +- +-nonsup: +- simple %prec SUP +- { $$ = $1; } +- | simple SUB nonsup +- { $$ = make_script_box($1, $3, 0); } +- | simple SUB simple SUP script +- { $$ = make_script_box($1, $3, $5); } +- ; +- +-simple: +- TEXT +- { $$ = split_text($1); } +- | QUOTED_TEXT +- { $$ = new quoted_text_box($1); } +- | SPLIT QUOTED_TEXT +- { $$ = split_text($2); } +- | NOSPLIT TEXT +- { $$ = new quoted_text_box($2); } +- | '^' +- { $$ = new half_space_box; } +- | '~' +- { $$ = new space_box; } +- | '\t' +- { $$ = new tab_box; } +- | '{' equation '}' +- { $$ = $2; } +- | PILE pile_arg +- { $2->set_alignment(CENTER_ALIGN); $$ = $2; } +- | LPILE pile_arg +- { $2->set_alignment(LEFT_ALIGN); $$ = $2; } +- | RPILE pile_arg +- { $2->set_alignment(RIGHT_ALIGN); $$ = $2; } +- | CPILE pile_arg +- { $2->set_alignment(CENTER_ALIGN); $$ = $2; } +- | MATRIX '{' column_list '}' +- { $$ = $3; } +- | LEFT delim equation RIGHT delim +- { $$ = make_delim_box($2, $3, $5); } +- | LEFT delim equation +- { $$ = make_delim_box($2, $3, 0); } +- | simple BAR +- { $$ = make_overline_box($1); } +- | simple UNDER +- { $$ = make_underline_box($1); } +- | simple PRIME +- { $$ = make_prime_box($1); } +- | simple ACCENT simple +- { $$ = make_accent_box($1, $3); } +- | simple UACCENT simple +- { $$ = make_uaccent_box($1, $3); } +- | ROMAN simple +- { $$ = new font_box(strsave(get_grfont()), $2); } +- | BOLD simple +- { $$ = new font_box(strsave(get_gbfont()), $2); } +- | ITALIC simple +- { $$ = new font_box(strsave(get_gfont()), $2); } +- | FAT simple +- { $$ = new fat_box($2); } +- | FONT text simple +- { $$ = new font_box($2, $3); } +- | SIZE text simple +- { $$ = new size_box($2, $3); } +- | FWD number simple +- { $$ = new hmotion_box($2, $3); } +- | BACK number simple +- { $$ = new hmotion_box(-$2, $3); } +- | UP number simple +- { $$ = new vmotion_box($2, $3); } +- | DOWN number simple +- { $$ = new vmotion_box(-$2, $3); } +- | TYPE text simple +- { $3->set_spacing_type($2); $$ = $3; } +- | VCENTER simple +- { $$ = new vcenter_box($2); } +- | SPECIAL text simple +- { $$ = make_special_box($2, $3); } +- ; +- +-number: +- text +- { +- int n; +- if (sscanf($1, "%d", &n) == 1) +- $$ = n; +- a_delete $1; +- } +- ; +- +-pile_element_list: +- equation +- { $$ = new pile_box($1); } +- | pile_element_list ABOVE equation +- { $1->append($3); $$ = $1; } +- ; +- +-pile_arg: +- '{' pile_element_list '}' +- { $$ = $2; } +- | number '{' pile_element_list '}' +- { $3->set_space($1); $$ = $3; } +- ; +- +-column_list: +- column +- { $$ = new matrix_box($1); } +- | column_list column +- { $1->append($2); $$ = $1; } +- ; +- +-column_element_list: +- equation +- { $$ = new column($1); } +- | column_element_list ABOVE equation +- { $1->append($3); $$ = $1; } +- ; +- +-column_arg: +- '{' column_element_list '}' +- { $$ = $2; } +- | number '{' column_element_list '}' +- { $3->set_space($1); $$ = $3; } +- ; +- +-column: +- COL column_arg +- { $2->set_alignment(CENTER_ALIGN); $$ = $2; } +- | LCOL column_arg +- { $2->set_alignment(LEFT_ALIGN); $$ = $2; } +- | RCOL column_arg +- { $2->set_alignment(RIGHT_ALIGN); $$ = $2; } +- | CCOL column_arg +- { $2->set_alignment(CENTER_ALIGN); $$ = $2; } +- ; +- +-text: TEXT +- { $$ = $1; } +- | QUOTED_TEXT +- { $$ = $1; } +- ; +- +-delim: +- text +- { $$ = $1; } +- | '{' +- { $$ = strsave("{"); } +- | '}' +- { $$ = strsave("}"); } +- ; +- +-%% +diff -Nuar groff-1.22.3.old/src/preproc/eqn/eqn.ypp groff-1.22.3/src/preproc/eqn/eqn.ypp +--- groff-1.22.3.old/src/preproc/eqn/eqn.ypp 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/eqn/eqn.ypp 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,329 @@ ++/* Copyright (C) 1989-2014 Free Software Foundation, Inc. ++ Written by James Clark (jjc@jclark.com) ++ ++This file is part of groff. ++ ++groff 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. ++ ++groff 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 . */ ++%{ ++#include ++#include ++#include ++ ++#include "lib.h" ++#include "box.h" ++extern int non_empty_flag; ++int yylex(); ++void yyerror(const char *); ++%} ++ ++%union { ++ char *str; ++ box *b; ++ pile_box *pb; ++ matrix_box *mb; ++ int n; ++ column *col; ++} ++ ++%token OVER ++%token SMALLOVER ++%token SQRT ++%token SUB ++%token SUP ++%token LPILE ++%token RPILE ++%token CPILE ++%token PILE ++%token LEFT ++%token RIGHT ++%token TO ++%token FROM ++%token SIZE ++%token FONT ++%token ROMAN ++%token BOLD ++%token ITALIC ++%token FAT ++%token ACCENT ++%token BAR ++%token UNDER ++%token ABOVE ++%token TEXT ++%token QUOTED_TEXT ++%token FWD ++%token BACK ++%token DOWN ++%token UP ++%token MATRIX ++%token COL ++%token LCOL ++%token RCOL ++%token CCOL ++%token MARK ++%token LINEUP ++%token TYPE ++%token VCENTER ++%token PRIME ++%token SPLIT ++%token NOSPLIT ++%token UACCENT ++%token SPECIAL ++ ++/* these are handled in the lexer */ ++%token SPACE ++%token GFONT ++%token GSIZE ++%token DEFINE ++%token NDEFINE ++%token TDEFINE ++%token SDEFINE ++%token UNDEF ++%token IFDEF ++%token INCLUDE ++%token DELIM ++%token CHARTYPE ++%token SET ++%token GRFONT ++%token GBFONT ++ ++/* The original eqn manual says that `left' is right associative. It's lying. ++Consider `left ( ~ left ( ~ right ) right )'. */ ++ ++%right LEFT ++%left RIGHT ++%right LPILE RPILE CPILE PILE TEXT QUOTED_TEXT MATRIX MARK LINEUP '^' '~' '\t' '{' SPLIT NOSPLIT ++%right FROM TO ++%left SQRT OVER SMALLOVER ++%right SUB SUP ++%right ROMAN BOLD ITALIC FAT FONT SIZE FWD BACK DOWN UP TYPE VCENTER SPECIAL ++%right BAR UNDER PRIME ++%left ACCENT UACCENT ++ ++%type mark from_to sqrt_over script simple equation nonsup ++%type number ++%type text delim ++%type pile_element_list pile_arg ++%type column_list ++%type column column_arg column_element_list ++ ++%% ++top: ++ /* empty */ ++ | equation ++ { $1->top_level(); non_empty_flag = 1; } ++ ; ++ ++equation: ++ mark ++ { $$ = $1; } ++ | equation mark ++ { ++ list_box *lb = $1->to_list_box(); ++ if (!lb) ++ lb = new list_box($1); ++ lb->append($2); ++ $$ = lb; ++ } ++ ; ++ ++mark: ++ from_to ++ { $$ = $1; } ++ | MARK mark ++ { $$ = make_mark_box($2); } ++ | LINEUP mark ++ { $$ = make_lineup_box($2); } ++ ; ++ ++from_to: ++ sqrt_over %prec FROM ++ { $$ = $1; } ++ | sqrt_over TO from_to ++ { $$ = make_limit_box($1, 0, $3); } ++ | sqrt_over FROM sqrt_over ++ { $$ = make_limit_box($1, $3, 0); } ++ | sqrt_over FROM sqrt_over TO from_to ++ { $$ = make_limit_box($1, $3, $5); } ++ | sqrt_over FROM sqrt_over FROM from_to ++ { $$ = make_limit_box($1, make_limit_box($3, $5, 0), 0); } ++ ; ++ ++sqrt_over: ++ script ++ { $$ = $1; } ++ | SQRT sqrt_over ++ { $$ = make_sqrt_box($2); } ++ | sqrt_over OVER sqrt_over ++ { $$ = make_over_box($1, $3); } ++ | sqrt_over SMALLOVER sqrt_over ++ { $$ = make_small_over_box($1, $3); } ++ ; ++ ++script: ++ nonsup ++ { $$ = $1; } ++ | simple SUP script ++ { $$ = make_script_box($1, 0, $3); } ++ ; ++ ++nonsup: ++ simple %prec SUP ++ { $$ = $1; } ++ | simple SUB nonsup ++ { $$ = make_script_box($1, $3, 0); } ++ | simple SUB simple SUP script ++ { $$ = make_script_box($1, $3, $5); } ++ ; ++ ++simple: ++ TEXT ++ { $$ = split_text($1); } ++ | QUOTED_TEXT ++ { $$ = new quoted_text_box($1); } ++ | SPLIT QUOTED_TEXT ++ { $$ = split_text($2); } ++ | NOSPLIT TEXT ++ { $$ = new quoted_text_box($2); } ++ | '^' ++ { $$ = new half_space_box; } ++ | '~' ++ { $$ = new space_box; } ++ | '\t' ++ { $$ = new tab_box; } ++ | '{' equation '}' ++ { $$ = $2; } ++ | PILE pile_arg ++ { $2->set_alignment(CENTER_ALIGN); $$ = $2; } ++ | LPILE pile_arg ++ { $2->set_alignment(LEFT_ALIGN); $$ = $2; } ++ | RPILE pile_arg ++ { $2->set_alignment(RIGHT_ALIGN); $$ = $2; } ++ | CPILE pile_arg ++ { $2->set_alignment(CENTER_ALIGN); $$ = $2; } ++ | MATRIX '{' column_list '}' ++ { $$ = $3; } ++ | LEFT delim equation RIGHT delim ++ { $$ = make_delim_box($2, $3, $5); } ++ | LEFT delim equation ++ { $$ = make_delim_box($2, $3, 0); } ++ | simple BAR ++ { $$ = make_overline_box($1); } ++ | simple UNDER ++ { $$ = make_underline_box($1); } ++ | simple PRIME ++ { $$ = make_prime_box($1); } ++ | simple ACCENT simple ++ { $$ = make_accent_box($1, $3); } ++ | simple UACCENT simple ++ { $$ = make_uaccent_box($1, $3); } ++ | ROMAN simple ++ { $$ = new font_box(strsave(get_grfont()), $2); } ++ | BOLD simple ++ { $$ = new font_box(strsave(get_gbfont()), $2); } ++ | ITALIC simple ++ { $$ = new font_box(strsave(get_gfont()), $2); } ++ | FAT simple ++ { $$ = new fat_box($2); } ++ | FONT text simple ++ { $$ = new font_box($2, $3); } ++ | SIZE text simple ++ { $$ = new size_box($2, $3); } ++ | FWD number simple ++ { $$ = new hmotion_box($2, $3); } ++ | BACK number simple ++ { $$ = new hmotion_box(-$2, $3); } ++ | UP number simple ++ { $$ = new vmotion_box($2, $3); } ++ | DOWN number simple ++ { $$ = new vmotion_box(-$2, $3); } ++ | TYPE text simple ++ { $3->set_spacing_type($2); $$ = $3; } ++ | VCENTER simple ++ { $$ = new vcenter_box($2); } ++ | SPECIAL text simple ++ { $$ = make_special_box($2, $3); } ++ ; ++ ++number: ++ text ++ { ++ int n; ++ if (sscanf($1, "%d", &n) == 1) ++ $$ = n; ++ a_delete $1; ++ } ++ ; ++ ++pile_element_list: ++ equation ++ { $$ = new pile_box($1); } ++ | pile_element_list ABOVE equation ++ { $1->append($3); $$ = $1; } ++ ; ++ ++pile_arg: ++ '{' pile_element_list '}' ++ { $$ = $2; } ++ | number '{' pile_element_list '}' ++ { $3->set_space($1); $$ = $3; } ++ ; ++ ++column_list: ++ column ++ { $$ = new matrix_box($1); } ++ | column_list column ++ { $1->append($2); $$ = $1; } ++ ; ++ ++column_element_list: ++ equation ++ { $$ = new column($1); } ++ | column_element_list ABOVE equation ++ { $1->append($3); $$ = $1; } ++ ; ++ ++column_arg: ++ '{' column_element_list '}' ++ { $$ = $2; } ++ | number '{' column_element_list '}' ++ { $3->set_space($1); $$ = $3; } ++ ; ++ ++column: ++ COL column_arg ++ { $2->set_alignment(CENTER_ALIGN); $$ = $2; } ++ | LCOL column_arg ++ { $2->set_alignment(LEFT_ALIGN); $$ = $2; } ++ | RCOL column_arg ++ { $2->set_alignment(RIGHT_ALIGN); $$ = $2; } ++ | CCOL column_arg ++ { $2->set_alignment(CENTER_ALIGN); $$ = $2; } ++ ; ++ ++text: TEXT ++ { $$ = $1; } ++ | QUOTED_TEXT ++ { $$ = $1; } ++ ; ++ ++delim: ++ text ++ { $$ = $1; } ++ | '{' ++ { $$ = strsave("{"); } ++ | '}' ++ { $$ = strsave("}"); } ++ ; ++ ++%% +diff -Nuar groff-1.22.3.old/src/preproc/eqn/.gitignore groff-1.22.3/src/preproc/eqn/.gitignore +--- groff-1.22.3.old/src/preproc/eqn/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/eqn/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++eqn.cpp +diff -Nuar groff-1.22.3.old/src/preproc/eqn/lex.cpp groff-1.22.3/src/preproc/eqn/lex.cpp +--- groff-1.22.3.old/src/preproc/eqn/lex.cpp 2014-11-04 10:38:35.232523909 +0200 ++++ groff-1.22.3/src/preproc/eqn/lex.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -18,7 +18,7 @@ + along with this program. If not, see . */ + + #include "eqn.h" +-#include "eqn_tab.h" ++#include "eqn.hpp" + #include "stringclass.h" + #include "ptable.h" + +diff -Nuar groff-1.22.3.old/src/preproc/eqn/main.cpp groff-1.22.3/src/preproc/eqn/main.cpp +--- groff-1.22.3.old/src/preproc/eqn/main.cpp 2014-11-04 10:38:35.232523909 +0200 ++++ groff-1.22.3/src/preproc/eqn/main.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -25,6 +25,7 @@ + #include "htmlhint.h" + #include "pbox.h" + #include "ctype.h" ++#include "lf.h" + + #define STARTUP_FILE "eqnrc" + +@@ -66,9 +67,12 @@ + { + string linebuf; + string str; ++ string fn(filename); ++ fn += '\0'; ++ normalize_for_lf(fn); ++ current_filename = fn.contents(); + if (output_format == troff) +- printf(".lf 1 %s\n", filename); +- current_filename = filename; ++ printf(".lf 1 %s\n", current_filename); + current_lineno = 0; + while (read_line(fp, &linebuf)) { + if (linebuf.length() >= 4 +diff -Nuar groff-1.22.3.old/src/preproc/eqn/Makefile.sub groff-1.22.3/src/preproc/eqn/Makefile.sub +--- groff-1.22.3.old/src/preproc/eqn/Makefile.sub 2014-11-04 10:38:35.233523897 +0200 ++++ groff-1.22.3/src/preproc/eqn/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,93 +0,0 @@ +-# Makefile.sub for `preproc eqn' +-# +-# File position: /src/preproc/eqn/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=eqn$(EXEEXT) +-MAN1=eqn.n neqn.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=\ +- eqn.$(OBJEXT) \ +- main.$(OBJEXT) \ +- lex.$(OBJEXT) \ +- box.$(OBJEXT) \ +- limit.$(OBJEXT) \ +- list.$(OBJEXT) \ +- over.$(OBJEXT) \ +- text.$(OBJEXT) \ +- script.$(OBJEXT) \ +- mark.$(OBJEXT) \ +- other.$(OBJEXT) \ +- delim.$(OBJEXT) \ +- sqrt.$(OBJEXT) \ +- pile.$(OBJEXT) \ +- special.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/main.cpp \ +- $(srcdir)/lex.cpp \ +- $(srcdir)/box.cpp \ +- $(srcdir)/limit.cpp \ +- $(srcdir)/list.cpp \ +- $(srcdir)/over.cpp \ +- $(srcdir)/text.cpp \ +- $(srcdir)/script.cpp \ +- $(srcdir)/mark.cpp \ +- $(srcdir)/other.cpp \ +- $(srcdir)/delim.cpp \ +- $(srcdir)/sqrt.cpp \ +- $(srcdir)/pile.cpp \ +- $(srcdir)/special.cpp +-HDRS=\ +- $(srcdir)/box.h \ +- $(srcdir)/eqn.h \ +- $(srcdir)/pbox.h +-GRAM=$(srcdir)/eqn.y +-YTABC=eqn.cpp +-YTABH=eqn_tab.h +-NAMEPREFIX=$(g) +-MOSTLYCLEANADD=neqn +-RM=rm -f +- +-all: neqn +- +-neqn: neqn.sh $(SH_DEPS_SED_SCRIPT) +- $(RM) $@ +- sed -e 's/@g@/$(g)/g' \ +- -f $(SH_DEPS_SED_SCRIPT) \ +- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@ +- chmod +x $@ +- +-install_data: neqn +- $(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn +- $(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/eqn/neqn.man groff-1.22.3/src/preproc/eqn/neqn.man +--- groff-1.22.3.old/src/preproc/eqn/neqn.man 2014-11-04 10:38:35.233523897 +0200 ++++ groff-1.22.3/src/preproc/eqn/neqn.man 2015-04-23 20:57:03.000000000 +0300 +@@ -5,7 +5,7 @@ + . + .\" license + .de co +-Copyright \[co] 2001-2014 Free Software Foundation, Inc. ++Copyright \(co 2001-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/preproc/grn/.gitignore groff-1.22.3/src/preproc/grn/.gitignore +--- groff-1.22.3.old/src/preproc/grn/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/grn/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++grn ++grn.n +diff -Nuar groff-1.22.3.old/src/preproc/grn/grn.am groff-1.22.3/src/preproc/grn/grn.am +--- groff-1.22.3.old/src/preproc/grn/grn.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/grn/grn.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,29 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += grn ++grn_SOURCES = \ ++ src/preproc/grn/hdb.cpp \ ++ src/preproc/grn/hpoint.cpp \ ++ src/preproc/grn/hgraph.cpp \ ++ src/preproc/grn/main.cpp \ ++ src/preproc/grn/gprint.h ++src/preproc/grn/main.$(OBJEXT): defs.h ++grn_LDADD = libgroff.a lib/libgnu.a $(LIBM) ++PREFIXMAN1 += src/preproc/grn/grn.n ++EXTRA_DIST += src/preproc/grn/README src/preproc/grn/grn.man +diff -Nuar groff-1.22.3.old/src/preproc/grn/grn.man groff-1.22.3/src/preproc/grn/grn.man +--- groff-1.22.3.old/src/preproc/grn/grn.man 2014-11-04 10:38:35.239523822 +0200 ++++ groff-1.22.3/src/preproc/grn/grn.man 2015-04-23 20:57:03.000000000 +0300 +@@ -10,7 +10,7 @@ + . + .\" license + .de co +-Copyright \[co] 2000-2014 Free Software Foundation, Inc. ++Copyright \(co 2000-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/preproc/grn/Makefile.sub groff-1.22.3/src/preproc/grn/Makefile.sub +--- groff-1.22.3.old/src/preproc/grn/Makefile.sub 2014-11-04 10:38:35.239523822 +0200 ++++ groff-1.22.3/src/preproc/grn/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,49 +0,0 @@ +-# Makefile.sub for `preproc grn +-# +-# File position: /src/preproc/grn/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=grn$(EXEEXT) +-MAN1=grn.n +-MLIB=$(LIBM) +-XLIBS=$(LIBGROFF) $(LIBGNU) +-OBJS=\ +- hdb.$(OBJEXT) \ +- hpoint.$(OBJEXT) \ +- hgraph.$(OBJEXT) \ +- main.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/hdb.cpp \ +- $(srcdir)/hpoint.cpp \ +- $(srcdir)/hgraph.cpp \ +- $(srcdir)/main.cpp +-HDRS=\ +- $(srcdir)/gprint.h +-NAMEPREFIX=$(g) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/html/.gitignore groff-1.22.3/src/preproc/html/.gitignore +--- groff-1.22.3.old/src/preproc/html/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/html/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++Makefile.dep ++pre-grohtml +diff -Nuar groff-1.22.3.old/src/preproc/html/html.am groff-1.22.3/src/preproc/html/html.am +--- groff-1.22.3.old/src/preproc/html/html.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/html/html.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,26 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += pre-grohtml ++pre_grohtml_LDADD = libgroff.a lib/libgnu.a $(LIBM) ++pre_grohtml_SOURCES = \ ++ src/preproc/html/pre-html.cpp \ ++ src/preproc/html/pushback.cpp \ ++ src/preproc/html/pre-html.h \ ++ src/preproc/html/pushback.h ++src/preproc/html/pre-html.$(OBJEXT): defs.h +diff -Nuar groff-1.22.3.old/src/preproc/html/Makefile.sub groff-1.22.3/src/preproc/html/Makefile.sub +--- groff-1.22.3.old/src/preproc/html/Makefile.sub 2014-11-04 10:38:35.255523622 +0200 ++++ groff-1.22.3/src/preproc/html/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `preproc html' +-# +-# File position: /src/preproc/html/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=pre-grohtml$(EXEEXT) +-# MAN1=pre-grohtml.n +-MAN1= +-XLIBS=$(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT) +-CCSRCS=$(srcdir)/pre-html.cpp $(srcdir)/pushback.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/pic/.gitignore groff-1.22.3/src/preproc/pic/.gitignore +--- groff-1.22.3.old/src/preproc/pic/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/pic/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1 @@ ++pic.cpp +diff -Nuar groff-1.22.3.old/src/preproc/pic/lex.cpp groff-1.22.3/src/preproc/pic/lex.cpp +--- groff-1.22.3.old/src/preproc/pic/lex.cpp 2014-11-04 10:38:35.225523997 +0200 ++++ groff-1.22.3/src/preproc/pic/lex.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -20,7 +20,7 @@ + #include "pic.h" + #include "ptable.h" + #include "object.h" +-#include "pic_tab.h" ++#include "pic.hpp" + + declare_ptable(char) + implement_ptable(char) +diff -Nuar groff-1.22.3.old/src/preproc/pic/main.cpp groff-1.22.3/src/preproc/pic/main.cpp +--- groff-1.22.3.old/src/preproc/pic/main.cpp 2014-11-04 10:38:35.226523984 +0200 ++++ groff-1.22.3/src/preproc/pic/main.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -309,8 +309,11 @@ + fatal("can't open `%1': %2", filename, strerror(errno)); + } + } +- out->set_location(filename, 1); +- current_filename = filename; ++ string fn(filename); ++ fn += '\0'; ++ normalize_for_lf(fn); ++ current_filename = fn.contents(); ++ out->set_location(current_filename, 1); + current_lineno = 1; + enum { START, MIDDLE, HAD_DOT, HAD_P, HAD_PS, HAD_l, HAD_lf } state = START; + for (;;) { +diff -Nuar groff-1.22.3.old/src/preproc/pic/Makefile.sub groff-1.22.3/src/preproc/pic/Makefile.sub +--- groff-1.22.3.old/src/preproc/pic/Makefile.sub 2014-11-04 10:38:35.226523984 +0200 ++++ groff-1.22.3/src/preproc/pic/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,63 +0,0 @@ +-# Makefile.sub for `preproc pic' +-# +-# File position: /src/preproc/pic/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=pic$(EXEEXT) +-MAN1=pic.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=\ +- pic.$(OBJEXT) \ +- lex.$(OBJEXT) \ +- main.$(OBJEXT) \ +- object.$(OBJEXT) \ +- common.$(OBJEXT) \ +- troff.$(OBJEXT) \ +- tex.$(OBJEXT) +- # fig.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/lex.cpp \ +- $(srcdir)/main.cpp \ +- $(srcdir)/object.cpp \ +- $(srcdir)/common.cpp \ +- $(srcdir)/troff.cpp \ +- $(srcdir)/tex.cpp +-HDRS=\ +- $(srcdir)/common.h \ +- $(srcdir)/object.h \ +- $(srcdir)/output.h \ +- $(srcdir)/pic.h \ +- $(srcdir)/position.h \ +- $(srcdir)/text.h +-GRAM=$(srcdir)/pic.y +-YTABC=pic.cpp +-YTABH=pic_tab.h +-NAMEPREFIX=$(g) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic.am groff-1.22.3/src/preproc/pic/pic.am +--- groff-1.22.3.old/src/preproc/pic/pic.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/pic/pic.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,49 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += pic ++pic_LDADD = libgroff.a $(LIBM) ++pic_SOURCES = \ ++ src/preproc/pic/pic.ypp \ ++ src/preproc/pic/lex.cpp \ ++ src/preproc/pic/main.cpp \ ++ src/preproc/pic/object.cpp \ ++ src/preproc/pic/common.cpp \ ++ src/preproc/pic/troff.cpp \ ++ src/preproc/pic/tex.cpp \ ++ src/preproc/pic/pic.h \ ++ src/preproc/pic/position.h \ ++ src/preproc/pic/text.h \ ++ src/preproc/pic/common.h \ ++ src/preproc/pic/output.h \ ++ src/preproc/pic/object.h ++ ++pic_CPPFLAGS = $(AM_CPPFLAGS) \ ++ -I $(top_srcdir)/src/preproc/pic \ ++ -I $(top_builddir)/src/preproc/pic ++PREFIXMAN1 += src/preproc/pic/pic.n ++ ++src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp ++EXTRA_DIST += \ ++ src/preproc/pic/pic.man \ ++ src/preproc/pic/TODO ++CLEANFILES += \ ++ src/preproc/pic/pic.cpp \ ++ src/preproc/pic/pic.hpp \ ++ src/preproc/pic/pic.output ++ +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic.cpp groff-1.22.3/src/preproc/pic/pic.cpp +--- groff-1.22.3.old/src/preproc/pic/pic.cpp 2014-11-04 10:38:37.823491518 +0200 ++++ groff-1.22.3/src/preproc/pic/pic.cpp 1970-01-01 02:00:00.000000000 +0200 +@@ -1,5008 +0,0 @@ +-/* A Bison parser, made by GNU Bison 3.0.2. */ +- +-/* Bison implementation for Yacc-like parsers in C +- +- Copyright (C) 1984, 1989-1990, 2000-2013 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 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 . */ +- +-/* As a special exception, you may create a larger work that contains +- part or all of the Bison parser skeleton and distribute that work +- under terms of your choice, so long as that work isn't itself a +- parser generator using the skeleton or a modified version thereof +- as a parser skeleton. Alternatively, if you modify or redistribute +- the parser skeleton itself, you may (at your option) remove this +- special exception, which will cause the skeleton and the resulting +- Bison output files to be licensed under the GNU General Public +- License without this special exception. +- +- This special exception was added by the Free Software Foundation in +- version 2.2 of Bison. */ +- +-/* C LALR(1) parser skeleton written by Richard Stallman, by +- simplifying the original so-called "semantic" parser. */ +- +-/* All symbols defined below should begin with yy or YY, to avoid +- infringing on user name space. This should be done even for local +- variables, as they might otherwise be expanded by user macros. +- There are some unavoidable exceptions within include files to +- define necessary library symbols; they are noted "INFRINGES ON +- USER NAME SPACE" below. */ +- +-/* Identify Bison output. */ +-#define YYBISON 1 +- +-/* Bison version. */ +-#define YYBISON_VERSION "3.0.2" +- +-/* Skeleton name. */ +-#define YYSKELETON_NAME "yacc.c" +- +-/* Pure parsers. */ +-#define YYPURE 0 +- +-/* Push parsers. */ +-#define YYPUSH 0 +- +-/* Pull parsers. */ +-#define YYPULL 1 +- +- +- +- +-/* Copy the first part of user declarations. */ +-#line 19 "pic.y" /* yacc.c:339 */ +- +-#include "pic.h" +-#include "ptable.h" +-#include "object.h" +- +-extern int delim_flag; +-extern void copy_rest_thru(const char *, const char *); +-extern void copy_file_thru(const char *, const char *, const char *); +-extern void push_body(const char *); +-extern void do_for(char *var, double from, double to, +- int by_is_multiplicative, double by, char *body); +-extern void do_lookahead(); +- +-/* Maximum number of characters produced by printf("%g") */ +-#define GDIGITS 14 +- +-int yylex(); +-void yyerror(const char *); +- +-void reset(const char *nm); +-void reset_all(); +- +-place *lookup_label(const char *); +-void define_label(const char *label, const place *pl); +- +-direction current_direction; +-position current_position; +- +-implement_ptable(place) +- +-PTABLE(place) top_table; +- +-PTABLE(place) *current_table = &top_table; +-saved_state *current_saved_state = 0; +- +-object_list olist; +- +-const char *ordinal_postfix(int n); +-const char *object_type_name(object_type type); +-char *format_number(const char *form, double n); +-char *do_sprintf(const char *form, const double *v, int nv); +- +- +-#line 110 "pic.cpp" /* yacc.c:339 */ +- +-# ifndef YY_NULLPTR +-# if defined __cplusplus && 201103L <= __cplusplus +-# define YY_NULLPTR nullptr +-# else +-# define YY_NULLPTR 0 +-# endif +-# endif +- +-/* Enabling verbose error messages. */ +-#ifdef YYERROR_VERBOSE +-# undef YYERROR_VERBOSE +-# define YYERROR_VERBOSE 1 +-#else +-# define YYERROR_VERBOSE 0 +-#endif +- +-/* In a future release of Bison, this section will be replaced +- by #include "y.tab.h". */ +-#ifndef YY_YY_Y_TAB_H_INCLUDED +-# define YY_YY_Y_TAB_H_INCLUDED +-/* Debug traces. */ +-#ifndef YYDEBUG +-# define YYDEBUG 0 +-#endif +-#if YYDEBUG +-extern int yydebug; +-#endif +- +-/* Token type. */ +-#ifndef YYTOKENTYPE +-# define YYTOKENTYPE +- enum yytokentype +- { +- LABEL = 258, +- VARIABLE = 259, +- NUMBER = 260, +- TEXT = 261, +- COMMAND_LINE = 262, +- DELIMITED = 263, +- ORDINAL = 264, +- TH = 265, +- LEFT_ARROW_HEAD = 266, +- RIGHT_ARROW_HEAD = 267, +- DOUBLE_ARROW_HEAD = 268, +- LAST = 269, +- BOX = 270, +- CIRCLE = 271, +- ELLIPSE = 272, +- ARC = 273, +- LINE = 274, +- ARROW = 275, +- MOVE = 276, +- SPLINE = 277, +- HEIGHT = 278, +- RADIUS = 279, +- FIGNAME = 280, +- WIDTH = 281, +- DIAMETER = 282, +- UP = 283, +- DOWN = 284, +- RIGHT = 285, +- LEFT = 286, +- FROM = 287, +- TO = 288, +- AT = 289, +- WITH = 290, +- BY = 291, +- THEN = 292, +- SOLID = 293, +- DOTTED = 294, +- DASHED = 295, +- CHOP = 296, +- SAME = 297, +- INVISIBLE = 298, +- LJUST = 299, +- RJUST = 300, +- ABOVE = 301, +- BELOW = 302, +- OF = 303, +- THE = 304, +- WAY = 305, +- BETWEEN = 306, +- AND = 307, +- HERE = 308, +- DOT_N = 309, +- DOT_E = 310, +- DOT_W = 311, +- DOT_S = 312, +- DOT_NE = 313, +- DOT_SE = 314, +- DOT_NW = 315, +- DOT_SW = 316, +- DOT_C = 317, +- DOT_START = 318, +- DOT_END = 319, +- DOT_X = 320, +- DOT_Y = 321, +- DOT_HT = 322, +- DOT_WID = 323, +- DOT_RAD = 324, +- SIN = 325, +- COS = 326, +- ATAN2 = 327, +- LOG = 328, +- EXP = 329, +- SQRT = 330, +- K_MAX = 331, +- K_MIN = 332, +- INT = 333, +- RAND = 334, +- SRAND = 335, +- COPY = 336, +- THRU = 337, +- TOP = 338, +- BOTTOM = 339, +- UPPER = 340, +- LOWER = 341, +- SH = 342, +- PRINT = 343, +- CW = 344, +- CCW = 345, +- FOR = 346, +- DO = 347, +- IF = 348, +- ELSE = 349, +- ANDAND = 350, +- OROR = 351, +- NOTEQUAL = 352, +- EQUALEQUAL = 353, +- LESSEQUAL = 354, +- GREATEREQUAL = 355, +- LEFT_CORNER = 356, +- RIGHT_CORNER = 357, +- NORTH = 358, +- SOUTH = 359, +- EAST = 360, +- WEST = 361, +- CENTER = 362, +- END = 363, +- START = 364, +- RESET = 365, +- UNTIL = 366, +- PLOT = 367, +- THICKNESS = 368, +- FILL = 369, +- COLORED = 370, +- OUTLINED = 371, +- SHADED = 372, +- XSLANTED = 373, +- YSLANTED = 374, +- ALIGNED = 375, +- SPRINTF = 376, +- COMMAND = 377, +- DEFINE = 378, +- UNDEF = 379 +- }; +-#endif +-/* Tokens. */ +-#define LABEL 258 +-#define VARIABLE 259 +-#define NUMBER 260 +-#define TEXT 261 +-#define COMMAND_LINE 262 +-#define DELIMITED 263 +-#define ORDINAL 264 +-#define TH 265 +-#define LEFT_ARROW_HEAD 266 +-#define RIGHT_ARROW_HEAD 267 +-#define DOUBLE_ARROW_HEAD 268 +-#define LAST 269 +-#define BOX 270 +-#define CIRCLE 271 +-#define ELLIPSE 272 +-#define ARC 273 +-#define LINE 274 +-#define ARROW 275 +-#define MOVE 276 +-#define SPLINE 277 +-#define HEIGHT 278 +-#define RADIUS 279 +-#define FIGNAME 280 +-#define WIDTH 281 +-#define DIAMETER 282 +-#define UP 283 +-#define DOWN 284 +-#define RIGHT 285 +-#define LEFT 286 +-#define FROM 287 +-#define TO 288 +-#define AT 289 +-#define WITH 290 +-#define BY 291 +-#define THEN 292 +-#define SOLID 293 +-#define DOTTED 294 +-#define DASHED 295 +-#define CHOP 296 +-#define SAME 297 +-#define INVISIBLE 298 +-#define LJUST 299 +-#define RJUST 300 +-#define ABOVE 301 +-#define BELOW 302 +-#define OF 303 +-#define THE 304 +-#define WAY 305 +-#define BETWEEN 306 +-#define AND 307 +-#define HERE 308 +-#define DOT_N 309 +-#define DOT_E 310 +-#define DOT_W 311 +-#define DOT_S 312 +-#define DOT_NE 313 +-#define DOT_SE 314 +-#define DOT_NW 315 +-#define DOT_SW 316 +-#define DOT_C 317 +-#define DOT_START 318 +-#define DOT_END 319 +-#define DOT_X 320 +-#define DOT_Y 321 +-#define DOT_HT 322 +-#define DOT_WID 323 +-#define DOT_RAD 324 +-#define SIN 325 +-#define COS 326 +-#define ATAN2 327 +-#define LOG 328 +-#define EXP 329 +-#define SQRT 330 +-#define K_MAX 331 +-#define K_MIN 332 +-#define INT 333 +-#define RAND 334 +-#define SRAND 335 +-#define COPY 336 +-#define THRU 337 +-#define TOP 338 +-#define BOTTOM 339 +-#define UPPER 340 +-#define LOWER 341 +-#define SH 342 +-#define PRINT 343 +-#define CW 344 +-#define CCW 345 +-#define FOR 346 +-#define DO 347 +-#define IF 348 +-#define ELSE 349 +-#define ANDAND 350 +-#define OROR 351 +-#define NOTEQUAL 352 +-#define EQUALEQUAL 353 +-#define LESSEQUAL 354 +-#define GREATEREQUAL 355 +-#define LEFT_CORNER 356 +-#define RIGHT_CORNER 357 +-#define NORTH 358 +-#define SOUTH 359 +-#define EAST 360 +-#define WEST 361 +-#define CENTER 362 +-#define END 363 +-#define START 364 +-#define RESET 365 +-#define UNTIL 366 +-#define PLOT 367 +-#define THICKNESS 368 +-#define FILL 369 +-#define COLORED 370 +-#define OUTLINED 371 +-#define SHADED 372 +-#define XSLANTED 373 +-#define YSLANTED 374 +-#define ALIGNED 375 +-#define SPRINTF 376 +-#define COMMAND 377 +-#define DEFINE 378 +-#define UNDEF 379 +- +-/* Value type. */ +-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +-typedef union YYSTYPE YYSTYPE; +-union YYSTYPE +-{ +-#line 65 "pic.y" /* yacc.c:355 */ +- +- char *str; +- int n; +- double x; +- struct { double x, y; } pair; +- struct { double x; char *body; } if_data; +- struct { char *str; const char *filename; int lineno; } lstr; +- struct { double *v; int nv; int maxv; } dv; +- struct { double val; int is_multiplicative; } by; +- place pl; +- object *obj; +- corner crn; +- path *pth; +- object_spec *spec; +- saved_state *pstate; +- graphics_state state; +- object_type obtype; +- +-#line 417 "pic.cpp" /* yacc.c:355 */ +-}; +-# define YYSTYPE_IS_TRIVIAL 1 +-# define YYSTYPE_IS_DECLARED 1 +-#endif +- +- +-extern YYSTYPE yylval; +- +-int yyparse (void); +- +-#endif /* !YY_YY_Y_TAB_H_INCLUDED */ +- +-/* Copy the second part of user declarations. */ +- +-#line 432 "pic.cpp" /* yacc.c:358 */ +- +-#ifdef short +-# undef short +-#endif +- +-#ifdef YYTYPE_UINT8 +-typedef YYTYPE_UINT8 yytype_uint8; +-#else +-typedef unsigned char yytype_uint8; +-#endif +- +-#ifdef YYTYPE_INT8 +-typedef YYTYPE_INT8 yytype_int8; +-#else +-typedef signed char yytype_int8; +-#endif +- +-#ifdef YYTYPE_UINT16 +-typedef YYTYPE_UINT16 yytype_uint16; +-#else +-typedef unsigned short int yytype_uint16; +-#endif +- +-#ifdef YYTYPE_INT16 +-typedef YYTYPE_INT16 yytype_int16; +-#else +-typedef short int yytype_int16; +-#endif +- +-#ifndef YYSIZE_T +-# ifdef __SIZE_TYPE__ +-# define YYSIZE_T __SIZE_TYPE__ +-# elif defined size_t +-# define YYSIZE_T size_t +-# elif ! defined YYSIZE_T +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YYSIZE_T size_t +-# else +-# define YYSIZE_T unsigned int +-# endif +-#endif +- +-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +- +-#ifndef YY_ +-# if defined YYENABLE_NLS && YYENABLE_NLS +-# if ENABLE_NLS +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YY_(Msgid) dgettext ("bison-runtime", Msgid) +-# endif +-# endif +-# ifndef YY_ +-# define YY_(Msgid) Msgid +-# endif +-#endif +- +-#ifndef YY_ATTRIBUTE +-# if (defined __GNUC__ \ +- && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ +- || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +-# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +-# else +-# define YY_ATTRIBUTE(Spec) /* empty */ +-# endif +-#endif +- +-#ifndef YY_ATTRIBUTE_PURE +-# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +-#endif +- +-#ifndef YY_ATTRIBUTE_UNUSED +-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +-#endif +- +-#if !defined _Noreturn \ +- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +-# if defined _MSC_VER && 1200 <= _MSC_VER +-# define _Noreturn __declspec (noreturn) +-# else +-# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +-# endif +-#endif +- +-/* Suppress unused-variable warnings by "using" E. */ +-#if ! defined lint || defined __GNUC__ +-# define YYUSE(E) ((void) (E)) +-#else +-# define YYUSE(E) /* empty */ +-#endif +- +-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +-/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ +- _Pragma ("GCC diagnostic push") \ +- _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +- _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +- _Pragma ("GCC diagnostic pop") +-#else +-# define YY_INITIAL_VALUE(Value) Value +-#endif +-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +-# define YY_IGNORE_MAYBE_UNINITIALIZED_END +-#endif +-#ifndef YY_INITIAL_VALUE +-# define YY_INITIAL_VALUE(Value) /* Nothing. */ +-#endif +- +- +-#if ! defined yyoverflow || YYERROR_VERBOSE +- +-/* The parser invokes alloca or malloc; define the necessary symbols. */ +- +-# ifdef YYSTACK_USE_ALLOCA +-# if YYSTACK_USE_ALLOCA +-# ifdef __GNUC__ +-# define YYSTACK_ALLOC __builtin_alloca +-# elif defined __BUILTIN_VA_ARG_INCR +-# include /* INFRINGES ON USER NAME SPACE */ +-# elif defined _AIX +-# define YYSTACK_ALLOC __alloca +-# elif defined _MSC_VER +-# include /* INFRINGES ON USER NAME SPACE */ +-# define alloca _alloca +-# else +-# define YYSTACK_ALLOC alloca +-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS +-# include /* INFRINGES ON USER NAME SPACE */ +- /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +-# ifndef EXIT_SUCCESS +-# define EXIT_SUCCESS 0 +-# endif +-# endif +-# endif +-# endif +-# endif +- +-# ifdef YYSTACK_ALLOC +- /* Pacify GCC's 'empty if-body' warning. */ +-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +-# ifndef YYSTACK_ALLOC_MAXIMUM +- /* The OS might guarantee only one guard page at the bottom of the stack, +- and a page size can be as small as 4096 bytes. So we cannot safely +- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number +- to allow for a few compiler-allocated temporary stack slots. */ +-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +-# endif +-# else +-# define YYSTACK_ALLOC YYMALLOC +-# define YYSTACK_FREE YYFREE +-# ifndef YYSTACK_ALLOC_MAXIMUM +-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +-# endif +-# if (defined __cplusplus && ! defined EXIT_SUCCESS \ +- && ! ((defined YYMALLOC || defined malloc) \ +- && (defined YYFREE || defined free))) +-# include /* INFRINGES ON USER NAME SPACE */ +-# ifndef EXIT_SUCCESS +-# define EXIT_SUCCESS 0 +-# endif +-# endif +-# ifndef YYMALLOC +-# define YYMALLOC malloc +-# if ! defined malloc && ! defined EXIT_SUCCESS +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +-# endif +-# endif +-# ifndef YYFREE +-# define YYFREE free +-# if ! defined free && ! defined EXIT_SUCCESS +-void free (void *); /* INFRINGES ON USER NAME SPACE */ +-# endif +-# endif +-# endif +-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +- +- +-#if (! defined yyoverflow \ +- && (! defined __cplusplus \ +- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) +- +-/* A type that is properly aligned for any stack member. */ +-union yyalloc +-{ +- yytype_int16 yyss_alloc; +- YYSTYPE yyvs_alloc; +-}; +- +-/* The size of the maximum gap between one aligned stack and the next. */ +-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +- +-/* The size of an array large to enough to hold all stacks, each with +- N elements. */ +-# define YYSTACK_BYTES(N) \ +- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ +- + YYSTACK_GAP_MAXIMUM) +- +-# define YYCOPY_NEEDED 1 +- +-/* Relocate STACK from its old location to the new one. The +- local variables YYSIZE and YYSTACKSIZE give the old and new number of +- elements in the stack, and YYPTR gives the new location of the +- stack. Advance YYPTR to a properly aligned location for the next +- stack. */ +-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ +- do \ +- { \ +- YYSIZE_T yynewbytes; \ +- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ +- Stack = &yyptr->Stack_alloc; \ +- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ +- yyptr += yynewbytes / sizeof (*yyptr); \ +- } \ +- while (0) +- +-#endif +- +-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +-/* Copy COUNT objects from SRC to DST. The source and destination do +- not overlap. */ +-# ifndef YYCOPY +-# if defined __GNUC__ && 1 < __GNUC__ +-# define YYCOPY(Dst, Src, Count) \ +- __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +-# else +-# define YYCOPY(Dst, Src, Count) \ +- do \ +- { \ +- YYSIZE_T yyi; \ +- for (yyi = 0; yyi < (Count); yyi++) \ +- (Dst)[yyi] = (Src)[yyi]; \ +- } \ +- while (0) +-# endif +-# endif +-#endif /* !YYCOPY_NEEDED */ +- +-/* YYFINAL -- State number of the termination state. */ +-#define YYFINAL 6 +-/* YYLAST -- Last index in YYTABLE. */ +-#define YYLAST 2438 +- +-/* YYNTOKENS -- Number of terminals. */ +-#define YYNTOKENS 146 +-/* YYNNTS -- Number of nonterminals. */ +-#define YYNNTS 49 +-/* YYNRULES -- Number of rules. */ +-#define YYNRULES 260 +-/* YYNSTATES -- Number of states. */ +-#define YYNSTATES 454 +- +-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned +- by yylex, with out-of-bounds checking. */ +-#define YYUNDEFTOK 2 +-#define YYMAXUTOK 379 +- +-#define YYTRANSLATE(YYX) \ +- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) +- +-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM +- as returned by yylex, without out-of-bounds checking. */ +-static const yytype_uint8 yytranslate[] = +-{ +- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 137, 2, 2, 2, 136, 2, 2, +- 126, 145, 134, 132, 129, 133, 125, 135, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 141, 139, +- 130, 140, 131, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 128, 2, 144, 138, 2, 127, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 142, 2, 143, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, +- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, +- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, +- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, +- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, +- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, +- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, +- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, +- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, +- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124 +-}; +- +-#if YYDEBUG +- /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +-static const yytype_uint16 yyrline[] = +-{ +- 0, 275, 275, 276, 285, 290, 292, 296, 298, 302, +- 303, 307, 315, 320, 332, 334, 336, 338, 340, 345, +- 350, 357, 356, 367, 375, 377, 374, 388, 390, 387, +- 400, 399, 408, 417, 416, 430, 431, 436, 437, 441, +- 446, 451, 459, 461, 480, 487, 489, 500, 499, 511, +- 512, 517, 519, 524, 530, 536, 538, 540, 542, 544, +- 546, 548, 555, 559, 564, 572, 586, 592, 600, 607, +- 613, 606, 622, 632, 633, 638, 640, 642, 644, 649, +- 656, 663, 670, 677, 682, 687, 695, 694, 721, 727, +- 733, 739, 745, 764, 771, 778, 785, 792, 799, 806, +- 813, 820, 827, 842, 854, 860, 869, 876, 901, 905, +- 911, 917, 923, 929, 934, 940, 946, 952, 959, 968, +- 975, 991, 1008, 1013, 1018, 1023, 1028, 1033, 1038, 1043, +- 1051, 1061, 1071, 1081, 1091, 1097, 1105, 1107, 1119, 1124, +- 1154, 1156, 1162, 1171, 1173, 1178, 1183, 1188, 1193, 1198, +- 1203, 1209, 1214, 1222, 1223, 1227, 1232, 1238, 1240, 1246, +- 1252, 1258, 1267, 1277, 1279, 1288, 1290, 1298, 1300, 1305, +- 1320, 1338, 1340, 1342, 1344, 1346, 1348, 1350, 1352, 1354, +- 1359, 1361, 1369, 1373, 1375, 1383, 1385, 1391, 1397, 1403, +- 1409, 1418, 1420, 1422, 1424, 1426, 1428, 1430, 1432, 1434, +- 1436, 1438, 1440, 1442, 1444, 1446, 1448, 1450, 1452, 1454, +- 1456, 1458, 1460, 1462, 1464, 1466, 1468, 1470, 1472, 1474, +- 1476, 1478, 1480, 1485, 1487, 1492, 1497, 1505, 1507, 1514, +- 1521, 1528, 1535, 1542, 1544, 1546, 1548, 1556, 1564, 1577, +- 1579, 1581, 1590, 1599, 1612, 1621, 1630, 1639, 1641, 1643, +- 1645, 1647, 1653, 1658, 1660, 1662, 1664, 1666, 1668, 1670, +- 1672 +-}; +-#endif +- +-#if YYDEBUG || YYERROR_VERBOSE || 0 +-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +- First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +-static const char *const yytname[] = +-{ +- "$end", "error", "$undefined", "LABEL", "VARIABLE", "NUMBER", "TEXT", +- "COMMAND_LINE", "DELIMITED", "ORDINAL", "TH", "LEFT_ARROW_HEAD", +- "RIGHT_ARROW_HEAD", "DOUBLE_ARROW_HEAD", "LAST", "BOX", "CIRCLE", +- "ELLIPSE", "ARC", "LINE", "ARROW", "MOVE", "SPLINE", "HEIGHT", "RADIUS", +- "FIGNAME", "WIDTH", "DIAMETER", "UP", "DOWN", "RIGHT", "LEFT", "FROM", +- "TO", "AT", "WITH", "BY", "THEN", "SOLID", "DOTTED", "DASHED", "CHOP", +- "SAME", "INVISIBLE", "LJUST", "RJUST", "ABOVE", "BELOW", "OF", "THE", +- "WAY", "BETWEEN", "AND", "HERE", "DOT_N", "DOT_E", "DOT_W", "DOT_S", +- "DOT_NE", "DOT_SE", "DOT_NW", "DOT_SW", "DOT_C", "DOT_START", "DOT_END", +- "DOT_X", "DOT_Y", "DOT_HT", "DOT_WID", "DOT_RAD", "SIN", "COS", "ATAN2", +- "LOG", "EXP", "SQRT", "K_MAX", "K_MIN", "INT", "RAND", "SRAND", "COPY", +- "THRU", "TOP", "BOTTOM", "UPPER", "LOWER", "SH", "PRINT", "CW", "CCW", +- "FOR", "DO", "IF", "ELSE", "ANDAND", "OROR", "NOTEQUAL", "EQUALEQUAL", +- "LESSEQUAL", "GREATEREQUAL", "LEFT_CORNER", "RIGHT_CORNER", "NORTH", +- "SOUTH", "EAST", "WEST", "CENTER", "END", "START", "RESET", "UNTIL", +- "PLOT", "THICKNESS", "FILL", "COLORED", "OUTLINED", "SHADED", "XSLANTED", +- "YSLANTED", "ALIGNED", "SPRINTF", "COMMAND", "DEFINE", "UNDEF", "'.'", +- "'('", "'`'", "'['", "','", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'", +- "'%'", "'!'", "'^'", "';'", "'='", "':'", "'{'", "'}'", "']'", "')'", +- "$accept", "top", "element_list", "middle_element_list", +- "optional_separator", "separator", "placeless_element", "$@1", "$@2", +- "$@3", "$@4", "$@5", "$@6", "$@7", "macro_name", "reset_variables", +- "print_args", "print_arg", "simple_if", "$@8", "until", "any_expr", +- "text_expr", "optional_by", "element", "@9", "$@10", "optional_element", +- "object_spec", "@11", "text", "sprintf_args", "position", +- "position_not_place", "between", "expr_pair", "place", "label", +- "ordinal", "optional_ordinal_last", "nth_primitive", "object_type", +- "label_path", "relative_path", "path", "corner", "expr", +- "expr_lower_than", "expr_not_lower_than", YY_NULLPTR +-}; +-#endif +- +-# ifdef YYPRINT +-/* YYTOKNUM[NUM] -- (External) token number corresponding to the +- (internal) symbol number NUM (which must be that of a token). */ +-static const yytype_uint16 yytoknum[] = +-{ +- 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, +- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, +- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, +- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, +- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, +- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, +- 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, +- 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, +- 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, +- 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, +- 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, +- 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, +- 375, 376, 377, 378, 379, 46, 40, 96, 91, 44, +- 60, 62, 43, 45, 42, 47, 37, 33, 94, 59, +- 61, 58, 123, 125, 93, 41 +-}; +-# endif +- +-#define YYPACT_NINF -240 +- +-#define yypact_value_is_default(Yystate) \ +- (!!((Yystate) == (-240))) +- +-#define YYTABLE_NINF -206 +- +-#define yytable_value_is_error(Yytable_value) \ +- 0 +- +- /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing +- STATE-NUM. */ +-static const yytype_int16 yypact[] = +-{ +- -114, -240, 20, -240, 757, -107, -240, -98, -123, -240, +- -240, -240, -240, -240, -240, -240, -240, -240, -240, -106, +- -240, -240, -240, -240, 9, -240, 1087, 46, 1172, 49, +- 1597, -70, 1087, -240, -240, -114, -240, 3, -33, -240, +- 877, -240, -240, -114, 1172, -60, 36, -14, -240, 74, +- -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, +- -240, -240, -240, -240, -240, -240, -240, -240, -240, -34, +- -18, 8, 38, 47, 51, 65, 101, 102, 112, 122, +- -240, -240, 21, 150, -240, -240, -240, -240, -240, -240, +- -240, -240, -240, 1257, 1172, 1597, 1597, 1087, -240, -240, +- -43, -240, -240, 357, 2242, 59, 258, -240, 10, 2147, +- -240, 1, 6, 1172, 1172, 145, -1, 2, 357, 2273, +- -240, -240, 220, 249, 1087, -114, -114, -240, 721, -240, +- 252, -240, -240, -240, -240, 1597, 1597, 1597, 1597, 2024, +- 2024, 1853, 1939, 1682, 1682, 1682, 1427, 1767, -240, -240, +- 2024, 2024, 2024, -240, -240, -240, -240, -240, -240, -240, +- -240, 1597, 2024, 23, 23, 23, 1597, 1597, -240, -240, +- 2282, 593, -240, 1172, -240, -240, -240, -240, 250, -240, +- 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 458, +- 1172, -240, -240, -240, -240, -240, -240, -240, -240, 121, +- 107, 123, 256, 2157, 137, 261, 134, 134, -240, 1767, +- 1767, -240, -240, -240, -240, -240, 276, -240, -240, -240, +- -240, -240, -240, -240, -240, -240, -240, 138, -240, -240, +- 24, 156, 235, -240, 1597, 1597, 1597, 1597, 1597, 1597, +- 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1682, +- 1682, 1597, -240, 134, -240, 1172, 1172, 23, 23, 1172, +- 1172, -240, -240, 143, 757, 153, -240, -240, 280, 2282, +- 2282, 2282, 2282, 2282, 2282, 2282, 2282, -43, 2147, -43, +- -43, 2253, 275, 275, 295, 1002, -43, 2081, -240, -240, +- 10, 1342, -240, 694, 2282, 2282, 2282, 2282, 2282, -240, +- -240, -240, 2282, 2282, -98, -123, 16, 28, -240, -43, +- 56, 302, -240, 291, -240, 155, 160, 172, 161, 164, +- 167, 184, 185, 181, -240, 186, 188, -240, 1682, 1767, +- 1767, -240, -240, 1682, 1682, -240, -240, -240, -240, -240, +- 156, 279, 314, 2291, 440, 440, 413, 413, 2282, 413, +- 413, -72, -72, 134, 134, 134, 134, -49, 117, 343, +- 322, -240, 314, 239, 2300, -240, -240, -240, 314, 239, +- 2300, -119, -240, -240, -240, -240, -240, 2116, 2116, -240, +- 206, 333, -240, 123, 2131, -240, 228, -240, -240, 1172, +- -240, -240, -240, 1172, 1172, -240, -240, -240, -110, 195, +- 197, -47, 128, 292, 1682, 1682, 1597, -240, 1597, -240, +- 757, -240, -240, 2116, -240, 228, 338, -240, 200, 202, +- 212, -240, -240, -240, 1682, 1682, -240, -43, -27, 360, +- 2282, -240, -240, 214, -240, -240, -240, -240, -240, -73, +- 30, -240, 1512, 268, -240, -240, 216, 1597, 2282, -240, +- -240, 2282, 354, -240 +-}; +- +- /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. +- Performed when YYTABLE does not specify something else to do. Zero +- means the default is an error. */ +-static const yytype_uint16 yydefact[] = +-{ +- 7, 9, 0, 3, 2, 8, 1, 0, 0, 136, +- 18, 75, 76, 77, 78, 79, 80, 81, 82, 0, +- 14, 15, 17, 16, 0, 21, 0, 0, 0, 36, +- 0, 0, 0, 86, 69, 7, 72, 35, 32, 5, +- 65, 83, 10, 7, 0, 0, 0, 23, 27, 0, +- 162, 226, 227, 165, 167, 205, 204, 161, 191, 192, +- 193, 194, 195, 196, 197, 198, 199, 200, 201, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 202, 203, 0, 0, 210, 211, 216, 217, 218, 219, +- 220, 222, 221, 0, 0, 0, 0, 20, 42, 45, +- 46, 140, 143, 141, 157, 0, 0, 163, 0, 44, +- 223, 224, 0, 0, 0, 0, 52, 0, 0, 51, +- 224, 39, 84, 0, 19, 7, 7, 4, 8, 40, +- 0, 33, 124, 125, 126, 0, 0, 0, 0, 93, +- 95, 97, 99, 0, 0, 0, 0, 0, 107, 108, +- 109, 111, 120, 122, 123, 130, 131, 132, 133, 127, +- 128, 0, 113, 0, 0, 0, 0, 0, 135, 129, +- 92, 0, 12, 0, 38, 37, 11, 24, 0, 22, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 208, 206, 212, 214, 209, 207, 213, 215, 0, +- 0, 143, 141, 51, 224, 0, 239, 260, 43, 0, +- 0, 228, 229, 230, 231, 232, 0, 158, 179, 168, +- 171, 172, 173, 174, 175, 176, 177, 0, 169, 170, +- 0, 159, 0, 153, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 61, 260, 47, 0, 0, 0, 0, 0, +- 0, 85, 138, 0, 0, 0, 6, 41, 0, 88, +- 89, 90, 91, 94, 96, 98, 100, 101, 0, 102, +- 103, 162, 165, 167, 0, 0, 105, 183, 185, 104, +- 182, 0, 106, 0, 110, 112, 121, 134, 114, 118, +- 119, 117, 115, 116, 162, 226, 205, 204, 66, 0, +- 67, 68, 13, 0, 28, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 251, 0, 0, 240, 0, 0, +- 0, 156, 142, 0, 0, 166, 144, 146, 164, 178, +- 160, 0, 258, 259, 257, 256, 253, 255, 155, 225, +- 254, 233, 234, 235, 236, 237, 238, 0, 0, 0, +- 0, 55, 56, 58, 59, 54, 53, 57, 258, 60, +- 259, 0, 87, 70, 34, 190, 182, 0, 0, 180, +- 0, 0, 184, 0, 51, 25, 49, 241, 242, 0, +- 244, 245, 246, 0, 0, 249, 250, 252, 0, 144, +- 146, 0, 0, 0, 0, 0, 0, 48, 0, 137, +- 73, 189, 188, 0, 181, 49, 0, 29, 0, 0, +- 0, 148, 145, 147, 0, 0, 154, 149, 0, 62, +- 139, 74, 71, 0, 26, 50, 243, 247, 248, 149, +- 0, 151, 0, 0, 186, 150, 151, 0, 63, 30, +- 152, 64, 0, 31 +-}; +- +- /* YYPGOTO[NTERM-NUM]. */ +-static const yytype_int16 yypgoto[] = +-{ +- -240, -240, 17, -240, 12, 329, -240, -240, -240, -240, +- -240, -240, -240, -240, -240, -240, 334, -76, -240, -240, +- -42, 13, -103, -240, -127, -240, -240, -240, -240, -240, +- 5, -240, 99, 194, 169, -44, 4, -100, -240, -240, +- -240, -104, -240, -239, -240, -50, -26, -240, 61 +-}; +- +- /* YYDEFGOTO[NTERM-NUM]. */ +-static const yytype_int16 yydefgoto[] = +-{ +- -1, 2, 3, 35, 264, 5, 36, 49, 313, 415, +- 178, 386, 452, 268, 176, 37, 97, 98, 38, 360, +- 417, 199, 116, 443, 39, 126, 410, 432, 40, 125, +- 117, 371, 100, 101, 249, 102, 118, 104, 105, 106, +- 107, 228, 287, 288, 289, 108, 119, 110, 120 +-}; +- +- /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If +- positive, shift that token. If negative, reduce the rule whose +- number is the opposite. If YYTABLE_NINF, syntax error. */ +-static const yytype_int16 yytable[] = +-{ +- 109, 266, 229, 404, 122, 424, 109, 129, 231, 41, +- 408, 252, 4, 50, 170, 47, -17, 44, 45, 53, +- 6, 208, 209, 210, 54, 1, 409, 50, -16, 9, +- 103, 99, 42, 53, 46, 421, 103, 99, 54, 174, +- 175, 115, 375, 43, 308, 169, 380, 127, 208, 201, +- 112, 191, 192, 121, 217, 171, 123, 172, 230, 209, +- 210, 131, 245, 246, 247, 218, 248, 203, 177, 206, +- 207, 109, 445, 219, 220, 221, 222, 223, 224, 225, +- 173, 226, 179, 209, 210, 209, 210, 111, 253, 209, +- 210, 48, 180, 111, 255, 256, 290, 202, 109, 257, +- 258, 103, 99, 292, 441, 209, 210, 205, 181, 269, +- 270, 271, 272, 273, 274, 275, 276, 278, 278, 278, +- 278, 293, 193, 194, 294, 295, 296, 261, 103, 99, +- 340, 250, 130, 41, 182, 297, 298, 94, 411, 412, +- 302, 303, 263, 265, 31, 278, 251, 103, 103, 103, +- 103, 94, 361, 363, 204, -17, 367, 369, 111, -17, +- -17, 446, 209, 210, 183, 336, 337, -16, 299, 300, +- 301, -16, -16, 184, 433, 311, 41, 185, 377, 378, +- 195, 196, 254, 293, 293, 111, 312, 227, -140, -140, +- 231, 186, 200, 315, 316, 317, 318, 319, 320, 321, +- 322, 323, 325, 326, 111, 111, 111, 111, 342, 343, +- 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, +- 354, 355, 356, 278, 278, 359, 9, 187, 188, 362, +- 364, 376, 111, 368, 370, 290, 328, 382, 189, 329, +- 330, 201, 277, 279, 280, 286, 405, 383, 190, 209, +- 210, 197, 198, 103, 103, 262, 267, 425, 314, 203, +- 209, 210, 365, 366, 218, 384, 327, 334, 331, 41, +- 309, 335, 248, 220, 221, 222, 223, 224, 225, 338, +- 226, 216, 339, 431, 341, 399, 400, 372, 374, 202, +- 220, 221, 222, 223, 224, 225, 373, 226, 379, 385, +- 387, 389, 278, 293, 293, 388, 390, 278, 278, 391, +- 111, 111, 392, 393, 394, 234, 235, 236, 237, 238, +- 239, 211, 212, 213, 214, 215, 395, 376, 376, 403, +- 407, 396, 103, 397, 255, 413, 414, 103, 103, 416, +- 422, 31, 423, 426, 435, 436, 204, 437, 357, 358, +- 241, 242, 243, 244, 245, 246, 247, 438, 248, 444, +- 449, 450, 453, 376, 128, 310, 124, 211, 212, 213, +- 214, 215, 333, 434, 0, 0, 406, 0, 278, 278, +- 429, 0, 430, 0, 200, 0, 227, 0, 0, 111, +- 0, 0, 0, 0, 111, 111, 442, 0, 278, 278, +- 0, 332, 418, 227, 0, 0, 419, 420, 103, 103, +- 0, 236, 237, 238, 239, 41, 448, 0, 0, 0, +- 0, 451, 211, 212, 213, 214, 215, 398, 103, 103, +- 0, 0, 401, 402, -141, -141, 0, 0, 234, 235, +- 236, 237, 238, 239, 241, 242, 243, 244, 245, 246, +- 247, 0, 248, 0, 0, 234, 235, 236, 237, 238, +- 239, 50, 51, 52, 9, 111, 111, 53, 0, 0, +- 0, 0, 54, 241, 242, 243, 244, 245, 246, 247, +- 0, 248, 0, 0, 0, 111, 111, 0, 55, 56, +- 241, 242, 243, 244, 245, 246, 247, 0, 248, 0, +- 0, 0, 0, 427, 428, 0, 0, 0, 0, 0, +- 0, 57, 58, 59, 60, 61, 62, 63, 64, 65, +- 66, 67, 68, 439, 440, 0, 0, 0, 69, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 238, +- 239, 80, 81, 82, 83, 243, 244, 245, 246, 247, +- 0, 248, 0, 0, 0, 0, 0, 0, 0, 84, +- 85, 86, 87, 88, 89, 90, 91, 92, 0, 0, +- 241, 242, 243, 244, 245, 246, 247, 0, 248, 31, +- 0, 0, 0, 0, 113, 94, 0, 0, 0, 0, +- 0, 95, 0, 0, 0, 114, 304, 305, 52, 9, +- 10, 0, 53, 324, 0, 0, 0, 54, 11, 12, +- 13, 14, 15, 16, 17, 18, 0, 0, 19, 0, +- 0, 20, 21, 306, 307, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 0, 0, +- 0, 0, 0, 69, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 24, 0, 80, 81, 82, 83, +- 25, 26, 0, 0, 27, 0, 28, 0, 0, 0, +- 0, 0, 0, 0, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 29, 0, 30, 0, 0, 0, 0, +- 0, 0, 0, 0, 31, 32, 0, 0, 0, 93, +- 94, 33, 0, 0, 7, 8, 95, 9, 10, 0, +- 96, 0, 0, 0, 0, 34, 11, 12, 13, 14, +- 15, 16, 17, 18, 0, 0, 19, 0, 0, 20, +- 21, 22, 23, 0, 0, 0, 0, 0, 0, 0, +- 7, 8, 0, 9, 10, 0, 0, 0, 0, 0, +- 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, +- 0, 0, 19, 0, 0, 20, 21, 22, 23, 234, +- 235, 236, 237, 238, 239, 0, 0, 0, 0, 0, +- 0, 0, 24, 0, 0, 0, 0, 0, 25, 26, +- 0, 0, 27, 0, 28, 0, 0, 0, 0, 0, +- 0, 0, 0, 240, 241, 242, 243, 244, 245, 246, +- 247, 29, 248, 30, 0, 0, 0, 0, 24, 0, +- 0, 0, 31, 32, 25, 26, 0, 0, 27, 33, +- 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 42, 0, 0, 34, 0, 0, 0, 29, 0, 30, +- 0, 0, 0, 0, 0, 0, 0, 0, 31, 32, +- 50, 51, 52, 9, 0, 33, 53, 0, 132, 133, +- 134, 54, 0, 0, 0, 0, 0, 0, 0, 34, +- 135, 136, 0, 137, 138, 139, 140, 141, 142, 143, +- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, +- 154, 155, 156, 157, 158, 0, 0, 0, 0, 0, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 0, 0, 0, 0, 0, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, +- 80, 81, 82, 83, 0, 0, 159, 160, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 0, 0, 0, +- 161, 162, 163, 164, 165, 166, 167, 168, 31, 0, +- 0, 0, 0, 113, 94, 50, 51, 52, 9, 0, +- 95, 53, 0, 0, 96, 0, 54, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 55, 56, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 0, 0, 0, +- 0, 0, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 0, 0, 80, 81, 82, 83, 0, +- 50, 51, 52, 9, 0, 0, 53, 0, 0, 0, +- 0, 54, 0, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 0, 0, 0, 0, 0, 55, 56, 0, +- 0, 0, 0, 31, 0, 0, 0, 284, 93, 94, +- 0, 0, 0, 0, 0, 95, 0, 0, 0, 114, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 0, 0, 0, 0, 0, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, +- 80, 81, 82, 83, 0, 50, 51, 52, 9, 0, +- 0, 53, 0, 0, 0, 0, 54, 0, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 0, 0, 0, +- 0, 0, 55, 56, 0, 0, 0, 0, 31, 0, +- 0, 0, 0, 93, 94, 0, 0, 0, 0, 0, +- 95, 0, 0, 0, 96, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 0, 0, 0, +- 0, 0, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 0, 0, 80, 81, 82, 83, 0, +- 50, 51, 52, 9, 0, 0, 53, 0, 0, 0, +- 0, 54, 0, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 0, 0, 0, 0, 0, 55, 56, 0, +- 0, 0, 0, 31, 0, 0, 0, 0, 113, 94, +- 0, 0, 0, 0, 0, 95, 0, 0, 0, 114, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 0, 0, 0, 0, 0, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, +- 80, 81, 82, 83, 0, 50, 51, 52, 9, 0, +- 0, 53, 0, 0, 0, 0, 54, 0, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 0, 0, 0, +- 0, 0, 55, 56, 0, 0, 0, 0, 31, 0, +- 0, 0, 0, 93, 94, 0, 0, 0, 0, 0, +- 95, 0, 0, 0, 114, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 0, 0, 0, +- 0, 0, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 0, 0, 80, 81, 82, 83, 0, +- 281, 51, 52, 0, 0, 0, 282, 0, 0, 0, +- 0, 283, 0, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 0, 0, 0, 0, 0, 55, 56, 0, +- 0, 0, 0, 31, 0, 0, 0, 0, 291, 94, +- 0, 0, 0, 0, 0, 95, 0, 0, 0, 114, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 0, 0, 0, 0, 0, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, +- 80, 81, 82, 83, 0, 50, 51, 52, 0, 0, +- 0, 53, 0, 0, 0, 0, 54, 0, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 0, 0, 0, +- 0, 0, 55, 56, 0, 0, 0, 0, 0, 0, +- 0, 0, 284, 285, 94, 0, 0, 0, 0, 0, +- 95, 0, 0, 0, 96, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 0, 0, 0, +- 0, 0, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 0, 0, 80, 81, 82, 83, 0, +- 50, 51, 52, 0, 0, 0, 53, 0, 0, 0, +- 0, 54, 0, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 0, 0, 0, 0, 0, 55, 56, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 113, 94, +- 0, 0, 0, 0, 0, 95, 447, 0, 0, 96, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 0, 0, 0, 0, 0, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, +- 80, 81, 82, 83, 0, 50, 51, 52, 0, 0, +- 0, 53, 0, 0, 0, 0, 54, 0, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 0, 0, 0, +- 0, 0, 55, 56, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 113, 94, 0, 0, 0, 0, 0, +- 95, 0, 0, 0, 96, 57, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 0, 0, 0, +- 0, 0, 69, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 0, 0, 80, 81, 82, 83, 0, +- 50, 51, 52, 0, 0, 0, 53, 0, 0, 0, +- 0, 54, 0, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 0, 0, 0, 0, 0, 55, 56, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 93, 94, +- 0, 0, 0, 0, 0, 95, 0, 0, 0, 96, +- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, +- 67, 68, 0, 0, 0, 0, 0, 69, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, +- 80, 81, 82, 83, 0, 0, 50, 51, 52, 0, +- 0, 0, 53, 0, 0, 0, 0, 54, 84, 85, +- 86, 87, 88, 89, 90, 91, 92, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 291, 94, 0, 0, 0, 0, 0, +- 95, -205, 0, 0, 96, 0, 57, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 0, 0, +- 0, 0, 0, 69, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 0, 0, 80, 81, 82, 83, +- 0, 0, 50, 51, 52, 0, 0, 0, 53, 0, +- 0, 0, 0, 54, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 113, +- 94, 0, 0, 0, 0, 0, 95, -204, 0, 0, +- 96, 0, 57, 58, 59, 60, 61, 62, 63, 64, +- 65, 66, 67, 68, 0, 0, 0, 0, 0, 69, +- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, +- 0, 0, 80, 81, 82, 83, 0, 50, 51, 52, +- 0, 0, 0, 53, 0, 0, 0, 0, 54, 0, +- 84, 85, 86, 87, 88, 89, 90, 91, 92, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 113, 94, 0, 0, 0, +- 0, 0, 95, 0, 0, 0, 96, 57, 58, 59, +- 60, 61, 62, 63, 64, 65, 66, 67, 68, 0, +- 0, 0, 0, 0, 69, 70, 71, 72, 73, 74, +- 75, 76, 77, 78, 79, 0, 0, 80, 81, 82, +- 83, 55, 56, 0, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 0, 0, 84, 85, 86, 87, 88, +- 89, 90, 91, 92, 0, 58, 59, 60, 61, 62, +- 63, 64, 65, 66, 67, 68, 55, 56, 0, 0, +- 113, 94, 0, 0, 0, 0, 0, 95, 0, 0, +- 0, 96, 0, 0, 80, 81, 82, 83, 0, 0, +- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, +- 68, 0, 84, 85, 86, 87, 88, 89, 90, 91, +- 92, 0, 0, 0, 0, 232, 0, 0, 233, 80, +- 81, 82, 83, 0, 0, 232, 381, 0, 233, 0, +- 0, 0, 0, 0, 0, 0, 0, 84, 85, 86, +- 87, 88, 89, 90, 91, 92, 259, 260, 236, 237, +- 238, 239, 0, 0, 0, 0, 0, 0, 0, 0, +- 0, 284, 234, 235, 236, 237, 238, 239, 0, 0, +- 0, 0, 259, 260, 236, 237, 238, 239, 0, 0, +- 240, 241, 242, 243, 244, 245, 246, 247, 0, 248, +- 0, 0, 0, 0, 0, 0, 240, 241, 242, 243, +- 244, 245, 246, 247, 0, 248, 240, 241, 242, 243, +- 244, 245, 246, 247, 0, 248, 58, 59, 60, 61, +- 62, 63, 64, 65, 66, 67, 68, 58, 59, 60, +- 61, 62, 63, 64, 65, 66, 67, 68, 0, 0, +- 0, 0, 0, 0, 0, 80, 81, 82, 83, 0, +- 0, 0, 0, 0, 0, 0, 80, 81, 82, 83, +- 0, 0, 0, 84, 85, 86, 87, 88, 89, 90, +- 91, 92, 0, 0, 84, 85, 86, 87, 88, 89, +- 90, 91, 92, 0, 0, 0, 0, 216, 259, 260, +- 236, 237, 238, 239, 0, 0, 0, 234, 235, 236, +- 237, 238, 239, 0, 0, 0, 234, 0, 236, 237, +- 238, 239, 0, 0, 0, 259, 0, 236, 237, 238, +- 239, 0, 0, 241, 242, 243, 244, 245, 246, 247, +- 0, 248, 241, 242, 243, 244, 245, 246, 247, 0, +- 248, 241, 242, 243, 244, 245, 246, 247, 0, 248, +- 241, 242, 243, 244, 245, 246, 247, 0, 248 +-}; +- +-static const yytype_int16 yycheck[] = +-{ +- 26, 128, 106, 52, 30, 52, 32, 4, 108, 4, +- 129, 114, 0, 3, 40, 6, 0, 140, 141, 9, +- 0, 97, 132, 133, 14, 139, 145, 3, 0, 6, +- 26, 26, 139, 9, 140, 145, 32, 32, 14, 3, +- 4, 28, 281, 141, 171, 40, 285, 35, 124, 93, +- 4, 30, 31, 4, 104, 43, 126, 44, 48, 132, +- 133, 94, 134, 135, 136, 6, 138, 93, 82, 95, +- 96, 97, 145, 14, 15, 16, 17, 18, 19, 20, +- 140, 22, 8, 132, 133, 132, 133, 26, 114, 132, +- 133, 82, 126, 32, 95, 96, 146, 93, 124, 97, +- 98, 97, 97, 147, 131, 132, 133, 94, 126, 135, +- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, +- 146, 147, 101, 102, 150, 151, 152, 122, 124, 124, +- 230, 130, 129, 128, 126, 161, 162, 127, 377, 378, +- 166, 167, 125, 126, 121, 171, 140, 143, 144, 145, +- 146, 127, 255, 256, 93, 139, 259, 260, 97, 143, +- 144, 131, 132, 133, 126, 209, 210, 139, 163, 164, +- 165, 143, 144, 126, 413, 171, 171, 126, 282, 283, +- 30, 31, 37, 209, 210, 124, 173, 128, 132, 133, +- 290, 126, 93, 180, 181, 182, 183, 184, 185, 186, +- 187, 188, 189, 190, 143, 144, 145, 146, 234, 235, +- 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, +- 246, 247, 248, 249, 250, 251, 6, 126, 126, 255, +- 256, 281, 171, 259, 260, 285, 129, 287, 126, 132, +- 133, 285, 143, 144, 145, 146, 129, 291, 126, 132, +- 133, 101, 102, 249, 250, 6, 4, 129, 8, 285, +- 132, 133, 257, 258, 6, 291, 145, 130, 145, 264, +- 171, 10, 138, 15, 16, 17, 18, 19, 20, 3, +- 22, 125, 144, 410, 49, 329, 330, 144, 8, 285, +- 15, 16, 17, 18, 19, 20, 143, 22, 3, 8, +- 145, 129, 328, 329, 330, 145, 145, 333, 334, 145, +- 249, 250, 145, 129, 129, 95, 96, 97, 98, 99, +- 100, 65, 66, 67, 68, 69, 145, 377, 378, 50, +- 8, 145, 328, 145, 95, 129, 3, 333, 334, 111, +- 145, 121, 145, 51, 6, 145, 285, 145, 249, 250, +- 130, 131, 132, 133, 134, 135, 136, 145, 138, 145, +- 92, 145, 8, 413, 35, 171, 32, 65, 66, 67, +- 68, 69, 203, 415, -1, -1, 33, -1, 404, 405, +- 406, -1, 408, -1, 285, -1, 128, -1, -1, 328, +- -1, -1, -1, -1, 333, 334, 36, -1, 424, 425, +- -1, 145, 389, 128, -1, -1, 393, 394, 404, 405, +- -1, 97, 98, 99, 100, 410, 442, -1, -1, -1, +- -1, 447, 65, 66, 67, 68, 69, 328, 424, 425, +- -1, -1, 333, 334, 132, 133, -1, -1, 95, 96, +- 97, 98, 99, 100, 130, 131, 132, 133, 134, 135, +- 136, -1, 138, -1, -1, 95, 96, 97, 98, 99, +- 100, 3, 4, 5, 6, 404, 405, 9, -1, -1, +- -1, -1, 14, 130, 131, 132, 133, 134, 135, 136, +- -1, 138, -1, -1, -1, 424, 425, -1, 30, 31, +- 130, 131, 132, 133, 134, 135, 136, -1, 138, -1, +- -1, -1, -1, 404, 405, -1, -1, -1, -1, -1, +- -1, 53, 54, 55, 56, 57, 58, 59, 60, 61, +- 62, 63, 64, 424, 425, -1, -1, -1, 70, 71, +- 72, 73, 74, 75, 76, 77, 78, 79, 80, 99, +- 100, 83, 84, 85, 86, 132, 133, 134, 135, 136, +- -1, 138, -1, -1, -1, -1, -1, -1, -1, 101, +- 102, 103, 104, 105, 106, 107, 108, 109, -1, -1, +- 130, 131, 132, 133, 134, 135, 136, -1, 138, 121, +- -1, -1, -1, -1, 126, 127, -1, -1, -1, -1, +- -1, 133, -1, -1, -1, 137, 3, 4, 5, 6, +- 7, -1, 9, 145, -1, -1, -1, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, -1, -1, 25, -1, +- -1, 28, 29, 30, 31, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, -1, -1, +- -1, -1, -1, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, 81, -1, 83, 84, 85, 86, +- 87, 88, -1, -1, 91, -1, 93, -1, -1, -1, +- -1, -1, -1, -1, 101, 102, 103, 104, 105, 106, +- 107, 108, 109, 110, -1, 112, -1, -1, -1, -1, +- -1, -1, -1, -1, 121, 122, -1, -1, -1, 126, +- 127, 128, -1, -1, 3, 4, 133, 6, 7, -1, +- 137, -1, -1, -1, -1, 142, 15, 16, 17, 18, +- 19, 20, 21, 22, -1, -1, 25, -1, -1, 28, +- 29, 30, 31, -1, -1, -1, -1, -1, -1, -1, +- 3, 4, -1, 6, 7, -1, -1, -1, -1, -1, +- -1, -1, 15, 16, 17, 18, 19, 20, 21, 22, +- -1, -1, 25, -1, -1, 28, 29, 30, 31, 95, +- 96, 97, 98, 99, 100, -1, -1, -1, -1, -1, +- -1, -1, 81, -1, -1, -1, -1, -1, 87, 88, +- -1, -1, 91, -1, 93, -1, -1, -1, -1, -1, +- -1, -1, -1, 129, 130, 131, 132, 133, 134, 135, +- 136, 110, 138, 112, -1, -1, -1, -1, 81, -1, +- -1, -1, 121, 122, 87, 88, -1, -1, 91, 128, +- 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- 139, -1, -1, 142, -1, -1, -1, 110, -1, 112, +- -1, -1, -1, -1, -1, -1, -1, -1, 121, 122, +- 3, 4, 5, 6, -1, 128, 9, -1, 11, 12, +- 13, 14, -1, -1, -1, -1, -1, -1, -1, 142, +- 23, 24, -1, 26, 27, 28, 29, 30, 31, 32, +- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, +- 43, 44, 45, 46, 47, -1, -1, -1, -1, -1, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1, +- 83, 84, 85, 86, -1, -1, 89, 90, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 101, 102, +- 103, 104, 105, 106, 107, 108, 109, -1, -1, -1, +- 113, 114, 115, 116, 117, 118, 119, 120, 121, -1, +- -1, -1, -1, 126, 127, 3, 4, 5, 6, -1, +- 133, 9, -1, -1, 137, -1, 14, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, 30, 31, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, -1, -1, -1, +- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, -1, -1, 83, 84, 85, 86, -1, +- 3, 4, 5, 6, -1, -1, 9, -1, -1, -1, +- -1, 14, -1, 101, 102, 103, 104, 105, 106, 107, +- 108, 109, -1, -1, -1, -1, -1, 30, 31, -1, +- -1, -1, -1, 121, -1, -1, -1, 125, 126, 127, +- -1, -1, -1, -1, -1, 133, -1, -1, -1, 137, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1, +- 83, 84, 85, 86, -1, 3, 4, 5, 6, -1, +- -1, 9, -1, -1, -1, -1, 14, -1, 101, 102, +- 103, 104, 105, 106, 107, 108, 109, -1, -1, -1, +- -1, -1, 30, 31, -1, -1, -1, -1, 121, -1, +- -1, -1, -1, 126, 127, -1, -1, -1, -1, -1, +- 133, -1, -1, -1, 137, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, -1, -1, -1, +- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, -1, -1, 83, 84, 85, 86, -1, +- 3, 4, 5, 6, -1, -1, 9, -1, -1, -1, +- -1, 14, -1, 101, 102, 103, 104, 105, 106, 107, +- 108, 109, -1, -1, -1, -1, -1, 30, 31, -1, +- -1, -1, -1, 121, -1, -1, -1, -1, 126, 127, +- -1, -1, -1, -1, -1, 133, -1, -1, -1, 137, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1, +- 83, 84, 85, 86, -1, 3, 4, 5, 6, -1, +- -1, 9, -1, -1, -1, -1, 14, -1, 101, 102, +- 103, 104, 105, 106, 107, 108, 109, -1, -1, -1, +- -1, -1, 30, 31, -1, -1, -1, -1, 121, -1, +- -1, -1, -1, 126, 127, -1, -1, -1, -1, -1, +- 133, -1, -1, -1, 137, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, -1, -1, -1, +- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, -1, -1, 83, 84, 85, 86, -1, +- 3, 4, 5, -1, -1, -1, 9, -1, -1, -1, +- -1, 14, -1, 101, 102, 103, 104, 105, 106, 107, +- 108, 109, -1, -1, -1, -1, -1, 30, 31, -1, +- -1, -1, -1, 121, -1, -1, -1, -1, 126, 127, +- -1, -1, -1, -1, -1, 133, -1, -1, -1, 137, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1, +- 83, 84, 85, 86, -1, 3, 4, 5, -1, -1, +- -1, 9, -1, -1, -1, -1, 14, -1, 101, 102, +- 103, 104, 105, 106, 107, 108, 109, -1, -1, -1, +- -1, -1, 30, 31, -1, -1, -1, -1, -1, -1, +- -1, -1, 125, 126, 127, -1, -1, -1, -1, -1, +- 133, -1, -1, -1, 137, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, -1, -1, -1, +- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, -1, -1, 83, 84, 85, 86, -1, +- 3, 4, 5, -1, -1, -1, 9, -1, -1, -1, +- -1, 14, -1, 101, 102, 103, 104, 105, 106, 107, +- 108, 109, -1, -1, -1, -1, -1, 30, 31, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 126, 127, +- -1, -1, -1, -1, -1, 133, 134, -1, -1, 137, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1, +- 83, 84, 85, 86, -1, 3, 4, 5, -1, -1, +- -1, 9, -1, -1, -1, -1, 14, -1, 101, 102, +- 103, 104, 105, 106, 107, 108, 109, -1, -1, -1, +- -1, -1, 30, 31, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 126, 127, -1, -1, -1, -1, -1, +- 133, -1, -1, -1, 137, 53, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, -1, -1, -1, +- -1, -1, 70, 71, 72, 73, 74, 75, 76, 77, +- 78, 79, 80, -1, -1, 83, 84, 85, 86, -1, +- 3, 4, 5, -1, -1, -1, 9, -1, -1, -1, +- -1, 14, -1, 101, 102, 103, 104, 105, 106, 107, +- 108, 109, -1, -1, -1, -1, -1, 30, 31, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, 126, 127, +- -1, -1, -1, -1, -1, 133, -1, -1, -1, 137, +- 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, +- 63, 64, -1, -1, -1, -1, -1, 70, 71, 72, +- 73, 74, 75, 76, 77, 78, 79, 80, -1, -1, +- 83, 84, 85, 86, -1, -1, 3, 4, 5, -1, +- -1, -1, 9, -1, -1, -1, -1, 14, 101, 102, +- 103, 104, 105, 106, 107, 108, 109, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, 126, 127, -1, -1, -1, -1, -1, +- 133, 48, -1, -1, 137, -1, 53, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, -1, -1, +- -1, -1, -1, 70, 71, 72, 73, 74, 75, 76, +- 77, 78, 79, 80, -1, -1, 83, 84, 85, 86, +- -1, -1, 3, 4, 5, -1, -1, -1, 9, -1, +- -1, -1, -1, 14, 101, 102, 103, 104, 105, 106, +- 107, 108, 109, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, 126, +- 127, -1, -1, -1, -1, -1, 133, 48, -1, -1, +- 137, -1, 53, 54, 55, 56, 57, 58, 59, 60, +- 61, 62, 63, 64, -1, -1, -1, -1, -1, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- -1, -1, 83, 84, 85, 86, -1, 3, 4, 5, +- -1, -1, -1, 9, -1, -1, -1, -1, 14, -1, +- 101, 102, 103, 104, 105, 106, 107, 108, 109, -1, +- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 126, 127, -1, -1, -1, +- -1, -1, 133, -1, -1, -1, 137, 53, 54, 55, +- 56, 57, 58, 59, 60, 61, 62, 63, 64, -1, +- -1, -1, -1, -1, 70, 71, 72, 73, 74, 75, +- 76, 77, 78, 79, 80, -1, -1, 83, 84, 85, +- 86, 30, 31, -1, -1, -1, -1, -1, -1, -1, +- -1, -1, -1, -1, -1, 101, 102, 103, 104, 105, +- 106, 107, 108, 109, -1, 54, 55, 56, 57, 58, +- 59, 60, 61, 62, 63, 64, 30, 31, -1, -1, +- 126, 127, -1, -1, -1, -1, -1, 133, -1, -1, +- -1, 137, -1, -1, 83, 84, 85, 86, -1, -1, +- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, +- 64, -1, 101, 102, 103, 104, 105, 106, 107, 108, +- 109, -1, -1, -1, -1, 48, -1, -1, 51, 83, +- 84, 85, 86, -1, -1, 48, 125, -1, 51, -1, +- -1, -1, -1, -1, -1, -1, -1, 101, 102, 103, +- 104, 105, 106, 107, 108, 109, 95, 96, 97, 98, +- 99, 100, -1, -1, -1, -1, -1, -1, -1, -1, +- -1, 125, 95, 96, 97, 98, 99, 100, -1, -1, +- -1, -1, 95, 96, 97, 98, 99, 100, -1, -1, +- 129, 130, 131, 132, 133, 134, 135, 136, -1, 138, +- -1, -1, -1, -1, -1, -1, 129, 130, 131, 132, +- 133, 134, 135, 136, -1, 138, 129, 130, 131, 132, +- 133, 134, 135, 136, -1, 138, 54, 55, 56, 57, +- 58, 59, 60, 61, 62, 63, 64, 54, 55, 56, +- 57, 58, 59, 60, 61, 62, 63, 64, -1, -1, +- -1, -1, -1, -1, -1, 83, 84, 85, 86, -1, +- -1, -1, -1, -1, -1, -1, 83, 84, 85, 86, +- -1, -1, -1, 101, 102, 103, 104, 105, 106, 107, +- 108, 109, -1, -1, 101, 102, 103, 104, 105, 106, +- 107, 108, 109, -1, -1, -1, -1, 125, 95, 96, +- 97, 98, 99, 100, -1, -1, -1, 95, 96, 97, +- 98, 99, 100, -1, -1, -1, 95, -1, 97, 98, +- 99, 100, -1, -1, -1, 95, -1, 97, 98, 99, +- 100, -1, -1, 130, 131, 132, 133, 134, 135, 136, +- -1, 138, 130, 131, 132, 133, 134, 135, 136, -1, +- 138, 130, 131, 132, 133, 134, 135, 136, -1, 138, +- 130, 131, 132, 133, 134, 135, 136, -1, 138 +-}; +- +- /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing +- symbol of state STATE-NUM. */ +-static const yytype_uint8 yystos[] = +-{ +- 0, 139, 147, 148, 150, 151, 0, 3, 4, 6, +- 7, 15, 16, 17, 18, 19, 20, 21, 22, 25, +- 28, 29, 30, 31, 81, 87, 88, 91, 93, 110, +- 112, 121, 122, 128, 142, 149, 152, 161, 164, 170, +- 174, 176, 139, 141, 140, 141, 140, 6, 82, 153, +- 3, 4, 5, 9, 14, 30, 31, 53, 54, 55, +- 56, 57, 58, 59, 60, 61, 62, 63, 64, 70, +- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, +- 83, 84, 85, 86, 101, 102, 103, 104, 105, 106, +- 107, 108, 109, 126, 127, 133, 137, 162, 163, 176, +- 178, 179, 181, 182, 183, 184, 185, 186, 191, 192, +- 193, 194, 4, 126, 137, 167, 168, 176, 182, 192, +- 194, 4, 192, 126, 162, 175, 171, 150, 151, 4, +- 129, 94, 11, 12, 13, 23, 24, 26, 27, 28, +- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, +- 39, 40, 41, 42, 43, 44, 45, 46, 47, 89, +- 90, 113, 114, 115, 116, 117, 118, 119, 120, 176, +- 192, 150, 167, 140, 3, 4, 160, 82, 156, 8, +- 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, +- 126, 30, 31, 101, 102, 30, 31, 101, 102, 167, +- 178, 181, 182, 192, 194, 167, 192, 192, 163, 132, +- 133, 65, 66, 67, 68, 69, 125, 191, 6, 14, +- 15, 16, 17, 18, 19, 20, 22, 128, 187, 187, +- 48, 183, 48, 51, 95, 96, 97, 98, 99, 100, +- 129, 130, 131, 132, 133, 134, 135, 136, 138, 180, +- 130, 140, 168, 192, 37, 95, 96, 97, 98, 95, +- 96, 176, 6, 148, 150, 148, 170, 4, 159, 192, +- 192, 192, 192, 192, 192, 192, 192, 178, 192, 178, +- 178, 3, 9, 14, 125, 126, 178, 188, 189, 190, +- 191, 126, 181, 192, 192, 192, 192, 192, 192, 176, +- 176, 176, 192, 192, 3, 4, 30, 31, 170, 178, +- 179, 182, 167, 154, 8, 167, 167, 167, 167, 167, +- 167, 167, 167, 167, 145, 167, 167, 145, 129, 132, +- 133, 145, 145, 180, 130, 10, 181, 181, 3, 144, +- 183, 49, 192, 192, 192, 192, 192, 192, 192, 192, +- 192, 192, 192, 192, 192, 192, 192, 178, 178, 192, +- 165, 168, 192, 168, 192, 176, 176, 168, 192, 168, +- 192, 177, 144, 143, 8, 189, 191, 187, 187, 3, +- 189, 125, 191, 181, 192, 8, 157, 145, 145, 129, +- 145, 145, 145, 129, 129, 145, 145, 145, 178, 181, +- 181, 178, 178, 50, 52, 129, 33, 8, 129, 145, +- 172, 189, 189, 129, 3, 155, 111, 166, 167, 167, +- 167, 145, 145, 145, 52, 129, 51, 178, 178, 192, +- 192, 170, 173, 189, 166, 6, 145, 145, 145, 178, +- 178, 131, 36, 169, 145, 145, 131, 134, 192, 92, +- 145, 192, 158, 8 +-}; +- +- /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +-static const yytype_uint8 yyr1[] = +-{ +- 0, 146, 147, 147, 148, 149, 149, 150, 150, 151, +- 151, 152, 152, 152, 152, 152, 152, 152, 152, 152, +- 152, 153, 152, 152, 154, 155, 152, 156, 157, 152, +- 158, 152, 152, 159, 152, 152, 152, 160, 160, 161, +- 161, 161, 162, 162, 163, 163, 163, 165, 164, 166, +- 166, 167, 167, 168, 168, 168, 168, 168, 168, 168, +- 168, 168, 169, 169, 169, 170, 170, 170, 170, 171, +- 172, 170, 170, 173, 173, 174, 174, 174, 174, 174, +- 174, 174, 174, 174, 174, 174, 175, 174, 174, 174, +- 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, +- 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, +- 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, +- 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, +- 174, 174, 174, 174, 174, 174, 176, 176, 177, 177, +- 178, 178, 178, 179, 179, 179, 179, 179, 179, 179, +- 179, 179, 179, 180, 180, 181, 181, 182, 182, 182, +- 182, 182, 183, 183, 183, 184, 184, 185, 185, 186, +- 186, 187, 187, 187, 187, 187, 187, 187, 187, 187, +- 188, 188, 189, 189, 189, 190, 190, 190, 190, 190, +- 190, 191, 191, 191, 191, 191, 191, 191, 191, 191, +- 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, +- 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, +- 191, 191, 191, 192, 192, 193, 194, 194, 194, 194, +- 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, +- 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, +- 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, +- 194 +-}; +- +- /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +-static const yytype_uint8 yyr2[] = +-{ +- 0, 2, 1, 1, 3, 1, 3, 0, 1, 1, +- 2, 3, 3, 4, 1, 1, 1, 1, 1, 2, +- 2, 0, 3, 2, 0, 0, 7, 0, 0, 6, +- 0, 10, 1, 0, 4, 1, 1, 1, 1, 2, +- 2, 3, 1, 2, 1, 1, 1, 0, 5, 0, +- 2, 1, 1, 3, 3, 3, 3, 3, 3, 3, +- 3, 2, 0, 2, 3, 1, 4, 4, 4, 0, +- 0, 6, 1, 0, 1, 1, 1, 1, 1, 1, +- 1, 1, 1, 1, 2, 3, 0, 4, 3, 3, +- 3, 3, 2, 2, 3, 2, 3, 2, 3, 2, +- 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, +- 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, +- 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 3, 2, 1, 5, 0, 3, +- 1, 1, 3, 1, 3, 5, 3, 5, 5, 5, +- 7, 6, 8, 1, 4, 3, 3, 1, 2, 2, +- 3, 1, 1, 1, 3, 1, 3, 1, 2, 2, +- 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, +- 2, 3, 1, 1, 2, 1, 5, 4, 3, 3, +- 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, +- 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, +- 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, +- 1, 1, 1, 1, 1, 3, 1, 1, 2, 2, +- 2, 2, 2, 3, 3, 3, 3, 3, 3, 2, +- 3, 4, 4, 6, 4, 4, 4, 6, 6, 4, +- 4, 3, 4, 3, 3, 3, 3, 3, 3, 3, +- 2 +-}; +- +- +-#define yyerrok (yyerrstatus = 0) +-#define yyclearin (yychar = YYEMPTY) +-#define YYEMPTY (-2) +-#define YYEOF 0 +- +-#define YYACCEPT goto yyacceptlab +-#define YYABORT goto yyabortlab +-#define YYERROR goto yyerrorlab +- +- +-#define YYRECOVERING() (!!yyerrstatus) +- +-#define YYBACKUP(Token, Value) \ +-do \ +- if (yychar == YYEMPTY) \ +- { \ +- yychar = (Token); \ +- yylval = (Value); \ +- YYPOPSTACK (yylen); \ +- yystate = *yyssp; \ +- goto yybackup; \ +- } \ +- else \ +- { \ +- yyerror (YY_("syntax error: cannot back up")); \ +- YYERROR; \ +- } \ +-while (0) +- +-/* Error token number */ +-#define YYTERROR 1 +-#define YYERRCODE 256 +- +- +- +-/* Enable debugging if requested. */ +-#if YYDEBUG +- +-# ifndef YYFPRINTF +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YYFPRINTF fprintf +-# endif +- +-# define YYDPRINTF(Args) \ +-do { \ +- if (yydebug) \ +- YYFPRINTF Args; \ +-} while (0) +- +-/* This macro is provided for backward compatibility. */ +-#ifndef YY_LOCATION_PRINT +-# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +-#endif +- +- +-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +-do { \ +- if (yydebug) \ +- { \ +- YYFPRINTF (stderr, "%s ", Title); \ +- yy_symbol_print (stderr, \ +- Type, Value); \ +- YYFPRINTF (stderr, "\n"); \ +- } \ +-} while (0) +- +- +-/*----------------------------------------. +-| Print this symbol's value on YYOUTPUT. | +-`----------------------------------------*/ +- +-static void +-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +-{ +- FILE *yyo = yyoutput; +- YYUSE (yyo); +- if (!yyvaluep) +- return; +-# ifdef YYPRINT +- if (yytype < YYNTOKENS) +- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +-# endif +- YYUSE (yytype); +-} +- +- +-/*--------------------------------. +-| Print this symbol on YYOUTPUT. | +-`--------------------------------*/ +- +-static void +-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +-{ +- YYFPRINTF (yyoutput, "%s %s (", +- yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); +- +- yy_symbol_value_print (yyoutput, yytype, yyvaluep); +- YYFPRINTF (yyoutput, ")"); +-} +- +-/*------------------------------------------------------------------. +-| yy_stack_print -- Print the state stack from its BOTTOM up to its | +-| TOP (included). | +-`------------------------------------------------------------------*/ +- +-static void +-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +-{ +- YYFPRINTF (stderr, "Stack now"); +- for (; yybottom <= yytop; yybottom++) +- { +- int yybot = *yybottom; +- YYFPRINTF (stderr, " %d", yybot); +- } +- YYFPRINTF (stderr, "\n"); +-} +- +-# define YY_STACK_PRINT(Bottom, Top) \ +-do { \ +- if (yydebug) \ +- yy_stack_print ((Bottom), (Top)); \ +-} while (0) +- +- +-/*------------------------------------------------. +-| Report that the YYRULE is going to be reduced. | +-`------------------------------------------------*/ +- +-static void +-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) +-{ +- unsigned long int yylno = yyrline[yyrule]; +- int yynrhs = yyr2[yyrule]; +- int yyi; +- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", +- yyrule - 1, yylno); +- /* The symbols being reduced. */ +- for (yyi = 0; yyi < yynrhs; yyi++) +- { +- YYFPRINTF (stderr, " $%d = ", yyi + 1); +- yy_symbol_print (stderr, +- yystos[yyssp[yyi + 1 - yynrhs]], +- &(yyvsp[(yyi + 1) - (yynrhs)]) +- ); +- YYFPRINTF (stderr, "\n"); +- } +-} +- +-# define YY_REDUCE_PRINT(Rule) \ +-do { \ +- if (yydebug) \ +- yy_reduce_print (yyssp, yyvsp, Rule); \ +-} while (0) +- +-/* Nonzero means print parse trace. It is left uninitialized so that +- multiple parsers can coexist. */ +-int yydebug; +-#else /* !YYDEBUG */ +-# define YYDPRINTF(Args) +-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +-# define YY_STACK_PRINT(Bottom, Top) +-# define YY_REDUCE_PRINT(Rule) +-#endif /* !YYDEBUG */ +- +- +-/* YYINITDEPTH -- initial size of the parser's stacks. */ +-#ifndef YYINITDEPTH +-# define YYINITDEPTH 200 +-#endif +- +-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only +- if the built-in stack extension method is used). +- +- Do not make this value too large; the results are undefined if +- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) +- evaluated with infinite-precision integer arithmetic. */ +- +-#ifndef YYMAXDEPTH +-# define YYMAXDEPTH 10000 +-#endif +- +- +-#if YYERROR_VERBOSE +- +-# ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H +-# define yystrlen strlen +-# else +-/* Return the length of YYSTR. */ +-static YYSIZE_T +-yystrlen (const char *yystr) +-{ +- YYSIZE_T yylen; +- for (yylen = 0; yystr[yylen]; yylen++) +- continue; +- return yylen; +-} +-# endif +-# endif +- +-# ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +-# define yystpcpy stpcpy +-# else +-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in +- YYDEST. */ +-static char * +-yystpcpy (char *yydest, const char *yysrc) +-{ +- char *yyd = yydest; +- const char *yys = yysrc; +- +- while ((*yyd++ = *yys++) != '\0') +- continue; +- +- return yyd - 1; +-} +-# endif +-# endif +- +-# ifndef yytnamerr +-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary +- quotes and backslashes, so that it's suitable for yyerror. The +- heuristic is that double-quoting is unnecessary unless the string +- contains an apostrophe, a comma, or backslash (other than +- backslash-backslash). YYSTR is taken from yytname. If YYRES is +- null, do not copy; instead, return the length of what the result +- would have been. */ +-static YYSIZE_T +-yytnamerr (char *yyres, const char *yystr) +-{ +- if (*yystr == '"') +- { +- YYSIZE_T yyn = 0; +- char const *yyp = yystr; +- +- for (;;) +- switch (*++yyp) +- { +- case '\'': +- case ',': +- goto do_not_strip_quotes; +- +- case '\\': +- if (*++yyp != '\\') +- goto do_not_strip_quotes; +- /* Fall through. */ +- default: +- if (yyres) +- yyres[yyn] = *yyp; +- yyn++; +- break; +- +- case '"': +- if (yyres) +- yyres[yyn] = '\0'; +- return yyn; +- } +- do_not_strip_quotes: ; +- } +- +- if (! yyres) +- return yystrlen (yystr); +- +- return yystpcpy (yyres, yystr) - yyres; +-} +-# endif +- +-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message +- about the unexpected token YYTOKEN for the state stack whose top is +- YYSSP. +- +- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is +- not large enough to hold the message. In that case, also set +- *YYMSG_ALLOC to the required number of bytes. Return 2 if the +- required number of bytes is too large to store. */ +-static int +-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, +- yytype_int16 *yyssp, int yytoken) +-{ +- YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); +- YYSIZE_T yysize = yysize0; +- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; +- /* Internationalized format string. */ +- const char *yyformat = YY_NULLPTR; +- /* Arguments of yyformat. */ +- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; +- /* Number of reported tokens (one for the "unexpected", one per +- "expected"). */ +- int yycount = 0; +- +- /* There are many possibilities here to consider: +- - If this state is a consistent state with a default action, then +- the only way this function was invoked is if the default action +- is an error action. In that case, don't check for expected +- tokens because there are none. +- - The only way there can be no lookahead present (in yychar) is if +- this state is a consistent state with a default action. Thus, +- detecting the absence of a lookahead is sufficient to determine +- that there is no unexpected or expected token to report. In that +- case, just report a simple "syntax error". +- - Don't assume there isn't a lookahead just because this state is a +- consistent state with a default action. There might have been a +- previous inconsistent state, consistent state with a non-default +- action, or user semantic action that manipulated yychar. +- - Of course, the expected token list depends on states to have +- correct lookahead information, and it depends on the parser not +- to perform extra reductions after fetching a lookahead from the +- scanner and before detecting a syntax error. Thus, state merging +- (from LALR or IELR) and default reductions corrupt the expected +- token list. However, the list is correct for canonical LR with +- one exception: it will still contain any token that will not be +- accepted due to an error action in a later state. +- */ +- if (yytoken != YYEMPTY) +- { +- int yyn = yypact[*yyssp]; +- yyarg[yycount++] = yytname[yytoken]; +- if (!yypact_value_is_default (yyn)) +- { +- /* Start YYX at -YYN if negative to avoid negative indexes in +- YYCHECK. In other words, skip the first -YYN actions for +- this state because they are default actions. */ +- int yyxbegin = yyn < 0 ? -yyn : 0; +- /* Stay within bounds of both yycheck and yytname. */ +- int yychecklim = YYLAST - yyn + 1; +- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; +- int yyx; +- +- for (yyx = yyxbegin; yyx < yyxend; ++yyx) +- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR +- && !yytable_value_is_error (yytable[yyx + yyn])) +- { +- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) +- { +- yycount = 1; +- yysize = yysize0; +- break; +- } +- yyarg[yycount++] = yytname[yyx]; +- { +- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); +- if (! (yysize <= yysize1 +- && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) +- return 2; +- yysize = yysize1; +- } +- } +- } +- } +- +- switch (yycount) +- { +-# define YYCASE_(N, S) \ +- case N: \ +- yyformat = S; \ +- break +- YYCASE_(0, YY_("syntax error")); +- YYCASE_(1, YY_("syntax error, unexpected %s")); +- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); +- YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); +- YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); +- YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +-# undef YYCASE_ +- } +- +- { +- YYSIZE_T yysize1 = yysize + yystrlen (yyformat); +- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) +- return 2; +- yysize = yysize1; +- } +- +- if (*yymsg_alloc < yysize) +- { +- *yymsg_alloc = 2 * yysize; +- if (! (yysize <= *yymsg_alloc +- && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) +- *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; +- return 1; +- } +- +- /* Avoid sprintf, as that infringes on the user's name space. +- Don't have undefined behavior even if the translation +- produced a string with the wrong number of "%s"s. */ +- { +- char *yyp = *yymsg; +- int yyi = 0; +- while ((*yyp = *yyformat) != '\0') +- if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) +- { +- yyp += yytnamerr (yyp, yyarg[yyi++]); +- yyformat += 2; +- } +- else +- { +- yyp++; +- yyformat++; +- } +- } +- return 0; +-} +-#endif /* YYERROR_VERBOSE */ +- +-/*-----------------------------------------------. +-| Release the memory associated to this symbol. | +-`-----------------------------------------------*/ +- +-static void +-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +-{ +- YYUSE (yyvaluep); +- if (!yymsg) +- yymsg = "Deleting"; +- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); +- +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- YYUSE (yytype); +- YY_IGNORE_MAYBE_UNINITIALIZED_END +-} +- +- +- +- +-/* The lookahead symbol. */ +-int yychar; +- +-/* The semantic value of the lookahead symbol. */ +-YYSTYPE yylval; +-/* Number of syntax errors so far. */ +-int yynerrs; +- +- +-/*----------. +-| yyparse. | +-`----------*/ +- +-int +-yyparse (void) +-{ +- int yystate; +- /* Number of tokens to shift before error messages enabled. */ +- int yyerrstatus; +- +- /* The stacks and their tools: +- 'yyss': related to states. +- 'yyvs': related to semantic values. +- +- Refer to the stacks through separate pointers, to allow yyoverflow +- to reallocate them elsewhere. */ +- +- /* The state stack. */ +- yytype_int16 yyssa[YYINITDEPTH]; +- yytype_int16 *yyss; +- yytype_int16 *yyssp; +- +- /* The semantic value stack. */ +- YYSTYPE yyvsa[YYINITDEPTH]; +- YYSTYPE *yyvs; +- YYSTYPE *yyvsp; +- +- YYSIZE_T yystacksize; +- +- int yyn; +- int yyresult; +- /* Lookahead token as an internal (translated) token number. */ +- int yytoken = 0; +- /* The variables used to return semantic value and location from the +- action routines. */ +- YYSTYPE yyval; +- +-#if YYERROR_VERBOSE +- /* Buffer for error messages, and its allocated size. */ +- char yymsgbuf[128]; +- char *yymsg = yymsgbuf; +- YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +-#endif +- +-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) +- +- /* The number of symbols on the RHS of the reduced rule. +- Keep to zero when no symbol should be popped. */ +- int yylen = 0; +- +- yyssp = yyss = yyssa; +- yyvsp = yyvs = yyvsa; +- yystacksize = YYINITDEPTH; +- +- YYDPRINTF ((stderr, "Starting parse\n")); +- +- yystate = 0; +- yyerrstatus = 0; +- yynerrs = 0; +- yychar = YYEMPTY; /* Cause a token to be read. */ +- goto yysetstate; +- +-/*------------------------------------------------------------. +-| yynewstate -- Push a new state, which is found in yystate. | +-`------------------------------------------------------------*/ +- yynewstate: +- /* In all cases, when you get here, the value and location stacks +- have just been pushed. So pushing a state here evens the stacks. */ +- yyssp++; +- +- yysetstate: +- *yyssp = yystate; +- +- if (yyss + yystacksize - 1 <= yyssp) +- { +- /* Get the current used size of the three stacks, in elements. */ +- YYSIZE_T yysize = yyssp - yyss + 1; +- +-#ifdef yyoverflow +- { +- /* Give user a chance to reallocate the stack. Use copies of +- these so that the &'s don't force the real ones into +- memory. */ +- YYSTYPE *yyvs1 = yyvs; +- yytype_int16 *yyss1 = yyss; +- +- /* Each stack pointer address is followed by the size of the +- data in use in that stack, in bytes. This used to be a +- conditional around just the two extra args, but that might +- be undefined if yyoverflow is a macro. */ +- yyoverflow (YY_("memory exhausted"), +- &yyss1, yysize * sizeof (*yyssp), +- &yyvs1, yysize * sizeof (*yyvsp), +- &yystacksize); +- +- yyss = yyss1; +- yyvs = yyvs1; +- } +-#else /* no yyoverflow */ +-# ifndef YYSTACK_RELOCATE +- goto yyexhaustedlab; +-# else +- /* Extend the stack our own way. */ +- if (YYMAXDEPTH <= yystacksize) +- goto yyexhaustedlab; +- yystacksize *= 2; +- if (YYMAXDEPTH < yystacksize) +- yystacksize = YYMAXDEPTH; +- +- { +- yytype_int16 *yyss1 = yyss; +- union yyalloc *yyptr = +- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); +- if (! yyptr) +- goto yyexhaustedlab; +- YYSTACK_RELOCATE (yyss_alloc, yyss); +- YYSTACK_RELOCATE (yyvs_alloc, yyvs); +-# undef YYSTACK_RELOCATE +- if (yyss1 != yyssa) +- YYSTACK_FREE (yyss1); +- } +-# endif +-#endif /* no yyoverflow */ +- +- yyssp = yyss + yysize - 1; +- yyvsp = yyvs + yysize - 1; +- +- YYDPRINTF ((stderr, "Stack size increased to %lu\n", +- (unsigned long int) yystacksize)); +- +- if (yyss + yystacksize - 1 <= yyssp) +- YYABORT; +- } +- +- YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +- +- if (yystate == YYFINAL) +- YYACCEPT; +- +- goto yybackup; +- +-/*-----------. +-| yybackup. | +-`-----------*/ +-yybackup: +- +- /* Do appropriate processing given the current state. Read a +- lookahead token if we need one and don't already have one. */ +- +- /* First try to decide what to do without reference to lookahead token. */ +- yyn = yypact[yystate]; +- if (yypact_value_is_default (yyn)) +- goto yydefault; +- +- /* Not known => get a lookahead token if don't already have one. */ +- +- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ +- if (yychar == YYEMPTY) +- { +- YYDPRINTF ((stderr, "Reading a token: ")); +- yychar = yylex (); +- } +- +- if (yychar <= YYEOF) +- { +- yychar = yytoken = YYEOF; +- YYDPRINTF ((stderr, "Now at end of input.\n")); +- } +- else +- { +- yytoken = YYTRANSLATE (yychar); +- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); +- } +- +- /* If the proper action on seeing token YYTOKEN is to reduce or to +- detect an error, take that action. */ +- yyn += yytoken; +- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) +- goto yydefault; +- yyn = yytable[yyn]; +- if (yyn <= 0) +- { +- if (yytable_value_is_error (yyn)) +- goto yyerrlab; +- yyn = -yyn; +- goto yyreduce; +- } +- +- /* Count tokens shifted since error; after three, turn off error +- status. */ +- if (yyerrstatus) +- yyerrstatus--; +- +- /* Shift the lookahead token. */ +- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); +- +- /* Discard the shifted token. */ +- yychar = YYEMPTY; +- +- yystate = yyn; +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- *++yyvsp = yylval; +- YY_IGNORE_MAYBE_UNINITIALIZED_END +- +- goto yynewstate; +- +- +-/*-----------------------------------------------------------. +-| yydefault -- do the default action for the current state. | +-`-----------------------------------------------------------*/ +-yydefault: +- yyn = yydefact[yystate]; +- if (yyn == 0) +- goto yyerrlab; +- goto yyreduce; +- +- +-/*-----------------------------. +-| yyreduce -- Do a reduction. | +-`-----------------------------*/ +-yyreduce: +- /* yyn is the number of a rule to reduce with. */ +- yylen = yyr2[yyn]; +- +- /* If YYLEN is nonzero, implement the default value of the action: +- '$$ = $1'. +- +- Otherwise, the following line sets YYVAL to garbage. +- This behavior is undocumented and Bison +- users should not rely upon it. Assigning to YYVAL +- unconditionally makes the parser a bit smaller, and it avoids a +- GCC warning that YYVAL may be used uninitialized. */ +- yyval = yyvsp[1-yylen]; +- +- +- YY_REDUCE_PRINT (yyn); +- switch (yyn) +- { +- case 3: +-#line 277 "pic.y" /* yacc.c:1646 */ +- { +- if (olist.head) +- print_picture(olist.head); +- } +-#line 2260 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 4: +-#line 286 "pic.y" /* yacc.c:1646 */ +- { (yyval.pl) = (yyvsp[-1].pl); } +-#line 2266 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 5: +-#line 291 "pic.y" /* yacc.c:1646 */ +- { (yyval.pl) = (yyvsp[0].pl); } +-#line 2272 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 6: +-#line 293 "pic.y" /* yacc.c:1646 */ +- { (yyval.pl) = (yyvsp[-2].pl); } +-#line 2278 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 11: +-#line 308 "pic.y" /* yacc.c:1646 */ +- { +- a_delete graphname; +- graphname = new char[strlen((yyvsp[0].str)) + 1]; +- strcpy(graphname, (yyvsp[0].str)); +- a_delete (yyvsp[0].str); +- } +-#line 2289 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 12: +-#line 316 "pic.y" /* yacc.c:1646 */ +- { +- define_variable((yyvsp[-2].str), (yyvsp[0].x)); +- a_delete (yyvsp[-2].str); +- } +-#line 2298 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 13: +-#line 321 "pic.y" /* yacc.c:1646 */ +- { +- place *p = lookup_label((yyvsp[-3].str)); +- if (!p) { +- lex_error("variable `%1' not defined", (yyvsp[-3].str)); +- YYABORT; +- } +- p->obj = 0; +- p->x = (yyvsp[0].x); +- p->y = 0.0; +- a_delete (yyvsp[-3].str); +- } +-#line 2314 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 14: +-#line 333 "pic.y" /* yacc.c:1646 */ +- { current_direction = UP_DIRECTION; } +-#line 2320 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 15: +-#line 335 "pic.y" /* yacc.c:1646 */ +- { current_direction = DOWN_DIRECTION; } +-#line 2326 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 16: +-#line 337 "pic.y" /* yacc.c:1646 */ +- { current_direction = LEFT_DIRECTION; } +-#line 2332 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 17: +-#line 339 "pic.y" /* yacc.c:1646 */ +- { current_direction = RIGHT_DIRECTION; } +-#line 2338 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 18: +-#line 341 "pic.y" /* yacc.c:1646 */ +- { +- olist.append(make_command_object((yyvsp[0].lstr).str, (yyvsp[0].lstr).filename, +- (yyvsp[0].lstr).lineno)); +- } +-#line 2347 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 19: +-#line 346 "pic.y" /* yacc.c:1646 */ +- { +- olist.append(make_command_object((yyvsp[0].lstr).str, (yyvsp[0].lstr).filename, +- (yyvsp[0].lstr).lineno)); +- } +-#line 2356 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 20: +-#line 351 "pic.y" /* yacc.c:1646 */ +- { +- fprintf(stderr, "%s\n", (yyvsp[0].lstr).str); +- a_delete (yyvsp[0].lstr).str; +- fflush(stderr); +- } +-#line 2366 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 21: +-#line 357 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 1; } +-#line 2372 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 22: +-#line 359 "pic.y" /* yacc.c:1646 */ +- { +- delim_flag = 0; +- if (safer_flag) +- lex_error("unsafe to run command `%1'", (yyvsp[0].str)); +- else +- system((yyvsp[0].str)); +- a_delete (yyvsp[0].str); +- } +-#line 2385 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 23: +-#line 368 "pic.y" /* yacc.c:1646 */ +- { +- if (yychar < 0) +- do_lookahead(); +- do_copy((yyvsp[0].lstr).str); +- // do not delete the filename +- } +-#line 2396 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 24: +-#line 375 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 2; } +-#line 2402 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 25: +-#line 377 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 0; } +-#line 2408 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 26: +-#line 379 "pic.y" /* yacc.c:1646 */ +- { +- if (yychar < 0) +- do_lookahead(); +- copy_file_thru((yyvsp[-5].lstr).str, (yyvsp[-2].str), (yyvsp[0].str)); +- // do not delete the filename +- a_delete (yyvsp[-2].str); +- a_delete (yyvsp[0].str); +- } +-#line 2421 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 27: +-#line 388 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 2; } +-#line 2427 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 28: +-#line 390 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 0; } +-#line 2433 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 29: +-#line 392 "pic.y" /* yacc.c:1646 */ +- { +- if (yychar < 0) +- do_lookahead(); +- copy_rest_thru((yyvsp[-2].str), (yyvsp[0].str)); +- a_delete (yyvsp[-2].str); +- a_delete (yyvsp[0].str); +- } +-#line 2445 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 30: +-#line 400 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 1; } +-#line 2451 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 31: +-#line 402 "pic.y" /* yacc.c:1646 */ +- { +- delim_flag = 0; +- if (yychar < 0) +- do_lookahead(); +- do_for((yyvsp[-8].str), (yyvsp[-6].x), (yyvsp[-4].x), (yyvsp[-3].by).is_multiplicative, (yyvsp[-3].by).val, (yyvsp[0].str)); +- } +-#line 2462 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 32: +-#line 409 "pic.y" /* yacc.c:1646 */ +- { +- if (yychar < 0) +- do_lookahead(); +- if ((yyvsp[0].if_data).x != 0.0) +- push_body((yyvsp[0].if_data).body); +- a_delete (yyvsp[0].if_data).body; +- } +-#line 2474 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 33: +-#line 417 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 1; } +-#line 2480 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 34: +-#line 419 "pic.y" /* yacc.c:1646 */ +- { +- delim_flag = 0; +- if (yychar < 0) +- do_lookahead(); +- if ((yyvsp[-3].if_data).x != 0.0) +- push_body((yyvsp[-3].if_data).body); +- else +- push_body((yyvsp[0].str)); +- a_delete (yyvsp[-3].if_data).body; +- a_delete (yyvsp[0].str); +- } +-#line 2496 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 36: +-#line 432 "pic.y" /* yacc.c:1646 */ +- { define_variable("scale", 1.0); } +-#line 2502 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 39: +-#line 442 "pic.y" /* yacc.c:1646 */ +- { +- reset((yyvsp[0].str)); +- a_delete (yyvsp[0].str); +- } +-#line 2511 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 40: +-#line 447 "pic.y" /* yacc.c:1646 */ +- { +- reset((yyvsp[0].str)); +- a_delete (yyvsp[0].str); +- } +-#line 2520 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 41: +-#line 452 "pic.y" /* yacc.c:1646 */ +- { +- reset((yyvsp[0].str)); +- a_delete (yyvsp[0].str); +- } +-#line 2529 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 42: +-#line 460 "pic.y" /* yacc.c:1646 */ +- { (yyval.lstr) = (yyvsp[0].lstr); } +-#line 2535 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 43: +-#line 462 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.lstr).str = new char[strlen((yyvsp[-1].lstr).str) + strlen((yyvsp[0].lstr).str) + 1]; +- strcpy((yyval.lstr).str, (yyvsp[-1].lstr).str); +- strcat((yyval.lstr).str, (yyvsp[0].lstr).str); +- a_delete (yyvsp[-1].lstr).str; +- a_delete (yyvsp[0].lstr).str; +- if ((yyvsp[-1].lstr).filename) { +- (yyval.lstr).filename = (yyvsp[-1].lstr).filename; +- (yyval.lstr).lineno = (yyvsp[-1].lstr).lineno; +- } +- else if ((yyvsp[0].lstr).filename) { +- (yyval.lstr).filename = (yyvsp[0].lstr).filename; +- (yyval.lstr).lineno = (yyvsp[0].lstr).lineno; +- } +- } +-#line 2555 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 44: +-#line 481 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.lstr).str = new char[GDIGITS + 1]; +- sprintf((yyval.lstr).str, "%g", (yyvsp[0].x)); +- (yyval.lstr).filename = 0; +- (yyval.lstr).lineno = 0; +- } +-#line 2566 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 45: +-#line 488 "pic.y" /* yacc.c:1646 */ +- { (yyval.lstr) = (yyvsp[0].lstr); } +-#line 2572 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 46: +-#line 490 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.lstr).str = new char[GDIGITS + 2 + GDIGITS + 1]; +- sprintf((yyval.lstr).str, "%g, %g", (yyvsp[0].pair).x, (yyvsp[0].pair).y); +- (yyval.lstr).filename = 0; +- (yyval.lstr).lineno = 0; +- } +-#line 2583 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 47: +-#line 500 "pic.y" /* yacc.c:1646 */ +- { delim_flag = 1; } +-#line 2589 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 48: +-#line 502 "pic.y" /* yacc.c:1646 */ +- { +- delim_flag = 0; +- (yyval.if_data).x = (yyvsp[-3].x); +- (yyval.if_data).body = (yyvsp[0].str); +- } +-#line 2599 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 49: +-#line 511 "pic.y" /* yacc.c:1646 */ +- { (yyval.str) = 0; } +-#line 2605 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 50: +-#line 513 "pic.y" /* yacc.c:1646 */ +- { (yyval.str) = (yyvsp[0].lstr).str; } +-#line 2611 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 51: +-#line 518 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[0].x); } +-#line 2617 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 52: +-#line 520 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[0].x); } +-#line 2623 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 53: +-#line 525 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.x) = strcmp((yyvsp[-2].lstr).str, (yyvsp[0].lstr).str) == 0; +- a_delete (yyvsp[-2].lstr).str; +- a_delete (yyvsp[0].lstr).str; +- } +-#line 2633 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 54: +-#line 531 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.x) = strcmp((yyvsp[-2].lstr).str, (yyvsp[0].lstr).str) != 0; +- a_delete (yyvsp[-2].lstr).str; +- a_delete (yyvsp[0].lstr).str; +- } +-#line 2643 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 55: +-#line 537 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 && (yyvsp[0].x) != 0.0); } +-#line 2649 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 56: +-#line 539 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 && (yyvsp[0].x) != 0.0); } +-#line 2655 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 57: +-#line 541 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 && (yyvsp[0].x) != 0.0); } +-#line 2661 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 58: +-#line 543 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 || (yyvsp[0].x) != 0.0); } +-#line 2667 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 59: +-#line 545 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 || (yyvsp[0].x) != 0.0); } +-#line 2673 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 60: +-#line 547 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 || (yyvsp[0].x) != 0.0); } +-#line 2679 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 61: +-#line 549 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[0].x) == 0.0); } +-#line 2685 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 62: +-#line 555 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.by).val = 1.0; +- (yyval.by).is_multiplicative = 0; +- } +-#line 2694 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 63: +-#line 560 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.by).val = (yyvsp[0].x); +- (yyval.by).is_multiplicative = 0; +- } +-#line 2703 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 64: +-#line 565 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.by).val = (yyvsp[0].x); +- (yyval.by).is_multiplicative = 1; +- } +-#line 2712 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 65: +-#line 573 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl).obj = (yyvsp[0].spec)->make_object(¤t_position, +- ¤t_direction); +- if ((yyval.pl).obj == 0) +- YYABORT; +- delete (yyvsp[0].spec); +- if ((yyval.pl).obj) +- olist.append((yyval.pl).obj); +- else { +- (yyval.pl).x = current_position.x; +- (yyval.pl).y = current_position.y; +- } +- } +-#line 2730 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 66: +-#line 587 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl) = (yyvsp[0].pl); +- define_label((yyvsp[-3].str), & (yyval.pl)); +- a_delete (yyvsp[-3].str); +- } +-#line 2740 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 67: +-#line 593 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl).obj = 0; +- (yyval.pl).x = (yyvsp[0].pair).x; +- (yyval.pl).y = (yyvsp[0].pair).y; +- define_label((yyvsp[-3].str), & (yyval.pl)); +- a_delete (yyvsp[-3].str); +- } +-#line 2752 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 68: +-#line 601 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl) = (yyvsp[0].pl); +- define_label((yyvsp[-3].str), & (yyval.pl)); +- a_delete (yyvsp[-3].str); +- } +-#line 2762 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 69: +-#line 607 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.state).x = current_position.x; +- (yyval.state).y = current_position.y; +- (yyval.state).dir = current_direction; +- } +-#line 2772 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 70: +-#line 613 "pic.y" /* yacc.c:1646 */ +- { +- current_position.x = (yyvsp[-2].state).x; +- current_position.y = (yyvsp[-2].state).y; +- current_direction = (yyvsp[-2].state).dir; +- } +-#line 2782 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 71: +-#line 619 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl) = (yyvsp[-3].pl); +- } +-#line 2790 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 72: +-#line 623 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl).obj = 0; +- (yyval.pl).x = current_position.x; +- (yyval.pl).y = current_position.y; +- } +-#line 2800 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 73: +-#line 632 "pic.y" /* yacc.c:1646 */ +- {} +-#line 2806 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 74: +-#line 634 "pic.y" /* yacc.c:1646 */ +- {} +-#line 2812 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 75: +-#line 639 "pic.y" /* yacc.c:1646 */ +- { (yyval.spec) = new object_spec(BOX_OBJECT); } +-#line 2818 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 76: +-#line 641 "pic.y" /* yacc.c:1646 */ +- { (yyval.spec) = new object_spec(CIRCLE_OBJECT); } +-#line 2824 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 77: +-#line 643 "pic.y" /* yacc.c:1646 */ +- { (yyval.spec) = new object_spec(ELLIPSE_OBJECT); } +-#line 2830 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 78: +-#line 645 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(ARC_OBJECT); +- (yyval.spec)->dir = current_direction; +- } +-#line 2839 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 79: +-#line 650 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(LINE_OBJECT); +- lookup_variable("lineht", & (yyval.spec)->segment_height); +- lookup_variable("linewid", & (yyval.spec)->segment_width); +- (yyval.spec)->dir = current_direction; +- } +-#line 2850 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 80: +-#line 657 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(ARROW_OBJECT); +- lookup_variable("lineht", & (yyval.spec)->segment_height); +- lookup_variable("linewid", & (yyval.spec)->segment_width); +- (yyval.spec)->dir = current_direction; +- } +-#line 2861 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 81: +-#line 664 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(MOVE_OBJECT); +- lookup_variable("moveht", & (yyval.spec)->segment_height); +- lookup_variable("movewid", & (yyval.spec)->segment_width); +- (yyval.spec)->dir = current_direction; +- } +-#line 2872 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 82: +-#line 671 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(SPLINE_OBJECT); +- lookup_variable("lineht", & (yyval.spec)->segment_height); +- lookup_variable("linewid", & (yyval.spec)->segment_width); +- (yyval.spec)->dir = current_direction; +- } +-#line 2883 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 83: +-#line 678 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(TEXT_OBJECT); +- (yyval.spec)->text = new text_item((yyvsp[0].lstr).str, (yyvsp[0].lstr).filename, (yyvsp[0].lstr).lineno); +- } +-#line 2892 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 84: +-#line 683 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(TEXT_OBJECT); +- (yyval.spec)->text = new text_item(format_number(0, (yyvsp[0].x)), 0, -1); +- } +-#line 2901 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 85: +-#line 688 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = new object_spec(TEXT_OBJECT); +- (yyval.spec)->text = new text_item(format_number((yyvsp[0].lstr).str, (yyvsp[-1].x)), +- (yyvsp[0].lstr).filename, (yyvsp[0].lstr).lineno); +- a_delete (yyvsp[0].lstr).str; +- } +-#line 2912 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 86: +-#line 695 "pic.y" /* yacc.c:1646 */ +- { +- saved_state *p = new saved_state; +- (yyval.pstate) = p; +- p->x = current_position.x; +- p->y = current_position.y; +- p->dir = current_direction; +- p->tbl = current_table; +- p->prev = current_saved_state; +- current_position.x = 0.0; +- current_position.y = 0.0; +- current_table = new PTABLE(place); +- current_saved_state = p; +- olist.append(make_mark_object()); +- } +-#line 2931 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 87: +-#line 710 "pic.y" /* yacc.c:1646 */ +- { +- current_position.x = (yyvsp[-2].pstate)->x; +- current_position.y = (yyvsp[-2].pstate)->y; +- current_direction = (yyvsp[-2].pstate)->dir; +- (yyval.spec) = new object_spec(BLOCK_OBJECT); +- olist.wrap_up_block(& (yyval.spec)->oblist); +- (yyval.spec)->tbl = current_table; +- current_table = (yyvsp[-2].pstate)->tbl; +- current_saved_state = (yyvsp[-2].pstate)->prev; +- delete (yyvsp[-2].pstate); +- } +-#line 2947 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 88: +-#line 722 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->height = (yyvsp[0].x); +- (yyval.spec)->flags |= HAS_HEIGHT; +- } +-#line 2957 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 89: +-#line 728 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->radius = (yyvsp[0].x); +- (yyval.spec)->flags |= HAS_RADIUS; +- } +-#line 2967 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 90: +-#line 734 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->width = (yyvsp[0].x); +- (yyval.spec)->flags |= HAS_WIDTH; +- } +-#line 2977 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 91: +-#line 740 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->radius = (yyvsp[0].x)/2.0; +- (yyval.spec)->flags |= HAS_RADIUS; +- } +-#line 2987 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 92: +-#line 746 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= HAS_SEGMENT; +- switch ((yyval.spec)->dir) { +- case UP_DIRECTION: +- (yyval.spec)->segment_pos.y += (yyvsp[0].x); +- break; +- case DOWN_DIRECTION: +- (yyval.spec)->segment_pos.y -= (yyvsp[0].x); +- break; +- case RIGHT_DIRECTION: +- (yyval.spec)->segment_pos.x += (yyvsp[0].x); +- break; +- case LEFT_DIRECTION: +- (yyval.spec)->segment_pos.x -= (yyvsp[0].x); +- break; +- } +- } +-#line 3010 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 93: +-#line 765 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->dir = UP_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.y += (yyval.spec)->segment_height; +- } +-#line 3021 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 94: +-#line 772 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->dir = UP_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.y += (yyvsp[0].x); +- } +-#line 3032 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 95: +-#line 779 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->dir = DOWN_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.y -= (yyval.spec)->segment_height; +- } +-#line 3043 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 96: +-#line 786 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->dir = DOWN_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.y -= (yyvsp[0].x); +- } +-#line 3054 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 97: +-#line 793 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->dir = RIGHT_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.x += (yyval.spec)->segment_width; +- } +-#line 3065 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 98: +-#line 800 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->dir = RIGHT_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.x += (yyvsp[0].x); +- } +-#line 3076 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 99: +-#line 807 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->dir = LEFT_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.x -= (yyval.spec)->segment_width; +- } +-#line 3087 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 100: +-#line 814 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->dir = LEFT_DIRECTION; +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.x -= (yyvsp[0].x); +- } +-#line 3098 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 101: +-#line 821 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= HAS_FROM; +- (yyval.spec)->from.x = (yyvsp[0].pair).x; +- (yyval.spec)->from.y = (yyvsp[0].pair).y; +- } +-#line 3109 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 102: +-#line 828 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- if ((yyval.spec)->flags & HAS_SEGMENT) +- (yyval.spec)->segment_list = new segment((yyval.spec)->segment_pos, +- (yyval.spec)->segment_is_absolute, +- (yyval.spec)->segment_list); +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.x = (yyvsp[0].pair).x; +- (yyval.spec)->segment_pos.y = (yyvsp[0].pair).y; +- (yyval.spec)->segment_is_absolute = 1; +- (yyval.spec)->flags |= HAS_TO; +- (yyval.spec)->to.x = (yyvsp[0].pair).x; +- (yyval.spec)->to.y = (yyvsp[0].pair).y; +- } +-#line 3128 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 103: +-#line 843 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= HAS_AT; +- (yyval.spec)->at.x = (yyvsp[0].pair).x; +- (yyval.spec)->at.y = (yyvsp[0].pair).y; +- if ((yyval.spec)->type != ARC_OBJECT) { +- (yyval.spec)->flags |= HAS_FROM; +- (yyval.spec)->from.x = (yyvsp[0].pair).x; +- (yyval.spec)->from.y = (yyvsp[0].pair).y; +- } +- } +-#line 3144 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 104: +-#line 855 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= HAS_WITH; +- (yyval.spec)->with = (yyvsp[0].pth); +- } +-#line 3154 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 105: +-#line 861 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= HAS_WITH; +- position pos; +- pos.x = (yyvsp[0].pair).x; +- pos.y = (yyvsp[0].pair).y; +- (yyval.spec)->with = new path(pos); +- } +-#line 3167 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 106: +-#line 870 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= HAS_SEGMENT; +- (yyval.spec)->segment_pos.x += (yyvsp[0].pair).x; +- (yyval.spec)->segment_pos.y += (yyvsp[0].pair).y; +- } +-#line 3178 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 107: +-#line 877 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- if (!((yyval.spec)->flags & HAS_SEGMENT)) +- switch ((yyval.spec)->dir) { +- case UP_DIRECTION: +- (yyval.spec)->segment_pos.y += (yyval.spec)->segment_width; +- break; +- case DOWN_DIRECTION: +- (yyval.spec)->segment_pos.y -= (yyval.spec)->segment_width; +- break; +- case RIGHT_DIRECTION: +- (yyval.spec)->segment_pos.x += (yyval.spec)->segment_width; +- break; +- case LEFT_DIRECTION: +- (yyval.spec)->segment_pos.x -= (yyval.spec)->segment_width; +- break; +- } +- (yyval.spec)->segment_list = new segment((yyval.spec)->segment_pos, +- (yyval.spec)->segment_is_absolute, +- (yyval.spec)->segment_list); +- (yyval.spec)->flags &= ~HAS_SEGMENT; +- (yyval.spec)->segment_pos.x = (yyval.spec)->segment_pos.y = 0.0; +- (yyval.spec)->segment_is_absolute = 0; +- } +-#line 3207 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 108: +-#line 902 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); // nothing +- } +-#line 3215 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 109: +-#line 906 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_DOTTED; +- lookup_variable("dashwid", & (yyval.spec)->dash_width); +- } +-#line 3225 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 110: +-#line 912 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= IS_DOTTED; +- (yyval.spec)->dash_width = (yyvsp[0].x); +- } +-#line 3235 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 111: +-#line 918 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_DASHED; +- lookup_variable("dashwid", & (yyval.spec)->dash_width); +- } +-#line 3245 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 112: +-#line 924 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= IS_DASHED; +- (yyval.spec)->dash_width = (yyvsp[0].x); +- } +-#line 3255 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 113: +-#line 930 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_DEFAULT_FILLED; +- } +-#line 3264 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 114: +-#line 935 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= IS_FILLED; +- (yyval.spec)->fill = (yyvsp[0].x); +- } +-#line 3274 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 115: +-#line 941 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= IS_XSLANTED; +- (yyval.spec)->xslanted = (yyvsp[0].x); +- } +-#line 3284 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 116: +-#line 947 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= IS_YSLANTED; +- (yyval.spec)->yslanted = (yyvsp[0].x); +- } +-#line 3294 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 117: +-#line 953 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= (IS_SHADED | IS_FILLED); +- (yyval.spec)->shaded = new char[strlen((yyvsp[0].lstr).str)+1]; +- strcpy((yyval.spec)->shaded, (yyvsp[0].lstr).str); +- } +-#line 3305 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 118: +-#line 960 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= (IS_SHADED | IS_OUTLINED | IS_FILLED); +- (yyval.spec)->shaded = new char[strlen((yyvsp[0].lstr).str)+1]; +- strcpy((yyval.spec)->shaded, (yyvsp[0].lstr).str); +- (yyval.spec)->outlined = new char[strlen((yyvsp[0].lstr).str)+1]; +- strcpy((yyval.spec)->outlined, (yyvsp[0].lstr).str); +- } +-#line 3318 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 119: +-#line 969 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= IS_OUTLINED; +- (yyval.spec)->outlined = new char[strlen((yyvsp[0].lstr).str)+1]; +- strcpy((yyval.spec)->outlined, (yyvsp[0].lstr).str); +- } +-#line 3329 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 120: +-#line 976 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- // line chop chop means line chop 0 chop 0 +- if ((yyval.spec)->flags & IS_DEFAULT_CHOPPED) { +- (yyval.spec)->flags |= IS_CHOPPED; +- (yyval.spec)->flags &= ~IS_DEFAULT_CHOPPED; +- (yyval.spec)->start_chop = (yyval.spec)->end_chop = 0.0; +- } +- else if ((yyval.spec)->flags & IS_CHOPPED) { +- (yyval.spec)->end_chop = 0.0; +- } +- else { +- (yyval.spec)->flags |= IS_DEFAULT_CHOPPED; +- } +- } +-#line 3349 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 121: +-#line 992 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- if ((yyval.spec)->flags & IS_DEFAULT_CHOPPED) { +- (yyval.spec)->flags |= IS_CHOPPED; +- (yyval.spec)->flags &= ~IS_DEFAULT_CHOPPED; +- (yyval.spec)->start_chop = 0.0; +- (yyval.spec)->end_chop = (yyvsp[0].x); +- } +- else if ((yyval.spec)->flags & IS_CHOPPED) { +- (yyval.spec)->end_chop = (yyvsp[0].x); +- } +- else { +- (yyval.spec)->start_chop = (yyval.spec)->end_chop = (yyvsp[0].x); +- (yyval.spec)->flags |= IS_CHOPPED; +- } +- } +-#line 3370 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 122: +-#line 1009 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_SAME; +- } +-#line 3379 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 123: +-#line 1014 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_INVISIBLE; +- } +-#line 3388 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 124: +-#line 1019 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= HAS_LEFT_ARROW_HEAD; +- } +-#line 3397 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 125: +-#line 1024 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= HAS_RIGHT_ARROW_HEAD; +- } +-#line 3406 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 126: +-#line 1029 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD); +- } +-#line 3415 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 127: +-#line 1034 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_CLOCKWISE; +- } +-#line 3424 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 128: +-#line 1039 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags &= ~IS_CLOCKWISE; +- } +-#line 3433 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 129: +-#line 1044 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- text_item **p; +- for (p = & (yyval.spec)->text; *p; p = &(*p)->next) +- ; +- *p = new text_item((yyvsp[0].lstr).str, (yyvsp[0].lstr).filename, (yyvsp[0].lstr).lineno); +- } +-#line 3445 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 130: +-#line 1052 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- if ((yyval.spec)->text) { +- text_item *p; +- for (p = (yyval.spec)->text; p->next; p = p->next) +- ; +- p->adj.h = LEFT_ADJUST; +- } +- } +-#line 3459 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 131: +-#line 1062 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- if ((yyval.spec)->text) { +- text_item *p; +- for (p = (yyval.spec)->text; p->next; p = p->next) +- ; +- p->adj.h = RIGHT_ADJUST; +- } +- } +-#line 3473 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 132: +-#line 1072 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- if ((yyval.spec)->text) { +- text_item *p; +- for (p = (yyval.spec)->text; p->next; p = p->next) +- ; +- p->adj.v = ABOVE_ADJUST; +- } +- } +-#line 3487 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 133: +-#line 1082 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- if ((yyval.spec)->text) { +- text_item *p; +- for (p = (yyval.spec)->text; p->next; p = p->next) +- ; +- p->adj.v = BELOW_ADJUST; +- } +- } +-#line 3501 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 134: +-#line 1092 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-2].spec); +- (yyval.spec)->flags |= HAS_THICKNESS; +- (yyval.spec)->thickness = (yyvsp[0].x); +- } +-#line 3511 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 135: +-#line 1098 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.spec) = (yyvsp[-1].spec); +- (yyval.spec)->flags |= IS_ALIGNED; +- } +-#line 3520 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 136: +-#line 1106 "pic.y" /* yacc.c:1646 */ +- { (yyval.lstr) = (yyvsp[0].lstr); } +-#line 3526 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 137: +-#line 1108 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.lstr).filename = (yyvsp[-2].lstr).filename; +- (yyval.lstr).lineno = (yyvsp[-2].lstr).lineno; +- (yyval.lstr).str = do_sprintf((yyvsp[-2].lstr).str, (yyvsp[-1].dv).v, (yyvsp[-1].dv).nv); +- a_delete (yyvsp[-1].dv).v; +- a_delete (yyvsp[-2].lstr).str; +- } +-#line 3538 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 138: +-#line 1119 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.dv).v = 0; +- (yyval.dv).nv = 0; +- (yyval.dv).maxv = 0; +- } +-#line 3548 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 139: +-#line 1125 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.dv) = (yyvsp[-2].dv); +- if ((yyval.dv).nv >= (yyval.dv).maxv) { +- if ((yyval.dv).nv == 0) { +- (yyval.dv).v = new double[4]; +- (yyval.dv).maxv = 4; +- } +- else { +- double *oldv = (yyval.dv).v; +- (yyval.dv).maxv *= 2; +-#if 0 +- (yyval.dv).v = new double[(yyval.dv).maxv]; +- memcpy((yyval.dv).v, oldv, (yyval.dv).nv*sizeof(double)); +-#else +- // workaround for bug in Compaq C++ V6.5-033 +- // for Compaq Tru64 UNIX V5.1A (Rev. 1885) +- double *foo = new double[(yyval.dv).maxv]; +- memcpy(foo, oldv, (yyval.dv).nv*sizeof(double)); +- (yyval.dv).v = foo; +-#endif +- a_delete oldv; +- } +- } +- (yyval.dv).v[(yyval.dv).nv] = (yyvsp[0].x); +- (yyval.dv).nv += 1; +- } +-#line 3579 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 140: +-#line 1155 "pic.y" /* yacc.c:1646 */ +- { (yyval.pair) = (yyvsp[0].pair); } +-#line 3585 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 141: +-#line 1157 "pic.y" /* yacc.c:1646 */ +- { +- position pos = (yyvsp[0].pl); +- (yyval.pair).x = pos.x; +- (yyval.pair).y = pos.y; +- } +-#line 3595 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 142: +-#line 1163 "pic.y" /* yacc.c:1646 */ +- { +- position pos = (yyvsp[-1].pl); +- (yyval.pair).x = pos.x; +- (yyval.pair).y = pos.y; +- } +-#line 3605 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 143: +-#line 1172 "pic.y" /* yacc.c:1646 */ +- { (yyval.pair) = (yyvsp[0].pair); } +-#line 3611 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 144: +-#line 1174 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (yyvsp[-2].pair).x + (yyvsp[0].pair).x; +- (yyval.pair).y = (yyvsp[-2].pair).y + (yyvsp[0].pair).y; +- } +-#line 3620 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 145: +-#line 1179 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (yyvsp[-3].pair).x + (yyvsp[-1].pair).x; +- (yyval.pair).y = (yyvsp[-3].pair).y + (yyvsp[-1].pair).y; +- } +-#line 3629 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 146: +-#line 1184 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (yyvsp[-2].pair).x - (yyvsp[0].pair).x; +- (yyval.pair).y = (yyvsp[-2].pair).y - (yyvsp[0].pair).y; +- } +-#line 3638 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 147: +-#line 1189 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (yyvsp[-3].pair).x - (yyvsp[-1].pair).x; +- (yyval.pair).y = (yyvsp[-3].pair).y - (yyvsp[-1].pair).y; +- } +-#line 3647 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 148: +-#line 1194 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (yyvsp[-3].pair).x; +- (yyval.pair).y = (yyvsp[-1].pair).y; +- } +-#line 3656 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 149: +-#line 1199 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (1.0 - (yyvsp[-4].x))*(yyvsp[-2].pair).x + (yyvsp[-4].x)*(yyvsp[0].pair).x; +- (yyval.pair).y = (1.0 - (yyvsp[-4].x))*(yyvsp[-2].pair).y + (yyvsp[-4].x)*(yyvsp[0].pair).y; +- } +-#line 3665 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 150: +-#line 1204 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (1.0 - (yyvsp[-5].x))*(yyvsp[-3].pair).x + (yyvsp[-5].x)*(yyvsp[-1].pair).x; +- (yyval.pair).y = (1.0 - (yyvsp[-5].x))*(yyvsp[-3].pair).y + (yyvsp[-5].x)*(yyvsp[-1].pair).y; +- } +-#line 3674 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 151: +-#line 1210 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (1.0 - (yyvsp[-5].x))*(yyvsp[-3].pair).x + (yyvsp[-5].x)*(yyvsp[-1].pair).x; +- (yyval.pair).y = (1.0 - (yyvsp[-5].x))*(yyvsp[-3].pair).y + (yyvsp[-5].x)*(yyvsp[-1].pair).y; +- } +-#line 3683 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 152: +-#line 1215 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (1.0 - (yyvsp[-6].x))*(yyvsp[-4].pair).x + (yyvsp[-6].x)*(yyvsp[-2].pair).x; +- (yyval.pair).y = (1.0 - (yyvsp[-6].x))*(yyvsp[-4].pair).y + (yyvsp[-6].x)*(yyvsp[-2].pair).y; +- } +-#line 3692 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 155: +-#line 1228 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pair).x = (yyvsp[-2].x); +- (yyval.pair).y = (yyvsp[0].x); +- } +-#line 3701 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 156: +-#line 1233 "pic.y" /* yacc.c:1646 */ +- { (yyval.pair) = (yyvsp[-1].pair); } +-#line 3707 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 157: +-#line 1239 "pic.y" /* yacc.c:1646 */ +- { (yyval.pl) = (yyvsp[0].pl); } +-#line 3713 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 158: +-#line 1241 "pic.y" /* yacc.c:1646 */ +- { +- path pth((yyvsp[0].crn)); +- if (!pth.follow((yyvsp[-1].pl), & (yyval.pl))) +- YYABORT; +- } +-#line 3723 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 159: +-#line 1247 "pic.y" /* yacc.c:1646 */ +- { +- path pth((yyvsp[-1].crn)); +- if (!pth.follow((yyvsp[0].pl), & (yyval.pl))) +- YYABORT; +- } +-#line 3733 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 160: +-#line 1253 "pic.y" /* yacc.c:1646 */ +- { +- path pth((yyvsp[-2].crn)); +- if (!pth.follow((yyvsp[0].pl), & (yyval.pl))) +- YYABORT; +- } +-#line 3743 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 161: +-#line 1259 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pl).x = current_position.x; +- (yyval.pl).y = current_position.y; +- (yyval.pl).obj = 0; +- } +-#line 3753 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 162: +-#line 1268 "pic.y" /* yacc.c:1646 */ +- { +- place *p = lookup_label((yyvsp[0].str)); +- if (!p) { +- lex_error("there is no place `%1'", (yyvsp[0].str)); +- YYABORT; +- } +- (yyval.pl) = *p; +- a_delete (yyvsp[0].str); +- } +-#line 3767 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 163: +-#line 1278 "pic.y" /* yacc.c:1646 */ +- { (yyval.pl).obj = (yyvsp[0].obj); } +-#line 3773 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 164: +-#line 1280 "pic.y" /* yacc.c:1646 */ +- { +- path pth((yyvsp[0].str)); +- if (!pth.follow((yyvsp[-2].pl), & (yyval.pl))) +- YYABORT; +- } +-#line 3783 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 165: +-#line 1289 "pic.y" /* yacc.c:1646 */ +- { (yyval.n) = (yyvsp[0].n); } +-#line 3789 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 166: +-#line 1291 "pic.y" /* yacc.c:1646 */ +- { +- // XXX Check for overflow (and non-integers?). +- (yyval.n) = (int)(yyvsp[-1].x); +- } +-#line 3798 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 167: +-#line 1299 "pic.y" /* yacc.c:1646 */ +- { (yyval.n) = 1; } +-#line 3804 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 168: +-#line 1301 "pic.y" /* yacc.c:1646 */ +- { (yyval.n) = (yyvsp[-1].n); } +-#line 3810 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 169: +-#line 1306 "pic.y" /* yacc.c:1646 */ +- { +- int count = 0; +- object *p; +- for (p = olist.head; p != 0; p = p->next) +- if (p->type() == (yyvsp[0].obtype) && ++count == (yyvsp[-1].n)) { +- (yyval.obj) = p; +- break; +- } +- if (p == 0) { +- lex_error("there is no %1%2 %3", (yyvsp[-1].n), ordinal_postfix((yyvsp[-1].n)), +- object_type_name((yyvsp[0].obtype))); +- YYABORT; +- } +- } +-#line 3829 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 170: +-#line 1321 "pic.y" /* yacc.c:1646 */ +- { +- int count = 0; +- object *p; +- for (p = olist.tail; p != 0; p = p->prev) +- if (p->type() == (yyvsp[0].obtype) && ++count == (yyvsp[-1].n)) { +- (yyval.obj) = p; +- break; +- } +- if (p == 0) { +- lex_error("there is no %1%2 last %3", (yyvsp[-1].n), +- ordinal_postfix((yyvsp[-1].n)), object_type_name((yyvsp[0].obtype))); +- YYABORT; +- } +- } +-#line 3848 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 171: +-#line 1339 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = BOX_OBJECT; } +-#line 3854 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 172: +-#line 1341 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = CIRCLE_OBJECT; } +-#line 3860 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 173: +-#line 1343 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = ELLIPSE_OBJECT; } +-#line 3866 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 174: +-#line 1345 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = ARC_OBJECT; } +-#line 3872 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 175: +-#line 1347 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = LINE_OBJECT; } +-#line 3878 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 176: +-#line 1349 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = ARROW_OBJECT; } +-#line 3884 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 177: +-#line 1351 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = SPLINE_OBJECT; } +-#line 3890 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 178: +-#line 1353 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = BLOCK_OBJECT; } +-#line 3896 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 179: +-#line 1355 "pic.y" /* yacc.c:1646 */ +- { (yyval.obtype) = TEXT_OBJECT; } +-#line 3902 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 180: +-#line 1360 "pic.y" /* yacc.c:1646 */ +- { (yyval.pth) = new path((yyvsp[0].str)); } +-#line 3908 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 181: +-#line 1362 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pth) = (yyvsp[-2].pth); +- (yyval.pth)->append((yyvsp[0].str)); +- } +-#line 3917 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 182: +-#line 1370 "pic.y" /* yacc.c:1646 */ +- { (yyval.pth) = new path((yyvsp[0].crn)); } +-#line 3923 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 183: +-#line 1374 "pic.y" /* yacc.c:1646 */ +- { (yyval.pth) = (yyvsp[0].pth); } +-#line 3929 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 184: +-#line 1376 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pth) = (yyvsp[-1].pth); +- (yyval.pth)->append((yyvsp[0].crn)); +- } +-#line 3938 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 185: +-#line 1384 "pic.y" /* yacc.c:1646 */ +- { (yyval.pth) = (yyvsp[0].pth); } +-#line 3944 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 186: +-#line 1386 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.pth) = (yyvsp[-3].pth); +- (yyval.pth)->set_ypath((yyvsp[-1].pth)); +- } +-#line 3953 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 187: +-#line 1392 "pic.y" /* yacc.c:1646 */ +- { +- lex_warning("`%1%2 last %3' in `with' argument ignored", +- (yyvsp[-3].n), ordinal_postfix((yyvsp[-3].n)), object_type_name((yyvsp[-1].obtype))); +- (yyval.pth) = (yyvsp[0].pth); +- } +-#line 3963 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 188: +-#line 1398 "pic.y" /* yacc.c:1646 */ +- { +- lex_warning("`last %1' in `with' argument ignored", +- object_type_name((yyvsp[-1].obtype))); +- (yyval.pth) = (yyvsp[0].pth); +- } +-#line 3973 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 189: +-#line 1404 "pic.y" /* yacc.c:1646 */ +- { +- lex_warning("`%1%2 %3' in `with' argument ignored", +- (yyvsp[-2].n), ordinal_postfix((yyvsp[-2].n)), object_type_name((yyvsp[-1].obtype))); +- (yyval.pth) = (yyvsp[0].pth); +- } +-#line 3983 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 190: +-#line 1410 "pic.y" /* yacc.c:1646 */ +- { +- lex_warning("initial `%1' in `with' argument ignored", (yyvsp[-1].str)); +- a_delete (yyvsp[-1].str); +- (yyval.pth) = (yyvsp[0].pth); +- } +-#line 3993 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 191: +-#line 1419 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north; } +-#line 3999 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 192: +-#line 1421 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::east; } +-#line 4005 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 193: +-#line 1423 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::west; } +-#line 4011 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 194: +-#line 1425 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south; } +-#line 4017 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 195: +-#line 1427 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north_east; } +-#line 4023 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 196: +-#line 1429 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object:: south_east; } +-#line 4029 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 197: +-#line 1431 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north_west; } +-#line 4035 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 198: +-#line 1433 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south_west; } +-#line 4041 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 199: +-#line 1435 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::center; } +-#line 4047 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 200: +-#line 1437 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::start; } +-#line 4053 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 201: +-#line 1439 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::end; } +-#line 4059 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 202: +-#line 1441 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north; } +-#line 4065 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 203: +-#line 1443 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south; } +-#line 4071 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 204: +-#line 1445 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::west; } +-#line 4077 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 205: +-#line 1447 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::east; } +-#line 4083 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 206: +-#line 1449 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north_west; } +-#line 4089 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 207: +-#line 1451 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south_west; } +-#line 4095 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 208: +-#line 1453 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north_east; } +-#line 4101 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 209: +-#line 1455 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south_east; } +-#line 4107 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 210: +-#line 1457 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::west; } +-#line 4113 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 211: +-#line 1459 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::east; } +-#line 4119 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 212: +-#line 1461 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north_west; } +-#line 4125 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 213: +-#line 1463 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south_west; } +-#line 4131 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 214: +-#line 1465 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north_east; } +-#line 4137 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 215: +-#line 1467 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south_east; } +-#line 4143 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 216: +-#line 1469 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::north; } +-#line 4149 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 217: +-#line 1471 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::south; } +-#line 4155 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 218: +-#line 1473 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::east; } +-#line 4161 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 219: +-#line 1475 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::west; } +-#line 4167 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 220: +-#line 1477 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::center; } +-#line 4173 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 221: +-#line 1479 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::start; } +-#line 4179 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 222: +-#line 1481 "pic.y" /* yacc.c:1646 */ +- { (yyval.crn) = &object::end; } +-#line 4185 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 223: +-#line 1486 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[0].x); } +-#line 4191 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 224: +-#line 1488 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[0].x); } +-#line 4197 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 225: +-#line 1493 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) < (yyvsp[0].x)); } +-#line 4203 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 226: +-#line 1498 "pic.y" /* yacc.c:1646 */ +- { +- if (!lookup_variable((yyvsp[0].str), & (yyval.x))) { +- lex_error("there is no variable `%1'", (yyvsp[0].str)); +- YYABORT; +- } +- a_delete (yyvsp[0].str); +- } +-#line 4215 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 227: +-#line 1506 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[0].x); } +-#line 4221 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 228: +-#line 1508 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[-1].pl).obj != 0) +- (yyval.x) = (yyvsp[-1].pl).obj->origin().x; +- else +- (yyval.x) = (yyvsp[-1].pl).x; +- } +-#line 4232 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 229: +-#line 1515 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[-1].pl).obj != 0) +- (yyval.x) = (yyvsp[-1].pl).obj->origin().y; +- else +- (yyval.x) = (yyvsp[-1].pl).y; +- } +-#line 4243 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 230: +-#line 1522 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[-1].pl).obj != 0) +- (yyval.x) = (yyvsp[-1].pl).obj->height(); +- else +- (yyval.x) = 0.0; +- } +-#line 4254 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 231: +-#line 1529 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[-1].pl).obj != 0) +- (yyval.x) = (yyvsp[-1].pl).obj->width(); +- else +- (yyval.x) = 0.0; +- } +-#line 4265 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 232: +-#line 1536 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[-1].pl).obj != 0) +- (yyval.x) = (yyvsp[-1].pl).obj->radius(); +- else +- (yyval.x) = 0.0; +- } +-#line 4276 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 233: +-#line 1543 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-2].x) + (yyvsp[0].x); } +-#line 4282 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 234: +-#line 1545 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-2].x) - (yyvsp[0].x); } +-#line 4288 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 235: +-#line 1547 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-2].x) * (yyvsp[0].x); } +-#line 4294 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 236: +-#line 1549 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[0].x) == 0.0) { +- lex_error("division by zero"); +- YYABORT; +- } +- (yyval.x) = (yyvsp[-2].x)/(yyvsp[0].x); +- } +-#line 4306 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 237: +-#line 1557 "pic.y" /* yacc.c:1646 */ +- { +- if ((yyvsp[0].x) == 0.0) { +- lex_error("modulus by zero"); +- YYABORT; +- } +- (yyval.x) = fmod((yyvsp[-2].x), (yyvsp[0].x)); +- } +-#line 4318 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 238: +-#line 1565 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = pow((yyvsp[-2].x), (yyvsp[0].x)); +- if (errno == EDOM) { +- lex_error("arguments to `^' operator out of domain"); +- YYABORT; +- } +- if (errno == ERANGE) { +- lex_error("result of `^' operator out of range"); +- YYABORT; +- } +- } +-#line 4335 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 239: +-#line 1578 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = -(yyvsp[0].x); } +-#line 4341 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 240: +-#line 1580 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-1].x); } +-#line 4347 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 241: +-#line 1582 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = sin((yyvsp[-1].x)); +- if (errno == ERANGE) { +- lex_error("sin result out of range"); +- YYABORT; +- } +- } +-#line 4360 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 242: +-#line 1591 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = cos((yyvsp[-1].x)); +- if (errno == ERANGE) { +- lex_error("cos result out of range"); +- YYABORT; +- } +- } +-#line 4373 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 243: +-#line 1600 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = atan2((yyvsp[-3].x), (yyvsp[-1].x)); +- if (errno == EDOM) { +- lex_error("atan2 argument out of domain"); +- YYABORT; +- } +- if (errno == ERANGE) { +- lex_error("atan2 result out of range"); +- YYABORT; +- } +- } +-#line 4390 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 244: +-#line 1613 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = log10((yyvsp[-1].x)); +- if (errno == ERANGE) { +- lex_error("log result out of range"); +- YYABORT; +- } +- } +-#line 4403 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 245: +-#line 1622 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = pow(10.0, (yyvsp[-1].x)); +- if (errno == ERANGE) { +- lex_error("exp result out of range"); +- YYABORT; +- } +- } +-#line 4416 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 246: +-#line 1631 "pic.y" /* yacc.c:1646 */ +- { +- errno = 0; +- (yyval.x) = sqrt((yyvsp[-1].x)); +- if (errno == EDOM) { +- lex_error("sqrt argument out of domain"); +- YYABORT; +- } +- } +-#line 4429 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 247: +-#line 1640 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-3].x) > (yyvsp[-1].x) ? (yyvsp[-3].x) : (yyvsp[-1].x); } +-#line 4435 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 248: +-#line 1642 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-3].x) < (yyvsp[-1].x) ? (yyvsp[-3].x) : (yyvsp[-1].x); } +-#line 4441 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 249: +-#line 1644 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = (yyvsp[-1].x) < 0 ? -floor(-(yyvsp[-1].x)) : floor((yyvsp[-1].x)); } +-#line 4447 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 250: +-#line 1646 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*(yyvsp[-1].x)); } +-#line 4453 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 251: +-#line 1648 "pic.y" /* yacc.c:1646 */ +- { +- /* return a random number in the range [0,1) */ +- /* portable, but not very random */ +- (yyval.x) = (rand() & 0x7fff) / double(0x8000); +- } +-#line 4463 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 252: +-#line 1654 "pic.y" /* yacc.c:1646 */ +- { +- (yyval.x) = 0; +- srand((unsigned int)(yyvsp[-1].x)); +- } +-#line 4472 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 253: +-#line 1659 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) <= (yyvsp[0].x)); } +-#line 4478 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 254: +-#line 1661 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) > (yyvsp[0].x)); } +-#line 4484 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 255: +-#line 1663 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) >= (yyvsp[0].x)); } +-#line 4490 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 256: +-#line 1665 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) == (yyvsp[0].x)); } +-#line 4496 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 257: +-#line 1667 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != (yyvsp[0].x)); } +-#line 4502 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 258: +-#line 1669 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 && (yyvsp[0].x) != 0.0); } +-#line 4508 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 259: +-#line 1671 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[-2].x) != 0.0 || (yyvsp[0].x) != 0.0); } +-#line 4514 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- case 260: +-#line 1673 "pic.y" /* yacc.c:1646 */ +- { (yyval.x) = ((yyvsp[0].x) == 0.0); } +-#line 4520 "pic.cpp" /* yacc.c:1646 */ +- break; +- +- +-#line 4524 "pic.cpp" /* yacc.c:1646 */ +- default: break; +- } +- /* User semantic actions sometimes alter yychar, and that requires +- that yytoken be updated with the new translation. We take the +- approach of translating immediately before every use of yytoken. +- One alternative is translating here after every semantic action, +- but that translation would be missed if the semantic action invokes +- YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or +- if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an +- incorrect destructor might then be invoked immediately. In the +- case of YYERROR or YYBACKUP, subsequent parser actions might lead +- to an incorrect destructor call or verbose syntax error message +- before the lookahead is translated. */ +- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); +- +- YYPOPSTACK (yylen); +- yylen = 0; +- YY_STACK_PRINT (yyss, yyssp); +- +- *++yyvsp = yyval; +- +- /* Now 'shift' the result of the reduction. Determine what state +- that goes to, based on the state we popped back to and the rule +- number reduced by. */ +- +- yyn = yyr1[yyn]; +- +- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; +- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) +- yystate = yytable[yystate]; +- else +- yystate = yydefgoto[yyn - YYNTOKENS]; +- +- goto yynewstate; +- +- +-/*--------------------------------------. +-| yyerrlab -- here on detecting error. | +-`--------------------------------------*/ +-yyerrlab: +- /* Make sure we have latest lookahead translation. See comments at +- user semantic actions for why this is necessary. */ +- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); +- +- /* If not already recovering from an error, report this error. */ +- if (!yyerrstatus) +- { +- ++yynerrs; +-#if ! YYERROR_VERBOSE +- yyerror (YY_("syntax error")); +-#else +-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ +- yyssp, yytoken) +- { +- char const *yymsgp = YY_("syntax error"); +- int yysyntax_error_status; +- yysyntax_error_status = YYSYNTAX_ERROR; +- if (yysyntax_error_status == 0) +- yymsgp = yymsg; +- else if (yysyntax_error_status == 1) +- { +- if (yymsg != yymsgbuf) +- YYSTACK_FREE (yymsg); +- yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); +- if (!yymsg) +- { +- yymsg = yymsgbuf; +- yymsg_alloc = sizeof yymsgbuf; +- yysyntax_error_status = 2; +- } +- else +- { +- yysyntax_error_status = YYSYNTAX_ERROR; +- yymsgp = yymsg; +- } +- } +- yyerror (yymsgp); +- if (yysyntax_error_status == 2) +- goto yyexhaustedlab; +- } +-# undef YYSYNTAX_ERROR +-#endif +- } +- +- +- +- if (yyerrstatus == 3) +- { +- /* If just tried and failed to reuse lookahead token after an +- error, discard it. */ +- +- if (yychar <= YYEOF) +- { +- /* Return failure if at end of input. */ +- if (yychar == YYEOF) +- YYABORT; +- } +- else +- { +- yydestruct ("Error: discarding", +- yytoken, &yylval); +- yychar = YYEMPTY; +- } +- } +- +- /* Else will try to reuse lookahead token after shifting the error +- token. */ +- goto yyerrlab1; +- +- +-/*---------------------------------------------------. +-| yyerrorlab -- error raised explicitly by YYERROR. | +-`---------------------------------------------------*/ +-yyerrorlab: +- +- /* Pacify compilers like GCC when the user code never invokes +- YYERROR and the label yyerrorlab therefore never appears in user +- code. */ +- if (/*CONSTCOND*/ 0) +- goto yyerrorlab; +- +- /* Do not reclaim the symbols of the rule whose action triggered +- this YYERROR. */ +- YYPOPSTACK (yylen); +- yylen = 0; +- YY_STACK_PRINT (yyss, yyssp); +- yystate = *yyssp; +- goto yyerrlab1; +- +- +-/*-------------------------------------------------------------. +-| yyerrlab1 -- common code for both syntax error and YYERROR. | +-`-------------------------------------------------------------*/ +-yyerrlab1: +- yyerrstatus = 3; /* Each real token shifted decrements this. */ +- +- for (;;) +- { +- yyn = yypact[yystate]; +- if (!yypact_value_is_default (yyn)) +- { +- yyn += YYTERROR; +- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) +- { +- yyn = yytable[yyn]; +- if (0 < yyn) +- break; +- } +- } +- +- /* Pop the current state because it cannot handle the error token. */ +- if (yyssp == yyss) +- YYABORT; +- +- +- yydestruct ("Error: popping", +- yystos[yystate], yyvsp); +- YYPOPSTACK (1); +- yystate = *yyssp; +- YY_STACK_PRINT (yyss, yyssp); +- } +- +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- *++yyvsp = yylval; +- YY_IGNORE_MAYBE_UNINITIALIZED_END +- +- +- /* Shift the error token. */ +- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); +- +- yystate = yyn; +- goto yynewstate; +- +- +-/*-------------------------------------. +-| yyacceptlab -- YYACCEPT comes here. | +-`-------------------------------------*/ +-yyacceptlab: +- yyresult = 0; +- goto yyreturn; +- +-/*-----------------------------------. +-| yyabortlab -- YYABORT comes here. | +-`-----------------------------------*/ +-yyabortlab: +- yyresult = 1; +- goto yyreturn; +- +-#if !defined yyoverflow || YYERROR_VERBOSE +-/*-------------------------------------------------. +-| yyexhaustedlab -- memory exhaustion comes here. | +-`-------------------------------------------------*/ +-yyexhaustedlab: +- yyerror (YY_("memory exhausted")); +- yyresult = 2; +- /* Fall through. */ +-#endif +- +-yyreturn: +- if (yychar != YYEMPTY) +- { +- /* Make sure we have latest lookahead translation. See comments at +- user semantic actions for why this is necessary. */ +- yytoken = YYTRANSLATE (yychar); +- yydestruct ("Cleanup: discarding lookahead", +- yytoken, &yylval); +- } +- /* Do not reclaim the symbols of the rule whose action triggered +- this YYABORT or YYACCEPT. */ +- YYPOPSTACK (yylen); +- YY_STACK_PRINT (yyss, yyssp); +- while (yyssp != yyss) +- { +- yydestruct ("Cleanup: popping", +- yystos[*yyssp], yyvsp); +- YYPOPSTACK (1); +- } +-#ifndef yyoverflow +- if (yyss != yyssa) +- YYSTACK_FREE (yyss); +-#endif +-#if YYERROR_VERBOSE +- if (yymsg != yymsgbuf) +- YYSTACK_FREE (yymsg); +-#endif +- return yyresult; +-} +-#line 1677 "pic.y" /* yacc.c:1906 */ +- +- +-/* bison defines const to be empty unless __STDC__ is defined, which it +-isn't under cfront */ +- +-#ifdef const +-#undef const +-#endif +- +-static struct { +- const char *name; +- double val; +- int scaled; // non-zero if val should be multiplied by scale +-} defaults_table[] = { +- { "arcrad", .25, 1 }, +- { "arrowht", .1, 1 }, +- { "arrowwid", .05, 1 }, +- { "circlerad", .25, 1 }, +- { "boxht", .5, 1 }, +- { "boxwid", .75, 1 }, +- { "boxrad", 0.0, 1 }, +- { "dashwid", .05, 1 }, +- { "ellipseht", .5, 1 }, +- { "ellipsewid", .75, 1 }, +- { "moveht", .5, 1 }, +- { "movewid", .5, 1 }, +- { "lineht", .5, 1 }, +- { "linewid", .5, 1 }, +- { "textht", 0.0, 1 }, +- { "textwid", 0.0, 1 }, +- { "scale", 1.0, 0 }, +- { "linethick", -1.0, 0 }, // in points +- { "fillval", .5, 0 }, +- { "arrowhead", 1.0, 0 }, +- { "maxpswid", 8.5, 0 }, +- { "maxpsht", 11.0, 0 }, +-}; +- +-place *lookup_label(const char *label) +-{ +- saved_state *state = current_saved_state; +- PTABLE(place) *tbl = current_table; +- for (;;) { +- place *pl = tbl->lookup(label); +- if (pl) +- return pl; +- if (!state) +- return 0; +- tbl = state->tbl; +- state = state->prev; +- } +-} +- +-void define_label(const char *label, const place *pl) +-{ +- place *p = new place[1]; +- *p = *pl; +- current_table->define(label, p); +-} +- +-int lookup_variable(const char *name, double *val) +-{ +- place *pl = lookup_label(name); +- if (pl) { +- *val = pl->x; +- return 1; +- } +- return 0; +-} +- +-void define_variable(const char *name, double val) +-{ +- place *p = new place[1]; +- p->obj = 0; +- p->x = val; +- p->y = 0.0; +- current_table->define(name, p); +- if (strcmp(name, "scale") == 0) { +- // When the scale changes, reset all scaled pre-defined variables to +- // their default values. +- for (unsigned int i = 0; +- i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) +- if (defaults_table[i].scaled) +- define_variable(defaults_table[i].name, val*defaults_table[i].val); +- } +-} +- +-// called once only (not once per parse) +- +-void parse_init() +-{ +- current_direction = RIGHT_DIRECTION; +- current_position.x = 0.0; +- current_position.y = 0.0; +- // This resets everything to its default value. +- reset_all(); +-} +- +-void reset(const char *nm) +-{ +- for (unsigned int i = 0; +- i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) +- if (strcmp(nm, defaults_table[i].name) == 0) { +- double val = defaults_table[i].val; +- if (defaults_table[i].scaled) { +- double scale; +- lookup_variable("scale", &scale); +- val *= scale; +- } +- define_variable(defaults_table[i].name, val); +- return; +- } +- lex_error("`%1' is not a predefined variable", nm); +-} +- +-void reset_all() +-{ +- // We only have to explicitly reset the pre-defined variables that +- // aren't scaled because `scale' is not scaled, and changing the +- // value of `scale' will reset all the pre-defined variables that +- // are scaled. +- for (unsigned int i = 0; +- i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) +- if (!defaults_table[i].scaled) +- define_variable(defaults_table[i].name, defaults_table[i].val); +-} +- +-// called after each parse +- +-void parse_cleanup() +-{ +- while (current_saved_state != 0) { +- delete current_table; +- current_table = current_saved_state->tbl; +- saved_state *tem = current_saved_state; +- current_saved_state = current_saved_state->prev; +- delete tem; +- } +- assert(current_table == &top_table); +- PTABLE_ITERATOR(place) iter(current_table); +- const char *key; +- place *pl; +- while (iter.next(&key, &pl)) +- if (pl->obj != 0) { +- position pos = pl->obj->origin(); +- pl->obj = 0; +- pl->x = pos.x; +- pl->y = pos.y; +- } +- while (olist.head != 0) { +- object *tem = olist.head; +- olist.head = olist.head->next; +- delete tem; +- } +- olist.tail = 0; +- current_direction = RIGHT_DIRECTION; +- current_position.x = 0.0; +- current_position.y = 0.0; +-} +- +-const char *ordinal_postfix(int n) +-{ +- if (n < 10 || n > 20) +- switch (n % 10) { +- case 1: +- return "st"; +- case 2: +- return "nd"; +- case 3: +- return "rd"; +- } +- return "th"; +-} +- +-const char *object_type_name(object_type type) +-{ +- switch (type) { +- case BOX_OBJECT: +- return "box"; +- case CIRCLE_OBJECT: +- return "circle"; +- case ELLIPSE_OBJECT: +- return "ellipse"; +- case ARC_OBJECT: +- return "arc"; +- case SPLINE_OBJECT: +- return "spline"; +- case LINE_OBJECT: +- return "line"; +- case ARROW_OBJECT: +- return "arrow"; +- case MOVE_OBJECT: +- return "move"; +- case TEXT_OBJECT: +- return "\"\""; +- case BLOCK_OBJECT: +- return "[]"; +- case OTHER_OBJECT: +- case MARK_OBJECT: +- default: +- break; +- } +- return "object"; +-} +- +-static char sprintf_buf[1024]; +- +-char *format_number(const char *form, double n) +-{ +- if (form == 0) +- form = "%g"; +- return do_sprintf(form, &n, 1); +-} +- +-char *do_sprintf(const char *form, const double *v, int nv) +-{ +- string result; +- int i = 0; +- string one_format; +- while (*form) { +- if (*form == '%') { +- one_format += *form++; +- for (; *form != '\0' && strchr("#-+ 0123456789.", *form) != 0; form++) +- one_format += *form; +- if (*form == '\0' || strchr("eEfgG%", *form) == 0) { +- lex_error("bad sprintf format"); +- result += one_format; +- result += form; +- break; +- } +- if (*form == '%') { +- one_format += *form++; +- one_format += '\0'; +- snprintf(sprintf_buf, sizeof(sprintf_buf), +- "%s", one_format.contents()); +- } +- else { +- if (i >= nv) { +- lex_error("too few arguments to snprintf"); +- result += one_format; +- result += form; +- break; +- } +- one_format += *form++; +- one_format += '\0'; +- snprintf(sprintf_buf, sizeof(sprintf_buf), +- one_format.contents(), v[i++]); +- } +- one_format.clear(); +- result += sprintf_buf; +- } +- else +- result += *form++; +- } +- result += '\0'; +- return strsave(result.contents()); +-} +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic.h groff-1.22.3/src/preproc/pic/pic.h +--- groff-1.22.3.old/src/preproc/pic/pic.h 2014-11-04 10:38:35.226523984 +0200 ++++ groff-1.22.3/src/preproc/pic/pic.h 2015-04-23 20:57:03.000000000 +0300 +@@ -50,6 +50,7 @@ + #include "assert.h" + #include "cset.h" + #include "stringclass.h" ++#include "lf.h" + #include "errarg.h" + #include "error.h" + #include "position.h" +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic.man groff-1.22.3/src/preproc/pic/pic.man +--- groff-1.22.3.old/src/preproc/pic/pic.man 2014-11-04 10:38:35.226523984 +0200 ++++ groff-1.22.3/src/preproc/pic/pic.man 2015-04-23 20:57:03.000000000 +0300 +@@ -3,6 +3,10 @@ + @g@pic \- compile pictures for troff or TeX + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" License (copying) + .\" -------------------------------------------------------------------- +@@ -1343,6 +1347,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic_tab.h groff-1.22.3/src/preproc/pic/pic_tab.h +--- groff-1.22.3.old/src/preproc/pic/pic_tab.h 2014-11-04 10:38:37.791491918 +0200 ++++ groff-1.22.3/src/preproc/pic/pic_tab.h 1970-01-01 02:00:00.000000000 +0200 +@@ -1,331 +0,0 @@ +-/* A Bison parser, made by GNU Bison 3.0.2. */ +- +-/* Bison interface for Yacc-like parsers in C +- +- Copyright (C) 1984, 1989-1990, 2000-2013 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 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 . */ +- +-/* As a special exception, you may create a larger work that contains +- part or all of the Bison parser skeleton and distribute that work +- under terms of your choice, so long as that work isn't itself a +- parser generator using the skeleton or a modified version thereof +- as a parser skeleton. Alternatively, if you modify or redistribute +- the parser skeleton itself, you may (at your option) remove this +- special exception, which will cause the skeleton and the resulting +- Bison output files to be licensed under the GNU General Public +- License without this special exception. +- +- This special exception was added by the Free Software Foundation in +- version 2.2 of Bison. */ +- +-#ifndef YY_YY_Y_TAB_H_INCLUDED +-# define YY_YY_Y_TAB_H_INCLUDED +-/* Debug traces. */ +-#ifndef YYDEBUG +-# define YYDEBUG 0 +-#endif +-#if YYDEBUG +-extern int yydebug; +-#endif +- +-/* Token type. */ +-#ifndef YYTOKENTYPE +-# define YYTOKENTYPE +- enum yytokentype +- { +- LABEL = 258, +- VARIABLE = 259, +- NUMBER = 260, +- TEXT = 261, +- COMMAND_LINE = 262, +- DELIMITED = 263, +- ORDINAL = 264, +- TH = 265, +- LEFT_ARROW_HEAD = 266, +- RIGHT_ARROW_HEAD = 267, +- DOUBLE_ARROW_HEAD = 268, +- LAST = 269, +- BOX = 270, +- CIRCLE = 271, +- ELLIPSE = 272, +- ARC = 273, +- LINE = 274, +- ARROW = 275, +- MOVE = 276, +- SPLINE = 277, +- HEIGHT = 278, +- RADIUS = 279, +- FIGNAME = 280, +- WIDTH = 281, +- DIAMETER = 282, +- UP = 283, +- DOWN = 284, +- RIGHT = 285, +- LEFT = 286, +- FROM = 287, +- TO = 288, +- AT = 289, +- WITH = 290, +- BY = 291, +- THEN = 292, +- SOLID = 293, +- DOTTED = 294, +- DASHED = 295, +- CHOP = 296, +- SAME = 297, +- INVISIBLE = 298, +- LJUST = 299, +- RJUST = 300, +- ABOVE = 301, +- BELOW = 302, +- OF = 303, +- THE = 304, +- WAY = 305, +- BETWEEN = 306, +- AND = 307, +- HERE = 308, +- DOT_N = 309, +- DOT_E = 310, +- DOT_W = 311, +- DOT_S = 312, +- DOT_NE = 313, +- DOT_SE = 314, +- DOT_NW = 315, +- DOT_SW = 316, +- DOT_C = 317, +- DOT_START = 318, +- DOT_END = 319, +- DOT_X = 320, +- DOT_Y = 321, +- DOT_HT = 322, +- DOT_WID = 323, +- DOT_RAD = 324, +- SIN = 325, +- COS = 326, +- ATAN2 = 327, +- LOG = 328, +- EXP = 329, +- SQRT = 330, +- K_MAX = 331, +- K_MIN = 332, +- INT = 333, +- RAND = 334, +- SRAND = 335, +- COPY = 336, +- THRU = 337, +- TOP = 338, +- BOTTOM = 339, +- UPPER = 340, +- LOWER = 341, +- SH = 342, +- PRINT = 343, +- CW = 344, +- CCW = 345, +- FOR = 346, +- DO = 347, +- IF = 348, +- ELSE = 349, +- ANDAND = 350, +- OROR = 351, +- NOTEQUAL = 352, +- EQUALEQUAL = 353, +- LESSEQUAL = 354, +- GREATEREQUAL = 355, +- LEFT_CORNER = 356, +- RIGHT_CORNER = 357, +- NORTH = 358, +- SOUTH = 359, +- EAST = 360, +- WEST = 361, +- CENTER = 362, +- END = 363, +- START = 364, +- RESET = 365, +- UNTIL = 366, +- PLOT = 367, +- THICKNESS = 368, +- FILL = 369, +- COLORED = 370, +- OUTLINED = 371, +- SHADED = 372, +- XSLANTED = 373, +- YSLANTED = 374, +- ALIGNED = 375, +- SPRINTF = 376, +- COMMAND = 377, +- DEFINE = 378, +- UNDEF = 379 +- }; +-#endif +-/* Tokens. */ +-#define LABEL 258 +-#define VARIABLE 259 +-#define NUMBER 260 +-#define TEXT 261 +-#define COMMAND_LINE 262 +-#define DELIMITED 263 +-#define ORDINAL 264 +-#define TH 265 +-#define LEFT_ARROW_HEAD 266 +-#define RIGHT_ARROW_HEAD 267 +-#define DOUBLE_ARROW_HEAD 268 +-#define LAST 269 +-#define BOX 270 +-#define CIRCLE 271 +-#define ELLIPSE 272 +-#define ARC 273 +-#define LINE 274 +-#define ARROW 275 +-#define MOVE 276 +-#define SPLINE 277 +-#define HEIGHT 278 +-#define RADIUS 279 +-#define FIGNAME 280 +-#define WIDTH 281 +-#define DIAMETER 282 +-#define UP 283 +-#define DOWN 284 +-#define RIGHT 285 +-#define LEFT 286 +-#define FROM 287 +-#define TO 288 +-#define AT 289 +-#define WITH 290 +-#define BY 291 +-#define THEN 292 +-#define SOLID 293 +-#define DOTTED 294 +-#define DASHED 295 +-#define CHOP 296 +-#define SAME 297 +-#define INVISIBLE 298 +-#define LJUST 299 +-#define RJUST 300 +-#define ABOVE 301 +-#define BELOW 302 +-#define OF 303 +-#define THE 304 +-#define WAY 305 +-#define BETWEEN 306 +-#define AND 307 +-#define HERE 308 +-#define DOT_N 309 +-#define DOT_E 310 +-#define DOT_W 311 +-#define DOT_S 312 +-#define DOT_NE 313 +-#define DOT_SE 314 +-#define DOT_NW 315 +-#define DOT_SW 316 +-#define DOT_C 317 +-#define DOT_START 318 +-#define DOT_END 319 +-#define DOT_X 320 +-#define DOT_Y 321 +-#define DOT_HT 322 +-#define DOT_WID 323 +-#define DOT_RAD 324 +-#define SIN 325 +-#define COS 326 +-#define ATAN2 327 +-#define LOG 328 +-#define EXP 329 +-#define SQRT 330 +-#define K_MAX 331 +-#define K_MIN 332 +-#define INT 333 +-#define RAND 334 +-#define SRAND 335 +-#define COPY 336 +-#define THRU 337 +-#define TOP 338 +-#define BOTTOM 339 +-#define UPPER 340 +-#define LOWER 341 +-#define SH 342 +-#define PRINT 343 +-#define CW 344 +-#define CCW 345 +-#define FOR 346 +-#define DO 347 +-#define IF 348 +-#define ELSE 349 +-#define ANDAND 350 +-#define OROR 351 +-#define NOTEQUAL 352 +-#define EQUALEQUAL 353 +-#define LESSEQUAL 354 +-#define GREATEREQUAL 355 +-#define LEFT_CORNER 356 +-#define RIGHT_CORNER 357 +-#define NORTH 358 +-#define SOUTH 359 +-#define EAST 360 +-#define WEST 361 +-#define CENTER 362 +-#define END 363 +-#define START 364 +-#define RESET 365 +-#define UNTIL 366 +-#define PLOT 367 +-#define THICKNESS 368 +-#define FILL 369 +-#define COLORED 370 +-#define OUTLINED 371 +-#define SHADED 372 +-#define XSLANTED 373 +-#define YSLANTED 374 +-#define ALIGNED 375 +-#define SPRINTF 376 +-#define COMMAND 377 +-#define DEFINE 378 +-#define UNDEF 379 +- +-/* Value type. */ +-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +-typedef union YYSTYPE YYSTYPE; +-union YYSTYPE +-{ +-#line 65 "pic.y" /* yacc.c:1909 */ +- +- char *str; +- int n; +- double x; +- struct { double x, y; } pair; +- struct { double x; char *body; } if_data; +- struct { char *str; const char *filename; int lineno; } lstr; +- struct { double *v; int nv; int maxv; } dv; +- struct { double val; int is_multiplicative; } by; +- place pl; +- object *obj; +- corner crn; +- path *pth; +- object_spec *spec; +- saved_state *pstate; +- graphics_state state; +- object_type obtype; +- +-#line 321 "y.tab.h" /* yacc.c:1909 */ +-}; +-# define YYSTYPE_IS_TRIVIAL 1 +-# define YYSTYPE_IS_DECLARED 1 +-#endif +- +- +-extern YYSTYPE yylval; +- +-int yyparse (void); +- +-#endif /* !YY_YY_Y_TAB_H_INCLUDED */ +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic.y groff-1.22.3/src/preproc/pic/pic.y +--- groff-1.22.3.old/src/preproc/pic/pic.y 2014-11-04 10:38:35.226523984 +0200 ++++ groff-1.22.3/src/preproc/pic/pic.y 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1933 +0,0 @@ +-/* Copyright (C) 1989-2014 Free Software Foundation, Inc. +- Written by James Clark (jjc@jclark.com) +- +-This file is part of groff. +- +-groff 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. +- +-groff 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 . */ +- +-%{ +-#include "pic.h" +-#include "ptable.h" +-#include "object.h" +- +-extern int delim_flag; +-extern void copy_rest_thru(const char *, const char *); +-extern void copy_file_thru(const char *, const char *, const char *); +-extern void push_body(const char *); +-extern void do_for(char *var, double from, double to, +- int by_is_multiplicative, double by, char *body); +-extern void do_lookahead(); +- +-/* Maximum number of characters produced by printf("%g") */ +-#define GDIGITS 14 +- +-int yylex(); +-void yyerror(const char *); +- +-void reset(const char *nm); +-void reset_all(); +- +-place *lookup_label(const char *); +-void define_label(const char *label, const place *pl); +- +-direction current_direction; +-position current_position; +- +-implement_ptable(place) +- +-PTABLE(place) top_table; +- +-PTABLE(place) *current_table = &top_table; +-saved_state *current_saved_state = 0; +- +-object_list olist; +- +-const char *ordinal_postfix(int n); +-const char *object_type_name(object_type type); +-char *format_number(const char *form, double n); +-char *do_sprintf(const char *form, const double *v, int nv); +- +-%} +- +-%expect 2 +- +-%union { +- char *str; +- int n; +- double x; +- struct { double x, y; } pair; +- struct { double x; char *body; } if_data; +- struct { char *str; const char *filename; int lineno; } lstr; +- struct { double *v; int nv; int maxv; } dv; +- struct { double val; int is_multiplicative; } by; +- place pl; +- object *obj; +- corner crn; +- path *pth; +- object_spec *spec; +- saved_state *pstate; +- graphics_state state; +- object_type obtype; +-} +- +-%token LABEL +-%token VARIABLE +-%token NUMBER +-%token TEXT +-%token COMMAND_LINE +-%token DELIMITED +-%token ORDINAL +-%token TH +-%token LEFT_ARROW_HEAD +-%token RIGHT_ARROW_HEAD +-%token DOUBLE_ARROW_HEAD +-%token LAST +-%token BOX +-%token CIRCLE +-%token ELLIPSE +-%token ARC +-%token LINE +-%token ARROW +-%token MOVE +-%token SPLINE +-%token HEIGHT +-%token RADIUS +-%token FIGNAME +-%token WIDTH +-%token DIAMETER +-%token UP +-%token DOWN +-%token RIGHT +-%token LEFT +-%token FROM +-%token TO +-%token AT +-%token WITH +-%token BY +-%token THEN +-%token SOLID +-%token DOTTED +-%token DASHED +-%token CHOP +-%token SAME +-%token INVISIBLE +-%token LJUST +-%token RJUST +-%token ABOVE +-%token BELOW +-%token OF +-%token THE +-%token WAY +-%token BETWEEN +-%token AND +-%token HERE +-%token DOT_N +-%token DOT_E +-%token DOT_W +-%token DOT_S +-%token DOT_NE +-%token DOT_SE +-%token DOT_NW +-%token DOT_SW +-%token DOT_C +-%token DOT_START +-%token DOT_END +-%token DOT_X +-%token DOT_Y +-%token DOT_HT +-%token DOT_WID +-%token DOT_RAD +-%token SIN +-%token COS +-%token ATAN2 +-%token LOG +-%token EXP +-%token SQRT +-%token K_MAX +-%token K_MIN +-%token INT +-%token RAND +-%token SRAND +-%token COPY +-%token THRU +-%token TOP +-%token BOTTOM +-%token UPPER +-%token LOWER +-%token SH +-%token PRINT +-%token CW +-%token CCW +-%token FOR +-%token DO +-%token IF +-%token ELSE +-%token ANDAND +-%token OROR +-%token NOTEQUAL +-%token EQUALEQUAL +-%token LESSEQUAL +-%token GREATEREQUAL +-%token LEFT_CORNER +-%token RIGHT_CORNER +-%token NORTH +-%token SOUTH +-%token EAST +-%token WEST +-%token CENTER +-%token END +-%token START +-%token RESET +-%token UNTIL +-%token PLOT +-%token THICKNESS +-%token FILL +-%token COLORED +-%token OUTLINED +-%token SHADED +-%token XSLANTED +-%token YSLANTED +-%token ALIGNED +-%token SPRINTF +-%token COMMAND +- +-%token DEFINE +-%token UNDEF +- +-%left '.' +- +-/* this ensures that plot 17 "%g" parses as (plot 17 "%g") */ +-%left PLOT +-%left TEXT SPRINTF +- +-/* give text adjustments higher precedence than TEXT, so that +-box "foo" above ljust == box ("foo" above ljust) +-*/ +- +-%left LJUST RJUST ABOVE BELOW +- +-%left LEFT RIGHT +-/* Give attributes that take an optional expression a higher +-precedence than left and right, so that eg `line chop left' +-parses properly. */ +-%left CHOP SOLID DASHED DOTTED UP DOWN FILL COLORED OUTLINED +-%left XSLANTED YSLANTED +-%left LABEL +- +-%left VARIABLE NUMBER '(' SIN COS ATAN2 LOG EXP SQRT K_MAX K_MIN INT RAND SRAND LAST +-%left ORDINAL HERE '`' +- +-%left BOX CIRCLE ELLIPSE ARC LINE ARROW SPLINE '[' +- +-/* these need to be lower than '-' */ +-%left HEIGHT RADIUS WIDTH DIAMETER FROM TO AT THICKNESS +- +-/* these must have higher precedence than CHOP so that `label %prec CHOP' +-works */ +-%left DOT_N DOT_E DOT_W DOT_S DOT_NE DOT_SE DOT_NW DOT_SW DOT_C +-%left DOT_START DOT_END TOP BOTTOM LEFT_CORNER RIGHT_CORNER +-%left UPPER LOWER NORTH SOUTH EAST WEST CENTER START END +- +-%left ',' +-%left OROR +-%left ANDAND +-%left EQUALEQUAL NOTEQUAL +-%left '<' '>' LESSEQUAL GREATEREQUAL +- +-%left BETWEEN OF +-%left AND +- +-%left '+' '-' +-%left '*' '/' '%' +-%right '!' +-%right '^' +- +-%type expr expr_lower_than expr_not_lower_than any_expr text_expr +-%type optional_by +-%type expr_pair position_not_place +-%type simple_if +-%type nth_primitive +-%type corner +-%type path label_path relative_path +-%type place label element element_list middle_element_list +-%type object_spec +-%type position +-%type object_type +-%type optional_ordinal_last ordinal +-%type macro_name until +-%type sprintf_args +-%type text print_args print_arg +- +-%% +- +-top: +- optional_separator +- | element_list +- { +- if (olist.head) +- print_picture(olist.head); +- } +- ; +- +- +-element_list: +- optional_separator middle_element_list optional_separator +- { $$ = $2; } +- ; +- +-middle_element_list: +- element +- { $$ = $1; } +- | middle_element_list separator element +- { $$ = $1; } +- ; +- +-optional_separator: +- /* empty */ +- | separator +- ; +- +-separator: +- ';' +- | separator ';' +- ; +- +-placeless_element: +- FIGNAME '=' macro_name +- { +- a_delete graphname; +- graphname = new char[strlen($3) + 1]; +- strcpy(graphname, $3); +- a_delete $3; +- } +- | +- VARIABLE '=' any_expr +- { +- define_variable($1, $3); +- a_delete $1; +- } +- | VARIABLE ':' '=' any_expr +- { +- place *p = lookup_label($1); +- if (!p) { +- lex_error("variable `%1' not defined", $1); +- YYABORT; +- } +- p->obj = 0; +- p->x = $4; +- p->y = 0.0; +- a_delete $1; +- } +- | UP +- { current_direction = UP_DIRECTION; } +- | DOWN +- { current_direction = DOWN_DIRECTION; } +- | LEFT +- { current_direction = LEFT_DIRECTION; } +- | RIGHT +- { current_direction = RIGHT_DIRECTION; } +- | COMMAND_LINE +- { +- olist.append(make_command_object($1.str, $1.filename, +- $1.lineno)); +- } +- | COMMAND print_args +- { +- olist.append(make_command_object($2.str, $2.filename, +- $2.lineno)); +- } +- | PRINT print_args +- { +- fprintf(stderr, "%s\n", $2.str); +- a_delete $2.str; +- fflush(stderr); +- } +- | SH +- { delim_flag = 1; } +- DELIMITED +- { +- delim_flag = 0; +- if (safer_flag) +- lex_error("unsafe to run command `%1'", $3); +- else +- system($3); +- a_delete $3; +- } +- | COPY TEXT +- { +- if (yychar < 0) +- do_lookahead(); +- do_copy($2.str); +- // do not delete the filename +- } +- | COPY TEXT THRU +- { delim_flag = 2; } +- DELIMITED +- { delim_flag = 0; } +- until +- { +- if (yychar < 0) +- do_lookahead(); +- copy_file_thru($2.str, $5, $7); +- // do not delete the filename +- a_delete $5; +- a_delete $7; +- } +- | COPY THRU +- { delim_flag = 2; } +- DELIMITED +- { delim_flag = 0; } +- until +- { +- if (yychar < 0) +- do_lookahead(); +- copy_rest_thru($4, $6); +- a_delete $4; +- a_delete $6; +- } +- | FOR VARIABLE '=' expr TO expr optional_by DO +- { delim_flag = 1; } +- DELIMITED +- { +- delim_flag = 0; +- if (yychar < 0) +- do_lookahead(); +- do_for($2, $4, $6, $7.is_multiplicative, $7.val, $10); +- } +- | simple_if +- { +- if (yychar < 0) +- do_lookahead(); +- if ($1.x != 0.0) +- push_body($1.body); +- a_delete $1.body; +- } +- | simple_if ELSE +- { delim_flag = 1; } +- DELIMITED +- { +- delim_flag = 0; +- if (yychar < 0) +- do_lookahead(); +- if ($1.x != 0.0) +- push_body($1.body); +- else +- push_body($4); +- a_delete $1.body; +- a_delete $4; +- } +- | reset_variables +- | RESET +- { define_variable("scale", 1.0); } +- ; +- +-macro_name: +- VARIABLE +- | LABEL +- ; +- +-reset_variables: +- RESET VARIABLE +- { +- reset($2); +- a_delete $2; +- } +- | reset_variables VARIABLE +- { +- reset($2); +- a_delete $2; +- } +- | reset_variables ',' VARIABLE +- { +- reset($3); +- a_delete $3; +- } +- ; +- +-print_args: +- print_arg +- { $$ = $1; } +- | print_args print_arg +- { +- $$.str = new char[strlen($1.str) + strlen($2.str) + 1]; +- strcpy($$.str, $1.str); +- strcat($$.str, $2.str); +- a_delete $1.str; +- a_delete $2.str; +- if ($1.filename) { +- $$.filename = $1.filename; +- $$.lineno = $1.lineno; +- } +- else if ($2.filename) { +- $$.filename = $2.filename; +- $$.lineno = $2.lineno; +- } +- } +- ; +- +-print_arg: +- expr %prec ',' +- { +- $$.str = new char[GDIGITS + 1]; +- sprintf($$.str, "%g", $1); +- $$.filename = 0; +- $$.lineno = 0; +- } +- | text +- { $$ = $1; } +- | position %prec ',' +- { +- $$.str = new char[GDIGITS + 2 + GDIGITS + 1]; +- sprintf($$.str, "%g, %g", $1.x, $1.y); +- $$.filename = 0; +- $$.lineno = 0; +- } +- ; +- +-simple_if: +- IF any_expr THEN +- { delim_flag = 1; } +- DELIMITED +- { +- delim_flag = 0; +- $$.x = $2; +- $$.body = $5; +- } +- ; +- +-until: +- /* empty */ +- { $$ = 0; } +- | UNTIL TEXT +- { $$ = $2.str; } +- ; +- +-any_expr: +- expr +- { $$ = $1; } +- | text_expr +- { $$ = $1; } +- ; +- +-text_expr: +- text EQUALEQUAL text +- { +- $$ = strcmp($1.str, $3.str) == 0; +- a_delete $1.str; +- a_delete $3.str; +- } +- | text NOTEQUAL text +- { +- $$ = strcmp($1.str, $3.str) != 0; +- a_delete $1.str; +- a_delete $3.str; +- } +- | text_expr ANDAND text_expr +- { $$ = ($1 != 0.0 && $3 != 0.0); } +- | text_expr ANDAND expr +- { $$ = ($1 != 0.0 && $3 != 0.0); } +- | expr ANDAND text_expr +- { $$ = ($1 != 0.0 && $3 != 0.0); } +- | text_expr OROR text_expr +- { $$ = ($1 != 0.0 || $3 != 0.0); } +- | text_expr OROR expr +- { $$ = ($1 != 0.0 || $3 != 0.0); } +- | expr OROR text_expr +- { $$ = ($1 != 0.0 || $3 != 0.0); } +- | '!' text_expr +- { $$ = ($2 == 0.0); } +- ; +- +- +-optional_by: +- /* empty */ +- { +- $$.val = 1.0; +- $$.is_multiplicative = 0; +- } +- | BY expr +- { +- $$.val = $2; +- $$.is_multiplicative = 0; +- } +- | BY '*' expr +- { +- $$.val = $3; +- $$.is_multiplicative = 1; +- } +- ; +- +-element: +- object_spec +- { +- $$.obj = $1->make_object(¤t_position, +- ¤t_direction); +- if ($$.obj == 0) +- YYABORT; +- delete $1; +- if ($$.obj) +- olist.append($$.obj); +- else { +- $$.x = current_position.x; +- $$.y = current_position.y; +- } +- } +- | LABEL ':' optional_separator element +- { +- $$ = $4; +- define_label($1, & $$); +- a_delete $1; +- } +- | LABEL ':' optional_separator position_not_place +- { +- $$.obj = 0; +- $$.x = $4.x; +- $$.y = $4.y; +- define_label($1, & $$); +- a_delete $1; +- } +- | LABEL ':' optional_separator place +- { +- $$ = $4; +- define_label($1, & $$); +- a_delete $1; +- } +- | '{' +- { +- $$.x = current_position.x; +- $$.y = current_position.y; +- $$.dir = current_direction; +- } +- element_list '}' +- { +- current_position.x = $2.x; +- current_position.y = $2.y; +- current_direction = $2.dir; +- } +- optional_element +- { +- $$ = $3; +- } +- | placeless_element +- { +- $$.obj = 0; +- $$.x = current_position.x; +- $$.y = current_position.y; +- } +- ; +- +-optional_element: +- /* empty */ +- {} +- | element +- {} +- ; +- +-object_spec: +- BOX +- { $$ = new object_spec(BOX_OBJECT); } +- | CIRCLE +- { $$ = new object_spec(CIRCLE_OBJECT); } +- | ELLIPSE +- { $$ = new object_spec(ELLIPSE_OBJECT); } +- | ARC +- { +- $$ = new object_spec(ARC_OBJECT); +- $$->dir = current_direction; +- } +- | LINE +- { +- $$ = new object_spec(LINE_OBJECT); +- lookup_variable("lineht", & $$->segment_height); +- lookup_variable("linewid", & $$->segment_width); +- $$->dir = current_direction; +- } +- | ARROW +- { +- $$ = new object_spec(ARROW_OBJECT); +- lookup_variable("lineht", & $$->segment_height); +- lookup_variable("linewid", & $$->segment_width); +- $$->dir = current_direction; +- } +- | MOVE +- { +- $$ = new object_spec(MOVE_OBJECT); +- lookup_variable("moveht", & $$->segment_height); +- lookup_variable("movewid", & $$->segment_width); +- $$->dir = current_direction; +- } +- | SPLINE +- { +- $$ = new object_spec(SPLINE_OBJECT); +- lookup_variable("lineht", & $$->segment_height); +- lookup_variable("linewid", & $$->segment_width); +- $$->dir = current_direction; +- } +- | text %prec TEXT +- { +- $$ = new object_spec(TEXT_OBJECT); +- $$->text = new text_item($1.str, $1.filename, $1.lineno); +- } +- | PLOT expr +- { +- $$ = new object_spec(TEXT_OBJECT); +- $$->text = new text_item(format_number(0, $2), 0, -1); +- } +- | PLOT expr text +- { +- $$ = new object_spec(TEXT_OBJECT); +- $$->text = new text_item(format_number($3.str, $2), +- $3.filename, $3.lineno); +- a_delete $3.str; +- } +- | '[' +- { +- saved_state *p = new saved_state; +- $$ = p; +- p->x = current_position.x; +- p->y = current_position.y; +- p->dir = current_direction; +- p->tbl = current_table; +- p->prev = current_saved_state; +- current_position.x = 0.0; +- current_position.y = 0.0; +- current_table = new PTABLE(place); +- current_saved_state = p; +- olist.append(make_mark_object()); +- } +- element_list ']' +- { +- current_position.x = $2->x; +- current_position.y = $2->y; +- current_direction = $2->dir; +- $$ = new object_spec(BLOCK_OBJECT); +- olist.wrap_up_block(& $$->oblist); +- $$->tbl = current_table; +- current_table = $2->tbl; +- current_saved_state = $2->prev; +- delete $2; +- } +- | object_spec HEIGHT expr +- { +- $$ = $1; +- $$->height = $3; +- $$->flags |= HAS_HEIGHT; +- } +- | object_spec RADIUS expr +- { +- $$ = $1; +- $$->radius = $3; +- $$->flags |= HAS_RADIUS; +- } +- | object_spec WIDTH expr +- { +- $$ = $1; +- $$->width = $3; +- $$->flags |= HAS_WIDTH; +- } +- | object_spec DIAMETER expr +- { +- $$ = $1; +- $$->radius = $3/2.0; +- $$->flags |= HAS_RADIUS; +- } +- | object_spec expr %prec HEIGHT +- { +- $$ = $1; +- $$->flags |= HAS_SEGMENT; +- switch ($$->dir) { +- case UP_DIRECTION: +- $$->segment_pos.y += $2; +- break; +- case DOWN_DIRECTION: +- $$->segment_pos.y -= $2; +- break; +- case RIGHT_DIRECTION: +- $$->segment_pos.x += $2; +- break; +- case LEFT_DIRECTION: +- $$->segment_pos.x -= $2; +- break; +- } +- } +- | object_spec UP +- { +- $$ = $1; +- $$->dir = UP_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.y += $$->segment_height; +- } +- | object_spec UP expr +- { +- $$ = $1; +- $$->dir = UP_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.y += $3; +- } +- | object_spec DOWN +- { +- $$ = $1; +- $$->dir = DOWN_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.y -= $$->segment_height; +- } +- | object_spec DOWN expr +- { +- $$ = $1; +- $$->dir = DOWN_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.y -= $3; +- } +- | object_spec RIGHT +- { +- $$ = $1; +- $$->dir = RIGHT_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.x += $$->segment_width; +- } +- | object_spec RIGHT expr +- { +- $$ = $1; +- $$->dir = RIGHT_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.x += $3; +- } +- | object_spec LEFT +- { +- $$ = $1; +- $$->dir = LEFT_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.x -= $$->segment_width; +- } +- | object_spec LEFT expr +- { +- $$ = $1; +- $$->dir = LEFT_DIRECTION; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.x -= $3; +- } +- | object_spec FROM position +- { +- $$ = $1; +- $$->flags |= HAS_FROM; +- $$->from.x = $3.x; +- $$->from.y = $3.y; +- } +- | object_spec TO position +- { +- $$ = $1; +- if ($$->flags & HAS_SEGMENT) +- $$->segment_list = new segment($$->segment_pos, +- $$->segment_is_absolute, +- $$->segment_list); +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.x = $3.x; +- $$->segment_pos.y = $3.y; +- $$->segment_is_absolute = 1; +- $$->flags |= HAS_TO; +- $$->to.x = $3.x; +- $$->to.y = $3.y; +- } +- | object_spec AT position +- { +- $$ = $1; +- $$->flags |= HAS_AT; +- $$->at.x = $3.x; +- $$->at.y = $3.y; +- if ($$->type != ARC_OBJECT) { +- $$->flags |= HAS_FROM; +- $$->from.x = $3.x; +- $$->from.y = $3.y; +- } +- } +- | object_spec WITH path +- { +- $$ = $1; +- $$->flags |= HAS_WITH; +- $$->with = $3; +- } +- | object_spec WITH position %prec ',' +- { +- $$ = $1; +- $$->flags |= HAS_WITH; +- position pos; +- pos.x = $3.x; +- pos.y = $3.y; +- $$->with = new path(pos); +- } +- | object_spec BY expr_pair +- { +- $$ = $1; +- $$->flags |= HAS_SEGMENT; +- $$->segment_pos.x += $3.x; +- $$->segment_pos.y += $3.y; +- } +- | object_spec THEN +- { +- $$ = $1; +- if (!($$->flags & HAS_SEGMENT)) +- switch ($$->dir) { +- case UP_DIRECTION: +- $$->segment_pos.y += $$->segment_width; +- break; +- case DOWN_DIRECTION: +- $$->segment_pos.y -= $$->segment_width; +- break; +- case RIGHT_DIRECTION: +- $$->segment_pos.x += $$->segment_width; +- break; +- case LEFT_DIRECTION: +- $$->segment_pos.x -= $$->segment_width; +- break; +- } +- $$->segment_list = new segment($$->segment_pos, +- $$->segment_is_absolute, +- $$->segment_list); +- $$->flags &= ~HAS_SEGMENT; +- $$->segment_pos.x = $$->segment_pos.y = 0.0; +- $$->segment_is_absolute = 0; +- } +- | object_spec SOLID +- { +- $$ = $1; // nothing +- } +- | object_spec DOTTED +- { +- $$ = $1; +- $$->flags |= IS_DOTTED; +- lookup_variable("dashwid", & $$->dash_width); +- } +- | object_spec DOTTED expr +- { +- $$ = $1; +- $$->flags |= IS_DOTTED; +- $$->dash_width = $3; +- } +- | object_spec DASHED +- { +- $$ = $1; +- $$->flags |= IS_DASHED; +- lookup_variable("dashwid", & $$->dash_width); +- } +- | object_spec DASHED expr +- { +- $$ = $1; +- $$->flags |= IS_DASHED; +- $$->dash_width = $3; +- } +- | object_spec FILL +- { +- $$ = $1; +- $$->flags |= IS_DEFAULT_FILLED; +- } +- | object_spec FILL expr +- { +- $$ = $1; +- $$->flags |= IS_FILLED; +- $$->fill = $3; +- } +- | object_spec XSLANTED expr +- { +- $$ = $1; +- $$->flags |= IS_XSLANTED; +- $$->xslanted = $3; +- } +- | object_spec YSLANTED expr +- { +- $$ = $1; +- $$->flags |= IS_YSLANTED; +- $$->yslanted = $3; +- } +- | object_spec SHADED text +- { +- $$ = $1; +- $$->flags |= (IS_SHADED | IS_FILLED); +- $$->shaded = new char[strlen($3.str)+1]; +- strcpy($$->shaded, $3.str); +- } +- | object_spec COLORED text +- { +- $$ = $1; +- $$->flags |= (IS_SHADED | IS_OUTLINED | IS_FILLED); +- $$->shaded = new char[strlen($3.str)+1]; +- strcpy($$->shaded, $3.str); +- $$->outlined = new char[strlen($3.str)+1]; +- strcpy($$->outlined, $3.str); +- } +- | object_spec OUTLINED text +- { +- $$ = $1; +- $$->flags |= IS_OUTLINED; +- $$->outlined = new char[strlen($3.str)+1]; +- strcpy($$->outlined, $3.str); +- } +- | object_spec CHOP +- { +- $$ = $1; +- // line chop chop means line chop 0 chop 0 +- if ($$->flags & IS_DEFAULT_CHOPPED) { +- $$->flags |= IS_CHOPPED; +- $$->flags &= ~IS_DEFAULT_CHOPPED; +- $$->start_chop = $$->end_chop = 0.0; +- } +- else if ($$->flags & IS_CHOPPED) { +- $$->end_chop = 0.0; +- } +- else { +- $$->flags |= IS_DEFAULT_CHOPPED; +- } +- } +- | object_spec CHOP expr +- { +- $$ = $1; +- if ($$->flags & IS_DEFAULT_CHOPPED) { +- $$->flags |= IS_CHOPPED; +- $$->flags &= ~IS_DEFAULT_CHOPPED; +- $$->start_chop = 0.0; +- $$->end_chop = $3; +- } +- else if ($$->flags & IS_CHOPPED) { +- $$->end_chop = $3; +- } +- else { +- $$->start_chop = $$->end_chop = $3; +- $$->flags |= IS_CHOPPED; +- } +- } +- | object_spec SAME +- { +- $$ = $1; +- $$->flags |= IS_SAME; +- } +- | object_spec INVISIBLE +- { +- $$ = $1; +- $$->flags |= IS_INVISIBLE; +- } +- | object_spec LEFT_ARROW_HEAD +- { +- $$ = $1; +- $$->flags |= HAS_LEFT_ARROW_HEAD; +- } +- | object_spec RIGHT_ARROW_HEAD +- { +- $$ = $1; +- $$->flags |= HAS_RIGHT_ARROW_HEAD; +- } +- | object_spec DOUBLE_ARROW_HEAD +- { +- $$ = $1; +- $$->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD); +- } +- | object_spec CW +- { +- $$ = $1; +- $$->flags |= IS_CLOCKWISE; +- } +- | object_spec CCW +- { +- $$ = $1; +- $$->flags &= ~IS_CLOCKWISE; +- } +- | object_spec text %prec TEXT +- { +- $$ = $1; +- text_item **p; +- for (p = & $$->text; *p; p = &(*p)->next) +- ; +- *p = new text_item($2.str, $2.filename, $2.lineno); +- } +- | object_spec LJUST +- { +- $$ = $1; +- if ($$->text) { +- text_item *p; +- for (p = $$->text; p->next; p = p->next) +- ; +- p->adj.h = LEFT_ADJUST; +- } +- } +- | object_spec RJUST +- { +- $$ = $1; +- if ($$->text) { +- text_item *p; +- for (p = $$->text; p->next; p = p->next) +- ; +- p->adj.h = RIGHT_ADJUST; +- } +- } +- | object_spec ABOVE +- { +- $$ = $1; +- if ($$->text) { +- text_item *p; +- for (p = $$->text; p->next; p = p->next) +- ; +- p->adj.v = ABOVE_ADJUST; +- } +- } +- | object_spec BELOW +- { +- $$ = $1; +- if ($$->text) { +- text_item *p; +- for (p = $$->text; p->next; p = p->next) +- ; +- p->adj.v = BELOW_ADJUST; +- } +- } +- | object_spec THICKNESS expr +- { +- $$ = $1; +- $$->flags |= HAS_THICKNESS; +- $$->thickness = $3; +- } +- | object_spec ALIGNED +- { +- $$ = $1; +- $$->flags |= IS_ALIGNED; +- } +- ; +- +-text: +- TEXT +- { $$ = $1; } +- | SPRINTF '(' TEXT sprintf_args ')' +- { +- $$.filename = $3.filename; +- $$.lineno = $3.lineno; +- $$.str = do_sprintf($3.str, $4.v, $4.nv); +- a_delete $4.v; +- a_delete $3.str; +- } +- ; +- +-sprintf_args: +- /* empty */ +- { +- $$.v = 0; +- $$.nv = 0; +- $$.maxv = 0; +- } +- | sprintf_args ',' expr +- { +- $$ = $1; +- if ($$.nv >= $$.maxv) { +- if ($$.nv == 0) { +- $$.v = new double[4]; +- $$.maxv = 4; +- } +- else { +- double *oldv = $$.v; +- $$.maxv *= 2; +-#if 0 +- $$.v = new double[$$.maxv]; +- memcpy($$.v, oldv, $$.nv*sizeof(double)); +-#else +- // workaround for bug in Compaq C++ V6.5-033 +- // for Compaq Tru64 UNIX V5.1A (Rev. 1885) +- double *foo = new double[$$.maxv]; +- memcpy(foo, oldv, $$.nv*sizeof(double)); +- $$.v = foo; +-#endif +- a_delete oldv; +- } +- } +- $$.v[$$.nv] = $3; +- $$.nv += 1; +- } +- ; +- +-position: +- position_not_place +- { $$ = $1; } +- | place +- { +- position pos = $1; +- $$.x = pos.x; +- $$.y = pos.y; +- } +- | '(' place ')' +- { +- position pos = $2; +- $$.x = pos.x; +- $$.y = pos.y; +- } +- ; +- +-position_not_place: +- expr_pair +- { $$ = $1; } +- | position '+' expr_pair +- { +- $$.x = $1.x + $3.x; +- $$.y = $1.y + $3.y; +- } +- | '(' position '+' expr_pair ')' +- { +- $$.x = $2.x + $4.x; +- $$.y = $2.y + $4.y; +- } +- | position '-' expr_pair +- { +- $$.x = $1.x - $3.x; +- $$.y = $1.y - $3.y; +- } +- | '(' position '-' expr_pair ')' +- { +- $$.x = $2.x - $4.x; +- $$.y = $2.y - $4.y; +- } +- | '(' position ',' position ')' +- { +- $$.x = $2.x; +- $$.y = $4.y; +- } +- | expr between position AND position +- { +- $$.x = (1.0 - $1)*$3.x + $1*$5.x; +- $$.y = (1.0 - $1)*$3.y + $1*$5.y; +- } +- | '(' expr between position AND position ')' +- { +- $$.x = (1.0 - $2)*$4.x + $2*$6.x; +- $$.y = (1.0 - $2)*$4.y + $2*$6.y; +- } +- /* the next two rules cause harmless shift/reduce warnings */ +- | expr_not_lower_than '<' position ',' position '>' +- { +- $$.x = (1.0 - $1)*$3.x + $1*$5.x; +- $$.y = (1.0 - $1)*$3.y + $1*$5.y; +- } +- | '(' expr_not_lower_than '<' position ',' position '>' ')' +- { +- $$.x = (1.0 - $2)*$4.x + $2*$6.x; +- $$.y = (1.0 - $2)*$4.y + $2*$6.y; +- } +- ; +- +-between: +- BETWEEN +- | OF THE WAY BETWEEN +- ; +- +-expr_pair: +- expr ',' expr +- { +- $$.x = $1; +- $$.y = $3; +- } +- | '(' expr_pair ')' +- { $$ = $2; } +- ; +- +-place: +- /* line at A left == line (at A) left */ +- label %prec CHOP +- { $$ = $1; } +- | label corner +- { +- path pth($2); +- if (!pth.follow($1, & $$)) +- YYABORT; +- } +- | corner label +- { +- path pth($1); +- if (!pth.follow($2, & $$)) +- YYABORT; +- } +- | corner OF label +- { +- path pth($1); +- if (!pth.follow($3, & $$)) +- YYABORT; +- } +- | HERE +- { +- $$.x = current_position.x; +- $$.y = current_position.y; +- $$.obj = 0; +- } +- ; +- +-label: +- LABEL +- { +- place *p = lookup_label($1); +- if (!p) { +- lex_error("there is no place `%1'", $1); +- YYABORT; +- } +- $$ = *p; +- a_delete $1; +- } +- | nth_primitive +- { $$.obj = $1; } +- | label '.' LABEL +- { +- path pth($3); +- if (!pth.follow($1, & $$)) +- YYABORT; +- } +- ; +- +-ordinal: +- ORDINAL +- { $$ = $1; } +- | '`' any_expr TH +- { +- // XXX Check for overflow (and non-integers?). +- $$ = (int)$2; +- } +- ; +- +-optional_ordinal_last: +- LAST +- { $$ = 1; } +- | ordinal LAST +- { $$ = $1; } +- ; +- +-nth_primitive: +- ordinal object_type +- { +- int count = 0; +- object *p; +- for (p = olist.head; p != 0; p = p->next) +- if (p->type() == $2 && ++count == $1) { +- $$ = p; +- break; +- } +- if (p == 0) { +- lex_error("there is no %1%2 %3", $1, ordinal_postfix($1), +- object_type_name($2)); +- YYABORT; +- } +- } +- | optional_ordinal_last object_type +- { +- int count = 0; +- object *p; +- for (p = olist.tail; p != 0; p = p->prev) +- if (p->type() == $2 && ++count == $1) { +- $$ = p; +- break; +- } +- if (p == 0) { +- lex_error("there is no %1%2 last %3", $1, +- ordinal_postfix($1), object_type_name($2)); +- YYABORT; +- } +- } +- ; +- +-object_type: +- BOX +- { $$ = BOX_OBJECT; } +- | CIRCLE +- { $$ = CIRCLE_OBJECT; } +- | ELLIPSE +- { $$ = ELLIPSE_OBJECT; } +- | ARC +- { $$ = ARC_OBJECT; } +- | LINE +- { $$ = LINE_OBJECT; } +- | ARROW +- { $$ = ARROW_OBJECT; } +- | SPLINE +- { $$ = SPLINE_OBJECT; } +- | '[' ']' +- { $$ = BLOCK_OBJECT; } +- | TEXT +- { $$ = TEXT_OBJECT; } +- ; +- +-label_path: +- '.' LABEL +- { $$ = new path($2); } +- | label_path '.' LABEL +- { +- $$ = $1; +- $$->append($3); +- } +- ; +- +-relative_path: +- corner %prec CHOP +- { $$ = new path($1); } +- /* give this a lower precedence than LEFT and RIGHT so that +- [A: box] with .A left == [A: box] with (.A left) */ +- | label_path %prec TEXT +- { $$ = $1; } +- | label_path corner +- { +- $$ = $1; +- $$->append($2); +- } +- ; +- +-path: +- relative_path +- { $$ = $1; } +- | '(' relative_path ',' relative_path ')' +- { +- $$ = $2; +- $$->set_ypath($4); +- } +- /* The rest of these rules are a compatibility sop. */ +- | ORDINAL LAST object_type relative_path +- { +- lex_warning("`%1%2 last %3' in `with' argument ignored", +- $1, ordinal_postfix($1), object_type_name($3)); +- $$ = $4; +- } +- | LAST object_type relative_path +- { +- lex_warning("`last %1' in `with' argument ignored", +- object_type_name($2)); +- $$ = $3; +- } +- | ORDINAL object_type relative_path +- { +- lex_warning("`%1%2 %3' in `with' argument ignored", +- $1, ordinal_postfix($1), object_type_name($2)); +- $$ = $3; +- } +- | LABEL relative_path +- { +- lex_warning("initial `%1' in `with' argument ignored", $1); +- a_delete $1; +- $$ = $2; +- } +- ; +- +-corner: +- DOT_N +- { $$ = &object::north; } +- | DOT_E +- { $$ = &object::east; } +- | DOT_W +- { $$ = &object::west; } +- | DOT_S +- { $$ = &object::south; } +- | DOT_NE +- { $$ = &object::north_east; } +- | DOT_SE +- { $$ = &object:: south_east; } +- | DOT_NW +- { $$ = &object::north_west; } +- | DOT_SW +- { $$ = &object::south_west; } +- | DOT_C +- { $$ = &object::center; } +- | DOT_START +- { $$ = &object::start; } +- | DOT_END +- { $$ = &object::end; } +- | TOP +- { $$ = &object::north; } +- | BOTTOM +- { $$ = &object::south; } +- | LEFT +- { $$ = &object::west; } +- | RIGHT +- { $$ = &object::east; } +- | UPPER LEFT +- { $$ = &object::north_west; } +- | LOWER LEFT +- { $$ = &object::south_west; } +- | UPPER RIGHT +- { $$ = &object::north_east; } +- | LOWER RIGHT +- { $$ = &object::south_east; } +- | LEFT_CORNER +- { $$ = &object::west; } +- | RIGHT_CORNER +- { $$ = &object::east; } +- | UPPER LEFT_CORNER +- { $$ = &object::north_west; } +- | LOWER LEFT_CORNER +- { $$ = &object::south_west; } +- | UPPER RIGHT_CORNER +- { $$ = &object::north_east; } +- | LOWER RIGHT_CORNER +- { $$ = &object::south_east; } +- | NORTH +- { $$ = &object::north; } +- | SOUTH +- { $$ = &object::south; } +- | EAST +- { $$ = &object::east; } +- | WEST +- { $$ = &object::west; } +- | CENTER +- { $$ = &object::center; } +- | START +- { $$ = &object::start; } +- | END +- { $$ = &object::end; } +- ; +- +-expr: +- expr_lower_than +- { $$ = $1; } +- | expr_not_lower_than +- { $$ = $1; } +- ; +- +-expr_lower_than: +- expr '<' expr +- { $$ = ($1 < $3); } +- ; +- +-expr_not_lower_than: +- VARIABLE +- { +- if (!lookup_variable($1, & $$)) { +- lex_error("there is no variable `%1'", $1); +- YYABORT; +- } +- a_delete $1; +- } +- | NUMBER +- { $$ = $1; } +- | place DOT_X +- { +- if ($1.obj != 0) +- $$ = $1.obj->origin().x; +- else +- $$ = $1.x; +- } +- | place DOT_Y +- { +- if ($1.obj != 0) +- $$ = $1.obj->origin().y; +- else +- $$ = $1.y; +- } +- | place DOT_HT +- { +- if ($1.obj != 0) +- $$ = $1.obj->height(); +- else +- $$ = 0.0; +- } +- | place DOT_WID +- { +- if ($1.obj != 0) +- $$ = $1.obj->width(); +- else +- $$ = 0.0; +- } +- | place DOT_RAD +- { +- if ($1.obj != 0) +- $$ = $1.obj->radius(); +- else +- $$ = 0.0; +- } +- | expr '+' expr +- { $$ = $1 + $3; } +- | expr '-' expr +- { $$ = $1 - $3; } +- | expr '*' expr +- { $$ = $1 * $3; } +- | expr '/' expr +- { +- if ($3 == 0.0) { +- lex_error("division by zero"); +- YYABORT; +- } +- $$ = $1/$3; +- } +- | expr '%' expr +- { +- if ($3 == 0.0) { +- lex_error("modulus by zero"); +- YYABORT; +- } +- $$ = fmod($1, $3); +- } +- | expr '^' expr +- { +- errno = 0; +- $$ = pow($1, $3); +- if (errno == EDOM) { +- lex_error("arguments to `^' operator out of domain"); +- YYABORT; +- } +- if (errno == ERANGE) { +- lex_error("result of `^' operator out of range"); +- YYABORT; +- } +- } +- | '-' expr %prec '!' +- { $$ = -$2; } +- | '(' any_expr ')' +- { $$ = $2; } +- | SIN '(' any_expr ')' +- { +- errno = 0; +- $$ = sin($3); +- if (errno == ERANGE) { +- lex_error("sin result out of range"); +- YYABORT; +- } +- } +- | COS '(' any_expr ')' +- { +- errno = 0; +- $$ = cos($3); +- if (errno == ERANGE) { +- lex_error("cos result out of range"); +- YYABORT; +- } +- } +- | ATAN2 '(' any_expr ',' any_expr ')' +- { +- errno = 0; +- $$ = atan2($3, $5); +- if (errno == EDOM) { +- lex_error("atan2 argument out of domain"); +- YYABORT; +- } +- if (errno == ERANGE) { +- lex_error("atan2 result out of range"); +- YYABORT; +- } +- } +- | LOG '(' any_expr ')' +- { +- errno = 0; +- $$ = log10($3); +- if (errno == ERANGE) { +- lex_error("log result out of range"); +- YYABORT; +- } +- } +- | EXP '(' any_expr ')' +- { +- errno = 0; +- $$ = pow(10.0, $3); +- if (errno == ERANGE) { +- lex_error("exp result out of range"); +- YYABORT; +- } +- } +- | SQRT '(' any_expr ')' +- { +- errno = 0; +- $$ = sqrt($3); +- if (errno == EDOM) { +- lex_error("sqrt argument out of domain"); +- YYABORT; +- } +- } +- | K_MAX '(' any_expr ',' any_expr ')' +- { $$ = $3 > $5 ? $3 : $5; } +- | K_MIN '(' any_expr ',' any_expr ')' +- { $$ = $3 < $5 ? $3 : $5; } +- | INT '(' any_expr ')' +- { $$ = $3 < 0 ? -floor(-$3) : floor($3); } +- | RAND '(' any_expr ')' +- { $$ = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*$3); } +- | RAND '(' ')' +- { +- /* return a random number in the range [0,1) */ +- /* portable, but not very random */ +- $$ = (rand() & 0x7fff) / double(0x8000); +- } +- | SRAND '(' any_expr ')' +- { +- $$ = 0; +- srand((unsigned int)$3); +- } +- | expr LESSEQUAL expr +- { $$ = ($1 <= $3); } +- | expr '>' expr +- { $$ = ($1 > $3); } +- | expr GREATEREQUAL expr +- { $$ = ($1 >= $3); } +- | expr EQUALEQUAL expr +- { $$ = ($1 == $3); } +- | expr NOTEQUAL expr +- { $$ = ($1 != $3); } +- | expr ANDAND expr +- { $$ = ($1 != 0.0 && $3 != 0.0); } +- | expr OROR expr +- { $$ = ($1 != 0.0 || $3 != 0.0); } +- | '!' expr +- { $$ = ($2 == 0.0); } +- +- ; +- +-%% +- +-/* bison defines const to be empty unless __STDC__ is defined, which it +-isn't under cfront */ +- +-#ifdef const +-#undef const +-#endif +- +-static struct { +- const char *name; +- double val; +- int scaled; // non-zero if val should be multiplied by scale +-} defaults_table[] = { +- { "arcrad", .25, 1 }, +- { "arrowht", .1, 1 }, +- { "arrowwid", .05, 1 }, +- { "circlerad", .25, 1 }, +- { "boxht", .5, 1 }, +- { "boxwid", .75, 1 }, +- { "boxrad", 0.0, 1 }, +- { "dashwid", .05, 1 }, +- { "ellipseht", .5, 1 }, +- { "ellipsewid", .75, 1 }, +- { "moveht", .5, 1 }, +- { "movewid", .5, 1 }, +- { "lineht", .5, 1 }, +- { "linewid", .5, 1 }, +- { "textht", 0.0, 1 }, +- { "textwid", 0.0, 1 }, +- { "scale", 1.0, 0 }, +- { "linethick", -1.0, 0 }, // in points +- { "fillval", .5, 0 }, +- { "arrowhead", 1.0, 0 }, +- { "maxpswid", 8.5, 0 }, +- { "maxpsht", 11.0, 0 }, +-}; +- +-place *lookup_label(const char *label) +-{ +- saved_state *state = current_saved_state; +- PTABLE(place) *tbl = current_table; +- for (;;) { +- place *pl = tbl->lookup(label); +- if (pl) +- return pl; +- if (!state) +- return 0; +- tbl = state->tbl; +- state = state->prev; +- } +-} +- +-void define_label(const char *label, const place *pl) +-{ +- place *p = new place[1]; +- *p = *pl; +- current_table->define(label, p); +-} +- +-int lookup_variable(const char *name, double *val) +-{ +- place *pl = lookup_label(name); +- if (pl) { +- *val = pl->x; +- return 1; +- } +- return 0; +-} +- +-void define_variable(const char *name, double val) +-{ +- place *p = new place[1]; +- p->obj = 0; +- p->x = val; +- p->y = 0.0; +- current_table->define(name, p); +- if (strcmp(name, "scale") == 0) { +- // When the scale changes, reset all scaled pre-defined variables to +- // their default values. +- for (unsigned int i = 0; +- i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) +- if (defaults_table[i].scaled) +- define_variable(defaults_table[i].name, val*defaults_table[i].val); +- } +-} +- +-// called once only (not once per parse) +- +-void parse_init() +-{ +- current_direction = RIGHT_DIRECTION; +- current_position.x = 0.0; +- current_position.y = 0.0; +- // This resets everything to its default value. +- reset_all(); +-} +- +-void reset(const char *nm) +-{ +- for (unsigned int i = 0; +- i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) +- if (strcmp(nm, defaults_table[i].name) == 0) { +- double val = defaults_table[i].val; +- if (defaults_table[i].scaled) { +- double scale; +- lookup_variable("scale", &scale); +- val *= scale; +- } +- define_variable(defaults_table[i].name, val); +- return; +- } +- lex_error("`%1' is not a predefined variable", nm); +-} +- +-void reset_all() +-{ +- // We only have to explicitly reset the pre-defined variables that +- // aren't scaled because `scale' is not scaled, and changing the +- // value of `scale' will reset all the pre-defined variables that +- // are scaled. +- for (unsigned int i = 0; +- i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) +- if (!defaults_table[i].scaled) +- define_variable(defaults_table[i].name, defaults_table[i].val); +-} +- +-// called after each parse +- +-void parse_cleanup() +-{ +- while (current_saved_state != 0) { +- delete current_table; +- current_table = current_saved_state->tbl; +- saved_state *tem = current_saved_state; +- current_saved_state = current_saved_state->prev; +- delete tem; +- } +- assert(current_table == &top_table); +- PTABLE_ITERATOR(place) iter(current_table); +- const char *key; +- place *pl; +- while (iter.next(&key, &pl)) +- if (pl->obj != 0) { +- position pos = pl->obj->origin(); +- pl->obj = 0; +- pl->x = pos.x; +- pl->y = pos.y; +- } +- while (olist.head != 0) { +- object *tem = olist.head; +- olist.head = olist.head->next; +- delete tem; +- } +- olist.tail = 0; +- current_direction = RIGHT_DIRECTION; +- current_position.x = 0.0; +- current_position.y = 0.0; +-} +- +-const char *ordinal_postfix(int n) +-{ +- if (n < 10 || n > 20) +- switch (n % 10) { +- case 1: +- return "st"; +- case 2: +- return "nd"; +- case 3: +- return "rd"; +- } +- return "th"; +-} +- +-const char *object_type_name(object_type type) +-{ +- switch (type) { +- case BOX_OBJECT: +- return "box"; +- case CIRCLE_OBJECT: +- return "circle"; +- case ELLIPSE_OBJECT: +- return "ellipse"; +- case ARC_OBJECT: +- return "arc"; +- case SPLINE_OBJECT: +- return "spline"; +- case LINE_OBJECT: +- return "line"; +- case ARROW_OBJECT: +- return "arrow"; +- case MOVE_OBJECT: +- return "move"; +- case TEXT_OBJECT: +- return "\"\""; +- case BLOCK_OBJECT: +- return "[]"; +- case OTHER_OBJECT: +- case MARK_OBJECT: +- default: +- break; +- } +- return "object"; +-} +- +-static char sprintf_buf[1024]; +- +-char *format_number(const char *form, double n) +-{ +- if (form == 0) +- form = "%g"; +- return do_sprintf(form, &n, 1); +-} +- +-char *do_sprintf(const char *form, const double *v, int nv) +-{ +- string result; +- int i = 0; +- string one_format; +- while (*form) { +- if (*form == '%') { +- one_format += *form++; +- for (; *form != '\0' && strchr("#-+ 0123456789.", *form) != 0; form++) +- one_format += *form; +- if (*form == '\0' || strchr("eEfgG%", *form) == 0) { +- lex_error("bad sprintf format"); +- result += one_format; +- result += form; +- break; +- } +- if (*form == '%') { +- one_format += *form++; +- one_format += '\0'; +- snprintf(sprintf_buf, sizeof(sprintf_buf), +- "%s", one_format.contents()); +- } +- else { +- if (i >= nv) { +- lex_error("too few arguments to snprintf"); +- result += one_format; +- result += form; +- break; +- } +- one_format += *form++; +- one_format += '\0'; +- snprintf(sprintf_buf, sizeof(sprintf_buf), +- one_format.contents(), v[i++]); +- } +- one_format.clear(); +- result += sprintf_buf; +- } +- else +- result += *form++; +- } +- result += '\0'; +- return strsave(result.contents()); +-} +diff -Nuar groff-1.22.3.old/src/preproc/pic/pic.ypp groff-1.22.3/src/preproc/pic/pic.ypp +--- groff-1.22.3.old/src/preproc/pic/pic.ypp 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/pic/pic.ypp 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,1933 @@ ++/* Copyright (C) 1989-2014 Free Software Foundation, Inc. ++ Written by James Clark (jjc@jclark.com) ++ ++This file is part of groff. ++ ++groff 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. ++ ++groff 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 . */ ++ ++%{ ++#include "pic.h" ++#include "ptable.h" ++#include "object.h" ++ ++extern int delim_flag; ++extern void copy_rest_thru(const char *, const char *); ++extern void copy_file_thru(const char *, const char *, const char *); ++extern void push_body(const char *); ++extern void do_for(char *var, double from, double to, ++ int by_is_multiplicative, double by, char *body); ++extern void do_lookahead(); ++ ++/* Maximum number of characters produced by printf("%g") */ ++#define GDIGITS 14 ++ ++int yylex(); ++void yyerror(const char *); ++ ++void reset(const char *nm); ++void reset_all(); ++ ++place *lookup_label(const char *); ++void define_label(const char *label, const place *pl); ++ ++direction current_direction; ++position current_position; ++ ++implement_ptable(place) ++ ++PTABLE(place) top_table; ++ ++PTABLE(place) *current_table = &top_table; ++saved_state *current_saved_state = 0; ++ ++object_list olist; ++ ++const char *ordinal_postfix(int n); ++const char *object_type_name(object_type type); ++char *format_number(const char *form, double n); ++char *do_sprintf(const char *form, const double *v, int nv); ++ ++%} ++ ++%expect 2 ++ ++%union { ++ char *str; ++ int n; ++ double x; ++ struct { double x, y; } pair; ++ struct { double x; char *body; } if_data; ++ struct { char *str; const char *filename; int lineno; } lstr; ++ struct { double *v; int nv; int maxv; } dv; ++ struct { double val; int is_multiplicative; } by; ++ place pl; ++ object *obj; ++ corner crn; ++ path *pth; ++ object_spec *spec; ++ saved_state *pstate; ++ graphics_state state; ++ object_type obtype; ++} ++ ++%token LABEL ++%token VARIABLE ++%token NUMBER ++%token TEXT ++%token COMMAND_LINE ++%token DELIMITED ++%token ORDINAL ++%token TH ++%token LEFT_ARROW_HEAD ++%token RIGHT_ARROW_HEAD ++%token DOUBLE_ARROW_HEAD ++%token LAST ++%token BOX ++%token CIRCLE ++%token ELLIPSE ++%token ARC ++%token LINE ++%token ARROW ++%token MOVE ++%token SPLINE ++%token HEIGHT ++%token RADIUS ++%token FIGNAME ++%token WIDTH ++%token DIAMETER ++%token UP ++%token DOWN ++%token RIGHT ++%token LEFT ++%token FROM ++%token TO ++%token AT ++%token WITH ++%token BY ++%token THEN ++%token SOLID ++%token DOTTED ++%token DASHED ++%token CHOP ++%token SAME ++%token INVISIBLE ++%token LJUST ++%token RJUST ++%token ABOVE ++%token BELOW ++%token OF ++%token THE ++%token WAY ++%token BETWEEN ++%token AND ++%token HERE ++%token DOT_N ++%token DOT_E ++%token DOT_W ++%token DOT_S ++%token DOT_NE ++%token DOT_SE ++%token DOT_NW ++%token DOT_SW ++%token DOT_C ++%token DOT_START ++%token DOT_END ++%token DOT_X ++%token DOT_Y ++%token DOT_HT ++%token DOT_WID ++%token DOT_RAD ++%token SIN ++%token COS ++%token ATAN2 ++%token LOG ++%token EXP ++%token SQRT ++%token K_MAX ++%token K_MIN ++%token INT ++%token RAND ++%token SRAND ++%token COPY ++%token THRU ++%token TOP ++%token BOTTOM ++%token UPPER ++%token LOWER ++%token SH ++%token PRINT ++%token CW ++%token CCW ++%token FOR ++%token DO ++%token IF ++%token ELSE ++%token ANDAND ++%token OROR ++%token NOTEQUAL ++%token EQUALEQUAL ++%token LESSEQUAL ++%token GREATEREQUAL ++%token LEFT_CORNER ++%token RIGHT_CORNER ++%token NORTH ++%token SOUTH ++%token EAST ++%token WEST ++%token CENTER ++%token END ++%token START ++%token RESET ++%token UNTIL ++%token PLOT ++%token THICKNESS ++%token FILL ++%token COLORED ++%token OUTLINED ++%token SHADED ++%token XSLANTED ++%token YSLANTED ++%token ALIGNED ++%token SPRINTF ++%token COMMAND ++ ++%token DEFINE ++%token UNDEF ++ ++%left '.' ++ ++/* this ensures that plot 17 "%g" parses as (plot 17 "%g") */ ++%left PLOT ++%left TEXT SPRINTF ++ ++/* give text adjustments higher precedence than TEXT, so that ++box "foo" above ljust == box ("foo" above ljust) ++*/ ++ ++%left LJUST RJUST ABOVE BELOW ++ ++%left LEFT RIGHT ++/* Give attributes that take an optional expression a higher ++precedence than left and right, so that eg `line chop left' ++parses properly. */ ++%left CHOP SOLID DASHED DOTTED UP DOWN FILL COLORED OUTLINED ++%left XSLANTED YSLANTED ++%left LABEL ++ ++%left VARIABLE NUMBER '(' SIN COS ATAN2 LOG EXP SQRT K_MAX K_MIN INT RAND SRAND LAST ++%left ORDINAL HERE '`' ++ ++%left BOX CIRCLE ELLIPSE ARC LINE ARROW SPLINE '[' ++ ++/* these need to be lower than '-' */ ++%left HEIGHT RADIUS WIDTH DIAMETER FROM TO AT THICKNESS ++ ++/* these must have higher precedence than CHOP so that `label %prec CHOP' ++works */ ++%left DOT_N DOT_E DOT_W DOT_S DOT_NE DOT_SE DOT_NW DOT_SW DOT_C ++%left DOT_START DOT_END TOP BOTTOM LEFT_CORNER RIGHT_CORNER ++%left UPPER LOWER NORTH SOUTH EAST WEST CENTER START END ++ ++%left ',' ++%left OROR ++%left ANDAND ++%left EQUALEQUAL NOTEQUAL ++%left '<' '>' LESSEQUAL GREATEREQUAL ++ ++%left BETWEEN OF ++%left AND ++ ++%left '+' '-' ++%left '*' '/' '%' ++%right '!' ++%right '^' ++ ++%type expr expr_lower_than expr_not_lower_than any_expr text_expr ++%type optional_by ++%type expr_pair position_not_place ++%type simple_if ++%type nth_primitive ++%type corner ++%type path label_path relative_path ++%type place label element element_list middle_element_list ++%type object_spec ++%type position ++%type object_type ++%type optional_ordinal_last ordinal ++%type macro_name until ++%type sprintf_args ++%type text print_args print_arg ++ ++%% ++ ++top: ++ optional_separator ++ | element_list ++ { ++ if (olist.head) ++ print_picture(olist.head); ++ } ++ ; ++ ++ ++element_list: ++ optional_separator middle_element_list optional_separator ++ { $$ = $2; } ++ ; ++ ++middle_element_list: ++ element ++ { $$ = $1; } ++ | middle_element_list separator element ++ { $$ = $1; } ++ ; ++ ++optional_separator: ++ /* empty */ ++ | separator ++ ; ++ ++separator: ++ ';' ++ | separator ';' ++ ; ++ ++placeless_element: ++ FIGNAME '=' macro_name ++ { ++ a_delete graphname; ++ graphname = new char[strlen($3) + 1]; ++ strcpy(graphname, $3); ++ a_delete $3; ++ } ++ | ++ VARIABLE '=' any_expr ++ { ++ define_variable($1, $3); ++ a_delete $1; ++ } ++ | VARIABLE ':' '=' any_expr ++ { ++ place *p = lookup_label($1); ++ if (!p) { ++ lex_error("variable `%1' not defined", $1); ++ YYABORT; ++ } ++ p->obj = 0; ++ p->x = $4; ++ p->y = 0.0; ++ a_delete $1; ++ } ++ | UP ++ { current_direction = UP_DIRECTION; } ++ | DOWN ++ { current_direction = DOWN_DIRECTION; } ++ | LEFT ++ { current_direction = LEFT_DIRECTION; } ++ | RIGHT ++ { current_direction = RIGHT_DIRECTION; } ++ | COMMAND_LINE ++ { ++ olist.append(make_command_object($1.str, $1.filename, ++ $1.lineno)); ++ } ++ | COMMAND print_args ++ { ++ olist.append(make_command_object($2.str, $2.filename, ++ $2.lineno)); ++ } ++ | PRINT print_args ++ { ++ fprintf(stderr, "%s\n", $2.str); ++ a_delete $2.str; ++ fflush(stderr); ++ } ++ | SH ++ { delim_flag = 1; } ++ DELIMITED ++ { ++ delim_flag = 0; ++ if (safer_flag) ++ lex_error("unsafe to run command `%1'", $3); ++ else ++ system($3); ++ a_delete $3; ++ } ++ | COPY TEXT ++ { ++ if (yychar < 0) ++ do_lookahead(); ++ do_copy($2.str); ++ // do not delete the filename ++ } ++ | COPY TEXT THRU ++ { delim_flag = 2; } ++ DELIMITED ++ { delim_flag = 0; } ++ until ++ { ++ if (yychar < 0) ++ do_lookahead(); ++ copy_file_thru($2.str, $5, $7); ++ // do not delete the filename ++ a_delete $5; ++ a_delete $7; ++ } ++ | COPY THRU ++ { delim_flag = 2; } ++ DELIMITED ++ { delim_flag = 0; } ++ until ++ { ++ if (yychar < 0) ++ do_lookahead(); ++ copy_rest_thru($4, $6); ++ a_delete $4; ++ a_delete $6; ++ } ++ | FOR VARIABLE '=' expr TO expr optional_by DO ++ { delim_flag = 1; } ++ DELIMITED ++ { ++ delim_flag = 0; ++ if (yychar < 0) ++ do_lookahead(); ++ do_for($2, $4, $6, $7.is_multiplicative, $7.val, $10); ++ } ++ | simple_if ++ { ++ if (yychar < 0) ++ do_lookahead(); ++ if ($1.x != 0.0) ++ push_body($1.body); ++ a_delete $1.body; ++ } ++ | simple_if ELSE ++ { delim_flag = 1; } ++ DELIMITED ++ { ++ delim_flag = 0; ++ if (yychar < 0) ++ do_lookahead(); ++ if ($1.x != 0.0) ++ push_body($1.body); ++ else ++ push_body($4); ++ a_delete $1.body; ++ a_delete $4; ++ } ++ | reset_variables ++ | RESET ++ { define_variable("scale", 1.0); } ++ ; ++ ++macro_name: ++ VARIABLE ++ | LABEL ++ ; ++ ++reset_variables: ++ RESET VARIABLE ++ { ++ reset($2); ++ a_delete $2; ++ } ++ | reset_variables VARIABLE ++ { ++ reset($2); ++ a_delete $2; ++ } ++ | reset_variables ',' VARIABLE ++ { ++ reset($3); ++ a_delete $3; ++ } ++ ; ++ ++print_args: ++ print_arg ++ { $$ = $1; } ++ | print_args print_arg ++ { ++ $$.str = new char[strlen($1.str) + strlen($2.str) + 1]; ++ strcpy($$.str, $1.str); ++ strcat($$.str, $2.str); ++ a_delete $1.str; ++ a_delete $2.str; ++ if ($1.filename) { ++ $$.filename = $1.filename; ++ $$.lineno = $1.lineno; ++ } ++ else if ($2.filename) { ++ $$.filename = $2.filename; ++ $$.lineno = $2.lineno; ++ } ++ } ++ ; ++ ++print_arg: ++ expr %prec ',' ++ { ++ $$.str = new char[GDIGITS + 1]; ++ sprintf($$.str, "%g", $1); ++ $$.filename = 0; ++ $$.lineno = 0; ++ } ++ | text ++ { $$ = $1; } ++ | position %prec ',' ++ { ++ $$.str = new char[GDIGITS + 2 + GDIGITS + 1]; ++ sprintf($$.str, "%g, %g", $1.x, $1.y); ++ $$.filename = 0; ++ $$.lineno = 0; ++ } ++ ; ++ ++simple_if: ++ IF any_expr THEN ++ { delim_flag = 1; } ++ DELIMITED ++ { ++ delim_flag = 0; ++ $$.x = $2; ++ $$.body = $5; ++ } ++ ; ++ ++until: ++ /* empty */ ++ { $$ = 0; } ++ | UNTIL TEXT ++ { $$ = $2.str; } ++ ; ++ ++any_expr: ++ expr ++ { $$ = $1; } ++ | text_expr ++ { $$ = $1; } ++ ; ++ ++text_expr: ++ text EQUALEQUAL text ++ { ++ $$ = strcmp($1.str, $3.str) == 0; ++ a_delete $1.str; ++ a_delete $3.str; ++ } ++ | text NOTEQUAL text ++ { ++ $$ = strcmp($1.str, $3.str) != 0; ++ a_delete $1.str; ++ a_delete $3.str; ++ } ++ | text_expr ANDAND text_expr ++ { $$ = ($1 != 0.0 && $3 != 0.0); } ++ | text_expr ANDAND expr ++ { $$ = ($1 != 0.0 && $3 != 0.0); } ++ | expr ANDAND text_expr ++ { $$ = ($1 != 0.0 && $3 != 0.0); } ++ | text_expr OROR text_expr ++ { $$ = ($1 != 0.0 || $3 != 0.0); } ++ | text_expr OROR expr ++ { $$ = ($1 != 0.0 || $3 != 0.0); } ++ | expr OROR text_expr ++ { $$ = ($1 != 0.0 || $3 != 0.0); } ++ | '!' text_expr ++ { $$ = ($2 == 0.0); } ++ ; ++ ++ ++optional_by: ++ /* empty */ ++ { ++ $$.val = 1.0; ++ $$.is_multiplicative = 0; ++ } ++ | BY expr ++ { ++ $$.val = $2; ++ $$.is_multiplicative = 0; ++ } ++ | BY '*' expr ++ { ++ $$.val = $3; ++ $$.is_multiplicative = 1; ++ } ++ ; ++ ++element: ++ object_spec ++ { ++ $$.obj = $1->make_object(¤t_position, ++ ¤t_direction); ++ if ($$.obj == 0) ++ YYABORT; ++ delete $1; ++ if ($$.obj) ++ olist.append($$.obj); ++ else { ++ $$.x = current_position.x; ++ $$.y = current_position.y; ++ } ++ } ++ | LABEL ':' optional_separator element ++ { ++ $$ = $4; ++ define_label($1, & $$); ++ a_delete $1; ++ } ++ | LABEL ':' optional_separator position_not_place ++ { ++ $$.obj = 0; ++ $$.x = $4.x; ++ $$.y = $4.y; ++ define_label($1, & $$); ++ a_delete $1; ++ } ++ | LABEL ':' optional_separator place ++ { ++ $$ = $4; ++ define_label($1, & $$); ++ a_delete $1; ++ } ++ | '{' ++ { ++ $$.x = current_position.x; ++ $$.y = current_position.y; ++ $$.dir = current_direction; ++ } ++ element_list '}' ++ { ++ current_position.x = $2.x; ++ current_position.y = $2.y; ++ current_direction = $2.dir; ++ } ++ optional_element ++ { ++ $$ = $3; ++ } ++ | placeless_element ++ { ++ $$.obj = 0; ++ $$.x = current_position.x; ++ $$.y = current_position.y; ++ } ++ ; ++ ++optional_element: ++ /* empty */ ++ {} ++ | element ++ {} ++ ; ++ ++object_spec: ++ BOX ++ { $$ = new object_spec(BOX_OBJECT); } ++ | CIRCLE ++ { $$ = new object_spec(CIRCLE_OBJECT); } ++ | ELLIPSE ++ { $$ = new object_spec(ELLIPSE_OBJECT); } ++ | ARC ++ { ++ $$ = new object_spec(ARC_OBJECT); ++ $$->dir = current_direction; ++ } ++ | LINE ++ { ++ $$ = new object_spec(LINE_OBJECT); ++ lookup_variable("lineht", & $$->segment_height); ++ lookup_variable("linewid", & $$->segment_width); ++ $$->dir = current_direction; ++ } ++ | ARROW ++ { ++ $$ = new object_spec(ARROW_OBJECT); ++ lookup_variable("lineht", & $$->segment_height); ++ lookup_variable("linewid", & $$->segment_width); ++ $$->dir = current_direction; ++ } ++ | MOVE ++ { ++ $$ = new object_spec(MOVE_OBJECT); ++ lookup_variable("moveht", & $$->segment_height); ++ lookup_variable("movewid", & $$->segment_width); ++ $$->dir = current_direction; ++ } ++ | SPLINE ++ { ++ $$ = new object_spec(SPLINE_OBJECT); ++ lookup_variable("lineht", & $$->segment_height); ++ lookup_variable("linewid", & $$->segment_width); ++ $$->dir = current_direction; ++ } ++ | text %prec TEXT ++ { ++ $$ = new object_spec(TEXT_OBJECT); ++ $$->text = new text_item($1.str, $1.filename, $1.lineno); ++ } ++ | PLOT expr ++ { ++ $$ = new object_spec(TEXT_OBJECT); ++ $$->text = new text_item(format_number(0, $2), 0, -1); ++ } ++ | PLOT expr text ++ { ++ $$ = new object_spec(TEXT_OBJECT); ++ $$->text = new text_item(format_number($3.str, $2), ++ $3.filename, $3.lineno); ++ a_delete $3.str; ++ } ++ | '[' ++ { ++ saved_state *p = new saved_state; ++ $$ = p; ++ p->x = current_position.x; ++ p->y = current_position.y; ++ p->dir = current_direction; ++ p->tbl = current_table; ++ p->prev = current_saved_state; ++ current_position.x = 0.0; ++ current_position.y = 0.0; ++ current_table = new PTABLE(place); ++ current_saved_state = p; ++ olist.append(make_mark_object()); ++ } ++ element_list ']' ++ { ++ current_position.x = $2->x; ++ current_position.y = $2->y; ++ current_direction = $2->dir; ++ $$ = new object_spec(BLOCK_OBJECT); ++ olist.wrap_up_block(& $$->oblist); ++ $$->tbl = current_table; ++ current_table = $2->tbl; ++ current_saved_state = $2->prev; ++ delete $2; ++ } ++ | object_spec HEIGHT expr ++ { ++ $$ = $1; ++ $$->height = $3; ++ $$->flags |= HAS_HEIGHT; ++ } ++ | object_spec RADIUS expr ++ { ++ $$ = $1; ++ $$->radius = $3; ++ $$->flags |= HAS_RADIUS; ++ } ++ | object_spec WIDTH expr ++ { ++ $$ = $1; ++ $$->width = $3; ++ $$->flags |= HAS_WIDTH; ++ } ++ | object_spec DIAMETER expr ++ { ++ $$ = $1; ++ $$->radius = $3/2.0; ++ $$->flags |= HAS_RADIUS; ++ } ++ | object_spec expr %prec HEIGHT ++ { ++ $$ = $1; ++ $$->flags |= HAS_SEGMENT; ++ switch ($$->dir) { ++ case UP_DIRECTION: ++ $$->segment_pos.y += $2; ++ break; ++ case DOWN_DIRECTION: ++ $$->segment_pos.y -= $2; ++ break; ++ case RIGHT_DIRECTION: ++ $$->segment_pos.x += $2; ++ break; ++ case LEFT_DIRECTION: ++ $$->segment_pos.x -= $2; ++ break; ++ } ++ } ++ | object_spec UP ++ { ++ $$ = $1; ++ $$->dir = UP_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.y += $$->segment_height; ++ } ++ | object_spec UP expr ++ { ++ $$ = $1; ++ $$->dir = UP_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.y += $3; ++ } ++ | object_spec DOWN ++ { ++ $$ = $1; ++ $$->dir = DOWN_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.y -= $$->segment_height; ++ } ++ | object_spec DOWN expr ++ { ++ $$ = $1; ++ $$->dir = DOWN_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.y -= $3; ++ } ++ | object_spec RIGHT ++ { ++ $$ = $1; ++ $$->dir = RIGHT_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.x += $$->segment_width; ++ } ++ | object_spec RIGHT expr ++ { ++ $$ = $1; ++ $$->dir = RIGHT_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.x += $3; ++ } ++ | object_spec LEFT ++ { ++ $$ = $1; ++ $$->dir = LEFT_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.x -= $$->segment_width; ++ } ++ | object_spec LEFT expr ++ { ++ $$ = $1; ++ $$->dir = LEFT_DIRECTION; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.x -= $3; ++ } ++ | object_spec FROM position ++ { ++ $$ = $1; ++ $$->flags |= HAS_FROM; ++ $$->from.x = $3.x; ++ $$->from.y = $3.y; ++ } ++ | object_spec TO position ++ { ++ $$ = $1; ++ if ($$->flags & HAS_SEGMENT) ++ $$->segment_list = new segment($$->segment_pos, ++ $$->segment_is_absolute, ++ $$->segment_list); ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.x = $3.x; ++ $$->segment_pos.y = $3.y; ++ $$->segment_is_absolute = 1; ++ $$->flags |= HAS_TO; ++ $$->to.x = $3.x; ++ $$->to.y = $3.y; ++ } ++ | object_spec AT position ++ { ++ $$ = $1; ++ $$->flags |= HAS_AT; ++ $$->at.x = $3.x; ++ $$->at.y = $3.y; ++ if ($$->type != ARC_OBJECT) { ++ $$->flags |= HAS_FROM; ++ $$->from.x = $3.x; ++ $$->from.y = $3.y; ++ } ++ } ++ | object_spec WITH path ++ { ++ $$ = $1; ++ $$->flags |= HAS_WITH; ++ $$->with = $3; ++ } ++ | object_spec WITH position %prec ',' ++ { ++ $$ = $1; ++ $$->flags |= HAS_WITH; ++ position pos; ++ pos.x = $3.x; ++ pos.y = $3.y; ++ $$->with = new path(pos); ++ } ++ | object_spec BY expr_pair ++ { ++ $$ = $1; ++ $$->flags |= HAS_SEGMENT; ++ $$->segment_pos.x += $3.x; ++ $$->segment_pos.y += $3.y; ++ } ++ | object_spec THEN ++ { ++ $$ = $1; ++ if (!($$->flags & HAS_SEGMENT)) ++ switch ($$->dir) { ++ case UP_DIRECTION: ++ $$->segment_pos.y += $$->segment_width; ++ break; ++ case DOWN_DIRECTION: ++ $$->segment_pos.y -= $$->segment_width; ++ break; ++ case RIGHT_DIRECTION: ++ $$->segment_pos.x += $$->segment_width; ++ break; ++ case LEFT_DIRECTION: ++ $$->segment_pos.x -= $$->segment_width; ++ break; ++ } ++ $$->segment_list = new segment($$->segment_pos, ++ $$->segment_is_absolute, ++ $$->segment_list); ++ $$->flags &= ~HAS_SEGMENT; ++ $$->segment_pos.x = $$->segment_pos.y = 0.0; ++ $$->segment_is_absolute = 0; ++ } ++ | object_spec SOLID ++ { ++ $$ = $1; // nothing ++ } ++ | object_spec DOTTED ++ { ++ $$ = $1; ++ $$->flags |= IS_DOTTED; ++ lookup_variable("dashwid", & $$->dash_width); ++ } ++ | object_spec DOTTED expr ++ { ++ $$ = $1; ++ $$->flags |= IS_DOTTED; ++ $$->dash_width = $3; ++ } ++ | object_spec DASHED ++ { ++ $$ = $1; ++ $$->flags |= IS_DASHED; ++ lookup_variable("dashwid", & $$->dash_width); ++ } ++ | object_spec DASHED expr ++ { ++ $$ = $1; ++ $$->flags |= IS_DASHED; ++ $$->dash_width = $3; ++ } ++ | object_spec FILL ++ { ++ $$ = $1; ++ $$->flags |= IS_DEFAULT_FILLED; ++ } ++ | object_spec FILL expr ++ { ++ $$ = $1; ++ $$->flags |= IS_FILLED; ++ $$->fill = $3; ++ } ++ | object_spec XSLANTED expr ++ { ++ $$ = $1; ++ $$->flags |= IS_XSLANTED; ++ $$->xslanted = $3; ++ } ++ | object_spec YSLANTED expr ++ { ++ $$ = $1; ++ $$->flags |= IS_YSLANTED; ++ $$->yslanted = $3; ++ } ++ | object_spec SHADED text ++ { ++ $$ = $1; ++ $$->flags |= (IS_SHADED | IS_FILLED); ++ $$->shaded = new char[strlen($3.str)+1]; ++ strcpy($$->shaded, $3.str); ++ } ++ | object_spec COLORED text ++ { ++ $$ = $1; ++ $$->flags |= (IS_SHADED | IS_OUTLINED | IS_FILLED); ++ $$->shaded = new char[strlen($3.str)+1]; ++ strcpy($$->shaded, $3.str); ++ $$->outlined = new char[strlen($3.str)+1]; ++ strcpy($$->outlined, $3.str); ++ } ++ | object_spec OUTLINED text ++ { ++ $$ = $1; ++ $$->flags |= IS_OUTLINED; ++ $$->outlined = new char[strlen($3.str)+1]; ++ strcpy($$->outlined, $3.str); ++ } ++ | object_spec CHOP ++ { ++ $$ = $1; ++ // line chop chop means line chop 0 chop 0 ++ if ($$->flags & IS_DEFAULT_CHOPPED) { ++ $$->flags |= IS_CHOPPED; ++ $$->flags &= ~IS_DEFAULT_CHOPPED; ++ $$->start_chop = $$->end_chop = 0.0; ++ } ++ else if ($$->flags & IS_CHOPPED) { ++ $$->end_chop = 0.0; ++ } ++ else { ++ $$->flags |= IS_DEFAULT_CHOPPED; ++ } ++ } ++ | object_spec CHOP expr ++ { ++ $$ = $1; ++ if ($$->flags & IS_DEFAULT_CHOPPED) { ++ $$->flags |= IS_CHOPPED; ++ $$->flags &= ~IS_DEFAULT_CHOPPED; ++ $$->start_chop = 0.0; ++ $$->end_chop = $3; ++ } ++ else if ($$->flags & IS_CHOPPED) { ++ $$->end_chop = $3; ++ } ++ else { ++ $$->start_chop = $$->end_chop = $3; ++ $$->flags |= IS_CHOPPED; ++ } ++ } ++ | object_spec SAME ++ { ++ $$ = $1; ++ $$->flags |= IS_SAME; ++ } ++ | object_spec INVISIBLE ++ { ++ $$ = $1; ++ $$->flags |= IS_INVISIBLE; ++ } ++ | object_spec LEFT_ARROW_HEAD ++ { ++ $$ = $1; ++ $$->flags |= HAS_LEFT_ARROW_HEAD; ++ } ++ | object_spec RIGHT_ARROW_HEAD ++ { ++ $$ = $1; ++ $$->flags |= HAS_RIGHT_ARROW_HEAD; ++ } ++ | object_spec DOUBLE_ARROW_HEAD ++ { ++ $$ = $1; ++ $$->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD); ++ } ++ | object_spec CW ++ { ++ $$ = $1; ++ $$->flags |= IS_CLOCKWISE; ++ } ++ | object_spec CCW ++ { ++ $$ = $1; ++ $$->flags &= ~IS_CLOCKWISE; ++ } ++ | object_spec text %prec TEXT ++ { ++ $$ = $1; ++ text_item **p; ++ for (p = & $$->text; *p; p = &(*p)->next) ++ ; ++ *p = new text_item($2.str, $2.filename, $2.lineno); ++ } ++ | object_spec LJUST ++ { ++ $$ = $1; ++ if ($$->text) { ++ text_item *p; ++ for (p = $$->text; p->next; p = p->next) ++ ; ++ p->adj.h = LEFT_ADJUST; ++ } ++ } ++ | object_spec RJUST ++ { ++ $$ = $1; ++ if ($$->text) { ++ text_item *p; ++ for (p = $$->text; p->next; p = p->next) ++ ; ++ p->adj.h = RIGHT_ADJUST; ++ } ++ } ++ | object_spec ABOVE ++ { ++ $$ = $1; ++ if ($$->text) { ++ text_item *p; ++ for (p = $$->text; p->next; p = p->next) ++ ; ++ p->adj.v = ABOVE_ADJUST; ++ } ++ } ++ | object_spec BELOW ++ { ++ $$ = $1; ++ if ($$->text) { ++ text_item *p; ++ for (p = $$->text; p->next; p = p->next) ++ ; ++ p->adj.v = BELOW_ADJUST; ++ } ++ } ++ | object_spec THICKNESS expr ++ { ++ $$ = $1; ++ $$->flags |= HAS_THICKNESS; ++ $$->thickness = $3; ++ } ++ | object_spec ALIGNED ++ { ++ $$ = $1; ++ $$->flags |= IS_ALIGNED; ++ } ++ ; ++ ++text: ++ TEXT ++ { $$ = $1; } ++ | SPRINTF '(' TEXT sprintf_args ')' ++ { ++ $$.filename = $3.filename; ++ $$.lineno = $3.lineno; ++ $$.str = do_sprintf($3.str, $4.v, $4.nv); ++ a_delete $4.v; ++ a_delete $3.str; ++ } ++ ; ++ ++sprintf_args: ++ /* empty */ ++ { ++ $$.v = 0; ++ $$.nv = 0; ++ $$.maxv = 0; ++ } ++ | sprintf_args ',' expr ++ { ++ $$ = $1; ++ if ($$.nv >= $$.maxv) { ++ if ($$.nv == 0) { ++ $$.v = new double[4]; ++ $$.maxv = 4; ++ } ++ else { ++ double *oldv = $$.v; ++ $$.maxv *= 2; ++#if 0 ++ $$.v = new double[$$.maxv]; ++ memcpy($$.v, oldv, $$.nv*sizeof(double)); ++#else ++ // workaround for bug in Compaq C++ V6.5-033 ++ // for Compaq Tru64 UNIX V5.1A (Rev. 1885) ++ double *foo = new double[$$.maxv]; ++ memcpy(foo, oldv, $$.nv*sizeof(double)); ++ $$.v = foo; ++#endif ++ a_delete oldv; ++ } ++ } ++ $$.v[$$.nv] = $3; ++ $$.nv += 1; ++ } ++ ; ++ ++position: ++ position_not_place ++ { $$ = $1; } ++ | place ++ { ++ position pos = $1; ++ $$.x = pos.x; ++ $$.y = pos.y; ++ } ++ | '(' place ')' ++ { ++ position pos = $2; ++ $$.x = pos.x; ++ $$.y = pos.y; ++ } ++ ; ++ ++position_not_place: ++ expr_pair ++ { $$ = $1; } ++ | position '+' expr_pair ++ { ++ $$.x = $1.x + $3.x; ++ $$.y = $1.y + $3.y; ++ } ++ | '(' position '+' expr_pair ')' ++ { ++ $$.x = $2.x + $4.x; ++ $$.y = $2.y + $4.y; ++ } ++ | position '-' expr_pair ++ { ++ $$.x = $1.x - $3.x; ++ $$.y = $1.y - $3.y; ++ } ++ | '(' position '-' expr_pair ')' ++ { ++ $$.x = $2.x - $4.x; ++ $$.y = $2.y - $4.y; ++ } ++ | '(' position ',' position ')' ++ { ++ $$.x = $2.x; ++ $$.y = $4.y; ++ } ++ | expr between position AND position ++ { ++ $$.x = (1.0 - $1)*$3.x + $1*$5.x; ++ $$.y = (1.0 - $1)*$3.y + $1*$5.y; ++ } ++ | '(' expr between position AND position ')' ++ { ++ $$.x = (1.0 - $2)*$4.x + $2*$6.x; ++ $$.y = (1.0 - $2)*$4.y + $2*$6.y; ++ } ++ /* the next two rules cause harmless shift/reduce warnings */ ++ | expr_not_lower_than '<' position ',' position '>' ++ { ++ $$.x = (1.0 - $1)*$3.x + $1*$5.x; ++ $$.y = (1.0 - $1)*$3.y + $1*$5.y; ++ } ++ | '(' expr_not_lower_than '<' position ',' position '>' ')' ++ { ++ $$.x = (1.0 - $2)*$4.x + $2*$6.x; ++ $$.y = (1.0 - $2)*$4.y + $2*$6.y; ++ } ++ ; ++ ++between: ++ BETWEEN ++ | OF THE WAY BETWEEN ++ ; ++ ++expr_pair: ++ expr ',' expr ++ { ++ $$.x = $1; ++ $$.y = $3; ++ } ++ | '(' expr_pair ')' ++ { $$ = $2; } ++ ; ++ ++place: ++ /* line at A left == line (at A) left */ ++ label %prec CHOP ++ { $$ = $1; } ++ | label corner ++ { ++ path pth($2); ++ if (!pth.follow($1, & $$)) ++ YYABORT; ++ } ++ | corner label ++ { ++ path pth($1); ++ if (!pth.follow($2, & $$)) ++ YYABORT; ++ } ++ | corner OF label ++ { ++ path pth($1); ++ if (!pth.follow($3, & $$)) ++ YYABORT; ++ } ++ | HERE ++ { ++ $$.x = current_position.x; ++ $$.y = current_position.y; ++ $$.obj = 0; ++ } ++ ; ++ ++label: ++ LABEL ++ { ++ place *p = lookup_label($1); ++ if (!p) { ++ lex_error("there is no place `%1'", $1); ++ YYABORT; ++ } ++ $$ = *p; ++ a_delete $1; ++ } ++ | nth_primitive ++ { $$.obj = $1; } ++ | label '.' LABEL ++ { ++ path pth($3); ++ if (!pth.follow($1, & $$)) ++ YYABORT; ++ } ++ ; ++ ++ordinal: ++ ORDINAL ++ { $$ = $1; } ++ | '`' any_expr TH ++ { ++ // XXX Check for overflow (and non-integers?). ++ $$ = (int)$2; ++ } ++ ; ++ ++optional_ordinal_last: ++ LAST ++ { $$ = 1; } ++ | ordinal LAST ++ { $$ = $1; } ++ ; ++ ++nth_primitive: ++ ordinal object_type ++ { ++ int count = 0; ++ object *p; ++ for (p = olist.head; p != 0; p = p->next) ++ if (p->type() == $2 && ++count == $1) { ++ $$ = p; ++ break; ++ } ++ if (p == 0) { ++ lex_error("there is no %1%2 %3", $1, ordinal_postfix($1), ++ object_type_name($2)); ++ YYABORT; ++ } ++ } ++ | optional_ordinal_last object_type ++ { ++ int count = 0; ++ object *p; ++ for (p = olist.tail; p != 0; p = p->prev) ++ if (p->type() == $2 && ++count == $1) { ++ $$ = p; ++ break; ++ } ++ if (p == 0) { ++ lex_error("there is no %1%2 last %3", $1, ++ ordinal_postfix($1), object_type_name($2)); ++ YYABORT; ++ } ++ } ++ ; ++ ++object_type: ++ BOX ++ { $$ = BOX_OBJECT; } ++ | CIRCLE ++ { $$ = CIRCLE_OBJECT; } ++ | ELLIPSE ++ { $$ = ELLIPSE_OBJECT; } ++ | ARC ++ { $$ = ARC_OBJECT; } ++ | LINE ++ { $$ = LINE_OBJECT; } ++ | ARROW ++ { $$ = ARROW_OBJECT; } ++ | SPLINE ++ { $$ = SPLINE_OBJECT; } ++ | '[' ']' ++ { $$ = BLOCK_OBJECT; } ++ | TEXT ++ { $$ = TEXT_OBJECT; } ++ ; ++ ++label_path: ++ '.' LABEL ++ { $$ = new path($2); } ++ | label_path '.' LABEL ++ { ++ $$ = $1; ++ $$->append($3); ++ } ++ ; ++ ++relative_path: ++ corner %prec CHOP ++ { $$ = new path($1); } ++ /* give this a lower precedence than LEFT and RIGHT so that ++ [A: box] with .A left == [A: box] with (.A left) */ ++ | label_path %prec TEXT ++ { $$ = $1; } ++ | label_path corner ++ { ++ $$ = $1; ++ $$->append($2); ++ } ++ ; ++ ++path: ++ relative_path ++ { $$ = $1; } ++ | '(' relative_path ',' relative_path ')' ++ { ++ $$ = $2; ++ $$->set_ypath($4); ++ } ++ /* The rest of these rules are a compatibility sop. */ ++ | ORDINAL LAST object_type relative_path ++ { ++ lex_warning("`%1%2 last %3' in `with' argument ignored", ++ $1, ordinal_postfix($1), object_type_name($3)); ++ $$ = $4; ++ } ++ | LAST object_type relative_path ++ { ++ lex_warning("`last %1' in `with' argument ignored", ++ object_type_name($2)); ++ $$ = $3; ++ } ++ | ORDINAL object_type relative_path ++ { ++ lex_warning("`%1%2 %3' in `with' argument ignored", ++ $1, ordinal_postfix($1), object_type_name($2)); ++ $$ = $3; ++ } ++ | LABEL relative_path ++ { ++ lex_warning("initial `%1' in `with' argument ignored", $1); ++ a_delete $1; ++ $$ = $2; ++ } ++ ; ++ ++corner: ++ DOT_N ++ { $$ = &object::north; } ++ | DOT_E ++ { $$ = &object::east; } ++ | DOT_W ++ { $$ = &object::west; } ++ | DOT_S ++ { $$ = &object::south; } ++ | DOT_NE ++ { $$ = &object::north_east; } ++ | DOT_SE ++ { $$ = &object:: south_east; } ++ | DOT_NW ++ { $$ = &object::north_west; } ++ | DOT_SW ++ { $$ = &object::south_west; } ++ | DOT_C ++ { $$ = &object::center; } ++ | DOT_START ++ { $$ = &object::start; } ++ | DOT_END ++ { $$ = &object::end; } ++ | TOP ++ { $$ = &object::north; } ++ | BOTTOM ++ { $$ = &object::south; } ++ | LEFT ++ { $$ = &object::west; } ++ | RIGHT ++ { $$ = &object::east; } ++ | UPPER LEFT ++ { $$ = &object::north_west; } ++ | LOWER LEFT ++ { $$ = &object::south_west; } ++ | UPPER RIGHT ++ { $$ = &object::north_east; } ++ | LOWER RIGHT ++ { $$ = &object::south_east; } ++ | LEFT_CORNER ++ { $$ = &object::west; } ++ | RIGHT_CORNER ++ { $$ = &object::east; } ++ | UPPER LEFT_CORNER ++ { $$ = &object::north_west; } ++ | LOWER LEFT_CORNER ++ { $$ = &object::south_west; } ++ | UPPER RIGHT_CORNER ++ { $$ = &object::north_east; } ++ | LOWER RIGHT_CORNER ++ { $$ = &object::south_east; } ++ | NORTH ++ { $$ = &object::north; } ++ | SOUTH ++ { $$ = &object::south; } ++ | EAST ++ { $$ = &object::east; } ++ | WEST ++ { $$ = &object::west; } ++ | CENTER ++ { $$ = &object::center; } ++ | START ++ { $$ = &object::start; } ++ | END ++ { $$ = &object::end; } ++ ; ++ ++expr: ++ expr_lower_than ++ { $$ = $1; } ++ | expr_not_lower_than ++ { $$ = $1; } ++ ; ++ ++expr_lower_than: ++ expr '<' expr ++ { $$ = ($1 < $3); } ++ ; ++ ++expr_not_lower_than: ++ VARIABLE ++ { ++ if (!lookup_variable($1, & $$)) { ++ lex_error("there is no variable `%1'", $1); ++ YYABORT; ++ } ++ a_delete $1; ++ } ++ | NUMBER ++ { $$ = $1; } ++ | place DOT_X ++ { ++ if ($1.obj != 0) ++ $$ = $1.obj->origin().x; ++ else ++ $$ = $1.x; ++ } ++ | place DOT_Y ++ { ++ if ($1.obj != 0) ++ $$ = $1.obj->origin().y; ++ else ++ $$ = $1.y; ++ } ++ | place DOT_HT ++ { ++ if ($1.obj != 0) ++ $$ = $1.obj->height(); ++ else ++ $$ = 0.0; ++ } ++ | place DOT_WID ++ { ++ if ($1.obj != 0) ++ $$ = $1.obj->width(); ++ else ++ $$ = 0.0; ++ } ++ | place DOT_RAD ++ { ++ if ($1.obj != 0) ++ $$ = $1.obj->radius(); ++ else ++ $$ = 0.0; ++ } ++ | expr '+' expr ++ { $$ = $1 + $3; } ++ | expr '-' expr ++ { $$ = $1 - $3; } ++ | expr '*' expr ++ { $$ = $1 * $3; } ++ | expr '/' expr ++ { ++ if ($3 == 0.0) { ++ lex_error("division by zero"); ++ YYABORT; ++ } ++ $$ = $1/$3; ++ } ++ | expr '%' expr ++ { ++ if ($3 == 0.0) { ++ lex_error("modulus by zero"); ++ YYABORT; ++ } ++ $$ = fmod($1, $3); ++ } ++ | expr '^' expr ++ { ++ errno = 0; ++ $$ = pow($1, $3); ++ if (errno == EDOM) { ++ lex_error("arguments to `^' operator out of domain"); ++ YYABORT; ++ } ++ if (errno == ERANGE) { ++ lex_error("result of `^' operator out of range"); ++ YYABORT; ++ } ++ } ++ | '-' expr %prec '!' ++ { $$ = -$2; } ++ | '(' any_expr ')' ++ { $$ = $2; } ++ | SIN '(' any_expr ')' ++ { ++ errno = 0; ++ $$ = sin($3); ++ if (errno == ERANGE) { ++ lex_error("sin result out of range"); ++ YYABORT; ++ } ++ } ++ | COS '(' any_expr ')' ++ { ++ errno = 0; ++ $$ = cos($3); ++ if (errno == ERANGE) { ++ lex_error("cos result out of range"); ++ YYABORT; ++ } ++ } ++ | ATAN2 '(' any_expr ',' any_expr ')' ++ { ++ errno = 0; ++ $$ = atan2($3, $5); ++ if (errno == EDOM) { ++ lex_error("atan2 argument out of domain"); ++ YYABORT; ++ } ++ if (errno == ERANGE) { ++ lex_error("atan2 result out of range"); ++ YYABORT; ++ } ++ } ++ | LOG '(' any_expr ')' ++ { ++ errno = 0; ++ $$ = log10($3); ++ if (errno == ERANGE) { ++ lex_error("log result out of range"); ++ YYABORT; ++ } ++ } ++ | EXP '(' any_expr ')' ++ { ++ errno = 0; ++ $$ = pow(10.0, $3); ++ if (errno == ERANGE) { ++ lex_error("exp result out of range"); ++ YYABORT; ++ } ++ } ++ | SQRT '(' any_expr ')' ++ { ++ errno = 0; ++ $$ = sqrt($3); ++ if (errno == EDOM) { ++ lex_error("sqrt argument out of domain"); ++ YYABORT; ++ } ++ } ++ | K_MAX '(' any_expr ',' any_expr ')' ++ { $$ = $3 > $5 ? $3 : $5; } ++ | K_MIN '(' any_expr ',' any_expr ')' ++ { $$ = $3 < $5 ? $3 : $5; } ++ | INT '(' any_expr ')' ++ { $$ = $3 < 0 ? -floor(-$3) : floor($3); } ++ | RAND '(' any_expr ')' ++ { $$ = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*$3); } ++ | RAND '(' ')' ++ { ++ /* return a random number in the range [0,1) */ ++ /* portable, but not very random */ ++ $$ = (rand() & 0x7fff) / double(0x8000); ++ } ++ | SRAND '(' any_expr ')' ++ { ++ $$ = 0; ++ srand((unsigned int)$3); ++ } ++ | expr LESSEQUAL expr ++ { $$ = ($1 <= $3); } ++ | expr '>' expr ++ { $$ = ($1 > $3); } ++ | expr GREATEREQUAL expr ++ { $$ = ($1 >= $3); } ++ | expr EQUALEQUAL expr ++ { $$ = ($1 == $3); } ++ | expr NOTEQUAL expr ++ { $$ = ($1 != $3); } ++ | expr ANDAND expr ++ { $$ = ($1 != 0.0 && $3 != 0.0); } ++ | expr OROR expr ++ { $$ = ($1 != 0.0 || $3 != 0.0); } ++ | '!' expr ++ { $$ = ($2 == 0.0); } ++ ++ ; ++ ++%% ++ ++/* bison defines const to be empty unless __STDC__ is defined, which it ++isn't under cfront */ ++ ++#ifdef const ++#undef const ++#endif ++ ++static struct { ++ const char *name; ++ double val; ++ int scaled; // non-zero if val should be multiplied by scale ++} defaults_table[] = { ++ { "arcrad", .25, 1 }, ++ { "arrowht", .1, 1 }, ++ { "arrowwid", .05, 1 }, ++ { "circlerad", .25, 1 }, ++ { "boxht", .5, 1 }, ++ { "boxwid", .75, 1 }, ++ { "boxrad", 0.0, 1 }, ++ { "dashwid", .05, 1 }, ++ { "ellipseht", .5, 1 }, ++ { "ellipsewid", .75, 1 }, ++ { "moveht", .5, 1 }, ++ { "movewid", .5, 1 }, ++ { "lineht", .5, 1 }, ++ { "linewid", .5, 1 }, ++ { "textht", 0.0, 1 }, ++ { "textwid", 0.0, 1 }, ++ { "scale", 1.0, 0 }, ++ { "linethick", -1.0, 0 }, // in points ++ { "fillval", .5, 0 }, ++ { "arrowhead", 1.0, 0 }, ++ { "maxpswid", 8.5, 0 }, ++ { "maxpsht", 11.0, 0 }, ++}; ++ ++place *lookup_label(const char *label) ++{ ++ saved_state *state = current_saved_state; ++ PTABLE(place) *tbl = current_table; ++ for (;;) { ++ place *pl = tbl->lookup(label); ++ if (pl) ++ return pl; ++ if (!state) ++ return 0; ++ tbl = state->tbl; ++ state = state->prev; ++ } ++} ++ ++void define_label(const char *label, const place *pl) ++{ ++ place *p = new place[1]; ++ *p = *pl; ++ current_table->define(label, p); ++} ++ ++int lookup_variable(const char *name, double *val) ++{ ++ place *pl = lookup_label(name); ++ if (pl) { ++ *val = pl->x; ++ return 1; ++ } ++ return 0; ++} ++ ++void define_variable(const char *name, double val) ++{ ++ place *p = new place[1]; ++ p->obj = 0; ++ p->x = val; ++ p->y = 0.0; ++ current_table->define(name, p); ++ if (strcmp(name, "scale") == 0) { ++ // When the scale changes, reset all scaled pre-defined variables to ++ // their default values. ++ for (unsigned int i = 0; ++ i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) ++ if (defaults_table[i].scaled) ++ define_variable(defaults_table[i].name, val*defaults_table[i].val); ++ } ++} ++ ++// called once only (not once per parse) ++ ++void parse_init() ++{ ++ current_direction = RIGHT_DIRECTION; ++ current_position.x = 0.0; ++ current_position.y = 0.0; ++ // This resets everything to its default value. ++ reset_all(); ++} ++ ++void reset(const char *nm) ++{ ++ for (unsigned int i = 0; ++ i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) ++ if (strcmp(nm, defaults_table[i].name) == 0) { ++ double val = defaults_table[i].val; ++ if (defaults_table[i].scaled) { ++ double scale; ++ lookup_variable("scale", &scale); ++ val *= scale; ++ } ++ define_variable(defaults_table[i].name, val); ++ return; ++ } ++ lex_error("`%1' is not a predefined variable", nm); ++} ++ ++void reset_all() ++{ ++ // We only have to explicitly reset the pre-defined variables that ++ // aren't scaled because `scale' is not scaled, and changing the ++ // value of `scale' will reset all the pre-defined variables that ++ // are scaled. ++ for (unsigned int i = 0; ++ i < sizeof(defaults_table)/sizeof(defaults_table[0]); i++) ++ if (!defaults_table[i].scaled) ++ define_variable(defaults_table[i].name, defaults_table[i].val); ++} ++ ++// called after each parse ++ ++void parse_cleanup() ++{ ++ while (current_saved_state != 0) { ++ delete current_table; ++ current_table = current_saved_state->tbl; ++ saved_state *tem = current_saved_state; ++ current_saved_state = current_saved_state->prev; ++ delete tem; ++ } ++ assert(current_table == &top_table); ++ PTABLE_ITERATOR(place) iter(current_table); ++ const char *key; ++ place *pl; ++ while (iter.next(&key, &pl)) ++ if (pl->obj != 0) { ++ position pos = pl->obj->origin(); ++ pl->obj = 0; ++ pl->x = pos.x; ++ pl->y = pos.y; ++ } ++ while (olist.head != 0) { ++ object *tem = olist.head; ++ olist.head = olist.head->next; ++ delete tem; ++ } ++ olist.tail = 0; ++ current_direction = RIGHT_DIRECTION; ++ current_position.x = 0.0; ++ current_position.y = 0.0; ++} ++ ++const char *ordinal_postfix(int n) ++{ ++ if (n < 10 || n > 20) ++ switch (n % 10) { ++ case 1: ++ return "st"; ++ case 2: ++ return "nd"; ++ case 3: ++ return "rd"; ++ } ++ return "th"; ++} ++ ++const char *object_type_name(object_type type) ++{ ++ switch (type) { ++ case BOX_OBJECT: ++ return "box"; ++ case CIRCLE_OBJECT: ++ return "circle"; ++ case ELLIPSE_OBJECT: ++ return "ellipse"; ++ case ARC_OBJECT: ++ return "arc"; ++ case SPLINE_OBJECT: ++ return "spline"; ++ case LINE_OBJECT: ++ return "line"; ++ case ARROW_OBJECT: ++ return "arrow"; ++ case MOVE_OBJECT: ++ return "move"; ++ case TEXT_OBJECT: ++ return "\"\""; ++ case BLOCK_OBJECT: ++ return "[]"; ++ case OTHER_OBJECT: ++ case MARK_OBJECT: ++ default: ++ break; ++ } ++ return "object"; ++} ++ ++static char sprintf_buf[1024]; ++ ++char *format_number(const char *form, double n) ++{ ++ if (form == 0) ++ form = "%g"; ++ return do_sprintf(form, &n, 1); ++} ++ ++char *do_sprintf(const char *form, const double *v, int nv) ++{ ++ string result; ++ int i = 0; ++ string one_format; ++ while (*form) { ++ if (*form == '%') { ++ one_format += *form++; ++ for (; *form != '\0' && strchr("#-+ 0123456789.", *form) != 0; form++) ++ one_format += *form; ++ if (*form == '\0' || strchr("eEfgG%", *form) == 0) { ++ lex_error("bad sprintf format"); ++ result += one_format; ++ result += form; ++ break; ++ } ++ if (*form == '%') { ++ one_format += *form++; ++ one_format += '\0'; ++ snprintf(sprintf_buf, sizeof(sprintf_buf), ++ "%s", one_format.contents()); ++ } ++ else { ++ if (i >= nv) { ++ lex_error("too few arguments to snprintf"); ++ result += one_format; ++ result += form; ++ break; ++ } ++ one_format += *form++; ++ one_format += '\0'; ++ snprintf(sprintf_buf, sizeof(sprintf_buf), ++ one_format.contents(), v[i++]); ++ } ++ one_format.clear(); ++ result += sprintf_buf; ++ } ++ else ++ result += *form++; ++ } ++ result += '\0'; ++ return strsave(result.contents()); ++} +diff -Nuar groff-1.22.3.old/src/preproc/preconv/.gitignore groff-1.22.3/src/preproc/preconv/.gitignore +--- groff-1.22.3.old/src/preproc/preconv/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/preconv/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++preconv ++preconv.n +diff -Nuar groff-1.22.3.old/src/preproc/preconv/Makefile.sub groff-1.22.3/src/preproc/preconv/Makefile.sub +--- groff-1.22.3.old/src/preproc/preconv/Makefile.sub 2014-11-04 10:38:35.214524134 +0200 ++++ groff-1.22.3/src/preproc/preconv/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `preproc preconv' +-# +-# File position: /src/preproc/preconv/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=preconv$(EXEEXT) +-MAN1=preconv.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-EXTRA_LDFLAGS=$(LIBICONV) +-OBJS=preconv.$(OBJEXT) +-CCSRCS=$(srcdir)/preconv.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/preconv/preconv.am groff-1.22.3/src/preproc/preconv/preconv.am +--- groff-1.22.3.old/src/preproc/preconv/preconv.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/preconv/preconv.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,23 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += preconv ++preconv_LDADD = libgroff.a $(LIBM) $(LIBICONV) ++preconv_SOURCES = src/preproc/preconv/preconv.cpp ++man1_MANS += src/preproc/preconv/preconv.n ++EXTRA_DIST += src/preproc/preconv/preconv.man +diff -Nuar groff-1.22.3.old/src/preproc/preconv/preconv.cpp groff-1.22.3/src/preproc/preconv/preconv.cpp +--- groff-1.22.3.old/src/preproc/preconv/preconv.cpp 2014-11-04 10:38:35.214524134 +0200 ++++ groff-1.22.3/src/preproc/preconv/preconv.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -27,6 +27,7 @@ + #include "localcharset.h" + #include "nonposix.h" + #include "stringclass.h" ++#include "lf.h" + + #include + +@@ -1065,8 +1066,12 @@ + } + if (debug_flag) + fprintf(stderr, " encoding used: `%s'\n", encoding); +- if (!raw_flag) +- printf(".lf 1 %s\n", filename); ++ if (!raw_flag) { ++ string fn(filename); ++ fn += '\0'; ++ normalize_for_lf(fn); ++ printf(".lf 1 %s\n", fn.contents()); ++ } + int success = 1; + // Call converter (converters write to stdout). + if (!strcasecmp(encoding, "ISO-8859-1")) +diff -Nuar groff-1.22.3.old/src/preproc/preconv/preconv.man groff-1.22.3/src/preproc/preconv/preconv.man +--- groff-1.22.3.old/src/preproc/preconv/preconv.man 2014-11-04 10:38:35.214524134 +0200 ++++ groff-1.22.3/src/preproc/preconv/preconv.man 2015-04-23 20:57:03.000000000 +0300 +@@ -3,6 +3,10 @@ + preconv \- convert encoding of input files to something GNU troff understands + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" license (copying) + .de co + Copyright \[co] 2006-2014 Free Software Foundation, Inc. +@@ -355,6 +359,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Emacs setting + .\" Local Variables: + .\" mode: nroff +diff -Nuar groff-1.22.3.old/src/preproc/refer/.gitignore groff-1.22.3/src/preproc/refer/.gitignore +--- groff-1.22.3.old/src/preproc/refer/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/refer/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,5 @@ ++Makefile.dep ++refer ++refer.n ++y.output ++label.cpp +diff -Nuar groff-1.22.3.old/src/preproc/refer/label.cpp groff-1.22.3/src/preproc/refer/label.cpp +--- groff-1.22.3.old/src/preproc/refer/label.cpp 2014-11-04 10:38:38.659481067 +0200 ++++ groff-1.22.3/src/preproc/refer/label.cpp 1970-01-01 02:00:00.000000000 +0200 +@@ -1,2701 +0,0 @@ +-/* A Bison parser, made by GNU Bison 3.0.2. */ +- +-/* Bison implementation for Yacc-like parsers in C +- +- Copyright (C) 1984, 1989-1990, 2000-2013 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 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 . */ +- +-/* As a special exception, you may create a larger work that contains +- part or all of the Bison parser skeleton and distribute that work +- under terms of your choice, so long as that work isn't itself a +- parser generator using the skeleton or a modified version thereof +- as a parser skeleton. Alternatively, if you modify or redistribute +- the parser skeleton itself, you may (at your option) remove this +- special exception, which will cause the skeleton and the resulting +- Bison output files to be licensed under the GNU General Public +- License without this special exception. +- +- This special exception was added by the Free Software Foundation in +- version 2.2 of Bison. */ +- +-/* C LALR(1) parser skeleton written by Richard Stallman, by +- simplifying the original so-called "semantic" parser. */ +- +-/* All symbols defined below should begin with yy or YY, to avoid +- infringing on user name space. This should be done even for local +- variables, as they might otherwise be expanded by user macros. +- There are some unavoidable exceptions within include files to +- define necessary library symbols; they are noted "INFRINGES ON +- USER NAME SPACE" below. */ +- +-/* Identify Bison output. */ +-#define YYBISON 1 +- +-/* Bison version. */ +-#define YYBISON_VERSION "3.0.2" +- +-/* Skeleton name. */ +-#define YYSKELETON_NAME "yacc.c" +- +-/* Pure parsers. */ +-#define YYPURE 0 +- +-/* Push parsers. */ +-#define YYPUSH 0 +- +-/* Pull parsers. */ +-#define YYPULL 1 +- +- +- +- +-/* Copy the first part of user declarations. */ +-#line 20 "label.y" /* yacc.c:339 */ +- +- +-#include "refer.h" +-#include "refid.h" +-#include "ref.h" +-#include "token.h" +- +-int yylex(); +-void yyerror(const char *); +-int yyparse(); +- +-static const char *format_serial(char c, int n); +- +-struct label_info { +- int start; +- int length; +- int count; +- int total; +- label_info(const string &); +-}; +- +-label_info *lookup_label(const string &label); +- +-struct expression { +- enum { +- // Does the tentative label depend on the reference? +- CONTAINS_VARIABLE = 01, +- CONTAINS_STAR = 02, +- CONTAINS_FORMAT = 04, +- CONTAINS_AT = 010 +- }; +- virtual ~expression() { } +- virtual void evaluate(int, const reference &, string &, +- substring_position &) = 0; +- virtual unsigned analyze() { return 0; } +-}; +- +-class at_expr : public expression { +-public: +- at_expr() { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return CONTAINS_VARIABLE|CONTAINS_AT; } +-}; +- +-class format_expr : public expression { +- char type; +- int width; +- int first_number; +-public: +- format_expr(char c, int w = 0, int f = 1) +- : type(c), width(w), first_number(f) { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return CONTAINS_FORMAT; } +-}; +- +-class field_expr : public expression { +- int number; +- char name; +-public: +- field_expr(char nm, int num) : number(num), name(nm) { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return CONTAINS_VARIABLE; } +-}; +- +-class literal_expr : public expression { +- string s; +-public: +- literal_expr(const char *ptr, int len) : s(ptr, len) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class unary_expr : public expression { +-protected: +- expression *expr; +-public: +- unary_expr(expression *e) : expr(e) { } +- ~unary_expr() { delete expr; } +- void evaluate(int, const reference &, string &, substring_position &) = 0; +- unsigned analyze() { return expr ? expr->analyze() : 0; } +-}; +- +-// This caches the analysis of an expression. +- +-class analyzed_expr : public unary_expr { +- unsigned flags; +-public: +- analyzed_expr(expression *); +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return flags; } +-}; +- +-class star_expr : public unary_expr { +-public: +- star_expr(expression *e) : unary_expr(e) { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { +- return ((expr ? (expr->analyze() & ~CONTAINS_VARIABLE) : 0) +- | CONTAINS_STAR); +- } +-}; +- +-typedef void map_func(const char *, const char *, string &); +- +-class map_expr : public unary_expr { +- map_func *func; +-public: +- map_expr(expression *e, map_func *f) : unary_expr(e), func(f) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-typedef const char *extractor_func(const char *, const char *, const char **); +- +-class extractor_expr : public unary_expr { +- int part; +- extractor_func *func; +-public: +- enum { BEFORE = +1, MATCH = 0, AFTER = -1 }; +- extractor_expr(expression *e, extractor_func *f, int pt) +- : unary_expr(e), part(pt), func(f) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class truncate_expr : public unary_expr { +- int n; +-public: +- truncate_expr(expression *e, int i) : unary_expr(e), n(i) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class separator_expr : public unary_expr { +-public: +- separator_expr(expression *e) : unary_expr(e) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class binary_expr : public expression { +-protected: +- expression *expr1; +- expression *expr2; +-public: +- binary_expr(expression *e1, expression *e2) : expr1(e1), expr2(e2) { } +- ~binary_expr() { delete expr1; delete expr2; } +- void evaluate(int, const reference &, string &, substring_position &) = 0; +- unsigned analyze() { +- return (expr1 ? expr1->analyze() : 0) | (expr2 ? expr2->analyze() : 0); +- } +-}; +- +-class alternative_expr : public binary_expr { +-public: +- alternative_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class list_expr : public binary_expr { +-public: +- list_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class substitute_expr : public binary_expr { +-public: +- substitute_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class ternary_expr : public expression { +-protected: +- expression *expr1; +- expression *expr2; +- expression *expr3; +-public: +- ternary_expr(expression *e1, expression *e2, expression *e3) +- : expr1(e1), expr2(e2), expr3(e3) { } +- ~ternary_expr() { delete expr1; delete expr2; delete expr3; } +- void evaluate(int, const reference &, string &, substring_position &) = 0; +- unsigned analyze() { +- return ((expr1 ? expr1->analyze() : 0) +- | (expr2 ? expr2->analyze() : 0) +- | (expr3 ? expr3->analyze() : 0)); +- } +-}; +- +-class conditional_expr : public ternary_expr { +-public: +- conditional_expr(expression *e1, expression *e2, expression *e3) +- : ternary_expr(e1, e2, e3) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-static expression *parsed_label = 0; +-static expression *parsed_date_label = 0; +-static expression *parsed_short_label = 0; +- +-static expression *parse_result; +- +-string literals; +- +- +-#line 266 "label.cpp" /* yacc.c:339 */ +- +-# ifndef YY_NULLPTR +-# if defined __cplusplus && 201103L <= __cplusplus +-# define YY_NULLPTR nullptr +-# else +-# define YY_NULLPTR 0 +-# endif +-# endif +- +-/* Enabling verbose error messages. */ +-#ifdef YYERROR_VERBOSE +-# undef YYERROR_VERBOSE +-# define YYERROR_VERBOSE 1 +-#else +-# define YYERROR_VERBOSE 0 +-#endif +- +- +-/* Debug traces. */ +-#ifndef YYDEBUG +-# define YYDEBUG 0 +-#endif +-#if YYDEBUG +-extern int yydebug; +-#endif +- +-/* Token type. */ +-#ifndef YYTOKENTYPE +-# define YYTOKENTYPE +- enum yytokentype +- { +- TOKEN_LETTER = 258, +- TOKEN_LITERAL = 259, +- TOKEN_DIGIT = 260 +- }; +-#endif +-/* Tokens. */ +-#define TOKEN_LETTER 258 +-#define TOKEN_LITERAL 259 +-#define TOKEN_DIGIT 260 +- +-/* Value type. */ +-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +-typedef union YYSTYPE YYSTYPE; +-union YYSTYPE +-{ +-#line 220 "label.y" /* yacc.c:355 */ +- +- int num; +- expression *expr; +- struct { int ndigits; int val; } dig; +- struct { int start; int len; } str; +- +-#line 320 "label.cpp" /* yacc.c:355 */ +-}; +-# define YYSTYPE_IS_TRIVIAL 1 +-# define YYSTYPE_IS_DECLARED 1 +-#endif +- +- +-extern YYSTYPE yylval; +- +-int yyparse (void); +- +- +- +-/* Copy the second part of user declarations. */ +- +-#line 335 "label.cpp" /* yacc.c:358 */ +- +-#ifdef short +-# undef short +-#endif +- +-#ifdef YYTYPE_UINT8 +-typedef YYTYPE_UINT8 yytype_uint8; +-#else +-typedef unsigned char yytype_uint8; +-#endif +- +-#ifdef YYTYPE_INT8 +-typedef YYTYPE_INT8 yytype_int8; +-#else +-typedef signed char yytype_int8; +-#endif +- +-#ifdef YYTYPE_UINT16 +-typedef YYTYPE_UINT16 yytype_uint16; +-#else +-typedef unsigned short int yytype_uint16; +-#endif +- +-#ifdef YYTYPE_INT16 +-typedef YYTYPE_INT16 yytype_int16; +-#else +-typedef short int yytype_int16; +-#endif +- +-#ifndef YYSIZE_T +-# ifdef __SIZE_TYPE__ +-# define YYSIZE_T __SIZE_TYPE__ +-# elif defined size_t +-# define YYSIZE_T size_t +-# elif ! defined YYSIZE_T +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YYSIZE_T size_t +-# else +-# define YYSIZE_T unsigned int +-# endif +-#endif +- +-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +- +-#ifndef YY_ +-# if defined YYENABLE_NLS && YYENABLE_NLS +-# if ENABLE_NLS +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YY_(Msgid) dgettext ("bison-runtime", Msgid) +-# endif +-# endif +-# ifndef YY_ +-# define YY_(Msgid) Msgid +-# endif +-#endif +- +-#ifndef YY_ATTRIBUTE +-# if (defined __GNUC__ \ +- && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ +- || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +-# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +-# else +-# define YY_ATTRIBUTE(Spec) /* empty */ +-# endif +-#endif +- +-#ifndef YY_ATTRIBUTE_PURE +-# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +-#endif +- +-#ifndef YY_ATTRIBUTE_UNUSED +-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +-#endif +- +-#if !defined _Noreturn \ +- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +-# if defined _MSC_VER && 1200 <= _MSC_VER +-# define _Noreturn __declspec (noreturn) +-# else +-# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +-# endif +-#endif +- +-/* Suppress unused-variable warnings by "using" E. */ +-#if ! defined lint || defined __GNUC__ +-# define YYUSE(E) ((void) (E)) +-#else +-# define YYUSE(E) /* empty */ +-#endif +- +-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +-/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ +- _Pragma ("GCC diagnostic push") \ +- _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ +- _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ +- _Pragma ("GCC diagnostic pop") +-#else +-# define YY_INITIAL_VALUE(Value) Value +-#endif +-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +-# define YY_IGNORE_MAYBE_UNINITIALIZED_END +-#endif +-#ifndef YY_INITIAL_VALUE +-# define YY_INITIAL_VALUE(Value) /* Nothing. */ +-#endif +- +- +-#if ! defined yyoverflow || YYERROR_VERBOSE +- +-/* The parser invokes alloca or malloc; define the necessary symbols. */ +- +-# ifdef YYSTACK_USE_ALLOCA +-# if YYSTACK_USE_ALLOCA +-# ifdef __GNUC__ +-# define YYSTACK_ALLOC __builtin_alloca +-# elif defined __BUILTIN_VA_ARG_INCR +-# include /* INFRINGES ON USER NAME SPACE */ +-# elif defined _AIX +-# define YYSTACK_ALLOC __alloca +-# elif defined _MSC_VER +-# include /* INFRINGES ON USER NAME SPACE */ +-# define alloca _alloca +-# else +-# define YYSTACK_ALLOC alloca +-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS +-# include /* INFRINGES ON USER NAME SPACE */ +- /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +-# ifndef EXIT_SUCCESS +-# define EXIT_SUCCESS 0 +-# endif +-# endif +-# endif +-# endif +-# endif +- +-# ifdef YYSTACK_ALLOC +- /* Pacify GCC's 'empty if-body' warning. */ +-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) +-# ifndef YYSTACK_ALLOC_MAXIMUM +- /* The OS might guarantee only one guard page at the bottom of the stack, +- and a page size can be as small as 4096 bytes. So we cannot safely +- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number +- to allow for a few compiler-allocated temporary stack slots. */ +-# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +-# endif +-# else +-# define YYSTACK_ALLOC YYMALLOC +-# define YYSTACK_FREE YYFREE +-# ifndef YYSTACK_ALLOC_MAXIMUM +-# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +-# endif +-# if (defined __cplusplus && ! defined EXIT_SUCCESS \ +- && ! ((defined YYMALLOC || defined malloc) \ +- && (defined YYFREE || defined free))) +-# include /* INFRINGES ON USER NAME SPACE */ +-# ifndef EXIT_SUCCESS +-# define EXIT_SUCCESS 0 +-# endif +-# endif +-# ifndef YYMALLOC +-# define YYMALLOC malloc +-# if ! defined malloc && ! defined EXIT_SUCCESS +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +-# endif +-# endif +-# ifndef YYFREE +-# define YYFREE free +-# if ! defined free && ! defined EXIT_SUCCESS +-void free (void *); /* INFRINGES ON USER NAME SPACE */ +-# endif +-# endif +-# endif +-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ +- +- +-#if (! defined yyoverflow \ +- && (! defined __cplusplus \ +- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) +- +-/* A type that is properly aligned for any stack member. */ +-union yyalloc +-{ +- yytype_int16 yyss_alloc; +- YYSTYPE yyvs_alloc; +-}; +- +-/* The size of the maximum gap between one aligned stack and the next. */ +-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +- +-/* The size of an array large to enough to hold all stacks, each with +- N elements. */ +-# define YYSTACK_BYTES(N) \ +- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ +- + YYSTACK_GAP_MAXIMUM) +- +-# define YYCOPY_NEEDED 1 +- +-/* Relocate STACK from its old location to the new one. The +- local variables YYSIZE and YYSTACKSIZE give the old and new number of +- elements in the stack, and YYPTR gives the new location of the +- stack. Advance YYPTR to a properly aligned location for the next +- stack. */ +-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ +- do \ +- { \ +- YYSIZE_T yynewbytes; \ +- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ +- Stack = &yyptr->Stack_alloc; \ +- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ +- yyptr += yynewbytes / sizeof (*yyptr); \ +- } \ +- while (0) +- +-#endif +- +-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +-/* Copy COUNT objects from SRC to DST. The source and destination do +- not overlap. */ +-# ifndef YYCOPY +-# if defined __GNUC__ && 1 < __GNUC__ +-# define YYCOPY(Dst, Src, Count) \ +- __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) +-# else +-# define YYCOPY(Dst, Src, Count) \ +- do \ +- { \ +- YYSIZE_T yyi; \ +- for (yyi = 0; yyi < (Count); yyi++) \ +- (Dst)[yyi] = (Src)[yyi]; \ +- } \ +- while (0) +-# endif +-# endif +-#endif /* !YYCOPY_NEEDED */ +- +-/* YYFINAL -- State number of the termination state. */ +-#define YYFINAL 21 +-/* YYLAST -- Last index in YYTABLE. */ +-#define YYLAST 39 +- +-/* YYNTOKENS -- Number of terminals. */ +-#define YYNTOKENS 21 +-/* YYNNTS -- Number of nonterminals. */ +-#define YYNNTS 12 +-/* YYNRULES -- Number of rules. */ +-#define YYNRULES 34 +-/* YYNSTATES -- Number of states. */ +-#define YYNSTATES 49 +- +-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned +- by yylex, with out-of-bounds checking. */ +-#define YYUNDEFTOK 2 +-#define YYMAXUTOK 260 +- +-#define YYTRANSLATE(YYX) \ +- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) +- +-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM +- as returned by yylex, without out-of-bounds checking. */ +-static const yytype_uint8 yytranslate[] = +-{ +- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 12, 9, 2, +- 17, 18, 16, 14, 2, 15, 13, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 7, 2, +- 19, 2, 20, 6, 11, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 8, 2, 10, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +- 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, +- 5 +-}; +- +-#if YYDEBUG +- /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +-static const yytype_uint16 yyrline[] = +-{ +- 0, 248, 248, 253, 255, 261, 262, 267, 269, 271, +- 276, 278, 283, 285, 290, 292, 297, 299, 301, 317, +- 321, 352, 354, 356, 358, 360, 366, 367, 372, 374, +- 379, 381, 388, 389, 391 +-}; +-#endif +- +-#if YYDEBUG || YYERROR_VERBOSE || 0 +-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +- First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +-static const char *const yytname[] = +-{ +- "$end", "error", "$undefined", "TOKEN_LETTER", "TOKEN_LITERAL", +- "TOKEN_DIGIT", "'?'", "':'", "'|'", "'&'", "'~'", "'@'", "'%'", "'.'", +- "'+'", "'-'", "'*'", "'('", "')'", "'<'", "'>'", "$accept", "expr", +- "conditional", "optional_conditional", "alternative", "list", +- "substitute", "string", "optional_number", "number", "digits", "flag", YY_NULLPTR +-}; +-#endif +- +-# ifdef YYPRINT +-/* YYTOKNUM[NUM] -- (External) token number corresponding to the +- (internal) symbol number NUM (which must be that of a token). */ +-static const yytype_uint16 yytoknum[] = +-{ +- 0, 256, 257, 258, 259, 260, 63, 58, 124, 38, +- 126, 64, 37, 46, 43, 45, 42, 40, 41, 60, +- 62 +-}; +-# endif +- +-#define YYPACT_NINF -26 +- +-#define yypact_value_is_default(Yystate) \ +- (!!((Yystate) == (-26))) +- +-#define YYTABLE_NINF -1 +- +-#define yytable_value_is_error(Yytable_value) \ +- 0 +- +- /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing +- STATE-NUM. */ +-static const yytype_int8 yypact[] = +-{ +- 2, 11, -26, -26, 12, 2, 2, 24, -26, -26, +- 21, 2, 18, -6, -26, 26, -26, -26, 27, 15, +- 14, -26, 2, 2, 2, 18, 2, -3, 11, 11, +- -26, -26, -26, -26, -26, 28, 2, 2, -6, -26, +- -26, 33, 26, 26, 2, 11, -26, -26, 26 +-}; +- +- /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. +- Performed when YYTABLE does not specify something else to do. Zero +- means the default is an error. */ +-static const yytype_uint8 yydefact[] = +-{ +- 5, 16, 15, 14, 0, 5, 5, 0, 6, 2, +- 3, 7, 10, 12, 28, 17, 18, 30, 19, 0, +- 0, 1, 5, 0, 0, 11, 0, 32, 0, 0, +- 23, 29, 31, 24, 25, 0, 8, 9, 13, 33, +- 34, 0, 21, 22, 0, 26, 4, 20, 27 +-}; +- +- /* YYPGOTO[NTERM-NUM]. */ +-static const yytype_int8 yypgoto[] = +-{ +- -26, -26, -7, -4, -26, -1, -11, 13, -26, -25, +- -26, -26 +-}; +- +- /* YYDEFGOTO[NTERM-NUM]. */ +-static const yytype_int8 yydefgoto[] = +-{ +- -1, 7, 8, 9, 10, 11, 12, 13, 47, 15, +- 18, 41 +-}; +- +- /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If +- positive, shift that token. If negative, reduce the rule whose +- number is the opposite. If YYTABLE_NINF, syntax error. */ +-static const yytype_uint8 yytable[] = +-{ +- 25, 19, 20, 42, 43, 1, 2, 27, 28, 29, +- 30, 39, 40, 3, 4, 16, 14, 17, 35, 5, +- 48, 6, 36, 37, 21, 25, 25, 22, 26, 23, +- 24, 31, 32, 33, 34, 44, 45, 46, 0, 38 +-}; +- +-static const yytype_int8 yycheck[] = +-{ +- 11, 5, 6, 28, 29, 3, 4, 13, 14, 15, +- 16, 14, 15, 11, 12, 3, 5, 5, 22, 17, +- 45, 19, 23, 24, 0, 36, 37, 6, 10, 8, +- 9, 5, 5, 18, 20, 7, 3, 44, -1, 26 +-}; +- +- /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing +- symbol of state STATE-NUM. */ +-static const yytype_uint8 yystos[] = +-{ +- 0, 3, 4, 11, 12, 17, 19, 22, 23, 24, +- 25, 26, 27, 28, 5, 30, 3, 5, 31, 24, +- 24, 0, 6, 8, 9, 27, 10, 13, 14, 15, +- 16, 5, 5, 18, 20, 24, 26, 26, 28, 14, +- 15, 32, 30, 30, 7, 3, 23, 29, 30 +-}; +- +- /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +-static const yytype_uint8 yyr1[] = +-{ +- 0, 21, 22, 23, 23, 24, 24, 25, 25, 25, +- 26, 26, 27, 27, 28, 28, 28, 28, 28, 28, +- 28, 28, 28, 28, 28, 28, 29, 29, 30, 30, +- 31, 31, 32, 32, 32 +-}; +- +- /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +-static const yytype_uint8 yyr2[] = +-{ +- 0, 2, 1, 1, 5, 0, 1, 1, 3, 3, +- 1, 2, 1, 3, 1, 1, 1, 2, 2, 2, +- 5, 3, 3, 2, 3, 3, 0, 1, 1, 2, +- 1, 2, 0, 1, 1 +-}; +- +- +-#define yyerrok (yyerrstatus = 0) +-#define yyclearin (yychar = YYEMPTY) +-#define YYEMPTY (-2) +-#define YYEOF 0 +- +-#define YYACCEPT goto yyacceptlab +-#define YYABORT goto yyabortlab +-#define YYERROR goto yyerrorlab +- +- +-#define YYRECOVERING() (!!yyerrstatus) +- +-#define YYBACKUP(Token, Value) \ +-do \ +- if (yychar == YYEMPTY) \ +- { \ +- yychar = (Token); \ +- yylval = (Value); \ +- YYPOPSTACK (yylen); \ +- yystate = *yyssp; \ +- goto yybackup; \ +- } \ +- else \ +- { \ +- yyerror (YY_("syntax error: cannot back up")); \ +- YYERROR; \ +- } \ +-while (0) +- +-/* Error token number */ +-#define YYTERROR 1 +-#define YYERRCODE 256 +- +- +- +-/* Enable debugging if requested. */ +-#if YYDEBUG +- +-# ifndef YYFPRINTF +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YYFPRINTF fprintf +-# endif +- +-# define YYDPRINTF(Args) \ +-do { \ +- if (yydebug) \ +- YYFPRINTF Args; \ +-} while (0) +- +-/* This macro is provided for backward compatibility. */ +-#ifndef YY_LOCATION_PRINT +-# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +-#endif +- +- +-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +-do { \ +- if (yydebug) \ +- { \ +- YYFPRINTF (stderr, "%s ", Title); \ +- yy_symbol_print (stderr, \ +- Type, Value); \ +- YYFPRINTF (stderr, "\n"); \ +- } \ +-} while (0) +- +- +-/*----------------------------------------. +-| Print this symbol's value on YYOUTPUT. | +-`----------------------------------------*/ +- +-static void +-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +-{ +- FILE *yyo = yyoutput; +- YYUSE (yyo); +- if (!yyvaluep) +- return; +-# ifdef YYPRINT +- if (yytype < YYNTOKENS) +- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +-# endif +- YYUSE (yytype); +-} +- +- +-/*--------------------------------. +-| Print this symbol on YYOUTPUT. | +-`--------------------------------*/ +- +-static void +-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +-{ +- YYFPRINTF (yyoutput, "%s %s (", +- yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); +- +- yy_symbol_value_print (yyoutput, yytype, yyvaluep); +- YYFPRINTF (yyoutput, ")"); +-} +- +-/*------------------------------------------------------------------. +-| yy_stack_print -- Print the state stack from its BOTTOM up to its | +-| TOP (included). | +-`------------------------------------------------------------------*/ +- +-static void +-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) +-{ +- YYFPRINTF (stderr, "Stack now"); +- for (; yybottom <= yytop; yybottom++) +- { +- int yybot = *yybottom; +- YYFPRINTF (stderr, " %d", yybot); +- } +- YYFPRINTF (stderr, "\n"); +-} +- +-# define YY_STACK_PRINT(Bottom, Top) \ +-do { \ +- if (yydebug) \ +- yy_stack_print ((Bottom), (Top)); \ +-} while (0) +- +- +-/*------------------------------------------------. +-| Report that the YYRULE is going to be reduced. | +-`------------------------------------------------*/ +- +-static void +-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) +-{ +- unsigned long int yylno = yyrline[yyrule]; +- int yynrhs = yyr2[yyrule]; +- int yyi; +- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", +- yyrule - 1, yylno); +- /* The symbols being reduced. */ +- for (yyi = 0; yyi < yynrhs; yyi++) +- { +- YYFPRINTF (stderr, " $%d = ", yyi + 1); +- yy_symbol_print (stderr, +- yystos[yyssp[yyi + 1 - yynrhs]], +- &(yyvsp[(yyi + 1) - (yynrhs)]) +- ); +- YYFPRINTF (stderr, "\n"); +- } +-} +- +-# define YY_REDUCE_PRINT(Rule) \ +-do { \ +- if (yydebug) \ +- yy_reduce_print (yyssp, yyvsp, Rule); \ +-} while (0) +- +-/* Nonzero means print parse trace. It is left uninitialized so that +- multiple parsers can coexist. */ +-int yydebug; +-#else /* !YYDEBUG */ +-# define YYDPRINTF(Args) +-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +-# define YY_STACK_PRINT(Bottom, Top) +-# define YY_REDUCE_PRINT(Rule) +-#endif /* !YYDEBUG */ +- +- +-/* YYINITDEPTH -- initial size of the parser's stacks. */ +-#ifndef YYINITDEPTH +-# define YYINITDEPTH 200 +-#endif +- +-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only +- if the built-in stack extension method is used). +- +- Do not make this value too large; the results are undefined if +- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) +- evaluated with infinite-precision integer arithmetic. */ +- +-#ifndef YYMAXDEPTH +-# define YYMAXDEPTH 10000 +-#endif +- +- +-#if YYERROR_VERBOSE +- +-# ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H +-# define yystrlen strlen +-# else +-/* Return the length of YYSTR. */ +-static YYSIZE_T +-yystrlen (const char *yystr) +-{ +- YYSIZE_T yylen; +- for (yylen = 0; yystr[yylen]; yylen++) +- continue; +- return yylen; +-} +-# endif +-# endif +- +-# ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +-# define yystpcpy stpcpy +-# else +-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in +- YYDEST. */ +-static char * +-yystpcpy (char *yydest, const char *yysrc) +-{ +- char *yyd = yydest; +- const char *yys = yysrc; +- +- while ((*yyd++ = *yys++) != '\0') +- continue; +- +- return yyd - 1; +-} +-# endif +-# endif +- +-# ifndef yytnamerr +-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary +- quotes and backslashes, so that it's suitable for yyerror. The +- heuristic is that double-quoting is unnecessary unless the string +- contains an apostrophe, a comma, or backslash (other than +- backslash-backslash). YYSTR is taken from yytname. If YYRES is +- null, do not copy; instead, return the length of what the result +- would have been. */ +-static YYSIZE_T +-yytnamerr (char *yyres, const char *yystr) +-{ +- if (*yystr == '"') +- { +- YYSIZE_T yyn = 0; +- char const *yyp = yystr; +- +- for (;;) +- switch (*++yyp) +- { +- case '\'': +- case ',': +- goto do_not_strip_quotes; +- +- case '\\': +- if (*++yyp != '\\') +- goto do_not_strip_quotes; +- /* Fall through. */ +- default: +- if (yyres) +- yyres[yyn] = *yyp; +- yyn++; +- break; +- +- case '"': +- if (yyres) +- yyres[yyn] = '\0'; +- return yyn; +- } +- do_not_strip_quotes: ; +- } +- +- if (! yyres) +- return yystrlen (yystr); +- +- return yystpcpy (yyres, yystr) - yyres; +-} +-# endif +- +-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message +- about the unexpected token YYTOKEN for the state stack whose top is +- YYSSP. +- +- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is +- not large enough to hold the message. In that case, also set +- *YYMSG_ALLOC to the required number of bytes. Return 2 if the +- required number of bytes is too large to store. */ +-static int +-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, +- yytype_int16 *yyssp, int yytoken) +-{ +- YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); +- YYSIZE_T yysize = yysize0; +- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; +- /* Internationalized format string. */ +- const char *yyformat = YY_NULLPTR; +- /* Arguments of yyformat. */ +- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; +- /* Number of reported tokens (one for the "unexpected", one per +- "expected"). */ +- int yycount = 0; +- +- /* There are many possibilities here to consider: +- - If this state is a consistent state with a default action, then +- the only way this function was invoked is if the default action +- is an error action. In that case, don't check for expected +- tokens because there are none. +- - The only way there can be no lookahead present (in yychar) is if +- this state is a consistent state with a default action. Thus, +- detecting the absence of a lookahead is sufficient to determine +- that there is no unexpected or expected token to report. In that +- case, just report a simple "syntax error". +- - Don't assume there isn't a lookahead just because this state is a +- consistent state with a default action. There might have been a +- previous inconsistent state, consistent state with a non-default +- action, or user semantic action that manipulated yychar. +- - Of course, the expected token list depends on states to have +- correct lookahead information, and it depends on the parser not +- to perform extra reductions after fetching a lookahead from the +- scanner and before detecting a syntax error. Thus, state merging +- (from LALR or IELR) and default reductions corrupt the expected +- token list. However, the list is correct for canonical LR with +- one exception: it will still contain any token that will not be +- accepted due to an error action in a later state. +- */ +- if (yytoken != YYEMPTY) +- { +- int yyn = yypact[*yyssp]; +- yyarg[yycount++] = yytname[yytoken]; +- if (!yypact_value_is_default (yyn)) +- { +- /* Start YYX at -YYN if negative to avoid negative indexes in +- YYCHECK. In other words, skip the first -YYN actions for +- this state because they are default actions. */ +- int yyxbegin = yyn < 0 ? -yyn : 0; +- /* Stay within bounds of both yycheck and yytname. */ +- int yychecklim = YYLAST - yyn + 1; +- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; +- int yyx; +- +- for (yyx = yyxbegin; yyx < yyxend; ++yyx) +- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR +- && !yytable_value_is_error (yytable[yyx + yyn])) +- { +- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) +- { +- yycount = 1; +- yysize = yysize0; +- break; +- } +- yyarg[yycount++] = yytname[yyx]; +- { +- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); +- if (! (yysize <= yysize1 +- && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) +- return 2; +- yysize = yysize1; +- } +- } +- } +- } +- +- switch (yycount) +- { +-# define YYCASE_(N, S) \ +- case N: \ +- yyformat = S; \ +- break +- YYCASE_(0, YY_("syntax error")); +- YYCASE_(1, YY_("syntax error, unexpected %s")); +- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); +- YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); +- YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); +- YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +-# undef YYCASE_ +- } +- +- { +- YYSIZE_T yysize1 = yysize + yystrlen (yyformat); +- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) +- return 2; +- yysize = yysize1; +- } +- +- if (*yymsg_alloc < yysize) +- { +- *yymsg_alloc = 2 * yysize; +- if (! (yysize <= *yymsg_alloc +- && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) +- *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; +- return 1; +- } +- +- /* Avoid sprintf, as that infringes on the user's name space. +- Don't have undefined behavior even if the translation +- produced a string with the wrong number of "%s"s. */ +- { +- char *yyp = *yymsg; +- int yyi = 0; +- while ((*yyp = *yyformat) != '\0') +- if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) +- { +- yyp += yytnamerr (yyp, yyarg[yyi++]); +- yyformat += 2; +- } +- else +- { +- yyp++; +- yyformat++; +- } +- } +- return 0; +-} +-#endif /* YYERROR_VERBOSE */ +- +-/*-----------------------------------------------. +-| Release the memory associated to this symbol. | +-`-----------------------------------------------*/ +- +-static void +-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +-{ +- YYUSE (yyvaluep); +- if (!yymsg) +- yymsg = "Deleting"; +- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); +- +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- YYUSE (yytype); +- YY_IGNORE_MAYBE_UNINITIALIZED_END +-} +- +- +- +- +-/* The lookahead symbol. */ +-int yychar; +- +-/* The semantic value of the lookahead symbol. */ +-YYSTYPE yylval; +-/* Number of syntax errors so far. */ +-int yynerrs; +- +- +-/*----------. +-| yyparse. | +-`----------*/ +- +-int +-yyparse (void) +-{ +- int yystate; +- /* Number of tokens to shift before error messages enabled. */ +- int yyerrstatus; +- +- /* The stacks and their tools: +- 'yyss': related to states. +- 'yyvs': related to semantic values. +- +- Refer to the stacks through separate pointers, to allow yyoverflow +- to reallocate them elsewhere. */ +- +- /* The state stack. */ +- yytype_int16 yyssa[YYINITDEPTH]; +- yytype_int16 *yyss; +- yytype_int16 *yyssp; +- +- /* The semantic value stack. */ +- YYSTYPE yyvsa[YYINITDEPTH]; +- YYSTYPE *yyvs; +- YYSTYPE *yyvsp; +- +- YYSIZE_T yystacksize; +- +- int yyn; +- int yyresult; +- /* Lookahead token as an internal (translated) token number. */ +- int yytoken = 0; +- /* The variables used to return semantic value and location from the +- action routines. */ +- YYSTYPE yyval; +- +-#if YYERROR_VERBOSE +- /* Buffer for error messages, and its allocated size. */ +- char yymsgbuf[128]; +- char *yymsg = yymsgbuf; +- YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +-#endif +- +-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) +- +- /* The number of symbols on the RHS of the reduced rule. +- Keep to zero when no symbol should be popped. */ +- int yylen = 0; +- +- yyssp = yyss = yyssa; +- yyvsp = yyvs = yyvsa; +- yystacksize = YYINITDEPTH; +- +- YYDPRINTF ((stderr, "Starting parse\n")); +- +- yystate = 0; +- yyerrstatus = 0; +- yynerrs = 0; +- yychar = YYEMPTY; /* Cause a token to be read. */ +- goto yysetstate; +- +-/*------------------------------------------------------------. +-| yynewstate -- Push a new state, which is found in yystate. | +-`------------------------------------------------------------*/ +- yynewstate: +- /* In all cases, when you get here, the value and location stacks +- have just been pushed. So pushing a state here evens the stacks. */ +- yyssp++; +- +- yysetstate: +- *yyssp = yystate; +- +- if (yyss + yystacksize - 1 <= yyssp) +- { +- /* Get the current used size of the three stacks, in elements. */ +- YYSIZE_T yysize = yyssp - yyss + 1; +- +-#ifdef yyoverflow +- { +- /* Give user a chance to reallocate the stack. Use copies of +- these so that the &'s don't force the real ones into +- memory. */ +- YYSTYPE *yyvs1 = yyvs; +- yytype_int16 *yyss1 = yyss; +- +- /* Each stack pointer address is followed by the size of the +- data in use in that stack, in bytes. This used to be a +- conditional around just the two extra args, but that might +- be undefined if yyoverflow is a macro. */ +- yyoverflow (YY_("memory exhausted"), +- &yyss1, yysize * sizeof (*yyssp), +- &yyvs1, yysize * sizeof (*yyvsp), +- &yystacksize); +- +- yyss = yyss1; +- yyvs = yyvs1; +- } +-#else /* no yyoverflow */ +-# ifndef YYSTACK_RELOCATE +- goto yyexhaustedlab; +-# else +- /* Extend the stack our own way. */ +- if (YYMAXDEPTH <= yystacksize) +- goto yyexhaustedlab; +- yystacksize *= 2; +- if (YYMAXDEPTH < yystacksize) +- yystacksize = YYMAXDEPTH; +- +- { +- yytype_int16 *yyss1 = yyss; +- union yyalloc *yyptr = +- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); +- if (! yyptr) +- goto yyexhaustedlab; +- YYSTACK_RELOCATE (yyss_alloc, yyss); +- YYSTACK_RELOCATE (yyvs_alloc, yyvs); +-# undef YYSTACK_RELOCATE +- if (yyss1 != yyssa) +- YYSTACK_FREE (yyss1); +- } +-# endif +-#endif /* no yyoverflow */ +- +- yyssp = yyss + yysize - 1; +- yyvsp = yyvs + yysize - 1; +- +- YYDPRINTF ((stderr, "Stack size increased to %lu\n", +- (unsigned long int) yystacksize)); +- +- if (yyss + yystacksize - 1 <= yyssp) +- YYABORT; +- } +- +- YYDPRINTF ((stderr, "Entering state %d\n", yystate)); +- +- if (yystate == YYFINAL) +- YYACCEPT; +- +- goto yybackup; +- +-/*-----------. +-| yybackup. | +-`-----------*/ +-yybackup: +- +- /* Do appropriate processing given the current state. Read a +- lookahead token if we need one and don't already have one. */ +- +- /* First try to decide what to do without reference to lookahead token. */ +- yyn = yypact[yystate]; +- if (yypact_value_is_default (yyn)) +- goto yydefault; +- +- /* Not known => get a lookahead token if don't already have one. */ +- +- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ +- if (yychar == YYEMPTY) +- { +- YYDPRINTF ((stderr, "Reading a token: ")); +- yychar = yylex (); +- } +- +- if (yychar <= YYEOF) +- { +- yychar = yytoken = YYEOF; +- YYDPRINTF ((stderr, "Now at end of input.\n")); +- } +- else +- { +- yytoken = YYTRANSLATE (yychar); +- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); +- } +- +- /* If the proper action on seeing token YYTOKEN is to reduce or to +- detect an error, take that action. */ +- yyn += yytoken; +- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) +- goto yydefault; +- yyn = yytable[yyn]; +- if (yyn <= 0) +- { +- if (yytable_value_is_error (yyn)) +- goto yyerrlab; +- yyn = -yyn; +- goto yyreduce; +- } +- +- /* Count tokens shifted since error; after three, turn off error +- status. */ +- if (yyerrstatus) +- yyerrstatus--; +- +- /* Shift the lookahead token. */ +- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); +- +- /* Discard the shifted token. */ +- yychar = YYEMPTY; +- +- yystate = yyn; +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- *++yyvsp = yylval; +- YY_IGNORE_MAYBE_UNINITIALIZED_END +- +- goto yynewstate; +- +- +-/*-----------------------------------------------------------. +-| yydefault -- do the default action for the current state. | +-`-----------------------------------------------------------*/ +-yydefault: +- yyn = yydefact[yystate]; +- if (yyn == 0) +- goto yyerrlab; +- goto yyreduce; +- +- +-/*-----------------------------. +-| yyreduce -- Do a reduction. | +-`-----------------------------*/ +-yyreduce: +- /* yyn is the number of a rule to reduce with. */ +- yylen = yyr2[yyn]; +- +- /* If YYLEN is nonzero, implement the default value of the action: +- '$$ = $1'. +- +- Otherwise, the following line sets YYVAL to garbage. +- This behavior is undocumented and Bison +- users should not rely upon it. Assigning to YYVAL +- unconditionally makes the parser a bit smaller, and it avoids a +- GCC warning that YYVAL may be used uninitialized. */ +- yyval = yyvsp[1-yylen]; +- +- +- YY_REDUCE_PRINT (yyn); +- switch (yyn) +- { +- case 2: +-#line 249 "label.y" /* yacc.c:1646 */ +- { parse_result = ((yyvsp[0].expr) ? new analyzed_expr((yyvsp[0].expr)) : 0); } +-#line 1435 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 3: +-#line 254 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = (yyvsp[0].expr); } +-#line 1441 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 4: +-#line 256 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new conditional_expr((yyvsp[-4].expr), (yyvsp[-2].expr), (yyvsp[0].expr)); } +-#line 1447 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 5: +-#line 261 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = 0; } +-#line 1453 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 6: +-#line 263 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = (yyvsp[0].expr); } +-#line 1459 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 7: +-#line 268 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = (yyvsp[0].expr); } +-#line 1465 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 8: +-#line 270 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new alternative_expr((yyvsp[-2].expr), (yyvsp[0].expr)); } +-#line 1471 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 9: +-#line 272 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new conditional_expr((yyvsp[-2].expr), (yyvsp[0].expr), 0); } +-#line 1477 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 10: +-#line 277 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = (yyvsp[0].expr); } +-#line 1483 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 11: +-#line 279 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new list_expr((yyvsp[-1].expr), (yyvsp[0].expr)); } +-#line 1489 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 12: +-#line 284 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = (yyvsp[0].expr); } +-#line 1495 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 13: +-#line 286 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new substitute_expr((yyvsp[-2].expr), (yyvsp[0].expr)); } +-#line 1501 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 14: +-#line 291 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new at_expr; } +-#line 1507 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 15: +-#line 293 "label.y" /* yacc.c:1646 */ +- { +- (yyval.expr) = new literal_expr(literals.contents() + (yyvsp[0].str).start, +- (yyvsp[0].str).len); +- } +-#line 1516 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 16: +-#line 298 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new field_expr((yyvsp[0].num), 0); } +-#line 1522 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 17: +-#line 300 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new field_expr((yyvsp[-1].num), (yyvsp[0].num) - 1); } +-#line 1528 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 18: +-#line 302 "label.y" /* yacc.c:1646 */ +- { +- switch ((yyvsp[0].num)) { +- case 'I': +- case 'i': +- case 'A': +- case 'a': +- (yyval.expr) = new format_expr((yyvsp[0].num)); +- break; +- default: +- command_error("unrecognized format `%1'", char((yyvsp[0].num))); +- (yyval.expr) = new format_expr('a'); +- break; +- } +- } +-#line 1547 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 19: +-#line 318 "label.y" /* yacc.c:1646 */ +- { +- (yyval.expr) = new format_expr('0', (yyvsp[0].dig).ndigits, (yyvsp[0].dig).val); +- } +-#line 1555 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 20: +-#line 322 "label.y" /* yacc.c:1646 */ +- { +- switch ((yyvsp[-1].num)) { +- case 'l': +- (yyval.expr) = new map_expr((yyvsp[-4].expr), lowercase); +- break; +- case 'u': +- (yyval.expr) = new map_expr((yyvsp[-4].expr), uppercase); +- break; +- case 'c': +- (yyval.expr) = new map_expr((yyvsp[-4].expr), capitalize); +- break; +- case 'r': +- (yyval.expr) = new map_expr((yyvsp[-4].expr), reverse_name); +- break; +- case 'a': +- (yyval.expr) = new map_expr((yyvsp[-4].expr), abbreviate_name); +- break; +- case 'y': +- (yyval.expr) = new extractor_expr((yyvsp[-4].expr), find_year, (yyvsp[-2].num)); +- break; +- case 'n': +- (yyval.expr) = new extractor_expr((yyvsp[-4].expr), find_last_name, (yyvsp[-2].num)); +- break; +- default: +- (yyval.expr) = (yyvsp[-4].expr); +- command_error("unknown function `%1'", char((yyvsp[-1].num))); +- break; +- } +- } +-#line 1589 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 21: +-#line 353 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new truncate_expr((yyvsp[-2].expr), (yyvsp[0].num)); } +-#line 1595 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 22: +-#line 355 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new truncate_expr((yyvsp[-2].expr), -(yyvsp[0].num)); } +-#line 1601 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 23: +-#line 357 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new star_expr((yyvsp[-1].expr)); } +-#line 1607 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 24: +-#line 359 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = (yyvsp[-1].expr); } +-#line 1613 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 25: +-#line 361 "label.y" /* yacc.c:1646 */ +- { (yyval.expr) = new separator_expr((yyvsp[-1].expr)); } +-#line 1619 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 26: +-#line 366 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = -1; } +-#line 1625 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 27: +-#line 368 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = (yyvsp[0].num); } +-#line 1631 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 28: +-#line 373 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = (yyvsp[0].num); } +-#line 1637 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 29: +-#line 375 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = (yyvsp[-1].num)*10 + (yyvsp[0].num); } +-#line 1643 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 30: +-#line 380 "label.y" /* yacc.c:1646 */ +- { (yyval.dig).ndigits = 1; (yyval.dig).val = (yyvsp[0].num); } +-#line 1649 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 31: +-#line 382 "label.y" /* yacc.c:1646 */ +- { (yyval.dig).ndigits = (yyvsp[-1].dig).ndigits + 1; (yyval.dig).val = (yyvsp[-1].dig).val*10 + (yyvsp[0].num); } +-#line 1655 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 32: +-#line 388 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = 0; } +-#line 1661 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 33: +-#line 390 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = 1; } +-#line 1667 "label.cpp" /* yacc.c:1646 */ +- break; +- +- case 34: +-#line 392 "label.y" /* yacc.c:1646 */ +- { (yyval.num) = -1; } +-#line 1673 "label.cpp" /* yacc.c:1646 */ +- break; +- +- +-#line 1677 "label.cpp" /* yacc.c:1646 */ +- default: break; +- } +- /* User semantic actions sometimes alter yychar, and that requires +- that yytoken be updated with the new translation. We take the +- approach of translating immediately before every use of yytoken. +- One alternative is translating here after every semantic action, +- but that translation would be missed if the semantic action invokes +- YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or +- if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an +- incorrect destructor might then be invoked immediately. In the +- case of YYERROR or YYBACKUP, subsequent parser actions might lead +- to an incorrect destructor call or verbose syntax error message +- before the lookahead is translated. */ +- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); +- +- YYPOPSTACK (yylen); +- yylen = 0; +- YY_STACK_PRINT (yyss, yyssp); +- +- *++yyvsp = yyval; +- +- /* Now 'shift' the result of the reduction. Determine what state +- that goes to, based on the state we popped back to and the rule +- number reduced by. */ +- +- yyn = yyr1[yyn]; +- +- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; +- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) +- yystate = yytable[yystate]; +- else +- yystate = yydefgoto[yyn - YYNTOKENS]; +- +- goto yynewstate; +- +- +-/*--------------------------------------. +-| yyerrlab -- here on detecting error. | +-`--------------------------------------*/ +-yyerrlab: +- /* Make sure we have latest lookahead translation. See comments at +- user semantic actions for why this is necessary. */ +- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); +- +- /* If not already recovering from an error, report this error. */ +- if (!yyerrstatus) +- { +- ++yynerrs; +-#if ! YYERROR_VERBOSE +- yyerror (YY_("syntax error")); +-#else +-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ +- yyssp, yytoken) +- { +- char const *yymsgp = YY_("syntax error"); +- int yysyntax_error_status; +- yysyntax_error_status = YYSYNTAX_ERROR; +- if (yysyntax_error_status == 0) +- yymsgp = yymsg; +- else if (yysyntax_error_status == 1) +- { +- if (yymsg != yymsgbuf) +- YYSTACK_FREE (yymsg); +- yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); +- if (!yymsg) +- { +- yymsg = yymsgbuf; +- yymsg_alloc = sizeof yymsgbuf; +- yysyntax_error_status = 2; +- } +- else +- { +- yysyntax_error_status = YYSYNTAX_ERROR; +- yymsgp = yymsg; +- } +- } +- yyerror (yymsgp); +- if (yysyntax_error_status == 2) +- goto yyexhaustedlab; +- } +-# undef YYSYNTAX_ERROR +-#endif +- } +- +- +- +- if (yyerrstatus == 3) +- { +- /* If just tried and failed to reuse lookahead token after an +- error, discard it. */ +- +- if (yychar <= YYEOF) +- { +- /* Return failure if at end of input. */ +- if (yychar == YYEOF) +- YYABORT; +- } +- else +- { +- yydestruct ("Error: discarding", +- yytoken, &yylval); +- yychar = YYEMPTY; +- } +- } +- +- /* Else will try to reuse lookahead token after shifting the error +- token. */ +- goto yyerrlab1; +- +- +-/*---------------------------------------------------. +-| yyerrorlab -- error raised explicitly by YYERROR. | +-`---------------------------------------------------*/ +-yyerrorlab: +- +- /* Pacify compilers like GCC when the user code never invokes +- YYERROR and the label yyerrorlab therefore never appears in user +- code. */ +- if (/*CONSTCOND*/ 0) +- goto yyerrorlab; +- +- /* Do not reclaim the symbols of the rule whose action triggered +- this YYERROR. */ +- YYPOPSTACK (yylen); +- yylen = 0; +- YY_STACK_PRINT (yyss, yyssp); +- yystate = *yyssp; +- goto yyerrlab1; +- +- +-/*-------------------------------------------------------------. +-| yyerrlab1 -- common code for both syntax error and YYERROR. | +-`-------------------------------------------------------------*/ +-yyerrlab1: +- yyerrstatus = 3; /* Each real token shifted decrements this. */ +- +- for (;;) +- { +- yyn = yypact[yystate]; +- if (!yypact_value_is_default (yyn)) +- { +- yyn += YYTERROR; +- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) +- { +- yyn = yytable[yyn]; +- if (0 < yyn) +- break; +- } +- } +- +- /* Pop the current state because it cannot handle the error token. */ +- if (yyssp == yyss) +- YYABORT; +- +- +- yydestruct ("Error: popping", +- yystos[yystate], yyvsp); +- YYPOPSTACK (1); +- yystate = *yyssp; +- YY_STACK_PRINT (yyss, yyssp); +- } +- +- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +- *++yyvsp = yylval; +- YY_IGNORE_MAYBE_UNINITIALIZED_END +- +- +- /* Shift the error token. */ +- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); +- +- yystate = yyn; +- goto yynewstate; +- +- +-/*-------------------------------------. +-| yyacceptlab -- YYACCEPT comes here. | +-`-------------------------------------*/ +-yyacceptlab: +- yyresult = 0; +- goto yyreturn; +- +-/*-----------------------------------. +-| yyabortlab -- YYABORT comes here. | +-`-----------------------------------*/ +-yyabortlab: +- yyresult = 1; +- goto yyreturn; +- +-#if !defined yyoverflow || YYERROR_VERBOSE +-/*-------------------------------------------------. +-| yyexhaustedlab -- memory exhaustion comes here. | +-`-------------------------------------------------*/ +-yyexhaustedlab: +- yyerror (YY_("memory exhausted")); +- yyresult = 2; +- /* Fall through. */ +-#endif +- +-yyreturn: +- if (yychar != YYEMPTY) +- { +- /* Make sure we have latest lookahead translation. See comments at +- user semantic actions for why this is necessary. */ +- yytoken = YYTRANSLATE (yychar); +- yydestruct ("Cleanup: discarding lookahead", +- yytoken, &yylval); +- } +- /* Do not reclaim the symbols of the rule whose action triggered +- this YYABORT or YYACCEPT. */ +- YYPOPSTACK (yylen); +- YY_STACK_PRINT (yyss, yyssp); +- while (yyssp != yyss) +- { +- yydestruct ("Cleanup: popping", +- yystos[*yyssp], yyvsp); +- YYPOPSTACK (1); +- } +-#ifndef yyoverflow +- if (yyss != yyssa) +- YYSTACK_FREE (yyss); +-#endif +-#if YYERROR_VERBOSE +- if (yymsg != yymsgbuf) +- YYSTACK_FREE (yymsg); +-#endif +- return yyresult; +-} +-#line 395 "label.y" /* yacc.c:1906 */ +- +- +-/* bison defines const to be empty unless __STDC__ is defined, which it +-isn't under cfront */ +- +-#ifdef const +-#undef const +-#endif +- +-const char *spec_ptr; +-const char *spec_end; +-const char *spec_cur; +- +-static char uppercase_array[] = { +- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', +- 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', +- 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', +- 'Y', 'Z', +-}; +- +-static char lowercase_array[] = { +- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', +- 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', +- 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', +- 'y', 'z', +-}; +- +-int yylex() +-{ +- while (spec_ptr < spec_end && csspace(*spec_ptr)) +- spec_ptr++; +- spec_cur = spec_ptr; +- if (spec_ptr >= spec_end) +- return 0; +- unsigned char c = *spec_ptr++; +- if (csalpha(c)) { +- yylval.num = c; +- return TOKEN_LETTER; +- } +- if (csdigit(c)) { +- yylval.num = c - '0'; +- return TOKEN_DIGIT; +- } +- if (c == '\'') { +- yylval.str.start = literals.length(); +- for (; spec_ptr < spec_end; spec_ptr++) { +- if (*spec_ptr == '\'') { +- if (++spec_ptr < spec_end && *spec_ptr == '\'') +- literals += '\''; +- else { +- yylval.str.len = literals.length() - yylval.str.start; +- return TOKEN_LITERAL; +- } +- } +- else +- literals += *spec_ptr; +- } +- yylval.str.len = literals.length() - yylval.str.start; +- return TOKEN_LITERAL; +- } +- return c; +-} +- +-int set_label_spec(const char *label_spec) +-{ +- spec_cur = spec_ptr = label_spec; +- spec_end = strchr(label_spec, '\0'); +- literals.clear(); +- if (yyparse()) +- return 0; +- delete parsed_label; +- parsed_label = parse_result; +- return 1; +-} +- +-int set_date_label_spec(const char *label_spec) +-{ +- spec_cur = spec_ptr = label_spec; +- spec_end = strchr(label_spec, '\0'); +- literals.clear(); +- if (yyparse()) +- return 0; +- delete parsed_date_label; +- parsed_date_label = parse_result; +- return 1; +-} +- +-int set_short_label_spec(const char *label_spec) +-{ +- spec_cur = spec_ptr = label_spec; +- spec_end = strchr(label_spec, '\0'); +- literals.clear(); +- if (yyparse()) +- return 0; +- delete parsed_short_label; +- parsed_short_label = parse_result; +- return 1; +-} +- +-void yyerror(const char *message) +-{ +- if (spec_cur < spec_end) +- command_error("label specification %1 before `%2'", message, spec_cur); +- else +- command_error("label specification %1 at end of string", +- message, spec_cur); +-} +- +-void at_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (tentative) +- ref.canonicalize_authors(result); +- else { +- const char *end, *start = ref.get_authors(&end); +- if (start) +- result.append(start, end - start); +- } +-} +- +-void format_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (tentative) +- return; +- const label_info *lp = ref.get_label_ptr(); +- int num = lp == 0 ? ref.get_number() : lp->count; +- if (type != '0') +- result += format_serial(type, num + 1); +- else { +- const char *ptr = i_to_a(num + first_number); +- int pad = width - strlen(ptr); +- while (--pad >= 0) +- result += '0'; +- result += ptr; +- } +-} +- +-static const char *format_serial(char c, int n) +-{ +- assert(n > 0); +- static char buf[128]; // more than enough. +- switch (c) { +- case 'i': +- case 'I': +- { +- char *p = buf; +- // troff uses z and w to represent 10000 and 5000 in Roman +- // numerals; I can find no historical basis for this usage +- const char *s = c == 'i' ? "zwmdclxvi" : "ZWMDCLXVI"; +- if (n >= 40000) +- return i_to_a(n); +- while (n >= 10000) { +- *p++ = s[0]; +- n -= 10000; +- } +- for (int i = 1000; i > 0; i /= 10, s += 2) { +- int m = n/i; +- n -= m*i; +- switch (m) { +- case 3: +- *p++ = s[2]; +- /* falls through */ +- case 2: +- *p++ = s[2]; +- /* falls through */ +- case 1: +- *p++ = s[2]; +- break; +- case 4: +- *p++ = s[2]; +- *p++ = s[1]; +- break; +- case 8: +- *p++ = s[1]; +- *p++ = s[2]; +- *p++ = s[2]; +- *p++ = s[2]; +- break; +- case 7: +- *p++ = s[1]; +- *p++ = s[2]; +- *p++ = s[2]; +- break; +- case 6: +- *p++ = s[1]; +- *p++ = s[2]; +- break; +- case 5: +- *p++ = s[1]; +- break; +- case 9: +- *p++ = s[2]; +- *p++ = s[0]; +- } +- } +- *p = 0; +- break; +- } +- case 'a': +- case 'A': +- { +- char *p = buf; +- // this is derived from troff/reg.c +- while (n > 0) { +- int d = n % 26; +- if (d == 0) +- d = 26; +- n -= d; +- n /= 26; +- *p++ = c == 'a' ? lowercase_array[d - 1] : +- uppercase_array[d - 1]; +- } +- *p-- = 0; +- // Reverse it. +- char *q = buf; +- while (q < p) { +- char temp = *q; +- *q = *p; +- *p = temp; +- --p; +- ++q; +- } +- break; +- } +- default: +- assert(0); +- } +- return buf; +-} +- +-void field_expr::evaluate(int, const reference &ref, +- string &result, substring_position &) +-{ +- const char *end; +- const char *start = ref.get_field(name, &end); +- if (start) { +- start = nth_field(number, start, &end); +- if (start) +- result.append(start, end - start); +- } +-} +- +-void literal_expr::evaluate(int, const reference &, +- string &result, substring_position &) +-{ +- result += s; +-} +- +-analyzed_expr::analyzed_expr(expression *e) +-: unary_expr(e), flags(e ? e->analyze() : 0) +-{ +-} +- +-void analyzed_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- if (expr) +- expr->evaluate(tentative, ref, result, pos); +-} +- +-void star_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- const label_info *lp = ref.get_label_ptr(); +- if (!tentative +- && (lp == 0 || lp->total > 1) +- && expr) +- expr->evaluate(tentative, ref, result, pos); +-} +- +-void separator_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- int start_length = result.length(); +- int is_first = pos.start < 0; +- if (expr) +- expr->evaluate(tentative, ref, result, pos); +- if (is_first) { +- pos.start = start_length; +- pos.length = result.length() - start_length; +- } +-} +- +-void map_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (expr) { +- string temp; +- substring_position temp_pos; +- expr->evaluate(tentative, ref, temp, temp_pos); +- (*func)(temp.contents(), temp.contents() + temp.length(), result); +- } +-} +- +-void extractor_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (expr) { +- string temp; +- substring_position temp_pos; +- expr->evaluate(tentative, ref, temp, temp_pos); +- const char *end, *start = (*func)(temp.contents(), +- temp.contents() + temp.length(), +- &end); +- switch (part) { +- case BEFORE: +- if (start) +- result.append(temp.contents(), start - temp.contents()); +- else +- result += temp; +- break; +- case MATCH: +- if (start) +- result.append(start, end - start); +- break; +- case AFTER: +- if (start) +- result.append(end, temp.contents() + temp.length() - end); +- break; +- default: +- assert(0); +- } +- } +-} +- +-static void first_part(int len, const char *ptr, const char *end, +- string &result) +-{ +- for (;;) { +- const char *token_start = ptr; +- if (!get_token(&ptr, end)) +- break; +- const token_info *ti = lookup_token(token_start, ptr); +- int counts = ti->sortify_non_empty(token_start, ptr); +- if (counts && --len < 0) +- break; +- if (counts || ti->is_accent()) +- result.append(token_start, ptr - token_start); +- } +-} +- +-static void last_part(int len, const char *ptr, const char *end, +- string &result) +-{ +- const char *start = ptr; +- int count = 0; +- for (;;) { +- const char *token_start = ptr; +- if (!get_token(&ptr, end)) +- break; +- const token_info *ti = lookup_token(token_start, ptr); +- if (ti->sortify_non_empty(token_start, ptr)) +- count++; +- } +- ptr = start; +- int skip = count - len; +- if (skip > 0) { +- for (;;) { +- const char *token_start = ptr; +- if (!get_token(&ptr, end)) +- assert(0); +- const token_info *ti = lookup_token(token_start, ptr); +- if (ti->sortify_non_empty(token_start, ptr) && --skip < 0) { +- ptr = token_start; +- break; +- } +- } +- } +- first_part(len, ptr, end, result); +-} +- +-void truncate_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (expr) { +- string temp; +- substring_position temp_pos; +- expr->evaluate(tentative, ref, temp, temp_pos); +- const char *start = temp.contents(); +- const char *end = start + temp.length(); +- if (n > 0) +- first_part(n, start, end, result); +- else if (n < 0) +- last_part(-n, start, end, result); +- } +-} +- +-void alternative_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- int start_length = result.length(); +- if (expr1) +- expr1->evaluate(tentative, ref, result, pos); +- if (result.length() == start_length && expr2) +- expr2->evaluate(tentative, ref, result, pos); +-} +- +-void list_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- if (expr1) +- expr1->evaluate(tentative, ref, result, pos); +- if (expr2) +- expr2->evaluate(tentative, ref, result, pos); +-} +- +-void substitute_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- int start_length = result.length(); +- if (expr1) +- expr1->evaluate(tentative, ref, result, pos); +- if (result.length() > start_length && result[result.length() - 1] == '-') { +- // ought to see if pos covers the - +- result.set_length(result.length() - 1); +- if (expr2) +- expr2->evaluate(tentative, ref, result, pos); +- } +-} +- +-void conditional_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- string temp; +- substring_position temp_pos; +- if (expr1) +- expr1->evaluate(tentative, ref, temp, temp_pos); +- if (temp.length() > 0) { +- if (expr2) +- expr2->evaluate(tentative, ref, result, pos); +- } +- else { +- if (expr3) +- expr3->evaluate(tentative, ref, result, pos); +- } +-} +- +-void reference::pre_compute_label() +-{ +- if (parsed_label != 0 +- && (parsed_label->analyze() & expression::CONTAINS_VARIABLE)) { +- label.clear(); +- substring_position temp_pos; +- parsed_label->evaluate(1, *this, label, temp_pos); +- label_ptr = lookup_label(label); +- } +-} +- +-void reference::compute_label() +-{ +- label.clear(); +- if (parsed_label) +- parsed_label->evaluate(0, *this, label, separator_pos); +- if (short_label_flag && parsed_short_label) +- parsed_short_label->evaluate(0, *this, short_label, short_separator_pos); +- if (date_as_label) { +- string new_date; +- if (parsed_date_label) { +- substring_position temp_pos; +- parsed_date_label->evaluate(0, *this, new_date, temp_pos); +- } +- set_date(new_date); +- } +- if (label_ptr) +- label_ptr->count += 1; +-} +- +-void reference::immediate_compute_label() +-{ +- if (label_ptr) +- label_ptr->total = 2; // force use of disambiguator +- compute_label(); +-} +- +-int reference::merge_labels(reference **v, int n, label_type type, +- string &result) +-{ +- if (abbreviate_label_ranges) +- return merge_labels_by_number(v, n, type, result); +- else +- return merge_labels_by_parts(v, n, type, result); +-} +- +-int reference::merge_labels_by_number(reference **v, int n, label_type type, +- string &result) +-{ +- if (n <= 1) +- return 0; +- int num = get_number(); +- // Only merge three or more labels. +- if (v[0]->get_number() != num + 1 +- || v[1]->get_number() != num + 2) +- return 0; +- int i; +- for (i = 2; i < n; i++) +- if (v[i]->get_number() != num + i + 1) +- break; +- result = get_label(type); +- result += label_range_indicator; +- result += v[i - 1]->get_label(type); +- return i; +-} +- +-const substring_position &reference::get_separator_pos(label_type type) const +-{ +- if (type == SHORT_LABEL && short_label_flag) +- return short_separator_pos; +- else +- return separator_pos; +-} +- +-const string &reference::get_label(label_type type) const +-{ +- if (type == SHORT_LABEL && short_label_flag) +- return short_label; +- else +- return label; +-} +- +-int reference::merge_labels_by_parts(reference **v, int n, label_type type, +- string &result) +-{ +- if (n <= 0) +- return 0; +- const string &lb = get_label(type); +- const substring_position &sp = get_separator_pos(type); +- if (sp.start < 0 +- || sp.start != v[0]->get_separator_pos(type).start +- || memcmp(lb.contents(), v[0]->get_label(type).contents(), +- sp.start) != 0) +- return 0; +- result = lb; +- int i = 0; +- do { +- result += separate_label_second_parts; +- const substring_position &s = v[i]->get_separator_pos(type); +- int sep_end_pos = s.start + s.length; +- result.append(v[i]->get_label(type).contents() + sep_end_pos, +- v[i]->get_label(type).length() - sep_end_pos); +- } while (++i < n +- && sp.start == v[i]->get_separator_pos(type).start +- && memcmp(lb.contents(), v[i]->get_label(type).contents(), +- sp.start) == 0); +- return i; +-} +- +-string label_pool; +- +-label_info::label_info(const string &s) +-: start(label_pool.length()), length(s.length()), count(0), total(1) +-{ +- label_pool += s; +-} +- +-static label_info **label_table = 0; +-static int label_table_size = 0; +-static int label_table_used = 0; +- +-label_info *lookup_label(const string &label) +-{ +- if (label_table == 0) { +- label_table = new label_info *[17]; +- label_table_size = 17; +- for (int i = 0; i < 17; i++) +- label_table[i] = 0; +- } +- unsigned h = hash_string(label.contents(), label.length()) % label_table_size; +- label_info **ptr; +- for (ptr = label_table + h; +- *ptr != 0; +- (ptr == label_table) +- ? (ptr = label_table + label_table_size - 1) +- : ptr--) +- if ((*ptr)->length == label.length() +- && memcmp(label_pool.contents() + (*ptr)->start, label.contents(), +- label.length()) == 0) { +- (*ptr)->total += 1; +- return *ptr; +- } +- label_info *result = *ptr = new label_info(label); +- if (++label_table_used * 2 > label_table_size) { +- // Rehash the table. +- label_info **old_table = label_table; +- int old_size = label_table_size; +- label_table_size = next_size(label_table_size); +- label_table = new label_info *[label_table_size]; +- int i; +- for (i = 0; i < label_table_size; i++) +- label_table[i] = 0; +- for (i = 0; i < old_size; i++) +- if (old_table[i]) { +- h = hash_string(label_pool.contents() + old_table[i]->start, +- old_table[i]->length); +- label_info **p; +- for (p = label_table + (h % label_table_size); +- *p != 0; +- (p == label_table) +- ? (p = label_table + label_table_size - 1) +- : --p) +- ; +- *p = old_table[i]; +- } +- a_delete old_table; +- } +- return result; +-} +- +-void clear_labels() +-{ +- for (int i = 0; i < label_table_size; i++) { +- delete label_table[i]; +- label_table[i] = 0; +- } +- label_table_used = 0; +- label_pool.clear(); +-} +- +-static void consider_authors(reference **start, reference **end, int i); +- +-void compute_labels(reference **v, int n) +-{ +- if (parsed_label +- && (parsed_label->analyze() & expression::CONTAINS_AT) +- && sort_fields.length() >= 2 +- && sort_fields[0] == 'A' +- && sort_fields[1] == '+') +- consider_authors(v, v + n, 0); +- for (int i = 0; i < n; i++) +- v[i]->compute_label(); +-} +- +- +-/* A reference with a list of authors _needs_ author i +-where 0 <= i <= N if there exists a reference with a list of authors +- such that != and M >= i +-and Aj = Bj for 0 <= j < i. In this case if we can't say ``A0, +-A1,...,A(i-1) et al'' because this would match both and +-. If a reference needs author i we only have to call +-need_author(j) for some j >= i such that the reference also needs +-author j. */ +- +-/* This function handles 2 tasks: +-determine which authors are needed (cannot be elided with et al.); +-determine which authors can have only last names in the labels. +- +-References >= start and < end have the same first i author names. +-Also they're sorted by A+. */ +- +-static void consider_authors(reference **start, reference **end, int i) +-{ +- if (start >= end) +- return; +- reference **p = start; +- if (i >= (*p)->get_nauthors()) { +- for (++p; p < end && i >= (*p)->get_nauthors(); p++) +- ; +- if (p < end && i > 0) { +- // If we have an author list and an author list , +- // then both lists need C. +- for (reference **q = start; q < end; q++) +- (*q)->need_author(i - 1); +- } +- start = p; +- } +- while (p < end) { +- reference **last_name_start = p; +- reference **name_start = p; +- for (++p; +- p < end && i < (*p)->get_nauthors() +- && same_author_last_name(**last_name_start, **p, i); +- p++) { +- if (!same_author_name(**name_start, **p, i)) { +- consider_authors(name_start, p, i + 1); +- name_start = p; +- } +- } +- consider_authors(name_start, p, i + 1); +- if (last_name_start == name_start) { +- for (reference **q = last_name_start; q < p; q++) +- (*q)->set_last_name_unambiguous(i); +- } +- // If we have an author list and , then the lists +- // need author D and E respectively. +- if (name_start > start || p < end) { +- for (reference **q = last_name_start; q < p; q++) +- (*q)->need_author(i); +- } +- } +-} +- +-int same_author_last_name(const reference &r1, const reference &r2, int n) +-{ +- const char *ae1; +- const char *as1 = r1.get_sort_field(0, n, 0, &ae1); +- const char *ae2; +- const char *as2 = r2.get_sort_field(0, n, 0, &ae2); +- if (!as1 && !as2) return 1; // they are the same +- if (!as1 || !as2) return 0; +- return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0; +-} +- +-int same_author_name(const reference &r1, const reference &r2, int n) +-{ +- const char *ae1; +- const char *as1 = r1.get_sort_field(0, n, -1, &ae1); +- const char *ae2; +- const char *as2 = r2.get_sort_field(0, n, -1, &ae2); +- if (!as1 && !as2) return 1; // they are the same +- if (!as1 || !as2) return 0; +- return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0; +-} +- +- +-void int_set::set(int i) +-{ +- assert(i >= 0); +- int bytei = i >> 3; +- if (bytei >= v.length()) { +- int old_length = v.length(); +- v.set_length(bytei + 1); +- for (int j = old_length; j <= bytei; j++) +- v[j] = 0; +- } +- v[bytei] |= 1 << (i & 7); +-} +- +-int int_set::get(int i) const +-{ +- assert(i >= 0); +- int bytei = i >> 3; +- return bytei >= v.length() ? 0 : (v[bytei] & (1 << (i & 7))) != 0; +-} +- +-void reference::set_last_name_unambiguous(int i) +-{ +- last_name_unambiguous.set(i); +-} +- +-void reference::need_author(int n) +-{ +- if (n > last_needed_author) +- last_needed_author = n; +-} +- +-const char *reference::get_authors(const char **end) const +-{ +- if (!computed_authors) { +- ((reference *)this)->computed_authors = 1; +- string &result = ((reference *)this)->authors; +- int na = get_nauthors(); +- result.clear(); +- for (int i = 0; i < na; i++) { +- if (last_name_unambiguous.get(i)) { +- const char *e, *start = get_author_last_name(i, &e); +- assert(start != 0); +- result.append(start, e - start); +- } +- else { +- const char *e, *start = get_author(i, &e); +- assert(start != 0); +- result.append(start, e - start); +- } +- if (i == last_needed_author +- && et_al.length() > 0 +- && et_al_min_elide > 0 +- && last_needed_author + et_al_min_elide < na +- && na >= et_al_min_total) { +- result += et_al; +- break; +- } +- if (i < na - 1) { +- if (na == 2) +- result += join_authors_exactly_two; +- else if (i < na - 2) +- result += join_authors_default; +- else +- result += join_authors_last_two; +- } +- } +- } +- const char *start = authors.contents(); +- *end = start + authors.length(); +- return start; +-} +- +-int reference::get_nauthors() const +-{ +- if (nauthors < 0) { +- const char *dummy; +- int na; +- for (na = 0; get_author(na, &dummy) != 0; na++) +- ; +- ((reference *)this)->nauthors = na; +- } +- return nauthors; +-} +diff -Nuar groff-1.22.3.old/src/preproc/refer/label.y groff-1.22.3/src/preproc/refer/label.y +--- groff-1.22.3.old/src/preproc/refer/label.y 2014-11-04 10:38:35.244523759 +0200 ++++ groff-1.22.3/src/preproc/refer/label.y 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1191 +0,0 @@ +-/* -*- C++ -*- +- Copyright (C) 1989-2014 Free Software Foundation, Inc. +- Written by James Clark (jjc@jclark.com) +- +-This file is part of groff. +- +-groff 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. +- +-groff 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 . */ +- +-%{ +- +-#include "refer.h" +-#include "refid.h" +-#include "ref.h" +-#include "token.h" +- +-int yylex(); +-void yyerror(const char *); +-int yyparse(); +- +-static const char *format_serial(char c, int n); +- +-struct label_info { +- int start; +- int length; +- int count; +- int total; +- label_info(const string &); +-}; +- +-label_info *lookup_label(const string &label); +- +-struct expression { +- enum { +- // Does the tentative label depend on the reference? +- CONTAINS_VARIABLE = 01, +- CONTAINS_STAR = 02, +- CONTAINS_FORMAT = 04, +- CONTAINS_AT = 010 +- }; +- virtual ~expression() { } +- virtual void evaluate(int, const reference &, string &, +- substring_position &) = 0; +- virtual unsigned analyze() { return 0; } +-}; +- +-class at_expr : public expression { +-public: +- at_expr() { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return CONTAINS_VARIABLE|CONTAINS_AT; } +-}; +- +-class format_expr : public expression { +- char type; +- int width; +- int first_number; +-public: +- format_expr(char c, int w = 0, int f = 1) +- : type(c), width(w), first_number(f) { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return CONTAINS_FORMAT; } +-}; +- +-class field_expr : public expression { +- int number; +- char name; +-public: +- field_expr(char nm, int num) : number(num), name(nm) { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return CONTAINS_VARIABLE; } +-}; +- +-class literal_expr : public expression { +- string s; +-public: +- literal_expr(const char *ptr, int len) : s(ptr, len) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class unary_expr : public expression { +-protected: +- expression *expr; +-public: +- unary_expr(expression *e) : expr(e) { } +- ~unary_expr() { delete expr; } +- void evaluate(int, const reference &, string &, substring_position &) = 0; +- unsigned analyze() { return expr ? expr->analyze() : 0; } +-}; +- +-// This caches the analysis of an expression. +- +-class analyzed_expr : public unary_expr { +- unsigned flags; +-public: +- analyzed_expr(expression *); +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { return flags; } +-}; +- +-class star_expr : public unary_expr { +-public: +- star_expr(expression *e) : unary_expr(e) { } +- void evaluate(int, const reference &, string &, substring_position &); +- unsigned analyze() { +- return ((expr ? (expr->analyze() & ~CONTAINS_VARIABLE) : 0) +- | CONTAINS_STAR); +- } +-}; +- +-typedef void map_func(const char *, const char *, string &); +- +-class map_expr : public unary_expr { +- map_func *func; +-public: +- map_expr(expression *e, map_func *f) : unary_expr(e), func(f) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-typedef const char *extractor_func(const char *, const char *, const char **); +- +-class extractor_expr : public unary_expr { +- int part; +- extractor_func *func; +-public: +- enum { BEFORE = +1, MATCH = 0, AFTER = -1 }; +- extractor_expr(expression *e, extractor_func *f, int pt) +- : unary_expr(e), part(pt), func(f) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class truncate_expr : public unary_expr { +- int n; +-public: +- truncate_expr(expression *e, int i) : unary_expr(e), n(i) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class separator_expr : public unary_expr { +-public: +- separator_expr(expression *e) : unary_expr(e) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class binary_expr : public expression { +-protected: +- expression *expr1; +- expression *expr2; +-public: +- binary_expr(expression *e1, expression *e2) : expr1(e1), expr2(e2) { } +- ~binary_expr() { delete expr1; delete expr2; } +- void evaluate(int, const reference &, string &, substring_position &) = 0; +- unsigned analyze() { +- return (expr1 ? expr1->analyze() : 0) | (expr2 ? expr2->analyze() : 0); +- } +-}; +- +-class alternative_expr : public binary_expr { +-public: +- alternative_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class list_expr : public binary_expr { +-public: +- list_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class substitute_expr : public binary_expr { +-public: +- substitute_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-class ternary_expr : public expression { +-protected: +- expression *expr1; +- expression *expr2; +- expression *expr3; +-public: +- ternary_expr(expression *e1, expression *e2, expression *e3) +- : expr1(e1), expr2(e2), expr3(e3) { } +- ~ternary_expr() { delete expr1; delete expr2; delete expr3; } +- void evaluate(int, const reference &, string &, substring_position &) = 0; +- unsigned analyze() { +- return ((expr1 ? expr1->analyze() : 0) +- | (expr2 ? expr2->analyze() : 0) +- | (expr3 ? expr3->analyze() : 0)); +- } +-}; +- +-class conditional_expr : public ternary_expr { +-public: +- conditional_expr(expression *e1, expression *e2, expression *e3) +- : ternary_expr(e1, e2, e3) { } +- void evaluate(int, const reference &, string &, substring_position &); +-}; +- +-static expression *parsed_label = 0; +-static expression *parsed_date_label = 0; +-static expression *parsed_short_label = 0; +- +-static expression *parse_result; +- +-string literals; +- +-%} +- +-%union { +- int num; +- expression *expr; +- struct { int ndigits; int val; } dig; +- struct { int start; int len; } str; +-} +- +-/* uppercase or lowercase letter */ +-%token TOKEN_LETTER +-/* literal characters */ +-%token TOKEN_LITERAL +-/* digit */ +-%token TOKEN_DIGIT +- +-%type conditional +-%type alternative +-%type list +-%type string +-%type substitute +-%type optional_conditional +-%type number +-%type digits +-%type optional_number +-%type flag +- +-%% +- +-expr: +- optional_conditional +- { parse_result = ($1 ? new analyzed_expr($1) : 0); } +- ; +- +-conditional: +- alternative +- { $$ = $1; } +- | alternative '?' optional_conditional ':' conditional +- { $$ = new conditional_expr($1, $3, $5); } +- ; +- +-optional_conditional: +- /* empty */ +- { $$ = 0; } +- | conditional +- { $$ = $1; } +- ; +- +-alternative: +- list +- { $$ = $1; } +- | alternative '|' list +- { $$ = new alternative_expr($1, $3); } +- | alternative '&' list +- { $$ = new conditional_expr($1, $3, 0); } +- ; +- +-list: +- substitute +- { $$ = $1; } +- | list substitute +- { $$ = new list_expr($1, $2); } +- ; +- +-substitute: +- string +- { $$ = $1; } +- | substitute '~' string +- { $$ = new substitute_expr($1, $3); } +- ; +- +-string: +- '@' +- { $$ = new at_expr; } +- | TOKEN_LITERAL +- { +- $$ = new literal_expr(literals.contents() + $1.start, +- $1.len); +- } +- | TOKEN_LETTER +- { $$ = new field_expr($1, 0); } +- | TOKEN_LETTER number +- { $$ = new field_expr($1, $2 - 1); } +- | '%' TOKEN_LETTER +- { +- switch ($2) { +- case 'I': +- case 'i': +- case 'A': +- case 'a': +- $$ = new format_expr($2); +- break; +- default: +- command_error("unrecognized format `%1'", char($2)); +- $$ = new format_expr('a'); +- break; +- } +- } +- +- | '%' digits +- { +- $$ = new format_expr('0', $2.ndigits, $2.val); +- } +- | string '.' flag TOKEN_LETTER optional_number +- { +- switch ($4) { +- case 'l': +- $$ = new map_expr($1, lowercase); +- break; +- case 'u': +- $$ = new map_expr($1, uppercase); +- break; +- case 'c': +- $$ = new map_expr($1, capitalize); +- break; +- case 'r': +- $$ = new map_expr($1, reverse_name); +- break; +- case 'a': +- $$ = new map_expr($1, abbreviate_name); +- break; +- case 'y': +- $$ = new extractor_expr($1, find_year, $3); +- break; +- case 'n': +- $$ = new extractor_expr($1, find_last_name, $3); +- break; +- default: +- $$ = $1; +- command_error("unknown function `%1'", char($4)); +- break; +- } +- } +- +- | string '+' number +- { $$ = new truncate_expr($1, $3); } +- | string '-' number +- { $$ = new truncate_expr($1, -$3); } +- | string '*' +- { $$ = new star_expr($1); } +- | '(' optional_conditional ')' +- { $$ = $2; } +- | '<' optional_conditional '>' +- { $$ = new separator_expr($2); } +- ; +- +-optional_number: +- /* empty */ +- { $$ = -1; } +- | number +- { $$ = $1; } +- ; +- +-number: +- TOKEN_DIGIT +- { $$ = $1; } +- | number TOKEN_DIGIT +- { $$ = $1*10 + $2; } +- ; +- +-digits: +- TOKEN_DIGIT +- { $$.ndigits = 1; $$.val = $1; } +- | digits TOKEN_DIGIT +- { $$.ndigits = $1.ndigits + 1; $$.val = $1.val*10 + $2; } +- ; +- +- +-flag: +- /* empty */ +- { $$ = 0; } +- | '+' +- { $$ = 1; } +- | '-' +- { $$ = -1; } +- ; +- +-%% +- +-/* bison defines const to be empty unless __STDC__ is defined, which it +-isn't under cfront */ +- +-#ifdef const +-#undef const +-#endif +- +-const char *spec_ptr; +-const char *spec_end; +-const char *spec_cur; +- +-static char uppercase_array[] = { +- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', +- 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', +- 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', +- 'Y', 'Z', +-}; +- +-static char lowercase_array[] = { +- 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', +- 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', +- 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', +- 'y', 'z', +-}; +- +-int yylex() +-{ +- while (spec_ptr < spec_end && csspace(*spec_ptr)) +- spec_ptr++; +- spec_cur = spec_ptr; +- if (spec_ptr >= spec_end) +- return 0; +- unsigned char c = *spec_ptr++; +- if (csalpha(c)) { +- yylval.num = c; +- return TOKEN_LETTER; +- } +- if (csdigit(c)) { +- yylval.num = c - '0'; +- return TOKEN_DIGIT; +- } +- if (c == '\'') { +- yylval.str.start = literals.length(); +- for (; spec_ptr < spec_end; spec_ptr++) { +- if (*spec_ptr == '\'') { +- if (++spec_ptr < spec_end && *spec_ptr == '\'') +- literals += '\''; +- else { +- yylval.str.len = literals.length() - yylval.str.start; +- return TOKEN_LITERAL; +- } +- } +- else +- literals += *spec_ptr; +- } +- yylval.str.len = literals.length() - yylval.str.start; +- return TOKEN_LITERAL; +- } +- return c; +-} +- +-int set_label_spec(const char *label_spec) +-{ +- spec_cur = spec_ptr = label_spec; +- spec_end = strchr(label_spec, '\0'); +- literals.clear(); +- if (yyparse()) +- return 0; +- delete parsed_label; +- parsed_label = parse_result; +- return 1; +-} +- +-int set_date_label_spec(const char *label_spec) +-{ +- spec_cur = spec_ptr = label_spec; +- spec_end = strchr(label_spec, '\0'); +- literals.clear(); +- if (yyparse()) +- return 0; +- delete parsed_date_label; +- parsed_date_label = parse_result; +- return 1; +-} +- +-int set_short_label_spec(const char *label_spec) +-{ +- spec_cur = spec_ptr = label_spec; +- spec_end = strchr(label_spec, '\0'); +- literals.clear(); +- if (yyparse()) +- return 0; +- delete parsed_short_label; +- parsed_short_label = parse_result; +- return 1; +-} +- +-void yyerror(const char *message) +-{ +- if (spec_cur < spec_end) +- command_error("label specification %1 before `%2'", message, spec_cur); +- else +- command_error("label specification %1 at end of string", +- message, spec_cur); +-} +- +-void at_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (tentative) +- ref.canonicalize_authors(result); +- else { +- const char *end, *start = ref.get_authors(&end); +- if (start) +- result.append(start, end - start); +- } +-} +- +-void format_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (tentative) +- return; +- const label_info *lp = ref.get_label_ptr(); +- int num = lp == 0 ? ref.get_number() : lp->count; +- if (type != '0') +- result += format_serial(type, num + 1); +- else { +- const char *ptr = i_to_a(num + first_number); +- int pad = width - strlen(ptr); +- while (--pad >= 0) +- result += '0'; +- result += ptr; +- } +-} +- +-static const char *format_serial(char c, int n) +-{ +- assert(n > 0); +- static char buf[128]; // more than enough. +- switch (c) { +- case 'i': +- case 'I': +- { +- char *p = buf; +- // troff uses z and w to represent 10000 and 5000 in Roman +- // numerals; I can find no historical basis for this usage +- const char *s = c == 'i' ? "zwmdclxvi" : "ZWMDCLXVI"; +- if (n >= 40000) +- return i_to_a(n); +- while (n >= 10000) { +- *p++ = s[0]; +- n -= 10000; +- } +- for (int i = 1000; i > 0; i /= 10, s += 2) { +- int m = n/i; +- n -= m*i; +- switch (m) { +- case 3: +- *p++ = s[2]; +- /* falls through */ +- case 2: +- *p++ = s[2]; +- /* falls through */ +- case 1: +- *p++ = s[2]; +- break; +- case 4: +- *p++ = s[2]; +- *p++ = s[1]; +- break; +- case 8: +- *p++ = s[1]; +- *p++ = s[2]; +- *p++ = s[2]; +- *p++ = s[2]; +- break; +- case 7: +- *p++ = s[1]; +- *p++ = s[2]; +- *p++ = s[2]; +- break; +- case 6: +- *p++ = s[1]; +- *p++ = s[2]; +- break; +- case 5: +- *p++ = s[1]; +- break; +- case 9: +- *p++ = s[2]; +- *p++ = s[0]; +- } +- } +- *p = 0; +- break; +- } +- case 'a': +- case 'A': +- { +- char *p = buf; +- // this is derived from troff/reg.c +- while (n > 0) { +- int d = n % 26; +- if (d == 0) +- d = 26; +- n -= d; +- n /= 26; +- *p++ = c == 'a' ? lowercase_array[d - 1] : +- uppercase_array[d - 1]; +- } +- *p-- = 0; +- // Reverse it. +- char *q = buf; +- while (q < p) { +- char temp = *q; +- *q = *p; +- *p = temp; +- --p; +- ++q; +- } +- break; +- } +- default: +- assert(0); +- } +- return buf; +-} +- +-void field_expr::evaluate(int, const reference &ref, +- string &result, substring_position &) +-{ +- const char *end; +- const char *start = ref.get_field(name, &end); +- if (start) { +- start = nth_field(number, start, &end); +- if (start) +- result.append(start, end - start); +- } +-} +- +-void literal_expr::evaluate(int, const reference &, +- string &result, substring_position &) +-{ +- result += s; +-} +- +-analyzed_expr::analyzed_expr(expression *e) +-: unary_expr(e), flags(e ? e->analyze() : 0) +-{ +-} +- +-void analyzed_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- if (expr) +- expr->evaluate(tentative, ref, result, pos); +-} +- +-void star_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- const label_info *lp = ref.get_label_ptr(); +- if (!tentative +- && (lp == 0 || lp->total > 1) +- && expr) +- expr->evaluate(tentative, ref, result, pos); +-} +- +-void separator_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- int start_length = result.length(); +- int is_first = pos.start < 0; +- if (expr) +- expr->evaluate(tentative, ref, result, pos); +- if (is_first) { +- pos.start = start_length; +- pos.length = result.length() - start_length; +- } +-} +- +-void map_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (expr) { +- string temp; +- substring_position temp_pos; +- expr->evaluate(tentative, ref, temp, temp_pos); +- (*func)(temp.contents(), temp.contents() + temp.length(), result); +- } +-} +- +-void extractor_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (expr) { +- string temp; +- substring_position temp_pos; +- expr->evaluate(tentative, ref, temp, temp_pos); +- const char *end, *start = (*func)(temp.contents(), +- temp.contents() + temp.length(), +- &end); +- switch (part) { +- case BEFORE: +- if (start) +- result.append(temp.contents(), start - temp.contents()); +- else +- result += temp; +- break; +- case MATCH: +- if (start) +- result.append(start, end - start); +- break; +- case AFTER: +- if (start) +- result.append(end, temp.contents() + temp.length() - end); +- break; +- default: +- assert(0); +- } +- } +-} +- +-static void first_part(int len, const char *ptr, const char *end, +- string &result) +-{ +- for (;;) { +- const char *token_start = ptr; +- if (!get_token(&ptr, end)) +- break; +- const token_info *ti = lookup_token(token_start, ptr); +- int counts = ti->sortify_non_empty(token_start, ptr); +- if (counts && --len < 0) +- break; +- if (counts || ti->is_accent()) +- result.append(token_start, ptr - token_start); +- } +-} +- +-static void last_part(int len, const char *ptr, const char *end, +- string &result) +-{ +- const char *start = ptr; +- int count = 0; +- for (;;) { +- const char *token_start = ptr; +- if (!get_token(&ptr, end)) +- break; +- const token_info *ti = lookup_token(token_start, ptr); +- if (ti->sortify_non_empty(token_start, ptr)) +- count++; +- } +- ptr = start; +- int skip = count - len; +- if (skip > 0) { +- for (;;) { +- const char *token_start = ptr; +- if (!get_token(&ptr, end)) +- assert(0); +- const token_info *ti = lookup_token(token_start, ptr); +- if (ti->sortify_non_empty(token_start, ptr) && --skip < 0) { +- ptr = token_start; +- break; +- } +- } +- } +- first_part(len, ptr, end, result); +-} +- +-void truncate_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &) +-{ +- if (expr) { +- string temp; +- substring_position temp_pos; +- expr->evaluate(tentative, ref, temp, temp_pos); +- const char *start = temp.contents(); +- const char *end = start + temp.length(); +- if (n > 0) +- first_part(n, start, end, result); +- else if (n < 0) +- last_part(-n, start, end, result); +- } +-} +- +-void alternative_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- int start_length = result.length(); +- if (expr1) +- expr1->evaluate(tentative, ref, result, pos); +- if (result.length() == start_length && expr2) +- expr2->evaluate(tentative, ref, result, pos); +-} +- +-void list_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- if (expr1) +- expr1->evaluate(tentative, ref, result, pos); +- if (expr2) +- expr2->evaluate(tentative, ref, result, pos); +-} +- +-void substitute_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- int start_length = result.length(); +- if (expr1) +- expr1->evaluate(tentative, ref, result, pos); +- if (result.length() > start_length && result[result.length() - 1] == '-') { +- // ought to see if pos covers the - +- result.set_length(result.length() - 1); +- if (expr2) +- expr2->evaluate(tentative, ref, result, pos); +- } +-} +- +-void conditional_expr::evaluate(int tentative, const reference &ref, +- string &result, substring_position &pos) +-{ +- string temp; +- substring_position temp_pos; +- if (expr1) +- expr1->evaluate(tentative, ref, temp, temp_pos); +- if (temp.length() > 0) { +- if (expr2) +- expr2->evaluate(tentative, ref, result, pos); +- } +- else { +- if (expr3) +- expr3->evaluate(tentative, ref, result, pos); +- } +-} +- +-void reference::pre_compute_label() +-{ +- if (parsed_label != 0 +- && (parsed_label->analyze() & expression::CONTAINS_VARIABLE)) { +- label.clear(); +- substring_position temp_pos; +- parsed_label->evaluate(1, *this, label, temp_pos); +- label_ptr = lookup_label(label); +- } +-} +- +-void reference::compute_label() +-{ +- label.clear(); +- if (parsed_label) +- parsed_label->evaluate(0, *this, label, separator_pos); +- if (short_label_flag && parsed_short_label) +- parsed_short_label->evaluate(0, *this, short_label, short_separator_pos); +- if (date_as_label) { +- string new_date; +- if (parsed_date_label) { +- substring_position temp_pos; +- parsed_date_label->evaluate(0, *this, new_date, temp_pos); +- } +- set_date(new_date); +- } +- if (label_ptr) +- label_ptr->count += 1; +-} +- +-void reference::immediate_compute_label() +-{ +- if (label_ptr) +- label_ptr->total = 2; // force use of disambiguator +- compute_label(); +-} +- +-int reference::merge_labels(reference **v, int n, label_type type, +- string &result) +-{ +- if (abbreviate_label_ranges) +- return merge_labels_by_number(v, n, type, result); +- else +- return merge_labels_by_parts(v, n, type, result); +-} +- +-int reference::merge_labels_by_number(reference **v, int n, label_type type, +- string &result) +-{ +- if (n <= 1) +- return 0; +- int num = get_number(); +- // Only merge three or more labels. +- if (v[0]->get_number() != num + 1 +- || v[1]->get_number() != num + 2) +- return 0; +- int i; +- for (i = 2; i < n; i++) +- if (v[i]->get_number() != num + i + 1) +- break; +- result = get_label(type); +- result += label_range_indicator; +- result += v[i - 1]->get_label(type); +- return i; +-} +- +-const substring_position &reference::get_separator_pos(label_type type) const +-{ +- if (type == SHORT_LABEL && short_label_flag) +- return short_separator_pos; +- else +- return separator_pos; +-} +- +-const string &reference::get_label(label_type type) const +-{ +- if (type == SHORT_LABEL && short_label_flag) +- return short_label; +- else +- return label; +-} +- +-int reference::merge_labels_by_parts(reference **v, int n, label_type type, +- string &result) +-{ +- if (n <= 0) +- return 0; +- const string &lb = get_label(type); +- const substring_position &sp = get_separator_pos(type); +- if (sp.start < 0 +- || sp.start != v[0]->get_separator_pos(type).start +- || memcmp(lb.contents(), v[0]->get_label(type).contents(), +- sp.start) != 0) +- return 0; +- result = lb; +- int i = 0; +- do { +- result += separate_label_second_parts; +- const substring_position &s = v[i]->get_separator_pos(type); +- int sep_end_pos = s.start + s.length; +- result.append(v[i]->get_label(type).contents() + sep_end_pos, +- v[i]->get_label(type).length() - sep_end_pos); +- } while (++i < n +- && sp.start == v[i]->get_separator_pos(type).start +- && memcmp(lb.contents(), v[i]->get_label(type).contents(), +- sp.start) == 0); +- return i; +-} +- +-string label_pool; +- +-label_info::label_info(const string &s) +-: start(label_pool.length()), length(s.length()), count(0), total(1) +-{ +- label_pool += s; +-} +- +-static label_info **label_table = 0; +-static int label_table_size = 0; +-static int label_table_used = 0; +- +-label_info *lookup_label(const string &label) +-{ +- if (label_table == 0) { +- label_table = new label_info *[17]; +- label_table_size = 17; +- for (int i = 0; i < 17; i++) +- label_table[i] = 0; +- } +- unsigned h = hash_string(label.contents(), label.length()) % label_table_size; +- label_info **ptr; +- for (ptr = label_table + h; +- *ptr != 0; +- (ptr == label_table) +- ? (ptr = label_table + label_table_size - 1) +- : ptr--) +- if ((*ptr)->length == label.length() +- && memcmp(label_pool.contents() + (*ptr)->start, label.contents(), +- label.length()) == 0) { +- (*ptr)->total += 1; +- return *ptr; +- } +- label_info *result = *ptr = new label_info(label); +- if (++label_table_used * 2 > label_table_size) { +- // Rehash the table. +- label_info **old_table = label_table; +- int old_size = label_table_size; +- label_table_size = next_size(label_table_size); +- label_table = new label_info *[label_table_size]; +- int i; +- for (i = 0; i < label_table_size; i++) +- label_table[i] = 0; +- for (i = 0; i < old_size; i++) +- if (old_table[i]) { +- h = hash_string(label_pool.contents() + old_table[i]->start, +- old_table[i]->length); +- label_info **p; +- for (p = label_table + (h % label_table_size); +- *p != 0; +- (p == label_table) +- ? (p = label_table + label_table_size - 1) +- : --p) +- ; +- *p = old_table[i]; +- } +- a_delete old_table; +- } +- return result; +-} +- +-void clear_labels() +-{ +- for (int i = 0; i < label_table_size; i++) { +- delete label_table[i]; +- label_table[i] = 0; +- } +- label_table_used = 0; +- label_pool.clear(); +-} +- +-static void consider_authors(reference **start, reference **end, int i); +- +-void compute_labels(reference **v, int n) +-{ +- if (parsed_label +- && (parsed_label->analyze() & expression::CONTAINS_AT) +- && sort_fields.length() >= 2 +- && sort_fields[0] == 'A' +- && sort_fields[1] == '+') +- consider_authors(v, v + n, 0); +- for (int i = 0; i < n; i++) +- v[i]->compute_label(); +-} +- +- +-/* A reference with a list of authors _needs_ author i +-where 0 <= i <= N if there exists a reference with a list of authors +- such that != and M >= i +-and Aj = Bj for 0 <= j < i. In this case if we can't say ``A0, +-A1,...,A(i-1) et al'' because this would match both and +-. If a reference needs author i we only have to call +-need_author(j) for some j >= i such that the reference also needs +-author j. */ +- +-/* This function handles 2 tasks: +-determine which authors are needed (cannot be elided with et al.); +-determine which authors can have only last names in the labels. +- +-References >= start and < end have the same first i author names. +-Also they're sorted by A+. */ +- +-static void consider_authors(reference **start, reference **end, int i) +-{ +- if (start >= end) +- return; +- reference **p = start; +- if (i >= (*p)->get_nauthors()) { +- for (++p; p < end && i >= (*p)->get_nauthors(); p++) +- ; +- if (p < end && i > 0) { +- // If we have an author list and an author list , +- // then both lists need C. +- for (reference **q = start; q < end; q++) +- (*q)->need_author(i - 1); +- } +- start = p; +- } +- while (p < end) { +- reference **last_name_start = p; +- reference **name_start = p; +- for (++p; +- p < end && i < (*p)->get_nauthors() +- && same_author_last_name(**last_name_start, **p, i); +- p++) { +- if (!same_author_name(**name_start, **p, i)) { +- consider_authors(name_start, p, i + 1); +- name_start = p; +- } +- } +- consider_authors(name_start, p, i + 1); +- if (last_name_start == name_start) { +- for (reference **q = last_name_start; q < p; q++) +- (*q)->set_last_name_unambiguous(i); +- } +- // If we have an author list and , then the lists +- // need author D and E respectively. +- if (name_start > start || p < end) { +- for (reference **q = last_name_start; q < p; q++) +- (*q)->need_author(i); +- } +- } +-} +- +-int same_author_last_name(const reference &r1, const reference &r2, int n) +-{ +- const char *ae1; +- const char *as1 = r1.get_sort_field(0, n, 0, &ae1); +- const char *ae2; +- const char *as2 = r2.get_sort_field(0, n, 0, &ae2); +- if (!as1 && !as2) return 1; // they are the same +- if (!as1 || !as2) return 0; +- return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0; +-} +- +-int same_author_name(const reference &r1, const reference &r2, int n) +-{ +- const char *ae1; +- const char *as1 = r1.get_sort_field(0, n, -1, &ae1); +- const char *ae2; +- const char *as2 = r2.get_sort_field(0, n, -1, &ae2); +- if (!as1 && !as2) return 1; // they are the same +- if (!as1 || !as2) return 0; +- return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0; +-} +- +- +-void int_set::set(int i) +-{ +- assert(i >= 0); +- int bytei = i >> 3; +- if (bytei >= v.length()) { +- int old_length = v.length(); +- v.set_length(bytei + 1); +- for (int j = old_length; j <= bytei; j++) +- v[j] = 0; +- } +- v[bytei] |= 1 << (i & 7); +-} +- +-int int_set::get(int i) const +-{ +- assert(i >= 0); +- int bytei = i >> 3; +- return bytei >= v.length() ? 0 : (v[bytei] & (1 << (i & 7))) != 0; +-} +- +-void reference::set_last_name_unambiguous(int i) +-{ +- last_name_unambiguous.set(i); +-} +- +-void reference::need_author(int n) +-{ +- if (n > last_needed_author) +- last_needed_author = n; +-} +- +-const char *reference::get_authors(const char **end) const +-{ +- if (!computed_authors) { +- ((reference *)this)->computed_authors = 1; +- string &result = ((reference *)this)->authors; +- int na = get_nauthors(); +- result.clear(); +- for (int i = 0; i < na; i++) { +- if (last_name_unambiguous.get(i)) { +- const char *e, *start = get_author_last_name(i, &e); +- assert(start != 0); +- result.append(start, e - start); +- } +- else { +- const char *e, *start = get_author(i, &e); +- assert(start != 0); +- result.append(start, e - start); +- } +- if (i == last_needed_author +- && et_al.length() > 0 +- && et_al_min_elide > 0 +- && last_needed_author + et_al_min_elide < na +- && na >= et_al_min_total) { +- result += et_al; +- break; +- } +- if (i < na - 1) { +- if (na == 2) +- result += join_authors_exactly_two; +- else if (i < na - 2) +- result += join_authors_default; +- else +- result += join_authors_last_two; +- } +- } +- } +- const char *start = authors.contents(); +- *end = start + authors.length(); +- return start; +-} +- +-int reference::get_nauthors() const +-{ +- if (nauthors < 0) { +- const char *dummy; +- int na; +- for (na = 0; get_author(na, &dummy) != 0; na++) +- ; +- ((reference *)this)->nauthors = na; +- } +- return nauthors; +-} +diff -Nuar groff-1.22.3.old/src/preproc/refer/label.ypp groff-1.22.3/src/preproc/refer/label.ypp +--- groff-1.22.3.old/src/preproc/refer/label.ypp 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/refer/label.ypp 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,1191 @@ ++/* -*- C++ -*- ++ Copyright (C) 1989-2014 Free Software Foundation, Inc. ++ Written by James Clark (jjc@jclark.com) ++ ++This file is part of groff. ++ ++groff 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. ++ ++groff 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 . */ ++ ++%{ ++ ++#include "refer.h" ++#include "refid.h" ++#include "ref.h" ++#include "token.h" ++ ++int yylex(); ++void yyerror(const char *); ++int yyparse(); ++ ++static const char *format_serial(char c, int n); ++ ++struct label_info { ++ int start; ++ int length; ++ int count; ++ int total; ++ label_info(const string &); ++}; ++ ++label_info *lookup_label(const string &label); ++ ++struct expression { ++ enum { ++ // Does the tentative label depend on the reference? ++ CONTAINS_VARIABLE = 01, ++ CONTAINS_STAR = 02, ++ CONTAINS_FORMAT = 04, ++ CONTAINS_AT = 010 ++ }; ++ virtual ~expression() { } ++ virtual void evaluate(int, const reference &, string &, ++ substring_position &) = 0; ++ virtual unsigned analyze() { return 0; } ++}; ++ ++class at_expr : public expression { ++public: ++ at_expr() { } ++ void evaluate(int, const reference &, string &, substring_position &); ++ unsigned analyze() { return CONTAINS_VARIABLE|CONTAINS_AT; } ++}; ++ ++class format_expr : public expression { ++ char type; ++ int width; ++ int first_number; ++public: ++ format_expr(char c, int w = 0, int f = 1) ++ : type(c), width(w), first_number(f) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++ unsigned analyze() { return CONTAINS_FORMAT; } ++}; ++ ++class field_expr : public expression { ++ int number; ++ char name; ++public: ++ field_expr(char nm, int num) : number(num), name(nm) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++ unsigned analyze() { return CONTAINS_VARIABLE; } ++}; ++ ++class literal_expr : public expression { ++ string s; ++public: ++ literal_expr(const char *ptr, int len) : s(ptr, len) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class unary_expr : public expression { ++protected: ++ expression *expr; ++public: ++ unary_expr(expression *e) : expr(e) { } ++ ~unary_expr() { delete expr; } ++ void evaluate(int, const reference &, string &, substring_position &) = 0; ++ unsigned analyze() { return expr ? expr->analyze() : 0; } ++}; ++ ++// This caches the analysis of an expression. ++ ++class analyzed_expr : public unary_expr { ++ unsigned flags; ++public: ++ analyzed_expr(expression *); ++ void evaluate(int, const reference &, string &, substring_position &); ++ unsigned analyze() { return flags; } ++}; ++ ++class star_expr : public unary_expr { ++public: ++ star_expr(expression *e) : unary_expr(e) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++ unsigned analyze() { ++ return ((expr ? (expr->analyze() & ~CONTAINS_VARIABLE) : 0) ++ | CONTAINS_STAR); ++ } ++}; ++ ++typedef void map_func(const char *, const char *, string &); ++ ++class map_expr : public unary_expr { ++ map_func *func; ++public: ++ map_expr(expression *e, map_func *f) : unary_expr(e), func(f) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++typedef const char *extractor_func(const char *, const char *, const char **); ++ ++class extractor_expr : public unary_expr { ++ int part; ++ extractor_func *func; ++public: ++ enum { BEFORE = +1, MATCH = 0, AFTER = -1 }; ++ extractor_expr(expression *e, extractor_func *f, int pt) ++ : unary_expr(e), part(pt), func(f) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class truncate_expr : public unary_expr { ++ int n; ++public: ++ truncate_expr(expression *e, int i) : unary_expr(e), n(i) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class separator_expr : public unary_expr { ++public: ++ separator_expr(expression *e) : unary_expr(e) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class binary_expr : public expression { ++protected: ++ expression *expr1; ++ expression *expr2; ++public: ++ binary_expr(expression *e1, expression *e2) : expr1(e1), expr2(e2) { } ++ ~binary_expr() { delete expr1; delete expr2; } ++ void evaluate(int, const reference &, string &, substring_position &) = 0; ++ unsigned analyze() { ++ return (expr1 ? expr1->analyze() : 0) | (expr2 ? expr2->analyze() : 0); ++ } ++}; ++ ++class alternative_expr : public binary_expr { ++public: ++ alternative_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class list_expr : public binary_expr { ++public: ++ list_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class substitute_expr : public binary_expr { ++public: ++ substitute_expr(expression *e1, expression *e2) : binary_expr(e1, e2) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++class ternary_expr : public expression { ++protected: ++ expression *expr1; ++ expression *expr2; ++ expression *expr3; ++public: ++ ternary_expr(expression *e1, expression *e2, expression *e3) ++ : expr1(e1), expr2(e2), expr3(e3) { } ++ ~ternary_expr() { delete expr1; delete expr2; delete expr3; } ++ void evaluate(int, const reference &, string &, substring_position &) = 0; ++ unsigned analyze() { ++ return ((expr1 ? expr1->analyze() : 0) ++ | (expr2 ? expr2->analyze() : 0) ++ | (expr3 ? expr3->analyze() : 0)); ++ } ++}; ++ ++class conditional_expr : public ternary_expr { ++public: ++ conditional_expr(expression *e1, expression *e2, expression *e3) ++ : ternary_expr(e1, e2, e3) { } ++ void evaluate(int, const reference &, string &, substring_position &); ++}; ++ ++static expression *parsed_label = 0; ++static expression *parsed_date_label = 0; ++static expression *parsed_short_label = 0; ++ ++static expression *parse_result; ++ ++string literals; ++ ++%} ++ ++%union { ++ int num; ++ expression *expr; ++ struct { int ndigits; int val; } dig; ++ struct { int start; int len; } str; ++} ++ ++/* uppercase or lowercase letter */ ++%token TOKEN_LETTER ++/* literal characters */ ++%token TOKEN_LITERAL ++/* digit */ ++%token TOKEN_DIGIT ++ ++%type conditional ++%type alternative ++%type list ++%type string ++%type substitute ++%type optional_conditional ++%type number ++%type digits ++%type optional_number ++%type flag ++ ++%% ++ ++expr: ++ optional_conditional ++ { parse_result = ($1 ? new analyzed_expr($1) : 0); } ++ ; ++ ++conditional: ++ alternative ++ { $$ = $1; } ++ | alternative '?' optional_conditional ':' conditional ++ { $$ = new conditional_expr($1, $3, $5); } ++ ; ++ ++optional_conditional: ++ /* empty */ ++ { $$ = 0; } ++ | conditional ++ { $$ = $1; } ++ ; ++ ++alternative: ++ list ++ { $$ = $1; } ++ | alternative '|' list ++ { $$ = new alternative_expr($1, $3); } ++ | alternative '&' list ++ { $$ = new conditional_expr($1, $3, 0); } ++ ; ++ ++list: ++ substitute ++ { $$ = $1; } ++ | list substitute ++ { $$ = new list_expr($1, $2); } ++ ; ++ ++substitute: ++ string ++ { $$ = $1; } ++ | substitute '~' string ++ { $$ = new substitute_expr($1, $3); } ++ ; ++ ++string: ++ '@' ++ { $$ = new at_expr; } ++ | TOKEN_LITERAL ++ { ++ $$ = new literal_expr(literals.contents() + $1.start, ++ $1.len); ++ } ++ | TOKEN_LETTER ++ { $$ = new field_expr($1, 0); } ++ | TOKEN_LETTER number ++ { $$ = new field_expr($1, $2 - 1); } ++ | '%' TOKEN_LETTER ++ { ++ switch ($2) { ++ case 'I': ++ case 'i': ++ case 'A': ++ case 'a': ++ $$ = new format_expr($2); ++ break; ++ default: ++ command_error("unrecognized format `%1'", char($2)); ++ $$ = new format_expr('a'); ++ break; ++ } ++ } ++ ++ | '%' digits ++ { ++ $$ = new format_expr('0', $2.ndigits, $2.val); ++ } ++ | string '.' flag TOKEN_LETTER optional_number ++ { ++ switch ($4) { ++ case 'l': ++ $$ = new map_expr($1, lowercase); ++ break; ++ case 'u': ++ $$ = new map_expr($1, uppercase); ++ break; ++ case 'c': ++ $$ = new map_expr($1, capitalize); ++ break; ++ case 'r': ++ $$ = new map_expr($1, reverse_name); ++ break; ++ case 'a': ++ $$ = new map_expr($1, abbreviate_name); ++ break; ++ case 'y': ++ $$ = new extractor_expr($1, find_year, $3); ++ break; ++ case 'n': ++ $$ = new extractor_expr($1, find_last_name, $3); ++ break; ++ default: ++ $$ = $1; ++ command_error("unknown function `%1'", char($4)); ++ break; ++ } ++ } ++ ++ | string '+' number ++ { $$ = new truncate_expr($1, $3); } ++ | string '-' number ++ { $$ = new truncate_expr($1, -$3); } ++ | string '*' ++ { $$ = new star_expr($1); } ++ | '(' optional_conditional ')' ++ { $$ = $2; } ++ | '<' optional_conditional '>' ++ { $$ = new separator_expr($2); } ++ ; ++ ++optional_number: ++ /* empty */ ++ { $$ = -1; } ++ | number ++ { $$ = $1; } ++ ; ++ ++number: ++ TOKEN_DIGIT ++ { $$ = $1; } ++ | number TOKEN_DIGIT ++ { $$ = $1*10 + $2; } ++ ; ++ ++digits: ++ TOKEN_DIGIT ++ { $$.ndigits = 1; $$.val = $1; } ++ | digits TOKEN_DIGIT ++ { $$.ndigits = $1.ndigits + 1; $$.val = $1.val*10 + $2; } ++ ; ++ ++ ++flag: ++ /* empty */ ++ { $$ = 0; } ++ | '+' ++ { $$ = 1; } ++ | '-' ++ { $$ = -1; } ++ ; ++ ++%% ++ ++/* bison defines const to be empty unless __STDC__ is defined, which it ++isn't under cfront */ ++ ++#ifdef const ++#undef const ++#endif ++ ++const char *spec_ptr; ++const char *spec_end; ++const char *spec_cur; ++ ++static char uppercase_array[] = { ++ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', ++ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', ++ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', ++ 'Y', 'Z', ++}; ++ ++static char lowercase_array[] = { ++ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', ++ 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', ++ 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', ++ 'y', 'z', ++}; ++ ++int yylex() ++{ ++ while (spec_ptr < spec_end && csspace(*spec_ptr)) ++ spec_ptr++; ++ spec_cur = spec_ptr; ++ if (spec_ptr >= spec_end) ++ return 0; ++ unsigned char c = *spec_ptr++; ++ if (csalpha(c)) { ++ yylval.num = c; ++ return TOKEN_LETTER; ++ } ++ if (csdigit(c)) { ++ yylval.num = c - '0'; ++ return TOKEN_DIGIT; ++ } ++ if (c == '\'') { ++ yylval.str.start = literals.length(); ++ for (; spec_ptr < spec_end; spec_ptr++) { ++ if (*spec_ptr == '\'') { ++ if (++spec_ptr < spec_end && *spec_ptr == '\'') ++ literals += '\''; ++ else { ++ yylval.str.len = literals.length() - yylval.str.start; ++ return TOKEN_LITERAL; ++ } ++ } ++ else ++ literals += *spec_ptr; ++ } ++ yylval.str.len = literals.length() - yylval.str.start; ++ return TOKEN_LITERAL; ++ } ++ return c; ++} ++ ++int set_label_spec(const char *label_spec) ++{ ++ spec_cur = spec_ptr = label_spec; ++ spec_end = strchr(label_spec, '\0'); ++ literals.clear(); ++ if (yyparse()) ++ return 0; ++ delete parsed_label; ++ parsed_label = parse_result; ++ return 1; ++} ++ ++int set_date_label_spec(const char *label_spec) ++{ ++ spec_cur = spec_ptr = label_spec; ++ spec_end = strchr(label_spec, '\0'); ++ literals.clear(); ++ if (yyparse()) ++ return 0; ++ delete parsed_date_label; ++ parsed_date_label = parse_result; ++ return 1; ++} ++ ++int set_short_label_spec(const char *label_spec) ++{ ++ spec_cur = spec_ptr = label_spec; ++ spec_end = strchr(label_spec, '\0'); ++ literals.clear(); ++ if (yyparse()) ++ return 0; ++ delete parsed_short_label; ++ parsed_short_label = parse_result; ++ return 1; ++} ++ ++void yyerror(const char *message) ++{ ++ if (spec_cur < spec_end) ++ command_error("label specification %1 before `%2'", message, spec_cur); ++ else ++ command_error("label specification %1 at end of string", ++ message, spec_cur); ++} ++ ++void at_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &) ++{ ++ if (tentative) ++ ref.canonicalize_authors(result); ++ else { ++ const char *end, *start = ref.get_authors(&end); ++ if (start) ++ result.append(start, end - start); ++ } ++} ++ ++void format_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &) ++{ ++ if (tentative) ++ return; ++ const label_info *lp = ref.get_label_ptr(); ++ int num = lp == 0 ? ref.get_number() : lp->count; ++ if (type != '0') ++ result += format_serial(type, num + 1); ++ else { ++ const char *ptr = i_to_a(num + first_number); ++ int pad = width - strlen(ptr); ++ while (--pad >= 0) ++ result += '0'; ++ result += ptr; ++ } ++} ++ ++static const char *format_serial(char c, int n) ++{ ++ assert(n > 0); ++ static char buf[128]; // more than enough. ++ switch (c) { ++ case 'i': ++ case 'I': ++ { ++ char *p = buf; ++ // troff uses z and w to represent 10000 and 5000 in Roman ++ // numerals; I can find no historical basis for this usage ++ const char *s = c == 'i' ? "zwmdclxvi" : "ZWMDCLXVI"; ++ if (n >= 40000) ++ return i_to_a(n); ++ while (n >= 10000) { ++ *p++ = s[0]; ++ n -= 10000; ++ } ++ for (int i = 1000; i > 0; i /= 10, s += 2) { ++ int m = n/i; ++ n -= m*i; ++ switch (m) { ++ case 3: ++ *p++ = s[2]; ++ /* falls through */ ++ case 2: ++ *p++ = s[2]; ++ /* falls through */ ++ case 1: ++ *p++ = s[2]; ++ break; ++ case 4: ++ *p++ = s[2]; ++ *p++ = s[1]; ++ break; ++ case 8: ++ *p++ = s[1]; ++ *p++ = s[2]; ++ *p++ = s[2]; ++ *p++ = s[2]; ++ break; ++ case 7: ++ *p++ = s[1]; ++ *p++ = s[2]; ++ *p++ = s[2]; ++ break; ++ case 6: ++ *p++ = s[1]; ++ *p++ = s[2]; ++ break; ++ case 5: ++ *p++ = s[1]; ++ break; ++ case 9: ++ *p++ = s[2]; ++ *p++ = s[0]; ++ } ++ } ++ *p = 0; ++ break; ++ } ++ case 'a': ++ case 'A': ++ { ++ char *p = buf; ++ // this is derived from troff/reg.c ++ while (n > 0) { ++ int d = n % 26; ++ if (d == 0) ++ d = 26; ++ n -= d; ++ n /= 26; ++ *p++ = c == 'a' ? lowercase_array[d - 1] : ++ uppercase_array[d - 1]; ++ } ++ *p-- = 0; ++ // Reverse it. ++ char *q = buf; ++ while (q < p) { ++ char temp = *q; ++ *q = *p; ++ *p = temp; ++ --p; ++ ++q; ++ } ++ break; ++ } ++ default: ++ assert(0); ++ } ++ return buf; ++} ++ ++void field_expr::evaluate(int, const reference &ref, ++ string &result, substring_position &) ++{ ++ const char *end; ++ const char *start = ref.get_field(name, &end); ++ if (start) { ++ start = nth_field(number, start, &end); ++ if (start) ++ result.append(start, end - start); ++ } ++} ++ ++void literal_expr::evaluate(int, const reference &, ++ string &result, substring_position &) ++{ ++ result += s; ++} ++ ++analyzed_expr::analyzed_expr(expression *e) ++: unary_expr(e), flags(e ? e->analyze() : 0) ++{ ++} ++ ++void analyzed_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ if (expr) ++ expr->evaluate(tentative, ref, result, pos); ++} ++ ++void star_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ const label_info *lp = ref.get_label_ptr(); ++ if (!tentative ++ && (lp == 0 || lp->total > 1) ++ && expr) ++ expr->evaluate(tentative, ref, result, pos); ++} ++ ++void separator_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ int start_length = result.length(); ++ int is_first = pos.start < 0; ++ if (expr) ++ expr->evaluate(tentative, ref, result, pos); ++ if (is_first) { ++ pos.start = start_length; ++ pos.length = result.length() - start_length; ++ } ++} ++ ++void map_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &) ++{ ++ if (expr) { ++ string temp; ++ substring_position temp_pos; ++ expr->evaluate(tentative, ref, temp, temp_pos); ++ (*func)(temp.contents(), temp.contents() + temp.length(), result); ++ } ++} ++ ++void extractor_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &) ++{ ++ if (expr) { ++ string temp; ++ substring_position temp_pos; ++ expr->evaluate(tentative, ref, temp, temp_pos); ++ const char *end, *start = (*func)(temp.contents(), ++ temp.contents() + temp.length(), ++ &end); ++ switch (part) { ++ case BEFORE: ++ if (start) ++ result.append(temp.contents(), start - temp.contents()); ++ else ++ result += temp; ++ break; ++ case MATCH: ++ if (start) ++ result.append(start, end - start); ++ break; ++ case AFTER: ++ if (start) ++ result.append(end, temp.contents() + temp.length() - end); ++ break; ++ default: ++ assert(0); ++ } ++ } ++} ++ ++static void first_part(int len, const char *ptr, const char *end, ++ string &result) ++{ ++ for (;;) { ++ const char *token_start = ptr; ++ if (!get_token(&ptr, end)) ++ break; ++ const token_info *ti = lookup_token(token_start, ptr); ++ int counts = ti->sortify_non_empty(token_start, ptr); ++ if (counts && --len < 0) ++ break; ++ if (counts || ti->is_accent()) ++ result.append(token_start, ptr - token_start); ++ } ++} ++ ++static void last_part(int len, const char *ptr, const char *end, ++ string &result) ++{ ++ const char *start = ptr; ++ int count = 0; ++ for (;;) { ++ const char *token_start = ptr; ++ if (!get_token(&ptr, end)) ++ break; ++ const token_info *ti = lookup_token(token_start, ptr); ++ if (ti->sortify_non_empty(token_start, ptr)) ++ count++; ++ } ++ ptr = start; ++ int skip = count - len; ++ if (skip > 0) { ++ for (;;) { ++ const char *token_start = ptr; ++ if (!get_token(&ptr, end)) ++ assert(0); ++ const token_info *ti = lookup_token(token_start, ptr); ++ if (ti->sortify_non_empty(token_start, ptr) && --skip < 0) { ++ ptr = token_start; ++ break; ++ } ++ } ++ } ++ first_part(len, ptr, end, result); ++} ++ ++void truncate_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &) ++{ ++ if (expr) { ++ string temp; ++ substring_position temp_pos; ++ expr->evaluate(tentative, ref, temp, temp_pos); ++ const char *start = temp.contents(); ++ const char *end = start + temp.length(); ++ if (n > 0) ++ first_part(n, start, end, result); ++ else if (n < 0) ++ last_part(-n, start, end, result); ++ } ++} ++ ++void alternative_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ int start_length = result.length(); ++ if (expr1) ++ expr1->evaluate(tentative, ref, result, pos); ++ if (result.length() == start_length && expr2) ++ expr2->evaluate(tentative, ref, result, pos); ++} ++ ++void list_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ if (expr1) ++ expr1->evaluate(tentative, ref, result, pos); ++ if (expr2) ++ expr2->evaluate(tentative, ref, result, pos); ++} ++ ++void substitute_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ int start_length = result.length(); ++ if (expr1) ++ expr1->evaluate(tentative, ref, result, pos); ++ if (result.length() > start_length && result[result.length() - 1] == '-') { ++ // ought to see if pos covers the - ++ result.set_length(result.length() - 1); ++ if (expr2) ++ expr2->evaluate(tentative, ref, result, pos); ++ } ++} ++ ++void conditional_expr::evaluate(int tentative, const reference &ref, ++ string &result, substring_position &pos) ++{ ++ string temp; ++ substring_position temp_pos; ++ if (expr1) ++ expr1->evaluate(tentative, ref, temp, temp_pos); ++ if (temp.length() > 0) { ++ if (expr2) ++ expr2->evaluate(tentative, ref, result, pos); ++ } ++ else { ++ if (expr3) ++ expr3->evaluate(tentative, ref, result, pos); ++ } ++} ++ ++void reference::pre_compute_label() ++{ ++ if (parsed_label != 0 ++ && (parsed_label->analyze() & expression::CONTAINS_VARIABLE)) { ++ label.clear(); ++ substring_position temp_pos; ++ parsed_label->evaluate(1, *this, label, temp_pos); ++ label_ptr = lookup_label(label); ++ } ++} ++ ++void reference::compute_label() ++{ ++ label.clear(); ++ if (parsed_label) ++ parsed_label->evaluate(0, *this, label, separator_pos); ++ if (short_label_flag && parsed_short_label) ++ parsed_short_label->evaluate(0, *this, short_label, short_separator_pos); ++ if (date_as_label) { ++ string new_date; ++ if (parsed_date_label) { ++ substring_position temp_pos; ++ parsed_date_label->evaluate(0, *this, new_date, temp_pos); ++ } ++ set_date(new_date); ++ } ++ if (label_ptr) ++ label_ptr->count += 1; ++} ++ ++void reference::immediate_compute_label() ++{ ++ if (label_ptr) ++ label_ptr->total = 2; // force use of disambiguator ++ compute_label(); ++} ++ ++int reference::merge_labels(reference **v, int n, label_type type, ++ string &result) ++{ ++ if (abbreviate_label_ranges) ++ return merge_labels_by_number(v, n, type, result); ++ else ++ return merge_labels_by_parts(v, n, type, result); ++} ++ ++int reference::merge_labels_by_number(reference **v, int n, label_type type, ++ string &result) ++{ ++ if (n <= 1) ++ return 0; ++ int num = get_number(); ++ // Only merge three or more labels. ++ if (v[0]->get_number() != num + 1 ++ || v[1]->get_number() != num + 2) ++ return 0; ++ int i; ++ for (i = 2; i < n; i++) ++ if (v[i]->get_number() != num + i + 1) ++ break; ++ result = get_label(type); ++ result += label_range_indicator; ++ result += v[i - 1]->get_label(type); ++ return i; ++} ++ ++const substring_position &reference::get_separator_pos(label_type type) const ++{ ++ if (type == SHORT_LABEL && short_label_flag) ++ return short_separator_pos; ++ else ++ return separator_pos; ++} ++ ++const string &reference::get_label(label_type type) const ++{ ++ if (type == SHORT_LABEL && short_label_flag) ++ return short_label; ++ else ++ return label; ++} ++ ++int reference::merge_labels_by_parts(reference **v, int n, label_type type, ++ string &result) ++{ ++ if (n <= 0) ++ return 0; ++ const string &lb = get_label(type); ++ const substring_position &sp = get_separator_pos(type); ++ if (sp.start < 0 ++ || sp.start != v[0]->get_separator_pos(type).start ++ || memcmp(lb.contents(), v[0]->get_label(type).contents(), ++ sp.start) != 0) ++ return 0; ++ result = lb; ++ int i = 0; ++ do { ++ result += separate_label_second_parts; ++ const substring_position &s = v[i]->get_separator_pos(type); ++ int sep_end_pos = s.start + s.length; ++ result.append(v[i]->get_label(type).contents() + sep_end_pos, ++ v[i]->get_label(type).length() - sep_end_pos); ++ } while (++i < n ++ && sp.start == v[i]->get_separator_pos(type).start ++ && memcmp(lb.contents(), v[i]->get_label(type).contents(), ++ sp.start) == 0); ++ return i; ++} ++ ++string label_pool; ++ ++label_info::label_info(const string &s) ++: start(label_pool.length()), length(s.length()), count(0), total(1) ++{ ++ label_pool += s; ++} ++ ++static label_info **label_table = 0; ++static int label_table_size = 0; ++static int label_table_used = 0; ++ ++label_info *lookup_label(const string &label) ++{ ++ if (label_table == 0) { ++ label_table = new label_info *[17]; ++ label_table_size = 17; ++ for (int i = 0; i < 17; i++) ++ label_table[i] = 0; ++ } ++ unsigned h = hash_string(label.contents(), label.length()) % label_table_size; ++ label_info **ptr; ++ for (ptr = label_table + h; ++ *ptr != 0; ++ (ptr == label_table) ++ ? (ptr = label_table + label_table_size - 1) ++ : ptr--) ++ if ((*ptr)->length == label.length() ++ && memcmp(label_pool.contents() + (*ptr)->start, label.contents(), ++ label.length()) == 0) { ++ (*ptr)->total += 1; ++ return *ptr; ++ } ++ label_info *result = *ptr = new label_info(label); ++ if (++label_table_used * 2 > label_table_size) { ++ // Rehash the table. ++ label_info **old_table = label_table; ++ int old_size = label_table_size; ++ label_table_size = next_size(label_table_size); ++ label_table = new label_info *[label_table_size]; ++ int i; ++ for (i = 0; i < label_table_size; i++) ++ label_table[i] = 0; ++ for (i = 0; i < old_size; i++) ++ if (old_table[i]) { ++ h = hash_string(label_pool.contents() + old_table[i]->start, ++ old_table[i]->length); ++ label_info **p; ++ for (p = label_table + (h % label_table_size); ++ *p != 0; ++ (p == label_table) ++ ? (p = label_table + label_table_size - 1) ++ : --p) ++ ; ++ *p = old_table[i]; ++ } ++ a_delete old_table; ++ } ++ return result; ++} ++ ++void clear_labels() ++{ ++ for (int i = 0; i < label_table_size; i++) { ++ delete label_table[i]; ++ label_table[i] = 0; ++ } ++ label_table_used = 0; ++ label_pool.clear(); ++} ++ ++static void consider_authors(reference **start, reference **end, int i); ++ ++void compute_labels(reference **v, int n) ++{ ++ if (parsed_label ++ && (parsed_label->analyze() & expression::CONTAINS_AT) ++ && sort_fields.length() >= 2 ++ && sort_fields[0] == 'A' ++ && sort_fields[1] == '+') ++ consider_authors(v, v + n, 0); ++ for (int i = 0; i < n; i++) ++ v[i]->compute_label(); ++} ++ ++ ++/* A reference with a list of authors _needs_ author i ++where 0 <= i <= N if there exists a reference with a list of authors ++ such that != and M >= i ++and Aj = Bj for 0 <= j < i. In this case if we can't say ``A0, ++A1,...,A(i-1) et al'' because this would match both and ++. If a reference needs author i we only have to call ++need_author(j) for some j >= i such that the reference also needs ++author j. */ ++ ++/* This function handles 2 tasks: ++determine which authors are needed (cannot be elided with et al.); ++determine which authors can have only last names in the labels. ++ ++References >= start and < end have the same first i author names. ++Also they're sorted by A+. */ ++ ++static void consider_authors(reference **start, reference **end, int i) ++{ ++ if (start >= end) ++ return; ++ reference **p = start; ++ if (i >= (*p)->get_nauthors()) { ++ for (++p; p < end && i >= (*p)->get_nauthors(); p++) ++ ; ++ if (p < end && i > 0) { ++ // If we have an author list and an author list , ++ // then both lists need C. ++ for (reference **q = start; q < end; q++) ++ (*q)->need_author(i - 1); ++ } ++ start = p; ++ } ++ while (p < end) { ++ reference **last_name_start = p; ++ reference **name_start = p; ++ for (++p; ++ p < end && i < (*p)->get_nauthors() ++ && same_author_last_name(**last_name_start, **p, i); ++ p++) { ++ if (!same_author_name(**name_start, **p, i)) { ++ consider_authors(name_start, p, i + 1); ++ name_start = p; ++ } ++ } ++ consider_authors(name_start, p, i + 1); ++ if (last_name_start == name_start) { ++ for (reference **q = last_name_start; q < p; q++) ++ (*q)->set_last_name_unambiguous(i); ++ } ++ // If we have an author list and , then the lists ++ // need author D and E respectively. ++ if (name_start > start || p < end) { ++ for (reference **q = last_name_start; q < p; q++) ++ (*q)->need_author(i); ++ } ++ } ++} ++ ++int same_author_last_name(const reference &r1, const reference &r2, int n) ++{ ++ const char *ae1; ++ const char *as1 = r1.get_sort_field(0, n, 0, &ae1); ++ const char *ae2; ++ const char *as2 = r2.get_sort_field(0, n, 0, &ae2); ++ if (!as1 && !as2) return 1; // they are the same ++ if (!as1 || !as2) return 0; ++ return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0; ++} ++ ++int same_author_name(const reference &r1, const reference &r2, int n) ++{ ++ const char *ae1; ++ const char *as1 = r1.get_sort_field(0, n, -1, &ae1); ++ const char *ae2; ++ const char *as2 = r2.get_sort_field(0, n, -1, &ae2); ++ if (!as1 && !as2) return 1; // they are the same ++ if (!as1 || !as2) return 0; ++ return ae1 - as1 == ae2 - as2 && memcmp(as1, as2, ae1 - as1) == 0; ++} ++ ++ ++void int_set::set(int i) ++{ ++ assert(i >= 0); ++ int bytei = i >> 3; ++ if (bytei >= v.length()) { ++ int old_length = v.length(); ++ v.set_length(bytei + 1); ++ for (int j = old_length; j <= bytei; j++) ++ v[j] = 0; ++ } ++ v[bytei] |= 1 << (i & 7); ++} ++ ++int int_set::get(int i) const ++{ ++ assert(i >= 0); ++ int bytei = i >> 3; ++ return bytei >= v.length() ? 0 : (v[bytei] & (1 << (i & 7))) != 0; ++} ++ ++void reference::set_last_name_unambiguous(int i) ++{ ++ last_name_unambiguous.set(i); ++} ++ ++void reference::need_author(int n) ++{ ++ if (n > last_needed_author) ++ last_needed_author = n; ++} ++ ++const char *reference::get_authors(const char **end) const ++{ ++ if (!computed_authors) { ++ ((reference *)this)->computed_authors = 1; ++ string &result = ((reference *)this)->authors; ++ int na = get_nauthors(); ++ result.clear(); ++ for (int i = 0; i < na; i++) { ++ if (last_name_unambiguous.get(i)) { ++ const char *e, *start = get_author_last_name(i, &e); ++ assert(start != 0); ++ result.append(start, e - start); ++ } ++ else { ++ const char *e, *start = get_author(i, &e); ++ assert(start != 0); ++ result.append(start, e - start); ++ } ++ if (i == last_needed_author ++ && et_al.length() > 0 ++ && et_al_min_elide > 0 ++ && last_needed_author + et_al_min_elide < na ++ && na >= et_al_min_total) { ++ result += et_al; ++ break; ++ } ++ if (i < na - 1) { ++ if (na == 2) ++ result += join_authors_exactly_two; ++ else if (i < na - 2) ++ result += join_authors_default; ++ else ++ result += join_authors_last_two; ++ } ++ } ++ } ++ const char *start = authors.contents(); ++ *end = start + authors.length(); ++ return start; ++} ++ ++int reference::get_nauthors() const ++{ ++ if (nauthors < 0) { ++ const char *dummy; ++ int na; ++ for (na = 0; get_author(na, &dummy) != 0; na++) ++ ; ++ ((reference *)this)->nauthors = na; ++ } ++ return nauthors; ++} +diff -Nuar groff-1.22.3.old/src/preproc/refer/Makefile.sub groff-1.22.3/src/preproc/refer/Makefile.sub +--- groff-1.22.3.old/src/preproc/refer/Makefile.sub 2014-11-04 10:38:35.245523747 +0200 ++++ groff-1.22.3/src/preproc/refer/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,65 +0,0 @@ +-# Makefile.sub for `preproc refer' +-# +-# File position: /src/preproc/refer/Makefile.sub +-# +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=refer$(EXEEXT) +-MAN1=refer.n +-XLIBS=$(LIBBIB) $(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=\ +- command.$(OBJEXT) \ +- label.$(OBJEXT) \ +- ref.$(OBJEXT) \ +- refer.$(OBJEXT) \ +- token.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/command.cpp \ +- $(srcdir)/ref.cpp \ +- $(srcdir)/refer.cpp \ +- $(srcdir)/token.cpp +-HDRS=\ +- $(srcdir)/refer.h \ +- $(srcdir)/token.h \ +- $(srcdir)/command.h \ +- $(srcdir)/ref.h +-GRAM=$(srcdir)/label.y +-YTABC=label.cpp +-NAMEPREFIX=$(g) +- +-.PHONY: install_data +-install_data: refer +- -test -d $(DESTDIR)$(referdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(referdir) +- +-.PHONY: uninstall_data +-uninstall_sub: +- -test -d $(DESTDIR)$(referdir) && rmdir $(DESTDIR)$(referdir) +- +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/refer/refer.am groff-1.22.3/src/preproc/refer/refer.am +--- groff-1.22.3.old/src/preproc/refer/refer.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/refer/refer.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,44 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += refer ++refer_CPPFLAGS = $(AM_CPPFLAGS) -I $(top_srcdir)/src/preproc/refer ++refer_LDADD = libbib.a libgroff.a $(LIBM) ++refer_SOURCES = \ ++ src/preproc/refer/command.cpp \ ++ src/preproc/refer/ref.cpp \ ++ src/preproc/refer/refer.cpp \ ++ src/preproc/refer/token.cpp \ ++ src/preproc/refer/label.ypp \ ++ src/preproc/refer/refer.h \ ++ src/preproc/refer/ref.h \ ++ src/preproc/refer/token.h \ ++ src/preproc/refer/command.h ++PREFIXMAN1 += src/preproc/refer/refer.n ++EXTRA_DIST += src/preproc/refer/TODO src/preproc/refer/refer.man ++CLEANFILES += \ ++ src/preproc/refer/label.cpp \ ++ src/preproc/refer/label.hpp \ ++ src/preproc/refer/label.output ++# As refer_CPPFLAGS was set, all the .o have a 'refer-' prefix ++src/preproc/refer/refer-command.$(OBJEXT): defs.h ++src/preproc/refer/refer-ref.$(OBJEXT): defs.h ++src/preproc/refer/refer-refer.$(OBJEXT): defs.h ++src/preproc/refer/refer-token.$(OBJEXT): defs.h ++src/preproc/refer/refer-label.$(OBJEXT): defs.h ++ +diff -Nuar groff-1.22.3.old/src/preproc/refer/refer.cpp groff-1.22.3/src/preproc/refer/refer.cpp +--- groff-1.22.3.old/src/preproc/refer/refer.cpp 2014-11-04 10:38:35.245523747 +0200 ++++ groff-1.22.3/src/preproc/refer/refer.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -432,8 +432,11 @@ + return; + } + } +- current_filename = filename; +- fprintf(outfp, ".lf 1 %s\n", filename); ++ string fn(filename); ++ fn += '\0'; ++ normalize_for_lf(fn); ++ current_filename = fn.contents(); ++ fprintf(outfp, ".lf 1 %s\n", current_filename); + string line; + current_lineno = 0; + for (;;) { +diff -Nuar groff-1.22.3.old/src/preproc/refer/refer.h groff-1.22.3/src/preproc/refer/refer.h +--- groff-1.22.3.old/src/preproc/refer/refer.h 2014-11-04 10:38:35.245523747 +0200 ++++ groff-1.22.3/src/preproc/refer/refer.h 2015-04-23 20:57:03.000000000 +0300 +@@ -28,6 +28,7 @@ + #include "stringclass.h" + #include "cset.h" + #include "cmap.h" ++#include "lf.h" + + #include "defs.h" + +diff -Nuar groff-1.22.3.old/src/preproc/refer/refer.man groff-1.22.3/src/preproc/refer/refer.man +--- groff-1.22.3.old/src/preproc/refer/refer.man 2014-11-04 10:38:35.245523747 +0200 ++++ groff-1.22.3/src/preproc/refer/refer.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/preproc/soelim/.gitignore groff-1.22.3/src/preproc/soelim/.gitignore +--- groff-1.22.3.old/src/preproc/soelim/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/soelim/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++soelim ++soelim.n +diff -Nuar groff-1.22.3.old/src/preproc/soelim/Makefile.sub groff-1.22.3/src/preproc/soelim/Makefile.sub +--- groff-1.22.3.old/src/preproc/soelim/Makefile.sub 2014-11-04 10:38:35.250523684 +0200 ++++ groff-1.22.3/src/preproc/soelim/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `preproc soelim' +-# +-# File position: /src/preproc/soelim/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=soelim$(EXEEXT) +-MAN1=soelim.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=soelim.$(OBJEXT) +-CCSRCS=$(srcdir)/soelim.cpp +-NAMEPREFIX=$(g) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/soelim/soelim.am groff-1.22.3/src/preproc/soelim/soelim.am +--- groff-1.22.3.old/src/preproc/soelim/soelim.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/soelim/soelim.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,25 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += soelim ++soelim_LDADD = libgroff.a $(LIBM) ++soelim_SOURCES = src/preproc/soelim/soelim.cpp ++PREFIXMAN1 += src/preproc/soelim/soelim.n ++EXTRA_DIST += \ ++ src/preproc/soelim/TODO \ ++ src/preproc/soelim/soelim.man +diff -Nuar groff-1.22.3.old/src/preproc/soelim/soelim.cpp groff-1.22.3/src/preproc/soelim/soelim.cpp +--- groff-1.22.3.old/src/preproc/soelim/soelim.cpp 2014-11-04 10:38:35.250523684 +0200 ++++ groff-1.22.3/src/preproc/soelim/soelim.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -28,6 +28,7 @@ + #include "stringclass.h" + #include "nonposix.h" + #include "searchpath.h" ++#include "lf.h" + + // The include search path initially contains only the current directory. + static search_path include_search_path(0, 0, 0, 1); +@@ -161,6 +162,7 @@ + error("can't open `%1': %2", whole_filename.contents(), strerror(err)); + return 0; + } ++ normalize_for_lf(whole_filename); + current_filename = whole_filename.contents(); + current_lineno = 1; + set_location(); +diff -Nuar groff-1.22.3.old/src/preproc/soelim/soelim.man groff-1.22.3/src/preproc/soelim/soelim.man +--- groff-1.22.3.old/src/preproc/soelim/soelim.man 2014-11-04 10:38:35.250523684 +0200 ++++ groff-1.22.3/src/preproc/soelim/soelim.man 2015-04-23 20:57:03.000000000 +0300 +@@ -5,6 +5,10 @@ + @g@soelim \- interpret .so requests in groff input + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" license (copying) + .de co + Copyright \[co] 1989-2014 Free Software Foundation, Inc. +@@ -275,6 +279,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/preproc/tbl/.gitignore groff-1.22.3/src/preproc/tbl/.gitignore +--- groff-1.22.3.old/src/preproc/tbl/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/tbl/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++tbl ++tbl.n +diff -Nuar groff-1.22.3.old/src/preproc/tbl/main.cpp groff-1.22.3/src/preproc/tbl/main.cpp +--- groff-1.22.3.old/src/preproc/tbl/main.cpp 2014-11-04 10:38:35.220524059 +0200 ++++ groff-1.22.3/src/preproc/tbl/main.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -1615,7 +1615,10 @@ + fatal("can't open `%1': %2", argv[i], strerror(errno)); + else { + current_lineno = 1; +- current_filename = argv[i]; ++ string fn(argv[i]); ++ fn += '\0'; ++ normalize_for_lf(fn); ++ current_filename = fn.contents(); + printf(".lf 1 %s\n", current_filename); + process_input_file(fp); + } +diff -Nuar groff-1.22.3.old/src/preproc/tbl/Makefile.sub groff-1.22.3/src/preproc/tbl/Makefile.sub +--- groff-1.22.3.old/src/preproc/tbl/Makefile.sub 2014-11-04 10:38:35.220524059 +0200 ++++ groff-1.22.3/src/preproc/tbl/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,45 +0,0 @@ +-# Makefile.sub for `preproc tbl' +-# +-# File position: /src/preproc/tbl/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=tbl$(EXEEXT) +-MAN1=tbl.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=\ +- main.$(OBJEXT) \ +- table.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/main.cpp \ +- $(srcdir)/table.cpp +-HDRS=\ +- $(srcdir)/table.h +-NAMEPREFIX=$(g) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/preproc/tbl/table.cpp groff-1.22.3/src/preproc/tbl/table.cpp +--- groff-1.22.3.old/src/preproc/tbl/table.cpp 2014-11-04 10:38:35.221524047 +0200 ++++ groff-1.22.3/src/preproc/tbl/table.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -2966,7 +2966,10 @@ + && strcmp(fn, last_filename) == 0) + printfs(".lf %1\n", as_string(ln)); + else { +- printfs(".lf %1 %2\n", as_string(ln), fn); ++ string filename(fn); ++ filename += '\0'; ++ normalize_for_lf(filename); ++ printfs(".lf %1 %2\n", as_string(ln), filename.contents()); + last_filename = fn; + location_force_filename = 0; + } +diff -Nuar groff-1.22.3.old/src/preproc/tbl/table.h groff-1.22.3/src/preproc/tbl/table.h +--- groff-1.22.3.old/src/preproc/tbl/table.h 2014-11-04 10:38:35.221524047 +0200 ++++ groff-1.22.3/src/preproc/tbl/table.h 2015-04-23 20:57:03.000000000 +0300 +@@ -29,6 +29,7 @@ + #include "stringclass.h" + #include "errarg.h" + #include "error.h" ++#include "lf.h" + + // PREFIX and PREFIX_CHAR must be the same. + #define PREFIX "3" +diff -Nuar groff-1.22.3.old/src/preproc/tbl/tbl.am groff-1.22.3/src/preproc/tbl/tbl.am +--- groff-1.22.3.old/src/preproc/tbl/tbl.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/preproc/tbl/tbl.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,26 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += tbl ++tbl_LDADD = libgroff.a $(LIBM) ++tbl_SOURCES = \ ++ src/preproc/tbl/main.cpp \ ++ src/preproc/tbl/table.cpp \ ++ src/preproc/tbl/table.h ++PREFIXMAN1 += src/preproc/tbl/tbl.n ++EXTRA_DIST += src/preproc/tbl/tbl.man +diff -Nuar groff-1.22.3.old/src/preproc/tbl/tbl.man groff-1.22.3/src/preproc/tbl/tbl.man +--- groff-1.22.3.old/src/preproc/tbl/tbl.man 2014-11-04 10:38:35.221524047 +0200 ++++ groff-1.22.3/src/preproc/tbl/tbl.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,10 @@ + @g@tbl \- format tables for troff + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" license + .de co + Copyright \[co] 1989-2014 Free Software Foundation, Inc. +@@ -1225,6 +1229,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/roff/groff/.gitignore groff-1.22.3/src/roff/groff/.gitignore +--- groff-1.22.3.old/src/roff/groff/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/groff/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++groff ++groff.n +diff -Nuar groff-1.22.3.old/src/roff/groff/groff.am groff-1.22.3/src/roff/groff/groff.am +--- groff-1.22.3.old/src/roff/groff/groff.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/groff/groff.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,60 @@ ++# Copyright (C) 1993-2014 ++# Free Software Foundation, Inc. ++# ++# Original Makefile.sub rewritten by ++# Bernd Warken ++# and Werner LEMBERG ++# ++# Automake migration by ++# Bertrand Garrigues ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++######################################################################## ++ ++bin_PROGRAMS += groff ++groff_LDADD = \ ++ libgroff.a \ ++ lib/libgnu.a \ ++ $(LIBM) ++groff_SOURCES = \ ++ src/roff/groff/groff.cpp \ ++ src/roff/groff/pipeline.c \ ++ src/roff/groff/pipeline.h ++src/roff/groff/groff.$(OBJEXT): defs.h ++man1_MANS += src/roff/groff/groff.n ++EXTRA_DIST += src/roff/groff/groff.man ++GROFF_OPTS_OUTPUT = \ ++ groff_opts_no_arg.txt \ ++ groff_opts_with_arg.txt ++groffoptsdir = $(libprogramdir) ++groffopts_DATA = $(GROFF_OPTS_OUTPUT) ++ ++MOSTLYCLEANFILES += groff_opts.tmp $(GROFF_OPTS_OUTPUT) ++ ++groff_opts.tmp: src/roff/groff/groff.cpp ++ @$(GREP) -e ':.*:.*:' $? | sed -e 's/[ \t",]//g' > $@ ++ @echo -n 'groff options: ' ++ @cat $@ ++ ++groff_opts_no_arg.txt: groff_opts.tmp ++ @sed -e 's/[a-zA-Z]://g' $? > $@ ++ @echo -n 'no arg: ' ++ @cat $@ ++ ++groff_opts_with_arg.txt: groff_opts_no_arg.txt ++ @rm -f $@ ++ @sed "s/[`cat $?`:]//g" groff_opts.tmp > $@ ++ @echo -n 'with arg: ' ++ @cat $@ +diff -Nuar groff-1.22.3.old/src/roff/groff/groff.cpp groff-1.22.3/src/roff/groff/groff.cpp +--- groff-1.22.3.old/src/roff/groff/groff.cpp 2014-11-04 10:38:35.195524372 +0200 ++++ groff-1.22.3/src/roff/groff/groff.cpp 2015-04-23 20:57:03.000000000 +0300 +@@ -701,7 +701,13 @@ + { + str += ' '; + int needs_quoting = 0; ++ // Native Windows programs don't support '..' style of quoting, so ++ // always behave as if ARG included the single quote character. ++#if defined(_WIN32) && !defined(__CYGWIN__) ++ int contains_single_quote = 1; ++#else + int contains_single_quote = 0; ++#endif + const char*p; + for (p = arg; *p != '\0'; p++) + switch (*p) { +@@ -731,10 +737,17 @@ + str += '"'; + for (p = arg; *p != '\0'; p++) + switch (*p) { ++#if !(defined(_WIN32) && !defined(__CYGWIN__)) + case '"': + case '\\': + case '$': + str += '\\'; ++#else ++ case '"': ++ case '\\': ++ if (*p == '"' || (*p == '\\' && p[1] == '"')) ++ str += '\\'; ++#endif + // fall through + default: + str += *p; +diff -Nuar groff-1.22.3.old/src/roff/groff/groff.man groff-1.22.3/src/roff/groff/groff.man +--- groff-1.22.3.old/src/roff/groff/groff.man 2014-11-04 10:38:35.195524372 +0200 ++++ groff-1.22.3/src/roff/groff/groff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -5,6 +5,10 @@ + .\" groff.man -> groff.1 + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legal Terms + .\" -------------------------------------------------------------------- +@@ -2026,6 +2030,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" -------------------------------------------------------------------- + .\" Emacs setup + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/src/roff/groff/Makefile.sub groff-1.22.3/src/roff/groff/Makefile.sub +--- groff-1.22.3.old/src/roff/groff/Makefile.sub 2014-11-04 10:38:35.195524372 +0200 ++++ groff-1.22.3/src/roff/groff/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,82 +0,0 @@ +-# Makefile.sub for `src roff groff' +- +-# File position: /src/roff/groff/Makefile.sub +- +-# Copyright (C) 1993-2014 Free Software Foundation, Inc. +- +-# Rewritten by Bernd Warken and +-# Werner LEMBERG +- +-# `groff' 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. +- +-# `groff' 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 . +- +-######################################################################## +- +-PROG=groff$(EXEEXT) +-MAN1=groff.n +-XLIBS=$(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT) +-CCSRCS=$(srcdir)/groff.cpp +-CSRCS=$(srcdir)/pipeline.c +-HDRS=$(srcdir)/pipeline.h +- +-GROFF_OPTS_OUTPUT=\ +- groff_opts_no_arg.txt \ +- groff_opts_with_arg.txt +- +-MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT) +- +-RM=rm -f +- +-all: $(srcdir)/groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT) +- +-groff_opts.tmp: $(srcdir)/groff.cpp +- @$(GREP) -e ':.*:.*:' $? | sed -e 's/[ \t",]//g' > $@ +- @echo -n 'groff options: ' +- @cat $@ +- +-groff_opts_no_arg.txt: groff_opts.tmp +- @sed -e 's/[a-zA-Z]://g' $? > $@ +- @echo -n 'no arg: ' +- @cat $@ +- +-groff_opts_with_arg.txt: groff_opts_no_arg.txt +- @sed "s/[`cat $?`:]//g" groff_opts.tmp > $@ +- @echo -n 'with arg: ' +- @cat $@ +- +-install_data: $(GROFF_OPTS_OUTPUT) +- -test -d $(DESTDIR)$(libprogramdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(libprogramdir) +- for f in $(GROFF_OPTS_OUTPUT); do \ +- $(RM) $(DESTDIR)$(libprogramdir)/$$f; \ +- $(INSTALL_SCRIPT) $$f $(DESTDIR)$(libprogramdir); \ +- done +- +-uninstall_sub: +- -for f in $(GROFF_OPTS_OUTPUT); do \ +- $(RM) $(DESTDIR)$(libprogramdir)/$$f;\ +- done +-# XXX This will be removed by `uninstall_dirs' in `$(top_srcdir)/Makefile.in' +-# XXX (And only from there it is successful on an empty directory) +-# -d=$(DESTDIR)$(libprogramdir);\ +-# if test -d $$d; then rmdir $$d; fi +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/roff/grog/.gitignore groff-1.22.3/src/roff/grog/.gitignore +--- groff-1.22.3.old/src/roff/grog/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/grog/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++grog ++grog.n +diff -Nuar groff-1.22.3.old/src/roff/grog/grog.am groff-1.22.3/src/roff/grog/grog.am +--- groff-1.22.3.old/src/roff/grog/grog.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/grog/grog.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,49 @@ ++# grog.am for `grog' ++# ++# File position: /src/roff/grog/grog.am ++# ++# Copyright (C) 1993-2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of `grog' which is part of `groff'. ++# ++# `groff' 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. ++# ++# `groff' 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 . ++ ++grog_srcdir = $(top_srcdir)/src/roff/grog ++bin_SCRIPTS += grog ++GROG = src/roff/grog/subs.pl ++ ++# grog_dir is defined by a m4 macro ++grogdir = $(grog_dir) ++dist_grog_DATA = $(GROG) ++man1_MANS += src/roff/grog/grog.n ++EXTRA_DIST += \ ++ src/roff/grog/grog.man \ ++ src/roff/grog/grog.pl ++ ++# Perl version works for all parts of `groff'. ++ ++grog: $(grog_srcdir)/grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT) ++ $(RM) $@ ++ sed -f "$(SH_DEPS_SED_SCRIPT)" \ ++ -e "1s|^\(#! \).*perl|\\1$(PERL)|" \ ++ -e "s|[@]g[@]|$(g)|g" \ ++ -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ ++ -e "s|[@]libdir[@]|$(DESTDIR)$(libdir)|g" \ ++ -e "s|[@]EGREP[@]|$(EGREP)|g" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]grog_dir[@]|$(grog_dir)|" \ ++ -e "$(SH_SCRIPT_SED_CMD)" \ ++ $(grog_srcdir)/grog.pl >$@ ++ chmod +x $@ +diff -Nuar groff-1.22.3.old/src/roff/grog/grog.man groff-1.22.3/src/roff/grog/grog.man +--- groff-1.22.3.old/src/roff/grog/grog.man 2014-11-04 10:38:35.522520284 +0200 ++++ groff-1.22.3/src/roff/grog/grog.man 2015-04-23 20:57:03.000000000 +0300 +@@ -12,7 +12,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + This file is part of grog, which is part of groff, a free software + project. You can redistribute it and/or modify it under the terms of +@@ -48,12 +48,12 @@ + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + .\" Bullet +-.ie t .ds BU \[bu] ++.ie t .ds BU \(bu + .el .ds BU * + .\" used in `.IP \*(BU 2m' (former .Topic) + . +@@ -513,12 +513,12 @@ + .RS + Man-pages of section 1 can be viewed with either + .RS +-\[Do] ++\(Do + .BI man " name" + .RE + for text mode or + .RS +-\[Do] ++\(Do + .BI groffer " name" + .RE + for graphical mode (default is PDF mode). +@@ -535,12 +535,12 @@ + .RS + Man-pages of section 7 can be viewed with either with + .RS +-\[Do] ++\(Do + .BI "man 7 " name + .RE + for text mode or + .RS +-\[Do] ++\(Do + .BI "groffer 7 " name + .RE + for graphical mode (default is PDF mode). +diff -Nuar groff-1.22.3.old/src/roff/grog/Makefile.sub groff-1.22.3/src/roff/grog/Makefile.sub +--- groff-1.22.3.old/src/roff/grog/Makefile.sub 2014-11-04 10:38:35.523520271 +0200 ++++ groff-1.22.3/src/roff/grog/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,79 +0,0 @@ +-# Makefile.sub for `grog' +- +-# File position: /src/roff/grog/Makefile.sub +- +-# Copyright (C) 1993-2014 Free Software Foundation, Inc. +- +-# This file is part of `grog' which is part of `groff'. +- +-# `groff' 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. +- +-# `groff' 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 . +- +-######################################################################## +- +-MAN1=grog.n +-MOSTLYCLEANADD=grog $(MAN1) +- +-# not all make programs have $(RM) predefined. +-RM=rm -f +- +-all: grog $(MAN1) +- +-# lib .pl-files +-GROG=$(srcdir)/subs.pl +-GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'` +- +- +-# Perl version works for all parts of `groff'. +- +-grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT) +- $(RM) $@ +- sed -f "$(SH_DEPS_SED_SCRIPT)" \ +- -e "1s|^\(#! \).*perl|\\1$(PERL)|" \ +- -e "s|@g@|$(g)|g" \ +- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ +- -e "s|@grog_dir@|$(DESTDIR)$(grog_dir)|g" \ +- -e "s|@EGREP@|$(EGREP)|g" \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "$(SH_SCRIPT_SED_CMD)" \ +- $(srcdir)/grog.pl >$@ +- chmod +x $@ +- +-.PHONY: install_data +-install_data: grog +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/grog +- $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog +- -test -d $(DESTDIR)$(grog_dir) || $(mkinstalldirs) $(DESTDIR)$(grog_dir) +- for f in $(GROG_); do \ +- $(RM) $(DESTDIR)$(grog_dir)/$$f; \ +- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \ +- done +- +-.PHONY: uninstall_data +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/grog +- -for f in $(GROG_); do \ +- $(RM) $(DESTDIR)$(grog_dir)/$$f; \ +- done +- -d=$(DESTDIR)$(grog_dir);\ +- if test -d $$d; then rmdir $$d; fi +- +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/roff/nroff/.gitignore groff-1.22.3/src/roff/nroff/.gitignore +--- groff-1.22.3.old/src/roff/nroff/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/nroff/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++nroff ++nroff.n +diff -Nuar groff-1.22.3.old/src/roff/nroff/Makefile.sub groff-1.22.3/src/roff/nroff/Makefile.sub +--- groff-1.22.3.old/src/roff/nroff/Makefile.sub 2014-11-04 10:38:35.526520234 +0200 ++++ groff-1.22.3/src/roff/nroff/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,53 +0,0 @@ +-# Makefile.sub for `src roff nroff' +-# +-# File position: /src/roff/nroff/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-MAN1=nroff.n +-NAMEPREFIX=$(g) +-MOSTLYCLEANADD=nroff +-RM=rm -f +- +-all: nroff +- +-nroff: nroff.sh $(SH_DEPS_SED_SCRIPT) +- $(RM) $@ +- sed -f $(SH_DEPS_SED_SCRIPT) \ +- -e $(SH_SCRIPT_SED_CMD) \ +- -e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@ +- chmod +x $@ +- +-install_data: nroff +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff +- $(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/roff/nroff/nroff.am groff-1.22.3/src/roff/nroff/nroff.am +--- groff-1.22.3.old/src/roff/nroff/nroff.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/nroff/nroff.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,31 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_SCRIPTS += nroff ++nroff_srcdir = $(top_srcdir)/src/roff/nroff ++PREFIXMAN1 += src/roff/nroff/nroff.n ++EXTRA_DIST += \ ++ src/roff/nroff/nroff.man \ ++ src/roff/nroff/nroff.sh ++ ++nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT) ++ rm -f $@ ++ sed -f $(SH_DEPS_SED_SCRIPT) \ ++ -e $(SH_SCRIPT_SED_CMD) \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" $(nroff_srcdir)/nroff.sh >$@ ++ chmod +x $@ +diff -Nuar groff-1.22.3.old/src/roff/nroff/nroff.man groff-1.22.3/src/roff/nroff/nroff.man +--- groff-1.22.3.old/src/roff/nroff/nroff.man 2014-11-04 10:38:35.526520234 +0200 ++++ groff-1.22.3/src/roff/nroff/nroff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -78,7 +78,7 @@ + .BR nroff + to select the output encoding emitted by + .BR grotty , +-groff\[aq]s TTY output device. ++groff\(aqs TTY output device. + . + If neither the + .B GROFF_TYPESETTER +@@ -108,7 +108,7 @@ + .B \-c + options + are equivalent to +-.BR grotty \[aq]s ++.BR grotty \(aqs + options + .B \-h + (using tabs in the output) and +@@ -168,7 +168,7 @@ + .B GROFF_TYPESETTER + The default device for + .BR groff . +-If not set (which is the normal case), it defaults to \[oq]ps\[cq]. ++If not set (which is the normal case), it defaults to \(oqps\(cq. + . + .TP + .SM +@@ -177,7 +177,7 @@ + .B groff + executable before searching in PATH. + . +-If unset, \[oq]@BINDIR@\[cq] is used. ++If unset, \(oq@BINDIR@\(cq is used. + . + . + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/src/roff/troff/.gitignore groff-1.22.3/src/roff/troff/.gitignore +--- groff-1.22.3.old/src/roff/troff/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/troff/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++Makefile.dep ++majorminor.cpp ++troff ++troff.n +diff -Nuar groff-1.22.3.old/src/roff/troff/Makefile.sub groff-1.22.3/src/roff/troff/Makefile.sub +--- groff-1.22.3.old/src/roff/troff/Makefile.sub 2014-11-04 10:38:35.203524272 +0200 ++++ groff-1.22.3/src/roff/troff/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,82 +0,0 @@ +-# Makefile.sub for `src roff troff' +-# +-# File position: /src/roff/troff/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=troff$(EXEEXT) +-MAN1=troff.n +-XLIBS=$(LIBGROFF) $(LIBGNU) +-MLIB=$(LIBM) +-OBJS=\ +- dictionary.$(OBJEXT) \ +- div.$(OBJEXT) \ +- env.$(OBJEXT) \ +- input.$(OBJEXT) \ +- majorminor.$(OBJEXT) \ +- mtsm.$(OBJEXT) \ +- node.$(OBJEXT) \ +- number.$(OBJEXT) \ +- reg.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/dictionary.cpp \ +- $(srcdir)/div.cpp \ +- $(srcdir)/env.cpp \ +- $(srcdir)/input.cpp \ +- majorminor.cpp \ +- $(srcdir)/mtsm.cpp \ +- $(srcdir)/node.cpp \ +- $(srcdir)/number.cpp \ +- $(srcdir)/reg.cpp +-HDRS=\ +- $(srcdir)/charinfo.h \ +- $(srcdir)/dictionary.h \ +- $(srcdir)/div.h \ +- $(srcdir)/env.h \ +- $(srcdir)/hvunits.h \ +- $(srcdir)/input.h \ +- $(srcdir)/mtsm.h \ +- $(srcdir)/node.h \ +- $(srcdir)/reg.h \ +- $(srcdir)/request.h \ +- $(srcdir)/token.h \ +- $(srcdir)/troff.h +-GENSRCS=majorminor.cpp +-NAMEPREFIX=$(g) +-RM=rm -f +- +-majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION +- @echo Making $@ +- @$(RM) $@ +- @echo const char \*major_version = \ +- \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@ +- @echo const char \*minor_version = \ +- \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; \ +- >>$@ +- @echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@ +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/roff/troff/troff.am groff-1.22.3/src/roff/troff/troff.am +--- groff-1.22.3.old/src/roff/troff/troff.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/roff/troff/troff.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,61 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += troff ++PREFIXMAN1 += src/roff/troff/troff.n ++EXTRA_DIST += \ ++ src/roff/troff/column.cpp \ ++ src/roff/troff/troff.man \ ++ src/roff/troff/TODO ++troff_LDADD = libgroff.a lib/libgnu.a $(LIBM) ++troff_SOURCES = \ ++ src/roff/troff/dictionary.cpp \ ++ src/roff/troff/div.cpp \ ++ src/roff/troff/env.cpp \ ++ src/roff/troff/input.cpp \ ++ src/roff/troff/mtsm.cpp \ ++ src/roff/troff/node.cpp \ ++ src/roff/troff/number.cpp \ ++ src/roff/troff/reg.cpp \ ++ src/roff/troff/env.h \ ++ src/roff/troff/node.h \ ++ src/roff/troff/troff.h \ ++ src/roff/troff/div.h \ ++ src/roff/troff/reg.h \ ++ src/roff/troff/dictionary.h \ ++ src/roff/troff/input.h \ ++ src/roff/troff/mtsm.h \ ++ src/roff/troff/token.h \ ++ src/roff/troff/charinfo.h \ ++ src/roff/troff/request.h \ ++ src/roff/troff/hvunits.h ++ ++nodist_troff_SOURCES = src/roff/troff/majorminor.cpp ++ ++src/roff/troff/input.$(OBJEXT): defs.h ++CLEANFILES += src/roff/troff/majorminor.cpp ++ ++src/roff/troff/majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION ++ @echo Making $@ ++ @$(RM) $@ ++ @echo const char \*major_version = \ ++ \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@ ++ @echo const char \*minor_version = \ ++ \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; \ ++ >>$@ ++ @echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@ +diff -Nuar groff-1.22.3.old/src/roff/troff/troff.man groff-1.22.3/src/roff/troff/troff.man +--- groff-1.22.3.old/src/roff/troff/troff.man 2014-11-04 10:38:35.204524259 +0200 ++++ groff-1.22.3/src/roff/troff/troff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -11,7 +11,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + This file is part of groff, the GNU roff type-setting system, which + is a GNU free software project.. +@@ -98,7 +98,7 @@ + This backtrace should help track down the cause of the error. + . + The line numbers given in the backtrace may not always be correct, for +-.BR @g@troff \[aq]s ++.BR @g@troff \(aqs + idea of line numbers gets confused by + .B as + or +@@ -131,7 +131,7 @@ + Inhibit all error messages of + .BR @g@troff . + . +-Note that this doesn\[aq]t affect messages output to standard error by ++Note that this doesn\(aqt affect messages output to standard error by + macro packages using the + .B tm + or +@@ -188,7 +188,7 @@ + Read in the file + .IB name .tmac\fR. + . +-If it isn\[aq]t found, try ++If it isn\(aqt found, try + .BI tmac. name + instead. + . +@@ -253,7 +253,7 @@ + . + .TP + .B \-R +-Don\[aq]t load ++Don\(aqt load + .B troffrc + and + .BR troffrc-end . +@@ -467,7 +467,7 @@ + .TP + .BR right-brace "\t4096" + Use of +-.B \[rs]} ++.B \(rs} + where a number was expected. + . + .TP +diff -Nuar groff-1.22.3.old/src/utils/addftinfo/addftinfo.am groff-1.22.3/src/utils/addftinfo/addftinfo.am +--- groff-1.22.3.old/src/utils/addftinfo/addftinfo.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/addftinfo/addftinfo.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,30 @@ ++# Automake rules for `src utils addftinfo' ++# ++# File position: /src/utils/addftinfo/addftinfo.am ++# ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# ++# `groff' 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. ++# ++# `groff' 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 ++# . ++# ++######################################################################## ++ ++bin_PROGRAMS += addftinfo ++man1_MANS += src/utils/addftinfo/addftinfo.n ++EXTRA_DIST += src/utils/addftinfo/addftinfo.man ++addftinfo_LDADD = libgroff.a ++addftinfo_SOURCES = \ ++ src/utils/addftinfo/addftinfo.cpp \ ++ src/utils/addftinfo/guess.cpp \ ++ src/utils/addftinfo/guess.h +diff -Nuar groff-1.22.3.old/src/utils/addftinfo/addftinfo.man groff-1.22.3/src/utils/addftinfo/addftinfo.man +--- groff-1.22.3.old/src/utils/addftinfo/addftinfo.man 2014-11-04 10:38:35.310522934 +0200 ++++ groff-1.22.3/src/utils/addftinfo/addftinfo.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -31,8 +31,8 @@ + .\" -------------------------------------------------------------------- + . + .\" Ellipsis ... +-.ie t .ds EL \fS\N'188'\fP +-.el .ds EL \&.\|.\|.\&\ ++.ie t .ds EL \fS\N'188'\fP\" ++.el .ds EL \&.\|.\|.\&\" + .\" called with \*(EL + . + . +@@ -88,7 +88,7 @@ + .SH OPTIONS + .\" -------------------------------------------------------------------- + . +-.B \[en]v ++.B \-v + prints the version number. + . + . +@@ -107,35 +107,35 @@ + must be one of: + . + .TP +-.B \[en]x\-height ++.B \-x\-height + The height of lowercase letters without ascenders such as x. + . + .TP +-.B \[en]fig-height ++.B \-fig\-height + The height of figures (digits). + . + .TP +-.B \[en]asc-height ++.B \-asc\-height + The height of characters with ascenders, such as b, d or l. + . + .TP +-.B \[en]body\-height ++.B \-body\-height + The height of characters such as parentheses. + . + .TP +-.B \[en]cap-height ++.B \-cap\-height + The height of uppercase letters such as A. + . + .TP +-.B \[en]comma\-depth ++.B \-comma\-depth + The depth of a comma. + . + .TP +-.B \[en]desc\-depth ++.B \-desc\-depth + The depth of characters with descenders, such as p, q, or y. + . + .TP +-.B \[en]body\-depth ++.B \-body\-depth + The depth of characters such as parentheses. + . + . +diff -Nuar groff-1.22.3.old/src/utils/addftinfo/.gitignore groff-1.22.3/src/utils/addftinfo/.gitignore +--- groff-1.22.3.old/src/utils/addftinfo/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/addftinfo/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++addftinfo ++addftinfo.n +diff -Nuar groff-1.22.3.old/src/utils/addftinfo/Makefile.sub groff-1.22.3/src/utils/addftinfo/Makefile.sub +--- groff-1.22.3.old/src/utils/addftinfo/Makefile.sub 2014-11-04 10:38:35.310522934 +0200 ++++ groff-1.22.3/src/utils/addftinfo/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,43 +0,0 @@ +-# Makefile.sub for `src utils addftinfo' +-# +-# File position: /src/utils/addftinfo/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=addftinfo$(EXEEXT) +-MAN1=addftinfo.n +-XLIBS=$(LIBGROFF) +-OBJS=\ +- addftinfo.$(OBJEXT) \ +- guess.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/addftinfo.cpp \ +- $(srcdir)/guess.cpp +-HDRS=\ +- $(srcdir)/guess.h +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/afmtodit/afmtodit.am groff-1.22.3/src/utils/afmtodit/afmtodit.am +--- groff-1.22.3.old/src/utils/afmtodit/afmtodit.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/afmtodit/afmtodit.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,49 @@ ++# Automake rules for `src utils afmtodit' ++# ++# File position: /src/utils/afmtodit/afmtdodit.am ++# ++# Copyright (C) 2013-2014 Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++# ++######################################################################## ++ ++afmtodit_srcdir = $(top_srcdir)/src/utils/afmtodit ++ ++bin_SCRIPTS += afmtodit ++man1_MANS += src/utils/afmtodit/afmtodit.n ++EXTRA_DIST += \ ++ src/utils/afmtodit/afmtodit.man \ ++ src/utils/afmtodit/afmtodit.pl \ ++ src/utils/afmtodit/afmtodit.tables \ ++ src/utils/afmtodit/make-afmtodit-tables ++ ++afmtodit: $(afmtodit_srcdir)/afmtodit.pl $(afmtodit_srcdir)/afmtodit.tables ++ if test -n "$(PERL)"; then \ ++ sed -e "s|/usr/bin/perl|$(PERL)|" \ ++ -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]FONTDIR[@]|$(fontdir)|" \ ++ -e "/[@]afmtodit.tables[@]/ r $(afmtodit_srcdir)/afmtodit.tables" \ ++ -e "/[@]afmtodit.tables[@]/ d" \ ++ $(afmtodit_srcdir)/afmtodit.pl >afmtodit; \ ++ else \ ++ sed -e "s|[@]VERSION[@]|$(VERSION)|" \ ++ -e "s|[@]FONTDIR[@]|$(fontdir)|" \ ++ -e "/[@]afmtodit.tables[@]/ r $(afmtodit_srcdir)/afmtodit.tables" \ ++ -e "/[@]afmtodit.tables[@]/ d" \ ++ $(afmtodit_srcdir)/afmtodit.pl >afmtodit; \ ++ fi ++ chmod +x afmtodit +diff -Nuar groff-1.22.3.old/src/utils/afmtodit/afmtodit.man groff-1.22.3/src/utils/afmtodit/afmtodit.man +--- groff-1.22.3.old/src/utils/afmtodit/afmtodit.man 2014-11-04 10:38:35.421521547 +0200 ++++ groff-1.22.3/src/utils/afmtodit/afmtodit.man 2015-04-23 20:57:03.000000000 +0300 +@@ -7,7 +7,7 @@ + .\" Leagal Terms + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -115,8 +115,8 @@ + .B # + and blank lines are ignored. + . +-If the file isn\[aq]t found in the current directory, it is searched +-in the \[oq]devps/generate\[cq] subdirectory of the default font ++If the file isn\(aqt found in the current directory, it is searched ++in the \(oqdevps/generate\(cq subdirectory of the default font + directory. + . + . +@@ -134,7 +134,7 @@ + escape sequence in + .BR troff . + . +-In particular, this is true for glyph variants like \[oq]foo.bar\[cq]; ++In particular, this is true for glyph variants like \(oqfoo.bar\(cq; + all glyph names containing one or more periods are mapped to unnamed + entities. + . +@@ -143,7 +143,7 @@ + is not specified, the encoding defined in the AFM file (i.e., entries + with non-negative character codes) is used. + . +-Please refer to section \[oq]Using Symbols\[cq] in the groff info file ++Please refer to section \(oqUsing Symbols\(cq in the groff info file + which describes how groff glyph names are constructed. + . + . +@@ -154,7 +154,7 @@ + code used in the AFM file in the unlikely case that it is greater than + 255) in the groff font file. + . +-Glyph indices of unencoded characters don\[aq]t have a specific order; ++Glyph indices of unencoded characters don\(aqt have a specific order; + it is best to access them with glyph names only. + . + . +@@ -239,7 +239,7 @@ + rather than the default + .BR DESC . + . +-If not found in the current directory, the \[oq]devps\[qc] ++If not found in the current directory, the \(oqdevps\(cq + subdirectory of the default font directory is searched (this is true + for both the default device description file and a file given with + option +@@ -255,7 +255,7 @@ + is described in + .BR grops (@MAN1EXT@). + . +-If not found in the current directory, the \[oq]devps\[cq] ++If not found in the current directory, the \(oqdevps\(cq + subdirectory of the default font directory is searched. + . + .TP +@@ -270,7 +270,7 @@ + .I n + thousandths of an em + plus the amount by which the right edge of the character's bounding box +-is to the right of the character\[aq]s origin. ++is to the right of the character\(aqs origin. + . + If this would result in a negative italic correction, use a zero + italic correction instead. +@@ -290,7 +290,7 @@ + .I n + thousandths of an em + plus the amount by which the left edge of the character's bounding box +-is to the left of the character\[aq]s origin. ++is to the left of the character\(aqs origin. + . + The left italic correction may be negative unless option + .B \-m +@@ -387,7 +387,7 @@ + . + . + .LP +-The groff info file, section \[oq]Using Symbols\[cq]. ++The groff info file, section \(oqUsing Symbols\(cq. + . + . + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/src/utils/afmtodit/.gitignore groff-1.22.3/src/utils/afmtodit/.gitignore +--- groff-1.22.3.old/src/utils/afmtodit/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/afmtodit/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2 @@ ++afmtodit ++afmtodit.n +diff -Nuar groff-1.22.3.old/src/utils/afmtodit/Makefile.sub groff-1.22.3/src/utils/afmtodit/Makefile.sub +--- groff-1.22.3.old/src/utils/afmtodit/Makefile.sub 2014-11-04 10:38:35.422521534 +0200 ++++ groff-1.22.3/src/utils/afmtodit/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,61 +0,0 @@ +-# Makefile.sub for `src utils afmtodit' +-# +-# File position: /src/utils/afmtodit/Makefile.sub +-# +-# Copyright (C) 2013-2014 Free Software Foundation, Inc. +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-######################################################################## +- +-MAN1=afmtodit.n +-MOSTLYCLEANADD=afmtodit +-RM=rm -f +- +-all: afmtodit +- +-afmtodit: afmtodit.pl afmtodit.tables +- if test -n "$(PERL)"; then \ +- sed -e "s|/usr/bin/perl|$(PERL)|" \ +- -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "s|@FONTDIR@|$(fontdir)|" \ +- -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \ +- -e "/@afmtodit.tables@/ d" \ +- $(srcdir)/afmtodit.pl >afmtodit; \ +- else \ +- sed -e "s|@VERSION@|$(version)$(revision)|" \ +- -e "s|@FONTDIR@|$(fontdir)|" \ +- -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \ +- -e "/@afmtodit.tables@/ d" \ +- $(srcdir)/afmtodit.pl >afmtodit; \ +- fi +- chmod +x afmtodit +- +-install_data: afmtodit +- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) +- $(RM) $(DESTDIR)$(bindir)/afmtodit +- $(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(bindir)/afmtodit +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/hpftodit/.gitignore groff-1.22.3/src/utils/hpftodit/.gitignore +--- groff-1.22.3.old/src/utils/hpftodit/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/hpftodit/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++hpftodit ++hpftodit.n +diff -Nuar groff-1.22.3.old/src/utils/hpftodit/hpftodit.am groff-1.22.3/src/utils/hpftodit/hpftodit.am +--- groff-1.22.3.old/src/utils/hpftodit/hpftodit.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/hpftodit/hpftodit.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,29 @@ ++# Automake rules for `src utils hpftodit' ++# ++# File position: /src/utils/hpftodit/hpftodit.am ++# ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# ++# `groff' 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. ++# ++# `groff' 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 ++# . ++# ++######################################################################## ++ ++bin_PROGRAMS += hpftodit ++man1_MANS += src/utils/hpftodit/hpftodit.n ++EXTRA_DIST += src/utils/hpftodit/hpftodit.man ++hpftodit_LDADD = libgroff.a $(LIBM) ++hpftodit_SOURCES = \ ++ src/utils/hpftodit/hpftodit.cpp \ ++ src/utils/hpftodit/hpuni.cpp +diff -Nuar groff-1.22.3.old/src/utils/hpftodit/hpftodit.man groff-1.22.3/src/utils/hpftodit/hpftodit.man +--- groff-1.22.3.old/src/utils/hpftodit/hpftodit.man 2014-11-04 10:38:35.293523147 +0200 ++++ groff-1.22.3/src/utils/hpftodit/hpftodit.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,10 @@ + hpftodit \- create font description files for use with groff \-Tlj4 + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legal Terms + .\" -------------------------------------------------------------------- +@@ -380,6 +384,9 @@ + .co + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/src/utils/hpftodit/Makefile.sub groff-1.22.3/src/utils/hpftodit/Makefile.sub +--- groff-1.22.3.old/src/utils/hpftodit/Makefile.sub 2014-11-04 10:38:35.293523147 +0200 ++++ groff-1.22.3/src/utils/hpftodit/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,40 +0,0 @@ +-# Makefile.sub for `src utils hpftodit' +-# +-# File position: /src/utils/hpftodit/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=hpftodit$(EXEEXT) +-MAN1=hpftodit.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=hpftodit.$(OBJEXT) \ +- hpuni.$(OBJEXT) +-CCSRCS=$(srcdir)/hpftodit.cpp \ +- $(srcdir)/hpuni.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/indxbib/.gitignore groff-1.22.3/src/utils/indxbib/.gitignore +--- groff-1.22.3.old/src/utils/indxbib/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/indxbib/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++indxbib ++indxbib.n +diff -Nuar groff-1.22.3.old/src/utils/indxbib/indxbib.am groff-1.22.3/src/utils/indxbib/indxbib.am +--- groff-1.22.3.old/src/utils/indxbib/indxbib.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/indxbib/indxbib.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,51 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++indxbib_srcdir = $(top_srcdir)/src/utils/indxbib ++prefixexecbin_PROGRAMS += indxbib ++indxbib_SOURCES = \ ++ src/utils/indxbib/indxbib.cpp \ ++ src/utils/indxbib/signal.c ++src/utils/indxbib/indxbib.$(OBJEXT): defs.h ++indxbib_LDADD = libbib.a libgroff.a $(LIBM) ++PREFIXMAN1 += src/utils/indxbib/indxbib.n ++EXTRA_DIST += \ ++ src/utils/indxbib/indxbib.man \ ++ src/utils/indxbib/eign ++ ++install-data-local: install_indxbib ++install_indxbib: $(indxbib_srcdir)/eign ++ -test -d $(DESTDIR)$(datadir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(datadir) ++ -test -d $(DESTDIR)$(dataprogramdir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir) ++ -test -d $(DESTDIR)$(datasubdir) \ ++ || $(mkinstalldirs) $(DESTDIR)$(datasubdir) ++ if test -f /usr/lib/eign; then \ ++ rm -f $(DESTDIR)$(common_words_file); \ ++ ln -s /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \ ++ || ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \ ++ || cp /usr/lib/eign $(DESTDIR)$(common_words_file); \ ++ else \ ++ rm -f $(DESTDIR)$(common_words_file); \ ++ $(INSTALL_DATA) $(indxbib_srcdir)/eign $(DESTDIR)$(common_words_file); \ ++ fi ++ ++uninstall-local: uninstall_indxbib ++uninstall_indxbib: ++ rm -f $(DESTDIR)$(common_words_file) +diff -Nuar groff-1.22.3.old/src/utils/indxbib/indxbib.man groff-1.22.3/src/utils/indxbib/indxbib.man +--- groff-1.22.3.old/src/utils/indxbib/indxbib.man 2014-11-04 10:38:35.301523047 +0200 ++++ groff-1.22.3/src/utils/indxbib/indxbib.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,7 +4,7 @@ + . + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -167,7 +167,7 @@ + . + .TP + .BI \-i string +-Don\[aq]t index the contents of fields whose names are in ++Don\(aqt index the contents of fields whose names are in + .IR string . + . + Initially +diff -Nuar groff-1.22.3.old/src/utils/indxbib/Makefile.sub groff-1.22.3/src/utils/indxbib/Makefile.sub +--- groff-1.22.3.old/src/utils/indxbib/Makefile.sub 2014-11-04 10:38:35.301523047 +0200 ++++ groff-1.22.3/src/utils/indxbib/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,65 +0,0 @@ +-# Makefile.sub for `src utils indxbib' +-# +-# File position: /src/utils/indxbib/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=indxbib$(EXEEXT) +-MAN1=indxbib.n +-XLIBS=$(LIBBIB) $(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=\ +- indxbib.$(OBJEXT) \ +- signal.$(OBJEXT) +-CCSRCS=\ +- $(srcdir)/indxbib.cpp +-CSRCS=\ +- $(srcdir)/signal.c +-NAMEPREFIX=$(g) +-RM=rm -f +- +-install_data: $(srcdir)/eign +- -test -d $(DESTDIR)$(datadir) \ +- || $(mkinstalldirs) $(DESTDIR)$(datadir) +- -test -d $(DESTDIR)$(dataprogramdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir) +- -test -d $(DESTDIR)$(datasubdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(datasubdir) +- if test -f /usr/lib/eign; then \ +- $(MK) $(DESTDIR)$(common_words_file); \ +- ln -s /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \ +- || ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \ +- || cp /usr/lib/eign $(DESTDIR)$(common_words_file); \ +- else \ +- $(RM) $(DESTDIR)$(common_words_file); \ +- $(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file); \ +- fi +- +-uninstall_sub: +- $(RM) $(DESTDIR)$(common_words_file) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/lkbib/.gitignore groff-1.22.3/src/utils/lkbib/.gitignore +--- groff-1.22.3.old/src/utils/lkbib/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/lkbib/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++lkbib ++lkbib.n +diff -Nuar groff-1.22.3.old/src/utils/lkbib/lkbib.am groff-1.22.3/src/utils/lkbib/lkbib.am +--- groff-1.22.3.old/src/utils/lkbib/lkbib.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/lkbib/lkbib.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,24 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += lkbib ++man1_MANS += src/utils/lkbib/lkbib.n ++EXTRA_DIST += src/utils/lkbib/lkbib.man ++lkbib_LDADD = libbib.a libgroff.a $(LIBM) ++lkbib_SOURCES = src/utils/lkbib/lkbib.cpp ++src/utils/lkbib/lkbib.$(OBJEXT): defs.h +diff -Nuar groff-1.22.3.old/src/utils/lkbib/lkbib.man groff-1.22.3/src/utils/lkbib/lkbib.man +--- groff-1.22.3.old/src/utils/lkbib/lkbib.man 2014-11-04 10:38:35.305522997 +0200 ++++ groff-1.22.3/src/utils/lkbib/lkbib.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/utils/lkbib/Makefile.sub groff-1.22.3/src/utils/lkbib/Makefile.sub +--- groff-1.22.3.old/src/utils/lkbib/Makefile.sub 2014-11-04 10:38:35.305522997 +0200 ++++ groff-1.22.3/src/utils/lkbib/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,38 +0,0 @@ +-# Makefile.sub for `src utils lkbib' +-# +-# File position: /src/utils/lkbib/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=lkbib$(EXEEXT) +-MAN1=lkbib.n +-XLIBS=$(LIBBIB) $(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=lkbib.$(OBJEXT) +-CCSRCS=$(srcdir)/lkbib.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/lookbib/.gitignore groff-1.22.3/src/utils/lookbib/.gitignore +--- groff-1.22.3.old/src/utils/lookbib/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/lookbib/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++lookbib ++lookbib.n +diff -Nuar groff-1.22.3.old/src/utils/lookbib/lookbib.am groff-1.22.3/src/utils/lookbib/lookbib.am +--- groff-1.22.3.old/src/utils/lookbib/lookbib.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/lookbib/lookbib.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,23 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++prefixexecbin_PROGRAMS += lookbib ++PREFIXMAN1 += src/utils/lookbib/lookbib.n ++EXTRA_DIST += src/utils/lookbib/lookbib.man ++lookbib_LDADD = libbib.a libgroff.a $(LIBM) ++lookbib_SOURCES = src/utils/lookbib/lookbib.cpp +diff -Nuar groff-1.22.3.old/src/utils/lookbib/lookbib.man groff-1.22.3/src/utils/lookbib/lookbib.man +--- groff-1.22.3.old/src/utils/lookbib/lookbib.man 2014-11-04 10:38:35.297523097 +0200 ++++ groff-1.22.3/src/utils/lookbib/lookbib.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/utils/lookbib/Makefile.sub groff-1.22.3/src/utils/lookbib/Makefile.sub +--- groff-1.22.3.old/src/utils/lookbib/Makefile.sub 2014-11-04 10:38:35.297523097 +0200 ++++ groff-1.22.3/src/utils/lookbib/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `src utils lookbib' +-# +-# File position: /src/utils/lookbib/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=lookbib$(EXEEXT) +-MAN1=lookbib.n +-XLIBS=$(LIBBIB) $(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=lookbib.$(OBJEXT) +-CCSRCS=$(srcdir)/lookbib.cpp +-NAMEPREFIX=$(g) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/pfbtops/.gitignore groff-1.22.3/src/utils/pfbtops/.gitignore +--- groff-1.22.3.old/src/utils/pfbtops/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/pfbtops/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++pfbtops ++pfbtops.n +diff -Nuar groff-1.22.3.old/src/utils/pfbtops/Makefile.sub groff-1.22.3/src/utils/pfbtops/Makefile.sub +--- groff-1.22.3.old/src/utils/pfbtops/Makefile.sub 2014-11-04 10:38:35.314522884 +0200 ++++ groff-1.22.3/src/utils/pfbtops/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,39 +0,0 @@ +-# Makefile.sub for `src utils pfbtops' +-# +-# File position: /src/utils/pfbtops/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=pfbtops$(EXEEXT) +-MAN1=pfbtops.n +-OBJS=pfbtops.$(OBJEXT) +-CSRCS=$(srcdir)/pfbtops.c +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-LINK.c=$(CCC) $(CCFLAGS) $(LDFLAGS) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/pfbtops/pfbtops.am groff-1.22.3/src/utils/pfbtops/pfbtops.am +--- groff-1.22.3.old/src/utils/pfbtops/pfbtops.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/pfbtops/pfbtops.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,26 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += pfbtops ++man1_MANS += src/utils/pfbtops/pfbtops.n ++EXTRA_DIST += src/utils/pfbtops/pfbtops.man ++pfbtops_SOURCES = src/utils/pfbtops/pfbtops.c ++pfbtops_LDADD = libgroff.a $(LIBM) ++# We use the following trick to force the use of C++ compiler ++# See the Automake manual, "Libtool Convenience Libraries" ++nodist_EXTRA_pfbtops_SOURCES = src/utils/pfbtops/dummy.cpp +diff -Nuar groff-1.22.3.old/src/utils/pfbtops/pfbtops.man groff-1.22.3/src/utils/pfbtops/pfbtops.man +--- groff-1.22.3.old/src/utils/pfbtops/pfbtops.man 2014-11-04 10:38:35.314522884 +0200 ++++ groff-1.22.3/src/utils/pfbtops/pfbtops.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -Nuar groff-1.22.3.old/src/utils/tfmtodit/.gitignore groff-1.22.3/src/utils/tfmtodit/.gitignore +--- groff-1.22.3.old/src/utils/tfmtodit/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/tfmtodit/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,3 @@ ++Makefile.dep ++tfmtodit ++tfmtodit.n +diff -Nuar groff-1.22.3.old/src/utils/tfmtodit/Makefile.sub groff-1.22.3/src/utils/tfmtodit/Makefile.sub +--- groff-1.22.3.old/src/utils/tfmtodit/Makefile.sub 2014-11-04 10:38:35.288523209 +0200 ++++ groff-1.22.3/src/utils/tfmtodit/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,38 +0,0 @@ +-# Makefile.sub for `src utils tfmtodit' +-# +-# File position: /src/utils/tfmtodit/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=tfmtodit$(EXEEXT) +-MAN1=tfmtodit.n +-XLIBS=$(LIBGROFF) +-MLIB=$(LIBM) +-OBJS=tfmtodit.$(OBJEXT) +-CCSRCS=$(srcdir)/tfmtodit.cpp +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/tfmtodit/tfmtodit.am groff-1.22.3/src/utils/tfmtodit/tfmtodit.am +--- groff-1.22.3.old/src/utils/tfmtodit/tfmtodit.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/tfmtodit/tfmtodit.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,23 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++bin_PROGRAMS += tfmtodit ++man1_MANS += src/utils/tfmtodit/tfmtodit.n ++EXTRA_DIST += src/utils/tfmtodit/tfmtodit.man ++tfmtodit_SOURCES = src/utils/tfmtodit/tfmtodit.cpp ++tfmtodit_LDADD = libgroff.a $(LIBM) +diff -Nuar groff-1.22.3.old/src/utils/tfmtodit/tfmtodit.man groff-1.22.3/src/utils/tfmtodit/tfmtodit.man +--- groff-1.22.3.old/src/utils/tfmtodit/tfmtodit.man 2014-11-04 10:38:35.288523209 +0200 ++++ groff-1.22.3/src/utils/tfmtodit/tfmtodit.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 1989-2014 Free Software Foundation, Inc. ++Copyright \(co 1989-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -120,7 +120,7 @@ + command in the DESC file; + if it is not special, there is no need to list it, since + .B troff +-can automatically mount it when it\[aq]s first used. ++can automatically mount it when it\(aqs first used. + . + . + .LP +diff -Nuar groff-1.22.3.old/src/utils/xtotroff/.gitignore groff-1.22.3/src/utils/xtotroff/.gitignore +--- groff-1.22.3.old/src/utils/xtotroff/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/xtotroff/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,4 @@ ++Makefile ++xtotroff.n ++xtotroff ++Makefile.dep +diff -Nuar groff-1.22.3.old/src/utils/xtotroff/Makefile.sub groff-1.22.3/src/utils/xtotroff/Makefile.sub +--- groff-1.22.3.old/src/utils/xtotroff/Makefile.sub 2014-11-04 10:38:35.331522672 +0200 ++++ groff-1.22.3/src/utils/xtotroff/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,40 +0,0 @@ +-# Makefile.sub for `src utils xtotroff' +-# +-# File position: /src/utils/stotroff/Makefile.sub +-# +-# Copyright (C) 2014 Free Software Foundation, Inc. +-# +-# This file is part of `font utf8' which is part of `groff'. +-# +-# `groff' 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. +-# +-# `groff' 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 +-# . +-# +-######################################################################## +- +-PROG=xtotroff$(EXEEXT) +-MAN1=xtotroff.n +-MLIB=$(LIBM) +-XLIBS=$(LIBXUTIL) $(LIBGROFF) +-EXTRA_CFLAGS=$(X_CFLAGS) +-EXTRA_LDFLAGS=$(X_LIBS) $(X_PRE_LIBS) -lXaw -lXt -lX11 $(X_EXTRA_LIBS) +-OBJS=xtotroff.$(OBJEXT) +-CSRCS=$(srcdir)/xtotroff.c +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/src/utils/xtotroff/xtotroff.am groff-1.22.3/src/utils/xtotroff/xtotroff.am +--- groff-1.22.3.old/src/utils/xtotroff/xtotroff.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/src/utils/xtotroff/xtotroff.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,28 @@ ++# Copyright (C) 2014 ++# Free Software Foundation, Inc. ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++ ++if !WITHOUT_X11 ++bin_PROGRAMS += xtotroff ++man1_MANS += src/utils/xtotroff/xtotroff.n ++xtotroff_SOURCES = src/utils/xtotroff/xtotroff.c ++XLIBS=$(LIBXUTIL) $(LIBGROFF) ++xtotroff_LDADD = libxutil.a libgroff.a $(X_LIBS) $(X_PRE_LIBS) \ ++ -lXaw -lXt -lX11 $(X_EXTRA_LIBS) $(LIBM) ++xtotroff_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) ++endif ++EXTRA_DIST += src/utils/xtotroff/xtotroff.man +diff -Nuar groff-1.22.3.old/src/utils/xtotroff/xtotroff.man groff-1.22.3/src/utils/xtotroff/xtotroff.man +--- groff-1.22.3.old/src/utils/xtotroff/xtotroff.man 2014-11-04 10:38:35.331522672 +0200 ++++ groff-1.22.3/src/utils/xtotroff/xtotroff.man 2015-04-23 20:57:03.000000000 +0300 +@@ -8,7 +8,7 @@ + .\" -------------------------------------------------------------------- + . + .de co +-Copyright \[co] 2004-2014 Free Software Foundation, Inc. ++Copyright \(co 2004-2014 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +@@ -116,8 +116,8 @@ + .\" -------------------------------------------------------------------- + .SH BUGS + .\" -------------------------------------------------------------------- +-The only supported font encodings are \[oq]iso8859-1\[cq] and +-\[cq]adobe-fontspecific\[cq]. ++The only supported font encodings are \(oqiso8859-1\(cq and ++\(cqadobe-fontspecific\(cq. + . + . + .\" -------------------------------------------------------------------- +diff -Nuar groff-1.22.3.old/stamp-h.in groff-1.22.3/stamp-h.in +--- groff-1.22.3.old/stamp-h.in 2014-11-04 10:38:35.146524985 +0200 ++++ groff-1.22.3/stamp-h.in 1970-01-01 02:00:00.000000000 +0200 +@@ -1 +0,0 @@ +-timestamp +diff -Nuar groff-1.22.3.old/test-groff.in groff-1.22.3/test-groff.in +--- groff-1.22.3.old/test-groff.in 2014-11-04 10:38:35.146524985 +0200 ++++ groff-1.22.3/test-groff.in 2015-04-23 20:57:03.000000000 +0300 +@@ -20,35 +20,17 @@ + # This script runs groff without requiring that it be installed. + + SEP='@PATH_SEPARATOR@' +-builddir=@abs_top_builddir@/src ++builddir=@abs_top_builddir@ + srcdir=@abs_top_srcdir@ + +-GROFF_BIN_PATH=\ +-$builddir/roff/groff$SEP\ +-$builddir/roff/troff$SEP\ +-$builddir/preproc/preconv$SEP\ +-$builddir/preproc/pic$SEP\ +-$builddir/preproc/eqn$SEP\ +-$builddir/preproc/tbl$SEP\ +-$builddir/preproc/grn$SEP\ +-$builddir/preproc/refer$SEP\ +-$builddir/preproc/soelim$SEP\ +-$builddir/preproc/html$SEP\ +-$builddir/devices/grops$SEP\ +-$builddir/devices/grodvi$SEP\ +-$builddir/devices/grotty$SEP\ +-$builddir/devices/grolj4$SEP\ +-$builddir/devices/grolbp$SEP\ +-$builddir/devices/grohtml$SEP\ +-$builddir/devices/gropdf$SEP\ +-$builddir/devices/xditview ++GROFF_BIN_PATH=$builddir + + XENVIRONMENT=$srcdir/src/devices/xditview/GXditview.ad + export XENVIRONMENT + + GROFF_COMMAND_PREFIX= +-GROFF_FONT_PATH=$builddir/../font$SEP$srcdir/font +-GROFF_TMAC_PATH=$srcdir/tmac ++GROFF_FONT_PATH=$builddir/font$SEP$srcdir/font ++GROFF_TMAC_PATH=$srcdir/tmac$SEP$builddir/tmac$SEP$srcdir/contrib/mom$SEP$builddir/contrib/mom + export GROFF_BIN_PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH + +-exec $builddir/roff/groff/groff ${1+"$@"} ++exec $builddir/groff ${1+"$@"} +diff -Nuar groff-1.22.3.old/TESTS groff-1.22.3/TESTS +--- groff-1.22.3.old/TESTS 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/TESTS 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,654 @@ ++This file gives information on the tests that were made during the ++Automake migration. ++ ++Environment ++----------- ++Arch Linux x64 with: ++ - Autoconf 2.69 ++ - Automake 1.14.1 ++ - GNU Make 4.0 ++ ++Current status ++-------------- ++ - Gnulib integrated ++ - Automake support ++ - Build src/libs/* ++ - Build src/utils/* ++ - Build src/preproc/* ++ - Build src/devices/* ++ - Build src/roff/* ++ - Build font/* ++ - man files from 'man' directory installed ++ - tmac files from 'tmac' directory installed ++ - Build and installation of contrib ++ - Build and installation of doc, including texinfo doc ++ ++Tests ++----- ++ ++0. Sum up of a full test pass ++----------------------------- ++ ++0.1. Build ++ ++ ./bootstrap ++ mkdir build ++ cd build ++ ../configure ++ make -j ++ ++0.2 Install ++ ++ mkdir -p ~/tmp/automake ++ make install DESTDIR=~/tmp/automake ++ ++-> Comparison with the tree installed by the the reference version ++ ++ make uninstall DESTDIR=~/tmp/automake ++ ++-> Check what is left in the installation tree ++ ++ make uninstall DESTDIR=~/tmp/automake ++ ++-> Check that this same command did not fail ++ ++0.3 Distcheck ++ ++ mkdir -p ~/tmp/distcheck ++ make distcheck DESTDIR=~/tmp/distcheck ++ ++-> Will attempt to untar the dist, make an out-of-source build, clean ++ and check that nothing is level, install, uninstall and check that ++ nothing is left in the install tree. This should not fail. ++ ++0.4 Dist ++ ++ make dist ++ ++-> Comparison of the generated tarball with the git tree ++-> Manually build an install from the tarball and compare the ++ installation tree with the reference version's installation tree. ++ ++Note that discheck checks that install does not fail, uninstall does ++not leave any file, but cannot check if a generated file that should ++not be distributed was distributed, or that files are missing in the ++installation tree. ++ ++0.5 Check ++ ++ make check ++ ++-> All tests should pass ++ ++0.6 Clean ++ ++ make mostlyclean ++ ++-> Check what is left in the build tree. ++ ++ make clean ++ ++-> Check what is left in the build tree. This is also automatically ++ checked by 'distcheck'. ++ ++ make distclean ++ ++-> Check what is left in the build tree ++ ++ ++1. Generation of build system files ++----------------------------------- ++ ++ ./bootstrap ++ ++Generated the following files and directories: ++ INSTALL ++ Makefile.in ++ aclocal.m4 ++ autom4te.cache/ ++ build-aux/ ++ configure ++ gnulib_m4/ ++ lib/ ++ src/include/config.hin ++ ++2. Tests of various targets ++--------------------------- ++ ++Tests done in 2 configurations: ++ ++ - Out-of source build mode ++ ++ mkdir build ++ cd build ++ ../configure ++ ++ - In source build: ++ ../configure ++ ++2.1 make ++ ++Following files are generated: ++ ++ - src/include/config.h ++ - lib/libgnu.a ++ ++from arch/misc: ++ - shdeps.sed ++ ++from src/libs: ++ - libbib.a ++ - libdriver.a ++ - libgroff.a, version.cpp and extra files (charset.alias, ++ ref-add.sed, ref-del.sed) ++ - libxutils.a ++ ++from src/utils: ++ - addftinfo ++ - afmtodit ++ - hpftodit ++ - indxbib ++ - lkbib ++ - lookbib ++ - pfbtops ++ - tfmtodit ++ - xtotroff ++ - man files (.n) in src/utils ++ ++from src/preproc: ++ - eqn ++ - grn ++ - pre-grohtml ++ - pic ++ - preconv ++ - refer ++ - soelim ++ - tbl ++ - Yacc and Lex support: the following files are generated: ++ -- eqn/eqn.cpp ++ -- eqn/eqn.hpp (previously eqn_tab.h) ++ -- pic/pic.cpp ++ -- pic/pic.hpp (previously pic_tab.h) ++ -- pic/pic.output ++ -- refer/label.cpp ++ -- refer/label.hpp ++ Compared to the previous build system, the only relevant diff is ++ an extra protection #define in label.cpp ++#ifndef YY_YY_SRC_PREPROC_REFER_LABEL_HPP_INCLUDED ++# define YY_YY_SRC_PREPROC_REFER_LABEL_HPP_INCLUDED ++ ++from src/devices: ++ - grodvi ++ - pre-grohtml ++ - post-grohtml ++ - grolbp ++ - grolj4 ++ - gropdf ++ - pdfmom ++ - grops ++ - grotty ++ - gxditview ++ ++from src/roff ++ - groff ++ - grog ++ - nroff ++ - troff ++ ++from font: font files in ++ - devascii ++ - devcp1047 ++ - devdvi ++ - devhtml ++ - devlatin1 ++ - devlbp ++ - devlj4 ++ - devpdf ++ - devps ++ - devutf8 ++ ++from contrib/chem: ++ - `chem' script and 3 README files ++ ++from contrib/eqn2graph: ++ - `eqn2graph' script ++ ++from contrib/gdiffmk: ++ - `gdiffmk' script ++ ++from contrib/gperl ++ - `gperl' script ++ ++from contrib/gpinyin ++ - `gpinyin' script ++ ++from contrib/grap2graph ++ - `grap2graph' script ++ ++from contrib/pic2graph ++ - `pic2graph' script ++ ++from contrib/glilypond ++ - `glilypond' script ++ ++from contrib/groffer ++ - `groffer' script, all the man files. ++ ++from contrib/hdtbl ++ - hdtbl examples and tmac files ++ ++from contrib/mm ++ - .n files ++ ++from contrib/pdfmark ++ - pdfmark.pdf ++ - pdfroff ++ ++from contrib/mom ++ - pdfmom ++ - 4 .pdf example files ++ ++from doc ++ - gnu.eps ++ - html and doc files ++ ++from doc, texinfo files: ++ ++ - By default, only doc/groff.info is built, as GNU standards require ++ to install only info doc. ++ ++ - Additional optional targets are available to build the doc in various formats: ++ -- make doc_txt ++ -- make doc_dvi ++ -- make doc_pdf ++ -- make doc_html (this will build the html in 2 directories: all ++ in 1 .html file, and 1 file per node). Note also that if ++ texinfo version is < 5.0, the resulting (mono) file will be ++ patched by fixinfo.sh ++ -- make doc_all will build all the 4 previous formats ++ ++In order to check and improve the dependencies, the following targets ++were built from a clean environment: ++ - make lib/libgnu.a ++ - make libbib.a ++ - make libdriver.a ++ - make libgroff.a ++ - make libxutil.a ++ - make addftinfo ++ - make afmtodit ++ - make hpftodit ++ - make indxbib ++ - make lkbib ++ - make lookbib ++ - make pfbtops ++ - make tfmtodit ++ - make xtotroff ++ - make eqn ++ - make grn ++ - make pre-grohtml ++ - make pic ++ - make preconv ++ - make refer ++ - make soelim ++ - make tbl ++ - make grodvi ++ - make post-grohtml ++ - make grolbp ++ - make grolj4 ++ - make gropdf ++ - make pdfmom ++ - make grops ++ - make grotty ++ - make gxditview ++ - make groff ++ - make grog ++ - make nroff ++ - make troff ++ - make chem ++ - make eqn2graph ++ - make gdiffmk ++ - make gperl ++ - make gpinyin ++ - make grap2graph ++ - make pic2graph ++ - make glilypond ++ - make groffer ++ - make pdfroff ++ - make contrib/pdfmark/pdfmark.pdf ++ - make pdfmom ++ - make contrib/mom/examples/mom-pdf.pdf ++ ++2.2 make clean ++ ++The following files remain (this is expected): ++ - Makefile ++ - config.status ++ - config.log ++ - doc/groff.info-1 ++ - doc/groff.info-3 ++ - src/include/config.h ++ - src/include/stamp-h1 ++ - .deps directories and .dirstamp files ++ ++2.3 make mostlyclean ++ ++ Like 'make clean', but the following files also remain (expected): ++ - lib*.a ++ - libgroff.a's charset.alias, ref-add.sed, ref-del.sed, and ++ version.cpp. ++ - gnulib's charset.alias, ref-add.sed, ref-del.sed and configmake.h ++ - src/preproc generated .cpp, hpp, and .output files ++ - Scripts (listed in bin_SCRIPTS) are added to the MOSTLYCLEANFILES ++ list. ++ ++Differences with former build system: ++ ++ - Programs (listed in bin_PROGRAMS) are not cleaned by 'make ++ mostlyclean'. This could be changed if needed (MOSTLYCLEANFILES += ++ $(bin_PROGRAMS)). ++ ++2.4 make distclean ++ ++ Like 'make clean', but the following files are also cleaned: ++ - Makefile ++ - config.status ++ - config.log ++ - src/include/config.h ++ - src/include/stamp-h1 ++ - .deps directories and .dirstamp files ++ ++ In a out-of-source build, nothing remains in the build directory ++ expect empty directories. ++ ++ The files generated by bootstrap and needed by the configure script ++ are untouched: ++ INSTALL ++ Makefile.in ++ aclocal.m4 ++ build-aux/ ++ configure ++ gnulib_m4/ ++ lib/ ++ src/include/config.hin ++ ++2.5 make maintainer-clean ++ ++ Like 'make distclean' ++ ++2.6 make install ++ ++ mkdir -p ~/tmp/automake ++ make install DESTDIR=~/tmp/automake ++ ++ - If file charset.alias is always present in ++ $(DESTDIR)/usr/local/lib, make install update it by adding 'groff' ++ to the list of programs using it. Otherwise nothing is installed. ++ ++ - Programs from 'src' installed in $(DESTDIR)/usr/local/bin: ++ ++ - man files from man, src are installed in ++ $(DESTDIR)/usr/local/share/man/man1, man5 and man7. ++ ++ - $(DESTDIR)/usr/local/share/groff/1.22.3/eign (from src/utils/indxbib) ++ ++ - In $(DESTDIR)/usr/local/lib/X11/app-defaults: GXditview and ++ GXditview-color. If these files are already present, they are ++ first moved to GXditview.old and GXditview-color.old. ++ ++ - usr/local/lib/groff: ++ -- groff_opts_no_arg.txt and groff_opts_with_arg.txt are installed ++ -- grog/sub.pl ++ ++ - font files are installed in $(DESTDIR)/usr/local/groff/1.22.3/font ++ and oldfont and identical to the one installed with the previous ++ build system, except the fonts from devpdf which are not generated ++ identically at each build. ++ ++ - tmac files from 'tmac' dir are installed in ++ $(DESTDIR)/usr/local/groff/1.22.3/tmac. Some files are first ++ stripped (comments removed) at build time. Checked that they are ++ strictly identical to the one install by the original build ++ system. ++ ++ - contrib scripts installed in $(DESTDIR)/usr/local/bin ++ ++ - contrib/chem: ++ ++ -- chem.pic installed in ++ $(DESTDIR)/usr/local/share/groff/1.22.3/pic/chem.pic ++ ++ -- other chem files installed in ++ $(DESTDIR)/usr/local/share/doc/groff-1.22.3/examples, identical to ++ the old build system. ++ ++ -- contrib/chem/README is strangely build but not installed, this ++ is the behaviour on the old build system. ++ ++ - contrib/hdtbl: ++ ++ -- example files in ++ $(DESTDIR)/usr/local/share/doc/groff-1.22.3/examples/hdtbl ++ ++ -- hdtbl.tmac and hdmisc.tmac installed in ++ $(DESTDIR)/usr/local/share/groff-1.22.3/tmac ++ ++ - contrib/mm ++ ++ -- tmac files in tmacdir, misc files in ++ $(DESTDIR)/usr/local/share/groff/1.22.3/tmac/mm ++ ++ -- refer-mm.tmac in tmacdir ++ ++ - contrib/pdfmark ++ ++ -- tmac files ++ -- pdfmark.pdf ++ ++ - contrib/mom ++ -- example files in $(DESTDIR)/usr/local/share/doc/groff-1.22.3/examples/mom ++ -- html files in $(DESTDIR)/usr/local/share/doc/groff-1.22.3/html/mom ++ ++ - doc ++ ++ -- webpageXX.html files ++ -- picXX.html files ++ -- info file from groff.texinfo ++ ++Diff with previous build system after final (full tree comparison): ++ - devcp1047 fonts are installed $(DESTDIR)/usr/local/groff/1.22.3/font ++ - devpdf fonts (not identical at each build) ++ - in hdbtbl, parts of some .ps are not identical at each build. ++ - timetamp in man files or html files ++ ++2.7 make uninstall ++ ++ - Note: target 'uninstall_groffdirs' is a dependency of standard ++ target uninstall-hook, and removes groff's specific directories ++ (exampledir, libprogramdir etc ...). contrib that create ++ sub-directories in these groff specific directories should also ++ add a custom rule that is a dependency of uninstall_groffdirs to ++ remove the directories it created, otherwise uninstall-hook will ++ fail du to the impossibility to remove non-empty dir. ++ ++ - Tree after uninstall: ++. ++└── usr ++ └── local ++ ├── bin ++ ├── lib ++ │   └── X11 ++ │   └── app-defaults ++ └── share ++ ├── doc ++ ├── info ++ │   └── dir ++ └── man ++ ├── man1 ++ ├── man5 ++ └── man7 ++ ++13 directories, 1 file ++ ++ - Notes: ++ -- $(DESTDIR)/usr/local/lib/charset.alias is removed if exists ++ -- $(DESTDIR)/usr/local/lib/X11/app-defaults/GXditview and ++ GXditview-color are removed. However, GXditview.old and ++ GXditview-color.old are not removed (this is the behaviour on the ++ old build system) ++ ++2.8 make dist ++ ++ groff-1.22.3.tar.gz is generated. ++ ++ - Files/directories that are not distributed on purpose: ++ all .gitignore files ++ .gitmodules ++ bootstrap ++ bootstrap.conf ++ gnulib/ ++ README.git ++ ++ - Files/directories not present in the git tree that are ++ distributed: ++ build-aux/ ++ gnulib_m4/ ++ lib/ ++ src/include/config.hin ++ INSTALL ++ Makefile.in ++ aclocal.m4 ++ configure ++ src/preproc/eqn/eqn.cpp ++ src/preproc/eqn/eqn.hpp ++ src/preproc/pic/pic.cpp ++ src/preproc/pic/pic.hpp ++ src/preproc/refer/label.hpp ++ src/preproc/refere/label.cpp ++ doc/gnu.eps ++ ++Note: when building from a tarball, we will use doc/gnu.eps. ++ ++2.9 make check ++ ++ (manually called automake --add-missing to add build-aux/test-driver) ++ - gdiffmk's test script is now plugged to the 'make check' ++ target. The original runtests.in is renamed to runtests.sh with ++ absolute paths. The new script gdiffmk_tests.sh is used to call ++ runtests.sh in $(top_builddir)/contrib/gdiff/tests, because ++ runtest.sh will generate some result files. ++ ++2.10 make distcheck ++ ++ This will attempt to make a tarball, and from this tarball, build ++the package(out-of-source build), check it, clean it (checking that no ++file remains), install it, uninstall it (checking that no file remains ++in the install tree). ++ ++ make distcheck ++ ++ - All phases now succeed ++ ++3. Additional tests ++------------------- ++ ++3.1 Build without X support ++ ++ Calling configure with option --without-x doesn't build: ++ - gxidview ++ - libxutil.a ++ - xtotroff ++ ++ The following fonts are not installed: ++ - dev/X100 ++ - devX100-12 ++ - devX75 ++ - devX75-12 ++ ++ 'make distcheck' passes correctly, and the tarball generated by ++ 'make dist' is identical to the one generated with X support. ++ ++3.2 Options to build the doc ++ ++ - Default behavour ++ -- By default all the documentation (except texinfo documents) ++ will be installed in: ++ $(DESTDIR)/usr/local/share/doc/groff-1.22.3/ ++ -- The only texinfo documentation installed by default is: ++ $(DESTDIR)/usr/local/share/info/groff.info ++ ++ - Passing to configure option: --with-doc=no ++ ++ No doc is built nor installed, $(DESTDIR)/usr/local/share/doc ++ is not even created. groff.info is not installed. ++ ++ - Passing to configure option: --with-doc=examples ++ ++ Only $(DESTDIR)/usr/local/share/doc/groff-1.22.3/examples is ++ present, and contain files in format other than html and pdf ++ formats. ++ ++ - Passing to configure option: --with-doc=html ++ ++ Only $(DESTDIR)/usr/local/share/doc/groff-1.22.3/html/ is present. ++ ++ - Passing to configure option: --with-doc=pdf ++ Only ++ $(DESTDIR)/usr/local/share/doc/groff-1.22.3/pdf/pdfmark.pdf ++ is present ++ ++ - Passing to configure option: --with-doc=other ++ ++ Only .me and .ps files are present in ++ $(DESTDIR)/usr/local/share/doc/groff-1.22.3/ ++ ++ - Passing to configure option: --with-doc=info ++ $(DESTDIR)/usr/local/share/doc is not created. ++ Only $(DESTDIR/usr/local/share/info/ is installed ++ ++ - Note that pre-built HTML doc in contrib/mom is installed even if ++ the tools needed to build html doc are not available. ++ ++ ++3.3 Build in presence of an non-GNU Troff installation ++ ++ - To simulate the existence of a non-GNU Troff, removed any existing ++ troff, and added a dummy troff script in /usr/bin/troff that ++ contains: ++ ++ #!/bin/sh ++ echo 0 ++ ++ and built groff as usuall. ++ ++ - Programs listed in prefixexecbin_PROGRAMS, scripts listed in ++ prefixecbin_SCRIPTS and man pages listed in PREFIXMAN1 are ++ correctly installed with a 'g' prefix. All targets (clean, ++ install/uninstall, distcheck) work as usual. No diff with the old ++ build system. ++ ++3.4 Build in presence of system tmac files ++ ++ - Create 3 dummy files in /usr/lib/tmac: tmac.an, tmac.m, tmac.s, ++ that all contain: ++ ++.if ++ ++ - Build and install as usual: ++ ++ -- $(DESTDIR)/usr/local/lib/groff/site-tmac/ contains 3 files: ++ an.tmac, m.tmac, s.tmac. ++ -- In $(DESTDIR)/usr/local/share/groff/1.22.3/tmac 6 files have a ++ 'g' prefix: gan.tmac, gm.tmac, gmm.tmac, gmmse.tmac, gmse.tmac, ++ gs.tmac. ++ ++3.5 Parallel build ++ ++ - Checked that usage of option -j when invoking `make' works correctly. ++ ++4. Notes ++-------- ++ ++ - Gnulib: some files of src/libs/libgroff could be replaced by their ++ gnulib equivalent ++ ++ - Gnulib: git-version-gen could be used +diff -Nuar groff-1.22.3.old/tmac/andoc.tmac groff-1.22.3/tmac/andoc.tmac +--- groff-1.22.3.old/tmac/andoc.tmac 2014-11-04 10:38:35.532520159 +0200 ++++ groff-1.22.3/tmac/andoc.tmac 2015-04-23 20:57:03.000000000 +0300 +@@ -34,35 +34,50 @@ + .als andoc-em em + .als andoc-bp bp + . +-.de1 reload-doc +-. ch an-header \" remove trap set by an-old.tmac +-. ch an-footer \" remove trap set by an-old.tmac +-. ch an-p-footer \" remove trap set by an-old.tmac +-. +-. als em andoc-em +-. als bp andoc-bp +-. rm Dd \" disable load-only-once, see doc.tmac + . +-. mso doc.tmac ++.\" We must not use `.de1' for `reload-doc' or `reload-man'! `doc.tmac' ++.\" unconditionally switches compatibility mode off, but `.de1' would ignore ++.\" this, restoring the mode that was active before. Similarly, we have to ++.\" switch back to the original compatibility mode for man documents in case ++.\" there is a mix of mdoc and man input files. ++.\" ++.\" Due to a bug in GNU troff it necessary to have a no-op line between ++.\" `.do' and `\*'. ++. ++. ++.de reload-doc ++. do ch an-header \" remove trap set by an-old.tmac ++. do ch an-footer \" remove trap set by an-old.tmac ++. do ch an-p-footer \" remove trap set by an-old.tmac ++. ++. do als em andoc-em ++. do als bp andoc-bp ++. do rm Dd \" disable load-only-once, see doc.tmac + . +-. als TH reload-man +-\\*[Dd]\\ ++. do mso doc.tmac ++. ++. do als TH reload-man ++. ++\\*(Dd\\ + .. + . +-.de1 reload-man +-. ch header \" remove trap set by doc.tmac +-. ch footer \" remove trap set by doc.tmac +-. +-. als em andoc-em +-. als bp andoc-bp +-. rm RI \" disable load-only-once, see an-old.tmac +-. blm \" no blank line macro +-. rm TH ++.de reload-man ++. do cp \n(.C \" restore original compatibility mode ++. ++. do ch header \" remove trap set by doc.tmac ++. do ch footer \" remove trap set by doc.tmac ++. ++. do als em andoc-em ++. do als bp andoc-bp ++. do rm RI \" disable load-only-once, see an-old.tmac ++. do blm \" no blank line macro ++. do rm TH ++. ++. do mso an-old.tmac + . +-. mso an-old.tmac ++. do als Dd reload-doc + . +-. als Dd reload-doc +-\\*[TH]\\ ++\\*(TH\\ + .. + . + .als TH reload-man +diff -Nuar groff-1.22.3.old/tmac/doc-common groff-1.22.3/tmac/doc-common +--- groff-1.22.3.old/tmac/doc-common 2014-11-04 10:38:35.533520146 +0200 ++++ groff-1.22.3/tmac/doc-common 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1376 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" Copyright (c) 1991, 1993 +-.\" The Regents of the University of California. All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms, with or without +-.\" modification, are permitted provided that the following conditions +-.\" are met: +-.\" 1. Redistributions of source code must retain the above copyright +-.\" notice, this list of conditions and the following disclaimer. +-.\" 2. Redistributions in binary form must reproduce the above copyright +-.\" notice, this list of conditions and the following disclaimer in the +-.\" documentation and/or other materials provided with the distribution. +-.\" 3. [Deleted. See +-.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] +-.\" 4. Neither the name of the University nor the names of its contributors +-.\" may be used to endorse or promote products derived from this software +-.\" without specific prior written permission. +-.\" +-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-.\" SUCH DAMAGE. +-.\" +-.\" @(#)doc-common 8.1 (Berkeley) 06/08/93 +-.\" +-.\" %beginstrip% +-. +-. +-.\" Macro Identifiers. For each user macro a corresponding register with +-.\" the same name must exist. Its value must not be zero. +-. +-.nr %A 1 +-.nr %B 1 +-.nr %C 1 +-.nr %D 1 +-.nr %I 1 +-.nr %J 1 +-.nr %N 1 +-.nr %O 1 +-.nr %P 1 +-.nr %Q 1 +-.nr %R 1 +-.nr %T 1 +-.nr %U 1 +-.nr %V 1 +-.nr Ac 3 +-.nr Ad 12n +-.nr An 12n +-.nr Ao 12n +-.nr Ap 2 +-.nr Aq 12n +-.nr Ar 12n +-.nr At 1 +-.nr Bc 3 +-.nr Bf 8n\" ? +-.nr Bk 8n\" ? +-.nr Bl 1 +-.nr Bo 12n +-.nr Bq 12n +-.nr Brc 3 +-.nr Bro 12n +-.nr Brq 12n +-.nr Bsx 1 +-.nr Bt 8n\" ? +-.nr Bx 1 +-.nr Cd 12n +-.nr Cm 10n +-.nr D1 8n\" ? +-.nr Dc 3 +-.nr Dl 8n\" ? +-.nr Dt 8n\" ? +-.nr Do 12n +-.nr Dq 12n +-.nr Ds 6n\" many manpages still use this as a -width value +-.nr Dv 12n +-.nr Dx 1 +-.nr Ec 3 +-.nr Ef 8n\" ? +-.nr Ek 8n\" ? +-.nr El 1 +-.nr Em 10n +-.nr En 12n +-.nr Eo 12n +-.nr Eq 12n +-.nr Er 17n +-.nr Es 12n +-.nr Ev 15n +-.nr Ex 1 +-.nr Fa 12n +-.nr Fc 3 +-.nr Fd 12n\" ? +-.nr Fl 10n +-.nr Fn 16n +-.nr Fo 16n +-.nr Fr 12n\" ? +-.nr Ft 8n\" ? +-.nr Fx 1 +-.nr Ic 10n +-.nr In 12n +-.nr It 8n\" ? +-.nr Lb 11n +-.nr Li 16n +-.nr Lk 6n\" ? +-.nr Lp 8n\" ? +-.nr Me 6n +-.nr Ms 6n +-.nr Mt 6n\" ? +-.nr Nd 8n\" ? +-.nr Nm 10n +-.nr No 12n +-.nr Ns 2 +-.nr Nx 1 +-.nr Oc 3 +-.nr Oo 10n +-.nr Op 14n +-.nr Os 6n\" ? +-.nr Ox 1 +-.nr Pa 32n +-.nr Pc 3 +-.nr Pf 12n +-.nr Po 12n +-.nr Pp 8n\" ? +-.nr Pq 12n +-.nr Qc 3 +-.nr Ql 16n +-.nr Qo 12n +-.nr Qq 12n +-.nr Rv 1 +-.nr Sc 3 +-.nr Sh 8n +-.nr Sm 8n\" ? +-.nr So 12n +-.nr Sq 12n +-.nr Ss 8n +-.nr St 8n\" ? +-.nr Sx 16n +-.nr Sy 6n +-.nr Ta 2 +-.nr Tn 10n +-.nr Ud 8n\" ? +-.nr Ux 1 +-.nr Va 12n +-.nr Vt 8n\" ? +-.nr Xc 3 +-.nr Xo 1 +-.nr Xr 10n +-. +-. +-.\" macros which must be processed after the closing delimiter of `Op' +-.\" and friends +-.ds doc-after-Ao +-.ds doc-after-Bo +-.ds doc-after-Bro +-.ds doc-after-Do +-.ds doc-after-Eo +-.ds doc-after-Fo +-.ds doc-after-Ns +-.ds doc-after-Oo +-.ds doc-after-Po +-.ds doc-after-Qo +-.ds doc-after-So +-.ds doc-after-Xo +-. +-. +-.nr doc-display-indent 6n +-. +-. +-.\" space strings +-. +-.ds doc-soft-space " \" +-.ds doc-hard-space \~ +-.ds doc-tab \t +-. +-. +-.eo +-. +-. +-.\" punctuation values (suffix=3, prefix=4) +-. +-.nr doc-punct. 3 +-.nr doc-punct, 3 +-.nr doc-punct: 3 +-.nr doc-punct; 3 +-.nr doc-punct( 4 +-.nr doc-punct) 3 +-.nr doc-punct[ 4 +-.nr doc-punct] 3 +-.nr doc-punct? 3 +-.nr doc-punct! 3 +-. +-. +-.\" header assembly macros +-. +-.\" NS doc-document-title global string +-.\" NS the title of the manual page +-. +-.ds doc-document-title UNTITLED +-. +-. +-.\" NS doc-volume global string +-.\" NS the volume where the manual page belongs to +-. +-.ds doc-volume LOCAL +-. +-. +-.\" NS doc-section global string +-.\" NS the manual section +-. +-.ds doc-section Null +-. +-. +-.\" NS Dt user macro (not parsed, not callable) +-.\" NS document title +-.\" NS +-.\" NS modifies: +-.\" NS doc-document-title +-.\" NS doc-section +-.\" NS doc-volume +-.\" NS doc-command-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-volume-as-XXX +-.\" NS doc-volume-ds-XXX +-.\" NS +-.\" NS width register `Dt' set above +-. +-.\" an alternative, more detailed scheme for naming the manual sections +-.\" +-.ds doc-volume-operating-system BSD +-.nr doc-volume-operating-system-ateol 0 +-.ds doc-volume-ds-1 General Commands Manual +-.ds doc-volume-ds-2 System Calls Manual +-.ds doc-volume-ds-3 Library Functions Manual +-.ds doc-volume-ds-4 Kernel Interfaces Manual +-.ds doc-volume-ds-5 File Formats Manual +-.ds doc-volume-ds-6 Games Manual +-.ds doc-volume-ds-7 Miscellaneous Information Manual +-.ds doc-volume-ds-8 System Manager's Manual +-.ds doc-volume-ds-9 Kernel Developer's Manual +-. +-.ds doc-volume-ds-USD User's Supplementary Documents +-.ds doc-volume-ds-PS1 Programmer's Supplementary Documents +-.ds doc-volume-ds-AMD Ancestral Manual Documents +-.ds doc-volume-ds-SMM System Manager's Manual +-.ds doc-volume-ds-URM User's Reference Manual +-.ds doc-volume-ds-PRM Programmer's Manual +-.ds doc-volume-ds-KM Kernel Manual +-.ds doc-volume-ds-IND Manual Master Index +-.ds doc-volume-ds-LOCAL Local Manual +-.ds doc-volume-ds-CON Contributed Software Manual +-. +-.als doc-volume-ds-MMI doc-volume-ds-IND +-.als doc-volume-ds-LOC doc-volume-ds-LOCAL +-. +-.ds doc-volume-as-alpha alpha +-.als doc-volume-as-Alpha doc-volume-as-alpha +-.ds doc-volume-as-acorn26 acorn26 +-.ds doc-volume-as-acorn32 acorn32 +-.ds doc-volume-as-algor algor +-.ds doc-volume-as-amd64 amd64 +-.ds doc-volume-as-amiga amiga +-.ds doc-volume-as-amigappc amigappc +-.ds doc-volume-as-arc arc +-.ds doc-volume-as-arm arm +-.ds doc-volume-as-arm26 arm26 +-.ds doc-volume-as-arm32 arm32 +-.ds doc-volume-as-armish armish +-.ds doc-volume-as-atari atari +-.ds doc-volume-as-aviion aviion +-.ds doc-volume-as-beagle beagle +-.ds doc-volume-as-bebox bebox +-.ds doc-volume-as-cats cats +-.ds doc-volume-as-cesfic cesfic +-.ds doc-volume-as-cobalt cobalt +-.ds doc-volume-as-dreamcast dreamcast +-.ds doc-volume-as-emips emips +-.ds doc-volume-as-evbarm evbarm +-.ds doc-volume-as-evbmips evbmips +-.ds doc-volume-as-evbppc evbppc +-.ds doc-volume-as-evbsh3 evbsh3 +-.ds doc-volume-as-ews4800mips ews4800mips +-.ds doc-volume-as-hp300 hp300 +-.ds doc-volume-as-hp700 hp700 +-.ds doc-volume-as-hpcarm hpcarm +-.ds doc-volume-as-hpcmips hpcmips +-.ds doc-volume-as-hpcsh hpcsh +-.ds doc-volume-as-hppa hppa +-.ds doc-volume-as-hppa64 hppa64 +-.ds doc-volume-as-i386 i386 +-.ds doc-volume-as-ia64 ia64 +-.ds doc-volume-as-ibmnws ibmnws +-.ds doc-volume-as-iyonix iyonix +-.ds doc-volume-as-landisk landisk +-.ds doc-volume-as-loongson loongson +-.ds doc-volume-as-luna68k luna68k +-.ds doc-volume-as-luna88k luna88k +-.ds doc-volume-as-m68k m68k +-.ds doc-volume-as-mac68k mac68k +-.ds doc-volume-as-macppc macppc +-.ds doc-volume-as-mips mips +-.ds doc-volume-as-mips64 mips64 +-.ds doc-volume-as-mipsco mipsco +-.ds doc-volume-as-mmeye mmeye +-.ds doc-volume-as-mvme68k mvme68k +-.ds doc-volume-as-mvme88k mvme88k +-.ds doc-volume-as-mvmeppc mvmeppc +-.ds doc-volume-as-netwinder netwinder +-.ds doc-volume-as-news68k news68k +-.ds doc-volume-as-newsmips newsmips +-.ds doc-volume-as-next68k next68k +-.ds doc-volume-as-ofppc ofppc +-.ds doc-volume-as-palm palm +-.ds doc-volume-as-pc532 pc532 +-.ds doc-volume-as-playstation2 playstation2 +-.ds doc-volume-as-pmax pmax +-.ds doc-volume-as-pmppc pmppc +-.ds doc-volume-as-powerpc powerpc +-.ds doc-volume-as-prep prep +-.ds doc-volume-as-rs6000 rs6000 +-.ds doc-volume-as-sandpoint sandpoint +-.ds doc-volume-as-sbmips sbmips +-.ds doc-volume-as-sgi sgi +-.ds doc-volume-as-sgimips sgimips +-.ds doc-volume-as-sh3 sh3 +-.ds doc-volume-as-shark shark +-.ds doc-volume-as-socppc socppc +-.ds doc-volume-as-solbourne solbourne +-.ds doc-volume-as-sparc sparc +-.ds doc-volume-as-sparc64 sparc64 +-.ds doc-volume-as-sun2 sun2 +-.ds doc-volume-as-sun3 sun3 +-.ds doc-volume-as-tahoe tahoe +-.ds doc-volume-as-vax vax +-.ds doc-volume-as-x68k x68k +-.ds doc-volume-as-x86_64 x86_64 +-.ds doc-volume-as-xen xen +-.ds doc-volume-as-zaurus zaurus +-. +-.de Dt +-. \" reset default arguments +-. ds doc-document-title UNTITLED +-. ds doc-volume LOCAL +-. ds doc-section Null +-. ds doc-command-name +-. +-. if !"\$1"" \ +-. ds doc-document-title "\$1 +-. +-. if !"\$2"" \{\ +-. ds doc-section \$2 +-. ie \B\$2 \{\ +-. if ((\$2 >= 1) & (\$2 <= 9)) \{\ +-. ie \n[doc-volume-operating-system-ateol] \{\ +-. ds doc-volume "\*[doc-volume-ds-\$2] \*[doc-volume-operating-system] +-. if \A\$3 \{\ +-. if d doc-volume-as-\$3 \ +-. as doc-volume "/\*[doc-volume-as-\$3] +-. \}\} +-. el \{\ +-. ds doc-volume "\*[doc-volume-operating-system] +-. if \A\$3 \{\ +-. if d doc-volume-as-\$3 \ +-. as doc-volume "/\*[doc-volume-as-\$3] +-. \} +-. as doc-volume " \*[doc-volume-ds-\$2] +-. \}\}\} +-. el \{\ +-. ie "\$2"unass" \ +-. ds doc-volume DRAFT +-. el \{ .ie "\$2"draft" \ +-. ds doc-volume DRAFT +-. el .if "\$2"paper" \ +-. ds doc-volume UNTITLED +-. \}\} +-. if \A\$3 \{\ +-. if d doc-volume-ds-\$3 \ +-. ds doc-volume "\*[doc-volume-ds-\$3] +-. \}\}\} +-. +-. if !"\$3"" \ +-. if "\*[doc-volume]"LOCAL" \ +-. ds doc-volume \$3 +-. +-. if !\n[cR] \ +-. if \n[nl] \{\ +- . doc-setup-header +-. bp +-. \} +-.. +-. +-. +-.\" NS doc-default-operating-system global string +-.\" NS the exact (default) version of the operating system +-.\" NS +-.\" NS override this in `mdoc.local', if necessary +-. +-.ds doc-default-operating-system BSD +-. +-. +-.\" NS doc-operating-system global string +-.\" NS the exact version of the operating system +-. +-.ds doc-operating-system +-. +-. +-.\" NS Os user macro (not parsed, not callable) +-.\" NS operating system +-.\" NS +-.\" NS modifies: +-.\" NS doc-operating-system +-.\" NS doc-command-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-operating-system-XXX-XXX +-.\" NS +-.\" NS width register `Os' set above +-. +-.ds doc-operating-system-ATT-7 7th\~Edition +-.als doc-operating-system-ATT-7th doc-operating-system-ATT-7 +-.ds doc-operating-system-ATT-3 System\~III +-.als doc-operating-system-ATT-III doc-operating-system-ATT-3 +-.ds doc-operating-system-ATT-V System\~V +-.ds doc-operating-system-ATT-V.2 System\~V Release\~2 +-.ds doc-operating-system-ATT-V.3 System\~V Release\~3 +-.ds doc-operating-system-ATT-V.4 System\~V Release\~4 +-. +-.ds doc-operating-system-BSD-3 3rd\~Berkeley Distribution +-.ds doc-operating-system-BSD-4 4th\~Berkeley Distribution +-.ds doc-operating-system-BSD-4.1 4.1\~Berkeley Distribution +-.ds doc-operating-system-BSD-4.2 4.2\~Berkeley Distribution +-.ds doc-operating-system-BSD-4.3 4.3\~Berkeley Distribution +-.ds doc-operating-system-BSD-4.3T 4.3-Tahoe Berkeley Distribution +-.ds doc-operating-system-BSD-4.3R 4.3-Reno Berkeley Distribution +-.als doc-operating-system-BSD-4.3t doc-operating-system-BSD-4.3T +-.als doc-operating-system-BSD-4.3r doc-operating-system-BSD-4.3R +-.ds doc-operating-system-BSD-4.4 4.4BSD +-. +-.ds doc-operating-system-NetBSD-0.8 0.8 +-.ds doc-operating-system-NetBSD-0.8a 0.8A +-.ds doc-operating-system-NetBSD-0.9 0.9 +-.ds doc-operating-system-NetBSD-0.9a 0.9A +-.ds doc-operating-system-NetBSD-1.0 1.0 +-.ds doc-operating-system-NetBSD-1.0a 1.0A +-.ds doc-operating-system-NetBSD-1.1 1.1 +-.ds doc-operating-system-NetBSD-1.2 1.2 +-.ds doc-operating-system-NetBSD-1.2a 1.2A +-.ds doc-operating-system-NetBSD-1.2b 1.2B +-.ds doc-operating-system-NetBSD-1.2c 1.2C +-.ds doc-operating-system-NetBSD-1.2d 1.2D +-.ds doc-operating-system-NetBSD-1.2e 1.2E +-.ds doc-operating-system-NetBSD-1.3 1.3 +-.ds doc-operating-system-NetBSD-1.3a 1.3A +-.ds doc-operating-system-NetBSD-1.4 1.4 +-.ds doc-operating-system-NetBSD-1.4.1 1.4.1 +-.ds doc-operating-system-NetBSD-1.4.2 1.4.2 +-.ds doc-operating-system-NetBSD-1.4.3 1.4.3 +-.ds doc-operating-system-NetBSD-1.5 1.5 +-.ds doc-operating-system-NetBSD-1.5.1 1.5.1 +-.ds doc-operating-system-NetBSD-1.5.2 1.5.2 +-.ds doc-operating-system-NetBSD-1.5.3 1.5.3 +-.ds doc-operating-system-NetBSD-1.6 1.6 +-.ds doc-operating-system-NetBSD-1.6.1 1.6.1 +-.ds doc-operating-system-NetBSD-1.6.2 1.6.2 +-.ds doc-operating-system-NetBSD-1.6.3 1.6.3 +-.ds doc-operating-system-NetBSD-2.0 2.0 +-.ds doc-operating-system-NetBSD-2.0.1 2.0.1 +-.ds doc-operating-system-NetBSD-2.0.2 2.0.2 +-.ds doc-operating-system-NetBSD-2.0.3 2.0.3 +-.ds doc-operating-system-NetBSD-2.1 2.1 +-.ds doc-operating-system-NetBSD-3.0 3.0 +-.ds doc-operating-system-NetBSD-3.0.1 3.0.1 +-.ds doc-operating-system-NetBSD-3.0.2 3.0.2 +-.ds doc-operating-system-NetBSD-3.0.3 3.0.3 +-.ds doc-operating-system-NetBSD-3.1 3.1 +-.ds doc-operating-system-NetBSD-3.1.1 3.1.1 +-.ds doc-operating-system-NetBSD-4.0 4.0 +-.ds doc-operating-system-NetBSD-4.0.1 4.0.1 +-.ds doc-operating-system-NetBSD-5.0 5.0 +-.ds doc-operating-system-NetBSD-5.0.1 5.0.1 +-.ds doc-operating-system-NetBSD-5.0.2 5.0.2 +-.ds doc-operating-system-NetBSD-5.1 5.1 +-.ds doc-operating-system-NetBSD-5.1.2 5.1.2 +-.ds doc-operating-system-NetBSD-5.1.3 5.1.3 +-.ds doc-operating-system-NetBSD-5.1.4 5.1.4 +-.ds doc-operating-system-NetBSD-5.2 5.2 +-.ds doc-operating-system-NetBSD-5.2.1 5.2.1 +-.ds doc-operating-system-NetBSD-5.2.2 5.2.2 +-.ds doc-operating-system-NetBSD-6.0 6.0 +-.ds doc-operating-system-NetBSD-6.0.1 6.0.1 +-.ds doc-operating-system-NetBSD-6.0.2 6.0.2 +-.ds doc-operating-system-NetBSD-6.0.3 6.0.3 +-.ds doc-operating-system-NetBSD-6.0.4 6.0.4 +-.ds doc-operating-system-NetBSD-6.0.5 6.0.5 +-.ds doc-operating-system-NetBSD-6.1 6.1 +-.ds doc-operating-system-NetBSD-6.1.1 6.1.1 +-.ds doc-operating-system-NetBSD-6.1.2 6.1.2 +-.ds doc-operating-system-NetBSD-6.1.3 6.1.3 +-.ds doc-operating-system-NetBSD-6.1.4 6.1.4 +-. +-.ds doc-operating-system-OpenBSD-2.0 2.0 +-.ds doc-operating-system-OpenBSD-2.1 2.1 +-.ds doc-operating-system-OpenBSD-2.2 2.2 +-.ds doc-operating-system-OpenBSD-2.3 2.3 +-.ds doc-operating-system-OpenBSD-2.4 2.4 +-.ds doc-operating-system-OpenBSD-2.5 2.5 +-.ds doc-operating-system-OpenBSD-2.6 2.6 +-.ds doc-operating-system-OpenBSD-2.7 2.7 +-.ds doc-operating-system-OpenBSD-2.8 2.8 +-.ds doc-operating-system-OpenBSD-2.9 2.9 +-.ds doc-operating-system-OpenBSD-3.0 3.0 +-.ds doc-operating-system-OpenBSD-3.1 3.1 +-.ds doc-operating-system-OpenBSD-3.2 3.2 +-.ds doc-operating-system-OpenBSD-3.3 3.3 +-.ds doc-operating-system-OpenBSD-3.4 3.4 +-.ds doc-operating-system-OpenBSD-3.5 3.5 +-.ds doc-operating-system-OpenBSD-3.6 3.6 +-.ds doc-operating-system-OpenBSD-3.7 3.7 +-.ds doc-operating-system-OpenBSD-3.8 3.8 +-.ds doc-operating-system-OpenBSD-3.9 3.9 +-.ds doc-operating-system-OpenBSD-4.0 4.0 +-.ds doc-operating-system-OpenBSD-4.1 4.1 +-.ds doc-operating-system-OpenBSD-4.2 4.2 +-.ds doc-operating-system-OpenBSD-4.3 4.3 +-.ds doc-operating-system-OpenBSD-4.4 4.4 +-.ds doc-operating-system-OpenBSD-4.5 4.5 +-.ds doc-operating-system-OpenBSD-4.6 4.6 +-.ds doc-operating-system-OpenBSD-4.7 4.7 +-.ds doc-operating-system-OpenBSD-4.8 4.8 +-.ds doc-operating-system-OpenBSD-4.9 4.9 +-.ds doc-operating-system-OpenBSD-5.0 5.0 +-.ds doc-operating-system-OpenBSD-5.1 5.1 +-.ds doc-operating-system-OpenBSD-5.2 5.2 +-.ds doc-operating-system-OpenBSD-5.3 5.3 +-.ds doc-operating-system-OpenBSD-5.4 5.4 +-.ds doc-operating-system-OpenBSD-5.5 5.5 +-.ds doc-operating-system-OpenBSD-5.6 5.6 +-. +-.ds doc-operating-system-FreeBSD-1.0 1.0 +-.ds doc-operating-system-FreeBSD-1.1 1.1 +-.ds doc-operating-system-FreeBSD-1.1.5 1.1.5 +-.ds doc-operating-system-FreeBSD-1.1.5.1 1.1.5.1 +-.ds doc-operating-system-FreeBSD-2.0 2.0 +-.ds doc-operating-system-FreeBSD-2.0.5 2.0.5 +-.ds doc-operating-system-FreeBSD-2.1 2.1 +-.ds doc-operating-system-FreeBSD-2.1.5 2.1.5 +-.ds doc-operating-system-FreeBSD-2.1.6 2.1.6 +-.ds doc-operating-system-FreeBSD-2.1.7 2.1.7 +-.ds doc-operating-system-FreeBSD-2.2 2.2 +-.ds doc-operating-system-FreeBSD-2.2.1 2.2.1 +-.ds doc-operating-system-FreeBSD-2.2.2 2.2.2 +-.ds doc-operating-system-FreeBSD-2.2.5 2.2.5 +-.ds doc-operating-system-FreeBSD-2.2.6 2.2.6 +-.ds doc-operating-system-FreeBSD-2.2.7 2.2.7 +-.ds doc-operating-system-FreeBSD-2.2.8 2.2.8 +-.ds doc-operating-system-FreeBSD-2.2.9 2.2.9 +-.ds doc-operating-system-FreeBSD-3.0 3.0 +-.ds doc-operating-system-FreeBSD-3.1 3.1 +-.ds doc-operating-system-FreeBSD-3.2 3.2 +-.ds doc-operating-system-FreeBSD-3.3 3.3 +-.ds doc-operating-system-FreeBSD-3.4 3.4 +-.ds doc-operating-system-FreeBSD-3.5 3.5 +-.ds doc-operating-system-FreeBSD-4.0 4.0 +-.ds doc-operating-system-FreeBSD-4.1 4.1 +-.ds doc-operating-system-FreeBSD-4.1.1 4.1.1 +-.ds doc-operating-system-FreeBSD-4.2 4.2 +-.ds doc-operating-system-FreeBSD-4.3 4.3 +-.ds doc-operating-system-FreeBSD-4.4 4.4 +-.ds doc-operating-system-FreeBSD-4.5 4.5 +-.ds doc-operating-system-FreeBSD-4.6 4.6 +-.ds doc-operating-system-FreeBSD-4.6.2 4.6.2 +-.ds doc-operating-system-FreeBSD-4.7 4.7 +-.ds doc-operating-system-FreeBSD-4.8 4.8 +-.ds doc-operating-system-FreeBSD-4.9 4.9 +-.ds doc-operating-system-FreeBSD-4.10 4.10 +-.ds doc-operating-system-FreeBSD-4.11 4.11 +-.ds doc-operating-system-FreeBSD-5.0 5.0 +-.ds doc-operating-system-FreeBSD-5.1 5.1 +-.ds doc-operating-system-FreeBSD-5.2 5.2 +-.ds doc-operating-system-FreeBSD-5.2.1 5.2.1 +-.ds doc-operating-system-FreeBSD-5.3 5.3 +-.ds doc-operating-system-FreeBSD-5.4 5.4 +-.ds doc-operating-system-FreeBSD-5.5 5.5 +-.ds doc-operating-system-FreeBSD-6.0 6.0 +-.ds doc-operating-system-FreeBSD-6.1 6.1 +-.ds doc-operating-system-FreeBSD-6.2 6.2 +-.ds doc-operating-system-FreeBSD-6.3 6.3 +-.ds doc-operating-system-FreeBSD-6.4 6.4 +-.ds doc-operating-system-FreeBSD-7.0 7.0 +-.ds doc-operating-system-FreeBSD-7.1 7.1 +-.ds doc-operating-system-FreeBSD-7.2 7.2 +-.ds doc-operating-system-FreeBSD-7.3 7.3 +-.ds doc-operating-system-FreeBSD-7.4 7.4 +-.ds doc-operating-system-FreeBSD-8.0 8.0 +-.ds doc-operating-system-FreeBSD-8.1 8.1 +-.ds doc-operating-system-FreeBSD-8.2 8.2 +-.ds doc-operating-system-FreeBSD-8.3 8.3 +-.ds doc-operating-system-FreeBSD-8.4 8.4 +-.ds doc-operating-system-FreeBSD-9.0 9.0 +-.ds doc-operating-system-FreeBSD-9.1 9.1 +-.ds doc-operating-system-FreeBSD-9.2 9.2 +-.ds doc-operating-system-FreeBSD-9.3 9.3 +-.ds doc-operating-system-FreeBSD-10.0 10.0 +-. +-.ds doc-operating-system-Darwin-8.0.0 8.0.0 +-.ds doc-operating-system-Darwin-8.1.0 8.1.0 +-.ds doc-operating-system-Darwin-8.2.0 8.2.0 +-.ds doc-operating-system-Darwin-8.3.0 8.3.0 +-.ds doc-operating-system-Darwin-8.4.0 8.4.0 +-.ds doc-operating-system-Darwin-8.5.0 8.5.0 +-.ds doc-operating-system-Darwin-8.6.0 8.6.0 +-.ds doc-operating-system-Darwin-8.7.0 8.7.0 +-.ds doc-operating-system-Darwin-8.8.0 8.8.0 +-.ds doc-operating-system-Darwin-8.9.0 8.9.0 +-.ds doc-operating-system-Darwin-8.10.0 8.10.0 +-.ds doc-operating-system-Darwin-8.11.0 8.11.0 +-.ds doc-operating-system-Darwin-9.0.0 9.0.0 +-.ds doc-operating-system-Darwin-9.1.0 9.1.0 +-.ds doc-operating-system-Darwin-9.2.0 9.2.0 +-.ds doc-operating-system-Darwin-9.3.0 9.3.0 +-.ds doc-operating-system-Darwin-9.4.0 9.4.0 +-.ds doc-operating-system-Darwin-9.5.0 9.5.0 +-.ds doc-operating-system-Darwin-9.6.0 9.6.0 +-.ds doc-operating-system-Darwin-9.7.0 9.7.0 +-.ds doc-operating-system-Darwin-9.8.0 9.8.0 +-.ds doc-operating-system-Darwin-10.0.0 10.0.0 +-.ds doc-operating-system-Darwin-10.1.0 10.1.0 +-.ds doc-operating-system-Darwin-10.2.0 10.2.0 +-.ds doc-operating-system-Darwin-10.3.0 10.3.0 +-.ds doc-operating-system-Darwin-10.4.0 10.4.0 +-.ds doc-operating-system-Darwin-10.5.0 10.5.0 +-.ds doc-operating-system-Darwin-10.6.0 10.6.0 +-.ds doc-operating-system-Darwin-10.7.0 10.7.0 +-.ds doc-operating-system-Darwin-10.8.0 10.8.0 +-.ds doc-operating-system-Darwin-11.0.0 11.0.0 +-.ds doc-operating-system-Darwin-11.1.0 11.1.0 +-.ds doc-operating-system-Darwin-11.2.0 11.2.0 +-.ds doc-operating-system-Darwin-11.3.0 11.3.0 +-.ds doc-operating-system-Darwin-11.4.0 11.4.0 +-.ds doc-operating-system-Darwin-11.5.0 11.5.0 +-.ds doc-operating-system-Darwin-12.0.0 12.0.0 +-.ds doc-operating-system-Darwin-12.1.0 12.1.0 +-.ds doc-operating-system-Darwin-12.2.0 12.2.0 +-.ds doc-operating-system-Darwin-13.0.0 13.0.0 +-.ds doc-operating-system-Darwin-13.1.0 13.1.0 +-.ds doc-operating-system-Darwin-13.2.0 13.2.0 +-.ds doc-operating-system-Darwin-13.3.0 13.3.0 +-.ds doc-operating-system-Darwin-13.4.0 13.4.0 +-.ds doc-operating-system-Darwin-14.0.0 14.0.0 +-. +-.ds doc-operating-system-DragonFly-1.0 1.0 +-.ds doc-operating-system-DragonFly-1.1 1.1 +-.ds doc-operating-system-DragonFly-1.2 1.2 +-.ds doc-operating-system-DragonFly-1.3 1.3 +-.ds doc-operating-system-DragonFly-1.4 1.4 +-.ds doc-operating-system-DragonFly-1.5 1.5 +-.ds doc-operating-system-DragonFly-1.6 1.6 +-.ds doc-operating-system-DragonFly-1.7 1.7 +-.ds doc-operating-system-DragonFly-1.8 1.8 +-.ds doc-operating-system-DragonFly-1.8.1 1.8.1 +-.ds doc-operating-system-DragonFly-1.9 1.9 +-.ds doc-operating-system-DragonFly-1.10 1.10 +-.ds doc-operating-system-DragonFly-1.11 1.11 +-.ds doc-operating-system-DragonFly-1.12 1.12 +-.ds doc-operating-system-DragonFly-1.12.2 1.12.2 +-.ds doc-operating-system-DragonFly-1.13 1.13 +-.ds doc-operating-system-DragonFly-2.0 2.0 +-.ds doc-operating-system-DragonFly-2.1 2.1 +-.ds doc-operating-system-DragonFly-2.2 2.2 +-.ds doc-operating-system-DragonFly-2.3 2.3 +-.ds doc-operating-system-DragonFly-2.4 2.4 +-.ds doc-operating-system-DragonFly-2.5 2.5 +-.ds doc-operating-system-DragonFly-2.6 2.6 +-.ds doc-operating-system-DragonFly-2.7 2.7 +-.ds doc-operating-system-DragonFly-2.8 2.8 +-.ds doc-operating-system-DragonFly-2.9 2.9 +-.ds doc-operating-system-DragonFly-2.9.1 2.9.1 +-.ds doc-operating-system-DragonFly-2.10 2.10 +-.ds doc-operating-system-DragonFly-2.10.1 2.10.1 +-.ds doc-operating-system-DragonFly-2.11 2.11 +-.ds doc-operating-system-DragonFly-2.12 2.12 +-.ds doc-operating-system-DragonFly-2.13 2.13 +-.ds doc-operating-system-DragonFly-3.0 3.0 +-.ds doc-operating-system-DragonFly-3.1 3.1 +-.ds doc-operating-system-DragonFly-3.2 3.2 +-.ds doc-operating-system-DragonFly-3.3 3.3 +-.ds doc-operating-system-DragonFly-3.4 3.4 +-.ds doc-operating-system-DragonFly-3.5 3.5 +-.ds doc-operating-system-DragonFly-3.6 3.6 +-.ds doc-operating-system-DragonFly-3.7 3.7 +-.ds doc-operating-system-DragonFly-3.8 3.8 +-. +-.de Os +-. ds doc-command-name +-. +-. ie "\$1"" \ +-. ds doc-operating-system "\*[doc-default-operating-system] +-. el \{ .ie "\$1"ATT" \{\ +-. ds doc-operating-system AT&T +-. if \A\$2 \{\ +-. ie d doc-operating-system-ATT-\$2 \ +-. as doc-operating-system " \*[doc-operating-system-ATT-\$2] +-. el \ +-. as doc-operating-system " UNIX +-. \}\} +-. el \{ .ie "\$1"BSD" \{\ +-. if \A\$2 \{\ +-. ie d doc-operating-system-BSD-\$2 \ +-. ds doc-operating-system "\*[doc-operating-system-BSD-\$2] +-. el \ +-. tm mdoc warning: .Os: Unknown BSD version `\$2' (#\n[.c]) +-. \}\} +-. el \{ .ie "\$1"FreeBSD" \{\ +-. ds doc-operating-system FreeBSD +-. if \A\$2 \{\ +-. ie d doc-operating-system-FreeBSD-\$2 \ +-. as doc-operating-system \~\*[doc-operating-system-FreeBSD-\$2] +-. el \ +-. tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c]) +-. \}\} +-. el \{ .ie "\$1"DragonFly" \{\ +-. ds doc-operating-system DragonFly +-. if \A\$2 \{\ +-. ie d doc-operating-system-DragonFly-\$2 \ +-. as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2] +-. el \ +-. tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c]) +-. \}\} +-. el \{ .ie "\$1"NetBSD" \{\ +-. ds doc-operating-system NetBSD +-. if \A\$2 \{\ +-. ie d doc-operating-system-NetBSD-\$2 \ +-. as doc-operating-system \~\*[doc-operating-system-NetBSD-\$2] +-. el \ +-. tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c]) +-. \}\} +-. el \{ .ie "\$1"OpenBSD" \{\ +-. ds doc-operating-system OpenBSD +-. if \A\$2 \{\ +-. ie d doc-operating-system-OpenBSD-\$2 \ +-. as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2] +-. el \ +-. tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c]) +-. \}\} +-. el \{ .ie "\$1"Darwin" \{\ +-. ds doc-operating-system Darwin +-. if \A\$2 \{\ +-. ie d doc-operating-system-Darwin-\$2 \ +-. as doc-operating-system \~\*[doc-operating-system-Darwin-\$2] +-. el \ +-. tm mdoc warning: .Os: Unknown Darwin version `\$2' (#\n[.c]) +-. \}\} +-. el \{\ +-. ds doc-operating-system \$1 +-. if !"\$2"" \ +-. as doc-operating-system " \$2 +-. \}\}\}\}\}\}\}\} +-.. +-. +-. +-.\" NS doc-date-string global string +-.\" NS the manual page date as set by `Dd' +-. +-.ds doc-date-string +-. +-. +-.\" NS Dd user macro (not parsed, not callable) +-.\" NS set document date +-.\" NS +-.\" NS modifies: +-.\" NS doc-date-string +-.\" NS doc-command-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-date-XXX +-.\" NS +-.\" NS width register `Dd' set above +-. +-.ds doc-date-1 January +-.ds doc-date-2 February +-.ds doc-date-3 March +-.ds doc-date-4 April +-.ds doc-date-5 May +-.ds doc-date-6 June +-.ds doc-date-7 July +-.ds doc-date-8 August +-.ds doc-date-9 September +-.ds doc-date-10 October +-.ds doc-date-11 November +-.ds doc-date-12 December +-. +-.de Dd +-. ds doc-command-name +-. +-. ie \n[.$] \{\ +-. ie "\$1"$Mdocdate:" \ +-. ds doc-date-string \$2\~\$3, \$4 +-. el .ie (\n[.$] == 3) \ +-. ds doc-date-string \$1\~\$2 \$3 +-. el \{\ +-. ds doc-date-string "\*[doc-date-\n[mo]] +-. as doc-date-string \~\n[dy], \n[year] +-. \} +-. \} +-. el \ +-. ds doc-date-string Epoch +-.. +-. +-. +-.\" NS doc-hyphen-flags global register +-.\" NS the parameter for the `.hy' request +-.\" NS +-.\" NS override this in `mdoc.local', if necessary. +-. +-.nr doc-hyphen-flags 12 +-. +-. +-.\" NS doc-header macro +-.\" NS print page header +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dh +-.\" NS doc-reg-dh1 +-. +-.de doc-header +-. ev doc-env-dh +-. doc-setup-page-layout +-. if !\n[cR] \ +-. sp \n[doc-header-space]u +-. nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[]' +-. nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[]' +-. if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\ +-. while (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\ +-. substring doc-header-string 0 -2 +-. nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\|.\|.\|.\f[]' +-. \} +-. as doc-header-string "\|.\|.\|. +-. \} +-. tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] +-. ie !\n[cR] \ +-. sp \n[doc-header-space]u +-. el \ +-. sp 1v +-. ev +-. ns +-.. +-. +-. +-.\" NS doc-footer macro +-.\" NS print page footer +-. +-.de doc-footer +-. ie \n[cR] \ +-. br +-. el \{\ +-. ev doc-caption-enviroment +-. doc-setup-page-layout +-. sp \n[doc-footer-space]u +-. ie \n[D] \{\ +-. ie o \ +-. tl %\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[] +-. el \ +-. tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]% +-. \} +-. el \ +-. tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]% +-. bp +-. ev +-. \} +-.. +-. +-. +-.\" NS doc-check-depth macro +-.\" NS check paired macros +-. +-.de doc-check-depth +-. if \n[doc-list-depth] \{\ +-. tm mdoc warning: A .Bl directive has no matching .El (#\n[.c]) +-. nr doc-list-depth 0 +-. \} +-. if \n[doc-display-depth] \{\ +-. tm mdoc warning: A .Bd directive has no matching .Ed (#\n[.c]) +-. nr doc-display-depth 0 +-. \} +-. if \n[doc-fontmode-depth] \{\ +-. tm mdoc warning: A .Bf directive has no matching .Ef (#\n[.c]) +-. nr doc-fontmode-depth 0 +-. \} +-.. +-. +-. +-.\" NS doc-end-macro macro +-.\" NS finish output +-. +-.de doc-end-macro +-. \" We may still have a partial line in the environment. If this is the +-. \" case, and we happen to be on the last line of the page, the `.fl' +-. \" request will cause the page to be ejected and troff will immediately +-. \" exit. If we are in nroff mode, this would be unfortunate, since we +-. \" would never get a chance to output the footer. So we fudge the page +-. \" length to make sure that the last page is never ejected until we want +-. \" it to be. +-. +-. if \n[cR] \ +-. pl +3v +-. fl +-. +-. doc-check-depth +-. +-. if \n[cR] \{\ +-. sp +-. tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[] +-. \" suppress empty lines after the footer +-. pl \n[nl]u +-. \} +-.. +-. +-. +-.\" NS doc-paragraph macro +-.\" NS insert a paragraph +-. +-.de doc-paragraph +-. sp \n[doc-paragraph-space]u +-. if !\n[cR] \ +-. ne 2 +-. ns +-.. +-. +-. +-.\" NS Pp user macro (not parsed, not callable) +-.\" NS new paragraph +-.\" NS +-.\" NS width register `Pp' set above +-. +-.als Pp doc-paragraph +-. +-. +-.\" NS Lp user macro (not parsed, not callable) +-.\" NS same as .Pp +-.\" NS +-.\" NS width register `Lp' set above +-. +-.als Lp doc-paragraph +-. +-. +-.de LP +-. tm Not a \-mdoc command: .LP (#\n[.c]) +-.. +-. +-. +-.de PP +-. tm Not a \-mdoc command: .PP (#\n[.c]) +-.. +-. +-. +-.de pp +-. tm Not a \-mdoc command: .pp (#\n[.c]) +-.. +-. +-. +-.de SH +-. tm Not a \-mdoc command: .SH (#\n[.c]) +-.. +-. +-. +-.\" NS Nd user macro (not parsed, not callable) +-.\" NS print name description +-.\" NS +-.\" NS width register `Nd' set above +-. +-.de Nd +-. nop \[em] \$* +-.. +-. +-. +-.\" NS doc-in-synopsis-section global register (bool) +-.\" NS whether we are in the `synopsis' section +-. +-.nr doc-in-synopsis-section 0 +-. +-. +-.\" NS doc-in-library-section global register (bool) +-.\" NS whether we are in the `library' section +-. +-.nr doc-in-library-section 0 +-. +-. +-.\" NS doc-in-see-also-section global register (bool) +-.\" NS whether we are in the `see also' section +-. +-.nr doc-in-see-also-section 0 +-. +-. +-.\" NS doc-in-files-section global register (bool) +-.\" NS whether we are in the `files' section +-. +-.nr doc-in-files-section 0 +-. +-. +-.\" NS doc-in-authors-section global register (bool) +-.\" NS whether we are in the `authors' section +-. +-.nr doc-in-authors-section 0 +-. +-. +-.\" NS doc-first-parameter macro +-.\" NS return first parameter +-.\" NS +-.\" NS local variables: +-.\" NS doc-str-dfp +-. +-.de doc-first-parameter +-. ds doc-str-dfp "\$1 +-.. +-. +-. +-.\" NS Sh user macro (not callable) +-.\" NS section headers +-.\" NS +-.\" NS modifies: +-.\" NS doc-func-args-processed +-.\" NS doc-func-count +-.\" NS doc-in-authors-section +-.\" NS doc-in-files-section +-.\" NS doc-in-library-section +-.\" NS doc-in-see-also-section +-.\" NS doc-in-synopsis-section +-.\" NS doc-indent-synopsis +-.\" NS doc-indent-synopsis-active +-.\" NS doc-is-func +-.\" NS doc-num-func-args +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Sh +-.\" NS doc-reg-Sh1 +-.\" NS doc-section-XXX +-.\" NS +-.\" NS width register `Sh' set in doc-common +-. +-.ds doc-section-name NAME +-.ds doc-section-synopsis SYNOPSIS +-.ds doc-section-library LIBRARY +-.ds doc-section-description DESCRIPTION +-.ds doc-section-see-also SEE +-.ds doc-section-files FILES +-.ds doc-section-authors AUTHORS +-. +-.de Sh +-. ie \n[doc-arg-limit] \{\ +-. \" we only allow `Sh' within `Sh'; it will change the font back to +-. \" `doc-Sh-font' +-. ie "\*[doc-macro-name]"Sh" \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Sh-font]\c +-. doc-print-recursive +-. \} +-. el \{\ +-. tm Usage: .Sh section_name ... (#\n[.c]) +-. doc-reset-args +-. \}\} +-. el \{\ +-. tm Usage: .Sh not callable by other macros (#\n[.c]) +-. doc-reset-args +-. \}\} +-. el \{\ +-. if !\n[.$] \{\ +-. tm Usage: .Sh section_name ... (#\n[.c]) +-. return +-. \} +-. +-. ds doc-macro-name Sh +-. doc-parse-args \$@ +-. +-. if t \ +-. ad +-. +-. \" this resolves e.g. `.Sh "SEE ALSO"' +-. doc-first-parameter \$* +-. +-. ie "\*[doc-str-dfp]"\*[doc-section-name]" \{\ +-. doc-setup-header +-. in 0 +-. \} +-. el \{\ +-. nr doc-in-synopsis-section 0 +-. nr doc-in-library-section 0 +-. nr doc-in-see-also-section 0 +-. nr doc-in-files-section 0 +-. nr doc-in-authors-section 0 +-. +-. ie "\*[doc-str-dfp]"\*[doc-section-synopsis]" \{\ +-. if t \ +-. na +-. nr doc-in-synopsis-section 1 +-. nr doc-indent-synopsis 0 +-. nr doc-indent-synopsis-active 0 +-. \} +-. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-library]" \{\ +-. nr doc-in-library-section 1 +-. \} +-. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-description]" \{\ +-. nr doc-is-func 0 +-. nr doc-func-count 0 +-. nr doc-func-args-processed 0 +-. nr doc-num-func-args 0 +-. \} +-. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-see-also]" \{\ +-. if t \ +-. na +-. nr doc-in-see-also-section 1 +-. \} +-. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-files]" \ +-. nr doc-in-files-section 1 +-. el .if "\*[doc-str-dfp]"\*[doc-section-authors]" \ +-. nr doc-in-authors-section 1 +-. \}\}\}\} +-. +-. in 0 +-. nr doc-have-author 0 +-. \} +-. +-. doc-setup-page-layout +-. sp +-. ns +-. ta T .5i +-. if !\n[cR] \ +-. ne 3 +-. fi +-. +-. if t \{\ +-. nr doc-reg-Sh \n[.ss] +-. nr doc-reg-Sh1 \n[.sss] +-. ss (\n[.ss] * 5 / 3) (\n[.sss] * 5 / 3) +-. \} +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Sh-font]\c +-. doc-print-recursive +-. +-. if t \ +-. ss \n[doc-reg-Sh] \n[doc-reg-Sh1] +-. +-. in +\n[doc-subheader-indent]u +-. ns +-. +-. doc-check-depth +-. \} +-.. +-. +-. +-.\" NS Ss user macro (not callable) +-.\" NS subsection +-.\" NS +-.\" NS local variable: +-.\" NS doc-reg-Ss +-.\" NS doc-reg-Ss1 +-.\" NS +-.\" NS width register `Ss' set above +-. +-.de Ss +-. ie \n[doc-arg-limit] \{\ +-. \" we only allow `Ss' within `Ss'; it will change the font back to +-. \" `doc-Sh-font' +-. ie "\*[doc-macro-name]"Ss" \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Sh-font]\c +-. doc-print-recursive +-. \} +-. el \{\ +-. tm Usage: .Ss subsection_name ... (#\n[.c]) +-. doc-reset-args +-. \}\} +-. el \{\ +-. tm Usage: .Ss not callable by other macros (#\n[.c]) +-. doc-reset-args +-. \}\} +-. el \{\ +-. if !\n[.$] \{\ +-. tm Usage: .Ss subsection_name ... (#\n[.c]) +-. return +-. \} +-. +-. ds doc-macro-name Ss +-. doc-parse-args \$@ +-. +-. sp +-. if !\n[cR] \ +-. ne 3 +-. ti -.25i +-. +-. nr doc-reg-Ss \n[.ss] +-. nr doc-reg-Ss1 \n[.sss] +-. ss (\n[.ss] * 5 / 4) (\n[.sss] * 5 / 4) +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Sh-font]\c +-. doc-print-recursive +-. +-. ss \n[doc-reg-Ss] \n[doc-reg-Ss1] +-. +-. ta T .5i +-. if !\n[cR] \ +-. ne 2 +-. br +-. ns +-. +-. doc-check-depth +-. \} +-.. +-. +-. +-.\" NS Rd macro (not parsed, not callable) +-.\" NS print global register dump to stderr +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Rd +-. +-.de Rd +-. tm MDOC GLOBAL REGISTER DUMP +-. tm doc-macro-name == `\*[doc-macro-name]' +-. tm doc-arg-limit == \n[doc-arg-limit] +-. tm doc-num-args == \n[doc-num-args] +-. tm doc-arg-ptr == \n[doc-arg-ptr] +-. +-. nr doc-reg-Rd 1 +-. while (\n[doc-reg-Rd] <= \n[doc-arg-limit]) \{\ +-. tm doc-arg\n[doc-reg-Rd] == `\*[doc-arg\n[doc-reg-Rd]]' +-. tm doc-type\n[doc-reg-Rd] == \n[doc-type\n[doc-reg-Rd]] +-. tm doc-space\n[doc-reg-Rd] == `\*[doc-space\n[doc-reg-Rd]]' +-. nr doc-reg-Rd +1 +-. \} +-. +-. tm doc-curr-font == \n[doc-curr-font] +-. tm doc-curr-size == \n[doc-curr-size] +-. tm doc-indent-synopsis == \n[doc-indent-synopsis] +-. tm doc-indent-synopsis-active == \n[doc-indent-synopsis-active] +-. tm doc-have-decl == \n[doc-have-decl] +-. tm doc-have-var == \n[doc-have-var] +-. tm doc-command-name == `\*[doc-command-name]' +-. tm doc-quote-left == `\*[doc-quote-left]' +-. tm doc-quote-right == `\*[doc-quote-right]' +-. tm doc-nesting-level == \n[doc-nesting-level] +-. tm doc-in-list == \n[doc-in-list] +-. tm doc-space == `\*[doc-space]' +-. tm doc-saved-space == `\*[doc-saved-space]' +-. tm doc-space-mode == \n[doc-space-mode] +-. tm doc-have-space == \n[doc-have-space] +-. tm doc-have-slot == \n[doc-have-slot] +-. tm doc-keep-type == \n[doc-keep-type] +-. tm doc-display-depth == \n[doc-display-depth] +-. tm doc-is-compact == \n[doc-is-compact] +-. +-. nr doc-reg-Rd 0 +-. while (\n[doc-reg-Rd] <= \n[doc-display-depth]) \{\ +-. tm doc-display-type-stack\n[doc-reg-Rd] == `\*[doc-display-type-stack\n[doc-reg-Rd]]' +-. tm doc-display-indent-stack\n[doc-reg-Rd] == \n[doc-display-indent-stack\n[doc-reg-Rd]] +-. tm doc-display-ad-stack\n[doc-reg-Rd] == \n[doc-display-ad-stack\n[doc-reg-Rd]] +-. tm doc-display-fi-stack\n[doc-reg-Rd] == \n[doc-display-fi-stack\n[doc-reg-Rd]] +-. tm doc-display-ft-stack\n[doc-reg-Rd] == \n[doc-display-ft-stack\n[doc-reg-Rd]] +-. tm doc-display-ps-stack\n[doc-reg-Rd] == \n[doc-display-ps-stack\n[doc-reg-Rd]] +-. nr doc-reg-Rd +1 +-. \} +-. +-. tm doc-fontmode-depth == \n[doc-fontmode-depth] +-. +-. nr doc-reg-Rd 1 +-. while (\n[doc-reg-Rd] <= \n[doc-fontmode-depth]) \{\ +-. tm doc-fontmode-font-stack\n[doc-reg-Rd] == `\n[doc-fontmode-font-stack\n[doc-reg-Rd]]' +-. tm doc-fontmode-size-stack\n[doc-reg-Rd] == `\n[doc-fontmode-size-stack\n[doc-reg-Rd]]' +-. nr doc-reg-Rd +1 +-. \} +-. +-. tm doc-list-depth == \n[doc-list-depth] +-. +-. nr doc-reg-Rd 1 +-. while (\n[doc-reg-Rd] <= \n[doc-list-depth]) \{\ +-. tm doc-list-type-stack\n[doc-reg-Rd] == `\*[doc-list-type-stack\n[doc-reg-Rd]]' +-. tm doc-list-have-indent-stack\n[doc-reg-Rd] == \n[doc-list-have-indent-stack\n[doc-reg-Rd]] +-. tm doc-list-indent-stack\n[doc-reg-Rd] == \n[doc-list-indent-stack\n[doc-reg-Rd]] +-. tm doc-compact-list-stack\n[doc-reg-Rd] == \n[doc-compact-list-stack\n[doc-reg-Rd]] +-. tm doc-tag-prefix-stack\n[doc-reg-Rd] == `\*[doc-tag-prefix-stack\n[doc-reg-Rd]]' +-. tm doc-tag-width-stack\n[doc-reg-Rd] == `\*[doc-tag-width-stack\n[doc-reg-Rd]]' +-. tm doc-list-offset-stack\n[doc-reg-Rd] == \n[doc-list-offset-stack\n[doc-reg-Rd]] +-. tm doc-enum-list-count-stack\n[doc-reg-Rd] == \n[doc-enum-list-count-stack\n[doc-reg-Rd]] +-. nr doc-reg-Rd +1 +-. \} +-. +-. tm doc-saved-Pa-font == `\*[doc-saved-Pa-font]' +-. tm doc-curr-type == \n[doc-curr-type] +-. tm doc-curr-arg == `\*[doc-curr-arg]' +-. tm doc-diag-list-input-line-count == \n[doc-diag-list-input-line-count] +-. tm doc-num-columns == \n[doc-num-columns] +-. tm doc-column-indent-width == \n[doc-column-indent-width] +-. tm doc-is-func == \n[doc-is-func] +-. tm doc-have-old-func == \n[doc-have-old-func] +-. tm doc-func-arg-count == \n[doc-func-arg-count] +-. tm doc-func-arg == `\*[doc-func-arg]' +-. tm doc-num-func-args == \n[doc-num-func-args] +-. tm doc-func-args-processed == \n[doc-func-args-processed] +-. tm doc-have-func == \n[doc-have-func] +-. tm doc-is-reference == \n[doc-is-reference] +-. tm doc-reference-count == \n[doc-reference-count] +-. tm doc-author-count == \n[doc-author-count] +-. +-. nr doc-reg-Rd 0 +-. while (\n[doc-reg-Rd] <= \n[doc-author-count]) \{\ +-. tm doc-author-name\n[doc-reg-Rd] == `\*[doc-author-name\n[doc-reg-Rd]]' +-. nr doc-reg-Rd +1 +-. \} +-. +-. tm doc-book-count == \n[doc-book-count] +-. tm doc-book-name == `\*[doc-book-name]' +-. tm doc-date-count == \n[doc-date-count] +-. tm doc-date == `\*[doc-date]' +-. tm doc-publisher-count == \n[doc-publisher-count] +-. tm doc-publisher-name == `\*[doc-publisher-name]' +-. tm doc-journal-count == \n[doc-journal-count] +-. tm doc-journal-name == `\*[doc-journal-name]' +-. tm doc-issue-count == \n[doc-issue-count] +-. tm doc-issue-name == `\*[doc-issue-name]' +-. tm doc-optional-count == \n[doc-optional-count] +-. tm doc-optional-string == `\*[doc-optional-string]' +-. tm doc-page-number-count == \n[doc-page-number-count] +-. tm doc-page-number-string == `\*[doc-page-number-string]' +-. tm doc-corporate-count == \n[doc-corporate-count] +-. tm doc-corporate-name == `\*[doc-corporate-name]' +-. tm doc-report-count == \n[doc-report-count] +-. tm doc-report-name == `\*[doc-report-name]' +-. tm doc-reference-title-count == \n[doc-reference-title-count] +-. tm doc-reference-title-name == `\*[doc-reference-title-name]' +-. tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]' +-. tm doc-url-count == \n[doc-url-count] +-. tm doc-url-name == `\*[doc-url-name]' +-. tm doc-volume-count == \n[doc-volume-count] +-. tm doc-volume-name == `\*[doc-volume-name]' +-. tm doc-have-author == \n[doc-have-author] +-. +-. tm doc-document-title == `\*[doc-document-title]' +-. tm doc-volume == `\*[doc-volume]' +-. tm doc-section == `\*[doc-section]' +-. tm doc-operating-system == `\*[doc-operating-system]' +-. tm doc-date-string == `\*[doc-date-string]' +-. tm doc-header-space == \n[doc-header-space] +-. tm doc-footer-space == \n[doc-footer-space] +-. tm doc-display-vertical == \n[doc-display-vertical] +-. tm doc-header-string == `\*[doc-header-string]' +-. tm doc-in-synopsis-section == \n[doc-in-synopsis-section] +-. tm doc-in-library-section == \n[doc-in-library-section] +-. tm doc-in-see-also-section == \n[doc-in-see-also-section] +-. tm doc-in-files-section == \n[doc-in-files-section] +-. tm doc-in-authors-section == \n[doc-in-authors-section] +-. +-. tm END OF GLOBAL REGISTER DUMP +-.. +-. +-. +-.ec +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-common-u groff-1.22.3/tmac/doc-common-u +--- groff-1.22.3.old/tmac/doc-common-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/doc-common-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,1376 @@ ++.\" -*- nroff -*- ++.\" ++.\" Copyright (c) 1991, 1993 ++.\" The Regents of the University of California. All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms, with or without ++.\" modification, are permitted provided that the following conditions ++.\" are met: ++.\" 1. Redistributions of source code must retain the above copyright ++.\" notice, this list of conditions and the following disclaimer. ++.\" 2. Redistributions in binary form must reproduce the above copyright ++.\" notice, this list of conditions and the following disclaimer in the ++.\" documentation and/or other materials provided with the distribution. ++.\" 3. [Deleted. See ++.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] ++.\" 4. Neither the name of the University nor the names of its contributors ++.\" may be used to endorse or promote products derived from this software ++.\" without specific prior written permission. ++.\" ++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++.\" SUCH DAMAGE. ++.\" ++.\" @(#)doc-common 8.1 (Berkeley) 06/08/93 ++.\" ++.\" %beginstrip% ++. ++. ++.\" Macro Identifiers. For each user macro a corresponding register with ++.\" the same name must exist. Its value must not be zero. ++. ++.nr %A 1 ++.nr %B 1 ++.nr %C 1 ++.nr %D 1 ++.nr %I 1 ++.nr %J 1 ++.nr %N 1 ++.nr %O 1 ++.nr %P 1 ++.nr %Q 1 ++.nr %R 1 ++.nr %T 1 ++.nr %U 1 ++.nr %V 1 ++.nr Ac 3 ++.nr Ad 12n ++.nr An 12n ++.nr Ao 12n ++.nr Ap 2 ++.nr Aq 12n ++.nr Ar 12n ++.nr At 1 ++.nr Bc 3 ++.nr Bf 8n\" ? ++.nr Bk 8n\" ? ++.nr Bl 1 ++.nr Bo 12n ++.nr Bq 12n ++.nr Brc 3 ++.nr Bro 12n ++.nr Brq 12n ++.nr Bsx 1 ++.nr Bt 8n\" ? ++.nr Bx 1 ++.nr Cd 12n ++.nr Cm 10n ++.nr D1 8n\" ? ++.nr Dc 3 ++.nr Dl 8n\" ? ++.nr Dt 8n\" ? ++.nr Do 12n ++.nr Dq 12n ++.nr Ds 6n\" many manpages still use this as a -width value ++.nr Dv 12n ++.nr Dx 1 ++.nr Ec 3 ++.nr Ef 8n\" ? ++.nr Ek 8n\" ? ++.nr El 1 ++.nr Em 10n ++.nr En 12n ++.nr Eo 12n ++.nr Eq 12n ++.nr Er 17n ++.nr Es 12n ++.nr Ev 15n ++.nr Ex 1 ++.nr Fa 12n ++.nr Fc 3 ++.nr Fd 12n\" ? ++.nr Fl 10n ++.nr Fn 16n ++.nr Fo 16n ++.nr Fr 12n\" ? ++.nr Ft 8n\" ? ++.nr Fx 1 ++.nr Ic 10n ++.nr In 12n ++.nr It 8n\" ? ++.nr Lb 11n ++.nr Li 16n ++.nr Lk 6n\" ? ++.nr Lp 8n\" ? ++.nr Me 6n ++.nr Ms 6n ++.nr Mt 6n\" ? ++.nr Nd 8n\" ? ++.nr Nm 10n ++.nr No 12n ++.nr Ns 2 ++.nr Nx 1 ++.nr Oc 3 ++.nr Oo 10n ++.nr Op 14n ++.nr Os 6n\" ? ++.nr Ox 1 ++.nr Pa 32n ++.nr Pc 3 ++.nr Pf 12n ++.nr Po 12n ++.nr Pp 8n\" ? ++.nr Pq 12n ++.nr Qc 3 ++.nr Ql 16n ++.nr Qo 12n ++.nr Qq 12n ++.nr Rv 1 ++.nr Sc 3 ++.nr Sh 8n ++.nr Sm 8n\" ? ++.nr So 12n ++.nr Sq 12n ++.nr Ss 8n ++.nr St 8n\" ? ++.nr Sx 16n ++.nr Sy 6n ++.nr Ta 2 ++.nr Tn 10n ++.nr Ud 8n\" ? ++.nr Ux 1 ++.nr Va 12n ++.nr Vt 8n\" ? ++.nr Xc 3 ++.nr Xo 1 ++.nr Xr 10n ++. ++. ++.\" macros which must be processed after the closing delimiter of `Op' ++.\" and friends ++.ds doc-after-Ao ++.ds doc-after-Bo ++.ds doc-after-Bro ++.ds doc-after-Do ++.ds doc-after-Eo ++.ds doc-after-Fo ++.ds doc-after-Ns ++.ds doc-after-Oo ++.ds doc-after-Po ++.ds doc-after-Qo ++.ds doc-after-So ++.ds doc-after-Xo ++. ++. ++.nr doc-display-indent 6n ++. ++. ++.\" space strings ++. ++.ds doc-soft-space " \" ++.ds doc-hard-space \~ ++.ds doc-tab \t ++. ++. ++.eo ++. ++. ++.\" punctuation values (suffix=3, prefix=4) ++. ++.nr doc-punct. 3 ++.nr doc-punct, 3 ++.nr doc-punct: 3 ++.nr doc-punct; 3 ++.nr doc-punct( 4 ++.nr doc-punct) 3 ++.nr doc-punct[ 4 ++.nr doc-punct] 3 ++.nr doc-punct? 3 ++.nr doc-punct! 3 ++. ++. ++.\" header assembly macros ++. ++.\" NS doc-document-title global string ++.\" NS the title of the manual page ++. ++.ds doc-document-title UNTITLED ++. ++. ++.\" NS doc-volume global string ++.\" NS the volume where the manual page belongs to ++. ++.ds doc-volume LOCAL ++. ++. ++.\" NS doc-section global string ++.\" NS the manual section ++. ++.ds doc-section Null ++. ++. ++.\" NS Dt user macro (not parsed, not callable) ++.\" NS document title ++.\" NS ++.\" NS modifies: ++.\" NS doc-document-title ++.\" NS doc-section ++.\" NS doc-volume ++.\" NS doc-command-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-volume-as-XXX ++.\" NS doc-volume-ds-XXX ++.\" NS ++.\" NS width register `Dt' set above ++. ++.\" an alternative, more detailed scheme for naming the manual sections ++.\" ++.ds doc-volume-operating-system BSD ++.nr doc-volume-operating-system-ateol 0 ++.ds doc-volume-ds-1 General Commands Manual ++.ds doc-volume-ds-2 System Calls Manual ++.ds doc-volume-ds-3 Library Functions Manual ++.ds doc-volume-ds-4 Kernel Interfaces Manual ++.ds doc-volume-ds-5 File Formats Manual ++.ds doc-volume-ds-6 Games Manual ++.ds doc-volume-ds-7 Miscellaneous Information Manual ++.ds doc-volume-ds-8 System Manager's Manual ++.ds doc-volume-ds-9 Kernel Developer's Manual ++. ++.ds doc-volume-ds-USD User's Supplementary Documents ++.ds doc-volume-ds-PS1 Programmer's Supplementary Documents ++.ds doc-volume-ds-AMD Ancestral Manual Documents ++.ds doc-volume-ds-SMM System Manager's Manual ++.ds doc-volume-ds-URM User's Reference Manual ++.ds doc-volume-ds-PRM Programmer's Manual ++.ds doc-volume-ds-KM Kernel Manual ++.ds doc-volume-ds-IND Manual Master Index ++.ds doc-volume-ds-LOCAL Local Manual ++.ds doc-volume-ds-CON Contributed Software Manual ++. ++.als doc-volume-ds-MMI doc-volume-ds-IND ++.als doc-volume-ds-LOC doc-volume-ds-LOCAL ++. ++.ds doc-volume-as-alpha alpha ++.als doc-volume-as-Alpha doc-volume-as-alpha ++.ds doc-volume-as-acorn26 acorn26 ++.ds doc-volume-as-acorn32 acorn32 ++.ds doc-volume-as-algor algor ++.ds doc-volume-as-amd64 amd64 ++.ds doc-volume-as-amiga amiga ++.ds doc-volume-as-amigappc amigappc ++.ds doc-volume-as-arc arc ++.ds doc-volume-as-arm arm ++.ds doc-volume-as-arm26 arm26 ++.ds doc-volume-as-arm32 arm32 ++.ds doc-volume-as-armish armish ++.ds doc-volume-as-atari atari ++.ds doc-volume-as-aviion aviion ++.ds doc-volume-as-beagle beagle ++.ds doc-volume-as-bebox bebox ++.ds doc-volume-as-cats cats ++.ds doc-volume-as-cesfic cesfic ++.ds doc-volume-as-cobalt cobalt ++.ds doc-volume-as-dreamcast dreamcast ++.ds doc-volume-as-emips emips ++.ds doc-volume-as-evbarm evbarm ++.ds doc-volume-as-evbmips evbmips ++.ds doc-volume-as-evbppc evbppc ++.ds doc-volume-as-evbsh3 evbsh3 ++.ds doc-volume-as-ews4800mips ews4800mips ++.ds doc-volume-as-hp300 hp300 ++.ds doc-volume-as-hp700 hp700 ++.ds doc-volume-as-hpcarm hpcarm ++.ds doc-volume-as-hpcmips hpcmips ++.ds doc-volume-as-hpcsh hpcsh ++.ds doc-volume-as-hppa hppa ++.ds doc-volume-as-hppa64 hppa64 ++.ds doc-volume-as-i386 i386 ++.ds doc-volume-as-ia64 ia64 ++.ds doc-volume-as-ibmnws ibmnws ++.ds doc-volume-as-iyonix iyonix ++.ds doc-volume-as-landisk landisk ++.ds doc-volume-as-loongson loongson ++.ds doc-volume-as-luna68k luna68k ++.ds doc-volume-as-luna88k luna88k ++.ds doc-volume-as-m68k m68k ++.ds doc-volume-as-mac68k mac68k ++.ds doc-volume-as-macppc macppc ++.ds doc-volume-as-mips mips ++.ds doc-volume-as-mips64 mips64 ++.ds doc-volume-as-mipsco mipsco ++.ds doc-volume-as-mmeye mmeye ++.ds doc-volume-as-mvme68k mvme68k ++.ds doc-volume-as-mvme88k mvme88k ++.ds doc-volume-as-mvmeppc mvmeppc ++.ds doc-volume-as-netwinder netwinder ++.ds doc-volume-as-news68k news68k ++.ds doc-volume-as-newsmips newsmips ++.ds doc-volume-as-next68k next68k ++.ds doc-volume-as-ofppc ofppc ++.ds doc-volume-as-palm palm ++.ds doc-volume-as-pc532 pc532 ++.ds doc-volume-as-playstation2 playstation2 ++.ds doc-volume-as-pmax pmax ++.ds doc-volume-as-pmppc pmppc ++.ds doc-volume-as-powerpc powerpc ++.ds doc-volume-as-prep prep ++.ds doc-volume-as-rs6000 rs6000 ++.ds doc-volume-as-sandpoint sandpoint ++.ds doc-volume-as-sbmips sbmips ++.ds doc-volume-as-sgi sgi ++.ds doc-volume-as-sgimips sgimips ++.ds doc-volume-as-sh3 sh3 ++.ds doc-volume-as-shark shark ++.ds doc-volume-as-socppc socppc ++.ds doc-volume-as-solbourne solbourne ++.ds doc-volume-as-sparc sparc ++.ds doc-volume-as-sparc64 sparc64 ++.ds doc-volume-as-sun2 sun2 ++.ds doc-volume-as-sun3 sun3 ++.ds doc-volume-as-tahoe tahoe ++.ds doc-volume-as-vax vax ++.ds doc-volume-as-x68k x68k ++.ds doc-volume-as-x86_64 x86_64 ++.ds doc-volume-as-xen xen ++.ds doc-volume-as-zaurus zaurus ++. ++.de Dt ++. \" reset default arguments ++. ds doc-document-title UNTITLED ++. ds doc-volume LOCAL ++. ds doc-section Null ++. ds doc-command-name ++. ++. if !"\$1"" \ ++. ds doc-document-title "\$1 ++. ++. if !"\$2"" \{\ ++. ds doc-section \$2 ++. ie \B\$2 \{\ ++. if ((\$2 >= 1) & (\$2 <= 9)) \{\ ++. ie \n[doc-volume-operating-system-ateol] \{\ ++. ds doc-volume "\*[doc-volume-ds-\$2] \*[doc-volume-operating-system] ++. if \A\$3 \{\ ++. if d doc-volume-as-\$3 \ ++. as doc-volume "/\*[doc-volume-as-\$3] ++. \}\} ++. el \{\ ++. ds doc-volume "\*[doc-volume-operating-system] ++. if \A\$3 \{\ ++. if d doc-volume-as-\$3 \ ++. as doc-volume "/\*[doc-volume-as-\$3] ++. \} ++. as doc-volume " \*[doc-volume-ds-\$2] ++. \}\}\} ++. el \{\ ++. ie "\$2"unass" \ ++. ds doc-volume DRAFT ++. el \{ .ie "\$2"draft" \ ++. ds doc-volume DRAFT ++. el .if "\$2"paper" \ ++. ds doc-volume UNTITLED ++. \}\} ++. if \A\$3 \{\ ++. if d doc-volume-ds-\$3 \ ++. ds doc-volume "\*[doc-volume-ds-\$3] ++. \}\}\} ++. ++. if !"\$3"" \ ++. if "\*[doc-volume]"LOCAL" \ ++. ds doc-volume \$3 ++. ++. if !\n[cR] \ ++. if \n[nl] \{\ ++. doc-setup-header ++. bp ++. \} ++.. ++. ++. ++.\" NS doc-default-operating-system global string ++.\" NS the exact (default) version of the operating system ++.\" NS ++.\" NS override this in `mdoc.local', if necessary ++. ++.ds doc-default-operating-system BSD ++. ++. ++.\" NS doc-operating-system global string ++.\" NS the exact version of the operating system ++. ++.ds doc-operating-system ++. ++. ++.\" NS Os user macro (not parsed, not callable) ++.\" NS operating system ++.\" NS ++.\" NS modifies: ++.\" NS doc-operating-system ++.\" NS doc-command-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-operating-system-XXX-XXX ++.\" NS ++.\" NS width register `Os' set above ++. ++.ds doc-operating-system-ATT-7 7th\~Edition ++.als doc-operating-system-ATT-7th doc-operating-system-ATT-7 ++.ds doc-operating-system-ATT-3 System\~III ++.als doc-operating-system-ATT-III doc-operating-system-ATT-3 ++.ds doc-operating-system-ATT-V System\~V ++.ds doc-operating-system-ATT-V.2 System\~V Release\~2 ++.ds doc-operating-system-ATT-V.3 System\~V Release\~3 ++.ds doc-operating-system-ATT-V.4 System\~V Release\~4 ++. ++.ds doc-operating-system-BSD-3 3rd\~Berkeley Distribution ++.ds doc-operating-system-BSD-4 4th\~Berkeley Distribution ++.ds doc-operating-system-BSD-4.1 4.1\~Berkeley Distribution ++.ds doc-operating-system-BSD-4.2 4.2\~Berkeley Distribution ++.ds doc-operating-system-BSD-4.3 4.3\~Berkeley Distribution ++.ds doc-operating-system-BSD-4.3T 4.3-Tahoe Berkeley Distribution ++.ds doc-operating-system-BSD-4.3R 4.3-Reno Berkeley Distribution ++.als doc-operating-system-BSD-4.3t doc-operating-system-BSD-4.3T ++.als doc-operating-system-BSD-4.3r doc-operating-system-BSD-4.3R ++.ds doc-operating-system-BSD-4.4 4.4BSD ++. ++.ds doc-operating-system-NetBSD-0.8 0.8 ++.ds doc-operating-system-NetBSD-0.8a 0.8A ++.ds doc-operating-system-NetBSD-0.9 0.9 ++.ds doc-operating-system-NetBSD-0.9a 0.9A ++.ds doc-operating-system-NetBSD-1.0 1.0 ++.ds doc-operating-system-NetBSD-1.0a 1.0A ++.ds doc-operating-system-NetBSD-1.1 1.1 ++.ds doc-operating-system-NetBSD-1.2 1.2 ++.ds doc-operating-system-NetBSD-1.2a 1.2A ++.ds doc-operating-system-NetBSD-1.2b 1.2B ++.ds doc-operating-system-NetBSD-1.2c 1.2C ++.ds doc-operating-system-NetBSD-1.2d 1.2D ++.ds doc-operating-system-NetBSD-1.2e 1.2E ++.ds doc-operating-system-NetBSD-1.3 1.3 ++.ds doc-operating-system-NetBSD-1.3a 1.3A ++.ds doc-operating-system-NetBSD-1.4 1.4 ++.ds doc-operating-system-NetBSD-1.4.1 1.4.1 ++.ds doc-operating-system-NetBSD-1.4.2 1.4.2 ++.ds doc-operating-system-NetBSD-1.4.3 1.4.3 ++.ds doc-operating-system-NetBSD-1.5 1.5 ++.ds doc-operating-system-NetBSD-1.5.1 1.5.1 ++.ds doc-operating-system-NetBSD-1.5.2 1.5.2 ++.ds doc-operating-system-NetBSD-1.5.3 1.5.3 ++.ds doc-operating-system-NetBSD-1.6 1.6 ++.ds doc-operating-system-NetBSD-1.6.1 1.6.1 ++.ds doc-operating-system-NetBSD-1.6.2 1.6.2 ++.ds doc-operating-system-NetBSD-1.6.3 1.6.3 ++.ds doc-operating-system-NetBSD-2.0 2.0 ++.ds doc-operating-system-NetBSD-2.0.1 2.0.1 ++.ds doc-operating-system-NetBSD-2.0.2 2.0.2 ++.ds doc-operating-system-NetBSD-2.0.3 2.0.3 ++.ds doc-operating-system-NetBSD-2.1 2.1 ++.ds doc-operating-system-NetBSD-3.0 3.0 ++.ds doc-operating-system-NetBSD-3.0.1 3.0.1 ++.ds doc-operating-system-NetBSD-3.0.2 3.0.2 ++.ds doc-operating-system-NetBSD-3.0.3 3.0.3 ++.ds doc-operating-system-NetBSD-3.1 3.1 ++.ds doc-operating-system-NetBSD-3.1.1 3.1.1 ++.ds doc-operating-system-NetBSD-4.0 4.0 ++.ds doc-operating-system-NetBSD-4.0.1 4.0.1 ++.ds doc-operating-system-NetBSD-5.0 5.0 ++.ds doc-operating-system-NetBSD-5.0.1 5.0.1 ++.ds doc-operating-system-NetBSD-5.0.2 5.0.2 ++.ds doc-operating-system-NetBSD-5.1 5.1 ++.ds doc-operating-system-NetBSD-5.1.2 5.1.2 ++.ds doc-operating-system-NetBSD-5.1.3 5.1.3 ++.ds doc-operating-system-NetBSD-5.1.4 5.1.4 ++.ds doc-operating-system-NetBSD-5.2 5.2 ++.ds doc-operating-system-NetBSD-5.2.1 5.2.1 ++.ds doc-operating-system-NetBSD-5.2.2 5.2.2 ++.ds doc-operating-system-NetBSD-6.0 6.0 ++.ds doc-operating-system-NetBSD-6.0.1 6.0.1 ++.ds doc-operating-system-NetBSD-6.0.2 6.0.2 ++.ds doc-operating-system-NetBSD-6.0.3 6.0.3 ++.ds doc-operating-system-NetBSD-6.0.4 6.0.4 ++.ds doc-operating-system-NetBSD-6.0.5 6.0.5 ++.ds doc-operating-system-NetBSD-6.1 6.1 ++.ds doc-operating-system-NetBSD-6.1.1 6.1.1 ++.ds doc-operating-system-NetBSD-6.1.2 6.1.2 ++.ds doc-operating-system-NetBSD-6.1.3 6.1.3 ++.ds doc-operating-system-NetBSD-6.1.4 6.1.4 ++. ++.ds doc-operating-system-OpenBSD-2.0 2.0 ++.ds doc-operating-system-OpenBSD-2.1 2.1 ++.ds doc-operating-system-OpenBSD-2.2 2.2 ++.ds doc-operating-system-OpenBSD-2.3 2.3 ++.ds doc-operating-system-OpenBSD-2.4 2.4 ++.ds doc-operating-system-OpenBSD-2.5 2.5 ++.ds doc-operating-system-OpenBSD-2.6 2.6 ++.ds doc-operating-system-OpenBSD-2.7 2.7 ++.ds doc-operating-system-OpenBSD-2.8 2.8 ++.ds doc-operating-system-OpenBSD-2.9 2.9 ++.ds doc-operating-system-OpenBSD-3.0 3.0 ++.ds doc-operating-system-OpenBSD-3.1 3.1 ++.ds doc-operating-system-OpenBSD-3.2 3.2 ++.ds doc-operating-system-OpenBSD-3.3 3.3 ++.ds doc-operating-system-OpenBSD-3.4 3.4 ++.ds doc-operating-system-OpenBSD-3.5 3.5 ++.ds doc-operating-system-OpenBSD-3.6 3.6 ++.ds doc-operating-system-OpenBSD-3.7 3.7 ++.ds doc-operating-system-OpenBSD-3.8 3.8 ++.ds doc-operating-system-OpenBSD-3.9 3.9 ++.ds doc-operating-system-OpenBSD-4.0 4.0 ++.ds doc-operating-system-OpenBSD-4.1 4.1 ++.ds doc-operating-system-OpenBSD-4.2 4.2 ++.ds doc-operating-system-OpenBSD-4.3 4.3 ++.ds doc-operating-system-OpenBSD-4.4 4.4 ++.ds doc-operating-system-OpenBSD-4.5 4.5 ++.ds doc-operating-system-OpenBSD-4.6 4.6 ++.ds doc-operating-system-OpenBSD-4.7 4.7 ++.ds doc-operating-system-OpenBSD-4.8 4.8 ++.ds doc-operating-system-OpenBSD-4.9 4.9 ++.ds doc-operating-system-OpenBSD-5.0 5.0 ++.ds doc-operating-system-OpenBSD-5.1 5.1 ++.ds doc-operating-system-OpenBSD-5.2 5.2 ++.ds doc-operating-system-OpenBSD-5.3 5.3 ++.ds doc-operating-system-OpenBSD-5.4 5.4 ++.ds doc-operating-system-OpenBSD-5.5 5.5 ++.ds doc-operating-system-OpenBSD-5.6 5.6 ++. ++.ds doc-operating-system-FreeBSD-1.0 1.0 ++.ds doc-operating-system-FreeBSD-1.1 1.1 ++.ds doc-operating-system-FreeBSD-1.1.5 1.1.5 ++.ds doc-operating-system-FreeBSD-1.1.5.1 1.1.5.1 ++.ds doc-operating-system-FreeBSD-2.0 2.0 ++.ds doc-operating-system-FreeBSD-2.0.5 2.0.5 ++.ds doc-operating-system-FreeBSD-2.1 2.1 ++.ds doc-operating-system-FreeBSD-2.1.5 2.1.5 ++.ds doc-operating-system-FreeBSD-2.1.6 2.1.6 ++.ds doc-operating-system-FreeBSD-2.1.7 2.1.7 ++.ds doc-operating-system-FreeBSD-2.2 2.2 ++.ds doc-operating-system-FreeBSD-2.2.1 2.2.1 ++.ds doc-operating-system-FreeBSD-2.2.2 2.2.2 ++.ds doc-operating-system-FreeBSD-2.2.5 2.2.5 ++.ds doc-operating-system-FreeBSD-2.2.6 2.2.6 ++.ds doc-operating-system-FreeBSD-2.2.7 2.2.7 ++.ds doc-operating-system-FreeBSD-2.2.8 2.2.8 ++.ds doc-operating-system-FreeBSD-2.2.9 2.2.9 ++.ds doc-operating-system-FreeBSD-3.0 3.0 ++.ds doc-operating-system-FreeBSD-3.1 3.1 ++.ds doc-operating-system-FreeBSD-3.2 3.2 ++.ds doc-operating-system-FreeBSD-3.3 3.3 ++.ds doc-operating-system-FreeBSD-3.4 3.4 ++.ds doc-operating-system-FreeBSD-3.5 3.5 ++.ds doc-operating-system-FreeBSD-4.0 4.0 ++.ds doc-operating-system-FreeBSD-4.1 4.1 ++.ds doc-operating-system-FreeBSD-4.1.1 4.1.1 ++.ds doc-operating-system-FreeBSD-4.2 4.2 ++.ds doc-operating-system-FreeBSD-4.3 4.3 ++.ds doc-operating-system-FreeBSD-4.4 4.4 ++.ds doc-operating-system-FreeBSD-4.5 4.5 ++.ds doc-operating-system-FreeBSD-4.6 4.6 ++.ds doc-operating-system-FreeBSD-4.6.2 4.6.2 ++.ds doc-operating-system-FreeBSD-4.7 4.7 ++.ds doc-operating-system-FreeBSD-4.8 4.8 ++.ds doc-operating-system-FreeBSD-4.9 4.9 ++.ds doc-operating-system-FreeBSD-4.10 4.10 ++.ds doc-operating-system-FreeBSD-4.11 4.11 ++.ds doc-operating-system-FreeBSD-5.0 5.0 ++.ds doc-operating-system-FreeBSD-5.1 5.1 ++.ds doc-operating-system-FreeBSD-5.2 5.2 ++.ds doc-operating-system-FreeBSD-5.2.1 5.2.1 ++.ds doc-operating-system-FreeBSD-5.3 5.3 ++.ds doc-operating-system-FreeBSD-5.4 5.4 ++.ds doc-operating-system-FreeBSD-5.5 5.5 ++.ds doc-operating-system-FreeBSD-6.0 6.0 ++.ds doc-operating-system-FreeBSD-6.1 6.1 ++.ds doc-operating-system-FreeBSD-6.2 6.2 ++.ds doc-operating-system-FreeBSD-6.3 6.3 ++.ds doc-operating-system-FreeBSD-6.4 6.4 ++.ds doc-operating-system-FreeBSD-7.0 7.0 ++.ds doc-operating-system-FreeBSD-7.1 7.1 ++.ds doc-operating-system-FreeBSD-7.2 7.2 ++.ds doc-operating-system-FreeBSD-7.3 7.3 ++.ds doc-operating-system-FreeBSD-7.4 7.4 ++.ds doc-operating-system-FreeBSD-8.0 8.0 ++.ds doc-operating-system-FreeBSD-8.1 8.1 ++.ds doc-operating-system-FreeBSD-8.2 8.2 ++.ds doc-operating-system-FreeBSD-8.3 8.3 ++.ds doc-operating-system-FreeBSD-8.4 8.4 ++.ds doc-operating-system-FreeBSD-9.0 9.0 ++.ds doc-operating-system-FreeBSD-9.1 9.1 ++.ds doc-operating-system-FreeBSD-9.2 9.2 ++.ds doc-operating-system-FreeBSD-9.3 9.3 ++.ds doc-operating-system-FreeBSD-10.0 10.0 ++. ++.ds doc-operating-system-Darwin-8.0.0 8.0.0 ++.ds doc-operating-system-Darwin-8.1.0 8.1.0 ++.ds doc-operating-system-Darwin-8.2.0 8.2.0 ++.ds doc-operating-system-Darwin-8.3.0 8.3.0 ++.ds doc-operating-system-Darwin-8.4.0 8.4.0 ++.ds doc-operating-system-Darwin-8.5.0 8.5.0 ++.ds doc-operating-system-Darwin-8.6.0 8.6.0 ++.ds doc-operating-system-Darwin-8.7.0 8.7.0 ++.ds doc-operating-system-Darwin-8.8.0 8.8.0 ++.ds doc-operating-system-Darwin-8.9.0 8.9.0 ++.ds doc-operating-system-Darwin-8.10.0 8.10.0 ++.ds doc-operating-system-Darwin-8.11.0 8.11.0 ++.ds doc-operating-system-Darwin-9.0.0 9.0.0 ++.ds doc-operating-system-Darwin-9.1.0 9.1.0 ++.ds doc-operating-system-Darwin-9.2.0 9.2.0 ++.ds doc-operating-system-Darwin-9.3.0 9.3.0 ++.ds doc-operating-system-Darwin-9.4.0 9.4.0 ++.ds doc-operating-system-Darwin-9.5.0 9.5.0 ++.ds doc-operating-system-Darwin-9.6.0 9.6.0 ++.ds doc-operating-system-Darwin-9.7.0 9.7.0 ++.ds doc-operating-system-Darwin-9.8.0 9.8.0 ++.ds doc-operating-system-Darwin-10.0.0 10.0.0 ++.ds doc-operating-system-Darwin-10.1.0 10.1.0 ++.ds doc-operating-system-Darwin-10.2.0 10.2.0 ++.ds doc-operating-system-Darwin-10.3.0 10.3.0 ++.ds doc-operating-system-Darwin-10.4.0 10.4.0 ++.ds doc-operating-system-Darwin-10.5.0 10.5.0 ++.ds doc-operating-system-Darwin-10.6.0 10.6.0 ++.ds doc-operating-system-Darwin-10.7.0 10.7.0 ++.ds doc-operating-system-Darwin-10.8.0 10.8.0 ++.ds doc-operating-system-Darwin-11.0.0 11.0.0 ++.ds doc-operating-system-Darwin-11.1.0 11.1.0 ++.ds doc-operating-system-Darwin-11.2.0 11.2.0 ++.ds doc-operating-system-Darwin-11.3.0 11.3.0 ++.ds doc-operating-system-Darwin-11.4.0 11.4.0 ++.ds doc-operating-system-Darwin-11.5.0 11.5.0 ++.ds doc-operating-system-Darwin-12.0.0 12.0.0 ++.ds doc-operating-system-Darwin-12.1.0 12.1.0 ++.ds doc-operating-system-Darwin-12.2.0 12.2.0 ++.ds doc-operating-system-Darwin-13.0.0 13.0.0 ++.ds doc-operating-system-Darwin-13.1.0 13.1.0 ++.ds doc-operating-system-Darwin-13.2.0 13.2.0 ++.ds doc-operating-system-Darwin-13.3.0 13.3.0 ++.ds doc-operating-system-Darwin-13.4.0 13.4.0 ++.ds doc-operating-system-Darwin-14.0.0 14.0.0 ++. ++.ds doc-operating-system-DragonFly-1.0 1.0 ++.ds doc-operating-system-DragonFly-1.1 1.1 ++.ds doc-operating-system-DragonFly-1.2 1.2 ++.ds doc-operating-system-DragonFly-1.3 1.3 ++.ds doc-operating-system-DragonFly-1.4 1.4 ++.ds doc-operating-system-DragonFly-1.5 1.5 ++.ds doc-operating-system-DragonFly-1.6 1.6 ++.ds doc-operating-system-DragonFly-1.7 1.7 ++.ds doc-operating-system-DragonFly-1.8 1.8 ++.ds doc-operating-system-DragonFly-1.8.1 1.8.1 ++.ds doc-operating-system-DragonFly-1.9 1.9 ++.ds doc-operating-system-DragonFly-1.10 1.10 ++.ds doc-operating-system-DragonFly-1.11 1.11 ++.ds doc-operating-system-DragonFly-1.12 1.12 ++.ds doc-operating-system-DragonFly-1.12.2 1.12.2 ++.ds doc-operating-system-DragonFly-1.13 1.13 ++.ds doc-operating-system-DragonFly-2.0 2.0 ++.ds doc-operating-system-DragonFly-2.1 2.1 ++.ds doc-operating-system-DragonFly-2.2 2.2 ++.ds doc-operating-system-DragonFly-2.3 2.3 ++.ds doc-operating-system-DragonFly-2.4 2.4 ++.ds doc-operating-system-DragonFly-2.5 2.5 ++.ds doc-operating-system-DragonFly-2.6 2.6 ++.ds doc-operating-system-DragonFly-2.7 2.7 ++.ds doc-operating-system-DragonFly-2.8 2.8 ++.ds doc-operating-system-DragonFly-2.9 2.9 ++.ds doc-operating-system-DragonFly-2.9.1 2.9.1 ++.ds doc-operating-system-DragonFly-2.10 2.10 ++.ds doc-operating-system-DragonFly-2.10.1 2.10.1 ++.ds doc-operating-system-DragonFly-2.11 2.11 ++.ds doc-operating-system-DragonFly-2.12 2.12 ++.ds doc-operating-system-DragonFly-2.13 2.13 ++.ds doc-operating-system-DragonFly-3.0 3.0 ++.ds doc-operating-system-DragonFly-3.1 3.1 ++.ds doc-operating-system-DragonFly-3.2 3.2 ++.ds doc-operating-system-DragonFly-3.3 3.3 ++.ds doc-operating-system-DragonFly-3.4 3.4 ++.ds doc-operating-system-DragonFly-3.5 3.5 ++.ds doc-operating-system-DragonFly-3.6 3.6 ++.ds doc-operating-system-DragonFly-3.7 3.7 ++.ds doc-operating-system-DragonFly-3.8 3.8 ++. ++.de Os ++. ds doc-command-name ++. ++. ie "\$1"" \ ++. ds doc-operating-system "\*[doc-default-operating-system] ++. el \{ .ie "\$1"ATT" \{\ ++. ds doc-operating-system AT&T ++. if \A\$2 \{\ ++. ie d doc-operating-system-ATT-\$2 \ ++. as doc-operating-system " \*[doc-operating-system-ATT-\$2] ++. el \ ++. as doc-operating-system " UNIX ++. \}\} ++. el \{ .ie "\$1"BSD" \{\ ++. if \A\$2 \{\ ++. ie d doc-operating-system-BSD-\$2 \ ++. ds doc-operating-system "\*[doc-operating-system-BSD-\$2] ++. el \ ++. tm mdoc warning: .Os: Unknown BSD version `\$2' (#\n[.c]) ++. \}\} ++. el \{ .ie "\$1"FreeBSD" \{\ ++. ds doc-operating-system FreeBSD ++. if \A\$2 \{\ ++. ie d doc-operating-system-FreeBSD-\$2 \ ++. as doc-operating-system \~\*[doc-operating-system-FreeBSD-\$2] ++. el \ ++. tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c]) ++. \}\} ++. el \{ .ie "\$1"DragonFly" \{\ ++. ds doc-operating-system DragonFly ++. if \A\$2 \{\ ++. ie d doc-operating-system-DragonFly-\$2 \ ++. as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2] ++. el \ ++. tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c]) ++. \}\} ++. el \{ .ie "\$1"NetBSD" \{\ ++. ds doc-operating-system NetBSD ++. if \A\$2 \{\ ++. ie d doc-operating-system-NetBSD-\$2 \ ++. as doc-operating-system \~\*[doc-operating-system-NetBSD-\$2] ++. el \ ++. tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c]) ++. \}\} ++. el \{ .ie "\$1"OpenBSD" \{\ ++. ds doc-operating-system OpenBSD ++. if \A\$2 \{\ ++. ie d doc-operating-system-OpenBSD-\$2 \ ++. as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2] ++. el \ ++. tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c]) ++. \}\} ++. el \{ .ie "\$1"Darwin" \{\ ++. ds doc-operating-system Darwin ++. if \A\$2 \{\ ++. ie d doc-operating-system-Darwin-\$2 \ ++. as doc-operating-system \~\*[doc-operating-system-Darwin-\$2] ++. el \ ++. tm mdoc warning: .Os: Unknown Darwin version `\$2' (#\n[.c]) ++. \}\} ++. el \{\ ++. ds doc-operating-system \$1 ++. if !"\$2"" \ ++. as doc-operating-system " \$2 ++. \}\}\}\}\}\}\}\} ++.. ++. ++. ++.\" NS doc-date-string global string ++.\" NS the manual page date as set by `Dd' ++. ++.ds doc-date-string ++. ++. ++.\" NS Dd user macro (not parsed, not callable) ++.\" NS set document date ++.\" NS ++.\" NS modifies: ++.\" NS doc-date-string ++.\" NS doc-command-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-date-XXX ++.\" NS ++.\" NS width register `Dd' set above ++. ++.ds doc-date-1 January ++.ds doc-date-2 February ++.ds doc-date-3 March ++.ds doc-date-4 April ++.ds doc-date-5 May ++.ds doc-date-6 June ++.ds doc-date-7 July ++.ds doc-date-8 August ++.ds doc-date-9 September ++.ds doc-date-10 October ++.ds doc-date-11 November ++.ds doc-date-12 December ++. ++.de Dd ++. ds doc-command-name ++. ++. ie \n[.$] \{\ ++. ie "\$1"$Mdocdate:" \ ++. ds doc-date-string \$2\~\$3, \$4 ++. el \{ .ie (\n[.$] == 3) \ ++. ds doc-date-string \$1\~\$2 \$3 ++. el \{\ ++. ds doc-date-string "\*[doc-date-\n[mo]] ++. as doc-date-string \~\n[dy], \n[year] ++. \}\} ++. \} ++. el \ ++. ds doc-date-string Epoch ++.. ++. ++. ++.\" NS doc-hyphen-flags global register ++.\" NS the parameter for the `.hy' request ++.\" NS ++.\" NS override this in `mdoc.local', if necessary. ++. ++.nr doc-hyphen-flags 12 ++. ++. ++.\" NS doc-header macro ++.\" NS print page header ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dh ++.\" NS doc-reg-dh1 ++. ++.de doc-header ++. ev doc-env-dh ++. doc-setup-page-layout ++. if !\n[cR] \ ++. sp \n[doc-header-space]u ++. nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[]' ++. nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[]' ++. if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\ ++. while (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\ ++. substring doc-header-string 0 -2 ++. nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\|.\|.\|.\f[]' ++. \} ++. as doc-header-string "\|.\|.\|. ++. \} ++. tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] ++. ie !\n[cR] \ ++. sp \n[doc-header-space]u ++. el \ ++. sp 1v ++. ev ++. ns ++.. ++. ++. ++.\" NS doc-footer macro ++.\" NS print page footer ++. ++.de doc-footer ++. ie \n[cR] \ ++. br ++. el \{\ ++. ev doc-caption-enviroment ++. doc-setup-page-layout ++. sp \n[doc-footer-space]u ++. ie \n[D] \{\ ++. ie o \ ++. tl %\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[] ++. el \ ++. tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]% ++. \} ++. el \ ++. tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]% ++. bp ++. ev ++. \} ++.. ++. ++. ++.\" NS doc-check-depth macro ++.\" NS check paired macros ++. ++.de doc-check-depth ++. if \n[doc-list-depth] \{\ ++. tm mdoc warning: A .Bl directive has no matching .El (#\n[.c]) ++. nr doc-list-depth 0 ++. \} ++. if \n[doc-display-depth] \{\ ++. tm mdoc warning: A .Bd directive has no matching .Ed (#\n[.c]) ++. nr doc-display-depth 0 ++. \} ++. if \n[doc-fontmode-depth] \{\ ++. tm mdoc warning: A .Bf directive has no matching .Ef (#\n[.c]) ++. nr doc-fontmode-depth 0 ++. \} ++.. ++. ++. ++.\" NS doc-end-macro macro ++.\" NS finish output ++. ++.de doc-end-macro ++. \" We may still have a partial line in the environment. If this is the ++. \" case, and we happen to be on the last line of the page, the `.fl' ++. \" request will cause the page to be ejected and troff will immediately ++. \" exit. If we are in nroff mode, this would be unfortunate, since we ++. \" would never get a chance to output the footer. So we fudge the page ++. \" length to make sure that the last page is never ejected until we want ++. \" it to be. ++. ++. if \n[cR] \ ++. pl +3v ++. fl ++. ++. doc-check-depth ++. ++. if \n[cR] \{\ ++. sp ++. tl \*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[] ++. \" suppress empty lines after the footer ++. pl \n[nl]u ++. \} ++.. ++. ++. ++.\" NS doc-paragraph macro ++.\" NS insert a paragraph ++. ++.de doc-paragraph ++. sp \n[doc-paragraph-space]u ++. if !\n[cR] \ ++. ne 2 ++. ns ++.. ++. ++. ++.\" NS Pp user macro (not parsed, not callable) ++.\" NS new paragraph ++.\" NS ++.\" NS width register `Pp' set above ++. ++.als Pp doc-paragraph ++. ++. ++.\" NS Lp user macro (not parsed, not callable) ++.\" NS same as .Pp ++.\" NS ++.\" NS width register `Lp' set above ++. ++.als Lp doc-paragraph ++. ++. ++.de LP ++. tm Not a \-mdoc command: .LP (#\n[.c]) ++.. ++. ++. ++.de PP ++. tm Not a \-mdoc command: .PP (#\n[.c]) ++.. ++. ++. ++.de pp ++. tm Not a \-mdoc command: .pp (#\n[.c]) ++.. ++. ++. ++.de SH ++. tm Not a \-mdoc command: .SH (#\n[.c]) ++.. ++. ++. ++.\" NS Nd user macro (not parsed, not callable) ++.\" NS print name description ++.\" NS ++.\" NS width register `Nd' set above ++. ++.de Nd ++. nop \[em] \$* ++.. ++. ++. ++.\" NS doc-in-synopsis-section global register (bool) ++.\" NS whether we are in the `synopsis' section ++. ++.nr doc-in-synopsis-section 0 ++. ++. ++.\" NS doc-in-library-section global register (bool) ++.\" NS whether we are in the `library' section ++. ++.nr doc-in-library-section 0 ++. ++. ++.\" NS doc-in-see-also-section global register (bool) ++.\" NS whether we are in the `see also' section ++. ++.nr doc-in-see-also-section 0 ++. ++. ++.\" NS doc-in-files-section global register (bool) ++.\" NS whether we are in the `files' section ++. ++.nr doc-in-files-section 0 ++. ++. ++.\" NS doc-in-authors-section global register (bool) ++.\" NS whether we are in the `authors' section ++. ++.nr doc-in-authors-section 0 ++. ++. ++.\" NS doc-first-parameter macro ++.\" NS return first parameter ++.\" NS ++.\" NS local variables: ++.\" NS doc-str-dfp ++. ++.de doc-first-parameter ++. ds doc-str-dfp "\$1 ++.. ++. ++. ++.\" NS Sh user macro (not callable) ++.\" NS section headers ++.\" NS ++.\" NS modifies: ++.\" NS doc-func-args-processed ++.\" NS doc-func-count ++.\" NS doc-in-authors-section ++.\" NS doc-in-files-section ++.\" NS doc-in-library-section ++.\" NS doc-in-see-also-section ++.\" NS doc-in-synopsis-section ++.\" NS doc-indent-synopsis ++.\" NS doc-indent-synopsis-active ++.\" NS doc-is-func ++.\" NS doc-num-func-args ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Sh ++.\" NS doc-reg-Sh1 ++.\" NS doc-section-XXX ++.\" NS ++.\" NS width register `Sh' set in doc-common ++. ++.ds doc-section-name NAME ++.ds doc-section-synopsis SYNOPSIS ++.ds doc-section-library LIBRARY ++.ds doc-section-description DESCRIPTION ++.ds doc-section-see-also SEE ++.ds doc-section-files FILES ++.ds doc-section-authors AUTHORS ++. ++.de Sh ++. ie \n[doc-arg-limit] \{\ ++. \" we only allow `Sh' within `Sh'; it will change the font back to ++. \" `doc-Sh-font' ++. ie "\*[doc-macro-name]"Sh" \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Sh-font]\c ++. doc-print-recursive ++. \} ++. el \{\ ++. tm Usage: .Sh section_name ... (#\n[.c]) ++. doc-reset-args ++. \}\} ++. el \{\ ++. tm Usage: .Sh not callable by other macros (#\n[.c]) ++. doc-reset-args ++. \}\} ++. el \{\ ++. if !\n[.$] \{\ ++. tm Usage: .Sh section_name ... (#\n[.c]) ++. return ++. \} ++. ++. ds doc-macro-name Sh ++. doc-parse-args \$@ ++. ++. if t \ ++. ad ++. ++. \" this resolves e.g. `.Sh "SEE ALSO"' ++. doc-first-parameter \$* ++. ++. ie "\*[doc-str-dfp]"\*[doc-section-name]" \{\ ++. doc-setup-header ++. in 0 ++. \} ++. el \{\ ++. nr doc-in-synopsis-section 0 ++. nr doc-in-library-section 0 ++. nr doc-in-see-also-section 0 ++. nr doc-in-files-section 0 ++. nr doc-in-authors-section 0 ++. ++. ie "\*[doc-str-dfp]"\*[doc-section-synopsis]" \{\ ++. if t \ ++. na ++. nr doc-in-synopsis-section 1 ++. nr doc-indent-synopsis 0 ++. nr doc-indent-synopsis-active 0 ++. \} ++. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-library]" \{\ ++. nr doc-in-library-section 1 ++. \} ++. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-description]" \{\ ++. nr doc-is-func 0 ++. nr doc-func-count 0 ++. nr doc-func-args-processed 0 ++. nr doc-num-func-args 0 ++. \} ++. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-see-also]" \{\ ++. if t \ ++. na ++. nr doc-in-see-also-section 1 ++. \} ++. el \{ .ie "\*[doc-str-dfp]"\*[doc-section-files]" \ ++. nr doc-in-files-section 1 ++. el .if "\*[doc-str-dfp]"\*[doc-section-authors]" \ ++. nr doc-in-authors-section 1 ++. \}\}\}\} ++. ++. in 0 ++. nr doc-have-author 0 ++. \} ++. ++. doc-setup-page-layout ++. sp ++. ns ++. ta T .5i ++. if !\n[cR] \ ++. ne 3 ++. fi ++. ++. if t \{\ ++. nr doc-reg-Sh \n[.ss] ++. nr doc-reg-Sh1 \n[.sss] ++. ss (\n[.ss] * 5 / 3) (\n[.sss] * 5 / 3) ++. \} ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Sh-font]\c ++. doc-print-recursive ++. ++. if t \ ++. ss \n[doc-reg-Sh] \n[doc-reg-Sh1] ++. ++. in +\n[doc-subheader-indent]u ++. ns ++. ++. doc-check-depth ++. \} ++.. ++. ++. ++.\" NS Ss user macro (not callable) ++.\" NS subsection ++.\" NS ++.\" NS local variable: ++.\" NS doc-reg-Ss ++.\" NS doc-reg-Ss1 ++.\" NS ++.\" NS width register `Ss' set above ++. ++.de Ss ++. ie \n[doc-arg-limit] \{\ ++. \" we only allow `Ss' within `Ss'; it will change the font back to ++. \" `doc-Sh-font' ++. ie "\*[doc-macro-name]"Ss" \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Sh-font]\c ++. doc-print-recursive ++. \} ++. el \{\ ++. tm Usage: .Ss subsection_name ... (#\n[.c]) ++. doc-reset-args ++. \}\} ++. el \{\ ++. tm Usage: .Ss not callable by other macros (#\n[.c]) ++. doc-reset-args ++. \}\} ++. el \{\ ++. if !\n[.$] \{\ ++. tm Usage: .Ss subsection_name ... (#\n[.c]) ++. return ++. \} ++. ++. ds doc-macro-name Ss ++. doc-parse-args \$@ ++. ++. sp ++. if !\n[cR] \ ++. ne 3 ++. ti -.25i ++. ++. nr doc-reg-Ss \n[.ss] ++. nr doc-reg-Ss1 \n[.sss] ++. ss (\n[.ss] * 5 / 4) (\n[.sss] * 5 / 4) ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Sh-font]\c ++. doc-print-recursive ++. ++. ss \n[doc-reg-Ss] \n[doc-reg-Ss1] ++. ++. ta T .5i ++. if !\n[cR] \ ++. ne 2 ++. br ++. ns ++. ++. doc-check-depth ++. \} ++.. ++. ++. ++.\" NS Rd macro (not parsed, not callable) ++.\" NS print global register dump to stderr ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Rd ++. ++.de Rd ++. tm MDOC GLOBAL REGISTER DUMP ++. tm doc-macro-name == `\*[doc-macro-name]' ++. tm doc-arg-limit == \n[doc-arg-limit] ++. tm doc-num-args == \n[doc-num-args] ++. tm doc-arg-ptr == \n[doc-arg-ptr] ++. ++. nr doc-reg-Rd 1 ++. while (\n[doc-reg-Rd] <= \n[doc-arg-limit]) \{\ ++. tm doc-arg\n[doc-reg-Rd] == `\*[doc-arg\n[doc-reg-Rd]]' ++. tm doc-type\n[doc-reg-Rd] == \n[doc-type\n[doc-reg-Rd]] ++. tm doc-space\n[doc-reg-Rd] == `\*[doc-space\n[doc-reg-Rd]]' ++. nr doc-reg-Rd +1 ++. \} ++. ++. tm doc-curr-font == \n[doc-curr-font] ++. tm doc-curr-size == \n[doc-curr-size] ++. tm doc-indent-synopsis == \n[doc-indent-synopsis] ++. tm doc-indent-synopsis-active == \n[doc-indent-synopsis-active] ++. tm doc-have-decl == \n[doc-have-decl] ++. tm doc-have-var == \n[doc-have-var] ++. tm doc-command-name == `\*[doc-command-name]' ++. tm doc-quote-left == `\*[doc-quote-left]' ++. tm doc-quote-right == `\*[doc-quote-right]' ++. tm doc-nesting-level == \n[doc-nesting-level] ++. tm doc-in-list == \n[doc-in-list] ++. tm doc-space == `\*[doc-space]' ++. tm doc-saved-space == `\*[doc-saved-space]' ++. tm doc-space-mode == \n[doc-space-mode] ++. tm doc-have-space == \n[doc-have-space] ++. tm doc-have-slot == \n[doc-have-slot] ++. tm doc-keep-type == \n[doc-keep-type] ++. tm doc-display-depth == \n[doc-display-depth] ++. tm doc-is-compact == \n[doc-is-compact] ++. ++. nr doc-reg-Rd 0 ++. while (\n[doc-reg-Rd] <= \n[doc-display-depth]) \{\ ++. tm doc-display-type-stack\n[doc-reg-Rd] == `\*[doc-display-type-stack\n[doc-reg-Rd]]' ++. tm doc-display-indent-stack\n[doc-reg-Rd] == \n[doc-display-indent-stack\n[doc-reg-Rd]] ++. tm doc-display-ad-stack\n[doc-reg-Rd] == \n[doc-display-ad-stack\n[doc-reg-Rd]] ++. tm doc-display-fi-stack\n[doc-reg-Rd] == \n[doc-display-fi-stack\n[doc-reg-Rd]] ++. tm doc-display-ft-stack\n[doc-reg-Rd] == \n[doc-display-ft-stack\n[doc-reg-Rd]] ++. tm doc-display-ps-stack\n[doc-reg-Rd] == \n[doc-display-ps-stack\n[doc-reg-Rd]] ++. nr doc-reg-Rd +1 ++. \} ++. ++. tm doc-fontmode-depth == \n[doc-fontmode-depth] ++. ++. nr doc-reg-Rd 1 ++. while (\n[doc-reg-Rd] <= \n[doc-fontmode-depth]) \{\ ++. tm doc-fontmode-font-stack\n[doc-reg-Rd] == `\n[doc-fontmode-font-stack\n[doc-reg-Rd]]' ++. tm doc-fontmode-size-stack\n[doc-reg-Rd] == `\n[doc-fontmode-size-stack\n[doc-reg-Rd]]' ++. nr doc-reg-Rd +1 ++. \} ++. ++. tm doc-list-depth == \n[doc-list-depth] ++. ++. nr doc-reg-Rd 1 ++. while (\n[doc-reg-Rd] <= \n[doc-list-depth]) \{\ ++. tm doc-list-type-stack\n[doc-reg-Rd] == `\*[doc-list-type-stack\n[doc-reg-Rd]]' ++. tm doc-list-have-indent-stack\n[doc-reg-Rd] == \n[doc-list-have-indent-stack\n[doc-reg-Rd]] ++. tm doc-list-indent-stack\n[doc-reg-Rd] == \n[doc-list-indent-stack\n[doc-reg-Rd]] ++. tm doc-compact-list-stack\n[doc-reg-Rd] == \n[doc-compact-list-stack\n[doc-reg-Rd]] ++. tm doc-tag-prefix-stack\n[doc-reg-Rd] == `\*[doc-tag-prefix-stack\n[doc-reg-Rd]]' ++. tm doc-tag-width-stack\n[doc-reg-Rd] == `\*[doc-tag-width-stack\n[doc-reg-Rd]]' ++. tm doc-list-offset-stack\n[doc-reg-Rd] == \n[doc-list-offset-stack\n[doc-reg-Rd]] ++. tm doc-enum-list-count-stack\n[doc-reg-Rd] == \n[doc-enum-list-count-stack\n[doc-reg-Rd]] ++. nr doc-reg-Rd +1 ++. \} ++. ++. tm doc-saved-Pa-font == `\*[doc-saved-Pa-font]' ++. tm doc-curr-type == \n[doc-curr-type] ++. tm doc-curr-arg == `\*[doc-curr-arg]' ++. tm doc-diag-list-input-line-count == \n[doc-diag-list-input-line-count] ++. tm doc-num-columns == \n[doc-num-columns] ++. tm doc-column-indent-width == \n[doc-column-indent-width] ++. tm doc-is-func == \n[doc-is-func] ++. tm doc-have-old-func == \n[doc-have-old-func] ++. tm doc-func-arg-count == \n[doc-func-arg-count] ++. tm doc-func-arg == `\*[doc-func-arg]' ++. tm doc-num-func-args == \n[doc-num-func-args] ++. tm doc-func-args-processed == \n[doc-func-args-processed] ++. tm doc-have-func == \n[doc-have-func] ++. tm doc-is-reference == \n[doc-is-reference] ++. tm doc-reference-count == \n[doc-reference-count] ++. tm doc-author-count == \n[doc-author-count] ++. ++. nr doc-reg-Rd 0 ++. while (\n[doc-reg-Rd] <= \n[doc-author-count]) \{\ ++. tm doc-author-name\n[doc-reg-Rd] == `\*[doc-author-name\n[doc-reg-Rd]]' ++. nr doc-reg-Rd +1 ++. \} ++. ++. tm doc-book-count == \n[doc-book-count] ++. tm doc-book-name == `\*[doc-book-name]' ++. tm doc-date-count == \n[doc-date-count] ++. tm doc-date == `\*[doc-date]' ++. tm doc-publisher-count == \n[doc-publisher-count] ++. tm doc-publisher-name == `\*[doc-publisher-name]' ++. tm doc-journal-count == \n[doc-journal-count] ++. tm doc-journal-name == `\*[doc-journal-name]' ++. tm doc-issue-count == \n[doc-issue-count] ++. tm doc-issue-name == `\*[doc-issue-name]' ++. tm doc-optional-count == \n[doc-optional-count] ++. tm doc-optional-string == `\*[doc-optional-string]' ++. tm doc-page-number-count == \n[doc-page-number-count] ++. tm doc-page-number-string == `\*[doc-page-number-string]' ++. tm doc-corporate-count == \n[doc-corporate-count] ++. tm doc-corporate-name == `\*[doc-corporate-name]' ++. tm doc-report-count == \n[doc-report-count] ++. tm doc-report-name == `\*[doc-report-name]' ++. tm doc-reference-title-count == \n[doc-reference-title-count] ++. tm doc-reference-title-name == `\*[doc-reference-title-name]' ++. tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]' ++. tm doc-url-count == \n[doc-url-count] ++. tm doc-url-name == `\*[doc-url-name]' ++. tm doc-volume-count == \n[doc-volume-count] ++. tm doc-volume-name == `\*[doc-volume-name]' ++. tm doc-have-author == \n[doc-have-author] ++. ++. tm doc-document-title == `\*[doc-document-title]' ++. tm doc-volume == `\*[doc-volume]' ++. tm doc-section == `\*[doc-section]' ++. tm doc-operating-system == `\*[doc-operating-system]' ++. tm doc-date-string == `\*[doc-date-string]' ++. tm doc-header-space == \n[doc-header-space] ++. tm doc-footer-space == \n[doc-footer-space] ++. tm doc-display-vertical == \n[doc-display-vertical] ++. tm doc-header-string == `\*[doc-header-string]' ++. tm doc-in-synopsis-section == \n[doc-in-synopsis-section] ++. tm doc-in-library-section == \n[doc-in-library-section] ++. tm doc-in-see-also-section == \n[doc-in-see-also-section] ++. tm doc-in-files-section == \n[doc-in-files-section] ++. tm doc-in-authors-section == \n[doc-in-authors-section] ++. ++. tm END OF GLOBAL REGISTER DUMP ++.. ++. ++. ++.ec ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-ditroff groff-1.22.3/tmac/doc-ditroff +--- groff-1.22.3.old/tmac/doc-ditroff 2014-11-04 10:38:35.533520146 +0200 ++++ groff-1.22.3/tmac/doc-ditroff 1970-01-01 02:00:00.000000000 +0200 +@@ -1,334 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" Copyright (c) 1991, 1993 +-.\" The Regents of the University of California. All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms, with or without +-.\" modification, are permitted provided that the following conditions +-.\" are met: +-.\" 1. Redistributions of source code must retain the above copyright +-.\" notice, this list of conditions and the following disclaimer. +-.\" 2. Redistributions in binary form must reproduce the above copyright +-.\" notice, this list of conditions and the following disclaimer in the +-.\" documentation and/or other materials provided with the distribution. +-.\" 3. [Deleted. See +-.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] +-.\" 4. Neither the name of the University nor the names of its contributors +-.\" may be used to endorse or promote products derived from this software +-.\" without specific prior written permission. +-.\" +-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-.\" SUCH DAMAGE. +-.\" +-.\" @(#)doc-ditroff 8.1 (Berkeley) 06/08/93 +-.\" +-.\" %beginstrip% +-. +-. +-.eo +-. +-.\" use -rD=1 for double-sided printing +-. +-.if !r D .nr D 0 +-. +-.\" use -rcR=1 to force the creation of a single, very long page +-. +-.if !r cR .nr cR 0 +-. +-.\" use -rS={11,12} to change the font size from 10pt to 11pt or 12pt. +-. +-.if !r S .nr S 10 +-. +-. +-.ec +-. +-. +-.ie (\n[S] == 11) \{\ +-. ps 10.95z +-. vs 13.6p +-.\} +-.el \{ .ie (\n[S] == 12) \{\ +-. ps 12z +-. vs 14.5p +-.\} +-.el \{\ +-. ps 10z +-. vs 12p +-.\}\} +-. +-. +-.\" the `doc-xx-font' strings must not be empty! +-. +-.ds doc-caption-font \f[R]\s[\n[.ps]u] +-.ds doc-caption-font2 \f[R]\s[\n[.ps]u] +-.ds doc-Ad-font \f[I]\s[\n[.ps]u] +-.ds doc-Ar-font \f[CO]\s[\n[.ps]u] +-.ds doc-Cm-font \f[CB]\s[\n[.ps]u] +-.ds doc-Em-font \f[I]\s[\n[.ps]u] +-.ds doc-Er-font \f[C]\s[\n[.ps]u] +-.ds doc-Ev-font \f[C]\s[\n[.ps]u] +-.ds doc-Fa-font \f[CO]\s[\n[.ps]u] +-.ds doc-Fd-font \f[CB]\s[\n[.ps]u] +-.ds doc-Fl-font \f[CB]\s[\n[.ps]u] +-.ds doc-Fn-font \f[CB]\s[\n[.ps]u] +-.ds doc-Ft-font \f[CO]\s[\n[.ps]u] +-.ds doc-Ic-font \f[CB]\s[\n[.ps]u] +-.ds doc-Li-font \f[C] +-.ds doc-Me-font \f[B]\s[\n[.ps]u] +-.ds doc-Nm-font \f[CB]\s[\n[.ps]u] +-.ds doc-No-font \f[R]\s[\n[.ps]u] +-.ds doc-Pa-font \f[C]\s[\n[.ps]u] +-.ds doc-Sh-font \f[B]\s[\n[.ps]u] +-.ds doc-Sy-font \f[B]\s[\n[.ps]u] +-.ds doc-Sx-font \f[B]\s[\n[.ps]u] +-.ds doc-Tn-font-shape \f[R] +-\# XXX: adapt to discrete LaTeX font sizes +-.ds doc-Tn-font-size \s[(\n[.ps]u - 1z)] +-.ds doc-Va-font \f[I]\s[\n[.ps]u] +-.ds doc-Xr-font \f[C]\s[\n[.ps]u] +-. +-.ds doc-left-parenthesis \f[R]\|(\|\f[]\s[\n[.ps]u] +-.ds doc-right-parenthesis \f[R]\|)\|\f[]\s[\n[.ps]u] +-.ds lp \f[R](\f[]\s[\n[.ps]u] +-.ds rp \f[R])\f[]\s[\n[.ps]u] +-.ds doc-left-bracket \f[R]\^[\^\f[]\s[\n[.ps]u] +-.ds doc-right-bracket \f[R]\^]\f[]\s[\n[.ps]u] +-. +-.tr *\[**] +-. +-.\" miscellaneous +-.nr doc-subheader-indent (\w\f[C],u * 5u) +-.nr doc-paragraph-space .5v +-. +-.nr doc-digit-width \w'\0'u +-.nr doc-fixed-width \w\f[C]0 +-. +-.eo +-. +-. +-.\" NS doc-header-space global register +-.\" NS the space between header and body +-. +-.nr doc-header-space .5i +-. +-. +-.\" NS doc-footer-space global register +-.\" NS the space between body and footer +-. +-.nr doc-footer-space .5i +-. +-. +-.\" NS doc-display-vertical global register +-.\" NS vertical space between list elements etc. +-. +-.nr doc-display-vertical 0 +-. +-. +-.\" NS doc-setup-page-layout macro +-.\" NS set up page layout +-.\" NS +-.\" NS modifies: +-.\" NS doc-display-vertical +-. +-.de doc-setup-page-layout +-. ie r LL \ +-. ll \n[LL]u +-. el \ +-. ll 6.5i +-. +-. ie r LT \ +-. lt \n[LT]u +-. el \ +-. lt 6.5i +-. +-. po 1i +-. +-. nr doc-display-vertical .5v +-.. +-. +-. +-.ds doc-left-singlequote \[oq] +-.ds doc-right-singlequote \[cq] +-. +-.\" the following strings are `official' +-.ds <= \[<=] +-.ds >= \[>=] +-.ds Lq \[lq] +-.ds Rq \[rq] +-.ds ua \[ua] +-.ds aa \[aa] +-.ds ga \[ga] +-.ds q \[dq] +-.ds Pi \[*p] +-.ds Ne \[!=] +-.ds Le \[<=] +-.ds Ge \[>=] +-.ds Lt < +-.ds Gt > +-.ds Pm \[+-] +-.ds If \[if] +-.ds Na \f[I]NaN\f[] +-.ds Ba \f[R]|\f[] +-.ds Am & +-. +-. +-.\" NS doc-header-string global string +-.\" NS the final string used for the manual page header +-. +-.ds doc-header-string +-. +-. +-.\" NS doc-setup-header macro +-.\" NS install and initialize header and footer support +-.\" NS +-.\" NS modifies: +-.\" NS doc-header-string +-. +-.de doc-setup-header +-. ds doc-header-string "\*[doc-document-title] +-. if !"\*[doc-section]"Null" \ +-. as doc-header-string \|(\*[doc-section]) +-. +-. wh 0 doc-header +-. wh -1.25i doc-footer +-. +-. br +-. +-. e@ doc-end-macro +-.. +-. +-. +-.\" NS doc-get-width macro +-.\" NS computes the width of a string as a multiple of `doc-fixed-width': +-.\" NS `.doc-get-width string' +-.\" NS +-.\" NS modifies: +-.\" NS doc-width +-. +-.de doc-get-width +-. nr doc-width \w\f[C]\$1 +-. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ +-. ie (\n[doc-width] % \n[doc-fixed-width]) \ +-. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) +-. el \ +-. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) +-. \} +-. el \{\ +-. ie \n[doc-width] \ +-. nr doc-width 1 +-. el \ +-. nr doc-width 0 +-. \} +-.. +-. +-. +-.\" NS doc-get-arg-width macro +-.\" NS computes the width of an argument as a multiple of +-.\" NS `doc-fixed-width': `.doc-get-arg-width arg-index' +-.\" NS +-.\" NS modifies: +-.\" NS doc-width +-. +-.de doc-get-arg-width +-. nr doc-width \w\f[C]\*[doc-arg\$1] +-. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ +-. ie (\n[doc-width] % \n[doc-fixed-width]) \ +-. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) +-. el \ +-. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) +-. \} +-. el \{\ +-. ie \n[doc-width] \ +-. nr doc-width 1 +-. el \ +-. nr doc-width 0 +-. \} +-.. +-. +-. +-.\" NS Ql user macro +-.\" NS quoted literal define +-.\" NS +-.\" NS modifies: +-.\" NS doc-argXXX +-.\" NS doc-arg-limit +-.\" NS doc-arg-ptr +-.\" NS doc-macro-name +-.\" NS doc-spaceXXX +-.\" NS doc-typeXXX +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Ql +-.\" NS doc-reg-Ql1 +-.\" NS doc-reg-Ql2 +-.\" NS +-.\" NS width register `Ql' set in doc-common +-. +-.de Ql +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Ql +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Ql argument ... (#\n[.c]) +-. \} +-. +-. nr doc-reg-Ql (\n[doc-arg-ptr] + 1) +-. doc-get-arg-width \n[doc-reg-Ql] +-. +-. \" don't use quotes if we have more than two succeeding string arguments +-. nr doc-reg-Ql +1 +-. if (\n[doc-arg-limit] >= \n[doc-reg-Ql]) \ +-. if (\n[doc-type\n[doc-reg-Ql]] == 2) \ +-. nr doc-width 3 +-. +-. \" make a difference in quotation style for strings longer +-. \" than two characters +-. ie (\n[doc-width] > 2) \ +-. Li +-. el \{\ +-. ie \n[doc-arg-ptr] \{\ +-. \" we replace `Ql' with `Li' +-. ds doc-arg\n[doc-arg-ptr] Li +-. nr doc-arg-ptr -1 +-. \} +-. el \{\ +-. \" if .Ql has been called directly, we must shift all elements in +-. \" the argument vector to the right so that we can insert `Li' +-. nr doc-reg-Ql \n[doc-arg-limit] +-. nr doc-reg-Ql1 (\n[doc-arg-limit] + 1) +-. while \n[doc-reg-Ql] \{\ +-. rn doc-arg\n[doc-reg-Ql] doc-arg\n[doc-reg-Ql1] +-. rnn doc-type\n[doc-reg-Ql] doc-type\n[doc-reg-Ql1] +-. rn doc-space\n[doc-reg-Ql] doc-space\n[doc-reg-Ql1] +-. nr doc-reg-Ql -1 +-. nr doc-reg-Ql1 -1 +-. \} +-. ds doc-arg1 Li +-. nr doc-type1 1 +-. ds doc-space1 +-. nr doc-arg-limit +1 +-. \} +-. +-. ds doc-quote-left "\*[doc-left-singlequote] +-. ds doc-quote-right "\*[doc-right-singlequote] +-. doc-enclose-string +-. \} +-.. +-. +-. +-.ec +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-ditroff-u groff-1.22.3/tmac/doc-ditroff-u +--- groff-1.22.3.old/tmac/doc-ditroff-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/doc-ditroff-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,334 @@ ++.\" -*- nroff -*- ++.\" ++.\" Copyright (c) 1991, 1993 ++.\" The Regents of the University of California. All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms, with or without ++.\" modification, are permitted provided that the following conditions ++.\" are met: ++.\" 1. Redistributions of source code must retain the above copyright ++.\" notice, this list of conditions and the following disclaimer. ++.\" 2. Redistributions in binary form must reproduce the above copyright ++.\" notice, this list of conditions and the following disclaimer in the ++.\" documentation and/or other materials provided with the distribution. ++.\" 3. [Deleted. See ++.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] ++.\" 4. Neither the name of the University nor the names of its contributors ++.\" may be used to endorse or promote products derived from this software ++.\" without specific prior written permission. ++.\" ++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++.\" SUCH DAMAGE. ++.\" ++.\" @(#)doc-ditroff 8.1 (Berkeley) 06/08/93 ++.\" ++.\" %beginstrip% ++. ++. ++.eo ++. ++.\" use -rD=1 for double-sided printing ++. ++.if !r D .nr D 0 ++. ++.\" use -rcR=1 to force the creation of a single, very long page ++. ++.if !r cR .nr cR 0 ++. ++.\" use -rS={11,12} to change the font size from 10pt to 11pt or 12pt. ++. ++.if !r S .nr S 10 ++. ++. ++.ec ++. ++. ++.ie (\n[S] == 11) \{\ ++. ps 10.95z ++. vs 13.6p ++.\} ++.el \{ .ie (\n[S] == 12) \{\ ++. ps 12z ++. vs 14.5p ++.\} ++.el \{\ ++. ps 10z ++. vs 12p ++.\}\} ++. ++. ++.\" the `doc-xx-font' strings must not be empty! ++. ++.ds doc-caption-font \f[R]\s[\n[.ps]u] ++.ds doc-caption-font2 \f[R]\s[\n[.ps]u] ++.ds doc-Ad-font \f[I]\s[\n[.ps]u] ++.ds doc-Ar-font \f[CO]\s[\n[.ps]u] ++.ds doc-Cm-font \f[CB]\s[\n[.ps]u] ++.ds doc-Em-font \f[I]\s[\n[.ps]u] ++.ds doc-Er-font \f[C]\s[\n[.ps]u] ++.ds doc-Ev-font \f[C]\s[\n[.ps]u] ++.ds doc-Fa-font \f[CO]\s[\n[.ps]u] ++.ds doc-Fd-font \f[CB]\s[\n[.ps]u] ++.ds doc-Fl-font \f[CB]\s[\n[.ps]u] ++.ds doc-Fn-font \f[CB]\s[\n[.ps]u] ++.ds doc-Ft-font \f[CO]\s[\n[.ps]u] ++.ds doc-Ic-font \f[CB]\s[\n[.ps]u] ++.ds doc-Li-font \f[C] ++.ds doc-Me-font \f[B]\s[\n[.ps]u] ++.ds doc-Nm-font \f[CB]\s[\n[.ps]u] ++.ds doc-No-font \f[R]\s[\n[.ps]u] ++.ds doc-Pa-font \f[C]\s[\n[.ps]u] ++.ds doc-Sh-font \f[B]\s[\n[.ps]u] ++.ds doc-Sy-font \f[B]\s[\n[.ps]u] ++.ds doc-Sx-font \f[B]\s[\n[.ps]u] ++.ds doc-Tn-font-shape \f[R] ++\# XXX: adapt to discrete LaTeX font sizes ++.ds doc-Tn-font-size \s[(\n[.ps]u - 1z)] ++.ds doc-Va-font \f[I]\s[\n[.ps]u] ++.ds doc-Xr-font \f[C]\s[\n[.ps]u] ++. ++.ds doc-left-parenthesis \f[R]\|(\|\f[]\s[\n[.ps]u] ++.ds doc-right-parenthesis \f[R]\|)\|\f[]\s[\n[.ps]u] ++.ds lp \f[R](\f[]\s[\n[.ps]u] ++.ds rp \f[R])\f[]\s[\n[.ps]u] ++.ds doc-left-bracket \f[R]\^[\^\f[]\s[\n[.ps]u] ++.ds doc-right-bracket \f[R]\^]\f[]\s[\n[.ps]u] ++. ++.tr *\[**] ++. ++.\" miscellaneous ++.nr doc-subheader-indent (\w\f[C],u * 5u) ++.nr doc-paragraph-space .5v ++. ++.nr doc-digit-width \w'\0'u ++.nr doc-fixed-width \w\f[C]0 ++. ++.eo ++. ++. ++.\" NS doc-header-space global register ++.\" NS the space between header and body ++. ++.nr doc-header-space .5i ++. ++. ++.\" NS doc-footer-space global register ++.\" NS the space between body and footer ++. ++.nr doc-footer-space .5i ++. ++. ++.\" NS doc-display-vertical global register ++.\" NS vertical space between list elements etc. ++. ++.nr doc-display-vertical 0 ++. ++. ++.\" NS doc-setup-page-layout macro ++.\" NS set up page layout ++.\" NS ++.\" NS modifies: ++.\" NS doc-display-vertical ++. ++.de doc-setup-page-layout ++. ie r LL \ ++. ll \n[LL]u ++. el \ ++. ll 6.5i ++. ++. ie r LT \ ++. lt \n[LT]u ++. el \ ++. lt 6.5i ++. ++. po 1i ++. ++. nr doc-display-vertical .5v ++.. ++. ++. ++.ds doc-left-singlequote \[oq] ++.ds doc-right-singlequote \[cq] ++. ++.\" the following strings are `official' ++.ds <= \[<=] ++.ds >= \[>=] ++.ds Lq \[lq] ++.ds Rq \[rq] ++.ds ua \[ua] ++.ds aa \[aa] ++.ds ga \[ga] ++.ds q \[dq] ++.ds Pi \[*p] ++.ds Ne \[!=] ++.ds Le \[<=] ++.ds Ge \[>=] ++.ds Lt < ++.ds Gt > ++.ds Pm \[+-] ++.ds If \[if] ++.ds Na \f[I]NaN\f[] ++.ds Ba \f[R]|\f[] ++.ds Am & ++. ++. ++.\" NS doc-header-string global string ++.\" NS the final string used for the manual page header ++. ++.ds doc-header-string ++. ++. ++.\" NS doc-setup-header macro ++.\" NS install and initialize header and footer support ++.\" NS ++.\" NS modifies: ++.\" NS doc-header-string ++. ++.de doc-setup-header ++. ds doc-header-string "\*[doc-document-title] ++. if !"\*[doc-section]"Null" \ ++. as doc-header-string \|(\*[doc-section]) ++. ++. wh 0 doc-header ++. wh -1.25i doc-footer ++. ++. br ++. ++. e@ doc-end-macro ++.. ++. ++. ++.\" NS doc-get-width macro ++.\" NS computes the width of a string as a multiple of `doc-fixed-width': ++.\" NS `.doc-get-width string' ++.\" NS ++.\" NS modifies: ++.\" NS doc-width ++. ++.de doc-get-width ++. nr doc-width \w\f[C]\$1 ++. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ ++. ie (\n[doc-width] % \n[doc-fixed-width]) \ ++. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) ++. el \ ++. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) ++. \} ++. el \{\ ++. ie \n[doc-width] \ ++. nr doc-width 1 ++. el \ ++. nr doc-width 0 ++. \} ++.. ++. ++. ++.\" NS doc-get-arg-width macro ++.\" NS computes the width of an argument as a multiple of ++.\" NS `doc-fixed-width': `.doc-get-arg-width arg-index' ++.\" NS ++.\" NS modifies: ++.\" NS doc-width ++. ++.de doc-get-arg-width ++. nr doc-width \w\f[C]\*[doc-arg\$1] ++. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ ++. ie (\n[doc-width] % \n[doc-fixed-width]) \ ++. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) ++. el \ ++. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) ++. \} ++. el \{\ ++. ie \n[doc-width] \ ++. nr doc-width 1 ++. el \ ++. nr doc-width 0 ++. \} ++.. ++. ++. ++.\" NS Ql user macro ++.\" NS quoted literal define ++.\" NS ++.\" NS modifies: ++.\" NS doc-argXXX ++.\" NS doc-arg-limit ++.\" NS doc-arg-ptr ++.\" NS doc-macro-name ++.\" NS doc-spaceXXX ++.\" NS doc-typeXXX ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Ql ++.\" NS doc-reg-Ql1 ++.\" NS doc-reg-Ql2 ++.\" NS ++.\" NS width register `Ql' set in doc-common ++. ++.de Ql ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Ql ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Ql argument ... (#\n[.c]) ++. \} ++. ++. nr doc-reg-Ql (\n[doc-arg-ptr] + 1) ++. doc-get-arg-width \n[doc-reg-Ql] ++. ++. \" don't use quotes if we have more than two succeeding string arguments ++. nr doc-reg-Ql +1 ++. if (\n[doc-arg-limit] >= \n[doc-reg-Ql]) \ ++. if (\n[doc-type\n[doc-reg-Ql]] == 2) \ ++. nr doc-width 3 ++. ++. \" make a difference in quotation style for strings longer ++. \" than two characters ++. ie (\n[doc-width] > 2) \ ++. Li ++. el \{\ ++. ie \n[doc-arg-ptr] \{\ ++. \" we replace `Ql' with `Li' ++. ds doc-arg\n[doc-arg-ptr] Li ++. nr doc-arg-ptr -1 ++. \} ++. el \{\ ++. \" if .Ql has been called directly, we must shift all elements in ++. \" the argument vector to the right so that we can insert `Li' ++. nr doc-reg-Ql \n[doc-arg-limit] ++. nr doc-reg-Ql1 (\n[doc-arg-limit] + 1) ++. while \n[doc-reg-Ql] \{\ ++. rn doc-arg\n[doc-reg-Ql] doc-arg\n[doc-reg-Ql1] ++. rnn doc-type\n[doc-reg-Ql] doc-type\n[doc-reg-Ql1] ++. rn doc-space\n[doc-reg-Ql] doc-space\n[doc-reg-Ql1] ++. nr doc-reg-Ql -1 ++. nr doc-reg-Ql1 -1 ++. \} ++. ds doc-arg1 Li ++. nr doc-type1 1 ++. ds doc-space1 ++. nr doc-arg-limit +1 ++. \} ++. ++. ds doc-quote-left "\*[doc-left-singlequote] ++. ds doc-quote-right "\*[doc-right-singlequote] ++. doc-enclose-string ++. \} ++.. ++. ++. ++.ec ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-nroff groff-1.22.3/tmac/doc-nroff +--- groff-1.22.3.old/tmac/doc-nroff 2014-11-04 10:38:35.533520146 +0200 ++++ groff-1.22.3/tmac/doc-nroff 1970-01-01 02:00:00.000000000 +0200 +@@ -1,277 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" Copyright (c) 1991, 1993 +-.\" The Regents of the University of California. All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms, with or without +-.\" modification, are permitted provided that the following conditions +-.\" are met: +-.\" 1. Redistributions of source code must retain the above copyright +-.\" notice, this list of conditions and the following disclaimer. +-.\" 2. Redistributions in binary form must reproduce the above copyright +-.\" notice, this list of conditions and the following disclaimer in the +-.\" documentation and/or other materials provided with the distribution. +-.\" 3. [Deleted. See +-.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] +-.\" 4. Neither the name of the University nor the names of its contributors +-.\" may be used to endorse or promote products derived from this software +-.\" without specific prior written permission. +-.\" +-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-.\" SUCH DAMAGE. +-.\" +-.\" @(#)doc-nroff 8.1 (Berkeley) 06/08/93 +-.\" +-.\" %beginstrip% +-. +-. +-.eo +-. +-.\" use -rD=1 for double-sided printing +-. +-.if !r D .nr D 0 +-. +-.\" use -rcR=0 to have multiple pages instead of a single, very long page +-. +-.if !r cR .nr cR 1 +-. +-.\" the following switch is ignored in nroff mode +-. +-.nr S 10 +-. +-.\" the `doc-xx-font' strings must not be empty! +-. +-.ds doc-caption-font \f[R] +-.ds doc-caption-font2 \f[R] +-.ds doc-Ad-font \f[I] +-.ds doc-Ar-font \f[I] +-.ds doc-Cm-font \f[B] +-.ds doc-Em-font \f[I] +-.ds doc-Er-font \f[R] +-.ds doc-Ev-font \f[R] +-.ds doc-Fa-font \f[I] +-.ds doc-Fd-font \f[B] +-.ds doc-Fl-font \f[B] +-.ds doc-Fn-font \f[B] +-.ds doc-Ft-font \f[I] +-.ds doc-Ic-font \f[B] +-.ds doc-Li-font \f[R] +-.ds doc-Me-font \f[B] +-.ds doc-Nm-font \f[B] +-.ds doc-No-font \f[R] +-.ds doc-Pa-font \f[I] +-.ds doc-Sh-font \f[B] +-.ds doc-Sy-font \f[B] +-.ds doc-Sx-font \f[I] +-.ds doc-Tn-font-shape \f[R] +-.ds doc-Tn-font-size +-.ds doc-Va-font \f[I] +-.ds doc-Xr-font \f[R] +-. +-.ds doc-left-parenthesis \f[R](\f[] +-.ds doc-right-parenthesis \f[R])\f[] +-.ds lp \f[R](\f[] +-.ds rp \f[R])\f[] +-.ds doc-left-bracket \f[R][\f[] +-.ds doc-right-bracket \f[R]]\f[] +-. +-.\" miscellaneous +-.nr doc-subheader-indent .5i +-.nr doc-paragraph-space 1v +-. +-.ec +-.nr doc-digit-width \w'\0\0'u +-.nr doc-fixed-width \w'0' +-.eo +-. +-. +-.\" NS doc-header-space global register +-.\" NS the space between header and body +-. +-.nr doc-header-space 0.5i +-. +-. +-.\" NS doc-footer-space global register +-.\" NS the space between body and footer +-. +-.nr doc-footer-space 0.5i +-. +-. +-.\" NS doc-display-vertical global register +-.\" NS vertical space between list elements etc. +-. +-.nr doc-display-vertical 0 +-. +-. +-.\" NS doc-setup-page-layout macro +-.\" NS set up page layout +-.\" NS +-.\" NS modifies: +-.\" NS doc-display-vertical +-. +-.de doc-setup-page-layout +-. ie r LL \ +-. ll \n[LL]u +-. el \ +-. ll 78n +-. +-. ie r LT \ +-. lt \n[LT]u +-. el \ +-. lt 78n +-. +-. po 0i +-. +-. nr doc-display-vertical 1v +-. ad l +-. na +-.. +-. +-. +-.ec +-. +-.ds doc-left-singlequote \[oq] +-.ds doc-right-singlequote \[cq] +-. +-.\" the following strings are `official' +-.ds <= \[<=] +-.ds >= \[>=] +-.ds aa \[aa] +-.ds ga \[ga] +-.ds q \[dq] +-.ds Ne \[!=] +-.ds Le \[<=] +-.ds Ge \[>=] +-.ds Lt < +-.ds Gt > +-.ds Pm \[+-] +-.ds Na \f[I]NaN\f[] +-.ds Ba \f[R]|\f[] +-.ds Am & +-. +-.\" Unicode TTYs have all glyph forms; for other TTY character sets we need +-.\" character representations which are different from GNU troff's standard +-.\" forms. +-.ie '\*[.T]'utf8' \{\ +-. ds Rq \[rq] +-. ds Lq \[lq] +-. ds ua \[ua] +-. ds Pi \[*p] +-. ds If \[if] +-.\} +-.el \{\ +-. ds Rq '' +-. ds Lq `` +-. ds ua ^ +-. ds Pi pi +-. ds If infinity +-.\} +-. +-.eo +-. +-. +-.\" NS doc-header-string global string +-.\" NS the final string used for the manual page header +-. +-.ds doc-header-string +-. +-. +-.\" NS doc-setup-header macro +-.\" NS install and initialize header and footer support +-.\" NS +-.\" NS modifies: +-.\" NS doc-header-string +-. +-.de doc-setup-header +-. ds doc-header-string "\*[doc-document-title] +-. if !"\*[doc-section]"Null" \ +-. as doc-header-string (\*[doc-section]) +-. +-. ie \n[cR] \ +-. doc-header +-. el \{\ +-. wh 0 doc-header +-. wh -1.167i doc-footer +-. \} +-. +-. e@ doc-end-macro +-.. +-. +-. +-.\" NS doc-get-width macro +-.\" NS computes the width of a string as a multiple of `doc-fixed-width': +-.\" NS `.doc-get-width string' +-.\" NS +-.\" NS modifies: +-.\" NS doc-width +-. +-.de doc-get-width +-. nr doc-width \w\$1 +-. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ +-. ie (\n[doc-width] % \n[doc-fixed-width]) \ +-. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) +-. el \ +-. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) +-. \} +-. el \ +-. nr doc-width 0 +-.. +-. +-. +-.\" NS doc-get-arg-width macro +-.\" NS computes the width of an argument as a multiple of +-.\" NS `doc-fixed-width': `.doc-get-arg-width arg-index' +-.\" NS +-.\" NS modifies: +-.\" NS doc-width +-. +-.de doc-get-arg-width +-. nr doc-width \w\*[doc-arg\$1] +-. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ +-. ie (\n[doc-width] % \n[doc-fixed-width]) \ +-. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) +-. el \ +-. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) +-. \} +-. el \ +-. nr doc-width 0 +-.. +-. +-. +-.\" NS Ql user macro +-.\" NS quoted literal define +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Ql' set in doc-common +-. +-.de Ql +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \ +-. ds doc-macro-name Ql +-. el \ +-. tm Usage: .Ql argument ... (#\n[.c]) +-. \} +-. +-. ds doc-quote-left "\*[doc-left-singlequote] +-. ds doc-quote-right "\*[doc-right-singlequote] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.ec +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-nroff-u groff-1.22.3/tmac/doc-nroff-u +--- groff-1.22.3.old/tmac/doc-nroff-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/doc-nroff-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,277 @@ ++.\" -*- nroff -*- ++.\" ++.\" Copyright (c) 1991, 1993 ++.\" The Regents of the University of California. All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms, with or without ++.\" modification, are permitted provided that the following conditions ++.\" are met: ++.\" 1. Redistributions of source code must retain the above copyright ++.\" notice, this list of conditions and the following disclaimer. ++.\" 2. Redistributions in binary form must reproduce the above copyright ++.\" notice, this list of conditions and the following disclaimer in the ++.\" documentation and/or other materials provided with the distribution. ++.\" 3. [Deleted. See ++.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] ++.\" 4. Neither the name of the University nor the names of its contributors ++.\" may be used to endorse or promote products derived from this software ++.\" without specific prior written permission. ++.\" ++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++.\" SUCH DAMAGE. ++.\" ++.\" @(#)doc-nroff 8.1 (Berkeley) 06/08/93 ++.\" ++.\" %beginstrip% ++. ++. ++.eo ++. ++.\" use -rD=1 for double-sided printing ++. ++.if !r D .nr D 0 ++. ++.\" use -rcR=0 to have multiple pages instead of a single, very long page ++. ++.if !r cR .nr cR 1 ++. ++.\" the following switch is ignored in nroff mode ++. ++.nr S 10 ++. ++.\" the `doc-xx-font' strings must not be empty! ++. ++.ds doc-caption-font \f[R] ++.ds doc-caption-font2 \f[R] ++.ds doc-Ad-font \f[I] ++.ds doc-Ar-font \f[I] ++.ds doc-Cm-font \f[B] ++.ds doc-Em-font \f[I] ++.ds doc-Er-font \f[R] ++.ds doc-Ev-font \f[R] ++.ds doc-Fa-font \f[I] ++.ds doc-Fd-font \f[B] ++.ds doc-Fl-font \f[B] ++.ds doc-Fn-font \f[B] ++.ds doc-Ft-font \f[I] ++.ds doc-Ic-font \f[B] ++.ds doc-Li-font \f[R] ++.ds doc-Me-font \f[B] ++.ds doc-Nm-font \f[B] ++.ds doc-No-font \f[R] ++.ds doc-Pa-font \f[I] ++.ds doc-Sh-font \f[B] ++.ds doc-Sy-font \f[B] ++.ds doc-Sx-font \f[I] ++.ds doc-Tn-font-shape \f[R] ++.ds doc-Tn-font-size ++.ds doc-Va-font \f[I] ++.ds doc-Xr-font \f[R] ++. ++.ds doc-left-parenthesis \f[R](\f[] ++.ds doc-right-parenthesis \f[R])\f[] ++.ds lp \f[R](\f[] ++.ds rp \f[R])\f[] ++.ds doc-left-bracket \f[R][\f[] ++.ds doc-right-bracket \f[R]]\f[] ++. ++.\" miscellaneous ++.nr doc-subheader-indent .5i ++.nr doc-paragraph-space 1v ++. ++.ec ++.nr doc-digit-width \w'\0\0'u ++.nr doc-fixed-width \w'0' ++.eo ++. ++. ++.\" NS doc-header-space global register ++.\" NS the space between header and body ++. ++.nr doc-header-space 0.5i ++. ++. ++.\" NS doc-footer-space global register ++.\" NS the space between body and footer ++. ++.nr doc-footer-space 0.5i ++. ++. ++.\" NS doc-display-vertical global register ++.\" NS vertical space between list elements etc. ++. ++.nr doc-display-vertical 0 ++. ++. ++.\" NS doc-setup-page-layout macro ++.\" NS set up page layout ++.\" NS ++.\" NS modifies: ++.\" NS doc-display-vertical ++. ++.de doc-setup-page-layout ++. ie r LL \ ++. ll \n[LL]u ++. el \ ++. ll 78n ++. ++. ie r LT \ ++. lt \n[LT]u ++. el \ ++. lt 78n ++. ++. po 0i ++. ++. nr doc-display-vertical 1v ++. ad l ++. na ++.. ++. ++. ++.ec ++. ++.ds doc-left-singlequote \[oq] ++.ds doc-right-singlequote \[cq] ++. ++.\" the following strings are `official' ++.ds <= \[<=] ++.ds >= \[>=] ++.ds aa \[aa] ++.ds ga \[ga] ++.ds q \[dq] ++.ds Ne \[!=] ++.ds Le \[<=] ++.ds Ge \[>=] ++.ds Lt < ++.ds Gt > ++.ds Pm \[+-] ++.ds Na \f[I]NaN\f[] ++.ds Ba \f[R]|\f[] ++.ds Am & ++. ++.\" Unicode TTYs have all glyph forms; for other TTY character sets we need ++.\" character representations which are different from GNU troff's standard ++.\" forms. ++.ie '\*[.T]'utf8' \{\ ++. ds Rq \[rq] ++. ds Lq \[lq] ++. ds ua \[ua] ++. ds Pi \[*p] ++. ds If \[if] ++.\} ++.el \{\ ++. ds Rq '' ++. ds Lq `` ++. ds ua ^ ++. ds Pi pi ++. ds If infinity ++.\} ++. ++.eo ++. ++. ++.\" NS doc-header-string global string ++.\" NS the final string used for the manual page header ++. ++.ds doc-header-string ++. ++. ++.\" NS doc-setup-header macro ++.\" NS install and initialize header and footer support ++.\" NS ++.\" NS modifies: ++.\" NS doc-header-string ++. ++.de doc-setup-header ++. ds doc-header-string "\*[doc-document-title] ++. if !"\*[doc-section]"Null" \ ++. as doc-header-string (\*[doc-section]) ++. ++. ie \n[cR] \ ++. doc-header ++. el \{\ ++. wh 0 doc-header ++. wh -1.167i doc-footer ++. \} ++. ++. e@ doc-end-macro ++.. ++. ++. ++.\" NS doc-get-width macro ++.\" NS computes the width of a string as a multiple of `doc-fixed-width': ++.\" NS `.doc-get-width string' ++.\" NS ++.\" NS modifies: ++.\" NS doc-width ++. ++.de doc-get-width ++. nr doc-width \w\$1 ++. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ ++. ie (\n[doc-width] % \n[doc-fixed-width]) \ ++. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) ++. el \ ++. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) ++. \} ++. el \ ++. nr doc-width 0 ++.. ++. ++. ++.\" NS doc-get-arg-width macro ++.\" NS computes the width of an argument as a multiple of ++.\" NS `doc-fixed-width': `.doc-get-arg-width arg-index' ++.\" NS ++.\" NS modifies: ++.\" NS doc-width ++. ++.de doc-get-arg-width ++. nr doc-width \w\*[doc-arg\$1] ++. ie (\n[doc-width] >= \n[doc-fixed-width]) \{\ ++. ie (\n[doc-width] % \n[doc-fixed-width]) \ ++. nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1) ++. el \ ++. nr doc-width (\n[doc-width] / \n[doc-fixed-width]) ++. \} ++. el \ ++. nr doc-width 0 ++.. ++. ++. ++.\" NS Ql user macro ++.\" NS quoted literal define ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Ql' set in doc-common ++. ++.de Ql ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \ ++. ds doc-macro-name Ql ++. el \ ++. tm Usage: .Ql argument ... (#\n[.c]) ++. \} ++. ++. ds doc-quote-left "\*[doc-left-singlequote] ++. ds doc-quote-right "\*[doc-right-singlequote] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.ec ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-old.tmac groff-1.22.3/tmac/doc-old.tmac +--- groff-1.22.3.old/tmac/doc-old.tmac 2014-11-04 10:38:35.533520146 +0200 ++++ groff-1.22.3/tmac/doc-old.tmac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1857 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" Copyright (c) 1990 The Regents of the University of California. +-.\" All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms, with or without +-.\" modification, are permitted provided that the following conditions +-.\" are met: +-.\" 1. Redistributions of source code must retain the above copyright +-.\" notice, this list of conditions and the following disclaimer. +-.\" 2. Redistributions in binary form must reproduce the above copyright +-.\" notice, this list of conditions and the following disclaimer in the +-.\" documentation and/or other materials provided with the distribution. +-.\" 3. [Deleted. See +-.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] +-.\" 4. Neither the name of the University nor the names of its contributors +-.\" may be used to endorse or promote products derived from this software +-.\" without specific prior written permission. +-.\" +-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-.\" SUCH DAMAGE. +-.\" +-.\" @(#)doc-old.tmac 5.2 (Berkeley) 3/13/91 +-.\" Slightly modified by jjc@jclark.com to work with groff as well. +-.\" +-.\" Assume nroff on crt's only if cR==1 +-.if n .nr cR 1 +-.\" STRING CONSTANTS +-.\" DITROFF +-.if t \{\ +-.\" Address Style +-.ds aD \fI +-.\" Argument Reference Style +-.ds aR \f(CO +-.\" Interactive Command Modifier (flag) +-.ds cM \f(CB +-.\" Emphasis (in the English sense - usually italics) +-.ds eM \fI +-.\" Errno Style +-.ds eR \fC +-.\" Environment Variable Style +-.ds eV \fC +-.\" Command Line Flag Style +-.ds fL \f(CB +-.\" Header String Style +-.ds Hs \fR +-.\" Interactive Command Style +-.ds iC \f(CB +-.\" Literal Style +-.ds lI \fC +-.\" Left Parenthesis Style +-.ds lP \fR\|(\|\fP +-.\" Right Parenthesis Style +-.ds rP \fR\|)\|\fP +-.\" Options Open Bracket Style +-.ds lB \fR\^[\^\fP +-.\" Options Open Bracket Style +-.ds rB \fR\^]\fP +-.\" Name (subject of manpage) Style +-.ds nM \f(CB +-.\" Pathname Style +-.ds pA \fC +-.\" Accepted punctuation string for -mdoc syntax +-.ds Pu \fR[.,:;(\^)[\^]\fR] +-.\" Section Header Style +-.ds Sp \s12\fB +-.\" .ds sT \s-2\fR +-.\" Symbolic Emphasis (boldface) +-.ds sY \f(CB +-.\" Generic Variable Style +-.ds vA \fI +-.\" Volume Title Style +-.ds Vs \fR +-.\" Cross Reference STyle (man page only) +-.ds xR \fC +-.\" Math * +-.tr *\(** +-.\} +-.\" NROFF +-.if n \{\ +-.\" Address Style +-.ds aD \fI +-.\" Argument Reference Style +-.ds aR \fI +-.\" Interactive Command Modifier (flag) +-.ds cM \fB +-.\" Emphasis (in the English sense - usually italics) +-.ds eM \fI +-.\" Errno Style +-.ds eR \fR +-.\" Environment Variable Style +-.ds eV \fR +-.\" Command Line Flag Style +-.ds fL \fB +-.\" Header String Style +-.ds Hs \fR +-.\" Interactive Command Style +-.ds iC \fB +-.\" Literal Style +-.ds lI \fR +-.\" Left Parenthesis Style +-.ds lP \fR\|(\fP +-.\" Right Parenthesis Style +-.ds rP \fR\|)\fP +-.\" Options Open Bracket Style +-.ds lB \fR\|[\|\fP +-.\" Options Open Bracket Style +-.ds rB \fR\|]\fP +-.\" Name (subject of manpage) Style +-.ds nM \fB +-.\" Pathname Style +-.ds pA \fI +-.\" Accepted punctuation string for -mdoc syntax +-.ds Pu [.,;:()[]] +-.\" Section Header Style +-.ds Sp \s12\fB +-.\" .ds sT \s-2\fR +-.\" .ds sT \s-2\fR +-.\" Symbol, Mode or Mask Style +-.ds sY \fB +-.\" Generic Variable Style +-.ds vA \fI +-.\" Volume Title Style +-.ds Vs \fR +-.\" Cross Reference Style (man page only) +-.ds xR \fR +-.\} +-.\" INDENTS - Subheaders(sI), Text(Ti) between Section Headers and Subsects +-.if t \{\ +-. nr sI \w'\fC,'u*5 +-. nr Ti \n(sIu +-.\} +-.if n \{\ +-. nr sI .5i +-. nr Ti .5i +-.\} +-.\" Flags for macros names which are used only for .Ds +-.nr dI 6n +-.nr dC 1 +-.nr dL 1 +-.nr dR 1 +-.\" INDENT WIDTHS (for Lists) +-.\" Width Needed for Address Tag (indented amount) +-.nr Ad 12n +-.\" Angle Quote Width +-.nr Aq 12n +-.\" Width Needed for Argument +-.nr Ar 12n +-.\" Width Needed for Column offset +-.nr Cl 15n +-.\" Width neeeded for Interactive Command Modifier +-.nr Cm 10n +-.\" Width Needed for Complex Expressions +-.nr Cx 20n +-.\" Indent Width Needed for Display (right and left margins) +-.nr Ds 6n +-.\" Double Quote Width +-.nr Dq 12n +-.\" tI is dependent on Ds and used by .Dp +-.nr tI \n(Dsu +-.\" Width Needed for Display +-.nr Em 10n +-.\" Width Needed for Errno Types +-.nr Er 15n +-.\" Width Needed for Environment Variables +-.nr Ev 15n +-.\" Width Needed for Example Indent +-.nr Ex 10n +-.\" Width Needed for Flag +-.nr Fl 10n +-.\" Width Needed for Function +-.nr Fn 16n +-.\" Width neeeded for Interactive Command Name +-.nr Ic 10n +-.\" Width Needed for Constant +-.nr Li 16n +-.\" Width Needed for Math Symbol ? not sure if needed +-.nr Ms 6n +-.\" Width Needed for Name +-.nr Nm 10n +-.\" Width Needed for Option Begin +-.nr Ob 14n +-.\" Width Needed for Option End +-.nr Oe 14n +-.\" Width Needed for Option (one line) +-.nr Op 14n +-.\" Width Needed for Pathname +-.nr Pa 32n +-.\" Parenthesis Quote Width +-.nr Pq 12n +-.\" Single Quote Width +-.nr Sq 12n +-.\" Width Needed for Symbols, Modes or Masks +-.nr Sy 6n +-.\" Width needed for default or unknown text width +-.nr Tx 22n +-.\" Width Needed for Generic Variable +-.nr Va 12n +-.\" Width Needed for Cross Reference, should the cross ref be annotated. +-.nr Xr 10n +-.\" PARAGRAPH SPACE +-.if t \{\ +-. nr Pp .5v +-.\} +-.if n \{\ +-. nr Pp 1v +-.\} +-.\" PAGE LAYOUT +-.\" .Li Tagged Paragraph Style - zero if break on oversized tag +-.\" one if add em space and continue filling line. +-.nr tP 0 +-.\" Page Layout Macro +-.de pL +-.\" DITROFF +-.ie t \{\ +-.\" Header Margin +-. nr Hm .5i +-.\" Footer Margin +-. nr Fm .5i +-.\" Line length +-. nr ll 5.5i +-.\" Line length +-. ll 5.5i +-.\" Title length +-. nr lt 5.5i +-.\" Title length +-. lt 5.5i +-.\" Page offset +-. nr po 1.56i +-.\" Page offset +-. po 1.56i +-.\" Vertical space distance (from Section headers/Lists/Subsections) +-. nr vV .5v +-.\" em space +-. ds tP \|\|\|\|\|\| +-.\} +-.el \{\ +-.\" Line length +-. nr ll 78n +-. ll 78n +-.\" Title length +-. nr lt 78n +-.\" Title length +-. lt 78n +-.\" Page offset +-. nr po 0i +-.\" Page offset +-. po 0i +-.\" Vertical space distance (from Section headers/Lists/Subsections) +-. nr vV 1v +-.\" em space +-. ds tP \0\0 +-.\" Test for crt +-. ie \\n(cR .nr Hm 0 +-. el .nr Hm .5i +-.\" Footer Margin +-. nr Fm .5i +-.\} +-.. +-.\" Adjustment mode +-.if n \{\ +-.ad l +-.na +-.. +-.\} +-.\" PREDEFINED STRINGS +-.if t \{\ +-. ds <= \(<= +-. ds >= \(>= +-. ds Lq \&`` +-. ds Rq \&'' +-. ds ua \(ua +-. ds aa \(aa +-. ds ga \(ga +-. ds sR \(aa +-. ds sL \(ga +-.\} +-.if n \{\ +-. ds <= \&<\&= +-. ds >= \&>\&= +-. ds Rq '' +-. ds Lq `` +-. ds ua ^ +-. ds aa ' +-. ds ga ` +-. ds sL ` +-. ds sR ' +-.\} +-.\" Note: The distances from the bottom or top of the page are set +-.\" in headers (macro .hK): to -1.25 for troff, and -1.167 for nroff +-.\" bottoms, and top is 0. +-.\" +-.\" .Dt Document/manpage_title section/chapter volume +-.\" The \{ and \} is necessary as roff doesn't nest if-elses +-.\" properly, especially with .ds. +-.\" TODO: separate Dt into Dt, Ch and Vt for supp docs. +-.de Dt +-.ds dT UNTITLED +-.ds vT Local +-.ds cH Null +-.\" Volume and Section Number or Chapter Number +-.if !"\\$1"" .ds dT \\$1 +-.if !"\\$2"" \{\ +-. ds cH \\$2 +-. if "\\$3"" \{\ +-. \" Volume Title if none given +-. if \\$2>=1 .if \\$2<=8 \{\ +-. ds vT UNIX Reference Manual +-. if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual +-. if "\\$2"8" .ds vT UNIX System Manager's Manual +-. \} +-. if "\\$2"unass" .ds vT DRAFT +-. if "\\$2"draft" .ds vT DRAFT +-. if "\\$2"paper" .ds vT Null +-. \} +-.\} +-.if !"\\$3"" \{\ +-. \" Volume Title if given +-. if "\\$3"USD" .ds vT UNIX User's Supplementary Documents +-. if "\\$3"PS1" .ds vT UNIX Programmers's Supplementary Documents +-. if "\\$3"AMD" .ds vT UNIX Ancestral Manual Documents +-. if "\\$3"SMM" .ds vT UNIX System Manager's Manual +-. if "\\$3"URM" .ds vT UNIX Reference Manual +-. if "\\$3"PRM" .ds vT UNIX Programmers's Manual +-. if "\\$3"IND" .ds vT UNIX Manual Master Index +-. if "\\$3"CON" .ds vT UNIX Contributed Software Manual +-. if "\\$3"IMP" .ds vT UNIX Implementation Notes +-. if "\\$3"HOW" .ds vT UNIX How Pocket Manual +-. if "\\$3"LOCAL" .ds vT UNIX Local Manual +-. if "\\*(vT"Local" .ds vT \\$3 +-.\} +-.. +-.\" +-.\" .Os Operating System/Standard and Release or Version Number +-.\" +-.de Os +-.ds oS Null +-.if "\\$1"" \{\ +-. ds oS \fIBSD Experimental\fP +-.\" . ds oS (\fIBag o' Bits\fP) +-.\} +-.if "\\$2"" \{\ +-. ds o1 Non-Null +-.\} +-.if "\\$1"ATT" \{\ +-. ds oS AT&T +-. if "\\$2"" .as oS \0UNIX +-. if "\\$2"7th" .as oS \07th Edition +-. if "\\$2"7" .as oS \07th Edition +-. if "\\$2"III" .as oS \0System III +-. if "\\$2"3" .as oS \0System III +-. if "\\$2"V" .as oS \0System V +-. if "\\$2"V.2" .as oS \0System V Release 2 +-. if "\\$2"V.3" .as oS \0System V Release 3 +-. if "\\$2"V.4" .as oS \0System V Release 4 +-.\} +-.if "\\$1"BSD" \{\ +-. if "\\$2"3" .ds oS 3rd Berkeley Distribution +-. if "\\$2"4" .ds oS 4th Berkeley Distribution +-. if "\\$2"4.1" .ds oS 4.1 Berkeley Distribution +-. if "\\$2"4.2" .ds oS 4.2 Berkeley Distribution +-. if "\\$2"4.3" .ds oS 4.3 Berkeley Distribution +-. if "\\$2"4.3+" .ds oS 4.3+tahoe Berkeley Distribution +-.\} +-.if "\\*(oS"Null" .ds oS \\$1 +-.if "\\*(o1"Non-Null" .as oS \0\\$2 +-.rm o1 +-.. +-.\" +-.\" Standards +-.\" +-.\" .de St +-.\" .ds sT Null +-.\" .if "\\$1"POSIX" \{\ +-.\" . ds sT IEEE Standard POSIX +-.\" . if \\$2 .as sT \0\\$2 +-.\" .\} +-.\" .if "\\$1"ANSI" \{\ +-.\" . ds sT ANSI Standard +-.\" . if \\$2 .as sT \0\\$2 +-.\" .\} +-.\" .if "\\$1"ISO" \{\ +-.\" . ds sT ISO Standard +-.\" . if \\$2 .as sT \0\\$2 +-.\" .\} +-.\" .if "\\*(sT"Null" .ds sR \\$3 +-.\" .. +-.\" +-.\" .de Gp +-.\" .ie !"\\$1"" .ds gP \&\\$1 \\$2 \\$3 \\$4 \\$5 +-.\" .el .ds gP Null +-.\" .. +-.\" +-.\" +-.de Dd +-.nr aa 0 +-.ie \\n(.$>0 \{\ +-. ie \\n(.$<4 \{\ +-. ds dD \\$1 \\$2 \\$3 +-. \} +-. el .tm Usage: .Dd Month Day, Year (e.g July 4, 1977). +-.\} +-.el \{\ +-. ds dD Epoch +-.\} +-.. +-.\" +-.\" House Keeping Macro - Make sense of dT, cH, vT, sT, gP and dS +-.\" TODO: Try to get else's for efficiency +-.\" TODO: GET RID OF .wh -1.167i (its in v7) +-.\" +-.\" +-.de hK +-.nr % 1 +-.ds hT \\*(dT +-.if !"\\*(cH"Null" \{\ +-. ie !"\\*(gP"Null" .as hT \|(\|\\*(cH\\*(gP\|) +-. el .as hT \\|(\\|\\*(cH\\|) +-.\} +-.if "\\*(cH"Null" .if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|) +-.if t \{\ +-. wh 0 hM +-. wh -1.25i fM +-.\} +-.if n \{\ +-. ie \\n(cR \{\ +-. hM +-. wh -0v fM +-. \} +-. el \{\ +-. wh 0 hM +-. wh -1.167i fM +-. \} +-.\} +-.if n \{\ +-. if \\n(nl==0:\\n(nl==-1 'bp +-.\} +-.if t 'bp +-.em lM +-.. +-.\" Header Macro +-.\" +-.de hM +-.ev 1 +-.pL +-.if !\\n(cR 'sp \\n(Hmu +-.tl @\\*(Hs\\*(hT\fP@\\*(Vs\\*(vT\fP@\\*(Hs\\*(hT\fP@ +-'sp \\n(Hmu +-.ev +-.. +-.\" +-.de fM +-.ev 1 +-.pL +-.if !\\n(cR \{\ +-' sp \\n(Fmu +-. tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@ +-' bp +-.\} +-.if \\n(cR \{\ +-.\" . tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@ +-.\" ' bp +-.\} +-.ev +-.. +-.de lM +-.fl +-.if \\n(cR \{\ +-. fM +-. pl \\n(nlu +-.\} +-.. +-.de Pp +-.sp \\n(Ppu +-.ne 2 +-.ns +-.. +-.de Lp +-.Pp +-.. +-.de LP +-.tm Not a \-mdoc command: .LP +-.. +-.de PP +-.tm Not a \-mdoc command: .PP +-.. +-.de pp +-.tm Not a \-mdoc command: .pp +-.. +-.de Co +-.tm Not a \-mdoc command: .Co +-.. +-.nr z. 1 +-.nr z, 1 +-.nr z: 1 +-.nr z; 1 +-.nr z) 1 +-.nr z( 1 +-.nr z[ 1 +-.nr z] 1 +-.\" This is disgusting, troff not parse if stmt properly +-.nr z1 0 +-.nr z2 0 +-.nr z3 0 +-.nr z4 0 +-.nr z5 0 +-.nr z6 0 +-.nr z7 0 +-.nr z8 0 +-.nr z9 0 +-.nr z0 0 +-.nr z# 0 +-.\" +-.de Ad +-.ie \\n(.$==0 \{\ +-. tm Usage: .Ad address [...] \\*(Pu +-.\} +-.el \{\ +-. ds sV \\*(aD +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.\" Command Line Argument Macro +-.\" +-.de Ar +-.ie \\n(.$==0 \{\ +-. ie !"\\*(iM"" .as f1 \&[\|\\*(aRfile\ ...\fP\|] +-. el \&[\|\\*(aRfile\ ...\fP\|] +-.\} +-.el \{\ +-. ds sV \\*(aR +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Em +-.ie \\n(.$==0 \{\ +-. tm Usage: .Em text ... \\*(Pu +-.\} +-.el \{\ +-. ds sV \\*(eM +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Er +-.ie \\n(.$==0 \{\ +-. tm Usage: .Er ERRNOTYPE ... \\*(Pu +-. \} +-.el \{\ +-. ds sV \\*(eR +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Ev +-.ie \\n(.$==0 \{\ +-. tm Usage: .Ev ENVIRONMENT_VARIABLE(s) ... \\*(Pu +-. \} +-.el \{\ +-. ds sV \\*(eV +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.\" Flag Name Macro +-.\" +-.de Fl +-.ie \\n(.$==0 \{\ +-. ie !"\\*(iM"" .as f1 \&\\*(fL\-\fP +-. el \&\\*(fL\-\fP +-.\} +-.el \{\ +-. nr rZ 0 +-. sW \\$1 +-. if (\\n(sW==1&\\n(.$==1) .rZ \\$1 +-. ds sV \\*(fL +-. nr cF \\n(.f +-. ie \\n(rZ \{\ +-. ie "\\*(iM"" .ds f1 \&\\*(sV\-\f\\n(cF\\$1 +-. el \&\\*(sV\-\f\\n(cF\\$1 +-. \} +-. el \{\ +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. fB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-. \} +-.\} +-.. +-.\" Interactive Commands Macro +-.\" +-.de Ic +-.ie \\n(.$==0 \{\ +-. tm Usage: .Ic Interactive Commands(s) ... \\*(Pu +-.\} +-.el \{\ +-. ds sV \\*(iC +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.\" Interactive Command Modifiers (flags) +-.\" +-.de Cm +-.ie \\n(.$==0 \{\ +-. tm Usage: .Cm Interactive Command Modifier(s) ... \\*(Pu +-.\} +-.el \{\ +-. ds sV \\*(cM +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Li +-.ie \\n(.$==0 \{\ +-. tm Usage: .Li literal ... \\*(Pu +-. \} +-.el \{\ +-. ds sV \\*(lI +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" If in nroff or any other case where the default font +-.\" is constant width, and literal means zilch, single quote instead. +-.ie n \{\ +-.de Ql +-. ie \\n(.$==0 \{\ +-. tm Usage: .Ql literal ... \\*(Pu +-. \} +-. el \{\ +-. Sq \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.. +-.\} +-.el \{\ +-.de Ql +-. ie \\n(.$==0 \{\ +-. tm Usage: .Ql literal ... \\*(Pu +-. \} +-. el \{\ +-. Li \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.. +-.\} +-.\" +-.de Nm +-.ie \\n(.$==0 \{\ +-. if "\\*(n1"" .tm Usage: .Nm Name(s) ... \\*(Pu +-. ie !"\\*(iM"" .as f1 \&\\*(nM\\*(n1\\$1\fP +-. el \&\\*(nM\\*(n1\\$1\fP +-.\} +-.el \{\ +-. ds sV \\*(nM +-. nr cF \\n(.f +-. if \\n(nS \{\ +-. rs +-. in -\\n(iSu +-. ie \\n(nS>1 .br +-. el \{\ +-. sW \\$1 +-. nr iS ((\\n(sW+1)*\\n(fW)u +-. \} +-. in +\\n(iSu +-. ti -\\n(iSu +-. nr nS \\n(nS+1 +-. \} +-. if "\\*(n1"" .ds n1 \\$1 +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Pa +-.ie \\n(.$==0 \{\ +-\&\\*(pA~\fP +-.\} +-.el \{\ +-. ds sV \\*(pA +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Sy +-.ie \\n(.$==0 \{\ +-. tm Usage: .Sy Symbolic Text ... \\*(Pu +-. \} +-.el \{\ +-. ds sV \\*(sY +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Ms +-.ie \\n(.$==0 \{\ +-. tm Usage: .Ms Math Symbol ... \\*(Pu +-. \} +-.el \{\ +-. ds sV \\*(sY +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de Va +-.ie \\n(.$==0 \{\ +-. tm Usage: .Va variable_name(s) ... \\*(Pu +-.\} +-.el \{\ +-. ds sV \\*(vA +-. nr cF \\n(.f +-. ie "\\*(iM"" .ds f1 \&\\*(sV +-. el .as f1 \&\\*(sV +-. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-.\} +-.. +-.\" +-.de nB +-.hy 0 +-.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)? +-.ie \\n(.$>1 \{\ +-. rZ \\$1 +-. ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP +-. el .as f1 \&\\$1 +-. rZ \\$2 +-. if !\\n(rZ \{\ +-. ie !"\\*(iM""\{\ +-.\" I surrender +-. if "\\*(iM"Tp" .as f1 \&\ \& +-. if "\\*(iM"Dp" .as f1 \&\ \& +-. if "\\*(iM"Op" .as f1 \&\ \& +-. if "\\*(iM"Cx" .as f1 \&\ \& +-. if "\\*(iM"Dq" .as f1 \& \& +-. if "\\*(iM"Sq" .as f1 \& \& +-. if "\\*(iM"Pq" .as f1 \& \& +-. if "\\*(iM"Aq" .as f1 \& \& +-. \} +-. el .as f1 \& \& +-. \} +-. nB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.\} +-.el \{\ +-. rZ \\$1 +-. ie \\n(rZ .as f1 \&\f\\n(cF\\$1 +-. el .as f1 \&\\$1\f\\n(cF +-. if "\\*(iM"" \{\&\\*(f1 +-. ds f1 +-. \} +-. hy +-.\} +-.. +-.de fB +-.hy 0 +-.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)? +-.ie \\n(.$>1 \{\ +-. rZ \\$1 +-. ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP +-. el \{\ +-. ie "\\$1"-" .as f1 \&\-\- +-. el .as f1 \&\-\\$1 +-. \} +-. rZ \\$2 +-. if !\\n(rZ \{\ +-. ie !"\\*(iM""\{\ +-.\" I surrender +-. if "\\*(iM"Tp" .as f1 \&\ \& +-. if "\\*(iM"Dp" .as f1 \&\ \& +-. if "\\*(iM"Op" .as f1 \&\ \& +-. if "\\*(iM"Cx" .as f1 \&\ \& +-. if "\\*(iM"Dq" .as f1 \& \& +-. if "\\*(iM"Sq" .as f1 \& \& +-. if "\\*(iM"Pq" .as f1 \& \& +-. if "\\*(iM"Aq" .as f1 \& \& +-. \} +-. el .as f1 \& \& +-. \} +-. fB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.\} +-.el \{\ +-. rZ \\$1 +-. ie \\n(rZ .as f1 \&\f\\n(cF\\$1 +-. el \{\ +-. ie "\\$1"-" .as f1 \&\-\-\f\\n(cF +-. el .as f1 \&\-\\$1\f\\n(cF +-. \} +-. if "\\*(iM"" \{\&\\*(f1 +-. ds f1 +-. \} +-. hy +-.\} +-.. +-.\" +-.\" Single quoted Items +-.\" eF, sB g[0-9] and f2 +-.de Sq +-.nr eF 0 +-.ie \\n(.$==0 \{\ +-. ie "\\*(iM"" \&\\*(sL\&\\*sR +-. el .as f1 \&\\*(sL\&\\*(sR +-.\} +-.el \{\ +-. ie "\\*(iM"" \{\ +-. ds f1 \&\\*(sL +-. ds iM Sq +-. \} +-. el .as f1 \&\\*(sL +-. sB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ie \\n(eF>0 .\\*(g1 \\*(g2 \\*(g3 \\*(g4 \\*(g5 \\*(g6 \\*(g7 \\*(g8 +-. el .as f1 \\*(g0 +-. as f1 \\*(sR +-. if !"\\*(f2"" .as f1 \\*(f2 +-. if "\\*(iM"Sq" \{\ +-\&\\*(f1 +-. ds f1 +-. ds iM +-. \} +-. ds f2 +-. rm g0 g1 g2 g3 g4 g5 g6 g7 g8 g9 +-. nr eF 0 +-.\} +-.. +-.\" +-.\" Double quoted Items +-.de Dq +-.nr Ef 0 +-.ie \\n(.$==0 \{\ +-. ie "\\*(iM"" \&\\*(Lq\&\\*(Rq +-. el .as f1 \&\\*(Lq\&\\*(Rq +-.\} +-.el \{\ +-. ie "\\*(iM"" \{\ +-. ds f1 \&\\*(Lq +-. ds iM Dq +-. \} +-. el .as f1 \&\\*(Lq +-. Sb \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ie \\n(Ef>0 .\\*(k1 \\*(k2 \\*(k3 \\*(k4 \\*(k5 \\*(k6 \\*(k7 \\*(k8 +-. el .as f1 \\*(k0 +-. as f1 \\*(Rq +-. if !"\\*(f4"" .as f1 \\*(f4 +-. if "\\*(iM"Dq" \{\ +-\&\\*(f1 +-. ds f1 +-. ds iM +-. \} +-. ds f4 +-. rm k0 k1 k2 k3 k4 k5 k6 k7 k8 k9 +-. nr Ef 0 +-.\} +-.. +-.\" +-.\" Parenthesis quoted Items +-.de Pq +-.nr pQ 0 +-.ie \\n(.$==0 \{\ +-. ie "\\*(iM"" \&(\&) +-. el .as f1 \&(\&) +-.\} +-.el \{\ +-. ie "\\*(iM"" \{\ +-. ds f1 \&( +-. ds iM Pq +-. \} +-. el .as f1 \&( +-. pB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ie \\n(pQ>0 .\\*(y1 \\*(y2 \\*(y3 \\*(y4 \\*(y5 \\*(y6 \\*(y7 \\*(y8 +-. el .as f1 \\*(y0 +-. as f1 \&) +-. if !"\\*(f3"" .as f1 \\*(f3 +-. if "\\*(iM"Pq" \{\ +-\&\\*(f1 +-. ds f1 +-. ds iM +-. \} +-. ds f3 +-. rm y0 y1 y2 y3 y4 y5 y6 y7 y8 y9 +-. nr pQ 0 +-.\} +-.. +-.\" eF, sB g[0-9] and f2 +-.de sB +-.hy 0 +-.ie \\n(.$==0 .tm Sick Logic: macro sB +-.el \{\ +-. ie \\n(eF>=1 .nr eF \\n(eF+1 +-. el \{\ +-. mN \\$1 +-. if \\n(mN .nr eF \\n(eF+1 +-. \} +-. rZ \\$1 +-. ie \\n(rZ .as f2 \\$1 +-. el \{\ +-. ie \\n(eF<1 .as g\\n(eF \\$1 +-. el .as g\\n(eF \\$1 +-. \} +-. if \\n(.$>1 \{\ +-. rZ \\$2 +-. if \\n(rZ==0 \{\ +-. if \\n(eF<1 \{\ +-. as g\\n(eF \& \& +-. \} +-. \} +-. sB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.\} +-.. +-.de Sb +-.hy 0 +-.ie \\n(.$==0 .tm Sick Logic: macro Sb +-.el \{\ +-. ie \\n(Ef>=1 .nr Ef \\n(Ef+1 +-. el \{\ +-. mN \\$1 +-. if \\n(mN .nr Ef \\n(Ef+1 +-. \} +-. rZ \\$1 +-. ie \\n(rZ .as f4 \\$1 +-. el \{\ +-. ie \\n(Ef<1 .as k\\n(Ef \\$1 +-. el .as k\\n(Ef \\$1 +-. \} +-. if \\n(.$>1 \{\ +-. rZ \\$2 +-. if \\n(rZ==0 \{\ +-. if \\n(Ef<1 \{\ +-. as k\\n(Ef \& \& +-. \} +-. \} +-. Sb \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.\} +-.. +-.de pB +-.hy 0 +-.ie \\n(.$==0 .tm Sick Logic: macro pB +-.el \{\ +-. ie \\n(pQ>=1 .nr pQ \\n(pQ+1 +-. el \{\ +-. mN \\$1 +-. if \\n(mN .nr pQ \\n(pQ+1 +-. \} +-. rZ \\$1 +-. ie \\n(rZ .as f3 \\$1 +-. el \{\ +-. ie \\n(pQ<1 .as y\\n(pQ \\$1 +-. el .as y\\n(pQ \\$1 +-. \} +-. if \\n(.$>1 \{\ +-. rZ \\$2 +-. if \\n(rZ==0 \{\ +-. if \\n(pQ<1 \{\ +-. as y\\n(pQ \& \& +-. \} +-. \} +-. pB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.\} +-.. +-.de aQ +-.hy 0 +-.ie \\n(.$==0 .tm Bad Syntax: .Aq +-.el \{\ +-. ie \\n(aQ>=1 .nr aQ \\n(aQ+1 +-. el \{\ +-. mN \\$1 +-. if \\n(mN .nr aQ \\n(aQ+1 +-. \} +-. rZ \\$1 +-. ie \\n(rZ .as aZ \\$1 +-. el \{\ +-. ie \\n(aQ<1 .as a\\n(aQ \\$1 +-. el .as a\\n(aQ \\$1 +-. \} +-. if \\n(.$>1 \{\ +-. rZ \\$2 +-. if \\n(rZ==0 \{\ +-. if \\n(aQ<1 \{\ +-. as a\\n(aQ \& \& +-. \} +-. \} +-. aQ \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.\} +-.. +-.\" Angle Bracket Quoted Items +-.de Aq +-.nr aQ 0 +-.ie \\n(.$==0 \{\ +-. ie "\\*(iM"" \&<\&> +-. el .as f1 \&<\&> +-.\} +-.el \{\ +-. ie "\\*(iM"" \{\ +-. ds f1 \&< +-. ds iM Aq +-. \} +-. el .as f1 \&< +-. aQ \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 +-. ie \\n(aQ>0 .\\*(a1 \\*(a2 \\*(a3 \\*(a4 \\*(a5 \\*(a6 \\*(a7 \\*(a8 +-. el .as f1 \\*(a0 +-. as f1 \&> +-. if !"\\*(aZ"" .as f1 \\*(aZ +-. if "\\*(iM"Aq" \{\ +-\&\\*(f1 +-. ds f1 +-. ds iM +-. \} +-. ds aZ +-. rm a0 a1 a2 a3 a4 a5 a6 a7 a8 +-. nr aQ 0 +-.\} +-.. +-.\" macro Name test, return macro register value if true +-.if \n(.g .ig +-.de mN +-.nr mN 0 +-.sW \\$1 +-.if \\n(sW==2 \{\ +-. if \\n(\\$1 .nr mN \\n(\\$1 +-.\} +-.. +-.if !\n(.g .ig +-.de mN +-.nr mN 0 +-.if \A'\\$1' \{\ +-. sW \\$1 +-. if \\n(sW==2 \{\ +-. if \\n(\\$1 .nr mN \\n(\\$1 +-. \} +-.\} +-.. +-.\" Punctuation test (using z registers), return 1 if true +-.if \n(.g .ig +-.de rZ +-.nr rZ 0 +-.sW \\$1 +-.if \\n(sW==1 \{\ +-. if \\n(z\\$1==1 \{\ +-. nr rZ 1 +-. \} +-.\} +-.. +-.if !\n(.g .ig +-.de rZ +-.nr rZ 0 +-.if \A'\\$1' \{\ +-. sW \\$1 +-. if \\n(sW==1 \{\ +-. if \\n(z\\$1==1 \{\ +-. nr rZ 1 +-. \} +-. \} +-.\} +-.. +-.\" +-.\" sW returns number of characters in a string +-.if t \{\ +-.nr fW \w'\fC,' +-.de sW +-.nr sW \w'\fC\\$1' +-.\} +-.if n \{\ +-.nr fW \w'0' +-.de sW +-.nr sW \w'\\$1' +-.\} +-.ie \\n(sW>=\\n(fW \{\ +-. ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1 +-. el .nr sW \\n(sW/\\n(fW +-.\} +-.el .nr sW 0 +-.. +-.\" Option Expression - +-.\" TODO - add line overflow check (right!) +-.nr eP 0 +-.ds e1 +-.nr oE 0 +-.nr hP 0 +-.ds hP +-.nr Ep 0 +-.de Op +-.hy 0 +-.if "\\*(iM"" \{\ +-. ds iM Op +-. ds f1 \& +-.\} +-.as f1 \&\\*(lB +-.\" .tm Op: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.dO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.ie !"\\$1"Cx" .oE +-.el .nr oE \\n(oE+1 +-.. +-.\" +-.\" just for mike, with every bite of garlic in mind (oops, i mean burp). +-.\" dO: go dOwn an argument vector and test each argument to see if +-.\" a macro name or punctuation. stash in respective place along +-.\" with its arguments. +-.nr oO 0 +-.nr oP 0 +-.nr aO 0 +-.de dO +-.mN \\$1 +-.ie \\n(mN \{\ +-. if \\n(oP \{\ +-. if \\n(hP \{\ +-. nr oZ 1 +-. oZ +-. Oz +-. \} +-. if \\n(e1==1 \{\ +-.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9 +-. \} +-. uO +-. if !(\\n(oO:\\n(aO) .as f1 \& \& +-. \} +-. ie "\\$1"Op" \{\ +-. as f1 \&\\*(lB +-. nr aO \\n(aO+1 +-. \} +-. el \{\ +-. nr eP \\n(eP+1 +-. ds e\\n(eP \\$1 +-. nr e\\n(eP 1 +-. \} +-.\} +-.el \{\ +-.\" .tm dO: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE +-. rZ \\$1 +-. ie \\n(rZ \{\ +-.\" .tm dO:rZ: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(eP +-. nr hP \\n(hP+1 +-. ds h\\n(hP \\$1 +-. \} +-. el \{\ +-.\" .tm dO:word $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE +-. if \\n(eP==0:\\n(e\\n(eP==1 .nr eP \\n(eP+1 +-. if \\n(eZ .as e\\n(eP \& \& +-. as e\\n(eP " \&\\$1 +-.\" . ds e\\n(eP \&\\$1 +-. nr eZ \\n(eZ+1 +-. \} +-.\} +-.nr oP 1 +-.ie \\n(.$>1 \{\ +-. dO \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.\} +-.el \{\ +-. ie \\n(e1 \{\ +-.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9 +-. \} +-. el \{\ +-. as f1 \\*(e1 +-. \} +-.\} +-.. +-.\" handle old style arguments such as the arg -Idir +-.\" in adb, .Oo is a toggle. +-.de Oo +-.ie \\n(oO .nr oO 0 +-.el .nr oO 1 +-.. +-.\" stash punctuation +-.de oZ +-.if \\n(hP>=\\n(oZ \{\ +-. nr eP \\n(eP+1 +-. ds e\\n(eP \\*(h\\n(oZ +-. nr oZ \\n(oZ+1 +-. oZ +-.\} +-.. +-.\" clean up punctuation vector +-.de Oz +-.if \\n(hP>0 \{\ +-. rm h\\n(hP +-. nr hP \\n(hP-1 +-. Oz +-.\} +-.. +-.\" uO: go back up created vector cleaning it up along the way +-.de uO +-.if \\n(eP>0 \{\ +-. rm e\\n(eP +-. rr e\\n(eP +-. nr eP \\n(eP-1 +-. nr oP 0 +-. nr eZ 0 +-. uO +-.\} +-.. +-.\" option end +-.de oE +-.uO +-.ie \\n(hP \{\ +-. as f1 \\*(rB\\*(h1\\*(h2\\*(h3 +-. Oz +-. nr oZ 0 +-.\} +-.el \{\ +-. as f1 \\*(rB +-.\} +-.ie "\\*(iM"Op" \{\ +-. if \\n(aO .aO +-.if t \{\ +-. if (\\n(.lu-\\n(.ku-\\n(.ou-(2*\\n(fWu))<\w'\fC\\*(f1'u .br +-.\} +-.if n \{\ +-. nr aa \w'\\*(f1'u +-.\" . nr qq \\n(.lu-\\n(.ku-\\n(.ou +-.\" \&aa == \\n(aa, f1==\\*(f1, qq==\\n(qq +-. if (\\n(.lu-\\n(.ku-\\n(.ou-\\n(aau)<=(8*\\n(fWu) .br +-.\} +-\&\\*(f1 +-. ds iM +-. ds f1 +-. hy +-.\} +-.el .nr oE \\n(oE-1 +-.. +-.de aO +-.as f1 \\*(rB +-.nr aO \\n(aO-1 +-.if \\n(aO >0 .aO +-.. +-.\" +-.de Xr +-.if \\n(.$<=1 \{\ +-. ie \\n(.$==1 \{\ +-. if !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP +-. if "\\*(iM"" \&\\*(xR\\$1\fP +-. \} +-. el .tm Xr Usage: .Xr manpage_name [section#] \\*(Pu +-.\} +-.if \\n(.$==2 \{\ +-. rZ \\$2 +-. ie "\\*(iM"" \{\ +-. ie \\n(rZ \&\\*(xR\\$1\fP\\$2 +-. el \&\\*(xR\\$1\fP(\\$2) +-. \} +-. el \{\ +-. ie \\n(rZ .as f1 \&\\*(xR\\$1\fP\\$2 +-. el .as f1 \&\\*(xR\\$1\fP(\\$2) +-. \} +-.\} +-.if \\n(.$>=3 \{\ +-. rZ \\$2 +-. ie \\n(rZ \{\ +-. ie !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8 +-. el \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8 +-. \} +-. el \{\ +-. rZ \\$3 +-. ie \\n(rZ \{\ +-. if !"\\*(iM"" \{\ +-. as f1 \&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8 +-. \} +-. if "\\*(iM"" \{\ +-\&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8 +-. \} +-. \} +-. el \{\ +-. tm rZ = \\n(rZ the arg is \\$3 +-. tm Xr-XX Usage: .Xr manpage_name [section#] \\*(Pu +-. \} +-. \} +-.\} +-.. +-.\" +-.\" +-.de Ex +-.tm Ex defunct, Use .Dl: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.. +-.\" Display (one) Line of text. +-.de Dl +-.ie "\\*(iM"" \{\ +-' ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i +-. in \\n(.iu+\\n(Dsu +-. mN \\$1 +-. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. el \{\ +-. nr cF \\n(.f +-.\" Literal font is none specified +-\&\\*(lI\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. ft \\n(cF +-. \} +-. in \\n(.iu-\\n(Dsu +-.\} +-.el \{\ +-. mN \\$1 +-. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 +-. el \{\ +-. nr cF \\n(.f +-. ds f1 \&\\*(lI\\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 +-. as f1 \&\f\\n(cF +-. \} +-.\} +-.. +-.\" +-.\" +-.\" user set Tagged Paragraph Width (used in both Dp and Tp) +-.de Tw +-.ie \\n(.$==0 \{\ +-. nr aa 0 +-.\} +-.el \{\ +-. mN \\$1 +-. ie \\n(sW>2 \{\ +-. nr tW (\\n(sW+3)*\\n(fWu) +-. \} +-. el \{\ +-. ie \\n(mN .nr tW \\n(mN +-. el .nr tW \\$1 +-. \} +-. nr tF 1 +-.\} +-.. +-.\" +-.de Dw +-.Tw \\$1 +-.. +-.\" +-.de Di +-.ie \\n(.$==0 \{\ +-. nr tI \\n(Dsu +-.\} +-.el \{\ +-. sW \\$1 +-. if \\n(sW>=2 \{\ +-. nr tI \\$1u +-. \} +-. if \\n(sW<2 \{\ +-. if "\\$1"L" \{\ +-. nr tI 0 +-. \} +-. \} +-.\} +-.. +-.\" tagged paragraph +-.\" initialize baby stack variables +-.nr np 0 +-.nr p1 0 +-.ds s\n(np +-.\" +-.de Tp +-.ie "\\$1"" .pE p s np +-.el \{\ +-. ds iM Tp +-. mN \\$1 +-. ie \\n(tF \{\ +-. ds tC Tw +-. nr tC 1 +-. nr tF 0 +-. \} +-. el \{\ +-. if !"Tw"\\*(s\\n(np" \{\ +-. ie \\n(mN \{\ +-. ds tC \\$1 +-. nr tW \\n(mN +-. \} +-. el \{\ +-. ds tC Tx +-. nr tW \\n(Tx +-. \} +-. if !"\\*(tC"\\*(s\\n(np" .nr tC 1 +-. \} +-. \} +-. sp \\n(vVu +-. if !\\n(cR .ne 2 +-. if \\n(tC \{\ +-. nr np \\n(np+1 +-. nr p\\n(np \\n(tW +-. ds s\\n(np \\*(tC +-. nr tC 0 +-. ds tC +-. in \\n(.iu+\\n(p\\n(npu +-. \} +-. ie \\n(mN \{\ +-. ds f1 +-. \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. if !"\\$1"Cx" .pT st p np +-. \} +-. el \{\ +-. br +-. ev 1 +-. fi +-. di Td +-\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. br +-. di +-. ev +-. na +-. ds tD \\*(Td\\ +-. pT di p np +-. \} +-.\} +-.. +-.\" +-.\" +-.\" Complex Expression Macro +-.\" +-.\" TODO: add length across line boundary check (like Li) +-.de Cx +-.hy 0 +-.ie \\n(.$==0 \{\ +-. if "\\*(iM"Cx" \{\ +-. ds iM +-. if \\n(oE .oE +-\&\\*(f1 +-. ds f1 +-. \} +-. if "\\*(iM"Tp" .pT st p np +-. if "\\*(iM"Dp" .pT st q mp +-.\} +-.el \{\ +-. if "\\*(iM"" \{\ +-. ds iM Cx +-. ds f1 \& +-. \} +-. mN \\$1 +-.\" Here are the args: `\\$1' `\\$2' `\\$3' `\\$4' +-. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. el \{\ +-. as f1 \&\\$1 +-. if \\n(.$>1 .Cx \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.\} +-.. +-.\" Prefix string in default font to content specified string +-.de Pf +-.Cx \\$1 +-.\\$2 \\$3 \\$4 \\$5 +-.Cx +-.. +-.\" Suffix string in default font to content specified string +-.de Sf +-.Cx \\$1 \\$2 +-.Cx \\$3 +-.Cx +-.. +-.\" Simple Option Begin +-.de Ob +-.hy 0 +-.ie "\\*(iM"" \{\ +-. ev 2 +-. fi +-. di oB +-.\} +-.el \{\ +-.tm shouldn't be here +-. as f1 \&[ +-. mN \\$1 +-. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. el \{\ +-. as f1 \&\\$1 +-. if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-.\} +-.. +-.de Oc +-.as f1 \&\\$1 +-.if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.. +-.de Oe +-.hy 0 +-.ie "\\*(iM"" \{\ +-. br +-. di +-. ev +-. ds bO \\*(oB\\ +-\&[\\*(bO\&] +-.\} +-.el \{\ +-. as f1 \&] +-.\} +-.. +-.\" White space for Cx +-.de Ws +-.Cx \&\ \& +-.. +-.\" tagged paragraph +-.\" initialize baby stack variables +-.nr mp 0 +-.nr q1 0 +-.ds r\n(np +-.\" +-.\" Complex Dp tag +-.de Dc +-.Dp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 +-.. +-.\" Complex Tp tag +-.de Tc +-.Tp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 +-.. +-.\" Tag with a flag and an argument with a space +-.de Ta +-.if "\\$2"" \{\ +-. Tp Fl \\$1 +-.\} +-.el \{\ +-. Tp Fl \\$1 +-. Cx \&\ \& +-. Ar \\$2 \\$3 +-. Cx +-.\} +-.. +-.de Da +-.Dp Cx Fl \\$1 +-.Ws +-.Ar \\$2 \\$3 +-.Cx +-.. +-.de To +-.Tp Cx Fl \\$1 +-.Ar \\$2 \\$3 +-.Cx +-.. +-.de Do +-.Dp Cx Fl \\$1 +-.Ar \\$2 \\$3 +-.Cx +-.. +-.\" Blended tag toggle +-.de Bt +-.ie \\n(tP==0 .nr tP 1 +-.el .nr tP 0 +-.. +-.\" Bullet paragraph +-.de Bu +-.Tp Sy \&\(bu +-.. +-.\" Display tagged paragraph +-.de Dp +-.ie "\\$1"" \{\ +-. pE q r mp +-. sp \\n(vVu +-.\} +-.el \{\ +-. ds iM Dp +-. mN \\$1 +-. ie \\n(tF \{\ +-. ds tC Tw +-. nr tC 1 +-. nr tF 0 +-. \} +-. el \{\ +-. if !"Tw"\\*(r\\n(mp" \{\ +-. ie \\n(mN \{\ +-. ds tC \\$1 +-. nr tW \\n(mN +-. \} +-. el \{\ +-. ds tC Tx +-. nr tW \\n(Tx +-. \} +-. if !"\\*(tC"\\*(r\\n(mp" .nr tC 1 +-. \} +-. \} +-. if !\\n(cR .ne 2 +-. if \\n(tC \{\ +-. nr mp \\n(mp+1 +-. nr q\\n(mp \\n(tW +-. ds r\\n(mp \\*(tC +-. nr tC 0 +-. ds tC +-. ie \\n(tIu==\\n(Dsu .nr i\\n(mp \\n(Dsu +-. el \{\ +-. nr i\\n(mp \\n(tIu +-. nr tI \\n(Dsu +-. \} +-. in \\n(.iu+\\n(i\\n(mpu +-. sp \\n(vVu +-. in \\n(.iu+\\n(\\q\\n(mpu +-. \} +-. ie \\n(mN \{\ +-. \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. if !"\\$1"Cx" .pT st q mp +-. \} +-. el \{\ +-. br +-. ev 1 +-. fi +-. di Td +-\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. br +-. di +-. ev +-. na +-. ds tD \\*(Td\\ +-. pT di q mp +-. \} +-.\} +-.. +-.\" +-.\" .pE number_stack string_stack counter +-.de pE +-.ie "\\$3"mp" \{\ +-. in \\n(.iu-(\\n(\\$1\\n(\\$3u)-(\\n(i\\n(mpu) +-. rr i\\n(mp +-.\} +-.el .in \\n(.iu-\\n(\\$1\\n(\\$3u +-.\" .in \\n(.iu-\\n(\\$1\\n(\\$3u +-.if \\n(\\$3<=0 .tm Extraneous call .Tp or .Dp +-.rr \\$1\\n(\\$3 +-.rm \\$2\\n(\\$3 +-.nr \\$3 \\n(\\$3-1 +-.ds iM +-.. +-.\" +-.\" .pT [st or di] number_stack counter +-.de pT +-.ie "\\$1"st" \{\ +-. nr bb \\n(\\$2\\n(\\$3u +-. ti -\\n(bbu +-. ie (\\n(\\$2\\n(\\$3u-2n)<=\w'\\*(f1'u \{\&\\*(f1\\*(tP +-. if \\n(tP==0 .br +-. \} +-. el \\*(f1\h'|\\n(\\$2\\n(\\$3u'\c +-.\} +-.el \{\ +-. ti -\\n(\\$2\\n(\\$3u +-. ie (\\n(\\$2\\n(\\$3u-2n)<=\\n(dlu \{\&\\*(tD\\*(tP +-. if !\\n(tP .br +-. \} +-. el \\*(tD\h'|\\n(\\$2\\n(\\$3u'\c +-. if t 'ad +-.\} +-. ds iM +-. ds f1 +-'fi +-.. +-.\" +-.\" The new SH +-.\" +-.de Sh +-.\" set Sh state off, check for list state before calling indent (.In) +-.nr nS 0 +-.nr sE 0 +-.ie "\\$1"NAME" \{\ +-.\" name state on, housekeep (headers & footers) +-. hK +-' in 0 +-.\} +-.el \{\ +-. if "\\$1"SYNOPSIS" .nr nS 1 +-. in 0 +-.\} +-.pL +-'sp +-.ns +-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i +-.if !\\n(cR .ne 3 +-'fi +-\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9 +-\&\fP\& +-.in \\n(.iu+\\n(Tiu +-.if "\\$1"SEE" .nr sE 1 +-.ns +-.. +-.\" +-.\" Nd minus sign for an en dash used in .Sh Name +-.de Nd +-\&\-\& \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.. +-.de Ss +-.sp +-.ti -.25i +-\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9 +-\&\fP\& +-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i +-.if !\\n(cR .ne 2 +-.br +-.. +-.\" .if "\\$1"Ss" .in \\n(.iu+\\n(sIu +-.\".. +-.\" +-.\" +-.\" Column Macro +-.\" +-.hy 0 +-.de Cw +-.ie \\n(.$==0 \{\ +-. br +-. in \\n(.iu-\\n(eWu +-. ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i +-.\} +-.el \{\ +-. Pp +-. if \\n(.$==1 \{\ +-. ta \w'\\$1 'u +-. nr eW \w'\\$1 'u +-' in \\n(.iu+\\n(eWu +-. \} +-. if \\n(.$==2 \{\ +-. ta \w'\\$1 'u +\w'\\$2 'u +-. nr eW \w'\\$1 'u+\w'\\$2 'u +-' in \\n(.iu+\\n(eWu +-. \} +-. if \\n(.$==3 \{\ +-. ta \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +-. nr eW \w'\\$1 'u+\w'\\$2 'u+\w'\\$3 'u +-' in \\n(.iu+\\n(eWu +-. \} +-. if \\n(.$==4 \{\ +-. ta \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +\w'\\$4 'u +-. nr eW \w'\\$1 'u+\w'\\$2 'u+\w'\\$3 'u +\w'\\$4 'u +-' in \\n(.iu+\\n(eWu +-. \} +-. if \\n(.$==5 \{\ +-.ta \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +\w'\\$4 'u +\w'\\$5 'u +-.nr eW \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +\w'\\$4 'u +\w'\\$5 'u +-' in \\n(.iu+\\n(eWu +-. \} +-.\} +-.. +-.de Cl +-.ti -\\n(eWu +-.mN \\$1 +-.ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.el \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.. +-.nr dQ 0 +-.de Ds +-.ie !"\\$1"" \{\ +-. mN d\\$1 +-. if \\n(mN \{\ +-. nr dQ \\n(dQ+1 +-. d\\$1 +-. \} +-.\} +-.el .br +-.nf +-.. +-.de Df +-.ie !"\\$1"" \{\ +-. mN d\\$1 +-. if \\n(mN \{\ +-. nr dQ \\n(dQ+1 +-. d\\$1 +-. \} +-.\} +-.el .br +-.. +-.de Dn +-\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-.nf +-.. +-.de dI +-.nr d\\n(dQ \\n(dIu +-.in \\n(.iu+\\n(dIu +-.. +-.de dC +-.nr d\\n(dQ (\\n(.l-\\n(.i)/4u +-.in \\n(.iu+\\n(d\\n(dQu +-.. +-.de dR +-.nr d\\n(dQ (\\n(.l/3)u +-.in \\n(.iu+\\n(d\\n(dQu +-.. +-.de dL +-.nr aa 0 +-.. +-.de De +-.br +-.if \\n(d\\n(dQ \{\ +-. in \\n(.iu-\\n(d\\n(dQu +-. rr d\\n(dQ +-. nr dQ \\n(dQ-1 +-.\} +-.fi +-.. +-.\" +-.de Fn +-.ie \\n(.$==0 \{\ +-. tm Usage: .Fn function_name function_arg(s) ... \\*(Pu +-.\} +-.el \{\ +-. nr cF \\n(.f +-. ie \\n(.$==1 .ds f1 \&\\*(nM\\$1\fP\\*(lP\fP\\*(rP\fP +-. el \{\ +-. ds f1 \\*(nM\\$1\fP\\*(lP +-. nr aa 0 +-. rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 +-. \} +-. if "\\*(iM"" \{\\&\\*(f1 +-. ds f1 +-. \} +-.\} +-.. +-.\" +-.de rC +-.rZ \\$1 +-.ie \\n(rZ \{\ +-. as f1 \f\\n(cF\\*(rP\f\\n(cF\\$1\\$2\\$3\\$4\\$5\\$6\\$7 +-.\} +-.el \{\ +-. ie \\n(aa .as f1 \fP, \\*(aR\\$1 +-. el .as f1 \\*(aR\\$1 +-. nr aa 1 +-. ie \\n(.$>1 .rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 +-. el .as f1 \fP\\*(rP\fP +-.\} +-.. +diff -Nuar groff-1.22.3.old/tmac/doc-old.tmac-u groff-1.22.3/tmac/doc-old.tmac-u +--- groff-1.22.3.old/tmac/doc-old.tmac-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/doc-old.tmac-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,1857 @@ ++.\" -*- nroff -*- ++.\" ++.\" Copyright (c) 1990 The Regents of the University of California. ++.\" All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms, with or without ++.\" modification, are permitted provided that the following conditions ++.\" are met: ++.\" 1. Redistributions of source code must retain the above copyright ++.\" notice, this list of conditions and the following disclaimer. ++.\" 2. Redistributions in binary form must reproduce the above copyright ++.\" notice, this list of conditions and the following disclaimer in the ++.\" documentation and/or other materials provided with the distribution. ++.\" 3. [Deleted. See ++.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] ++.\" 4. Neither the name of the University nor the names of its contributors ++.\" may be used to endorse or promote products derived from this software ++.\" without specific prior written permission. ++.\" ++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++.\" SUCH DAMAGE. ++.\" ++.\" @(#)doc-old.tmac 5.2 (Berkeley) 3/13/91 ++.\" Slightly modified by jjc@jclark.com to work with groff as well. ++.\" ++.\" Assume nroff on crt's only if cR==1 ++.if n .nr cR 1 ++.\" STRING CONSTANTS ++.\" DITROFF ++.if t \{\ ++.\" Address Style ++.ds aD \fI ++.\" Argument Reference Style ++.ds aR \f(CO ++.\" Interactive Command Modifier (flag) ++.ds cM \f(CB ++.\" Emphasis (in the English sense - usually italics) ++.ds eM \fI ++.\" Errno Style ++.ds eR \fC ++.\" Environment Variable Style ++.ds eV \fC ++.\" Command Line Flag Style ++.ds fL \f(CB ++.\" Header String Style ++.ds Hs \fR ++.\" Interactive Command Style ++.ds iC \f(CB ++.\" Literal Style ++.ds lI \fC ++.\" Left Parenthesis Style ++.ds lP \fR\|(\|\fP ++.\" Right Parenthesis Style ++.ds rP \fR\|)\|\fP ++.\" Options Open Bracket Style ++.ds lB \fR\^[\^\fP ++.\" Options Open Bracket Style ++.ds rB \fR\^]\fP ++.\" Name (subject of manpage) Style ++.ds nM \f(CB ++.\" Pathname Style ++.ds pA \fC ++.\" Accepted punctuation string for -mdoc syntax ++.ds Pu \fR[.,:;(\^)[\^]\fR] ++.\" Section Header Style ++.ds Sp \s12\fB ++.\" .ds sT \s-2\fR ++.\" Symbolic Emphasis (boldface) ++.ds sY \f(CB ++.\" Generic Variable Style ++.ds vA \fI ++.\" Volume Title Style ++.ds Vs \fR ++.\" Cross Reference STyle (man page only) ++.ds xR \fC ++.\" Math * ++.tr *\(** ++.\} ++.\" NROFF ++.if n \{\ ++.\" Address Style ++.ds aD \fI ++.\" Argument Reference Style ++.ds aR \fI ++.\" Interactive Command Modifier (flag) ++.ds cM \fB ++.\" Emphasis (in the English sense - usually italics) ++.ds eM \fI ++.\" Errno Style ++.ds eR \fR ++.\" Environment Variable Style ++.ds eV \fR ++.\" Command Line Flag Style ++.ds fL \fB ++.\" Header String Style ++.ds Hs \fR ++.\" Interactive Command Style ++.ds iC \fB ++.\" Literal Style ++.ds lI \fR ++.\" Left Parenthesis Style ++.ds lP \fR\|(\fP ++.\" Right Parenthesis Style ++.ds rP \fR\|)\fP ++.\" Options Open Bracket Style ++.ds lB \fR\|[\|\fP ++.\" Options Open Bracket Style ++.ds rB \fR\|]\fP ++.\" Name (subject of manpage) Style ++.ds nM \fB ++.\" Pathname Style ++.ds pA \fI ++.\" Accepted punctuation string for -mdoc syntax ++.ds Pu [.,;:()[]] ++.\" Section Header Style ++.ds Sp \s12\fB ++.\" .ds sT \s-2\fR ++.\" .ds sT \s-2\fR ++.\" Symbol, Mode or Mask Style ++.ds sY \fB ++.\" Generic Variable Style ++.ds vA \fI ++.\" Volume Title Style ++.ds Vs \fR ++.\" Cross Reference Style (man page only) ++.ds xR \fR ++.\} ++.\" INDENTS - Subheaders(sI), Text(Ti) between Section Headers and Subsects ++.if t \{\ ++. nr sI \w'\fC,'u*5 ++. nr Ti \n(sIu ++.\} ++.if n \{\ ++. nr sI .5i ++. nr Ti .5i ++.\} ++.\" Flags for macros names which are used only for .Ds ++.nr dI 6n ++.nr dC 1 ++.nr dL 1 ++.nr dR 1 ++.\" INDENT WIDTHS (for Lists) ++.\" Width Needed for Address Tag (indented amount) ++.nr Ad 12n ++.\" Angle Quote Width ++.nr Aq 12n ++.\" Width Needed for Argument ++.nr Ar 12n ++.\" Width Needed for Column offset ++.nr Cl 15n ++.\" Width neeeded for Interactive Command Modifier ++.nr Cm 10n ++.\" Width Needed for Complex Expressions ++.nr Cx 20n ++.\" Indent Width Needed for Display (right and left margins) ++.nr Ds 6n ++.\" Double Quote Width ++.nr Dq 12n ++.\" tI is dependent on Ds and used by .Dp ++.nr tI \n(Dsu ++.\" Width Needed for Display ++.nr Em 10n ++.\" Width Needed for Errno Types ++.nr Er 15n ++.\" Width Needed for Environment Variables ++.nr Ev 15n ++.\" Width Needed for Example Indent ++.nr Ex 10n ++.\" Width Needed for Flag ++.nr Fl 10n ++.\" Width Needed for Function ++.nr Fn 16n ++.\" Width neeeded for Interactive Command Name ++.nr Ic 10n ++.\" Width Needed for Constant ++.nr Li 16n ++.\" Width Needed for Math Symbol ? not sure if needed ++.nr Ms 6n ++.\" Width Needed for Name ++.nr Nm 10n ++.\" Width Needed for Option Begin ++.nr Ob 14n ++.\" Width Needed for Option End ++.nr Oe 14n ++.\" Width Needed for Option (one line) ++.nr Op 14n ++.\" Width Needed for Pathname ++.nr Pa 32n ++.\" Parenthesis Quote Width ++.nr Pq 12n ++.\" Single Quote Width ++.nr Sq 12n ++.\" Width Needed for Symbols, Modes or Masks ++.nr Sy 6n ++.\" Width needed for default or unknown text width ++.nr Tx 22n ++.\" Width Needed for Generic Variable ++.nr Va 12n ++.\" Width Needed for Cross Reference, should the cross ref be annotated. ++.nr Xr 10n ++.\" PARAGRAPH SPACE ++.if t \{\ ++. nr Pp .5v ++.\} ++.if n \{\ ++. nr Pp 1v ++.\} ++.\" PAGE LAYOUT ++.\" .Li Tagged Paragraph Style - zero if break on oversized tag ++.\" one if add em space and continue filling line. ++.nr tP 0 ++.\" Page Layout Macro ++.de pL ++.\" DITROFF ++.ie t \{\ ++.\" Header Margin ++. nr Hm .5i ++.\" Footer Margin ++. nr Fm .5i ++.\" Line length ++. nr ll 5.5i ++.\" Line length ++. ll 5.5i ++.\" Title length ++. nr lt 5.5i ++.\" Title length ++. lt 5.5i ++.\" Page offset ++. nr po 1.56i ++.\" Page offset ++. po 1.56i ++.\" Vertical space distance (from Section headers/Lists/Subsections) ++. nr vV .5v ++.\" em space ++. ds tP \|\|\|\|\|\| ++.\} ++.el \{\ ++.\" Line length ++. nr ll 78n ++. ll 78n ++.\" Title length ++. nr lt 78n ++.\" Title length ++. lt 78n ++.\" Page offset ++. nr po 0i ++.\" Page offset ++. po 0i ++.\" Vertical space distance (from Section headers/Lists/Subsections) ++. nr vV 1v ++.\" em space ++. ds tP \0\0 ++.\" Test for crt ++. ie \\n(cR .nr Hm 0 ++. el .nr Hm .5i ++.\" Footer Margin ++. nr Fm .5i ++.\} ++.. ++.\" Adjustment mode ++.if n \{\ ++.ad l ++.na ++.. ++.\} ++.\" PREDEFINED STRINGS ++.if t \{\ ++. ds <= \(<= ++. ds >= \(>= ++. ds Lq \&`` ++. ds Rq \&'' ++. ds ua \(ua ++. ds aa \(aa ++. ds ga \(ga ++. ds sR \(aa ++. ds sL \(ga ++.\} ++.if n \{\ ++. ds <= \&<\&= ++. ds >= \&>\&= ++. ds Rq '' ++. ds Lq `` ++. ds ua ^ ++. ds aa ' ++. ds ga ` ++. ds sL ` ++. ds sR ' ++.\} ++.\" Note: The distances from the bottom or top of the page are set ++.\" in headers (macro .hK): to -1.25 for troff, and -1.167 for nroff ++.\" bottoms, and top is 0. ++.\" ++.\" .Dt Document/manpage_title section/chapter volume ++.\" The \{ and \} is necessary as roff doesn't nest if-elses ++.\" properly, especially with .ds. ++.\" TODO: separate Dt into Dt, Ch and Vt for supp docs. ++.de Dt ++.ds dT UNTITLED ++.ds vT Local ++.ds cH Null ++.\" Volume and Section Number or Chapter Number ++.if !"\\$1"" .ds dT \\$1 ++.if !"\\$2"" \{\ ++. ds cH \\$2 ++. if "\\$3"" \{\ ++. \" Volume Title if none given ++. if \\$2>=1 .if \\$2<=8 \{\ ++. ds vT UNIX Reference Manual ++. if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual ++. if "\\$2"8" .ds vT UNIX System Manager's Manual ++. \} ++. if "\\$2"unass" .ds vT DRAFT ++. if "\\$2"draft" .ds vT DRAFT ++. if "\\$2"paper" .ds vT Null ++. \} ++.\} ++.if !"\\$3"" \{\ ++. \" Volume Title if given ++. if "\\$3"USD" .ds vT UNIX User's Supplementary Documents ++. if "\\$3"PS1" .ds vT UNIX Programmers's Supplementary Documents ++. if "\\$3"AMD" .ds vT UNIX Ancestral Manual Documents ++. if "\\$3"SMM" .ds vT UNIX System Manager's Manual ++. if "\\$3"URM" .ds vT UNIX Reference Manual ++. if "\\$3"PRM" .ds vT UNIX Programmers's Manual ++. if "\\$3"IND" .ds vT UNIX Manual Master Index ++. if "\\$3"CON" .ds vT UNIX Contributed Software Manual ++. if "\\$3"IMP" .ds vT UNIX Implementation Notes ++. if "\\$3"HOW" .ds vT UNIX How Pocket Manual ++. if "\\$3"LOCAL" .ds vT UNIX Local Manual ++. if "\\*(vT"Local" .ds vT \\$3 ++.\} ++.. ++.\" ++.\" .Os Operating System/Standard and Release or Version Number ++.\" ++.de Os ++.ds oS Null ++.if "\\$1"" \{\ ++. ds oS \fIBSD Experimental\fP ++.\" . ds oS (\fIBag o' Bits\fP) ++.\} ++.if "\\$2"" \{\ ++. ds o1 Non-Null ++.\} ++.if "\\$1"ATT" \{\ ++. ds oS AT&T ++. if "\\$2"" .as oS \0UNIX ++. if "\\$2"7th" .as oS \07th Edition ++. if "\\$2"7" .as oS \07th Edition ++. if "\\$2"III" .as oS \0System III ++. if "\\$2"3" .as oS \0System III ++. if "\\$2"V" .as oS \0System V ++. if "\\$2"V.2" .as oS \0System V Release 2 ++. if "\\$2"V.3" .as oS \0System V Release 3 ++. if "\\$2"V.4" .as oS \0System V Release 4 ++.\} ++.if "\\$1"BSD" \{\ ++. if "\\$2"3" .ds oS 3rd Berkeley Distribution ++. if "\\$2"4" .ds oS 4th Berkeley Distribution ++. if "\\$2"4.1" .ds oS 4.1 Berkeley Distribution ++. if "\\$2"4.2" .ds oS 4.2 Berkeley Distribution ++. if "\\$2"4.3" .ds oS 4.3 Berkeley Distribution ++. if "\\$2"4.3+" .ds oS 4.3+tahoe Berkeley Distribution ++.\} ++.if "\\*(oS"Null" .ds oS \\$1 ++.if "\\*(o1"Non-Null" .as oS \0\\$2 ++.rm o1 ++.. ++.\" ++.\" Standards ++.\" ++.\" .de St ++.\" .ds sT Null ++.\" .if "\\$1"POSIX" \{\ ++.\" . ds sT IEEE Standard POSIX ++.\" . if \\$2 .as sT \0\\$2 ++.\" .\} ++.\" .if "\\$1"ANSI" \{\ ++.\" . ds sT ANSI Standard ++.\" . if \\$2 .as sT \0\\$2 ++.\" .\} ++.\" .if "\\$1"ISO" \{\ ++.\" . ds sT ISO Standard ++.\" . if \\$2 .as sT \0\\$2 ++.\" .\} ++.\" .if "\\*(sT"Null" .ds sR \\$3 ++.\" .. ++.\" ++.\" .de Gp ++.\" .ie !"\\$1"" .ds gP \&\\$1 \\$2 \\$3 \\$4 \\$5 ++.\" .el .ds gP Null ++.\" .. ++.\" ++.\" ++.de Dd ++.nr aa 0 ++.ie \\n(.$>0 \{\ ++. ie \\n(.$<4 \{\ ++. ds dD \\$1 \\$2 \\$3 ++. \} ++. el .tm Usage: .Dd Month Day, Year (e.g July 4, 1977). ++.\} ++.el \{\ ++. ds dD Epoch ++.\} ++.. ++.\" ++.\" House Keeping Macro - Make sense of dT, cH, vT, sT, gP and dS ++.\" TODO: Try to get else's for efficiency ++.\" TODO: GET RID OF .wh -1.167i (its in v7) ++.\" ++.\" ++.de hK ++.nr % 1 ++.ds hT \\*(dT ++.if !"\\*(cH"Null" \{\ ++. ie !"\\*(gP"Null" .as hT \|(\|\\*(cH\\*(gP\|) ++. el .as hT \\|(\\|\\*(cH\\|) ++.\} ++.if "\\*(cH"Null" .if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|) ++.if t \{\ ++. wh 0 hM ++. wh -1.25i fM ++.\} ++.if n \{\ ++. ie \\n(cR \{\ ++. hM ++. wh -0v fM ++. \} ++. el \{\ ++. wh 0 hM ++. wh -1.167i fM ++. \} ++.\} ++.if n \{\ ++. if \\n(nl==0:\\n(nl==-1 'bp ++.\} ++.if t 'bp ++.em lM ++.. ++.\" Header Macro ++.\" ++.de hM ++.ev 1 ++.pL ++.if !\\n(cR 'sp \\n(Hmu ++.tl @\\*(Hs\\*(hT\fP@\\*(Vs\\*(vT\fP@\\*(Hs\\*(hT\fP@ ++'sp \\n(Hmu ++.ev ++.. ++.\" ++.de fM ++.ev 1 ++.pL ++.if !\\n(cR \{\ ++' sp \\n(Fmu ++. tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@ ++' bp ++.\} ++.if \\n(cR \{\ ++.\" . tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@ ++.\" ' bp ++.\} ++.ev ++.. ++.de lM ++.fl ++.if \\n(cR \{\ ++. fM ++. pl \\n(nlu ++.\} ++.. ++.de Pp ++.sp \\n(Ppu ++.ne 2 ++.ns ++.. ++.de Lp ++.Pp ++.. ++.de LP ++.tm Not a \-mdoc command: .LP ++.. ++.de PP ++.tm Not a \-mdoc command: .PP ++.. ++.de pp ++.tm Not a \-mdoc command: .pp ++.. ++.de Co ++.tm Not a \-mdoc command: .Co ++.. ++.nr z. 1 ++.nr z, 1 ++.nr z: 1 ++.nr z; 1 ++.nr z) 1 ++.nr z( 1 ++.nr z[ 1 ++.nr z] 1 ++.\" This is disgusting, troff not parse if stmt properly ++.nr z1 0 ++.nr z2 0 ++.nr z3 0 ++.nr z4 0 ++.nr z5 0 ++.nr z6 0 ++.nr z7 0 ++.nr z8 0 ++.nr z9 0 ++.nr z0 0 ++.nr z# 0 ++.\" ++.de Ad ++.ie \\n(.$==0 \{\ ++. tm Usage: .Ad address [...] \\*(Pu ++.\} ++.el \{\ ++. ds sV \\*(aD ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.\" Command Line Argument Macro ++.\" ++.de Ar ++.ie \\n(.$==0 \{\ ++. ie !"\\*(iM"" .as f1 \&[\|\\*(aRfile\ ...\fP\|] ++. el \&[\|\\*(aRfile\ ...\fP\|] ++.\} ++.el \{\ ++. ds sV \\*(aR ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Em ++.ie \\n(.$==0 \{\ ++. tm Usage: .Em text ... \\*(Pu ++.\} ++.el \{\ ++. ds sV \\*(eM ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Er ++.ie \\n(.$==0 \{\ ++. tm Usage: .Er ERRNOTYPE ... \\*(Pu ++. \} ++.el \{\ ++. ds sV \\*(eR ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Ev ++.ie \\n(.$==0 \{\ ++. tm Usage: .Ev ENVIRONMENT_VARIABLE(s) ... \\*(Pu ++. \} ++.el \{\ ++. ds sV \\*(eV ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.\" Flag Name Macro ++.\" ++.de Fl ++.ie \\n(.$==0 \{\ ++. ie !"\\*(iM"" .as f1 \&\\*(fL\-\fP ++. el \&\\*(fL\-\fP ++.\} ++.el \{\ ++. nr rZ 0 ++. sW \\$1 ++. if (\\n(sW==1&\\n(.$==1) .rZ \\$1 ++. ds sV \\*(fL ++. nr cF \\n(.f ++. ie \\n(rZ \{\ ++. ie "\\*(iM"" .ds f1 \&\\*(sV\-\f\\n(cF\\$1 ++. el \&\\*(sV\-\f\\n(cF\\$1 ++. \} ++. el \{\ ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. fB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++. \} ++.\} ++.. ++.\" Interactive Commands Macro ++.\" ++.de Ic ++.ie \\n(.$==0 \{\ ++. tm Usage: .Ic Interactive Commands(s) ... \\*(Pu ++.\} ++.el \{\ ++. ds sV \\*(iC ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.\" Interactive Command Modifiers (flags) ++.\" ++.de Cm ++.ie \\n(.$==0 \{\ ++. tm Usage: .Cm Interactive Command Modifier(s) ... \\*(Pu ++.\} ++.el \{\ ++. ds sV \\*(cM ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Li ++.ie \\n(.$==0 \{\ ++. tm Usage: .Li literal ... \\*(Pu ++. \} ++.el \{\ ++. ds sV \\*(lI ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" If in nroff or any other case where the default font ++.\" is constant width, and literal means zilch, single quote instead. ++.ie n \{\ ++.de Ql ++. ie \\n(.$==0 \{\ ++. tm Usage: .Ql literal ... \\*(Pu ++. \} ++. el \{\ ++. Sq \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.. ++.\} ++.el \{\ ++.de Ql ++. ie \\n(.$==0 \{\ ++. tm Usage: .Ql literal ... \\*(Pu ++. \} ++. el \{\ ++. Li \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.. ++.\} ++.\" ++.de Nm ++.ie \\n(.$==0 \{\ ++. if "\\*(n1"" .tm Usage: .Nm Name(s) ... \\*(Pu ++. ie !"\\*(iM"" .as f1 \&\\*(nM\\*(n1\\$1\fP ++. el \&\\*(nM\\*(n1\\$1\fP ++.\} ++.el \{\ ++. ds sV \\*(nM ++. nr cF \\n(.f ++. if \\n(nS \{\ ++. rs ++. in -\\n(iSu ++. ie \\n(nS>1 .br ++. el \{\ ++. sW \\$1 ++. nr iS ((\\n(sW+1)*\\n(fW)u ++. \} ++. in +\\n(iSu ++. ti -\\n(iSu ++. nr nS \\n(nS+1 ++. \} ++. if "\\*(n1"" .ds n1 \\$1 ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Pa ++.ie \\n(.$==0 \{\ ++\&\\*(pA~\fP ++.\} ++.el \{\ ++. ds sV \\*(pA ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Sy ++.ie \\n(.$==0 \{\ ++. tm Usage: .Sy Symbolic Text ... \\*(Pu ++. \} ++.el \{\ ++. ds sV \\*(sY ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Ms ++.ie \\n(.$==0 \{\ ++. tm Usage: .Ms Math Symbol ... \\*(Pu ++. \} ++.el \{\ ++. ds sV \\*(sY ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de Va ++.ie \\n(.$==0 \{\ ++. tm Usage: .Va variable_name(s) ... \\*(Pu ++.\} ++.el \{\ ++. ds sV \\*(vA ++. nr cF \\n(.f ++. ie "\\*(iM"" .ds f1 \&\\*(sV ++. el .as f1 \&\\*(sV ++. nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++.\} ++.. ++.\" ++.de nB ++.hy 0 ++.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)? ++.ie \\n(.$>1 \{\ ++. rZ \\$1 ++. ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP ++. el .as f1 \&\\$1 ++. rZ \\$2 ++. if !\\n(rZ \{\ ++. ie !"\\*(iM""\{\ ++.\" I surrender ++. if "\\*(iM"Tp" .as f1 \&\ \& ++. if "\\*(iM"Dp" .as f1 \&\ \& ++. if "\\*(iM"Op" .as f1 \&\ \& ++. if "\\*(iM"Cx" .as f1 \&\ \& ++. if "\\*(iM"Dq" .as f1 \& \& ++. if "\\*(iM"Sq" .as f1 \& \& ++. if "\\*(iM"Pq" .as f1 \& \& ++. if "\\*(iM"Aq" .as f1 \& \& ++. \} ++. el .as f1 \& \& ++. \} ++. nB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.\} ++.el \{\ ++. rZ \\$1 ++. ie \\n(rZ .as f1 \&\f\\n(cF\\$1 ++. el .as f1 \&\\$1\f\\n(cF ++. if "\\*(iM"" \{\&\\*(f1 ++. ds f1 ++. \} ++. hy ++.\} ++.. ++.de fB ++.hy 0 ++.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)? ++.ie \\n(.$>1 \{\ ++. rZ \\$1 ++. ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP ++. el \{\ ++. ie "\\$1"-" .as f1 \&\-\- ++. el .as f1 \&\-\\$1 ++. \} ++. rZ \\$2 ++. if !\\n(rZ \{\ ++. ie !"\\*(iM""\{\ ++.\" I surrender ++. if "\\*(iM"Tp" .as f1 \&\ \& ++. if "\\*(iM"Dp" .as f1 \&\ \& ++. if "\\*(iM"Op" .as f1 \&\ \& ++. if "\\*(iM"Cx" .as f1 \&\ \& ++. if "\\*(iM"Dq" .as f1 \& \& ++. if "\\*(iM"Sq" .as f1 \& \& ++. if "\\*(iM"Pq" .as f1 \& \& ++. if "\\*(iM"Aq" .as f1 \& \& ++. \} ++. el .as f1 \& \& ++. \} ++. fB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.\} ++.el \{\ ++. rZ \\$1 ++. ie \\n(rZ .as f1 \&\f\\n(cF\\$1 ++. el \{\ ++. ie "\\$1"-" .as f1 \&\-\-\f\\n(cF ++. el .as f1 \&\-\\$1\f\\n(cF ++. \} ++. if "\\*(iM"" \{\&\\*(f1 ++. ds f1 ++. \} ++. hy ++.\} ++.. ++.\" ++.\" Single quoted Items ++.\" eF, sB g[0-9] and f2 ++.de Sq ++.nr eF 0 ++.ie \\n(.$==0 \{\ ++. ie "\\*(iM"" \&\\*(sL\&\\*sR ++. el .as f1 \&\\*(sL\&\\*(sR ++.\} ++.el \{\ ++. ie "\\*(iM"" \{\ ++. ds f1 \&\\*(sL ++. ds iM Sq ++. \} ++. el .as f1 \&\\*(sL ++. sB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ie \\n(eF>0 .\\*(g1 \\*(g2 \\*(g3 \\*(g4 \\*(g5 \\*(g6 \\*(g7 \\*(g8 ++. el .as f1 \\*(g0 ++. as f1 \\*(sR ++. if !"\\*(f2"" .as f1 \\*(f2 ++. if "\\*(iM"Sq" \{\ ++\&\\*(f1 ++. ds f1 ++. ds iM ++. \} ++. ds f2 ++. rm g0 g1 g2 g3 g4 g5 g6 g7 g8 g9 ++. nr eF 0 ++.\} ++.. ++.\" ++.\" Double quoted Items ++.de Dq ++.nr Ef 0 ++.ie \\n(.$==0 \{\ ++. ie "\\*(iM"" \&\\*(Lq\&\\*(Rq ++. el .as f1 \&\\*(Lq\&\\*(Rq ++.\} ++.el \{\ ++. ie "\\*(iM"" \{\ ++. ds f1 \&\\*(Lq ++. ds iM Dq ++. \} ++. el .as f1 \&\\*(Lq ++. Sb \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ie \\n(Ef>0 .\\*(k1 \\*(k2 \\*(k3 \\*(k4 \\*(k5 \\*(k6 \\*(k7 \\*(k8 ++. el .as f1 \\*(k0 ++. as f1 \\*(Rq ++. if !"\\*(f4"" .as f1 \\*(f4 ++. if "\\*(iM"Dq" \{\ ++\&\\*(f1 ++. ds f1 ++. ds iM ++. \} ++. ds f4 ++. rm k0 k1 k2 k3 k4 k5 k6 k7 k8 k9 ++. nr Ef 0 ++.\} ++.. ++.\" ++.\" Parenthesis quoted Items ++.de Pq ++.nr pQ 0 ++.ie \\n(.$==0 \{\ ++. ie "\\*(iM"" \&(\&) ++. el .as f1 \&(\&) ++.\} ++.el \{\ ++. ie "\\*(iM"" \{\ ++. ds f1 \&( ++. ds iM Pq ++. \} ++. el .as f1 \&( ++. pB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ie \\n(pQ>0 .\\*(y1 \\*(y2 \\*(y3 \\*(y4 \\*(y5 \\*(y6 \\*(y7 \\*(y8 ++. el .as f1 \\*(y0 ++. as f1 \&) ++. if !"\\*(f3"" .as f1 \\*(f3 ++. if "\\*(iM"Pq" \{\ ++\&\\*(f1 ++. ds f1 ++. ds iM ++. \} ++. ds f3 ++. rm y0 y1 y2 y3 y4 y5 y6 y7 y8 y9 ++. nr pQ 0 ++.\} ++.. ++.\" eF, sB g[0-9] and f2 ++.de sB ++.hy 0 ++.ie \\n(.$==0 .tm Sick Logic: macro sB ++.el \{\ ++. ie \\n(eF>=1 .nr eF \\n(eF+1 ++. el \{\ ++. mN \\$1 ++. if \\n(mN .nr eF \\n(eF+1 ++. \} ++. rZ \\$1 ++. ie \\n(rZ .as f2 \\$1 ++. el \{\ ++. ie \\n(eF<1 .as g\\n(eF \\$1 ++. el .as g\\n(eF \\$1 ++. \} ++. if \\n(.$>1 \{\ ++. rZ \\$2 ++. if \\n(rZ==0 \{\ ++. if \\n(eF<1 \{\ ++. as g\\n(eF \& \& ++. \} ++. \} ++. sB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.\} ++.. ++.de Sb ++.hy 0 ++.ie \\n(.$==0 .tm Sick Logic: macro Sb ++.el \{\ ++. ie \\n(Ef>=1 .nr Ef \\n(Ef+1 ++. el \{\ ++. mN \\$1 ++. if \\n(mN .nr Ef \\n(Ef+1 ++. \} ++. rZ \\$1 ++. ie \\n(rZ .as f4 \\$1 ++. el \{\ ++. ie \\n(Ef<1 .as k\\n(Ef \\$1 ++. el .as k\\n(Ef \\$1 ++. \} ++. if \\n(.$>1 \{\ ++. rZ \\$2 ++. if \\n(rZ==0 \{\ ++. if \\n(Ef<1 \{\ ++. as k\\n(Ef \& \& ++. \} ++. \} ++. Sb \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.\} ++.. ++.de pB ++.hy 0 ++.ie \\n(.$==0 .tm Sick Logic: macro pB ++.el \{\ ++. ie \\n(pQ>=1 .nr pQ \\n(pQ+1 ++. el \{\ ++. mN \\$1 ++. if \\n(mN .nr pQ \\n(pQ+1 ++. \} ++. rZ \\$1 ++. ie \\n(rZ .as f3 \\$1 ++. el \{\ ++. ie \\n(pQ<1 .as y\\n(pQ \\$1 ++. el .as y\\n(pQ \\$1 ++. \} ++. if \\n(.$>1 \{\ ++. rZ \\$2 ++. if \\n(rZ==0 \{\ ++. if \\n(pQ<1 \{\ ++. as y\\n(pQ \& \& ++. \} ++. \} ++. pB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.\} ++.. ++.de aQ ++.hy 0 ++.ie \\n(.$==0 .tm Bad Syntax: .Aq ++.el \{\ ++. ie \\n(aQ>=1 .nr aQ \\n(aQ+1 ++. el \{\ ++. mN \\$1 ++. if \\n(mN .nr aQ \\n(aQ+1 ++. \} ++. rZ \\$1 ++. ie \\n(rZ .as aZ \\$1 ++. el \{\ ++. ie \\n(aQ<1 .as a\\n(aQ \\$1 ++. el .as a\\n(aQ \\$1 ++. \} ++. if \\n(.$>1 \{\ ++. rZ \\$2 ++. if \\n(rZ==0 \{\ ++. if \\n(aQ<1 \{\ ++. as a\\n(aQ \& \& ++. \} ++. \} ++. aQ \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.\} ++.. ++.\" Angle Bracket Quoted Items ++.de Aq ++.nr aQ 0 ++.ie \\n(.$==0 \{\ ++. ie "\\*(iM"" \&<\&> ++. el .as f1 \&<\&> ++.\} ++.el \{\ ++. ie "\\*(iM"" \{\ ++. ds f1 \&< ++. ds iM Aq ++. \} ++. el .as f1 \&< ++. aQ \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 ++. ie \\n(aQ>0 .\\*(a1 \\*(a2 \\*(a3 \\*(a4 \\*(a5 \\*(a6 \\*(a7 \\*(a8 ++. el .as f1 \\*(a0 ++. as f1 \&> ++. if !"\\*(aZ"" .as f1 \\*(aZ ++. if "\\*(iM"Aq" \{\ ++\&\\*(f1 ++. ds f1 ++. ds iM ++. \} ++. ds aZ ++. rm a0 a1 a2 a3 a4 a5 a6 a7 a8 ++. nr aQ 0 ++.\} ++.. ++.\" macro Name test, return macro register value if true ++.if \n(.g .ig ++.de mN ++.nr mN 0 ++.sW \\$1 ++.if \\n(sW==2 \{\ ++. if \\n(\\$1 .nr mN \\n(\\$1 ++.\} ++.. ++.if !\n(.g .ig ++.de mN ++.nr mN 0 ++.if \A'\\$1' \{\ ++. sW \\$1 ++. if \\n(sW==2 \{\ ++. if \\n(\\$1 .nr mN \\n(\\$1 ++. \} ++.\} ++.. ++.\" Punctuation test (using z registers), return 1 if true ++.if \n(.g .ig ++.de rZ ++.nr rZ 0 ++.sW \\$1 ++.if \\n(sW==1 \{\ ++. if \\n(z\\$1==1 \{\ ++. nr rZ 1 ++. \} ++.\} ++.. ++.if !\n(.g .ig ++.de rZ ++.nr rZ 0 ++.if \A'\\$1' \{\ ++. sW \\$1 ++. if \\n(sW==1 \{\ ++. if \\n(z\\$1==1 \{\ ++. nr rZ 1 ++. \} ++. \} ++.\} ++.. ++.\" ++.\" sW returns number of characters in a string ++.if t \{\ ++.nr fW \w'\fC,' ++.de sW ++.nr sW \w'\fC\\$1' ++.\} ++.if n \{\ ++.nr fW \w'0' ++.de sW ++.nr sW \w'\\$1' ++.\} ++.ie \\n(sW>=\\n(fW \{\ ++. ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1 ++. el .nr sW \\n(sW/\\n(fW ++.\} ++.el .nr sW 0 ++.. ++.\" Option Expression - ++.\" TODO - add line overflow check (right!) ++.nr eP 0 ++.ds e1 ++.nr oE 0 ++.nr hP 0 ++.ds hP ++.nr Ep 0 ++.de Op ++.hy 0 ++.if "\\*(iM"" \{\ ++. ds iM Op ++. ds f1 \& ++.\} ++.as f1 \&\\*(lB ++.\" .tm Op: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.dO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.ie !"\\$1"Cx" .oE ++.el .nr oE \\n(oE+1 ++.. ++.\" ++.\" just for mike, with every bite of garlic in mind (oops, i mean burp). ++.\" dO: go dOwn an argument vector and test each argument to see if ++.\" a macro name or punctuation. stash in respective place along ++.\" with its arguments. ++.nr oO 0 ++.nr oP 0 ++.nr aO 0 ++.de dO ++.mN \\$1 ++.ie \\n(mN \{\ ++. if \\n(oP \{\ ++. if \\n(hP \{\ ++. nr oZ 1 ++. oZ ++. Oz ++. \} ++. if \\n(e1==1 \{\ ++.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9 ++. \} ++. uO ++. if !(\\n(oO:\\n(aO) .as f1 \& \& ++. \} ++. ie "\\$1"Op" \{\ ++. as f1 \&\\*(lB ++. nr aO \\n(aO+1 ++. \} ++. el \{\ ++. nr eP \\n(eP+1 ++. ds e\\n(eP \\$1 ++. nr e\\n(eP 1 ++. \} ++.\} ++.el \{\ ++.\" .tm dO: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE ++. rZ \\$1 ++. ie \\n(rZ \{\ ++.\" .tm dO:rZ: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(eP ++. nr hP \\n(hP+1 ++. ds h\\n(hP \\$1 ++. \} ++. el \{\ ++.\" .tm dO:word $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE ++. if \\n(eP==0:\\n(e\\n(eP==1 .nr eP \\n(eP+1 ++. if \\n(eZ .as e\\n(eP \& \& ++. as e\\n(eP " \&\\$1 ++.\" . ds e\\n(eP \&\\$1 ++. nr eZ \\n(eZ+1 ++. \} ++.\} ++.nr oP 1 ++.ie \\n(.$>1 \{\ ++. dO \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.\} ++.el \{\ ++. ie \\n(e1 \{\ ++.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9 ++. \} ++. el \{\ ++. as f1 \\*(e1 ++. \} ++.\} ++.. ++.\" handle old style arguments such as the arg -Idir ++.\" in adb, .Oo is a toggle. ++.de Oo ++.ie \\n(oO .nr oO 0 ++.el .nr oO 1 ++.. ++.\" stash punctuation ++.de oZ ++.if \\n(hP>=\\n(oZ \{\ ++. nr eP \\n(eP+1 ++. ds e\\n(eP \\*(h\\n(oZ ++. nr oZ \\n(oZ+1 ++. oZ ++.\} ++.. ++.\" clean up punctuation vector ++.de Oz ++.if \\n(hP>0 \{\ ++. rm h\\n(hP ++. nr hP \\n(hP-1 ++. Oz ++.\} ++.. ++.\" uO: go back up created vector cleaning it up along the way ++.de uO ++.if \\n(eP>0 \{\ ++. rm e\\n(eP ++. rr e\\n(eP ++. nr eP \\n(eP-1 ++. nr oP 0 ++. nr eZ 0 ++. uO ++.\} ++.. ++.\" option end ++.de oE ++.uO ++.ie \\n(hP \{\ ++. as f1 \\*(rB\\*(h1\\*(h2\\*(h3 ++. Oz ++. nr oZ 0 ++.\} ++.el \{\ ++. as f1 \\*(rB ++.\} ++.ie "\\*(iM"Op" \{\ ++. if \\n(aO .aO ++.if t \{\ ++. if (\\n(.lu-\\n(.ku-\\n(.ou-(2*\\n(fWu))<\w'\fC\\*(f1'u .br ++.\} ++.if n \{\ ++. nr aa \w'\\*(f1'u ++.\" . nr qq \\n(.lu-\\n(.ku-\\n(.ou ++.\" \&aa == \\n(aa, f1==\\*(f1, qq==\\n(qq ++. if (\\n(.lu-\\n(.ku-\\n(.ou-\\n(aau)<=(8*\\n(fWu) .br ++.\} ++\&\\*(f1 ++. ds iM ++. ds f1 ++. hy ++.\} ++.el .nr oE \\n(oE-1 ++.. ++.de aO ++.as f1 \\*(rB ++.nr aO \\n(aO-1 ++.if \\n(aO >0 .aO ++.. ++.\" ++.de Xr ++.if \\n(.$<=1 \{\ ++. ie \\n(.$==1 \{\ ++. if !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP ++. if "\\*(iM"" \&\\*(xR\\$1\fP ++. \} ++. el .tm Xr Usage: .Xr manpage_name [section#] \\*(Pu ++.\} ++.if \\n(.$==2 \{\ ++. rZ \\$2 ++. ie "\\*(iM"" \{\ ++. ie \\n(rZ \&\\*(xR\\$1\fP\\$2 ++. el \&\\*(xR\\$1\fP(\\$2) ++. \} ++. el \{\ ++. ie \\n(rZ .as f1 \&\\*(xR\\$1\fP\\$2 ++. el .as f1 \&\\*(xR\\$1\fP(\\$2) ++. \} ++.\} ++.if \\n(.$>=3 \{\ ++. rZ \\$2 ++. ie \\n(rZ \{\ ++. ie !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8 ++. el \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8 ++. \} ++. el \{\ ++. rZ \\$3 ++. ie \\n(rZ \{\ ++. if !"\\*(iM"" \{\ ++. as f1 \&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8 ++. \} ++. if "\\*(iM"" \{\ ++\&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8 ++. \} ++. \} ++. el \{\ ++. tm rZ = \\n(rZ the arg is \\$3 ++. tm Xr-XX Usage: .Xr manpage_name [section#] \\*(Pu ++. \} ++. \} ++.\} ++.. ++.\" ++.\" ++.de Ex ++.tm Ex defunct, Use .Dl: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.. ++.\" Display (one) Line of text. ++.de Dl ++.ie "\\*(iM"" \{\ ++' ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i ++. in \\n(.iu+\\n(Dsu ++. mN \\$1 ++. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. el \{\ ++. nr cF \\n(.f ++.\" Literal font is none specified ++\&\\*(lI\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. ft \\n(cF ++. \} ++. in \\n(.iu-\\n(Dsu ++.\} ++.el \{\ ++. mN \\$1 ++. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 ++. el \{\ ++. nr cF \\n(.f ++. ds f1 \&\\*(lI\\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 ++. as f1 \&\f\\n(cF ++. \} ++.\} ++.. ++.\" ++.\" ++.\" user set Tagged Paragraph Width (used in both Dp and Tp) ++.de Tw ++.ie \\n(.$==0 \{\ ++. nr aa 0 ++.\} ++.el \{\ ++. mN \\$1 ++. ie \\n(sW>2 \{\ ++. nr tW (\\n(sW+3)*\\n(fWu) ++. \} ++. el \{\ ++. ie \\n(mN .nr tW \\n(mN ++. el .nr tW \\$1 ++. \} ++. nr tF 1 ++.\} ++.. ++.\" ++.de Dw ++.Tw \\$1 ++.. ++.\" ++.de Di ++.ie \\n(.$==0 \{\ ++. nr tI \\n(Dsu ++.\} ++.el \{\ ++. sW \\$1 ++. if \\n(sW>=2 \{\ ++. nr tI \\$1u ++. \} ++. if \\n(sW<2 \{\ ++. if "\\$1"L" \{\ ++. nr tI 0 ++. \} ++. \} ++.\} ++.. ++.\" tagged paragraph ++.\" initialize baby stack variables ++.nr np 0 ++.nr p1 0 ++.ds s\n(np ++.\" ++.de Tp ++.ie "\\$1"" .pE p s np ++.el \{\ ++. ds iM Tp ++. mN \\$1 ++. ie \\n(tF \{\ ++. ds tC Tw ++. nr tC 1 ++. nr tF 0 ++. \} ++. el \{\ ++. if !"Tw"\\*(s\\n(np" \{\ ++. ie \\n(mN \{\ ++. ds tC \\$1 ++. nr tW \\n(mN ++. \} ++. el \{\ ++. ds tC Tx ++. nr tW \\n(Tx ++. \} ++. if !"\\*(tC"\\*(s\\n(np" .nr tC 1 ++. \} ++. \} ++. sp \\n(vVu ++. if !\\n(cR .ne 2 ++. if \\n(tC \{\ ++. nr np \\n(np+1 ++. nr p\\n(np \\n(tW ++. ds s\\n(np \\*(tC ++. nr tC 0 ++. ds tC ++. in \\n(.iu+\\n(p\\n(npu ++. \} ++. ie \\n(mN \{\ ++. ds f1 ++. \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. if !"\\$1"Cx" .pT st p np ++. \} ++. el \{\ ++. br ++. ev 1 ++. fi ++. di Td ++\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. br ++. di ++. ev ++. na ++. ds tD \\*(Td\\ ++. pT di p np ++. \} ++.\} ++.. ++.\" ++.\" ++.\" Complex Expression Macro ++.\" ++.\" TODO: add length across line boundary check (like Li) ++.de Cx ++.hy 0 ++.ie \\n(.$==0 \{\ ++. if "\\*(iM"Cx" \{\ ++. ds iM ++. if \\n(oE .oE ++\&\\*(f1 ++. ds f1 ++. \} ++. if "\\*(iM"Tp" .pT st p np ++. if "\\*(iM"Dp" .pT st q mp ++.\} ++.el \{\ ++. if "\\*(iM"" \{\ ++. ds iM Cx ++. ds f1 \& ++. \} ++. mN \\$1 ++.\" Here are the args: `\\$1' `\\$2' `\\$3' `\\$4' ++. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. el \{\ ++. as f1 \&\\$1 ++. if \\n(.$>1 .Cx \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.\} ++.. ++.\" Prefix string in default font to content specified string ++.de Pf ++.Cx \\$1 ++.\\$2 \\$3 \\$4 \\$5 ++.Cx ++.. ++.\" Suffix string in default font to content specified string ++.de Sf ++.Cx \\$1 \\$2 ++.Cx \\$3 ++.Cx ++.. ++.\" Simple Option Begin ++.de Ob ++.hy 0 ++.ie "\\*(iM"" \{\ ++. ev 2 ++. fi ++. di oB ++.\} ++.el \{\ ++.tm shouldn't be here ++. as f1 \&[ ++. mN \\$1 ++. ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. el \{\ ++. as f1 \&\\$1 ++. if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++.\} ++.. ++.de Oc ++.as f1 \&\\$1 ++.if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.. ++.de Oe ++.hy 0 ++.ie "\\*(iM"" \{\ ++. br ++. di ++. ev ++. ds bO \\*(oB\\ ++\&[\\*(bO\&] ++.\} ++.el \{\ ++. as f1 \&] ++.\} ++.. ++.\" White space for Cx ++.de Ws ++.Cx \&\ \& ++.. ++.\" tagged paragraph ++.\" initialize baby stack variables ++.nr mp 0 ++.nr q1 0 ++.ds r\n(np ++.\" ++.\" Complex Dp tag ++.de Dc ++.Dp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 ++.. ++.\" Complex Tp tag ++.de Tc ++.Tp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 ++.. ++.\" Tag with a flag and an argument with a space ++.de Ta ++.if "\\$2"" \{\ ++. Tp Fl \\$1 ++.\} ++.el \{\ ++. Tp Fl \\$1 ++. Cx \&\ \& ++. Ar \\$2 \\$3 ++. Cx ++.\} ++.. ++.de Da ++.Dp Cx Fl \\$1 ++.Ws ++.Ar \\$2 \\$3 ++.Cx ++.. ++.de To ++.Tp Cx Fl \\$1 ++.Ar \\$2 \\$3 ++.Cx ++.. ++.de Do ++.Dp Cx Fl \\$1 ++.Ar \\$2 \\$3 ++.Cx ++.. ++.\" Blended tag toggle ++.de Bt ++.ie \\n(tP==0 .nr tP 1 ++.el .nr tP 0 ++.. ++.\" Bullet paragraph ++.de Bu ++.Tp Sy \&\(bu ++.. ++.\" Display tagged paragraph ++.de Dp ++.ie "\\$1"" \{\ ++. pE q r mp ++. sp \\n(vVu ++.\} ++.el \{\ ++. ds iM Dp ++. mN \\$1 ++. ie \\n(tF \{\ ++. ds tC Tw ++. nr tC 1 ++. nr tF 0 ++. \} ++. el \{\ ++. if !"Tw"\\*(r\\n(mp" \{\ ++. ie \\n(mN \{\ ++. ds tC \\$1 ++. nr tW \\n(mN ++. \} ++. el \{\ ++. ds tC Tx ++. nr tW \\n(Tx ++. \} ++. if !"\\*(tC"\\*(r\\n(mp" .nr tC 1 ++. \} ++. \} ++. if !\\n(cR .ne 2 ++. if \\n(tC \{\ ++. nr mp \\n(mp+1 ++. nr q\\n(mp \\n(tW ++. ds r\\n(mp \\*(tC ++. nr tC 0 ++. ds tC ++. ie \\n(tIu==\\n(Dsu .nr i\\n(mp \\n(Dsu ++. el \{\ ++. nr i\\n(mp \\n(tIu ++. nr tI \\n(Dsu ++. \} ++. in \\n(.iu+\\n(i\\n(mpu ++. sp \\n(vVu ++. in \\n(.iu+\\n(\\q\\n(mpu ++. \} ++. ie \\n(mN \{\ ++. \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. if !"\\$1"Cx" .pT st q mp ++. \} ++. el \{\ ++. br ++. ev 1 ++. fi ++. di Td ++\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. br ++. di ++. ev ++. na ++. ds tD \\*(Td\\ ++. pT di q mp ++. \} ++.\} ++.. ++.\" ++.\" .pE number_stack string_stack counter ++.de pE ++.ie "\\$3"mp" \{\ ++. in \\n(.iu-(\\n(\\$1\\n(\\$3u)-(\\n(i\\n(mpu) ++. rr i\\n(mp ++.\} ++.el .in \\n(.iu-\\n(\\$1\\n(\\$3u ++.\" .in \\n(.iu-\\n(\\$1\\n(\\$3u ++.if \\n(\\$3<=0 .tm Extraneous call .Tp or .Dp ++.rr \\$1\\n(\\$3 ++.rm \\$2\\n(\\$3 ++.nr \\$3 \\n(\\$3-1 ++.ds iM ++.. ++.\" ++.\" .pT [st or di] number_stack counter ++.de pT ++.ie "\\$1"st" \{\ ++. nr bb \\n(\\$2\\n(\\$3u ++. ti -\\n(bbu ++. ie (\\n(\\$2\\n(\\$3u-2n)<=\w'\\*(f1'u \{\&\\*(f1\\*(tP ++. if \\n(tP==0 .br ++. \} ++. el \\*(f1\h'|\\n(\\$2\\n(\\$3u'\c ++.\} ++.el \{\ ++. ti -\\n(\\$2\\n(\\$3u ++. ie (\\n(\\$2\\n(\\$3u-2n)<=\\n(dlu \{\&\\*(tD\\*(tP ++. if !\\n(tP .br ++. \} ++. el \\*(tD\h'|\\n(\\$2\\n(\\$3u'\c ++. if t 'ad ++.\} ++. ds iM ++. ds f1 ++'fi ++.. ++.\" ++.\" The new SH ++.\" ++.de Sh ++.\" set Sh state off, check for list state before calling indent (.In) ++.nr nS 0 ++.nr sE 0 ++.ie "\\$1"NAME" \{\ ++.\" name state on, housekeep (headers & footers) ++. hK ++' in 0 ++.\} ++.el \{\ ++. if "\\$1"SYNOPSIS" .nr nS 1 ++. in 0 ++.\} ++.pL ++'sp ++.ns ++.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i ++.if !\\n(cR .ne 3 ++'fi ++\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9 ++\&\fP\& ++.in \\n(.iu+\\n(Tiu ++.if "\\$1"SEE" .nr sE 1 ++.ns ++.. ++.\" ++.\" Nd minus sign for an en dash used in .Sh Name ++.de Nd ++\&\-\& \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.. ++.de Ss ++.sp ++.ti -.25i ++\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9 ++\&\fP\& ++.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i ++.if !\\n(cR .ne 2 ++.br ++.. ++.\" .if "\\$1"Ss" .in \\n(.iu+\\n(sIu ++.\".. ++.\" ++.\" ++.\" Column Macro ++.\" ++.hy 0 ++.de Cw ++.ie \\n(.$==0 \{\ ++. br ++. in \\n(.iu-\\n(eWu ++. ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i ++.\} ++.el \{\ ++. Pp ++. if \\n(.$==1 \{\ ++. ta \w'\\$1 'u ++. nr eW \w'\\$1 'u ++' in \\n(.iu+\\n(eWu ++. \} ++. if \\n(.$==2 \{\ ++. ta \w'\\$1 'u +\w'\\$2 'u ++. nr eW \w'\\$1 'u+\w'\\$2 'u ++' in \\n(.iu+\\n(eWu ++. \} ++. if \\n(.$==3 \{\ ++. ta \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u ++. nr eW \w'\\$1 'u+\w'\\$2 'u+\w'\\$3 'u ++' in \\n(.iu+\\n(eWu ++. \} ++. if \\n(.$==4 \{\ ++. ta \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +\w'\\$4 'u ++. nr eW \w'\\$1 'u+\w'\\$2 'u+\w'\\$3 'u +\w'\\$4 'u ++' in \\n(.iu+\\n(eWu ++. \} ++. if \\n(.$==5 \{\ ++.ta \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +\w'\\$4 'u +\w'\\$5 'u ++.nr eW \w'\\$1 'u +\w'\\$2 'u +\w'\\$3 'u +\w'\\$4 'u +\w'\\$5 'u ++' in \\n(.iu+\\n(eWu ++. \} ++.\} ++.. ++.de Cl ++.ti -\\n(eWu ++.mN \\$1 ++.ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.el \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.. ++.nr dQ 0 ++.de Ds ++.ie !"\\$1"" \{\ ++. mN d\\$1 ++. if \\n(mN \{\ ++. nr dQ \\n(dQ+1 ++. d\\$1 ++. \} ++.\} ++.el .br ++.nf ++.. ++.de Df ++.ie !"\\$1"" \{\ ++. mN d\\$1 ++. if \\n(mN \{\ ++. nr dQ \\n(dQ+1 ++. d\\$1 ++. \} ++.\} ++.el .br ++.. ++.de Dn ++\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++.nf ++.. ++.de dI ++.nr d\\n(dQ \\n(dIu ++.in \\n(.iu+\\n(dIu ++.. ++.de dC ++.nr d\\n(dQ (\\n(.l-\\n(.i)/4u ++.in \\n(.iu+\\n(d\\n(dQu ++.. ++.de dR ++.nr d\\n(dQ (\\n(.l/3)u ++.in \\n(.iu+\\n(d\\n(dQu ++.. ++.de dL ++.nr aa 0 ++.. ++.de De ++.br ++.if \\n(d\\n(dQ \{\ ++. in \\n(.iu-\\n(d\\n(dQu ++. rr d\\n(dQ ++. nr dQ \\n(dQ-1 ++.\} ++.fi ++.. ++.\" ++.de Fn ++.ie \\n(.$==0 \{\ ++. tm Usage: .Fn function_name function_arg(s) ... \\*(Pu ++.\} ++.el \{\ ++. nr cF \\n(.f ++. ie \\n(.$==1 .ds f1 \&\\*(nM\\$1\fP\\*(lP\fP\\*(rP\fP ++. el \{\ ++. ds f1 \\*(nM\\$1\fP\\*(lP ++. nr aa 0 ++. rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 ++. \} ++. if "\\*(iM"" \{\\&\\*(f1 ++. ds f1 ++. \} ++.\} ++.. ++.\" ++.de rC ++.rZ \\$1 ++.ie \\n(rZ \{\ ++. as f1 \f\\n(cF\\*(rP\f\\n(cF\\$1\\$2\\$3\\$4\\$5\\$6\\$7 ++.\} ++.el \{\ ++. ie \\n(aa .as f1 \fP, \\*(aR\\$1 ++. el .as f1 \\*(aR\\$1 ++. nr aa 1 ++. ie \\n(.$>1 .rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 ++. el .as f1 \fP\\*(rP\fP ++.\} ++.. +diff -Nuar groff-1.22.3.old/tmac/doc-syms groff-1.22.3/tmac/doc-syms +--- groff-1.22.3.old/tmac/doc-syms 2014-11-04 10:38:35.533520146 +0200 ++++ groff-1.22.3/tmac/doc-syms 1970-01-01 02:00:00.000000000 +0200 +@@ -1,880 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" Copyright (c) 1991, 1993 +-.\" The Regents of the University of California. All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms, with or without +-.\" modification, are permitted provided that the following conditions +-.\" are met: +-.\" 1. Redistributions of source code must retain the above copyright +-.\" notice, this list of conditions and the following disclaimer. +-.\" 2. Redistributions in binary form must reproduce the above copyright +-.\" notice, this list of conditions and the following disclaimer in the +-.\" documentation and/or other materials provided with the distribution. +-.\" 3. [Deleted. See +-.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] +-.\" 4. Neither the name of the University nor the names of its contributors +-.\" may be used to endorse or promote products derived from this software +-.\" without specific prior written permission. +-.\" +-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-.\" SUCH DAMAGE. +-.\" +-.\" @(#)doc-syms 8.1 (Berkeley) 06/08/93 +-.\" +-.\" %beginstrip% +-. +-. +-.eo +-. +-.\" NS Ux user macro +-.\" NS print UNIX +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Ux +-.\" NS +-.\" NS width register `Ux' defined in doc-common +-. +-.de Ux +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Ux \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Ux +-. doc-parse-args \$@ +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] \*[doc-Tn-font-size]UNIX\*[doc-str-Ux] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Bx user macro +-.\" NS print BSD (fix smaller nroff version) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Bx +-.\" NS doc-str-Bx1 +-.\" NS doc-str-Bx-XXX +-.\" NS +-.\" NS width register `Bx' defined in doc-common +-. +-.ds doc-str-Bx-Reno \-Reno +-.ds doc-str-Bx-reno \-Reno +-.ds doc-str-Bx-Tahoe \-Tahoe +-.ds doc-str-Bx-tahoe \-Tahoe +-.ds doc-str-Bx-Lite \-Lite +-.ds doc-str-Bx-lite \-Lite +-.ds doc-str-Bx-Lite2 \-Lite2 +-.ds doc-str-Bx-lite2 \-Lite2 +-. +-.de Bx +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Bx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-Bx1 \*[doc-Tn-font-size]BSD\*[doc-str-Bx] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Bx +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie "\*[doc-arg\n[doc-arg-ptr]]"-alpha" \ +-. as doc-str-Bx1 " (currently in alpha test) +-. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-beta" \ +-. as doc-str-Bx1 " (currently in beta test) +-. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-devel" \ +-. as doc-str-Bx1 " (currently under development) +-. el \{\ +-. ds doc-str-Bx1 \&\*[doc-arg\n[doc-arg-ptr]]\^\*[doc-Tn-font-size] +-. as doc-str-Bx1 BSD\*[doc-str-Bx] +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie d doc-str-Bx-\*[doc-arg\n[doc-arg-ptr]] \ +-. as doc-str-Bx1 "\*[doc-str-Bx-\*[doc-arg\n[doc-arg-ptr]]] +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. el \ +-. nr doc-arg-ptr -1 +-. \}\}\}\}\} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Bx1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Ud user macro (not parsed, not callable) +-.\" NS print "currently under development" (HISTORY section) +-.\" NS +-.\" NS width register `Ud' defined in doc-common +-. +-.de Ud +-. nop \¤tly under development. +-.. +-. +-. +-.\" NS At user macro +-.\" NS print AT&T UNIX +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-At +-.\" NS doc-str-At1 +-.\" NS doc-str-At-XXX +-.\" NS +-.\" NS width register `At' defined in doc-common +-. +-.ds doc-str-At-32v \&Version\~32V +-.as doc-str-At-32v " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v1 \&Version\~1 +-.as doc-str-At-v1 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v2 \&Version\~2 +-.as doc-str-At-v2 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v3 \&Version\~3 +-.as doc-str-At-v3 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v4 \&Version\~4 +-.as doc-str-At-v4 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v5 \&Version\~5 +-.as doc-str-At-v5 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v6 \&Version\~6 +-.as doc-str-At-v6 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-v7 \&Version\~7 +-.as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-.ds doc-str-At-III \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~III +-.as doc-str-At-III " \*[doc-Tn-font-size]UNIX\*[doc-str-At] +-.ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V +-.as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At] +-.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1 +-.as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] +-.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2 +-.as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] +-.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3 +-.as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] +-.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4 +-.as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] +-. +-.de At +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-At \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-At1 \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name At +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +-. ie d doc-str-At-\*[doc-arg\n[doc-arg-ptr]] \ +-. ds doc-str-At1 "\*[doc-str-At-\*[doc-arg\n[doc-arg-ptr]]] +-. el \{\ +-. tmc mdoc warning: .At: Unknown AT&T UNIX version +-. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +-. nr doc-arg-ptr -1 +-. \}\} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-At1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Dx user macro +-.\" NS print DragonFly +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Dx +-.\" NS doc-str-Dx1 +-.\" NS +-.\" NS width register `Dx' defined in doc-common +-. +-.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common +-. +-.de Dx +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Dx +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +-. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \ +-. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]] +-. el \{\ +-. tmc mdoc warning: .Dx: Unknown DragonFly version +-. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +-. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. \}\} +-. el \ +-. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. \} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Fx user macro +-.\" NS print FreeBSD +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Fx +-.\" NS doc-str-Fx1 +-.\" NS +-.\" NS width register `Fx' defined in doc-common +-. +-.\" we use the doc-operating-system-FreeBSD-* strings defined in doc-common +-. +-.de Fx +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Fx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-Fx1 \*[doc-Tn-font-size]\%FreeBSD\*[doc-str-Fx] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Fx +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +-. ie d doc-operating-system-FreeBSD-\*[doc-arg\n[doc-arg-ptr]] \ +-. as doc-str-Fx1 \~\*[doc-operating-system-FreeBSD-\*[doc-arg\n[doc-arg-ptr]]] +-. el \{\ +-. tmc mdoc warning: .Fx: Unknown FreeBSD version +-. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +-. as doc-str-Fx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. \}\} +-. el \ +-. as doc-str-Fx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. \} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Fx1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Nx user macro +-.\" NS print NetBSD +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Nx +-.\" NS doc-str-Nx1 +-.\" NS +-.\" NS width register `Nx' defined in doc-common +-. +-.\" we use the doc-operating-system-NetBSD-* strings defined in doc-common +-. +-.de Nx +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Nx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-Nx1 \*[doc-Tn-font-size]\%N\s[\n[doc-curr-size]u]et +-. as doc-str-Nx1 \*[doc-Tn-font-size]BSD\*[doc-str-Nx] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Nx +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +-. ie d doc-operating-system-NetBSD-\*[doc-arg\n[doc-arg-ptr]] \ +-. as doc-str-Nx1 \~\*[doc-operating-system-NetBSD-\*[doc-arg\n[doc-arg-ptr]]] +-. el \{\ +-. tmc mdoc warning: .Nx: Unknown NetBSD version +-. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +-. as doc-str-Nx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. \}\} +-. el \ +-. as doc-str-Nx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. \} +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Nx1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Ox user macro +-.\" NS print OpenBSD +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Ox +-.\" NS doc-str-Ox1 +-.\" NS +-.\" NS width register `Ox' defined in doc-common +-. +-.de Ox +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Ox \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-Ox1 \*[doc-Tn-font-size]\%OpenBSD\*[doc-str-Ox] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Ox +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \ +-. as doc-str-Ox1 \~\*[doc-arg\n[doc-arg-ptr]] +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Ox1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" NS Bsx user macro +-.\" NS print BSD/OS +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Bsx +-.\" NS doc-str-Bsx1 +-.\" NS +-.\" NS width register `Bsx' defined in doc-common +-. +-.de Bsx +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Bsx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. \" default value if no argument +-. ds doc-str-Bsx1 \*[doc-Tn-font-size]BSD/OS\*[doc-str-Bsx] +-. +-. if !\n[doc-arg-limit] \ +-. if \n[.$] \{\ +-. ds doc-macro-name Bsx +-. doc-parse-args \$@ +-. \} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \ +-. as doc-str-Bsx1 \~\*[doc-arg\n[doc-arg-ptr]] +-. el \ +-. nr doc-arg-ptr -1 +-. \} +-. +-. \" replace current argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Bsx1] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. doc-print-recursive +-.. +-. +-. +-.\" The Bt macro should go away now +-. +-.\" NS Bt user macro (not parsed, not callable) +-.\" NS print "is currently in beta test." (HISTORY section) +-.\" NS +-.\" NS width register `Bt' defined in doc-common +-. +-.de Bt +-. nop \&is currently in beta test. +-.. +-. +-. +-.\" NS Px user macro +-.\" NS print POSIX +-. +-.ds Px \*[doc-Tn-font-size]\%POSIX +-. +-. +-.\" NS Ai user macro +-.\" NS print ANSI +-. +-.ds Ai \*[doc-Tn-font-size]\%ANSI +-. +-. +-.\" NS St user macro +-.\" NS standards (posix, ansi - formal standard names) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-reg-St +-.\" NS doc-str-St +-.\" NS doc-str-St1 +-.\" NS doc-str-St-XXX +-.\" NS +-.\" NS width register `St' defined in doc-common +-. +-.\" ANSI/ISO C +-.ds doc-str-St--ansiC-89 \*[Ai] \*[doc-str-St]X\^3.159-1989 +-.as doc-str-St--ansiC-89 " (\*[Lq]\)\*[Ai]\~C89\*[doc-str-St]\*[Rq]) +-.als doc-str-St--ansiC doc-str-St--ansiC-89 +-.ds doc-str-St--isoC \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990 +-.as doc-str-St--isoC " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq]) +-.als doc-str-St--isoC-90 doc-str-St--isoC +-.ds doc-str-St--isoC-2011 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011 +-.as doc-str-St--isoC-2011 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq]) +-.ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999 +-.as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq]) +-.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 +-.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq]) +-.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994 +-.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) +-.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 +-.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) +-. +-.\" POSIX Part 1: System API +-.ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 +-.as doc-str-St--p1003.1 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1b \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b +-.as doc-str-St--p1003.1b " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1-88 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988 +-.as doc-str-St--p1003.1-88 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1-90 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990 +-.as doc-str-St--p1003.1-90 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.als doc-str-St--iso9945-1-90 doc-str-St--p1003.1-90 +-.ds doc-str-St--p1003.1b-93 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b-1993 +-.as doc-str-St--p1003.1b-93 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1c-95 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1c-1995 +-.as doc-str-St--p1003.1c-95 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1i-95 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1i-1995 +-.as doc-str-St--p1003.1i-95 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1-96 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1996 +-.as doc-str-St--p1003.1-96 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.als doc-str-St--iso9945-1-96 doc-str-St--p1003.1-96 +-.ds doc-str-St--p1003.1g-2000 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1g-2000 +-.as doc-str-St--p1003.1g-2000 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1-2001 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2001 +-.as doc-str-St--p1003.1-2001 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1-2004 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004 +-.as doc-str-St--p1003.1-2004 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 +-.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +-. +-.\" POSIX Part 2: Shell and Utilities +-.ds doc-str-St--p1003.2 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2 +-.as doc-str-St--p1003.2 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) +-.ds doc-str-St--p1003.2-92 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2-1992 +-.as doc-str-St--p1003.2-92 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) +-.ds doc-str-St--p1003.2a-92 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2a-1992 +-.as doc-str-St--p1003.2a-92 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) +-.ds doc-str-St--iso9945-2-93 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-2:1993 +-.as doc-str-St--iso9945-2-93 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) +-. +-.\" X/Open +-.ds doc-str-St--susv2 Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification +-.as doc-str-St--susv2 " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq]) +-.ds doc-str-St--susv3 Version\~3 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification +-.as doc-str-St--susv3 " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq]) +-.ds doc-str-St--svid4 System\~V Interface Definition, Fourth Edition +-.as doc-str-St--svid4 " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq]) +-.ds doc-str-St--xbd5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Base Definitions Issue\~5 +-.as doc-str-St--xbd5 " (\*[Lq]\*[doc-Tn-font-size]XBD\*[doc-str-St]\^5\*[Rq]) +-.ds doc-str-St--xcu5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Commands and Utilities Issue\~5 +-.as doc-str-St--xcu5 " (\*[Lq]\*[doc-Tn-font-size]XCU\*[doc-str-St]\^5\*[Rq]) +-.ds doc-str-St--xcurses4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4, Version\~2 +-.as doc-str-St--xcurses4.2 " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq]) +-.ds doc-str-St--xns5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5 +-.as doc-str-St--xns5 " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5\*[Rq]) +-.ds doc-str-St--xns5.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5.2 +-.as doc-str-St--xns5.2 " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5.2\*[Rq]) +-.ds doc-str-St--xpg3 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~3 +-.as doc-str-St--xpg3 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^3\*[Rq]) +-.ds doc-str-St--xpg4 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4 +-.as doc-str-St--xpg4 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4\*[Rq]) +-.ds doc-str-St--xpg4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4, Version\~2 +-.as doc-str-St--xpg4.2 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq]) +-.ds doc-str-St--xsh5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interfaces and Headers Issue\~5 +-.as doc-str-St--xsh5 " (\*[Lq]\*[doc-Tn-font-size]XSH\*[doc-str-St]\^5\*[Rq]) +-. +-.\" Miscellaneous +-.ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985 +-.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994 +-.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) +-.ds doc-str-St--iso8601 \*[doc-Tn-font-size]ISO\*[doc-str-St] 8601 +-.ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989 +-. +-.de St +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name St +-. doc-parse-args \$@ +-. \} +-. el \ +-. doc-St-usage +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-St \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. ds doc-str-St1 +-. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +-. ie d doc-str-St-\*[doc-arg\n[doc-arg-ptr]] \ +-. ds doc-str-St1 "\*[doc-str-St-\*[doc-arg\n[doc-arg-ptr]]] +-. el \{\ +-. tmc "mdoc warning: .St: Unknown standard abbreviation +-. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +-. tm1 " Please refer to the groff_mdoc(7) manpage for a +-. tm1 " list of available standard abbreviations. +-. \}\} +-. el \ +-. doc-St-usage +-. +-. \" replacing argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-St1] +-. +-. doc-print-recursive +-. \} +-. el \{\ +-. doc-St-usage +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS doc-St-usage macro +-. +-.de doc-St-usage +-. tm1 "Usage: .St standard (#\n[.c]) +-. tm1 " Please refer to the groff_mdoc(7) manpage for a list of +-. tm1 " available standard abbreviations. +-.. +-. +-. +-.\" NS Lb user macro +-.\" NS formal library names for LIBRARY sections +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-reg-Lb +-.\" NS doc-str-Lb +-.\" NS doc-str-Lb1 +-.\" NS doc-str-Lb-XXX +-.\" NS +-.\" NS width register `Lb' defined in doc-common +-. +-.ds doc-str-Lb-libarchive Reading and Writing Streaming Archives Library (libarchive, \-larchive) +-.ds doc-str-Lb-libarm ARM Architecture Library (libarm, \-larm) +-.ds doc-str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32) +-.ds doc-str-Lb-libbluetooth Bluetooth Library (libbluetooth, \-lbluetooth) +-.ds doc-str-Lb-libbsm Basic Security Module Library (libbsm, \-lbsm) +-.ds doc-str-Lb-libc Standard C\~Library (libc, \-lc) +-.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) +-.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) +-.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) +-.ds doc-str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk) +-.ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher) +-.ds doc-str-Lb-libcompat Compatibility Library (libcompat, \-lcompat) +-.ds doc-str-Lb-libcrypt Crypt Library (libcrypt, \-lcrypt) +-.ds doc-str-Lb-libcurses Curses Library (libcurses, \-lcurses) +-.ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) +-.ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) +-.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) +-.ds doc-str-Lb-libdwarf DWARF Access Library (libdwarf, \-ldwarf) +-.ds doc-str-Lb-libedit Command Line Editor Library (libedit, \-ledit) +-.ds doc-str-Lb-libelf ELF Access Library (libelf, \-lelf) +-.ds doc-str-Lb-libevent Event Notification Library (libevent, \-levent) +-.ds doc-str-Lb-libfetch File Transfer Library for URLs (libfetch, \-lfetch) +-.ds doc-str-Lb-libform Curses Form Library (libform, \-lform) +-.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) +-.ds doc-str-Lb-libgpib General-Purpose Instrument Bus (GPIB) library (libgpib, \-lgpib) +-.ds doc-str-Lb-libi386 i386 Architecture Library (libi386, \-li386) +-.ds doc-str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl) +-.ds doc-str-Lb-libipsec IPsec Policy Control Library (libipsec, \-lipsec) +-.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) +-.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) +-.ds doc-str-Lb-libjail Jail Library (libjail, \-ljail) +-.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) +-.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) +-.ds doc-str-Lb-libkvm Kernel Data Access Library (libkvm, \-lkvm) +-.ds doc-str-Lb-libm Math Library (libm, \-lm) +-.ds doc-str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k) +-.ds doc-str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic) +-.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) +-.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) +-.ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) +-.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) +-.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) +-.ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) +-.ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) +-.ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) +-.ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) +-.ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) +-.ds doc-str-Lb-libposix \*[Px] \*[doc-str-Lb]Compatibility Library (libposix, \-lposix) +-.ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) +-.ds doc-str-Lb-libpthread \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread) +-.ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) +-.ds doc-str-Lb-librefuse File System in Userspace Convenience Library (librefuse, \-lrefuse) +-.ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) +-.ds doc-str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss) +-.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) +-.ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) +-.ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) +-.ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) +-.ds doc-str-Lb-libSystem System Library (libSystem, \-lSystem) +-.ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) +-.ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) +-.ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) +-.ds doc-str-Lb-libufs UFS File System Access Library (libufs, \-lufs) +-.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) +-.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) +-.ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) +-.ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) +-.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) +-.ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) +-.ds doc-str-Lb-libz Compression Library (libz, \-lz) +-. +-.de Lb +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Lb +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Lb library_name ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-str-Lb \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +-. +-. ie d doc-str-Lb-\*[doc-arg\n[doc-arg-ptr]] \ +-. ds doc-str-Lb1 "\*[doc-str-Lb-\*[doc-arg\n[doc-arg-ptr]]] +-. el \{\ +-. tmc "mdoc warning: .Lb: no description for library +-. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' available (#\n[.c]) +-. ds doc-str-Lb1 library \*[Lq]\*[doc-arg\n[doc-arg-ptr]]\*[Rq] +-. \} +-. +-. \" replacing argument with result +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Lb1] +-. +-. if \n[doc-in-library-section] \ +-. br +-. doc-print-recursive +-. if \n[doc-in-library-section] \ +-. br +-. \} +-. el \{\ +-. tm Usage: .Lb library_name ... (#\n[.c]) +-. doc-reset-args +-. \} +-.. +-. +-. +-.ec +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc-syms-u groff-1.22.3/tmac/doc-syms-u +--- groff-1.22.3.old/tmac/doc-syms-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/doc-syms-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,880 @@ ++.\" -*- nroff -*- ++.\" ++.\" Copyright (c) 1991, 1993 ++.\" The Regents of the University of California. All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms, with or without ++.\" modification, are permitted provided that the following conditions ++.\" are met: ++.\" 1. Redistributions of source code must retain the above copyright ++.\" notice, this list of conditions and the following disclaimer. ++.\" 2. Redistributions in binary form must reproduce the above copyright ++.\" notice, this list of conditions and the following disclaimer in the ++.\" documentation and/or other materials provided with the distribution. ++.\" 3. [Deleted. See ++.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] ++.\" 4. Neither the name of the University nor the names of its contributors ++.\" may be used to endorse or promote products derived from this software ++.\" without specific prior written permission. ++.\" ++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++.\" SUCH DAMAGE. ++.\" ++.\" @(#)doc-syms 8.1 (Berkeley) 06/08/93 ++.\" ++.\" %beginstrip% ++. ++. ++.eo ++. ++.\" NS Ux user macro ++.\" NS print UNIX ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Ux ++.\" NS ++.\" NS width register `Ux' defined in doc-common ++. ++.de Ux ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Ux \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Ux ++. doc-parse-args \$@ ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] \*[doc-Tn-font-size]UNIX\*[doc-str-Ux] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Bx user macro ++.\" NS print BSD (fix smaller nroff version) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Bx ++.\" NS doc-str-Bx1 ++.\" NS doc-str-Bx-XXX ++.\" NS ++.\" NS width register `Bx' defined in doc-common ++. ++.ds doc-str-Bx-Reno \-Reno ++.ds doc-str-Bx-reno \-Reno ++.ds doc-str-Bx-Tahoe \-Tahoe ++.ds doc-str-Bx-tahoe \-Tahoe ++.ds doc-str-Bx-Lite \-Lite ++.ds doc-str-Bx-lite \-Lite ++.ds doc-str-Bx-Lite2 \-Lite2 ++.ds doc-str-Bx-lite2 \-Lite2 ++. ++.de Bx ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Bx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-Bx1 \*[doc-Tn-font-size]BSD\*[doc-str-Bx] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Bx ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie "\*[doc-arg\n[doc-arg-ptr]]"-alpha" \ ++. as doc-str-Bx1 " (currently in alpha test) ++. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-beta" \ ++. as doc-str-Bx1 " (currently in beta test) ++. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-devel" \ ++. as doc-str-Bx1 " (currently under development) ++. el \{\ ++. ds doc-str-Bx1 \&\*[doc-arg\n[doc-arg-ptr]]\^\*[doc-Tn-font-size] ++. as doc-str-Bx1 BSD\*[doc-str-Bx] ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie d doc-str-Bx-\*[doc-arg\n[doc-arg-ptr]] \ ++. as doc-str-Bx1 "\*[doc-str-Bx-\*[doc-arg\n[doc-arg-ptr]]] ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. el \ ++. nr doc-arg-ptr -1 ++. \}\}\}\}\} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Bx1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Ud user macro (not parsed, not callable) ++.\" NS print "currently under development" (HISTORY section) ++.\" NS ++.\" NS width register `Ud' defined in doc-common ++. ++.de Ud ++. nop \¤tly under development. ++.. ++. ++. ++.\" NS At user macro ++.\" NS print AT&T UNIX ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-At ++.\" NS doc-str-At1 ++.\" NS doc-str-At-XXX ++.\" NS ++.\" NS width register `At' defined in doc-common ++. ++.ds doc-str-At-32v \&Version\~32V ++.as doc-str-At-32v " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v1 \&Version\~1 ++.as doc-str-At-v1 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v2 \&Version\~2 ++.as doc-str-At-v2 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v3 \&Version\~3 ++.as doc-str-At-v3 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v4 \&Version\~4 ++.as doc-str-At-v4 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v5 \&Version\~5 ++.as doc-str-At-v5 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v6 \&Version\~6 ++.as doc-str-At-v6 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-v7 \&Version\~7 ++.as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++.ds doc-str-At-III \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~III ++.as doc-str-At-III " \*[doc-Tn-font-size]UNIX\*[doc-str-At] ++.ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V ++.as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At] ++.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1 ++.as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] ++.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2 ++.as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] ++.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3 ++.as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] ++.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4 ++.as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At] ++. ++.de At ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-At \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-At1 \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name At ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ ++. ie d doc-str-At-\*[doc-arg\n[doc-arg-ptr]] \ ++. ds doc-str-At1 "\*[doc-str-At-\*[doc-arg\n[doc-arg-ptr]]] ++. el \{\ ++. tmc mdoc warning: .At: Unknown AT&T UNIX version ++. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) ++. nr doc-arg-ptr -1 ++. \}\} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-At1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Dx user macro ++.\" NS print DragonFly ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Dx ++.\" NS doc-str-Dx1 ++.\" NS ++.\" NS width register `Dx' defined in doc-common ++. ++.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common ++. ++.de Dx ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Dx ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ ++. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \ ++. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]] ++. el \{\ ++. tmc mdoc warning: .Dx: Unknown DragonFly version ++. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) ++. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. \}\} ++. el \ ++. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. \} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Fx user macro ++.\" NS print FreeBSD ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Fx ++.\" NS doc-str-Fx1 ++.\" NS ++.\" NS width register `Fx' defined in doc-common ++. ++.\" we use the doc-operating-system-FreeBSD-* strings defined in doc-common ++. ++.de Fx ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Fx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-Fx1 \*[doc-Tn-font-size]\%FreeBSD\*[doc-str-Fx] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Fx ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ ++. ie d doc-operating-system-FreeBSD-\*[doc-arg\n[doc-arg-ptr]] \ ++. as doc-str-Fx1 \~\*[doc-operating-system-FreeBSD-\*[doc-arg\n[doc-arg-ptr]]] ++. el \{\ ++. tmc mdoc warning: .Fx: Unknown FreeBSD version ++. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) ++. as doc-str-Fx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. \}\} ++. el \ ++. as doc-str-Fx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. \} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Fx1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Nx user macro ++.\" NS print NetBSD ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Nx ++.\" NS doc-str-Nx1 ++.\" NS ++.\" NS width register `Nx' defined in doc-common ++. ++.\" we use the doc-operating-system-NetBSD-* strings defined in doc-common ++. ++.de Nx ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Nx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-Nx1 \*[doc-Tn-font-size]\%N\s[\n[doc-curr-size]u]et ++. as doc-str-Nx1 \*[doc-Tn-font-size]BSD\*[doc-str-Nx] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Nx ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ ++. ie d doc-operating-system-NetBSD-\*[doc-arg\n[doc-arg-ptr]] \ ++. as doc-str-Nx1 \~\*[doc-operating-system-NetBSD-\*[doc-arg\n[doc-arg-ptr]]] ++. el \{\ ++. tmc mdoc warning: .Nx: Unknown NetBSD version ++. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) ++. as doc-str-Nx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. \}\} ++. el \ ++. as doc-str-Nx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. \} ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Nx1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Ox user macro ++.\" NS print OpenBSD ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Ox ++.\" NS doc-str-Ox1 ++.\" NS ++.\" NS width register `Ox' defined in doc-common ++. ++.de Ox ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Ox \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-Ox1 \*[doc-Tn-font-size]\%OpenBSD\*[doc-str-Ox] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Ox ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \ ++. as doc-str-Ox1 \~\*[doc-arg\n[doc-arg-ptr]] ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Ox1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" NS Bsx user macro ++.\" NS print BSD/OS ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Bsx ++.\" NS doc-str-Bsx1 ++.\" NS ++.\" NS width register `Bsx' defined in doc-common ++. ++.de Bsx ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Bsx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. \" default value if no argument ++. ds doc-str-Bsx1 \*[doc-Tn-font-size]BSD/OS\*[doc-str-Bsx] ++. ++. if !\n[doc-arg-limit] \ ++. if \n[.$] \{\ ++. ds doc-macro-name Bsx ++. doc-parse-args \$@ ++. \} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \ ++. as doc-str-Bsx1 \~\*[doc-arg\n[doc-arg-ptr]] ++. el \ ++. nr doc-arg-ptr -1 ++. \} ++. ++. \" replace current argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Bsx1] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. doc-print-recursive ++.. ++. ++. ++.\" The Bt macro should go away now ++. ++.\" NS Bt user macro (not parsed, not callable) ++.\" NS print "is currently in beta test." (HISTORY section) ++.\" NS ++.\" NS width register `Bt' defined in doc-common ++. ++.de Bt ++. nop \&is currently in beta test. ++.. ++. ++. ++.\" NS Px user macro ++.\" NS print POSIX ++. ++.ds Px \*[doc-Tn-font-size]\%POSIX ++. ++. ++.\" NS Ai user macro ++.\" NS print ANSI ++. ++.ds Ai \*[doc-Tn-font-size]\%ANSI ++. ++. ++.\" NS St user macro ++.\" NS standards (posix, ansi - formal standard names) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-reg-St ++.\" NS doc-str-St ++.\" NS doc-str-St1 ++.\" NS doc-str-St-XXX ++.\" NS ++.\" NS width register `St' defined in doc-common ++. ++.\" ANSI/ISO C ++.ds doc-str-St--ansiC-89 \*[Ai] \*[doc-str-St]X\^3.159-1989 ++.as doc-str-St--ansiC-89 " (\*[Lq]\)\*[Ai]\~C89\*[doc-str-St]\*[Rq]) ++.als doc-str-St--ansiC doc-str-St--ansiC-89 ++.ds doc-str-St--isoC \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990 ++.as doc-str-St--isoC " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq]) ++.als doc-str-St--isoC-90 doc-str-St--isoC ++.ds doc-str-St--isoC-2011 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011 ++.as doc-str-St--isoC-2011 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq]) ++.ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999 ++.as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq]) ++.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 ++.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq]) ++.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994 ++.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) ++.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 ++.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) ++. ++.\" POSIX Part 1: System API ++.ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 ++.as doc-str-St--p1003.1 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1b \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b ++.as doc-str-St--p1003.1b " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1-88 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988 ++.as doc-str-St--p1003.1-88 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1-90 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990 ++.as doc-str-St--p1003.1-90 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.als doc-str-St--iso9945-1-90 doc-str-St--p1003.1-90 ++.ds doc-str-St--p1003.1b-93 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b-1993 ++.as doc-str-St--p1003.1b-93 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1c-95 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1c-1995 ++.as doc-str-St--p1003.1c-95 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1i-95 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1i-1995 ++.as doc-str-St--p1003.1i-95 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1-96 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1996 ++.as doc-str-St--p1003.1-96 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.als doc-str-St--iso9945-1-96 doc-str-St--p1003.1-96 ++.ds doc-str-St--p1003.1g-2000 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1g-2000 ++.as doc-str-St--p1003.1g-2000 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1-2001 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2001 ++.as doc-str-St--p1003.1-2001 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1-2004 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004 ++.as doc-str-St--p1003.1-2004 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 ++.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) ++. ++.\" POSIX Part 2: Shell and Utilities ++.ds doc-str-St--p1003.2 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2 ++.as doc-str-St--p1003.2 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) ++.ds doc-str-St--p1003.2-92 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2-1992 ++.as doc-str-St--p1003.2-92 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) ++.ds doc-str-St--p1003.2a-92 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2a-1992 ++.as doc-str-St--p1003.2a-92 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) ++.ds doc-str-St--iso9945-2-93 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-2:1993 ++.as doc-str-St--iso9945-2-93 " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq]) ++. ++.\" X/Open ++.ds doc-str-St--susv2 Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification ++.as doc-str-St--susv2 " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq]) ++.ds doc-str-St--susv3 Version\~3 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification ++.as doc-str-St--susv3 " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq]) ++.ds doc-str-St--svid4 System\~V Interface Definition, Fourth Edition ++.as doc-str-St--svid4 " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq]) ++.ds doc-str-St--xbd5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Base Definitions Issue\~5 ++.as doc-str-St--xbd5 " (\*[Lq]\*[doc-Tn-font-size]XBD\*[doc-str-St]\^5\*[Rq]) ++.ds doc-str-St--xcu5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Commands and Utilities Issue\~5 ++.as doc-str-St--xcu5 " (\*[Lq]\*[doc-Tn-font-size]XCU\*[doc-str-St]\^5\*[Rq]) ++.ds doc-str-St--xcurses4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4, Version\~2 ++.as doc-str-St--xcurses4.2 " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq]) ++.ds doc-str-St--xns5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5 ++.as doc-str-St--xns5 " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5\*[Rq]) ++.ds doc-str-St--xns5.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5.2 ++.as doc-str-St--xns5.2 " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5.2\*[Rq]) ++.ds doc-str-St--xpg3 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~3 ++.as doc-str-St--xpg3 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^3\*[Rq]) ++.ds doc-str-St--xpg4 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4 ++.as doc-str-St--xpg4 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4\*[Rq]) ++.ds doc-str-St--xpg4.2 \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4, Version\~2 ++.as doc-str-St--xpg4.2 " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq]) ++.ds doc-str-St--xsh5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interfaces and Headers Issue\~5 ++.as doc-str-St--xsh5 " (\*[Lq]\*[doc-Tn-font-size]XSH\*[doc-str-St]\^5\*[Rq]) ++. ++.\" Miscellaneous ++.ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985 ++.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994 ++.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) ++.ds doc-str-St--iso8601 \*[doc-Tn-font-size]ISO\*[doc-str-St] 8601 ++.ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989 ++. ++.de St ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name St ++. doc-parse-args \$@ ++. \} ++. el \ ++. doc-St-usage ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-St \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. ds doc-str-St1 ++. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ ++. ie d doc-str-St-\*[doc-arg\n[doc-arg-ptr]] \ ++. ds doc-str-St1 "\*[doc-str-St-\*[doc-arg\n[doc-arg-ptr]]] ++. el \{\ ++. tmc "mdoc warning: .St: Unknown standard abbreviation ++. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) ++. tm1 " Please refer to the groff_mdoc(7) manpage for a ++. tm1 " list of available standard abbreviations. ++. \}\} ++. el \ ++. doc-St-usage ++. ++. \" replacing argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-St1] ++. ++. doc-print-recursive ++. \} ++. el \{\ ++. doc-St-usage ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS doc-St-usage macro ++. ++.de doc-St-usage ++. tm1 "Usage: .St standard (#\n[.c]) ++. tm1 " Please refer to the groff_mdoc(7) manpage for a list of ++. tm1 " available standard abbreviations. ++.. ++. ++. ++.\" NS Lb user macro ++.\" NS formal library names for LIBRARY sections ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-reg-Lb ++.\" NS doc-str-Lb ++.\" NS doc-str-Lb1 ++.\" NS doc-str-Lb-XXX ++.\" NS ++.\" NS width register `Lb' defined in doc-common ++. ++.ds doc-str-Lb-libarchive Reading and Writing Streaming Archives Library (libarchive, \-larchive) ++.ds doc-str-Lb-libarm ARM Architecture Library (libarm, \-larm) ++.ds doc-str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32) ++.ds doc-str-Lb-libbluetooth Bluetooth Library (libbluetooth, \-lbluetooth) ++.ds doc-str-Lb-libbsm Basic Security Module Library (libbsm, \-lbsm) ++.ds doc-str-Lb-libc Standard C\~Library (libc, \-lc) ++.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) ++.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) ++.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) ++.ds doc-str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk) ++.ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher) ++.ds doc-str-Lb-libcompat Compatibility Library (libcompat, \-lcompat) ++.ds doc-str-Lb-libcrypt Crypt Library (libcrypt, \-lcrypt) ++.ds doc-str-Lb-libcurses Curses Library (libcurses, \-lcurses) ++.ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) ++.ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) ++.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) ++.ds doc-str-Lb-libdwarf DWARF Access Library (libdwarf, \-ldwarf) ++.ds doc-str-Lb-libedit Command Line Editor Library (libedit, \-ledit) ++.ds doc-str-Lb-libelf ELF Access Library (libelf, \-lelf) ++.ds doc-str-Lb-libevent Event Notification Library (libevent, \-levent) ++.ds doc-str-Lb-libfetch File Transfer Library for URLs (libfetch, \-lfetch) ++.ds doc-str-Lb-libform Curses Form Library (libform, \-lform) ++.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) ++.ds doc-str-Lb-libgpib General-Purpose Instrument Bus (GPIB) library (libgpib, \-lgpib) ++.ds doc-str-Lb-libi386 i386 Architecture Library (libi386, \-li386) ++.ds doc-str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl) ++.ds doc-str-Lb-libipsec IPsec Policy Control Library (libipsec, \-lipsec) ++.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) ++.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) ++.ds doc-str-Lb-libjail Jail Library (libjail, \-ljail) ++.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) ++.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) ++.ds doc-str-Lb-libkvm Kernel Data Access Library (libkvm, \-lkvm) ++.ds doc-str-Lb-libm Math Library (libm, \-lm) ++.ds doc-str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k) ++.ds doc-str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic) ++.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) ++.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) ++.ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) ++.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) ++.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) ++.ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) ++.ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) ++.ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) ++.ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) ++.ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) ++.ds doc-str-Lb-libposix \*[Px] \*[doc-str-Lb]Compatibility Library (libposix, \-lposix) ++.ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) ++.ds doc-str-Lb-libpthread \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread) ++.ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) ++.ds doc-str-Lb-librefuse File System in Userspace Convenience Library (librefuse, \-lrefuse) ++.ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) ++.ds doc-str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss) ++.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) ++.ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) ++.ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) ++.ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) ++.ds doc-str-Lb-libSystem System Library (libSystem, \-lSystem) ++.ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) ++.ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) ++.ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) ++.ds doc-str-Lb-libufs UFS File System Access Library (libufs, \-lufs) ++.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) ++.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) ++.ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) ++.ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) ++.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) ++.ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) ++.ds doc-str-Lb-libz Compression Library (libz, \-lz) ++. ++.de Lb ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Lb ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Lb library_name ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-str-Lb \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] ++. ++. ie d doc-str-Lb-\*[doc-arg\n[doc-arg-ptr]] \ ++. ds doc-str-Lb1 "\*[doc-str-Lb-\*[doc-arg\n[doc-arg-ptr]]] ++. el \{\ ++. tmc "mdoc warning: .Lb: no description for library ++. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' available (#\n[.c]) ++. ds doc-str-Lb1 library \*[Lq]\*[doc-arg\n[doc-arg-ptr]]\*[Rq] ++. \} ++. ++. \" replacing argument with result ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Lb1] ++. ++. if \n[doc-in-library-section] \ ++. br ++. doc-print-recursive ++. if \n[doc-in-library-section] \ ++. br ++. \} ++. el \{\ ++. tm Usage: .Lb library_name ... (#\n[.c]) ++. doc-reset-args ++. \} ++.. ++. ++. ++.ec ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc.tmac groff-1.22.3/tmac/doc.tmac +--- groff-1.22.3.old/tmac/doc.tmac 2014-11-04 10:38:35.534520134 +0200 ++++ groff-1.22.3/tmac/doc.tmac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,6599 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" Copyright (c) 1991, 1993 +-.\" The Regents of the University of California. All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms, with or without +-.\" modification, are permitted provided that the following conditions +-.\" are met: +-.\" 1. Redistributions of source code must retain the above copyright +-.\" notice, this list of conditions and the following disclaimer. +-.\" 2. Redistributions in binary form must reproduce the above copyright +-.\" notice, this list of conditions and the following disclaimer in the +-.\" documentation and/or other materials provided with the distribution. +-.\" 3. [Deleted. See +-.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] +-.\" 4. Neither the name of the University nor the names of its contributors +-.\" may be used to endorse or promote products derived from this software +-.\" without specific prior written permission. +-.\" +-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +-.\" SUCH DAMAGE. +-.\" +-.\" @(#)doc 8.1 (Berkeley) 06/08/93 +-.\" +-.\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be +-.\" installed as mdoc/doc-* rather than tmac.doc-* (the filename +-.\" `tmac.doc-common' would be too long); when using groff, the doc-* files +-.\" are loaded using the `mso' request. +-.\" +-.\" Modified by +-.\" +-.\" Werner LEMBERG and +-.\" Ruslan Ermilov +-.\" +-.\" to make it more readable: using long names and many groff features, +-.\" updating and extending documentation, etc. +-.\" +-.\" %beginstrip% +-. +-. +-.if !\n(.g \ +-. ab This version of mdoc can be run with GNU troff only! +-. +-. +-.do if d Dd .nx +-. +-. +-.cp 0 +-. +-. +-.if (\n[.x]\n[.y] < 118) \ +-. ab You need GNU troff version 1.18 or higher to run this version of mdoc! +-. +-. +-.\" Load start-up files +-.ie t \ +-. mso mdoc/doc-ditroff +-.el \ +-. mso mdoc/doc-nroff +-. +-.mso mdoc/doc-common +-.mso mdoc/doc-syms +-. +-. +-.eo +-. +-. +-.\" NS doc-macro-name global string +-.\" NS name of calling request (set in each user-requestable macro) +-. +-.ds doc-macro-name +-.als doc-arg0 doc-macro-name +-. +-. +-.\" NS doc-arg-limit global register +-.\" NS total number of arguments +-. +-.nr doc-arg-limit 0 +-. +-. +-.\" NS doc-num-args global register +-.\" NS number of arguments to handle (must be set to \n[.$] prior to +-.\" NS `doc-parse-arg-vector' request) +-. +-.nr doc-num-args 0 +-. +-. +-.\" NS doc-arg-ptr global register +-.\" NS argument pointer +-. +-.nr doc-arg-ptr 0 +-. +-. +-.\" NS doc-argXXX global string +-.\" NS argument vector +-.\" NS +-.\" NS limit: +-.\" NS doc-arg-limit +-. +-.ds doc-arg1 +-. +-. +-.\" NS doc-typeXXX global register +-.\" NS argument type vector (macro=1, string=2, punctuation suffix=3, +-.\" NS punctuation prefix=4) +-.\" NS +-.\" NS limit: +-.\" NS doc-arg-limit +-. +-.nr doc-type1 0 +-. +-. +-.\" NS doc-spaceXXX global string +-.\" NS space vector +-.\" NS +-.\" NS limit: +-.\" NS doc-arg-limit +-. +-.ds doc-space1 +-. +-. +-.\" NS doc-parse-args macro +-.\" NS parse arguments (recursively) (`.doc-parse-args arg ...') +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-limit +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-spaceXXX +-.\" NS doc-typeXXX +-.\" NS doc-arg-ptr +-.\" NS doc-have-space +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dpa +-.\" NS doc-reg-dpa1 +-.\" NS doc-str-dpa +-. +-.de doc-parse-args +-. if !\n[doc-arg-limit] \ +-. doc-set-spacing-1 +-. +-. nr doc-have-space 0 +-. +-. if !\n[.$] \ +-. return +-. +-. nr doc-arg-limit +1 +-. +-. \" handle `|' and `...' specially +-. ie "\$1"|" \ +-. ds doc-arg\n[doc-arg-limit] \f[R]|\f[] +-. el \{ .ie "\$1"..." \ +-. ds doc-arg\n[doc-arg-limit] \|.\|.\|. +-. el \ +-. ds doc-arg\n[doc-arg-limit] "\$1 +-. \} +-. +-. \" get argument type and set spacing +-. doc-get-arg-type* \n[doc-arg-limit] +-. nr doc-type\n[doc-arg-limit] \n[doc-arg-type] +-. doc-set-spacing-\n[doc-arg-type] +-. +-. \" check whether we have processed the last parameter +-. ie (\n[.$] == 1) \ +-. nr doc-arg-ptr 0 +-. el \{\ +-. shift +-. doc-parse-args \$@ +-. \} +-. +-. nh +-.. +-. +-. +-.\" NS doc-parse-arg-vector macro +-.\" NS parse argument vector (recursive) +-.\" NS +-.\" NS cf. comments in doc-parse-args +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-limit +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-num-args +-.\" NS doc-spaceXXX +-.\" NS doc-typeXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dpav +-.\" NS doc-reg-dpav1 +-.\" NS doc-str-dpav +-. +-.de doc-parse-arg-vector +-. if !\n[doc-arg-limit] \ +-. doc-set-spacing-1 +-. +-. nr doc-arg-limit +1 +-. +-. ie "\*[doc-arg\n[doc-arg-limit]]"|" \ +-. ds doc-arg\n[doc-arg-limit] \f[R]|\f[] +-. el \{ .if "\*[doc-arg\n[doc-arg-limit]]"..." \ +-. ds doc-arg\n[doc-arg-limit] \|.\|.\|. +-. \} +-. +-. doc-get-arg-type* \n[doc-arg-limit] +-. nr doc-type\n[doc-arg-limit] \n[doc-arg-type] +-. doc-set-spacing-\n[doc-arg-type] +-. +-. ie (\n[doc-num-args] == 1) \{\ +-. nr doc-arg-ptr 0 +-. nr doc-num-args 0 +-. \} +-. el \{\ +-. nr doc-num-args -1 +-. doc-parse-arg-vector +-. \} +-. +-. nh +-.. +-. +-. +-.\" NS doc-parse-space-vector macro +-.\" NS parse space vector (recursive) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-limit +-.\" NS doc-num-args +-.\" NS doc-spaceXXX +-. +-.de doc-parse-space-vector +-. nr doc-arg-limit +1 +-. +-. doc-set-spacing-\n[doc-type\n[doc-arg-limit]] +-. +-. ie (\n[doc-num-args] == 1) \ +-. nr doc-num-args 0 +-. el \{\ +-. nr doc-num-args -1 +-. doc-parse-space-vector +-. \} +-.. +-. +-. +-.\" NS doc-remaining-args macro +-.\" NS output remaining arguments as-is, separated by spaces (until +-.\" NS `doc-num-args' is exhausted) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-num-args +-. +-.de doc-remaining-args +-. nr doc-arg-ptr +1 +-. nop \)\*[doc-arg\n[doc-arg-ptr]]\c +-. +-. ie (\n[doc-num-args] == 1) \{\ +-. nr doc-arg-ptr 0 +-. nr doc-num-args 0 +-. \} +-. el \{\ +-. nop \)\*[doc-space]\c +-. nr doc-num-args -1 +-. doc-remaining-args +-. \} +-.. +-. +-. +-.\" NS doc-append-arg macro +-.\" NS append one argument to argument vector: +-.\" NS `.doc-append-arg [arg] [type]' +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-limit +-.\" NS doc-argXXX +-.\" NS doc-typeXXX +-. +-.de doc-append-arg +-. nr doc-arg-limit +1 +-. ds doc-arg\n[doc-arg-limit] "\$1 +-. nr doc-type\n[doc-arg-limit] \$2 +-. doc-set-spacing-\$2 +-.. +-. +-. +-.\" NS doc-print-and-reset macro +-.\" NS finish input line and clean up argument vectors +-. +-.de doc-print-and-reset +-. if \n[doc-space-mode] \ +-. nop \) +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-reset-args macro +-.\" NS reset argument counters +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-limit +-.\" NS doc-arg-ptr +-.\" NS doc-have-slot +-. +-.de doc-reset-args +-. nr doc-arg-limit 0 +-. nr doc-arg-ptr 0 +-. nr doc-have-slot 0 +-. +-. hy \n[doc-hyphen-flags] +-.. +-. +-. +-.ec +-. +-.\" NS doc-curr-font global register +-.\" NS saved current font +-. +-.nr doc-curr-font \n[.f] +-. +-. +-.\" NS doc-curr-size global register +-.\" NS saved current font size +-. +-.nr doc-curr-size \n[.ps] +-. +-.eo +-. +-. +-.\" NS Fl user macro +-.\" NS handle flags (appends `-' and prints flags): `.Fl [arg ...]' +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Fl (for communication with doc-flag-recursion) +-.\" NS +-.\" NS width register `Fl' set in doc-common +-. +-.de Fl +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Fl-font]\c +-. +-. if !\n[doc-arg-limit] \{\ +-. ds doc-macro-name Fl +-. doc-parse-args \$@ +-. +-. \" no arguments +-. if !\n[.$] \ +-. nop \|\-\|\f[]\s[0] +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. \" last argument +-. nop \|\-\f[]\s[0]\c +-. doc-print-and-reset +-. \} +-. el \{\ +-. ie (\n[doc-type\n[doc-arg-ptr]] == 1) \{\ +-. nop \|\-\f[]\s[0]\c +-. \*[doc-arg\n[doc-arg-ptr]] +-. \} +-. el \{\ +-. if (\n[doc-type\n[doc-arg-ptr]] == 3) \ +-. nop \|\-\|\c +-. +-. nr doc-reg-Fl 1 +-. doc-flag-recursion +-. \}\} +-.. +-. +-. +-.\" NS doc-flag-recursion macro +-.\" NS `Fl' flag recursion routine (special handling) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dfr +-.\" NS doc-reg-dfr1 +-.\" NS doc-str-dfr +-. +-.de doc-flag-recursion +-. nr doc-reg-dfr1 \n[doc-type\n[doc-arg-ptr]] +-. ds doc-str-dfr "\*[doc-arg\n[doc-arg-ptr]] +-. +-. ie (\n[doc-reg-dfr1] == 1) \{\ +-. nop \f[]\s[0]\c +-. \*[doc-str-dfr] +-. \} +-. el \{\ +-. nr doc-reg-dfr \n[doc-arg-ptr] +-. +-. ie (\n[doc-reg-dfr1] == 2) \{\ +-. \" handle vertical bar -- doc-reg-Fl is set for the first call of +-. \" doc-flag-recursion only; we need this to make `.Fl | ...' work +-. \" correctly +-. ie "\*[doc-str-dfr]"\*[Ba]" \{\ +-. if \n[doc-reg-Fl] \ +-. nop \|\-\*[doc-space]\c +-. nop \)\*[Ba]\c +-. \} +-. el \{\ +-. ie "\*[doc-str-dfr]"\f[R]|\f[]" \{\ +-. if \n[doc-reg-Fl] \ +-. nop \|\-\*[doc-space]\c +-. nop \f[R]|\f[]\c +-. \} +-. el \{\ +-. \" two consecutive hyphen characters? +-. ie "\*[doc-str-dfr]"-" \ +-. nop \|\-\^\-\|\c +-. el \ +-. nop \|\%\-\*[doc-str-dfr]\&\c +-. \}\}\} +-. el \{\ +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. nop \)\*[doc-str-dfr]\f[]\s[0]\c +-. \} +-. +-. ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\ +-. \" last argument +-. if (\n[doc-reg-dfr1] == 4) \ +-. nop \|\-\c +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. doc-print-and-reset +-. \} +-. el \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-type\n[doc-arg-ptr]] == 3) \{\ +-. ie (\n[doc-type\n[doc-reg-dfr]] == 4) \ +-. nop \|\-\c +-. el \ +-. nop \)\*[doc-space\n[doc-reg-dfr]]\c +-. \} +-. el \ +-. nop \)\*[doc-space\n[doc-reg-dfr]]\c +-. +-. shift +-. nr doc-reg-Fl 0 +-. doc-flag-recursion \$@ +-. \}\} +-.. +-. +-. +-.\" NS doc-print-recursive macro +-.\" NS general name recursion routine (print remaining arguments) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dpr +-.\" NS doc-reg-dpr1 +-.\" NS doc-str-dpr +-. +-.de doc-print-recursive +-. nr doc-reg-dpr1 \n[doc-type\n[doc-arg-ptr]] +-. ds doc-str-dpr "\*[doc-arg\n[doc-arg-ptr]] +-. +-. ie (\n[doc-reg-dpr1] == 1) \{\ +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. \*[doc-str-dpr] +-. \} +-. el \{\ +-. nr doc-reg-dpr \n[doc-arg-ptr] +-. +-. \" the `\%' prevents hyphenation on a dash (`-') +-. ie (\n[doc-reg-dpr1] == 2) \ +-. nop \%\*[doc-str-dpr]\&\c +-. el \{\ +-. \" punctuation character +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. nop \)\*[doc-str-dpr]\f[]\s[0]\c +-. \} +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. \" last argument +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. doc-print-and-reset +-. \} +-. el \{\ +-. nop \)\*[doc-space\n[doc-reg-dpr]]\c +-. doc-print-recursive +-. \}\} +-.. +-. +-. +-.\" NS doc-print-prefixes macro +-.\" NS print leading prefixes +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-. +-.de doc-print-prefixes +-. while (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. if !(\n[doc-type\n[doc-arg-ptr]] == 4) \ +-. break +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c +-. nr doc-arg-ptr +1 +-. \} +-.. +-. +-. +-.\" NS doc-generic-macro macro +-.\" NS this is the skeleton for most simple macros +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-. +-.de doc-generic-macro +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name \$0 +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. if (\n[doc-type\n[doc-arg-ptr]] == 1) \{\ +-. tmc mdoc warning: Using a macro as first argument +-. tm1 " cancels effect of .\$0 (#\n[.c]) +-. +-. \" the right action here would be to reset the argument counters +-. \" and bail out -- unfortunately, a small number of manual pages +-. \" (less than 2% for FreeBSD which has been used for testing) +-. \" relied on the old behaviour (silently ignore this error), +-. \" so it is commented out +-. +-.\" doc-reset-args +-. \} +-.\" el \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-\$0-font]\c +-. doc-print-recursive +-.\" \} +-. \} +-. el \{\ +-. tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c]) +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS Ar user macro +-.\" NS command line `argument' macro: `.Ar [args ...]' +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variable: +-.\" NS doc-str-Ar-default +-.\" NS +-.\" NS width register `Ar' set in doc-common +-. +-.ds doc-str-Ar-default "file\ .\|.\|. +-. +-.de Ar +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Ar-font]\c +-. +-. if !\n[doc-arg-limit] \{\ +-. ds doc-macro-name Ar +-. doc-parse-args \$@ +-. +-. \" no argument +-. if !\n[.$] \ +-. nop \)\*[doc-str-Ar-default]\&\f[]\s[0] +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. nop \)\*[doc-str-Ar-default]\&\f[]\s[0]\c +-. doc-print-and-reset +-. \} +-. el \{\ +-. if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. \" replace previous argument (Ar) with default value +-. nr doc-arg-ptr -1 +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Ar-default] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. doc-parse-space-vector +-. \} +-. doc-print-recursive +-. \} +-.. +-. +-. +-.\" NS Ad user macro +-.\" NS Addresses +-.\" NS +-.\" NS width register `Ad' set in doc-common +-. +-.als Ad doc-generic-macro +-.ds doc-Ad-usage address +-. +-. +-.\" NS doc-indent-synopsis global register +-.\" NS indentation in synopsis +-. +-.nr doc-indent-synopsis 0 +-. +-. +-.\" NS doc-indent-synopsis-active global register (bool) +-.\" NS indentation in synopsis active +-. +-.nr doc-indent-synopsis-active 0 +-. +-. +-.\" NS Cd user macro +-.\" NS config declaration (for section 4 SYNOPSIS) +-.\" NS +-.\" NS this function causes a break; it uses the `Nm' font +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-indent-synopsis +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Cd' set in doc-common +-. +-.de Cd +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Cd +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Cd configuration_file_declaration ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. ie \n[doc-in-synopsis-section] \{\ +-. ie "\*[doc-macro-name]"Cd" \{\ +-. br +-. if !\n[doc-indent-synopsis] \ +-. nr doc-indent-synopsis \n[doc-display-indent]u +-. if !\n[doc-indent-synopsis-active] \ +-. in +\n[doc-indent-synopsis]u +-. ti -\n[doc-indent-synopsis]u +-. nop \*[doc-Nm-font]\c +-. doc-print-recursive +-. if !\n[doc-indent-synopsis-active] \ +-. in -\n[doc-indent-synopsis]u +-. \} +-. el \{\ +-. nop \*[doc-Nm-font]\c +-. doc-print-recursive +-. \}\} +-. el \{\ +-. nop \*[doc-Nm-font]\c +-. doc-print-recursive +-. \}\} +-. el \{\ +-. tm Usage: .Cd configuration_file_declaration ... (#\n[.c]) +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS Cm user macro +-.\" NS interactive command modifier (flag) +-.\" NS +-.\" NS width register `Cm' set in doc-common +-. +-.als Cm doc-generic-macro +-.ds doc-Cm-usage interactive_command_modifier +-. +-. +-.\" NS Dv user macro +-.\" NS defined variable +-.\" NS +-.\" NS this function uses the `Er' font +-.\" NS +-.\" NS width register `Dv' set in doc-common +-. +-.als Dv doc-generic-macro +-.ds doc-Dv-usage defined_variable +-.als doc-Dv-font doc-Er-font +-. +-. +-.\" NS Em user macro +-.\" NS emphasis +-.\" NS +-.\" NS width register `Em' set in doc-common +-. +-.als Em doc-generic-macro +-.ds doc-Em-usage text +-. +-. +-.\" NS Er user macro +-.\" NS errno type +-.\" NS +-.\" NS width register `Er' set in doc-common +-. +-.als Er doc-generic-macro +-.ds doc-Er-usage text +-. +-. +-.\" NS Ev user macro +-.\" NS environment variable +-.\" NS +-.\" NS width register `Ev' set in doc-common +-. +-.als Ev doc-generic-macro +-.ds doc-Ev-usage text +-. +-. +-.\" NS doc-have-decl global register (bool) +-.\" NS subroutine test (in synopsis only) +-. +-.nr doc-have-decl 0 +-. +-. +-.\" NS doc-have-var global register (bool) +-.\" NS whether last type is a variable type +-. +-.nr doc-have-var 0 +-. +-. +-.\" NS doc-do-func-decl macro +-.\" NS do something special while in SYNOPSIS +-.\" NS +-.\" NS modifies: +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-have-decl +-.\" NS doc-have-var +-. +-.de doc-do-func-decl +-. if \n[doc-in-synopsis-section] \{\ +-. \" if a variable type was the last thing given, want vertical space +-. if \n[doc-have-var] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. \} +-. \" if a subroutine was the last thing given, want vertical space +-. if \n[doc-have-func] \{\ +-. ie \n[doc-have-decl] \ +-. br +-. el \ +-. doc-paragraph +-. \} +-. nr doc-have-decl 1 +-. \} +-. +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-.. +-. +-. +-.\" NS Fd user macro +-.\" NS function declaration -- not callable +-.\" NS +-.\" NS this function causes a break +-.\" NS +-.\" NS width register `Fd' set in doc-common +-. +-.de Fd +-. ie ((\n[.$] >= 1) & (\n[doc-arg-limit] == 0)) \{\ +-. doc-do-func-decl +-. nop \*[doc-Fd-font]\$* +-. br +-. ft \n[doc-curr-font] +-. ps \n[doc-curr-size]u +-. \} +-. el \{\ +-. tm Usage: .Fd function_declaration -- Fd is not callable (#\n[.c]) +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS In user macro +-.\" NS #include statement in SYNOPSIS +-.\" NS if not in SYNOPSIS +-.\" NS +-.\" NS this function causes a break; it uses the `Fd' font +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-indent-synopsis +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `In' set in doc-common +-. +-.de In +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name In +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .In include_file ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. ie ((\n[doc-arg-limit] >= \n[doc-arg-ptr]) & (\n[doc-type\n[doc-arg-ptr]] == 2)) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. ie \n[doc-in-synopsis-section] \{\ +-. ie "\*[doc-macro-name]"In" \{\ +-. doc-do-func-decl +-. nop \*[doc-Fd-font]#include <\*[doc-arg\n[doc-arg-ptr]]> +-. ft \n[doc-curr-font] +-. ps \n[doc-curr-size]u +-. br +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ +-. doc-print-recursive +-. el \ +-. doc-reset-args +-. \} +-. el \{\ +-. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]] +-. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]> +-. doc-print-recursive +-. \}\} +-. el \{\ +-. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]] +-. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]> +-. doc-print-recursive +-. \}\} +-. el \{\ +-. tm Usage: .In include_file ... (#\n[.c]) +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS Fr user macro +-.\" NS function return value +-.\" NS +-.\" NS this function uses the `Ar' font +-.\" NS +-.\" NS width register `Fr' set in doc-common +-. +-.als Fr doc-generic-macro +-.ds doc-Fr-usage function_return_value +-.als doc-Fr-font doc-Ar-font +-. +-. +-.\" NS Ic user macro +-.\" NS interactive command +-.\" NS +-.\" NS width register `Ic' set in doc-common +-. +-.als Ic doc-generic-macro +-.ds doc-Ic-usage interactive_command +-. +-. +-.\" NS Li user macro +-.\" NS literals +-.\" NS +-.\" NS width register `Li' set in doc-common +-. +-.als Li doc-generic-macro +-.ds doc-Li-usage argument +-. +-. +-.\" NS Ms user macro +-.\" NS math symbol +-.\" NS +-.\" NS this function uses the `Sy' font +-.\" NS +-.\" NS width register `Ms' set in doc-common +-. +-.als Ms doc-generic-macro +-.ds doc-Ms-usage math_symbol +-.als doc-Ms-font doc-Sy-font +-. +-. +-.\" NS doc-command-name global string +-.\" NS save first invocation of .Nm +-. +-.ds doc-command-name +-. +-. +-.\" NS Nm user macro +-.\" NS name of command or page topic +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-command-name +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-indent-synopsis +-.\" NS doc-indent-synopsis-active +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Nm' set in doc-common +-. +-.de Nm +-. if !\n[doc-arg-limit] \{\ +-. ds doc-macro-name Nm +-. ie \n[.$] \ +-. doc-parse-args \$@ +-. el \{\ +-. ie "\*[doc-command-name]"" \ +-. tm Usage: .Nm name ... (#\n[.c]) +-. el \ +-. doc-parse-args \*[doc-command-name] +-. \}\} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. \" last argument +-. ie "\*[doc-command-name]"" \{\ +-. tm Usage: .Nm name ... (#\n[.c]) +-. doc-reset-args +-. \} +-. el \{\ +-. nop \*[doc-Nm-font]\*[doc-command-name]\f[]\s[0]\c +-. doc-print-and-reset +-. \}\} +-. el \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. ie !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. ie "\*[doc-command-name]"" \ +-. tm Usage: .Nm name ... (#\n[.c]) +-. el \{\ +-. \" replace previous argument (Nm) with default value +-. nr doc-arg-ptr -1 +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-Nm-font]\*[doc-command-name]\f[]\s[0] +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. doc-parse-space-vector +-. \}\} +-. el \{\ +-. \" handle `.Nm ...' in SYNOPSIS +-. if \n[doc-in-synopsis-section] \{\ +-. if "\*[doc-macro-name]"Nm" \{\ +-. br +-. if !\n[doc-indent-synopsis] \{\ +-. doc-get-width "\*[doc-arg\n[doc-arg-ptr]]" +-. nr doc-indent-synopsis ((\n[doc-width]u + 1u) * \n[doc-fixed-width]u) +-. \} +-. if !\n[doc-indent-synopsis-active] \{\ +-. in +\n[doc-indent-synopsis]u +-. nr doc-indent-synopsis-active 1 +-. \} +-. ti -\n[doc-indent-synopsis]u +-. \}\} +-. if "\*[doc-command-name]"" \ +-. ds doc-command-name "\*[doc-arg\n[doc-arg-ptr]] +-. +-. nop \*[doc-Nm-font]\c +-. \} +-. doc-print-recursive +-. \} +-.. +-. +-. +-.\" NS Pa user macro +-.\" NS pathname: `.Pa [arg ...]' +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Pa' set in doc-common +-. +-.de Pa +-. if !\n[doc-arg-limit] \{\ +-. ds doc-macro-name Pa +-. doc-parse-args \$@ +-. +-. \" default value +-. if !\n[.$] \ +-. nop \*[doc-Pa-font]~\f[]\s[0] +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Pa-font]\c +-. if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. \" replace previous argument (Pa) with default value +-. nr doc-arg-ptr -1 +-. ds doc-arg\n[doc-arg-ptr] ~ +-. nr doc-type\n[doc-arg-ptr] 2 +-. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +-. +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. doc-parse-space-vector +-. \} +-. doc-print-recursive +-. \} +-. el \{\ +-. nop \*[doc-Pa-font]~\f[]\s[0]\c +-. doc-print-and-reset +-. \} +-.. +-. +-. +-.\" NS Sy user macro +-.\" NS symbolics +-.\" NS +-.\" NS width register `Sy' set in doc-common +-. +-.als Sy doc-generic-macro +-.ds doc-Sy-usage symbolic_text +-. +-. +-.\" NS Me user macro +-.\" NS menu entries +-.\" NS +-.\" NS width register `Me' set in doc-common +-. +-.als Me doc-generic-macro +-.ds doc-Me-usage menu_entry +-. +-. +-.\" NS Tn user macro +-.\" NS trade name +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Tn' set in doc-common +-. +-.de Tn +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Tn +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Tn trade_name ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \)\*[doc-Tn-font-size]\c +-. ie !\n[doc-is-reference] \{\ +-. nop \)\*[doc-Tn-font-shape]\c +-. doc-print-recursive +-. \} +-. el \ +-. doc-do-references +-. \} +-. el \{\ +-. tm Usage: .Tn trade_name ... (#\n[.c]) +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS Va user macro +-.\" NS variable name +-.\" NS +-.\" NS width register `Va' set in doc-common +-. +-.als Va doc-generic-macro +-.ds doc-Va-usage variable_name +-. +-. +-.\" NS No user macro +-.\" NS normal text macro (default text style if mess up) +-.\" NS +-.\" NS width register `No' set in doc-common +-. +-.als No doc-generic-macro +-.ds doc-No-usage normal_text +-. +-. +-.\" NS doc-quote-left global string +-.\" NS left quotation character for `doc-enclose-string' and +-.\" NS `doc-enclose-open' +-. +-.ds doc-quote-left +-. +-. +-.\" NS doc-quote-right global string +-.\" NS right quotation character for `doc-enclose-string' and +-.\" NS `doc-enclose-close' +-. +-.ds doc-quote-right +-. +-. +-.\" NS Op user macro +-.\" NS option expression (i.e., enclose string in square brackets) +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Op' set in doc-common +-. +-.de Op +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Op +-. +-. ds doc-quote-left "\*[doc-left-bracket] +-. ds doc-quote-right "\*[doc-right-bracket] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Aq user macro +-.\" NS enclose string in angle brackets +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Aq' set in doc-common +-. +-.de Aq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Aq +-. +-. ie "\*[doc-macro-name]"An" \{\ +-. ds doc-quote-left < +-. ds doc-quote-right > +-. \} +-. el \{\ +-. ds doc-quote-left \[la] +-. ds doc-quote-right \[ra] +-. \} +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Bq user macro +-.\" NS enclose string in square brackets +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Bq' set in doc-common +-. +-.de Bq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Bq +-. +-. ds doc-quote-left "\*[doc-left-bracket] +-. ds doc-quote-right "\*[doc-right-bracket] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Brq user macro +-.\" NS enclose string in braces +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Brq' set in doc-common +-. +-.de Brq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Brq +-. +-. ds doc-quote-left { +-. ds doc-quote-right } +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Dq user macro +-.\" NS enclose string in double quotes +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Dq' set in doc-common +-. +-.de Dq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Dq +-. +-. ds doc-quote-left "\*[Lq] +-. ds doc-quote-right "\*[Rq] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Eq user macro +-.\" NS enclose string in user-defined quotes (args 1 and 2) +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Eq' set in doc-common +-. +-.de Eq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Eq +-. +-. ds doc-quote-left "\$1 +-. ds doc-quote-right "\$2 +-. +-. shift 2 +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Pq user macro +-.\" NS enclose string in parentheses +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Pq' set in doc-common +-. +-.de Pq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Pq +-. +-. ds doc-quote-left "\*[doc-left-parenthesis] +-. ds doc-quote-right "\*[doc-right-parenthesis] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Ql user macro +-.\" NS quoted literal +-.\" +-.\" is in file doc-[dit|n]roff +-. +-. +-.\" NS Qq user macro +-.\" NS enclose string in straight double quotes +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Qq' set in doc-common +-. +-.de Qq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Qq +-. +-. ds doc-quote-left "\*[q] +-. ds doc-quote-right "\*[q] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Sq user macro +-.\" NS enclose string in single quotes +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Sq' set in doc-common +-. +-.de Sq +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Sq +-. +-. ds doc-quote-left "\*[doc-left-singlequote] +-. ds doc-quote-right "\*[doc-right-singlequote] +-. +-. doc-enclose-string \$@ +-.. +-. +-. +-.\" NS Es user macro +-.\" NS set up arguments (i.e., the left and right quotation character as +-.\" NS first and second argument) for .En call +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-. +-.de Es +-. if !\n[doc-arg-limit] \{\ +-. ie (\n[.$] > 2) \{\ +-. ds doc-macro-name Es +-. doc-parse-args \$@ +-. \} +-. el \{\ +-. ds doc-quote-left "\$1 +-. ds doc-quote-right "\$2 +-. \}\} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. ds doc-quote-left "\*[doc-arg\n[doc-arg-ptr]] +-. nr doc-arg-ptr +1 +-. ds doc-quote-right "\*[doc-arg\n[doc-arg-ptr]] +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ +-. doc-do-\n[doc-type\n[doc-arg-ptr]] +-. el \ +-. doc-print-and-reset +-.. +-. +-. +-.\" NS doc-have-slot global register (bool) +-.\" NS set if `doc-enclose-string' has created a slot for closing +-.\" NS delimiter +-. +-.nr doc-have-slot 0 +-. +-. +-.\" NS doc-enclose-string macro +-.\" NS enclose string with given args (e.g. [ and ]) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-have-slot +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-des +-.\" NS doc-reg-des1 +-.\" NS doc-reg-des2 +-.\" NS +-.\" NS requires: +-.\" NS doc-quote-left +-.\" NS doc-quote-right +-. +-.de doc-enclose-string +-. if \n[doc-in-synopsis-section] \ +-. doc-set-hard-space +-. +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \ +-. doc-parse-args \$@ +-. el \{\ +-. nop \)\*[doc-quote-left]\*[doc-quote-right] +-. \}\} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. \" the final `\)' prevents hyphenation in case the next character is `\%' +-. nop \)\*[doc-quote-left]\)\c +-. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. \" last argument +-. nop \)\*[doc-quote-right]\)\c +-. doc-print-and-reset +-. \} +-. el \{\ +-. \" test whether last arguments are of type closing punctuation +-. \" resp. suffix +-. ie (\n[doc-type\n[doc-arg-limit]] == 3) \{\ +-. nr doc-reg-des (\n[doc-arg-limit] - 1) +-. while (\n[doc-type\n[doc-reg-des]] == 3) \ +-. nr doc-reg-des -1 +-. +-. \" prepend closing delimiter +-. nr doc-reg-des +1 +-. ds doc-arg\n[doc-reg-des] "\*[doc-quote-right]\)\*[doc-arg\n[doc-reg-des]] +-. \} +-. el \{\ +-. \" test whether last arguments are macros which continue the line +-. \" logically +-. nr doc-reg-des \n[doc-arg-limit] +-. while (\n[doc-reg-des] >= \n[doc-arg-ptr]) \{\ +-. if !\A\*[doc-arg\n[doc-reg-des]] \ +-. break +-. if !d doc-after-\*[doc-arg\n[doc-reg-des]] \ +-. break +-. nr doc-reg-des -1 +-. \} +-. +-. \" if there are no trailing macros to be skipped, append argument +-. ie (\n[doc-reg-des] == \n[doc-arg-limit]) \ +-. doc-append-arg "\)\*[doc-quote-right]\)" 3 +-. el \{\ +-. \" if a previous call to `doc-enclose-string' has already created +-. \" a slot, prepend argument +-. ie \n[doc-have-slot] \ +-. ds doc-arg\n[doc-reg-des] "\*[doc-quote-right]\)\*[doc-arg\n[doc-reg-des]] +-. el \{\ +-. \" we have to shift all arguments to the right +-. nr doc-reg-des +1 +-. nr doc-reg-des1 \n[doc-arg-limit] +-. nr doc-reg-des2 (\n[doc-arg-limit] + 1) +-. while (\n[doc-reg-des1] >= \n[doc-reg-des]) \{\ +-. rn doc-arg\n[doc-reg-des1] doc-arg\n[doc-reg-des2] +-. rnn doc-type\n[doc-reg-des1] doc-type\n[doc-reg-des2] +-. rn doc-space\n[doc-reg-des1] doc-space\n[doc-reg-des2] +-. nr doc-reg-des1 -1 +-. nr doc-reg-des2 -1 +-. \} +-. nr doc-arg-limit +1 +-. +-. \" finally, insert closing delimiter into the freed slot and +-. \" recompute spacing vector +-. ds doc-arg\n[doc-reg-des] "\)\*[doc-quote-right]\) +-. nr doc-type\n[doc-reg-des] 3 +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-reg-des] + 1) +-. nr doc-arg-limit (\n[doc-reg-des] - 1) +-. doc-parse-space-vector +-. nr doc-have-slot 1 +-. \}\}\} +-. +-. doc-do-\n[doc-type\n[doc-arg-ptr]] +-. \} +-. +-. if \n[doc-in-synopsis-section] \ +-. doc-set-soft-space +-.. +-. +-. +-.\" NS En user macro +-.\" NS enclose arguments with quotation characters set up with `.Es' +-. +-.als En doc-enclose-string +-. +-. +-.\" NS Ao user macro +-.\" NS angle open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Ao' set in doc-common +-. +-.de Ao +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Ao +-. +-. ie "\*[doc-macro-name]"An" \ +-. ds doc-quote-left < +-. el \ +-. ds doc-quote-left \[la] +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Ac user macro +-.\" NS angle close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Ac' set in doc-common +-. +-.de Ac +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Ac +-. +-. ie "\*[doc-macro-name]"An" \ +-. ds doc-quote-right > +-. el \ +-. ds doc-quote-right \[ra] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Bo user macro +-.\" NS bracket open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Bo' set in doc-common +-. +-.de Bo +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Bo +-. +-. ds doc-quote-left "\*[doc-left-bracket] +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Bc user macro +-.\" NS bracket close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Bc' set in doc-common +-. +-.de Bc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Bc +-. +-. ds doc-quote-right "\*[doc-right-bracket] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Bro user macro +-.\" NS brace open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Bro' set in doc-common +-. +-.de Bro +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Bo +-. +-. ds doc-quote-left { +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Brc user macro +-.\" NS brace close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Brc' set in doc-common +-. +-.de Brc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Bc +-. +-. ds doc-quote-right } +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Do user macro +-.\" NS double quote open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Do' set in doc-common +-. +-.de Do +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Do +-. +-. ds doc-quote-left "\*[Lq] +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Dc user macro +-.\" NS double quote close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Dc' set in doc-common +-. +-.de Dc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Dc +-. +-. ds doc-quote-right "\*[Rq] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Eo user macro +-.\" NS enclose open (using first argument as beginning of enclosure) +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Eo' set in doc-common +-. +-.de Eo +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Eo +-. +-. ds doc-quote-left "\$1 +-. +-. shift +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Ec user macro +-.\" NS enclose close (using first argument as end of enclosure) +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Ec' set in doc-common +-. +-.de Ec +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Ec +-. +-. ds doc-quote-right "\$1 +-. +-. shift +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Oo user macro +-.\" NS option open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Oo' set in doc-common +-. +-.de Oo +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Oo +-. +-. ds doc-quote-left [ +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Oc user macro +-.\" NS option close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Oc' set in doc-common +-. +-.de Oc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Oc +-. +-. ds doc-quote-right ] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Po user macro +-.\" NS parenthesis open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Po' set in doc-common +-. +-.de Po +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Po +-. +-. ds doc-quote-left "\*[doc-left-parenthesis] +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Pc user macro +-.\" NS parenthesis close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Pc' set in doc-common +-. +-.de Pc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Pc +-. +-. ds doc-quote-right "\*[doc-right-parenthesis] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Qo user macro +-.\" NS straight double quote open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Qo' set in doc-common +-. +-.de Qo +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Qo +-. +-. ds doc-quote-left "\*[q] +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Qc user macro +-.\" NS straight double quote close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Qc' set in doc-common +-. +-.de Qc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Qc +-. +-. ds doc-quote-right "\*[q] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS So user macro +-.\" NS single quote open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `So' set in doc-common +-. +-.de So +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name So +-. +-. ds doc-quote-left "\*[doc-left-singlequote] +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Sc user macro +-.\" NS single quote close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Sc' set in doc-common +-. +-.de Sc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Sc +-. +-. ds doc-quote-right "\*[doc-right-singlequote] +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS Xo user macro +-.\" NS extend open +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Xo' set in doc-common +-. +-.de Xo +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Xo +-. +-. ds doc-quote-left +-. +-. doc-enclose-open \$@ +-.. +-. +-. +-.\" NS Xc user macro +-.\" NS extend close +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS doc-quote-right +-.\" NS +-.\" NS width register `Xc' set in doc-common +-. +-.de Xc +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Xc +-. +-. ds doc-quote-right +-. +-. doc-enclose-close \$@ +-.. +-. +-. +-.\" NS doc-nesting-level global register +-.\" NS used by `doc-enclose-open' and `doc-enclose-close' +-. +-.nr doc-nesting-level 0 +-. +-. +-.\" NS doc-in-list global register (bool) +-.\" NS whether we are in (logical) .It +-. +-.nr doc-in-list 0 +-. +-. +-.\" NS doc-enclose-open macro +-.\" NS enclose string open +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-nesting-level +-. +-.de doc-enclose-open +-. if !\n[doc-arg-limit] \ +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. nr doc-arg-ptr -1 +-. +-. nop \)\*[doc-quote-left]\)\c +-. +-. \" start enclosure box +-. box doc-enclosure-box\n[doc-nesting-level] +-. ev doc-enclosure-env\n[doc-nesting-level] +-. evc 0 +-. in 0 +-. nf +-. \" we insert something to make .chop always work +-. nop \&\c +-. +-. \" increase nesting level *after* parsing of arguments +-. nr doc-nesting-level +1 +-. +-. if \n[doc-arg-limit] \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ +-. doc-print-recursive +-. el \ +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS doc-enclose-close macro +-.\" NS enclose string close +-.\" NS +-.\" NS modifies: +-.\" NS doc-nesting-level +-. +-.de doc-enclose-close +-. nr doc-nesting-level -1 +-. +-. \" finish enclosure box +-. br +-. ev +-. box +-. chop doc-enclosure-box\n[doc-nesting-level] +-. unformat doc-enclosure-box\n[doc-nesting-level] +-. +-. nh +-. nop \*[doc-enclosure-box\n[doc-nesting-level]]\c +-. nop \)\*[doc-quote-right]\)\c +-. +-. if !\n[doc-arg-limit] \{\ +-. doc-parse-args \$@ +-. +-. if !\n[.$] \ +-. doc-print-and-reset +-. \} +-. +-. if \n[doc-arg-limit] \{\ +-. ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nop \)\*[doc-space\n[doc-arg-ptr]]\c +-. nr doc-arg-ptr +1 +-. doc-print-recursive +-. \} +-. el \ +-. doc-print-and-reset +-. \} +-. +-. \" shall we finish .It macro? +-. if !"\*[doc-macro-name]"It" \ +-. if \n[doc-in-list] \ +-. if !\n[doc-nesting-level] \ +-. doc-\*[doc-list-type-stack\n[doc-list-depth]] +-.. +-. +-. +-.\" NS Pf user macro +-.\" NS prefix: `.Pf prefix arg ...' +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-macro-name +-.\" NS doc-quote-left +-.\" NS +-.\" NS width register `Pf' set in doc-common +-. +-.de Pf +-. if !\n[doc-arg-limit] \ +-. ds doc-macro-name Pf +-. +-. ie \n[doc-arg-limit] \{\ +-. ie ((\n[doc-arg-limit] - \n[doc-arg-ptr]) > 1) \{\ +-. nr doc-arg-ptr +1 +-. nop \)\*[doc-arg\n[doc-arg-ptr]]\c +-. \} +-. el \ +-. tm mdoc warning: .Pf: trailing prefix (#\n[.c]) +-. \} +-. el \{\ +-. nop \)\$1\)\c +-. shift +-. ie \n[.$] \ +-. doc-parse-args \$@ +-. el \{\ +-. tm mdoc warning: .Pf: missing arguments (#\n[.c]) +-. nop \) +-. \}\} +-. +-. if \n[doc-arg-limit] \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \ +-. doc-print-and-reset +-. el \ +-. doc-do-\n[doc-type\n[doc-arg-ptr]] +-. \} +-.. +-. +-. +-.\" NS Ns user macro +-.\" NS remove space (space removal done by `doc-parse-args') +-.\" NS +-.\" NS modifies: +-.\" NS doc-argXXX +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Ns' set in doc-common +-. +-.de Ns +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Ns +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Ns must be called with arguments (#\n[.c]) +-. \} +-. +-. if \n[doc-arg-limit] \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ +-. doc-print-recursive +-. el \ +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS Ap user macro +-.\" NS append an apostrophe +-.\" NS +-.\" NS width register `Ap' set in doc-common +-. +-.de Ap +-. ie !\n[doc-arg-limit] \ +-. tm Usage: `Ap' cannot be first macro on a line (no `.Ap') (#\n[.c]) +-. el \{\ +-. nop \)'\)\c +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ +-. doc-print-recursive +-. el \ +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS doc-space global string +-.\" NS current inter-argument space +-. +-.ds doc-space "\*[doc-soft-space] +-. +-. +-.\" NS doc-soft-space constant string +-.\" NS soft (stretchable) space (defined in doc-common) +-. +-. +-.\" NS doc-hard-space constant string +-.\" NS hard (unpaddable) space (defined in doc-common) +-. +-. +-.\" NS doc-set-hard-space macro +-.\" NS set current space string to hard (unpaddable) space. +-.\" NS +-.\" NS modifies: +-.\" NS doc-saved-space +-.\" NS doc-space +-. +-.de doc-set-hard-space +-. ie "\*[doc-space]"" \ +-. ds doc-saved-space "\*[doc-hard-space] +-. el \ +-. ds doc-space "\*[doc-hard-space] +-.. +-. +-. +-.\" NS doc-set-soft-space macro +-.\" NS set current space string to soft space +-.\" NS +-.\" NS modifies: +-.\" NS doc-saved-space +-.\" NS doc-space +-. +-.de doc-set-soft-space +-. ie "\*[doc-space]"" \ +-. ds doc-saved-space "\*[doc-soft-space] +-. el \ +-. ds doc-space "\*[doc-soft-space] +-.. +-. +-. +-.\" NS doc-space-mode global register (bool) +-.\" NS default is one (space mode on) +-. +-.nr doc-space-mode 1 +-. +-. +-.\" NS doc-saved-space global string +-.\" NS saved value of `doc-space' +-. +-.ds doc-saved-space "\*[doc-space] +-. +-. +-.\" NS doc-have-space global register (bool) +-.\" NS set if last command was horizontal space +-. +-.nr doc-have-space 0 +-. +-. +-.\" NS Sm user macro +-.\" NS space mode (`.Sm'/`.Sm on'/`.Sm off') +-.\" NS +-.\" NS without argument, toggle space mode +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-limit +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-macro-name +-.\" NS doc-num-args +-.\" NS doc-saved-space +-.\" NS doc-space +-.\" NS doc-space-mode +-.\" NS doc-spaceXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Sm +-.\" NS +-.\" NS width register `Sm' set in doc-common +-. +-.de Sm +-. ie \n[doc-have-space] \ +-. nr doc-reg-Sm 0 +-. el \ +-. nr doc-reg-Sm 1 +-. +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Sm +-. doc-parse-args \$@ +-. \} +-. el \{\ +-. ie \n[doc-space-mode] \{\ +-. ds doc-saved-space "\*[doc-space] +-. ds doc-space +-. nr doc-space-mode 0 +-. \} +-. el \{\ +-. ds doc-space "\*[doc-saved-space] +-. nr doc-space-mode 1 +-. +-. \" finish line only if it is interrupted and `doc-have-space' +-. \" isn't set +-. if \n[doc-reg-Sm] \ +-. if \n[.int] \ +-. nop \) +-. \} +-. \}\} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. +-. \" avoid a warning message in case `Sm' is the last parameter +-. if !d doc-arg\n[doc-arg-ptr] \ +-. ds doc-arg\n[doc-arg-ptr] +-. +-. ie "\*[doc-arg\n[doc-arg-ptr]]"on" \{\ +-. ds doc-space "\*[doc-saved-space] +-. nr doc-space-mode 1 +-. \} +-. el \{\ +-. ie "\*[doc-arg\n[doc-arg-ptr]]"off" \{\ +-. ds doc-saved-space "\*[doc-space] +-. ds doc-space +-. nr doc-space-mode 0 +-. \} +-. el \{\ +-. \" no argument for Sm +-. nr doc-arg-ptr -1 +-. ie \n[doc-space-mode] \{\ +-. ds doc-saved-space "\*[doc-space] +-. ds doc-space +-. nr doc-space-mode 0 +-. \} +-. el \{\ +-. ds doc-space "\*[doc-saved-space] +-. nr doc-space-mode 1 +-. \} +-. \}\} +-. +-. ie \n[doc-space-mode] \{\ +-. \" recompute space vector for remaining arguments +-. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +-. nr doc-arg-limit \n[doc-arg-ptr] +-. if \n[doc-num-args] \ +-. doc-parse-space-vector +-. +-. \" finish line only if it is interrupted and `doc-have-space' +-. \" isn't set +-. if \n[doc-reg-Sm] \ +-. if \n[.int] \ +-. nop \) +-. \} +-. el \{\ +-. \" reset remaining space vector elements +-. nr doc-reg-Sm (\n[doc-arg-ptr] + 1) +-. while (\n[doc-reg-Sm] <= \n[doc-arg-limit]) \{\ +-. ds doc-space\n[doc-reg-Sm] +-. nr doc-reg-Sm +1 +-. \" the body of a `while' request must end with the fitting `\}'! +-. \} +-. \} +-. +-. \" do we have parameters to print? +-. ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. \" skip `Sm' argument +-. nr doc-arg-ptr +1 +-. doc-print-recursive +-. \} +-. el \ +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-arg-type immediate register +-.\" NS argument type (macro=1, string=2, punctuation suffix=3, +-.\" NS punctuation prefix=4) +-. +-.nr doc-arg-type 0 +-. +-. +-.\" NS doc-get-arg-type macro +-.\" NS get argument type +-.\" NS +-.\" NS this macro expects the width of the argument in `doc-width' +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-type +-. +-.de doc-get-arg-type +-. nr doc-arg-type 2 +-. +-. if ((\n[doc-width] < 4) & \A\$1) \{\ +-. ie (\n[doc-width] == 1) \{\ +-. if r doc-punct\$1 \ +-. nr doc-arg-type \n[doc-punct\$1] +-. \} +-. el \ +-. if r \$1 \ +-. if d \$1 \ +-. nr doc-arg-type 1 +-. \} +-.. +-. +-. +-.\" NS doc-get-arg-type* macro +-.\" NS similar to as `doc-get-arg-type' but uses doc-argXXX strings +-.\" NS +-.\" NS this macro sets the `doc-width' register using the `length' request +-.\" NS to get the number of characters in a string literally +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-type +-.\" NS doc-width +-. +-.de doc-get-arg-type* +-. nr doc-arg-type 2 +-. length doc-width "\*[doc-arg\$1] +-. +-. if ((\n[doc-width] < 4) & \A\*[doc-arg\$1]) \{\ +-. ie (\n[doc-width] == 1) \{\ +-. if r doc-punct\*[doc-arg\$1] \ +-. nr doc-arg-type \n[doc-punct\*[doc-arg\$1]] +-. \} +-. el \ +-. if r \*[doc-arg\$1] \ +-. if d \*[doc-arg\$1] \ +-. nr doc-arg-type 1 +-. \} +-.. +-. +-. +-.\" NS doc-set-spacing-1 macro +-.\" NS set spacing for macros +-.\" NS +-.\" NS modifies: +-.\" NS doc-spaceXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dssfm +-.\" NS doc-reg-dssfm1 +-. +-.de doc-set-spacing-1 +-. nr doc-reg-dssfm1 \n[\*[doc-arg\n[doc-arg-limit]]] +-. +-. \" closing macros like .Ac, Bc., etc. have value 3 (remove space before +-. \" argument) +-. ie (\n[doc-reg-dssfm1] == 3) \{\ +-. if \n[doc-arg-limit] \{\ +-. nr doc-reg-dssfm (\n[doc-arg-limit] - 1) +-. ds doc-space\n[doc-reg-dssfm] +-. \} +-. ds doc-space\n[doc-arg-limit] "\*[doc-space] +-. \} +-. el \{\ +-. \" macros like .Ap and .Ns have value 2 (remove space before and after +-. \" argument) +-. ie (\n[doc-reg-dssfm1] == 2) \{\ +-. if \n[doc-arg-limit] \{\ +-. nr doc-reg-dssfm (\n[doc-arg-limit] - 1) +-. ds doc-space\n[doc-reg-dssfm] +-. \} +-. ds doc-space\n[doc-arg-limit] +-. \} +-. el \ +-. ds doc-space\n[doc-arg-limit] +-. \} +-.. +-. +-. +-.\" NS doc-set-spacing-2 macro +-.\" NS set spacing for strings +-.\" NS +-.\" NS modifies: +-.\" NS doc-spaceXXX +-. +-.de doc-set-spacing-2 +-. ds doc-space\n[doc-arg-limit] "\*[doc-space] +-.. +-. +-. +-.\" NS doc-set-spacing-3 macro +-.\" NS set spacing for punctuation suffixes +-.\" NS +-.\" NS modifies: +-.\" NS doc-spaceXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dssfps +-. +-.de doc-set-spacing-3 +-. if \n[doc-arg-limit] \{\ +-. nr doc-reg-dssfps (\n[doc-arg-limit] - 1) +-. ds doc-space\n[doc-reg-dssfps] +-. \} +-. +-. ds doc-space\n[doc-arg-limit] "\*[doc-space] +-.. +-. +-. +-.\" NS doc-set-spacing-4 macro +-.\" NS set spacing for punctuation prefixes +-.\" NS +-.\" NS modifies: +-.\" NS doc-spaceXXX +-. +-.de doc-set-spacing-4 +-. ds doc-space\n[doc-arg-limit] +-.. +-. +-. +-.\" type switches (on current argument doc-arg-ptr) +-. +-. +-.\" NS doc-do-1 macro +-.\" NS call request if macro +-. +-.de doc-do-1 +-. \*[doc-arg\n[doc-arg-ptr]] +-.. +-. +-. +-.\" NS doc-do-2 macro +-.\" NS call .doc-print-recursive if string +-. +-.als doc-do-2 doc-print-recursive +-. +-. +-.\" NS doc-do-3 macro +-.\" NS call .doc-print-recursive if punctuation suffix +-. +-.als doc-do-3 doc-print-recursive +-. +-. +-.\" NS doc-do-4 macro +-.\" NS call .doc-print-recursive if punctuation prefix +-. +-.als doc-do-4 doc-print-recursive +-. +-. +-.\" NS doc-fontmode-depth global register +-.\" NS font mode level +-. +-.nr doc-fontmode-depth 0 +-. +-. +-.\" NS doc-fontmode-font-stackXXX global register +-.\" NS stack of saved current font values from `Bf' macro +-.\" NS +-.\" NS limit: +-.\" NS doc-fontmode-depth +-. +-.nr doc-fontmode-font-stack0 0 +-. +-. +-.\" NS doc-fontmode-size-stackXXX global register +-.\" NS stack of saved current size values from `Bf' macro +-.\" NS +-.\" NS limit: +-.\" NS doc-fontmode-depth +-. +-.nr doc-fontmode-size-stack0 0 +-. +-. +-.\" NS Bf user macro +-.\" NS begin font mode (will be begin-mode/end-mode in groff & TeX) +-.\" NS +-.\" NS modifies: +-.\" NS doc-fontmode-depth +-.\" NS doc-fontmode-font-stackXXX +-.\" NS doc-fontmode-size-stackXXX +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Bf' set in doc-common +-. +-.de Bf +-. ds doc-macro-name Bf +-. +-. ie \n[.$] \{\ +-. nr doc-fontmode-depth +1 +-. +-. \" save current font and size +-. nr doc-fontmode-font-stack\n[doc-fontmode-depth] \n[.f] +-. nr doc-fontmode-size-stack\n[doc-fontmode-depth] \n[.ps] +-. +-. ie "\$1"Em" \ +-. nop \*[doc-Em-font]\c +-. el \{ .ie "\$1"Li" \ +-. nop \*[doc-Li-font]\c +-. el \{ .ie "\$1"Sy" \ +-. nop \*[doc-Sy-font]\c +-. el \{ .ie "\$1"-emphasis" \ +-. nop \*[doc-Em-font]\c +-. el \{ .ie "\$1"-literal" \ +-. nop \*[doc-Li-font]\c +-. el \{ .ie "\$1"-symbolic" \ +-. nop \*[doc-Sy-font]\c +-. el \{\ +-. tmc mdoc warning: Unknown keyword `\$1' in .Bf macro +-. tm1 " (#\n[.c]) +-. \}\}\}\}\}\}\} +-. el \ +-. tm Usage: .Bf [Em | -emphasis | Li | -literal | Sy | -symbolic] (#\n[.c]) +-.. +-. +-. +-.\" NS Ef user macro +-.\" NS end font mode +-.\" NS +-.\" NS modifies: +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Ef' set in doc-common +-. +-.de Ef +-. ds doc-macro-name Ef +-. +-. ie \n[doc-fontmode-depth] \{\ +-. \" restore saved font and size +-. nop \)\f[\n[doc-fontmode-font-stack\n[doc-fontmode-depth]]]\c +-. nop \)\s[\n[doc-fontmode-size-stack\n[doc-fontmode-depth]]u]\c +-. +-. nr doc-fontmode-font-stack\n[doc-fontmode-depth] 0 +-. nr doc-curr-font \n[.f] +-. nr doc-fontmode-size-stack\n[doc-fontmode-depth] 0 +-. nr doc-curr-size \n[.ps] +-. nr doc-fontmode-depth -1 +-. \} +-. el \ +-. tm mdoc warning: Extraneous .Ef (#\n[.c]) +-.. +-. +-. +-.\" NS doc-keep-type global register +-.\" NS current keep type; 1 is `-words', 2 is `-lines', 3 is unknown +-. +-.nr doc-keep-type 0 +-. +-. +-.\" NS Bk user macro +-.\" NS begin keep +-.\" NS +-.\" NS modifies: +-.\" NS doc-keep-type +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Bk' set in doc-common +-. +-.de Bk +-. ds doc-macro-name Bk +-. +-. if \n[doc-keep-type] \ +-. tm .Bk: nesting keeps not implemented yet. (#\n[.c]) +-. +-. ie "\$1"-lines" \{\ +-. nr doc-keep-type 2 +-. tm .Bk -lines: Not implemented yet. (#\n[.c]) +-. \} +-. el \{ .ie "\$1"-words" \{\ +-. nr doc-keep-type 1 +-. doc-set-hard-space +-. \} +-. el \{ .ie "\$1"" \{\ +-. \" default +-. nr doc-keep-type 1 +-. doc-set-hard-space +-. \} +-. el \{\ +-. tm mdoc warning: Unknown keyword `\$1' in .Bk macro (#\n[.c]) +-. nr doc-keep-type 3 +-. \}\}\} +-. +-\#. nr doc-nesting-level +1 +-.. +-. +-. +-.\" NS Ek user macro +-.\" NS end keep +-.\" NS +-.\" NS modifies: +-.\" NS doc-keep-type +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Ek' set in doc-common +-. +-.de Ek +-. ds doc-macro-name Ek +-. +-\#. nr doc-nesting-level -1 +-. +-. ie \n[.$] \ +-. tm Usage: .Ek (does not take arguments) (#\n[.c]) +-. el \{\ +-. if !\n[doc-keep-type] \ +-. tm mdoc warning: .Ek found without .Bk before (#\n[.c]) +-. +-. ie (\n[doc-keep-type] == 1) \ +-. doc-set-soft-space +-. el \{ .if (\n[doc-keep-type] == 2) \ +-. tm .Bk -lines: Not implemented yet. (#\n[.c]) +-. \}\} +-. +-. nr doc-keep-type 0 +-. +-\#. if !"\*[doc-out-string]"" \ +-\#. doc-print-out-string +-.. +-. +-. +-.\" NS doc-display-depth global register +-.\" NS display level +-. +-.nr doc-display-depth 0 +-. +-. +-.\" NS doc-is-compact global register (bool) +-.\" NS set if the `compact' keyword is given +-. +-.nr doc-is-compact 0 +-. +-. +-.\" NS doc-display-type-stackXXX global string +-.\" NS the display type stack +-.\" NS +-.\" NS limit: +-.\" NS doc-display-depth +-. +-.ds doc-display-type-stack0 +-. +-. +-.\" NS doc-display-indent-stackXXX global register +-.\" NS stack of display indentation values +-.\" NS +-.\" NS limit: +-.\" NS doc-display-depth +-. +-.nr doc-display-indent-stack0 0 +-. +-. +-.\" NS doc-display-ad-stackXXX global register +-.\" NS stack of saved adjustment modes +-.\" NS +-.\" NS limit: +-.\" NS doc-display-depth +-. +-.nr doc-display-ad-stack0 0 +-. +-. +-.\" NS doc-display-fi-stackXXX global register +-.\" NS stack of saved fill modes +-.\" NS +-.\" NS limit: +-.\" NS doc-display-depth +-. +-.nr doc-display-fi-stack0 0 +-. +-. +-.\" NS doc-display-ft-stackXXX global register +-.\" NS stack of saved fonts +-.\" NS +-.\" NS limit: +-.\" NS doc-display-depth +-. +-.nr doc-display-ft-stack0 0 +-. +-. +-.\" NS doc-display-ps-stackXXX global register +-.\" NS stack of saved font sizes +-.\" NS +-.\" NS limit: +-.\" NS doc-display-depth +-. +-.nr doc-display-ps-stack0 0 +-. +-. +-.\" NS Bd user macro +-.\" NS begin display +-.\" NS +-.\" NS width register `Bd' set in doc-common +-.\" NS +-.\" NS modifies: +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-display-depth +-.\" NS doc-display-ad-stackXXX +-.\" NS doc-display-fi-stackXXX +-.\" NS doc-display-ft-stackXXX +-.\" NS doc-display-ps-stackXXX +-.\" NS doc-display-file +-.\" NS doc-display-indent-stackXXX +-.\" NS doc-display-type-stackXXX +-.\" NS doc-is-compact +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Bd +-. +-.de Bd +-. ds doc-macro-name Bd +-. +-. if !\n[.$] \{\ +-. tm1 "Usage: .Bd {-literal | -filled | -ragged | -centered | -unfilled} +-. tm1 " [-offset [string]] [-compact] [-file name] (#\n[.c]) +-. return +-. \} +-. +-. nr doc-is-compact 0 +-. ds doc-display-file +-. nr doc-reg-Bd 1 +-. nr doc-display-depth +1 +-. +-. \" save current adjustment and fill modes +-. nr doc-display-ad-stack\n[doc-display-depth] \n[.j] +-. nr doc-display-fi-stack\n[doc-display-depth] \n[.u] +-. +-. ie "\$1"-literal" \{\ +-. ds doc-display-type-stack\n[doc-display-depth] literal +-. nr doc-display-ft-stack\n[doc-display-depth] \n[.f] +-. nr doc-display-ps-stack\n[doc-display-depth] \n[.ps] +-. +-. ie t \ +-. ta T 9n +-. el \ +-. ta T 8n +-. nf +-. \} +-. el \{ .ie "\$1"-filled" \{\ +-. ds doc-display-type-stack\n[doc-display-depth] filled +-. ad b +-. fi +-. \} +-. el \{ .ie "\$1"-ragged" \{\ +-. ds doc-display-type-stack\n[doc-display-depth] ragged +-. na +-. fi +-. \} +-. el \{ .ie "\$1"-centered" \{\ +-. ds doc-display-type-stack\n[doc-display-depth] centered +-. ad c +-. fi +-. \} +-. el \{ .ie "\$1"-unfilled" \{\ +-. ds doc-display-type-stack\n[doc-display-depth] unfilled +-. nf +-. \} +-. el \{\ +-. tm1 "mdoc warning: Unknown keyword `\$1' (or missing display type) +-. tm1 " in .Bd macro (#\n[.c]) +-. nr doc-reg-Bd 0 +-. \}\}\}\}\} +-. +-. \" have we seen an argument? +-. if \n[doc-reg-Bd] \{\ +-. shift +-. \" check other arguments +-. if \n[.$] \ +-. doc-do-Bd-args \$@ +-. \} +-. +-. \" avoid warning about non-existent register +-. if !r doc-display-indent-stack\n[doc-display-depth] \ +-. nr doc-display-indent-stack\n[doc-display-depth] 0 +-. +-. if \n[doc-display-indent-stack\n[doc-display-depth]] \ +-. in +\n[doc-display-indent-stack\n[doc-display-depth]]u +-. +-. if !\n[doc-is-compact] \ +-. sp \n[doc-display-vertical]u +-. +-. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \ +-. if t \ +-. nop \*[doc-Li-font]\c +-. +-. if !\n[cR] \ +-. ne 2v +-. +-. if !"\*[doc-display-file]"" \ +-. so \*[doc-display-file] +-. +-. nr doc-is-compact 0 +-. ds doc-display-file +-.. +-. +-. +-.\" NS doc-do-Bd-args macro +-.\" NS resolve remaining .Bd arguments +-.\" NS +-.\" NS modifies: +-.\" NS doc-display-file +-.\" NS doc-display-indent-stackXXX +-.\" NS doc-is-compact +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-ddBa +-.\" NS doc-reg-ddBa1 +-.\" NS doc-reg-ddBa2 +-.\" NS doc-reg-ddBa3 +-.\" NS doc-reg-ddBa4 +-.\" NS doc-str-ddBa +-. +-.de doc-do-Bd-args +-. nr doc-reg-ddBa 1 +-. +-. ie "\$1"-offset" \{\ +-. nr doc-reg-ddBa 2 +-. +-. ie "\$2"left" \ +-. nr doc-display-indent-stack\n[doc-display-depth] 0 +-. el \{ .ie "\$2"right" \ +-. nr doc-display-indent-stack\n[doc-display-depth] (\n[.l]u / 3u) +-. el \{ .ie "\$2"center" \ +-. nr doc-display-indent-stack\n[doc-display-depth] ((\n[.l]u - \n[.i]u) / 4u) +-. el \{ .ie "\$2"indent" \ +-. nr doc-display-indent-stack\n[doc-display-depth] \n[doc-display-indent]u +-. el \{ .ie "\$2"indent-two" \ +-. nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-display-indent]u + \n[doc-display-indent]u) +-. el \ +-. nr doc-reg-ddBa 1 +-. \}\}\}\} +-. +-. \" not a known keyword +-. if (\n[doc-reg-ddBa] == 1) \{\ +-. nr doc-reg-ddBa 2 +-. +-. nr doc-reg-ddBa1 0 +-. if \B(\$2) \{\ +-. \" disable warnings related to scaling indicators (32) +-. nr doc-reg-ddBa2 \n[.warn] +-. warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32)) +-. +-. \" values without a scaling indicator are taken as strings; +-. \" we test whether the parameter string with and without the last +-. \" character yields identical numerical results (ignoring the +-. \" scaling indicator) +-. ds doc-str-ddBa "\$2 +-. substring doc-str-ddBa 0 -2 +-. if \B(\*[doc-str-ddBa]) \{\ +-. nr doc-reg-ddBa3 (;(\$2)) +-. nr doc-reg-ddBa4 (\*[doc-str-ddBa]) +-. if (\n[doc-reg-ddBa3] == \n[doc-reg-ddBa4]) \ +-. nr doc-reg-ddBa1 1 +-. \} +-. +-. \" enable all warnings again +-. warn \n[doc-reg-ddBa2] +-. \} +-. +-. ie \n[doc-reg-ddBa1] \ +-. nr doc-display-indent-stack\n[doc-display-depth] \$2 +-. el \{\ +-. doc-get-width "\$2" +-. ie (\n[doc-width] <= 3) \{\ +-. \" if the offset parameter is a macro, use the macro's +-. \" width as specified in doc-common +-. doc-get-arg-type "\$2" +-. ie (\n[doc-arg-type] == 1) \ +-. nr doc-display-indent-stack\n[doc-display-depth] \n[\$2] +-. el \ +-. nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \} +-. el \ +-. nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \}\} +-. \} +-. el \{ .ie "\$1"-compact" \ +-. nr doc-is-compact 1 +-. el \{ .ie "\$1"-file" \{\ +-. ie !"\$2"" \{\ +-. ds doc-display-file "\$2 +-. nr doc-reg-ddBa 2 +-. \} +-. el \ +-. tm mdoc warning: .Bd `-file' keyword requires argument (#\n[.c]) +-. \} +-. el \ +-. tm mdoc warning: Unknown keyword `\$1' in .Bd macro (#\n[.c]) +-. \}\} +-. +-. if (\n[doc-reg-ddBa] < \n[.$]) \{\ +-. shift \n[doc-reg-ddBa] +-. doc-do-Bd-args \$@ +-. \} +-.. +-. +-. +-.\" NS Ed user macro +-.\" NS end display +-.\" NS +-.\" NS modifies: +-.\" NS doc-display-depth +-.\" NS doc-display-indent-stackXXX +-.\" NS doc-display-type-stackXXX +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Ed' set in doc-common +-. +-.de Ed +-. ds doc-macro-name Ed +-. +-. br +-. +-. if !\n[doc-display-depth] \{\ +-. tm mdoc warning: Extraneous .Ed (#\n[.c]) +-. nr doc-display-depth 1 +-. \} +-. +-. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \{\ +-. ft \n[doc-display-ft-stack\n[doc-display-depth]] +-. ps \n[doc-display-ps-stack\n[doc-display-depth]]u +-. \} +-. +-. in -\n[doc-display-indent-stack\n[doc-display-depth]]u +-. +-. \" restore saved adjustment and fill modes +-. ie \n[doc-display-fi-stack\n[doc-display-depth]] \ +-. fi +-. el \ +-. nf +-. ad \n[doc-display-ad-stack\n[doc-display-depth]] +-. +-. nr doc-display-indent-stack\n[doc-display-depth] 0 +-. ds doc-display-type-stack\n[doc-display-depth] +-. nr doc-display-depth -1 +-.. +-. +-. +-.\" NS doc-list-type-stackXXX global string +-.\" NS stack of list types +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.ds doc-list-type-stack1 +-. +-. +-.\" NS doc-list-indent-stackXXX global register +-.\" NS stack of list indentation values +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.nr doc-list-indent-stack1 0 +-. +-. +-.\" NS doc-list-have-indent-stackXXX global register (bool) +-.\" NS an indentation value is active +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.nr doc-list-have-indent-stack1 0 +-. +-. +-.\" NS Bl user macro +-.\" NS begin list +-.\" NS +-.\" NS width register `Bl' set in doc-common +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-list-depth +-.\" NS doc-list-have-indent-stackXXX +-.\" NS doc-list-indent-stackXXX +-.\" NS doc-list-type-stackXXX +-.\" NS doc-macro-name +-.\" NS doc-num-args +-.\" NS doc-num-columns +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Bl +-. +-.de Bl +-. if !\n[.$] \{\ +-. doc-Bl-usage +-. return +-. \} +-. +-. ds doc-macro-name Bl +-. nr doc-list-depth +1 +-. nr doc-arg-ptr 1 +-. +-. ie "\$1"-hang" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] hang-list +-. nr doc-list-indent-stack\n[doc-list-depth] 6n +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-tag" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] tag-list +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-item" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] item-list +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-enum" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] enum-list +-. nr doc-list-indent-stack\n[doc-list-depth] 3n +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-bullet" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] bullet-list +-. nr doc-list-indent-stack\n[doc-list-depth] 2n +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-dash" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] dash-list +-. nr doc-list-indent-stack\n[doc-list-depth] 2n +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-hyphen" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] dash-list +-. nr doc-list-indent-stack\n[doc-list-depth] 2n +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-inset" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] inset-list +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-diag" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] diag-list +-. \} +-. el \{ .ie "\$1"-ohang" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] ohang-list +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. el \{ .ie "\$1"-column" \{\ +-. ds doc-list-type-stack\n[doc-list-depth] column-list +-. linetabs 1 +-. \} +-. el \{\ +-. tm1 "mdoc warning: Unknown list type `\$1' (or missing list type) +-. tm1 " in .Bl macro +-. tm +-. nr doc-arg-ptr 0 +-. \}\}\}\}\}\}\}\}\}\}\} +-. +-. \" we have seen a list type +-. if !\n[doc-arg-ptr] \{\ +-. doc-Bl-usage +-. doc-reset-args +-. nr doc-list-depth -1 +-. return +-. \} +-. +-. shift +-. +-. \" fill argument vector +-. nr doc-reg-Bl 1 +-. while (\n[doc-reg-Bl] <= \n[.$]) \{\ +-. ds doc-arg\n[doc-reg-Bl] "\$[\n[doc-reg-Bl]] +-. \" dummy type and space so that doc-save-global-vars() doesn't warn +-. nr doc-type\n[doc-reg-Bl] 0 +-. ds doc-space\n[doc-reg-Bl] +-. nr doc-reg-Bl +1 +-. \} +-. +-. doc-increment-list-stack +-. +-. if \n[.$] \{\ +-. nr doc-arg-limit \n[.$] +-. nr doc-arg-ptr 0 +-. doc-do-Bl-args +-. +-. in +\n[doc-list-offset-stack\n[doc-list-depth]]u +-. +-. \" initialize column list +-. if "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\ +-. doc-set-column-tab \n[doc-num-columns] +-' in -\n[doc-column-indent-width]u +-. if !\n[doc-compact-list-stack\n[doc-list-depth]] \ +-. sp \n[doc-display-vertical]u +-. +-. nf +-. nr doc-num-columns 0 +-. \}\} +-. +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-Bl-usage macro +-. +-.de doc-Bl-usage +-. tm1 "Usage: .Bl {-hang | -ohang | -tag | -diag | -inset} +-. tm1 " [-width ] +-. tm1 " [-offset ] [-compact] +-. tm1 " .Bl -column [-offset ] ... +-. tm1 " .Bl {-item | -enum [-nested] | -bullet | -hyphen | -dash} +-. tm1 " [-offset ] [-compact] (#\n[.c]) +-.. +-. +-. +-.\" NS doc-do-Bl-args macro +-.\" NS resolve remaining .Bl arguments +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-compact-list-stackXXX +-.\" NS doc-list-indent-stackXXX +-.\" NS doc-list-offset-stackXXX +-.\" NS doc-num-columns +-.\" NS doc-tag-prefix-stackXXX +-.\" NS doc-tag-width-stackXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-box-dBla +-.\" NS doc-env-dBla +-.\" NS doc-reg-dBla +-.\" NS doc-reg-dBla1 +-.\" NS doc-reg-dBla2 +-.\" NS doc-reg-dBla3 +-.\" NS doc-reg-dBla4 +-.\" NS doc-str-dBla +-.\" NS doc-str-dBla1 +-. +-.de doc-do-Bl-args +-. nr doc-arg-ptr +1 +-. +-. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \ +-. return +-. +-. \" avoid a warning message in case e.g. `-offset' has no parameter +-. nr doc-reg-dBla (\n[doc-arg-ptr] + 1) +-. if !d doc-arg\n[doc-reg-dBla] \ +-. ds doc-arg\n[doc-reg-dBla] +-. +-. nr doc-reg-dBla 1 +-. +-. ie "\*[doc-arg\n[doc-arg-ptr]]"-compact" \ +-. nr doc-compact-list-stack\n[doc-list-depth] 1 +-. +-. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-nested" \{\ +-. ie (\n[doc-list-depth] > 1) \{\ +-. nr doc-reg-dBla1 (\n[doc-list-depth] - 1) +-. ds doc-tag-prefix-stack\n[doc-list-depth] "\*[doc-tag-prefix-stack\n[doc-reg-dBla1]] +-. as doc-tag-prefix-stack\n[doc-list-depth] \n[doc-enum-list-count-stack\n[doc-reg-dBla1]]. +-. length doc-reg-dBla1 "\*[doc-tag-prefix-stack\n[doc-list-depth]] +-. nr doc-list-indent-stack\n[doc-list-depth] +\n[doc-reg-dBla1]n +-. \} +-. el \ +-. tm mdoc warning: `-nested' allowed with nested .Bl macros only (#\n[.c]) +-. \} +-. +-. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-width" \{\ +-. nr doc-arg-ptr +1 +-. ds doc-tag-width-stack\n[doc-list-depth] TagwidtH +-. +-. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] +-. substring doc-str-dBla 0 0 +-. ie .\*[doc-str-dBla] \{\ +-. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] +-. substring doc-str-dBla 1 +-. doc-first-parameter \*[doc-str-dBla] +-. doc-get-width "\*[doc-str-dfp] +-. doc-get-arg-type "\*[doc-str-dfp] +-. ie (\n[doc-arg-type] == 1) \ +-. nr doc-reg-dBla1 1 +-. el \ +-. nr doc-reg-dBla1 0 +-. \} +-. el \ +-. nr doc-reg-dBla1 0 +-. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] +-. +-. ie \n[doc-reg-dBla1] \{\ +-. \" execute string in a box to get the width of the diversion +-. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]] +-. doc-save-global-vars +-. doc-reset-args +-. box doc-box-dBla +-. ev doc-env-dBla +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-str-dBla] +-. br +-. ev +-. box +-. doc-restore-global-vars +-. doc-get-width \h'\n[dl]u' +-. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \} +-. el \{\ +-. \" test whether argument is a valid numeric expression +-. nr doc-reg-dBla1 0 +-. if \B(\*[doc-str-dBla]) \{\ +-. \" disable warnings related to scaling indicators (32) +-. nr doc-reg-dBla2 \n[.warn] +-. warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32)) +-. +-. \" values without a scaling indicator are taken as strings; +-. \" we test whether the parameter string with and without the last +-. \" character yields identical numerical results (ignoring the +-. \" scaling indicator) +-. ds doc-str-dBla1 "\*[doc-str-dBla] +-. substring doc-str-dBla1 0 -2 +-. if \B(\*[doc-str-dBla1]) \{\ +-. nr doc-reg-dBla3 (;(\*[doc-str-dBla])) +-. nr doc-reg-dBla4 (\*[doc-str-dBla1]) +-. if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \ +-. nr doc-reg-dBla1 1 +-. \} +-. +-. \" enable all warnings again +-. warn \n[doc-reg-dBla2] +-. \} +-. +-. ie \n[doc-reg-dBla1] \ +-. nr doc-list-indent-stack\n[doc-list-depth] (\*[doc-str-dBla]) +-. el \{\ +-. doc-get-arg-width \n[doc-arg-ptr] +-. ie (\n[doc-width] == 2) \{\ +-. \" if the width parameter is a macro, use the macro's +-. \" width as specified in doc-common +-. doc-get-arg-type \*[doc-str-dBla] +-. ie (\n[doc-arg-type] == 1) \ +-. nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-str-dBla]] +-. el \ +-. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \} +-. el \ +-. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \}\}\} +-. +-. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-offset" \{\ +-. nr doc-arg-ptr +1 +-. +-. ie "\*[doc-arg\n[doc-arg-ptr]]"indent" \ +-. nr doc-list-offset-stack\n[doc-list-depth] \n[doc-display-indent]u +-. el \{\ +-. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] +-. nr doc-reg-dBla1 0 +-. if \B(\*[doc-str-dBla]) \{\ +-. nr doc-reg-dBla2 \n[.warn] +-. warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32)) +-. +-. ds doc-str-dBla1 "\*[doc-str-dBla] +-. substring doc-str-dBla1 0 -2 +-. if \B(\*[doc-str-dBla1]) \{\ +-. nr doc-reg-dBla3 (;(\*[doc-str-dBla])) +-. nr doc-reg-dBla4 (\*[doc-str-dBla1]) +-. if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \ +-. nr doc-reg-dBla1 1 +-. \} +-. +-. warn \n[doc-reg-dBla2] +-. \} +-. +-. ie \n[doc-reg-dBla1] \ +-. nr doc-list-offset-stack\n[doc-list-depth] \*[doc-str-dBla] +-. el \{\ +-. doc-get-arg-width \n[doc-arg-ptr] +-. ie (\n[doc-width] <= 3) \{\ +-. \" if the offset parameter is a macro, use the macro's +-. \" width as specified in doc-common +-. doc-get-arg-type \*[doc-str-dBla] +-. ie (\n[doc-arg-type] == 1) \ +-. nr doc-list-offset-stack\n[doc-list-depth] \n[\*[doc-str-dBla]] +-. el \ +-. nr doc-list-offset-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \} +-. el \ +-. nr doc-list-offset-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) +-. \}\}\} +-. el \ +-. nr doc-reg-dBla 0 +-. \}\}\} +-. +-. \" not a known keyword, so it specifies the width of the next column +-. \" (if it is a column list) +-. if !\n[doc-reg-dBla] \{\ +-. ie "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\ +-. nr doc-num-columns +1 +-. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]] +-. substring doc-str-dBla 0 0 +-. ie .\*[doc-str-dBla] \{\ +-. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] +-. substring doc-str-dBla 1 +-. doc-first-parameter \*[doc-str-dBla] +-. doc-get-width "\*[doc-str-dfp] +-. doc-get-arg-type "\*[doc-str-dfp] +-. ie (\n[doc-arg-type] == 1) \ +-. nr doc-reg-dBla1 1 +-. el \ +-. nr doc-reg-dBla1 0 +-. \} +-. el \ +-. nr doc-reg-dBla1 0 +-. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] +-. +-. ie \n[doc-reg-dBla1] \{\ +-. \" execute string in a box to get the width of the diversion +-. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]] +-. doc-save-global-vars +-. doc-reset-args +-. box doc-box-dBla +-. ev doc-env-dBla +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-str-dBla] +-. br +-. ev +-. box +-. doc-restore-global-vars +-. ds doc-arg\n[doc-num-columns] "\h'\n[dl]u' +-. \} +-. el \ +-. ds doc-arg\n[doc-num-columns] "\*[doc-arg\n[doc-arg-ptr]] +-. \} +-. el \{\ +-. tmc mdoc warning: Unknown keyword `\*[doc-arg\n[doc-arg-ptr]]' +-. tm1 " in .Bl macro (#\n[.c]) +-. \}\} +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \ +-. doc-do-Bl-args +-.. +-. +-. +-.\" NS doc-save-global-vars macro +-.\" NS save all global variables +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dsgv +-. +-.de doc-save-global-vars +-. ds doc-macro-name-saved "\*[doc-macro-name] +-. nr doc-arg-limit-saved \n[doc-arg-limit] +-. nr doc-num-args-saved \n[doc-num-args] +-. nr doc-arg-ptr-saved \n[doc-arg-ptr] +-. +-. nr doc-reg-dsgv 1 +-. while (\n[doc-reg-dsgv] <= \n[doc-arg-limit]) \{\ +-. ds doc-arg\n[doc-reg-dsgv]-saved "\*[doc-arg\n[doc-reg-dsgv]] +-. nr doc-type\n[doc-reg-dsgv]-saved \n[doc-type\n[doc-reg-dsgv]] +-. ds doc-space\n[doc-reg-dsgv]-saved "\*[doc-space\n[doc-reg-dsgv]] +-. nr doc-reg-dsgv +1 +-. \} +-. +-. nr doc-curr-font-saved \n[doc-curr-font] +-. nr doc-curr-size-saved \n[doc-curr-size] +-. nr doc-in-synopsis-section-saved \n[doc-in-synopsis-section] +-. nr doc-in-library-section-saved \n[doc-in-library-section] +-. nr doc-indent-synopsis-saved \n[doc-indent-synopsis] +-. nr doc-indent-synopsis-active-saved \n[doc-indent-synopsis-active] +-. nr doc-have-decl-saved \n[doc-have-decl] +-. nr doc-have-var-saved \n[doc-have-var] +-. ds doc-command-name-saved "\*[doc-command-name] +-. ds doc-quote-left-saved "\*[doc-quote-left] +-. ds doc-quote-right-saved "\*[doc-quote-right] +-. nr doc-nesting-level-saved \n[doc-nesting-level] +-. nr doc-in-list-saved \n[doc-in-list] +-. ds doc-space-saved "\*[doc-space] +-. ds doc-saved-space-saved "\*[doc-saved-space] +-. nr doc-space-mode-saved \n[doc-space-mode] +-. nr doc-have-space-saved \n[doc-have-space] +-. nr doc-have-slot-saved \n[doc-have-slot] +-. nr doc-keep-type-saved \n[doc-keep-type] +-. nr doc-display-depth-saved \n[doc-display-depth] +-. nr doc-is-compact-saved \n[doc-is-compact] +-. +-. nr doc-reg-dsgv 0 +-. while (\n[doc-reg-dsgv] <= \n[doc-display-depth]) \{\ +-. ds doc-display-type-stack\n[doc-reg-dsgv]-saved "\*[doc-display-type-stack\n[doc-reg-dsgv]] +-. nr doc-display-indent-stack\n[doc-reg-dsgv]-saved \n[doc-display-indent-stack\n[doc-reg-dsgv]] +-. nr doc-display-ad-stack\n[doc-reg-dsgv]-saved \n[doc-display-ad-stack\n[doc-reg-dsgv]] +-. nr doc-display-fi-stack\n[doc-reg-dsgv]-saved \n[doc-display-fi-stack\n[doc-reg-dsgv]] +-. nr doc-display-ft-stack\n[doc-reg-dsgv]-saved \n[doc-display-ft-stack\n[doc-reg-dsgv]] +-. nr doc-display-ps-stack\n[doc-reg-dsgv]-saved \n[doc-display-ps-stack\n[doc-reg-dsgv]] +-. nr doc-reg-dsgv +1 +-. \} +-. +-. nr doc-fontmode-depth-saved \n[doc-fontmode-depth] +-. +-. nr doc-reg-dsgv 1 +-. while (\n[doc-reg-dsgv] <= \n[doc-fontmode-depth]) \{\ +-. nr doc-fontmode-font-stack\n[doc-reg-dsgv]-saved \n[doc-fontmode-font-stack\n[doc-reg-dsgv]] +-. nr doc-fontmode-size-stack\n[doc-reg-dsgv]-saved \n[doc-fontmode-size-stack\n[doc-reg-dsgv]] +-. nr doc-reg-dsgv +1 +-. \} +-. +-. nr doc-list-depth-saved \n[doc-list-depth] +-. +-. nr doc-reg-dsgv 1 +-. while (\n[doc-reg-dsgv] <= \n[doc-list-depth]) \{\ +-. ds doc-list-type-stack\n[doc-reg-dsgv]-saved "\*[doc-list-type-stack\n[doc-reg-dsgv]] +-. nr doc-list-have-indent-stack\n[doc-reg-dsgv]-saved \n[doc-list-have-indent-stack\n[doc-reg-dsgv]] +-. nr doc-list-indent-stack\n[doc-reg-dsgv]-saved \n[doc-list-indent-stack\n[doc-reg-dsgv]] +-. nr doc-compact-list-stack\n[doc-reg-dsgv]-saved \n[doc-compact-list-stack\n[doc-reg-dsgv]] +-. ds doc-tag-prefix-stack\n[doc-reg-dsgv]-saved "\*[doc-tag-prefix-stack\n[doc-reg-dsgv]] +-. ds doc-tag-width-stack\n[doc-reg-dsgv]-saved "\*[doc-tag-width-stack\n[doc-reg-dsgv]] +-. nr doc-list-offset-stack\n[doc-reg-dsgv]-saved \n[doc-list-offset-stack\n[doc-reg-dsgv]] +-. nr doc-enum-list-count-stack\n[doc-reg-dsgv]-saved \n[doc-enum-list-count-stack\n[doc-reg-dsgv]] +-. nr doc-reg-dsgv +1 +-. \} +-. +-. ds doc-saved-Pa-font-saved "\*[doc-saved-Pa-font] +-. nr doc-curr-type-saved \n[doc-curr-type] +-. ds doc-curr-arg-saved "\*[doc-curr-arg] +-. nr doc-diag-list-input-line-count-saved \n[doc-diag-list-input-line-count] +-. nr doc-num-columns-saved \n[doc-num-columns] +-. nr doc-column-indent-width-saved \n[doc-column-indent-width] +-. nr doc-is-func-saved \n[doc-is-func] +-. nr doc-have-old-func-saved \n[doc-have-old-func] +-. nr doc-func-arg-count-saved \n[doc-func-arg-count] +-. ds doc-func-arg-saved "\*[doc-func-arg] +-. nr doc-num-func-args-saved \n[doc-num-func-args] +-. nr doc-func-args-processed-saved \n[doc-func-args-processed] +-. nr doc-have-func-saved \n[doc-have-func] +-. nr doc-is-reference-saved \n[doc-is-reference] +-. nr doc-reference-count-saved \n[doc-reference-count] +-. nr doc-author-count-saved \n[doc-author-count] +-. +-. nr doc-reg-dsgv 0 +-. while (\n[doc-reg-dsgv] <= \n[doc-author-count]) \{\ +-. ds doc-author-name\n[doc-reg-dsgv]-saved "\*[doc-author-name\n[doc-reg-dsgv]] +-. nr doc-reg-dsgv +1 +-. \} +-. +-. nr doc-book-count-saved \n[doc-book-count] +-. ds doc-book-name-saved "\*[doc-book-name] +-. nr doc-city-count-saved \n[doc-city-count] +-. ds doc-city-name-saved "\*[doc-city-name] +-. nr doc-date-count-saved \n[doc-date-count] +-. ds doc-date-saved "\*[doc-date] +-. nr doc-publisher-count-saved \n[doc-publisher-count] +-. ds doc-publisher-name-saved "\*[doc-publisher-name] +-. nr doc-journal-count-saved \n[doc-journal-count] +-. ds doc-journal-name-saved "\*[doc-journal-name] +-. nr doc-issue-count-saved \n[doc-issue-count] +-. ds doc-issue-name-saved "\*[doc-issue-name] +-. nr doc-optional-count-saved \n[doc-optional-count] +-. ds doc-optional-string-saved "\*[doc-optional-string] +-. nr doc-page-number-count-saved \n[doc-page-number-count] +-. ds doc-page-number-string-saved "\*[doc-page-number-string] +-. nr doc-corporate-count-saved \n[doc-corporate-count] +-. ds doc-corporate-name-saved "\*[doc-corporate-name] +-. nr doc-report-count-saved \n[doc-report-count] +-. ds doc-report-name-saved "\*[doc-report-name] +-. nr doc-reference-title-count-saved \n[doc-reference-title-count] +-. ds doc-reference-title-name-saved "\*[doc-reference-title-name] +-. ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book] +-. nr doc-url-count-saved \n[doc-url-count] +-. ds doc-url-name-saved "\*[doc-url-name] +-. nr doc-volume-count-saved \n[doc-volume-count] +-. ds doc-volume-name-saved "\*[doc-volume-name] +-. nr doc-have-author-saved \n[doc-have-author] +-. +-. ds doc-document-title-saved "\*[doc-document-title] +-. ds doc-volume-saved "\*[doc-volume] +-. ds doc-section-saved "\*[doc-section] +-. ds doc-operating-system-saved "\*[doc-operating-system] +-. ds doc-date-string-saved "\*[doc-date-string] +-. nr doc-header-space-saved \n[doc-header-space] +-. nr doc-footer-space-saved \n[doc-footer-space] +-. nr doc-display-vertical-saved \n[doc-display-vertical] +-. ds doc-header-string-saved "\*[doc-header-string] +-. nr doc-in-see-also-section-saved \n[doc-in-see-also-section] +-. nr doc-in-files-section-saved \n[doc-in-files-section] +-. nr doc-in-authors-section-saved \n[doc-in-authors-section] +-.. +-. +-. +-.\" NS doc-restore-global-vars macro +-.\" NS restore all global variables +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-drgv +-. +-.de doc-restore-global-vars +-. ds doc-macro-name "\*[doc-macro-name-saved] +-. nr doc-arg-limit \n[doc-arg-limit-saved] +-. nr doc-num-args \n[doc-num-args-saved] +-. nr doc-arg-ptr \n[doc-arg-ptr-saved] +-. +-. nr doc-reg-drgv 1 +-. while (\n[doc-reg-drgv] <= \n[doc-arg-limit]) \{\ +-. ds doc-arg\n[doc-reg-drgv] "\*[doc-arg\n[doc-reg-drgv]-saved] +-. nr doc-type\n[doc-reg-drgv] \n[doc-type\n[doc-reg-drgv]-saved] +-. ds doc-space\n[doc-reg-drgv] "\*[doc-space\n[doc-reg-drgv]-saved] +-. nr doc-reg-drgv +1 +-. \} +-. +-. nr doc-curr-font \n[doc-curr-font-saved] +-. nr doc-curr-size \n[doc-curr-size-saved] +-. nr doc-in-synopsis-section \n[doc-in-synopsis-section-saved] +-. nr doc-in-library-section \n[doc-in-library-section-saved] +-. nr doc-indent-synopsis \n[doc-indent-synopsis-saved] +-. nr doc-indent-synopsis-active \n[doc-indent-synopsis-active-saved] +-. nr doc-have-decl \n[doc-have-decl-saved] +-. nr doc-have-var \n[doc-have-var-saved] +-. ds doc-command-name "\*[doc-command-name-saved] +-. ds doc-quote-left "\*[doc-quote-left-saved] +-. ds doc-quote-right "\*[doc-quote-right-saved] +-. nr doc-nesting-level \n[doc-nesting-level-saved] +-. nr doc-in-list \n[doc-in-list-saved] +-. ds doc-space "\*[doc-space-saved] +-. ds doc-saved-space "\*[doc-saved-space-saved] +-. nr doc-space-mode \n[doc-space-mode-saved] +-. nr doc-have-space \n[doc-have-space-saved] +-. nr doc-have-slot \n[doc-have-slot-saved] +-. nr doc-keep-type \n[doc-keep-type-saved] +-. nr doc-display-depth \n[doc-display-depth-saved] +-. nr doc-is-compact \n[doc-is-compact-saved] +-. +-. nr doc-reg-drgv 0 +-. while (\n[doc-reg-drgv] <= \n[doc-display-depth]) \{\ +-. ds doc-display-type-stack\n[doc-reg-drgv] "\*[doc-display-type-stack\n[doc-reg-drgv]-saved] +-. nr doc-display-indent-stack\n[doc-reg-drgv] \n[doc-display-indent-stack\n[doc-reg-drgv]-saved] +-. nr doc-display-ad-stack\n[doc-reg-drgv] \n[doc-display-ad-stack\n[doc-reg-drgv]-saved] +-. nr doc-display-fi-stack\n[doc-reg-drgv] \n[doc-display-fi-stack\n[doc-reg-drgv]-saved] +-. nr doc-display-ft-stack\n[doc-reg-drgv] \n[doc-display-ft-stack\n[doc-reg-drgv]-saved] +-. nr doc-display-ps-stack\n[doc-reg-drgv] \n[doc-display-ps-stack\n[doc-reg-drgv]-saved] +-. nr doc-reg-drgv +1 +-. \} +-. +-. nr doc-fontmode-depth \n[doc-fontmode-depth-saved] +-. +-. nr doc-reg-drgv 1 +-. while (\n[doc-reg-drgv] <= \n[doc-fontmode-depth]) \{\ +-. nr doc-fontmode-font-stack\n[doc-reg-drgv] \n[doc-fontmode-font-stack\n[doc-reg-drgv]]-saved +-. nr doc-fontmode-size-stack\n[doc-reg-drgv] \n[doc-fontmode-size-stack\n[doc-reg-drgv]]-saved +-. nr doc-reg-drgv +1 +-. \} +-. +-. nr doc-list-depth \n[doc-list-depth-saved] +-. +-. nr doc-reg-drgv 1 +-. while (\n[doc-reg-drgv] <= \n[doc-list-depth]) \{\ +-. ds doc-list-type-stack\n[doc-reg-drgv] "\*[doc-list-type-stack\n[doc-reg-drgv]-saved] +-. nr doc-list-have-indent-stack\n[doc-reg-drgv] \n[doc-list-have-indent-stack\n[doc-reg-drgv]-saved] +-. nr doc-list-indent-stack\n[doc-reg-drgv] \n[doc-list-indent-stack\n[doc-reg-drgv]-saved] +-. nr doc-compact-list-stack\n[doc-reg-drgv] \n[doc-compact-list-stack\n[doc-reg-drgv]-saved] +-. ds doc-tag-prefix-stack\n[doc-reg-drgv] "\*[doc-tag-prefix-stack\n[doc-reg-drgv]-saved] +-. ds doc-tag-width-stack\n[doc-reg-drgv] "\*[doc-tag-width-stack\n[doc-reg-drgv]-saved] +-. nr doc-list-offset-stack\n[doc-reg-drgv] \n[doc-list-offset-stack\n[doc-reg-drgv]-saved] +-. nr doc-enum-list-count-stack\n[doc-reg-drgv] \n[doc-enum-list-count-stack\n[doc-reg-drgv]-saved] +-. nr doc-reg-drgv +1 +-. \} +-. +-. ds doc-saved-Pa-font "\*[doc-saved-Pa-font-saved] +-. nr doc-curr-type \n[doc-curr-type-saved] +-. ds doc-curr-arg "\*[doc-curr-arg-saved] +-. nr doc-diag-list-input-line-count \n[doc-diag-list-input-line-count-saved] +-. nr doc-num-columns \n[doc-num-columns-saved] +-. nr doc-column-indent-width \n[doc-column-indent-width-saved] +-. nr doc-is-func \n[doc-is-func-saved] +-. nr doc-have-old-func \n[doc-have-old-func-saved] +-. nr doc-func-arg-count \n[doc-func-arg-count-saved] +-. ds doc-func-arg "\*[doc-func-arg-saved] +-. nr doc-num-func-args \n[doc-num-func-args-saved] +-. nr doc-func-args-processed \n[doc-func-args-processed-saved] +-. nr doc-have-func \n[doc-have-func-saved] +-. nr doc-is-reference \n[doc-is-reference-saved] +-. nr doc-reference-count \n[doc-reference-count-saved] +-. nr doc-author-count \n[doc-author-count-saved] +-. +-. nr doc-reg-drgv 0 +-. while (\n[doc-reg-drgv] <= \n[doc-author-count]) \{\ +-. ds doc-author-name\n[doc-reg-drgv] "\*[doc-author-name\n[doc-reg-drgv]-saved] +-. nr doc-reg-drgv +1 +-. \} +-. +-. nr doc-book-count \n[doc-book-count-saved] +-. ds doc-book-name "\*[doc-book-name-saved] +-. nr doc-city-count \n[doc-city-count-saved] +-. ds doc-city-name "\*[doc-city-name-saved] +-. nr doc-date-count \n[doc-date-count-saved] +-. ds doc-date "\*[doc-date-saved] +-. nr doc-publisher-count \n[doc-publisher-count-saved] +-. ds doc-publisher-name "\*[doc-publisher-name-saved] +-. nr doc-journal-count \n[doc-journal-count-saved] +-. ds doc-journal-name "\*[doc-journal-name-saved] +-. nr doc-issue-count \n[doc-issue-count-saved] +-. ds doc-issue-name "\*[doc-issue-name-saved] +-. nr doc-optional-count \n[doc-optional-count-saved] +-. ds doc-optional-string "\*[doc-optional-string-saved] +-. nr doc-page-number-count \n[doc-page-number-count-saved] +-. ds doc-page-number-string "\*[doc-page-number-string-saved] +-. nr doc-corporate-count \n[doc-corporate-count-saved] +-. ds doc-corporate-name "\*[doc-corporate-name-saved] +-. nr doc-report-count \n[doc-report-count-saved] +-. ds doc-report-name "\*[doc-report-name-saved] +-. nr doc-reference-title-count \n[doc-reference-title-count-saved] +-. ds doc-reference-title-name "\*[doc-reference-title-name-saved] +-. ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved] +-. nr doc-url-count \n[doc-url-count-saved] +-. ds doc-url-name "\*[doc-url-name-saved] +-. nr doc-volume-count \n[doc-volume-count-saved] +-. ds doc-volume-name "\*[doc-volume-name-saved] +-. nr doc-have-author \n[doc-have-author-saved] +-. +-. ds doc-document-title "\*[doc-document-title-saved] +-. ds doc-volume "\*[doc-volume-saved] +-. ds doc-section "\*[doc-section-saved] +-. ds doc-operating-system "\*[doc-operating-system-saved] +-. ds doc-date-string "\*[doc-date-string-saved] +-. nr doc-header-space \n[doc-header-space-saved] +-. nr doc-footer-space \n[doc-footer-space-saved] +-. nr doc-display-vertical \n[doc-display-vertical-saved] +-. ds doc-header-string "\*[doc-header-string-saved] +-. nr doc-in-see-also-section \n[doc-in-see-also-section-saved] +-. nr doc-in-files-section \n[doc-in-files-section-saved] +-. nr doc-in-authors-section \n[doc-in-authors-section-saved] +-.. +-. +-. +-.\" NS El user macro +-.\" NS end list +-.\" NS +-.\" NS modifies: +-.\" NS doc-list-depth +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-str-El +-.\" NS +-.\" NS width register `El' set in doc-common +-. +-.de El +-. if \n[.$] \{\ +-. tm Usage: .El (does not take arguments) (#\n[.c]) +-. return +-. \} +-. +-. ds doc-macro-name El +-. ds doc-str-El \*[doc-list-type-stack\n[doc-list-depth]] +-. +-. ie "\*[doc-str-El]"diag-list" \ +-. doc-end-list 0 +-. el \{ .ie "\*[doc-str-El]"column-list" \ +-. doc-end-column-list +-. el \{ .ie "\*[doc-str-El]"item-list" \ +-. doc-end-list 0 +-. el \{ .ie "\*[doc-str-El]"ohang-list" \ +-. doc-end-list 0 +-. el \{ .ie "\*[doc-str-El]"inset-list" \ +-. doc-end-list 0 +-. el \ +-. doc-end-list 1 +-. \}\}\}\} +-. +-. br +-.. +-. +-. +-.\" NS doc-saved-Pa-font global string +-.\" NS saved doc-Pa-font string for section FILES (no underline if +-.\" NS nroff) +-. +-.ds doc-saved-Pa-font +-. +-. +-.\" NS doc-curr-type global register +-.\" NS current argument type +-. +-.nr doc-curr-type 0 +-. +-. +-.\" NS doc-curr-arg global string +-.\" NS current argument +-. +-.ds doc-curr-arg +-. +-. +-.\" NS doc-item-boxXXX global box +-.\" NS item boxes associated list depth +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-. +-.\" NS It user macro +-.\" NS list item +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-curr-arg +-.\" NS doc-curr-type +-.\" NS doc-in-list +-.\" NS doc-macro-name +-.\" NS doc-num-args +-.\" NS doc-saved-Pa-font +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-It +-.\" NS doc-str-It +-.\" NS doc-XXX-list-type +-.\" NS +-.\" NS width register `It' set in doc-common +-. +-.nr doc-bullet-list-type 1 +-.nr doc-column-list-type 0 +-.nr doc-dash-list-type 1 +-.nr doc-diag-list-type 0 +-.nr doc-enum-list-type 1 +-.nr doc-hang-list-type 2 +-.nr doc-inset-list-type 2 +-.nr doc-item-list-type 1 +-.nr doc-ohang-list-type 2 +-.nr doc-tag-list-type 2 +-. +-.de It +-. ds doc-str-It \*[doc-list-type-stack\n[doc-list-depth]] +-. +-. if "\*[doc-str-It]"" \ +-. tm mdoc error: .It without preceding .Bl (#\n[.c]) +-. +-. if \n[doc-nesting-level] \{\ +-. tmc "mdoc error: .It found in enclosing (e.g. .Ac ... .It ... .Ao) +-. tm1 " (#\n[.c]) +-. \} +-. +-. br +-. if !\n[cR] \ +-. ne 3v +-. +-. if \n[.$] \{\ +-. ds doc-macro-name It +-. +-. \" fill argument vector +-. nr doc-reg-It 1 +-. while (\n[doc-reg-It] <= \n[.$]) \{\ +-. ds doc-arg\n[doc-reg-It] "\$[\n[doc-reg-It]] +-. nr doc-reg-It +1 +-. \} +-. +-. nr doc-num-args \n[.$] +-. nr doc-arg-ptr 0 +-. \} +-. +-. nr doc-reg-It \n[doc-\*[doc-str-It]-type] +-. +-. if \n[doc-reg-It] \{\ +-. \" start item box +-. box doc-item-box\n[doc-list-depth] +-. ev doc-item-env\n[doc-list-depth] +-. evc 0 +-. in 0 +-. nf +-. \} +-. +-. ie (\n[doc-reg-It] == 1) \{\ +-. if \n[.$] \{\ +-. tm1 "mdoc warning: .It macros in lists of type `\*[doc-str-It]' +-. tm1 " don't take arguments (#\n[.c]) +-. \}\} +-. el \{\ +-. ie \n[.$] \{\ +-. if (\n[doc-reg-It] == 2) \{\ +-. \" handle list types with arguments +-. doc-parse-arg-vector +-. +-. nr doc-in-list 1 +-. nr doc-arg-ptr 1 +-. nr doc-curr-type \n[doc-type1] +-. ds doc-curr-arg "\*[doc-arg1] +-. +-. if \n[doc-in-files-section] \{\ +-. ds doc-saved-Pa-font "\*[doc-Pa-font] +-. if n \ +-. ds doc-Pa-font "\*[doc-No-font] +-. \} +-. +-. ie (\n[doc-type1] == 1) \ +-. \*[doc-arg1] +-. el \{\ +-. nr doc-arg-ptr 1 +-. doc-print-recursive +-. \}\}\} +-. el \{\ +-. tm1 "mdoc warning: .It macros in lists of type `\*[doc-str-It]' +-. tm1 " require arguments (#\n[.c]) +-. \} +-. \} +-. +-. \" the previous call of `.doc-print-recursive' can contain calls to +-. \" opening macros like `.Ao'; we then defer the call of `doc-xxx-list' +-. if !\n[doc-nesting-level] \ +-. doc-\*[doc-str-It] +-.. +-. +-. +-.\" NS doc-inset-list macro +-.\" NS .It item of list-type inset +-.\" NS +-.\" NS modifies: +-.\" NS doc-in-list +-. +-.de doc-inset-list +-. \" finish item box +-. br +-. ev +-. box +-. unformat doc-item-box\n[doc-list-depth] +-. +-. doc-set-vertical-and-indent 0 +-. br +-. +-. nh +-. doc-item-box\n[doc-list-depth] +-. +-. if \n[doc-in-files-section] \ +-. if n \ +-. ds doc-Pa-font "\*[doc-saved-Pa-font] +-. +-. nr doc-in-list 0 +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-hang-list macro +-.\" NS .It item of list-type hanging tag (as opposed to tagged) +-.\" NS +-.\" NS modifies: +-.\" NS doc-have-space +-.\" NS doc-in-list +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dhl +-.\" NS doc-reg-dhl1 +-. +-.de doc-hang-list +-. \" finish item box +-. br +-. ev +-. box +-. unformat doc-item-box\n[doc-list-depth] +-. +-. doc-set-vertical-and-indent 1 +-. nr doc-reg-dhl (\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) +-. ti -\n[doc-reg-dhl]u +-. +-. nh +-. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ +-. doc-item-box\n[doc-list-depth] +-. el \{\ +-. chop doc-item-box\n[doc-list-depth] +-. nr doc-reg-dhl1 \n[.k]u +-. nop \*[doc-item-box\n[doc-list-depth]]\c +-. nop \h'|(\n[doc-reg-dhl1]u - \n[.k]u + \n[doc-reg-dhl]u)'\c +-. nr doc-have-space 1 +-. \} +-. +-. if \n[doc-in-files-section] \ +-. if n \ +-. ds doc-Pa-font "\*[doc-saved-Pa-font] +-. +-. nr doc-in-list 0 +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-ohang-list macro +-.\" NS .It item of list-type overhanging tag +-.\" NS +-.\" NS modifies: +-.\" NS doc-in-list +-. +-.de doc-ohang-list +-. \" finish item box +-. br +-. ev +-. box +-. unformat doc-item-box\n[doc-list-depth] +-. +-. doc-set-vertical-and-indent 0 +-. nh +-. doc-item-box\n[doc-list-depth] +-. br +-. +-. if \n[doc-in-files-section] \ +-. if n \ +-. ds doc-Pa-font "\*[doc-saved-Pa-font] +-. +-. nr doc-in-list 0 +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-item-list macro +-.\" NS .It item of list-type [empty tag] +-. +-.de doc-item-list +-. \" finish (dummy) item box +-. br +-. ev +-. box +-. +-. doc-set-vertical-and-indent 0 +-. br +-. +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-enum-list-count-stackXXX global register +-.\" NS stack of current enum count values +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.nr doc-enum-list-count-stack1 0 +-. +-. +-.\" NS doc-enum-list macro +-.\" NS enumerated list +-.\" NS +-.\" NS modifies: +-.\" NS doc-enum-list-count-stackXXX +-.\" NS doc-in-list +-. +-.de doc-enum-list +-. nr doc-in-list 1 +-. nr doc-enum-list-count-stack\n[doc-list-depth] +1 +-\# XXX +-\#.ll \n[doc-list-indent-stack\n[doc-list-depth]]u +-\#.rj +-. nop \*[doc-tag-prefix-stack\n[doc-list-depth]]\c +-. nop \n[doc-enum-list-count-stack\n[doc-list-depth]].\& +-. doc-do-list +-.. +-. +-. +-.\" NS doc-bullet-list macro +-.\" NS bullet paragraph list +-.\" NS +-.\" NS modifies: +-.\" NS doc-in-list +-. +-.de doc-bullet-list +-. nr doc-in-list 1 +-. nop \)\*[doc-Sy-font]\[bu]\f[] +-. doc-do-list +-.. +-. +-. +-.\" NS doc-dash-list macro +-.\" NS hyphen paragraph list (sub bullet list) +-.\" NS +-.\" NS modifies: +-.\" NS doc-in-list +-. +-.de doc-dash-list +-. nr doc-in-list 1 +-. nop \)\*[doc-Sy-font]\-\f[] +-. doc-do-list +-.. +-. +-. +-.\" NS doc-do-list macro +-.\" NS .It item of list-type enum/bullet/hyphen +-. +-.als doc-do-list doc-hang-list +-. +-. +-.\" NS doc-diag-list-input-line-count global register +-.\" NS saved line number to be checked in next diag-list item +-. +-.nr doc-diag-list-input-line-count 0 +-. +-. +-.\" NS doc-diag-list macro +-.\" NS .It item of list-type diagnostic-message +-.\" NS +-.\" NS modifies: +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-diag-list-input-line-count +-. +-.de doc-diag-list +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. ie ((\n[.c] - \n[doc-diag-list-input-line-count]) > 1) \{\ +-. ie !\n[doc-compact-list-stack\n[doc-list-depth]] \ +-. doc-paragraph +-. el \ +-. br +-. \} +-. el \ +-. br +-. nr doc-diag-list-input-line-count \n[.c] +-. +-. nh +-. nop \*[doc-Sy-font]\c +-. if \n[doc-num-args] \ +-. doc-remaining-args +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\*[doc-hard-space]\c +-. +-. doc-print-and-reset +-.. +-. +-. +-.\" NS doc-tag-list macro +-.\" NS .It item of list-type `tag' +-.\" NS +-.\" NS modifies: +-.\" NS doc-have-space +-.\" NS doc-in-list +-.\" NS +-.\" NS local variables: +-.\" NS doc-box-dtl +-.\" NS doc-reg-dtl +-.\" NS doc-reg-dtl1 +-. +-.de doc-tag-list +-. \" finish item box +-. br +-. ev +-. box +-. unformat doc-item-box\n[doc-list-depth] +-. +-. \" we use a box without `.nf' to compute the tag width (via `dl' register) +-. box doc-box-dtl +-. ev doc-env-dtl +-. evc 0 +-. fi +-. ad 0 +-. in 0 +-. doc-item-box\n[doc-list-depth] +-. br +-. ev +-. box +-. +-. if !"TagwidtH"\*[doc-tag-width-stack\n[doc-list-depth]]" \{\ +-. if !\n[doc-list-have-indent-stack\n[doc-list-depth]] \{\ +-. in -(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) +-. nr doc-list-have-indent-stack\n[doc-list-depth] 1 +-. \} +-. doc-get-tag-width +-. \} +-. doc-set-vertical-and-indent 1 +-. nr doc-reg-dtl (\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) +-. ti -\n[doc-reg-dtl]u +-. +-. nh +-. doc-item-box\n[doc-list-depth] +-. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ +-. br +-. el \{\ +-. \" format the tag separately to prevent stretching of spaces +-. vpt 0 +-. br +-. sp -1 +-. vpt 1 +-. nop \&\c +-. nr doc-have-space 1 +-. \} +-. +-. if \n[doc-in-files-section] \ +-. if n \ +-. ds doc-Pa-font "\*[doc-saved-Pa-font] +-. +-. nr doc-in-list 0 +-. doc-reset-args +-.. +-. +-. +-.\" NS doc-get-tag-width macro +-.\" NS resolve unknown tag width (`tag' list-type only) +-.\" NS +-.\" NS modifies: +-.\" NS doc-list-indent-stackXXX +-.\" NS doc-tag-width-stackXXX +-.\" NS +-.\" NS requires: +-.\" NS doc-curr-arg +-.\" NS doc-curr-type +-. +-.de doc-get-tag-width +-. ie (\n[doc-curr-type] == 1) \{\ +-. ds doc-tag-width-stack\n[doc-list-depth] \*[doc-curr-arg] +-. nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-curr-arg]] +-. \} +-. el \{\ +-. ds doc-tag-width-stack\n[doc-list-depth] No +-. nr doc-list-indent-stack\n[doc-list-depth] \n[No] +-. \} +-.. +-. +-. +-.\" NS doc-set-vertical-and-indent macro +-.\" NS set up vertical spacing (if not compact) and indentation (with +-.\" NS offset if argument is non-zero) +-.\" NS +-.\" NS modifies: +-.\" NS doc-list-have-indent-stackXXX +-. +-.de doc-set-vertical-and-indent +-. if !\n[doc-compact-list-stack\n[doc-list-depth]] \ +-. sp \n[doc-display-vertical]u +-. +-. if \n[doc-list-have-indent-stack\n[doc-list-depth]] \{\ +-. nr doc-list-have-indent-stack\n[doc-list-depth] 0 +-. if \$1 \ +-. in +(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) +-. \} +-. +-. if !\n[cR] \ +-. ne 2v +-.. +-. +-. +-.\" NS doc-list-depth global register +-.\" NS list type stack counter +-. +-.nr doc-list-depth 0 +-. +-. +-.\" NS doc-num-columns global register +-.\" NS number of columns +-. +-.nr doc-num-columns 0 +-. +-. +-.\" NS doc-compact-list-stackXXX global register (bool) +-.\" NS stack of flags to indicate whether a particular list is compact +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.nr doc-compact-list-stack1 0 +-. +-. +-.\" NS doc-tag-prefix-stackXXX global string +-.\" NS stack of tag prefixes (currently used for -nested -enum lists) +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.ds doc-tag-prefix-stack1 +-. +-. +-.\" NS doc-tag-width-stackXXX global string +-.\" NS stack of strings indicating how to set up current element of +-.\" NS doc-list-indent-stackXXX -- if set to TagwidtH, user has set it +-.\" NS directly; if it is a macro name, use the macro's width value; +-.\" NS otherwise, `doc-get-tag-width' uses width value of `No'. +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.ds doc-tag-width-stack0 +-.ds doc-tag-width-stack1 +-. +-. +-.\" NS doc-list-offset-stackXXX global register +-.\" NS stack of list offsets +-.\" NS +-.\" NS limit: +-.\" NS doc-list-depth +-. +-.nr doc-list-offset-stack1 0 +-. +-. +-.\" NS doc-end-list macro +-.\" NS list end function; resets indentation (and offset if argument is +-.\" NS non-zero) +-.\" NS +-.\" NS modifies: +-.\" NS doc-list-depth +-.\" NS doc-list-offset-stackXXX +-. +-.de doc-end-list +-. if \$1 \ +-' in -(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) +-. +-' in -\n[doc-list-offset-stack\n[doc-list-depth]]u +-. +-. if (\n[doc-list-depth] <= 0) \ +-. tm mdoc warning: extraneous .El call (#\n[.c]) +-. +-. doc-decrement-list-stack +-. nr doc-list-depth -1 +-.. +-. +-. +-.\" NS doc-increment-list-stack macro +-.\" NS set up next block for list +-.\" NS +-.\" NS modifies: +-.\" NS doc-compact-list-stackXXX +-.\" NS doc-list-have-indent-stackXXX +-.\" NS doc-list-indent-stackXXX +-.\" NS doc-list-offset-stackXXX +-.\" NS doc-list-type-stackXXX +-.\" NS doc-tag-prefix-stackXXX +-.\" NS doc-tag-width-stackXXX +-.\" NS doc-enum-list-count-stackXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dils +-. +-.de doc-increment-list-stack +-. nr doc-reg-dils (\n[doc-list-depth] + 1) +-. nr doc-list-have-indent-stack\n[doc-reg-dils] 0 +-. nr doc-list-indent-stack\n[doc-reg-dils] 0 +-. nr doc-list-offset-stack\n[doc-reg-dils] 0 +-. ds doc-tag-prefix-stack\n[doc-reg-dils] +-. ds doc-tag-width-stack\n[doc-reg-dils] \*[doc-tag-width-stack\n[doc-list-depth]] +-. ds doc-list-type-stack\n[doc-reg-dils] +-. nr doc-compact-list-stack\n[doc-reg-dils] 0 +-. nr doc-enum-list-count-stack\n[doc-reg-dils] 0 +-.. +-. +-. +-.\" NS doc-decrement-list-stack macro +-.\" NS decrement stack +-.\" NS +-.\" NS modifies: +-.\" NS doc-compact-list-stackXXX +-.\" NS doc-list-have-indent-stackXXX +-.\" NS doc-list-indent-stackXXX +-.\" NS doc-list-offset-stackXXX +-.\" NS doc-list-type-stackXXX +-.\" NS doc-tag-prefix-stackXXX +-.\" NS doc-tag-width-stackXXX +-.\" NS doc-enum-list-count-stackXXX +-. +-.de doc-decrement-list-stack +-. ds doc-list-type-stack\n[doc-list-depth] +-. nr doc-list-have-indent-stack\n[doc-list-depth] 0 +-. nr doc-list-indent-stack\n[doc-list-depth] 0 +-. nr doc-list-offset-stack\n[doc-list-depth] 0 +-. ds doc-tag-prefix-stack\n[doc-list-depth] +-. ds doc-tag-width-stack\n[doc-list-depth] +-. nr doc-compact-list-stack\n[doc-list-depth] 0 +-. nr doc-enum-list-count-stack\n[doc-list-depth] 0 +-.. +-. +-. +-.\" NS Xr user macro +-.\" NS cross reference (for man pages only) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-macro-name +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Xr +-.\" NS +-.\" NS width register `Xr' set in doc-common +-. +-.de Xr +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Xr +-. doc-parse-args \$@ +-. \} +-. el \ +-. doc-Xr-usage +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. \" first argument must be a string +-. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ds doc-arg\n[doc-arg-ptr] \*[doc-Xr-font]\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0] +-. +-. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +-. nr doc-reg-Xr (\n[doc-arg-ptr] + 1) +-. \" modify second argument if it is a string and +-. \" remove space in between +-. if (\n[doc-type\n[doc-reg-Xr]] == 2) \{\ +-. ds doc-arg\n[doc-reg-Xr] \*[lp]\*[doc-arg\n[doc-reg-Xr]]\*[rp] +-. ds doc-space\n[doc-arg-ptr] +-. \} +-. \} +-. doc-print-recursive +-. \} +-. el \ +-. doc-Xr-usage +-. \} +-. el \ +-. doc-Xr-usage +-.. +-. +-. +-.\" NS doc-Xr-usage macro +-. +-.de doc-Xr-usage +-. tm Usage: .Xr manpage_name [section#] ... (#\n[.c]) +-. doc-reset-args +-.. +-. +-. +-.\" NS Sx user macro +-.\" NS cross section reference +-.\" NS +-.\" NS width register `Sx' set in doc-common +-. +-.als Sx doc-generic-macro +-.ds doc-Sx-usage section_header +-. +-. +-.\" NS doc-end-column-list macro +-.\" NS column-list end-list +-.\" NS +-.\" NS modifies: +-.\" NS doc-list-depth +-. +-.de doc-end-column-list +-. linetabs 0 +-' in -(\n[doc-list-offset-stack\n[doc-list-depth]]u + \n[doc-list-indent-stack\n[doc-list-depth]]u) +-. ta T .5i +-. fi +-. doc-decrement-list-stack +-. nr doc-list-depth -1 +-.. +-. +-. +-.\" NS doc-column-indent-width global register +-.\" NS holds the indent width for a column list +-. +-.nr doc-column-indent-width 0 +-. +-. +-.\" NS doc-set-column-tab macro +-.\" NS establish tabs for list-type column: `.doc-set-column-tab num_cols' +-.\" NS +-.\" NS modifies: +-.\" NS doc-column-indent-width +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dsct +-.\" NS doc-str-dsct +-.\" NS doc-str-dsct1 +-. +-.de doc-set-column-tab +-. ds doc-str-dsct +-. nr doc-reg-dsct 1 +-. nr doc-column-indent-width 0 +-. +-. ie (\$1 < 5) \ +-. ds doc-str-dsct1 " \" +-. el \{\ +-. ie (\$1 == 5) \ +-. ds doc-str-dsct1 " \" +-. el \{\ +-. \" XXX: this is packed abnormally close -- intercolumn width +-. \" should be configurable +-. ds doc-str-dsct1 " \" +-. \}\} +-. +-. while (\n[doc-reg-dsct] <= \$1) \{\ +-. as doc-str-dsct " +\w\*[doc-arg\n[doc-reg-dsct]]\*[doc-str-dsct1]u +-. nr doc-column-indent-width +\w\*[doc-arg\n[doc-reg-dsct]]\*[doc-str-dsct1]u +-. nr doc-reg-dsct +1 +-. \} +-. +-. ta \*[doc-str-dsct] +-' in +\n[doc-column-indent-width]u +-.. +-. +-. +-.\" NS doc-column-list macro +-.\" NS column items +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-list-indent-stackXXX +-.\" NS doc-spaceXXX +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dcl +-. +-.de doc-column-list +-. if \n[doc-num-args] \ +-. doc-parse-arg-vector +-. nr doc-arg-ptr +1 +-. +-. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. tm Usage: .It column_string [Ta [column_string ...] ] (#\n[.c]) +-. return +-. \} +-. +-. if "\*[doc-arg\n[doc-arg-ptr]]"Ta" \{\ +-. nr doc-reg-dcl (\n[doc-arg-ptr] - 1) +-. ds doc-space\n[doc-reg-dcl] +-. \} +-. +-. if !\n[doc-list-indent-stack\n[doc-list-depth]] \ +-. nr doc-list-indent-stack\n[doc-list-depth] \n[doc-column-indent-width]u +-. if !\n[.u] \{\ +-. fi +-. in +\n[doc-column-indent-width]u +-. \} +-. ti -\n[doc-column-indent-width]u +-. +-. doc-do-\n[doc-type\n[doc-arg-ptr]] +-.. +-. +-. +-.\" NS Ta user macro +-.\" NS append tab (\t) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS +-.\" NS width register `Ta' set in doc-common +-. +-.de Ta +-. ie \n[doc-arg-limit] \{\ +-. nr doc-arg-ptr +1 +-. nop \*[doc-tab]\c +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ +-. doc-do-\n[doc-type\n[doc-arg-ptr]] +-. el \ +-. doc-reset-args +-. \} +-. el \{\ +-. tm1 "Usage: Ta must follow column entry: e.g. +-. tm1 " .It column_string [Ta [column_string ...]] (#\n[.c]) +-. \} +-.. +-. +-. +-.\" NS Dl user macro +-.\" NS display (one line) literal +-.\" NS +-.\" NS this function uses the `Li' font +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Dl' set in doc-common +-. +-.de Dl +-. ta T .5i +-. in +\n[doc-display-indent]u +-. +-. ie \n[doc-arg-limit] \{\ +-. tm Usage: .Dl not callable by other macros (#\n[.c]) +-. doc-reset-args +-. \} +-. el \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Dl +-. doc-parse-args \$@ +-. nr doc-arg-ptr 1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Li-font]\c +-. doc-print-recursive +-. \} +-. el \ +-. tm Usage: .Dl argument ... (#\n[.c]) +-. \} +-. +-. in -\n[doc-display-indent]u +-.. +-. +-. +-.\" NS D1 user macro +-.\" NS display (one line) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `D1' set in doc-common +-. +-.de D1 +-. ta T .5i +-. in +\n[doc-display-indent]u +-. +-. ie \n[doc-arg-limit] \{\ +-. tm Usage: .D1 not callable by other macros (#\n[.c]) +-. doc-reset-args +-. \} +-. el \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name D1 +-. doc-parse-args \$@ +-. nr doc-arg-ptr 1 +-. doc-print-recursive +-. \} +-. el \ +-. tm Usage: .D1 argument ... (#\n[.c]) +-. \} +-. +-. in -\n[doc-display-indent]u +-.. +-. +-. +-.\" NS Vt user macro +-.\" NS variable type (for forcing old style variable declarations); +-.\" NS this is not done in the same manner as .Ot for fortrash -- +-.\" NS clean up later +-.\" NS +-.\" NS modifies: +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-have-decl +-.\" NS doc-have-var +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Vt' set in doc-common +-. +-.de Vt +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Vt +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Vt variable_type ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. tm Usage: .Vt variable_type ... (#\n[.c]) +-. doc-reset-args +-. return +-. \} +-. +-. if \n[doc-in-synopsis-section] \{\ +-. \" if a function declaration was the last thing given, +-. \" want vertical space +-. if \n[doc-have-decl] \{\ +-. doc-paragraph +-. nr doc-have-decl 0 +-. \} +-. +-. \" if a subroutine was the last thing given, want vertical space +-. if \n[doc-have-func] \{\ +-. ie \n[doc-have-var] \ +-. br +-. el \ +-. doc-paragraph +-. \} +-. +-. nr doc-have-var 1 +-. \} +-. +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Ft-font]\c +-. doc-print-recursive +-. +-. if \n[doc-in-synopsis-section] \{\ +-. ie \n[doc-have-old-func] \ +-. nop \*[doc-soft-space]\c +-. el \ +-. br +-. \} +-.. +-. +-. +-.\" NS doc-is-func global register (bool) +-.\" NS set if subroutine (in synopsis only) (fortran only) +-. +-.nr doc-is-func 0 +-. +-. +-.\" NS Ft user macro +-.\" NS function type +-.\" NS +-.\" NS modifies: +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-have-decl +-.\" NS doc-have-var +-.\" NS doc-is-func +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Ft' set in doc-common +-. +-.de Ft +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Ft +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Ft function_type ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. nr doc-arg-ptr +1 +-. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. tm Usage: .Ft function_type ... (#\n[.c]) +-. doc-reset-args +-. return +-. \} +-. +-. if \n[doc-in-synopsis-section] \{\ +-. if (\n[doc-have-func] : \n[doc-have-decl]) \{\ +-. doc-paragraph +-. nr doc-have-decl 0 +-. nr doc-have-var 0 +-. \} +-. +-. if \n[doc-have-var] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. \} +-. +-. nr doc-is-func 1 +-. \} +-. +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Ft-font]\c +-. doc-print-recursive +-.. +-. +-. +-.\" NS doc-have-old-func global register (bool) +-.\" NS set if `Ot' has been called +-. +-.nr doc-have-old-func 0 +-. +-. +-.\" NS Ot user macro +-.\" NS old function type (fortran -- no newline) +-.\" NS +-.\" NS modifies: +-.\" NS doc-have-decl +-.\" NS doc-have-old-func +-.\" NS doc-have-var +-.\" NS doc-is-func +-.\" NS +-.\" NS width register `Ot' set in doc-common +-. +-.de Ot +-. nr doc-have-old-func 1 +-. +-. if \n[doc-in-synopsis-section] \{\ +-. if (\n[doc-have-func] : \n[doc-have-decl]) \{\ +-. doc-paragraph +-. nr doc-have-decl 0 +-. nr doc-have-var 0 +-. \} +-. +-. if \n[doc-have-var] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. \} +-. +-. nr doc-is-func 1 +-. \} +-. +-. if \n[.$] \ +-. nop \*[doc-Ft-font]\$*\c +-. nop \ \f[]\c +-.. +-. +-. +-.\" NS Fa user macro +-.\" NS function arguments +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Fa' set in doc-common +-. +-.de Fa +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Fa +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Fa function_arguments ... (#\n[.c]) +-. \} +-. +-. ie \n[doc-func-arg-count] \ +-. doc-do-func +-. el \{\ +-. nr doc-arg-ptr +1 +-. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Fa-font]\c +-. doc-print-recursive +-. +-. if \n[doc-in-synopsis-section] \ +-. if \n[doc-have-func] \ +-. br +-. \}\} +-.. +-. +-. +-.\" NS doc-func-arg-count global register +-.\" NS how many function arguments have been processed so far +-. +-.nr doc-func-arg-count 0 +-. +-. +-.\" NS doc-func-arg global string +-.\" NS work buffer for function name strings +-. +-.ds doc-func-arg +-. +-. +-.\" NS doc-num-func-args global register +-.\" NS number of function arguments +-. +-.nr doc-num-func-args 0 +-. +-. +-.\" NS doc-func-args-processed global register +-.\" NS function arguments processed so far +-. +-.nr doc-func-args-processed 0 +-. +-. +-.\" NS doc-do-func macro +-.\" NS internal .Fa for .Fc +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-func-arg +-.\" NS doc-func-arg-count +-.\" NS doc-func-args-processed +-.\" NS doc-num-func-args +-. +-.de doc-do-func +-. if (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\ +-. doc-reset-args +-. return +-. \} +-. +-. nr doc-arg-ptr +1 +-. +-. ds doc-func-arg +-. nr doc-num-func-args 0 +-. nr doc-func-args-processed 0 +-. +-. doc-build-func-string \*[doc-arg\n[doc-arg-ptr]] +-. if (\n[doc-num-func-args] > 1) \ +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg] +-. +-. if (\n[doc-func-arg-count] > 1) \{\ +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|\c +-. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \ +-. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \ +-. nop ,\)\c +-. nop \)\*[doc-space\n[doc-arg-ptr]]\*[doc-Fa-font]\c +-. nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c +-. \} +-. +-. if (\n[doc-func-arg-count] == 1) \{\ +-. nop \)\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c +-. nop \f[]\s[0]\c +-. \} +-. nr doc-func-arg-count +1 +-. doc-do-func +-.. +-. +-. +-.\" NS doc-have-func global register (bool) +-.\" NS whether we have more than one function in synopsis +-. +-.nr doc-have-func 0 +-. +-. +-.\" NS Fn user macro +-.\" NS functions +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-have-decl +-.\" NS doc-have-func +-.\" NS doc-have-var +-.\" NS doc-indent-synopsis +-.\" NS doc-is-func +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Fn' set in doc-common +-. +-.de Fn +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Fn +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Fn function_name [function_arg] ... (#\n[.c]) +-. \} +-. +-. if !\n[doc-arg-limit] \ +-. return +-. +-. if \n[doc-in-synopsis-section] \{\ +-. \" if there is/has been more than one subroutine declaration +-. ie \n[doc-is-func] \{\ +-. br +-. nr doc-have-var 0 +-. nr doc-have-decl 0 +-. nr doc-is-func 0 +-. \} +-. el \{\ +-. if \n[doc-have-func] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. nr doc-have-decl 0 +-. \}\} +-. +-. if \n[doc-have-decl] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. \} +-. +-. if \n[doc-have-var] \{\ +-. doc-paragraph +-. nr doc-have-decl 0 +-. \} +-. +-. nr doc-have-func 1 +-. nr doc-is-func 0 +-. +-. br +-. if !\n[doc-indent-synopsis] \ +-. nr doc-indent-synopsis (4u * \n[doc-fixed-width]u) +-. if !\n[doc-indent-synopsis-active] \ +-. in +\n[doc-indent-synopsis]u +-. ti -\n[doc-indent-synopsis]u +-. \} +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ +-. tm Usage: .Fn function_name [function_arg] ... (#\n[.c]) +-. doc-reset-args +-. return +-. \} +-. +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c +-. nop \f[]\s[0]\*[lp]\)\c +-. +-. nr doc-arg-ptr +1 +-. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. nop \*[doc-Fa-font]\c +-. doc-do-func-args +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. \}\} +-. +-. nop \)\*[rp]\)\c +-. if \n[doc-in-synopsis-section] \ +-. nop \);\)\c +-. +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. \" output the space (if needed) +-. nr doc-arg-ptr -1 +-. nop \)\*[doc-space\n[doc-arg-ptr]]\c +-. nr doc-arg-ptr +1 +-. +-. doc-print-recursive +-. \} +-. el \ +-. doc-print-and-reset +-. +-. if \n[doc-in-synopsis-section] \ +-. if !\n[doc-indent-synopsis-active] \ +-. in -\n[doc-indent-synopsis]u +-.. +-. +-. +-.\" NS doc-do-func-args macro +-.\" NS handle function arguments +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-argXXX +-.\" NS doc-func-arg +-.\" NS doc-func-args-processed +-.\" NS doc-num-func-args +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-ddfa +-. +-.de doc-do-func-args +-. if \n[doc-in-synopsis-section] \{\ +-. ds doc-func-arg +-. nr doc-num-func-args 0 +-. nr doc-func-args-processed 0 +-. +-. doc-build-func-string \*[doc-arg\n[doc-arg-ptr]] +-. if (\n[doc-num-func-args] > 1) \ +-. ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg] +-. \} +-. +-. nop \)\*[doc-arg\n[doc-arg-ptr]]\c +-. nr doc-arg-ptr +1 +-. +-. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +-. nr doc-reg-ddfa (\n[doc-arg-ptr] - 1) +-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|\c +-. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \ +-. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \ +-. nop ,\)\c +-. nop \)\*[doc-space\n[doc-reg-ddfa]]\f[]\s[0]\|\c +-. doc-do-func-args +-. \}\} +-.. +-. +-. +-.\" NS doc-saved-nesting-level global register +-. +-.nr doc-saved-nesting-level 0 +-. +-. +-.\" NS doc-in-func-enclosure global register (bool) +-. +-.nr doc-in-func-enclosure 0 +-. +-. +-.\" NS Fo user macro +-.\" NS function open +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-func-arg-count +-.\" NS doc-have-decl +-.\" NS doc-have-func +-.\" NS doc-have-var +-.\" NS doc-in-func-enclosure +-.\" NS doc-indent-synopsis +-.\" NS doc-is-func +-.\" NS doc-macro-name +-.\" NS doc-saved-nesting-level +-.\" NS +-.\" NS width register `Fo' set in doc-common +-. +-.de Fo +-. if (\n[doc-in-func-enclosure]) \{\ +-. tm mdoc error: .Fo/.Fc can't be nested (#\n[.c]) +-. return +-. \} +-. +-. nr doc-saved-nesting-level \n[doc-nesting-level] +-. nr doc-in-func-enclosure 1 +-. +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ds doc-macro-name Fo +-. doc-parse-args \$@ +-. \} +-. el \ +-. tm Usage: .Fo function_name (#\n[.c]) +-. \} +-. +-. if \n[doc-in-synopsis-section] \{\ +-. \" if there is/has been more than one subroutine declaration +-. ie \n[doc-is-func] \{\ +-. br +-. nr doc-have-var 0 +-. nr doc-have-decl 0 +-. nr doc-is-func 0 +-. \} +-. el \{\ +-. if \n[doc-have-func] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. nr doc-have-decl 0 +-. \}\} +-. +-. if \n[doc-have-decl] \{\ +-. doc-paragraph +-. nr doc-have-var 0 +-. \} +-. +-. if \n[doc-have-var] \{\ +-. doc-paragraph +-. nr doc-have-decl 0 +-. \} +-. +-. nr doc-have-func 1 +-. nr doc-is-func 0 +-. +-. br +-. if !\n[doc-indent-synopsis] \ +-. nr doc-indent-synopsis (4u * \n[doc-fixed-width]u) +-. \} +-. +-. \" start function box +-. box doc-func-box +-. ev doc-func-env +-. evc 0 +-. in 0 +-. nf +-. +-. nr doc-arg-ptr +1 +-. doc-print-prefixes +-. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-func-arg-count 1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c +-. nop \f[]\s[0]\*[lp]\)\c +-. doc-reset-args +-. \} +-.. +-. +-. +-.\" NS Fc user macro +-.\" NS function close +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-func-arg-count +-.\" NS doc-in-func-enclosure +-.\" NS doc-saved-nesting-level +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `Fc' set in doc-common +-. +-.de Fc +-. if !\n[doc-in-func-enclosure] \{\ +-. tm mdoc warning: Extraneous .Fc (#\n[.c]) +-. return +-. \} +-. +-. if \n[.$] \{\ +-. ds doc-macro-name Fc +-. \" the first (dummy) argument is used to get the correct spacing +-. doc-parse-args \) \$@ +-. \} +-. +-. if !(\n[doc-saved-nesting-level] == \n[doc-nesting-level]) \ +-. tm mdoc warning: Unbalanced enclosure commands within .Fo/.Fc +-. +-. nr doc-func-arg-count 0 +-. nr doc-in-func-enclosure 0 +-. +-. ie \n[doc-in-synopsis-section] \ +-. nop \|\*[rp];\) +-. el \ +-. nop \|\*[rp]\) +-. +-. \" finish function box +-. br +-. ev +-. box +-. chop doc-func-box +-. unformat doc-func-box +-. +-. if \n[doc-in-synopsis-section] \{\ +-. if !\n[doc-indent-synopsis-active] \ +-. in +\n[doc-indent-synopsis]u +-. ti -\n[doc-indent-synopsis]u +-. \} +-. +-. nh +-. nop \*[doc-func-box]\c +-. +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. doc-print-recursive +-. \} +-. el \ +-. doc-print-and-reset +-. +-. if \n[doc-in-synopsis-section] \ +-. if !\n[doc-indent-synopsis-active] \ +-. in -\n[doc-indent-synopsis]u +-.. +-. +-. +-.\" NS doc-build-func-string macro +-.\" NS collect function arguments and set hard spaces in between +-.\" NS +-.\" NS modifies: +-.\" NS doc-func-arg +-.\" NS doc-func-args-processed +-.\" NS doc-num-func-args +-. +-.de doc-build-func-string +-. if !\n[doc-num-func-args] \{\ +-. nr doc-num-func-args \n[.$] +-. nr doc-func-args-processed 0 +-. ds doc-func-arg +-. \} +-. +-. nr doc-func-args-processed +1 +-. as doc-func-arg "\$1 +-. +-. if (\n[doc-func-args-processed] < \n[doc-num-func-args]) \{\ +-. as doc-func-arg "\*[doc-hard-space] +-. +-. shift +-. doc-build-func-string \$@ +-. \} +-.. +-. +-. +-.\" Very crude references: Stash all reference info into boxes, print out +-.\" reference on .Re macro and clean up. Ordering very limited, no fancy +-.\" citations, but can do articles, journals, and books -- need to add +-.\" several missing options (like city etc). Should be able to grab a refer +-.\" entry, massage it a wee bit (prefix a `.' to the %[A-Z]) and not worry +-.\" (ha!). +-. +-. +-.\" NS doc-is-reference global register (bool) +-.\" NS set if in reference +-. +-.nr doc-is-reference 0 +-. +-. +-.\" NS doc-reference-count global register +-.\" NS reference element counter +-. +-.nr doc-reference-count 0 +-. +-. +-.\" NS Rs user macro +-.\" NS reference start +-.\" NS +-.\" NS modifies: +-.\" NS doc-is-reference +-.\" NS doc-reference-count +-.\" NS +-.\" NS width register `Rs' set in doc-common +-. +-.de Rs +-. ie \n[.$] \ +-. tm Usage: .Rs (does not take arguments) (#\n[.c]) +-. el \{\ +-. nr doc-is-reference 1 +-. doc-reset-reference +-. if \n[doc-in-see-also-section] \ +-. doc-paragraph +-. nr doc-reference-count 0 +-. \} +-.. +-. +-. +-.\" NS Re user macro +-.\" NS reference end +-.\" NS +-.\" NS modifies: +-.\" NS doc-is-reference +-.\" NS +-.\" NS width register `Re' set in doc-common +-. +-.de Re +-. ie \n[.$] \ +-. tm Usage: .Re (does not take arguments) (#\n[.c]) +-. el \{\ +-. if !\n[doc-is-reference] \{\ +-. tm mdoc warning: Extraneous .Re (#\n[.c]) +-. return +-. \} +-. doc-print-reference +-. doc-reset-reference +-. nr doc-is-reference 0 +-. \} +-.. +-. +-. +-.\" NS doc-reset-reference macro +-.\" NS reference cleanup +-.\" NS +-.\" NS modifies: +-.\" NS doc-author-count +-.\" NS doc-author-nameXXX +-.\" NS doc-book-count +-.\" NS doc-book-name +-.\" NS doc-city-count +-.\" NS doc-city-name +-.\" NS doc-corporate-count +-.\" NS doc-corporate-name +-.\" NS doc-date +-.\" NS doc-date-count +-.\" NS doc-issue-count +-.\" NS doc-issue-name +-.\" NS doc-journal-count +-.\" NS doc-journal-name +-.\" NS doc-optional-count +-.\" NS doc-optional-string +-.\" NS doc-page-number-count +-.\" NS doc-page-number-string +-.\" NS doc-publisher-count +-.\" NS doc-publisher-name +-.\" NS doc-reference-count +-.\" NS doc-reference-title-count +-.\" NS doc-reference-title-name +-.\" NS doc-reference-title-name-for-book +-.\" NS doc-report-count +-.\" NS doc-report-name +-.\" NS doc-url-count +-.\" NS doc-url-name +-.\" NS doc-volume-count +-.\" NS doc-volume-name +-. +-.de doc-reset-reference +-. while (\n[doc-author-count]) \{\ +-. ds doc-author-name\n[doc-author-count] +-. nr doc-author-count -1 +-. \} +-. nr doc-journal-count 0 +-. nr doc-issue-count 0 +-. nr doc-optional-count 0 +-. nr doc-corporate-count 0 +-. nr doc-report-count 0 +-. nr doc-reference-title-count 0 +-. nr doc-url-count 0 +-. nr doc-volume-count 0 +-. nr doc-city-count 0 +-. nr doc-date-count 0 +-. nr doc-page-number-count 0 +-. nr doc-book-count 0 +-. nr doc-publisher-count 0 +-. nr doc-reference-count 0 +-. +-. ds doc-journal-name +-. ds doc-issue-name +-. ds doc-optional-string +-. ds doc-corporate-name +-. ds doc-report-name +-. ds doc-reference-title-name +-. ds doc-reference-title-name-for-book +-. ds doc-url-name +-. ds doc-volume-name +-. ds doc-city-name +-. ds doc-date +-. ds doc-page-number-string +-. ds doc-book-name +-. ds doc-publisher-name +-.. +-. +-. +-.\" NS doc-finish-reference macro +-.\" NS auxiliary macro for doc-print-reference +-.\" NS +-.\" NS modifies: +-.\" NS doc-reference-count +-. +-.de doc-finish-reference +-. nr doc-reference-count -\$1 +-. ie \n[doc-reference-count] \ +-. nop \), +-. el \ +-. nop \). +-.. +-. +-. +-.\" NS doc-print-reference macro +-.\" NS reference print +-.\" NS +-.\" NS modifies: +-.\" NS doc-reference-count +-. +-.de doc-print-reference +-. +-. nh +-. +-. if \n[doc-author-count] \{\ +-. doc-print-reference-authors +-. nr doc-reference-count -\n[doc-author-count] +-. \} +-. +-. if \n[doc-reference-title-count] \{\ +-. unformat doc-reference-title-name +-. chop doc-reference-title-name +-. unformat doc-reference-title-name-for-book +-. chop doc-reference-title-name-for-book +-. ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\ +-. nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c +-. doc-finish-reference \n[doc-reference-title-count] +-. \} +-. el \{\ +-. nop \*[doc-reference-title-name]\c +-. doc-finish-reference \n[doc-reference-title-count] +-. \}\} +-. +-. if \n[doc-book-count] \{\ +-. unformat doc-book-name +-. chop doc-book-name +-. nop \*[doc-book-name]\c +-. doc-finish-reference \n[doc-book-count] +-. \} +-. +-. if \n[doc-publisher-count] \{\ +-. unformat doc-publisher-name +-. chop doc-publisher-name +-. nop \*[doc-publisher-name]\c +-. doc-finish-reference \n[doc-publisher-count] +-. \} +-. +-. if \n[doc-journal-count] \{\ +-. unformat doc-journal-name +-. chop doc-journal-name +-. nop \*[doc-journal-name]\c +-. doc-finish-reference \n[doc-journal-count] +-. \} +-. +-. if \n[doc-report-count] \{\ +-. unformat doc-report-name +-. chop doc-report-name +-. nop \*[doc-report-name]\c +-. doc-finish-reference \n[doc-report-count] +-. \} +-. +-. if \n[doc-issue-count] \{\ +-. unformat doc-issue-name +-. chop doc-issue-name +-. nop \*[doc-issue-name]\c +-. doc-finish-reference \n[doc-issue-count] +-. \} +-. +-. if \n[doc-volume-count] \{\ +-. unformat doc-volume-name +-. chop doc-volume-name +-. nop \*[doc-volume-name]\c +-. doc-finish-reference \n[doc-volume-count] +-. \} +-. +-. if \n[doc-url-count] \{\ +-. unformat doc-url-name +-. chop doc-url-name +-. nop \*[doc-url-name]\c +-. doc-finish-reference \n[doc-url-count] +-. \} +-. +-. if \n[doc-page-number-count] \{\ +-. unformat doc-page-number-string +-. chop doc-page-number-string +-. nop \*[doc-page-number-string]\c +-. doc-finish-reference \n[doc-page-number-count] +-. \} +-. +-. if \n[doc-corporate-count] \{\ +-. unformat doc-corporate-name +-. chop doc-corporate-name +-. nop \*[doc-corporate-name]\c +-. doc-finish-reference \n[doc-corporate-count] +-. \} +-. +-. if \n[doc-city-count] \{\ +-. unformat doc-city-name +-. chop doc-city-name +-. nop \*[doc-city-name]\c +-. doc-finish-reference \n[doc-city-count] +-. \} +-. +-. if \n[doc-date-count] \{\ +-. unformat doc-date +-. chop doc-date +-. nop \*[doc-date]\c +-. doc-finish-reference \n[doc-date-count] +-. \} +-. +-. if \n[doc-optional-count] \{\ +-. unformat doc-optional-string +-. chop doc-optional-string +-. nop \*[doc-optional-string]\c +-. doc-finish-reference \n[doc-optional-count] +-. \} +-. +-. if \n[doc-reference-count] \ +-. tm mdoc warning: unresolved reference problem +-. +-. hy \n[doc-hyphen-flags] +-.. +-. +-. +-.\" NS doc-print-reference-authors macro +-.\" NS print out reference authors +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-dpra +-.\" NS doc-str-dpra +-. +-.ds doc-str-dpra "and +-. +-.de doc-print-reference-authors +-. nr doc-reg-dpra 1 +-. +-. while (\n[doc-reg-dpra] < \n[doc-author-count]) \{\ +-. unformat doc-author-name\n[doc-reg-dpra] +-. chop doc-author-name\n[doc-reg-dpra] +-. ie (\n[doc-author-count] > 2) \ +-. nop \)\*[doc-author-name\n[doc-reg-dpra]], +-. el \ +-. nop \)\*[doc-author-name\n[doc-reg-dpra]] +-. nr doc-reg-dpra +1 +-. \} +-. +-. unformat doc-author-name\n[doc-reg-dpra] +-. chop doc-author-name\n[doc-reg-dpra] +-. if (\n[doc-author-count] > 1) \ +-. nop \)\*[doc-str-dpra] +-. nop \)\*[doc-author-name\n[doc-reg-dpra]], +-.. +-. +-. +-.\" NS doc-author-count global register +-.\" NS counter of author references +-. +-.nr doc-author-count 0 +-. +-. +-.\" NS doc-author-nameXXX global box +-.\" NS array of author names +-.\" NS +-.\" NS limit: +-.\" NS doc-author-count +-. +-.ds doc-author-name0 +-. +-. +-.\" NS %A user macro +-.\" NS reference author(s) +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-author-count +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%A +-.\" NS +-.\" NS width register `%A' set in doc-common +-. +-.de %A +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%A author_name ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-author-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %A +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" save to reference box +-. box doc-author-name\n[doc-author-count] +-. ev doc-env-%A +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-book-count global register +-.\" NS counter of book references +-. +-.nr doc-book-count 0 +-. +-. +-.\" NS doc-book-name global box +-.\" NS string of collected book references +-. +-.ds doc-book-name +-. +-. +-.\" NS %B user macro +-.\" NS [reference] book name +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-book-count +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%B +-.\" NS +-.\" NS width register `%B' set in doc-common +-. +-.de %B +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%B book_name ... (#\n[.c]) +-. return +-. \} +-. +-. if \n[doc-is-reference] \{\ +-. nr doc-book-count +1 +-. nr doc-reference-count +1 +-. \} +-. +-. ds doc-macro-name %B +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. ie \n[doc-is-reference] \{\ +-. \" append to reference box +-. boxa doc-book-name +-. ev doc-env-%B +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-Em-font]\c +-. doc-do-references +-. \} +-. el \{\ +-. nop \*[doc-Em-font]\c +-. doc-print-recursive +-. \} +-.. +-. +-. +-.\" NS doc-city-count global register +-.\" NS counter of city references +-. +-.nr doc-city-count 0 +-. +-. +-.\" NS doc-city-name global box +-.\" NS string of collected city references +-. +-.ds doc-city-name +-. +-. +-.\" NS %C user macro +-.\" NS [reference] city +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-city-count +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%C +-.\" NS +-.\" NS width register `%C' set in doc-common +-. +-.de %C +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%C city_name ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-city-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %C +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-city-name +-. ev doc-env-%C +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-date-count global register +-.\" NS counter of date references +-. +-.nr doc-date-count 0 +-. +-. +-.\" NS doc-date global box +-.\" NS string of collected date references +-. +-.ds doc-date +-. +-. +-.\" NS %D user macro +-.\" NS [reference] date +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-date-count +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%D +-.\" NS +-.\" NS width register `%D' set in doc-common +-. +-.de %D +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%D date ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-date-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %D +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-date +-. ev doc-env-%D +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-publisher-count global register +-.\" NS counter of publisher references +-. +-.nr doc-publisher-count 0 +-. +-. +-.\" NS doc-publisher-name global box +-.\" NS string of collected publisher references +-. +-.ds doc-publisher-name +-. +-. +-.\" NS %I user macro +-.\" NS [reference] issuer/publisher name +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-publisher-count +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%I +-.\" NS +-.\" NS width register `%I' set in doc-common +-. +-.de %I +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%I issuer/publisher_name ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-publisher-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %I +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-publisher-name +-. ev doc-env-%I +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-Em-font]\c +-. doc-do-references +-.. +-. +-. +-.\" NS doc-journal-count global register +-.\" NS counter of journal references +-. +-.nr doc-journal-count 0 +-. +-. +-.\" NS doc-journal-name global box +-.\" NS string of collected journal references +-. +-.ds doc-journal-name +-. +-. +-.\" NS %J user macro +-.\" NS [reference] Journal Name +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-journal-count +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%J +-.\" NS +-.\" NS width register `%J' set in doc-common +-. +-.de %J +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%J journal_name ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-journal-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %J +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-journal-name +-. ev doc-env-%J +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-Em-font]\c +-. doc-do-references +-.. +-. +-. +-.\" NS doc-issue-count global register +-.\" NS counter of issue number references +-. +-.nr doc-issue-count 0 +-. +-. +-.\" NS doc-issue-name global box +-.\" NS string of collected issue number references +-. +-.ds doc-issue-name +-. +-. +-.\" NS %N user macro +-.\" NS [reference] issue number +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-issue-count +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%N +-.\" NS +-.\" NS width register `%N' set in doc-common +-. +-.de %N +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%N issue_number ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-issue-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %N +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-issue-name +-. ev doc-env-%N +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-optional-count global register +-.\" NS counter of optional information references +-. +-.nr doc-optional-count 0 +-. +-. +-.\" NS doc-optional-string global box +-.\" NS string of collected optional information references +-. +-.ds doc-optional-string +-. +-. +-.\" NS %O user macro +-.\" NS [reference] optional information +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-optional-count +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%O +-.\" NS +-.\" NS width register `%O' set in doc-common +-. +-.de %O +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%O optional_information ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-optional-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %O +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-optional-string +-. ev doc-env-%O +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-page-number-count global register +-.\" NS counter of page number references +-. +-.nr doc-page-number-count 0 +-. +-. +-.\" NS doc-page-number-string global box +-.\" NS string of collected page number references +-. +-.ds doc-page-number-string +-. +-. +-.\" NS %P user macro +-.\" NS [reference] page numbers +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-page-number-count +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%P +-.\" NS +-.\" NS width register `%P' set in doc-common +-. +-.de %P +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%P page_number ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-page-number-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %P +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-page-number-string +-. ev doc-env-%P +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-corporate-count global register +-.\" NS counter of corporate references +-. +-.nr doc-corporate-count 0 +-. +-. +-.\" NS doc-corporate-name global box +-.\" NS string of collected corporate references +-. +-.ds doc-corporate-name +-. +-. +-.\" NS %Q user macro +-.\" NS corporate or foreign author +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-corporate-count +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%Q +-.\" NS +-.\" NS width register `%Q' set in doc-common +-. +-.de %Q +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%Q corporate_or_foreign_author ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-corporate-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %Q +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-corporate-name +-. ev doc-env-%Q +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-report-count global register +-.\" NS counter of report references +-. +-.nr doc-report-count 0 +-. +-. +-.\" NS doc-report-name global box +-.\" NS string of collected report references +-. +-.ds doc-report-name +-. +-. +-.\" NS %R user macro +-.\" NS [reference] report name +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS doc-report-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%R +-.\" NS +-.\" NS width register `%R' set in doc-common +-. +-.de %R +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%R reference_report ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-report-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %R +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-report-name +-. ev doc-env-%R +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-reference-title-count global register +-.\" NS counter of reference title references +-. +-.nr doc-reference-title-count 0 +-. +-. +-.\" NS doc-reference-title-name global box +-.\" NS string of collected reference title references +-. +-.ds doc-reference-title-name +-. +-. +-.\" NS doc-reference-title-name-for-book global box +-.\" NS string of collected reference title references +-.\" NS (saved with another font; this is a shortcoming of groff) +-. +-.ds doc-reference-title-name-for-book +-. +-. +-.\" NS %T user macro +-.\" NS reference title +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-title-count +-.\" NS doc-report-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%T +-.\" NS +-.\" NS width register `%T' set in doc-common +-. +-.de %T +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%T reference_title ... (#\n[.c]) +-. return +-. \} +-. +-. if \n[doc-is-reference] \{\ +-. nr doc-reference-title-count +1 +-. nr doc-reference-count +1 +-. \} +-. +-. ds doc-macro-name %T +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. ie \n[doc-is-reference] \{\ +-. \" append to reference box +-. boxa doc-reference-title-name-for-book +-. ev doc-env-%T +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-No-font]\c +-. doc-do-references +-. +-. \" do it a second time with another font +-. ds doc-macro-name %T +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. boxa doc-reference-title-name +-. ev doc-env-%T +-. evc 0 +-. in 0 +-. nf +-. nop \*[doc-Em-font]\c +-. doc-do-references +-. \} +-. el \{\ +-. nop \*[doc-Em-font]\c +-. doc-print-recursive +-. \} +-.. +-. +-. +-.\" NS doc-url-count global register +-.\" NS counter of hypertext references +-. +-.nr doc-url-count 0 +-. +-. +-.\" NS doc-url-name global box +-.\" NS string of collected hypertext references +-. +-.ds doc-url-name +-. +-. +-.\" NS doc-volume-count global register +-.\" NS counter of reference title references +-. +-.nr doc-volume-count 0 +-. +-. +-.\" NS doc-volume-name global box +-.\" NS string of collected volume references +-. +-.ds doc-volume-name +-. +-. +-.\" NS %U user macro +-.\" NS hypertext reference +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS doc-url-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%U +-.\" NS +-.\" NS width register `%U' set in doc-common +-. +-.de %U +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%U URL ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-url-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %U +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-url-name +-. ev doc-env-%U +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS %V user macro +-.\" NS reference volume +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-macro-name +-.\" NS doc-reference-count +-.\" NS doc-volume-count +-.\" NS +-.\" NS local variables: +-.\" NS doc-env-%V +-.\" NS +-.\" NS width register `%V' set in doc-common +-. +-.de %V +-. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ +-. tm Usage: .%V volume ... (#\n[.c]) +-. return +-. \} +-. +-. nr doc-volume-count +1 +-. nr doc-reference-count +1 +-. +-. ds doc-macro-name %V +-. doc-parse-args \$@ +-. +-. nr doc-arg-ptr +1 +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. +-. \" append to reference box +-. boxa doc-volume-name +-. ev doc-env-%V +-. evc 0 +-. in 0 +-. nf +-. doc-do-references +-.. +-. +-. +-.\" NS doc-do-references macro +-.\" NS reference recursion routine +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-ddr +-.\" NS doc-reg-ddr1 +-. +-.de doc-do-references +-. if !\n[doc-is-reference] \ +-. tm mdoc error: .\*[doc-macro-name] found outside of .Rs ... .Re (#\n[.c]) +-. +-. nr doc-reg-ddr1 \n[doc-type\n[doc-arg-ptr]] +-. +-. ie (\n[doc-reg-ddr1] == 1) \{\ +-. \" .nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c +-. doc-append-arg \c 3 +-. \*[doc-arg\n[doc-arg-ptr]] +-. \} +-. el \{\ +-. nop \)\*[doc-arg\n[doc-arg-ptr]]\c +-. +-. ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\ +-. \" finish reference box +-. br +-. ev +-. boxa +-. +-. doc-reset-args +-. \} +-. el \{\ +-. nr doc-reg-ddr \n[doc-arg-ptr] +-. nr doc-arg-ptr +1 +-. nop \)\*[doc-space\n[doc-reg-ddr]]\c +-. doc-do-references +-. \}\} +-.. +-. +-. +-.\" NS Hf user macro +-.\" NS source include header files. +-.\" NS +-.\" NS modifies: +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS +-.\" NS width register `Hf' set in doc-common +-. +-.de Hf +-. ie ((\n[.$] == 1) & (\n[doc-arg-limit] == 0)) \{\ +-. doc-paragraph +-. nop File: +-. Pa \$1 +-. +-. Bd -literal +-. so \$1 +-. Ed +-. +-. doc-paragraph +-. \} +-. el \ +-. Usage: .Hf file (#\n[.c]) +-.. +-. +-. +-.\" NS doc-have-author global register (bool) +-.\" NS set in `An' +-. +-.nr doc-have-author 0 +-. +-. +-.\" NS An user macro +-.\" NS author name +-.\" NS +-.\" NS modifies: +-.\" NS doc-arg-ptr +-.\" NS doc-curr-font +-.\" NS doc-curr-size +-.\" NS doc-have-author +-.\" NS doc-macro-name +-.\" NS +-.\" NS width register `An' set in doc-common +-. +-.de An +-. if !\n[doc-arg-limit] \{\ +-. ie \n[.$] \{\ +-. ie "\$1"-nosplit" \ +-. nr doc-in-authors-section 0 +-. el \{ .ie "\$1"-split" \ +-. nr doc-in-authors-section 1 +-. el \{\ +-. ds doc-macro-name An +-. doc-parse-args \$@ +-. \}\}\} +-. el \{\ +-. tm1 "Usage: .An {-nosplit | -split} +-. tm1 " .An author_name ... (#\n[.c]) +-. \}\} +-. +-. if \n[doc-in-authors-section] \{\ +-. ie \n[doc-have-author] \ +-. br +-. el \ +-. nr doc-have-author 1 +-. \} +-. +-. if \n[doc-arg-limit] \{\ +-. nr doc-arg-ptr +1 +-. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ +-. nr doc-curr-font \n[.f] +-. nr doc-curr-size \n[.ps] +-. doc-print-recursive +-. \} +-. el \{\ +-. tm Usage: .An author_name ... (#\n[.c]) +-. doc-reset-args +-. \}\} +-.. +-. +-. +-.\" NS Rv user macro +-.\" NS return values +-.\" NS +-.\" NS width register `Rv' set in doc-common +-.\" NS +-.\" NS local variables: +-.\" NS doc-str-Rv-std-prefix +-.\" NS doc-str-Rv-std-suffix +-.\" NS doc-str-Rv-stds-prefix +-.\" NS doc-str-Rv-stds-and +-.\" NS doc-str-Rv-stds-suffix +-.\" NS doc-str-Rv-std0 +-. +-.ds doc-str-Rv-std-prefix "The +-.ds doc-str-Rv-std-suffix "function returns the value\~0 if successful; +-.as doc-str-Rv-std-suffix " otherwise the value\~\-1 is returned and +-.as doc-str-Rv-std-suffix " the global variable \*[doc-Va-font]errno\f[] +-.as doc-str-Rv-std-suffix " is set to indicate the error. +-. +-.ds doc-str-Rv-stds-prefix "The +-.ds doc-str-Rv-stds-and "and +-.ds doc-str-Rv-stds-suffix "functions return the value\~0 if successful; +-.as doc-str-Rv-stds-suffix " otherwise the value\~\-1 is returned and +-.as doc-str-Rv-stds-suffix " the global variable \*[doc-Va-font]errno\f[] +-.as doc-str-Rv-stds-suffix " is set to indicate the error. +-. +-.ds doc-str-Rv-std0 "Upon successful completion, the value\~0 is returned; +-.as doc-str-Rv-std0 " otherwise the value\~\-1 is returned and +-.as doc-str-Rv-std0 " the global variable \*[doc-Va-font]errno\f[] +-.as doc-str-Rv-std0 " is set to indicate the error. +-. +-.de Rv +-. +-.\" XXX: what does this function without `-std'? +-. +-. if \n[doc-arg-limit] \{\ +-. tm Usage: .Rv not callable by other macros (#\n[.c]) +-. doc-reset-args +-. return +-. \} +-. +-. if !\n[.$] \{\ +-. tm Usage: .Rv [-std] [ ...] (#\n[.c]) +-. return +-. \} +-. +-. if "\$1"-std" \{\ +-. nr doc-reg-Rv \*[doc-section] +-. if ((\n[doc-reg-Rv] < 2) : (\n[doc-reg-Rv] > 3)) \ +-. tm Usage: .Rv -std in sections 2 and 3 only (#\n[.c]) +-. br +-. shift +-. ie (\n[.$] > 1) \{\ +-. nop \)\*[doc-str-Rv-stds-prefix] +-. nr doc-reg-Rv 1 +-. while (\n[doc-reg-Rv] < \n[.$]) \{\ +-. ie (\n[.$] > 2) \ +-. Fn \$\n[doc-reg-Rv] , +-. el \ +-. Fn \$\n[doc-reg-Rv] +-. nr doc-reg-Rv +1 +-. \} +-. nop \)\*[doc-str-Rv-stds-and] +-. Fn \$\n[.$] +-. nop \)\*[doc-str-Rv-stds-suffix] +-. \} +-. el \{ .ie (\n[.$] == 1) \{\ +-. nop \)\*[doc-str-Rv-std-prefix] +-. Fn \$1 +-. nop \)\*[doc-str-Rv-std-suffix] +-. \} +-. el \{\ +-. nop \)\*[doc-str-Rv-std0] +-. \}\}\} +-.. +-. +-. +-.\" NS Ex user macro +-.\" NS exit status +-.\" NS +-.\" NS width register `Ex' set in doc-common +-.\" NS +-.\" NS local variables: +-.\" NS doc-str-Ex-std-prefix +-.\" NS doc-str-Ex-std-suffix +-. +-.ds doc-str-Ex-std-prefix "The +-.ds doc-str-Ex-std-suffix "utility exits\~0 on success, +-.as doc-str-Ex-std-suffix " and\~>0 if an error occurs. +-. +-.ds doc-str-Ex-stds-prefix "The +-.als doc-str-Ex-stds-and doc-str-Rv-stds-and +-.ds doc-str-Ex-stds-suffix "utilities exit\~0 on success, +-.as doc-str-Ex-stds-suffix " and\~>0 if an error occurs. +-. +-.de Ex +-. +-.\" XXX: what does this function without `-std'? +-. +-. if \n[doc-arg-limit] \{\ +-. tm Usage: .Ex not callable by other macros (#\n[.c]) +-. doc-reset-args +-. return +-. \} +-. +-. if !\n[.$] \{\ +-. tm Usage: .Ex [-std] [ ...] (#\n[.c]) +-. return +-. \} +-. +-. if "\$1"-std" \{\ +-. nr doc-reg-Ex \*[doc-section] +-. if !((\n[doc-reg-Ex] == 1) : (\n[doc-reg-Ex] == 6) : (\n[doc-reg-Ex] == 8)) \ +-. tm Usage: .Ex -std in sections 1, 6 and 8 only (#\n[.c]) +-. br +-. shift +-. ie (\n[.$] > 1) \{\ +-. nop \)\*[doc-str-Ex-stds-prefix] +-. nr doc-reg-Ex 1 +-. while (\n[doc-reg-Ex] < \n[.$]) \{\ +-. ie (\n[.$] > 2) \ +-. Nm \$\n[doc-reg-Ex] , +-. el \ +-. Nm \$\n[doc-reg-Ex] +-. nr doc-reg-Ex +1 +-. \} +-. nop \)\*[doc-str-Ex-stds-and] +-. Nm \$\n[.$] +-. nop \)\*[doc-str-Ex-stds-suffix] +-. \} +-. el \{\ +-. nop \)\*[doc-str-Ex-std-prefix] +-. Nm \$1 +-. nop \)\*[doc-str-Ex-std-suffix] +-. \}\} +-.. +-. +-. +-.\" NS Mt user macro +-.\" NS mailto (for conversion to HTML) +-. +-.de Mt +-. \" XXX: error handling missing +-. Pa \$@ +-.. +-. +-. +-.\" NS Lk user macro +-.\" NS link (for conversion to HTML) +-.\" NS +-.\" NS local variables: +-.\" NS doc-reg-Lk +-.\" NS doc-str-Lk +-. +-.de Lk +-. ds doc-str-Lk Sy \$@ +-. +-. ie (\n[.$] > 1) \{\ +-. doc-get-arg-type \$2 +-. ie (\n[doc-arg-type] < 3) \{\ +-. Em \)\$2: +-. ds doc-str-Lk Sy "\$1" +-. doc-get-width "\$1" +-. shift 2 +-. if \n[.$] \ +-. as doc-str-Lk " \$@ +-. \} +-. el \ +-. doc-get-width "\$1" +-. \} +-. el \ +-. doc-get-width "\$1" +-. +-. ie n \ +-. nr doc-reg-Lk 26 +-. el \ +-. nr doc-reg-Lk 38 +-. ie (\n[doc-width] >= \n[doc-reg-Lk]) \ +-. D1 \*[doc-str-Lk] +-. el \ +-. \*[doc-str-Lk] +-.. +-. +-. +-.\" NS doc-defunct-macro macro +-.\" NS this is the skeleton for defunct macros +-.\" NS +-. +-.de doc-defunct-macro +-. tmc mdoc error: .\$0 defunct +-. if d doc-\$0-usage \ +-. tmc , \*[doc-\$0-usage] +-. tm1 " (#\n[.c]) +-.. +-. +-. +-.\" obsolete macros +-. +-.als Db doc-defunct-macro +-. +-.als Ds doc-defunct-macro +-. +-.als Or doc-defunct-macro +-.ds doc-Or-usage use `|' +-. +-.als Sf doc-defunct-macro +-.ds doc-Sf-usage use .Pf or .Ns +-. +-. +-.rn em e@ +-. +-.de em +-. tm1 "mdoc error: end-macro (.em) respecification is not allowed. (#\n[.c]) +-. tm1 " Should this have been `.Em ...'? +-. ab +-.. +-. +-. +-.\" NS doc-empty-line macro +-.\" NS emit warning and print empty line +-. +-.de doc-empty-line +-. if !\n[doc-display-depth] \ +-. tm mdoc warning: Empty input line #\n[.c] +-. sp +-.. +-. +-.blm doc-empty-line +-. +-. +-.ec +-. +-. +-.\" For UTF-8, map some characters conservatively for the sake +-.\" of easy cut and paste. +-. +-.if '\*[.T]'utf8' \{\ +-. rchar \- - ' ` +-. +-. char \- \N'45' +-. char - \N'45' +-. char ' \N'39' +-. char ` \N'96' +-.\} +-. +-. +-.\" load local modifications +-.mso mdoc.local +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/doc.tmac-u groff-1.22.3/tmac/doc.tmac-u +--- groff-1.22.3.old/tmac/doc.tmac-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/doc.tmac-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,6599 @@ ++.\" -*- nroff -*- ++.\" ++.\" Copyright (c) 1991, 1993 ++.\" The Regents of the University of California. All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms, with or without ++.\" modification, are permitted provided that the following conditions ++.\" are met: ++.\" 1. Redistributions of source code must retain the above copyright ++.\" notice, this list of conditions and the following disclaimer. ++.\" 2. Redistributions in binary form must reproduce the above copyright ++.\" notice, this list of conditions and the following disclaimer in the ++.\" documentation and/or other materials provided with the distribution. ++.\" 3. [Deleted. See ++.\" ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change] ++.\" 4. Neither the name of the University nor the names of its contributors ++.\" may be used to endorse or promote products derived from this software ++.\" without specific prior written permission. ++.\" ++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++.\" SUCH DAMAGE. ++.\" ++.\" @(#)doc 8.1 (Berkeley) 06/08/93 ++.\" ++.\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be ++.\" installed as mdoc/doc-* rather than tmac.doc-* (the filename ++.\" `tmac.doc-common' would be too long); when using groff, the doc-* files ++.\" are loaded using the `mso' request. ++.\" ++.\" Modified by ++.\" ++.\" Werner LEMBERG and ++.\" Ruslan Ermilov ++.\" ++.\" to make it more readable: using long names and many groff features, ++.\" updating and extending documentation, etc. ++.\" ++.\" %beginstrip% ++. ++. ++.if !\n(.g \ ++. ab This version of mdoc can be run with GNU troff only! ++. ++. ++.do if d Dd .nx ++. ++. ++.cp 0 ++. ++. ++.if (\n[.x]\n[.y] < 118) \ ++. ab You need GNU troff version 1.18 or higher to run this version of mdoc! ++. ++. ++.\" Load start-up files ++.ie t \ ++. mso mdoc/doc-ditroff ++.el \ ++. mso mdoc/doc-nroff ++. ++.mso mdoc/doc-common ++.mso mdoc/doc-syms ++. ++. ++.eo ++. ++. ++.\" NS doc-macro-name global string ++.\" NS name of calling request (set in each user-requestable macro) ++. ++.ds doc-macro-name ++.als doc-arg0 doc-macro-name ++. ++. ++.\" NS doc-arg-limit global register ++.\" NS total number of arguments ++. ++.nr doc-arg-limit 0 ++. ++. ++.\" NS doc-num-args global register ++.\" NS number of arguments to handle (must be set to \n[.$] prior to ++.\" NS `doc-parse-arg-vector' request) ++. ++.nr doc-num-args 0 ++. ++. ++.\" NS doc-arg-ptr global register ++.\" NS argument pointer ++. ++.nr doc-arg-ptr 0 ++. ++. ++.\" NS doc-argXXX global string ++.\" NS argument vector ++.\" NS ++.\" NS limit: ++.\" NS doc-arg-limit ++. ++.ds doc-arg1 ++. ++. ++.\" NS doc-typeXXX global register ++.\" NS argument type vector (macro=1, string=2, punctuation suffix=3, ++.\" NS punctuation prefix=4) ++.\" NS ++.\" NS limit: ++.\" NS doc-arg-limit ++. ++.nr doc-type1 0 ++. ++. ++.\" NS doc-spaceXXX global string ++.\" NS space vector ++.\" NS ++.\" NS limit: ++.\" NS doc-arg-limit ++. ++.ds doc-space1 ++. ++. ++.\" NS doc-parse-args macro ++.\" NS parse arguments (recursively) (`.doc-parse-args arg ...') ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-limit ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-spaceXXX ++.\" NS doc-typeXXX ++.\" NS doc-arg-ptr ++.\" NS doc-have-space ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dpa ++.\" NS doc-reg-dpa1 ++.\" NS doc-str-dpa ++. ++.de doc-parse-args ++. if !\n[doc-arg-limit] \ ++. doc-set-spacing-1 ++. ++. nr doc-have-space 0 ++. ++. if !\n[.$] \ ++. return ++. ++. nr doc-arg-limit +1 ++. ++. \" handle `|' and `...' specially ++. ie "\$1"|" \ ++. ds doc-arg\n[doc-arg-limit] \f[R]|\f[] ++. el \{ .ie "\$1"..." \ ++. ds doc-arg\n[doc-arg-limit] \|.\|.\|. ++. el \ ++. ds doc-arg\n[doc-arg-limit] "\$1 ++. \} ++. ++. \" get argument type and set spacing ++. doc-get-arg-type* \n[doc-arg-limit] ++. nr doc-type\n[doc-arg-limit] \n[doc-arg-type] ++. doc-set-spacing-\n[doc-arg-type] ++. ++. \" check whether we have processed the last parameter ++. ie (\n[.$] == 1) \ ++. nr doc-arg-ptr 0 ++. el \{\ ++. shift ++. doc-parse-args \$@ ++. \} ++. ++. nh ++.. ++. ++. ++.\" NS doc-parse-arg-vector macro ++.\" NS parse argument vector (recursive) ++.\" NS ++.\" NS cf. comments in doc-parse-args ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-limit ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-num-args ++.\" NS doc-spaceXXX ++.\" NS doc-typeXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dpav ++.\" NS doc-reg-dpav1 ++.\" NS doc-str-dpav ++. ++.de doc-parse-arg-vector ++. if !\n[doc-arg-limit] \ ++. doc-set-spacing-1 ++. ++. nr doc-arg-limit +1 ++. ++. ie "\*[doc-arg\n[doc-arg-limit]]"|" \ ++. ds doc-arg\n[doc-arg-limit] \f[R]|\f[] ++. el \{ .if "\*[doc-arg\n[doc-arg-limit]]"..." \ ++. ds doc-arg\n[doc-arg-limit] \|.\|.\|. ++. \} ++. ++. doc-get-arg-type* \n[doc-arg-limit] ++. nr doc-type\n[doc-arg-limit] \n[doc-arg-type] ++. doc-set-spacing-\n[doc-arg-type] ++. ++. ie (\n[doc-num-args] == 1) \{\ ++. nr doc-arg-ptr 0 ++. nr doc-num-args 0 ++. \} ++. el \{\ ++. nr doc-num-args -1 ++. doc-parse-arg-vector ++. \} ++. ++. nh ++.. ++. ++. ++.\" NS doc-parse-space-vector macro ++.\" NS parse space vector (recursive) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-limit ++.\" NS doc-num-args ++.\" NS doc-spaceXXX ++. ++.de doc-parse-space-vector ++. nr doc-arg-limit +1 ++. ++. doc-set-spacing-\n[doc-type\n[doc-arg-limit]] ++. ++. ie (\n[doc-num-args] == 1) \ ++. nr doc-num-args 0 ++. el \{\ ++. nr doc-num-args -1 ++. doc-parse-space-vector ++. \} ++.. ++. ++. ++.\" NS doc-remaining-args macro ++.\" NS output remaining arguments as-is, separated by spaces (until ++.\" NS `doc-num-args' is exhausted) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-num-args ++. ++.de doc-remaining-args ++. nr doc-arg-ptr +1 ++. nop \)\*[doc-arg\n[doc-arg-ptr]]\c ++. ++. ie (\n[doc-num-args] == 1) \{\ ++. nr doc-arg-ptr 0 ++. nr doc-num-args 0 ++. \} ++. el \{\ ++. nop \)\*[doc-space]\c ++. nr doc-num-args -1 ++. doc-remaining-args ++. \} ++.. ++. ++. ++.\" NS doc-append-arg macro ++.\" NS append one argument to argument vector: ++.\" NS `.doc-append-arg [arg] [type]' ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-limit ++.\" NS doc-argXXX ++.\" NS doc-typeXXX ++. ++.de doc-append-arg ++. nr doc-arg-limit +1 ++. ds doc-arg\n[doc-arg-limit] "\$1 ++. nr doc-type\n[doc-arg-limit] \$2 ++. doc-set-spacing-\$2 ++.. ++. ++. ++.\" NS doc-print-and-reset macro ++.\" NS finish input line and clean up argument vectors ++. ++.de doc-print-and-reset ++. if \n[doc-space-mode] \ ++. nop \) ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-reset-args macro ++.\" NS reset argument counters ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-limit ++.\" NS doc-arg-ptr ++.\" NS doc-have-slot ++. ++.de doc-reset-args ++. nr doc-arg-limit 0 ++. nr doc-arg-ptr 0 ++. nr doc-have-slot 0 ++. ++. hy \n[doc-hyphen-flags] ++.. ++. ++. ++.ec ++. ++.\" NS doc-curr-font global register ++.\" NS saved current font ++. ++.nr doc-curr-font \n[.f] ++. ++. ++.\" NS doc-curr-size global register ++.\" NS saved current font size ++. ++.nr doc-curr-size \n[.ps] ++. ++.eo ++. ++. ++.\" NS Fl user macro ++.\" NS handle flags (appends `-' and prints flags): `.Fl [arg ...]' ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Fl (for communication with doc-flag-recursion) ++.\" NS ++.\" NS width register `Fl' set in doc-common ++. ++.de Fl ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Fl-font]\c ++. ++. if !\n[doc-arg-limit] \{\ ++. ds doc-macro-name Fl ++. doc-parse-args \$@ ++. ++. \" no arguments ++. if !\n[.$] \ ++. nop \|\-\|\f[]\s[0] ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. \" last argument ++. nop \|\-\f[]\s[0]\c ++. doc-print-and-reset ++. \} ++. el \{\ ++. ie (\n[doc-type\n[doc-arg-ptr]] == 1) \{\ ++. nop \|\-\f[]\s[0]\c ++. \*[doc-arg\n[doc-arg-ptr]] ++. \} ++. el \{\ ++. if (\n[doc-type\n[doc-arg-ptr]] == 3) \ ++. nop \|\-\|\c ++. ++. nr doc-reg-Fl 1 ++. doc-flag-recursion ++. \}\} ++.. ++. ++. ++.\" NS doc-flag-recursion macro ++.\" NS `Fl' flag recursion routine (special handling) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dfr ++.\" NS doc-reg-dfr1 ++.\" NS doc-str-dfr ++. ++.de doc-flag-recursion ++. nr doc-reg-dfr1 \n[doc-type\n[doc-arg-ptr]] ++. ds doc-str-dfr "\*[doc-arg\n[doc-arg-ptr]] ++. ++. ie (\n[doc-reg-dfr1] == 1) \{\ ++. nop \f[]\s[0]\c ++. \*[doc-str-dfr] ++. \} ++. el \{\ ++. nr doc-reg-dfr \n[doc-arg-ptr] ++. ++. ie (\n[doc-reg-dfr1] == 2) \{\ ++. \" handle vertical bar -- doc-reg-Fl is set for the first call of ++. \" doc-flag-recursion only; we need this to make `.Fl | ...' work ++. \" correctly ++. ie "\*[doc-str-dfr]"\*[Ba]" \{\ ++. if \n[doc-reg-Fl] \ ++. nop \|\-\*[doc-space]\c ++. nop \)\*[Ba]\c ++. \} ++. el \{\ ++. ie "\*[doc-str-dfr]"\f[R]|\f[]" \{\ ++. if \n[doc-reg-Fl] \ ++. nop \|\-\*[doc-space]\c ++. nop \f[R]|\f[]\c ++. \} ++. el \{\ ++. \" two consecutive hyphen characters? ++. ie "\*[doc-str-dfr]"-" \ ++. nop \|\-\^\-\|\c ++. el \ ++. nop \|\%\-\*[doc-str-dfr]\&\c ++. \}\}\} ++. el \{\ ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. nop \)\*[doc-str-dfr]\f[]\s[0]\c ++. \} ++. ++. ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\ ++. \" last argument ++. if (\n[doc-reg-dfr1] == 4) \ ++. nop \|\-\c ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. doc-print-and-reset ++. \} ++. el \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-type\n[doc-arg-ptr]] == 3) \{\ ++. ie (\n[doc-type\n[doc-reg-dfr]] == 4) \ ++. nop \|\-\c ++. el \ ++. nop \)\*[doc-space\n[doc-reg-dfr]]\c ++. \} ++. el \ ++. nop \)\*[doc-space\n[doc-reg-dfr]]\c ++. ++. shift ++. nr doc-reg-Fl 0 ++. doc-flag-recursion \$@ ++. \}\} ++.. ++. ++. ++.\" NS doc-print-recursive macro ++.\" NS general name recursion routine (print remaining arguments) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dpr ++.\" NS doc-reg-dpr1 ++.\" NS doc-str-dpr ++. ++.de doc-print-recursive ++. nr doc-reg-dpr1 \n[doc-type\n[doc-arg-ptr]] ++. ds doc-str-dpr "\*[doc-arg\n[doc-arg-ptr]] ++. ++. ie (\n[doc-reg-dpr1] == 1) \{\ ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. \*[doc-str-dpr] ++. \} ++. el \{\ ++. nr doc-reg-dpr \n[doc-arg-ptr] ++. ++. \" the `\%' prevents hyphenation on a dash (`-') ++. ie (\n[doc-reg-dpr1] == 2) \ ++. nop \%\*[doc-str-dpr]\&\c ++. el \{\ ++. \" punctuation character ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. nop \)\*[doc-str-dpr]\f[]\s[0]\c ++. \} ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. \" last argument ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. doc-print-and-reset ++. \} ++. el \{\ ++. nop \)\*[doc-space\n[doc-reg-dpr]]\c ++. doc-print-recursive ++. \}\} ++.. ++. ++. ++.\" NS doc-print-prefixes macro ++.\" NS print leading prefixes ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++. ++.de doc-print-prefixes ++. while (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. if !(\n[doc-type\n[doc-arg-ptr]] == 4) \ ++. break ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c ++. nr doc-arg-ptr +1 ++. \} ++.. ++. ++. ++.\" NS doc-generic-macro macro ++.\" NS this is the skeleton for most simple macros ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++. ++.de doc-generic-macro ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name \$0 ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. if (\n[doc-type\n[doc-arg-ptr]] == 1) \{\ ++. tmc mdoc warning: Using a macro as first argument ++. tm1 " cancels effect of .\$0 (#\n[.c]) ++. ++. \" the right action here would be to reset the argument counters ++. \" and bail out -- unfortunately, a small number of manual pages ++. \" (less than 2% for FreeBSD which has been used for testing) ++. \" relied on the old behaviour (silently ignore this error), ++. \" so it is commented out ++. ++.\" doc-reset-args ++. \} ++.\" el \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-\$0-font]\c ++. doc-print-recursive ++.\" \} ++. \} ++. el \{\ ++. tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c]) ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS Ar user macro ++.\" NS command line `argument' macro: `.Ar [args ...]' ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variable: ++.\" NS doc-str-Ar-default ++.\" NS ++.\" NS width register `Ar' set in doc-common ++. ++.ds doc-str-Ar-default "file\ .\|.\|. ++. ++.de Ar ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Ar-font]\c ++. ++. if !\n[doc-arg-limit] \{\ ++. ds doc-macro-name Ar ++. doc-parse-args \$@ ++. ++. \" no argument ++. if !\n[.$] \ ++. nop \)\*[doc-str-Ar-default]\&\f[]\s[0] ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. nop \)\*[doc-str-Ar-default]\&\f[]\s[0]\c ++. doc-print-and-reset ++. \} ++. el \{\ ++. if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. \" replace previous argument (Ar) with default value ++. nr doc-arg-ptr -1 ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Ar-default] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. doc-parse-space-vector ++. \} ++. doc-print-recursive ++. \} ++.. ++. ++. ++.\" NS Ad user macro ++.\" NS Addresses ++.\" NS ++.\" NS width register `Ad' set in doc-common ++. ++.als Ad doc-generic-macro ++.ds doc-Ad-usage address ++. ++. ++.\" NS doc-indent-synopsis global register ++.\" NS indentation in synopsis ++. ++.nr doc-indent-synopsis 0 ++. ++. ++.\" NS doc-indent-synopsis-active global register (bool) ++.\" NS indentation in synopsis active ++. ++.nr doc-indent-synopsis-active 0 ++. ++. ++.\" NS Cd user macro ++.\" NS config declaration (for section 4 SYNOPSIS) ++.\" NS ++.\" NS this function causes a break; it uses the `Nm' font ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-indent-synopsis ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Cd' set in doc-common ++. ++.de Cd ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Cd ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Cd configuration_file_declaration ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. ie \n[doc-in-synopsis-section] \{\ ++. ie "\*[doc-macro-name]"Cd" \{\ ++. br ++. if !\n[doc-indent-synopsis] \ ++. nr doc-indent-synopsis \n[doc-display-indent]u ++. if !\n[doc-indent-synopsis-active] \ ++. in +\n[doc-indent-synopsis]u ++. ti -\n[doc-indent-synopsis]u ++. nop \*[doc-Nm-font]\c ++. doc-print-recursive ++. if !\n[doc-indent-synopsis-active] \ ++. in -\n[doc-indent-synopsis]u ++. \} ++. el \{\ ++. nop \*[doc-Nm-font]\c ++. doc-print-recursive ++. \}\} ++. el \{\ ++. nop \*[doc-Nm-font]\c ++. doc-print-recursive ++. \}\} ++. el \{\ ++. tm Usage: .Cd configuration_file_declaration ... (#\n[.c]) ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS Cm user macro ++.\" NS interactive command modifier (flag) ++.\" NS ++.\" NS width register `Cm' set in doc-common ++. ++.als Cm doc-generic-macro ++.ds doc-Cm-usage interactive_command_modifier ++. ++. ++.\" NS Dv user macro ++.\" NS defined variable ++.\" NS ++.\" NS this function uses the `Er' font ++.\" NS ++.\" NS width register `Dv' set in doc-common ++. ++.als Dv doc-generic-macro ++.ds doc-Dv-usage defined_variable ++.als doc-Dv-font doc-Er-font ++. ++. ++.\" NS Em user macro ++.\" NS emphasis ++.\" NS ++.\" NS width register `Em' set in doc-common ++. ++.als Em doc-generic-macro ++.ds doc-Em-usage text ++. ++. ++.\" NS Er user macro ++.\" NS errno type ++.\" NS ++.\" NS width register `Er' set in doc-common ++. ++.als Er doc-generic-macro ++.ds doc-Er-usage text ++. ++. ++.\" NS Ev user macro ++.\" NS environment variable ++.\" NS ++.\" NS width register `Ev' set in doc-common ++. ++.als Ev doc-generic-macro ++.ds doc-Ev-usage text ++. ++. ++.\" NS doc-have-decl global register (bool) ++.\" NS subroutine test (in synopsis only) ++. ++.nr doc-have-decl 0 ++. ++. ++.\" NS doc-have-var global register (bool) ++.\" NS whether last type is a variable type ++. ++.nr doc-have-var 0 ++. ++. ++.\" NS doc-do-func-decl macro ++.\" NS do something special while in SYNOPSIS ++.\" NS ++.\" NS modifies: ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-have-decl ++.\" NS doc-have-var ++. ++.de doc-do-func-decl ++. if \n[doc-in-synopsis-section] \{\ ++. \" if a variable type was the last thing given, want vertical space ++. if \n[doc-have-var] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. \} ++. \" if a subroutine was the last thing given, want vertical space ++. if \n[doc-have-func] \{\ ++. ie \n[doc-have-decl] \ ++. br ++. el \ ++. doc-paragraph ++. \} ++. nr doc-have-decl 1 ++. \} ++. ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++.. ++. ++. ++.\" NS Fd user macro ++.\" NS function declaration -- not callable ++.\" NS ++.\" NS this function causes a break ++.\" NS ++.\" NS width register `Fd' set in doc-common ++. ++.de Fd ++. ie ((\n[.$] >= 1) & (\n[doc-arg-limit] == 0)) \{\ ++. doc-do-func-decl ++. nop \*[doc-Fd-font]\$* ++. br ++. ft \n[doc-curr-font] ++. ps \n[doc-curr-size]u ++. \} ++. el \{\ ++. tm Usage: .Fd function_declaration -- Fd is not callable (#\n[.c]) ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS In user macro ++.\" NS #include statement in SYNOPSIS ++.\" NS if not in SYNOPSIS ++.\" NS ++.\" NS this function causes a break; it uses the `Fd' font ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-indent-synopsis ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `In' set in doc-common ++. ++.de In ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name In ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .In include_file ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. ie ((\n[doc-arg-limit] >= \n[doc-arg-ptr]) & (\n[doc-type\n[doc-arg-ptr]] == 2)) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. ie \n[doc-in-synopsis-section] \{\ ++. ie "\*[doc-macro-name]"In" \{\ ++. doc-do-func-decl ++. nop \*[doc-Fd-font]#include <\*[doc-arg\n[doc-arg-ptr]]> ++. ft \n[doc-curr-font] ++. ps \n[doc-curr-size]u ++. br ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ ++. doc-print-recursive ++. el \ ++. doc-reset-args ++. \} ++. el \{\ ++. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]] ++. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]> ++. doc-print-recursive ++. \}\} ++. el \{\ ++. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]] ++. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]> ++. doc-print-recursive ++. \}\} ++. el \{\ ++. tm Usage: .In include_file ... (#\n[.c]) ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS Fr user macro ++.\" NS function return value ++.\" NS ++.\" NS this function uses the `Ar' font ++.\" NS ++.\" NS width register `Fr' set in doc-common ++. ++.als Fr doc-generic-macro ++.ds doc-Fr-usage function_return_value ++.als doc-Fr-font doc-Ar-font ++. ++. ++.\" NS Ic user macro ++.\" NS interactive command ++.\" NS ++.\" NS width register `Ic' set in doc-common ++. ++.als Ic doc-generic-macro ++.ds doc-Ic-usage interactive_command ++. ++. ++.\" NS Li user macro ++.\" NS literals ++.\" NS ++.\" NS width register `Li' set in doc-common ++. ++.als Li doc-generic-macro ++.ds doc-Li-usage argument ++. ++. ++.\" NS Ms user macro ++.\" NS math symbol ++.\" NS ++.\" NS this function uses the `Sy' font ++.\" NS ++.\" NS width register `Ms' set in doc-common ++. ++.als Ms doc-generic-macro ++.ds doc-Ms-usage math_symbol ++.als doc-Ms-font doc-Sy-font ++. ++. ++.\" NS doc-command-name global string ++.\" NS save first invocation of .Nm ++. ++.ds doc-command-name ++. ++. ++.\" NS Nm user macro ++.\" NS name of command or page topic ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-command-name ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-indent-synopsis ++.\" NS doc-indent-synopsis-active ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Nm' set in doc-common ++. ++.de Nm ++. if !\n[doc-arg-limit] \{\ ++. ds doc-macro-name Nm ++. ie \n[.$] \ ++. doc-parse-args \$@ ++. el \{\ ++. ie "\*[doc-command-name]"" \ ++. tm Usage: .Nm name ... (#\n[.c]) ++. el \ ++. doc-parse-args \*[doc-command-name] ++. \}\} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. \" last argument ++. ie "\*[doc-command-name]"" \{\ ++. tm Usage: .Nm name ... (#\n[.c]) ++. doc-reset-args ++. \} ++. el \{\ ++. nop \*[doc-Nm-font]\*[doc-command-name]\f[]\s[0]\c ++. doc-print-and-reset ++. \}\} ++. el \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. ie !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. ie "\*[doc-command-name]"" \ ++. tm Usage: .Nm name ... (#\n[.c]) ++. el \{\ ++. \" replace previous argument (Nm) with default value ++. nr doc-arg-ptr -1 ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-Nm-font]\*[doc-command-name]\f[]\s[0] ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. doc-parse-space-vector ++. \}\} ++. el \{\ ++. \" handle `.Nm ...' in SYNOPSIS ++. if \n[doc-in-synopsis-section] \{\ ++. if "\*[doc-macro-name]"Nm" \{\ ++. br ++. if !\n[doc-indent-synopsis] \{\ ++. doc-get-width "\*[doc-arg\n[doc-arg-ptr]]" ++. nr doc-indent-synopsis ((\n[doc-width]u + 1u) * \n[doc-fixed-width]u) ++. \} ++. if !\n[doc-indent-synopsis-active] \{\ ++. in +\n[doc-indent-synopsis]u ++. nr doc-indent-synopsis-active 1 ++. \} ++. ti -\n[doc-indent-synopsis]u ++. \}\} ++. if "\*[doc-command-name]"" \ ++. ds doc-command-name "\*[doc-arg\n[doc-arg-ptr]] ++. ++. nop \*[doc-Nm-font]\c ++. \} ++. doc-print-recursive ++. \} ++.. ++. ++. ++.\" NS Pa user macro ++.\" NS pathname: `.Pa [arg ...]' ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Pa' set in doc-common ++. ++.de Pa ++. if !\n[doc-arg-limit] \{\ ++. ds doc-macro-name Pa ++. doc-parse-args \$@ ++. ++. \" default value ++. if !\n[.$] \ ++. nop \*[doc-Pa-font]~\f[]\s[0] ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Pa-font]\c ++. if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. \" replace previous argument (Pa) with default value ++. nr doc-arg-ptr -1 ++. ds doc-arg\n[doc-arg-ptr] ~ ++. nr doc-type\n[doc-arg-ptr] 2 ++. ds doc-space\n[doc-arg-ptr] "\*[doc-space] ++. ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. doc-parse-space-vector ++. \} ++. doc-print-recursive ++. \} ++. el \{\ ++. nop \*[doc-Pa-font]~\f[]\s[0]\c ++. doc-print-and-reset ++. \} ++.. ++. ++. ++.\" NS Sy user macro ++.\" NS symbolics ++.\" NS ++.\" NS width register `Sy' set in doc-common ++. ++.als Sy doc-generic-macro ++.ds doc-Sy-usage symbolic_text ++. ++. ++.\" NS Me user macro ++.\" NS menu entries ++.\" NS ++.\" NS width register `Me' set in doc-common ++. ++.als Me doc-generic-macro ++.ds doc-Me-usage menu_entry ++. ++. ++.\" NS Tn user macro ++.\" NS trade name ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Tn' set in doc-common ++. ++.de Tn ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Tn ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Tn trade_name ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \)\*[doc-Tn-font-size]\c ++. ie !\n[doc-is-reference] \{\ ++. nop \)\*[doc-Tn-font-shape]\c ++. doc-print-recursive ++. \} ++. el \ ++. doc-do-references ++. \} ++. el \{\ ++. tm Usage: .Tn trade_name ... (#\n[.c]) ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS Va user macro ++.\" NS variable name ++.\" NS ++.\" NS width register `Va' set in doc-common ++. ++.als Va doc-generic-macro ++.ds doc-Va-usage variable_name ++. ++. ++.\" NS No user macro ++.\" NS normal text macro (default text style if mess up) ++.\" NS ++.\" NS width register `No' set in doc-common ++. ++.als No doc-generic-macro ++.ds doc-No-usage normal_text ++. ++. ++.\" NS doc-quote-left global string ++.\" NS left quotation character for `doc-enclose-string' and ++.\" NS `doc-enclose-open' ++. ++.ds doc-quote-left ++. ++. ++.\" NS doc-quote-right global string ++.\" NS right quotation character for `doc-enclose-string' and ++.\" NS `doc-enclose-close' ++. ++.ds doc-quote-right ++. ++. ++.\" NS Op user macro ++.\" NS option expression (i.e., enclose string in square brackets) ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Op' set in doc-common ++. ++.de Op ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Op ++. ++. ds doc-quote-left "\*[doc-left-bracket] ++. ds doc-quote-right "\*[doc-right-bracket] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Aq user macro ++.\" NS enclose string in angle brackets ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Aq' set in doc-common ++. ++.de Aq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Aq ++. ++. ie "\*[doc-macro-name]"An" \{\ ++. ds doc-quote-left < ++. ds doc-quote-right > ++. \} ++. el \{\ ++. ds doc-quote-left \[la] ++. ds doc-quote-right \[ra] ++. \} ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Bq user macro ++.\" NS enclose string in square brackets ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Bq' set in doc-common ++. ++.de Bq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Bq ++. ++. ds doc-quote-left "\*[doc-left-bracket] ++. ds doc-quote-right "\*[doc-right-bracket] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Brq user macro ++.\" NS enclose string in braces ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Brq' set in doc-common ++. ++.de Brq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Brq ++. ++. ds doc-quote-left { ++. ds doc-quote-right } ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Dq user macro ++.\" NS enclose string in double quotes ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Dq' set in doc-common ++. ++.de Dq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Dq ++. ++. ds doc-quote-left "\*[Lq] ++. ds doc-quote-right "\*[Rq] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Eq user macro ++.\" NS enclose string in user-defined quotes (args 1 and 2) ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Eq' set in doc-common ++. ++.de Eq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Eq ++. ++. ds doc-quote-left "\$1 ++. ds doc-quote-right "\$2 ++. ++. shift 2 ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Pq user macro ++.\" NS enclose string in parentheses ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Pq' set in doc-common ++. ++.de Pq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Pq ++. ++. ds doc-quote-left "\*[doc-left-parenthesis] ++. ds doc-quote-right "\*[doc-right-parenthesis] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Ql user macro ++.\" NS quoted literal ++.\" ++.\" is in file doc-[dit|n]roff ++. ++. ++.\" NS Qq user macro ++.\" NS enclose string in straight double quotes ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Qq' set in doc-common ++. ++.de Qq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Qq ++. ++. ds doc-quote-left "\*[q] ++. ds doc-quote-right "\*[q] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Sq user macro ++.\" NS enclose string in single quotes ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Sq' set in doc-common ++. ++.de Sq ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Sq ++. ++. ds doc-quote-left "\*[doc-left-singlequote] ++. ds doc-quote-right "\*[doc-right-singlequote] ++. ++. doc-enclose-string \$@ ++.. ++. ++. ++.\" NS Es user macro ++.\" NS set up arguments (i.e., the left and right quotation character as ++.\" NS first and second argument) for .En call ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++. ++.de Es ++. if !\n[doc-arg-limit] \{\ ++. ie (\n[.$] > 2) \{\ ++. ds doc-macro-name Es ++. doc-parse-args \$@ ++. \} ++. el \{\ ++. ds doc-quote-left "\$1 ++. ds doc-quote-right "\$2 ++. \}\} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ds doc-quote-left "\*[doc-arg\n[doc-arg-ptr]] ++. nr doc-arg-ptr +1 ++. ds doc-quote-right "\*[doc-arg\n[doc-arg-ptr]] ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ ++. doc-do-\n[doc-type\n[doc-arg-ptr]] ++. el \ ++. doc-print-and-reset ++.. ++. ++. ++.\" NS doc-have-slot global register (bool) ++.\" NS set if `doc-enclose-string' has created a slot for closing ++.\" NS delimiter ++. ++.nr doc-have-slot 0 ++. ++. ++.\" NS doc-enclose-string macro ++.\" NS enclose string with given args (e.g. [ and ]) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-have-slot ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-des ++.\" NS doc-reg-des1 ++.\" NS doc-reg-des2 ++.\" NS ++.\" NS requires: ++.\" NS doc-quote-left ++.\" NS doc-quote-right ++. ++.de doc-enclose-string ++. if \n[doc-in-synopsis-section] \ ++. doc-set-hard-space ++. ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \ ++. doc-parse-args \$@ ++. el \{\ ++. nop \)\*[doc-quote-left]\*[doc-quote-right] ++. \}\} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. \" the final `\)' prevents hyphenation in case the next character is `\%' ++. nop \)\*[doc-quote-left]\)\c ++. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. \" last argument ++. nop \)\*[doc-quote-right]\)\c ++. doc-print-and-reset ++. \} ++. el \{\ ++. \" test whether last arguments are of type closing punctuation ++. \" resp. suffix ++. ie (\n[doc-type\n[doc-arg-limit]] == 3) \{\ ++. nr doc-reg-des (\n[doc-arg-limit] - 1) ++. while (\n[doc-type\n[doc-reg-des]] == 3) \ ++. nr doc-reg-des -1 ++. ++. \" prepend closing delimiter ++. nr doc-reg-des +1 ++. ds doc-arg\n[doc-reg-des] "\*[doc-quote-right]\)\*[doc-arg\n[doc-reg-des]] ++. \} ++. el \{\ ++. \" test whether last arguments are macros which continue the line ++. \" logically ++. nr doc-reg-des \n[doc-arg-limit] ++. while (\n[doc-reg-des] >= \n[doc-arg-ptr]) \{\ ++. if !\A\*[doc-arg\n[doc-reg-des]] \ ++. break ++. if !d doc-after-\*[doc-arg\n[doc-reg-des]] \ ++. break ++. nr doc-reg-des -1 ++. \} ++. ++. \" if there are no trailing macros to be skipped, append argument ++. ie (\n[doc-reg-des] == \n[doc-arg-limit]) \ ++. doc-append-arg "\)\*[doc-quote-right]\)" 3 ++. el \{\ ++. \" if a previous call to `doc-enclose-string' has already created ++. \" a slot, prepend argument ++. ie \n[doc-have-slot] \ ++. ds doc-arg\n[doc-reg-des] "\*[doc-quote-right]\)\*[doc-arg\n[doc-reg-des]] ++. el \{\ ++. \" we have to shift all arguments to the right ++. nr doc-reg-des +1 ++. nr doc-reg-des1 \n[doc-arg-limit] ++. nr doc-reg-des2 (\n[doc-arg-limit] + 1) ++. while (\n[doc-reg-des1] >= \n[doc-reg-des]) \{\ ++. rn doc-arg\n[doc-reg-des1] doc-arg\n[doc-reg-des2] ++. rnn doc-type\n[doc-reg-des1] doc-type\n[doc-reg-des2] ++. rn doc-space\n[doc-reg-des1] doc-space\n[doc-reg-des2] ++. nr doc-reg-des1 -1 ++. nr doc-reg-des2 -1 ++. \} ++. nr doc-arg-limit +1 ++. ++. \" finally, insert closing delimiter into the freed slot and ++. \" recompute spacing vector ++. ds doc-arg\n[doc-reg-des] "\)\*[doc-quote-right]\) ++. nr doc-type\n[doc-reg-des] 3 ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-reg-des] + 1) ++. nr doc-arg-limit (\n[doc-reg-des] - 1) ++. doc-parse-space-vector ++. nr doc-have-slot 1 ++. \}\}\} ++. ++. doc-do-\n[doc-type\n[doc-arg-ptr]] ++. \} ++. ++. if \n[doc-in-synopsis-section] \ ++. doc-set-soft-space ++.. ++. ++. ++.\" NS En user macro ++.\" NS enclose arguments with quotation characters set up with `.Es' ++. ++.als En doc-enclose-string ++. ++. ++.\" NS Ao user macro ++.\" NS angle open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Ao' set in doc-common ++. ++.de Ao ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Ao ++. ++. ie "\*[doc-macro-name]"An" \ ++. ds doc-quote-left < ++. el \ ++. ds doc-quote-left \[la] ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Ac user macro ++.\" NS angle close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Ac' set in doc-common ++. ++.de Ac ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Ac ++. ++. ie "\*[doc-macro-name]"An" \ ++. ds doc-quote-right > ++. el \ ++. ds doc-quote-right \[ra] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Bo user macro ++.\" NS bracket open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Bo' set in doc-common ++. ++.de Bo ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Bo ++. ++. ds doc-quote-left "\*[doc-left-bracket] ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Bc user macro ++.\" NS bracket close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Bc' set in doc-common ++. ++.de Bc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Bc ++. ++. ds doc-quote-right "\*[doc-right-bracket] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Bro user macro ++.\" NS brace open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Bro' set in doc-common ++. ++.de Bro ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Bo ++. ++. ds doc-quote-left { ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Brc user macro ++.\" NS brace close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Brc' set in doc-common ++. ++.de Brc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Bc ++. ++. ds doc-quote-right } ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Do user macro ++.\" NS double quote open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Do' set in doc-common ++. ++.de Do ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Do ++. ++. ds doc-quote-left "\*[Lq] ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Dc user macro ++.\" NS double quote close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Dc' set in doc-common ++. ++.de Dc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Dc ++. ++. ds doc-quote-right "\*[Rq] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Eo user macro ++.\" NS enclose open (using first argument as beginning of enclosure) ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Eo' set in doc-common ++. ++.de Eo ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Eo ++. ++. ds doc-quote-left "\$1 ++. ++. shift ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Ec user macro ++.\" NS enclose close (using first argument as end of enclosure) ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Ec' set in doc-common ++. ++.de Ec ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Ec ++. ++. ds doc-quote-right "\$1 ++. ++. shift ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Oo user macro ++.\" NS option open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Oo' set in doc-common ++. ++.de Oo ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Oo ++. ++. ds doc-quote-left [ ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Oc user macro ++.\" NS option close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Oc' set in doc-common ++. ++.de Oc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Oc ++. ++. ds doc-quote-right ] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Po user macro ++.\" NS parenthesis open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Po' set in doc-common ++. ++.de Po ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Po ++. ++. ds doc-quote-left "\*[doc-left-parenthesis] ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Pc user macro ++.\" NS parenthesis close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Pc' set in doc-common ++. ++.de Pc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Pc ++. ++. ds doc-quote-right "\*[doc-right-parenthesis] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Qo user macro ++.\" NS straight double quote open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Qo' set in doc-common ++. ++.de Qo ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Qo ++. ++. ds doc-quote-left "\*[q] ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Qc user macro ++.\" NS straight double quote close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Qc' set in doc-common ++. ++.de Qc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Qc ++. ++. ds doc-quote-right "\*[q] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS So user macro ++.\" NS single quote open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `So' set in doc-common ++. ++.de So ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name So ++. ++. ds doc-quote-left "\*[doc-left-singlequote] ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Sc user macro ++.\" NS single quote close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Sc' set in doc-common ++. ++.de Sc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Sc ++. ++. ds doc-quote-right "\*[doc-right-singlequote] ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS Xo user macro ++.\" NS extend open ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Xo' set in doc-common ++. ++.de Xo ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Xo ++. ++. ds doc-quote-left ++. ++. doc-enclose-open \$@ ++.. ++. ++. ++.\" NS Xc user macro ++.\" NS extend close ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS doc-quote-right ++.\" NS ++.\" NS width register `Xc' set in doc-common ++. ++.de Xc ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Xc ++. ++. ds doc-quote-right ++. ++. doc-enclose-close \$@ ++.. ++. ++. ++.\" NS doc-nesting-level global register ++.\" NS used by `doc-enclose-open' and `doc-enclose-close' ++. ++.nr doc-nesting-level 0 ++. ++. ++.\" NS doc-in-list global register (bool) ++.\" NS whether we are in (logical) .It ++. ++.nr doc-in-list 0 ++. ++. ++.\" NS doc-enclose-open macro ++.\" NS enclose string open ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-nesting-level ++. ++.de doc-enclose-open ++. if !\n[doc-arg-limit] \ ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. nr doc-arg-ptr -1 ++. ++. nop \)\*[doc-quote-left]\)\c ++. ++. \" start enclosure box ++. box doc-enclosure-box\n[doc-nesting-level] ++. ev doc-enclosure-env\n[doc-nesting-level] ++. evc 0 ++. in 0 ++. nf ++. \" we insert something to make .chop always work ++. nop \&\c ++. ++. \" increase nesting level *after* parsing of arguments ++. nr doc-nesting-level +1 ++. ++. if \n[doc-arg-limit] \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ ++. doc-print-recursive ++. el \ ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS doc-enclose-close macro ++.\" NS enclose string close ++.\" NS ++.\" NS modifies: ++.\" NS doc-nesting-level ++. ++.de doc-enclose-close ++. nr doc-nesting-level -1 ++. ++. \" finish enclosure box ++. br ++. ev ++. box ++. chop doc-enclosure-box\n[doc-nesting-level] ++. unformat doc-enclosure-box\n[doc-nesting-level] ++. ++. nh ++. nop \*[doc-enclosure-box\n[doc-nesting-level]]\c ++. nop \)\*[doc-quote-right]\)\c ++. ++. if !\n[doc-arg-limit] \{\ ++. doc-parse-args \$@ ++. ++. if !\n[.$] \ ++. doc-print-and-reset ++. \} ++. ++. if \n[doc-arg-limit] \{\ ++. ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nop \)\*[doc-space\n[doc-arg-ptr]]\c ++. nr doc-arg-ptr +1 ++. doc-print-recursive ++. \} ++. el \ ++. doc-print-and-reset ++. \} ++. ++. \" shall we finish .It macro? ++. if !"\*[doc-macro-name]"It" \ ++. if \n[doc-in-list] \ ++. if !\n[doc-nesting-level] \ ++. doc-\*[doc-list-type-stack\n[doc-list-depth]] ++.. ++. ++. ++.\" NS Pf user macro ++.\" NS prefix: `.Pf prefix arg ...' ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-macro-name ++.\" NS doc-quote-left ++.\" NS ++.\" NS width register `Pf' set in doc-common ++. ++.de Pf ++. if !\n[doc-arg-limit] \ ++. ds doc-macro-name Pf ++. ++. ie \n[doc-arg-limit] \{\ ++. ie ((\n[doc-arg-limit] - \n[doc-arg-ptr]) > 1) \{\ ++. nr doc-arg-ptr +1 ++. nop \)\*[doc-arg\n[doc-arg-ptr]]\c ++. \} ++. el \ ++. tm mdoc warning: .Pf: trailing prefix (#\n[.c]) ++. \} ++. el \{\ ++. nop \)\$1\)\c ++. shift ++. ie \n[.$] \ ++. doc-parse-args \$@ ++. el \{\ ++. tm mdoc warning: .Pf: missing arguments (#\n[.c]) ++. nop \) ++. \}\} ++. ++. if \n[doc-arg-limit] \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \ ++. doc-print-and-reset ++. el \ ++. doc-do-\n[doc-type\n[doc-arg-ptr]] ++. \} ++.. ++. ++. ++.\" NS Ns user macro ++.\" NS remove space (space removal done by `doc-parse-args') ++.\" NS ++.\" NS modifies: ++.\" NS doc-argXXX ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Ns' set in doc-common ++. ++.de Ns ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Ns ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Ns must be called with arguments (#\n[.c]) ++. \} ++. ++. if \n[doc-arg-limit] \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ ++. doc-print-recursive ++. el \ ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS Ap user macro ++.\" NS append an apostrophe ++.\" NS ++.\" NS width register `Ap' set in doc-common ++. ++.de Ap ++. ie !\n[doc-arg-limit] \ ++. tm Usage: `Ap' cannot be first macro on a line (no `.Ap') (#\n[.c]) ++. el \{\ ++. nop \)'\)\c ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ ++. doc-print-recursive ++. el \ ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS doc-space global string ++.\" NS current inter-argument space ++. ++.ds doc-space "\*[doc-soft-space] ++. ++. ++.\" NS doc-soft-space constant string ++.\" NS soft (stretchable) space (defined in doc-common) ++. ++. ++.\" NS doc-hard-space constant string ++.\" NS hard (unpaddable) space (defined in doc-common) ++. ++. ++.\" NS doc-set-hard-space macro ++.\" NS set current space string to hard (unpaddable) space. ++.\" NS ++.\" NS modifies: ++.\" NS doc-saved-space ++.\" NS doc-space ++. ++.de doc-set-hard-space ++. ie "\*[doc-space]"" \ ++. ds doc-saved-space "\*[doc-hard-space] ++. el \ ++. ds doc-space "\*[doc-hard-space] ++.. ++. ++. ++.\" NS doc-set-soft-space macro ++.\" NS set current space string to soft space ++.\" NS ++.\" NS modifies: ++.\" NS doc-saved-space ++.\" NS doc-space ++. ++.de doc-set-soft-space ++. ie "\*[doc-space]"" \ ++. ds doc-saved-space "\*[doc-soft-space] ++. el \ ++. ds doc-space "\*[doc-soft-space] ++.. ++. ++. ++.\" NS doc-space-mode global register (bool) ++.\" NS default is one (space mode on) ++. ++.nr doc-space-mode 1 ++. ++. ++.\" NS doc-saved-space global string ++.\" NS saved value of `doc-space' ++. ++.ds doc-saved-space "\*[doc-space] ++. ++. ++.\" NS doc-have-space global register (bool) ++.\" NS set if last command was horizontal space ++. ++.nr doc-have-space 0 ++. ++. ++.\" NS Sm user macro ++.\" NS space mode (`.Sm'/`.Sm on'/`.Sm off') ++.\" NS ++.\" NS without argument, toggle space mode ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-limit ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-macro-name ++.\" NS doc-num-args ++.\" NS doc-saved-space ++.\" NS doc-space ++.\" NS doc-space-mode ++.\" NS doc-spaceXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Sm ++.\" NS ++.\" NS width register `Sm' set in doc-common ++. ++.de Sm ++. ie \n[doc-have-space] \ ++. nr doc-reg-Sm 0 ++. el \ ++. nr doc-reg-Sm 1 ++. ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Sm ++. doc-parse-args \$@ ++. \} ++. el \{\ ++. ie \n[doc-space-mode] \{\ ++. ds doc-saved-space "\*[doc-space] ++. ds doc-space ++. nr doc-space-mode 0 ++. \} ++. el \{\ ++. ds doc-space "\*[doc-saved-space] ++. nr doc-space-mode 1 ++. ++. \" finish line only if it is interrupted and `doc-have-space' ++. \" isn't set ++. if \n[doc-reg-Sm] \ ++. if \n[.int] \ ++. nop \) ++. \} ++. \}\} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. ++. \" avoid a warning message in case `Sm' is the last parameter ++. if !d doc-arg\n[doc-arg-ptr] \ ++. ds doc-arg\n[doc-arg-ptr] ++. ++. ie "\*[doc-arg\n[doc-arg-ptr]]"on" \{\ ++. ds doc-space "\*[doc-saved-space] ++. nr doc-space-mode 1 ++. \} ++. el \{\ ++. ie "\*[doc-arg\n[doc-arg-ptr]]"off" \{\ ++. ds doc-saved-space "\*[doc-space] ++. ds doc-space ++. nr doc-space-mode 0 ++. \} ++. el \{\ ++. \" no argument for Sm ++. nr doc-arg-ptr -1 ++. ie \n[doc-space-mode] \{\ ++. ds doc-saved-space "\*[doc-space] ++. ds doc-space ++. nr doc-space-mode 0 ++. \} ++. el \{\ ++. ds doc-space "\*[doc-saved-space] ++. nr doc-space-mode 1 ++. \} ++. \}\} ++. ++. ie \n[doc-space-mode] \{\ ++. \" recompute space vector for remaining arguments ++. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) ++. nr doc-arg-limit \n[doc-arg-ptr] ++. if \n[doc-num-args] \ ++. doc-parse-space-vector ++. ++. \" finish line only if it is interrupted and `doc-have-space' ++. \" isn't set ++. if \n[doc-reg-Sm] \ ++. if \n[.int] \ ++. nop \) ++. \} ++. el \{\ ++. \" reset remaining space vector elements ++. nr doc-reg-Sm (\n[doc-arg-ptr] + 1) ++. while (\n[doc-reg-Sm] <= \n[doc-arg-limit]) \{\ ++. ds doc-space\n[doc-reg-Sm] ++. nr doc-reg-Sm +1 ++. \" the body of a `while' request must end with the fitting `\}'! ++. \} ++. \} ++. ++. \" do we have parameters to print? ++. ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. \" skip `Sm' argument ++. nr doc-arg-ptr +1 ++. doc-print-recursive ++. \} ++. el \ ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-arg-type immediate register ++.\" NS argument type (macro=1, string=2, punctuation suffix=3, ++.\" NS punctuation prefix=4) ++. ++.nr doc-arg-type 0 ++. ++. ++.\" NS doc-get-arg-type macro ++.\" NS get argument type ++.\" NS ++.\" NS this macro expects the width of the argument in `doc-width' ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-type ++. ++.de doc-get-arg-type ++. nr doc-arg-type 2 ++. ++. if ((\n[doc-width] < 4) & \A\$1) \{\ ++. ie (\n[doc-width] == 1) \{\ ++. if r doc-punct\$1 \ ++. nr doc-arg-type \n[doc-punct\$1] ++. \} ++. el \ ++. if r \$1 \ ++. if d \$1 \ ++. nr doc-arg-type 1 ++. \} ++.. ++. ++. ++.\" NS doc-get-arg-type* macro ++.\" NS similar to as `doc-get-arg-type' but uses doc-argXXX strings ++.\" NS ++.\" NS this macro sets the `doc-width' register using the `length' request ++.\" NS to get the number of characters in a string literally ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-type ++.\" NS doc-width ++. ++.de doc-get-arg-type* ++. nr doc-arg-type 2 ++. length doc-width "\*[doc-arg\$1] ++. ++. if ((\n[doc-width] < 4) & \A\*[doc-arg\$1]) \{\ ++. ie (\n[doc-width] == 1) \{\ ++. if r doc-punct\*[doc-arg\$1] \ ++. nr doc-arg-type \n[doc-punct\*[doc-arg\$1]] ++. \} ++. el \ ++. if r \*[doc-arg\$1] \ ++. if d \*[doc-arg\$1] \ ++. nr doc-arg-type 1 ++. \} ++.. ++. ++. ++.\" NS doc-set-spacing-1 macro ++.\" NS set spacing for macros ++.\" NS ++.\" NS modifies: ++.\" NS doc-spaceXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dssfm ++.\" NS doc-reg-dssfm1 ++. ++.de doc-set-spacing-1 ++. nr doc-reg-dssfm1 \n[\*[doc-arg\n[doc-arg-limit]]] ++. ++. \" closing macros like .Ac, Bc., etc. have value 3 (remove space before ++. \" argument) ++. ie (\n[doc-reg-dssfm1] == 3) \{\ ++. if \n[doc-arg-limit] \{\ ++. nr doc-reg-dssfm (\n[doc-arg-limit] - 1) ++. ds doc-space\n[doc-reg-dssfm] ++. \} ++. ds doc-space\n[doc-arg-limit] "\*[doc-space] ++. \} ++. el \{\ ++. \" macros like .Ap and .Ns have value 2 (remove space before and after ++. \" argument) ++. ie (\n[doc-reg-dssfm1] == 2) \{\ ++. if \n[doc-arg-limit] \{\ ++. nr doc-reg-dssfm (\n[doc-arg-limit] - 1) ++. ds doc-space\n[doc-reg-dssfm] ++. \} ++. ds doc-space\n[doc-arg-limit] ++. \} ++. el \ ++. ds doc-space\n[doc-arg-limit] ++. \} ++.. ++. ++. ++.\" NS doc-set-spacing-2 macro ++.\" NS set spacing for strings ++.\" NS ++.\" NS modifies: ++.\" NS doc-spaceXXX ++. ++.de doc-set-spacing-2 ++. ds doc-space\n[doc-arg-limit] "\*[doc-space] ++.. ++. ++. ++.\" NS doc-set-spacing-3 macro ++.\" NS set spacing for punctuation suffixes ++.\" NS ++.\" NS modifies: ++.\" NS doc-spaceXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dssfps ++. ++.de doc-set-spacing-3 ++. if \n[doc-arg-limit] \{\ ++. nr doc-reg-dssfps (\n[doc-arg-limit] - 1) ++. ds doc-space\n[doc-reg-dssfps] ++. \} ++. ++. ds doc-space\n[doc-arg-limit] "\*[doc-space] ++.. ++. ++. ++.\" NS doc-set-spacing-4 macro ++.\" NS set spacing for punctuation prefixes ++.\" NS ++.\" NS modifies: ++.\" NS doc-spaceXXX ++. ++.de doc-set-spacing-4 ++. ds doc-space\n[doc-arg-limit] ++.. ++. ++. ++.\" type switches (on current argument doc-arg-ptr) ++. ++. ++.\" NS doc-do-1 macro ++.\" NS call request if macro ++. ++.de doc-do-1 ++. \*[doc-arg\n[doc-arg-ptr]] ++.. ++. ++. ++.\" NS doc-do-2 macro ++.\" NS call .doc-print-recursive if string ++. ++.als doc-do-2 doc-print-recursive ++. ++. ++.\" NS doc-do-3 macro ++.\" NS call .doc-print-recursive if punctuation suffix ++. ++.als doc-do-3 doc-print-recursive ++. ++. ++.\" NS doc-do-4 macro ++.\" NS call .doc-print-recursive if punctuation prefix ++. ++.als doc-do-4 doc-print-recursive ++. ++. ++.\" NS doc-fontmode-depth global register ++.\" NS font mode level ++. ++.nr doc-fontmode-depth 0 ++. ++. ++.\" NS doc-fontmode-font-stackXXX global register ++.\" NS stack of saved current font values from `Bf' macro ++.\" NS ++.\" NS limit: ++.\" NS doc-fontmode-depth ++. ++.nr doc-fontmode-font-stack0 0 ++. ++. ++.\" NS doc-fontmode-size-stackXXX global register ++.\" NS stack of saved current size values from `Bf' macro ++.\" NS ++.\" NS limit: ++.\" NS doc-fontmode-depth ++. ++.nr doc-fontmode-size-stack0 0 ++. ++. ++.\" NS Bf user macro ++.\" NS begin font mode (will be begin-mode/end-mode in groff & TeX) ++.\" NS ++.\" NS modifies: ++.\" NS doc-fontmode-depth ++.\" NS doc-fontmode-font-stackXXX ++.\" NS doc-fontmode-size-stackXXX ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Bf' set in doc-common ++. ++.de Bf ++. ds doc-macro-name Bf ++. ++. ie \n[.$] \{\ ++. nr doc-fontmode-depth +1 ++. ++. \" save current font and size ++. nr doc-fontmode-font-stack\n[doc-fontmode-depth] \n[.f] ++. nr doc-fontmode-size-stack\n[doc-fontmode-depth] \n[.ps] ++. ++. ie "\$1"Em" \ ++. nop \*[doc-Em-font]\c ++. el \{ .ie "\$1"Li" \ ++. nop \*[doc-Li-font]\c ++. el \{ .ie "\$1"Sy" \ ++. nop \*[doc-Sy-font]\c ++. el \{ .ie "\$1"-emphasis" \ ++. nop \*[doc-Em-font]\c ++. el \{ .ie "\$1"-literal" \ ++. nop \*[doc-Li-font]\c ++. el \{ .ie "\$1"-symbolic" \ ++. nop \*[doc-Sy-font]\c ++. el \{\ ++. tmc mdoc warning: Unknown keyword `\$1' in .Bf macro ++. tm1 " (#\n[.c]) ++. \}\}\}\}\}\}\} ++. el \ ++. tm Usage: .Bf [Em | -emphasis | Li | -literal | Sy | -symbolic] (#\n[.c]) ++.. ++. ++. ++.\" NS Ef user macro ++.\" NS end font mode ++.\" NS ++.\" NS modifies: ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Ef' set in doc-common ++. ++.de Ef ++. ds doc-macro-name Ef ++. ++. ie \n[doc-fontmode-depth] \{\ ++. \" restore saved font and size ++. nop \)\f[\n[doc-fontmode-font-stack\n[doc-fontmode-depth]]]\c ++. nop \)\s[\n[doc-fontmode-size-stack\n[doc-fontmode-depth]]u]\c ++. ++. nr doc-fontmode-font-stack\n[doc-fontmode-depth] 0 ++. nr doc-curr-font \n[.f] ++. nr doc-fontmode-size-stack\n[doc-fontmode-depth] 0 ++. nr doc-curr-size \n[.ps] ++. nr doc-fontmode-depth -1 ++. \} ++. el \ ++. tm mdoc warning: Extraneous .Ef (#\n[.c]) ++.. ++. ++. ++.\" NS doc-keep-type global register ++.\" NS current keep type; 1 is `-words', 2 is `-lines', 3 is unknown ++. ++.nr doc-keep-type 0 ++. ++. ++.\" NS Bk user macro ++.\" NS begin keep ++.\" NS ++.\" NS modifies: ++.\" NS doc-keep-type ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Bk' set in doc-common ++. ++.de Bk ++. ds doc-macro-name Bk ++. ++. if \n[doc-keep-type] \ ++. tm .Bk: nesting keeps not implemented yet. (#\n[.c]) ++. ++. ie "\$1"-lines" \{\ ++. nr doc-keep-type 2 ++. tm .Bk -lines: Not implemented yet. (#\n[.c]) ++. \} ++. el \{ .ie "\$1"-words" \{\ ++. nr doc-keep-type 1 ++. doc-set-hard-space ++. \} ++. el \{ .ie "\$1"" \{\ ++. \" default ++. nr doc-keep-type 1 ++. doc-set-hard-space ++. \} ++. el \{\ ++. tm mdoc warning: Unknown keyword `\$1' in .Bk macro (#\n[.c]) ++. nr doc-keep-type 3 ++. \}\}\} ++. ++\#. nr doc-nesting-level +1 ++.. ++. ++. ++.\" NS Ek user macro ++.\" NS end keep ++.\" NS ++.\" NS modifies: ++.\" NS doc-keep-type ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Ek' set in doc-common ++. ++.de Ek ++. ds doc-macro-name Ek ++. ++\#. nr doc-nesting-level -1 ++. ++. ie \n[.$] \ ++. tm Usage: .Ek (does not take arguments) (#\n[.c]) ++. el \{\ ++. if !\n[doc-keep-type] \ ++. tm mdoc warning: .Ek found without .Bk before (#\n[.c]) ++. ++. ie (\n[doc-keep-type] == 1) \ ++. doc-set-soft-space ++. el \{ .if (\n[doc-keep-type] == 2) \ ++. tm .Bk -lines: Not implemented yet. (#\n[.c]) ++. \}\} ++. ++. nr doc-keep-type 0 ++. ++\#. if !"\*[doc-out-string]"" \ ++\#. doc-print-out-string ++.. ++. ++. ++.\" NS doc-display-depth global register ++.\" NS display level ++. ++.nr doc-display-depth 0 ++. ++. ++.\" NS doc-is-compact global register (bool) ++.\" NS set if the `compact' keyword is given ++. ++.nr doc-is-compact 0 ++. ++. ++.\" NS doc-display-type-stackXXX global string ++.\" NS the display type stack ++.\" NS ++.\" NS limit: ++.\" NS doc-display-depth ++. ++.ds doc-display-type-stack0 ++. ++. ++.\" NS doc-display-indent-stackXXX global register ++.\" NS stack of display indentation values ++.\" NS ++.\" NS limit: ++.\" NS doc-display-depth ++. ++.nr doc-display-indent-stack0 0 ++. ++. ++.\" NS doc-display-ad-stackXXX global register ++.\" NS stack of saved adjustment modes ++.\" NS ++.\" NS limit: ++.\" NS doc-display-depth ++. ++.nr doc-display-ad-stack0 0 ++. ++. ++.\" NS doc-display-fi-stackXXX global register ++.\" NS stack of saved fill modes ++.\" NS ++.\" NS limit: ++.\" NS doc-display-depth ++. ++.nr doc-display-fi-stack0 0 ++. ++. ++.\" NS doc-display-ft-stackXXX global register ++.\" NS stack of saved fonts ++.\" NS ++.\" NS limit: ++.\" NS doc-display-depth ++. ++.nr doc-display-ft-stack0 0 ++. ++. ++.\" NS doc-display-ps-stackXXX global register ++.\" NS stack of saved font sizes ++.\" NS ++.\" NS limit: ++.\" NS doc-display-depth ++. ++.nr doc-display-ps-stack0 0 ++. ++. ++.\" NS Bd user macro ++.\" NS begin display ++.\" NS ++.\" NS width register `Bd' set in doc-common ++.\" NS ++.\" NS modifies: ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-display-depth ++.\" NS doc-display-ad-stackXXX ++.\" NS doc-display-fi-stackXXX ++.\" NS doc-display-ft-stackXXX ++.\" NS doc-display-ps-stackXXX ++.\" NS doc-display-file ++.\" NS doc-display-indent-stackXXX ++.\" NS doc-display-type-stackXXX ++.\" NS doc-is-compact ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Bd ++. ++.de Bd ++. ds doc-macro-name Bd ++. ++. if !\n[.$] \{\ ++. tm1 "Usage: .Bd {-literal | -filled | -ragged | -centered | -unfilled} ++. tm1 " [-offset [string]] [-compact] [-file name] (#\n[.c]) ++. return ++. \} ++. ++. nr doc-is-compact 0 ++. ds doc-display-file ++. nr doc-reg-Bd 1 ++. nr doc-display-depth +1 ++. ++. \" save current adjustment and fill modes ++. nr doc-display-ad-stack\n[doc-display-depth] \n[.j] ++. nr doc-display-fi-stack\n[doc-display-depth] \n[.u] ++. ++. ie "\$1"-literal" \{\ ++. ds doc-display-type-stack\n[doc-display-depth] literal ++. nr doc-display-ft-stack\n[doc-display-depth] \n[.f] ++. nr doc-display-ps-stack\n[doc-display-depth] \n[.ps] ++. ++. ie t \ ++. ta T 9n ++. el \ ++. ta T 8n ++. nf ++. \} ++. el \{ .ie "\$1"-filled" \{\ ++. ds doc-display-type-stack\n[doc-display-depth] filled ++. ad b ++. fi ++. \} ++. el \{ .ie "\$1"-ragged" \{\ ++. ds doc-display-type-stack\n[doc-display-depth] ragged ++. na ++. fi ++. \} ++. el \{ .ie "\$1"-centered" \{\ ++. ds doc-display-type-stack\n[doc-display-depth] centered ++. ad c ++. fi ++. \} ++. el \{ .ie "\$1"-unfilled" \{\ ++. ds doc-display-type-stack\n[doc-display-depth] unfilled ++. nf ++. \} ++. el \{\ ++. tm1 "mdoc warning: Unknown keyword `\$1' (or missing display type) ++. tm1 " in .Bd macro (#\n[.c]) ++. nr doc-reg-Bd 0 ++. \}\}\}\}\} ++. ++. \" have we seen an argument? ++. if \n[doc-reg-Bd] \{\ ++. shift ++. \" check other arguments ++. if \n[.$] \ ++. doc-do-Bd-args \$@ ++. \} ++. ++. \" avoid warning about non-existent register ++. if !r doc-display-indent-stack\n[doc-display-depth] \ ++. nr doc-display-indent-stack\n[doc-display-depth] 0 ++. ++. if \n[doc-display-indent-stack\n[doc-display-depth]] \ ++. in +\n[doc-display-indent-stack\n[doc-display-depth]]u ++. ++. if !\n[doc-is-compact] \ ++. sp \n[doc-display-vertical]u ++. ++. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \ ++. if t \ ++. nop \*[doc-Li-font]\c ++. ++. if !\n[cR] \ ++. ne 2v ++. ++. if !"\*[doc-display-file]"" \ ++. so \*[doc-display-file] ++. ++. nr doc-is-compact 0 ++. ds doc-display-file ++.. ++. ++. ++.\" NS doc-do-Bd-args macro ++.\" NS resolve remaining .Bd arguments ++.\" NS ++.\" NS modifies: ++.\" NS doc-display-file ++.\" NS doc-display-indent-stackXXX ++.\" NS doc-is-compact ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-ddBa ++.\" NS doc-reg-ddBa1 ++.\" NS doc-reg-ddBa2 ++.\" NS doc-reg-ddBa3 ++.\" NS doc-reg-ddBa4 ++.\" NS doc-str-ddBa ++. ++.de doc-do-Bd-args ++. nr doc-reg-ddBa 1 ++. ++. ie "\$1"-offset" \{\ ++. nr doc-reg-ddBa 2 ++. ++. ie "\$2"left" \ ++. nr doc-display-indent-stack\n[doc-display-depth] 0 ++. el \{ .ie "\$2"right" \ ++. nr doc-display-indent-stack\n[doc-display-depth] (\n[.l]u / 3u) ++. el \{ .ie "\$2"center" \ ++. nr doc-display-indent-stack\n[doc-display-depth] ((\n[.l]u - \n[.i]u) / 4u) ++. el \{ .ie "\$2"indent" \ ++. nr doc-display-indent-stack\n[doc-display-depth] \n[doc-display-indent]u ++. el \{ .ie "\$2"indent-two" \ ++. nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-display-indent]u + \n[doc-display-indent]u) ++. el \ ++. nr doc-reg-ddBa 1 ++. \}\}\}\} ++. ++. \" not a known keyword ++. if (\n[doc-reg-ddBa] == 1) \{\ ++. nr doc-reg-ddBa 2 ++. ++. nr doc-reg-ddBa1 0 ++. if \B(\$2) \{\ ++. \" disable warnings related to scaling indicators (32) ++. nr doc-reg-ddBa2 \n[.warn] ++. warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32)) ++. ++. \" values without a scaling indicator are taken as strings; ++. \" we test whether the parameter string with and without the last ++. \" character yields identical numerical results (ignoring the ++. \" scaling indicator) ++. ds doc-str-ddBa "\$2 ++. substring doc-str-ddBa 0 -2 ++. if \B(\*[doc-str-ddBa]) \{\ ++. nr doc-reg-ddBa3 (;(\$2)) ++. nr doc-reg-ddBa4 (\*[doc-str-ddBa]) ++. if (\n[doc-reg-ddBa3] == \n[doc-reg-ddBa4]) \ ++. nr doc-reg-ddBa1 1 ++. \} ++. ++. \" enable all warnings again ++. warn \n[doc-reg-ddBa2] ++. \} ++. ++. ie \n[doc-reg-ddBa1] \ ++. nr doc-display-indent-stack\n[doc-display-depth] \$2 ++. el \{\ ++. doc-get-width "\$2" ++. ie (\n[doc-width] <= 3) \{\ ++. \" if the offset parameter is a macro, use the macro's ++. \" width as specified in doc-common ++. doc-get-arg-type "\$2" ++. ie (\n[doc-arg-type] == 1) \ ++. nr doc-display-indent-stack\n[doc-display-depth] \n[\$2] ++. el \ ++. nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \} ++. el \ ++. nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \}\} ++. \} ++. el \{ .ie "\$1"-compact" \ ++. nr doc-is-compact 1 ++. el \{ .ie "\$1"-file" \{\ ++. ie !"\$2"" \{\ ++. ds doc-display-file "\$2 ++. nr doc-reg-ddBa 2 ++. \} ++. el \ ++. tm mdoc warning: .Bd `-file' keyword requires argument (#\n[.c]) ++. \} ++. el \ ++. tm mdoc warning: Unknown keyword `\$1' in .Bd macro (#\n[.c]) ++. \}\} ++. ++. if (\n[doc-reg-ddBa] < \n[.$]) \{\ ++. shift \n[doc-reg-ddBa] ++. doc-do-Bd-args \$@ ++. \} ++.. ++. ++. ++.\" NS Ed user macro ++.\" NS end display ++.\" NS ++.\" NS modifies: ++.\" NS doc-display-depth ++.\" NS doc-display-indent-stackXXX ++.\" NS doc-display-type-stackXXX ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Ed' set in doc-common ++. ++.de Ed ++. ds doc-macro-name Ed ++. ++. br ++. ++. if !\n[doc-display-depth] \{\ ++. tm mdoc warning: Extraneous .Ed (#\n[.c]) ++. nr doc-display-depth 1 ++. \} ++. ++. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \{\ ++. ft \n[doc-display-ft-stack\n[doc-display-depth]] ++. ps \n[doc-display-ps-stack\n[doc-display-depth]]u ++. \} ++. ++. in -\n[doc-display-indent-stack\n[doc-display-depth]]u ++. ++. \" restore saved adjustment and fill modes ++. ie \n[doc-display-fi-stack\n[doc-display-depth]] \ ++. fi ++. el \ ++. nf ++. ad \n[doc-display-ad-stack\n[doc-display-depth]] ++. ++. nr doc-display-indent-stack\n[doc-display-depth] 0 ++. ds doc-display-type-stack\n[doc-display-depth] ++. nr doc-display-depth -1 ++.. ++. ++. ++.\" NS doc-list-type-stackXXX global string ++.\" NS stack of list types ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.ds doc-list-type-stack1 ++. ++. ++.\" NS doc-list-indent-stackXXX global register ++.\" NS stack of list indentation values ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.nr doc-list-indent-stack1 0 ++. ++. ++.\" NS doc-list-have-indent-stackXXX global register (bool) ++.\" NS an indentation value is active ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.nr doc-list-have-indent-stack1 0 ++. ++. ++.\" NS Bl user macro ++.\" NS begin list ++.\" NS ++.\" NS width register `Bl' set in doc-common ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-list-depth ++.\" NS doc-list-have-indent-stackXXX ++.\" NS doc-list-indent-stackXXX ++.\" NS doc-list-type-stackXXX ++.\" NS doc-macro-name ++.\" NS doc-num-args ++.\" NS doc-num-columns ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Bl ++. ++.de Bl ++. if !\n[.$] \{\ ++. doc-Bl-usage ++. return ++. \} ++. ++. ds doc-macro-name Bl ++. nr doc-list-depth +1 ++. nr doc-arg-ptr 1 ++. ++. ie "\$1"-hang" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] hang-list ++. nr doc-list-indent-stack\n[doc-list-depth] 6n ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-tag" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] tag-list ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-item" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] item-list ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-enum" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] enum-list ++. nr doc-list-indent-stack\n[doc-list-depth] 3n ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-bullet" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] bullet-list ++. nr doc-list-indent-stack\n[doc-list-depth] 2n ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-dash" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] dash-list ++. nr doc-list-indent-stack\n[doc-list-depth] 2n ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-hyphen" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] dash-list ++. nr doc-list-indent-stack\n[doc-list-depth] 2n ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-inset" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] inset-list ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-diag" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] diag-list ++. \} ++. el \{ .ie "\$1"-ohang" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] ohang-list ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. el \{ .ie "\$1"-column" \{\ ++. ds doc-list-type-stack\n[doc-list-depth] column-list ++. linetabs 1 ++. \} ++. el \{\ ++. tm1 "mdoc warning: Unknown list type `\$1' (or missing list type) ++. tm1 " in .Bl macro ++. tm ++. nr doc-arg-ptr 0 ++. \}\}\}\}\}\}\}\}\}\}\} ++. ++. \" we have seen a list type ++. if !\n[doc-arg-ptr] \{\ ++. doc-Bl-usage ++. doc-reset-args ++. nr doc-list-depth -1 ++. return ++. \} ++. ++. shift ++. ++. \" fill argument vector ++. nr doc-reg-Bl 1 ++. while (\n[doc-reg-Bl] <= \n[.$]) \{\ ++. ds doc-arg\n[doc-reg-Bl] "\$[\n[doc-reg-Bl]] ++. \" dummy type and space so that doc-save-global-vars() doesn't warn ++. nr doc-type\n[doc-reg-Bl] 0 ++. ds doc-space\n[doc-reg-Bl] ++. nr doc-reg-Bl +1 ++. \} ++. ++. doc-increment-list-stack ++. ++. if \n[.$] \{\ ++. nr doc-arg-limit \n[.$] ++. nr doc-arg-ptr 0 ++. doc-do-Bl-args ++. ++. in +\n[doc-list-offset-stack\n[doc-list-depth]]u ++. ++. \" initialize column list ++. if "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\ ++. doc-set-column-tab \n[doc-num-columns] ++' in -\n[doc-column-indent-width]u ++. if !\n[doc-compact-list-stack\n[doc-list-depth]] \ ++. sp \n[doc-display-vertical]u ++. ++. nf ++. nr doc-num-columns 0 ++. \}\} ++. ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-Bl-usage macro ++. ++.de doc-Bl-usage ++. tm1 "Usage: .Bl {-hang | -ohang | -tag | -diag | -inset} ++. tm1 " [-width ] ++. tm1 " [-offset ] [-compact] ++. tm1 " .Bl -column [-offset ] ... ++. tm1 " .Bl {-item | -enum [-nested] | -bullet | -hyphen | -dash} ++. tm1 " [-offset ] [-compact] (#\n[.c]) ++.. ++. ++. ++.\" NS doc-do-Bl-args macro ++.\" NS resolve remaining .Bl arguments ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-compact-list-stackXXX ++.\" NS doc-list-indent-stackXXX ++.\" NS doc-list-offset-stackXXX ++.\" NS doc-num-columns ++.\" NS doc-tag-prefix-stackXXX ++.\" NS doc-tag-width-stackXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-box-dBla ++.\" NS doc-env-dBla ++.\" NS doc-reg-dBla ++.\" NS doc-reg-dBla1 ++.\" NS doc-reg-dBla2 ++.\" NS doc-reg-dBla3 ++.\" NS doc-reg-dBla4 ++.\" NS doc-str-dBla ++.\" NS doc-str-dBla1 ++. ++.de doc-do-Bl-args ++. nr doc-arg-ptr +1 ++. ++. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \ ++. return ++. ++. \" avoid a warning message in case e.g. `-offset' has no parameter ++. nr doc-reg-dBla (\n[doc-arg-ptr] + 1) ++. if (\n[doc-arg-limit] < \n[doc-reg-dBla]) \ ++. ds doc-arg\n[doc-reg-dBla] ++. ++. nr doc-reg-dBla 1 ++. ++. ie "\*[doc-arg\n[doc-arg-ptr]]"-compact" \ ++. nr doc-compact-list-stack\n[doc-list-depth] 1 ++. ++. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-nested" \{\ ++. ie (\n[doc-list-depth] > 1) \{\ ++. nr doc-reg-dBla1 (\n[doc-list-depth] - 1) ++. ds doc-tag-prefix-stack\n[doc-list-depth] "\*[doc-tag-prefix-stack\n[doc-reg-dBla1]] ++. as doc-tag-prefix-stack\n[doc-list-depth] \n[doc-enum-list-count-stack\n[doc-reg-dBla1]]. ++. length doc-reg-dBla1 "\*[doc-tag-prefix-stack\n[doc-list-depth]] ++. nr doc-list-indent-stack\n[doc-list-depth] +\n[doc-reg-dBla1]n ++. \} ++. el \ ++. tm mdoc warning: `-nested' allowed with nested .Bl macros only (#\n[.c]) ++. \} ++. ++. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-width" \{\ ++. nr doc-arg-ptr +1 ++. ds doc-tag-width-stack\n[doc-list-depth] TagwidtH ++. ++. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] ++. substring doc-str-dBla 0 0 ++. ie .\*[doc-str-dBla] \{\ ++. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] ++. substring doc-str-dBla 1 ++. doc-first-parameter \*[doc-str-dBla] ++. doc-get-width "\*[doc-str-dfp] ++. doc-get-arg-type "\*[doc-str-dfp] ++. ie (\n[doc-arg-type] == 1) \ ++. nr doc-reg-dBla1 1 ++. el \ ++. nr doc-reg-dBla1 0 ++. \} ++. el \ ++. nr doc-reg-dBla1 0 ++. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] ++. ++. ie \n[doc-reg-dBla1] \{\ ++. \" execute string in a box to get the width of the diversion ++. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]] ++. doc-save-global-vars ++. doc-reset-args ++. box doc-box-dBla ++. ev doc-env-dBla ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-str-dBla] ++. br ++. ev ++. box ++. doc-restore-global-vars ++. doc-get-width \h'\n[dl]u' ++. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \} ++. el \{\ ++. \" test whether argument is a valid numeric expression ++. nr doc-reg-dBla1 0 ++. if \B(\*[doc-str-dBla]) \{\ ++. \" disable warnings related to scaling indicators (32) ++. nr doc-reg-dBla2 \n[.warn] ++. warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32)) ++. ++. \" values without a scaling indicator are taken as strings; ++. \" we test whether the parameter string with and without the last ++. \" character yields identical numerical results (ignoring the ++. \" scaling indicator) ++. ds doc-str-dBla1 "\*[doc-str-dBla] ++. substring doc-str-dBla1 0 -2 ++. if \B(\*[doc-str-dBla1]) \{\ ++. nr doc-reg-dBla3 (;(\*[doc-str-dBla])) ++. nr doc-reg-dBla4 (\*[doc-str-dBla1]) ++. if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \ ++. nr doc-reg-dBla1 1 ++. \} ++. ++. \" enable all warnings again ++. warn \n[doc-reg-dBla2] ++. \} ++. ++. ie \n[doc-reg-dBla1] \ ++. nr doc-list-indent-stack\n[doc-list-depth] (\*[doc-str-dBla]) ++. el \{\ ++. doc-get-arg-width \n[doc-arg-ptr] ++. ie (\n[doc-width] == 2) \{\ ++. \" if the width parameter is a macro, use the macro's ++. \" width as specified in doc-common ++. doc-get-arg-type \*[doc-str-dBla] ++. ie (\n[doc-arg-type] == 1) \ ++. nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-str-dBla]] ++. el \ ++. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \} ++. el \ ++. nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \}\}\} ++. ++. el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-offset" \{\ ++. nr doc-arg-ptr +1 ++. ++. ie "\*[doc-arg\n[doc-arg-ptr]]"indent" \ ++. nr doc-list-offset-stack\n[doc-list-depth] \n[doc-display-indent]u ++. el \{\ ++. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] ++. nr doc-reg-dBla1 0 ++. if \B(\*[doc-str-dBla]) \{\ ++. nr doc-reg-dBla2 \n[.warn] ++. warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32)) ++. ++. ds doc-str-dBla1 "\*[doc-str-dBla] ++. substring doc-str-dBla1 0 -2 ++. if \B(\*[doc-str-dBla1]) \{\ ++. nr doc-reg-dBla3 (;(\*[doc-str-dBla])) ++. nr doc-reg-dBla4 (\*[doc-str-dBla1]) ++. if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \ ++. nr doc-reg-dBla1 1 ++. \} ++. ++. warn \n[doc-reg-dBla2] ++. \} ++. ++. ie \n[doc-reg-dBla1] \ ++. nr doc-list-offset-stack\n[doc-list-depth] \*[doc-str-dBla] ++. el \{\ ++. doc-get-arg-width \n[doc-arg-ptr] ++. ie (\n[doc-width] <= 3) \{\ ++. \" if the offset parameter is a macro, use the macro's ++. \" width as specified in doc-common ++. doc-get-arg-type \*[doc-str-dBla] ++. ie (\n[doc-arg-type] == 1) \ ++. nr doc-list-offset-stack\n[doc-list-depth] \n[\*[doc-str-dBla]] ++. el \ ++. nr doc-list-offset-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \} ++. el \ ++. nr doc-list-offset-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u) ++. \}\}\} ++. el \ ++. nr doc-reg-dBla 0 ++. \}\}\} ++. ++. \" not a known keyword, so it specifies the width of the next column ++. \" (if it is a column list) ++. if !\n[doc-reg-dBla] \{\ ++. ie "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\ ++. nr doc-num-columns +1 ++. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]] ++. substring doc-str-dBla 0 0 ++. ie .\*[doc-str-dBla] \{\ ++. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] ++. substring doc-str-dBla 1 ++. doc-first-parameter \*[doc-str-dBla] ++. doc-get-width "\*[doc-str-dfp] ++. doc-get-arg-type "\*[doc-str-dfp] ++. ie (\n[doc-arg-type] == 1) \ ++. nr doc-reg-dBla1 1 ++. el \ ++. nr doc-reg-dBla1 0 ++. \} ++. el \ ++. nr doc-reg-dBla1 0 ++. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]] ++. ++. ie \n[doc-reg-dBla1] \{\ ++. \" execute string in a box to get the width of the diversion ++. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]] ++. doc-save-global-vars ++. doc-reset-args ++. box doc-box-dBla ++. ev doc-env-dBla ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-str-dBla] ++. br ++. ev ++. box ++. doc-restore-global-vars ++. ds doc-arg\n[doc-num-columns] "\h'\n[dl]u' ++. \} ++. el \ ++. ds doc-arg\n[doc-num-columns] "\*[doc-arg\n[doc-arg-ptr]] ++. \} ++. el \{\ ++. tmc mdoc warning: Unknown keyword `\*[doc-arg\n[doc-arg-ptr]]' ++. tm1 " in .Bl macro (#\n[.c]) ++. \}\} ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \ ++. doc-do-Bl-args ++.. ++. ++. ++.\" NS doc-save-global-vars macro ++.\" NS save all global variables ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dsgv ++. ++.de doc-save-global-vars ++. ds doc-macro-name-saved "\*[doc-macro-name] ++. nr doc-arg-limit-saved \n[doc-arg-limit] ++. nr doc-num-args-saved \n[doc-num-args] ++. nr doc-arg-ptr-saved \n[doc-arg-ptr] ++. ++. nr doc-reg-dsgv 1 ++. while (\n[doc-reg-dsgv] <= \n[doc-arg-limit]) \{\ ++. ds doc-arg\n[doc-reg-dsgv]-saved "\*[doc-arg\n[doc-reg-dsgv]] ++. nr doc-type\n[doc-reg-dsgv]-saved \n[doc-type\n[doc-reg-dsgv]] ++. ds doc-space\n[doc-reg-dsgv]-saved "\*[doc-space\n[doc-reg-dsgv]] ++. nr doc-reg-dsgv +1 ++. \} ++. ++. nr doc-curr-font-saved \n[doc-curr-font] ++. nr doc-curr-size-saved \n[doc-curr-size] ++. nr doc-in-synopsis-section-saved \n[doc-in-synopsis-section] ++. nr doc-in-library-section-saved \n[doc-in-library-section] ++. nr doc-indent-synopsis-saved \n[doc-indent-synopsis] ++. nr doc-indent-synopsis-active-saved \n[doc-indent-synopsis-active] ++. nr doc-have-decl-saved \n[doc-have-decl] ++. nr doc-have-var-saved \n[doc-have-var] ++. ds doc-command-name-saved "\*[doc-command-name] ++. ds doc-quote-left-saved "\*[doc-quote-left] ++. ds doc-quote-right-saved "\*[doc-quote-right] ++. nr doc-nesting-level-saved \n[doc-nesting-level] ++. nr doc-in-list-saved \n[doc-in-list] ++. ds doc-space-saved "\*[doc-space] ++. ds doc-saved-space-saved "\*[doc-saved-space] ++. nr doc-space-mode-saved \n[doc-space-mode] ++. nr doc-have-space-saved \n[doc-have-space] ++. nr doc-have-slot-saved \n[doc-have-slot] ++. nr doc-keep-type-saved \n[doc-keep-type] ++. nr doc-display-depth-saved \n[doc-display-depth] ++. nr doc-is-compact-saved \n[doc-is-compact] ++. ++. nr doc-reg-dsgv 0 ++. while (\n[doc-reg-dsgv] <= \n[doc-display-depth]) \{\ ++. ds doc-display-type-stack\n[doc-reg-dsgv]-saved "\*[doc-display-type-stack\n[doc-reg-dsgv]] ++. nr doc-display-indent-stack\n[doc-reg-dsgv]-saved \n[doc-display-indent-stack\n[doc-reg-dsgv]] ++. nr doc-display-ad-stack\n[doc-reg-dsgv]-saved \n[doc-display-ad-stack\n[doc-reg-dsgv]] ++. nr doc-display-fi-stack\n[doc-reg-dsgv]-saved \n[doc-display-fi-stack\n[doc-reg-dsgv]] ++. nr doc-display-ft-stack\n[doc-reg-dsgv]-saved \n[doc-display-ft-stack\n[doc-reg-dsgv]] ++. nr doc-display-ps-stack\n[doc-reg-dsgv]-saved \n[doc-display-ps-stack\n[doc-reg-dsgv]] ++. nr doc-reg-dsgv +1 ++. \} ++. ++. nr doc-fontmode-depth-saved \n[doc-fontmode-depth] ++. ++. nr doc-reg-dsgv 1 ++. while (\n[doc-reg-dsgv] <= \n[doc-fontmode-depth]) \{\ ++. nr doc-fontmode-font-stack\n[doc-reg-dsgv]-saved \n[doc-fontmode-font-stack\n[doc-reg-dsgv]] ++. nr doc-fontmode-size-stack\n[doc-reg-dsgv]-saved \n[doc-fontmode-size-stack\n[doc-reg-dsgv]] ++. nr doc-reg-dsgv +1 ++. \} ++. ++. nr doc-list-depth-saved \n[doc-list-depth] ++. ++. nr doc-reg-dsgv 1 ++. while (\n[doc-reg-dsgv] <= \n[doc-list-depth]) \{\ ++. ds doc-list-type-stack\n[doc-reg-dsgv]-saved "\*[doc-list-type-stack\n[doc-reg-dsgv]] ++. nr doc-list-have-indent-stack\n[doc-reg-dsgv]-saved \n[doc-list-have-indent-stack\n[doc-reg-dsgv]] ++. nr doc-list-indent-stack\n[doc-reg-dsgv]-saved \n[doc-list-indent-stack\n[doc-reg-dsgv]] ++. nr doc-compact-list-stack\n[doc-reg-dsgv]-saved \n[doc-compact-list-stack\n[doc-reg-dsgv]] ++. ds doc-tag-prefix-stack\n[doc-reg-dsgv]-saved "\*[doc-tag-prefix-stack\n[doc-reg-dsgv]] ++. ds doc-tag-width-stack\n[doc-reg-dsgv]-saved "\*[doc-tag-width-stack\n[doc-reg-dsgv]] ++. nr doc-list-offset-stack\n[doc-reg-dsgv]-saved \n[doc-list-offset-stack\n[doc-reg-dsgv]] ++. nr doc-enum-list-count-stack\n[doc-reg-dsgv]-saved \n[doc-enum-list-count-stack\n[doc-reg-dsgv]] ++. nr doc-reg-dsgv +1 ++. \} ++. ++. ds doc-saved-Pa-font-saved "\*[doc-saved-Pa-font] ++. nr doc-curr-type-saved \n[doc-curr-type] ++. ds doc-curr-arg-saved "\*[doc-curr-arg] ++. nr doc-diag-list-input-line-count-saved \n[doc-diag-list-input-line-count] ++. nr doc-num-columns-saved \n[doc-num-columns] ++. nr doc-column-indent-width-saved \n[doc-column-indent-width] ++. nr doc-is-func-saved \n[doc-is-func] ++. nr doc-have-old-func-saved \n[doc-have-old-func] ++. nr doc-func-arg-count-saved \n[doc-func-arg-count] ++. ds doc-func-arg-saved "\*[doc-func-arg] ++. nr doc-num-func-args-saved \n[doc-num-func-args] ++. nr doc-func-args-processed-saved \n[doc-func-args-processed] ++. nr doc-have-func-saved \n[doc-have-func] ++. nr doc-is-reference-saved \n[doc-is-reference] ++. nr doc-reference-count-saved \n[doc-reference-count] ++. nr doc-author-count-saved \n[doc-author-count] ++. ++. nr doc-reg-dsgv 0 ++. while (\n[doc-reg-dsgv] <= \n[doc-author-count]) \{\ ++. ds doc-author-name\n[doc-reg-dsgv]-saved "\*[doc-author-name\n[doc-reg-dsgv]] ++. nr doc-reg-dsgv +1 ++. \} ++. ++. nr doc-book-count-saved \n[doc-book-count] ++. ds doc-book-name-saved "\*[doc-book-name] ++. nr doc-city-count-saved \n[doc-city-count] ++. ds doc-city-name-saved "\*[doc-city-name] ++. nr doc-date-count-saved \n[doc-date-count] ++. ds doc-date-saved "\*[doc-date] ++. nr doc-publisher-count-saved \n[doc-publisher-count] ++. ds doc-publisher-name-saved "\*[doc-publisher-name] ++. nr doc-journal-count-saved \n[doc-journal-count] ++. ds doc-journal-name-saved "\*[doc-journal-name] ++. nr doc-issue-count-saved \n[doc-issue-count] ++. ds doc-issue-name-saved "\*[doc-issue-name] ++. nr doc-optional-count-saved \n[doc-optional-count] ++. ds doc-optional-string-saved "\*[doc-optional-string] ++. nr doc-page-number-count-saved \n[doc-page-number-count] ++. ds doc-page-number-string-saved "\*[doc-page-number-string] ++. nr doc-corporate-count-saved \n[doc-corporate-count] ++. ds doc-corporate-name-saved "\*[doc-corporate-name] ++. nr doc-report-count-saved \n[doc-report-count] ++. ds doc-report-name-saved "\*[doc-report-name] ++. nr doc-reference-title-count-saved \n[doc-reference-title-count] ++. ds doc-reference-title-name-saved "\*[doc-reference-title-name] ++. ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book] ++. nr doc-url-count-saved \n[doc-url-count] ++. ds doc-url-name-saved "\*[doc-url-name] ++. nr doc-volume-count-saved \n[doc-volume-count] ++. ds doc-volume-name-saved "\*[doc-volume-name] ++. nr doc-have-author-saved \n[doc-have-author] ++. ++. ds doc-document-title-saved "\*[doc-document-title] ++. ds doc-volume-saved "\*[doc-volume] ++. ds doc-section-saved "\*[doc-section] ++. ds doc-operating-system-saved "\*[doc-operating-system] ++. ds doc-date-string-saved "\*[doc-date-string] ++. nr doc-header-space-saved \n[doc-header-space] ++. nr doc-footer-space-saved \n[doc-footer-space] ++. nr doc-display-vertical-saved \n[doc-display-vertical] ++. ds doc-header-string-saved "\*[doc-header-string] ++. nr doc-in-see-also-section-saved \n[doc-in-see-also-section] ++. nr doc-in-files-section-saved \n[doc-in-files-section] ++. nr doc-in-authors-section-saved \n[doc-in-authors-section] ++.. ++. ++. ++.\" NS doc-restore-global-vars macro ++.\" NS restore all global variables ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-drgv ++. ++.de doc-restore-global-vars ++. ds doc-macro-name "\*[doc-macro-name-saved] ++. nr doc-arg-limit \n[doc-arg-limit-saved] ++. nr doc-num-args \n[doc-num-args-saved] ++. nr doc-arg-ptr \n[doc-arg-ptr-saved] ++. ++. nr doc-reg-drgv 1 ++. while (\n[doc-reg-drgv] <= \n[doc-arg-limit]) \{\ ++. ds doc-arg\n[doc-reg-drgv] "\*[doc-arg\n[doc-reg-drgv]-saved] ++. nr doc-type\n[doc-reg-drgv] \n[doc-type\n[doc-reg-drgv]-saved] ++. ds doc-space\n[doc-reg-drgv] "\*[doc-space\n[doc-reg-drgv]-saved] ++. nr doc-reg-drgv +1 ++. \} ++. ++. nr doc-curr-font \n[doc-curr-font-saved] ++. nr doc-curr-size \n[doc-curr-size-saved] ++. nr doc-in-synopsis-section \n[doc-in-synopsis-section-saved] ++. nr doc-in-library-section \n[doc-in-library-section-saved] ++. nr doc-indent-synopsis \n[doc-indent-synopsis-saved] ++. nr doc-indent-synopsis-active \n[doc-indent-synopsis-active-saved] ++. nr doc-have-decl \n[doc-have-decl-saved] ++. nr doc-have-var \n[doc-have-var-saved] ++. ds doc-command-name "\*[doc-command-name-saved] ++. ds doc-quote-left "\*[doc-quote-left-saved] ++. ds doc-quote-right "\*[doc-quote-right-saved] ++. nr doc-nesting-level \n[doc-nesting-level-saved] ++. nr doc-in-list \n[doc-in-list-saved] ++. ds doc-space "\*[doc-space-saved] ++. ds doc-saved-space "\*[doc-saved-space-saved] ++. nr doc-space-mode \n[doc-space-mode-saved] ++. nr doc-have-space \n[doc-have-space-saved] ++. nr doc-have-slot \n[doc-have-slot-saved] ++. nr doc-keep-type \n[doc-keep-type-saved] ++. nr doc-display-depth \n[doc-display-depth-saved] ++. nr doc-is-compact \n[doc-is-compact-saved] ++. ++. nr doc-reg-drgv 0 ++. while (\n[doc-reg-drgv] <= \n[doc-display-depth]) \{\ ++. ds doc-display-type-stack\n[doc-reg-drgv] "\*[doc-display-type-stack\n[doc-reg-drgv]-saved] ++. nr doc-display-indent-stack\n[doc-reg-drgv] \n[doc-display-indent-stack\n[doc-reg-drgv]-saved] ++. nr doc-display-ad-stack\n[doc-reg-drgv] \n[doc-display-ad-stack\n[doc-reg-drgv]-saved] ++. nr doc-display-fi-stack\n[doc-reg-drgv] \n[doc-display-fi-stack\n[doc-reg-drgv]-saved] ++. nr doc-display-ft-stack\n[doc-reg-drgv] \n[doc-display-ft-stack\n[doc-reg-drgv]-saved] ++. nr doc-display-ps-stack\n[doc-reg-drgv] \n[doc-display-ps-stack\n[doc-reg-drgv]-saved] ++. nr doc-reg-drgv +1 ++. \} ++. ++. nr doc-fontmode-depth \n[doc-fontmode-depth-saved] ++. ++. nr doc-reg-drgv 1 ++. while (\n[doc-reg-drgv] <= \n[doc-fontmode-depth]) \{\ ++. nr doc-fontmode-font-stack\n[doc-reg-drgv] \n[doc-fontmode-font-stack\n[doc-reg-drgv]]-saved ++. nr doc-fontmode-size-stack\n[doc-reg-drgv] \n[doc-fontmode-size-stack\n[doc-reg-drgv]]-saved ++. nr doc-reg-drgv +1 ++. \} ++. ++. nr doc-list-depth \n[doc-list-depth-saved] ++. ++. nr doc-reg-drgv 1 ++. while (\n[doc-reg-drgv] <= \n[doc-list-depth]) \{\ ++. ds doc-list-type-stack\n[doc-reg-drgv] "\*[doc-list-type-stack\n[doc-reg-drgv]-saved] ++. nr doc-list-have-indent-stack\n[doc-reg-drgv] \n[doc-list-have-indent-stack\n[doc-reg-drgv]-saved] ++. nr doc-list-indent-stack\n[doc-reg-drgv] \n[doc-list-indent-stack\n[doc-reg-drgv]-saved] ++. nr doc-compact-list-stack\n[doc-reg-drgv] \n[doc-compact-list-stack\n[doc-reg-drgv]-saved] ++. ds doc-tag-prefix-stack\n[doc-reg-drgv] "\*[doc-tag-prefix-stack\n[doc-reg-drgv]-saved] ++. ds doc-tag-width-stack\n[doc-reg-drgv] "\*[doc-tag-width-stack\n[doc-reg-drgv]-saved] ++. nr doc-list-offset-stack\n[doc-reg-drgv] \n[doc-list-offset-stack\n[doc-reg-drgv]-saved] ++. nr doc-enum-list-count-stack\n[doc-reg-drgv] \n[doc-enum-list-count-stack\n[doc-reg-drgv]-saved] ++. nr doc-reg-drgv +1 ++. \} ++. ++. ds doc-saved-Pa-font "\*[doc-saved-Pa-font-saved] ++. nr doc-curr-type \n[doc-curr-type-saved] ++. ds doc-curr-arg "\*[doc-curr-arg-saved] ++. nr doc-diag-list-input-line-count \n[doc-diag-list-input-line-count-saved] ++. nr doc-num-columns \n[doc-num-columns-saved] ++. nr doc-column-indent-width \n[doc-column-indent-width-saved] ++. nr doc-is-func \n[doc-is-func-saved] ++. nr doc-have-old-func \n[doc-have-old-func-saved] ++. nr doc-func-arg-count \n[doc-func-arg-count-saved] ++. ds doc-func-arg "\*[doc-func-arg-saved] ++. nr doc-num-func-args \n[doc-num-func-args-saved] ++. nr doc-func-args-processed \n[doc-func-args-processed-saved] ++. nr doc-have-func \n[doc-have-func-saved] ++. nr doc-is-reference \n[doc-is-reference-saved] ++. nr doc-reference-count \n[doc-reference-count-saved] ++. nr doc-author-count \n[doc-author-count-saved] ++. ++. nr doc-reg-drgv 0 ++. while (\n[doc-reg-drgv] <= \n[doc-author-count]) \{\ ++. ds doc-author-name\n[doc-reg-drgv] "\*[doc-author-name\n[doc-reg-drgv]-saved] ++. nr doc-reg-drgv +1 ++. \} ++. ++. nr doc-book-count \n[doc-book-count-saved] ++. ds doc-book-name "\*[doc-book-name-saved] ++. nr doc-city-count \n[doc-city-count-saved] ++. ds doc-city-name "\*[doc-city-name-saved] ++. nr doc-date-count \n[doc-date-count-saved] ++. ds doc-date "\*[doc-date-saved] ++. nr doc-publisher-count \n[doc-publisher-count-saved] ++. ds doc-publisher-name "\*[doc-publisher-name-saved] ++. nr doc-journal-count \n[doc-journal-count-saved] ++. ds doc-journal-name "\*[doc-journal-name-saved] ++. nr doc-issue-count \n[doc-issue-count-saved] ++. ds doc-issue-name "\*[doc-issue-name-saved] ++. nr doc-optional-count \n[doc-optional-count-saved] ++. ds doc-optional-string "\*[doc-optional-string-saved] ++. nr doc-page-number-count \n[doc-page-number-count-saved] ++. ds doc-page-number-string "\*[doc-page-number-string-saved] ++. nr doc-corporate-count \n[doc-corporate-count-saved] ++. ds doc-corporate-name "\*[doc-corporate-name-saved] ++. nr doc-report-count \n[doc-report-count-saved] ++. ds doc-report-name "\*[doc-report-name-saved] ++. nr doc-reference-title-count \n[doc-reference-title-count-saved] ++. ds doc-reference-title-name "\*[doc-reference-title-name-saved] ++. ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved] ++. nr doc-url-count \n[doc-url-count-saved] ++. ds doc-url-name "\*[doc-url-name-saved] ++. nr doc-volume-count \n[doc-volume-count-saved] ++. ds doc-volume-name "\*[doc-volume-name-saved] ++. nr doc-have-author \n[doc-have-author-saved] ++. ++. ds doc-document-title "\*[doc-document-title-saved] ++. ds doc-volume "\*[doc-volume-saved] ++. ds doc-section "\*[doc-section-saved] ++. ds doc-operating-system "\*[doc-operating-system-saved] ++. ds doc-date-string "\*[doc-date-string-saved] ++. nr doc-header-space \n[doc-header-space-saved] ++. nr doc-footer-space \n[doc-footer-space-saved] ++. nr doc-display-vertical \n[doc-display-vertical-saved] ++. ds doc-header-string "\*[doc-header-string-saved] ++. nr doc-in-see-also-section \n[doc-in-see-also-section-saved] ++. nr doc-in-files-section \n[doc-in-files-section-saved] ++. nr doc-in-authors-section \n[doc-in-authors-section-saved] ++.. ++. ++. ++.\" NS El user macro ++.\" NS end list ++.\" NS ++.\" NS modifies: ++.\" NS doc-list-depth ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-str-El ++.\" NS ++.\" NS width register `El' set in doc-common ++. ++.de El ++. if \n[.$] \{\ ++. tm Usage: .El (does not take arguments) (#\n[.c]) ++. return ++. \} ++. ++. ds doc-macro-name El ++. ds doc-str-El \*[doc-list-type-stack\n[doc-list-depth]] ++. ++. ie "\*[doc-str-El]"diag-list" \ ++. doc-end-list 0 ++. el \{ .ie "\*[doc-str-El]"column-list" \ ++. doc-end-column-list ++. el \{ .ie "\*[doc-str-El]"item-list" \ ++. doc-end-list 0 ++. el \{ .ie "\*[doc-str-El]"ohang-list" \ ++. doc-end-list 0 ++. el \{ .ie "\*[doc-str-El]"inset-list" \ ++. doc-end-list 0 ++. el \ ++. doc-end-list 1 ++. \}\}\}\} ++. ++. br ++.. ++. ++. ++.\" NS doc-saved-Pa-font global string ++.\" NS saved doc-Pa-font string for section FILES (no underline if ++.\" NS nroff) ++. ++.ds doc-saved-Pa-font ++. ++. ++.\" NS doc-curr-type global register ++.\" NS current argument type ++. ++.nr doc-curr-type 0 ++. ++. ++.\" NS doc-curr-arg global string ++.\" NS current argument ++. ++.ds doc-curr-arg ++. ++. ++.\" NS doc-item-boxXXX global box ++.\" NS item boxes associated list depth ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++. ++.\" NS It user macro ++.\" NS list item ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-curr-arg ++.\" NS doc-curr-type ++.\" NS doc-in-list ++.\" NS doc-macro-name ++.\" NS doc-num-args ++.\" NS doc-saved-Pa-font ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-It ++.\" NS doc-str-It ++.\" NS doc-XXX-list-type ++.\" NS ++.\" NS width register `It' set in doc-common ++. ++.nr doc-bullet-list-type 1 ++.nr doc-column-list-type 0 ++.nr doc-dash-list-type 1 ++.nr doc-diag-list-type 0 ++.nr doc-enum-list-type 1 ++.nr doc-hang-list-type 2 ++.nr doc-inset-list-type 2 ++.nr doc-item-list-type 1 ++.nr doc-ohang-list-type 2 ++.nr doc-tag-list-type 2 ++. ++.de It ++. ds doc-str-It \*[doc-list-type-stack\n[doc-list-depth]] ++. ++. if "\*[doc-str-It]"" \ ++. tm mdoc error: .It without preceding .Bl (#\n[.c]) ++. ++. if \n[doc-nesting-level] \{\ ++. tmc "mdoc error: .It found in enclosing (e.g. .Ac ... .It ... .Ao) ++. tm1 " (#\n[.c]) ++. \} ++. ++. br ++. if !\n[cR] \ ++. ne 3v ++. ++. if \n[.$] \{\ ++. ds doc-macro-name It ++. ++. \" fill argument vector ++. nr doc-reg-It 1 ++. while (\n[doc-reg-It] <= \n[.$]) \{\ ++. ds doc-arg\n[doc-reg-It] "\$[\n[doc-reg-It]] ++. nr doc-reg-It +1 ++. \} ++. ++. nr doc-num-args \n[.$] ++. nr doc-arg-ptr 0 ++. \} ++. ++. nr doc-reg-It \n[doc-\*[doc-str-It]-type] ++. ++. if \n[doc-reg-It] \{\ ++. \" start item box ++. box doc-item-box\n[doc-list-depth] ++. ev doc-item-env\n[doc-list-depth] ++. evc 0 ++. in 0 ++. nf ++. \} ++. ++. ie (\n[doc-reg-It] == 1) \{\ ++. if \n[.$] \{\ ++. tm1 "mdoc warning: .It macros in lists of type `\*[doc-str-It]' ++. tm1 " don't take arguments (#\n[.c]) ++. \}\} ++. el \{\ ++. ie \n[.$] \{\ ++. if (\n[doc-reg-It] == 2) \{\ ++. \" handle list types with arguments ++. doc-parse-arg-vector ++. ++. nr doc-in-list 1 ++. nr doc-arg-ptr 1 ++. nr doc-curr-type \n[doc-type1] ++. ds doc-curr-arg "\*[doc-arg1] ++. ++. if \n[doc-in-files-section] \{\ ++. ds doc-saved-Pa-font "\*[doc-Pa-font] ++. if n \ ++. ds doc-Pa-font "\*[doc-No-font] ++. \} ++. ++. ie (\n[doc-type1] == 1) \ ++. \*[doc-arg1] ++. el \{\ ++. nr doc-arg-ptr 1 ++. doc-print-recursive ++. \}\}\} ++. el \{\ ++. tm1 "mdoc warning: .It macros in lists of type `\*[doc-str-It]' ++. tm1 " require arguments (#\n[.c]) ++. \} ++. \} ++. ++. \" the previous call of `.doc-print-recursive' can contain calls to ++. \" opening macros like `.Ao'; we then defer the call of `doc-xxx-list' ++. if !\n[doc-nesting-level] \ ++. doc-\*[doc-str-It] ++.. ++. ++. ++.\" NS doc-inset-list macro ++.\" NS .It item of list-type inset ++.\" NS ++.\" NS modifies: ++.\" NS doc-in-list ++. ++.de doc-inset-list ++. \" finish item box ++. br ++. ev ++. box ++. unformat doc-item-box\n[doc-list-depth] ++. ++. doc-set-vertical-and-indent 0 ++. br ++. ++. nh ++. doc-item-box\n[doc-list-depth] ++. ++. if \n[doc-in-files-section] \ ++. if n \ ++. ds doc-Pa-font "\*[doc-saved-Pa-font] ++. ++. nr doc-in-list 0 ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-hang-list macro ++.\" NS .It item of list-type hanging tag (as opposed to tagged) ++.\" NS ++.\" NS modifies: ++.\" NS doc-have-space ++.\" NS doc-in-list ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dhl ++.\" NS doc-reg-dhl1 ++. ++.de doc-hang-list ++. \" finish item box ++. br ++. ev ++. box ++. unformat doc-item-box\n[doc-list-depth] ++. ++. doc-set-vertical-and-indent 1 ++. nr doc-reg-dhl (\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) ++. ti -\n[doc-reg-dhl]u ++. ++. nh ++. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ ++. doc-item-box\n[doc-list-depth] ++. el \{\ ++. chop doc-item-box\n[doc-list-depth] ++. nr doc-reg-dhl1 \n[.k]u ++. nop \*[doc-item-box\n[doc-list-depth]]\c ++. nop \h'|(\n[doc-reg-dhl1]u - \n[.k]u + \n[doc-reg-dhl]u)'\c ++. nr doc-have-space 1 ++. \} ++. ++. if \n[doc-in-files-section] \ ++. if n \ ++. ds doc-Pa-font "\*[doc-saved-Pa-font] ++. ++. nr doc-in-list 0 ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-ohang-list macro ++.\" NS .It item of list-type overhanging tag ++.\" NS ++.\" NS modifies: ++.\" NS doc-in-list ++. ++.de doc-ohang-list ++. \" finish item box ++. br ++. ev ++. box ++. unformat doc-item-box\n[doc-list-depth] ++. ++. doc-set-vertical-and-indent 0 ++. nh ++. doc-item-box\n[doc-list-depth] ++. br ++. ++. if \n[doc-in-files-section] \ ++. if n \ ++. ds doc-Pa-font "\*[doc-saved-Pa-font] ++. ++. nr doc-in-list 0 ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-item-list macro ++.\" NS .It item of list-type [empty tag] ++. ++.de doc-item-list ++. \" finish (dummy) item box ++. br ++. ev ++. box ++. ++. doc-set-vertical-and-indent 0 ++. br ++. ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-enum-list-count-stackXXX global register ++.\" NS stack of current enum count values ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.nr doc-enum-list-count-stack1 0 ++. ++. ++.\" NS doc-enum-list macro ++.\" NS enumerated list ++.\" NS ++.\" NS modifies: ++.\" NS doc-enum-list-count-stackXXX ++.\" NS doc-in-list ++. ++.de doc-enum-list ++. nr doc-in-list 1 ++. nr doc-enum-list-count-stack\n[doc-list-depth] +1 ++\# XXX ++\#.ll \n[doc-list-indent-stack\n[doc-list-depth]]u ++\#.rj ++. nop \*[doc-tag-prefix-stack\n[doc-list-depth]]\c ++. nop \n[doc-enum-list-count-stack\n[doc-list-depth]].\& ++. doc-do-list ++.. ++. ++. ++.\" NS doc-bullet-list macro ++.\" NS bullet paragraph list ++.\" NS ++.\" NS modifies: ++.\" NS doc-in-list ++. ++.de doc-bullet-list ++. nr doc-in-list 1 ++. nop \)\*[doc-Sy-font]\[bu]\f[] ++. doc-do-list ++.. ++. ++. ++.\" NS doc-dash-list macro ++.\" NS hyphen paragraph list (sub bullet list) ++.\" NS ++.\" NS modifies: ++.\" NS doc-in-list ++. ++.de doc-dash-list ++. nr doc-in-list 1 ++. nop \)\*[doc-Sy-font]\-\f[] ++. doc-do-list ++.. ++. ++. ++.\" NS doc-do-list macro ++.\" NS .It item of list-type enum/bullet/hyphen ++. ++.als doc-do-list doc-hang-list ++. ++. ++.\" NS doc-diag-list-input-line-count global register ++.\" NS saved line number to be checked in next diag-list item ++. ++.nr doc-diag-list-input-line-count 0 ++. ++. ++.\" NS doc-diag-list macro ++.\" NS .It item of list-type diagnostic-message ++.\" NS ++.\" NS modifies: ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-diag-list-input-line-count ++. ++.de doc-diag-list ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. ie ((\n[.c] - \n[doc-diag-list-input-line-count]) > 1) \{\ ++. ie !\n[doc-compact-list-stack\n[doc-list-depth]] \ ++. doc-paragraph ++. el \ ++. br ++. \} ++. el \ ++. br ++. nr doc-diag-list-input-line-count \n[.c] ++. ++. nh ++. nop \*[doc-Sy-font]\c ++. if \n[doc-num-args] \ ++. doc-remaining-args ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\*[doc-hard-space]\c ++. ++. doc-print-and-reset ++.. ++. ++. ++.\" NS doc-tag-list macro ++.\" NS .It item of list-type `tag' ++.\" NS ++.\" NS modifies: ++.\" NS doc-have-space ++.\" NS doc-in-list ++.\" NS ++.\" NS local variables: ++.\" NS doc-box-dtl ++.\" NS doc-reg-dtl ++.\" NS doc-reg-dtl1 ++. ++.de doc-tag-list ++. \" finish item box ++. br ++. ev ++. box ++. unformat doc-item-box\n[doc-list-depth] ++. ++. \" we use a box without `.nf' to compute the tag width (via `dl' register) ++. box doc-box-dtl ++. ev doc-env-dtl ++. evc 0 ++. fi ++. ad 0 ++. in 0 ++. doc-item-box\n[doc-list-depth] ++. br ++. ev ++. box ++. ++. if !"TagwidtH"\*[doc-tag-width-stack\n[doc-list-depth]]" \{\ ++. if !\n[doc-list-have-indent-stack\n[doc-list-depth]] \{\ ++. in -(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) ++. nr doc-list-have-indent-stack\n[doc-list-depth] 1 ++. \} ++. doc-get-tag-width ++. \} ++. doc-set-vertical-and-indent 1 ++. nr doc-reg-dtl (\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) ++. ti -\n[doc-reg-dtl]u ++. ++. nh ++. doc-item-box\n[doc-list-depth] ++. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ ++. br ++. el \{\ ++. \" format the tag separately to prevent stretching of spaces ++. vpt 0 ++. br ++. sp -1 ++. vpt 1 ++. nop \&\c ++. nr doc-have-space 1 ++. \} ++. ++. if \n[doc-in-files-section] \ ++. if n \ ++. ds doc-Pa-font "\*[doc-saved-Pa-font] ++. ++. nr doc-in-list 0 ++. doc-reset-args ++.. ++. ++. ++.\" NS doc-get-tag-width macro ++.\" NS resolve unknown tag width (`tag' list-type only) ++.\" NS ++.\" NS modifies: ++.\" NS doc-list-indent-stackXXX ++.\" NS doc-tag-width-stackXXX ++.\" NS ++.\" NS requires: ++.\" NS doc-curr-arg ++.\" NS doc-curr-type ++. ++.de doc-get-tag-width ++. ie (\n[doc-curr-type] == 1) \{\ ++. ds doc-tag-width-stack\n[doc-list-depth] \*[doc-curr-arg] ++. nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-curr-arg]] ++. \} ++. el \{\ ++. ds doc-tag-width-stack\n[doc-list-depth] No ++. nr doc-list-indent-stack\n[doc-list-depth] \n[No] ++. \} ++.. ++. ++. ++.\" NS doc-set-vertical-and-indent macro ++.\" NS set up vertical spacing (if not compact) and indentation (with ++.\" NS offset if argument is non-zero) ++.\" NS ++.\" NS modifies: ++.\" NS doc-list-have-indent-stackXXX ++. ++.de doc-set-vertical-and-indent ++. if !\n[doc-compact-list-stack\n[doc-list-depth]] \ ++. sp \n[doc-display-vertical]u ++. ++. if \n[doc-list-have-indent-stack\n[doc-list-depth]] \{\ ++. nr doc-list-have-indent-stack\n[doc-list-depth] 0 ++. if \$1 \ ++. in +(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) ++. \} ++. ++. if !\n[cR] \ ++. ne 2v ++.. ++. ++. ++.\" NS doc-list-depth global register ++.\" NS list type stack counter ++. ++.nr doc-list-depth 0 ++. ++. ++.\" NS doc-num-columns global register ++.\" NS number of columns ++. ++.nr doc-num-columns 0 ++. ++. ++.\" NS doc-compact-list-stackXXX global register (bool) ++.\" NS stack of flags to indicate whether a particular list is compact ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.nr doc-compact-list-stack1 0 ++. ++. ++.\" NS doc-tag-prefix-stackXXX global string ++.\" NS stack of tag prefixes (currently used for -nested -enum lists) ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.ds doc-tag-prefix-stack1 ++. ++. ++.\" NS doc-tag-width-stackXXX global string ++.\" NS stack of strings indicating how to set up current element of ++.\" NS doc-list-indent-stackXXX -- if set to TagwidtH, user has set it ++.\" NS directly; if it is a macro name, use the macro's width value; ++.\" NS otherwise, `doc-get-tag-width' uses width value of `No'. ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.ds doc-tag-width-stack0 ++.ds doc-tag-width-stack1 ++. ++. ++.\" NS doc-list-offset-stackXXX global register ++.\" NS stack of list offsets ++.\" NS ++.\" NS limit: ++.\" NS doc-list-depth ++. ++.nr doc-list-offset-stack1 0 ++. ++. ++.\" NS doc-end-list macro ++.\" NS list end function; resets indentation (and offset if argument is ++.\" NS non-zero) ++.\" NS ++.\" NS modifies: ++.\" NS doc-list-depth ++.\" NS doc-list-offset-stackXXX ++. ++.de doc-end-list ++. if \$1 \ ++' in -(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u) ++. ++' in -\n[doc-list-offset-stack\n[doc-list-depth]]u ++. ++. if (\n[doc-list-depth] <= 0) \ ++. tm mdoc warning: extraneous .El call (#\n[.c]) ++. ++. doc-decrement-list-stack ++. nr doc-list-depth -1 ++.. ++. ++. ++.\" NS doc-increment-list-stack macro ++.\" NS set up next block for list ++.\" NS ++.\" NS modifies: ++.\" NS doc-compact-list-stackXXX ++.\" NS doc-list-have-indent-stackXXX ++.\" NS doc-list-indent-stackXXX ++.\" NS doc-list-offset-stackXXX ++.\" NS doc-list-type-stackXXX ++.\" NS doc-tag-prefix-stackXXX ++.\" NS doc-tag-width-stackXXX ++.\" NS doc-enum-list-count-stackXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dils ++. ++.de doc-increment-list-stack ++. nr doc-reg-dils (\n[doc-list-depth] + 1) ++. nr doc-list-have-indent-stack\n[doc-reg-dils] 0 ++. nr doc-list-indent-stack\n[doc-reg-dils] 0 ++. nr doc-list-offset-stack\n[doc-reg-dils] 0 ++. ds doc-tag-prefix-stack\n[doc-reg-dils] ++. ds doc-tag-width-stack\n[doc-reg-dils] \*[doc-tag-width-stack\n[doc-list-depth]] ++. ds doc-list-type-stack\n[doc-reg-dils] ++. nr doc-compact-list-stack\n[doc-reg-dils] 0 ++. nr doc-enum-list-count-stack\n[doc-reg-dils] 0 ++.. ++. ++. ++.\" NS doc-decrement-list-stack macro ++.\" NS decrement stack ++.\" NS ++.\" NS modifies: ++.\" NS doc-compact-list-stackXXX ++.\" NS doc-list-have-indent-stackXXX ++.\" NS doc-list-indent-stackXXX ++.\" NS doc-list-offset-stackXXX ++.\" NS doc-list-type-stackXXX ++.\" NS doc-tag-prefix-stackXXX ++.\" NS doc-tag-width-stackXXX ++.\" NS doc-enum-list-count-stackXXX ++. ++.de doc-decrement-list-stack ++. ds doc-list-type-stack\n[doc-list-depth] ++. nr doc-list-have-indent-stack\n[doc-list-depth] 0 ++. nr doc-list-indent-stack\n[doc-list-depth] 0 ++. nr doc-list-offset-stack\n[doc-list-depth] 0 ++. ds doc-tag-prefix-stack\n[doc-list-depth] ++. ds doc-tag-width-stack\n[doc-list-depth] ++. nr doc-compact-list-stack\n[doc-list-depth] 0 ++. nr doc-enum-list-count-stack\n[doc-list-depth] 0 ++.. ++. ++. ++.\" NS Xr user macro ++.\" NS cross reference (for man pages only) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-macro-name ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Xr ++.\" NS ++.\" NS width register `Xr' set in doc-common ++. ++.de Xr ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Xr ++. doc-parse-args \$@ ++. \} ++. el \ ++. doc-Xr-usage ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. \" first argument must be a string ++. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ds doc-arg\n[doc-arg-ptr] \*[doc-Xr-font]\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0] ++. ++. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ ++. nr doc-reg-Xr (\n[doc-arg-ptr] + 1) ++. \" modify second argument if it is a string and ++. \" remove space in between ++. if (\n[doc-type\n[doc-reg-Xr]] == 2) \{\ ++. ds doc-arg\n[doc-reg-Xr] \*[lp]\*[doc-arg\n[doc-reg-Xr]]\*[rp] ++. ds doc-space\n[doc-arg-ptr] ++. \} ++. \} ++. doc-print-recursive ++. \} ++. el \ ++. doc-Xr-usage ++. \} ++. el \ ++. doc-Xr-usage ++.. ++. ++. ++.\" NS doc-Xr-usage macro ++. ++.de doc-Xr-usage ++. tm Usage: .Xr manpage_name [section#] ... (#\n[.c]) ++. doc-reset-args ++.. ++. ++. ++.\" NS Sx user macro ++.\" NS cross section reference ++.\" NS ++.\" NS width register `Sx' set in doc-common ++. ++.als Sx doc-generic-macro ++.ds doc-Sx-usage section_header ++. ++. ++.\" NS doc-end-column-list macro ++.\" NS column-list end-list ++.\" NS ++.\" NS modifies: ++.\" NS doc-list-depth ++. ++.de doc-end-column-list ++. linetabs 0 ++' in -(\n[doc-list-offset-stack\n[doc-list-depth]]u + \n[doc-list-indent-stack\n[doc-list-depth]]u) ++. ta T .5i ++. fi ++. doc-decrement-list-stack ++. nr doc-list-depth -1 ++.. ++. ++. ++.\" NS doc-column-indent-width global register ++.\" NS holds the indent width for a column list ++. ++.nr doc-column-indent-width 0 ++. ++. ++.\" NS doc-set-column-tab macro ++.\" NS establish tabs for list-type column: `.doc-set-column-tab num_cols' ++.\" NS ++.\" NS modifies: ++.\" NS doc-column-indent-width ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dsct ++.\" NS doc-str-dsct ++.\" NS doc-str-dsct1 ++. ++.de doc-set-column-tab ++. ds doc-str-dsct ++. nr doc-reg-dsct 1 ++. nr doc-column-indent-width 0 ++. ++. ie (\$1 < 5) \ ++. ds doc-str-dsct1 " \" ++. el \{\ ++. ie (\$1 == 5) \ ++. ds doc-str-dsct1 " \" ++. el \{\ ++. \" XXX: this is packed abnormally close -- intercolumn width ++. \" should be configurable ++. ds doc-str-dsct1 " \" ++. \}\} ++. ++. while (\n[doc-reg-dsct] <= \$1) \{\ ++. as doc-str-dsct " +\w\*[doc-arg\n[doc-reg-dsct]]\*[doc-str-dsct1]u ++. nr doc-column-indent-width +\w\*[doc-arg\n[doc-reg-dsct]]\*[doc-str-dsct1]u ++. nr doc-reg-dsct +1 ++. \} ++. ++. ta \*[doc-str-dsct] ++' in +\n[doc-column-indent-width]u ++.. ++. ++. ++.\" NS doc-column-list macro ++.\" NS column items ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-list-indent-stackXXX ++.\" NS doc-spaceXXX ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dcl ++. ++.de doc-column-list ++. if \n[doc-num-args] \ ++. doc-parse-arg-vector ++. nr doc-arg-ptr +1 ++. ++. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. tm Usage: .It column_string [Ta [column_string ...] ] (#\n[.c]) ++. return ++. \} ++. ++. if "\*[doc-arg\n[doc-arg-ptr]]"Ta" \{\ ++. nr doc-reg-dcl (\n[doc-arg-ptr] - 1) ++. ds doc-space\n[doc-reg-dcl] ++. \} ++. ++. if !\n[doc-list-indent-stack\n[doc-list-depth]] \ ++. nr doc-list-indent-stack\n[doc-list-depth] \n[doc-column-indent-width]u ++. if !\n[.u] \{\ ++. fi ++. in +\n[doc-column-indent-width]u ++. \} ++. ti -\n[doc-column-indent-width]u ++. ++. doc-do-\n[doc-type\n[doc-arg-ptr]] ++.. ++. ++. ++.\" NS Ta user macro ++.\" NS append tab (\t) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS ++.\" NS width register `Ta' set in doc-common ++. ++.de Ta ++. ie \n[doc-arg-limit] \{\ ++. nr doc-arg-ptr +1 ++. nop \*[doc-tab]\c ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \ ++. doc-do-\n[doc-type\n[doc-arg-ptr]] ++. el \ ++. doc-reset-args ++. \} ++. el \{\ ++. tm1 "Usage: Ta must follow column entry: e.g. ++. tm1 " .It column_string [Ta [column_string ...]] (#\n[.c]) ++. \} ++.. ++. ++. ++.\" NS Dl user macro ++.\" NS display (one line) literal ++.\" NS ++.\" NS this function uses the `Li' font ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Dl' set in doc-common ++. ++.de Dl ++. ta T .5i ++. in +\n[doc-display-indent]u ++. ++. ie \n[doc-arg-limit] \{\ ++. tm Usage: .Dl not callable by other macros (#\n[.c]) ++. doc-reset-args ++. \} ++. el \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Dl ++. doc-parse-args \$@ ++. nr doc-arg-ptr 1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Li-font]\c ++. doc-print-recursive ++. \} ++. el \ ++. tm Usage: .Dl argument ... (#\n[.c]) ++. \} ++. ++. in -\n[doc-display-indent]u ++.. ++. ++. ++.\" NS D1 user macro ++.\" NS display (one line) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `D1' set in doc-common ++. ++.de D1 ++. ta T .5i ++. in +\n[doc-display-indent]u ++. ++. ie \n[doc-arg-limit] \{\ ++. tm Usage: .D1 not callable by other macros (#\n[.c]) ++. doc-reset-args ++. \} ++. el \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name D1 ++. doc-parse-args \$@ ++. nr doc-arg-ptr 1 ++. doc-print-recursive ++. \} ++. el \ ++. tm Usage: .D1 argument ... (#\n[.c]) ++. \} ++. ++. in -\n[doc-display-indent]u ++.. ++. ++. ++.\" NS Vt user macro ++.\" NS variable type (for forcing old style variable declarations); ++.\" NS this is not done in the same manner as .Ot for fortrash -- ++.\" NS clean up later ++.\" NS ++.\" NS modifies: ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-have-decl ++.\" NS doc-have-var ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Vt' set in doc-common ++. ++.de Vt ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Vt ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Vt variable_type ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. tm Usage: .Vt variable_type ... (#\n[.c]) ++. doc-reset-args ++. return ++. \} ++. ++. if \n[doc-in-synopsis-section] \{\ ++. \" if a function declaration was the last thing given, ++. \" want vertical space ++. if \n[doc-have-decl] \{\ ++. doc-paragraph ++. nr doc-have-decl 0 ++. \} ++. ++. \" if a subroutine was the last thing given, want vertical space ++. if \n[doc-have-func] \{\ ++. ie \n[doc-have-var] \ ++. br ++. el \ ++. doc-paragraph ++. \} ++. ++. nr doc-have-var 1 ++. \} ++. ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Ft-font]\c ++. doc-print-recursive ++. ++. if \n[doc-in-synopsis-section] \{\ ++. ie \n[doc-have-old-func] \ ++. nop \*[doc-soft-space]\c ++. el \ ++. br ++. \} ++.. ++. ++. ++.\" NS doc-is-func global register (bool) ++.\" NS set if subroutine (in synopsis only) (fortran only) ++. ++.nr doc-is-func 0 ++. ++. ++.\" NS Ft user macro ++.\" NS function type ++.\" NS ++.\" NS modifies: ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-have-decl ++.\" NS doc-have-var ++.\" NS doc-is-func ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Ft' set in doc-common ++. ++.de Ft ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Ft ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Ft function_type ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. nr doc-arg-ptr +1 ++. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. tm Usage: .Ft function_type ... (#\n[.c]) ++. doc-reset-args ++. return ++. \} ++. ++. if \n[doc-in-synopsis-section] \{\ ++. if (\n[doc-have-func] : \n[doc-have-decl]) \{\ ++. doc-paragraph ++. nr doc-have-decl 0 ++. nr doc-have-var 0 ++. \} ++. ++. if \n[doc-have-var] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. \} ++. ++. nr doc-is-func 1 ++. \} ++. ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Ft-font]\c ++. doc-print-recursive ++.. ++. ++. ++.\" NS doc-have-old-func global register (bool) ++.\" NS set if `Ot' has been called ++. ++.nr doc-have-old-func 0 ++. ++. ++.\" NS Ot user macro ++.\" NS old function type (fortran -- no newline) ++.\" NS ++.\" NS modifies: ++.\" NS doc-have-decl ++.\" NS doc-have-old-func ++.\" NS doc-have-var ++.\" NS doc-is-func ++.\" NS ++.\" NS width register `Ot' set in doc-common ++. ++.de Ot ++. nr doc-have-old-func 1 ++. ++. if \n[doc-in-synopsis-section] \{\ ++. if (\n[doc-have-func] : \n[doc-have-decl]) \{\ ++. doc-paragraph ++. nr doc-have-decl 0 ++. nr doc-have-var 0 ++. \} ++. ++. if \n[doc-have-var] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. \} ++. ++. nr doc-is-func 1 ++. \} ++. ++. if \n[.$] \ ++. nop \*[doc-Ft-font]\$*\c ++. nop \ \f[]\c ++.. ++. ++. ++.\" NS Fa user macro ++.\" NS function arguments ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Fa' set in doc-common ++. ++.de Fa ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Fa ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Fa function_arguments ... (#\n[.c]) ++. \} ++. ++. ie \n[doc-func-arg-count] \ ++. doc-do-func ++. el \{\ ++. nr doc-arg-ptr +1 ++. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Fa-font]\c ++. doc-print-recursive ++. ++. if \n[doc-in-synopsis-section] \ ++. if \n[doc-have-func] \ ++. br ++. \}\} ++.. ++. ++. ++.\" NS doc-func-arg-count global register ++.\" NS how many function arguments have been processed so far ++. ++.nr doc-func-arg-count 0 ++. ++. ++.\" NS doc-func-arg global string ++.\" NS work buffer for function name strings ++. ++.ds doc-func-arg ++. ++. ++.\" NS doc-num-func-args global register ++.\" NS number of function arguments ++. ++.nr doc-num-func-args 0 ++. ++. ++.\" NS doc-func-args-processed global register ++.\" NS function arguments processed so far ++. ++.nr doc-func-args-processed 0 ++. ++. ++.\" NS doc-do-func macro ++.\" NS internal .Fa for .Fc ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-func-arg ++.\" NS doc-func-arg-count ++.\" NS doc-func-args-processed ++.\" NS doc-num-func-args ++. ++.de doc-do-func ++. if (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\ ++. doc-reset-args ++. return ++. \} ++. ++. nr doc-arg-ptr +1 ++. ++. ds doc-func-arg ++. nr doc-num-func-args 0 ++. nr doc-func-args-processed 0 ++. ++. doc-build-func-string \*[doc-arg\n[doc-arg-ptr]] ++. if (\n[doc-num-func-args] > 1) \ ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg] ++. ++. if (\n[doc-func-arg-count] > 1) \{\ ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|\c ++. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \ ++. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \ ++. nop ,\)\c ++. nop \)\*[doc-space\n[doc-arg-ptr]]\*[doc-Fa-font]\c ++. nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c ++. \} ++. ++. if (\n[doc-func-arg-count] == 1) \{\ ++. nop \)\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c ++. nop \f[]\s[0]\c ++. \} ++. nr doc-func-arg-count +1 ++. doc-do-func ++.. ++. ++. ++.\" NS doc-have-func global register (bool) ++.\" NS whether we have more than one function in synopsis ++. ++.nr doc-have-func 0 ++. ++. ++.\" NS Fn user macro ++.\" NS functions ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-have-decl ++.\" NS doc-have-func ++.\" NS doc-have-var ++.\" NS doc-indent-synopsis ++.\" NS doc-is-func ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Fn' set in doc-common ++. ++.de Fn ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Fn ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Fn function_name [function_arg] ... (#\n[.c]) ++. \} ++. ++. if !\n[doc-arg-limit] \ ++. return ++. ++. if \n[doc-in-synopsis-section] \{\ ++. \" if there is/has been more than one subroutine declaration ++. ie \n[doc-is-func] \{\ ++. br ++. nr doc-have-var 0 ++. nr doc-have-decl 0 ++. nr doc-is-func 0 ++. \} ++. el \{\ ++. if \n[doc-have-func] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. nr doc-have-decl 0 ++. \}\} ++. ++. if \n[doc-have-decl] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. \} ++. ++. if \n[doc-have-var] \{\ ++. doc-paragraph ++. nr doc-have-decl 0 ++. \} ++. ++. nr doc-have-func 1 ++. nr doc-is-func 0 ++. ++. br ++. if !\n[doc-indent-synopsis] \ ++. nr doc-indent-synopsis (4u * \n[doc-fixed-width]u) ++. if !\n[doc-indent-synopsis-active] \ ++. in +\n[doc-indent-synopsis]u ++. ti -\n[doc-indent-synopsis]u ++. \} ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\ ++. tm Usage: .Fn function_name [function_arg] ... (#\n[.c]) ++. doc-reset-args ++. return ++. \} ++. ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c ++. nop \f[]\s[0]\*[lp]\)\c ++. ++. nr doc-arg-ptr +1 ++. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. nop \*[doc-Fa-font]\c ++. doc-do-func-args ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. \}\} ++. ++. nop \)\*[rp]\)\c ++. if \n[doc-in-synopsis-section] \ ++. nop \);\)\c ++. ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. \" output the space (if needed) ++. nr doc-arg-ptr -1 ++. nop \)\*[doc-space\n[doc-arg-ptr]]\c ++. nr doc-arg-ptr +1 ++. ++. doc-print-recursive ++. \} ++. el \ ++. doc-print-and-reset ++. ++. if \n[doc-in-synopsis-section] \ ++. if !\n[doc-indent-synopsis-active] \ ++. in -\n[doc-indent-synopsis]u ++.. ++. ++. ++.\" NS doc-do-func-args macro ++.\" NS handle function arguments ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-argXXX ++.\" NS doc-func-arg ++.\" NS doc-func-args-processed ++.\" NS doc-num-func-args ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-ddfa ++. ++.de doc-do-func-args ++. if \n[doc-in-synopsis-section] \{\ ++. ds doc-func-arg ++. nr doc-num-func-args 0 ++. nr doc-func-args-processed 0 ++. ++. doc-build-func-string \*[doc-arg\n[doc-arg-ptr]] ++. if (\n[doc-num-func-args] > 1) \ ++. ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg] ++. \} ++. ++. nop \)\*[doc-arg\n[doc-arg-ptr]]\c ++. nr doc-arg-ptr +1 ++. ++. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ ++. nr doc-reg-ddfa (\n[doc-arg-ptr] - 1) ++. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|\c ++. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \ ++. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \ ++. nop ,\)\c ++. nop \)\*[doc-space\n[doc-reg-ddfa]]\f[]\s[0]\|\c ++. doc-do-func-args ++. \}\} ++.. ++. ++. ++.\" NS doc-saved-nesting-level global register ++. ++.nr doc-saved-nesting-level 0 ++. ++. ++.\" NS doc-in-func-enclosure global register (bool) ++. ++.nr doc-in-func-enclosure 0 ++. ++. ++.\" NS Fo user macro ++.\" NS function open ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-func-arg-count ++.\" NS doc-have-decl ++.\" NS doc-have-func ++.\" NS doc-have-var ++.\" NS doc-in-func-enclosure ++.\" NS doc-indent-synopsis ++.\" NS doc-is-func ++.\" NS doc-macro-name ++.\" NS doc-saved-nesting-level ++.\" NS ++.\" NS width register `Fo' set in doc-common ++. ++.de Fo ++. if (\n[doc-in-func-enclosure]) \{\ ++. tm mdoc error: .Fo/.Fc can't be nested (#\n[.c]) ++. return ++. \} ++. ++. nr doc-saved-nesting-level \n[doc-nesting-level] ++. nr doc-in-func-enclosure 1 ++. ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ds doc-macro-name Fo ++. doc-parse-args \$@ ++. \} ++. el \ ++. tm Usage: .Fo function_name (#\n[.c]) ++. \} ++. ++. if \n[doc-in-synopsis-section] \{\ ++. \" if there is/has been more than one subroutine declaration ++. ie \n[doc-is-func] \{\ ++. br ++. nr doc-have-var 0 ++. nr doc-have-decl 0 ++. nr doc-is-func 0 ++. \} ++. el \{\ ++. if \n[doc-have-func] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. nr doc-have-decl 0 ++. \}\} ++. ++. if \n[doc-have-decl] \{\ ++. doc-paragraph ++. nr doc-have-var 0 ++. \} ++. ++. if \n[doc-have-var] \{\ ++. doc-paragraph ++. nr doc-have-decl 0 ++. \} ++. ++. nr doc-have-func 1 ++. nr doc-is-func 0 ++. ++. br ++. if !\n[doc-indent-synopsis] \ ++. nr doc-indent-synopsis (4u * \n[doc-fixed-width]u) ++. \} ++. ++. \" start function box ++. box doc-func-box ++. ev doc-func-env ++. evc 0 ++. in 0 ++. nf ++. ++. nr doc-arg-ptr +1 ++. doc-print-prefixes ++. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-func-arg-count 1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c ++. nop \f[]\s[0]\*[lp]\)\c ++. doc-reset-args ++. \} ++.. ++. ++. ++.\" NS Fc user macro ++.\" NS function close ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-func-arg-count ++.\" NS doc-in-func-enclosure ++.\" NS doc-saved-nesting-level ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `Fc' set in doc-common ++. ++.de Fc ++. if !\n[doc-in-func-enclosure] \{\ ++. tm mdoc warning: Extraneous .Fc (#\n[.c]) ++. return ++. \} ++. ++. if \n[.$] \{\ ++. ds doc-macro-name Fc ++. \" the first (dummy) argument is used to get the correct spacing ++. doc-parse-args \) \$@ ++. \} ++. ++. if !(\n[doc-saved-nesting-level] == \n[doc-nesting-level]) \ ++. tm mdoc warning: Unbalanced enclosure commands within .Fo/.Fc ++. ++. nr doc-func-arg-count 0 ++. nr doc-in-func-enclosure 0 ++. ++. ie \n[doc-in-synopsis-section] \ ++. nop \|\*[rp];\) ++. el \ ++. nop \|\*[rp]\) ++. ++. \" finish function box ++. br ++. ev ++. box ++. chop doc-func-box ++. unformat doc-func-box ++. ++. if \n[doc-in-synopsis-section] \{\ ++. if !\n[doc-indent-synopsis-active] \ ++. in +\n[doc-indent-synopsis]u ++. ti -\n[doc-indent-synopsis]u ++. \} ++. ++. nh ++. nop \*[doc-func-box]\c ++. ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. doc-print-recursive ++. \} ++. el \ ++. doc-print-and-reset ++. ++. if \n[doc-in-synopsis-section] \ ++. if !\n[doc-indent-synopsis-active] \ ++. in -\n[doc-indent-synopsis]u ++.. ++. ++. ++.\" NS doc-build-func-string macro ++.\" NS collect function arguments and set hard spaces in between ++.\" NS ++.\" NS modifies: ++.\" NS doc-func-arg ++.\" NS doc-func-args-processed ++.\" NS doc-num-func-args ++. ++.de doc-build-func-string ++. if !\n[doc-num-func-args] \{\ ++. nr doc-num-func-args \n[.$] ++. nr doc-func-args-processed 0 ++. ds doc-func-arg ++. \} ++. ++. nr doc-func-args-processed +1 ++. as doc-func-arg "\$1 ++. ++. if (\n[doc-func-args-processed] < \n[doc-num-func-args]) \{\ ++. as doc-func-arg "\*[doc-hard-space] ++. ++. shift ++. doc-build-func-string \$@ ++. \} ++.. ++. ++. ++.\" Very crude references: Stash all reference info into boxes, print out ++.\" reference on .Re macro and clean up. Ordering very limited, no fancy ++.\" citations, but can do articles, journals, and books -- need to add ++.\" several missing options (like city etc). Should be able to grab a refer ++.\" entry, massage it a wee bit (prefix a `.' to the %[A-Z]) and not worry ++.\" (ha!). ++. ++. ++.\" NS doc-is-reference global register (bool) ++.\" NS set if in reference ++. ++.nr doc-is-reference 0 ++. ++. ++.\" NS doc-reference-count global register ++.\" NS reference element counter ++. ++.nr doc-reference-count 0 ++. ++. ++.\" NS Rs user macro ++.\" NS reference start ++.\" NS ++.\" NS modifies: ++.\" NS doc-is-reference ++.\" NS doc-reference-count ++.\" NS ++.\" NS width register `Rs' set in doc-common ++. ++.de Rs ++. ie \n[.$] \ ++. tm Usage: .Rs (does not take arguments) (#\n[.c]) ++. el \{\ ++. nr doc-is-reference 1 ++. doc-reset-reference ++. if \n[doc-in-see-also-section] \ ++. doc-paragraph ++. nr doc-reference-count 0 ++. \} ++.. ++. ++. ++.\" NS Re user macro ++.\" NS reference end ++.\" NS ++.\" NS modifies: ++.\" NS doc-is-reference ++.\" NS ++.\" NS width register `Re' set in doc-common ++. ++.de Re ++. ie \n[.$] \ ++. tm Usage: .Re (does not take arguments) (#\n[.c]) ++. el \{\ ++. if !\n[doc-is-reference] \{\ ++. tm mdoc warning: Extraneous .Re (#\n[.c]) ++. return ++. \} ++. doc-print-reference ++. doc-reset-reference ++. nr doc-is-reference 0 ++. \} ++.. ++. ++. ++.\" NS doc-reset-reference macro ++.\" NS reference cleanup ++.\" NS ++.\" NS modifies: ++.\" NS doc-author-count ++.\" NS doc-author-nameXXX ++.\" NS doc-book-count ++.\" NS doc-book-name ++.\" NS doc-city-count ++.\" NS doc-city-name ++.\" NS doc-corporate-count ++.\" NS doc-corporate-name ++.\" NS doc-date ++.\" NS doc-date-count ++.\" NS doc-issue-count ++.\" NS doc-issue-name ++.\" NS doc-journal-count ++.\" NS doc-journal-name ++.\" NS doc-optional-count ++.\" NS doc-optional-string ++.\" NS doc-page-number-count ++.\" NS doc-page-number-string ++.\" NS doc-publisher-count ++.\" NS doc-publisher-name ++.\" NS doc-reference-count ++.\" NS doc-reference-title-count ++.\" NS doc-reference-title-name ++.\" NS doc-reference-title-name-for-book ++.\" NS doc-report-count ++.\" NS doc-report-name ++.\" NS doc-url-count ++.\" NS doc-url-name ++.\" NS doc-volume-count ++.\" NS doc-volume-name ++. ++.de doc-reset-reference ++. while (\n[doc-author-count]) \{\ ++. ds doc-author-name\n[doc-author-count] ++. nr doc-author-count -1 ++. \} ++. nr doc-journal-count 0 ++. nr doc-issue-count 0 ++. nr doc-optional-count 0 ++. nr doc-corporate-count 0 ++. nr doc-report-count 0 ++. nr doc-reference-title-count 0 ++. nr doc-url-count 0 ++. nr doc-volume-count 0 ++. nr doc-city-count 0 ++. nr doc-date-count 0 ++. nr doc-page-number-count 0 ++. nr doc-book-count 0 ++. nr doc-publisher-count 0 ++. nr doc-reference-count 0 ++. ++. ds doc-journal-name ++. ds doc-issue-name ++. ds doc-optional-string ++. ds doc-corporate-name ++. ds doc-report-name ++. ds doc-reference-title-name ++. ds doc-reference-title-name-for-book ++. ds doc-url-name ++. ds doc-volume-name ++. ds doc-city-name ++. ds doc-date ++. ds doc-page-number-string ++. ds doc-book-name ++. ds doc-publisher-name ++.. ++. ++. ++.\" NS doc-finish-reference macro ++.\" NS auxiliary macro for doc-print-reference ++.\" NS ++.\" NS modifies: ++.\" NS doc-reference-count ++. ++.de doc-finish-reference ++. nr doc-reference-count -\$1 ++. ie \n[doc-reference-count] \ ++. nop \), ++. el \ ++. nop \). ++.. ++. ++. ++.\" NS doc-print-reference macro ++.\" NS reference print ++.\" NS ++.\" NS modifies: ++.\" NS doc-reference-count ++. ++.de doc-print-reference ++. ++. nh ++. ++. if \n[doc-author-count] \{\ ++. doc-print-reference-authors ++. nr doc-reference-count -\n[doc-author-count] ++. \} ++. ++. if \n[doc-reference-title-count] \{\ ++. unformat doc-reference-title-name ++. chop doc-reference-title-name ++. unformat doc-reference-title-name-for-book ++. chop doc-reference-title-name-for-book ++. ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\ ++. nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c ++. doc-finish-reference \n[doc-reference-title-count] ++. \} ++. el \{\ ++. nop \*[doc-reference-title-name]\c ++. doc-finish-reference \n[doc-reference-title-count] ++. \}\} ++. ++. if \n[doc-book-count] \{\ ++. unformat doc-book-name ++. chop doc-book-name ++. nop \*[doc-book-name]\c ++. doc-finish-reference \n[doc-book-count] ++. \} ++. ++. if \n[doc-publisher-count] \{\ ++. unformat doc-publisher-name ++. chop doc-publisher-name ++. nop \*[doc-publisher-name]\c ++. doc-finish-reference \n[doc-publisher-count] ++. \} ++. ++. if \n[doc-journal-count] \{\ ++. unformat doc-journal-name ++. chop doc-journal-name ++. nop \*[doc-journal-name]\c ++. doc-finish-reference \n[doc-journal-count] ++. \} ++. ++. if \n[doc-report-count] \{\ ++. unformat doc-report-name ++. chop doc-report-name ++. nop \*[doc-report-name]\c ++. doc-finish-reference \n[doc-report-count] ++. \} ++. ++. if \n[doc-issue-count] \{\ ++. unformat doc-issue-name ++. chop doc-issue-name ++. nop \*[doc-issue-name]\c ++. doc-finish-reference \n[doc-issue-count] ++. \} ++. ++. if \n[doc-volume-count] \{\ ++. unformat doc-volume-name ++. chop doc-volume-name ++. nop \*[doc-volume-name]\c ++. doc-finish-reference \n[doc-volume-count] ++. \} ++. ++. if \n[doc-url-count] \{\ ++. unformat doc-url-name ++. chop doc-url-name ++. nop \*[doc-url-name]\c ++. doc-finish-reference \n[doc-url-count] ++. \} ++. ++. if \n[doc-page-number-count] \{\ ++. unformat doc-page-number-string ++. chop doc-page-number-string ++. nop \*[doc-page-number-string]\c ++. doc-finish-reference \n[doc-page-number-count] ++. \} ++. ++. if \n[doc-corporate-count] \{\ ++. unformat doc-corporate-name ++. chop doc-corporate-name ++. nop \*[doc-corporate-name]\c ++. doc-finish-reference \n[doc-corporate-count] ++. \} ++. ++. if \n[doc-city-count] \{\ ++. unformat doc-city-name ++. chop doc-city-name ++. nop \*[doc-city-name]\c ++. doc-finish-reference \n[doc-city-count] ++. \} ++. ++. if \n[doc-date-count] \{\ ++. unformat doc-date ++. chop doc-date ++. nop \*[doc-date]\c ++. doc-finish-reference \n[doc-date-count] ++. \} ++. ++. if \n[doc-optional-count] \{\ ++. unformat doc-optional-string ++. chop doc-optional-string ++. nop \*[doc-optional-string]\c ++. doc-finish-reference \n[doc-optional-count] ++. \} ++. ++. if \n[doc-reference-count] \ ++. tm mdoc warning: unresolved reference problem ++. ++. hy \n[doc-hyphen-flags] ++.. ++. ++. ++.\" NS doc-print-reference-authors macro ++.\" NS print out reference authors ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-dpra ++.\" NS doc-str-dpra ++. ++.ds doc-str-dpra "and ++. ++.de doc-print-reference-authors ++. nr doc-reg-dpra 1 ++. ++. while (\n[doc-reg-dpra] < \n[doc-author-count]) \{\ ++. unformat doc-author-name\n[doc-reg-dpra] ++. chop doc-author-name\n[doc-reg-dpra] ++. ie (\n[doc-author-count] > 2) \ ++. nop \)\*[doc-author-name\n[doc-reg-dpra]], ++. el \ ++. nop \)\*[doc-author-name\n[doc-reg-dpra]] ++. nr doc-reg-dpra +1 ++. \} ++. ++. unformat doc-author-name\n[doc-reg-dpra] ++. chop doc-author-name\n[doc-reg-dpra] ++. if (\n[doc-author-count] > 1) \ ++. nop \)\*[doc-str-dpra] ++. nop \)\*[doc-author-name\n[doc-reg-dpra]], ++.. ++. ++. ++.\" NS doc-author-count global register ++.\" NS counter of author references ++. ++.nr doc-author-count 0 ++. ++. ++.\" NS doc-author-nameXXX global box ++.\" NS array of author names ++.\" NS ++.\" NS limit: ++.\" NS doc-author-count ++. ++.ds doc-author-name0 ++. ++. ++.\" NS %A user macro ++.\" NS reference author(s) ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-author-count ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%A ++.\" NS ++.\" NS width register `%A' set in doc-common ++. ++.de %A ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%A author_name ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-author-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %A ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" save to reference box ++. box doc-author-name\n[doc-author-count] ++. ev doc-env-%A ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-book-count global register ++.\" NS counter of book references ++. ++.nr doc-book-count 0 ++. ++. ++.\" NS doc-book-name global box ++.\" NS string of collected book references ++. ++.ds doc-book-name ++. ++. ++.\" NS %B user macro ++.\" NS [reference] book name ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-book-count ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%B ++.\" NS ++.\" NS width register `%B' set in doc-common ++. ++.de %B ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%B book_name ... (#\n[.c]) ++. return ++. \} ++. ++. if \n[doc-is-reference] \{\ ++. nr doc-book-count +1 ++. nr doc-reference-count +1 ++. \} ++. ++. ds doc-macro-name %B ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. ie \n[doc-is-reference] \{\ ++. \" append to reference box ++. boxa doc-book-name ++. ev doc-env-%B ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-Em-font]\c ++. doc-do-references ++. \} ++. el \{\ ++. nop \*[doc-Em-font]\c ++. doc-print-recursive ++. \} ++.. ++. ++. ++.\" NS doc-city-count global register ++.\" NS counter of city references ++. ++.nr doc-city-count 0 ++. ++. ++.\" NS doc-city-name global box ++.\" NS string of collected city references ++. ++.ds doc-city-name ++. ++. ++.\" NS %C user macro ++.\" NS [reference] city ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-city-count ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%C ++.\" NS ++.\" NS width register `%C' set in doc-common ++. ++.de %C ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%C city_name ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-city-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %C ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-city-name ++. ev doc-env-%C ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-date-count global register ++.\" NS counter of date references ++. ++.nr doc-date-count 0 ++. ++. ++.\" NS doc-date global box ++.\" NS string of collected date references ++. ++.ds doc-date ++. ++. ++.\" NS %D user macro ++.\" NS [reference] date ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-date-count ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%D ++.\" NS ++.\" NS width register `%D' set in doc-common ++. ++.de %D ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%D date ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-date-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %D ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-date ++. ev doc-env-%D ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-publisher-count global register ++.\" NS counter of publisher references ++. ++.nr doc-publisher-count 0 ++. ++. ++.\" NS doc-publisher-name global box ++.\" NS string of collected publisher references ++. ++.ds doc-publisher-name ++. ++. ++.\" NS %I user macro ++.\" NS [reference] issuer/publisher name ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-publisher-count ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%I ++.\" NS ++.\" NS width register `%I' set in doc-common ++. ++.de %I ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%I issuer/publisher_name ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-publisher-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %I ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-publisher-name ++. ev doc-env-%I ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-Em-font]\c ++. doc-do-references ++.. ++. ++. ++.\" NS doc-journal-count global register ++.\" NS counter of journal references ++. ++.nr doc-journal-count 0 ++. ++. ++.\" NS doc-journal-name global box ++.\" NS string of collected journal references ++. ++.ds doc-journal-name ++. ++. ++.\" NS %J user macro ++.\" NS [reference] Journal Name ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-journal-count ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%J ++.\" NS ++.\" NS width register `%J' set in doc-common ++. ++.de %J ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%J journal_name ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-journal-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %J ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-journal-name ++. ev doc-env-%J ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-Em-font]\c ++. doc-do-references ++.. ++. ++. ++.\" NS doc-issue-count global register ++.\" NS counter of issue number references ++. ++.nr doc-issue-count 0 ++. ++. ++.\" NS doc-issue-name global box ++.\" NS string of collected issue number references ++. ++.ds doc-issue-name ++. ++. ++.\" NS %N user macro ++.\" NS [reference] issue number ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-issue-count ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%N ++.\" NS ++.\" NS width register `%N' set in doc-common ++. ++.de %N ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%N issue_number ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-issue-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %N ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-issue-name ++. ev doc-env-%N ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-optional-count global register ++.\" NS counter of optional information references ++. ++.nr doc-optional-count 0 ++. ++. ++.\" NS doc-optional-string global box ++.\" NS string of collected optional information references ++. ++.ds doc-optional-string ++. ++. ++.\" NS %O user macro ++.\" NS [reference] optional information ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-optional-count ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%O ++.\" NS ++.\" NS width register `%O' set in doc-common ++. ++.de %O ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%O optional_information ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-optional-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %O ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-optional-string ++. ev doc-env-%O ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-page-number-count global register ++.\" NS counter of page number references ++. ++.nr doc-page-number-count 0 ++. ++. ++.\" NS doc-page-number-string global box ++.\" NS string of collected page number references ++. ++.ds doc-page-number-string ++. ++. ++.\" NS %P user macro ++.\" NS [reference] page numbers ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-page-number-count ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%P ++.\" NS ++.\" NS width register `%P' set in doc-common ++. ++.de %P ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%P page_number ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-page-number-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %P ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-page-number-string ++. ev doc-env-%P ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-corporate-count global register ++.\" NS counter of corporate references ++. ++.nr doc-corporate-count 0 ++. ++. ++.\" NS doc-corporate-name global box ++.\" NS string of collected corporate references ++. ++.ds doc-corporate-name ++. ++. ++.\" NS %Q user macro ++.\" NS corporate or foreign author ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-corporate-count ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%Q ++.\" NS ++.\" NS width register `%Q' set in doc-common ++. ++.de %Q ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%Q corporate_or_foreign_author ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-corporate-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %Q ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-corporate-name ++. ev doc-env-%Q ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-report-count global register ++.\" NS counter of report references ++. ++.nr doc-report-count 0 ++. ++. ++.\" NS doc-report-name global box ++.\" NS string of collected report references ++. ++.ds doc-report-name ++. ++. ++.\" NS %R user macro ++.\" NS [reference] report name ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS doc-report-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%R ++.\" NS ++.\" NS width register `%R' set in doc-common ++. ++.de %R ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%R reference_report ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-report-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %R ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-report-name ++. ev doc-env-%R ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-reference-title-count global register ++.\" NS counter of reference title references ++. ++.nr doc-reference-title-count 0 ++. ++. ++.\" NS doc-reference-title-name global box ++.\" NS string of collected reference title references ++. ++.ds doc-reference-title-name ++. ++. ++.\" NS doc-reference-title-name-for-book global box ++.\" NS string of collected reference title references ++.\" NS (saved with another font; this is a shortcoming of groff) ++. ++.ds doc-reference-title-name-for-book ++. ++. ++.\" NS %T user macro ++.\" NS reference title ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-title-count ++.\" NS doc-report-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%T ++.\" NS ++.\" NS width register `%T' set in doc-common ++. ++.de %T ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%T reference_title ... (#\n[.c]) ++. return ++. \} ++. ++. if \n[doc-is-reference] \{\ ++. nr doc-reference-title-count +1 ++. nr doc-reference-count +1 ++. \} ++. ++. ds doc-macro-name %T ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ie \n[doc-is-reference] \{\ ++. \" append to reference box ++. boxa doc-reference-title-name-for-book ++. ev doc-env-%T ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-No-font]\c ++. doc-do-references ++. ++. \" do it a second time with another font ++. ds doc-macro-name %T ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. boxa doc-reference-title-name ++. ev doc-env-%T ++. evc 0 ++. in 0 ++. nf ++. nop \*[doc-Em-font]\c ++. doc-do-references ++. \} ++. el \{\ ++. nop \*[doc-Em-font]\c ++. doc-print-recursive ++. \} ++.. ++. ++. ++.\" NS doc-url-count global register ++.\" NS counter of hypertext references ++. ++.nr doc-url-count 0 ++. ++. ++.\" NS doc-url-name global box ++.\" NS string of collected hypertext references ++. ++.ds doc-url-name ++. ++. ++.\" NS doc-volume-count global register ++.\" NS counter of reference title references ++. ++.nr doc-volume-count 0 ++. ++. ++.\" NS doc-volume-name global box ++.\" NS string of collected volume references ++. ++.ds doc-volume-name ++. ++. ++.\" NS %U user macro ++.\" NS hypertext reference ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS doc-url-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%U ++.\" NS ++.\" NS width register `%U' set in doc-common ++. ++.de %U ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%U URL ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-url-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %U ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-url-name ++. ev doc-env-%U ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS %V user macro ++.\" NS reference volume ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-macro-name ++.\" NS doc-reference-count ++.\" NS doc-volume-count ++.\" NS ++.\" NS local variables: ++.\" NS doc-env-%V ++.\" NS ++.\" NS width register `%V' set in doc-common ++. ++.de %V ++. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ ++. tm Usage: .%V volume ... (#\n[.c]) ++. return ++. \} ++. ++. nr doc-volume-count +1 ++. nr doc-reference-count +1 ++. ++. ds doc-macro-name %V ++. doc-parse-args \$@ ++. ++. nr doc-arg-ptr +1 ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. ++. \" append to reference box ++. boxa doc-volume-name ++. ev doc-env-%V ++. evc 0 ++. in 0 ++. nf ++. doc-do-references ++.. ++. ++. ++.\" NS doc-do-references macro ++.\" NS reference recursion routine ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-ddr ++.\" NS doc-reg-ddr1 ++. ++.de doc-do-references ++. if !\n[doc-is-reference] \ ++. tm mdoc error: .\*[doc-macro-name] found outside of .Rs ... .Re (#\n[.c]) ++. ++. nr doc-reg-ddr1 \n[doc-type\n[doc-arg-ptr]] ++. ++. ie (\n[doc-reg-ddr1] == 1) \{\ ++. \" .nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c ++. doc-append-arg \c 3 ++. \*[doc-arg\n[doc-arg-ptr]] ++. \} ++. el \{\ ++. nop \)\*[doc-arg\n[doc-arg-ptr]]\c ++. ++. ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\ ++. \" finish reference box ++. br ++. ev ++. boxa ++. ++. doc-reset-args ++. \} ++. el \{\ ++. nr doc-reg-ddr \n[doc-arg-ptr] ++. nr doc-arg-ptr +1 ++. nop \)\*[doc-space\n[doc-reg-ddr]]\c ++. doc-do-references ++. \}\} ++.. ++. ++. ++.\" NS Hf user macro ++.\" NS source include header files. ++.\" NS ++.\" NS modifies: ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS ++.\" NS width register `Hf' set in doc-common ++. ++.de Hf ++. ie ((\n[.$] == 1) & (\n[doc-arg-limit] == 0)) \{\ ++. doc-paragraph ++. nop File: ++. Pa \$1 ++. ++. Bd -literal ++. so \$1 ++. Ed ++. ++. doc-paragraph ++. \} ++. el \ ++. Usage: .Hf file (#\n[.c]) ++.. ++. ++. ++.\" NS doc-have-author global register (bool) ++.\" NS set in `An' ++. ++.nr doc-have-author 0 ++. ++. ++.\" NS An user macro ++.\" NS author name ++.\" NS ++.\" NS modifies: ++.\" NS doc-arg-ptr ++.\" NS doc-curr-font ++.\" NS doc-curr-size ++.\" NS doc-have-author ++.\" NS doc-macro-name ++.\" NS ++.\" NS width register `An' set in doc-common ++. ++.de An ++. if !\n[doc-arg-limit] \{\ ++. ie \n[.$] \{\ ++. ie "\$1"-nosplit" \ ++. nr doc-in-authors-section 0 ++. el \{ .ie "\$1"-split" \ ++. nr doc-in-authors-section 1 ++. el \{\ ++. ds doc-macro-name An ++. doc-parse-args \$@ ++. \}\}\} ++. el \{\ ++. tm1 "Usage: .An {-nosplit | -split} ++. tm1 " .An author_name ... (#\n[.c]) ++. \}\} ++. ++. if \n[doc-in-authors-section] \{\ ++. ie \n[doc-have-author] \ ++. br ++. el \ ++. nr doc-have-author 1 ++. \} ++. ++. if \n[doc-arg-limit] \{\ ++. nr doc-arg-ptr +1 ++. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\ ++. nr doc-curr-font \n[.f] ++. nr doc-curr-size \n[.ps] ++. doc-print-recursive ++. \} ++. el \{\ ++. tm Usage: .An author_name ... (#\n[.c]) ++. doc-reset-args ++. \}\} ++.. ++. ++. ++.\" NS Rv user macro ++.\" NS return values ++.\" NS ++.\" NS width register `Rv' set in doc-common ++.\" NS ++.\" NS local variables: ++.\" NS doc-str-Rv-std-prefix ++.\" NS doc-str-Rv-std-suffix ++.\" NS doc-str-Rv-stds-prefix ++.\" NS doc-str-Rv-stds-and ++.\" NS doc-str-Rv-stds-suffix ++.\" NS doc-str-Rv-std0 ++. ++.ds doc-str-Rv-std-prefix "The ++.ds doc-str-Rv-std-suffix "function returns the value\~0 if successful; ++.as doc-str-Rv-std-suffix " otherwise the value\~\-1 is returned and ++.as doc-str-Rv-std-suffix " the global variable \*[doc-Va-font]errno\f[] ++.as doc-str-Rv-std-suffix " is set to indicate the error. ++. ++.ds doc-str-Rv-stds-prefix "The ++.ds doc-str-Rv-stds-and "and ++.ds doc-str-Rv-stds-suffix "functions return the value\~0 if successful; ++.as doc-str-Rv-stds-suffix " otherwise the value\~\-1 is returned and ++.as doc-str-Rv-stds-suffix " the global variable \*[doc-Va-font]errno\f[] ++.as doc-str-Rv-stds-suffix " is set to indicate the error. ++. ++.ds doc-str-Rv-std0 "Upon successful completion, the value\~0 is returned; ++.as doc-str-Rv-std0 " otherwise the value\~\-1 is returned and ++.as doc-str-Rv-std0 " the global variable \*[doc-Va-font]errno\f[] ++.as doc-str-Rv-std0 " is set to indicate the error. ++. ++.de Rv ++. ++.\" XXX: what does this function without `-std'? ++. ++. if \n[doc-arg-limit] \{\ ++. tm Usage: .Rv not callable by other macros (#\n[.c]) ++. doc-reset-args ++. return ++. \} ++. ++. if !\n[.$] \{\ ++. tm Usage: .Rv [-std] [ ...] (#\n[.c]) ++. return ++. \} ++. ++. if "\$1"-std" \{\ ++. nr doc-reg-Rv \*[doc-section] ++. if ((\n[doc-reg-Rv] < 2) : (\n[doc-reg-Rv] > 3)) \ ++. tm Usage: .Rv -std in sections 2 and 3 only (#\n[.c]) ++. br ++. shift ++. ie (\n[.$] > 1) \{\ ++. nop \)\*[doc-str-Rv-stds-prefix] ++. nr doc-reg-Rv 1 ++. while (\n[doc-reg-Rv] < \n[.$]) \{\ ++. ie (\n[.$] > 2) \ ++. Fn \$\n[doc-reg-Rv] , ++. el \ ++. Fn \$\n[doc-reg-Rv] ++. nr doc-reg-Rv +1 ++. \} ++. nop \)\*[doc-str-Rv-stds-and] ++. Fn \$\n[.$] ++. nop \)\*[doc-str-Rv-stds-suffix] ++. \} ++. el \{ .ie (\n[.$] == 1) \{\ ++. nop \)\*[doc-str-Rv-std-prefix] ++. Fn \$1 ++. nop \)\*[doc-str-Rv-std-suffix] ++. \} ++. el \{\ ++. nop \)\*[doc-str-Rv-std0] ++. \}\}\} ++.. ++. ++. ++.\" NS Ex user macro ++.\" NS exit status ++.\" NS ++.\" NS width register `Ex' set in doc-common ++.\" NS ++.\" NS local variables: ++.\" NS doc-str-Ex-std-prefix ++.\" NS doc-str-Ex-std-suffix ++. ++.ds doc-str-Ex-std-prefix "The ++.ds doc-str-Ex-std-suffix "utility exits\~0 on success, ++.as doc-str-Ex-std-suffix " and\~>0 if an error occurs. ++. ++.ds doc-str-Ex-stds-prefix "The ++.als doc-str-Ex-stds-and doc-str-Rv-stds-and ++.ds doc-str-Ex-stds-suffix "utilities exit\~0 on success, ++.as doc-str-Ex-stds-suffix " and\~>0 if an error occurs. ++. ++.de Ex ++. ++.\" XXX: what does this function without `-std'? ++. ++. if \n[doc-arg-limit] \{\ ++. tm Usage: .Ex not callable by other macros (#\n[.c]) ++. doc-reset-args ++. return ++. \} ++. ++. if !\n[.$] \{\ ++. tm Usage: .Ex [-std] [ ...] (#\n[.c]) ++. return ++. \} ++. ++. if "\$1"-std" \{\ ++. nr doc-reg-Ex \*[doc-section] ++. if !((\n[doc-reg-Ex] == 1) : (\n[doc-reg-Ex] == 6) : (\n[doc-reg-Ex] == 8)) \ ++. tm Usage: .Ex -std in sections 1, 6 and 8 only (#\n[.c]) ++. br ++. shift ++. ie (\n[.$] > 1) \{\ ++. nop \)\*[doc-str-Ex-stds-prefix] ++. nr doc-reg-Ex 1 ++. while (\n[doc-reg-Ex] < \n[.$]) \{\ ++. ie (\n[.$] > 2) \ ++. Nm \$\n[doc-reg-Ex] , ++. el \ ++. Nm \$\n[doc-reg-Ex] ++. nr doc-reg-Ex +1 ++. \} ++. nop \)\*[doc-str-Ex-stds-and] ++. Nm \$\n[.$] ++. nop \)\*[doc-str-Ex-stds-suffix] ++. \} ++. el \{\ ++. nop \)\*[doc-str-Ex-std-prefix] ++. Nm \$1 ++. nop \)\*[doc-str-Ex-std-suffix] ++. \}\} ++.. ++. ++. ++.\" NS Mt user macro ++.\" NS mailto (for conversion to HTML) ++. ++.de Mt ++. \" XXX: error handling missing ++. Pa \$@ ++.. ++. ++. ++.\" NS Lk user macro ++.\" NS link (for conversion to HTML) ++.\" NS ++.\" NS local variables: ++.\" NS doc-reg-Lk ++.\" NS doc-str-Lk ++. ++.de Lk ++. ds doc-str-Lk Sy \$@ ++. ++. ie (\n[.$] > 1) \{\ ++. doc-get-arg-type \$2 ++. ie (\n[doc-arg-type] < 3) \{\ ++. Em \)\$2: ++. ds doc-str-Lk Sy "\$1" ++. doc-get-width "\$1" ++. shift 2 ++. if \n[.$] \ ++. as doc-str-Lk " \$@ ++. \} ++. el \ ++. doc-get-width "\$1" ++. \} ++. el \ ++. doc-get-width "\$1" ++. ++. ie n \ ++. nr doc-reg-Lk 26 ++. el \ ++. nr doc-reg-Lk 38 ++. ie (\n[doc-width] >= \n[doc-reg-Lk]) \ ++. D1 \*[doc-str-Lk] ++. el \ ++. \*[doc-str-Lk] ++.. ++. ++. ++.\" NS doc-defunct-macro macro ++.\" NS this is the skeleton for defunct macros ++.\" NS ++. ++.de doc-defunct-macro ++. tmc mdoc error: .\$0 defunct ++. if d doc-\$0-usage \ ++. tmc , \*[doc-\$0-usage] ++. tm1 " (#\n[.c]) ++.. ++. ++. ++.\" obsolete macros ++. ++.als Db doc-defunct-macro ++. ++.als Ds doc-defunct-macro ++. ++.als Or doc-defunct-macro ++.ds doc-Or-usage use `|' ++. ++.als Sf doc-defunct-macro ++.ds doc-Sf-usage use .Pf or .Ns ++. ++. ++.rn em e@ ++. ++.de em ++. tm1 "mdoc error: end-macro (.em) respecification is not allowed. (#\n[.c]) ++. tm1 " Should this have been `.Em ...'? ++. ab ++.. ++. ++. ++.\" NS doc-empty-line macro ++.\" NS emit warning and print empty line ++. ++.de doc-empty-line ++. if !\n[doc-display-depth] \ ++. tm mdoc warning: Empty input line #\n[.c] ++. sp ++.. ++. ++.blm doc-empty-line ++. ++. ++.ec ++. ++. ++.\" For UTF-8, map some characters conservatively for the sake ++.\" of easy cut and paste. ++. ++.if '\*[.T]'utf8' \{\ ++. rchar \- - ' ` ++. ++. char \- \N'45' ++. char - \N'45' ++. char ' \N'39' ++. char ` \N'96' ++.\} ++. ++. ++.\" load local modifications ++.mso mdoc.local ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/tmac/e.tmac groff-1.22.3/tmac/e.tmac +--- groff-1.22.3.old/tmac/e.tmac 2014-11-04 10:38:35.534520134 +0200 ++++ groff-1.22.3/tmac/e.tmac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,2037 +0,0 @@ +-.\" -*- nroff -*- +-.\" +-.\" @(#)e.tmac 2.31 (Berkeley) 5/21/88 +-.\" Modified by James Clark for use with groff. +-.\" +-.\" Copyright (c) 1988 Regents of the University of California. +-.\" All rights reserved. +-.\" +-.\" Redistribution and use in source and binary forms are permitted +-.\" provided that this notice is preserved and that due credit is given +-.\" to the University of California at Berkeley. The name of the University +-.\" may not be used to endorse or promote products derived from this +-.\" software without specific prior written permission. This software +-.\" is provided ``as is'' without express or implied warranty. +-.\" %beginstrip% +-.\" +-.\"********************************************************************** +-.\"* * +-.\"* ****** - M E N R O F F / T R O F F M A C R O S ****** * +-.\"* * +-.\"* Produced for your edification and enjoyment by: * +-.\"* Eric Allman * +-.\"* Electronics Research Laboratory * +-.\"* U.C. Berkeley. * +-.\"* current address: * +-.\"* Britton-Lee, Inc. * +-.\"* 1919 Addison Street Suite 105 * +-.\"* Berkeley, California 94704 * +-.\"* * +-.\"* VERSION 2.31 First Release: 11 Sept 1978 * +-.\"* * +-.\"* Documentation is available. * +-.\"* * +-.\"********************************************************************** +-.\" +-.\" Code on .de commands: +-.\" *** a user interface macro. +-.\" &&& a user interface macro which is redefined +-.\" when used to be the real thing. +-.\" $$$ a macro which may be redefined by the user +-.\" to provide variant functions. +-.\" --- an internal macro. +-.\" +-. +-.do nr need_eo_h 0 +-.do nr need_eo_tl 0 +-.do nr need_tl 1 +-. +-.do mso devtag.tmac +-. +-.if !\n(.g .ig +-.de @R \" --- initialize number register to 0, if undefined +-.if !r\\$1 .nr \\$1 0 +-.. +-. +-.\" --- check whether grohtml needs end of title/heading +-.de @html_check_need_title +-.do if (\\n[need_eo_tl] == 1) \ +-\{\ +-. do nr need_eo_tl 0 +-. do DEVTAG-EO-TL +-.\} +-.do if (\\n[need_tl] == 1) \ +-\{\ +-. do DEVTAG-TL +-. do nr need_tl 0 +-. do nr need_eo_tl 1 +-.\} +-.do if \\n[need_eo_h]>0 .do DEVTAG-EO-H +-.do nr need_eo_h 0 +-.. +-. +-.de @check_need_title +-.. +-. +-.ie '\*(.T'html' \ +-. do als check_need_title @html_check_need_title +-.el \ +-. do als check_need_title @check_need_title +-. +-.@R pf +-.if \n(pf .nx +-. +-.if !\n(.g .ig +-.de @S \" --- initialize string/macro to empty, if undefined +-.if !d\\$1 .ds \\$1 \" empty +-.. +-. +-.@R @\" \" debugging level +-. +-. +-.\" *** INTERNAL GP MACROS *** +-. +-. +-.de @C \" --- change ev's, taking info with us +-.nr _S \\n(.s +-.nr _V \\n(.v +-.nr _F \\n(.f +-.nr _J \\n(.j +-.do ds _A \\n[.fam] +-.nr _I \\n(.i +-.ev \\$1 +-.ps \\n(_S +-.vs \\n(_Vu +-.ft \\n(_F +-.ad \\n(_J +-.do @fam \\*(_A +-'in \\n(_Iu +-.xl \\n($lu +-.lt \\n($lu +-.rr _S +-.rr _V +-.rr _F +-.rr _I +-.rr _J +-.ls 1 +-'ce 0 +-.. +-. +-.de @D \" --- determine display type (Indent, Left, Center) +-.ds |p "\\$3 +-.nr _d 0 +-.if "\\$2"C" \ +-. nr _d 1 +-.if "\\$2"L" \ +-. nr _d 2 +-.if "\\$2"I" \ +-. nr _d 3 +-.if "\\$2"M" \ +-. nr _d 4 +-.if !\\n(_d \ +-\{\ +-. nr _d \\$1 +-. ds |p "\\$2 +-.\} +-. +-.. +-. +-.de @z \" --- end macro +-.if \n@>1 .tm >> @z, .z=\\n(.z ?a=\\n(?a +-.if !"\\n(.z"" \ +-\{\ +-. tm Line \\n(c. -- Unclosed block, footnote, or other diversion (\\n(.z) +-. di +-. ex +-.\} +-.if \\n(?a \ +-. bp \" force out final table +-.ds bp +-.ds @b\" \" don't start another page +-.br +-.if \n@>1 .tm << @z +-.. +-. +-. +-.\" *** STANDARD HEADERS AND FOOTERS *** +-. +-. +-.ie \n(.g .ds $* \\\\$* +-.el .ds $* \\\\$1 \\\\$2 \\\\$3 \\\\$4 \\\\$5 \\\\$6 \\\\$7 \\\\$8 \\\\$9 +-. +-.de he \" *** define header +-.ie !\\n(.$ \ +-\{\ +-. rm |4 +-. rm |5 +-.\} +-.el \ +-\{\ +-. ds |4 "\*($* +-. ds |5 "\*($* +-.\} +-.. +-. +-.de eh \" *** define even header +-.ie !\\n(.$ \ +-. rm |4 +-.el \ +-. ds |4 "\*($* +-.. +-. +-.de oh \" *** define odd header +-.ie !\\n(.$ \ +-. rm |5 +-.el \ +-. ds |5 "\*($* +-.. +-. +-.de fo \" *** define footer +-.ie !\\n(.$ \ +-\{\ +-. rm |6 +-. rm |7 +-.\} +-.el \ +-\{\ +-. ds |6 "\*($* +-. ds |7 "\*($* +-.\} +-.. +-. +-.de ef \" *** define even foot +-.ie !\\n(.$ \ +-. rm |6 +-.el \ +-. ds |6 "\*($* +-.. +-. +-.de of \" *** define odd footer +-.ie !\\n(.$ \ +-. rm |7 +-.el \ +-. ds |7 "\*($* +-.. +-. +-.de ep \" *** end page (must always be followed by a .bp) +-.if \\n(nl>0 \ +-\{\ +-. wh 0 +-. rs +-. @b +-.\} +-.. +-. +-. +-.\" *** INTERNAL HEADER AND FOOTER MACROS *** +-. +-. +-.de @h \" --- header +-.if \n@>1 .tm >> @h %=\\n% ?a=\\n(?a ?b=\\n(?b ?w=\\n(?w +-.if (\\n(.i+\\n(.o)>=\\n(.l \ +-. tm Line \\n(c. -- Offset + indent exceeds line length +-.\" initialize a pile of junk +-.nr ?h \\n(?H \" transfer "next page" to "this page" +-.nr ?H 0 +-.nr ?c \\n(?C +-.nr ?C 0 +-.rn |4 |0 +-.rn |5 |1 +-.rn |6 |2 +-.rn |7 |3 +-.nr _w 0 \" reset max footnote width +-.nr ?W 0 \" no wide floats this page (yet) +-.nr ?I 1 +-.\" begin actual header stuff +-.ev 2 +-.rs +-.if \\n(hm>0 \ +-. if !'\*(.T'html' \ +-. sp |\\n(hmu \" move to header position +-.@t $h\" \" output header title +-.if \\n(tm<=0 \ +-. nr tm \n(.Vu +-.if !'\*(.T'html' \ +-. sp |\\n(tmu \" move to top of text +-.ev +-.mk _k \" for columned output +-.if \\n(?n=1 .nm 1 \" restore line numbering if n1 mode +-.nr $c 1 \" set first column +-.if \n@>4 .tm -- @h >> .ns nl=\\n(nl %=\\n% _k=\\n(_k tm=\\n(tm +-.ie \\n(?s \ +-\{\ +-. nr ?s 0 +-. rs +-' @b +-.\} +-.el \ +-. @n\" \" begin the column +-.if \n@>2 .tm << @h +-.. +-. +-.de @n \" --- new column or page +-.if \n@>3 .tm >> @n nl=\\n(nl %=\\n% ?f=\\n(?f ?o=\\n(?o +-.if \\n(bm<=0 \ +-. nr bm \\n(.Vu +-.if (\\n(_w<=\\n($l)&(\\n(?W=0) \ +-\{\ +-. nr _b (\\n(ppp*\\n($vu)/200u \" compute fudge factor (must be < 1P) +-. if \\n(_bu>((\\n(bmu-\\n(fmu-((\\n(tpp*\\n($vu)/100u))/2u) \ +-. nr _b (\\n(ppp*\\n($vu)/100u-\n(.Vu +-. nr _b +\\n(bmu +-.\} +-.nr _B \\n(_bu +-.ch @f +-.wh -\\n(_bu @f +-.nr _b +(\\n(ppp*\\n($vu)/100u \" add 1 paragraph v in case of sweep past +-.if \n@>2 .tm @n .p=\\n(.p bm=\\n(bm _b=\\n(_b _B=\\n(_B +-.nr ?f 0 \" reset footnote flag +-.if \\n(?o \ +-\{\ +-. (f _\" \" reprocess footnotes which run off page +-. nf +-. |o +-. fi +-. )f +-. rm |o +-.\} +-.nr ?o 0 +-.if \\n(?T \ +-\{\ +-. nr _i \\n(.i +-. if \\n(?n \ +-. nm \\n(ln +-. in 0 +-. |h\" \" output the table header +-. in \\n(_iu +-. if \\n(?n \ +-. nm +-. rr _i +-. mk #T \" for tbl commands +-. ns +-.\} +-.if (\\n(?a)&((\\n($c<2):(\\n(?w=0)) \ +-\{\ +-. nr ?a 0 \" output floating keep +-. @k |t +-. if \\n(?w \ +-. mk _k \" don't overstrike wide keeps +-. nr ?w 0 +-.\} +-.os +-.$H\" \" special column header macro +-.ns +-.. +-. +-.de @f \" --- footer +-.if \n@>1 .tm >> @f %=\\n% nl=\\n(nl ?a=\\n(?a ?b=\\n(?b ?f=\\n(?f +-.if \n@>2 .nr VL \\n(.pu-\\n(nlu +-.if \n@>2 .tm @f bm=\\n(bm _B=\\n(_B _b=\\n(_b .p-nl=\\n(VL +-.ec +-.if \\n(?T \ +-\{\ +-. nr T. 1 \" for tbl commands (to output bottom line) +-. T# 1\" \" output the sides and bottom lines +-. br +-.\} +-.ev 2 +-.ce 0 +-.if \\n(?b \ +-\{\ +-. nr ?b 0 +-. @k |b\" \" output bottom of page tables +-.\} +-.if \\n(?f \ +-. @o\" \" output footnote if present +-.ie \\n($c<\\n($m \ +-. @c\" \" handle new column +-.el \ +-. @e\" \" new page +-.ev +-.if \n@>2 .tm << @f +-.. +-. +-.de @o \" --- output footnote +-.nf +-.ls 1 +-.in 0 +-.if \n@>2 .tm @o last printed text = \\n(nl placing @r trap at -\\n(_B +-.wh -\\n(_Bu @r +-.if \\n(?n \ +-. nm \\n(ln +-.|f +-.if \\n(?n \ +-. nm +-.fi +-.if \n@>2 .tm @o triggered @r (?o) = \\n(?o +-.if \\n(?o \ +-\{\ +-. di \" just in case triggered @r +-. if \\n(dn=0 \ +-\{\ +-. rm |o +-. nr ?o 0 +-. \} +-. nr dn \\n(_D +-. rr _D +-.\} +-.rm |f +-.ch @r +-.. +-. +-.de @c \" --- new column +-.if \n@>2 .tm >> @c %=\\n% +-.rs +-.sp |\\n(_ku +-.@O +\\n($lu+\\n($su +-.nr $c +1 +-.@n +-.. +-. +-.de @e \" --- end page +-.if \n@>2 .tm >> @e +-.@O \\n(_ou +-.rs +-.sp |\\n(.pu-\\n(fmu-((\\n(tpp*\\n($vu)/100u) \" move to footer position +-.@t $f\" \" output footer title +-.nr ?h 0 +-.bp +-.. +-. +-.de @t \" --- output header or footer title +-.if !\\n(?h \ +-\{\ +-. sz \\n(tp\" \" set header/footer type fonts, etc. +-. @F \\n(tf +-. lt \\n(_Lu \" make title span entire page +-. if \\n(?n \ +-. nm \\n(ln +-. nf +-. \\$1 +-. br +-. if \\n(?n \ +-. nm +-.\} +-.. +-. +-.de $h \" $$$ print header +-.ds |z +-.if !\\n(?c \ +-\{\ +-. if e .ds |z "\\*(|0 +-. if o .ds |z "\\*(|1 +-.\} +-.if !\(ts\\*(|z\(ts\(ts \ +-' tl \\*(|z +-.rm |z +-.. +-. +-.de $f \" $$$ print footer +-.ds |z +-.if \\n(?c \ +-\{\ +-. if e .ds |z "\\*(|0 +-. if o .ds |z "\\*(|1 +-.\} +-.if \(ts\\*(|z\(ts\(ts \ +-\{\ +-. if e .ds |z "\\*(|2 +-. if o .ds |z "\\*(|3 +-.\} +-.if !\(ts\\*(|z\(ts\(ts \ +-' tl \\*(|z +-.rm |z +-.. +-. +-.de @r \" --- reprocess overflow footnotes +-.if \n@>3 .tm >> @r .z=\\n(.z ?f=\\n(?f ?a=\\n(?a ?b=\\n(?b _b=\\n(_b +-.di |o \" save overflow footnote +-.nr ?o 1 +-.nr _D \\n(dn +-.ns +-.. +-. +-. +-.\" *** COMMANDS WITH VARIANT DEFINITIONS *** +-. +-. +-.if !'\*(.T'html' .rn bp @b \" --- begin page +-. +-.de bp \" *** begin new page (overrides columns) +-.nr $c \\n($m \" force new page, not new column +-.ie \\n(nl>0 \ +-. @b \\$1 +-.el \ +-\{\ +-. if \\n(.$>0 \ +-. pn \\$1 +-. if \\n(?I \ +-. @h\" \" 'spring' the header trap +-.\} +-.br +-.wh 0 @h \" reset header +-.. +-. +-.rn ll xl \" *** special line length (local) +-.de ll \" *** line length (global to environments) +-.xl \\$1 +-.lt \\$1 +-.nr $l \\n(.l +-.if (\\n($m<=1):(\\n($l>\\n(_L) \ +-. nr _L \\n(.l +-.. +-. +-.rn po @O \" --- local page offset +-. +-.de po \" *** page offset +-.@O \\$1 +-.nr _o \\n(.o +-.. +-. +-.\" Redefine the fam request to set the family in +-.\" environment 2 as well as the current environment. +-.if !\n(.g .ig +-.do rn fam @fam \" --- set family in current environment +-.do de fam \" *** set font family in ev 2 and current ev +-.do @fam \\$1 +-.ev 2 +-.do @fam \\$1 +-.ev +-.. +-. +-. +-.\" *** MISCELLANEOUS ROFF COMMANDS *** +-. +-. +-.de hx \" *** suppress headers and footers next page +-.nr ?H 1 +-.. +-. +-.de ix \" *** indent, no break +-'in \\$1 +-.. +-. +-.de bl \" *** contiguous blank lines +-.br +-.@s \\$1 +-.sp \\$1 +-.. +-. +-.de @s \" --- diversion-surviving space test +-.ne \\$1 +-.rs +-.if !'\\n(.z'' \!.@s \\$1 +-.. +-. +-.de n1 \" *** line numbering 1 +-.nm 1 +-.ll -\w'0000'u +-.nr ?n 1 +-.. +-. +-.de n2 \" *** line numbering 2 +-.ie \\n(.$ \ +-\{\ +-. ie !`\\$2`c` \ +-. po -\w'0000'u +-. el \ +-. ll -\w'0000'u +-. ie \\B`\\$1` \ +-\{\ +-. ds |i \\$1 +-. ds |j \\$1 +-. do substring |i 0 0 \" pick off leading char and rest to check +-. do substring |j 1 \" for +N / -N +-. ie `\\*(|i`+` \ +-. nr ln (\\n[_ln])+\\*(|j +-. el \ +-. ie `\\*(|i`-` \ +-. nr ln (\\n[_ln])-\\*(|j +-. el \ +-. nr ln \\$1 \" unsigned N +-. nm \\n(ln +-. nr ?n 2 +-. rm |i |j +-.\} +-. el \ +-. tm Line \\n(.c -- Bad .n2 value +-.\} +-.el \ +-\{\ +-. nm +-. nr _ln \\n(ln +-. po +\w'0000'u +-. ll \\n($lu +-. nr ?n 0 +-. nr ln 0 +-.\} +-.. +-. +-.de pa \" *** new page +-.bp \\$1 +-.. +-. +-.de ro \" *** roman page numbers +-.af % i +-.. +-. +-.de ar \" *** arabic page numbers +-.af % 1 +-.. +-. +-.de m1 \" *** position one space +-.nr _0 \\n(hmu +-.nr hm \\$1v +-.nr tm +\\n(hmu-\\n(_0u +-.rr _0 +-.. +-. +-.de m2 \" *** position two space +-.nr tm \\n(hmu+\\n(tpp+\\$1v +-.. +-. +-.de m3 \" *** position three space +-.nr bm \\n(fmu+\\n(tpp+\\$1v +-.. +-. +-.de m4 \" *** position four space +-.nr _0 \\n(fmu +-.nr fm \\$1v +-.nr bm +\\n(fmu-\\n(_0u +-.. +-. +-.de sk \" *** leave a blank page (next page) +-.if \\n(.$>0 \ +-. tm Line \\n(c. -- I cannot skip multiple pages +-.nr ?s 1 +-.. +-. +-. +-.\" *** MISCELLANEOUS USER SUPPORT COMMANDS *** +-. +-. +-.if !\n(.g .ig +-.de re \" *** reset tabs (TROFF defines 15 stops default) +-.ta T 0.5i +-.. +-. +-.if \n(.g .ig +-.de re +-.ta 0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +-.. +-. +-.de ba \" *** set base indent +-.ie \\n(.$ \ +-. nr $i \\$1n +-.el \ +-. nr $i \\n(siu*\\n($0u +-.. +-. +-.de hl \" *** draw horizontal line +-.br +-.if '\*(.T'html' \ +-\{\ +-. HR +-. do return +-.\} +-.ie \n(.g .do nr _I \\n[.in] +-.el .nr _I \\n(.i +-\l'\\n(.lu-\\n(_Iu' +-.sp +-.. +-. +-. +-.\" *** PARAGRAPHING *** +-. +-. +-.de pp \" *** paragraph +-.lp \\n(piu +-.. +-. +-.de lp \" *** left aligned paragraph +-.@p +-.if \\n(.$ \ +-. ti +\\$1 +-.nr $p 0 1 +-.. +-. +-.de ip \" *** indented paragraph w/ optional tag +-.if (\\n(ii>0)&(\\n(ii<1n) \ +-. nr ii \\n(iin +-.nr _0 \\n(ii +-.if \\n(.$>1 \ +-. nr _0 \\$2n +-.@p \\n(_0u +-.nr _I \\n(.iu +-.in 0 +-.di |i +-\&\\$1 +-.br +-.di +-.in \\n(_Iu +-.ds |j \\*(|i\\ +-.ie \\w"\\*(|j" \ +-\{\ +-. ti -\\n(_0u +-. ie \\w"\\*(|j">=\\n(_0 \ +-\{\ +-. do DEVTAG-COL 1 +-\\*(|j +-. do DEVTAG-COL-NEXT 2 +-. br +-. \} +-. el \ +-\{\ +-. do DEVTAG-COL 1 +-\\*(|j\h'|\\n(_0u'\c +-. do DEVTAG-COL 2 +-. \} +-.\} +-.el .do DEVTAG-COL 2 +-.rr _0 +-.rm |i |j +-.. +-. +-.de np \" *** numbered paragraph +-.\" use string comparison in case user has changed format of $p +-.if '\\n($p'-1' \ +-. nr $p 0 \" reset number after .bu +-.nr $p +1 \" increment paragraph number +-.@p \w'\0(000)\0'u +-.ti -\w'\0(000)\0'u +-\0(\\n($p)\h'|\w'\0(000)\0'u'\c +-.. +-. +-.de bu \" *** bulleted paragraph +-.br +-.\" use string comparison in case user has changed format of $p +-.if '\\n($p'-1' \ +-. ns \" don't space between .bu paragraphs +-.nr $p 0-1 \" mark "bulleted paragraph" mode +-.@p \w'\0\(bu\0'u +-.ti -\w'\0\(bu\0'u +-\0\(bu\0\c +-.. +-. +-.de @p \" --- initialize for paragraph +-.do check_need_title +-.if "\\n(.z"|e" .tm Line \\n(c. -- Unmatched continued equation +-.in \\n($iu+\\n(pou +-.if \\n(.$ \ +-. in +\\$1n +-.ce 0 +-.fi +-.@F \\n(pf +-.sz \\n(pp +-.sp \\n(psu +-.ne \\n(.Lv+\\n(.Vu +-.ns +-.. +-. +-. +-.\" *** SECTION HEADINGS *** +-. +-. +-.de sh \" *** section heading +-.fi +-.do check_need_title +-.if (\\n(si>0)&(\\n(si<1n) \ +-. nr si \\n(sin +-.if '\*(.T'html' .nr si 0 +-.ce 0 +-.if '\*(.T'html' \ +-\{\ +-. do DEVTAG-SH \\$1 +-. do nr need_eo_h 1 +-.\} +-.@d "\\$1" +1 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 +-.if !"\\$2"_" \ +-\{\ +-. ds |n \&\\$2 +-. $p "\\*(|n" "\\*($n" \\n($0 +-. $0 "\\*(|n" "\\*($n" \\n($0 +-. rm |n +-.\} +-.nr $p 0 1 \" reset .np count +-.. +-. +-.de @d \" --- change section depth +-.if !""\\$1" \ +-. nr $0 \\$1 +-.if \\n($0&(\\n(.$>1) \ +-. nr $\\n($0 \\$2 +-.ds $n \&\" +-.ie \\n($0>=1 \ +-\{\ +-. if '\\n($1'0' \ +-. nr $1 1 +-. if (\\n(.$>=3) .if !"\\$3"-" \ +-. nr $1 \\$3 +-. as $n \\n($1 +-.\} +-.el \ +-. nr $1 0 +-.ie \\n($0>=2 \ +-\{\ +-. if '\\n($2'0' \ +-. nr $2 1 +-. if (\\n(.$>=4) .if !"\\$4"-" \ +-. nr $2 \\$4 +-. as $n .\\n($2 +-.\} +-.el \ +-. nr $2 0 +-.ie \\n($0>=3 \ +-\{\ +-. if '\\n($3'0' \ +-. nr $3 1 +-. if (\\n(.$>=5) .if !"\\$5"-" \ +-. nr $3 \\$5 +-. as $n .\\n($3 +-.\} +-.el \ +-. nr $3 0 +-.ie \\n($0>=4 \ +-\{\ +-. if '\\n($4'0' \ +-. nr $4 1 +-. if (\\n(.$>=6) .if !"\\$6"-" \ +-. nr $4 \\$6 +-. as $n .\\n($4 +-.\} +-.el \ +-. nr $4 0 +-.ie \\n($0>=5 \ +-\{\ +-. if '\\n($5'0' \ +-. nr $5 1 +-. if (\\n(.$>=7) .if !"\\$7"-" \ +-. nr $5 \\$7 +-. as $n .\\n($5 +-.\} +-.el \ +-. nr $5 0 +-.ie \\n($0>=6 \ +-\{\ +-. if '\\n($6'0' \ +-. nr $6 1 +-. if (\\n(.$>=8) .if !"\\$8"-" \ +-. nr $6 \\$8 +-. as $n .\\n($6 +-.\} +-.el \ +-. nr $6 0 +-.. +-. +-.de sx \" *** heading up, no increment (2.1.1 -> 2.1) +-.ce 0 +-.ul 0 +-.nr _0 \\n($0-1 +-.if \\n(.$ .nr _0 +1 +-.if \\n(.$ .nr _0 \\$1 +-.@d \\n(_0 +-.rr _0 +-.$p "" "" \\n($0 +-.nr $p 0 1 \" reset .np count +-.. +-. +-.de uh \" *** unnumbered section heading +-.$p "\\$1" +-.$0 "\\$1" +-.. +-. +-.de $p \" $$$ print section heading +-.if (\\n(si>0)&(\\n(.$>2) \ +-. nr $i \\$3*\\n(si +-.in \\n($iu +-.ie !"\\$1\\$2"" \ +-\{\ +-. sp \\n(ssu \" one of them is non-null +-. ne \\n(.Lv+\\n(.Vu+\\n(psu+((\\n(spp*\\n($vu*\\n(.Lu)/100u) +-. \" exdent if \\$3 > 0 +-. ie 0\\$3 \ +-. ti -(\\n(siu-\\n(sou) +-. el \ +-. ti +\\n(sou +-. @F \\n(sf +-. sz \\n(sp +-. if 0\\$3 \ +-. $\\$3 +-. if \w"\\$2">0 \\$2. +-. if \w"\\$1">0 \\$1\f1\ \ \& +-.\} +-.el \ +-. sp \\n(psu +-.@F \\n(pf +-.sz \\n(pp +-.. +-. +-. +-.\" *** COLUMNED OUTPUT *** +-. +-. +-.de 2c \" *** double columned output +-.br +-.if \\n($m>1 \ +-. 1c\" \" revert to 1c if already 2c +-.nr $c 1 +-.nr $m 2 +-.if \\n(.$>1 \ +-. nr $m \\$2 +-.if \\n(.$>0 \ +-. nr $s \\$1n \" param 1: column separation +-.nr $l (\\n(.l-((\\n($m-1)*\\n($s))/\\n($m +-.xl \\n($lu +-.mk _k +-.ns +-.. +-. +-.de 1c \" *** single columned output +-.br +-.nr $c 1 +-.nr $m 1 +-.ll \\n(_Lu \" return to normal output +-.sp |\\n(.hu +-.@O \\n(_ou +-.. +-. +-.de bc \" *** begin column +-.sp 24i +-.. +-. +-. +-.\" *** FLOATING TABLES AND NONFLOATING BLOCKS *** +-. +-. +-.de (z \" *** begin floating keep +-.if \n@>4 .tm >> (z, .z=\n(.z +-.@D 4 \\$1 \\$2 +-.@( +-.. +-. +-.de )z \" *** end floating keep +-.if \n@>4 .tm >> )z, .z=\n(.z +-.sp \\n(zsu +-.@) +-.if \n@>4 .tm -- )z << @), .z=\n(.z +-.rr _0 +-.if !\\n(?b \ +-. nr dn +(\\n(ppp*\\n($vu)/200u+\\n(zsu +-.nr dl -\n(.H \" fudge factor necessary to make it work +-.ie ((\\n(dn+\n(.V)>=\\n(.t):(\\n(?a):((\\n(dl>\\n($l)&(\\n($c>1)) \ +-\{\ +-. nr ?a 1 +-. if (\\n(dl>\\n($l)&(\\n($m>1) \ +-. nr ?w 1 \" mark wider than one column (top) +-. ds |x |t +-.\} +-.el \ +-\{\ +-. nr ?b 1 +-. if (\\n(dl>\\n($l)&(\\n($m>1) \ +-. nr ?W 1 \" mark wider than one column (bottom) +-. nr _b +\\n(dnu +-. \" avoid moving @f back past the current position +-. if \\n(.p-\\n(nl-\n(.V<\\n(_b \ +-. nr _b \\n(.p-\\n(nl-\n(.V +-. ch @f -\\n(_bu +-. ds |x |b +-.\} +-.da \\*(|x \" copy to save macro +-.nf +-.ls 1 +-.nr ?k 1 +-.if \n@>4 .tm -- )z >> \\*(|x +-\!.if \\\\n(nl>(\\\\n(tm+2v) .ne \\n(dnu-\\n(zsu +-.|k\" \" and the body +-.ec +-.if \n@>4 .tm -- )z << \\*(|x, .z=\\n(.z +-.nr ?k 0 +-.rm |k\" \" remove the temp macro +-.da +-.in 0 +-.ls 1 +-.xl \\n($lu +-.ev +-.if \n@>4 .tm << )z, .z=\\n(.z +-.. +-. +-.de @k \" --- output floating keep +-.if \n@>4 .tm >> @k, $1=\\$1, .z=\\n(.z +-.ev 1 +-.nf +-.ls 1 +-.in 0 +-.sp \\n(zsu +-.if \\n(?n \ +-. nm \\n(ln +-.\\$1 +-.if \\n(?n \ +-. nm +-.ec +-.br +-.rm \\$1 +-.ev +-.. +-. +-.de (t \" XXX temp ref to (z +-.(z \\$1 \\$2 +-.. +-. +-.de )t \" XXX temp ref to )t +-.)z \\$1 \\$2 +-.. +-. +-.de (b \" *** begin block +-.br +-.@D 3 \\$1 \\$2 +-.sp \\n(bsu +-.@( +-.if '\*(.T'html' .sp \\n(bsu +-.. +-. +-.de )b \" *** end block +-.br +-.@) +-.if (\\n(bt=0):(\\n(.t<\\n(bt) \ +-. ne \\n(dnu \" make it all on one page +-.@k |k +-.ev \" return from display environment +-.sp \\n(bsu+\\n(.Lv-1v +-.. +-. +-.de @( \" --- begin keep +-.if !"\\n(.z"" .tm Line \\n(c. -- Invalid nested keep \\n(.z +-.@M +-.di |k +-\!'rs +-.. +-. +-.de @M \" --- set modes for display +-.nr ?k 1 +-.@C 1 +-.@F \\n(df +-.if \\n($R .@V +-.vs \\n(.sp*\\n($Vu/100u +-.nf +-.if "\\*(|p"F" \ +-. fi \" set fill mode if "F" parameter +-.if \\n(_d=4 \ +-. in 0 +-.if \\n(_d=3 \ +-\{\ +-. in +\\n(biu +-. xl -\\n(biu +-.\} +-.if \\n(_d=1 \ +-. ce 10000 +-.. +-. +-.de @) \" --- end keep +-.br +-.if !"\\n(.z"|k" .tm Line \\n(c. -- Close of a keep which has never been opened +-.nr ?k 0 +-.di +-.in 0 +-.ce 0 +-.. +-. +-.de (c \" *** begin block centered text +-.br +-.if "\\n(.z"|c" .tm Line \\n(c. -- Nested .(c requests +-.if \\n(?n .nm +-.di |c +-.. +-. +-.de )c \" *** end block centered text +-.if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c +-.br \" force out final line +-.di +-.if \n@>4 .tm >> .)c .l=\\n(.l .i=\\n(.i $i=\\n($i dl=\\n(dl +-.ev 1 +-.ls 1 +-.in (\\n(.lu-\\n(.iu-\\n(dlu)/2u +-.if \n@>4 .tm -- .)c << .in .l=\\n(.l .i=\\n(.i dl=\\n(dl +-.if \\n(?n \ +-. nm \\n(ln +-.nf +-.|c +-.ec +-.in +-.ls +-.if \\n(?n \ +-. nm +-.ev +-.rm |c +-.. +-. +-. +-.\" *** BLOCK QUOTES (OR WHATEVER) AND LISTS *** +-. +-. +-.de (q \" *** begin block quote +-.br +-.@C 1 +-.fi +-.sp \\n(qsu +-.in +\\n(qiu +-.xl -\\n(qiu +-.sz \\n(qp +-.if \\n(?n \ +-. nm \\n(ln +-.. +-. +-.de )q \" *** end block quote +-.br +-.if \\n(?n \ +-. nm +-.ev +-.sp \\n(qsu+\\n(.Lv-1v +-.nr ?k 0 +-.. +-. +-.de (l \" *** begin list +-.br +-.sp \\n(bsu +-.@D 3 \\$1 \\$2 +-.@M +-.if \\n(?n \ +-. nm \\n(ln +-.if '\*(.T'html' .sp \\n(bsu +-.. +-. +-.de )l \" *** end list +-.br +-.if \\n(?n \ +-. nm +-.ev +-.sp \\n(bsu+\\n(.Lv-1v +-.nr ?k 0 +-.. +-. +-. +-.\" *** PREPROCESSOR SUPPORT *** +-. +-. +-.\" +-.\" EQN +-.\" +-.de EQ \" *** equation start +-.do if \\n[need_eo_h]>0 .do DEVTAG-EO-H +-.do nr need_eo_h 0 +-.ec +-.if "\*(.T"html" \ +-\{\ +-. do nr e-EQ-ll \\n(.l +-. ll 1000n +-.\} +-.do HTML-IMAGE +-.if !\\n(?e \ +-\{\ +-. if "\\n(.z"|e" .tm Line \\n(c. -- Nested .EQ request +-. @D 1 "\\$1" "\\$2" +-. @C 2 +-. di |e +-.\} +-.ls 1 +-.in 0 +-.nf +-.. +-. +-.de EN \" *** equation end +-.br +-.do HTML-IMAGE-END +-.if "\*(.T"html" \ +-. do ll \\n[e-EQ-ll]u +-.ie "\\$1"C" \ +-\{\ +-. nr ?e 1 +-. sp \\n(esu +-.\} +-.el \ +-\{\ +-. nr ?e 0 +-. di +-. if \\n(dn \ +-. @q\" \" actual equation output +-. rm |e +-. ev +-.\} +-.. +-. +-.de @q \" --- equation output +-.nr _Q \\n(dnu +-.ev +-.sp \\n(esu \" output rest of preceding text +-.if !"\\n(.z"" \!.ne \\n(_Qu +-.ne \\n(_Qu+\n(.Vu \" keep it on one page +-.@C 2\" \" .ev 2 may be jumbled from header +-.if \\n(_d=1 \ +-. in (\\n(.lu+\\n($iu-\\n(dlu)/2u +-.if \\n(_d=2 \ +-. in \\n($iu +-.if \\n(_d=3 \ +-. in \\n(biu+\\n($iu +-.if \\n(_d=4 \ +-. in 0 +-.mk _q +-.if \n@>1 .tm --@e: _Q=\\n(_Q _q=\\n(_q nl=\\n(nl |p=\\*(|p +-.if !"\\*(|p"" \ +-\{\ +-. rs +-. sp (\\n(_Qu-\\n(.vu)/2u +-. tl """\\*(|p" +-. rt \\n(_qu +-.\} +-.if \\n(?n \ +-. nm \\n(ln +-.|e +-.if \\n(?n \ +-. nm +-.sp |\\n(_qu+\\n(_Qu +-.sp \\n(esu+\\n(.Lv-1v +-.rr _q +-.rr _Q +-.. +-. +-.\" +-.\" TBL +-.\" +-.de TS \" *** table start +-.sp \\n(bsu +-.if "\*(.T"html" \ +-\{\ +-. do nr e-TS-ll \\n(.l +-. ll 1000n +-.\} +-.do HTML-IMAGE +-.@C 1 +-.fi \" drop into fill mode for text boxes +-.if "\\$1"H" \ +-\{\ +-. di |h \" save header part +-. nr ?T 1 +-.\} +-.ls 1 +-.ch @f -(\\n(_bu+1v) \" set pseudo-trap for bottom line +-.if \\n(.p-\\n(_b-1v<=\\n(nl \ +-. ch @f \\n(nlu+\n(.Vu +-.. +-. +-.de TH \" *** end header part of table +-.nr T. 0 +-.T# 0 +-.if \\n(?n \!.nm +-.di +-.nr _T \\n(?T +-.nr ?T 0 +-.ne \\n(dnu+1v +-.nr ?T \\n(_T +-.nr _i \\n(.i +-.if \\n(?n .nm \\n(ln +-.in 0 +-.|h\" \" put in the initial header +-.in \\n(_iu +-.rr _i +-.mk #T +-.. +-. +-.de TE \" *** table end +-.nr ?T 0 +-.ch @f -\\n(_bu \" reset pseudo-trap +-.if \\n(.p-\\n(_b<=\\n(nl \ +-. ch @f \\n(nlu+\n(.Vu +-.ev +-.do HTML-IMAGE-END +-.if "\*(.T"html" \ +-. do ll \\n[e-TS-ll]u +-.sp \\n(bsu+\\n(.Lv-1v +-.re +-.. +-. +-.de T& +-.. +-. +-.\" +-.\" REFER +-.\" +-.mso refer-me.tmac +-. +-.\" +-.\" IDEAL +-.\" +-.de IS \" *** start ideal picture +-.nr g7 \\n(.u +-.ls 1 +-.. +-. +-.de IF +-.if \\n(g7 .fi +-.ls +-.. +-. +-.de IE \" *** end ideal picture +-.if \\n(g7 .fi +-.ls +-.. +-. +-.\" +-.\" PIC +-.\" +-.de PS \" *** start picture: $1=height, $2=width in units or inches +-.sp 0.3 +-.do HTML-IMAGE +-.nr g7 \\$2 +-.in (u;\\n(.l-\\n(g7>?0/2) +-.ne \\$1u +-.nr g7 \\n(.u +-.ls 1 +-.if \\n(?n \ +-\{\ +-. de PS_nm_check && \" define macro to emit .nm at top diversion +-. if \n@>4 .tm -- PS: \\\\$1 \\\\$2 .z=\\\\n(.z PS_nm_cnt=\\\\n[PS_nm_cnt] +-. \" \" multiple .PS/.PE in a keep. +-. if `\\\\$2`init` \ +-. do nr PS_nm_cnt \\\\n[PS_nm_cnt]+1 +-. ie `\\\\n(.z`` \ +-\{\ +-. if `\\\\$1`suspend` \ +-. nm +-. if `\\\\$1`resume` \ +-\{\ +-. nm \\\\n(ln +-. do nr PS_nm_cnt \\\\n[PS_nm_cnt]-1 +-. do if !\\\\n[PS_nm_cnt] \ +-\{\ +-. do rm PS_nm_check +-. do rr PS_nm_cnt +-.\} +-.\} +-.\} +-.el \!.PS_nm_check \\\\$1 +-.&& +-. mk _q \" emit a single numbered line for PS picture +-. rs +-\&\ +-. br +-. rt \\n(_qu +-. PS_nm_check suspend init +-.\} +-.. +-. +-.de PE \" *** end picture +-.if \\n(?n .PS_nm_check resume +-.ls +-.in +-.if \\n(g7 .fi +-.do HTML-IMAGE-END +-.sp .6 +-.. +-. +-.\" +-.\" GREMLIN +-.\" +-.de GS \" *** start gremlin picture +-.ie '\*(.T'html' \ +-\{\ +-. ie "\\$1"L" .do HTML-IMAGE-LEFT +-. el .ie "\\$1"R" .do HTML-IMAGE-RIGHT +-. el .do HTML-IMAGE +-.\} +-.el \ +-\{\ +-. nr g7 (\\n(.lu-\\n(g1u)/2u +-. if "\\$1"L" .nr g7 \\n(.iu +-. if "\\$1"R" .nr g7 \\n(.lu-\\n(g1u +-. in \\n(g7u +-. nr g7 \\n(.u +-. ls 1 +-. nf +-. ne \\n(g2u +-.\} +-.. +-. +-.de GE \" *** end gremlin picture +-.ie '\*(.T'html' .do HTML-IMAGE-END +-.el \ +-\{\ +-. GF +-. sp .6 +-.\} +-.. +-. +-.de GF \" *** finish gremlin picture; stay at top +-.ls +-.in +-.if \\n(g7 .fi +-.. +-. +-. +-.\" *** FONT AIDS *** +-. +-. +-.de sz \" *** set point size and vertical spacing +-.ps \\$1 +-.if \\n($r .@v +-.vs \\n(.sp*\\n($vu/100u \" default vs at pointsize + 20% +-.. +-. +-.de @v \" --- possibly set $v from $r +-.if (1i>=240u)&(1p<=\\n($r)&(\\n($r<=4p) .nr $v \\n($r00/1p +-.. +-. +-.de @V \" --- possibly set $V from $R +-.if (1i>=240u)&(1p<=\\n($R)&(\\n($R<=4p) .nr $V \\n($R00/1p +-.. +-. +-.de @E \" --- store in _F argument to \f for restoring font +-.ie \\n(.f<10 \ +-. ds _F \\n(.f +-.el \ +-\{\ +-. ie \\n(.f<100&\n(.g \ +-. ds _F (\\n(.f +-. el \ +-. ds _F P +-.\} +-.. +-. +-.de r \" *** enter roman font +-.do check_need_title +-.@E +-.ft 1 +-.if \\n(.$ \&\\$1\f\\*(_F\\$2 +-.do check_need_title +-.. +-. +-.de i \" *** enter italic +-.do check_need_title +-.@E +-.ft 2 +-.if \\n(.$ \&\\$1\f\\*(_F\\$2 +-.do check_need_title +-.. +-. +-.de b \" *** enter boldface +-.do check_need_title +-.@E +-.ft 3 +-.if \\n(.$ \&\\$1\f\\*(_F\\$2 +-.do check_need_title +-.. +-. +-.de rb \" *** enter real boldface +-.do check_need_title +-.@E +-.ft 3 +-.if \\n(.$ \&\\$1\f\\*(_F\\$2 +-.do check_need_title +-.. +-. +-.de bi \" *** enter bold italic +-.do check_need_title +-.@E +-.ft 4 +-.if \\n(.$ \&\\$1\f\\*(_F\\$2 +-.do check_need_title +-.. +-. +-.de u \" *** enter underlined word +-\&\\$1\l'|0\(ul'\\$2 +-.. +-. +-.\" a better version of u +-.if !\n(.g .ig +-.de u +-\Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2 +-.. +-. +-.de q \" *** enter quoted word +-\&\\*(lq\\$1\\*(rq\\$2 +-.. +-. +-.de bx \" *** enter boxed word +-.ie '\*(.T'html' \\$1\\$2 +-.el \k~\(br\|\\$1\|\(br\l'|\\n~u\(rn'\l'|\\n~u\(ul'\^\\$2 +-.. +-. +-.de sm \" *** print in smaller font +-\s-1\\$1\\s0\\$2 +-.. +-. +-.de @F \" --- change font (0 -> no change) +-.nr ~ \\$1 +-.if \\n~>0 \ +-. ft \\n~ +-.rr ~ +-.. +-. +-. +-.\" *** FOOTNOTING *** +-. +-. +-.de (f \" *** begin footnote +-.ec +-.if "\\n(.z"|f" .tm Line \\n(c. -- Invalid footnote nesting +-.ie "\\n(.z"" \ +-\{\ +-. nr _D \\n(dn +-. nr _0 1v+\\n(nlu +-. ev 2 +-. nm +-. da |f +-. in 0 +-. xl \\n($lu-\\n(fuu +-. @F \\n(ff +-. sz \\n(fp +-. vs \\n(.sp*\\n($Vu/100u +-. if !\\n(?f \ +-\{\ +-. nr _b +1v \" allow space for $s +-. $s +-. \} +-. br +-. if \\n(.p-\\n(_b-\\n(_0-\\n(.h-1v-\\n(fs<0 \ +-\{\ +-. da\" \" won't fit on page at all +-. bc +-. if !\\n(?f \ +-. rm |f +-. da |f +-.\" next five lines could be dropped if headers had their own environment +-. in 0 \" reset everything from .bc +-. xl \\n($lu-\\n(fuu +-. @F \\n(ff +-. sz \\n(fp +-. vs \\n(.sp*\\n($Vu/100u +-. if !\\n(?f \ +-. $s +-. br +-. \} +-. rr _0 +-. sp \\n(fsu +-. nr ?f 1 +-. fi +-. if !"\\$1"_" \ +-. ti \\n(fiu +-. if \n@>2 .tm << (f $f=\\n($f +-.\} +-.el \ +-\{\ +-. ev 2 +-. nm +-. in 0 +-. xl \\n($lu-\\n(fuu +-. @F \\n(ff +-. sz \\n(fp +-. vs \\n(.sp*\\n($Vu/100u +-. fi +-\!.(f \\$1 +-\!.@N +-.\} +-.. +-. +-.de @N \" --- set no fill mode in the top-level diversion +-.ie "\\n(.z"" .nf +-.el \!.@N +-.. +-. +-.de )f \" *** end footnote +-.ie "\\n(.z"|f" \ +-\{\ +-. if \\n* \ +-. nr $f +1 +-. ds * \\*{\\n($f\\*}\k* +-. nr * 0 +-. in 0 +-. da +-. ev +-. if \\n(_w<\\n(dl \ +-. nr _w \\n(dl \" compute maximum fn width +-. nr _b +\\n(dn +-. ch @f -\\n(_bu +-. if \\n(.p-\\n(_b<=\\n(nl \ +-. ch @f \\n(nlu+\n(.Vu +-. nr dn \\n(_D +-. rr _D +-.\} +-.el \ +-\{\ +-. br +-\!.)f +-. ev +-.\} +-.. +-. +-.@R ff +-.if \n(ff<=0 \ +-. nr ff 1 \" footnote font: Times Roman +-.@R fp +-.if \n(fp<=0 \ +-. nr fp 8 \" footnote pointsize +-. +-.de $s \" $$$ footnote separator +-\l'2i' +-.. +-. +-. +-.\" *** DELAYED TEXT *** +-. +-. +-.de (d \" *** begin delayed text +-.am |d )d +-.sp \\n(bsu +-.. +-. +-.de )d \" *** end delayed text +-.if \\n# \ +-. nr $d +1 +-.ds # [\\n($d]\k# +-.rr # +-.. +-. +-.de pd \" *** print delayed text +-.|d +-.rm |d +-.nr $d 1 1 +-.ds # [1]\k# +-.. +-. +-. +-.\" *** INDEXES (TABLE OF CONTENTS) *** +-. +-. +-.nr _x 0 1 +-.do nr _xn 0 +-.af _x a +-. +-.de (x \" *** begin index entry +-.if \n@>4 .tm >> (x, .z=\\n(.z +-.ds |X x +-.if \\n(.$>0 \ +-. ds |X \\$1 +-.ie "\\n(.z"" \ +-. nr _z 0 +-.el \ +-. nr _z 1 +-.@\\n(_z +-.. +-. +-.de @0 \" --- finish (x if no current diversion +-.am %\\*(|X )x +-.sp \\n(xsu +-.ti -\\n(piu +-.. +-. +-.de @1 \" --- finish (x if current diversion +-.if "\\n(_x"z" .nr _x 0 +-.de =\\n+(_x )x +-.. +-. +-.de )x \" *** end index entry +-.if \n@>4 .tm >> )x, .z=\\n(.z +-.ie "\\n(.z"" \ +-\{\ +-. ds |x \\n% +-. if \\n(.$>0 \ +-. ds |x \\$1 +-. if "\\*(|x"_" \ +-. ig .. +-. am %\\*(|X .. +-. if \w"\\$2">(\\n(.l-\\n(.i-\\n(.k) \ +-. ti +\\n(xuu +-\\\\a\\\\t\\$2\\*(|x +-... +-. rm |x +-. rm |X +-.\} +-.el \ +-\{\ +-\!.(x \\*(|X +-\!\\\\*(=\\n(_x\\\\ +-\!.)x \\$1 \\$2 +-\!.rm =\\n(_x +-.\} +-.. +-. +-.de xp \" *** print the index +-.br +-.@C 2 +-.ls 1 +-.vs \\n(.sp*\\n($Vu/100u +-.fi +-.in +\\n(piu +-.ds |X x +-.if \\n(.$>0 \ +-. ds |X \\$1 +-.xl -(\\n(xuu+\w'...'u) +-.di |x +-.%\\*(|X +-.br +-.di +-.rm %\\*(|X +-.xl \\n($lu +-.rm |X +-.ev +-.nf +-.in 0 +-.ta \\n(.lu-\\n(xuuR \\n(.luR +-.|x +-.fi +-.in +-.rm |x +-.. +-. +-. +-.\" *** HTML VERSIONS OF .x(, .x), AND .xp *** +-. +-. +-.de (x-html \" --- create TAG and divert text +-.nr _x +1 +-.do nr _xn +1 +-.do TAG "_x\\n[_x] +-.br +-.do di |x\\n[_xn] +-.br +-.. +-. +-.de )x-html \" --- end diversion +-.br +-.di +-.. +-. +-.de xp-html \" --- create list of links +-.do nr _xx 1 +-.br +-.do ev xp-html-ev +-.sp +-.do ULS +-.do while \\n[_xx]<=\\n[_xn] \ +-\{\ +-. br +-. do unformat |x\\n[_xx] +-. do di xp-html-div +-. br +-. ll 100i +-. fi +-. do |x\\n[_xx] +-. br +-. di +-. do asciify xp-html-div +-. do rm xp-html-as +-. do as xp-html-as # +-. do as xp-html-as _x\\n[_xx] +-. ll +-. LI +-. do URL \\*[xp-html-as] "\\*[xp-html-div] +-. do rm xp-html-as +-. do nr _xx +1 +-.\} +-.do ULE +-.sp +-.ev +-.. +-. +-.if '\*(.T'html' \ +-\{\ +-. rm (x +-. do als (x (x-html +-. rm )x +-. do als )x )x-html +-. rm xp +-. do als xp xp-html +-.\} +-. +-. +-.\" *** CHAPTERS AND TITLES *** +-. +-. +-.de +c \" *** begin chapter +-.ep\" \" force out footnotes +-.if \\n(?o:\\n(?a \ +-\{\ +-. bp \" force out a table or more footnote +-. rs +-. ep +-.\} +-.nr ?C 1 +-.nr $f 1 1 +-.ds * \\*{1\\*}\k* +-.if \\n(?R \ +-. pn 1 +-.bp +-.in \\n($iu \" reset the indent +-.rs +-.ie \\n(.$ \ +-. $c "\\$1" +-.el \ +-. sp 3 +-.. +-. +-.de ++ \" *** declare chapter type +-.nr _0 0 +-.if "\\$1"C" \ +-. nr _0 1 \" chapter +-.if "\\$1"RC" \ +-. nr _0 11 \" renumbered chapter +-.if "\\$1"A" \ +-. nr _0 2 \" appendix +-.if "\\$1"RA" \ +-. nr _0 12 \" renumbered appendix +-.if "\\$1"P" \ +-. nr _0 3 \" preliminary material +-.if "\\$1"B" \ +-. nr _0 4 \" bibliographic material +-.if "\\$1"AB" \ +-. nr _0 5 \" abstract +-.if \\n(_0=0 \ +-. tm Line \\n(c. -- Bad mode to .++ +-.nr ?R 0 +-.if \\n(_0>10 \ +-.\{ +-. nr ?R 1 +-. nr _0 -10 +-.\} +-.nr ch 0 1 +-.if (\\n(_0=3):(\\n(_0=5) \ +-. pn 1 \" must do before .ep +-.if !\\n(_0=\\n(_M .if \\n(_M=3 \ +-. pn 1 \" must do before .ep +-.ep\" \" end page for correct page number types +-.if \\n(_0=1 \ +-\{\ +-. af ch 1 +-. af % 1 +-.\} +-.if \\n(_0=2 \ +-\{\ +-. af ch A +-. af % 1 +-.\} +-.if \\n(_0=3 \ +-. af % i +-.if \\n(_0=4 \ +-. af % 1 +-.if \\n(_0=5 \ +-. af % 1 +-.if \\n(.$>1 \ +-. he \\$2 +-.nr _M \\n(_0 +-.rr _0 +-.. +-. +-.de $c \" $$$ print chapter title +-.sz 12 +-.ft 3 +-.ce 1000 +-.if \\n(_M<3 \ +-. nr ch +1 +-.ie \\n(_M=1 CHAPTER\ \ \\n(ch +-.el .if \\n(_M=2 APPENDIX\ \ \\n(ch +-.if \w"\\$1" .sp 3-\\n(.L +-.if \w"\\$1" \\$1 +-.if (\\n(_M<3):(\w"\\$1") \ +-. sp 4-\\n(.L +-.ce 0 +-.ft +-.sz +-.ie \\n(_M=1 \ +-. $C Chapter \\n(ch "\\$1" +-.el .if \\n(_M=2 \ +-. $C Appendix \\n(ch "\\$1" +-.. +-. +-.de tp \" *** title page +-.hx +-.bp +-.br +-.rs +-.pn \\n% +-.. +-. +-.\" *** DATES *** +-.if \n(mo=1 .ds mo January +-.if \n(mo=2 .ds mo February +-.if \n(mo=3 .ds mo March +-.if \n(mo=4 .ds mo April +-.if \n(mo=5 .ds mo May +-.if \n(mo=6 .ds mo June +-.if \n(mo=7 .ds mo July +-.if \n(mo=8 .ds mo August +-.if \n(mo=9 .ds mo September +-.if \n(mo=10 .ds mo October +-.if \n(mo=11 .ds mo November +-.if \n(mo=12 .ds mo December +-.if \n(dw=1 .ds dw Sunday +-.if \n(dw=2 .ds dw Monday +-.if \n(dw=3 .ds dw Tuesday +-.if \n(dw=4 .ds dw Wednesday +-.if \n(dw=5 .ds dw Thursday +-.if \n(dw=6 .ds dw Friday +-.if \n(dw=7 .ds dw Saturday +-.nr y2 \n(yr%100 +-.af y2 00 +-.nr y4 \n(yr+1900 +-.ds td \*(mo \n(dy, \n(y4 +-. +-. +-.\" *** PARAMETRIC INITIALIZATIONS *** +-. +-. +-.rr x +-.nr $v \n(.v00+\n(.sp-1/\n(.sp \" vs as percentage of ps for .sz request +-.nr $V \n($v \" same for displays & footnotes +-.nr hm 4v \" header margin +-.nr tm 7v \" top margin +-.nr bm 6v \" bottom margin +-.nr fm 3v \" footer margin +-.nr tf 3 \" title font: (real) Times Bold +-.nr tp 10 \" title point size +-.hy 14 +-.nr bi 4m \" indent for blocks +-.nr pi 5n \" indent for paragraphs +-.nr pf 1 \" normal text font +-.nr pp 10 \" normal text point size +-.nr qi 4n \" indent for quotes +-.nr qp -1 \" down one point +-.nr ii 5n \" indent for .ip's and .np's +-.nr $m 1 \" max number of columns +-.nr $s 4n \" column separation +-.nr sf 3 \" section font -- Times Bold +-.nr sp 10 \" section title pointsize +-.nr ss 12p \" section prespacing +-.nr si 0 \" section indent +-. +-. +-.\" *** OTHER INITIALIZATION *** +-. +-. +-.\" GNU pic sets this register to 1, to indicate that \x should not be used. +-.@R 0x +-.ds { \v'-0.4m'\x'\\n(0x=0*-0.2m'\s-3 +-.ds } \s0\v'0.4m' +-.\" for compatibility with traditional -me +-.\" (the first will work only in compatibility mode) +-.ds [ \*{ +-.ds ] \*} +-.ds < \v'0.4m'\x'\\n(0x=0*0.2m'\s-3 +-.ds > \s0\v'-0.4m' +-.ds - \(em +-.\" Avoid warnings from groff -ww. +-.@S |0 +-.@S |1 +-.@S |2 +-.@S |3 +-.@S $H +-.@S $0 +-.@S $1 +-.@S $2 +-.@S $3 +-.@S $4 +-.@S $5 +-.@S $6 +-.@S $7 +-.@S $8 +-.@S $9 +-.@S .. +-. +-.@R po\" \" simulated page offset +-.@R $0\" \" section depth +-.@R $i\" \" paragraph base indent +-.@R $p\" \" numbered paragraph number +-.@R $r\" \" ratio of vs to ps (may override $v) +-.@R $R\" \" same for displays (may override $V) +-.@R df\" \" display font: same as surrounding text +-.@R so\" \" additional section title offset +-.@R fu\" \" footnote undent +-.@R bt\" \" block keep threshold +-.@R *\" \" has \** been referenced? +-.@R ?a\" \" pending floating keep at page top? +-.@R ?b\" \" pending floating keep at page bottom? +-.@R ?C\" \" at chapter header? +-.@R ?e\" \" in equation? +-.@R ?H\" \" suppress headers and footers next page? +-.@R ?I\" \" has the header trap been sprung? +-.@R ?n\" \" n1 mode? +-.@R ?o\" \" footnote overflow? +-.@R ?R\" \" renumbered chapter? +-.@R ?s\" \" skip next page? +-.@R ?T\" \" inside .TS H? +-.@R ?W\" \" wide floating keep at page bottom? +-.@R ?w\" \" wide floating keep at page top? +-. +-.nr fi 0.3i +-.nr _o \n(.o +-.nr $b 3 \" bold +-.nr ps 0.35v +-.if \n(ps<\n(.V .nr ps \n(.V +-.nr bs \n(ps \" block pre/post spacing +-.nr qs \n(ps \" quote pre/post spacing +-.nr zs 1v \" float-block pre/postspacing +-.nr xs 0.2v \" index prespacing +-.nr xu 0.5i \" index undent +-.nr fs 0.2v \" footnote prespacing +-.nr es 0.5v \" equation pre/postspacing +-.if \n(es<\n(.V .nr es \n(.V +-.wh 0 @h \" set header +-.nr $l \n(.lu \" line length +-.nr _L \n(.lu \" line length of page +-.nr $c 1 \" current column number +-.nr $f 1 1 \" footnote number +-.ds * \*{1\*}\k*\" \" footnote "name" +-.nr $d 1 1 \" delayed text number +-.ds # [1]\k#\" \" delayed text "name" +-.nr _M 1 \" chapter mode is chapter +-.ds lq \(lq\" \" left quote +-.ds rq \(rq\" \" right quote +-.em @z +-. +-. +-.\" *** FOREIGN LETTERS AND SPECIAL CHARACTERS *** +-. +-. +-.ds #h ((1u-(\\\\n(.fu%2u))*0.13m) +-.ds #v 0.6m +-. +-.\" \" accents +-.ds ' \k_\h'-(\\n(.wu*8/10-\*(#h)'\(aa\h'|\\n_u' +-.ds ` \k_\h'-(\\n(.wu*7/10-\*(#h)'\(ga\h'|\\n_u' +-. +-.\" \" umlaut +-.ds : \k_\h'-(\\n(.wu*8/10-\*(#h+0.1m)'\v'-\*(#v'\z.\h'0.2m'.\h'|\\n_u'\v'\*(#v' +-. +-.\" \" circumflex and tilde +-.ds ^ \k_\h'-(\\n(.wu-\*(#h-0.05m)'^\h'|\\n_u' +-.ds ~ \k_\h'-(\\n(.wu-\*(#h-0.05m)'~\h'|\\n_u' +-. +-.\" \" cedilla and czech +-.ds , \k_\h'-(\\n(.wu)',\h'|\\n_u' +-.ds v \k_\h'-(\\n(.wu*9/10-\*(#h)'\v'-\*(#v'\s-4v\s0\v'\*(#v'\h'|\\n_u' +-. +-.\" \" Norwegian A or angstrom +-.ds o \k_\h'-(\\n(.wu+\w'\(de'u-\*(#h)/2u'\v'-0.4n'\z\(de\v'0.4n'\h'|\\n_u' +-. +-.\" \" there exists, for all +-.ds qe \s-2\v'0.45m'\z\(em\v'-0.625m'\z\(em\v'-0.625m'\(em\v'0.8m'\s0\h'-0.1m'\v'-0.05m'\(br\v'0.05m'\h'0.1m' +-.ds qa \z\e\h'0.35m'\z\(sl\h'-0.33m'\v'-0.3m'\s-4\(em\s0\v'0.3m'\h'0.15m' +-.rm #h #v +-.ll 6.0i +-.lt 6.0i +-. +-.de @U +-.tm The \\$1 macro has been removed from this version of the -me macros. +-.. +-. +-.de lo +-.@U lo +-.. +-. +-.de th +-.@U th +-.. +-. +-.de ac +-.@U ac +-.. +-. +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/e.tmac-u groff-1.22.3/tmac/e.tmac-u +--- groff-1.22.3.old/tmac/e.tmac-u 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/e.tmac-u 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,2037 @@ ++.\" -*- nroff -*- ++.\" ++.\" @(#)e.tmac 2.31 (Berkeley) 5/21/88 ++.\" Modified by James Clark for use with groff. ++.\" ++.\" Copyright (c) 1988 Regents of the University of California. ++.\" All rights reserved. ++.\" ++.\" Redistribution and use in source and binary forms are permitted ++.\" provided that this notice is preserved and that due credit is given ++.\" to the University of California at Berkeley. The name of the University ++.\" may not be used to endorse or promote products derived from this ++.\" software without specific prior written permission. This software ++.\" is provided ``as is'' without express or implied warranty. ++.\" %beginstrip% ++.\" ++.\"********************************************************************** ++.\"* * ++.\"* ****** - M E N R O F F / T R O F F M A C R O S ****** * ++.\"* * ++.\"* Produced for your edification and enjoyment by: * ++.\"* Eric Allman * ++.\"* Electronics Research Laboratory * ++.\"* U.C. Berkeley. * ++.\"* current address: * ++.\"* Britton-Lee, Inc. * ++.\"* 1919 Addison Street Suite 105 * ++.\"* Berkeley, California 94704 * ++.\"* * ++.\"* VERSION 2.31 First Release: 11 Sept 1978 * ++.\"* * ++.\"* Documentation is available. * ++.\"* * ++.\"********************************************************************** ++.\" ++.\" Code on .de commands: ++.\" *** a user interface macro. ++.\" &&& a user interface macro which is redefined ++.\" when used to be the real thing. ++.\" $$$ a macro which may be redefined by the user ++.\" to provide variant functions. ++.\" --- an internal macro. ++.\" ++. ++.do nr need_eo_h 0 ++.do nr need_eo_tl 0 ++.do nr need_tl 1 ++. ++.do mso devtag.tmac ++. ++.if !\n(.g .ig ++.de @R \" --- initialize number register to 0, if undefined ++.if !r\\$1 .nr \\$1 0 ++.. ++. ++.\" --- check whether grohtml needs end of title/heading ++.de @html_check_need_title ++.do if (\\n[need_eo_tl] == 1) \ ++\{\ ++. do nr need_eo_tl 0 ++. do DEVTAG-EO-TL ++.\} ++.do if (\\n[need_tl] == 1) \ ++\{\ ++. do DEVTAG-TL ++. do nr need_tl 0 ++. do nr need_eo_tl 1 ++.\} ++.do if \\n[need_eo_h]>0 .do DEVTAG-EO-H ++.do nr need_eo_h 0 ++.. ++. ++.de @check_need_title ++.. ++. ++.ie '\*(.T'html' \ ++. do als check_need_title @html_check_need_title ++.el \ ++. do als check_need_title @check_need_title ++. ++.@R pf ++.if \n(pf .nx ++. ++.if !\n(.g .ig ++.de @S \" --- initialize string/macro to empty, if undefined ++.if !d\\$1 .ds \\$1 \" empty ++.. ++. ++.@R @\" \" debugging level ++. ++. ++.\" *** INTERNAL GP MACROS *** ++. ++. ++.de @C \" --- change ev's, taking info with us ++.nr _S \\n(.s ++.nr _V \\n(.v ++.nr _F \\n(.f ++.nr _J \\n(.j ++.do ds _A \\n[.fam] ++.nr _I \\n(.i ++.ev \\$1 ++.ps \\n(_S ++.vs \\n(_Vu ++.ft \\n(_F ++.ad \\n(_J ++.do @fam \\*(_A ++'in \\n(_Iu ++.xl \\n($lu ++.lt \\n($lu ++.rr _S ++.rr _V ++.rr _F ++.rr _I ++.rr _J ++.ls 1 ++'ce 0 ++.. ++. ++.de @D \" --- determine display type (Indent, Left, Center) ++.ds |p "\\$3 ++.nr _d 0 ++.if "\\$2"C" \ ++. nr _d 1 ++.if "\\$2"L" \ ++. nr _d 2 ++.if "\\$2"I" \ ++. nr _d 3 ++.if "\\$2"M" \ ++. nr _d 4 ++.if !\\n(_d \ ++\{\ ++. nr _d \\$1 ++. ds |p "\\$2 ++.\} ++. ++.. ++. ++.de @z \" --- end macro ++.if \n@>1 .tm >> @z, .z=\\n(.z ?a=\\n(?a ++.if !"\\n(.z"" \ ++\{\ ++. tm Line \\n(c. -- Unclosed block, footnote, or other diversion (\\n(.z) ++. di ++. ex ++.\} ++.if \\n(?a \ ++. bp \" force out final table ++.ds bp ++.ds @b\" \" don't start another page ++.br ++.if \n@>1 .tm << @z ++.. ++. ++. ++.\" *** STANDARD HEADERS AND FOOTERS *** ++. ++. ++.ie \n(.g .ds $* \\\\$* ++.el .ds $* \\\\$1 \\\\$2 \\\\$3 \\\\$4 \\\\$5 \\\\$6 \\\\$7 \\\\$8 \\\\$9 ++. ++.de he \" *** define header ++.ie !\\n(.$ \ ++\{\ ++. rm |4 ++. rm |5 ++.\} ++.el \ ++\{\ ++. ds |4 "\*($* ++. ds |5 "\*($* ++.\} ++.. ++. ++.de eh \" *** define even header ++.ie !\\n(.$ \ ++. rm |4 ++.el \ ++. ds |4 "\*($* ++.. ++. ++.de oh \" *** define odd header ++.ie !\\n(.$ \ ++. rm |5 ++.el \ ++. ds |5 "\*($* ++.. ++. ++.de fo \" *** define footer ++.ie !\\n(.$ \ ++\{\ ++. rm |6 ++. rm |7 ++.\} ++.el \ ++\{\ ++. ds |6 "\*($* ++. ds |7 "\*($* ++.\} ++.. ++. ++.de ef \" *** define even foot ++.ie !\\n(.$ \ ++. rm |6 ++.el \ ++. ds |6 "\*($* ++.. ++. ++.de of \" *** define odd footer ++.ie !\\n(.$ \ ++. rm |7 ++.el \ ++. ds |7 "\*($* ++.. ++. ++.de ep \" *** end page (must always be followed by a .bp) ++.if \\n(nl>0 \ ++\{\ ++. wh 0 ++. rs ++. @b ++.\} ++.. ++. ++. ++.\" *** INTERNAL HEADER AND FOOTER MACROS *** ++. ++. ++.de @h \" --- header ++.if \n@>1 .tm >> @h %=\\n% ?a=\\n(?a ?b=\\n(?b ?w=\\n(?w ++.if (\\n(.i+\\n(.o)>=\\n(.l \ ++. tm Line \\n(c. -- Offset + indent exceeds line length ++.\" initialize a pile of junk ++.nr ?h \\n(?H \" transfer "next page" to "this page" ++.nr ?H 0 ++.nr ?c \\n(?C ++.nr ?C 0 ++.rn |4 |0 ++.rn |5 |1 ++.rn |6 |2 ++.rn |7 |3 ++.nr _w 0 \" reset max footnote width ++.nr ?W 0 \" no wide floats this page (yet) ++.nr ?I 1 ++.\" begin actual header stuff ++.ev 2 ++.rs ++.if \\n(hm>0 \ ++. if !'\*(.T'html' \ ++. sp |\\n(hmu \" move to header position ++.@t $h\" \" output header title ++.if \\n(tm<=0 \ ++. nr tm \n(.Vu ++.if !'\*(.T'html' \ ++. sp |\\n(tmu \" move to top of text ++.ev ++.mk _k \" for columned output ++.if \\n(?n=1 .nm 1 \" restore line numbering if n1 mode ++.nr $c 1 \" set first column ++.if \n@>4 .tm -- @h >> .ns nl=\\n(nl %=\\n% _k=\\n(_k tm=\\n(tm ++.ie \\n(?s \ ++\{\ ++. nr ?s 0 ++. rs ++' @b ++.\} ++.el \ ++. @n\" \" begin the column ++.if \n@>2 .tm << @h ++.. ++. ++.de @n \" --- new column or page ++.if \n@>3 .tm >> @n nl=\\n(nl %=\\n% ?f=\\n(?f ?o=\\n(?o ++.if \\n(bm<=0 \ ++. nr bm \\n(.Vu ++.if (\\n(_w<=\\n($l)&(\\n(?W=0) \ ++\{\ ++. nr _b (\\n(ppp*\\n($vu)/200u \" compute fudge factor (must be < 1P) ++. if \\n(_bu>((\\n(bmu-\\n(fmu-((\\n(tpp*\\n($vu)/100u))/2u) \ ++. nr _b (\\n(ppp*\\n($vu)/100u-\n(.Vu ++. nr _b +\\n(bmu ++.\} ++.nr _B \\n(_bu ++.ch @f ++.wh -\\n(_bu @f ++.nr _b +(\\n(ppp*\\n($vu)/100u \" add 1 paragraph v in case of sweep past ++.if \n@>2 .tm @n .p=\\n(.p bm=\\n(bm _b=\\n(_b _B=\\n(_B ++.nr ?f 0 \" reset footnote flag ++.if \\n(?o \ ++\{\ ++. (f _\" \" reprocess footnotes which run off page ++. nf ++. |o ++. fi ++. )f ++. rm |o ++.\} ++.nr ?o 0 ++.if \\n(?T \ ++\{\ ++. nr _i \\n(.i ++. if \\n(?n \ ++. nm \\n(ln ++. in 0 ++. |h\" \" output the table header ++. in \\n(_iu ++. if \\n(?n \ ++. nm ++. rr _i ++. mk #T \" for tbl commands ++. ns ++.\} ++.if (\\n(?a)&((\\n($c<2):(\\n(?w=0)) \ ++\{\ ++. nr ?a 0 \" output floating keep ++. @k |t ++. if \\n(?w \ ++. mk _k \" don't overstrike wide keeps ++. nr ?w 0 ++.\} ++.os ++.$H\" \" special column header macro ++.ns ++.. ++. ++.de @f \" --- footer ++.if \n@>1 .tm >> @f %=\\n% nl=\\n(nl ?a=\\n(?a ?b=\\n(?b ?f=\\n(?f ++.if \n@>2 .nr VL \\n(.pu-\\n(nlu ++.if \n@>2 .tm @f bm=\\n(bm _B=\\n(_B _b=\\n(_b .p-nl=\\n(VL ++.ec ++.if \\n(?T \ ++\{\ ++. nr T. 1 \" for tbl commands (to output bottom line) ++. T# 1\" \" output the sides and bottom lines ++. br ++.\} ++.ev 2 ++.ce 0 ++.if \\n(?b \ ++\{\ ++. nr ?b 0 ++. @k |b\" \" output bottom of page tables ++.\} ++.if \\n(?f \ ++. @o\" \" output footnote if present ++.ie \\n($c<\\n($m \ ++. @c\" \" handle new column ++.el \ ++. @e\" \" new page ++.ev ++.if \n@>2 .tm << @f ++.. ++. ++.de @o \" --- output footnote ++.nf ++.ls 1 ++.in 0 ++.if \n@>2 .tm @o last printed text = \\n(nl placing @r trap at -\\n(_B ++.wh -\\n(_Bu @r ++.if \\n(?n \ ++. nm \\n(ln ++.|f ++.if \\n(?n \ ++. nm ++.fi ++.if \n@>2 .tm @o triggered @r (?o) = \\n(?o ++.if \\n(?o \ ++\{\ ++. di \" just in case triggered @r ++. if \\n(dn=0 \ ++\{\ ++. rm |o ++. nr ?o 0 ++. \} ++. nr dn \\n(_D ++. rr _D ++.\} ++.rm |f ++.ch @r ++.. ++. ++.de @c \" --- new column ++.if \n@>2 .tm >> @c %=\\n% ++.rs ++.sp |\\n(_ku ++.@O +\\n($lu+\\n($su ++.nr $c +1 ++.@n ++.. ++. ++.de @e \" --- end page ++.if \n@>2 .tm >> @e ++.@O \\n(_ou ++.rs ++.sp |\\n(.pu-\\n(fmu-((\\n(tpp*\\n($vu)/100u) \" move to footer position ++.@t $f\" \" output footer title ++.nr ?h 0 ++.bp ++.. ++. ++.de @t \" --- output header or footer title ++.if !\\n(?h \ ++\{\ ++. sz \\n(tp\" \" set header/footer type fonts, etc. ++. @F \\n(tf ++. lt \\n(_Lu \" make title span entire page ++. if \\n(?n \ ++. nm \\n(ln ++. nf ++. \\$1 ++. br ++. if \\n(?n \ ++. nm ++.\} ++.. ++. ++.de $h \" $$$ print header ++.ds |z ++.if !\\n(?c \ ++\{\ ++. if e .ds |z "\\*(|0 ++. if o .ds |z "\\*(|1 ++.\} ++.if !\(ts\\*(|z\(ts\(ts \ ++' tl \\*(|z ++.rm |z ++.. ++. ++.de $f \" $$$ print footer ++.ds |z ++.if \\n(?c \ ++\{\ ++. if e .ds |z "\\*(|0 ++. if o .ds |z "\\*(|1 ++.\} ++.if \(ts\\*(|z\(ts\(ts \ ++\{\ ++. if e .ds |z "\\*(|2 ++. if o .ds |z "\\*(|3 ++.\} ++.if !\(ts\\*(|z\(ts\(ts \ ++' tl \\*(|z ++.rm |z ++.. ++. ++.de @r \" --- reprocess overflow footnotes ++.if \n@>3 .tm >> @r .z=\\n(.z ?f=\\n(?f ?a=\\n(?a ?b=\\n(?b _b=\\n(_b ++.di |o \" save overflow footnote ++.nr ?o 1 ++.nr _D \\n(dn ++.ns ++.. ++. ++. ++.\" *** COMMANDS WITH VARIANT DEFINITIONS *** ++. ++. ++.if !'\*(.T'html' .rn bp @b \" --- begin page ++. ++.de bp \" *** begin new page (overrides columns) ++.nr $c \\n($m \" force new page, not new column ++.ie \\n(nl>0 \ ++. @b \\$1 ++.el \ ++\{\ ++. if \\n(.$>0 \ ++. pn \\$1 ++. if \\n(?I \ ++. @h\" \" 'spring' the header trap ++.\} ++.br ++.wh 0 @h \" reset header ++.. ++. ++.rn ll xl \" *** special line length (local) ++.de ll \" *** line length (global to environments) ++.xl \\$1 ++.lt \\$1 ++.nr $l \\n(.l ++.if (\\n($m<=1):(\\n($l>\\n(_L) \ ++. nr _L \\n(.l ++.. ++. ++.rn po @O \" --- local page offset ++. ++.de po \" *** page offset ++.@O \\$1 ++.nr _o \\n(.o ++.. ++. ++.\" Redefine the fam request to set the family in ++.\" environment 2 as well as the current environment. ++.if !\n(.g .ig ++.do rn fam @fam \" --- set family in current environment ++.do de fam \" *** set font family in ev 2 and current ev ++.do @fam \\$1 ++.ev 2 ++.do @fam \\$1 ++.ev ++.. ++. ++. ++.\" *** MISCELLANEOUS ROFF COMMANDS *** ++. ++. ++.de hx \" *** suppress headers and footers next page ++.nr ?H 1 ++.. ++. ++.de ix \" *** indent, no break ++'in \\$1 ++.. ++. ++.de bl \" *** contiguous blank lines ++.br ++.@s \\$1 ++.sp \\$1 ++.. ++. ++.de @s \" --- diversion-surviving space test ++.ne \\$1 ++.rs ++.if !'\\n(.z'' \!.@s \\$1 ++.. ++. ++.de n1 \" *** line numbering 1 ++.nm 1 ++.ll -\w'0000'u ++.nr ?n 1 ++.. ++. ++.de n2 \" *** line numbering 2 ++.ie \\n(.$ \ ++\{\ ++. ie !`\\$2`c` \ ++. po -\w'0000'u ++. el \ ++. ll -\w'0000'u ++. ie \\B`\\$1` \ ++\{\ ++. ds |i \\$1 ++. ds |j \\$1 ++. do substring |i 0 0 \" pick off leading char and rest to check ++. do substring |j 1 \" for +N / -N ++. ie `\\*(|i`+` \ ++. nr ln (\\n[_ln])+\\*(|j ++. el \ ++. ie `\\*(|i`-` \ ++. nr ln (\\n[_ln])-\\*(|j ++. el \ ++. nr ln \\$1 \" unsigned N ++. nm \\n(ln ++. nr ?n 2 ++. rm |i |j ++.\} ++. el \ ++. tm Line \\n(.c -- Bad .n2 value ++.\} ++.el \ ++\{\ ++. nm ++. nr _ln \\n(ln ++. po +\w'0000'u ++. ll \\n($lu ++. nr ?n 0 ++. nr ln 0 ++.\} ++.. ++. ++.de pa \" *** new page ++.bp \\$1 ++.. ++. ++.de ro \" *** roman page numbers ++.af % i ++.. ++. ++.de ar \" *** arabic page numbers ++.af % 1 ++.. ++. ++.de m1 \" *** position one space ++.nr _0 \\n(hmu ++.nr hm \\$1v ++.nr tm +\\n(hmu-\\n(_0u ++.rr _0 ++.. ++. ++.de m2 \" *** position two space ++.nr tm \\n(hmu+\\n(tpp+\\$1v ++.. ++. ++.de m3 \" *** position three space ++.nr bm \\n(fmu+\\n(tpp+\\$1v ++.. ++. ++.de m4 \" *** position four space ++.nr _0 \\n(fmu ++.nr fm \\$1v ++.nr bm +\\n(fmu-\\n(_0u ++.. ++. ++.de sk \" *** leave a blank page (next page) ++.if \\n(.$>0 \ ++. tm Line \\n(c. -- I cannot skip multiple pages ++.nr ?s 1 ++.. ++. ++. ++.\" *** MISCELLANEOUS USER SUPPORT COMMANDS *** ++. ++. ++.if !\n(.g .ig ++.de re \" *** reset tabs (TROFF defines 15 stops default) ++.ta T 0.5i ++.. ++. ++.if \n(.g .ig ++.de re ++.ta 0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i ++.. ++. ++.de ba \" *** set base indent ++.ie \\n(.$ \ ++. nr $i \\$1n ++.el \ ++. nr $i \\n(siu*\\n($0u ++.. ++. ++.de hl \" *** draw horizontal line ++.br ++.if '\*(.T'html' \ ++\{\ ++. HR ++. do return ++.\} ++.ie \n(.g .do nr _I \\n[.in] ++.el .nr _I \\n(.i ++\l'\\n(.lu-\\n(_Iu' ++.sp ++.. ++. ++. ++.\" *** PARAGRAPHING *** ++. ++. ++.de pp \" *** paragraph ++.lp \\n(piu ++.. ++. ++.de lp \" *** left aligned paragraph ++.@p ++.if \\n(.$ \ ++. ti +\\$1 ++.nr $p 0 1 ++.. ++. ++.de ip \" *** indented paragraph w/ optional tag ++.if (\\n(ii>0)&(\\n(ii<1n) \ ++. nr ii \\n(iin ++.nr _0 \\n(ii ++.if \\n(.$>1 \ ++. nr _0 \\$2n ++.@p \\n(_0u ++.nr _I \\n(.iu ++.in 0 ++.di |i ++\&\\$1 ++.br ++.di ++.in \\n(_Iu ++.ds |j \\*(|i\\ ++.ie \\w"\\*(|j" \ ++\{\ ++. ti -\\n(_0u ++. ie \\w"\\*(|j">=\\n(_0 \ ++\{\ ++. do DEVTAG-COL 1 ++\\*(|j ++. do DEVTAG-COL-NEXT 2 ++. br ++. \} ++. el \ ++\{\ ++. do DEVTAG-COL 1 ++\\*(|j\h'|\\n(_0u'\c ++. do DEVTAG-COL 2 ++. \} ++.\} ++.el .do DEVTAG-COL 2 ++.rr _0 ++.rm |i |j ++.. ++. ++.de np \" *** numbered paragraph ++.\" use string comparison in case user has changed format of $p ++.if '\\n($p'-1' \ ++. nr $p 0 \" reset number after .bu ++.nr $p +1 \" increment paragraph number ++.@p \w'\0(000)\0'u ++.ti -\w'\0(000)\0'u ++\0(\\n($p)\h'|\w'\0(000)\0'u'\c ++.. ++. ++.de bu \" *** bulleted paragraph ++.br ++.\" use string comparison in case user has changed format of $p ++.if '\\n($p'-1' \ ++. ns \" don't space between .bu paragraphs ++.nr $p 0-1 \" mark "bulleted paragraph" mode ++.@p \w'\0\(bu\0'u ++.ti -\w'\0\(bu\0'u ++\0\(bu\0\c ++.. ++. ++.de @p \" --- initialize for paragraph ++.do check_need_title ++.if "\\n(.z"|e" .tm Line \\n(c. -- Unmatched continued equation ++.in \\n($iu+\\n(pou ++.if \\n(.$ \ ++. in +\\$1n ++.ce 0 ++.fi ++.@F \\n(pf ++.sz \\n(pp ++.sp \\n(psu ++.ne \\n(.Lv+\\n(.Vu ++.ns ++.. ++. ++. ++.\" *** SECTION HEADINGS *** ++. ++. ++.de sh \" *** section heading ++.fi ++.do check_need_title ++.if (\\n(si>0)&(\\n(si<1n) \ ++. nr si \\n(sin ++.if '\*(.T'html' .nr si 0 ++.ce 0 ++.if '\*(.T'html' \ ++\{\ ++. do DEVTAG-SH \\$1 ++. do nr need_eo_h 1 ++.\} ++.@d "\\$1" +1 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 ++.if !"\\$2"_" \ ++\{\ ++. ds |n \&\\$2 ++. $p "\\*(|n" "\\*($n" \\n($0 ++. $0 "\\*(|n" "\\*($n" \\n($0 ++. rm |n ++.\} ++.nr $p 0 1 \" reset .np count ++.. ++. ++.de @d \" --- change section depth ++.if !""\\$1" \ ++. nr $0 \\$1 ++.if \\n($0&(\\n(.$>1) \ ++. nr $\\n($0 \\$2 ++.ds $n \&\" ++.ie \\n($0>=1 \ ++\{\ ++. if '\\n($1'0' \ ++. nr $1 1 ++. if (\\n(.$>=3) .if !"\\$3"-" \ ++. nr $1 \\$3 ++. as $n \\n($1 ++.\} ++.el \ ++. nr $1 0 ++.ie \\n($0>=2 \ ++\{\ ++. if '\\n($2'0' \ ++. nr $2 1 ++. if (\\n(.$>=4) .if !"\\$4"-" \ ++. nr $2 \\$4 ++. as $n .\\n($2 ++.\} ++.el \ ++. nr $2 0 ++.ie \\n($0>=3 \ ++\{\ ++. if '\\n($3'0' \ ++. nr $3 1 ++. if (\\n(.$>=5) .if !"\\$5"-" \ ++. nr $3 \\$5 ++. as $n .\\n($3 ++.\} ++.el \ ++. nr $3 0 ++.ie \\n($0>=4 \ ++\{\ ++. if '\\n($4'0' \ ++. nr $4 1 ++. if (\\n(.$>=6) .if !"\\$6"-" \ ++. nr $4 \\$6 ++. as $n .\\n($4 ++.\} ++.el \ ++. nr $4 0 ++.ie \\n($0>=5 \ ++\{\ ++. if '\\n($5'0' \ ++. nr $5 1 ++. if (\\n(.$>=7) .if !"\\$7"-" \ ++. nr $5 \\$7 ++. as $n .\\n($5 ++.\} ++.el \ ++. nr $5 0 ++.ie \\n($0>=6 \ ++\{\ ++. if '\\n($6'0' \ ++. nr $6 1 ++. if (\\n(.$>=8) .if !"\\$8"-" \ ++. nr $6 \\$8 ++. as $n .\\n($6 ++.\} ++.el \ ++. nr $6 0 ++.. ++. ++.de sx \" *** heading up, no increment (2.1.1 -> 2.1) ++.ce 0 ++.ul 0 ++.nr _0 \\n($0-1 ++.if \\n(.$ .nr _0 +1 ++.if \\n(.$ .nr _0 \\$1 ++.@d \\n(_0 ++.rr _0 ++.$p "" "" \\n($0 ++.nr $p 0 1 \" reset .np count ++.. ++. ++.de uh \" *** unnumbered section heading ++.$p "\\$1" ++.$0 "\\$1" ++.. ++. ++.de $p \" $$$ print section heading ++.if (\\n(si>0)&(\\n(.$>2) \ ++. nr $i \\$3*\\n(si ++.in \\n($iu ++.ie !"\\$1\\$2"" \ ++\{\ ++. sp \\n(ssu \" one of them is non-null ++. ne \\n(.Lv+\\n(.Vu+\\n(psu+((\\n(spp*\\n($vu*\\n(.Lu)/100u) ++. \" exdent if \\$3 > 0 ++. ie 0\\$3 \ ++. ti -(\\n(siu-\\n(sou) ++. el \ ++. ti +\\n(sou ++. @F \\n(sf ++. sz \\n(sp ++. if 0\\$3 \ ++. $\\$3 ++. if \w"\\$2">0 \\$2. ++. if \w"\\$1">0 \\$1\f1\ \ \& ++.\} ++.el \ ++. sp \\n(psu ++.@F \\n(pf ++.sz \\n(pp ++.. ++. ++. ++.\" *** COLUMNED OUTPUT *** ++. ++. ++.de 2c \" *** double columned output ++.br ++.if \\n($m>1 \ ++. 1c\" \" revert to 1c if already 2c ++.nr $c 1 ++.nr $m 2 ++.if \\n(.$>1 \ ++. nr $m \\$2 ++.if \\n(.$>0 \ ++. nr $s \\$1n \" param 1: column separation ++.nr $l (\\n(.l-((\\n($m-1)*\\n($s))/\\n($m ++.xl \\n($lu ++.mk _k ++.ns ++.. ++. ++.de 1c \" *** single columned output ++.br ++.nr $c 1 ++.nr $m 1 ++.ll \\n(_Lu \" return to normal output ++.sp |\\n(.hu ++.@O \\n(_ou ++.. ++. ++.de bc \" *** begin column ++.sp 24i ++.. ++. ++. ++.\" *** FLOATING TABLES AND NONFLOATING BLOCKS *** ++. ++. ++.de (z \" *** begin floating keep ++.if \n@>4 .tm >> (z, .z=\n(.z ++.@D 4 \\$1 \\$2 ++.@( ++.. ++. ++.de )z \" *** end floating keep ++.if \n@>4 .tm >> )z, .z=\n(.z ++.sp \\n(zsu ++.@) ++.if \n@>4 .tm -- )z << @), .z=\n(.z ++.rr _0 ++.if !\\n(?b \ ++. nr dn +(\\n(ppp*\\n($vu)/200u+\\n(zsu ++.nr dl -\n(.H \" fudge factor necessary to make it work ++.ie ((\\n(dn+\n(.V)>=\\n(.t):(\\n(?a):((\\n(dl>\\n($l)&(\\n($c>1)) \ ++\{\ ++. nr ?a 1 ++. if (\\n(dl>\\n($l)&(\\n($m>1) \ ++. nr ?w 1 \" mark wider than one column (top) ++. ds |x |t ++.\} ++.el \ ++\{\ ++. nr ?b 1 ++. if (\\n(dl>\\n($l)&(\\n($m>1) \ ++. nr ?W 1 \" mark wider than one column (bottom) ++. nr _b +\\n(dnu ++. \" avoid moving @f back past the current position ++. if \\n(.p-\\n(nl-\n(.V<\\n(_b \ ++. nr _b \\n(.p-\\n(nl-\n(.V ++. ch @f -\\n(_bu ++. ds |x |b ++.\} ++.da \\*(|x \" copy to save macro ++.nf ++.ls 1 ++.nr ?k 1 ++.if \n@>4 .tm -- )z >> \\*(|x ++\!.if \\\\n(nl>(\\\\n(tm+2v) .ne \\n(dnu-\\n(zsu ++.|k\" \" and the body ++.ec ++.if \n@>4 .tm -- )z << \\*(|x, .z=\\n(.z ++.nr ?k 0 ++.rm |k\" \" remove the temp macro ++.da ++.in 0 ++.ls 1 ++.xl \\n($lu ++.ev ++.if \n@>4 .tm << )z, .z=\\n(.z ++.. ++. ++.de @k \" --- output floating keep ++.if \n@>4 .tm >> @k, $1=\\$1, .z=\\n(.z ++.ev 1 ++.nf ++.ls 1 ++.in 0 ++.sp \\n(zsu ++.if \\n(?n \ ++. nm \\n(ln ++.\\$1 ++.if \\n(?n \ ++. nm ++.ec ++.br ++.rm \\$1 ++.ev ++.. ++. ++.de (t \" XXX temp ref to (z ++.(z \\$1 \\$2 ++.. ++. ++.de )t \" XXX temp ref to )t ++.)z \\$1 \\$2 ++.. ++. ++.de (b \" *** begin block ++.br ++.@D 3 \\$1 \\$2 ++.sp \\n(bsu ++.@( ++.if '\*(.T'html' .sp \\n(bsu ++.. ++. ++.de )b \" *** end block ++.br ++.@) ++.if (\\n(bt=0):(\\n(.t<\\n(bt) \ ++. ne \\n(dnu \" make it all on one page ++.@k |k ++.ev \" return from display environment ++.sp \\n(bsu+\\n(.Lv-1v ++.. ++. ++.de @( \" --- begin keep ++.if !"\\n(.z"" .tm Line \\n(c. -- Invalid nested keep \\n(.z ++.@M ++.di |k ++\!'rs ++.. ++. ++.de @M \" --- set modes for display ++.nr ?k 1 ++.@C 1 ++.@F \\n(df ++.if \\n($R .@V ++.vs \\n(.sp*\\n($Vu/100u ++.nf ++.if "\\*(|p"F" \ ++. fi \" set fill mode if "F" parameter ++.if \\n(_d=4 \ ++. in 0 ++.if \\n(_d=3 \ ++\{\ ++. in +\\n(biu ++. xl -\\n(biu ++.\} ++.if \\n(_d=1 \ ++. ce 10000 ++.. ++. ++.de @) \" --- end keep ++.br ++.if !"\\n(.z"|k" .tm Line \\n(c. -- Close of a keep which has never been opened ++.nr ?k 0 ++.di ++.in 0 ++.ce 0 ++.. ++. ++.de (c \" *** begin block centered text ++.br ++.if "\\n(.z"|c" .tm Line \\n(c. -- Nested .(c requests ++.if \\n(?n .nm ++.di |c ++.. ++. ++.de )c \" *** end block centered text ++.if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c ++.br \" force out final line ++.di ++.if \n@>4 .tm >> .)c .l=\\n(.l .i=\\n(.i $i=\\n($i dl=\\n(dl ++.ev 1 ++.ls 1 ++.in (\\n(.lu-\\n(.iu-\\n(dlu)/2u ++.if \n@>4 .tm -- .)c << .in .l=\\n(.l .i=\\n(.i dl=\\n(dl ++.if \\n(?n \ ++. nm \\n(ln ++.nf ++.|c ++.ec ++.in ++.ls ++.if \\n(?n \ ++. nm ++.ev ++.rm |c ++.. ++. ++. ++.\" *** BLOCK QUOTES (OR WHATEVER) AND LISTS *** ++. ++. ++.de (q \" *** begin block quote ++.br ++.@C 1 ++.fi ++.sp \\n(qsu ++.in +\\n(qiu ++.xl -\\n(qiu ++.sz \\n(qp ++.if \\n(?n \ ++. nm \\n(ln ++.. ++. ++.de )q \" *** end block quote ++.br ++.if \\n(?n \ ++. nm ++.ev ++.sp \\n(qsu+\\n(.Lv-1v ++.nr ?k 0 ++.. ++. ++.de (l \" *** begin list ++.br ++.sp \\n(bsu ++.@D 3 \\$1 \\$2 ++.@M ++.if \\n(?n \ ++. nm \\n(ln ++.if '\*(.T'html' .sp \\n(bsu ++.. ++. ++.de )l \" *** end list ++.br ++.if \\n(?n \ ++. nm ++.ev ++.sp \\n(bsu+\\n(.Lv-1v ++.nr ?k 0 ++.. ++. ++. ++.\" *** PREPROCESSOR SUPPORT *** ++. ++. ++.\" ++.\" EQN ++.\" ++.de EQ \" *** equation start ++.do if \\n[need_eo_h]>0 .do DEVTAG-EO-H ++.do nr need_eo_h 0 ++.ec ++.if "\*(.T"html" \ ++\{\ ++. do nr e-EQ-ll \\n(.l ++. ll 1000n ++.\} ++.do HTML-IMAGE ++.if !\\n(?e \ ++\{\ ++. if "\\n(.z"|e" .tm Line \\n(c. -- Nested .EQ request ++. @D 1 "\\$1" "\\$2" ++. @C 2 ++. di |e ++.\} ++.ls 1 ++.in 0 ++.nf ++.. ++. ++.de EN \" *** equation end ++.br ++.do HTML-IMAGE-END ++.if "\*(.T"html" \ ++. do ll \\n[e-EQ-ll]u ++.ie "\\$1"C" \ ++\{\ ++. nr ?e 1 ++. sp \\n(esu ++.\} ++.el \ ++\{\ ++. nr ?e 0 ++. di ++. if \\n(dn \ ++. @q\" \" actual equation output ++. rm |e ++. ev ++.\} ++.. ++. ++.de @q \" --- equation output ++.nr _Q \\n(dnu ++.ev ++.sp \\n(esu \" output rest of preceding text ++.if !"\\n(.z"" \!.ne \\n(_Qu ++.ne \\n(_Qu+\n(.Vu \" keep it on one page ++.@C 2\" \" .ev 2 may be jumbled from header ++.if \\n(_d=1 \ ++. in (\\n(.lu+\\n($iu-\\n(dlu)/2u ++.if \\n(_d=2 \ ++. in \\n($iu ++.if \\n(_d=3 \ ++. in \\n(biu+\\n($iu ++.if \\n(_d=4 \ ++. in 0 ++.mk _q ++.if \n@>1 .tm --@e: _Q=\\n(_Q _q=\\n(_q nl=\\n(nl |p=\\*(|p ++.if !"\\*(|p"" \ ++\{\ ++. rs ++. sp (\\n(_Qu-\\n(.vu)/2u ++. tl """\\*(|p" ++. rt \\n(_qu ++.\} ++.if \\n(?n \ ++. nm \\n(ln ++.|e ++.if \\n(?n \ ++. nm ++.sp |\\n(_qu+\\n(_Qu ++.sp \\n(esu+\\n(.Lv-1v ++.rr _q ++.rr _Q ++.. ++. ++.\" ++.\" TBL ++.\" ++.de TS \" *** table start ++.sp \\n(bsu ++.if "\*(.T"html" \ ++\{\ ++. do nr e-TS-ll \\n(.l ++. ll 1000n ++.\} ++.do HTML-IMAGE ++.@C 1 ++.fi \" drop into fill mode for text boxes ++.if "\\$1"H" \ ++\{\ ++. di |h \" save header part ++. nr ?T 1 ++.\} ++.ls 1 ++.ch @f -(\\n(_bu+1v) \" set pseudo-trap for bottom line ++.if \\n(.p-\\n(_b-1v<=\\n(nl \ ++. ch @f \\n(nlu+\n(.Vu ++.. ++. ++.de TH \" *** end header part of table ++.nr T. 0 ++.T# 0 ++.if \\n(?n \!.nm ++.di ++.nr _T \\n(?T ++.nr ?T 0 ++.ne \\n(dnu+1v ++.nr ?T \\n(_T ++.nr _i \\n(.i ++.if \\n(?n .nm \\n(ln ++.in 0 ++.|h\" \" put in the initial header ++.in \\n(_iu ++.rr _i ++.mk #T ++.. ++. ++.de TE \" *** table end ++.nr ?T 0 ++.ch @f -\\n(_bu \" reset pseudo-trap ++.if \\n(.p-\\n(_b<=\\n(nl \ ++. ch @f \\n(nlu+\n(.Vu ++.ev ++.do HTML-IMAGE-END ++.if "\*(.T"html" \ ++. do ll \\n[e-TS-ll]u ++.sp \\n(bsu+\\n(.Lv-1v ++.re ++.. ++. ++.de T& ++.. ++. ++.\" ++.\" REFER ++.\" ++.mso refer-me.tmac ++. ++.\" ++.\" IDEAL ++.\" ++.de IS \" *** start ideal picture ++.nr g7 \\n(.u ++.ls 1 ++.. ++. ++.de IF ++.if \\n(g7 .fi ++.ls ++.. ++. ++.de IE \" *** end ideal picture ++.if \\n(g7 .fi ++.ls ++.. ++. ++.\" ++.\" PIC ++.\" ++.de PS \" *** start picture: $1=height, $2=width in units or inches ++.sp 0.3 ++.do HTML-IMAGE ++.nr g7 \\$2 ++.in (u;\\n(.l-\\n(g7>?0/2) ++.ne \\$1u ++.nr g7 \\n(.u ++.ls 1 ++.if \\n(?n \ ++\{\ ++. de PS_nm_check && \" define macro to emit .nm at top diversion ++. if \n@>4 .tm -- PS: \\\\$1 \\\\$2 .z=\\\\n(.z PS_nm_cnt=\\\\n[PS_nm_cnt] ++. \" \" multiple .PS/.PE in a keep. ++. if `\\\\$2`init` \ ++. do nr PS_nm_cnt \\\\n[PS_nm_cnt]+1 ++. ie `\\\\n(.z`` \ ++\{\ ++. if `\\\\$1`suspend` \ ++. nm ++. if `\\\\$1`resume` \ ++\{\ ++. nm \\\\n(ln ++. do nr PS_nm_cnt \\\\n[PS_nm_cnt]-1 ++. do if !\\\\n[PS_nm_cnt] \ ++\{\ ++. do rm PS_nm_check ++. do rr PS_nm_cnt ++.\} ++.\} ++.\} ++.el \!.PS_nm_check \\\\$1 ++.&& ++. mk _q \" emit a single numbered line for PS picture ++. rs ++\&\ ++. br ++. rt \\n(_qu ++. PS_nm_check suspend init ++.\} ++.. ++. ++.de PE \" *** end picture ++.if \\n(?n .PS_nm_check resume ++.ls ++.in ++.if \\n(g7 .fi ++.do HTML-IMAGE-END ++.sp .6 ++.. ++. ++.\" ++.\" GREMLIN ++.\" ++.de GS \" *** start gremlin picture ++.ie '\*(.T'html' \ ++\{\ ++. ie "\\$1"L" .do HTML-IMAGE-LEFT ++. el .ie "\\$1"R" .do HTML-IMAGE-RIGHT ++. el .do HTML-IMAGE ++.\} ++.el \ ++\{\ ++. nr g7 (\\n(.lu-\\n(g1u)/2u ++. if "\\$1"L" .nr g7 \\n(.iu ++. if "\\$1"R" .nr g7 \\n(.lu-\\n(g1u ++. in \\n(g7u ++. nr g7 \\n(.u ++. ls 1 ++. nf ++. ne \\n(g2u ++.\} ++.. ++. ++.de GE \" *** end gremlin picture ++.ie '\*(.T'html' .do HTML-IMAGE-END ++.el \ ++\{\ ++. GF ++. sp .6 ++.\} ++.. ++. ++.de GF \" *** finish gremlin picture; stay at top ++.ls ++.in ++.if \\n(g7 .fi ++.. ++. ++. ++.\" *** FONT AIDS *** ++. ++. ++.de sz \" *** set point size and vertical spacing ++.ps \\$1 ++.if \\n($r .@v ++.vs \\n(.sp*\\n($vu/100u \" default vs at pointsize + 20% ++.. ++. ++.de @v \" --- possibly set $v from $r ++.if (1i>=240u)&(1p<=\\n($r)&(\\n($r<=4p) .nr $v \\n($r00/1p ++.. ++. ++.de @V \" --- possibly set $V from $R ++.if (1i>=240u)&(1p<=\\n($R)&(\\n($R<=4p) .nr $V \\n($R00/1p ++.. ++. ++.de @E \" --- store in _F argument to \f for restoring font ++.ie \\n(.f<10 \ ++. ds _F \\n(.f ++.el \ ++\{\ ++. ie \\n(.f<100&\n(.g \ ++. ds _F (\\n(.f ++. el \ ++. ds _F P ++.\} ++.. ++. ++.de r \" *** enter roman font ++.do check_need_title ++.@E ++.ft 1 ++.if \\n(.$ \&\\$1\f\\*(_F\\$2 ++.do check_need_title ++.. ++. ++.de i \" *** enter italic ++.do check_need_title ++.@E ++.ft 2 ++.if \\n(.$ \&\\$1\f\\*(_F\\$2 ++.do check_need_title ++.. ++. ++.de b \" *** enter boldface ++.do check_need_title ++.@E ++.ft 3 ++.if \\n(.$ \&\\$1\f\\*(_F\\$2 ++.do check_need_title ++.. ++. ++.de rb \" *** enter real boldface ++.do check_need_title ++.@E ++.ft 3 ++.if \\n(.$ \&\\$1\f\\*(_F\\$2 ++.do check_need_title ++.. ++. ++.de bi \" *** enter bold italic ++.do check_need_title ++.@E ++.ft 4 ++.if \\n(.$ \&\\$1\f\\*(_F\\$2 ++.do check_need_title ++.. ++. ++.de u \" *** enter underlined word ++\&\\$1\l'|0\(ul'\\$2 ++.. ++. ++.\" a better version of u ++.if !\n(.g .ig ++.de u ++\Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2 ++.. ++. ++.de q \" *** enter quoted word ++\&\\*(lq\\$1\\*(rq\\$2 ++.. ++. ++.de bx \" *** enter boxed word ++.ie '\*(.T'html' \\$1\\$2 ++.el \k~\(br\|\\$1\|\(br\l'|\\n~u\(rn'\l'|\\n~u\(ul'\^\\$2 ++.. ++. ++.de sm \" *** print in smaller font ++\s-1\\$1\\s0\\$2 ++.. ++. ++.de @F \" --- change font (0 -> no change) ++.nr ~ \\$1 ++.if \\n~>0 \ ++. ft \\n~ ++.rr ~ ++.. ++. ++. ++.\" *** FOOTNOTING *** ++. ++. ++.de (f \" *** begin footnote ++.ec ++.if "\\n(.z"|f" .tm Line \\n(c. -- Invalid footnote nesting ++.ie "\\n(.z"" \ ++\{\ ++. nr _D \\n(dn ++. nr _0 1v+\\n(nlu ++. ev 2 ++. nm ++. da |f ++. in 0 ++. xl \\n($lu-\\n(fuu ++. @F \\n(ff ++. sz \\n(fp ++. vs \\n(.sp*\\n($Vu/100u ++. if !\\n(?f \ ++\{\ ++. nr _b +1v \" allow space for $s ++. $s ++. \} ++. br ++. if \\n(.p-\\n(_b-\\n(_0-\\n(.h-1v-\\n(fs<0 \ ++\{\ ++. da\" \" won't fit on page at all ++. bc ++. if !\\n(?f \ ++. rm |f ++. da |f ++.\" next five lines could be dropped if headers had their own environment ++. in 0 \" reset everything from .bc ++. xl \\n($lu-\\n(fuu ++. @F \\n(ff ++. sz \\n(fp ++. vs \\n(.sp*\\n($Vu/100u ++. if !\\n(?f \ ++. $s ++. br ++. \} ++. rr _0 ++. sp \\n(fsu ++. nr ?f 1 ++. fi ++. if !"\\$1"_" \ ++. ti \\n(fiu ++. if \n@>2 .tm << (f $f=\\n($f ++.\} ++.el \ ++\{\ ++. ev 2 ++. nm ++. in 0 ++. xl \\n($lu-\\n(fuu ++. @F \\n(ff ++. sz \\n(fp ++. vs \\n(.sp*\\n($Vu/100u ++. fi ++\!.(f \\$1 ++\!.@N ++.\} ++.. ++. ++.de @N \" --- set no fill mode in the top-level diversion ++.ie "\\n(.z"" .nf ++.el \!.@N ++.. ++. ++.de )f \" *** end footnote ++.ie "\\n(.z"|f" \ ++\{\ ++. if \\n* \ ++. nr $f +1 ++. ds * \\*{\\n($f\\*}\k* ++. nr * 0 ++. in 0 ++. da ++. ev ++. if \\n(_w<\\n(dl \ ++. nr _w \\n(dl \" compute maximum fn width ++. nr _b +\\n(dn ++. ch @f -\\n(_bu ++. if \\n(.p-\\n(_b<=\\n(nl \ ++. ch @f \\n(nlu+\n(.Vu ++. nr dn \\n(_D ++. rr _D ++.\} ++.el \ ++\{\ ++. br ++\!.)f ++. ev ++.\} ++.. ++. ++.@R ff ++.if \n(ff<=0 \ ++. nr ff 1 \" footnote font: Times Roman ++.@R fp ++.if \n(fp<=0 \ ++. nr fp 8 \" footnote pointsize ++. ++.de $s \" $$$ footnote separator ++\l'2i' ++.. ++. ++. ++.\" *** DELAYED TEXT *** ++. ++. ++.de (d \" *** begin delayed text ++.am |d )d ++.sp \\n(bsu ++.. ++. ++.de )d \" *** end delayed text ++.if \\n# \ ++. nr $d +1 ++.ds # [\\n($d]\k# ++.rr # ++.. ++. ++.de pd \" *** print delayed text ++.|d ++.rm |d ++.nr $d 1 1 ++.ds # [1]\k# ++.. ++. ++. ++.\" *** INDEXES (TABLE OF CONTENTS) *** ++. ++. ++.nr _x 0 1 ++.do nr _xn 0 ++.af _x a ++. ++.de (x \" *** begin index entry ++.if \n@>4 .tm >> (x, .z=\\n(.z ++.ds |X x ++.if \\n(.$>0 \ ++. ds |X \\$1 ++.ie "\\n(.z"" \ ++. nr _z 0 ++.el \ ++. nr _z 1 ++.@\\n(_z ++.. ++. ++.de @0 \" --- finish (x if no current diversion ++.am %\\*(|X )x ++.sp \\n(xsu ++.ti -\\n(piu ++.. ++. ++.de @1 \" --- finish (x if current diversion ++.if "\\n(_x"z" .nr _x 0 ++.de =\\n+(_x )x ++.. ++. ++.de )x \" *** end index entry ++.if \n@>4 .tm >> )x, .z=\\n(.z ++.ie "\\n(.z"" \ ++\{\ ++. ds |x \\n% ++. if \\n(.$>0 \ ++. ds |x \\$1 ++. if "\\*(|x"_" \ ++. ig .. ++. am %\\*(|X .. ++. if \w"\\$2">(\\n(.l-\\n(.i-\\n(.k) \ ++. ti +\\n(xuu ++\\\\a\\\\t\\$2\\*(|x ++... ++. rm |x ++. rm |X ++.\} ++.el \ ++\{\ ++\!.(x \\*(|X ++\!\\\\*(=\\n(_x\\\\ ++\!.)x \\$1 \\$2 ++\!.rm =\\n(_x ++.\} ++.. ++. ++.de xp \" *** print the index ++.br ++.@C 2 ++.ls 1 ++.vs \\n(.sp*\\n($Vu/100u ++.fi ++.in +\\n(piu ++.ds |X x ++.if \\n(.$>0 \ ++. ds |X \\$1 ++.xl -(\\n(xuu+\w'...'u) ++.di |x ++.%\\*(|X ++.br ++.di ++.rm %\\*(|X ++.xl \\n($lu ++.rm |X ++.ev ++.nf ++.in 0 ++.ta \\n(.lu-\\n(xuuR \\n(.luR ++.|x ++.fi ++.in ++.rm |x ++.. ++. ++. ++.\" *** HTML VERSIONS OF .x(, .x), AND .xp *** ++. ++. ++.de (x-html \" --- create TAG and divert text ++.nr _x +1 ++.do nr _xn +1 ++.do TAG "_x\\n[_x] ++.br ++.do di |x\\n[_xn] ++.br ++.. ++. ++.de )x-html \" --- end diversion ++.br ++.di ++.. ++. ++.de xp-html \" --- create list of links ++.do nr _xx 1 ++.br ++.do ev xp-html-ev ++.sp ++.do ULS ++.do while \\n[_xx]<=\\n[_xn] \ ++\{\ ++. br ++. do unformat |x\\n[_xx] ++. do di xp-html-div ++. br ++. ll 100i ++. fi ++. do |x\\n[_xx] ++. br ++. di ++. do asciify xp-html-div ++. do rm xp-html-as ++. do as xp-html-as # ++. do as xp-html-as _x\\n[_xx] ++. ll ++. LI ++. do URL \\*[xp-html-as] "\\*[xp-html-div] ++. do rm xp-html-as ++. do nr _xx +1 ++.\} ++.do ULE ++.sp ++.ev ++.. ++. ++.if '\*(.T'html' \ ++\{\ ++. rm (x ++. do als (x (x-html ++. rm )x ++. do als )x )x-html ++. rm xp ++. do als xp xp-html ++.\} ++. ++. ++.\" *** CHAPTERS AND TITLES *** ++. ++. ++.de +c \" *** begin chapter ++.ep\" \" force out footnotes ++.if \\n(?o:\\n(?a \ ++\{\ ++. bp \" force out a table or more footnote ++. rs ++. ep ++.\} ++.nr ?C 1 ++.nr $f 1 1 ++.ds * \\*{1\\*}\k* ++.if \\n(?R \ ++. pn 1 ++.bp ++.in \\n($iu \" reset the indent ++.rs ++.ie \\n(.$ \ ++. $c "\\$1" ++.el \ ++. sp 3 ++.. ++. ++.de ++ \" *** declare chapter type ++.nr _0 0 ++.if "\\$1"C" \ ++. nr _0 1 \" chapter ++.if "\\$1"RC" \ ++. nr _0 11 \" renumbered chapter ++.if "\\$1"A" \ ++. nr _0 2 \" appendix ++.if "\\$1"RA" \ ++. nr _0 12 \" renumbered appendix ++.if "\\$1"P" \ ++. nr _0 3 \" preliminary material ++.if "\\$1"B" \ ++. nr _0 4 \" bibliographic material ++.if "\\$1"AB" \ ++. nr _0 5 \" abstract ++.if \\n(_0=0 \ ++. tm Line \\n(c. -- Bad mode to .++ ++.nr ?R 0 ++.if \\n(_0>10 \ ++.\{ ++. nr ?R 1 ++. nr _0 -10 ++.\} ++.nr ch 0 1 ++.if (\\n(_0=3):(\\n(_0=5) \ ++. pn 1 \" must do before .ep ++.if !\\n(_0=\\n(_M .if \\n(_M=3 \ ++. pn 1 \" must do before .ep ++.ep\" \" end page for correct page number types ++.if \\n(_0=1 \ ++\{\ ++. af ch 1 ++. af % 1 ++.\} ++.if \\n(_0=2 \ ++\{\ ++. af ch A ++. af % 1 ++.\} ++.if \\n(_0=3 \ ++. af % i ++.if \\n(_0=4 \ ++. af % 1 ++.if \\n(_0=5 \ ++. af % 1 ++.if \\n(.$>1 \ ++. he \\$2 ++.nr _M \\n(_0 ++.rr _0 ++.. ++. ++.de $c \" $$$ print chapter title ++.sz 12 ++.ft 3 ++.ce 1000 ++.if \\n(_M<3 \ ++. nr ch +1 ++.ie \\n(_M=1 CHAPTER\ \ \\n(ch ++.el .if \\n(_M=2 APPENDIX\ \ \\n(ch ++.if \w"\\$1" .sp 3-\\n(.L ++.if \w"\\$1" \\$1 ++.if (\\n(_M<3):(\w"\\$1") \ ++. sp 4-\\n(.L ++.ce 0 ++.ft ++.sz ++.ie \\n(_M=1 \ ++. $C Chapter \\n(ch "\\$1" ++.el .if \\n(_M=2 \ ++. $C Appendix \\n(ch "\\$1" ++.. ++. ++.de tp \" *** title page ++.hx ++.bp ++.br ++.rs ++.pn \\n% ++.. ++. ++.\" *** DATES *** ++.if \n(mo=1 .ds mo January ++.if \n(mo=2 .ds mo February ++.if \n(mo=3 .ds mo March ++.if \n(mo=4 .ds mo April ++.if \n(mo=5 .ds mo May ++.if \n(mo=6 .ds mo June ++.if \n(mo=7 .ds mo July ++.if \n(mo=8 .ds mo August ++.if \n(mo=9 .ds mo September ++.if \n(mo=10 .ds mo October ++.if \n(mo=11 .ds mo November ++.if \n(mo=12 .ds mo December ++.if \n(dw=1 .ds dw Sunday ++.if \n(dw=2 .ds dw Monday ++.if \n(dw=3 .ds dw Tuesday ++.if \n(dw=4 .ds dw Wednesday ++.if \n(dw=5 .ds dw Thursday ++.if \n(dw=6 .ds dw Friday ++.if \n(dw=7 .ds dw Saturday ++.nr y2 \n(yr%100 ++.af y2 00 ++.nr y4 \n(yr+1900 ++.ds td \*(mo \n(dy, \n(y4 ++. ++. ++.\" *** PARAMETRIC INITIALIZATIONS *** ++. ++. ++.rr x ++.nr $v \n(.v00+\n(.sp-1/\n(.sp \" vs as percentage of ps for .sz request ++.nr $V \n($v \" same for displays & footnotes ++.nr hm 4v \" header margin ++.nr tm 7v \" top margin ++.nr bm 6v \" bottom margin ++.nr fm 3v \" footer margin ++.nr tf 3 \" title font: (real) Times Bold ++.nr tp 10 \" title point size ++.hy 14 ++.nr bi 4m \" indent for blocks ++.nr pi 5n \" indent for paragraphs ++.nr pf 1 \" normal text font ++.nr pp 10 \" normal text point size ++.nr qi 4n \" indent for quotes ++.nr qp -1 \" down one point ++.nr ii 5n \" indent for .ip's and .np's ++.nr $m 1 \" max number of columns ++.nr $s 4n \" column separation ++.nr sf 3 \" section font -- Times Bold ++.nr sp 10 \" section title pointsize ++.nr ss 12p \" section prespacing ++.nr si 0 \" section indent ++. ++. ++.\" *** OTHER INITIALIZATION *** ++. ++. ++.\" GNU pic sets this register to 1, to indicate that \x should not be used. ++.@R 0x ++.ds { \v'-0.4m'\x'\\n(0x=0*-0.2m'\s-3 ++.ds } \s0\v'0.4m' ++.\" for compatibility with traditional -me ++.\" (the first will work only in compatibility mode) ++.ds [ \*{ ++.ds ] \*} ++.ds < \v'0.4m'\x'\\n(0x=0*0.2m'\s-3 ++.ds > \s0\v'-0.4m' ++.ds - \(em ++.\" Avoid warnings from groff -ww. ++.@S |0 ++.@S |1 ++.@S |2 ++.@S |3 ++.@S $H ++.@S $0 ++.@S $1 ++.@S $2 ++.@S $3 ++.@S $4 ++.@S $5 ++.@S $6 ++.@S $7 ++.@S $8 ++.@S $9 ++.@S .. ++. ++.@R po\" \" simulated page offset ++.@R $0\" \" section depth ++.@R $i\" \" paragraph base indent ++.@R $p\" \" numbered paragraph number ++.@R $r\" \" ratio of vs to ps (may override $v) ++.@R $R\" \" same for displays (may override $V) ++.@R df\" \" display font: same as surrounding text ++.@R so\" \" additional section title offset ++.@R fu\" \" footnote undent ++.@R bt\" \" block keep threshold ++.@R *\" \" has \** been referenced? ++.@R ?a\" \" pending floating keep at page top? ++.@R ?b\" \" pending floating keep at page bottom? ++.@R ?C\" \" at chapter header? ++.@R ?e\" \" in equation? ++.@R ?H\" \" suppress headers and footers next page? ++.@R ?I\" \" has the header trap been sprung? ++.@R ?n\" \" n1 mode? ++.@R ?o\" \" footnote overflow? ++.@R ?R\" \" renumbered chapter? ++.@R ?s\" \" skip next page? ++.@R ?T\" \" inside .TS H? ++.@R ?W\" \" wide floating keep at page bottom? ++.@R ?w\" \" wide floating keep at page top? ++. ++.nr fi 0.3i ++.nr _o \n(.o ++.nr $b 3 \" bold ++.nr ps 0.35v ++.if \n(ps<\n(.V .nr ps \n(.V ++.nr bs \n(ps \" block pre/post spacing ++.nr qs \n(ps \" quote pre/post spacing ++.nr zs 1v \" float-block pre/postspacing ++.nr xs 0.2v \" index prespacing ++.nr xu 0.5i \" index undent ++.nr fs 0.2v \" footnote prespacing ++.nr es 0.5v \" equation pre/postspacing ++.if \n(es<\n(.V .nr es \n(.V ++.wh 0 @h \" set header ++.nr $l \n(.lu \" line length ++.nr _L \n(.lu \" line length of page ++.nr $c 1 \" current column number ++.nr $f 1 1 \" footnote number ++.ds * \*{1\*}\k*\" \" footnote "name" ++.nr $d 1 1 \" delayed text number ++.ds # [1]\k#\" \" delayed text "name" ++.nr _M 1 \" chapter mode is chapter ++.ds lq \(lq\" \" left quote ++.ds rq \(rq\" \" right quote ++.em @z ++. ++. ++.\" *** FOREIGN LETTERS AND SPECIAL CHARACTERS *** ++. ++. ++.ds #h ((1u-(\\\\n(.fu%2u))*0.13m) ++.ds #v 0.6m ++. ++.\" \" accents ++.ds ' \k_\h'-(\\n(.wu*8/10-\*(#h)'\(aa\h'|\\n_u' ++.ds ` \k_\h'-(\\n(.wu*7/10-\*(#h)'\(ga\h'|\\n_u' ++. ++.\" \" umlaut ++.ds : \k_\h'-(\\n(.wu*8/10-\*(#h+0.1m)'\v'-\*(#v'\z.\h'0.2m'.\h'|\\n_u'\v'\*(#v' ++. ++.\" \" circumflex and tilde ++.ds ^ \k_\h'-(\\n(.wu-\*(#h-0.05m)'^\h'|\\n_u' ++.ds ~ \k_\h'-(\\n(.wu-\*(#h-0.05m)'~\h'|\\n_u' ++. ++.\" \" cedilla and czech ++.ds , \k_\h'-(\\n(.wu)',\h'|\\n_u' ++.ds v \k_\h'-(\\n(.wu*9/10-\*(#h)'\v'-\*(#v'\s-4v\s0\v'\*(#v'\h'|\\n_u' ++. ++.\" \" Norwegian A or angstrom ++.ds o \k_\h'-(\\n(.wu+\w'\(de'u-\*(#h)/2u'\v'-0.4n'\z\(de\v'0.4n'\h'|\\n_u' ++. ++.\" \" there exists, for all ++.ds qe \s-2\v'0.45m'\z\(em\v'-0.625m'\z\(em\v'-0.625m'\(em\v'0.8m'\s0\h'-0.1m'\v'-0.05m'\(br\v'0.05m'\h'0.1m' ++.ds qa \z\e\h'0.35m'\z\(sl\h'-0.33m'\v'-0.3m'\s-4\(em\s0\v'0.3m'\h'0.15m' ++.rm #h #v ++.ll 6.0i ++.lt 6.0i ++. ++.de @U ++.tm The \\$1 macro has been removed from this version of the -me macros. ++.. ++. ++.de lo ++.@U lo ++.. ++. ++.de th ++.@U th ++.. ++. ++.de ac ++.@U ac ++.. ++. ++.\" EOF +diff -Nuar groff-1.22.3.old/tmac/.gitignore groff-1.22.3/tmac/.gitignore +--- groff-1.22.3.old/tmac/.gitignore 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/.gitignore 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,18 @@ ++*-s ++*-sed ++*-wrap ++groff_man.n ++groff_mdoc.n ++groff_me.n ++groff_ms.n ++groff_www.n ++groff_trace.n ++stamp-strip ++doc-common ++doc-ditroff ++doc-nroff ++doc-old.tmac ++doc-syms ++doc.tmac ++e.tmac ++www.tmac +diff -Nuar groff-1.22.3.old/tmac/groff_man.man groff-1.22.3/tmac/groff_man.man +--- groff-1.22.3.old/tmac/groff_man.man 2014-11-04 10:38:35.534520134 +0200 ++++ groff-1.22.3/tmac/groff_man.man 2015-04-23 20:57:03.000000000 +0300 +@@ -4,6 +4,10 @@ + groff_man \- groff man macros to support generation of man pages + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legal Terms + .\" -------------------------------------------------------------------- +@@ -1269,6 +1273,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" -------------------------------------------------------------------- + .\" ### Emacs settings: + .\" Local Variables: +diff -Nuar groff-1.22.3.old/tmac/groff_trace.man groff-1.22.3/tmac/groff_trace.man +--- groff-1.22.3.old/tmac/groff_trace.man 2014-11-04 10:38:35.535520121 +0200 ++++ groff-1.22.3/tmac/groff_trace.man 2015-04-23 20:57:03.000000000 +0300 +@@ -6,6 +6,10 @@ + .\" File position: /tmac/groff_trace.man + . + . ++.do nr groff_C \n[.C] ++.cp 0 ++. ++. + .\" -------------------------------------------------------------------- + .\" Legal Terms + .\" -------------------------------------------------------------------- +@@ -323,6 +327,9 @@ + .au + . + . ++.cp \n[groff_C] ++. ++. + .\" Local Variables: + .\" mode: nroff + .\" End: +diff -Nuar groff-1.22.3.old/tmac/Makefile.sub groff-1.22.3/tmac/Makefile.sub +--- groff-1.22.3.old/tmac/Makefile.sub 2014-11-04 10:38:35.537520096 +0200 ++++ groff-1.22.3/tmac/Makefile.sub 1970-01-01 02:00:00.000000000 +0200 +@@ -1,184 +0,0 @@ +-# Makefile.sub for `tmac' +-# +-# File position: /tmac/Makefile.sub +-# +-# Copyright (C) 1989-2014 Free Software Foundation, Inc. +-# Written by James Clark (jjc@jclark.com) +-# +-# This file is part of groff. +-# +-# groff 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. +-# +-# groff 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 . +-# +-######################################################################## +- +-MAN7=\ +- groff_ms.n \ +- groff_man.n \ +- groff_me.n \ +- groff_mdoc.n \ +- groff_trace.n \ +- groff_www.n +- +-NORMALFILES=\ +- man.tmac mandoc.tmac andoc.tmac an-old.tmac an-ext.tmac \ +- ms.tmac \ +- me.tmac \ +- mdoc.tmac \ +- pic.tmac \ +- a4.tmac papersize.tmac \ +- 62bit.tmac \ +- ec.tmac \ +- safer.tmac \ +- trace.tmac \ +- ps.tmac psold.tmac pspic.tmac psatk.tmac \ +- pdf.tmac \ +- dvi.tmac \ +- tty.tmac tty-char.tmac \ +- latin1.tmac latin2.tmac latin5.tmac latin9.tmac cp1047.tmac \ +- unicode.tmac \ +- X.tmac Xps.tmac \ +- lj4.tmac \ +- lbp.tmac \ +- html.tmac html-end.tmac \ +- devtag.tmac \ +- europs.tmac \ +- composite.tmac fallbacks.tmac \ +- eqnrc \ +- refer.tmac refer-me.tmac refer-ms.tmac \ +- troffrc troffrc-end \ +- trans.tmac \ +- hyphen.us hyphenex.us \ +- fr.tmac hyphen.fr \ +- sv.tmac hyphen.sv \ +- de.tmac den.tmac hyphen.det hyphen.den hyphenex.det \ +- cs.tmac hyphen.cs hyphenex.cs \ +- ja.tmac +- +-# These files are handled specially during installation and deinstallation. +-SPECIALFILES=an.tmac s.tmac www.tmac +- +-# These files are processed with `strip.sed'. +-STRIPFILES=e.tmac doc.tmac doc-old.tmac +-MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms +-mdocdir=$(tmacdir)/mdoc +- +-MOSTLYCLEANADD=\ +- stamp-wrap stamp-sed *-wrap www.tmac-sed \ +- stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \ +- doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s mdoc.local-s +-tmac_s_prefix= +-tmac_an_prefix= +-tmac_wrap= +-sys_tmac_prefix= +-pnmtops_nosetpage="pnmtops" +- +-RM=rm -f +- +-all: stamp-strip stamp-wrap stamp-sed +- +-install_data: $(NORMALFILES) $(SPECIALFILES) man.local \ +- stamp-strip stamp-wrap stamp-sed +- -test -d $(DESTDIR)$(tmacdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(tmacdir) +- -test -d $(DESTDIR)$(systemtmacdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(systemtmacdir) +- -test -d $(DESTDIR)$(localtmacdir) \ +- || $(mkinstalldirs) $(DESTDIR)$(localtmacdir) +- if test -n "$(tmac_wrap)"; then \ +- for m in ""$(tmac_wrap); do \ +- $(INSTALL_DATA) $$m-wrap $(DESTDIR)$(systemtmacdir)/$$m.tmac; \ +- done; \ +- fi +- for f in $(NORMALFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \ +- done +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac +- $(INSTALL_DATA) $(srcdir)/s.tmac \ +- $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac +- $(INSTALL_DATA) $(srcdir)/an.tmac \ +- $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac +- $(RM) $(DESTDIR)$(tmacdir)/www.tmac +- $(INSTALL_DATA) www.tmac-sed $(DESTDIR)$(tmacdir)/www.tmac +- for f in $(STRIPFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \ +- done +- -test -d $(DESTDIR)$(mdocdir) || $(mkinstalldirs) $(DESTDIR)$(mdocdir) +- for f in $(MDOCFILES); do \ +- $(RM) $(DESTDIR)$(mdocdir)/$$f; \ +- $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \ +- done +- -test -f $(DESTDIR)$(localtmacdir)/man.local \ +- || $(INSTALL_DATA) $(srcdir)/man.local \ +- $(DESTDIR)$(localtmacdir)/man.local +- -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \ +- || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local +- +-stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local +- for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \ +- $(RM) $$f-s; \ +- sed -f $(srcdir)/strip.sed $(srcdir)/$$f >$$f-s; \ +- done +- touch $@ +- +-stamp-wrap: +- if test -n "$(tmac_wrap)"; then \ +- for m in ""$(tmac_wrap); do \ +- $(RM) $$m-wrap; \ +- if test "$$m" = an; then \ +- echo .do mso andoc.tmac >>$$m-wrap; \ +- fi; \ +- echo .cp 1 >>$$m-wrap; \ +- echo .so $(sys_tmac_prefix)$$m >>$$m-wrap; \ +- done; \ +- fi +- touch $@ +- +-stamp-sed: www.tmac +- sed -e "s;@PNMTOPS_NOSETPAGE@;$(pnmtops_nosetpage);g" \ +- $(srcdir)/www.tmac > www.tmac-sed +- touch $@ +- +-uninstall_sub: +- -if test -n "$(tmac_wrap)"; then \ +- for m in ""$(tmac_wrap); do \ +- $(RM) $(DESTDIR)$(systemtmacdir)/$$m.tmac; \ +- done; \ +- fi +- -for f in $(NORMALFILES) $(STRIPFILES); do \ +- $(RM) $(DESTDIR)$(tmacdir)/$$f; \ +- done +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac +- $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac +- $(RM) $(DESTDIR)$(tmacdir)/www.tmac +- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \ +- $(srcdir)/man.local; then \ +- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \ +- fi +- -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \ +- $(srcdir)/mdoc.local; then \ +- $(RM) $(DESTDIR)$(localtmacdir)/mdoc.local; \ +- fi +- -for f in $(MDOCFILES); do $(RM) $(DESTDIR)$(mdocdir)/$$f; done +- -test -d $(DESTDIR)$(mdocdir) && rmdir $(DESTDIR)$(mdocdir) +- +-######################################################################## +-# Emacs settings +-######################################################################## +-# +-# Local Variables: +-# mode: makefile +-# End: +diff -Nuar groff-1.22.3.old/tmac/strip.sed groff-1.22.3/tmac/strip.sed +--- groff-1.22.3.old/tmac/strip.sed 2014-11-04 10:38:35.539520071 +0200 ++++ groff-1.22.3/tmac/strip.sed 2015-04-23 20:57:03.000000000 +0300 +@@ -1,3 +1,6 @@ ++2 i\ ++.\\" This is a generated file, created by `tmac/strip.sed' in groff's\ ++.\\" source code bundle from a file having `-u' appended to its name. + # strip comments, spaces, etc., after a line containing `%beginstrip%' + /%beginstrip%/,$ { + s/^\.[ ]*/./ +diff -Nuar groff-1.22.3.old/tmac/tmac.am groff-1.22.3/tmac/tmac.am +--- groff-1.22.3.old/tmac/tmac.am 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/tmac.am 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,216 @@ ++# Copyright (C) 1989-2007, 2009-2012, 2014 ++# Free Software Foundation, Inc. ++# Written by James Clark (jjc@jclark.com) ++# Automake migration by Bertrand Garrigues ++# ++# This file is part of groff. ++# ++# groff 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. ++# ++# groff 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 . ++tmac_srcdir = $(top_srcdir)/tmac ++tmac_builddir = $(top_builddir)/tmac ++ ++man7_MANS += \ ++ tmac/groff_ms.n \ ++ tmac/groff_man.n \ ++ tmac/groff_me.n \ ++ tmac/groff_mdoc.n \ ++ tmac/groff_trace.n \ ++ tmac/groff_www.n ++ ++TMACNORMALFILES = \ ++ tmac/man.tmac \ ++ tmac/mandoc.tmac \ ++ tmac/andoc.tmac \ ++ tmac/an-old.tmac \ ++ tmac/an-ext.tmac \ ++ tmac/ms.tmac \ ++ tmac/me.tmac \ ++ tmac/mdoc.tmac \ ++ tmac/pic.tmac \ ++ tmac/a4.tmac \ ++ tmac/papersize.tmac \ ++ tmac/62bit.tmac \ ++ tmac/ec.tmac \ ++ tmac/safer.tmac \ ++ tmac/trace.tmac \ ++ tmac/ps.tmac \ ++ tmac/psold.tmac \ ++ tmac/pspic.tmac \ ++ tmac/psatk.tmac \ ++ tmac/pdf.tmac \ ++ tmac/dvi.tmac \ ++ tmac/tty.tmac \ ++ tmac/tty-char.tmac \ ++ tmac/latin1.tmac \ ++ tmac/latin2.tmac \ ++ tmac/latin5.tmac \ ++ tmac/latin9.tmac \ ++ tmac/cp1047.tmac \ ++ tmac/unicode.tmac \ ++ tmac/X.tmac \ ++ tmac/Xps.tmac \ ++ tmac/lj4.tmac \ ++ tmac/lbp.tmac \ ++ tmac/html.tmac \ ++ tmac/html-end.tmac \ ++ tmac/devtag.tmac \ ++ tmac/europs.tmac \ ++ tmac/composite.tmac \ ++ tmac/fallbacks.tmac \ ++ tmac/eqnrc \ ++ tmac/refer.tmac \ ++ tmac/refer-me.tmac \ ++ tmac/refer-ms.tmac \ ++ tmac/troffrc \ ++ tmac/troffrc-end \ ++ tmac/trans.tmac \ ++ tmac/hyphen.us \ ++ tmac/hyphenex.us \ ++ tmac/fr.tmac \ ++ tmac/hyphen.fr \ ++ tmac/sv.tmac \ ++ tmac/hyphen.sv \ ++ tmac/de.tmac \ ++ tmac/den.tmac \ ++ tmac/hyphen.det \ ++ tmac/hyphen.den \ ++ tmac/hyphenex.det \ ++ tmac/cs.tmac \ ++ tmac/hyphen.cs \ ++ tmac/hyphenex.cs \ ++ tmac/ja.tmac ++NORMALFILES = `echo $(TMACNORMALFILES) | sed -e "s|tmac/||g"` ++ ++# TMACSTRIPFILES are built from their unstripped version (-u) ++TMACSTRIPFILES = tmac/e.tmac tmac/doc.tmac tmac/doc-old.tmac ++ ++# Files installed in tmacdir ++dist_tmac_DATA = $(TMACNORMALFILES) tmac/an.tmac tmac/s.tmac ++nodist_tmac_DATA = $(TMACSTRIPFILES) tmac/www.tmac ++ ++TMACMDOCFILES = \ ++ tmac/doc-common \ ++ tmac/doc-ditroff \ ++ tmac/doc-nroff \ ++ tmac/doc-syms ++MDOCFILES = `echo $(TMACMDOCFILES) | sed -e "s|tmac/||g"` ++mdocdir=$(tmacdir)/mdoc ++# Files installed in mdocdir ++nodist_mdoc_DATA = $(TMACMDOCFILES) ++ ++# Installed in localtmacdir ++dist_localtmac_DATA = tmac/man.local tmac/mdoc.local ++ ++MOSTLYCLEANFILES += $(TMACMDOCFILES) tmac/www.tmac $(TMACSTRIPFILES) \ ++ tmac/stamp-wrap \ ++ tmac/*-wrap ++ ++EXTRA_DIST += \ ++ tmac/fixmacros.sed \ ++ tmac/groff_ms.man \ ++ tmac/groff_man.man \ ++ tmac/groff_me.man \ ++ tmac/groff_mdoc.man \ ++ tmac/groff_trace.man \ ++ tmac/groff_www.man \ ++ tmac/hyphenex.pl \ ++ tmac/LOCALIZATION \ ++ tmac/man.ultrix \ ++ tmac/psfig.tmac \ ++ tmac/ptx.tmac \ ++ tmac/strip.sed \ ++ tmac/TESTING-HINTS \ ++ tmac/TODO \ ++ tmac/www.tmac.in ++ ++dist-hook: tmac-dist-hook ++tmac-dist-hook: ++ chmod u+w $(distdir)/tmac ++ for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \ ++ cp -f $(top_srcdir)/$$f-u $(distdir)/tmac; \ ++ done ++ ++ ++# If the system comes with its own tmac macro installation (/usr/lib/tmac ++# contains tmac.an, tmac.m, tmac.s), ms and man macros are installed as ++# gs.tmac and gan.tmac, instead of s.tmac and an.tmac. Also, an.tmac, ++# m.tmac and s.tmac files are installed in /lib/groff/site-tmac. ++all: tmac/stamp-wrap ++ ++$(TMACMDOCFILES) $(TMACSTRIPFILES): ++ $(MKDIR_P) $(top_builddir)/tmac ++ for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \ ++ sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$$f-u > $(top_builddir)/$$f; \ ++ done ++ ++tmac/stamp-wrap: ++ $(MKDIR_P) $(top_builddir)/tmac; ++ if test -n "$(tmac_wrap)"; then \ ++ for m in ""$(tmac_wrap); do \ ++ $(RM) $(top_builddir)/tmac/$$m-wrap; \ ++ if test "$$m" = an; then \ ++ echo .do mso andoc.tmac >>$(top_builddir)/tmac/$$m-wrap; \ ++ fi; \ ++ echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \ ++ echo .so $(sys_tmac_prefix)$$m >>$(top_builddir)/tmac/$$m-wrap; \ ++ done; \ ++ fi ++ touch $@ ++ ++tmac/www.tmac: tmac/www.tmac.in ++ $(MKDIR_P) $(top_builddir)/tmac ++ sed -e "s;[@]PNMTOPS_NOSETPAGE[@];$(pnmtops_nosetpage);g" \ ++ $(tmac_srcdir)/www.tmac.in > $(top_builddir)/tmac/www.tmac ++ ++install-data-local: install_tmac_wrap ++install_tmac_wrap: ++ $(MKDIR_P) $(DESTDIR)$(systemtmacdir); ++ if test -n "$(tmac_wrap)"; then \ ++ for m in ""$(tmac_wrap); do \ ++ $(INSTALL_DATA) $(tmac_builddir)/$$m-wrap \ ++ $(DESTDIR)$(systemtmacdir)/$$m.tmac; \ ++ done; \ ++ fi ++ ++install-data-hook: install_tmac_wrap_hook ++install_tmac_wrap_hook: ++ if test -n "$(tmac_wrap)"; then \ ++ if test -f $(DESTDIR)$(tmacdir)/s.tmac; then \ ++ mv $(DESTDIR)$(tmacdir)/s.tmac \ ++ $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac; \ ++ fi; \ ++ if test -f $(DESTDIR)$(tmacdir)/an.tmac; then \ ++ mv $(DESTDIR)$(tmacdir)/an.tmac \ ++ $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac; \ ++ fi; \ ++ fi ++ ++uninstall_groffdirs: uninstall_tmac_hook ++uninstall_tmac_hook: ++ if test -n "$(tmac_wrap)"; then \ ++ for m in ""$(tmac_wrap); do \ ++ $(RM) $(DESTDIR)$(systemtmacdir)/$$m.tmac; \ ++ done; \ ++ $(RM) -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac; \ ++ $(RM) -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac; \ ++ fi ++ if test -d $(DESTDIR)$(mdocdir); then \ ++ rmdir $(DESTDIR)$(mdocdir); \ ++ fi ++ if test -d $(DESTDIR)$(tmacdir); then \ ++ rmdir $(DESTDIR)$(tmacdir); \ ++ fi ++ if test -d $(DESTDIR)$(localtmacdir); then \ ++ rmdir $(DESTDIR)$(localtmacdir); \ ++ fi +diff -Nuar groff-1.22.3.old/tmac/www.tmac groff-1.22.3/tmac/www.tmac +--- groff-1.22.3.old/tmac/www.tmac 2014-11-04 10:38:35.540520059 +0200 ++++ groff-1.22.3/tmac/www.tmac 1970-01-01 02:00:00.000000000 +0200 +@@ -1,1625 +0,0 @@ +-.ig +-www.tmac - macro package for adding HTML elements to roff documents. +- +-File position: /tmac/www.tmac +-Installed position: groff's main macro directory. +- +------------------------------------------------------------------------- +- Legalese +------------------------------------------------------------------------- +- +-This file is part of groff, the GNU roff type-setting system. +- +-Copyright (C) 2001-2014 Free Software Foundation, Inc. +-written by Gaius Mulley , with additions by +-Werner Lemberg and +-Bernd Warken . +- +-groff 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. +- +-groff 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 . +- +- +------------------------------------------------------------------------- +- Description +------------------------------------------------------------------------- +- +-A simple set of macros to provide HTML (or XHTML) documents with basic +-www functionality. It should work with any macro set. In the following, +-HTML always denotes XHTML also. +-.. +-. +-. +-.\" -------------------------------------------------------------------- +-.\" Setup +-.\" -------------------------------------------------------------------- +-. +-.do if d www:lenstr .nx +-. +-.do mso devtag.tmac +-. +-.nr _C \n(.C +-.cp 0 +-. +-. +-.ie r xhtml \ +-. ds www-> />\" +-.el \ +-. ds www-> >\" +-. +-.nr www-html 0 +-.if '\*[.T]'html' \ +-. nr www-html 1 +-. +-.\" set up www-image-template +-. +-.if !d www-image-template \ +-. ds www-image-template +-. +-.if r ps4html \{\ +-. \" remove the title command when we are generating images for HTML +-. \" (stops a title accidentally appearing inside an image) +-. di www-notitle +-. tl '''' +-. di +-. rm tl +-. de tl +-. . +-.\} +-. +-. +-.\" -------------------------------------------------------------------- +-.\" Test for `.substring'; result in register `www.substring_ok'. +-.\" The automated break points in .URL addresses are only added if +-.\" this register is non-zero. +-.\" +-.nr www:substring_ok 0 +-.de www:@test_substring +-. if !d substring \ +-. return +-. ds \\$0:s abcdefg\" +-. substring \\$0:s 1 1 +-. if !'\\*[\\$0:s]'b' \{\ +-. rm \\$0:s +-. return +-. \} +-. ds \\$0:s abcdefg\" +-. substring \\$0:s 0 0 +-. if !'\\*[\\$0:s]'a' \{\ +-. rm \\$0:s +-. return +-. \} +-. ds \\$0:s abcdefg\" +-. substring \\$0:s 1 -1 +-. if !'\\*[\\$0:s]'bcdefg' \{\ +-. rm \\$0:s +-. return +-. \} +-. nr www:substring_ok 1 +-. rm \\$0:s +-.. +-.www:@test_substring +-.rm www:@test_substring +-. +-. +-.\" -------------------------------------------------------------------- +-.\" Local Macros +-.\" -------------------------------------------------------------------- +-. +-.\" -------------------------------------------------------------------- +-.\" www:paraspace +-.\" +-.\" Space before paragraph. Use \n[PD] if it exists. +-.\" +-.nr www:pd 0.5v +-. +-.de www:paraspace +-. ie r PD \ +-. sp \\n[PD]u +-. el \ +-. sp \\n[www:pd]u +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" www:error (...) +-.\" +-.\" Print error message. +-.\" +-.de www-error +-. tm \\n[.F]:\\n[.c]: macro error: \\$* +-.. +-. +-.als www:error www-error +-. +-.\" -------------------------------------------------------------------- +-.\" www:lenstr ( ) +-.\" +-.\" Store length of string named into register named +-.\" . +-.\" +-.de www:lenstr +-. if !(\\n[.$] == 2) \{\ +-. tm .\\$0 expects 2 arguments. +-. ab +-. \} +-. length \\$0:n x\\*[\\$2] +-. nr \\$1 (\\n[\\$0:n] - 1) +-. rr \\$0:n +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" www:splitstr () +-.\" +-.\" Add a space character between any two adjacent characters in string +-.\" and restore result into the string variable ; space +-.\" characters are first replaced by the word `space'. +-.\" +-.de www:splitstr +-. if !(\\n[.$] == 1) \ +-. www:error .\\$0 expects 1 argument. +-. if '\\*[\\$1]'' \ +-. return +-. ds \\$0:r "\\*[\\$1]\" +-. ds \\$0:s +-. while 1 \{\ +-. ds \\$0:c "\\*[\\$0:r]\" +-. substring \\$0:c 0 0 +-. ie '\\*[\\$0:c]' ' \ +-. as \\$0:s " space\" +-. el \ +-. as \\$0:s " \\*[\\$0:c]\" +-. www:lenstr \\$0:n \\$0:r +-. if (\\n[\\$0:n] <= 1) \ +-. break +-. substring \\$0:r 1 -1 +-. \} +-. if !'\\*[\\$0:s]'' \ +-. substring \\$0:s 1 -1 +-. ds \\$1 \\*[\\$0:s]\" +-. rm \\$0:c +-. rr \\$0:n +-. rm \\$0:r +-. rm \\$0:s +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" www:url_breaks () +-.\" +-.\" Add `\:' (possible break point) within URL strings after `/'. +-.\" +-.\" Smart about multiple `/', existing `\:', and space characters; +-.\" does not set a break point if less than 5 characters would go to +-.\" the next line. +-.\" +-.de www:url_breaks +-. if !(\\n[.$] == 1) \ +-. www:error .\\$0 expects 1 argument. +-. if !\n[www:substring_ok] \ +-. return +-. ds \\$0:s "\\*[\\$1]\" +-. www:splitstr \\$0:s +-. www:url_breaks_split \\$0:s \\*[\\$0:s] +-. ds \\$1 "\\*[\\$0:s]\" +-. rm \\$0:s +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" www:url_breaks_split ( [...]) +-.\" +-.\" Add `\:' within URL strings, but arguments are a split string. +-.\" +-.\" Arguments: >=2: [...] +-.\" +-.de www:url_breaks_split +-. nr \\$0:min 5 \" minimal number of characters for next line +-. if (\\n[.$] < 2) \ +-. www:error .\\$0 expects at least 2 arguments. +-. ds \\$0:res \\$1\" +-. shift +-. ds \\$0:s +-. nr \\$0:done 0 +-. while !\\n[\\$0:done] \{\ +-. if (\\n[.$] <= 0) \ +-. break +-. if '\\$1'space' \{\ +-. as \\$0:s " \" +-. shift +-. continue +-. \} +-. if (\\n[.$] < \\n[\\$0:min]) \{\ +-. as \\$0:s "\\$1\" +-. shift +-. continue +-. \} +-. if !'\\$1'/' \{\ +-. as \\$0:s "\\$1\" +-. shift +-. continue +-. \} +-. \" we are at a `/' character +-. while '\\$1'/' \{\ +-. as \\$0:s /\" +-. if (\\n[.$] == 0) \{\ +-. nr \\$0:done 1 +-. break +-. \} +-. shift +-. \} +-. if \\n[\\$0:done] \ +-. break +-. if (\\n[.$] < \\n[\\$0:min]) \ +-. continue +-. if '\\$1'\:' \ +-. shift +-. as \\$0:s \:\" +-. \} +-. ds \\*[\\$0:res] \\*[\\$0:s]\" +-. rm \\$0:res +-. rm \\$0:s +-.. +-. +-. +-.\" -------------------------------------------------------------------- +-.\" User Interface +-.\" -------------------------------------------------------------------- +-. +-.\" -------------------------------------------------------------------- +-.\" HTML +-.\" +-.\" The main auxiliary macro for the HTML interface. +-.\" +-.de HTML +-. if \\n[www-html] \{\ +-. \" was implemented via .nop \&\X^html:\\$*^ but +-. \" is now implemented using HTML-NS to utilize code factoring. +-. \" +-. \" the `\&' makes the vertical mode leave, so to say +-. \" +-. nop \&\c +-. HTML-NS \\$* +-. nop \& +-. \} +-.. +-. +-.\" +-.\" An auxiliary macro for HTML (without following space). +-.\" +-.de HTML-NS +-. nop \X^html:\\$*^\c +-.. +-. +-.\" +-.\" Emit an HTML tag after shutting down a (possibly open) paragraph. +-.\" +-.de HTML

    +-. ie \\n[www-html] \{\ +-. \" the `\&' makes the vertical mode leave, so to say +-. nop \&\X^html

    :\\$*^ +-. \} +-. el \ +-. www:paraspace +-.. +-. +-.\" +-.\" Emit an HTML tag. If text has been written in the paragraph +-.\" then do not shut the paragraph down. +-.\" If text was not written, remove the empty +-.\" paragraph tag and emit the desired HTML tag. +-.\" +-.de HTML +-. if \\n[www-html] \ +-. nop \&\X^html:\\$*^ +-.. +-. +-.\" +-.\" Emit a MATH tag. If text has been written in the paragraph +-.\" then do not shut the paragraph down. +-.\" If text was not written, remove the empty +-.\" paragraph tag and emit the desired math tag. +-.\" +-.de MATH +-. if \\n[www-html] \ +-. nop \&\X^math:\\$*^ +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HX n +-.\" +-.\" Automatic heading level cut off. +-.\" +-.\" N is the depth limit of automatically linked headings. So a depth +-.\" of 2 would cause grohtml to generate a list of links for `.NH 1' +-.\" and `.NH 2' but not for `.NH 3'. +-.\" +-.de HX +-. if \\n[www-html] \ +-. nop \X^index:\\$*^ +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" BCL foreground background active not-visited visited +-.\" +-.de BCL +-. HTML " +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" BGIMG imagefile +-.\" +-.de BGIMG +-. HTML " +-.. +-. +-.\" www:url_check_tag str +-.\" If url named by \*[str] is internal (starts with #), +-.\" redefine \*[str] to be the value of the string TAG_url. +-. +-.de www:url_check_tag +-. ds \\$0:tmp \\*[\\$1]\" +-. substring \\$0:tmp 0 0 +-. if '\\*[\\$0:tmp]'#' \{\ +-. ds \\$0:tmp \\*[\\$1]\" +-. substring \\$0:tmp 1 +-. ds \\$0:tmp TAG_\\*[\\$0:tmp]\" +-. +-. ie d \\*[\\$0:tmp] \ +-. ds \\$1 \\*[\\*[\\$0:tmp]]\" +-. el \ +-. ds \\$1 see below\" +-. \} +-. rm \\$0:tmp +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" URL url [description] [after] +-.\" +-.\" If description is absent then the url becomes the anchor text. +-.\" +-.de URL +-. if !'\\$1'' \{\ +-. ds \\$0:adr \\$1\" +-. www:url_check_tag \\$0:adr +-. if !\\n[www-html] \ +-. www:url_breaks \\$0:adr +-. \} +-. ie \\n[www-html] \{\ +-. ie '\\$3'' \ +-. ds \\$0:after \&\" +-. el \ +-. ds \\$0:after \&\\$3\" +-. +-. ie '\\$2'' \ +-. HTML-NS     \\*[\\$0:adr]" +-. el \ +-. HTML-NS \\$2" +-. +-. nop \\*[\\$0:after] +-. rm \\$0:after +-. \} +-. el \{\ +-. if !r ps4html \ +-. ad l +-. +-. ie '\\$2'' \{\ +-. ie '\\$1'' \{\ +-. if !'\\$3'' \ +-. nop \\$3 +-. \} +-. el \{\ +-. ie \\n[.color] \ +-. nop \%\\*[www:open]\m[\\*[www:color]]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\m[]\\*[www:close]\\$3 +-. el \ +-. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\\*[www:close]\\$3 +-. \} +-. \} +-. el \{\ +-. ie '\\$1'' \{\ +-. ie \\n[.color] \ +-. nop \m[\\*[www:color]]\\$2\m[]\\$3 +-. el \ +-. nop \f[\\*[www:fontstyle]]\\$2\f[]\\$3 +-. \} +-. el \{\ +-. ie \\n[.color] \{\ +-. nop \m[\\*[www:color]]\\$2\m[] +-. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\\*[www:close]\\$3 +-. \} +-. el \{\ +-. nop \f[\\*[www:fontstyle]]\\$2\f[] +-. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\\*[www:close]\\$3 +-. \} +-. \} +-. \} +-. +-. if !r ps4html \ +-. ad +-. \} +-. rm \\$0:adr +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" FTP url description [after] +-.\" +-.\" Same as URL. +-.\" +-.als FTP URL +-. +-.\" -------------------------------------------------------------------- +-.\" MTO address description [after] +-.\" +-.\" ADDRESS is the email address (without the `mailto:' prefix). +-.\" +-.\" DESCRIPTION is the optional name. If an empty argument is given, +-.\" ADDRESS is used instead. +-.\" +-.\" AFTER is optional stuff printed immediately after ADDRESS +-.\" (resp. DESCRIPTION). +-.\" +-.\" Example: +-.\" +-.\" Foobar has been written by +-.\" .MTO fred@foo.bar "Fredrick Bloggs" . +-.\" +-.de MTO +-. ie \\n[www-html] \{\ +-. ie '\\$2'' \ +-. URL mailto:\\$1 \\$1 "\\$3" +-. el \ +-. URL mailto:\\$1 "\\$2" "\\$3" +-. \} +-. el \{\ +-. ie '\\$2'' \{\ +-. ie '\\$1'' \{\ +-. ie !'\\$3'' \ +-. nop \\$3 +-. \} +-. el \{\ +-. ie \\n[.color] \ +-. nop \%\m[\\*[www:color]]\f[\\*[www:fontstyle]]\\$1\f[]\m[]\\$3 +-. el \ +-. nop \%\f[\\*[www:fontstyle]]\\$1\f[]\\$3 +-. \} +-. \} +-. el \{\ +-. ie '\\$1'' \{\ +-. ie \\n[.color] \ +-. nop \m[\\*[www:color]]\\$2\m[]\\$3 +-. el \ +-. nop \f[\\*[www:fontstyle]]\\$2\f[]\\$3 +-. \} +-. el \{\ +-. ie \\n[.color] \{\ +-. nop \m[\\*[www:color]]\\$2\m[] +-. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\$1\f[]\\*[www:close]\\$3 +-. \} +-. el \{\ +-. nop \f[\\*[www:fontstyle]]\\$2\f[] +-. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\$1\f[]\\*[www:close]\\$3 +-. \} +-. \} +-. \} +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" TAG name [text] +-.\" +-.\" Generate an HTML name NAME. +-.\" Define string TAG_NAME to TEXT, if present, otherwise to \n[PN]. +-.\" Register PN is the current page number. +-.\" +-.de TAG +-. HTML " +-. ie '\\$2'' \ +-. if !rPN \ +-. nr PN \\n% +-. ds TAG_\\$1 \\n[PN]\" +-. el \ +-. ds TAG_\\$1 \\$2\" +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" IMG [-R|-L|-C] filename [width] [height] +-.\" +-.\" Include an image of any type (only works for -Thtml). +-.\" +-.\" Alignment is centered by default (-C). +-.\" Default value for WIDTH is 1i. +-.\" If HEIGHT is not given, WIDTH is used as the height. +-.\" +-.de IMG +-. ie \\n[www-html] \{\ +-. ie '\\$2'-R' \ +-. DEVTAG .right-image +-. el \{\ +-. ie '\\$2'-L' \ +-. DEVTAG .left-image +-. el \ +-. DEVTAG .centered-image +-. \} +-. nr www-width 100 +-. if !'\\$3'' \ +-. nr www-width \\$3 +-. nr www-height \\n[www-width] +-. if !'\\$4'' \ +-. nr www-height \\$4 +-. HTML ]" +-. \} +-. el \ +-. nop \\*[www:open]\f[\\*[www:fontstyle]]\\$1\f[]\\*[www:close] +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" PIMG [-R|-L|-C] filename [width] [height] +-.\" +-.\" Include a PNG image. It works for -Tps and -Thtml. +-.\" The default value for WIDTH and HEIGHT is zero; the default +-.\" alignment is centering (-C). +-.\" +-.\" Note: This macro can only be used with the `-U' option of groff, +-.\" activating unsafe mode, if not used with -Thtml; the PNG image +-.\" is then converted to the EPS format using netpbm utilities. +-.\" +-.de PIMG +-. ds www-pic-align -C\" +-. ie '\\$1'-R' \{\ +-. ds www-pic-align -R\" +-. shift +-. \} +-. el \{\ +-. if '\\$1'-L' \{\ +-. ds www-pic-align -L\" +-. shift +-. \} +-. \} +-. if '\\$1'-C' \ +-. shift +-. +-. ie \\n[www-html] \{\ +-. ds www-htmlalign align="center"\" +-. if '\\*[www-pic-align]'-R' \ +-. ds www-htmlalign align="right"\" +-. if '\\*[www-pic-align]'-L' \ +-. ds www-htmlalign align="left"\" +-. +-. nr www-width 0 +-. nr www-height 0 +-. if !'\\$2'' \ +-. nr www-width (\\$3 * 100 / 240) +-. if !'\\$3'' \ +-. nr www-height (\\$4 * 100 / 240) +-. ie (\\n[www-width] == 0) \{\ +-. ie (\\n[www-height] == 0) \ +-. HTML

    ]

    " +-. el \ +-. HTML

    ]

    " +-. \} +-. el \{\ +-. ie (\\n[www-height] == 0) \ +-. HTML

    ]

    " +-. el \ +-. HTML

    ]

    " +-. \} +-. \} +-. el \{\ +-. if !r ps4html \{\ +-. www-make-unique-name +-. sy pngtopnm \\$1 \ +- | pnmcrop -white \ +- | @PNMTOPS_NOSETPAGE@ -noturn \ +- > \\*[www-unique-name].eps +-. shift +-. PSPIC \\*[www-pic-align] \\*[www-unique-name].eps \\$* +-. \} +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" auxiliary definitions for MPIMG +-.\" +-.nr www-left-ll-trap 0 +-.nr www-left-po-trap 0 +-.nr www-right-ll-trap 0 +-. +-.de www-finish-left-po +-. po -(\\n[www-left-indent]u + \\n[www-image-gap]u) +-. wh \\n[www-left-po-trap]u +-. nr www-left-indent 0 +-.. +-. +-.\" called when the -R picture is finished +-.de www-finish-right-ll +-. ll +(\\n[www-right-indent]u + \\n[www-image-gap]u) +-. +-. \" now check whether we need to inline www-finish-left-ll +-. if (\\n[www-left-ll-trap]u > 0) \ +-. if ((\\n[www-right-ll-trap]u + 1v) >= \\n[www-left-ll-trap]u) \{\ +-. mk www-left-po-trap +-. nr www-left-po-trap +1v +-. wh \\n[www-left-po-trap]u www-finish-left-po +-. ll +\\n[www-left-indent]u +-. wh \\n[www-left-ll-trap]u +-. nr www-left-ll-trap 0 +-. \} +-. +-. \" and check whether we need to inline www-finish-left-po +-. if (\\n[www-left-po-trap]u > 0) \ +-. if ((\\n[www-right-ll-trap]u + 1v) >= \\n[www-left-po-trap]u) \{\ +-. po -\\n[www-left-indent]u +-. wh \\n[www-left-po-trap]u +-. nr www-left-indent 0 +-. \} +-. +-. wh \\n[www-right-ll-trap]u +-. nr www-right-ll-trap 0 +-.. +-. +-.de www-finish-left-ll +-. if (\\n[www-right-ll-trap] > 0) \ +-. if ((\\n[www-left-ll-trap] + 1v) >= \\n[www-right-ll-trap]) \{\ +-. ll +\\n[www-right-indent]u +-. nr www-right-ll-trap 0 +-. \} +-. +-. mk www-left-po-trap +-. nr www-left-po-trap +1v +-. wh \\n[www-left-po-trap]u www-finish-left-po +-. ll +(\\n[www-left-indent]u + \\n[www-image-gap]u) +-. wh \\n[www-left-ll-trap]u +-. nr www-left-ll-trap 0 +-.. +-. +-.\" www-handle-percent arg N1 N2 S1 +-.\" arg - input string (number or number%) +-.\" output parameters: +-.\" N1 - name of number register 1=absolute 0=percentage +-.\" N2 - number register name for absolute value +-.\" S1 - string register name for percentage value +-.\" +-.de www-handle-percent +-. ds www-percent \\$1\" +-. substring www-percent -1 -1 +-. +-. ie '\\*[www-percent]'%' \{\ +-. ds www-abs \\$1\" +-. substring www-abs 0 -2 +-. nr \\$2 0 +-. nr \\$3 \\*[www-abs] +-. ds \\$4 \\$1\" +-. \} +-. el \{\ +-. nr \\$2 1 +-. nr \\$3 \\$1 +-. ds \\$4 none\" +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" MPIMG [-R|-L] [-G gap] filename [width [height]] +-.\" +-.\" Include a PNG image and wrap text around it. It works for +-.\" -Tps and -Thtml. The default value for WIDTH is 1i; default value +-.\" for HEIGHT is WIDTH; the default alignment is left (-L). +-.\" -G is used to insert a gap between the text and the image. +-.\" The height and width can also be given as a percentage. +-.\" The PostScript device converts the percentage width into an +-.\" absolute value by using \\n[.l], and the height by using \\n[.p]. +-.\" +-.\" +-.\" Note: This macro can only be used with the `-U' option of groff, +-.\" activating unsafe mode, if not used with -Thtml; the PNG image +-.\" is then converted to the EPS format using netpbm utilities. +-.\" +-.nr www-htmlimage-gap 0 +-. +-.de MPIMG +-. nr www-image-just 1 +-. nr www-image-gap 0 +-. while (\\n[.$] > 0) \{\ +-. if '-L'\\$1' \{\ +-. nr www-image-just 1 +-. shift +-. continue +-. \} +-. if '-R'\\$1' \{\ +-. nr www-image-just 0 +-. shift +-. continue +-. \} +-. if '-G'\\$1' \{\ +-. nr www-image-gap \\$2 +-. nr www-htmlimage-gap (\\$2 * 100 / 240) +-. shift 2 +-. continue +-. \} +-. break +-. \} +-. +-. nr www-width 1i +-. nr www-height 1i +-. ds www-size-specs width="\\n[www-width]" height="\\n[www-height]"\" +-. ie !'\\$2'' \{\ +-. nr www-is-absolute 0 +-. nr www-absolute 0 +-. ds www-percentage none\" +-. www-handle-percent \\$2 www-is-absolute www-absolute www-percentage +-. ie !\\n[www-is-absolute] \{\ +-. \" percentage of linelength requested +-. nr www-width (\\n[www-absolute] * \\n[.l] / 100) +-. if \\n[www-html] \ +-. nr www-width (\\n[www-width] * 100 / 240) +-. ds www-size-specs width="\\*[www-percentage]"\" +-. \} +-. el \{\ +-. nr www-width \\n[www-absolute] +-. if \\n[www-html] \ +-. nr www-width (\\n[www-width] * 100 / 240) +-. ds www-size-specs width="\\n[www-width]"\" +-. \} +-. +-. nr www-height \\n[www-width] +-. ie !'\\$3'' \{\ +-. nr www-is-absolute 0 +-. nr www-absolute 0 +-. ds www-percentage none\" +-. www-handle-percent \\$3 www-is-absolute www-absolute www-percentage +-. ie !\\n[www-is-absolute] \{\ +-. \" percentage of pagelength requested +-. nr www-height (\\n[www-absolute] * \\n[.p] / 100) +-. if \\n[www-html] \ +-. nr www-height (\\n[www-height] * 100 / 240) +-. ds www-size-specs "\\*[www-size-specs] height="\\*[www-percentage]"\" +-. \} +-. el \{\ +-. nr www-height \\n[www-absolute] +-. if \\n[www-html] \ +-. nr www-height (\\n[www-height] * 100 / 240) +-. ds www-size-specs "\\*[www-size-specs] height="\\*[www-height]"\" +-. \} +-. \} +-. \} +-. el \{\ +-. \" height not specified; use width value +-. ie !\\n[www-is-absolute] \{\ +-. \" percentage value +-. ds www-size-specs "\\*[www-size-specs] height="\\*[www-percentage]"\" +-. nr www-height \\n[www-width] +-. \} +-. el \{\ +-. ds www-size-specs "\\*[www-size-specs] height="\\*[www-width]"\" +-. nr www-height \\n[www-width] +-. \} +-. \} +-. +-. ie \\n[www-html] \{\ +-. ie !\\n[www-image-just] \ +-. HTML ]" +-. el \ +-. HTML ]" +-. \} +-. el \{\ +-. tm www-width is \\n[www-width] +-. tm www-height is \\n[www-height] +-. if !r ps4html \{\ +-. www-make-unique-name +-. sy pngtopnm \\$1 \ +- | pnmcrop -white \ +- | @PNMTOPS_NOSETPAGE@ -noturn \ +- > \\*[www-unique-name].eps +-. ie !\\n[www-image-just] \{\ +-. \" we must now disable a possible left image trap +-. sp -1 +-. if (\\n[www-left-ll-trap] > 0) \ +-. wh \\n[www-left-ll-trap]u +-. if (\\n[www-left-po-trap] > 0) \ +-. wh \\n[www-left-po-trap]u +-. PSPIC -R \\*[www-unique-name].eps \\n[www-width]u \\n[www-height]u +-. sp -\\n[ps-desht]u +-. +-. nr www-right-indent \\n[ps-deswid]u +-. \" we want to have some space between text and image, +-. \" so the line length must be shorter +-. ll -(\\n[www-right-indent]u + \\n[www-image-gap]u) +-. mk www-right-ll-trap +-. nr www-right-ll-trap +(\\n[ps-desht]u - 1v) +-. wh \\n[www-right-ll-trap]u www-finish-right-ll +-. +-. \" now restore possible left trap +-. if (\\n[www-left-ll-trap] > 0) \ +-. wh \\n[www-left-ll-trap]u www-finish-left-ll +-. if (\\n[www-left-po-trap] > 0) \ +-. wh \\n[www-left-po-trap]u +-. \} +-. el \{\ +-. \" we must now disable a possible right image trap +-. if (\\n[www-right-ll-trap] > 0) \ +-. wh \\n[www-right-ll-trap]u +-. PSPIC -L \\*[www-unique-name].eps \\n[www-width]u \\n[www-height]u +-. sp -\\n[ps-desht]u +-. +-. nr www-left-indent \\n[ps-deswid]u +-. \" increase offset by gap +-. po +(\\n[www-left-indent]u + \\n[www-image-gap]u) +-. \" decrease line length by gap +-. ll -(\\n[www-left-indent]u + \\n[www-image-gap]u) +-. mk www-left-ll-trap +-. nr www-left-ll-trap +(\\n[ps-desht]u - 1v) +-. wh \\n[www-left-ll-trap]u www-finish-left-ll +-. +-. \" now restore possible right trap +-. if (\\n[www-right-ll-trap] > 0) \ +-. wh \\n[www-right-ll-trap]u www-finish-right-ll +-. \} +-. \} +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HnS n +-.\" +-.\" Begin heading. Heading level is N. +-.\" +-.\" HnE +-.\" +-.\" End heading. +-.\" +-.\" If your heading contains URL, FTP, MTO macros you might wish to +-.\" disable automatic links to headings. This can be done via `-P-l' +-.\" from the command line or by using a cakk to `.HX 0'. +-.\" +-.nr www-heading-no -1 +-. +-.de HnS +-. ie '\\$1'' \ +-. nr www-heading-no 1 +-. el \ +-. nr www-heading-no \\$1 +-. DEVTAG-NH \\n[www-heading-no] +-.. +-. +-.de HnE +-. if (\\n[www-heading-no] == -1) \ +-. www-error HnE found without a corresponding HnS +-. DEVTAG-EO-H +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" LK +-.\" +-.\" Emit the automatically collected links derived from +-.\" section/numbered headings at this position. +-.\" +-.de LK +-. DEVTAG .links +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HR +-.\" +-.\" Produce a horizontal line. +-.\" +-.de HR +-. HTML

    ] +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" NHR +-.\" +-.\" Suppress the generation of the top and bottom rules which grohtml +-.\" emits by default. +-.\" +-.de NHR +-. DEVTAG .no-auto-rule +-.. +-. +-.\" +-.\" www-end-nowhere - end of input trap called to finish diversion. +-.\" +-.de www-end-nowhere +-. if !\\n[www-html] \ +-. di +-. DEVTAG-EO-TL +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HTL +-.\" +-.\" Generate an HTML title only. This differs from the -ms .TL macro +-.\" which generates both an HTML title and an H1 heading. +-.\" +-.\" This is useful when an author wishes to use an HTML title as search +-.\" engine fodder but a graphic title in the document. +-.\" +-.\" The macro terminates when a space or break is seen (.sp, .br). +-.\" +-.de HTL +-. DEVTAG .html-tl +-. if !\\n[www-html] \ +-. di www-nowhere +-. it 2 www-end-nowhere +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" auxiliary definitions for lists +-.\" +-.ds www-ul-level1 \[bu]\ \ \" +-.ds www-ul-level2 \[sq]\ \ \" +-.ds www-ul-level3 \[ci]\ \ \" +-.nr www-ul-level 0 +-. +-.ds www-ol-level1 decimal\" +-.ds www-ol-level2 lower-alpha\" +-.ds www-ol-level3 lower-roman\" +-.ds www-ol-tmp 00\ \ \" +-.nr www-ol-ctr1 0 1 +-.nr www-ol-ctr2 0 1 +-.nr www-ol-ctr3 0 1 +-.af www-ol-ctr2 a +-.af www-ol-ctr3 i +-.nr www-ol-level 0 +-. +-.nr www-dl-level 0 +-.nr www-dl-shift 5n +-. +-.\" +-.\" allow nested lists +-.\" +-.nr www-depth 0 +-.nr www-li-indent \n[.i] +-.ds www-level0 nop\" +-.ds www-level1 +-.ds www-level2 +-.ds www-level3 +-.ds www-level4 +-.ds www-level5 +-.ds www-level6 +-.ds www-level7 +-.ds www-level8 +-.ds www-level9 +-. +-.\" which macro to use for LI +-.de www-push-li +-. nr www-li-indent \\n[.i] +-. nr www-depth +1 +-. ds www-level\\n[www-depth] \\$1\" +-. ds www-ltag\\n[www-depth] +-. als LI \\$1 +-.. +-. +-.de www-pop-li +-. nr www-depth -1 +-. als LI \\*[www-level\\n[www-depth]] +-.. +-. +-.\" www-emit-ltag - shut down a previous open list tag +-.\" before issuing a new tag \\$1. +-.\" It then records tag \\$1 is open. +-. +-.de www-emit-ltag +-. if !'\\*[www-ltag\\n[www-depth]]'' \ +-. HTML-NS +-. if !'\\$1'' \ +-. HTML-NS <\\$1> +-. ds www-ltag\\n[www-depth] \\$1\" +-.. +-. +-.\" +-.\" Auxiliary macro for ULS. +-.\" +-.de www-push-ul-level +-. nr www-ul-level +1 +-. if (\\n[www-ul-level] > 3) \ +-. www-error ULS: too many levels of indentation (\\n[www-ul-level]) +-.. +-.\" +-.\" Auxiliary macro for ULE. +-.\" +-.de www-pop-ul-level +-. if !\\n[www-ul-level] \ +-. www-error ULE: trying to terminate a list which does not exist +-. nr www-ul-level -1 +-.. +-. +-.\" +-.\" Auxiliary macro for OLS. +-.\" +-.de www-push-ol-level +-. nr www-ol-level +1 +-. if (\\n[www-ol-level] > 3) \ +-. www-error OLS: too many levels of indentation (\\n[www-ol-level]) +-.. +-. +-.\" +-.\" Auxiliary macro for OLE. +-.\" +-.de www-pop-ol-level +-. if !\\n[www-ol-level] \ +-. www-error OLE: trying to terminate a list which does not exist +-. nr www-ol-level -1 +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" ULS +-.\" +-.\" Start an unordered list. +-.\" +-.de ULS +-. www-push-li www-li-ul +-. www-push-ul-level +-. ie \\n[www-html] \{\ +-. www-emit-ltag +-. HTML

      +-. \} +-. el \ +-. nr www-li-indent +\w'\\*[www-ul-level\\n[www-ul-level]]'u +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" ULE +-.\" +-.\" End an unordered list. +-.\" +-.de ULE +-. ie \\n[www-html] \{\ +-. www-emit-ltag +-. HTML

    +-. \} +-. el \{\ +-. nr www-li-indent -\w'\\*[www-ul-level\\n[www-ul-level]]'u +-. in \\n[www-li-indent]u +-. \} +-. www-pop-ul-level +-. www-pop-li +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" OLS +-.\" +-.\" Start an ordered list. +-.\" +-.de OLS +-. www-push-li www-li-ol +-. www-push-ol-level +-. ie \\n[www-html] \{\ +-. www-emit-ltag +-. HTML

      " +-. \} +-. el \ +-. nr www-li-indent +\w'\\*[www-ol-tmp]'u +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" OLE +-.\" +-.\" End an ordered list. +-.\" +-.de OLE +-. ie \\n[www-html] \{\ +-. www-emit-ltag +-. HTML
    +-. \} +-. el \{\ +-. nr www-li-indent -\w'\\*[www-ol-tmp]'u +-. in \\n[www-li-indent]u +-. nr www-ol-ctr\\n[www-ol-level] 0 1 +-. \} +-. www-pop-ol-level +-. www-pop-li +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" DLS +-.\" +-.\" Start a definition list. +-.\" +-.de DLS +-. www-push-li www-li-dl +-. nr www-dl-level +1 +-. ie \\n[www-html] \{\ +-. www-emit-ltag +-. HTML

    +-. \} +-. el \{\ +-. nr www-li-indent +\\n[www-dl-shift]u +-. in \\n[www-li-indent]u +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" DLE +-.\" +-.\" End a definition list. +-.\" +-.de DLE +-. ie \\n[www-html] \{\ +-. www-emit-ltag +-. HTML
    +-. \} +-. el \{\ +-. nr www-li-indent -\\n[www-dl-shift]u +-. in \\n[www-li-indent]u +-. \} +-. nr www-dl-level -1 +-. www-pop-li +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" LI +-.\" +-.\" Insert a list item. +-.\" +-. +-.\" ******** +-.\" www-li-ul - bulleted list item +-.\" +-.de www-li-ul +-. ie \\n[www-html] \ +-. www-emit-ltag li +-. el \{\ +-. www:paraspace +-. if rPORPHANS \ +-. ne \\n[PORPHANS]v +-. in \\n[www-li-indent]u +-. ti -\w'\\*[www-ul-level\\n[www-ul-level]]'u +-. nop \\*[www-ul-level\\n[www-ul-level]]\c +-. \} +-.. +-. +-.\" ******** +-.\" www-li-ol - numbered list item +-.\" +-.de www-li-ol +-. ie \\n[www-html] \ +-. www-emit-ltag li +-. el \{\ +-. www:paraspace +-. if rPORPHANS \ +-. ne \\n[PORPHANS]v +-. in \\n[www-li-indent]u +-. ti -\w'\\n+[www-ol-ctr\\n[www-ol-level]]\ \ 'u +-. nop \\n[www-ol-ctr\\n[www-ol-level]]\ \ \c +-. \} +-.. +-. +-.\" ******** +-.\" www-li-dl - definition list item +-.\" +-.de www-li-dl +-. ie \\n[www-html] \{\ +-. HTML
    \\$1
    +-. www-emit-ltag dd +-. \} +-. el \{\ +-. www:paraspace +-. if rPORPHANS \ +-. ne \\n[PORPHANS]v +-. in \\n[www-li-indent]u +-. ti -\\n[www-dl-shift]u +-. nop \&\\$1 +-. br +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" DC l text [color] +-.\" +-.\" L is the letter to be dropped and enlarged. +-.\" +-.\" TEXT is the following text whose height the first letter should not +-.\" exceed. +-.\" +-.\" COLOR is the optional color of the dropped letter (default black). +-.\" +-.de DC +-. ds www-dropcolor black\" +-. if !'\\$3'' \ +-. ds www-dropcolor \\$3\" +-. ie '\*[.T]'html' \{\ +-. www-make-unique-name +-. nr www-drop-width (100u * \\n[.v]u * 3u / \\n[.l]u) +-. MPIMG -L \\*[www-unique-name].png \\n[www-drop-width]% +-. \} +-. el \{\ +-. ie r ps4html \{\ +-. www-make-unique-name +-. \" To avoid interferences with another DC macro call which is located +-. \" very near to the current one, we draw the glyph on a separate page. +-. \" Otherwise it could theoretically happen that the dropped capital +-. \" glyphs overlap. +-. bp +-. ev www-DC +-. vs 320p +-. nop \O[5i\\*[www-unique-name].png]\O[1] +-. nop \m[\\*[www-dropcolor]]\s[160]\O[3]\\$1\O[4] +-. nop \O[2]\O[0] +-. br +-. ev +-. bp +-. \} +-. el \{\ +-. ie n \ +-. nop \\$1\c +-. el \{\ +-. nr dummy \w'\\$1'u +-. nr dcht ((\\n[.v] + \\n[rst]) * \\n[.ps] / \\n[rst]) +-. char \[dcap] \m[\\*[www-dropcolor]]\s'\\n[dcht]u'\\$1 +-. nop \v'\\n[.v]u'\\[dcap]\v'-\\n[.v]u'\c +-' ti \w'\\[dcap]'u +-. \} +-. \} +-. \} +-. nop \\$2 +-.. +-. +-.\" +-.\" supplementary macros used by other macro sets +-.\" +-.\" here are some tags specially for -Tps or -Thtml when invoked by +-.\" pre-html to generate PNG images from postscript. +-. +-.\" -------------------------------------------------------------------- +-.\" HTML-DO-IMAGE - tell troff to issue an image marker which can be +-.\" read back by pre-html +-.\" +-.de HTML-DO-IMAGE +-. if r ps4html \ +-. nop \O[5\\$2\\$1.png]\O[1]\O[3] +-. if \\n[www-html] \ +-. nop \O[5\\$2\\$1.png]\O[0]\O[3] +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HTML-IMAGE-END - terminate an image for HTML +-.\" +-.de HTML-IMAGE-END +-. if r ps4html \ +-. nop \O[4]\O[2]\O[0] +-. if \\n[www-html] \ +-. nop \O[4]\O[2]\O[1] +-.. +-. +-.nr www-png-no 0 +-. +-.\" -------------------------------------------------------------------- +-.\" www-make-unique-name - generate another unique name in string +-.\" `www-unique-name' +-.\" +-.de www-make-unique-name +-. nr www-png-no +1 +-. ds www-unique-name \\*[www-image-template]\\n[www-png-no]\" +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HTML-IMAGE and friends tell grohtml that this region of text needs +-.\" to be rendered as an image. +-.\" +-.de HTML-IMAGE +-. \" generates a centered image +-. www-make-unique-name +-. HTML-DO-IMAGE \\*[www-unique-name] c +-.. +-. +-.de HTML-IMAGE-RIGHT +-. www-make-unique-name +-. HTML-DO-IMAGE \\*[www-unique-name] r +-.. +-. +-.de HTML-IMAGE-LEFT +-. www-make-unique-name +-. HTML-DO-IMAGE \\*[www-unique-name] l +-.. +-. +-.de HTML-IMAGE-INLINE +-. www-make-unique-name +-. HTML-DO-IMAGE \\*[www-unique-name] i +-.. +-. +-.\" EQN-HTML-IMAGE and friends check to see whether the equation is +-.\" not in an image, in which case it allows HTML +-.\" (mathml) to be generated (if -Txhtml was specified). +-. +-.de EQN-HTML-IMAGE +-. \" generates a centered image +-. www-make-unique-name +-. EQN-HTML-DO-IMAGE \\*[www-unique-name] c +-.. +-. +-.de EQN-HTML-IMAGE-RIGHT +-. www-make-unique-name +-. EQN-HTML-DO-IMAGE \\*[www-unique-name] r +-.. +-. +-.de EQN-HTML-IMAGE-LEFT +-. www-make-unique-name +-. EQN-HTML-DO-IMAGE \\*[www-unique-name] l +-.. +-. +-.de EQN-HTML-IMAGE-INLINE +-. www-make-unique-name +-. EQN-HTML-DO-IMAGE \\*[www-unique-name] i +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" EQN-HTML-DO-IMAGE - tell troff to issue an image marker which can be +-.\" read back by pre-html +-.\" +-.de EQN-HTML-DO-IMAGE +-. ie r xhtml \{\ +-. if !(\\n[.O] == 0) \{\ +-. if r ps4html \ +-. nop \O[5\\$2\\$1.png]\O[1]\O[3] +-. if \\n[www-html] \ +-. nop \O[5\\$2\\$1.png]\O[0]\O[3] +-. \} +-. \} +-. el \ +-. HTML-DO-IMAGE \\$* +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" EQN-HTML-IMAGE-END - terminate an image for HTML +-.\" +-.de EQN-HTML-IMAGE-END +-. ie r xhtml \{\ +-. if !(\\n[.O] == 0) \{\ +-. if r ps4html \ +-. nop \O[4]\O[2]\O[0] +-. if \\n[www-html] \ +-. nop \O[4]\O[2]\O[1] +-. \} +-. \} +-. el \ +-. HTML-IMAGE-END +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" Setup around HTML-IMAGE and friends +-.\" +-.\" now set up TS, TE, EQ, EN default macros +-.\" +-.\" we must not use `.als': the definition of .TE in s.tmac, for example, +-.\" calls .HTML-IMAGE-END, which would refer to itself due to the alias, +-.\" causing an endless loop +-.\" +-.if !d TS \{\ +-. de TS +-. HTML-IMAGE \\$@ +-. if \\n[www-html] \{\ +-. nr www-TS-ll \\n[.l] +-. ll 1000n +-. \} +-. . +-.\} +-.if !d TE \{\ +-. de TE +-. if \\n[www-html] \ +-. ll \\n[www-TS-ll]u +-. HTML-IMAGE-END \\$@ +-. . +-.\} +-.if !d EQ \{\ +-. de EQ +-. EQN-HTML-IMAGE \\$@ +-. if \\n[www-html] \{\ +-. nr www-EQ-ll \\n[.l] +-. ll 1000n +-. \} +-. . +-.\} +-.if !d EN \{\ +-. de EN +-. if \\n[www-html] \ +-. ll \\n[www-EQ-ll]u +-. EQN-HTML-IMAGE-END \\$@ +-. . +-.\} +-. +-.\" -------------------------------------------------------------------- +-.\" JOBNAME +-.\" +-.\" Generate multiple output files containing the HTML. +-.\" A file is split whenever a .SH or .NH 1 is encountered. +-.\" The argument to JOBNAME is the file stem for future output files. +-.\" +-.de JOBNAME +-. DEVTAG .job-name \\$1 +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" HEAD +-.\" +-.\" Add information to the section of the HTML +-.\" document +-.\" +-.de HEAD +-. DEVTAG .head "\\$*" +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" start of some code +-.\" +-.de CDS +-. ft C +-. nf +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" end of some code +-.\" +-.de CDE +-. fi +-. ft P +-.. +-. +-.ds www-nav-colour #eeeeee\" +-.nr www-nav-width-left 30 +-.nr www-nav-width-right 70 +-. +-.\" -------------------------------------------------------------------- +-.\" LNS - left navigation start +-.\" +-.de LNS +-. HTML
    " +-. LK +-. HTML

    		" +-. nr SH-open 1 +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" LNE - left navigation end +-.\" +-.de LNE +-. HTML

    +-. HR +-.. +-. +-.nr SH-open 0 +-.nr needs-begin 0 +-. +-.\" +-.\" some auxiliary macros for left navigation lists +-.\" +-.de www-SH +-. if (0\\$1 == 0) \{\ +-. if (\\n[SH-open] == 1) \ +-. LNE +-. nr needs-begin 1 +-. @SH-old +-. \} +-.. +-. +-.de www-NH +-. if (0\\$1 <= 1) \{\ +-. if (\\n[SH-open] == 1) \ +-. LNE +-. nr needs-begin 1 +-. @NH-old +-. \} +-.. +-. +-.de www-LP +-. @LP-old +-. if (\\n[needs-begin] == 1) \{\ +-. HR +-. LNS +-. \} +-. nr needs-begin 0 +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" ALN [colour] [left width percentage] +-.\" +-.\" Turn on automatic left navigation. This macro should only be +-.\" called once (normally at the start of the document) as it +-.\" indicates that all top-level section headings form a navigation +-.\" list on the left of the main text. +-.\" +-.de ALN +-. if '\*[.T]'html' \{\ +-. if !'\\$1'' \ +-. ds www-nav-colour \\$1\" +-. if (0\\$2 > 0) \{\ +-. nr www-nav-width-left \\$2 +-. nr www-nav-width-right (100 - \\$2) +-. \} +-. rn @SH @SH-old +-. rn www-SH @SH +-. rn @NH @NH-old +-. rn www-NH @NH +-. rn @LP @LP-old +-. rn www-LP @LP +-. \} +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" LINKSTYLE color [fontstyle [openglyph closeglyph]] +-.\" +-.\" Initialize www.tmac so that when this macro set is used with +-.\" non-HTML devices the urls are rendered the user defined attributes. +-.\" For example: +-.\" +-.\" LINKSTYLE blue CR < > +-.\" +-.de LINKSTYLE +-. if (\\n[.$] < 1) \ +-. www:error .\\$0 expects at least 1 argument. +-. ds www:color \\$1\" +-. shift +-. if (\\n[.$] < 1) \ +-. return +-. ds www:fontstyle \\$1\" +-. shift +-. if (\\n[.$] < 1) \ +-. www:error .\\$0 expects that both the open and close glyph is specified +-. ds www:open \\$1\" +-. ds www:close \\$2\" +-.. +-. +-.\" MATHML - enable eqn mathml output to pass through to the device +-.\" driver +-. +-.de MATHML +-. if (\\n[.O] == 0) \ +-. MATH \\$* +-.. +-. +-.\" -------------------------------------------------------------------- +-.\" final setup +-.\" -------------------------------------------------------------------- +-. +-.LINKSTYLE blue C \[la] \[ra] +-. +-.if \n[www-html] \{\ +-. nh +-. nr HY 0 +-.\} +-. +-.if r ps4html .nop \O[0] +-.cp \n(_C +-. +-.\" now set +-. +-.\" -------------------------------------------------------------------- +-.\" Emacs settings +-.\" -------------------------------------------------------------------- +-. +-.\" Local Variables: +-.\" mode: nroff +-.\" End: +-.\" EOF +diff -Nuar groff-1.22.3.old/tmac/www.tmac.in groff-1.22.3/tmac/www.tmac.in +--- groff-1.22.3.old/tmac/www.tmac.in 1970-01-01 02:00:00.000000000 +0200 ++++ groff-1.22.3/tmac/www.tmac.in 2015-04-23 20:57:03.000000000 +0300 +@@ -0,0 +1,1625 @@ ++.ig ++www.tmac - macro package for adding HTML elements to roff documents. ++ ++File position: /tmac/www.tmac ++Installed position: groff's main macro directory. ++ ++------------------------------------------------------------------------ ++ Legalese ++------------------------------------------------------------------------ ++ ++This file is part of groff, the GNU roff type-setting system. ++ ++Copyright (C) 2001-2014 Free Software Foundation, Inc. ++written by Gaius Mulley , with additions by ++Werner Lemberg and ++Bernd Warken . ++ ++groff 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. ++ ++groff 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 . ++ ++ ++------------------------------------------------------------------------ ++ Description ++------------------------------------------------------------------------ ++ ++A simple set of macros to provide HTML (or XHTML) documents with basic ++www functionality. It should work with any macro set. In the following, ++HTML always denotes XHTML also. ++.. ++. ++. ++.\" -------------------------------------------------------------------- ++.\" Setup ++.\" -------------------------------------------------------------------- ++. ++.do if d www:lenstr .nx ++. ++.do mso devtag.tmac ++. ++.nr _C \n(.C ++.cp 0 ++. ++. ++.ie r xhtml \ ++. ds www-> />\" ++.el \ ++. ds www-> >\" ++. ++.nr www-html 0 ++.if '\*[.T]'html' \ ++. nr www-html 1 ++. ++.\" set up www-image-template ++. ++.if !d www-image-template \ ++. ds www-image-template ++. ++.if r ps4html \{\ ++. \" remove the title command when we are generating images for HTML ++. \" (stops a title accidentally appearing inside an image) ++. di www-notitle ++. tl '''' ++. di ++. rm tl ++. de tl ++. . ++.\} ++. ++. ++.\" -------------------------------------------------------------------- ++.\" Test for `.substring'; result in register `www.substring_ok'. ++.\" The automated break points in .URL addresses are only added if ++.\" this register is non-zero. ++.\" ++.nr www:substring_ok 0 ++.de www:@test_substring ++. if !d substring \ ++. return ++. ds \\$0:s abcdefg\" ++. substring \\$0:s 1 1 ++. if !'\\*[\\$0:s]'b' \{\ ++. rm \\$0:s ++. return ++. \} ++. ds \\$0:s abcdefg\" ++. substring \\$0:s 0 0 ++. if !'\\*[\\$0:s]'a' \{\ ++. rm \\$0:s ++. return ++. \} ++. ds \\$0:s abcdefg\" ++. substring \\$0:s 1 -1 ++. if !'\\*[\\$0:s]'bcdefg' \{\ ++. rm \\$0:s ++. return ++. \} ++. nr www:substring_ok 1 ++. rm \\$0:s ++.. ++.www:@test_substring ++.rm www:@test_substring ++. ++. ++.\" -------------------------------------------------------------------- ++.\" Local Macros ++.\" -------------------------------------------------------------------- ++. ++.\" -------------------------------------------------------------------- ++.\" www:paraspace ++.\" ++.\" Space before paragraph. Use \n[PD] if it exists. ++.\" ++.nr www:pd 0.5v ++. ++.de www:paraspace ++. ie r PD \ ++. sp \\n[PD]u ++. el \ ++. sp \\n[www:pd]u ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" www:error (...) ++.\" ++.\" Print error message. ++.\" ++.de www-error ++. tm \\n[.F]:\\n[.c]: macro error: \\$* ++.. ++. ++.als www:error www-error ++. ++.\" -------------------------------------------------------------------- ++.\" www:lenstr ( ) ++.\" ++.\" Store length of string named into register named ++.\" . ++.\" ++.de www:lenstr ++. if !(\\n[.$] == 2) \{\ ++. tm .\\$0 expects 2 arguments. ++. ab ++. \} ++. length \\$0:n x\\*[\\$2] ++. nr \\$1 (\\n[\\$0:n] - 1) ++. rr \\$0:n ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" www:splitstr () ++.\" ++.\" Add a space character between any two adjacent characters in string ++.\" and restore result into the string variable ; space ++.\" characters are first replaced by the word `space'. ++.\" ++.de www:splitstr ++. if !(\\n[.$] == 1) \ ++. www:error .\\$0 expects 1 argument. ++. if '\\*[\\$1]'' \ ++. return ++. ds \\$0:r "\\*[\\$1]\" ++. ds \\$0:s ++. while 1 \{\ ++. ds \\$0:c "\\*[\\$0:r]\" ++. substring \\$0:c 0 0 ++. ie '\\*[\\$0:c]' ' \ ++. as \\$0:s " space\" ++. el \ ++. as \\$0:s " \\*[\\$0:c]\" ++. www:lenstr \\$0:n \\$0:r ++. if (\\n[\\$0:n] <= 1) \ ++. break ++. substring \\$0:r 1 -1 ++. \} ++. if !'\\*[\\$0:s]'' \ ++. substring \\$0:s 1 -1 ++. ds \\$1 \\*[\\$0:s]\" ++. rm \\$0:c ++. rr \\$0:n ++. rm \\$0:r ++. rm \\$0:s ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" www:url_breaks () ++.\" ++.\" Add `\:' (possible break point) within URL strings after `/'. ++.\" ++.\" Smart about multiple `/', existing `\:', and space characters; ++.\" does not set a break point if less than 5 characters would go to ++.\" the next line. ++.\" ++.de www:url_breaks ++. if !(\\n[.$] == 1) \ ++. www:error .\\$0 expects 1 argument. ++. if !\n[www:substring_ok] \ ++. return ++. ds \\$0:s "\\*[\\$1]\" ++. www:splitstr \\$0:s ++. www:url_breaks_split \\$0:s \\*[\\$0:s] ++. ds \\$1 "\\*[\\$0:s]\" ++. rm \\$0:s ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" www:url_breaks_split ( [...]) ++.\" ++.\" Add `\:' within URL strings, but arguments are a split string. ++.\" ++.\" Arguments: >=2: [...] ++.\" ++.de www:url_breaks_split ++. nr \\$0:min 5 \" minimal number of characters for next line ++. if (\\n[.$] < 2) \ ++. www:error .\\$0 expects at least 2 arguments. ++. ds \\$0:res \\$1\" ++. shift ++. ds \\$0:s ++. nr \\$0:done 0 ++. while !\\n[\\$0:done] \{\ ++. if (\\n[.$] <= 0) \ ++. break ++. if '\\$1'space' \{\ ++. as \\$0:s " \" ++. shift ++. continue ++. \} ++. if (\\n[.$] < \\n[\\$0:min]) \{\ ++. as \\$0:s "\\$1\" ++. shift ++. continue ++. \} ++. if !'\\$1'/' \{\ ++. as \\$0:s "\\$1\" ++. shift ++. continue ++. \} ++. \" we are at a `/' character ++. while '\\$1'/' \{\ ++. as \\$0:s /\" ++. if (\\n[.$] == 0) \{\ ++. nr \\$0:done 1 ++. break ++. \} ++. shift ++. \} ++. if \\n[\\$0:done] \ ++. break ++. if (\\n[.$] < \\n[\\$0:min]) \ ++. continue ++. if '\\$1'\:' \ ++. shift ++. as \\$0:s \:\" ++. \} ++. ds \\*[\\$0:res] \\*[\\$0:s]\" ++. rm \\$0:res ++. rm \\$0:s ++.. ++. ++. ++.\" -------------------------------------------------------------------- ++.\" User Interface ++.\" -------------------------------------------------------------------- ++. ++.\" -------------------------------------------------------------------- ++.\" HTML ++.\" ++.\" The main auxiliary macro for the HTML interface. ++.\" ++.de HTML ++. if \\n[www-html] \{\ ++. \" was implemented via .nop \&\X^html:\\$*^ but ++. \" is now implemented using HTML-NS to utilize code factoring. ++. \" ++. \" the `\&' makes the vertical mode leave, so to say ++. \" ++. nop \&\c ++. HTML-NS \\$* ++. nop \& ++. \} ++.. ++. ++.\" ++.\" An auxiliary macro for HTML (without following space). ++.\" ++.de HTML-NS ++. nop \X^html:\\$*^\c ++.. ++. ++.\" ++.\" Emit an HTML tag after shutting down a (possibly open) paragraph. ++.\" ++.de HTML

    ++. ie \\n[www-html] \{\ ++. \" the `\&' makes the vertical mode leave, so to say ++. nop \&\X^html

    :\\$*^ ++. \} ++. el \ ++. www:paraspace ++.. ++. ++.\" ++.\" Emit an HTML tag. If text has been written in the paragraph ++.\" then do not shut the paragraph down. ++.\" If text was not written, remove the empty ++.\" paragraph tag and emit the desired HTML tag. ++.\" ++.de HTML ++. if \\n[www-html] \ ++. nop \&\X^html:\\$*^ ++.. ++. ++.\" ++.\" Emit a MATH tag. If text has been written in the paragraph ++.\" then do not shut the paragraph down. ++.\" If text was not written, remove the empty ++.\" paragraph tag and emit the desired math tag. ++.\" ++.de MATH ++. if \\n[www-html] \ ++. nop \&\X^math:\\$*^ ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HX n ++.\" ++.\" Automatic heading level cut off. ++.\" ++.\" N is the depth limit of automatically linked headings. So a depth ++.\" of 2 would cause grohtml to generate a list of links for `.NH 1' ++.\" and `.NH 2' but not for `.NH 3'. ++.\" ++.de HX ++. if \\n[www-html] \ ++. nop \X^index:\\$*^ ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" BCL foreground background active not-visited visited ++.\" ++.de BCL ++. HTML " ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" BGIMG imagefile ++.\" ++.de BGIMG ++. HTML " ++.. ++. ++.\" www:url_check_tag str ++.\" If url named by \*[str] is internal (starts with #), ++.\" redefine \*[str] to be the value of the string TAG_url. ++. ++.de www:url_check_tag ++. ds \\$0:tmp \\*[\\$1]\" ++. substring \\$0:tmp 0 0 ++. if '\\*[\\$0:tmp]'#' \{\ ++. ds \\$0:tmp \\*[\\$1]\" ++. substring \\$0:tmp 1 ++. ds \\$0:tmp TAG_\\*[\\$0:tmp]\" ++. ++. ie d \\*[\\$0:tmp] \ ++. ds \\$1 \\*[\\*[\\$0:tmp]]\" ++. el \ ++. ds \\$1 see below\" ++. \} ++. rm \\$0:tmp ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" URL url [description] [after] ++.\" ++.\" If description is absent then the url becomes the anchor text. ++.\" ++.de URL ++. if !'\\$1'' \{\ ++. ds \\$0:adr \\$1\" ++. www:url_check_tag \\$0:adr ++. if !\\n[www-html] \ ++. www:url_breaks \\$0:adr ++. \} ++. ie \\n[www-html] \{\ ++. ie '\\$3'' \ ++. ds \\$0:after \&\" ++. el \ ++. ds \\$0:after \&\\$3\" ++. ++. ie '\\$2'' \ ++. HTML-NS \\*[\\$0:adr]" ++. el \ ++. HTML-NS \\$2" ++. ++. nop \\*[\\$0:after] ++. rm \\$0:after ++. \} ++. el \{\ ++. if !r ps4html \ ++. ad l ++. ++. ie '\\$2'' \{\ ++. ie '\\$1'' \{\ ++. if !'\\$3'' \ ++. nop \\$3 ++. \} ++. el \{\ ++. ie \\n[.color] \ ++. nop \%\\*[www:open]\m[\\*[www:color]]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\m[]\\*[www:close]\\$3 ++. el \ ++. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\\*[www:close]\\$3 ++. \} ++. \} ++. el \{\ ++. ie '\\$1'' \{\ ++. ie \\n[.color] \ ++. nop \m[\\*[www:color]]\\$2\m[]\\$3 ++. el \ ++. nop \f[\\*[www:fontstyle]]\\$2\f[]\\$3 ++. \} ++. el \{\ ++. ie \\n[.color] \{\ ++. nop \m[\\*[www:color]]\\$2\m[] ++. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\\*[www:close]\\$3 ++. \} ++. el \{\ ++. nop \f[\\*[www:fontstyle]]\\$2\f[] ++. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\*[\\$0:adr]\f[]\\*[www:close]\\$3 ++. \} ++. \} ++. \} ++. ++. if !r ps4html \ ++. ad ++. \} ++. rm \\$0:adr ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" FTP url description [after] ++.\" ++.\" Same as URL. ++.\" ++.als FTP URL ++. ++.\" -------------------------------------------------------------------- ++.\" MTO address description [after] ++.\" ++.\" ADDRESS is the email address (without the `mailto:' prefix). ++.\" ++.\" DESCRIPTION is the optional name. If an empty argument is given, ++.\" ADDRESS is used instead. ++.\" ++.\" AFTER is optional stuff printed immediately after ADDRESS ++.\" (resp. DESCRIPTION). ++.\" ++.\" Example: ++.\" ++.\" Foobar has been written by ++.\" .MTO fred@foo.bar "Fredrick Bloggs" . ++.\" ++.de MTO ++. ie \\n[www-html] \{\ ++. ie '\\$2'' \ ++. URL mailto:\\$1 \\$1 "\\$3" ++. el \ ++. URL mailto:\\$1 "\\$2" "\\$3" ++. \} ++. el \{\ ++. ie '\\$2'' \{\ ++. ie '\\$1'' \{\ ++. ie !'\\$3'' \ ++. nop \\$3 ++. \} ++. el \{\ ++. ie \\n[.color] \ ++. nop \%\m[\\*[www:color]]\f[\\*[www:fontstyle]]\\$1\f[]\m[]\\$3 ++. el \ ++. nop \%\f[\\*[www:fontstyle]]\\$1\f[]\\$3 ++. \} ++. \} ++. el \{\ ++. ie '\\$1'' \{\ ++. ie \\n[.color] \ ++. nop \m[\\*[www:color]]\\$2\m[]\\$3 ++. el \ ++. nop \f[\\*[www:fontstyle]]\\$2\f[]\\$3 ++. \} ++. el \{\ ++. ie \\n[.color] \{\ ++. nop \m[\\*[www:color]]\\$2\m[] ++. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\$1\f[]\\*[www:close]\\$3 ++. \} ++. el \{\ ++. nop \f[\\*[www:fontstyle]]\\$2\f[] ++. nop \%\\*[www:open]\f[\\*[www:fontstyle]]\\$1\f[]\\*[www:close]\\$3 ++. \} ++. \} ++. \} ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" TAG name [text] ++.\" ++.\" Generate an HTML name NAME. ++.\" Define string TAG_NAME to TEXT, if present, otherwise to \n[PN]. ++.\" Register PN is the current page number. ++.\" ++.de TAG ++. HTML " ++. ie '\\$2'' \ ++. if !rPN \ ++. nr PN \\n% ++. ds TAG_\\$1 \\n[PN]\" ++. el \ ++. ds TAG_\\$1 \\$2\" ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" IMG [-R|-L|-C] filename [width] [height] ++.\" ++.\" Include an image of any type (only works for -Thtml). ++.\" ++.\" Alignment is centered by default (-C). ++.\" Default value for WIDTH is 1i. ++.\" If HEIGHT is not given, WIDTH is used as the height. ++.\" ++.de IMG ++. ie \\n[www-html] \{\ ++. ie '\\$2'-R' \ ++. DEVTAG .right-image ++. el \{\ ++. ie '\\$2'-L' \ ++. DEVTAG .left-image ++. el \ ++. DEVTAG .centered-image ++. \} ++. nr www-width 100 ++. if !'\\$3'' \ ++. nr www-width \\$3 ++. nr www-height \\n[www-width] ++. if !'\\$4'' \ ++. nr www-height \\$4 ++. HTML ]" ++. \} ++. el \ ++. nop \\*[www:open]\f[\\*[www:fontstyle]]\\$1\f[]\\*[www:close] ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" PIMG [-R|-L|-C] filename [width] [height] ++.\" ++.\" Include a PNG image. It works for -Tps and -Thtml. ++.\" The default value for WIDTH and HEIGHT is zero; the default ++.\" alignment is centering (-C). ++.\" ++.\" Note: This macro can only be used with the `-U' option of groff, ++.\" activating unsafe mode, if not used with -Thtml; the PNG image ++.\" is then converted to the EPS format using netpbm utilities. ++.\" ++.de PIMG ++. ds www-pic-align -C\" ++. ie '\\$1'-R' \{\ ++. ds www-pic-align -R\" ++. shift ++. \} ++. el \{\ ++. if '\\$1'-L' \{\ ++. ds www-pic-align -L\" ++. shift ++. \} ++. \} ++. if '\\$1'-C' \ ++. shift ++. ++. ie \\n[www-html] \{\ ++. ds www-htmlalign align="center"\" ++. if '\\*[www-pic-align]'-R' \ ++. ds www-htmlalign align="right"\" ++. if '\\*[www-pic-align]'-L' \ ++. ds www-htmlalign align="left"\" ++. ++. nr www-width 0 ++. nr www-height 0 ++. if !'\\$2'' \ ++. nr www-width (\\$3 * 100 / 240) ++. if !'\\$3'' \ ++. nr www-height (\\$4 * 100 / 240) ++. ie (\\n[www-width] == 0) \{\ ++. ie (\\n[www-height] == 0) \ ++. HTML

    ]

    " ++. el \ ++. HTML

    ]

    " ++. \} ++. el \{\ ++. ie (\\n[www-height] == 0) \ ++. HTML

    ]

    " ++. el \ ++. HTML

    ]

    " ++. \} ++. \} ++. el \{\ ++. if !r ps4html \{\ ++. www-make-unique-name ++. sy pngtopnm \\$1 \ ++ | pnmcrop -white \ ++ | @PNMTOPS_NOSETPAGE@ -noturn \ ++ > \\*[www-unique-name].eps ++. shift ++. PSPIC \\*[www-pic-align] \\*[www-unique-name].eps \\$* ++. \} ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" auxiliary definitions for MPIMG ++.\" ++.nr www-left-ll-trap 0 ++.nr www-left-po-trap 0 ++.nr www-right-ll-trap 0 ++. ++.de www-finish-left-po ++. po -(\\n[www-left-indent]u + \\n[www-image-gap]u) ++. wh \\n[www-left-po-trap]u ++. nr www-left-indent 0 ++.. ++. ++.\" called when the -R picture is finished ++.de www-finish-right-ll ++. ll +(\\n[www-right-indent]u + \\n[www-image-gap]u) ++. ++. \" now check whether we need to inline www-finish-left-ll ++. if (\\n[www-left-ll-trap]u > 0) \ ++. if ((\\n[www-right-ll-trap]u + 1v) >= \\n[www-left-ll-trap]u) \{\ ++. mk www-left-po-trap ++. nr www-left-po-trap +1v ++. wh \\n[www-left-po-trap]u www-finish-left-po ++. ll +\\n[www-left-indent]u ++. wh \\n[www-left-ll-trap]u ++. nr www-left-ll-trap 0 ++. \} ++. ++. \" and check whether we need to inline www-finish-left-po ++. if (\\n[www-left-po-trap]u > 0) \ ++. if ((\\n[www-right-ll-trap]u + 1v) >= \\n[www-left-po-trap]u) \{\ ++. po -\\n[www-left-indent]u ++. wh \\n[www-left-po-trap]u ++. nr www-left-indent 0 ++. \} ++. ++. wh \\n[www-right-ll-trap]u ++. nr www-right-ll-trap 0 ++.. ++. ++.de www-finish-left-ll ++. if (\\n[www-right-ll-trap] > 0) \ ++. if ((\\n[www-left-ll-trap] + 1v) >= \\n[www-right-ll-trap]) \{\ ++. ll +\\n[www-right-indent]u ++. nr www-right-ll-trap 0 ++. \} ++. ++. mk www-left-po-trap ++. nr www-left-po-trap +1v ++. wh \\n[www-left-po-trap]u www-finish-left-po ++. ll +(\\n[www-left-indent]u + \\n[www-image-gap]u) ++. wh \\n[www-left-ll-trap]u ++. nr www-left-ll-trap 0 ++.. ++. ++.\" www-handle-percent arg N1 N2 S1 ++.\" arg - input string (number or number%) ++.\" output parameters: ++.\" N1 - name of number register 1=absolute 0=percentage ++.\" N2 - number register name for absolute value ++.\" S1 - string register name for percentage value ++.\" ++.de www-handle-percent ++. ds www-percent \\$1\" ++. substring www-percent -1 -1 ++. ++. ie '\\*[www-percent]'%' \{\ ++. ds www-abs \\$1\" ++. substring www-abs 0 -2 ++. nr \\$2 0 ++. nr \\$3 \\*[www-abs] ++. ds \\$4 \\$1\" ++. \} ++. el \{\ ++. nr \\$2 1 ++. nr \\$3 \\$1 ++. ds \\$4 none\" ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" MPIMG [-R|-L] [-G gap] filename [width [height]] ++.\" ++.\" Include a PNG image and wrap text around it. It works for ++.\" -Tps and -Thtml. The default value for WIDTH is 1i; default value ++.\" for HEIGHT is WIDTH; the default alignment is left (-L). ++.\" -G is used to insert a gap between the text and the image. ++.\" The height and width can also be given as a percentage. ++.\" The PostScript device converts the percentage width into an ++.\" absolute value by using \\n[.l], and the height by using \\n[.p]. ++.\" ++.\" ++.\" Note: This macro can only be used with the `-U' option of groff, ++.\" activating unsafe mode, if not used with -Thtml; the PNG image ++.\" is then converted to the EPS format using netpbm utilities. ++.\" ++.nr www-htmlimage-gap 0 ++. ++.de MPIMG ++. nr www-image-just 1 ++. nr www-image-gap 0 ++. while (\\n[.$] > 0) \{\ ++. if '-L'\\$1' \{\ ++. nr www-image-just 1 ++. shift ++. continue ++. \} ++. if '-R'\\$1' \{\ ++. nr www-image-just 0 ++. shift ++. continue ++. \} ++. if '-G'\\$1' \{\ ++. nr www-image-gap \\$2 ++. nr www-htmlimage-gap (\\$2 * 100 / 240) ++. shift 2 ++. continue ++. \} ++. break ++. \} ++. ++. nr www-width 1i ++. nr www-height 1i ++. ds www-size-specs width="\\n[www-width]" height="\\n[www-height]"\" ++. ie !'\\$2'' \{\ ++. nr www-is-absolute 0 ++. nr www-absolute 0 ++. ds www-percentage none\" ++. www-handle-percent \\$2 www-is-absolute www-absolute www-percentage ++. ie !\\n[www-is-absolute] \{\ ++. \" percentage of linelength requested ++. nr www-width (\\n[www-absolute] * \\n[.l] / 100) ++. if \\n[www-html] \ ++. nr www-width (\\n[www-width] * 100 / 240) ++. ds www-size-specs width="\\*[www-percentage]"\" ++. \} ++. el \{\ ++. nr www-width \\n[www-absolute] ++. if \\n[www-html] \ ++. nr www-width (\\n[www-width] * 100 / 240) ++. ds www-size-specs width="\\n[www-width]"\" ++. \} ++. ++. nr www-height \\n[www-width] ++. ie !'\\$3'' \{\ ++. nr www-is-absolute 0 ++. nr www-absolute 0 ++. ds www-percentage none\" ++. www-handle-percent \\$3 www-is-absolute www-absolute www-percentage ++. ie !\\n[www-is-absolute] \{\ ++. \" percentage of pagelength requested ++. nr www-height (\\n[www-absolute] * \\n[.p] / 100) ++. if \\n[www-html] \ ++. nr www-height (\\n[www-height] * 100 / 240) ++. ds www-size-specs "\\*[www-size-specs] height="\\*[www-percentage]"\" ++. \} ++. el \{\ ++. nr www-height \\n[www-absolute] ++. if \\n[www-html] \ ++. nr www-height (\\n[www-height] * 100 / 240) ++. ds www-size-specs "\\*[www-size-specs] height="\\*[www-height]"\" ++. \} ++. \} ++. \} ++. el \{\ ++. \" height not specified; use width value ++. ie !\\n[www-is-absolute] \{\ ++. \" percentage value ++. ds www-size-specs "\\*[www-size-specs] height="\\*[www-percentage]"\" ++. nr www-height \\n[www-width] ++. \} ++. el \{\ ++. ds www-size-specs "\\*[www-size-specs] height="\\*[www-width]"\" ++. nr www-height \\n[www-width] ++. \} ++. \} ++. ++. ie \\n[www-html] \{\ ++. ie !\\n[www-image-just] \ ++. HTML ]" ++. el \ ++. HTML ]" ++. \} ++. el \{\ ++. tm www-width is \\n[www-width] ++. tm www-height is \\n[www-height] ++. if !r ps4html \{\ ++. www-make-unique-name ++. sy pngtopnm \\$1 \ ++ | pnmcrop -white \ ++ | @PNMTOPS_NOSETPAGE@ -noturn \ ++ > \\*[www-unique-name].eps ++. ie !\\n[www-image-just] \{\ ++. \" we must now disable a possible left image trap ++. sp -1 ++. if (\\n[www-left-ll-trap] > 0) \ ++. wh \\n[www-left-ll-trap]u ++. if (\\n[www-left-po-trap] > 0) \ ++. wh \\n[www-left-po-trap]u ++. PSPIC -R \\*[www-unique-name].eps \\n[www-width]u \\n[www-height]u ++. sp -\\n[ps-desht]u ++. ++. nr www-right-indent \\n[ps-deswid]u ++. \" we want to have some space between text and image, ++. \" so the line length must be shorter ++. ll -(\\n[www-right-indent]u + \\n[www-image-gap]u) ++. mk www-right-ll-trap ++. nr www-right-ll-trap +(\\n[ps-desht]u - 1v) ++. wh \\n[www-right-ll-trap]u www-finish-right-ll ++. ++. \" now restore possible left trap ++. if (\\n[www-left-ll-trap] > 0) \ ++. wh \\n[www-left-ll-trap]u www-finish-left-ll ++. if (\\n[www-left-po-trap] > 0) \ ++. wh \\n[www-left-po-trap]u ++. \} ++. el \{\ ++. \" we must now disable a possible right image trap ++. if (\\n[www-right-ll-trap] > 0) \ ++. wh \\n[www-right-ll-trap]u ++. PSPIC -L \\*[www-unique-name].eps \\n[www-width]u \\n[www-height]u ++. sp -\\n[ps-desht]u ++. ++. nr www-left-indent \\n[ps-deswid]u ++. \" increase offset by gap ++. po +(\\n[www-left-indent]u + \\n[www-image-gap]u) ++. \" decrease line length by gap ++. ll -(\\n[www-left-indent]u + \\n[www-image-gap]u) ++. mk www-left-ll-trap ++. nr www-left-ll-trap +(\\n[ps-desht]u - 1v) ++. wh \\n[www-left-ll-trap]u www-finish-left-ll ++. ++. \" now restore possible right trap ++. if (\\n[www-right-ll-trap] > 0) \ ++. wh \\n[www-right-ll-trap]u www-finish-right-ll ++. \} ++. \} ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HnS n ++.\" ++.\" Begin heading. Heading level is N. ++.\" ++.\" HnE ++.\" ++.\" End heading. ++.\" ++.\" If your heading contains URL, FTP, MTO macros you might wish to ++.\" disable automatic links to headings. This can be done via `-P-l' ++.\" from the command line or by using a cakk to `.HX 0'. ++.\" ++.nr www-heading-no -1 ++. ++.de HnS ++. ie '\\$1'' \ ++. nr www-heading-no 1 ++. el \ ++. nr www-heading-no \\$1 ++. DEVTAG-NH \\n[www-heading-no] ++.. ++. ++.de HnE ++. if (\\n[www-heading-no] == -1) \ ++. www-error HnE found without a corresponding HnS ++. DEVTAG-EO-H ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" LK ++.\" ++.\" Emit the automatically collected links derived from ++.\" section/numbered headings at this position. ++.\" ++.de LK ++. DEVTAG .links ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HR ++.\" ++.\" Produce a horizontal line. ++.\" ++.de HR ++. HTML

    ] ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" NHR ++.\" ++.\" Suppress the generation of the top and bottom rules which grohtml ++.\" emits by default. ++.\" ++.de NHR ++. DEVTAG .no-auto-rule ++.. ++. ++.\" ++.\" www-end-nowhere - end of input trap called to finish diversion. ++.\" ++.de www-end-nowhere ++. if !\\n[www-html] \ ++. di ++. DEVTAG-EO-TL ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HTL ++.\" ++.\" Generate an HTML title only. This differs from the -ms .TL macro ++.\" which generates both an HTML title and an H1 heading. ++.\" ++.\" This is useful when an author wishes to use an HTML title as search ++.\" engine fodder but a graphic title in the document. ++.\" ++.\" The macro terminates when a space or break is seen (.sp, .br). ++.\" ++.de HTL ++. DEVTAG .html-tl ++. if !\\n[www-html] \ ++. di www-nowhere ++. it 2 www-end-nowhere ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" auxiliary definitions for lists ++.\" ++.ds www-ul-level1 \[bu]\ \ \" ++.ds www-ul-level2 \[sq]\ \ \" ++.ds www-ul-level3 \[ci]\ \ \" ++.nr www-ul-level 0 ++. ++.ds www-ol-level1 decimal\" ++.ds www-ol-level2 lower-alpha\" ++.ds www-ol-level3 lower-roman\" ++.ds www-ol-tmp 00\ \ \" ++.nr www-ol-ctr1 0 1 ++.nr www-ol-ctr2 0 1 ++.nr www-ol-ctr3 0 1 ++.af www-ol-ctr2 a ++.af www-ol-ctr3 i ++.nr www-ol-level 0 ++. ++.nr www-dl-level 0 ++.nr www-dl-shift 5n ++. ++.\" ++.\" allow nested lists ++.\" ++.nr www-depth 0 ++.nr www-li-indent \n[.i] ++.ds www-level0 nop\" ++.ds www-level1 ++.ds www-level2 ++.ds www-level3 ++.ds www-level4 ++.ds www-level5 ++.ds www-level6 ++.ds www-level7 ++.ds www-level8 ++.ds www-level9 ++. ++.\" which macro to use for LI ++.de www-push-li ++. nr www-li-indent \\n[.i] ++. nr www-depth +1 ++. ds www-level\\n[www-depth] \\$1\" ++. ds www-ltag\\n[www-depth] ++. als LI \\$1 ++.. ++. ++.de www-pop-li ++. nr www-depth -1 ++. als LI \\*[www-level\\n[www-depth]] ++.. ++. ++.\" www-emit-ltag - shut down a previous open list tag ++.\" before issuing a new tag \\$1. ++.\" It then records tag \\$1 is open. ++. ++.de www-emit-ltag ++. if !'\\*[www-ltag\\n[www-depth]]'' \ ++. HTML-NS ++. if !'\\$1'' \ ++. HTML-NS <\\$1> ++. ds www-ltag\\n[www-depth] \\$1\" ++.. ++. ++.\" ++.\" Auxiliary macro for ULS. ++.\" ++.de www-push-ul-level ++. nr www-ul-level +1 ++. if (\\n[www-ul-level] > 3) \ ++. www-error ULS: too many levels of indentation (\\n[www-ul-level]) ++.. ++.\" ++.\" Auxiliary macro for ULE. ++.\" ++.de www-pop-ul-level ++. if !\\n[www-ul-level] \ ++. www-error ULE: trying to terminate a list which does not exist ++. nr www-ul-level -1 ++.. ++. ++.\" ++.\" Auxiliary macro for OLS. ++.\" ++.de www-push-ol-level ++. nr www-ol-level +1 ++. if (\\n[www-ol-level] > 3) \ ++. www-error OLS: too many levels of indentation (\\n[www-ol-level]) ++.. ++. ++.\" ++.\" Auxiliary macro for OLE. ++.\" ++.de www-pop-ol-level ++. if !\\n[www-ol-level] \ ++. www-error OLE: trying to terminate a list which does not exist ++. nr www-ol-level -1 ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" ULS ++.\" ++.\" Start an unordered list. ++.\" ++.de ULS ++. www-push-li www-li-ul ++. www-push-ul-level ++. ie \\n[www-html] \{\ ++. www-emit-ltag ++. HTML

      ++. \} ++. el \ ++. nr www-li-indent +\w'\\*[www-ul-level\\n[www-ul-level]]'u ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" ULE ++.\" ++.\" End an unordered list. ++.\" ++.de ULE ++. ie \\n[www-html] \{\ ++. www-emit-ltag ++. HTML

    ++. \} ++. el \{\ ++. nr www-li-indent -\w'\\*[www-ul-level\\n[www-ul-level]]'u ++. in \\n[www-li-indent]u ++. \} ++. www-pop-ul-level ++. www-pop-li ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" OLS ++.\" ++.\" Start an ordered list. ++.\" ++.de OLS ++. www-push-li www-li-ol ++. www-push-ol-level ++. ie \\n[www-html] \{\ ++. www-emit-ltag ++. HTML

      " ++. \} ++. el \ ++. nr www-li-indent +\w'\\*[www-ol-tmp]'u ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" OLE ++.\" ++.\" End an ordered list. ++.\" ++.de OLE ++. ie \\n[www-html] \{\ ++. www-emit-ltag ++. HTML
    ++. \} ++. el \{\ ++. nr www-li-indent -\w'\\*[www-ol-tmp]'u ++. in \\n[www-li-indent]u ++. nr www-ol-ctr\\n[www-ol-level] 0 1 ++. \} ++. www-pop-ol-level ++. www-pop-li ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" DLS ++.\" ++.\" Start a definition list. ++.\" ++.de DLS ++. www-push-li www-li-dl ++. nr www-dl-level +1 ++. ie \\n[www-html] \{\ ++. www-emit-ltag ++. HTML

    ++. \} ++. el \{\ ++. nr www-li-indent +\\n[www-dl-shift]u ++. in \\n[www-li-indent]u ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" DLE ++.\" ++.\" End a definition list. ++.\" ++.de DLE ++. ie \\n[www-html] \{\ ++. www-emit-ltag ++. HTML
    ++. \} ++. el \{\ ++. nr www-li-indent -\\n[www-dl-shift]u ++. in \\n[www-li-indent]u ++. \} ++. nr www-dl-level -1 ++. www-pop-li ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" LI ++.\" ++.\" Insert a list item. ++.\" ++. ++.\" ******** ++.\" www-li-ul - bulleted list item ++.\" ++.de www-li-ul ++. ie \\n[www-html] \ ++. www-emit-ltag li ++. el \{\ ++. www:paraspace ++. if rPORPHANS \ ++. ne \\n[PORPHANS]v ++. in \\n[www-li-indent]u ++. ti -\w'\\*[www-ul-level\\n[www-ul-level]]'u ++. nop \\*[www-ul-level\\n[www-ul-level]]\c ++. \} ++.. ++. ++.\" ******** ++.\" www-li-ol - numbered list item ++.\" ++.de www-li-ol ++. ie \\n[www-html] \ ++. www-emit-ltag li ++. el \{\ ++. www:paraspace ++. if rPORPHANS \ ++. ne \\n[PORPHANS]v ++. in \\n[www-li-indent]u ++. ti -\w'\\n+[www-ol-ctr\\n[www-ol-level]]\ \ 'u ++. nop \\n[www-ol-ctr\\n[www-ol-level]]\ \ \c ++. \} ++.. ++. ++.\" ******** ++.\" www-li-dl - definition list item ++.\" ++.de www-li-dl ++. ie \\n[www-html] \{\ ++. HTML
    \\$1
    ++. www-emit-ltag dd ++. \} ++. el \{\ ++. www:paraspace ++. if rPORPHANS \ ++. ne \\n[PORPHANS]v ++. in \\n[www-li-indent]u ++. ti -\\n[www-dl-shift]u ++. nop \&\\$1 ++. br ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" DC l text [color] ++.\" ++.\" L is the letter to be dropped and enlarged. ++.\" ++.\" TEXT is the following text whose height the first letter should not ++.\" exceed. ++.\" ++.\" COLOR is the optional color of the dropped letter (default black). ++.\" ++.de DC ++. ds www-dropcolor black\" ++. if !'\\$3'' \ ++. ds www-dropcolor \\$3\" ++. ie '\*[.T]'html' \{\ ++. www-make-unique-name ++. nr www-drop-width (100u * \\n[.v]u * 3u / \\n[.l]u) ++. MPIMG -L \\*[www-unique-name].png \\n[www-drop-width]% ++. \} ++. el \{\ ++. ie r ps4html \{\ ++. www-make-unique-name ++. \" To avoid interferences with another DC macro call which is located ++. \" very near to the current one, we draw the glyph on a separate page. ++. \" Otherwise it could theoretically happen that the dropped capital ++. \" glyphs overlap. ++. bp ++. ev www-DC ++. vs 320p ++. nop \O[5i\\*[www-unique-name].png]\O[1] ++. nop \m[\\*[www-dropcolor]]\s[160]\O[3]\\$1\O[4] ++. nop \O[2]\O[0] ++. br ++. ev ++. bp ++. \} ++. el \{\ ++. ie n \ ++. nop \\$1\c ++. el \{\ ++. nr dummy \w'\\$1'u ++. nr dcht ((\\n[.v] + \\n[rst]) * \\n[.ps] / \\n[rst]) ++. char \[dcap] \m[\\*[www-dropcolor]]\s'\\n[dcht]u'\\$1 ++. nop \v'\\n[.v]u'\\[dcap]\v'-\\n[.v]u'\c ++' ti \w'\\[dcap]'u ++. \} ++. \} ++. \} ++. nop \\$2 ++.. ++. ++.\" ++.\" supplementary macros used by other macro sets ++.\" ++.\" here are some tags specially for -Tps or -Thtml when invoked by ++.\" pre-html to generate PNG images from postscript. ++. ++.\" -------------------------------------------------------------------- ++.\" HTML-DO-IMAGE - tell troff to issue an image marker which can be ++.\" read back by pre-html ++.\" ++.de HTML-DO-IMAGE ++. if r ps4html \ ++. nop \O[5\\$2\\$1.png]\O[1]\O[3] ++. if \\n[www-html] \ ++. nop \O[5\\$2\\$1.png]\O[0]\O[3] ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HTML-IMAGE-END - terminate an image for HTML ++.\" ++.de HTML-IMAGE-END ++. if r ps4html \ ++. nop \O[4]\O[2]\O[0] ++. if \\n[www-html] \ ++. nop \O[4]\O[2]\O[1] ++.. ++. ++.nr www-png-no 0 ++. ++.\" -------------------------------------------------------------------- ++.\" www-make-unique-name - generate another unique name in string ++.\" `www-unique-name' ++.\" ++.de www-make-unique-name ++. nr www-png-no +1 ++. ds www-unique-name \\*[www-image-template]\\n[www-png-no]\" ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HTML-IMAGE and friends tell grohtml that this region of text needs ++.\" to be rendered as an image. ++.\" ++.de HTML-IMAGE ++. \" generates a centered image ++. www-make-unique-name ++. HTML-DO-IMAGE \\*[www-unique-name] c ++.. ++. ++.de HTML-IMAGE-RIGHT ++. www-make-unique-name ++. HTML-DO-IMAGE \\*[www-unique-name] r ++.. ++. ++.de HTML-IMAGE-LEFT ++. www-make-unique-name ++. HTML-DO-IMAGE \\*[www-unique-name] l ++.. ++. ++.de HTML-IMAGE-INLINE ++. www-make-unique-name ++. HTML-DO-IMAGE \\*[www-unique-name] i ++.. ++. ++.\" EQN-HTML-IMAGE and friends check to see whether the equation is ++.\" not in an image, in which case it allows HTML ++.\" (mathml) to be generated (if -Txhtml was specified). ++. ++.de EQN-HTML-IMAGE ++. \" generates a centered image ++. www-make-unique-name ++. EQN-HTML-DO-IMAGE \\*[www-unique-name] c ++.. ++. ++.de EQN-HTML-IMAGE-RIGHT ++. www-make-unique-name ++. EQN-HTML-DO-IMAGE \\*[www-unique-name] r ++.. ++. ++.de EQN-HTML-IMAGE-LEFT ++. www-make-unique-name ++. EQN-HTML-DO-IMAGE \\*[www-unique-name] l ++.. ++. ++.de EQN-HTML-IMAGE-INLINE ++. www-make-unique-name ++. EQN-HTML-DO-IMAGE \\*[www-unique-name] i ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" EQN-HTML-DO-IMAGE - tell troff to issue an image marker which can be ++.\" read back by pre-html ++.\" ++.de EQN-HTML-DO-IMAGE ++. ie r xhtml \{\ ++. if !(\\n[.O] == 0) \{\ ++. if r ps4html \ ++. nop \O[5\\$2\\$1.png]\O[1]\O[3] ++. if \\n[www-html] \ ++. nop \O[5\\$2\\$1.png]\O[0]\O[3] ++. \} ++. \} ++. el \ ++. HTML-DO-IMAGE \\$* ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" EQN-HTML-IMAGE-END - terminate an image for HTML ++.\" ++.de EQN-HTML-IMAGE-END ++. ie r xhtml \{\ ++. if !(\\n[.O] == 0) \{\ ++. if r ps4html \ ++. nop \O[4]\O[2]\O[0] ++. if \\n[www-html] \ ++. nop \O[4]\O[2]\O[1] ++. \} ++. \} ++. el \ ++. HTML-IMAGE-END ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" Setup around HTML-IMAGE and friends ++.\" ++.\" now set up TS, TE, EQ, EN default macros ++.\" ++.\" we must not use `.als': the definition of .TE in s.tmac, for example, ++.\" calls .HTML-IMAGE-END, which would refer to itself due to the alias, ++.\" causing an endless loop ++.\" ++.if !d TS \{\ ++. de TS ++. HTML-IMAGE \\$@ ++. if \\n[www-html] \{\ ++. nr www-TS-ll \\n[.l] ++. ll 1000n ++. \} ++. . ++.\} ++.if !d TE \{\ ++. de TE ++. if \\n[www-html] \ ++. ll \\n[www-TS-ll]u ++. HTML-IMAGE-END \\$@ ++. . ++.\} ++.if !d EQ \{\ ++. de EQ ++. EQN-HTML-IMAGE \\$@ ++. if \\n[www-html] \{\ ++. nr www-EQ-ll \\n[.l] ++. ll 1000n ++. \} ++. . ++.\} ++.if !d EN \{\ ++. de EN ++. if \\n[www-html] \ ++. ll \\n[www-EQ-ll]u ++. EQN-HTML-IMAGE-END \\$@ ++. . ++.\} ++. ++.\" -------------------------------------------------------------------- ++.\" JOBNAME ++.\" ++.\" Generate multiple output files containing the HTML. ++.\" A file is split whenever a .SH or .NH 1 is encountered. ++.\" The argument to JOBNAME is the file stem for future output files. ++.\" ++.de JOBNAME ++. DEVTAG .job-name \\$1 ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" HEAD ++.\" ++.\" Add information to the section of the HTML ++.\" document ++.\" ++.de HEAD ++. DEVTAG .head "\\$*" ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" start of some code ++.\" ++.de CDS ++. ft C ++. nf ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" end of some code ++.\" ++.de CDE ++. fi ++. ft P ++.. ++. ++.ds www-nav-colour #eeeeee\" ++.nr www-nav-width-left 30 ++.nr www-nav-width-right 70 ++. ++.\" -------------------------------------------------------------------- ++.\" LNS - left navigation start ++.\" ++.de LNS ++. HTML

    " ++. LK ++. HTML

    		" ++. nr SH-open 1 ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" LNE - left navigation end ++.\" ++.de LNE ++. HTML

    ++. HR ++.. ++. ++.nr SH-open 0 ++.nr needs-begin 0 ++. ++.\" ++.\" some auxiliary macros for left navigation lists ++.\" ++.de www-SH ++. if (0\\$1 == 0) \{\ ++. if (\\n[SH-open] == 1) \ ++. LNE ++. nr needs-begin 1 ++. @SH-old ++. \} ++.. ++. ++.de www-NH ++. if (0\\$1 <= 1) \{\ ++. if (\\n[SH-open] == 1) \ ++. LNE ++. nr needs-begin 1 ++. @NH-old ++. \} ++.. ++. ++.de www-LP ++. @LP-old ++. if (\\n[needs-begin] == 1) \{\ ++. HR ++. LNS ++. \} ++. nr needs-begin 0 ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" ALN [colour] [left width percentage] ++.\" ++.\" Turn on automatic left navigation. This macro should only be ++.\" called once (normally at the start of the document) as it ++.\" indicates that all top-level section headings form a navigation ++.\" list on the left of the main text. ++.\" ++.de ALN ++. if '\*[.T]'html' \{\ ++. if !'\\$1'' \ ++. ds www-nav-colour \\$1\" ++. if (0\\$2 > 0) \{\ ++. nr www-nav-width-left \\$2 ++. nr www-nav-width-right (100 - \\$2) ++. \} ++. rn @SH @SH-old ++. rn www-SH @SH ++. rn @NH @NH-old ++. rn www-NH @NH ++. rn @LP @LP-old ++. rn www-LP @LP ++. \} ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" LINKSTYLE color [fontstyle [openglyph closeglyph]] ++.\" ++.\" Initialize www.tmac so that when this macro set is used with ++.\" non-HTML devices the urls are rendered the user defined attributes. ++.\" For example: ++.\" ++.\" LINKSTYLE blue CR < > ++.\" ++.de LINKSTYLE ++. if (\\n[.$] < 1) \ ++. www:error .\\$0 expects at least 1 argument. ++. ds www:color \\$1\" ++. shift ++. if (\\n[.$] < 1) \ ++. return ++. ds www:fontstyle \\$1\" ++. shift ++. if (\\n[.$] < 1) \ ++. www:error .\\$0 expects that both the open and close glyph is specified ++. ds www:open \\$1\" ++. ds www:close \\$2\" ++.. ++. ++.\" MATHML - enable eqn mathml output to pass through to the device ++.\" driver ++. ++.de MATHML ++. if (\\n[.O] == 0) \ ++. MATH \\$* ++.. ++. ++.\" -------------------------------------------------------------------- ++.\" final setup ++.\" -------------------------------------------------------------------- ++. ++.LINKSTYLE blue C \[la] \[ra] ++. ++.if \n[www-html] \{\ ++. nh ++. nr HY 0 ++.\} ++. ++.if r ps4html .nop \O[0] ++.cp \n(_C ++. ++.\" now set ++. ++.\" -------------------------------------------------------------------- ++.\" Emacs settings ++.\" -------------------------------------------------------------------- ++. ++.\" Local Variables: ++.\" mode: nroff ++.\" End: ++.\" EOF diff --git a/system/base/groff/pspec.xml b/system/base/groff/pspec.xml index f77b3f03..b410ef9e 100644 --- a/system/base/groff/pspec.xml +++ b/system/base/groff/pspec.xml @@ -14,10 +14,14 @@ app:console A document formatting system groff is a document formatting system. Groff takes standard text and formatting commands as input and produces formatted output. - http://ftp.gnu.org/gnu/groff/groff-1.22.2.tar.gz + http://ftp.gnu.org/gnu/groff/groff-1.22.3.tar.gz texinfo + + groff-1.19.2-man-unicode-dashes.patch + groff-1.22.3-parallel-mom.patch + @@ -31,7 +35,6 @@ /usr/bin /usr/lib /usr/share/groff - /usr/share/X11/app-defaults @@ -49,6 +52,13 @@ + + 2015-04-02 + 1.22.3 + Release bump, remove X builddep. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.22.2 diff --git a/system/base/iputils/actions.py b/system/base/iputils/actions.py deleted file mode 100644 index 661fe8eb..00000000 --- a/system/base/iputils/actions.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import shelltools -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def build(): - autotools.make("CCOPT='%s -fpie' CC=%s" % (get.CFLAGS(), get.CC())) - - autotools.compile("ifenslave.c -o ifenslave") - -def install(): - for app in ["ping", "ping6"]: - pisitools.dobin(app) - - for app in ["clockdiff", "arping", "rdisc", "tracepath", "tracepath6", "traceroute6", "ifenslave"]: - pisitools.dosbin(app) - - # We will not need these if we set cap on postInstall like Fedora - shelltools.chmod("%s/usr/bin/ping" % get.installDIR(), 04711) - shelltools.chmod("%s/usr/bin/ping6" % get.installDIR(), 04711) - - pisitools.dodoc("RELNOTES") diff --git a/system/base/iputils/files/021109-uclibc-no-ether_ntohost.patch b/system/base/iputils/files/021109-uclibc-no-ether_ntohost.patch deleted file mode 100644 index e790d2b5..00000000 --- a/system/base/iputils/files/021109-uclibc-no-ether_ntohost.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- iputils/rarpd.c.mps 2004-06-10 15:27:01.000000000 +0200 -+++ iputils/rarpd.c 2004-06-10 15:26:29.000000000 +0200 -@@ -42,7 +42,9 @@ int listen_arp; - char *ifname; - char *tftp_dir = "/etc/tftpboot"; - -+#ifndef __UCLIBC__ - extern int ether_ntohost(char *name, unsigned char *ea); -+#endif - void usage(void) __attribute__((noreturn)); - - struct iflink -@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex - 6, - }; - -+#ifndef __UCLIBC__ - if (ether_ntohost(ename, lladdr) != 0 || -+#else -+ if ( -+#endif - (hp = gethostbyname(ename)) == NULL) { - if (verbose) - syslog(LOG_INFO, "not found in /etc/ethers"); diff --git a/system/base/iputils/files/docs.patch b/system/base/iputils/files/docs.patch deleted file mode 100644 index c2e023ec..00000000 --- a/system/base/iputils/files/docs.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/doc/Makefile 2007-11-27 02:57:27.000000000 +0200 -+++ b/doc/Makefile 2007-11-27 04:55:23.000000000 +0200 -@@ -13,25 +13,17 @@ - # So, scope it to a temporary dir and clean all after each run. - - $(HTMLFILES): index.db -- @-rm -rf tmp.db2html -- @mkdir tmp.db2html -- @set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html .. -- @-rm -rf tmp.db2html -+ @docbook2html $< - - iputils.html: iputils.db -- @-rm -rf tmp.db2html -- @mkdir tmp.db2html -- @set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ .. -- @-rm -rf tmp.db2html -+ @docbook2html -u $< - - # docbook2man produces utterly ugly output and I did not find - # any way to customize this but hacking backend perl script a little. - # Well, hence... - - $(MANFILES): index.db -- @-mkdir tmp.db2man -- @set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ; mv $@ .. -- @-rm -rf tmp.db2man -+ @nsgmls $< |sgmlspl docbook2man-spec.pl - - clean: - @rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man diff --git a/system/base/iputils/files/fedora/iputils-20020124-countermeasures.patch b/system/base/iputils/files/fedora/iputils-20020124-countermeasures.patch deleted file mode 100644 index 5e6f4bcd..00000000 --- a/system/base/iputils/files/fedora/iputils-20020124-countermeasures.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- iputils/ping_common.c.countermeasures Tue May 21 10:06:05 2002 -+++ iputils/ping_common.c Tue May 21 10:12:42 2002 -@@ -628,7 +628,8 @@ - tvsub(tv, &tmp_tv); - triptime = tv->tv_sec * 1000000 + tv->tv_usec; - if (triptime < 0) { -- fprintf(stderr, "Warning: time of day goes back (%ldus), taking countermeasures.\n", triptime); -+ if (options & F_VERBOSE) -+ fprintf(stderr, "Warning: time of day goes back (%ldus), taking countermeasures.\n", triptime); - triptime = 0; - if (!(options & F_LATENCY)) { - gettimeofday(tv, NULL); diff --git a/system/base/iputils/files/fedora/iputils-20020927-ping-subint.patch b/system/base/iputils/files/fedora/iputils-20020927-ping-subint.patch deleted file mode 100644 index e19e724f..00000000 --- a/system/base/iputils/files/fedora/iputils-20020927-ping-subint.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- iputils-ss021109-vanilla/ping.c Thu Nov 7 23:53:21 2002 -+++ iputils/ping.c Sun Jan 12 03:39:24 2003 -@@ -285,6 +285,9 @@ - perror("ping: IP_MULTICAST_IF"); - exit(2); - } -+ } else if (icmp_sock >= 0) { -+ /* We possible tried to SO_BINDTODEVICE() a subinterface like 'eth0:1' */ -+ perror("Warning: cannot bind to specified iface, falling back"); - } - } - } diff --git a/system/base/iputils/files/fedora/iputils-20070202-traffic_class.patch b/system/base/iputils/files/fedora/iputils-20070202-traffic_class.patch deleted file mode 100644 index 8a4ddf0f..00000000 --- a/system/base/iputils/files/fedora/iputils-20070202-traffic_class.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up iputils-s20070202/ping6.c.flowlabel iputils-s20070202/ping6.c ---- iputils-s20070202/ping6.c.flowlabel 2008-02-01 11:10:53.000000000 +0100 -+++ iputils-s20070202/ping6.c 2008-02-01 11:16:47.000000000 +0100 -@@ -86,6 +86,10 @@ char copyright[] = - #define SOL_ICMPV6 IPPROTO_ICMPV6 - #endif - -+#ifndef IVP6_FLOWINFO_SEND -+#define IPV6_FLOWINFO_SEND 33 -+#endif -+ - /* RFC3542 */ - #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE - #define ICMP6_DST_UNREACH_BEYONDSCOPE ICMP6_DST_UNREACH_NOTNEIGHBOR diff --git a/system/base/iputils/files/fedora/iputils-20100418-convtoint.patch b/system/base/iputils/files/fedora/iputils-20100418-convtoint.patch deleted file mode 100644 index 77c2256c..00000000 --- a/system/base/iputils/files/fedora/iputils-20100418-convtoint.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up iputils-s20100418/tracepath6.c.convtoint iputils-s20100418/tracepath6.c ---- iputils-s20100418/tracepath6.c.convtoint 2010-04-23 11:28:15.294593391 +0200 -+++ iputils-s20100418/tracepath6.c 2010-04-23 11:28:23.544605551 +0200 -@@ -89,7 +89,7 @@ void print_host(const char *a, const cha - } - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; -- printf("%*s", HOST_COLUMN_SIZE - plen, ""); -+ printf("%*s", HOST_COLUMN_SIZE - (int)plen, ""); - } - - int recverr(int fd, int ttl) -diff -up iputils-s20100418/tracepath.c.convtoint iputils-s20100418/tracepath.c ---- iputils-s20100418/tracepath.c.convtoint 2010-04-23 11:26:20.273555629 +0200 -+++ iputils-s20100418/tracepath.c 2010-04-23 11:26:20.281562493 +0200 -@@ -77,7 +77,7 @@ void print_host(const char *a, const cha - } - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; -- printf("%*s", HOST_COLUMN_SIZE - plen, ""); -+ printf("%*s", HOST_COLUMN_SIZE - (int)plen, ""); - } - - int recverr(int fd, int ttl) diff --git a/system/base/iputils/files/fedora/rdisc.service b/system/base/iputils/files/fedora/rdisc.service deleted file mode 100644 index 70a3d3aa..00000000 --- a/system/base/iputils/files/fedora/rdisc.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=rdisc daemon which discovers routers on the local subnet -After=syslog.target network.target - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/rdisc -ExecStart=/sbin/rdisc $RDISCOPTS - -[Install] -WantedBy=multi-user.target diff --git a/system/base/iputils/files/fedora/rdisc.sysconfig b/system/base/iputils/files/fedora/rdisc.sysconfig deleted file mode 100644 index bd11c2ad..00000000 --- a/system/base/iputils/files/fedora/rdisc.sysconfig +++ /dev/null @@ -1 +0,0 @@ -RDISCOPTS="-s" diff --git a/system/base/iputils/files/ifenslave/README.bonding b/system/base/iputils/files/ifenslave/README.bonding deleted file mode 100644 index 61f516b1..00000000 --- a/system/base/iputils/files/ifenslave/README.bonding +++ /dev/null @@ -1,2440 +0,0 @@ - - Linux Ethernet Bonding Driver HOWTO - - Latest update: 23 September 2009 - -Initial release : Thomas Davis -Corrections, HA extensions : 2000/10/03-15 : - - Willy Tarreau - - Constantine Gavrilov - - Chad N. Tindel - - Janice Girouard - - Jay Vosburgh - -Reorganized and updated Feb 2005 by Jay Vosburgh -Added Sysfs information: 2006/04/24 - - Mitch Williams - -Introduction -============ - - The Linux bonding driver provides a method for aggregating -multiple network interfaces into a single logical "bonded" interface. -The behavior of the bonded interfaces depends upon the mode; generally -speaking, modes provide either hot standby or load balancing services. -Additionally, link integrity monitoring may be performed. - - The bonding driver originally came from Donald Becker's -beowulf patches for kernel 2.0. It has changed quite a bit since, and -the original tools from extreme-linux and beowulf sites will not work -with this version of the driver. - - For new versions of the driver, updated userspace tools, and -who to ask for help, please follow the links at the end of this file. - -Table of Contents -================= - -1. Bonding Driver Installation - -2. Bonding Driver Options - -3. Configuring Bonding Devices -3.1 Configuration with Sysconfig Support -3.1.1 Using DHCP with Sysconfig -3.1.2 Configuring Multiple Bonds with Sysconfig -3.2 Configuration with Initscripts Support -3.2.1 Using DHCP with Initscripts -3.2.2 Configuring Multiple Bonds with Initscripts -3.3 Configuring Bonding Manually with Ifenslave -3.3.1 Configuring Multiple Bonds Manually -3.4 Configuring Bonding Manually via Sysfs - -4. Querying Bonding Configuration -4.1 Bonding Configuration -4.2 Network Configuration - -5. Switch Configuration - -6. 802.1q VLAN Support - -7. Link Monitoring -7.1 ARP Monitor Operation -7.2 Configuring Multiple ARP Targets -7.3 MII Monitor Operation - -8. Potential Trouble Sources -8.1 Adventures in Routing -8.2 Ethernet Device Renaming -8.3 Painfully Slow Or No Failed Link Detection By Miimon - -9. SNMP agents - -10. Promiscuous mode - -11. Configuring Bonding for High Availability -11.1 High Availability in a Single Switch Topology -11.2 High Availability in a Multiple Switch Topology -11.2.1 HA Bonding Mode Selection for Multiple Switch Topology -11.2.2 HA Link Monitoring for Multiple Switch Topology - -12. Configuring Bonding for Maximum Throughput -12.1 Maximum Throughput in a Single Switch Topology -12.1.1 MT Bonding Mode Selection for Single Switch Topology -12.1.2 MT Link Monitoring for Single Switch Topology -12.2 Maximum Throughput in a Multiple Switch Topology -12.2.1 MT Bonding Mode Selection for Multiple Switch Topology -12.2.2 MT Link Monitoring for Multiple Switch Topology - -13. Switch Behavior Issues -13.1 Link Establishment and Failover Delays -13.2 Duplicated Incoming Packets - -14. Hardware Specific Considerations -14.1 IBM BladeCenter - -15. Frequently Asked Questions - -16. Resources and Links - - -1. Bonding Driver Installation -============================== - - Most popular distro kernels ship with the bonding driver -already available as a module and the ifenslave user level control -program installed and ready for use. If your distro does not, or you -have need to compile bonding from source (e.g., configuring and -installing a mainline kernel from kernel.org), you'll need to perform -the following steps: - -1.1 Configure and build the kernel with bonding ------------------------------------------------ - - The current version of the bonding driver is available in the -drivers/net/bonding subdirectory of the most recent kernel source -(which is available on http://kernel.org). Most users "rolling their -own" will want to use the most recent kernel from kernel.org. - - Configure kernel with "make menuconfig" (or "make xconfig" or -"make config"), then select "Bonding driver support" in the "Network -device support" section. It is recommended that you configure the -driver as module since it is currently the only way to pass parameters -to the driver or configure more than one bonding device. - - Build and install the new kernel and modules, then continue -below to install ifenslave. - -1.2 Install ifenslave Control Utility -------------------------------------- - - The ifenslave user level control program is included in the -kernel source tree, in the file Documentation/networking/ifenslave.c. -It is generally recommended that you use the ifenslave that -corresponds to the kernel that you are using (either from the same -source tree or supplied with the distro), however, ifenslave -executables from older kernels should function (but features newer -than the ifenslave release are not supported). Running an ifenslave -that is newer than the kernel is not supported, and may or may not -work. - - To install ifenslave, do the following: - -# gcc -Wall -O -I/usr/src/linux/include ifenslave.c -o ifenslave -# cp ifenslave /sbin/ifenslave - - If your kernel source is not in "/usr/src/linux," then replace -"/usr/src/linux/include" in the above with the location of your kernel -source include directory. - - You may wish to back up any existing /sbin/ifenslave, or, for -testing or informal use, tag the ifenslave to the kernel version -(e.g., name the ifenslave executable /sbin/ifenslave-2.6.10). - -IMPORTANT NOTE: - - If you omit the "-I" or specify an incorrect directory, you -may end up with an ifenslave that is incompatible with the kernel -you're trying to build it for. Some distros (e.g., Red Hat from 7.1 -onwards) do not have /usr/include/linux symbolically linked to the -default kernel source include directory. - -SECOND IMPORTANT NOTE: - If you plan to configure bonding using sysfs, you do not need -to use ifenslave. - -2. Bonding Driver Options -========================= - - Options for the bonding driver are supplied as parameters to the -bonding module at load time, or are specified via sysfs. - - Module options may be given as command line arguments to the -insmod or modprobe command, but are usually specified in either the -/etc/modules.conf or /etc/modprobe.conf configuration file, or in a -distro-specific configuration file (some of which are detailed in the next -section). - - Details on bonding support for sysfs is provided in the -"Configuring Bonding Manually via Sysfs" section, below. - - The available bonding driver parameters are listed below. If a -parameter is not specified the default value is used. When initially -configuring a bond, it is recommended "tail -f /var/log/messages" be -run in a separate window to watch for bonding driver error messages. - - It is critical that either the miimon or arp_interval and -arp_ip_target parameters be specified, otherwise serious network -degradation will occur during link failures. Very few devices do not -support at least miimon, so there is really no reason not to use it. - - Options with textual values will accept either the text name -or, for backwards compatibility, the option value. E.g., -"mode=802.3ad" and "mode=4" set the same mode. - - The parameters are as follows: - -ad_select - - Specifies the 802.3ad aggregation selection logic to use. The - possible values and their effects are: - - stable or 0 - - The active aggregator is chosen by largest aggregate - bandwidth. - - Reselection of the active aggregator occurs only when all - slaves of the active aggregator are down or the active - aggregator has no slaves. - - This is the default value. - - bandwidth or 1 - - The active aggregator is chosen by largest aggregate - bandwidth. Reselection occurs if: - - - A slave is added to or removed from the bond - - - Any slave's link state changes - - - Any slave's 802.3ad association state changes - - - The bond's administrative state changes to up - - count or 2 - - The active aggregator is chosen by the largest number of - ports (slaves). Reselection occurs as described under the - "bandwidth" setting, above. - - The bandwidth and count selection policies permit failover of - 802.3ad aggregations when partial failure of the active aggregator - occurs. This keeps the aggregator with the highest availability - (either in bandwidth or in number of ports) active at all times. - - This option was added in bonding version 3.4.0. - -arp_interval - - Specifies the ARP link monitoring frequency in milliseconds. - - The ARP monitor works by periodically checking the slave - devices to determine whether they have sent or received - traffic recently (the precise criteria depends upon the - bonding mode, and the state of the slave). Regular traffic is - generated via ARP probes issued for the addresses specified by - the arp_ip_target option. - - This behavior can be modified by the arp_validate option, - below. - - If ARP monitoring is used in an etherchannel compatible mode - (modes 0 and 2), the switch should be configured in a mode - that evenly distributes packets across all links. If the - switch is configured to distribute the packets in an XOR - fashion, all replies from the ARP targets will be received on - the same link which could cause the other team members to - fail. ARP monitoring should not be used in conjunction with - miimon. A value of 0 disables ARP monitoring. The default - value is 0. - -arp_ip_target - - Specifies the IP addresses to use as ARP monitoring peers when - arp_interval is > 0. These are the targets of the ARP request - sent to determine the health of the link to the targets. - Specify these values in ddd.ddd.ddd.ddd format. Multiple IP - addresses must be separated by a comma. At least one IP - address must be given for ARP monitoring to function. The - maximum number of targets that can be specified is 16. The - default value is no IP addresses. - -arp_validate - - Specifies whether or not ARP probes and replies should be - validated in the active-backup mode. This causes the ARP - monitor to examine the incoming ARP requests and replies, and - only consider a slave to be up if it is receiving the - appropriate ARP traffic. - - Possible values are: - - none or 0 - - No validation is performed. This is the default. - - active or 1 - - Validation is performed only for the active slave. - - backup or 2 - - Validation is performed only for backup slaves. - - all or 3 - - Validation is performed for all slaves. - - For the active slave, the validation checks ARP replies to - confirm that they were generated by an arp_ip_target. Since - backup slaves do not typically receive these replies, the - validation performed for backup slaves is on the ARP request - sent out via the active slave. It is possible that some - switch or network configurations may result in situations - wherein the backup slaves do not receive the ARP requests; in - such a situation, validation of backup slaves must be - disabled. - - This option is useful in network configurations in which - multiple bonding hosts are concurrently issuing ARPs to one or - more targets beyond a common switch. Should the link between - the switch and target fail (but not the switch itself), the - probe traffic generated by the multiple bonding instances will - fool the standard ARP monitor into considering the links as - still up. Use of the arp_validate option can resolve this, as - the ARP monitor will only consider ARP requests and replies - associated with its own instance of bonding. - - This option was added in bonding version 3.1.0. - -downdelay - - Specifies the time, in milliseconds, to wait before disabling - a slave after a link failure has been detected. This option - is only valid for the miimon link monitor. The downdelay - value should be a multiple of the miimon value; if not, it - will be rounded down to the nearest multiple. The default - value is 0. - -fail_over_mac - - Specifies whether active-backup mode should set all slaves to - the same MAC address at enslavement (the traditional - behavior), or, when enabled, perform special handling of the - bond's MAC address in accordance with the selected policy. - - Possible values are: - - none or 0 - - This setting disables fail_over_mac, and causes - bonding to set all slaves of an active-backup bond to - the same MAC address at enslavement time. This is the - default. - - active or 1 - - The "active" fail_over_mac policy indicates that the - MAC address of the bond should always be the MAC - address of the currently active slave. The MAC - address of the slaves is not changed; instead, the MAC - address of the bond changes during a failover. - - This policy is useful for devices that cannot ever - alter their MAC address, or for devices that refuse - incoming broadcasts with their own source MAC (which - interferes with the ARP monitor). - - The down side of this policy is that every device on - the network must be updated via gratuitous ARP, - vs. just updating a switch or set of switches (which - often takes place for any traffic, not just ARP - traffic, if the switch snoops incoming traffic to - update its tables) for the traditional method. If the - gratuitous ARP is lost, communication may be - disrupted. - - When this policy is used in conjuction with the mii - monitor, devices which assert link up prior to being - able to actually transmit and receive are particularly - susceptible to loss of the gratuitous ARP, and an - appropriate updelay setting may be required. - - follow or 2 - - The "follow" fail_over_mac policy causes the MAC - address of the bond to be selected normally (normally - the MAC address of the first slave added to the bond). - However, the second and subsequent slaves are not set - to this MAC address while they are in a backup role; a - slave is programmed with the bond's MAC address at - failover time (and the formerly active slave receives - the newly active slave's MAC address). - - This policy is useful for multiport devices that - either become confused or incur a performance penalty - when multiple ports are programmed with the same MAC - address. - - - The default policy is none, unless the first slave cannot - change its MAC address, in which case the active policy is - selected by default. - - This option may be modified via sysfs only when no slaves are - present in the bond. - - This option was added in bonding version 3.2.0. The "follow" - policy was added in bonding version 3.3.0. - -lacp_rate - - Option specifying the rate in which we'll ask our link partner - to transmit LACPDU packets in 802.3ad mode. Possible values - are: - - slow or 0 - Request partner to transmit LACPDUs every 30 seconds - - fast or 1 - Request partner to transmit LACPDUs every 1 second - - The default is slow. - -max_bonds - - Specifies the number of bonding devices to create for this - instance of the bonding driver. E.g., if max_bonds is 3, and - the bonding driver is not already loaded, then bond0, bond1 - and bond2 will be created. The default value is 1. Specifying - a value of 0 will load bonding, but will not create any devices. - -miimon - - Specifies the MII link monitoring frequency in milliseconds. - This determines how often the link state of each slave is - inspected for link failures. A value of zero disables MII - link monitoring. A value of 100 is a good starting point. - The use_carrier option, below, affects how the link state is - determined. See the High Availability section for additional - information. The default value is 0. - -mode - - Specifies one of the bonding policies. The default is - balance-rr (round robin). Possible values are: - - balance-rr or 0 - - Round-robin policy: Transmit packets in sequential - order from the first available slave through the - last. This mode provides load balancing and fault - tolerance. - - active-backup or 1 - - Active-backup policy: Only one slave in the bond is - active. A different slave becomes active if, and only - if, the active slave fails. The bond's MAC address is - externally visible on only one port (network adapter) - to avoid confusing the switch. - - In bonding version 2.6.2 or later, when a failover - occurs in active-backup mode, bonding will issue one - or more gratuitous ARPs on the newly active slave. - One gratuitous ARP is issued for the bonding master - interface and each VLAN interfaces configured above - it, provided that the interface has at least one IP - address configured. Gratuitous ARPs issued for VLAN - interfaces are tagged with the appropriate VLAN id. - - This mode provides fault tolerance. The primary - option, documented below, affects the behavior of this - mode. - - balance-xor or 2 - - XOR policy: Transmit based on the selected transmit - hash policy. The default policy is a simple [(source - MAC address XOR'd with destination MAC address) modulo - slave count]. Alternate transmit policies may be - selected via the xmit_hash_policy option, described - below. - - This mode provides load balancing and fault tolerance. - - broadcast or 3 - - Broadcast policy: transmits everything on all slave - interfaces. This mode provides fault tolerance. - - 802.3ad or 4 - - IEEE 802.3ad Dynamic link aggregation. Creates - aggregation groups that share the same speed and - duplex settings. Utilizes all slaves in the active - aggregator according to the 802.3ad specification. - - Slave selection for outgoing traffic is done according - to the transmit hash policy, which may be changed from - the default simple XOR policy via the xmit_hash_policy - option, documented below. Note that not all transmit - policies may be 802.3ad compliant, particularly in - regards to the packet mis-ordering requirements of - section 43.2.4 of the 802.3ad standard. Differing - peer implementations will have varying tolerances for - noncompliance. - - Prerequisites: - - 1. Ethtool support in the base drivers for retrieving - the speed and duplex of each slave. - - 2. A switch that supports IEEE 802.3ad Dynamic link - aggregation. - - Most switches will require some type of configuration - to enable 802.3ad mode. - - balance-tlb or 5 - - Adaptive transmit load balancing: channel bonding that - does not require any special switch support. The - outgoing traffic is distributed according to the - current load (computed relative to the speed) on each - slave. Incoming traffic is received by the current - slave. If the receiving slave fails, another slave - takes over the MAC address of the failed receiving - slave. - - Prerequisite: - - Ethtool support in the base drivers for retrieving the - speed of each slave. - - balance-alb or 6 - - Adaptive load balancing: includes balance-tlb plus - receive load balancing (rlb) for IPV4 traffic, and - does not require any special switch support. The - receive load balancing is achieved by ARP negotiation. - The bonding driver intercepts the ARP Replies sent by - the local system on their way out and overwrites the - source hardware address with the unique hardware - address of one of the slaves in the bond such that - different peers use different hardware addresses for - the server. - - Receive traffic from connections created by the server - is also balanced. When the local system sends an ARP - Request the bonding driver copies and saves the peer's - IP information from the ARP packet. When the ARP - Reply arrives from the peer, its hardware address is - retrieved and the bonding driver initiates an ARP - reply to this peer assigning it to one of the slaves - in the bond. A problematic outcome of using ARP - negotiation for balancing is that each time that an - ARP request is broadcast it uses the hardware address - of the bond. Hence, peers learn the hardware address - of the bond and the balancing of receive traffic - collapses to the current slave. This is handled by - sending updates (ARP Replies) to all the peers with - their individually assigned hardware address such that - the traffic is redistributed. Receive traffic is also - redistributed when a new slave is added to the bond - and when an inactive slave is re-activated. The - receive load is distributed sequentially (round robin) - among the group of highest speed slaves in the bond. - - When a link is reconnected or a new slave joins the - bond the receive traffic is redistributed among all - active slaves in the bond by initiating ARP Replies - with the selected MAC address to each of the - clients. The updelay parameter (detailed below) must - be set to a value equal or greater than the switch's - forwarding delay so that the ARP Replies sent to the - peers will not be blocked by the switch. - - Prerequisites: - - 1. Ethtool support in the base drivers for retrieving - the speed of each slave. - - 2. Base driver support for setting the hardware - address of a device while it is open. This is - required so that there will always be one slave in the - team using the bond hardware address (the - curr_active_slave) while having a unique hardware - address for each slave in the bond. If the - curr_active_slave fails its hardware address is - swapped with the new curr_active_slave that was - chosen. - -num_grat_arp - - Specifies the number of gratuitous ARPs to be issued after a - failover event. One gratuitous ARP is issued immediately after - the failover, subsequent ARPs are sent at a rate of one per link - monitor interval (arp_interval or miimon, whichever is active). - - The valid range is 0 - 255; the default value is 1. This option - affects only the active-backup mode. This option was added for - bonding version 3.3.0. - -num_unsol_na - - Specifies the number of unsolicited IPv6 Neighbor Advertisements - to be issued after a failover event. One unsolicited NA is issued - immediately after the failover. - - The valid range is 0 - 255; the default value is 1. This option - affects only the active-backup mode. This option was added for - bonding version 3.4.0. - -primary - - A string (eth0, eth2, etc) specifying which slave is the - primary device. The specified device will always be the - active slave while it is available. Only when the primary is - off-line will alternate devices be used. This is useful when - one slave is preferred over another, e.g., when one slave has - higher throughput than another. - - The primary option is only valid for active-backup mode. - -primary_reselect - - Specifies the reselection policy for the primary slave. This - affects how the primary slave is chosen to become the active slave - when failure of the active slave or recovery of the primary slave - occurs. This option is designed to prevent flip-flopping between - the primary slave and other slaves. Possible values are: - - always or 0 (default) - - The primary slave becomes the active slave whenever it - comes back up. - - better or 1 - - The primary slave becomes the active slave when it comes - back up, if the speed and duplex of the primary slave is - better than the speed and duplex of the current active - slave. - - failure or 2 - - The primary slave becomes the active slave only if the - current active slave fails and the primary slave is up. - - The primary_reselect setting is ignored in two cases: - - If no slaves are active, the first slave to recover is - made the active slave. - - When initially enslaved, the primary slave is always made - the active slave. - - Changing the primary_reselect policy via sysfs will cause an - immediate selection of the best active slave according to the new - policy. This may or may not result in a change of the active - slave, depending upon the circumstances. - - This option was added for bonding version 3.6.0. - -updelay - - Specifies the time, in milliseconds, to wait before enabling a - slave after a link recovery has been detected. This option is - only valid for the miimon link monitor. The updelay value - should be a multiple of the miimon value; if not, it will be - rounded down to the nearest multiple. The default value is 0. - -use_carrier - - Specifies whether or not miimon should use MII or ETHTOOL - ioctls vs. netif_carrier_ok() to determine the link - status. The MII or ETHTOOL ioctls are less efficient and - utilize a deprecated calling sequence within the kernel. The - netif_carrier_ok() relies on the device driver to maintain its - state with netif_carrier_on/off; at this writing, most, but - not all, device drivers support this facility. - - If bonding insists that the link is up when it should not be, - it may be that your network device driver does not support - netif_carrier_on/off. The default state for netif_carrier is - "carrier on," so if a driver does not support netif_carrier, - it will appear as if the link is always up. In this case, - setting use_carrier to 0 will cause bonding to revert to the - MII / ETHTOOL ioctl method to determine the link state. - - A value of 1 enables the use of netif_carrier_ok(), a value of - 0 will use the deprecated MII / ETHTOOL ioctls. The default - value is 1. - -xmit_hash_policy - - Selects the transmit hash policy to use for slave selection in - balance-xor and 802.3ad modes. Possible values are: - - layer2 - - Uses XOR of hardware MAC addresses to generate the - hash. The formula is - - (source MAC XOR destination MAC) modulo slave count - - This algorithm will place all traffic to a particular - network peer on the same slave. - - This algorithm is 802.3ad compliant. - - layer2+3 - - This policy uses a combination of layer2 and layer3 - protocol information to generate the hash. - - Uses XOR of hardware MAC addresses and IP addresses to - generate the hash. The formula is - - (((source IP XOR dest IP) AND 0xffff) XOR - ( source MAC XOR destination MAC )) - modulo slave count - - This algorithm will place all traffic to a particular - network peer on the same slave. For non-IP traffic, - the formula is the same as for the layer2 transmit - hash policy. - - This policy is intended to provide a more balanced - distribution of traffic than layer2 alone, especially - in environments where a layer3 gateway device is - required to reach most destinations. - - This algorithm is 802.3ad compliant. - - layer3+4 - - This policy uses upper layer protocol information, - when available, to generate the hash. This allows for - traffic to a particular network peer to span multiple - slaves, although a single connection will not span - multiple slaves. - - The formula for unfragmented TCP and UDP packets is - - ((source port XOR dest port) XOR - ((source IP XOR dest IP) AND 0xffff) - modulo slave count - - For fragmented TCP or UDP packets and all other IP - protocol traffic, the source and destination port - information is omitted. For non-IP traffic, the - formula is the same as for the layer2 transmit hash - policy. - - This policy is intended to mimic the behavior of - certain switches, notably Cisco switches with PFC2 as - well as some Foundry and IBM products. - - This algorithm is not fully 802.3ad compliant. A - single TCP or UDP conversation containing both - fragmented and unfragmented packets will see packets - striped across two interfaces. This may result in out - of order delivery. Most traffic types will not meet - this criteria, as TCP rarely fragments traffic, and - most UDP traffic is not involved in extended - conversations. Other implementations of 802.3ad may - or may not tolerate this noncompliance. - - The default value is layer2. This option was added in bonding - version 2.6.3. In earlier versions of bonding, this parameter - does not exist, and the layer2 policy is the only policy. The - layer2+3 value was added for bonding version 3.2.2. - - -3. Configuring Bonding Devices -============================== - - You can configure bonding using either your distro's network -initialization scripts, or manually using either ifenslave or the -sysfs interface. Distros generally use one of two packages for the -network initialization scripts: initscripts or sysconfig. Recent -versions of these packages have support for bonding, while older -versions do not. - - We will first describe the options for configuring bonding for -distros using versions of initscripts and sysconfig with full or -partial support for bonding, then provide information on enabling -bonding without support from the network initialization scripts (i.e., -older versions of initscripts or sysconfig). - - If you're unsure whether your distro uses sysconfig or -initscripts, or don't know if it's new enough, have no fear. -Determining this is fairly straightforward. - - First, issue the command: - -$ rpm -qf /sbin/ifup - - It will respond with a line of text starting with either -"initscripts" or "sysconfig," followed by some numbers. This is the -package that provides your network initialization scripts. - - Next, to determine if your installation supports bonding, -issue the command: - -$ grep ifenslave /sbin/ifup - - If this returns any matches, then your initscripts or -sysconfig has support for bonding. - -3.1 Configuration with Sysconfig Support ----------------------------------------- - - This section applies to distros using a version of sysconfig -with bonding support, for example, SuSE Linux Enterprise Server 9. - - SuSE SLES 9's networking configuration system does support -bonding, however, at this writing, the YaST system configuration -front end does not provide any means to work with bonding devices. -Bonding devices can be managed by hand, however, as follows. - - First, if they have not already been configured, configure the -slave devices. On SLES 9, this is most easily done by running the -yast2 sysconfig configuration utility. The goal is for to create an -ifcfg-id file for each slave device. The simplest way to accomplish -this is to configure the devices for DHCP (this is only to get the -file ifcfg-id file created; see below for some issues with DHCP). The -name of the configuration file for each device will be of the form: - -ifcfg-id-xx:xx:xx:xx:xx:xx - - Where the "xx" portion will be replaced with the digits from -the device's permanent MAC address. - - Once the set of ifcfg-id-xx:xx:xx:xx:xx:xx files has been -created, it is necessary to edit the configuration files for the slave -devices (the MAC addresses correspond to those of the slave devices). -Before editing, the file will contain multiple lines, and will look -something like this: - -BOOTPROTO='dhcp' -STARTMODE='on' -USERCTL='no' -UNIQUE='XNzu.WeZGOGF+4wE' -_nm_name='bus-pci-0001:61:01.0' - - Change the BOOTPROTO and STARTMODE lines to the following: - -BOOTPROTO='none' -STARTMODE='off' - - Do not alter the UNIQUE or _nm_name lines. Remove any other -lines (USERCTL, etc). - - Once the ifcfg-id-xx:xx:xx:xx:xx:xx files have been modified, -it's time to create the configuration file for the bonding device -itself. This file is named ifcfg-bondX, where X is the number of the -bonding device to create, starting at 0. The first such file is -ifcfg-bond0, the second is ifcfg-bond1, and so on. The sysconfig -network configuration system will correctly start multiple instances -of bonding. - - The contents of the ifcfg-bondX file is as follows: - -BOOTPROTO="static" -BROADCAST="10.0.2.255" -IPADDR="10.0.2.10" -NETMASK="255.255.0.0" -NETWORK="10.0.2.0" -REMOTE_IPADDR="" -STARTMODE="onboot" -BONDING_MASTER="yes" -BONDING_MODULE_OPTS="mode=active-backup miimon=100" -BONDING_SLAVE0="eth0" -BONDING_SLAVE1="bus-pci-0000:06:08.1" - - Replace the sample BROADCAST, IPADDR, NETMASK and NETWORK -values with the appropriate values for your network. - - The STARTMODE specifies when the device is brought online. -The possible values are: - - onboot: The device is started at boot time. If you're not - sure, this is probably what you want. - - manual: The device is started only when ifup is called - manually. Bonding devices may be configured this - way if you do not wish them to start automatically - at boot for some reason. - - hotplug: The device is started by a hotplug event. This is not - a valid choice for a bonding device. - - off or ignore: The device configuration is ignored. - - The line BONDING_MASTER='yes' indicates that the device is a -bonding master device. The only useful value is "yes." - - The contents of BONDING_MODULE_OPTS are supplied to the -instance of the bonding module for this device. Specify the options -for the bonding mode, link monitoring, and so on here. Do not include -the max_bonds bonding parameter; this will confuse the configuration -system if you have multiple bonding devices. - - Finally, supply one BONDING_SLAVEn="slave device" for each -slave. where "n" is an increasing value, one for each slave. The -"slave device" is either an interface name, e.g., "eth0", or a device -specifier for the network device. The interface name is easier to -find, but the ethN names are subject to change at boot time if, e.g., -a device early in the sequence has failed. The device specifiers -(bus-pci-0000:06:08.1 in the example above) specify the physical -network device, and will not change unless the device's bus location -changes (for example, it is moved from one PCI slot to another). The -example above uses one of each type for demonstration purposes; most -configurations will choose one or the other for all slave devices. - - When all configuration files have been modified or created, -networking must be restarted for the configuration changes to take -effect. This can be accomplished via the following: - -# /etc/init.d/network restart - - Note that the network control script (/sbin/ifdown) will -remove the bonding module as part of the network shutdown processing, -so it is not necessary to remove the module by hand if, e.g., the -module parameters have changed. - - Also, at this writing, YaST/YaST2 will not manage bonding -devices (they do not show bonding interfaces on its list of network -devices). It is necessary to edit the configuration file by hand to -change the bonding configuration. - - Additional general options and details of the ifcfg file -format can be found in an example ifcfg template file: - -/etc/sysconfig/network/ifcfg.template - - Note that the template does not document the various BONDING_ -settings described above, but does describe many of the other options. - -3.1.1 Using DHCP with Sysconfig -------------------------------- - - Under sysconfig, configuring a device with BOOTPROTO='dhcp' -will cause it to query DHCP for its IP address information. At this -writing, this does not function for bonding devices; the scripts -attempt to obtain the device address from DHCP prior to adding any of -the slave devices. Without active slaves, the DHCP requests are not -sent to the network. - -3.1.2 Configuring Multiple Bonds with Sysconfig ------------------------------------------------ - - The sysconfig network initialization system is capable of -handling multiple bonding devices. All that is necessary is for each -bonding instance to have an appropriately configured ifcfg-bondX file -(as described above). Do not specify the "max_bonds" parameter to any -instance of bonding, as this will confuse sysconfig. If you require -multiple bonding devices with identical parameters, create multiple -ifcfg-bondX files. - - Because the sysconfig scripts supply the bonding module -options in the ifcfg-bondX file, it is not necessary to add them to -the system /etc/modules.conf or /etc/modprobe.conf configuration file. - -3.2 Configuration with Initscripts Support ------------------------------------------- - - This section applies to distros using a recent version of -initscripts with bonding support, for example, Red Hat Enterprise Linux -version 3 or later, Fedora, etc. On these systems, the network -initialization scripts have knowledge of bonding, and can be configured to -control bonding devices. Note that older versions of the initscripts -package have lower levels of support for bonding; this will be noted where -applicable. - - These distros will not automatically load the network adapter -driver unless the ethX device is configured with an IP address. -Because of this constraint, users must manually configure a -network-script file for all physical adapters that will be members of -a bondX link. Network script files are located in the directory: - -/etc/sysconfig/network-scripts - - The file name must be prefixed with "ifcfg-eth" and suffixed -with the adapter's physical adapter number. For example, the script -for eth0 would be named /etc/sysconfig/network-scripts/ifcfg-eth0. -Place the following text in the file: - -DEVICE=eth0 -USERCTL=no -ONBOOT=yes -MASTER=bond0 -SLAVE=yes -BOOTPROTO=none - - The DEVICE= line will be different for every ethX device and -must correspond with the name of the file, i.e., ifcfg-eth1 must have -a device line of DEVICE=eth1. The setting of the MASTER= line will -also depend on the final bonding interface name chosen for your bond. -As with other network devices, these typically start at 0, and go up -one for each device, i.e., the first bonding instance is bond0, the -second is bond1, and so on. - - Next, create a bond network script. The file name for this -script will be /etc/sysconfig/network-scripts/ifcfg-bondX where X is -the number of the bond. For bond0 the file is named "ifcfg-bond0", -for bond1 it is named "ifcfg-bond1", and so on. Within that file, -place the following text: - -DEVICE=bond0 -IPADDR=192.168.1.1 -NETMASK=255.255.255.0 -NETWORK=192.168.1.0 -BROADCAST=192.168.1.255 -ONBOOT=yes -BOOTPROTO=none -USERCTL=no - - Be sure to change the networking specific lines (IPADDR, -NETMASK, NETWORK and BROADCAST) to match your network configuration. - - For later versions of initscripts, such as that found with Fedora -7 (or later) and Red Hat Enterprise Linux version 5 (or later), it is possible, -and, indeed, preferable, to specify the bonding options in the ifcfg-bond0 -file, e.g. a line of the format: - -BONDING_OPTS="mode=active-backup arp_interval=60 arp_ip_target=192.168.1.254" - - will configure the bond with the specified options. The options -specified in BONDING_OPTS are identical to the bonding module parameters -except for the arp_ip_target field when using versions of initscripts older -than and 8.57 (Fedora 8) and 8.45.19 (Red Hat Enterprise Linux 5.2). When -using older versions each target should be included as a separate option and -should be preceded by a '+' to indicate it should be added to the list of -queried targets, e.g., - - arp_ip_target=+192.168.1.1 arp_ip_target=+192.168.1.2 - - is the proper syntax to specify multiple targets. When specifying -options via BONDING_OPTS, it is not necessary to edit /etc/modules.conf or -/etc/modprobe.conf. - - For even older versions of initscripts that do not support -BONDING_OPTS, it is necessary to edit /etc/modules.conf (or -/etc/modprobe.conf, depending upon your distro) to load the bonding module -with your desired options when the bond0 interface is brought up. The -following lines in /etc/modules.conf (or modprobe.conf) will load the -bonding module, and select its options: - -alias bond0 bonding -options bond0 mode=balance-alb miimon=100 - - Replace the sample parameters with the appropriate set of -options for your configuration. - - Finally run "/etc/rc.d/init.d/network restart" as root. This -will restart the networking subsystem and your bond link should be now -up and running. - -3.2.1 Using DHCP with Initscripts ---------------------------------- - - Recent versions of initscripts (the versions supplied with Fedora -Core 3 and Red Hat Enterprise Linux 4, or later versions, are reported to -work) have support for assigning IP information to bonding devices via -DHCP. - - To configure bonding for DHCP, configure it as described -above, except replace the line "BOOTPROTO=none" with "BOOTPROTO=dhcp" -and add a line consisting of "TYPE=Bonding". Note that the TYPE value -is case sensitive. - -3.2.2 Configuring Multiple Bonds with Initscripts -------------------------------------------------- - - Initscripts packages that are included with Fedora 7 and Red Hat -Enterprise Linux 5 support multiple bonding interfaces by simply -specifying the appropriate BONDING_OPTS= in ifcfg-bondX where X is the -number of the bond. This support requires sysfs support in the kernel, -and a bonding driver of version 3.0.0 or later. Other configurations may -not support this method for specifying multiple bonding interfaces; for -those instances, see the "Configuring Multiple Bonds Manually" section, -below. - -3.3 Configuring Bonding Manually with Ifenslave ------------------------------------------------ - - This section applies to distros whose network initialization -scripts (the sysconfig or initscripts package) do not have specific -knowledge of bonding. One such distro is SuSE Linux Enterprise Server -version 8. - - The general method for these systems is to place the bonding -module parameters into /etc/modules.conf or /etc/modprobe.conf (as -appropriate for the installed distro), then add modprobe and/or -ifenslave commands to the system's global init script. The name of -the global init script differs; for sysconfig, it is -/etc/init.d/boot.local and for initscripts it is /etc/rc.d/rc.local. - - For example, if you wanted to make a simple bond of two e100 -devices (presumed to be eth0 and eth1), and have it persist across -reboots, edit the appropriate file (/etc/init.d/boot.local or -/etc/rc.d/rc.local), and add the following: - -modprobe bonding mode=balance-alb miimon=100 -modprobe e100 -ifconfig bond0 192.168.1.1 netmask 255.255.255.0 up -ifenslave bond0 eth0 -ifenslave bond0 eth1 - - Replace the example bonding module parameters and bond0 -network configuration (IP address, netmask, etc) with the appropriate -values for your configuration. - - Unfortunately, this method will not provide support for the -ifup and ifdown scripts on the bond devices. To reload the bonding -configuration, it is necessary to run the initialization script, e.g., - -# /etc/init.d/boot.local - - or - -# /etc/rc.d/rc.local - - It may be desirable in such a case to create a separate script -which only initializes the bonding configuration, then call that -separate script from within boot.local. This allows for bonding to be -enabled without re-running the entire global init script. - - To shut down the bonding devices, it is necessary to first -mark the bonding device itself as being down, then remove the -appropriate device driver modules. For our example above, you can do -the following: - -# ifconfig bond0 down -# rmmod bonding -# rmmod e100 - - Again, for convenience, it may be desirable to create a script -with these commands. - - -3.3.1 Configuring Multiple Bonds Manually ------------------------------------------ - - This section contains information on configuring multiple -bonding devices with differing options for those systems whose network -initialization scripts lack support for configuring multiple bonds. - - If you require multiple bonding devices, but all with the same -options, you may wish to use the "max_bonds" module parameter, -documented above. - - To create multiple bonding devices with differing options, it is -preferrable to use bonding parameters exported by sysfs, documented in the -section below. - - For versions of bonding without sysfs support, the only means to -provide multiple instances of bonding with differing options is to load -the bonding driver multiple times. Note that current versions of the -sysconfig network initialization scripts handle this automatically; if -your distro uses these scripts, no special action is needed. See the -section Configuring Bonding Devices, above, if you're not sure about your -network initialization scripts. - - To load multiple instances of the module, it is necessary to -specify a different name for each instance (the module loading system -requires that every loaded module, even multiple instances of the same -module, have a unique name). This is accomplished by supplying multiple -sets of bonding options in /etc/modprobe.conf, for example: - -alias bond0 bonding -options bond0 -o bond0 mode=balance-rr miimon=100 - -alias bond1 bonding -options bond1 -o bond1 mode=balance-alb miimon=50 - - will load the bonding module two times. The first instance is -named "bond0" and creates the bond0 device in balance-rr mode with an -miimon of 100. The second instance is named "bond1" and creates the -bond1 device in balance-alb mode with an miimon of 50. - - In some circumstances (typically with older distributions), -the above does not work, and the second bonding instance never sees -its options. In that case, the second options line can be substituted -as follows: - -install bond1 /sbin/modprobe --ignore-install bonding -o bond1 \ - mode=balance-alb miimon=50 - - This may be repeated any number of times, specifying a new and -unique name in place of bond1 for each subsequent instance. - - It has been observed that some Red Hat supplied kernels are unable -to rename modules at load time (the "-o bond1" part). Attempts to pass -that option to modprobe will produce an "Operation not permitted" error. -This has been reported on some Fedora Core kernels, and has been seen on -RHEL 4 as well. On kernels exhibiting this problem, it will be impossible -to configure multiple bonds with differing parameters (as they are older -kernels, and also lack sysfs support). - -3.4 Configuring Bonding Manually via Sysfs ------------------------------------------- - - Starting with version 3.0.0, Channel Bonding may be configured -via the sysfs interface. This interface allows dynamic configuration -of all bonds in the system without unloading the module. It also -allows for adding and removing bonds at runtime. Ifenslave is no -longer required, though it is still supported. - - Use of the sysfs interface allows you to use multiple bonds -with different configurations without having to reload the module. -It also allows you to use multiple, differently configured bonds when -bonding is compiled into the kernel. - - You must have the sysfs filesystem mounted to configure -bonding this way. The examples in this document assume that you -are using the standard mount point for sysfs, e.g. /sys. If your -sysfs filesystem is mounted elsewhere, you will need to adjust the -example paths accordingly. - -Creating and Destroying Bonds ------------------------------ -To add a new bond foo: -# echo +foo > /sys/class/net/bonding_masters - -To remove an existing bond bar: -# echo -bar > /sys/class/net/bonding_masters - -To show all existing bonds: -# cat /sys/class/net/bonding_masters - -NOTE: due to 4K size limitation of sysfs files, this list may be -truncated if you have more than a few hundred bonds. This is unlikely -to occur under normal operating conditions. - -Adding and Removing Slaves --------------------------- - Interfaces may be enslaved to a bond using the file -/sys/class/net//bonding/slaves. The semantics for this file -are the same as for the bonding_masters file. - -To enslave interface eth0 to bond bond0: -# ifconfig bond0 up -# echo +eth0 > /sys/class/net/bond0/bonding/slaves - -To free slave eth0 from bond bond0: -# echo -eth0 > /sys/class/net/bond0/bonding/slaves - - When an interface is enslaved to a bond, symlinks between the -two are created in the sysfs filesystem. In this case, you would get -/sys/class/net/bond0/slave_eth0 pointing to /sys/class/net/eth0, and -/sys/class/net/eth0/master pointing to /sys/class/net/bond0. - - This means that you can tell quickly whether or not an -interface is enslaved by looking for the master symlink. Thus: -# echo -eth0 > /sys/class/net/eth0/master/bonding/slaves -will free eth0 from whatever bond it is enslaved to, regardless of -the name of the bond interface. - -Changing a Bond's Configuration -------------------------------- - Each bond may be configured individually by manipulating the -files located in /sys/class/net//bonding - - The names of these files correspond directly with the command- -line parameters described elsewhere in this file, and, with the -exception of arp_ip_target, they accept the same values. To see the -current setting, simply cat the appropriate file. - - A few examples will be given here; for specific usage -guidelines for each parameter, see the appropriate section in this -document. - -To configure bond0 for balance-alb mode: -# ifconfig bond0 down -# echo 6 > /sys/class/net/bond0/bonding/mode - - or - -# echo balance-alb > /sys/class/net/bond0/bonding/mode - NOTE: The bond interface must be down before the mode can be -changed. - -To enable MII monitoring on bond0 with a 1 second interval: -# echo 1000 > /sys/class/net/bond0/bonding/miimon - NOTE: If ARP monitoring is enabled, it will disabled when MII -monitoring is enabled, and vice-versa. - -To add ARP targets: -# echo +192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target -# echo +192.168.0.101 > /sys/class/net/bond0/bonding/arp_ip_target - NOTE: up to 16 target addresses may be specified. - -To remove an ARP target: -# echo -192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target - -Example Configuration ---------------------- - We begin with the same example that is shown in section 3.3, -executed with sysfs, and without using ifenslave. - - To make a simple bond of two e100 devices (presumed to be eth0 -and eth1), and have it persist across reboots, edit the appropriate -file (/etc/init.d/boot.local or /etc/rc.d/rc.local), and add the -following: - -modprobe bonding -modprobe e100 -echo balance-alb > /sys/class/net/bond0/bonding/mode -ifconfig bond0 192.168.1.1 netmask 255.255.255.0 up -echo 100 > /sys/class/net/bond0/bonding/miimon -echo +eth0 > /sys/class/net/bond0/bonding/slaves -echo +eth1 > /sys/class/net/bond0/bonding/slaves - - To add a second bond, with two e1000 interfaces in -active-backup mode, using ARP monitoring, add the following lines to -your init script: - -modprobe e1000 -echo +bond1 > /sys/class/net/bonding_masters -echo active-backup > /sys/class/net/bond1/bonding/mode -ifconfig bond1 192.168.2.1 netmask 255.255.255.0 up -echo +192.168.2.100 /sys/class/net/bond1/bonding/arp_ip_target -echo 2000 > /sys/class/net/bond1/bonding/arp_interval -echo +eth2 > /sys/class/net/bond1/bonding/slaves -echo +eth3 > /sys/class/net/bond1/bonding/slaves - - -4. Querying Bonding Configuration -================================= - -4.1 Bonding Configuration -------------------------- - - Each bonding device has a read-only file residing in the -/proc/net/bonding directory. The file contents include information -about the bonding configuration, options and state of each slave. - - For example, the contents of /proc/net/bonding/bond0 after the -driver is loaded with parameters of mode=0 and miimon=1000 is -generally as follows: - - Ethernet Channel Bonding Driver: 2.6.1 (October 29, 2004) - Bonding Mode: load balancing (round-robin) - Currently Active Slave: eth0 - MII Status: up - MII Polling Interval (ms): 1000 - Up Delay (ms): 0 - Down Delay (ms): 0 - - Slave Interface: eth1 - MII Status: up - Link Failure Count: 1 - - Slave Interface: eth0 - MII Status: up - Link Failure Count: 1 - - The precise format and contents will change depending upon the -bonding configuration, state, and version of the bonding driver. - -4.2 Network configuration -------------------------- - - The network configuration can be inspected using the ifconfig -command. Bonding devices will have the MASTER flag set; Bonding slave -devices will have the SLAVE flag set. The ifconfig output does not -contain information on which slaves are associated with which masters. - - In the example below, the bond0 interface is the master -(MASTER) while eth0 and eth1 are slaves (SLAVE). Notice all slaves of -bond0 have the same MAC address (HWaddr) as bond0 for all modes except -TLB and ALB that require a unique MAC address for each slave. - -# /sbin/ifconfig -bond0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 - UP BROADCAST RUNNING MASTER MULTICAST MTU:1500 Metric:1 - RX packets:7224794 errors:0 dropped:0 overruns:0 frame:0 - TX packets:3286647 errors:1 dropped:0 overruns:1 carrier:0 - collisions:0 txqueuelen:0 - -eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 - RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0 - TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0 - collisions:0 txqueuelen:100 - Interrupt:10 Base address:0x1080 - -eth1 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 - UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 - RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0 - TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0 - collisions:0 txqueuelen:100 - Interrupt:9 Base address:0x1400 - -5. Switch Configuration -======================= - - For this section, "switch" refers to whatever system the -bonded devices are directly connected to (i.e., where the other end of -the cable plugs into). This may be an actual dedicated switch device, -or it may be another regular system (e.g., another computer running -Linux), - - The active-backup, balance-tlb and balance-alb modes do not -require any specific configuration of the switch. - - The 802.3ad mode requires that the switch have the appropriate -ports configured as an 802.3ad aggregation. The precise method used -to configure this varies from switch to switch, but, for example, a -Cisco 3550 series switch requires that the appropriate ports first be -grouped together in a single etherchannel instance, then that -etherchannel is set to mode "lacp" to enable 802.3ad (instead of -standard EtherChannel). - - The balance-rr, balance-xor and broadcast modes generally -require that the switch have the appropriate ports grouped together. -The nomenclature for such a group differs between switches, it may be -called an "etherchannel" (as in the Cisco example, above), a "trunk -group" or some other similar variation. For these modes, each switch -will also have its own configuration options for the switch's transmit -policy to the bond. Typical choices include XOR of either the MAC or -IP addresses. The transmit policy of the two peers does not need to -match. For these three modes, the bonding mode really selects a -transmit policy for an EtherChannel group; all three will interoperate -with another EtherChannel group. - - -6. 802.1q VLAN Support -====================== - - It is possible to configure VLAN devices over a bond interface -using the 8021q driver. However, only packets coming from the 8021q -driver and passing through bonding will be tagged by default. Self -generated packets, for example, bonding's learning packets or ARP -packets generated by either ALB mode or the ARP monitor mechanism, are -tagged internally by bonding itself. As a result, bonding must -"learn" the VLAN IDs configured above it, and use those IDs to tag -self generated packets. - - For reasons of simplicity, and to support the use of adapters -that can do VLAN hardware acceleration offloading, the bonding -interface declares itself as fully hardware offloading capable, it gets -the add_vid/kill_vid notifications to gather the necessary -information, and it propagates those actions to the slaves. In case -of mixed adapter types, hardware accelerated tagged packets that -should go through an adapter that is not offloading capable are -"un-accelerated" by the bonding driver so the VLAN tag sits in the -regular location. - - VLAN interfaces *must* be added on top of a bonding interface -only after enslaving at least one slave. The bonding interface has a -hardware address of 00:00:00:00:00:00 until the first slave is added. -If the VLAN interface is created prior to the first enslavement, it -would pick up the all-zeroes hardware address. Once the first slave -is attached to the bond, the bond device itself will pick up the -slave's hardware address, which is then available for the VLAN device. - - Also, be aware that a similar problem can occur if all slaves -are released from a bond that still has one or more VLAN interfaces on -top of it. When a new slave is added, the bonding interface will -obtain its hardware address from the first slave, which might not -match the hardware address of the VLAN interfaces (which was -ultimately copied from an earlier slave). - - There are two methods to insure that the VLAN device operates -with the correct hardware address if all slaves are removed from a -bond interface: - - 1. Remove all VLAN interfaces then recreate them - - 2. Set the bonding interface's hardware address so that it -matches the hardware address of the VLAN interfaces. - - Note that changing a VLAN interface's HW address would set the -underlying device -- i.e. the bonding interface -- to promiscuous -mode, which might not be what you want. - - -7. Link Monitoring -================== - - The bonding driver at present supports two schemes for -monitoring a slave device's link state: the ARP monitor and the MII -monitor. - - At the present time, due to implementation restrictions in the -bonding driver itself, it is not possible to enable both ARP and MII -monitoring simultaneously. - -7.1 ARP Monitor Operation -------------------------- - - The ARP monitor operates as its name suggests: it sends ARP -queries to one or more designated peer systems on the network, and -uses the response as an indication that the link is operating. This -gives some assurance that traffic is actually flowing to and from one -or more peers on the local network. - - The ARP monitor relies on the device driver itself to verify -that traffic is flowing. In particular, the driver must keep up to -date the last receive time, dev->last_rx, and transmit start time, -dev->trans_start. If these are not updated by the driver, then the -ARP monitor will immediately fail any slaves using that driver, and -those slaves will stay down. If networking monitoring (tcpdump, etc) -shows the ARP requests and replies on the network, then it may be that -your device driver is not updating last_rx and trans_start. - -7.2 Configuring Multiple ARP Targets ------------------------------------- - - While ARP monitoring can be done with just one target, it can -be useful in a High Availability setup to have several targets to -monitor. In the case of just one target, the target itself may go -down or have a problem making it unresponsive to ARP requests. Having -an additional target (or several) increases the reliability of the ARP -monitoring. - - Multiple ARP targets must be separated by commas as follows: - -# example options for ARP monitoring with three targets -alias bond0 bonding -options bond0 arp_interval=60 arp_ip_target=192.168.0.1,192.168.0.3,192.168.0.9 - - For just a single target the options would resemble: - -# example options for ARP monitoring with one target -alias bond0 bonding -options bond0 arp_interval=60 arp_ip_target=192.168.0.100 - - -7.3 MII Monitor Operation -------------------------- - - The MII monitor monitors only the carrier state of the local -network interface. It accomplishes this in one of three ways: by -depending upon the device driver to maintain its carrier state, by -querying the device's MII registers, or by making an ethtool query to -the device. - - If the use_carrier module parameter is 1 (the default value), -then the MII monitor will rely on the driver for carrier state -information (via the netif_carrier subsystem). As explained in the -use_carrier parameter information, above, if the MII monitor fails to -detect carrier loss on the device (e.g., when the cable is physically -disconnected), it may be that the driver does not support -netif_carrier. - - If use_carrier is 0, then the MII monitor will first query the -device's (via ioctl) MII registers and check the link state. If that -request fails (not just that it returns carrier down), then the MII -monitor will make an ethtool ETHOOL_GLINK request to attempt to obtain -the same information. If both methods fail (i.e., the driver either -does not support or had some error in processing both the MII register -and ethtool requests), then the MII monitor will assume the link is -up. - -8. Potential Sources of Trouble -=============================== - -8.1 Adventures in Routing -------------------------- - - When bonding is configured, it is important that the slave -devices not have routes that supersede routes of the master (or, -generally, not have routes at all). For example, suppose the bonding -device bond0 has two slaves, eth0 and eth1, and the routing table is -as follows: - -Kernel IP routing table -Destination Gateway Genmask Flags MSS Window irtt Iface -10.0.0.0 0.0.0.0 255.255.0.0 U 40 0 0 eth0 -10.0.0.0 0.0.0.0 255.255.0.0 U 40 0 0 eth1 -10.0.0.0 0.0.0.0 255.255.0.0 U 40 0 0 bond0 -127.0.0.0 0.0.0.0 255.0.0.0 U 40 0 0 lo - - This routing configuration will likely still update the -receive/transmit times in the driver (needed by the ARP monitor), but -may bypass the bonding driver (because outgoing traffic to, in this -case, another host on network 10 would use eth0 or eth1 before bond0). - - The ARP monitor (and ARP itself) may become confused by this -configuration, because ARP requests (generated by the ARP monitor) -will be sent on one interface (bond0), but the corresponding reply -will arrive on a different interface (eth0). This reply looks to ARP -as an unsolicited ARP reply (because ARP matches replies on an -interface basis), and is discarded. The MII monitor is not affected -by the state of the routing table. - - The solution here is simply to insure that slaves do not have -routes of their own, and if for some reason they must, those routes do -not supersede routes of their master. This should generally be the -case, but unusual configurations or errant manual or automatic static -route additions may cause trouble. - -8.2 Ethernet Device Renaming ----------------------------- - - On systems with network configuration scripts that do not -associate physical devices directly with network interface names (so -that the same physical device always has the same "ethX" name), it may -be necessary to add some special logic to either /etc/modules.conf or -/etc/modprobe.conf (depending upon which is installed on the system). - - For example, given a modules.conf containing the following: - -alias bond0 bonding -options bond0 mode=some-mode miimon=50 -alias eth0 tg3 -alias eth1 tg3 -alias eth2 e1000 -alias eth3 e1000 - - If neither eth0 and eth1 are slaves to bond0, then when the -bond0 interface comes up, the devices may end up reordered. This -happens because bonding is loaded first, then its slave device's -drivers are loaded next. Since no other drivers have been loaded, -when the e1000 driver loads, it will receive eth0 and eth1 for its -devices, but the bonding configuration tries to enslave eth2 and eth3 -(which may later be assigned to the tg3 devices). - - Adding the following: - -add above bonding e1000 tg3 - - causes modprobe to load e1000 then tg3, in that order, when -bonding is loaded. This command is fully documented in the -modules.conf manual page. - - On systems utilizing modprobe.conf (or modprobe.conf.local), -an equivalent problem can occur. In this case, the following can be -added to modprobe.conf (or modprobe.conf.local, as appropriate), as -follows (all on one line; it has been split here for clarity): - -install bonding /sbin/modprobe tg3; /sbin/modprobe e1000; - /sbin/modprobe --ignore-install bonding - - This will, when loading the bonding module, rather than -performing the normal action, instead execute the provided command. -This command loads the device drivers in the order needed, then calls -modprobe with --ignore-install to cause the normal action to then take -place. Full documentation on this can be found in the modprobe.conf -and modprobe manual pages. - -8.3. Painfully Slow Or No Failed Link Detection By Miimon ---------------------------------------------------------- - - By default, bonding enables the use_carrier option, which -instructs bonding to trust the driver to maintain carrier state. - - As discussed in the options section, above, some drivers do -not support the netif_carrier_on/_off link state tracking system. -With use_carrier enabled, bonding will always see these links as up, -regardless of their actual state. - - Additionally, other drivers do support netif_carrier, but do -not maintain it in real time, e.g., only polling the link state at -some fixed interval. In this case, miimon will detect failures, but -only after some long period of time has expired. If it appears that -miimon is very slow in detecting link failures, try specifying -use_carrier=0 to see if that improves the failure detection time. If -it does, then it may be that the driver checks the carrier state at a -fixed interval, but does not cache the MII register values (so the -use_carrier=0 method of querying the registers directly works). If -use_carrier=0 does not improve the failover, then the driver may cache -the registers, or the problem may be elsewhere. - - Also, remember that miimon only checks for the device's -carrier state. It has no way to determine the state of devices on or -beyond other ports of a switch, or if a switch is refusing to pass -traffic while still maintaining carrier on. - -9. SNMP agents -=============== - - If running SNMP agents, the bonding driver should be loaded -before any network drivers participating in a bond. This requirement -is due to the interface index (ipAdEntIfIndex) being associated to -the first interface found with a given IP address. That is, there is -only one ipAdEntIfIndex for each IP address. For example, if eth0 and -eth1 are slaves of bond0 and the driver for eth0 is loaded before the -bonding driver, the interface for the IP address will be associated -with the eth0 interface. This configuration is shown below, the IP -address 192.168.1.1 has an interface index of 2 which indexes to eth0 -in the ifDescr table (ifDescr.2). - - interfaces.ifTable.ifEntry.ifDescr.1 = lo - interfaces.ifTable.ifEntry.ifDescr.2 = eth0 - interfaces.ifTable.ifEntry.ifDescr.3 = eth1 - interfaces.ifTable.ifEntry.ifDescr.4 = eth2 - interfaces.ifTable.ifEntry.ifDescr.5 = eth3 - interfaces.ifTable.ifEntry.ifDescr.6 = bond0 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.10.10.10.10 = 5 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.192.168.1.1 = 2 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.10.74.20.94 = 4 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.127.0.0.1 = 1 - - This problem is avoided by loading the bonding driver before -any network drivers participating in a bond. Below is an example of -loading the bonding driver first, the IP address 192.168.1.1 is -correctly associated with ifDescr.2. - - interfaces.ifTable.ifEntry.ifDescr.1 = lo - interfaces.ifTable.ifEntry.ifDescr.2 = bond0 - interfaces.ifTable.ifEntry.ifDescr.3 = eth0 - interfaces.ifTable.ifEntry.ifDescr.4 = eth1 - interfaces.ifTable.ifEntry.ifDescr.5 = eth2 - interfaces.ifTable.ifEntry.ifDescr.6 = eth3 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.10.10.10.10 = 6 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.192.168.1.1 = 2 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.10.74.20.94 = 5 - ip.ipAddrTable.ipAddrEntry.ipAdEntIfIndex.127.0.0.1 = 1 - - While some distributions may not report the interface name in -ifDescr, the association between the IP address and IfIndex remains -and SNMP functions such as Interface_Scan_Next will report that -association. - -10. Promiscuous mode -==================== - - When running network monitoring tools, e.g., tcpdump, it is -common to enable promiscuous mode on the device, so that all traffic -is seen (instead of seeing only traffic destined for the local host). -The bonding driver handles promiscuous mode changes to the bonding -master device (e.g., bond0), and propagates the setting to the slave -devices. - - For the balance-rr, balance-xor, broadcast, and 802.3ad modes, -the promiscuous mode setting is propagated to all slaves. - - For the active-backup, balance-tlb and balance-alb modes, the -promiscuous mode setting is propagated only to the active slave. - - For balance-tlb mode, the active slave is the slave currently -receiving inbound traffic. - - For balance-alb mode, the active slave is the slave used as a -"primary." This slave is used for mode-specific control traffic, for -sending to peers that are unassigned or if the load is unbalanced. - - For the active-backup, balance-tlb and balance-alb modes, when -the active slave changes (e.g., due to a link failure), the -promiscuous setting will be propagated to the new active slave. - -11. Configuring Bonding for High Availability -============================================= - - High Availability refers to configurations that provide -maximum network availability by having redundant or backup devices, -links or switches between the host and the rest of the world. The -goal is to provide the maximum availability of network connectivity -(i.e., the network always works), even though other configurations -could provide higher throughput. - -11.1 High Availability in a Single Switch Topology --------------------------------------------------- - - If two hosts (or a host and a single switch) are directly -connected via multiple physical links, then there is no availability -penalty to optimizing for maximum bandwidth. In this case, there is -only one switch (or peer), so if it fails, there is no alternative -access to fail over to. Additionally, the bonding load balance modes -support link monitoring of their members, so if individual links fail, -the load will be rebalanced across the remaining devices. - - See Section 13, "Configuring Bonding for Maximum Throughput" -for information on configuring bonding with one peer device. - -11.2 High Availability in a Multiple Switch Topology ----------------------------------------------------- - - With multiple switches, the configuration of bonding and the -network changes dramatically. In multiple switch topologies, there is -a trade off between network availability and usable bandwidth. - - Below is a sample network, configured to maximize the -availability of the network: - - | | - |port3 port3| - +-----+----+ +-----+----+ - | |port2 ISL port2| | - | switch A +--------------------------+ switch B | - | | | | - +-----+----+ +-----++---+ - |port1 port1| - | +-------+ | - +-------------+ host1 +---------------+ - eth0 +-------+ eth1 - - In this configuration, there is a link between the two -switches (ISL, or inter switch link), and multiple ports connecting to -the outside world ("port3" on each switch). There is no technical -reason that this could not be extended to a third switch. - -11.2.1 HA Bonding Mode Selection for Multiple Switch Topology -------------------------------------------------------------- - - In a topology such as the example above, the active-backup and -broadcast modes are the only useful bonding modes when optimizing for -availability; the other modes require all links to terminate on the -same peer for them to behave rationally. - -active-backup: This is generally the preferred mode, particularly if - the switches have an ISL and play together well. If the - network configuration is such that one switch is specifically - a backup switch (e.g., has lower capacity, higher cost, etc), - then the primary option can be used to insure that the - preferred link is always used when it is available. - -broadcast: This mode is really a special purpose mode, and is suitable - only for very specific needs. For example, if the two - switches are not connected (no ISL), and the networks beyond - them are totally independent. In this case, if it is - necessary for some specific one-way traffic to reach both - independent networks, then the broadcast mode may be suitable. - -11.2.2 HA Link Monitoring Selection for Multiple Switch Topology ----------------------------------------------------------------- - - The choice of link monitoring ultimately depends upon your -switch. If the switch can reliably fail ports in response to other -failures, then either the MII or ARP monitors should work. For -example, in the above example, if the "port3" link fails at the remote -end, the MII monitor has no direct means to detect this. The ARP -monitor could be configured with a target at the remote end of port3, -thus detecting that failure without switch support. - - In general, however, in a multiple switch topology, the ARP -monitor can provide a higher level of reliability in detecting end to -end connectivity failures (which may be caused by the failure of any -individual component to pass traffic for any reason). Additionally, -the ARP monitor should be configured with multiple targets (at least -one for each switch in the network). This will insure that, -regardless of which switch is active, the ARP monitor has a suitable -target to query. - - Note, also, that of late many switches now support a functionality -generally referred to as "trunk failover." This is a feature of the -switch that causes the link state of a particular switch port to be set -down (or up) when the state of another switch port goes down (or up). -Its purpose is to propagate link failures from logically "exterior" ports -to the logically "interior" ports that bonding is able to monitor via -miimon. Availability and configuration for trunk failover varies by -switch, but this can be a viable alternative to the ARP monitor when using -suitable switches. - -12. Configuring Bonding for Maximum Throughput -============================================== - -12.1 Maximizing Throughput in a Single Switch Topology ------------------------------------------------------- - - In a single switch configuration, the best method to maximize -throughput depends upon the application and network environment. The -various load balancing modes each have strengths and weaknesses in -different environments, as detailed below. - - For this discussion, we will break down the topologies into -two categories. Depending upon the destination of most traffic, we -categorize them into either "gatewayed" or "local" configurations. - - In a gatewayed configuration, the "switch" is acting primarily -as a router, and the majority of traffic passes through this router to -other networks. An example would be the following: - - - +----------+ +----------+ - | |eth0 port1| | to other networks - | Host A +---------------------+ router +-------------------> - | +---------------------+ | Hosts B and C are out - | |eth1 port2| | here somewhere - +----------+ +----------+ - - The router may be a dedicated router device, or another host -acting as a gateway. For our discussion, the important point is that -the majority of traffic from Host A will pass through the router to -some other network before reaching its final destination. - - In a gatewayed network configuration, although Host A may -communicate with many other systems, all of its traffic will be sent -and received via one other peer on the local network, the router. - - Note that the case of two systems connected directly via -multiple physical links is, for purposes of configuring bonding, the -same as a gatewayed configuration. In that case, it happens that all -traffic is destined for the "gateway" itself, not some other network -beyond the gateway. - - In a local configuration, the "switch" is acting primarily as -a switch, and the majority of traffic passes through this switch to -reach other stations on the same network. An example would be the -following: - - +----------+ +----------+ +--------+ - | |eth0 port1| +-------+ Host B | - | Host A +------------+ switch |port3 +--------+ - | +------------+ | +--------+ - | |eth1 port2| +------------------+ Host C | - +----------+ +----------+port4 +--------+ - - - Again, the switch may be a dedicated switch device, or another -host acting as a gateway. For our discussion, the important point is -that the majority of traffic from Host A is destined for other hosts -on the same local network (Hosts B and C in the above example). - - In summary, in a gatewayed configuration, traffic to and from -the bonded device will be to the same MAC level peer on the network -(the gateway itself, i.e., the router), regardless of its final -destination. In a local configuration, traffic flows directly to and -from the final destinations, thus, each destination (Host B, Host C) -will be addressed directly by their individual MAC addresses. - - This distinction between a gatewayed and a local network -configuration is important because many of the load balancing modes -available use the MAC addresses of the local network source and -destination to make load balancing decisions. The behavior of each -mode is described below. - - -12.1.1 MT Bonding Mode Selection for Single Switch Topology ------------------------------------------------------------ - - This configuration is the easiest to set up and to understand, -although you will have to decide which bonding mode best suits your -needs. The trade offs for each mode are detailed below: - -balance-rr: This mode is the only mode that will permit a single - TCP/IP connection to stripe traffic across multiple - interfaces. It is therefore the only mode that will allow a - single TCP/IP stream to utilize more than one interface's - worth of throughput. This comes at a cost, however: the - striping generally results in peer systems receiving packets out - of order, causing TCP/IP's congestion control system to kick - in, often by retransmitting segments. - - It is possible to adjust TCP/IP's congestion limits by - altering the net.ipv4.tcp_reordering sysctl parameter. The - usual default value is 3, and the maximum useful value is 127. - For a four interface balance-rr bond, expect that a single - TCP/IP stream will utilize no more than approximately 2.3 - interface's worth of throughput, even after adjusting - tcp_reordering. - - Note that the fraction of packets that will be delivered out of - order is highly variable, and is unlikely to be zero. The level - of reordering depends upon a variety of factors, including the - networking interfaces, the switch, and the topology of the - configuration. Speaking in general terms, higher speed network - cards produce more reordering (due to factors such as packet - coalescing), and a "many to many" topology will reorder at a - higher rate than a "many slow to one fast" configuration. - - Many switches do not support any modes that stripe traffic - (instead choosing a port based upon IP or MAC level addresses); - for those devices, traffic for a particular connection flowing - through the switch to a balance-rr bond will not utilize greater - than one interface's worth of bandwidth. - - If you are utilizing protocols other than TCP/IP, UDP for - example, and your application can tolerate out of order - delivery, then this mode can allow for single stream datagram - performance that scales near linearly as interfaces are added - to the bond. - - This mode requires the switch to have the appropriate ports - configured for "etherchannel" or "trunking." - -active-backup: There is not much advantage in this network topology to - the active-backup mode, as the inactive backup devices are all - connected to the same peer as the primary. In this case, a - load balancing mode (with link monitoring) will provide the - same level of network availability, but with increased - available bandwidth. On the plus side, active-backup mode - does not require any configuration of the switch, so it may - have value if the hardware available does not support any of - the load balance modes. - -balance-xor: This mode will limit traffic such that packets destined - for specific peers will always be sent over the same - interface. Since the destination is determined by the MAC - addresses involved, this mode works best in a "local" network - configuration (as described above), with destinations all on - the same local network. This mode is likely to be suboptimal - if all your traffic is passed through a single router (i.e., a - "gatewayed" network configuration, as described above). - - As with balance-rr, the switch ports need to be configured for - "etherchannel" or "trunking." - -broadcast: Like active-backup, there is not much advantage to this - mode in this type of network topology. - -802.3ad: This mode can be a good choice for this type of network - topology. The 802.3ad mode is an IEEE standard, so all peers - that implement 802.3ad should interoperate well. The 802.3ad - protocol includes automatic configuration of the aggregates, - so minimal manual configuration of the switch is needed - (typically only to designate that some set of devices is - available for 802.3ad). The 802.3ad standard also mandates - that frames be delivered in order (within certain limits), so - in general single connections will not see misordering of - packets. The 802.3ad mode does have some drawbacks: the - standard mandates that all devices in the aggregate operate at - the same speed and duplex. Also, as with all bonding load - balance modes other than balance-rr, no single connection will - be able to utilize more than a single interface's worth of - bandwidth. - - Additionally, the linux bonding 802.3ad implementation - distributes traffic by peer (using an XOR of MAC addresses), - so in a "gatewayed" configuration, all outgoing traffic will - generally use the same device. Incoming traffic may also end - up on a single device, but that is dependent upon the - balancing policy of the peer's 8023.ad implementation. In a - "local" configuration, traffic will be distributed across the - devices in the bond. - - Finally, the 802.3ad mode mandates the use of the MII monitor, - therefore, the ARP monitor is not available in this mode. - -balance-tlb: The balance-tlb mode balances outgoing traffic by peer. - Since the balancing is done according to MAC address, in a - "gatewayed" configuration (as described above), this mode will - send all traffic across a single device. However, in a - "local" network configuration, this mode balances multiple - local network peers across devices in a vaguely intelligent - manner (not a simple XOR as in balance-xor or 802.3ad mode), - so that mathematically unlucky MAC addresses (i.e., ones that - XOR to the same value) will not all "bunch up" on a single - interface. - - Unlike 802.3ad, interfaces may be of differing speeds, and no - special switch configuration is required. On the down side, - in this mode all incoming traffic arrives over a single - interface, this mode requires certain ethtool support in the - network device driver of the slave interfaces, and the ARP - monitor is not available. - -balance-alb: This mode is everything that balance-tlb is, and more. - It has all of the features (and restrictions) of balance-tlb, - and will also balance incoming traffic from local network - peers (as described in the Bonding Module Options section, - above). - - The only additional down side to this mode is that the network - device driver must support changing the hardware address while - the device is open. - -12.1.2 MT Link Monitoring for Single Switch Topology ----------------------------------------------------- - - The choice of link monitoring may largely depend upon which -mode you choose to use. The more advanced load balancing modes do not -support the use of the ARP monitor, and are thus restricted to using -the MII monitor (which does not provide as high a level of end to end -assurance as the ARP monitor). - -12.2 Maximum Throughput in a Multiple Switch Topology ------------------------------------------------------ - - Multiple switches may be utilized to optimize for throughput -when they are configured in parallel as part of an isolated network -between two or more systems, for example: - - +-----------+ - | Host A | - +-+---+---+-+ - | | | - +--------+ | +---------+ - | | | - +------+---+ +-----+----+ +-----+----+ - | Switch A | | Switch B | | Switch C | - +------+---+ +-----+----+ +-----+----+ - | | | - +--------+ | +---------+ - | | | - +-+---+---+-+ - | Host B | - +-----------+ - - In this configuration, the switches are isolated from one -another. One reason to employ a topology such as this is for an -isolated network with many hosts (a cluster configured for high -performance, for example), using multiple smaller switches can be more -cost effective than a single larger switch, e.g., on a network with 24 -hosts, three 24 port switches can be significantly less expensive than -a single 72 port switch. - - If access beyond the network is required, an individual host -can be equipped with an additional network device connected to an -external network; this host then additionally acts as a gateway. - -12.2.1 MT Bonding Mode Selection for Multiple Switch Topology -------------------------------------------------------------- - - In actual practice, the bonding mode typically employed in -configurations of this type is balance-rr. Historically, in this -network configuration, the usual caveats about out of order packet -delivery are mitigated by the use of network adapters that do not do -any kind of packet coalescing (via the use of NAPI, or because the -device itself does not generate interrupts until some number of -packets has arrived). When employed in this fashion, the balance-rr -mode allows individual connections between two hosts to effectively -utilize greater than one interface's bandwidth. - -12.2.2 MT Link Monitoring for Multiple Switch Topology ------------------------------------------------------- - - Again, in actual practice, the MII monitor is most often used -in this configuration, as performance is given preference over -availability. The ARP monitor will function in this topology, but its -advantages over the MII monitor are mitigated by the volume of probes -needed as the number of systems involved grows (remember that each -host in the network is configured with bonding). - -13. Switch Behavior Issues -========================== - -13.1 Link Establishment and Failover Delays -------------------------------------------- - - Some switches exhibit undesirable behavior with regard to the -timing of link up and down reporting by the switch. - - First, when a link comes up, some switches may indicate that -the link is up (carrier available), but not pass traffic over the -interface for some period of time. This delay is typically due to -some type of autonegotiation or routing protocol, but may also occur -during switch initialization (e.g., during recovery after a switch -failure). If you find this to be a problem, specify an appropriate -value to the updelay bonding module option to delay the use of the -relevant interface(s). - - Second, some switches may "bounce" the link state one or more -times while a link is changing state. This occurs most commonly while -the switch is initializing. Again, an appropriate updelay value may -help. - - Note that when a bonding interface has no active links, the -driver will immediately reuse the first link that goes up, even if the -updelay parameter has been specified (the updelay is ignored in this -case). If there are slave interfaces waiting for the updelay timeout -to expire, the interface that first went into that state will be -immediately reused. This reduces down time of the network if the -value of updelay has been overestimated, and since this occurs only in -cases with no connectivity, there is no additional penalty for -ignoring the updelay. - - In addition to the concerns about switch timings, if your -switches take a long time to go into backup mode, it may be desirable -to not activate a backup interface immediately after a link goes down. -Failover may be delayed via the downdelay bonding module option. - -13.2 Duplicated Incoming Packets --------------------------------- - - NOTE: Starting with version 3.0.2, the bonding driver has logic to -suppress duplicate packets, which should largely eliminate this problem. -The following description is kept for reference. - - It is not uncommon to observe a short burst of duplicated -traffic when the bonding device is first used, or after it has been -idle for some period of time. This is most easily observed by issuing -a "ping" to some other host on the network, and noticing that the -output from ping flags duplicates (typically one per slave). - - For example, on a bond in active-backup mode with five slaves -all connected to one switch, the output may appear as follows: - -# ping -n 10.0.4.2 -PING 10.0.4.2 (10.0.4.2) from 10.0.3.10 : 56(84) bytes of data. -64 bytes from 10.0.4.2: icmp_seq=1 ttl=64 time=13.7 ms -64 bytes from 10.0.4.2: icmp_seq=1 ttl=64 time=13.8 ms (DUP!) -64 bytes from 10.0.4.2: icmp_seq=1 ttl=64 time=13.8 ms (DUP!) -64 bytes from 10.0.4.2: icmp_seq=1 ttl=64 time=13.8 ms (DUP!) -64 bytes from 10.0.4.2: icmp_seq=1 ttl=64 time=13.8 ms (DUP!) -64 bytes from 10.0.4.2: icmp_seq=2 ttl=64 time=0.216 ms -64 bytes from 10.0.4.2: icmp_seq=3 ttl=64 time=0.267 ms -64 bytes from 10.0.4.2: icmp_seq=4 ttl=64 time=0.222 ms - - This is not due to an error in the bonding driver, rather, it -is a side effect of how many switches update their MAC forwarding -tables. Initially, the switch does not associate the MAC address in -the packet with a particular switch port, and so it may send the -traffic to all ports until its MAC forwarding table is updated. Since -the interfaces attached to the bond may occupy multiple ports on a -single switch, when the switch (temporarily) floods the traffic to all -ports, the bond device receives multiple copies of the same packet -(one per slave device). - - The duplicated packet behavior is switch dependent, some -switches exhibit this, and some do not. On switches that display this -behavior, it can be induced by clearing the MAC forwarding table (on -most Cisco switches, the privileged command "clear mac address-table -dynamic" will accomplish this). - -14. Hardware Specific Considerations -==================================== - - This section contains additional information for configuring -bonding on specific hardware platforms, or for interfacing bonding -with particular switches or other devices. - -14.1 IBM BladeCenter --------------------- - - This applies to the JS20 and similar systems. - - On the JS20 blades, the bonding driver supports only -balance-rr, active-backup, balance-tlb and balance-alb modes. This is -largely due to the network topology inside the BladeCenter, detailed -below. - -JS20 network adapter information --------------------------------- - - All JS20s come with two Broadcom Gigabit Ethernet ports -integrated on the planar (that's "motherboard" in IBM-speak). In the -BladeCenter chassis, the eth0 port of all JS20 blades is hard wired to -I/O Module #1; similarly, all eth1 ports are wired to I/O Module #2. -An add-on Broadcom daughter card can be installed on a JS20 to provide -two more Gigabit Ethernet ports. These ports, eth2 and eth3, are -wired to I/O Modules 3 and 4, respectively. - - Each I/O Module may contain either a switch or a passthrough -module (which allows ports to be directly connected to an external -switch). Some bonding modes require a specific BladeCenter internal -network topology in order to function; these are detailed below. - - Additional BladeCenter-specific networking information can be -found in two IBM Redbooks (www.ibm.com/redbooks): - -"IBM eServer BladeCenter Networking Options" -"IBM eServer BladeCenter Layer 2-7 Network Switching" - -BladeCenter networking configuration ------------------------------------- - - Because a BladeCenter can be configured in a very large number -of ways, this discussion will be confined to describing basic -configurations. - - Normally, Ethernet Switch Modules (ESMs) are used in I/O -modules 1 and 2. In this configuration, the eth0 and eth1 ports of a -JS20 will be connected to different internal switches (in the -respective I/O modules). - - A passthrough module (OPM or CPM, optical or copper, -passthrough module) connects the I/O module directly to an external -switch. By using PMs in I/O module #1 and #2, the eth0 and eth1 -interfaces of a JS20 can be redirected to the outside world and -connected to a common external switch. - - Depending upon the mix of ESMs and PMs, the network will -appear to bonding as either a single switch topology (all PMs) or as a -multiple switch topology (one or more ESMs, zero or more PMs). It is -also possible to connect ESMs together, resulting in a configuration -much like the example in "High Availability in a Multiple Switch -Topology," above. - -Requirements for specific modes -------------------------------- - - The balance-rr mode requires the use of passthrough modules -for devices in the bond, all connected to an common external switch. -That switch must be configured for "etherchannel" or "trunking" on the -appropriate ports, as is usual for balance-rr. - - The balance-alb and balance-tlb modes will function with -either switch modules or passthrough modules (or a mix). The only -specific requirement for these modes is that all network interfaces -must be able to reach all destinations for traffic sent over the -bonding device (i.e., the network must converge at some point outside -the BladeCenter). - - The active-backup mode has no additional requirements. - -Link monitoring issues ----------------------- - - When an Ethernet Switch Module is in place, only the ARP -monitor will reliably detect link loss to an external switch. This is -nothing unusual, but examination of the BladeCenter cabinet would -suggest that the "external" network ports are the ethernet ports for -the system, when it fact there is a switch between these "external" -ports and the devices on the JS20 system itself. The MII monitor is -only able to detect link failures between the ESM and the JS20 system. - - When a passthrough module is in place, the MII monitor does -detect failures to the "external" port, which is then directly -connected to the JS20 system. - -Other concerns --------------- - - The Serial Over LAN (SoL) link is established over the primary -ethernet (eth0) only, therefore, any loss of link to eth0 will result -in losing your SoL connection. It will not fail over with other -network traffic, as the SoL system is beyond the control of the -bonding driver. - - It may be desirable to disable spanning tree on the switch -(either the internal Ethernet Switch Module, or an external switch) to -avoid fail-over delay issues when using bonding. - - -15. Frequently Asked Questions -============================== - -1. Is it SMP safe? - - Yes. The old 2.0.xx channel bonding patch was not SMP safe. -The new driver was designed to be SMP safe from the start. - -2. What type of cards will work with it? - - Any Ethernet type cards (you can even mix cards - a Intel -EtherExpress PRO/100 and a 3com 3c905b, for example). For most modes, -devices need not be of the same speed. - - Starting with version 3.2.1, bonding also supports Infiniband -slaves in active-backup mode. - -3. How many bonding devices can I have? - - There is no limit. - -4. How many slaves can a bonding device have? - - This is limited only by the number of network interfaces Linux -supports and/or the number of network cards you can place in your -system. - -5. What happens when a slave link dies? - - If link monitoring is enabled, then the failing device will be -disabled. The active-backup mode will fail over to a backup link, and -other modes will ignore the failed link. The link will continue to be -monitored, and should it recover, it will rejoin the bond (in whatever -manner is appropriate for the mode). See the sections on High -Availability and the documentation for each mode for additional -information. - - Link monitoring can be enabled via either the miimon or -arp_interval parameters (described in the module parameters section, -above). In general, miimon monitors the carrier state as sensed by -the underlying network device, and the arp monitor (arp_interval) -monitors connectivity to another host on the local network. - - If no link monitoring is configured, the bonding driver will -be unable to detect link failures, and will assume that all links are -always available. This will likely result in lost packets, and a -resulting degradation of performance. The precise performance loss -depends upon the bonding mode and network configuration. - -6. Can bonding be used for High Availability? - - Yes. See the section on High Availability for details. - -7. Which switches/systems does it work with? - - The full answer to this depends upon the desired mode. - - In the basic balance modes (balance-rr and balance-xor), it -works with any system that supports etherchannel (also called -trunking). Most managed switches currently available have such -support, and many unmanaged switches as well. - - The advanced balance modes (balance-tlb and balance-alb) do -not have special switch requirements, but do need device drivers that -support specific features (described in the appropriate section under -module parameters, above). - - In 802.3ad mode, it works with systems that support IEEE -802.3ad Dynamic Link Aggregation. Most managed and many unmanaged -switches currently available support 802.3ad. - - The active-backup mode should work with any Layer-II switch. - -8. Where does a bonding device get its MAC address from? - - When using slave devices that have fixed MAC addresses, or when -the fail_over_mac option is enabled, the bonding device's MAC address is -the MAC address of the active slave. - - For other configurations, if not explicitly configured (with -ifconfig or ip link), the MAC address of the bonding device is taken from -its first slave device. This MAC address is then passed to all following -slaves and remains persistent (even if the first slave is removed) until -the bonding device is brought down or reconfigured. - - If you wish to change the MAC address, you can set it with -ifconfig or ip link: - -# ifconfig bond0 hw ether 00:11:22:33:44:55 - -# ip link set bond0 address 66:77:88:99:aa:bb - - The MAC address can be also changed by bringing down/up the -device and then changing its slaves (or their order): - -# ifconfig bond0 down ; modprobe -r bonding -# ifconfig bond0 .... up -# ifenslave bond0 eth... - - This method will automatically take the address from the next -slave that is added. - - To restore your slaves' MAC addresses, you need to detach them -from the bond (`ifenslave -d bond0 eth0'). The bonding driver will -then restore the MAC addresses that the slaves had before they were -enslaved. - -16. Resources and Links -======================= - -The latest version of the bonding driver can be found in the latest -version of the linux kernel, found on http://kernel.org - -The latest version of this document can be found in either the latest -kernel source (named Documentation/networking/bonding.txt), or on the -bonding sourceforge site: - -http://www.sourceforge.net/projects/bonding - -Discussions regarding the bonding driver take place primarily on the -bonding-devel mailing list, hosted at sourceforge.net. If you have -questions or problems, post them to the list. The list address is: - -bonding-devel@lists.sourceforge.net - - The administrative interface (to subscribe or unsubscribe) can -be found at: - -https://lists.sourceforge.net/lists/listinfo/bonding-devel - -Donald Becker's Ethernet Drivers and diag programs may be found at : - - http://www.scyld.com/network/ - -You will also find a lot of information regarding Ethernet, NWay, MII, -etc. at www.scyld.com. - --- END -- diff --git a/system/base/iputils/files/ifenslave/ifenslave.8 b/system/base/iputils/files/ifenslave/ifenslave.8 deleted file mode 100644 index 89998923..00000000 --- a/system/base/iputils/files/ifenslave/ifenslave.8 +++ /dev/null @@ -1,68 +0,0 @@ -.Dd 2004-04-09 -.Dt IFENSLAVE 8 -.\" Manual page created by Guus Sliepen -.Sh NAME -.Nm ifenslave -.Nd Attach and detach slave network devices to a bonding device. -.Sh SYNOPSIS -.Nm -.Op Fl acdfhuvV -.Op Fl -all-interfaces -.Op Fl -change-active -.Op Fl -detach -.Op Fl -force -.Op Fl -help -.Op Fl -usage -.Op Fl -verbose -.Op Fl -version -.Ar master -.Ar slave -.No ... -.Sh DESCRIPTION -.Nm -is a tool to attach and detach slave network devices to a bonding device. -A bonding device will act like a normal Ethernet network device to the kernel, -but will send out the packets via the slave devices using a simple round-robin scheduler. -This allows for simple load-balancing, -identical to "channel bonding" or "trunking" techniques used in switches. -.Pp -The kernel must have support for bonding devices for -.Nm -to be useful. -.Sh OPTIONS -.Bl -tag -width indent -.It Fl a, -all-interfaces -Show information about all interfaces. -.It Fl c, -change-active -Change active slave. -.It Fl d, -detach -Removes slave interfaces from the bonding device. -.It Fl f, -force -Force actions to be taken if one of the specified interfaces appears not to belong to an Ethernet device. -.It Fl h, -help -Display a help message and exit. -.It Fl u, -usage -Show usage information and exit. -.It Fl v, -verbose -Print warning and debug messages. -.It Fl V, -version -Show version information and exit. -.El -If not options are given, the default action will be to enslave interfaces. -.Sh EXAMPLE -The following example shows how to setup a bonding device and -enslave two real Ethernet devices to it: -.Bd -literal -# modprobe bonding -# ifconfig bond0 192.168.0.1 netmask 255.255.0.0 -# ifenslave bond0 eth0 eth1 -.Ed -.Sh AUTHOR -.Nm -was originally written by -.An Donald Becker Aq becker@cesdis.gsfc.nasa.gov , -and has since been updated by various kernel developers. -.Pp -This manual page was written by -.An Guus Sliepen Aq guus@debian.org -for the Debian GNU/Linux system. diff --git a/system/base/iputils/files/ifenslave/ifenslave.c b/system/base/iputils/files/ifenslave/ifenslave.c deleted file mode 100644 index bd375058..00000000 --- a/system/base/iputils/files/ifenslave/ifenslave.c +++ /dev/null @@ -1,1103 +0,0 @@ -/* Mode: C; - * ifenslave.c: Configure network interfaces for parallel routing. - * - * This program controls the Linux implementation of running multiple - * network interfaces in parallel. - * - * Author: Donald Becker - * Copyright 1994-1996 Donald Becker - * - * 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. - * - * The author may be reached as becker@CESDIS.gsfc.nasa.gov, or C/O - * Center of Excellence in Space Data and Information Sciences - * Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771 - * - * Changes : - * - 2000/10/02 Willy Tarreau : - * - few fixes. Master's MAC address is now correctly taken from - * the first device when not previously set ; - * - detach support : call BOND_RELEASE to detach an enslaved interface. - * - give a mini-howto from command-line help : # ifenslave -h - * - * - 2001/02/16 Chad N. Tindel : - * - Master is now brought down before setting the MAC address. In - * the 2.4 kernel you can't change the MAC address while the device is - * up because you get EBUSY. - * - * - 2001/09/13 Takao Indoh - * - Added the ability to change the active interface on a mode 1 bond - * at runtime. - * - * - 2001/10/23 Chad N. Tindel : - * - No longer set the MAC address of the master. The bond device will - * take care of this itself - * - Try the SIOC*** versions of the bonding ioctls before using the - * old versions - * - 2002/02/18 Erik Habbinga : - * - ifr2.ifr_flags was not initialized in the hwaddr_notset case, - * SIOCGIFFLAGS now called before hwaddr_notset test - * - * - 2002/10/31 Tony Cureington : - * - If the master does not have a hardware address when the first slave - * is enslaved, the master is assigned the hardware address of that - * slave - there is a comment in bonding.c stating "ifenslave takes - * care of this now." This corrects the problem of slaves having - * different hardware addresses in active-backup mode when - * multiple interfaces are specified on a single ifenslave command - * (ifenslave bond0 eth0 eth1). - * - * - 2003/03/18 - Tsippy Mendelson and - * Shmulik Hen - * - Moved setting the slave's mac address and openning it, from - * the application to the driver. This enables support of modes - * that need to use the unique mac address of each slave. - * The driver also takes care of closing the slave and restoring its - * original mac address upon release. - * In addition, block possibility of enslaving before the master is up. - * This prevents putting the system in an undefined state. - * - * - 2003/05/01 - Amir Noam - * - Added ABI version control to restore compatibility between - * new/old ifenslave and new/old bonding. - * - Prevent adding an adapter that is already a slave. - * Fixes the problem of stalling the transmission and leaving - * the slave in a down state. - * - * - 2003/05/01 - Shmulik Hen - * - Prevent enslaving if the bond device is down. - * Fixes the problem of leaving the system in unstable state and - * halting when trying to remove the module. - * - Close socket on all abnormal exists. - * - Add versioning scheme that follows that of the bonding driver. - * current version is 1.0.0 as a base line. - * - * - 2003/05/22 - Jay Vosburgh - * - ifenslave -c was broken; it's now fixed - * - Fixed problem with routes vanishing from master during enslave - * processing. - * - * - 2003/05/27 - Amir Noam - * - Fix backward compatibility issues: - * For drivers not using ABI versions, slave was set down while - * it should be left up before enslaving. - * Also, master was not set down and the default set_mac_address() - * would fail and generate an error message in the system log. - * - For opt_c: slave should not be set to the master's setting - * while it is running. It was already set during enslave. To - * simplify things, it is now handled separately. - * - * - 2003/12/01 - Shmulik Hen - * - Code cleanup and style changes - * set version to 1.1.0 - */ - -#define APP_VERSION "1.1.0" -#define APP_RELDATE "December 1, 2003" -#define APP_NAME "ifenslave" - -static char *version = -APP_NAME ".c:v" APP_VERSION " (" APP_RELDATE ")\n" -"o Donald Becker (becker@cesdis.gsfc.nasa.gov).\n" -"o Detach support added on 2000/10/02 by Willy Tarreau (willy at meta-x.org).\n" -"o 2.4 kernel support added on 2001/02/16 by Chad N. Tindel\n" -" (ctindel at ieee dot org).\n"; - -static const char *usage_msg = -"Usage: ifenslave [-f] [...]\n" -" ifenslave -d [...]\n" -" ifenslave -c \n" -" ifenslave --help\n"; - -static const char *help_msg = -"\n" -" To create a bond device, simply follow these three steps :\n" -" - ensure that the required drivers are properly loaded :\n" -" # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n" -" - assign an IP address to the bond device :\n" -" # ifconfig bond0 netmask broadcast \n" -" - attach all the interfaces you need to the bond device :\n" -" # ifenslave [{-f|--force}] bond0 eth0 [eth1 [eth2]...]\n" -" If bond0 didn't have a MAC address, it will take eth0's. Then, all\n" -" interfaces attached AFTER this assignment will get the same MAC addr.\n" -" (except for ALB/TLB modes)\n" -"\n" -" To set the bond device down and automatically release all the slaves :\n" -" # ifconfig bond0 down\n" -"\n" -" To detach a dead interface without setting the bond device down :\n" -" # ifenslave {-d|--detach} bond0 eth0 [eth1 [eth2]...]\n" -"\n" -" To change active slave :\n" -" # ifenslave {-c|--change-active} bond0 eth0\n" -"\n" -" To show master interface info\n" -" # ifenslave bond0\n" -"\n" -" To show all interfaces info\n" -" # ifenslave {-a|--all-interfaces}\n" -"\n" -" To be more verbose\n" -" # ifenslave {-v|--verbose} ...\n" -"\n" -" # ifenslave {-u|--usage} Show usage\n" -" # ifenslave {-V|--version} Show version\n" -" # ifenslave {-h|--help} This message\n" -"\n"; - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */ -typedef __uint32_t u32; /* ditto */ -typedef __uint16_t u16; /* ditto */ -typedef __uint8_t u8; /* ditto */ -#include - -struct option longopts[] = { - /* { name has_arg *flag val } */ - {"all-interfaces", 0, 0, 'a'}, /* Show all interfaces. */ - {"change-active", 0, 0, 'c'}, /* Change the active slave. */ - {"detach", 0, 0, 'd'}, /* Detach a slave interface. */ - {"force", 0, 0, 'f'}, /* Force the operation. */ - {"help", 0, 0, 'h'}, /* Give help */ - {"usage", 0, 0, 'u'}, /* Give usage */ - {"verbose", 0, 0, 'v'}, /* Report each action taken. */ - {"version", 0, 0, 'V'}, /* Emit version information. */ - { 0, 0, 0, 0} -}; - -/* Command-line flags. */ -unsigned int -opt_a = 0, /* Show-all-interfaces flag. */ -opt_c = 0, /* Change-active-slave flag. */ -opt_d = 0, /* Detach a slave interface. */ -opt_f = 0, /* Force the operation. */ -opt_h = 0, /* Help */ -opt_u = 0, /* Usage */ -opt_v = 0, /* Verbose flag. */ -opt_V = 0; /* Version */ - -int skfd = -1; /* AF_INET socket for ioctl() calls.*/ -int abi_ver = 0; /* userland - kernel ABI version */ -int hwaddr_set = 0; /* Master's hwaddr is set */ -int saved_errno; - -struct ifreq master_mtu, master_flags, master_hwaddr; -struct ifreq slave_mtu, slave_flags, slave_hwaddr; - -struct dev_ifr { - struct ifreq *req_ifr; - char *req_name; - int req_type; -}; - -struct dev_ifr master_ifra[] = { - {&master_mtu, "SIOCGIFMTU", SIOCGIFMTU}, - {&master_flags, "SIOCGIFFLAGS", SIOCGIFFLAGS}, - {&master_hwaddr, "SIOCGIFHWADDR", SIOCGIFHWADDR}, - {NULL, "", 0} -}; - -struct dev_ifr slave_ifra[] = { - {&slave_mtu, "SIOCGIFMTU", SIOCGIFMTU}, - {&slave_flags, "SIOCGIFFLAGS", SIOCGIFFLAGS}, - {&slave_hwaddr, "SIOCGIFHWADDR", SIOCGIFHWADDR}, - {NULL, "", 0} -}; - -static void if_print(char *ifname); -static int get_drv_info(char *master_ifname); -static int get_if_settings(char *ifname, struct dev_ifr ifra[]); -static int get_slave_flags(char *slave_ifname); -static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr); -static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr); -static int set_slave_mtu(char *slave_ifname, int mtu); -static int set_if_flags(char *ifname, short flags); -static int set_if_up(char *ifname, short flags); -static int set_if_down(char *ifname, short flags); -static int clear_if_addr(char *ifname); -static int set_if_addr(char *master_ifname, char *slave_ifname); -static int change_active(char *master_ifname, char *slave_ifname); -static int enslave(char *master_ifname, char *slave_ifname); -static int release(char *master_ifname, char *slave_ifname); -#define v_print(fmt, args...) \ - if (opt_v) \ - fprintf(stderr, fmt, ## args ) - -int main(int argc, char *argv[]) -{ - char **spp, *master_ifname, *slave_ifname; - int c, i, rv; - int res = 0; - int exclusive = 0; - - while ((c = getopt_long(argc, argv, "acdfhuvV", longopts, 0)) != EOF) { - switch (c) { - case 'a': opt_a++; exclusive++; break; - case 'c': opt_c++; exclusive++; break; - case 'd': opt_d++; exclusive++; break; - case 'f': opt_f++; exclusive++; break; - case 'h': opt_h++; exclusive++; break; - case 'u': opt_u++; exclusive++; break; - case 'v': opt_v++; break; - case 'V': opt_V++; exclusive++; break; - - case '?': - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - } - - /* options check */ - if (exclusive > 1) { - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - - if (opt_v || opt_V) { - printf(version); - if (opt_V) { - res = 0; - goto out; - } - } - - if (opt_u) { - printf(usage_msg); - res = 0; - goto out; - } - - if (opt_h) { - printf(usage_msg); - printf(help_msg); - res = 0; - goto out; - } - - /* Open a basic socket */ - if ((skfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - perror("socket"); - res = 1; - goto out; - } - - if (opt_a) { - if (optind == argc) { - /* No remaining args */ - /* show all interfaces */ - if_print((char *)NULL); - goto out; - } else { - /* Just show usage */ - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - } - - /* Copy the interface name */ - spp = argv + optind; - master_ifname = *spp++; - - if (master_ifname == NULL) { - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - - /* exchange abi version with bonding module */ - res = get_drv_info(master_ifname); - if (res) { - fprintf(stderr, - "Master '%s': Error: handshake with driver failed. " - "Aborting\n", - master_ifname); - goto out; - } - - slave_ifname = *spp++; - - if (slave_ifname == NULL) { - if (opt_d || opt_c) { - fprintf(stderr, usage_msg); - res = 2; - goto out; - } - - /* A single arg means show the - * configuration for this interface - */ - if_print(master_ifname); - goto out; - } - - res = get_if_settings(master_ifname, master_ifra); - if (res) { - /* Probably a good reason not to go on */ - fprintf(stderr, - "Master '%s': Error: get settings failed: %s. " - "Aborting\n", - master_ifname, strerror(res)); - goto out; - } - - /* check if master is indeed a master; - * if not then fail any operation - */ - if (!(master_flags.ifr_flags & IFF_MASTER)) { - fprintf(stderr, - "Illegal operation; the specified interface '%s' " - "is not a master. Aborting\n", - master_ifname); - res = 1; - goto out; - } - - /* check if master is up; if not then fail any operation */ - if (!(master_flags.ifr_flags & IFF_UP)) { - fprintf(stderr, - "Illegal operation; the specified master interface " - "'%s' is not up.\n", - master_ifname); - res = 1; - goto out; - } - - /* Only for enslaving */ - if (!opt_c && !opt_d) { - sa_family_t master_family = master_hwaddr.ifr_hwaddr.sa_family; - unsigned char *hwaddr = - (unsigned char *)master_hwaddr.ifr_hwaddr.sa_data; - - /* The family '1' is ARPHRD_ETHER for ethernet. */ - if (master_family != 1 && !opt_f) { - fprintf(stderr, - "Illegal operation: The specified master " - "interface '%s' is not ethernet-like.\n " - "This program is designed to work with " - "ethernet-like network interfaces.\n " - "Use the '-f' option to force the " - "operation.\n", - master_ifname); - res = 1; - goto out; - } - - /* Check master's hw addr */ - for (i = 0; i < 6; i++) { - if (hwaddr[i] != 0) { - hwaddr_set = 1; - break; - } - } - - if (hwaddr_set) { - v_print("current hardware address of master '%s' " - "is %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, " - "type %d\n", - master_ifname, - hwaddr[0], hwaddr[1], - hwaddr[2], hwaddr[3], - hwaddr[4], hwaddr[5], - master_family); - } - } - - /* Accepts only one slave */ - if (opt_c) { - /* change active slave */ - res = get_slave_flags(slave_ifname); - if (res) { - fprintf(stderr, - "Slave '%s': Error: get flags failed. " - "Aborting\n", - slave_ifname); - goto out; - } - res = change_active(master_ifname, slave_ifname); - if (res) { - fprintf(stderr, - "Master '%s', Slave '%s': Error: " - "Change active failed\n", - master_ifname, slave_ifname); - } - } else { - /* Accept multiple slaves */ - do { - if (opt_d) { - /* detach a slave interface from the master */ - rv = get_slave_flags(slave_ifname); - if (rv) { - /* Can't work with this slave. */ - /* remember the error and skip it*/ - fprintf(stderr, - "Slave '%s': Error: get flags " - "failed. Skipping\n", - slave_ifname); - res = rv; - continue; - } - rv = release(master_ifname, slave_ifname); - if (rv) { - fprintf(stderr, - "Master '%s', Slave '%s': Error: " - "Release failed\n", - master_ifname, slave_ifname); - res = rv; - } - } else { - /* attach a slave interface to the master */ - rv = get_if_settings(slave_ifname, slave_ifra); - if (rv) { - /* Can't work with this slave. */ - /* remember the error and skip it*/ - fprintf(stderr, - "Slave '%s': Error: get " - "settings failed: %s. " - "Skipping\n", - slave_ifname, strerror(rv)); - res = rv; - continue; - } - rv = enslave(master_ifname, slave_ifname); - if (rv) { - fprintf(stderr, - "Master '%s', Slave '%s': Error: " - "Enslave failed\n", - master_ifname, slave_ifname); - res = rv; - } - } - } while ((slave_ifname = *spp++) != NULL); - } - -out: - if (skfd >= 0) { - close(skfd); - } - - return res; -} - -static short mif_flags; - -/* Get the inteface configuration from the kernel. */ -static int if_getconfig(char *ifname) -{ - struct ifreq ifr; - int metric, mtu; /* Parameters of the master interface. */ - struct sockaddr dstaddr, broadaddr, netmask; - unsigned char *hwaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) - return -1; - mif_flags = ifr.ifr_flags; - printf("The result of SIOCGIFFLAGS on %s is %x.\n", - ifname, ifr.ifr_flags); - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0) - return -1; - printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n", - ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3], - ifr.ifr_addr.sa_data[4], ifr.ifr_addr.sa_data[5]); - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) - return -1; - - /* Gotta convert from 'char' to unsigned for printf(). */ - hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data; - printf("The result of SIOCGIFHWADDR is type %d " - "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", - ifr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1], - hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFMETRIC, &ifr) < 0) { - metric = 0; - } else - metric = ifr.ifr_metric; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0) - mtu = 0; - else - mtu = ifr.ifr_mtu; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFDSTADDR, &ifr) < 0) { - memset(&dstaddr, 0, sizeof(struct sockaddr)); - } else - dstaddr = ifr.ifr_dstaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFBRDADDR, &ifr) < 0) { - memset(&broadaddr, 0, sizeof(struct sockaddr)); - } else - broadaddr = ifr.ifr_broadaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFNETMASK, &ifr) < 0) { - memset(&netmask, 0, sizeof(struct sockaddr)); - } else - netmask = ifr.ifr_netmask; - - return 0; -} - -static void if_print(char *ifname) -{ - char buff[1024]; - struct ifconf ifc; - struct ifreq *ifr; - int i; - - if (ifname == (char *)NULL) { - ifc.ifc_len = sizeof(buff); - ifc.ifc_buf = buff; - if (ioctl(skfd, SIOCGIFCONF, &ifc) < 0) { - perror("SIOCGIFCONF failed"); - return; - } - - ifr = ifc.ifc_req; - for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; ifr++) { - if (if_getconfig(ifr->ifr_name) < 0) { - fprintf(stderr, - "%s: unknown interface.\n", - ifr->ifr_name); - continue; - } - - if (((mif_flags & IFF_UP) == 0) && !opt_a) continue; - /*ife_print(&ife);*/ - } - } else { - if (if_getconfig(ifname) < 0) { - fprintf(stderr, - "%s: unknown interface.\n", ifname); - } - } -} - -static int get_drv_info(char *master_ifname) -{ - struct ifreq ifr; - struct ethtool_drvinfo info; - char *endptr; - - memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - ifr.ifr_data = (caddr_t)&info; - - info.cmd = ETHTOOL_GDRVINFO; - strncpy(info.driver, "ifenslave", 32); - snprintf(info.fw_version, 32, "%d", BOND_ABI_VERSION); - - if (ioctl(skfd, SIOCETHTOOL, &ifr) < 0) { - if (errno == EOPNOTSUPP) { - goto out; - } - - saved_errno = errno; - v_print("Master '%s': Error: get bonding info failed %s\n", - master_ifname, strerror(saved_errno)); - return 1; - } - - abi_ver = strtoul(info.fw_version, &endptr, 0); - if (*endptr) { - v_print("Master '%s': Error: got invalid string as an ABI " - "version from the bonding module\n", - master_ifname); - return 1; - } - -out: - v_print("ABI ver is %d\n", abi_ver); - - return 0; -} - -static int change_active(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res = 0; - - if (!(slave_flags.ifr_flags & IFF_SLAVE)) { - fprintf(stderr, - "Illegal operation: The specified slave interface " - "'%s' is not a slave\n", - slave_ifname); - return 1; - } - - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); - if ((ioctl(skfd, SIOCBONDCHANGEACTIVE, &ifr) < 0) && - (ioctl(skfd, BOND_CHANGE_ACTIVE_OLD, &ifr) < 0)) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCBONDCHANGEACTIVE failed: " - "%s\n", - master_ifname, strerror(saved_errno)); - res = 1; - } - - return res; -} - -static int enslave(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res = 0; - - if (slave_flags.ifr_flags & IFF_SLAVE) { - fprintf(stderr, - "Illegal operation: The specified slave interface " - "'%s' is already a slave\n", - slave_ifname); - return 1; - } - - res = set_if_down(slave_ifname, slave_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Slave '%s': Error: bring interface down failed\n", - slave_ifname); - return res; - } - - if (abi_ver < 2) { - /* Older bonding versions would panic if the slave has no IP - * address, so get the IP setting from the master. - */ - set_if_addr(master_ifname, slave_ifname); - } else { - res = clear_if_addr(slave_ifname); - if (res) { - fprintf(stderr, - "Slave '%s': Error: clear address failed\n", - slave_ifname); - return res; - } - } - - if (master_mtu.ifr_mtu != slave_mtu.ifr_mtu) { - res = set_slave_mtu(slave_ifname, master_mtu.ifr_mtu); - if (res) { - fprintf(stderr, - "Slave '%s': Error: set MTU failed\n", - slave_ifname); - return res; - } - } - - if (hwaddr_set) { - /* Master already has an hwaddr - * so set it's hwaddr to the slave - */ - if (abi_ver < 1) { - /* The driver is using an old ABI, so - * the application sets the slave's - * hwaddr - */ - res = set_slave_hwaddr(slave_ifname, - &(master_hwaddr.ifr_hwaddr)); - if (res) { - fprintf(stderr, - "Slave '%s': Error: set hw address " - "failed\n", - slave_ifname); - goto undo_mtu; - } - - /* For old ABI the application needs to bring the - * slave back up - */ - res = set_if_up(slave_ifname, slave_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Slave '%s': Error: bring interface " - "down failed\n", - slave_ifname); - goto undo_slave_mac; - } - } - /* The driver is using a new ABI, - * so the driver takes care of setting - * the slave's hwaddr and bringing - * it up again - */ - } else { - /* No hwaddr for master yet, so - * set the slave's hwaddr to it - */ - if (abi_ver < 1) { - /* For old ABI, the master needs to be - * down before setting it's hwaddr - */ - res = set_if_down(master_ifname, master_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Master '%s': Error: bring interface " - "down failed\n", - master_ifname); - goto undo_mtu; - } - } - - res = set_master_hwaddr(master_ifname, - &(slave_hwaddr.ifr_hwaddr)); - if (res) { - fprintf(stderr, - "Master '%s': Error: set hw address " - "failed\n", - master_ifname); - goto undo_mtu; - } - - if (abi_ver < 1) { - /* For old ABI, bring the master - * back up - */ - res = set_if_up(master_ifname, master_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Master '%s': Error: bring interface " - "up failed\n", - master_ifname); - goto undo_master_mac; - } - } - - hwaddr_set = 1; - } - - /* Do the real thing */ - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); - if ((ioctl(skfd, SIOCBONDENSLAVE, &ifr) < 0) && - (ioctl(skfd, BOND_ENSLAVE_OLD, &ifr) < 0)) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCBONDENSLAVE failed: %s\n", - master_ifname, strerror(saved_errno)); - res = 1; - } - - if (res) { - goto undo_master_mac; - } - - return 0; - -/* rollback (best effort) */ -undo_master_mac: - set_master_hwaddr(master_ifname, &(master_hwaddr.ifr_hwaddr)); - hwaddr_set = 0; - goto undo_mtu; -undo_slave_mac: - set_slave_hwaddr(slave_ifname, &(slave_hwaddr.ifr_hwaddr)); -undo_mtu: - set_slave_mtu(slave_ifname, slave_mtu.ifr_mtu); - return res; -} - -static int release(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res = 0; - - if (!(slave_flags.ifr_flags & IFF_SLAVE)) { - fprintf(stderr, - "Illegal operation: The specified slave interface " - "'%s' is not a slave\n", - slave_ifname); - return 1; - } - - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ); - if ((ioctl(skfd, SIOCBONDRELEASE, &ifr) < 0) && - (ioctl(skfd, BOND_RELEASE_OLD, &ifr) < 0)) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCBONDRELEASE failed: %s\n", - master_ifname, strerror(saved_errno)); - return 1; - } else if (abi_ver < 1) { - /* The driver is using an old ABI, so we'll set the interface - * down to avoid any conflicts due to same MAC/IP - */ - res = set_if_down(slave_ifname, slave_flags.ifr_flags); - if (res) { - fprintf(stderr, - "Slave '%s': Error: bring interface " - "down failed\n", - slave_ifname); - } - } - - /* set to default mtu */ - set_slave_mtu(slave_ifname, 1500); - - return res; -} - -static int get_if_settings(char *ifname, struct dev_ifr ifra[]) -{ - int i; - int res = 0; - - for (i = 0; ifra[i].req_ifr; i++) { - strncpy(ifra[i].req_ifr->ifr_name, ifname, IFNAMSIZ); - res = ioctl(skfd, ifra[i].req_type, ifra[i].req_ifr); - if (res < 0) { - saved_errno = errno; - v_print("Interface '%s': Error: %s failed: %s\n", - ifname, ifra[i].req_name, - strerror(saved_errno)); - - return saved_errno; - } - } - - return 0; -} - -static int get_slave_flags(char *slave_ifname) -{ - int res = 0; - - strncpy(slave_flags.ifr_name, slave_ifname, IFNAMSIZ); - res = ioctl(skfd, SIOCGIFFLAGS, &slave_flags); - if (res < 0) { - saved_errno = errno; - v_print("Slave '%s': Error: SIOCGIFFLAGS failed: %s\n", - slave_ifname, strerror(saved_errno)); - } else { - v_print("Slave %s: flags %04X.\n", - slave_ifname, slave_flags.ifr_flags); - } - - return res; -} - -static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr) -{ - unsigned char *addr = (unsigned char *)hwaddr->sa_data; - struct ifreq ifr; - int res = 0; - - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr)); - res = ioctl(skfd, SIOCSIFHWADDR, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Master '%s': Error: SIOCSIFHWADDR failed: %s\n", - master_ifname, strerror(saved_errno)); - return res; - } else { - v_print("Master '%s': hardware address set to " - "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", - master_ifname, addr[0], addr[1], addr[2], - addr[3], addr[4], addr[5]); - } - - return res; -} - -static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr) -{ - unsigned char *addr = (unsigned char *)hwaddr->sa_data; - struct ifreq ifr; - int res = 0; - - strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); - memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr)); - res = ioctl(skfd, SIOCSIFHWADDR, &ifr); - if (res < 0) { - saved_errno = errno; - - v_print("Slave '%s': Error: SIOCSIFHWADDR failed: %s\n", - slave_ifname, strerror(saved_errno)); - - if (saved_errno == EBUSY) { - v_print(" The device is busy: it must be idle " - "before running this command.\n"); - } else if (saved_errno == EOPNOTSUPP) { - v_print(" The device does not support setting " - "the MAC address.\n" - " Your kernel likely does not support slave " - "devices.\n"); - } else if (saved_errno == EINVAL) { - v_print(" The device's address type does not match " - "the master's address type.\n"); - } - return res; - } else { - v_print("Slave '%s': hardware address set to " - "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", - slave_ifname, addr[0], addr[1], addr[2], - addr[3], addr[4], addr[5]); - } - - return res; -} - -static int set_slave_mtu(char *slave_ifname, int mtu) -{ - struct ifreq ifr; - int res = 0; - - ifr.ifr_mtu = mtu; - strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); - - res = ioctl(skfd, SIOCSIFMTU, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Slave '%s': Error: SIOCSIFMTU failed: %s\n", - slave_ifname, strerror(saved_errno)); - } else { - v_print("Slave '%s': MTU set to %d.\n", slave_ifname, mtu); - } - - return res; -} - -static int set_if_flags(char *ifname, short flags) -{ - struct ifreq ifr; - int res = 0; - - ifr.ifr_flags = flags; - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - - res = ioctl(skfd, SIOCSIFFLAGS, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Interface '%s': Error: SIOCSIFFLAGS failed: %s\n", - ifname, strerror(saved_errno)); - } else { - v_print("Interface '%s': flags set to %04X.\n", ifname, flags); - } - - return res; -} - -static int set_if_up(char *ifname, short flags) -{ - return set_if_flags(ifname, flags | IFF_UP); -} - -static int set_if_down(char *ifname, short flags) -{ - return set_if_flags(ifname, flags & ~IFF_UP); -} - -static int clear_if_addr(char *ifname) -{ - struct ifreq ifr; - int res = 0; - - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - ifr.ifr_addr.sa_family = AF_INET; - memset(ifr.ifr_addr.sa_data, 0, sizeof(ifr.ifr_addr.sa_data)); - - res = ioctl(skfd, SIOCSIFADDR, &ifr); - if (res < 0) { - saved_errno = errno; - v_print("Interface '%s': Error: SIOCSIFADDR failed: %s\n", - ifname, strerror(saved_errno)); - } else { - v_print("Interface '%s': address cleared\n", ifname); - } - - return res; -} - -static int set_if_addr(char *master_ifname, char *slave_ifname) -{ - struct ifreq ifr; - int res; - unsigned char *ipaddr; - int i; - struct { - char *req_name; - char *desc; - int g_ioctl; - int s_ioctl; - } ifra[] = { - {"IFADDR", "addr", SIOCGIFADDR, SIOCSIFADDR}, - {"DSTADDR", "destination addr", SIOCGIFDSTADDR, SIOCSIFDSTADDR}, - {"BRDADDR", "broadcast addr", SIOCGIFBRDADDR, SIOCSIFBRDADDR}, - {"NETMASK", "netmask", SIOCGIFNETMASK, SIOCSIFNETMASK}, - {NULL, NULL, 0, 0}, - }; - - for (i = 0; ifra[i].req_name; i++) { - strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ); - res = ioctl(skfd, ifra[i].g_ioctl, &ifr); - if (res < 0) { - int saved_errno = errno; - - v_print("Interface '%s': Error: SIOCG%s failed: %s\n", - master_ifname, ifra[i].req_name, - strerror(saved_errno)); - - ifr.ifr_addr.sa_family = AF_INET; - memset(ifr.ifr_addr.sa_data, 0, - sizeof(ifr.ifr_addr.sa_data)); - } - - strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ); - res = ioctl(skfd, ifra[i].s_ioctl, &ifr); - if (res < 0) { - int saved_errno = errno; - - v_print("Interface '%s': Error: SIOCS%s failed: %s\n", - slave_ifname, ifra[i].req_name, - strerror(saved_errno)); - - } - - ipaddr = (unsigned char *)ifr.ifr_addr.sa_data; - v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n", - slave_ifname, ifra[i].desc, - ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]); - } - - return 0; -} - -/* - * Local variables: - * version-control: t - * kept-new-versions: 5 - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * compile-command: "gcc -Wall -Wstrict-prototypes -O -I/usr/src/linux/include ifenslave.c -o ifenslave" - * End: - */ - diff --git a/system/base/iputils/files/iputils-20071127-kernel-ifaddr.patch b/system/base/iputils/files/iputils-20071127-kernel-ifaddr.patch deleted file mode 100644 index 9c13f7e1..00000000 --- a/system/base/iputils/files/iputils-20071127-kernel-ifaddr.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/rarpd.c -+++ b/rarpd.c -@@ -55,10 +55,10 @@ struct iflink - unsigned char lladdr[16]; - char name[IFNAMSIZ]; -- struct ifaddr *ifa_list; -+ struct kern_ifaddr *ifa_list; - } *ifl_list; - --struct ifaddr -+struct kern_ifaddr - { -- struct ifaddr *next; -+ struct kern_ifaddr *next; - __u32 prefix; - __u32 mask; -@@ -92,5 +92,5 @@ void load_if(void) - struct ifreq *ifrp, *ifend; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - struct ifconf ifc; - struct ifreq ibuf[256]; -@@ -183,5 +183,5 @@ void load_if(void) - if (mask == 0 || prefix == 0) - continue; -- ifa = (struct ifaddr*)malloc(sizeof(*ifa)); -+ ifa = (struct kern_ifaddr*)malloc(sizeof(*ifa)); - memset(ifa, 0, sizeof(*ifa)); - ifa->local = addr; -@@ -239,8 +239,8 @@ int bootable(__u32 addr) - } - --struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) -+struct kern_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist) - { - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - int retry = 0; - int i; -@@ -298,5 +298,5 @@ struct rarp_map *rarp_lookup(int ifindex - if (r == NULL) { - if (hatype == ARPHRD_ETHER && halen == 6) { -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - struct hostent *hp; - char ename[256]; -@@ -371,5 +371,5 @@ int put_myipaddr(unsigned char **ptr_p, - __u32 laddr = 0; - struct iflink *ifl; -- struct ifaddr *ifa; -+ struct kern_ifaddr *ifa; - - for (ifl=ifl_list; ifl; ifl = ifl->next) diff --git a/system/base/iputils/files/iputils-20071127-nonroot-floodping.patch b/system/base/iputils/files/iputils-20071127-nonroot-floodping.patch deleted file mode 100644 index cae87791..00000000 --- a/system/base/iputils/files/iputils-20071127-nonroot-floodping.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iputils-s20071127/ping_common.h.orig 2008-06-10 11:16:06.000000000 +0100 -+++ iputils-s20071127/ping_common.h 2008-06-10 11:16:18.000000000 +0100 -@@ -28,7 +28,7 @@ - - #define MAXWAIT 10 /* max seconds to wait for response */ - #define MININTERVAL 10 /* Minimal interpacket gap */ --#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */ -+#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */ - - #define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a)) - diff --git a/system/base/iputils/files/iputils-20100418-so_mark.patch b/system/base/iputils/files/iputils-20100418-so_mark.patch deleted file mode 100644 index 0d7c7860..00000000 --- a/system/base/iputils/files/iputils-20100418-so_mark.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/335347 - -fix building with older linux headers that don't define SO_MARK - ---- ping_common.c.org -+++ ping_common.c -@@ -485,6 +485,7 @@ - fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n"); - } - #endif -+#ifdef SO_MARK - if (options & F_MARK) { - if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK, - &mark, sizeof(mark)) == -1) { -@@ -494,6 +495,7 @@ - fprintf(stderr, "Warning: Failed to set mark %d\n", mark); - } - } -+#endif - - /* Set some SNDTIMEO to prevent blocking forever - * on sends, when device is too slow or stalls. Just put limit diff --git a/system/base/iputils/files/iputils-20121221-crypto-build.patch b/system/base/iputils/files/iputils-20121221-crypto-build.patch deleted file mode 100644 index 1ec3c101..00000000 --- a/system/base/iputils/files/iputils-20121221-crypto-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001 -From: Arjan van de Ven -Date: Wed, 16 Jan 2013 03:12:15 +0900 -Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls. - -The ping6 command can use either openssl or gnutls... -and the Makefile has a bunch of setup for defining which of the two to use. - -Unfortunately, the final -D define on the commandline to enable gnutls -inside the ping6.c file didn't actually make it onto the gcc -commandline. -This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap. - -Signed-off-by: Arjan van de Ven -Signed-off-by: YOSHIFUJI Hideaki ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c62d9df..89249f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP) - DEF_ping_common = $(DEF_CAP) $(DEF_IDN) - DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) - LIB_ping = $(LIB_CAP) $(LIB_IDN) --DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) -+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO) - LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO) - - ping: ping_common.o --- -1.8.0.2 - diff --git a/system/base/iputils/files/iputils-20121221-makefile.patch b/system/base/iputils/files/iputils-20121221-makefile.patch deleted file mode 100644 index 66424c85..00000000 --- a/system/base/iputils/files/iputils-20121221-makefile.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 24 Jan 2013 23:36:16 -0500 -Subject: [PATCH [iputils]] fix handling of CFLAGS - -This defaults CFLAGS to -O3 without clobbering settings people have set -up in the environment already. - -Signed-off-by: Mike Frysinger ---- - Makefile | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 2c49940..ecabac3 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,8 +2,6 @@ - # Configuration - # - --# CC --CC=gcc - # Path to parent kernel include files directory - LIBC_INCLUDE=/usr/include - # Libraries -@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no - - # ------------------------------------- - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. --# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g --CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g --CCOPTOPT=-O3 --GLIBCFIX=-D_GNU_SOURCE --DEFINES= -+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g -+CFLAGS?=-O3 -g -+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -+CPPFLAGS+=-D_GNU_SOURCE - LDLIB= - - FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2)) -@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 - TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) - --CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES) - LDLIBS=$(LDLIB) $(ADDLIB) - - UNAME_N:=$(shell uname -n) -@@ -132,6 +128,7 @@ all: $(TARGETS) - $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@ - %.o: %.c - $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@ -+LINK.o += $(CFLAGS) - $(TARGETS): %: %.o - $(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@ - --- -1.8.0.2 - diff --git a/system/base/iputils/files/iputils-20121221-openssl.patch b/system/base/iputils/files/iputils-20121221-openssl.patch deleted file mode 100644 index 1c6ba81d..00000000 --- a/system/base/iputils/files/iputils-20121221-openssl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 24 Jan 2013 23:32:39 -0500 -Subject: [PATCH [iputils]] ping6: allow disabling of openssl support - -Signed-off-by: Mike Frysinger ---- - Makefile | 5 ++++- - ping6.c | 14 +++++++++++++- - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 89249f5..2c49940 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE= - - # GNU TLS library for ping6 [yes|no|static] - USE_GNUTLS=yes --# Crypto library for ping6 [shared|static] -+# Crypto library for ping6 [shared|static|no] - USE_CRYPTO=shared - # Resolv library for ping6 [yes|static] - USE_RESOLV=yes -@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no) - LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS)) - DEF_CRYPTO = -DUSE_GNUTLS - else -+ifneq ($(USE_CRYPTO),no) - LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO)) -+ DEF_CRYPTO = -DUSE_OPENSSL -+endif - endif - - # USE_RESOLV: LIB_RESOLV -diff --git a/ping6.c b/ping6.c -index c39864d..f2f90af 100644 ---- a/ping6.c -+++ b/ping6.c -@@ -168,8 +168,10 @@ static int icmp_sock; - - #ifdef USE_GNUTLS - # include --#else -+# define USE_CRYPTO -+#elif defined USE_OPENSSL - # include -+# define USE_CRYPTO - #endif - - /* Node Information query */ -@@ -326,6 +328,7 @@ static void niquery_init_nonce(void) - #if !PING6_NONCE_MEMORY - static int niquery_nonce(__u8 *nonce, int fill) - { -+# ifdef USE_CRYPTO - static __u8 digest[MD5_DIGEST_LENGTH]; - static int seq = -1; - -@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill) - return -1; - return ntohsp((__u16 *)nonce); - } -+# else -+ fprintf(stderr, "ping6: function not available; crypto disabled\n"); -+ exit(3); -+# endif - } - #endif - -@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg) - - static int niquery_option_subject_name_handler(int index, const char *arg) - { -+#ifdef USE_CRYPTO - static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ]; - unsigned char *dnptrs[2], **dpp, **lastdnptr; - int n; -@@ -627,6 +635,10 @@ errexit: - free(idn); - free(name); - exit(1); -+#else -+ fprintf(stderr, "ping6: function not available; crypto disabled\n"); -+ exit(3); -+#endif - } - - int niquery_option_help_handler(int index, const char *arg) --- -1.8.0.2 - diff --git a/system/base/iputils/files/iputils-20121221-owl-pingsock.diff b/system/base/iputils/files/iputils-20121221-owl-pingsock.diff deleted file mode 100644 index 283aa989..00000000 --- a/system/base/iputils/files/iputils-20121221-owl-pingsock.diff +++ /dev/null @@ -1,224 +0,0 @@ -http://openwall.info/wiki/people/segoon/ping - ---- iputils-s20101006/ping.c -+++ iputils-s20101006/ping.c -@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi - int optlen = 0; - int settos = 0; /* Set TOS, Precendence or other QOS options */ - int icmp_sock; /* socket file descriptor */ -+int using_ping_socket = 0; - u_char outpack[0x10000]; - int maxpacket = sizeof(outpack); - -@@ -123,7 +124,11 @@ main(int argc, char **argv) - char *target, hnamebuf[MAX_HOSTNAMELEN]; - char rspace[3 + 4 * NROUTES + 1]; /* record route space */ - -- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); -+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP); -+ if (icmp_sock != -1) -+ using_ping_socket = 1; -+ else -+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); - socket_errno = errno; - - uid = getuid(); -@@ -377,13 +382,35 @@ main(int argc, char **argv) - } - } - -- if ((options&F_STRICTSOURCE) && -- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) { -- perror("bind"); -- exit(2); -+ if (!using_ping_socket) { -+ if ((options&F_STRICTSOURCE) && -+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ } else { -+ struct sockaddr_in sa; -+ socklen_t sl; -+ -+ sa.sin_family = AF_INET; -+ sa.sin_port = 0; -+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ? -+ source.sin_addr.s_addr : 0; -+ sl = sizeof(sa); -+ -+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ ident = sa.sin_port; - } - -- if (1) { -+ if (!using_ping_socket) { - struct icmp_filter filt; - filt.data = ~((1<ee_origin == SO_EE_ORIGIN_ICMP) { - struct sockaddr_in *sin = (struct sockaddr_in*)(e+1); -+ int error_pkt; - - if (res < sizeof(icmph) || - target.sin_addr.s_addr != whereto.sin_addr.s_addr || -@@ -576,9 +610,18 @@ int receive_error_msg() - goto out; - } - -- acknowledge(ntohs(icmph.un.echo.sequence)); -+ error_pkt = (e->ee_type != ICMP_REDIRECT && -+ e->ee_type != ICMP_SOURCE_QUENCH); -+ if (error_pkt) { -+ acknowledge(ntohs(icmph.un.echo.sequence)); -+ net_errors++; -+ nerrors++; -+ } -+ else { -+ saved_errno = 0; -+ } - -- if (!working_recverr) { -+ if (!using_ping_socket && !working_recverr) { - struct icmp_filter filt; - working_recverr = 1; - /* OK, it works. Add stronger filter. */ -@@ -589,15 +632,14 @@ int receive_error_msg() - perror("\rWARNING: setsockopt(ICMP_FILTER)"); - } - -- net_errors++; -- nerrors++; - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) { -- write_stdout("\bE", 2); -+ if (error_pkt) -+ write_stdout("\bE", 2); - } else { - print_timestamp(); -- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); -+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); - pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL); - fflush(stdout); - } -@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, - struct iphdr *ip; - int hlen; - int csfailed; -+ struct cmsghdr *cmsg; -+ int ttl; -+ __u8 *opts; -+ int optlen; - - /* Check the IP header */ - ip = (struct iphdr *)buf; -- hlen = ip->ihl*4; -- if (cc < hlen + 8 || ip->ihl < 5) { -- if (options & F_VERBOSE) -- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc, -- pr_addr(from->sin_addr.s_addr)); -- return 1; -+ if (!using_ping_socket) { -+ hlen = ip->ihl*4; -+ if (cc < hlen + 8 || ip->ihl < 5) { -+ if (options & F_VERBOSE) -+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc, -+ pr_addr(from->sin_addr.s_addr)); -+ return 1; -+ } -+ ttl = ip->ttl; -+ opts = buf + sizeof(struct iphdr); -+ optlen = hlen - sizeof(struct iphdr); -+ } else { -+ hlen = 0; -+ ttl = 0; -+ opts = buf; -+ optlen = 0; -+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) { -+ if (cmsg->cmsg_level != SOL_IP) -+ continue; -+ if (cmsg->cmsg_type == IP_TTL) { -+ if (cmsg->cmsg_len < sizeof(int)) -+ continue; -+ ttl = *(int *) CMSG_DATA(cmsg); -+ } else if (cmsg->cmsg_type == IP_RETOPTS) { -+ opts = (__u8 *) CMSG_DATA(cmsg); -+ optlen = cmsg->cmsg_len; -+ } -+ } - } - - /* Now the ICMP part */ -@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, - return 1; /* 'Twas not our ECHO */ - if (gather_statistics((__u8*)icp, sizeof(*icp), cc, - ntohs(icp->un.echo.sequence), -- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr), -+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr), - pr_echo_reply)) - return 0; - } else { -@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, - } - - if (!(options & F_FLOOD)) { -- pr_options(buf + sizeof(struct iphdr), hlen); -+ pr_options(opts, optlen + sizeof(struct iphdr)); - - if (options & F_AUDIBLE) - putchar('\a'); -@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3 - printf("Redirect, Bad Code: %d", code); - break; - } -- if (icp) -- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway)); -+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info)); - if (icp && (options & F_VERBOSE)) - pr_iph((struct iphdr*)(icp + 1)); - break; -@@ -1217,7 +1284,7 @@ void install_filter(void) - insns - }; - -- if (once) -+ if (once || using_ping_socket) - return; - once = 1; - ---- iputils-s20101006/ping_common.c -+++ iputils-s20101006/ping_common.c -@@ -515,7 +515,8 @@ void setup(int icmp_sock) - *p++ = i; - } - -- ident = htons(getpid() & 0xFFFF); -+ if (!ident) -+ ident = htons(getpid() & 0xFFFF); - - set_signal(SIGINT, sigexit); - set_signal(SIGALRM, sigexit); diff --git a/system/base/iputils/files/iputils-20121221-printf-size.patch b/system/base/iputils/files/iputils-20121221-printf-size.patch deleted file mode 100644 index 6d6c3b7d..00000000 --- a/system/base/iputils/files/iputils-20121221-printf-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 14 Aug 2010 01:16:42 -0400 -Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host - -Since the printf funcs already return the length of chars displayed, -use that value instead of re-calculating the length with strlen. - -This also fixes the handling of the strlen return -- it's a size_t, -not an int. - -Signed-off-by: Mike Frysinger ---- - tracepath.c | 11 ++++------- - tracepath6.c | 11 ++++------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/tracepath.c b/tracepath.c -index 8a08f1d..f155816 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -73,13 +73,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- int plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); -diff --git a/tracepath6.c b/tracepath6.c -index 126fadf..bee95c3 100644 ---- a/tracepath6.c -+++ b/tracepath6.c -@@ -86,13 +86,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- int plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); --- -1.8.0.2 - diff --git a/system/base/iputils/files/man/arping.8 b/system/base/iputils/files/man/arping.8 deleted file mode 100644 index af98087a..00000000 --- a/system/base/iputils/files/man/arping.8 +++ /dev/null @@ -1,110 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "ARPING" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -arping \- send ARP REQUEST to a neighbour host -.SH SYNOPSIS - -\fBarping\fR [ \fB-AbDfhqUV\fR] [ \fB-c \fIcount\fB\fR] [ \fB-w \fIdeadline\fB\fR] [ \fB-s \fIsource\fB\fR] \fB-I \fIinterface\fB\fR \fB\fIdestination\fB\fR - -.SH "DESCRIPTION" -.PP -Ping \fIdestination\fR on device \fIinterface\fR by ARP packets, -using source address \fIsource\fR. -.SH "OPTIONS" -.TP -\fB-A\fR -The same as \fB-U\fR, but ARP REPLY packets used instead -of ARP REQUEST. -.TP -\fB-b\fR -Send only MAC level broadcasts. Normally \fBarping\fR starts -from sending broadcast, and switch to unicast after reply received. -.TP -\fB-c \fIcount\fB\fR -Stop after sending \fIcount\fR ARP REQUEST -packets. With -\fIdeadline\fR -option, \fBarping\fR waits for -\fIcount\fR ARP REPLY packets, until the timeout expires. -.TP -\fB-D\fR -Duplicate address detection mode (DAD). See -RFC2131, 4.4.1. -Returns 0, if DAD succeeded i.e. no replies are received -.TP -\fB-f\fR -Finish after the first reply confirming that target is alive. -.TP -\fB-I \fIinterface\fB\fR -Name of network device where to send ARP REQUEST packets. This option -is required. -.TP -\fB-h\fR -Print help page and exit. -.TP -\fB-q\fR -Quiet output. Nothing is displayed. -.TP -\fB-s \fIsource\fB\fR -IP source address to use in ARP packets. -If this option is absent, source address is: -.RS -.TP 0.2i -\(bu -In DAD mode (with option \fB-D\fR) set to 0.0.0.0. -.TP 0.2i -\(bu -In Unsolicited ARP mode (with options \fB-U\fR or \fB-A\fR) -set to \fIdestination\fR. -.TP 0.2i -\(bu -Otherwise, it is calculated from routing tables. -.RE -.TP -\fB-U\fR -Unsolicited ARP mode to update neighbours' ARP caches. -No replies are expected. -.TP -\fB-V\fR -Print version of the program and exit. -.TP -\fB-w \fIdeadline\fB\fR -Specify a timeout, in seconds, before -\fBarping\fR -exits regardless of how many -packets have been sent or received. In this case -\fBarping\fR -does not stop after -\fIcount\fR -packet are sent, it waits either for -\fIdeadline\fR -expire or until -\fIcount\fR -probes are answered. -.SH "SEE ALSO" -.PP -\fBping\fR(8), -\fBclockdiff\fR(8), -\fBtracepath\fR(8). -.SH "AUTHOR" -.PP -\fBarping\fR was written by -Alexey Kuznetsov -. -It is now maintained by -YOSHIFUJI Hideaki -. -.SH "SECURITY" -.PP -\fBarping\fR requires CAP_NET_RAWIO capability -to be executed. It is not recommended to be used as set-uid root, -because it allows user to modify ARP caches of neighbour hosts. -.SH "AVAILABILITY" -.PP -\fBarping\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/files/man/clockdiff.8 b/system/base/iputils/files/man/clockdiff.8 deleted file mode 100644 index 764dcd5e..00000000 --- a/system/base/iputils/files/man/clockdiff.8 +++ /dev/null @@ -1,81 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "CLOCKDIFF" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -clockdiff \- measure clock difference between hosts -.SH SYNOPSIS - -\fBclockdiff\fR [ \fB-o\fR] [ \fB-o1\fR] \fB\fIdestination\fB\fR - -.SH "DESCRIPTION" -.PP -\fBclockdiff\fR Measures clock difference between us and -\fIdestination\fR with 1 msec resolution using ICMP TIMESTAMP -[2] -packets or, optionally, IP TIMESTAMP option -[3] -option added to ICMP ECHO. -[1] -.SH "OPTIONS" -.TP -\fB-o\fR -Use IP TIMESTAMP with ICMP ECHO instead of ICMP TIMESTAMP -messages. It is useful with some destinations, which do not support -ICMP TIMESTAMP (f.e. Solaris <2.4). -.TP -\fB-o1\fR -Slightly different form of \fB-o\fR, namely it uses three-term -IP TIMESTAMP with prespecified hop addresses instead of four term one. -What flavor works better depends on target host. Particularly, -\fB-o\fR is better for Linux. -.SH "WARNINGS" -.TP 0.2i -\(bu -Some nodes (Cisco) use non-standard timestamps, which is allowed -by RFC, but makes timestamps mostly useless. -.TP 0.2i -\(bu -Some nodes generate messed timestamps (Solaris>2.4), when -run \fBxntpd\fR. Seems, its IP stack uses a corrupted clock source, -which is synchronized to time-of-day clock periodically and jumps -randomly making timestamps mostly useless. Good news is that you can -use NTP in this case, which is even better. -.TP 0.2i -\(bu -\fBclockdiff\fR shows difference in time modulo 24 days. -.SH "SEE ALSO" -.PP -\fBping\fR(8), -\fBarping\fR(8), -\fBtracepath\fR(8). -.SH "REFERENCES" -.PP -[1] ICMP ECHO, -RFC0792, page 14. -.PP -[2] ICMP TIMESTAMP, -RFC0792, page 16. -.PP -[3] IP TIMESTAMP option, -RFC0791, 3.1, page 16. -.SH "AUTHOR" -.PP -\fBclockdiff\fR was compiled by -Alexey Kuznetsov -. It was based on code borrowed -from BSD \fBtimed\fR daemon. -It is now maintained by -YOSHIFUJI Hideaki -. -.SH "SECURITY" -.PP -\fBclockdiff\fR requires CAP_NET_RAWIO capability -to be executed. It is safe to be used as set-uid root. -.SH "AVAILABILITY" -.PP -\fBclockdiff\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/files/man/ping.8 b/system/base/iputils/files/man/ping.8 deleted file mode 100644 index d0615b11..00000000 --- a/system/base/iputils/files/man/ping.8 +++ /dev/null @@ -1,408 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "PING" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -ping, ping6 \- send ICMP ECHO_REQUEST to network hosts -.SH SYNOPSIS - -\fBping\fR [ \fB-LRUbdfnqrvVaAB\fR] [ \fB-c \fIcount\fB\fR] [ \fB-m \fImark\fB\fR] [ \fB-i \fIinterval\fB\fR] [ \fB-l \fIpreload\fB\fR] [ \fB-p \fIpattern\fB\fR] [ \fB-s \fIpacketsize\fB\fR] [ \fB-t \fIttl\fB\fR] [ \fB-w \fIdeadline\fB\fR] [ \fB-F \fIflowlabel\fB\fR] [ \fB-I \fIinterface\fB\fR] [ \fB-M \fIhint\fB\fR] [ \fB-N \fInioption\fB\fR] [ \fB-Q \fItos\fB\fR] [ \fB-S \fIsndbuf\fB\fR] [ \fB-T \fItimestamp option\fB\fR] [ \fB-W \fItimeout\fB\fR] [ \fB\fIhop\fB\fR\fI ...\fR] \fB\fIdestination\fB\fR - -.SH "DESCRIPTION" -.PP -\fBping\fR uses the ICMP protocol's mandatory ECHO_REQUEST -datagram to elicit an ICMP ECHO_RESPONSE from a host or gateway. -ECHO_REQUEST datagrams (``pings'') have an IP and ICMP -header, followed by a struct timeval and then an arbitrary -number of ``pad'' bytes used to fill out the packet. -.PP -\fBping6\fR can also send Node Information Queries (RFC4620). -.SH "OPTIONS" -.TP -\fB-a\fR -Audible ping. -.TP -\fB-A\fR -Adaptive ping. Interpacket interval adapts to round-trip time, so that -effectively not more than one (or more, if preload is set) unanswered probe -is present in the network. Minimal interval is 200msec for not super-user. -On networks with low rtt this mode is essentially equivalent to flood mode. -.TP -\fB-b\fR -Allow pinging a broadcast address. -.TP -\fB-B\fR -Do not allow \fBping\fR to change source address of probes. -The address is bound to one selected when \fBping\fR starts. -.TP -\fB-m \fImark\fB\fR -use \fImark\fR to tag the packets going out. This is useful -for variety of reasons within the kernel such as using policy -routing to select specific outbound processing. -.TP -\fB-c \fIcount\fB\fR -Stop after sending \fIcount\fR ECHO_REQUEST -packets. With -\fIdeadline\fR -option, \fBping\fR waits for -\fIcount\fR ECHO_REPLY packets, until the timeout expires. -.TP -\fB-d\fR -Set the SO_DEBUG option on the socket being used. -Essentially, this socket option is not used by Linux kernel. -.TP -\fB-F \fIflow label\fB\fR -Allocate and set 20 bit flow label on echo request packets. -(Only \fBping6\fR). If value is zero, kernel allocates random flow label. -.TP -\fB-f\fR -Flood ping. For every ECHO_REQUEST sent a period ``.'' is printed, -while for ever ECHO_REPLY received a backspace is printed. -This provides a rapid display of how many packets are being dropped. -If interval is not given, it sets interval to zero and -outputs packets as fast as they come back or one hundred times per second, -whichever is more. -Only the super-user may use this option with zero interval. -.TP -\fB-i \fIinterval\fB\fR -Wait \fIinterval\fR seconds between sending each packet. -The default is to wait for one second between each packet normally, -or not to wait in flood mode. Only super-user may set interval -to values less 0.2 seconds. -.TP -\fB-I \fIinterface address\fB\fR -Set source address to specified interface address. Argument -may be numeric IP address or name of device. When pinging IPv6 -link-local address this option is required. -.TP -\fB-l \fIpreload\fB\fR -If \fIpreload\fR is specified, -\fBping\fR sends that many packets not waiting for reply. -Only the super-user may select preload more than 3. -.TP -\fB-L\fR -Suppress loopback of multicast packets. This flag only applies if the ping -destination is a multicast address. -.TP -\fB-N \fInioption\fB\fR -Send ICMPv6 Node Information Queries (RFC4620), instead of Echo Request. -.RS -.TP -\fBname\fR -Queries for Node Names. -.RE -.RS -.TP -\fBipv6\fR -Queries for IPv6 Addresses. There are several IPv6 specific flags. -.RS -.TP -\fBipv6-global\fR -Request IPv6 global-scope addresses. -.RE -.RS -.TP -\fBipv6-sitelocal\fR -Request IPv6 site-local addresses. -.RE -.RS -.TP -\fBipv6-linklocal\fR -Request IPv6 link-local addresses. -.RE -.RS -.TP -\fBipv6-all\fR -Request IPv6 addresses on other interfaces. -.RE -.RE -.RS -.TP -\fBipv4\fR -Queries for IPv4 Addresses. There is one IPv4 specific flag. -.RS -.TP -\fBipv4-all\fR -Request IPv4 addresses on other interfaces. -.RE -.RE -.RS -.TP -\fBsubject-ipv6=\fIipv6addr\fB\fR -IPv6 subject address. -.RE -.RS -.TP -\fBsubject-ipv4=\fIipv4addr\fB\fR -IPv4 subject address. -.RE -.RS -.TP -\fBsubject-name=\fInodename\fB\fR -Subject name. If it contains more than one dot, -fully-qualified domain name is assumed. -.RE -.RS -.TP -\fBsubject-fqdn=\fInodename\fB\fR -Subject name. Fully-qualified domain name is -always assumed. -.RE -.TP -\fB-n\fR -Numeric output only. -No attempt will be made to lookup symbolic names for host addresses. -.TP -\fB-p \fIpattern\fB\fR -You may specify up to 16 ``pad'' bytes to fill out the packet you send. -This is useful for diagnosing data-dependent problems in a network. -For example, \fB-p ff\fR will cause the sent packet -to be filled with all ones. -.TP -\fB-D\fR -Print timestamp (unix time + microseconds as in gettimeofday) before -each line. -.TP -\fB-Q \fItos\fB\fR -Set Quality of Service -related bits in ICMP datagrams. -\fItos\fR can be either decimal or hex number. -Traditionally (RFC1349), these have been interpreted as: 0 for reserved -(currently being redefined as congestion control), 1-4 for Type of Service -and 5-7 for Precedence. -Possible settings for Type of Service are: minimal cost: 0x02, -reliability: 0x04, throughput: 0x08, low delay: 0x10. Multiple TOS bits -should not be set simultaneously. Possible settings for -special Precedence range from priority (0x20) to net control (0xe0). You -must be root (CAP_NET_ADMIN capability) to use Critical or -higher precedence value. You cannot set -bit 0x01 (reserved) unless ECN has been enabled in the kernel. -In RFC2474, these fields has been redefined as 8-bit Differentiated -Services (DS), consisting of: bits 0-1 of separate data (ECN will be used, -here), and bits 2-7 of Differentiated Services Codepoint (DSCP). -.TP -\fB-q\fR -Quiet output. -Nothing is displayed except the summary lines at startup time and -when finished. -.TP -\fB-R\fR -Record route. -Includes the RECORD_ROUTE option in the ECHO_REQUEST -packet and displays the route buffer on returned packets. -Note that the IP header is only large enough for nine such routes. -Many hosts ignore or discard this option. -.TP -\fB-r\fR -Bypass the normal routing tables and send directly to a host on an attached -interface. -If the host is not on a directly-attached network, an error is returned. -This option can be used to ping a local host through an interface -that has no route through it provided the option \fB-I\fR is also -used. -.TP -\fB-s \fIpacketsize\fB\fR -Specifies the number of data bytes to be sent. -The default is 56, which translates into 64 ICMP -data bytes when combined with the 8 bytes of ICMP header data. -.TP -\fB-S \fIsndbuf\fB\fR -Set socket sndbuf. If not specified, it is selected to buffer -not more than one packet. -.TP -\fB-t \fIttl\fB\fR -Set the IP Time to Live. -.TP -\fB-T \fItimestamp option\fB\fR -Set special IP timestamp options. -\fItimestamp option\fR may be either -\fItsonly\fR (only timestamps), -\fItsandaddr\fR (timestamps and addresses) or -\fItsprespec host1 [host2 [host3 [host4]]]\fR -(timestamp prespecified hops). -.TP -\fB-M \fIhint\fB\fR -Select Path MTU Discovery strategy. -\fIhint\fR may be either \fIdo\fR -(prohibit fragmentation, even local one), -\fIwant\fR (do PMTU discovery, fragment locally when packet size -is large), or \fIdont\fR (do not set DF flag). -.TP -\fB-U\fR -Print full user-to-user latency (the old behaviour). Normally -\fBping\fR -prints network round trip time, which can be different -f.e. due to DNS failures. -.TP -\fB-v\fR -Verbose output. -.TP -\fB-V\fR -Show version and exit. -.TP -\fB-w \fIdeadline\fB\fR -Specify a timeout, in seconds, before -\fBping\fR -exits regardless of how many -packets have been sent or received. In this case -\fBping\fR -does not stop after -\fIcount\fR -packet are sent, it waits either for -\fIdeadline\fR -expire or until -\fIcount\fR -probes are answered or for some error notification from network. -.TP -\fB-W \fItimeout\fB\fR -Time to wait for a response, in seconds. The option affects only timeout -in absence of any responses, otherwise \fBping\fR waits for two RTTs. -.PP -When using \fBping\fR for fault isolation, it should first be run -on the local host, to verify that the local network interface is up -and running. Then, hosts and gateways further and further away should be -``pinged''. Round-trip times and packet loss statistics are computed. -If duplicate packets are received, they are not included in the packet -loss calculation, although the round trip time of these packets is used -in calculating the minimum/average/maximum round-trip time numbers. -When the specified number of packets have been sent (and received) or -if the program is terminated with a -SIGINT, a brief summary is displayed. Shorter current statistics -can be obtained without termination of process with signal -SIGQUIT. -.PP -If \fBping\fR does not receive any reply packets at all it will -exit with code 1. If a packet -\fIcount\fR -and -\fIdeadline\fR -are both specified, and fewer than -\fIcount\fR -packets are received by the time the -\fIdeadline\fR -has arrived, it will also exit with code 1. -On other error it exits with code 2. Otherwise it exits with code 0. This -makes it possible to use the exit code to see if a host is alive or -not. -.PP -This program is intended for use in network testing, measurement and -management. -Because of the load it can impose on the network, it is unwise to use -\fBping\fR during normal operations or from automated scripts. -.SH "ICMP PACKET DETAILS" -.PP -An IP header without options is 20 bytes. -An ICMP ECHO_REQUEST packet contains an additional 8 bytes worth -of ICMP header followed by an arbitrary amount of data. -When a \fIpacketsize\fR is given, this indicated the size of this -extra piece of data (the default is 56). Thus the amount of data received -inside of an IP packet of type ICMP ECHO_REPLY will always be 8 bytes -more than the requested data space (the ICMP header). -.PP -If the data space is at least of size of struct timeval -\fBping\fR uses the beginning bytes of this space to include -a timestamp which it uses in the computation of round trip times. -If the data space is shorter, no round trip times are given. -.SH "DUPLICATE AND DAMAGED PACKETS" -.PP -\fBping\fR will report duplicate and damaged packets. -Duplicate packets should never occur, and seem to be caused by -inappropriate link-level retransmissions. -Duplicates may occur in many situations and are rarely (if ever) a -good sign, although the presence of low levels of duplicates may not -always be cause for alarm. -.PP -Damaged packets are obviously serious cause for alarm and often -indicate broken hardware somewhere in the -\fBping\fR packet's path (in the network or in the hosts). -.SH "TRYING DIFFERENT DATA PATTERNS" -.PP -The (inter)network layer should never treat packets differently depending -on the data contained in the data portion. -Unfortunately, data-dependent problems have been known to sneak into -networks and remain undetected for long periods of time. -In many cases the particular pattern that will have problems is something -that doesn't have sufficient ``transitions'', such as all ones or all -zeros, or a pattern right at the edge, such as almost all zeros. -It isn't necessarily enough to specify a data pattern of all zeros (for -example) on the command line because the pattern that is of interest is -at the data link level, and the relationship between what you type and -what the controllers transmit can be complicated. -.PP -This means that if you have a data-dependent problem you will probably -have to do a lot of testing to find it. -If you are lucky, you may manage to find a file that either can't be sent -across your network or that takes much longer to transfer than other -similar length files. -You can then examine this file for repeated patterns that you can test -using the \fB-p\fR option of \fBping\fR. -.SH "TTL DETAILS" -.PP -The TTL value of an IP packet represents the maximum number of IP routers -that the packet can go through before being thrown away. -In current practice you can expect each router in the Internet to decrement -the TTL field by exactly one. -.PP -The TCP/IP specification states that the TTL field for TCP -packets should be set to 60, but many systems use smaller values -(4.3 BSD uses 30, 4.2 used 15). -.PP -The maximum possible value of this field is 255, and most Unix systems set -the TTL field of ICMP ECHO_REQUEST packets to 255. -This is why you will find you can ``ping'' some hosts, but not reach them -with -\fBtelnet\fR(1) -or -\fBftp\fR(1). -.PP -In normal operation ping prints the TTL value from the packet it receives. -When a remote system receives a ping packet, it can do one of three things -with the TTL field in its response: -.TP 0.2i -\(bu -Not change it; this is what Berkeley Unix systems did before the -4.3BSD Tahoe release. In this case the TTL value in the received packet -will be 255 minus the number of routers in the round-trip path. -.TP 0.2i -\(bu -Set it to 255; this is what current Berkeley Unix systems do. -In this case the TTL value in the received packet will be 255 minus the -number of routers in the path \fBfrom\fR -the remote system \fBto\fR the \fBping\fRing host. -.TP 0.2i -\(bu -Set it to some other value. Some machines use the same value for -ICMP packets that they use for TCP packets, for example either 30 or 60. -Others may use completely wild values. -.SH "BUGS" -.TP 0.2i -\(bu -Many Hosts and Gateways ignore the RECORD_ROUTE option. -.TP 0.2i -\(bu -The maximum IP header length is too small for options like -RECORD_ROUTE to be completely useful. -There's not much that that can be done about this, however. -.TP 0.2i -\(bu -Flood pinging is not recommended in general, and flood pinging the -broadcast address should only be done under very controlled conditions. -.SH "SEE ALSO" -.PP -\fBnetstat\fR(1), -\fBifconfig\fR(8). -.SH "HISTORY" -.PP -The \fBping\fR command appeared in 4.3BSD. -.PP -The version described here is its descendant specific to Linux. -.SH "SECURITY" -.PP -\fBping\fR requires CAP_NET_RAWIO capability -to be executed. It may be used as set-uid root. -.SH "AVAILABILITY" -.PP -\fBping\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/files/man/rarpd.8 b/system/base/iputils/files/man/rarpd.8 deleted file mode 100644 index 0e68d549..00000000 --- a/system/base/iputils/files/man/rarpd.8 +++ /dev/null @@ -1,84 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "RARPD" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -rarpd \- answer RARP REQUESTs -.SH SYNOPSIS - -\fBarping\fR [ \fB-aAvde\fR] [ \fB-b \fIbootdir\fB\fR] [ \fB\fIinterface\fB\fR] - -.SH "DESCRIPTION" -.PP -Listens -RARP -requests from clients. Provided MAC address of client -is found in \fI/etc/ethers\fR database and -obtained host name is resolvable to an IP address appropriate -for attached network, \fBrarpd\fR answers to client with RARPD -reply carrying an IP address. -.PP -To allow multiple boot servers on the network \fBrarpd\fR -optionally checks for presence Sun-like bootable image in TFTP directory. -It should have form \fBHexadecimal_IP.ARCH\fR, f.e. to load -sparc 193.233.7.98 \fIC1E90762.SUN4M\fR is linked to -an image appropriate for SUM4M in directory \fI/etc/tftpboot\fR. -.SH "WARNING" -.PP -This facility is deeply obsoleted by -BOOTP -and later -DHCP protocols. -However, some clients really still need this to boot. -.SH "OPTIONS" -.TP -\fB-a\fR -Listen on all the interfaces. Currently it is an internal -option, its function is overridden with \fIinterface\fR -argument. It should not be used. -.TP -\fB-A\fR -Listen not only RARP but also ARP messages, some rare clients -use ARP by some unknown reason. -.TP -\fB-v\fR -Be verbose. -.TP -\fB-d\fR -Debug mode. Do not go to background. -.TP -\fB-e\fR -Do not check for presence of a boot image, reply if MAC address -resolves to a valid IP address using \fI/etc/ethers\fR -database and DNS. -.TP -\fB-b \fIbootdir\fB\fR -TFTP boot directory. Default is \fI/etc/tftpboot\fR -.SH "SEE ALSO" -.PP -\fBarping\fR(8), -\fBtftpd\fR(8). -.SH "AUTHOR" -.PP -\fBrarpd\fR was written by -Alexey Kuznetsov -. -It is now maintained by -YOSHIFUJI Hideaki -. -.SH "SECURITY" -.PP -\fBrarpd\fR requires CAP_NET_RAWIO capability -to listen and send RARP and ARP packets. It also needs CAP_NET_ADMIN -to give to kernel hint for ARP resolution; this is not strictly required, -but some (most of, to be more exact) clients are so badly broken that -are not able to answer ARP before they are finally booted. This is -not wonderful taking into account that clients using RARPD in 2002 -are all unsupported relic creatures of 90's and even earlier. -.SH "AVAILABILITY" -.PP -\fBrarpd\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/files/man/rdisc.8 b/system/base/iputils/files/man/rdisc.8 deleted file mode 100644 index b8acca56..00000000 --- a/system/base/iputils/files/man/rdisc.8 +++ /dev/null @@ -1,110 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "RDISC" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -rdisc \- network router discovery daemon -.SH SYNOPSIS - -\fBrdisc\fR [ \fB-abdfstvV\fR] [ \fB\fIsend_address\fB\fR] [ \fB\fIreceive_address\fB\fR] - -.SH "DESCRIPTION" -.PP -\fBrdisc\fR implements client side of the ICMP router discover protocol. -\fBrdisc\fR is invoked at boot time to populate the network -routing tables with default routes. -.PP -\fBrdisc\fR listens on the ALL_HOSTS (224.0.0.1) multicast address -(or \fIreceive_address\fR provided it is given) -for ROUTER_ADVERTISE messages from routers. The received -messages are handled by first ignoring those listed router addresses -with which the host does not share a network. Among the remaining addresses -the ones with the highest preference are selected as default routers -and a default route is entered in the kernel routing table -for each one of them. -.PP -Optionally, \fBrdisc\fR can avoid waiting for routers to announce -themselves by sending out a few ROUTER_SOLICITATION messages -to the ALL_ROUTERS (224.0.0.2) multicast address -(or \fIsend_address\fR provided it is given) -when it is started. -.PP -A timer is associated with each router address and the address will -no longer be considered for inclusion in the the routing tables if the -timer expires before a new -\fBadvertise\fR message is received from the router. -The address will also be excluded from consideration if the host receives an -\fBadvertise\fR -message with the preference being maximally negative. -.PP -Server side of router discovery protocol is supported by Cisco IOS -and by any more or less complete UNIX routing daemon, f.e \fBgated\fR. -.SH "OPTIONS" -.TP -\fB-a\fR -Accept all routers independently of the preference they have in their -\fBadvertise\fR messages. -Normally \fBrdisc\fR only accepts (and enters in the kernel routing -tables) the router or routers with the highest preference. -.TP -\fB-b\fR -Opposite to \fB-a\fR, i.e. install only router with the best -preference value. It is default behaviour. -.TP -\fB-d\fR -Send debugging messages to syslog. -.TP -\fB-f\fR -Run \fBrdisc\fR forever even if no routers are found. -Normally \fBrdisc\fR gives up if it has not received any -\fBadvertise\fR message after after soliciting three times, -in which case it exits with a non-zero exit code. -If \fB-f\fR is not specified in the first form then -\fB-s\fR must be specified. -.TP -\fB-s\fR -Send three \fBsolicitation\fR messages initially to quickly discover -the routers when the system is booted. -When \fB-s\fR is specified \fBrdisc\fR -exits with a non-zero exit code if it can not find any routers. -This can be overridden with the \fB-f\fR option. -.TP -\fB-t\fR -Test mode. Do not go to background. -.TP -\fB-v\fR -Be verbose i.e. send lots of debugging messages to syslog. -.TP -\fB-V\fR -Print version and exit. -.SH "HISTORY" -.PP -This program was developed by Sun Microsystems (see copyright -notice in source file). It was ported to Linux by -Alexey Kuznetsov -. -It is now maintained by -YOSHIFUJI Hideaki -. -.SH "SEE ALSO" -.PP -\fBicmp\fR(7), -\fBinet\fR(7), -\fBping\fR(8). -.SH "REFERENCES" -.PP -Deering, S.E.,ed "ICMP Router Discovery Messages", -RFC1256, Network Information Center, SRI International, -Menlo Park, Calif., September 1991. -.SH "SECURITY" -.PP -\fBrdisc\fR requires CAP_NET_RAWIO to listen -and send ICMP messages and capability CAP_NET_ADMIN -to update routing tables. -.SH "AVAILABILITY" -.PP -\fBrdisc\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/files/man/tracepath.8 b/system/base/iputils/files/man/tracepath.8 deleted file mode 100644 index ed780bf9..00000000 --- a/system/base/iputils/files/man/tracepath.8 +++ /dev/null @@ -1,97 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "TRACEPATH" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -tracepath, tracepath6 \- traces path to a network host discovering MTU along this path -.SH SYNOPSIS - -\fBtracepath\fR [ \fB-n\fR] [ \fB-b\fR] [ \fB-l \fIpktlen\fB\fR] \fB\fIdestination\fB\fR [ \fB\fIport\fB\fR] - -.SH "DESCRIPTION" -.PP -It traces path to \fIdestination\fR discovering MTU along this path. -It uses UDP port \fIport\fR or some random port. -It is similar to \fBtraceroute\fR, only does not require superuser -privileges and has no fancy options. -.PP -\fBtracepath6\fR is good replacement for \fBtraceroute6\fR -and classic example of application of Linux error queues. -The situation with IPv4 is worse, because commercial -IP routers do not return enough information in ICMP error messages. -Probably, it will change, when they will be updated. -For now it uses Van Jacobson's trick, sweeping a range -of UDP ports to maintain trace history. -.SH "OPTIONS" -.TP -\fB-n\fR -Print primarily IP addresses numerically. -.TP -\fB-b\fR -Print both of host names and IP addresses. -.TP -\fB-l\fR -Sets the initial packet length to \fIpktlen\fR instead of -65536 for \fBtracepath\fR or 128000 for \fBtracepath6\fR. -.SH "OUTPUT" -.PP - -.nf -root@mops:~ # tracepath6 3ffe:2400:0:109::2 - 1?: [LOCALHOST] pmtu 1500 - 1: dust.inr.ac.ru 0.411ms - 2: dust.inr.ac.ru asymm 1 0.390ms pmtu 1480 - 2: 3ffe:2400:0:109::2 463.514ms reached - Resume: pmtu 1480 hops 2 back 2 -.fi -.PP -The first column shows TTL of the probe, followed by colon. -Usually value of TTL is obtained from reply from network, -but sometimes reply does not contain necessary information and -we have to guess it. In this case the number is followed by ?. -.PP -The second column shows the network hop, which replied to the probe. -It is either address of router or word [LOCALHOST], if -the probe was not sent to the network. -.PP -The rest of line shows miscellaneous information about path to -the correspinding network hop. As rule it contains value of RTT. -Additionally, it can show Path MTU, when it changes. -If the path is asymmetric -or the probe finishes before it reach prescribed hop, difference -between number of hops in forward and backward direction is shown -following keyword async. This information is not reliable. -F.e. the third line shows asymmetry of 1, it is because the first probe -with TTL of 2 was rejected at the first hop due to Path MTU Discovery. -.PP -The last line summarizes information about all the path to the destination, -it shows detected Path MTU, amount of hops to the destination and our -guess about amount of hops from the destination to us, which can be -different when the path is asymmetric. -.SH "SEE ALSO" -.PP -\fBtraceroute\fR(8), -\fBtraceroute6\fR(8), -\fBping\fR(8). -.SH "AUTHOR" -.PP -\fBtracepath\fR was written by -Alexey Kuznetsov -. -.SH "SECURITY" -.PP -No security issues. -.PP -This lapidary deserves to be elaborated. -\fBtracepath\fR is not a privileged program, unlike -\fBtraceroute\fR, \fBping\fR and other beasts of this kind. -\fBtracepath\fR may be executed by everyone who has some access -to network, enough to send UDP datagrams to investigated destination -using given port. -.SH "AVAILABILITY" -.PP -\fBtracepath\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/files/man/traceroute6.8 b/system/base/iputils/files/man/traceroute6.8 deleted file mode 100644 index 7dfe99d3..00000000 --- a/system/base/iputils/files/man/traceroute6.8 +++ /dev/null @@ -1,42 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "TRACEROUTE6" "8" "24 Mayıs 2011" "iputils-101006" "System Manager's Manual: iputils" -.SH NAME -traceroute6 \- traces path to a network host -.SH SYNOPSIS - -\fBtraceroute6\fR [ \fB-dnrvV\fR] [ \fB-i \fIinterface\fB\fR] [ \fB-m \fImax_ttl\fB\fR] [ \fB-p \fIport\fB\fR] [ \fB-q \fImax_probes\fB\fR] [ \fB-s \fIsource\fB\fR] [ \fB-w \fIwait time\fB\fR] \fB\fIdestination\fB\fR [ \fB\fIsize\fB\fR] - -.SH "DESCRIPTION" -.PP -Description can be found in -\fBtraceroute\fR(8), -all the references to IP replaced to IPv6. It is needless to copy -the description from there. -.SH "SEE ALSO" -.PP -\fBtraceroute\fR(8), -\fBtracepath\fR(8), -\fBping\fR(8). -.SH "HISTORY" -.PP -This program has long history. Author of \fBtraceroute\fR -is Van Jacobson and it first appeared in 1988. This clone is -based on a port of \fBtraceroute\fR to IPv6 published -in NRL IPv6 distribution in 1996. In turn, it was ported -to Linux by Pedro Roque. After this it was kept in sync by -Alexey Kuznetsov -. And eventually entered -\fBiputils\fR package. -.SH "SECURITY" -.PP -\fBtracepath6\fR requires CAP_NET_RAWIO capability -to be executed. It is safe to be used as set-uid root. -.SH "AVAILABILITY" -.PP -\fBtraceroute6\fR is part of \fIiputils\fR package -and the latest versions are available in source form at -http://www.skbuff.net/iputils/iputils-current.tar.bz2. diff --git a/system/base/iputils/pspec.xml b/system/base/iputils/pspec.xml deleted file mode 100644 index 3686682d..00000000 --- a/system/base/iputils/pspec.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - iputils - http://www.linux-ipv6.org - - PisiLinux Community - admins@pisilinux.org - - BSD - app:console - Network monitoring tools including ping and ping6 - iputils contains network monitoring tools including ping and ping6. - http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 - - - ifenslave/ifenslave.c - - - openssl-devel - libidn-devel - gnutls-devel - - - - 021109-uclibc-no-ether_ntohost.patch - - iputils-20121221-printf-size.patch - iputils-20121221-owl-pingsock.diff - iputils-20121221-openssl.patch - iputils-20121221-makefile.patch - iputils-20121221-crypto-build.patch - iputils-20100418-so_mark.patch - iputils-20071127-nonroot-floodping.patch - iputils-20071127-kernel-ifaddr.patch - - - - fedora/iputils-20020124-countermeasures.patch - - fedora/iputils-20020927-ping-subint.patch - - fedora/iputils-20070202-traffic_class.patch - - fedora/iputils-20100418-convtoint.patch - - - - - - - docs.patch - - - - - iputils - - libcap - gnutls - - - /bin - /usr/bin - /usr/sbin - /sbin - /lib/systemd/system - /etc/conf.d/rdisc - /usr/share/doc - /usr/share/man - - - - man/arping.8 - man/clockdiff.8 - man/ping.8 - man/rarpd.8 - man/rdisc.8 - man/tracepath.8 - man/traceroute6.8 - ifenslave/ifenslave.8 - ifenslave/README.bonding - - - fedora/rdisc.sysconfig - fedora/rdisc.service - - - - - - 2014-05-11 - 20121221 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-26 - 20121221 - Fix dep, release bump. - PisiLinux Community - admins@pisilinux.org - - - 2013-01-14 - 20121221 - New release - PisiLinux Community - admins@pisilinux.org - - - 2012-08-23 - 20101006 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/system/base/iputils/translations.xml b/system/base/iputils/translations.xml deleted file mode 100644 index ed28e723..00000000 --- a/system/base/iputils/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - iputils - ping ve ping6 uygulamalarını da içeren ağ izleme araçları - Iputils, ping ve ping6 gibi ağ izleme araçlarını içeren bir pakettir. - Iputils contient les outils de surveillance réseau incluant ping et ping6. - - diff --git a/system/base/json-c/pspec.xml b/system/base/json-c/pspec.xml index 5083824a..7a3ad3a7 100644 --- a/system/base/json-c/pspec.xml +++ b/system/base/json-c/pspec.xml @@ -45,6 +45,9 @@ json-c-32bit emul32 32-bit shared libraries for json-c + + glibc-32bit + emul32 /usr/lib32 @@ -53,7 +56,7 @@ - 2014-07-04 + 2015-04-30 0.12 Version bump and security update(CVE-2013-6371, CVE-2013-6370). Vedat Demir diff --git a/system/base/kbd/actions.py b/system/base/kbd/actions.py index 3b6b49b0..4ed46171 100644 --- a/system/base/kbd/actions.py +++ b/system/base/kbd/actions.py @@ -8,19 +8,22 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - autotools.configure("--enable-nls") + autotools.configure("--enable-nls \ + --prefix=/usr \ + --datadir=/usr/share/kbd \ + --mandir=/usr/share/man") def build(): - autotools.make() + autotools.make("KEYCODES_PROGS=yes RESIZECONS_PROGS=yes") def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + autotools.rawInstall("KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=%s" % get.installDIR()) for exe in ("loadkeys", "setfont", "unicode_start", "unicode_stop"): pisitools.domove("/usr/bin/%s" % exe, "/bin") pisitools.dosym("/bin/%s" % exe, "/usr/bin/%s" % exe) - pisitools.remove("/usr/share/keymaps/i386/qwerty/trf.map.gz") + pisitools.remove("/usr/share/kbd/keymaps/i386/qwerty/trf.map.gz") - pisitools.dohtml("doc/*") + pisitools.dohtml("docs/doc/*.html") pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/system/base/kbd/files/archlinux/fix-dvorak-es.patch b/system/base/kbd/files/archlinux/fix-dvorak-es.patch new file mode 100644 index 00000000..95760fd3 --- /dev/null +++ b/system/base/kbd/files/archlinux/fix-dvorak-es.patch @@ -0,0 +1,11 @@ +--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old 2013-05-08 14:58:03.393349828 +0200 ++++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map 2013-05-08 14:58:20.206415053 +0200 +@@ -4,7 +4,7 @@ + + keymaps 0-2,4,5,6,8-10,12,14 + include "linux-with-alt-and-altgr" +-include "euro" ++include "euro.map" + strings as usual + + keycode 1 = Escape diff --git a/system/base/kbd/files/archlinux/fix-euro2.patch b/system/base/kbd/files/archlinux/fix-euro2.patch new file mode 100644 index 00000000..572cba74 --- /dev/null +++ b/system/base/kbd/files/archlinux/fix-euro2.patch @@ -0,0 +1,9 @@ +--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 15:00:25.917752313 +0200 ++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 15:00:54.943957367 +0200 +@@ -2,5 +2,5 @@ + # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt) + # on the positions where many keyboards have E and C. + # To get it displayed, use a latin0 (i.e., latin9) font.] +-altgr keycode 18 = currency ++altgr keycode 18 = euro + altgr keycode 46 = cent diff --git a/system/base/kbd/pspec.xml b/system/base/kbd/pspec.xml index 785ac8c6..175d479b 100644 --- a/system/base/kbd/pspec.xml +++ b/system/base/kbd/pspec.xml @@ -12,36 +12,26 @@ app:console Keyboard and console utilities The kbd package contains keytable files and keyboard utilities compatible with kernel version 1.1.54 and later. - ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-1.15.5.tar.gz - http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2 - http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2 - http://source.pisilinux.org/1.0/ro_maps.tar.bz2 + https://www.kernel.org/pub/linux/utils/kbd/kbd-2.0.2.tar.xz + http://source.pisilinux.org/1.0/kbd-latarcyrheb-16-fixed.tar.bz2 + http://source.pisilinux.org/1.0/kbd-latsun-fonts.tar.bz2 + http://source.pisilinux.org/1.0/ro_maps.tar.bz2 gettext gzip + pam-devel + check-devel - kbd-1.15.5-loadkeys-parse.patch - - - mandriva/kbd-1.15-mandriva.patch mandriva/kbd-1.15-tilde_twosuperior_french_kbd.patch mandriva/kbd-1.12-data_thai.patch mandriva/kbd-1.15-remove-unneeded-calls.patch - - - fedora/kbd-1.15-keycodes-man.patch - - + + + archlinux/fix-dvorak-es.patch + archlinux/fix-euro2.patch pisilinux/unicode_start-default-font.patch @@ -51,6 +41,7 @@ pisilinux/currency.patch pisilinux/trf-keymap-fixes.patch pisilinux/trf-capslock-fix.patch + @@ -64,23 +55,30 @@ /usr/bin /usr/share/doc /usr/share/man - /usr/share/keymaps - /usr/share/locale - /usr/share/unimaps - /usr/share/consolefonts - /usr/share/consoletrans + /usr/share/kbd/keymaps + /usr/share/kbd/locale + /usr/share/kbd/unimaps + /usr/share/kbd/consolefonts + /usr/share/kbd/consoletrans - pisilinux/lat5u-12.psf.gz - pisilinux/lat5u-14.psf.gz - pisilinux/lat5u-16.psf.gz + pisilinux/lat5u-12.psf.gz + pisilinux/lat5u-14.psf.gz + pisilinux/lat5u-16.psf.gz - mandriva/mac-fr-ext_new.kmap.gz + mandriva/mac-fr-ext_new.kmap.gz + + 2015-05-08 + 2.0.2 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.15.5 diff --git a/system/base/kmod/actions.py b/system/base/kmod/actions.py index 28246c96..9687ff35 100644 --- a/system/base/kmod/actions.py +++ b/system/base/kmod/actions.py @@ -17,8 +17,9 @@ def setup(): def build(): autotools.make() -def check(): - autotools.make("check") +# need git for check +#def check(): +# autotools.make("check") def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/system/base/kmod/files/depmod-search.conf b/system/base/kmod/files/depmod-search.conf new file mode 100644 index 00000000..36f2cf7d --- /dev/null +++ b/system/base/kmod/files/depmod-search.conf @@ -0,0 +1,5 @@ +# +# /usr/lib/depmod.d/search.conf +# + +search updates extramodules built-in diff --git a/system/base/kmod/files/kmod-15-dynamic-kmod.patch b/system/base/kmod/files/kmod-15-dynamic-kmod.patch new file mode 100644 index 00000000..fc46f578 --- /dev/null +++ b/system/base/kmod/files/kmod-15-dynamic-kmod.patch @@ -0,0 +1,23 @@ +diff --git a/sys-apps/kmod/files/kmod-15-dynamic-kmod.patch b/sys-apps/kmod/files/kmod-15-dynamic-kmod.patch +new file mode 100644 +index 0000000..c93bea6 +--- /dev/null ++++ b/sys-apps/kmod/files/kmod-15-dynamic-kmod.patch + +@@ -0,0 +1,16 @@ ++do not statically link kmod against its own libraries ++ ++https://bugs.gentoo.org/493630 ++http://thread.gmane.org/gmane.linux.kernel.modules/1206 ++ ++--- a/Makefile.in +++++ b/Makefile.in ++@@ -817,7 +817,7 @@ ++ @BUILD_TOOLS_TRUE@ tools/static-nodes.c ++ ++ @BUILD_TOOLS_TRUE@tools_kmod_LDADD = libkmod/libkmod-util.la \ ++-@BUILD_TOOLS_TRUE@ libkmod/libkmod-internal.la +++@BUILD_TOOLS_TRUE@ libkmod/libkmod.la ++ ++ ++ # ------------------------------------------------------------------------------ diff --git a/system/base/kmod/pspec.xml b/system/base/kmod/pspec.xml index 4dcbc239..01662c52 100644 --- a/system/base/kmod/pspec.xml +++ b/system/base/kmod/pspec.xml @@ -12,11 +12,19 @@ app:console Linux kernel module management utilities Linux kernel module management utilities - ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-19.tar.xz + https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-20.tar.xz chrpath - libxslt + + xz-32bit + xz-devel + zlib-32bit + zlib-devel + kernel-module-headers + + kmod-15-dynamic-kmod.patch + @@ -47,6 +55,8 @@ modprobe.conf depmod.conf + + depmod-search.conf @@ -88,6 +98,7 @@ xz-32bit zlib-32bit + glibc-32bit /usr/lib32 @@ -95,6 +106,13 @@ + + 2015-03-26 + 20 + Version bump,add patch and fix deps. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-11-18 19 diff --git a/system/base/libX11/actions.py b/system/base/libX11/actions.py deleted file mode 100644 index 4d41b1e2..00000000 --- a/system/base/libX11/actions.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - -def setup(): - autotools.autoreconf("-vif") - autotools.configure("--disable-static") - - pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""') - pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE") - pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - if get.buildTYPE() == "emul32": return - - pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README") diff --git a/system/base/libX11/files/fix-null-pointer.patch b/system/base/libX11/files/fix-null-pointer.patch deleted file mode 100644 index 8b37f365..00000000 --- a/system/base/libX11/files/fix-null-pointer.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libX11-1.3.5//src/xlibi18n/ICWrap.c libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c ---- libX11-1.3.5//src/xlibi18n/ICWrap.c 2010-08-10 04:59:44.000000000 +0000 -+++ libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c 2010-09-17 17:11:21.000000000 +0000 -@@ -283,7 +283,7 @@ - XIMArg *args; - char *ret; - -- if (!ic->core.im) -+ if (!ic || !ic->core.im) - return (char *) NULL; - - /* diff --git a/system/base/libX11/files/fix-segfault.diff b/system/base/libX11/files/fix-segfault.diff deleted file mode 100644 index a38c0ce2..00000000 --- a/system/base/libX11/files/fix-segfault.diff +++ /dev/null @@ -1,50 +0,0 @@ -Index: libX11-1.4.99.1/src/Xrm.c -=================================================================== ---- libX11-1.4.99.1.orig/src/Xrm.c -+++ libX11-1.4.99.1/src/Xrm.c -@@ -2540,30 +2540,40 @@ Bool XrmQGetResource( - VClosureRec closure; - - if (db && *names) { -- _XLockMutex(&db->linfo); -+ if ((_XLockMutex_fn) && db->linfo.lock ) { -+ _XLockMutex(&db->linfo); -+ } - closure.type = pType; - closure.value = pValue; - table = db->table; - if (names[1]) { - if (table && !table->leaf) { - if (GetNEntry(table, names, classes, &closure)) { -- _XUnlockMutex(&db->linfo); -+ if ((_XUnlockMutex_fn) && db->linfo.lock ) { -+ _XUnlockMutex(&db->linfo); -+ } - return True; - } - } else if (table && table->hasloose && - GetLooseVEntry((LTable)table, names, classes, &closure)) { -- _XUnlockMutex (&db->linfo); -+ if ((_XUnlockMutex_fn) && db->linfo.lock ) { -+ _XUnlockMutex (&db->linfo); -+ } - return True; - } - } else { - if (table && !table->leaf) - table = table->next; - if (table && GetVEntry((LTable)table, names, classes, &closure)) { -- _XUnlockMutex(&db->linfo); -+ if ((_XUnlockMutex_fn) && db->linfo.lock ) { -+ _XUnlockMutex(&db->linfo); -+ } - return True; - } - } -- _XUnlockMutex(&db->linfo); -+ if ((_XUnlockMutex_fn) && db->linfo.lock ) { -+ _XUnlockMutex(&db->linfo); -+ } - } - *pType = NULLQUARK; - pValue->addr = (XPointer)NULL; diff --git a/system/base/libX11/pspec.xml b/system/base/libX11/pspec.xml deleted file mode 100644 index 82f3791f..00000000 --- a/system/base/libX11/pspec.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - libX11 - http://www.x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - X.Org X11 library - Core X11 protocol client library. - mirrors://xorg/individual/lib/libX11-1.6.2.tar.bz2 - - libxcb-devel - xorg-proto - xtrans - - - fix-segfault.diff - fix-null-pointer.patch - - - - - libX11 - - libxcb - - - /usr/lib/libX11* - /usr/lib/X11 - /usr/share/X11 - /usr/share/doc/libX11 - - - - - libX11-devel - system.devel - Development files for X11 library - - libX11 - libxcb-devel - xorg-proto - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man - - - - - libX11-32bit - emul32 - 32-bit shared libraries for libX11 - emul32 - - libxcb-32bit - - - libX11 - libxcb-32bit - - - /usr/lib32 - - - - - - 2014-05-11 - 1.6.2 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-07 - 1.6.2 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-09-12 - 1.6.2 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-07-30 - 1.6.1 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-06-21 - 1.6.0 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-24 - 1.5.0 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - diff --git a/system/base/libX11/translations.xml b/system/base/libX11/translations.xml deleted file mode 100644 index f7b669ff..00000000 --- a/system/base/libX11/translations.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - libX11 - X.Org X11 kitaplığı - Librairie X11 de X.Org. - X.Org X11 Bibliothek - - - - libX11-devel - libX11 için geliştirme dosyaları - - - - libX11-32bit - libX11 için 32-bit paylaşımlı kitaplıklar - - diff --git a/system/base/libXau/actions.py b/system/base/libXau/actions.py deleted file mode 100644 index 1e2e53ca..00000000 --- a/system/base/libXau/actions.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import get -from pisi.actionsapi import autotools -from pisi.actionsapi import shelltools - -def setup(): - autotools.autoreconf("-vif") - autotools.configure("--disable-static") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - diff --git a/system/base/libXau/files/visibility.patch b/system/base/libXau/files/visibility.patch deleted file mode 100644 index 5a338a16..00000000 --- a/system/base/libXau/files/visibility.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libXau-1.0.3/AuDispose.c.orig 2007-11-23 17:51:27.000000000 -0200 -+++ libXau-1.0.3/AuDispose.c 2007-11-23 17:51:34.000000000 -0200 -@@ -33,7 +33,7 @@ in this Software without prior written a - #include - #include - --void -+_X_EXPORT void - XauDisposeAuth (Xauth *auth) - { - if (auth) { ---- libXau-1.0.3/AuRead.c.orig 2007-11-23 17:52:14.000000000 -0200 -+++ libXau-1.0.3/AuRead.c 2007-11-23 17:52:21.000000000 -0200 -@@ -69,7 +69,7 @@ read_counted_string (unsigned short *cou - return 1; - } - --Xauth * -+_X_EXPORT Xauth * - XauReadAuth (FILE *auth_file) - { - Xauth local; diff --git a/system/base/libXau/pspec.xml b/system/base/libXau/pspec.xml deleted file mode 100644 index a13e5ff5..00000000 --- a/system/base/libXau/pspec.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - libXau - http://www.x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - X.Org Au library - libXau provides functions to manage X authorization files - http://xorg.freedesktop.org/archive/individual/lib/libXau-1.0.8.tar.gz - - visibility.patch - - - - - libXau - - /usr/lib - - - - - libXau-devel - system.devel - Development files for libXau - - libXau - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man - - - - - libXau-32bit - emul32 - 32-bit shared libraries for libXau - emul32 - - libXau - - - /usr/lib32 - - - - - - 2014-05-11 - 1.0.8 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-07 - 1.0.8 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-21 - 1.0.8 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-08-23 - 1.0.7 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/system/base/libXau/translations.xml b/system/base/libXau/translations.xml deleted file mode 100644 index a48e4482..00000000 --- a/system/base/libXau/translations.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - libXau - X.Org Au kitaplığı. - Librairie Au de X.Org. - X.Org Au Bibliothek - libXau, X yetkilendirme dosyalarını yönetmek için işlevler sağlar. - - - - libXau-devel - libXau için geliştirme dosyaları - - - - libXau-32bit - libXau için 32-bit paylaşımlı kitaplıklar - - diff --git a/system/base/libXdmcp/pspec.xml b/system/base/libXdmcp/pspec.xml deleted file mode 100644 index 87eca840..00000000 --- a/system/base/libXdmcp/pspec.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - libXdmcp - http://x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - X.Org Xdmcp library - LibXdmcp is the X Display Manager Control Protocol library. - http://xorg.freedesktop.org/archive/individual/lib/libXdmcp-1.1.1.tar.bz2 - - - - libXdmcp - - /usr/lib - /usr/share/doc - - - - - libXdmcp-devel - system.devel - Development files for libXdmcp - - libXdmcp - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/doc/*/*.xml - - - - - libXdmcp-32bit - emul32 - 32-bit shared libraries for libXdmcp - emul32 - - libXdmcp - - - /usr/lib32 - - - - - - 2014-05-11 - 1.1.1 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2013-10-08 - 1.1.1 - Rebuild, clean actions.py. - Serdar Soytetir - kaptan@pisilinux.org - - - 2012-08-23 - 1.1.1 - First release - PisiLinux Community - admins@pisilinux.org - - - diff --git a/system/base/libXdmcp/translations.xml b/system/base/libXdmcp/translations.xml deleted file mode 100644 index 7eb6f757..00000000 --- a/system/base/libXdmcp/translations.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - libXdmcp - X.Org Xdmcp kitaplığı. - Librairie Xdmcp de X.Org. - X.Org Xdmcp Bibliothek - LibXdmcp, X Ekran Yöneticisi Denetim Protokolü kitaplığıdır. - - - - libXdmcp-devel - libXdmcp için geliştirme dosyaları - - - - libXdmcp-32bit - libXdmcp için 32-bit paylaşımlı kitaplıklar - - diff --git a/system/base/libcap/pspec.xml b/system/base/libcap/pspec.xml index 43a0f57d..68ca1abe 100644 --- a/system/base/libcap/pspec.xml +++ b/system/base/libcap/pspec.xml @@ -16,7 +16,7 @@ https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz attr-devel - pam + pam-devel @@ -56,9 +56,10 @@ emul32 attr-32bit + glibc-32bit - libcap + glibc-32bit attr-32bit @@ -67,6 +68,13 @@ + + 2015-03-16 + 2.24 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 2.24 diff --git a/system/base/libgcrypt/pspec.xml b/system/base/libgcrypt/pspec.xml index 7c74ee80..6799f13d 100644 --- a/system/base/libgcrypt/pspec.xml +++ b/system/base/libgcrypt/pspec.xml @@ -12,7 +12,7 @@ library General purpose crypto library Libgcrypt is a general purpose crypto library based on the code used in GNU Privacy Guard. - ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.1.tar.bz2 + http://source.pisilinux.org/1.0/libgcrypt-1.6.3.tar.bz2 libgpg-error-devel @@ -57,9 +57,11 @@ emul32 libgpg-error-32bit + glibc-32bit libgpg-error-32bit + glibc-32bit libgcrypt @@ -68,6 +70,13 @@ + + 2015-04-13 + 1.6.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.6.1 diff --git a/system/base/libgpg-error/pspec.xml b/system/base/libgpg-error/pspec.xml index ef455176..a2a7a799 100644 --- a/system/base/libgpg-error/pspec.xml +++ b/system/base/libgpg-error/pspec.xml @@ -13,7 +13,7 @@ library Library for error values used by GnuPG components libgpg-error is a library that defines common error values for all GnuPG components. - ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.12.tar.bz2 + ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.19.tar.bz2 @@ -22,6 +22,8 @@ /usr/bin /usr/lib /usr/share/doc + /usr/share/info + /usr/share/man /usr/share/locale @@ -34,7 +36,7 @@ libgpg-error - /usr/bin/*-config + /usr/bin/gpg-error-config /usr/include /usr/lib/pkgconfig /usr/lib32/pkgconfig @@ -47,8 +49,12 @@ emul32 32-bit shared libraries for libgpg-error emul32 + + glibc-32bit + libgpg-error + glibc-32bit /usr/lib32 @@ -56,6 +62,13 @@ + + 2015-04-13 + 1.19 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.12 diff --git a/system/base/libidn/pspec.xml b/system/base/libidn/pspec.xml index 6a830f5f..ce45c4b3 100644 --- a/system/base/libidn/pspec.xml +++ b/system/base/libidn/pspec.xml @@ -34,6 +34,9 @@ libidn-devel system.devel Development files for libidn + + glibc-32bit + libidn diff --git a/system/base/libpcre/pspec.xml b/system/base/libpcre/pspec.xml index 1795b1ca..d1725719 100644 --- a/system/base/libpcre/pspec.xml +++ b/system/base/libpcre/pspec.xml @@ -58,6 +58,7 @@ emul32 readline-32bit + glibc-32bit libgcc diff --git a/system/devel/libunwind/actions.py b/system/base/libunwind/actions.py similarity index 100% rename from system/devel/libunwind/actions.py rename to system/base/libunwind/actions.py diff --git a/system/devel/libunwind/pspec.xml b/system/base/libunwind/pspec.xml similarity index 100% rename from system/devel/libunwind/pspec.xml rename to system/base/libunwind/pspec.xml diff --git a/system/devel/libunwind/translations.xml b/system/base/libunwind/translations.xml similarity index 100% rename from system/devel/libunwind/translations.xml rename to system/base/libunwind/translations.xml diff --git a/system/base/libusb-compat/pspec.xml b/system/base/libusb-compat/pspec.xml index 940ba512..4983026c 100644 --- a/system/base/libusb-compat/pspec.xml +++ b/system/base/libusb-compat/pspec.xml @@ -53,9 +53,12 @@ emul32 libusb-32bit + glibc-32bit libusb-32bit + libusb + glibc-32bit libusb-compat @@ -65,7 +68,7 @@ - 2014-09-08 + 2015-05-05 0.1.5 Rebuild for libusbx libusb changes diff --git a/system/base/libusb/actions.py b/system/base/libusb/actions.py index 144f72f0..47def8af 100644 --- a/system/base/libusb/actions.py +++ b/system/base/libusb/actions.py @@ -9,7 +9,9 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - autotools.configure("--disable-static") + autotools.configure("--disable-static \ + --enable-udev") + def build(): autotools.make() diff --git a/system/base/libusb/pspec.xml b/system/base/libusb/pspec.xml index 74c7f89d..7b1fcd4e 100644 --- a/system/base/libusb/pspec.xml +++ b/system/base/libusb/pspec.xml @@ -14,7 +14,7 @@ Project's main aim is to create a library for use by user level applications to access USB devices regardless of OS. http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.19/libusb-1.0.19.tar.bz2 - libudev-devel + eudev-devel @@ -27,7 +27,7 @@ libusbx - libudev + eudev /usr/bin @@ -68,11 +68,12 @@ 32-bit shared libraries for libusb emul32 - libudev-32bit + glibc-32bit libusb - libudev-32bit + eudev-32bit + glibc-32bit /usr/lib32 @@ -81,7 +82,7 @@ - 2014-09-08 + 2014-04-30 1.0.19 rename libusbx to libusb like upsteam diff --git a/system/base/libuser/actions.py b/system/base/libuser/actions.py new file mode 100644 index 00000000..074bd724 --- /dev/null +++ b/system/base/libuser/actions.py @@ -0,0 +1,35 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +def setup(): + shelltools.export("AUTOPOINT", "true") + + autotools.configure("--with-python \ + --without-ldap \ + --without-sasl \ + --with-popt \ + --disable-rpath \ + --enable-gtk-doc-html=no \ + --disable-gtk-doc") + + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + + autotools.make("-C po update-gmo") + +def install(): + autotools.rawInstall("DESTDIR='%s'" % get.installDIR()) + + pisitools.removeDir("/usr/share/gtk-doc") + + pisitools.dodoc("ABOUT*", "AUTHORS", "COPYING", "NEWS", "README") diff --git a/system/base/libuser/files/add-python-linkage.diff b/system/base/libuser/files/add-python-linkage.diff new file mode 100644 index 00000000..23562d28 --- /dev/null +++ b/system/base/libuser/files/add-python-linkage.diff @@ -0,0 +1,11 @@ +--- Makefile.am.OSmanOS 2012-11-08 04:25:58.000000000 +0200 ++++ Makefile.am 2013-02-14 18:27:39.272866825 +0200 +@@ -198,7 +198,7 @@ + python_libusermodule_la_SOURCES = python/libusermodule.c python/common.h \ + python/debug.h + python_libusermodule_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) +-python_libusermodule_la_LDFLAGS = -module -avoid-version $(GOBJECT_LIBS) ++python_libusermodule_la_LDFLAGS = -module -avoid-version $(GOBJECT_LIBS) -lpython$(PYTHON_VERSION) + python_libusermodule_la_LIBADD = lib/libuser.la + + samples_enum_CPPFLAGS = $(AM_CPPFLAGS) $(LOCALEDIR_CPPFLAGS) diff --git a/system/base/libuser/files/disable-sgml2x-conversion.diff b/system/base/libuser/files/disable-sgml2x-conversion.diff new file mode 100644 index 00000000..cf406615 --- /dev/null +++ b/system/base/libuser/files/disable-sgml2x-conversion.diff @@ -0,0 +1,18 @@ +Index: libuser-0.56.17/docs/Makefile.am +=================================================================== +--- libuser-0.56.17.orig/docs/Makefile.am ++++ libuser-0.56.17/docs/Makefile.am +@@ -1,12 +1,10 @@ +-SUBDIRS = reference +- + man_MANS = libuser.conf.5 + + CLEANFILES = $(man_MANS) sgml/libuser.html sgml/libuser-1.html \ + sgml/libuser-2.html sgml/libuser.txt + EXTRA_DIST = attributes.txt libuser.conf.5.in rfc2307.txt sgml/libuser.sgml + +-all: sgml/libuser.txt sgml/libuser.html ++all: libuser.conf.5 + + libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile + sed 's,@sysconfdir\@,$(sysconfdir),g' \ diff --git a/system/base/libuser/files/libuser-0.56.15-fix_blowfish.patch b/system/base/libuser/files/libuser-0.56.15-fix_blowfish.patch new file mode 100644 index 00000000..cc8bcf5b --- /dev/null +++ b/system/base/libuser/files/libuser-0.56.15-fix_blowfish.patch @@ -0,0 +1,28 @@ +--- lib/util.c 2010-05-20 15:46:11.000000000 +0200 ++++ lib/util.c 2010-05-20 16:23:28.000000000 +0200 +@@ -116,14 +116,14 @@ + } + + static const struct { +- const char initial[5]; ++ const char initial[8]; + char separator[2]; + size_t salt_length; + gboolean sha_rounds; + } salt_type_info[] = { + {"$1$", "$", 8, FALSE }, + /* FIXME: number of rounds, base64 of 128 bits */ +- {"$2a$", "$", 8, FALSE }, ++ {"$2a$08$", "$", 22, FALSE }, + {"$5$", "$", 16, TRUE }, + {"$6$", "$", 16, TRUE }, + { "", "", 2 }, +@@ -230,7 +230,7 @@ + } salt_types[] = { + { "des", "", FALSE }, + { "md5", "$1$", FALSE }, +- { "blowfish", "$2a$", FALSE }, ++ { "blowfish", "$2a$08$", FALSE }, + { "sha256", "$5$", TRUE }, + { "sha512", "$6$", TRUE }, + }; diff --git a/system/base/libuser/files/libuser-0.56.9-fix-str-fmt.patch b/system/base/libuser/files/libuser-0.56.9-fix-str-fmt.patch new file mode 100644 index 00000000..4210d77e --- /dev/null +++ b/system/base/libuser/files/libuser-0.56.9-fix-str-fmt.patch @@ -0,0 +1,22 @@ +--- modules/files.c.str 2008-12-27 08:27:58.000000000 +0100 ++++ modules/files.c 2008-12-27 08:28:24.000000000 +0100 +@@ -281,7 +281,7 @@ + string, &err); + if (ret == FALSE) { + g_assert(err != NULL); +- g_warning(lu_strerror(err)); ++ g_warning("%s",lu_strerror(err)); + lu_error_free(&err); + } + return ret; +--- modules/ldap.c.str 2008-12-27 08:28:41.000000000 +0100 ++++ modules/ldap.c 2008-12-27 08:29:03.000000000 +0100 +@@ -677,7 +677,7 @@ + (&value, attr, val, &error); + if (ok == FALSE) { + g_assert(error != NULL); +- g_warning(lu_strerror(error)); ++ g_warning("%s",lu_strerror(error)); + lu_error_free(&error); + } else { + lu_ent_add_current(ent, attr, diff --git a/system/base/libuser/pspec.xml b/system/base/libuser/pspec.xml new file mode 100644 index 00000000..8dcc364b --- /dev/null +++ b/system/base/libuser/pspec.xml @@ -0,0 +1,122 @@ + + + + + libuser + https://fedorahosted.org/libuser + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + A user and group account administration library + libuser implements a standardized interface for manipulating and administering user and group accounts. The library uses pluggable back-ends to interface to its data sources. + https://fedorahosted.org/releases/l/i/libuser/libuser-0.61.tar.xz + + pam-devel + popt-devel + glib2-devel + python-devel + + + libuser-0.56.15-fix_blowfish.patch + libuser-0.56.9-fix-str-fmt.patch + + + + + + libuser + + pam + popt + glib2 + python + + + /etc + /usr/share/man + /usr/share/doc + /usr/share/locale + /usr/bin + /usr/sbin + /usr/lib + + + + + + + + + libuser-devel + system.devel + Development files for libuser + + libuser + glib2-devel + + + /usr/include + /usr/lib/pkgconfig + + + + + + 2015-04-07 + 0.61 + Version bump, build without-sasl + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 0.60 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 0.60 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-28 + 0.59 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-14 + 0.58.0 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 0.57.6 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/system/base/libuser/translations.xml b/system/base/libuser/translations.xml new file mode 100644 index 00000000..54c68e51 --- /dev/null +++ b/system/base/libuser/translations.xml @@ -0,0 +1,18 @@ + + + + libuser + Kullanıcı ve grup hesap yönetim kitaplığı + libuser kullanıcı ve grup hesaplarını yönetmek ve işlemek için standart bir arayüz sunar. Kitaplık, sağladığı arayüzün verilere erişimi için genişletilebilir arkauçlar kullanmaktadır. + + + + libuser-devel + libuser için geliştirme dosyaları + + + + libuser-ldap + libuser için LDAP kitaplığı + + diff --git a/system/base/libxcb/actions.py b/system/base/libxcb/actions.py deleted file mode 100644 index 291ea490..00000000 --- a/system/base/libxcb/actions.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - pisitools.flags.add("-DNDEBUG") - - autotools.autoreconf("-vif") - autotools.configure("--disable-static \ - --enable-xevie \ - --enable-xprint \ - --enable-xinput \ - --enable-xkb \ - --without-doxygen") - - pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("-j1 DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("COPYING", "NEWS", "README") diff --git a/system/base/libxcb/files/pthread-stubs.pc b/system/base/libxcb/files/pthread-stubs.pc deleted file mode 100644 index ad7b91b6..00000000 --- a/system/base/libxcb/files/pthread-stubs.pc +++ /dev/null @@ -1,8 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib - -Name: pthread stubs -Description: Stubs missing from libc for standard pthread functions -Version: 0.3 -Libs: diff --git a/system/base/libxcb/pspec.xml b/system/base/libxcb/pspec.xml deleted file mode 100644 index de4bda32..00000000 --- a/system/base/libxcb/pspec.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - libxcb - http://xcb.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - The X protocol C-language Binding (XCB) - The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility. - http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 - - libXau-devel - libXdmcp-devel - libxslt - xcb-proto - - - - - libxcb - - libXau - libXdmcp - glibc - - - /usr/lib - /usr/share/man - /usr/share/doc - - - - - libxcb-devel - system.devel - Development files for libxcb - - libxcb - - - /usr/include/xcb - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - pthread-stubs.pc - - - - - libxcb-32bit - emul32 - 32-bit shared libraries for libxcb - emul32 - - libXau-32bit - libXdmcp-32bit - - - libxcb - libXau-32bit - libXdmcp-32bit - - - /usr/lib32 - - - - - - 2014-09-02 - 1.11 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 1.10 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-03-07 - 1.10 - Version bump. - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-10-08 - 1.9.1 - Rebuild. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-07-28 - 1.9.1 - Version bump. - Marcin Bojara - marcin@pisilinux.org - - - 2012-11-18 - 1.9 - First release - Erdinç Gültekin - admins@pisilinux.org - - - diff --git a/system/base/libxcb/translations.xml b/system/base/libxcb/translations.xml deleted file mode 100644 index d1bf19d2..00000000 --- a/system/base/libxcb/translations.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - libxcb - X protokolü için C dili bağlayıcısı (XCB) - - - - libxcb-devel - libxcb için geliştirme dosyaları - - - - libxcb-32bit - libxcb için 32-bit paylaşımlı kitaplıklar - - diff --git a/system/base/libxml2/pspec.xml b/system/base/libxml2/pspec.xml index 92f33d6c..2d4950d2 100644 --- a/system/base/libxml2/pspec.xml +++ b/system/base/libxml2/pspec.xml @@ -14,7 +14,7 @@ Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform). ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz - python + python-devel xz-devel zlib-devel readline-devel @@ -75,6 +75,7 @@ xz-32bit zlib-32bit readline-32bit + glibc-32bit libxml2 diff --git a/system/base/lsb-release/pspec.xml b/system/base/lsb-release/pspec.xml index c91f6793..3e9a5072 100644 --- a/system/base/lsb-release/pspec.xml +++ b/system/base/lsb-release/pspec.xml @@ -13,6 +13,9 @@ LSB version query program lsb-release prints certain LSB (Linux Standard Base) and distribution information. mirrors://sourceforge/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz + + util-linux + diff --git a/system/base/lzo/pspec.xml b/system/base/lzo/pspec.xml index c566e779..248caa24 100644 --- a/system/base/lzo/pspec.xml +++ b/system/base/lzo/pspec.xml @@ -12,7 +12,7 @@ library An extremely fast compression and decompression library lzo is a library with very high compression and decompression speeds and very small memory usage. Provides low compression ratios but very high speeds. - http://www.oberhumer.com/opensource/lzo/download/lzo-2.08.tar.gz + http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz @@ -39,12 +39,25 @@ emul32 32-bit shared libraries for lzo emul32 + + glibc-32bit + + + glibc-32bit + /usr/lib32 + + 2015-04-12 + 2.09 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-07-03 2.08 diff --git a/system/base/man-pages/pspec.xml b/system/base/man-pages/pspec.xml index 603838fc..1242b96a 100644 --- a/system/base/man-pages/pspec.xml +++ b/system/base/man-pages/pspec.xml @@ -12,8 +12,8 @@ data:doc A somewhat comprehensive collection of Linux man pages A large collection of man pages (documentation) from the Linux Documentation Project (LDP). - http://ftp.kernel.org/pub/linux/docs/man-pages/man-pages-3.70.tar.xz - http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz + https://www.kernel.org/pub/linux/docs/man-pages/man-pages-3.81.tar.xz + http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2003-a.tar.xz @@ -32,6 +32,13 @@ + + 2015-03-09 + 3.81 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-07-13 3.70 diff --git a/system/base/mkinitramfs/actions.py b/system/base/mkinitramfs/actions.py deleted file mode 100644 index 7223540b..00000000 --- a/system/base/mkinitramfs/actions.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools - - -WorkDir = "./" - -def setup(): - shelltools.move("README.mkinitramfs", "README") - -def install(): - pisitools.dodir("/etc/initramfs.d") - pisitools.dodoc("README") - diff --git a/system/base/mkinitramfs/comar/pakhandler.py b/system/base/mkinitramfs/comar/pakhandler.py deleted file mode 100644 index 39a202f9..00000000 --- a/system/base/mkinitramfs/comar/pakhandler.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -import piksemel -import subprocess - -def generate_initramfs(filepath): - patterns = ("lib/initramfs", "boot/kernel", "bin/busybox") - doc = piksemel.parse(filepath) - for item in doc.tags("File"): - path = item.getTagData("Path") - if path.startswith(patterns): - for kernel in os.listdir("/etc/kernel"): - subprocess.call(["/sbin/mkinitramfs", "--type", kernel]) - return - -def setupPackage(metapath, filepath): - generate_initramfs(filepath) - -def cleanupPackage(metapath, filepath): - pass - -def postCleanupPackage(metapath, filepath): - generate_initramfs(filepath) diff --git a/system/base/mkinitramfs/files/hotplug b/system/base/mkinitramfs/files/hotplug deleted file mode 100644 index 6168aec4..00000000 --- a/system/base/mkinitramfs/files/hotplug +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# Simple script to handle uevents -# - -if [ "$SUBSYSTEM/$ACTION" == "firmware/add" ]; then - [ -e "/sys$DEVPATH/loading" ] || exit 1 - DIR=/lib/firmware - [ -e "$DIR/$FIRMWARE" ] || exit 1 - echo 1 > /sys$DEVPATH/loading - cat "$DIR/$FIRMWARE" > /sys$DEVPATH/data - echo 0 > /sys$DEVPATH/loading - exit 0 -fi diff --git a/system/base/mkinitramfs/files/init b/system/base/mkinitramfs/files/init deleted file mode 100644 index 8345cde5..00000000 --- a/system/base/mkinitramfs/files/init +++ /dev/null @@ -1,593 +0,0 @@ -#!/bin/sh -# -# Simple init script that should handle both -# livecd/livedisk, thinclient and hdd boot -# - -PATH=/usr/sbin:/usr/bin:/sbin:/bin -INITRAMFSCONF="/etc/initramfs.conf" - -ROOT_LINKS="bin sbin lib boot usr opt" -ROOT_TREES="etc root home var run" -TMPFS_DIRS="dev mnt mnt/cdrom mnt/livecd mnt/thin tmp sys proc media" -LOOPBACKFILE="/boot/pisi.sqfs" - -NORESUME=0 -LIVE=0 -NFSROOT=0 -QUIET=0 -RAID_INCREMENTAL=1 -RAID=0 -LVM=0 -COPYTORAM=0 -SPLASH=0 -WIPEMEM=0 - -HOTPLUG="/sbin/hotplug" - -MNTDIR="" -FS_TYPE="" -INITRAMFS="" -ROOT_FLAGS="" -ROOT_DEVICE="" -ROOT_TARGET="" -RESUME_DEVICE="" -WIPEMEM_OPTS="-llv" - -########################### -# Miscellaneous functions # -########################### - -info() { - echo "<6>initramfs: $1" > /dev/kmsg -} - -log_output() { - $@ | echo "<6>`sed 's#^\(.*\)$#initramfs:\1#g'`" > /dev/kmsg -} - -fall2sh() { - # Kill any possible plymouth instances - test -x /bin/plymouth && /bin/plymouth quit &> /dev/null - kill -9 $(pidof plymouthd) &> /dev/null - - echo "--> $*" - echo "Reboot with initramfs=shell(noprobe) to further debug the issue." - - # Use a login shell for sourcing /etc/profile - /bin/sh -l -} - -run_dhcpc() { - udhcpc -C -i eth0 -s /etc/udhcpc.script -} - -################## -# Device probers # -################## - -probe_devices() { - # Set hotplug helper for firmware loading - echo $HOTPLUG > /proc/sys/kernel/hotplug - - if [ "x$1" = "x--with-kms" ]; then - probe_kms - test -x /bin/plymouth && /bin/plymouth show-splash - fi - - probe_pci_devices - probe_virtio_devices - probe_usb_devices - - # Unset hotplug helper - echo > /proc/sys/kernel/hotplug - - [ "${RAID}" -eq "1" ] && probe_raid - [ "${LVM}" -eq "1" ] && probe_lvm -} - -probe_kms() { - for device in /sys/bus/pci/devices/*/boot_vga; do - [ -f $device ] || continue - info "Loading KMS driver" - grep -q 1 $device && modprobe -bq `cat ${device%boot_vga}modalias` - done - if [ ! -c /dev/fb0 ]; then - echo "options uvesafb scroll=ywrap mtrr=0 nocrtc=1 mode_option=1024x768-32" > /etc/modprobe.d/uvesafb.conf - modprobe -bq uvesafb - fi -} - -probe_pci_devices() { - info "Probing PCI devices" - local MODULES="" - for module in /sys/bus/pci/devices/*/modalias; do - [ -f $module ] || continue - MODULES="$MODULES $(cat $module)" - done - modprobe -bqa $MODULES -} - -probe_usb_devices() { - info "Probing USB devices" - local MODULES="" - for module in /sys/bus/usb/devices/*/modalias; do - [ -f $module ] || continue - MODULES="$MODULES $(cat $module)" - done - modprobe -bqa $MODULES -} - -probe_raid() { - info "Probing RAID devices" - modprobe -bqa dm-mod raid0 raid1 raid10 raid456 - if [ -x /sbin/mdadm ] - then - /sbin/mdadm --examine --scan > /etc/mdadm.conf - /sbin/mdadm -As - fi -} - -probe_lvm() { - info "Probing LVM devices" - modprobe -qa dm-mod - if [ -x /sbin/lvm ] - then - /sbin/lvm vgscan --ignorelockingfailure &> /dev/null - /sbin/lvm vgchange -ay --sysinit --ignorelockingfailure &> /dev/null - /sbin/lvm vgmknodes --ignorelockingfailure &> /dev/null - fi -} -probe_virtio_devices() { - local MODULES="" - for module in /sys/bus/virtio/devices/*/modalias; do - [ -f $module ] || continue - MODULES="$MODULES $(cat $module)" - done - modprobe -bqa $MODULES -} - -################################# -# Filesystem specific functions # -################################# - -mount_rootfs() { - FS_TYPE=`disktype $ROOT_DEVICE | grep KERNELMODULE | awk '{print $2}'` - info "Mounting rootfs: $ROOT_DEVICE ($FS_TYPE)" - mount -r -t $FS_TYPE -n ${ROOT_FLAGS} ${ROOT_DEVICE} /newroot -} - -find_live_mount() { - if [ "$#" -gt "0" ] - then - for x in $* - do - # this is used for non Linux fs detection - FS_TYPE=`disktype $1 | grep KERNELMODULE | awk '{print $2}'` - if [ -n "$FS_TYPE" -a -f /lib/modules/*/$FS_TYPE.ko ] - then - modprobe $FS_TYPE 1> /dev/null 2>&1 - fi - - mount -r ${x} /newroot/mnt/cdrom > /dev/null 2>&1 - - if [ "$?" = "0" ] - then - # Check for cdroot image - if [ -e /newroot/mnt/cdrom/${LOOPBACKFILE} ] - then - ROOT_DEVICE="/newroot${x}" - if [ "$COPYTORAM" == "1" ] - then - info "Copying Live Media files to RAM" - mkdir /newroot/mnt/cdromtemp - cp -af /newroot/mnt/cdrom/* /newroot/mnt/cdromtemp/ - umount /newroot/mnt/cdrom - rmdir /newroot/mnt/cdrom - mv /newroot/mnt/cdromtemp /newroot/mnt/cdrom - fi - break - else - umount /newroot/mnt/cdrom - fi - fi - done - fi -} - -manage_tmpfs() { - mount -t tmpfs tmpfs /newroot - - for d in ${TMPFS_DIRS}; do - mkdir -p "/newroot/${d}" - done -} - -mount_nfs() { - FS_LOCATION='mnt/thin' - - # Change directory to /newroot - cd /newroot - - # FIXME: busybox mount does not load automatically - modprobe -q nfs - - # mount nfs - if [ -z "/etc/udhcpc.info" ] - then - fall2sh "/etc/udhcpc.info not found" - fi - - . /etc/udhcpc.info - - if [ -z "${ROOTPATH}" ] - then - fall2sh "NFS rootpath not found" - fi - - echo "Mounting NFS from $ROOTPATH" - mount -o tcp,nolock,ro $ROOTPATH /newroot/mnt/thin - - if [ "$?" != '0' ] - then - fall2sh "Could not nfs root" - fi - - # Create necessary links - for x in ${ROOT_LINKS}; do - ln -s "${FS_LOCATION}/${x}" "${x}" - done - - if [ -e "${FS_LOCATION}/lib32" ] - then - ln -s "${FS_LOCATION}/lib32" "lib32" - fi - - # We need this for x86_64 - ln -s "${FS_LOCATION}/lib" "lib64" - - chmod 1777 tmp - (cd /newroot/${FS_LOCATION}; cp -a ${ROOT_TREES} /newroot) - - # Needed for ltspfs mechanism - echo "$IP $HOSTNAME" >> /newroot/etc/hosts -} - -mount_cdroot() { - FS_LOCATION="mnt/livecd" - - # Change directory to /newroot - cd /newroot - - # These are not loaded automatically - modprobe -q squashfs - - # Loop type squashfs - mount -t squashfs -o loop,ro /newroot/mnt/cdrom/${LOOPBACKFILE} /newroot/mnt/livecd - - if [ "$?" != "0" ] - then - fall2sh "Could not mount root image" - fi - - # Create necessary links - for x in ${ROOT_LINKS}; do - ln -s "${FS_LOCATION}/${x}" "${x}" - done - - if [ -e "${FS_LOCATION}/lib32" ] - then - ln -s "${FS_LOCATION}/lib32" "lib32" - fi - - # We need this for x86_64 - ln -s "${FS_LOCATION}/lib" "lib64" - - chmod 1777 tmp - (cd /newroot/${FS_LOCATION}; cp -a ${ROOT_TREES} /newroot) - - # FIXME: the device list is taken from udev, we can't rely on sys entries since pluggable means different - # in kernel world. Suggestions that do not include this kind of regexp mania are welcome - - # for userspace applications - REAL_ROOT_TYPE=`echo "${ROOT_DEVICE}" | sed -e 's/^\/newroot\/dev\///' | grep -qE '^sr[0-9]*|^hd[a-z]|^pcd[0-9]|^xvd*' && echo "optical" || echo "harddisk"` - echo "${REAL_ROOT_TYPE}" > /newroot/run/pisilinux/livemedia - - # this is needed for yali - MNTDIR=`grep \/mnt\/cdrom\ /proc/mounts|sed 's/\/newroot//g'` - echo "$MNTDIR" >> /newroot/etc/fstab -} - -############################## -# Config and cmdline parsers # -############################## - -# FIXME: maybe we should just source the file instead of parsing -# also consider merging conf parser and cmdline parser -parse_config() { - while read inputline; - do - case "${inputline}" in - raid=*) - RAID=$(echo $inputline|cut -f2- -d=) - ;; - lvm=*) - LVM=$(echo $inputline|cut -f2- -d=) - ;; - thin=*) - NFSROOT=$(echo $inputline|cut -f2- -d=) - ;; - root=*) - ROOT_TARGET=$(echo $inputline|cut -f2- -d=) - ;; - rootflags=*) - ROOT_FLAGS=$(echo $inputline|cut -f2- -d=) - ;; - liveroot=*) - # Installation or livecd, enable RAID by default - # to be able to read existing RAID installations - LIVE=1 - RAID_INCREMENTAL=0 - LIVEROOT=$(echo $inputline|cut -f2- -d=) - ;; - resume=*) - RESUME_DEVICE="${inputline#resume=}" - ;; - noresume) - NORESUME=1 - ;; - copytoram) - COPYTORAM=1 - ;; - wipemem) - WIPEMEM=1 - ;; - wipememopts=*) - WIPEMEM=1 - WIPEMEM_OPTS=$(echo $inputline|cut -f2- -d=) - ;; - splash) - SPLASH=1 - ;; - init=*) - INIT="${inputline#INIT=}" - ;; - esac - done < $INITRAMFSCONF -} - -parse_cmdline() { - for x in `cat /proc/cmdline`; do - case "${x}" in - [0123456Ss]) - # Normalize 'S' to 's' - LEVEL=`echo ${x}|tr A-Z a-z` - ;; - mudur=*) - for m in `echo ${x}|cut -f2 -d=|sed 's/,/ /g'`; do - case "${m}" in - livecd) - LIVE=1 - ;; - livedisk) - LIVE=1 - ;; - raid) - RAID=1 - ;; - lvm) - LVM=1 - ;; - thin) - NFSROOT=1 - ;; - esac - done - ;; - initramfs=*) - INITRAMFS=`echo ${x}|cut -f2- -d=` - ;; - root=*) - ROOT_TARGET=`echo ${x}|cut -f2- -d=` - ;; - rootflags=*) - ROOT_FLAGS="-o ${x#rootflags=}" - ;; - liveroot=*) - LIVE=1 - LIVEROOT=$(echo ${x}|cut -f2- -d=) - ;; - resume=*) - RESUME_DEVICE="${x#resume=}" - ;; - noresume) - NORESUME=1 - ;; - init=*) - INIT="${x#init=}" - ;; - copytoram) - COPYTORAM=1 - ;; - wipemem) - WIPEMEM=1 - ;; - wipememopts=*) - WIPEMEM=1 - WIPEMEM_OPTS=$(echo $x|cut -f2- -d=) - ;; - splash) - SPLASH=1 - ;; - single) - LEVEL="s" - ;; - quiet) - QUIET=1 - ;; - blacklist=*) - modules=${x#blacklist=} - for module in ${modules//,/ }; do - echo "blacklist $module" >> /etc/modprobe.d/cmdline.conf - done - ;; - esac - done - - if [ -f /etc/modprobe.d/cmdline.conf ]; then - cp /etc/modprobe.d/cmdline.conf /dev/.modprobe.initramfs.conf - fi -} - - -#################### -# init starts here # -#################### - -info "Starting init on initramfs" - -# Mount needed filesystems -mount -n -t proc proc /proc -mount -n -t sysfs sysfs /sys -# Added to start udev properly -#mkdir -m 0755 /run -#mount -t tmpfs tmpfs /run - -# Prepare /dev (Needs kernel >= 2.6.32) -mount -t devtmpfs devtmpfs /dev -mkdir -m 0755 /dev/pts -mount -t devpts -o gid=5,mode=620 devpts /dev/pts - -# First parse config file, then cmdline to allow overwriting internal config -if [ -f "$INITRAMFSCONF" ] -then - #. $INITRAMFSCONF - parse_config -fi - -# Parse command line parameters -parse_cmdline - -# Minimize printk log -test "x$QUIET" = "x1" && echo "1" > /proc/sys/kernel/printk - -# Initialize plymouth daemon if found and splash is true -# Don't even launch plymouthd if we're in single-user mode -if [ "$LEVEL" != "s" -a "$SPLASH" = "1" -a -x /sbin/plymouthd ]; then - /sbin/plymouthd --attach-to-session -fi - -# Handle initramfs= parameter -if [ "${INITRAMFS}" == "shellnoprobe" ] -then - fall2sh "Starting up a shell without probing" -elif [ "${INITRAMFS}" == "shell" ] -then - probe_devices --with-kms - fall2sh "Starting up a shell" -fi - -if [ "${WIPEMEM}" = "1" ] -then - info "Wiping out memory, system will be shutdown after completion" - sdmem ${WIPEMEM_OPTS} - poweroff -f -fi - -# Probe devices -probe_devices --with-kms - -if [ -x /usr/sbin/resume -a -b "$RESUME_DEVICE" -a "x$NORESUME" != "x1" ] -then - if [ "x$SPLASH" == "x1" ] - then - SPLASHPARAM="-P splash=y" - else - SPLASHPARAM="-P splash=n" - fi - # FIXME: This will fail if resume= contains LABEL/UUID - info "Attempting to resume from hibernation" - /usr/sbin/resume $SPLASHPARAM $RESUME_DEVICE -fi - -echo 0x0100 > /proc/sys/kernel/real-root-dev - -if [ "${LIVE}" -eq "1" ] -then - ROOT_DEVICE="" - manage_tmpfs - - # modprobe filesystems that are not in kernel, for live disks - modprobe -qa nls_cp857 nls_utf8 vfat - - for i in `seq 50` - do - t=`findfs ${LIVEROOT} 2>/dev/null` - find_live_mount "$t" - - if [ "${ROOT_DEVICE}" != "" ] - then - break - else - probe_devices - usleep 200000 - fi - done - - if [ "${ROOT_DEVICE}" == "" ] - then - fall2sh "Could not find mount media" - fi - - mount_cdroot - -elif [ "${NFSROOT}" -eq "1" ] -then - run_dhcpc - manage_tmpfs - mount_nfs - - # set hostname for mudur - hostname $HOSTNAME - -else - # Wait until ROOT_DEVICE appears - for i in `seq 50` - do - # let findfs handle all conversion - ROOT_DEVICE=`findfs ${ROOT_TARGET} 2>/dev/null` - - if [ ! -b "${ROOT_DEVICE}" ] - then - probe_devices - usleep 200000 - else - break - fi - done - if [ ! -b "${ROOT_DEVICE}" ] - then - fall2sh "Could not find boot device" - else - mount_rootfs - fi -fi - -[ "${INIT}" == "" ] && INIT="/sbin/init"; - -# This stops /lib/udev/rules.d/65-md-incremental.rules from medling with mdraid sets. -[ "${RAID_INCREMENTAL}" -eq "0" ] && touch /dev/.in_sysinit - -# Move mounts instead of umount/mount -mount --move /dev /newroot/dev -mount --move /proc /newroot/proc -mount --move /sys /newroot/sys -# Added to start udev properly -#mount --move /run /newroot/run - - -# And we start -info "Switching to the real root" -test -x /bin/plymouth && /bin/plymouth update-root-fs --new-root-dir=/newroot -exec /bin/switch_root -c /dev/console /newroot ${INIT} ${LEVEL} - diff --git a/system/base/mkinitramfs/files/initramfs.conf b/system/base/mkinitramfs/files/initramfs.conf deleted file mode 100644 index 5c9df8f9..00000000 --- a/system/base/mkinitramfs/files/initramfs.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -# this file is used to configure initramfs, lowercase is preferred -# - -# Set to 1 to enable probing raid modules and -# calling /sbin/mdadm if it exists -# raid=1 - -# Set to 1 to enable probing lvm modules and -# calling /sbin/lvm if it exists -# lvm=1 - -# Set to 1 to mount rootfs over NFS -# thin=0 - -# Set root device -# root=LABEL=MyPisiLinuxSystem - -# Set rootfs's mount flags -# rootflags=acl,xattr - -# Set resume partition -# resume=/dev/sdb5 - -# Set to 1 to disable resuming -# noresume=0 - -# Set Live media label -# liveroot=LABEL=PisiLiveImage diff --git a/system/base/mkinitramfs/files/mkinitramfs b/system/base/mkinitramfs/files/mkinitramfs deleted file mode 100644 index adc54211..00000000 --- a/system/base/mkinitramfs/files/mkinitramfs +++ /dev/null @@ -1,586 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# PisiLinux initramfs creator -# - -import os -import sys -import glob -import stat -import shutil -import tempfile -import subprocess - -from optparse import OptionParser - -config = {"rootDir" : "/", - "tmpDir" : "", - "debug" : False, - "dryrun" : False, - "destDir" : "/boot", - "blackList" : ["pktcdvd", "floppy"], - "kernelType" : "kernel", - "initramfsConf" : "/etc/initramfs.conf", - "kernelVersion" : "", -} - -def loadFile(_file): - try: - f = file(_file) - d = [a.lstrip().rstrip("\n") for a in f] - d = filter(lambda x: not (x.startswith("#") or x == ""), d) - f.close() - return d - except: - return [] - -def writeFile(_file, data): - f = open(_file, "w") - f.write(data) - f.close() - -def mkdir(_dir): - os.makedirs(_dir) - -def dohardlink(destination, source): - os.link(destination, source) - -def dosymlink(destination, source): - os.symlink(destination, source) - -def mknod(nodfile, nodtype, major, minor, perms=0666): - # c for character b for block devices, mknod style - if nodtype == "c": - devtype = stat.S_IFCHR - else: - devtype = stat.S_IFBLK - - os.mknod(nodfile, perms | devtype, os.makedev(major, minor)) - -def copy(source, destination): - # First let's check for the target directory and create if - # it doesn't exist - destdir = os.path.dirname(destination) - if not os.path.isdir(destdir): - mkdir(destdir) - - try: - shutil.copy2(source, destination) - except IOError: - printWarn("Could not find %s" % source) - -def touch(_file): - if os.path.exists(_file): - os.utime(_file, None) - else: - f = open(_file, 'w') - f.close() - -def capture(*cmd): - a = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - return a.communicate() - -def run(*cmd): - f = file("/dev/null", "w") - return subprocess.call(cmd, shell=True, stdout=f, stderr=f) - -def printFail(msg): - print "ERROR: %s" % msg - - tempdir.cleanup() - sys.exit(1) - -def printWarn(msg): - print "WARNING: %s" % msg - -def setKernelVersion(Version=""): - if Version == "": - kver = "".join(loadFile("/etc/kernel/%s" % config["kernelType"])) - else: - kver = Version - - # FIXME: we should do this an option and in a try/except - if kver == "": - print "could not find version of %s, autodetecting" % config["kernelType"] - kver = os.uname()[2] - - config["kernelVersion"] = kver - -class BaseSystem: - def __init__(self): - self.kver = config["kernelVersion"] - self.tmpDir = config["tmpDir"] - self.baseDirs = ["bin", "sbin", "etc/initramfs.d", "dev", "dev/loop", "lib", "newroot", "proc", "sys"] - - self.deviceNodes = {"null" : ["c", 1, 3], - "console" : ["c", 5, 1], - "tty" : ["c", 5, 0], - "tty0" : ["c", 4, 0], - "tty1" : ["c", 4, 1], - "ram0" : ["b", 1, 0], - "fb0" : ["c", 29, 0], - "urandom" : ["c", 1, 9], - "kmsg" : ["c", 1, 11], - } - - self.baseFileList = { - "/bin/busybox" : "/bin/", - "/bin/busybox.links" : "/bin/", - "/usr/bin/disktype" : "/bin/", - "/usr/bin/sdmem" : "/bin/", - "/lib/initramfs/init" : "/", - "/lib/initramfs/hotplug" : "/sbin/", - "/lib/initramfs/udhcpc.script" : "/etc/", - "/lib/initramfs/profile.rc" : "/etc/profile", - } - - self.modprobeBlacklistFileList = dict([(k,"/etc/modprobe.d") for k in glob.glob("/etc/modprobe.d/blacklist*conf")]) - - self.suspendFileList = { - "/etc/suspend.conf" : "/etc/", - "/usr/sbin/resume" : "/bin/", - } - - - def getNewRoot(self, dir): - cleandir = dir.lstrip("/") - return os.path.join(self.tmpDir, cleandir) - - def createBaseDirectories(self): - for i in self.baseDirs: - mkdir(self.getNewRoot(i)) - - mkdir(self.getNewRoot("/lib/modules/%s" % self.kver)) - mkdir(self.getNewRoot("/lib/firmware")) - mkdir(self.getNewRoot("/etc/modprobe.d")) - - def copyBasefiles(self): - for i in self.baseFileList: - copy(i, self.getNewRoot(self.baseFileList[i])) - - for i in ["/init", "/etc/udhcpc.script"]: - os.chmod(self.getNewRoot(i), 0755) - - for i in ["ext2", "ext3", "ext4", "reiserfs", "xfs"]: - touch(self.getNewRoot("/bin/fsck.%s" % i)) - - writeFile(self.getNewRoot("/etc/fstab"), "none none none defaults 0 0") - - def createConfig(self): - # FIXME: Parse config files and create a proper one by hand - configFileSource = config["initramfsConf"] - if os.path.exists(configFileSource): - copy(configFileSource, self.getNewRoot(configFileSource)) - - def createNodes(self): - for i in self.deviceNodes: - k = self.deviceNodes[i] - mknod(self.getNewRoot("dev/%s" % i), k[0], k[1], k[2]) - - for i in range(8): - mknod(self.getNewRoot("dev/loop/%i" % i), "b", 7, i) - dosymlink("loop/%i" % i, self.getNewRoot("dev/loop%i" % i)) - - def createBaseSymlinks(self): - for i in loadFile(self.getNewRoot("/bin/busybox.links")): - # FIXME: python dosym does not play nice with cpio, it creates 120MB initramfs - # dosymlink("busybox", self.getNewRoot("/bin/%s" % i.split("/")[-1])) - dohardlink(self.getNewRoot("/bin/busybox"), self.getNewRoot("/bin/%s" % i.split("/")[-1])) - - # FIXME: maybe we should symlink sbin to bin - dohardlink(self.getNewRoot("/bin/busybox"), self.getNewRoot("/sbin/modprobe")) - - def addRaid(self): - mdadmFile = "/sbin/mdadm.static" - if os.path.exists(mdadmFile): - copy(mdadmFile, self.getNewRoot(mdadmFile.replace(".static", ""))) - - def addLvm(self): - lvmFile = "/sbin/lvm.static" - if os.path.exists(lvmFile): - copy(lvmFile, self.getNewRoot(lvmFile.replace(".static", ""))) - - def addSuspend(self): - for i in self.suspendFileList: - copy(i, self.getNewRoot(self.suspendFileList[i])) - - def addModprobeBlacklists(self): - for i in self.modprobeBlacklistFileList: - copy(i, self.getNewRoot(self.modprobeBlacklistFileList[i])) - - def create(self): - self.createBaseDirectories() - self.copyBasefiles() - self.createNodes() - self.createBaseSymlinks() - self.createConfig() - self.addRaid() - self.addLvm() - self.addSuspend() - self.addModprobeBlacklists() - -class KernelModule: - def __init__(self): - self.modulesList = [] - self.allModules = [] - self.blackList = config["blackList"] - self.kernelVersion = config["kernelVersion"] - - self.targetDir = config["tmpDir"] - self.rootDir = config["rootDir"] - self.modulesDir = os.path.join(self.rootDir, "lib/modules/%s" % self.kernelVersion) - self.firmwareDir = os.path.join(self.rootDir, "lib/firmware") - - self.addNetworkModule = config["networkModule"] - self.addNetworkModuleBasic = config["networkModuleBasic"] - - self.addDRMModules = not config["excludeDRM"] - self.findAllModules() - - self.scsiDirs = ["kernel/drivers/scsi"] - self.scsiModules = ["mptfc", "mptsas", "mptscsih", "mptspi", "zfcp"] - - self.mdDirs = ["kernel/drivers/md"] - self.ataDirs = ["kernel/drivers/ata"] - self.mmcDirs = ["kernel/drivers/mmc"] - self.ideDirs = ["kernel/drivers/ide"] - self.blockDirs = ["kernel/drivers/block"] - - self.firewireModules = ["firewire-ohci", "firewire-sbp2", "firewire-net", "firewire-core"] - self.i2oModules = ["i2o_block"] - self.usbModules = ["usb-storage", "sd_mod", "usbcore", "ehci-hcd", "ohci-hcd", "uhci-hcd"] - - self.filesystemModules = ["ext2", "ext3", "ext4", "reiser4", "jfs", "reiserfs", "xfs", "vfat", "fat", "ntfs", "unionfs", "cramfs", "nfs", "nls_utf8", "nls_iso8859_9", "nls_cp857", "nls_iso8859-1", "nls_ascii", "nls_cp850", "squashfs"] - - self.networkBaseModules = ["af_packet", "mii", "8390", "via-rhine", "8139too", "ne2k-pci", "e100", "sky2", "tg3", "skge"] - self.networkDirs = ["kernel/drivers/net"] - - self.drmDir = "kernel/drivers/gpu/drm" - - self.virtioModules = ["virtio", "virtio_balloon", "virtio_blk", "virtio_net", "virtio_pci"] - self.xenModules = ["xenblk", "xenfb", "gntdev", "xennet", "xenkbd"] - - - def tidyModuleList(self): - ml = list(set(self.modulesList)) - ml.sort() - self.modulesList = ml - - def depmod(self, targetdir): - cmd = "/sbin/depmod -a -b %s -F %s/System.map %s" - capture(cmd % (targetdir, self.modulesDir, self.kernelVersion)) - - def installModules(self): - for i in self.modulesList: - if os.path.basename(i).replace(".ko", "") not in self.blackList: - copy(i, os.path.join(self.targetDir, self.modulesDir.replace(self.rootDir, "/").lstrip("/"))) - - def findAllModules(self): - foundModules = [] - - if not os.path.exists(self.modulesDir): - printFail("There is no %s, please check your kernel version" % self.modulesDir) - - for root, directory, files in os.walk(self.modulesDir): - for name in files: - if name.endswith(".ko"): - foundModules.append(os.path.join(root, name)) - - self.allModules = foundModules - - def findModuleDeps(self): - deps = [] - depdata = loadFile(os.path.join(self.modulesDir, "modules.dep")) - - for line in depdata: - for i in self.modulesList: - if "%s:" % i.replace("%s/" % self.modulesDir, "") in line: - deps.extend(line.split(":")[1].strip().split(" ")) - - # return [os.path.join(self.modulesDir, x) for x in deps if not x == ""] - self.modulesList.extend([os.path.join(self.modulesDir, x) for x in deps if not x == ""]) - - def appendFirmwares(self): - ret = capture("/sbin/modinfo -F firmware %s/*.ko" % os.path.join(self.targetDir, self.modulesDir.replace(self.rootDir, "/").lstrip("/")))[0] - fwlist = ret.strip("\n").split("\n") - - targetbase = os.path.join(self.targetDir, "lib/firmware") - - for i in fwlist: - src = os.path.join(self.firmwareDir, i) - target = os.path.join(targetbase, os.path.dirname(i)) - - if os.path.exists(src): - if not os.path.exists(target): - mkdir(target) - - copy(src, target) - - else: - printWarn("Could not find firmware %s" % src) - pass - - def updateModuleDependencies(self, force=False): - # this is here to prevent a race condition with pakhandler, when installing a system from scratch - if force or not os.path.exists("%s/modules.dep" % self.modulesDir): - printWarn("Could not find module dependencies in %s, running depmod for system" % self.modulesDir) - self.depmod(self.rootDir) - - def addDir(self, mdir): - newModules = [] - dirtoadd = os.path.join(self.modulesDir, mdir) - - for line in self.allModules: - if line.startswith(dirtoadd): - newModules.append(line) - - self.modulesList.extend(newModules) - - def addModule(self, module): - if module.endswith(".ko"): - module = module[:-3] - - for line in self.allModules: - # FIXME: I still don't trust the _ versus - case, try to be sure of it in kernel - if line.replace("-", "_").endswith("/%s.ko" % module.replace("-", "_")): - self.modulesList.append(line) - return - - def addScsi(self): - for i in self.scsiDirs: - self.addDir(i) - - for i in self.scsiModules: - self.addModule(i) - - def addAta(self): - for i in self.ataDirs: - self.addDir(i) - - def addMmc(self): - for i in self.mmcDirs: - self.addDir(i) - - def addBlock(self): - for i in self.blockDirs: - self.addDir(i) - - def addIde(self): - for i in self.ideDirs: - self.addDir(i) - - def addNetwork(self): - if self.addNetworkModule: - for i in self.networkDirs: - self.addDir(i) - - if self.addNetworkModuleBasic: - for i in self.networkBaseModules: - self.addModule(i) - - def addDRM(self): - if self.addDRMModules: - for i in glob.glob("%s/*/*.ko" % os.path.join(self.modulesDir, self.drmDir)): - # Check for drm_crtc_init symbol - if not os.system("grep -qw drm_crtc_init %s" % i): - self.addModule(i.partition(self.modulesDir+'/')[-1]) - - # Add uvesafb as a fallback - if os.path.exists("/sbin/v86d"): - copy("/sbin/v86d", os.path.join(self.targetDir, "sbin/")) - self.addModule("kernel/drivers/video/uvesafb.ko") - - def addMd(self): - for i in self.mdDirs: - self.addDir(i) - - def addFirewire(self): - for i in self.firewireModules: - self.addModule(i) - - def addI2o(self): - for i in self.i2oModules: - self.addModule(i) - - def addUsb(self): - for i in self.usbModules: - self.addModule(i) - - def addFilesystem(self): - for i in self.filesystemModules: - self.addModule(i) - - def addVirtio(self): - for i in self.virtioModules: - self.addModule(i) - - def addXen(self): - for i in self.xenModules: - self.addModule(i) - - def addGeneric(self): - self.addScsi() - self.addAta() - self.addMmc() - self.addBlock() - self.addIde() - self.addNetwork() - self.addMd() - self.addFirewire() - self.addI2o() - self.addUsb() - self.addFilesystem() - self.addVirtio() - self.addDRM() - - def autoGenerate(self): - self.updateModuleDependencies() - self.addGeneric() - self.findModuleDeps() - self.tidyModuleList() - self.installModules() - self.appendFirmwares() - self.depmod(self.targetDir) - -class Plymouth: - def __init__(self): - self.fileList = "/lib/initramfs/plymouth.list" - self.targetDir = config["tmpDir"] - self.theme = "pisilinux" - self.themeDir = "/usr/share/plymouth/themes" - - def install_current_theme(self): - self.theme = os.popen("plymouth-set-default-theme").read().strip() - if os.path.exists("%s/%s" % (self.themeDir, self.theme)): - for themeFile in glob.glob("%s/%s/*" % (self.themeDir, self.theme)): - copy(themeFile, os.path.join(self.targetDir, themeFile[1:])) - - def install(self): - """Will install plymouth related base stuff.""" - if os.path.exists(self.fileList): - with open(self.fileList, "r") as files: - for _file in files: - filename = _file.strip() - copy(filename.strip(), os.path.join(self.targetDir, filename[1:])) - - self.install_current_theme() - -class Initramfs: - def __init__(self): - self.destDir = config["destDir"] - self.sourceDir = config["tmpDir"] - self.initramfs = "initramfs-%s" % config["kernelVersion"] - - def create(self): - if not os.path.exists(self.destDir): - mkdir(self.destDir) - - cmd = "(cd %s && find . | cpio --quiet --dereference -o -H newc | gzip -6 > %s)" - capture(cmd % (self.sourceDir, os.path.join(self.destDir, self.initramfs))) - -class Tempdir: - def __init__(self): - self.tmpDir = "" - self.keepTmp = False - - def create(self): - self.tmpDir = tempfile.mkdtemp(prefix="mkinitramfs-") - - def cleanup(self): - if self.keepTmp: - printWarn("Keeping temporary directory %s" % self.tmpDir) - else: - shutil.rmtree(self.tmpDir) - - -if __name__ == "__main__": - tempdir = Tempdir() - tempdir.create() - config["tmpDir"] = tempdir.tmpDir - - parser = OptionParser() - parser.add_option("-k", "--kernel", dest="kernelVersion", type="string", - help="kernel version to create initramfs for") - - parser.add_option("-t", "--type", dest="type", type="string", default="kernel", - help="kernel type to create initramfs for") - - parser.add_option("-o", "--output", dest="destDir", type="string", metavar="DIR", default="/boot", - help="create initramfs in DIR") - - parser.add_option("-c", "--configfile", dest="configFile", type="string", metavar="FILE", default="/etc/initramfs.conf", - help="use FILE for initramfs config file, default is /etc/initramfs.conf") - - parser.add_option("-r", "--rootdir", dest="rootDir", type="string", metavar="DIR", default="/", - help="use DIR as basedir for kernel modules") - - parser.add_option("-f", "--filename", dest="filename", type="string", metavar="FILE", - help="use FILE for initramfs file name") - - parser.add_option("-d", "--debug", action="store_true", dest="debug", default=False, - help="print extra debug info") - - parser.add_option("--blacklist", dest="blackList", type="string", metavar="FILES", default="", - help="define modules to be blacklisted, seperated by comma. Example: e100,rtl819,ahci") - - parser.add_option("--network", action="store_true", dest="networkModule", default=False, - help="add network modules") - - parser.add_option("--nodrm", action="store_true", dest="excludeDRM", default=False, - help="Don't include KMS capable DRM modules") - - parser.add_option("--network-generic", action="store_true", dest="networkModuleBasic", default=False, - help="add only generic network modules") - - parser.add_option("--keeptmp", action="store_true", dest="keepTmp", default=False, - help="whether to keep temporary dir after operation") - - parser.add_option("-n", "--dry-run", action="store_true", dest="dryrun", default=False, - help="do not perform any action, just show what will be done") - - parser.add_option("--list-modules", action="store_true", dest="listModules", default=False, - help="do not perform any action, just show what will be done") - - parser.add_option("--list-base", action="store_true", dest="listBase", default=False, - help="do not perform any action, just show what will be done") - - (opts, args) = parser.parse_args() - - config["initramfsConf"] = opts.configFile - - config["destDir"] = os.path.abspath(opts.destDir) - config["rootDir"] = os.path.abspath(opts.rootDir) - - config["debug"] = opts.debug - config["dryrun"] = opts.dryrun - tempdir.keepTmp = opts.keepTmp - - config["kernelType"] = opts.type - config["networkModule"] = opts.networkModule - config["networkModuleBasic"] = opts.networkModuleBasic - config["excludeDRM"] = opts.excludeDRM - - if "," in opts.blackList: - config["blackList"].extend(opts.blackList.split(",")) - - if opts.kernelVersion: - config["kernelVersion"] = opts.kernelVersion - else: - setKernelVersion() - - basesystem = BaseSystem() - basesystem.create() - - # Check for plymouth and install if found - plymouth = Plymouth() - plymouth.install() - - kernelmodule = KernelModule() - kernelmodule.autoGenerate() - - initramfs = Initramfs() - initramfs.create() - - tempdir.cleanup() - diff --git a/system/base/mkinitramfs/files/profile.rc b/system/base/mkinitramfs/files/profile.rc deleted file mode 100644 index 64884402..00000000 --- a/system/base/mkinitramfs/files/profile.rc +++ /dev/null @@ -1,6 +0,0 @@ -# Simple profile file for sh - -alias ls='ls --color=auto' -alias ll='ls --color -l' - -export PS1="\[\033[1;31m\]initramfs \[\033[1;34m\]\W # \[\033[00m\]" diff --git a/system/base/mkinitramfs/files/udhcpc.script b/system/base/mkinitramfs/files/udhcpc.script deleted file mode 100644 index 2fcc4d0b..00000000 --- a/system/base/mkinitramfs/files/udhcpc.script +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -RESOLV_CONF="/etc/resolv.conf" - -UDHCPC_INFO="/etc/udhcpc.info" - -update_interface() -{ - [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" - [ -n "$subnet" ] && NETMASK="netmask $subnet" - /bin/ifconfig $interface $ip $BROADCAST $NETMASK -} - -update_routes() -{ - if [ -n "$router" ] - then - echo "deleting routes" - while /bin/route del default gw 0.0.0.0 dev $interface > /dev/null 2>&1 - do : - done - - for i in $router - do - /bin/route add default gw $i dev $interface - done - fi -} - -update_dns() -{ - echo -n > $RESOLV_CONF - [ -n "$domain" ] && echo domain $domain >> $RESOLV_CONF - for i in $dns - do - echo adding dns $i - echo nameserver $i >> $RESOLV_CONF - done -} - -deconfig() -{ - /bin/ifconfig $interface 0.0.0.0 -} - -update_udhcpc_info() -{ - cat > $UDHCPC_INFO < - - - - mkinitramfs - http://www.busybox.net - - PisiLinux Community - admins@pisilinux.org - - GPLv2 - app:console - A tool to create the initramfs image - mkinitramfs contains a tool to create the initramfs image with busybox. - http://source.pisilinux.org/1.0/README.mkinitramfs - - - - mkinitramfs - - disktype - busybox - - - /etc - /sbin - /lib/initramfs - /usr/share/doc/mkinitramfs - - - mkinitramfs - init - udhcpc.script - hotplug - profile.rc - initramfs.conf - - - System.PackageHandler - - - - - - 2014-05-11 - 1.0.7 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-10 - 1.0.7 - Fix probing LVM devices - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-10 - 1.0.7 - Disable mount tmpfs on /run - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-05 - 1.0.7 - Add missing method to pakhandler.py - Marcin Bojara - marcin@pisilinux.org - - - 2013-09-03 - 1.0.7 - Fix default plymouth theme name. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-06-17 - 1.0.7 - Fix resume path. - Marcin Bojara - marcin@pisilinux.org - - - 2013-02-13 - 1.0.7 - Change loopbackimage address and name. - Serdar Soytetir - kaptan@pisilinux.org - - - 2013-01-13 - 1.0.7 - First release - Serdar Soytetir - kaptan@pisilinux.org - - - diff --git a/system/base/mkinitramfs/translations.xml b/system/base/mkinitramfs/translations.xml deleted file mode 100644 index 23a58871..00000000 --- a/system/base/mkinitramfs/translations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - mkinitramfs - initramfs image dosyası yaratmak için araç - initramfs image dosyası yaratmak için araç - Un outil pour créer les images initramfs - - diff --git a/system/base/mudur/actions.py b/system/base/mudur/actions.py new file mode 100644 index 00000000..d957743c --- /dev/null +++ b/system/base/mudur/actions.py @@ -0,0 +1,20 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import shelltools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def install(): + pisitools.dosed("bin/adduser.py", "plugdev", "removable") + shelltools.system("./setup.py install %s" % get.installDIR()) + + # in new tarball remove + shelltools.chmod(get.installDIR() + "/sbin/mudur_cgroupfs.py" , 0755) + + pisitools.dodir("/etc/mudur/services/enabled") + pisitools.dodir("/etc/mudur/services/disabled") + pisitools.dodir("/etc/mudur/services/conditional") diff --git a/system/base/mudur/comar/disk.py b/system/base/mudur/comar/disk.py new file mode 100644 index 00000000..fe9687bb --- /dev/null +++ b/system/base/mudur/comar/disk.py @@ -0,0 +1,492 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +import glob +import os +import sys +import subprocess + +FSTAB = '/etc/fstab' + +""" +Quick list is used for improving efficiency of the script. +Stores device names and uuids pairs for partitions so prevents multiple +communication with subprocesses. +""" +quickList = {} + +FAIL_FSTAB = { + "en": "Unable to read '%s'.", + "tr": "'%s' okunamadı.", + "fr": "Impossible de lire '%s' .", + "es": "No posible leer '%s'.", + "de": "'%s' konnte nicht gelesen werden.", + "nl": "Kan '%s' niet lezen.", +} + +FAIL_PATH = { + "en": "'%s' is not a valid mount point.", + "tr": "'%s' geçerli bir bağlama noktası değil.", + "fr": "'%s' n'est pas un point de montage valide.", + "es": "'%s' no es un punto de montaje válido.", + "de": "'%s' ist kein gültiger Mount-Punkt.", + "nl": "'%s' is geen geldig aankoppelpunt.", +} + +FAIL_PATH_ALREADY_EXIST = { + "en": "'%s' is already being used by an entry.", + "tr": "'%s' zaten bir kayıt tarafından kullanılıyor.", + "fr": "'%s' est déjà utilisé par une entrée.", + "es": "Ya '%s' siendo utilizado por una entrada.", + "de": "'%s' wird bereits durch einen Eintrag verwendet.", + "nl": "'%s' bruges allerede af en post.", +} + +FAIL_ENTRY = { + "en": "Device '%s' not found in entry list.", + "tr": "'%s' aygıtı listede bulunamadı.", + "fr": "Le matériel '%s' n'a pas été trouvé dans la liste.", + "es": "Dispositivo '%s' no encontrado en lista de entrada.", + "de": "Gerät '%s' ist nicht in der Liste eingetragen.", + "nl": "Apparaat '%s' is niet in invoerlijst gevonden.", +} + +FAIL_ROOT = { + "en": "'%s' is mounted to root directory, operation cancelled.", + "tr": "'%s' diski kök dizine bağlı, işlem iptal edildi.", + "fr": "'%s' est monté sur le répertoire racine, opération annulée.", + "es": "'%s' está montado com root, operación cancelada.", + "de": "'%s' ist als Root gemounted, Vorgang abgebrochen.", + "nl": "'%s' is in root-map aangekoppeld, bewerking geannuleerd.", +} + +FAIL_MOUNTED = { + "en": "'%s' is mounted to another directory, operation cancelled.", + "tr": "'%s' başka bir dizine bağlı, işlem iptal edildi.", + "fr": "'%s' est monté sur un autre répertoire, opération annulée.", + "es": "'%s' está montado en otro directorio, operación cancelada.", + "de": "'%s' ist schon auf einem anderen Mount-Punkt gemounted, Vorgang abgebrochen.", + "nl": "'%s' is in een andere map aangekoppeld, bewerking geannuleerd.", +} + +FAIL_OPERATION = { + "en": "Operation failed:\n\n %s", + "tr": "İşlem başarısız:\n\n %s", + "fr": "L'opération a échoué : \n\n %s", + "es": "Operación fallada:\n\n %s", + "de": "Vorgang fehlerhaft:\n\n %s", + "nl": "Mislukte bewerking:\n\n %s", +} + +class DMException(Exception): + pass + +def parseFstab(fstab): + if not os.access(fstab, os.R_OK): + raise DMException, _(FAIL_FSTAB) % fstab + entries = [] + for line in open(fstab): + line = line.strip() + # Check len(line) for empty lines. + if line.startswith('#') or len(line) == 0: + continue + line = line.replace('\t', ' ').split() + # Replace UUID value with device name after reading it from fstab + if line[0].startswith('UUID='): + line[0] = getPartitionNameByUUID(line[0]) + entries.append(line) + elif line[0].startswith('LABEL='): + line[0] = getDeviceByLabel(line[0].replace('LABEL=', '')) + entries.append(line) + elif line[0].startswith('/dev/'): + entries.append(line) + return entries + +def createPath(device, path): + real_path = path + if not os.path.exists(path) and os.path.exists(os.path.dirname(path)): + # Mount point does not exist, but parent directory does. + path = os.path.dirname(path) + if not os.path.ismount(path) and not os.path.islink(path) and os.path.isdir(path): + os.mkdir(real_path, 0755) + return True + else: + if os.path.ismount(path): + # Path is already mounted, allow user to use that mount point if it's already mounted + for _device, _path in getMounted(): + if device == _device and _path == path: + return True + else: + if not os.path.islink(path) and os.path.isdir(path) and os.listdir(path) == []: + return True + return False + +def getMounted(): + parts = [] + for line in open('/proc/mounts'): + if line.startswith('/dev/'): + device, path, other = line.split(" ", 2) + parts.append((device, path, )) + return parts + +def getFSType(device): + if device.startswith('UUID='): + device = getPartitionNameByUUID(device) + cmd = "/sbin/blkid -s TYPE -o value %s" % device + proc = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) + return proc.communicate()[0].strip() + +def getUUID(part): + """ + Finds UUID for the given partition. + """ + global quickList + if len(quickList) == 0: + fillQuickList() + return quickList[part] + +def getPartitionNameByUUID(part): + """ + Finds name of the partition for the given UUId. + """ + global quickList + part = part.replace('UUID=', '') + if len(quickList) == 0: + fillQuickList() + for devName, uuid in quickList.items(): + if uuid == part: + return devName + return '' + +def fillQuickList(): + """ + Fills the quick list. + """ + global quickList + cmd = "/sbin/blkid" + proc = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) + for line in proc.stdout: + line = line.replace(':', '').strip() + propList = line.split() + devName = label = uuid = fsType = '' + devName = propList[0] + for property in propList: + if property.startswith('UUID'): + uuid = property.replace('UUID=', '').replace('"', '') + quickList[devName] = uuid + +def runCommand(cmd): + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + err = proc.communicate()[1].strip() + if len(err): + fail(_(FAIL_OPERATION) % err) + +# Disk.Manager methods + +def isMounted(device): + """ + Searches the given partition in mounted devices. If partition is + mounted, returns mount point else returns none. + """ + for _device, _path in getMounted(): + if device == _device: + return _path + return '' + +def getDevices(): + from pardus.diskutils import EDD + return EDD().blockDevices() + +def getDeviceByLabel(label): + root = '/dev/disk/by-label' + path = os.path.join(root, label) + if os.access(path, os.R_OK): + return os.path.realpath(os.path.join(root, os.readlink(path))) + else: + return '' + +def getDeviceParts(device): + if not os.path.exists(device): + return [] + parts = [] + for part in glob.glob("%s*" % device): + if not part == device and not getFSType(part) == "": + parts.append(part) + return parts + +def getLabel(device): + """ + Finds label for the given partition. + """ + cmd = "/sbin/blkid -s LABEL -o value %s" % device + proc = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE) + return proc.communicate()[0].strip() + +def getPath(device): + """ + Gets partition name and determine a path for that partition. + """ + # If there is a entry record for this partition in fstab + # use path in there. + if device in listEntries(): + path_, fsType_, options_ = getEntry(device) + return path_ + path = '/media/' + label = getLabel(device) + # There may be partitions without a label + if not label: + if not os.path.exists(path+'disk'): + path = path+'disk' + elif not os.path.ismount(path+'disk'): + path = path+'disk' + else: + for i in range(1, len(getMounted())): + if not os.path.exists(path+'disk-'+str(i)): + path = path+'disk-'+str(i) + break + elif not os.path.ismount(path+'disk-'+str(i)): + path = path+'disk-'+str(i) + break + # Labels may be same + else: + if not os.path.exists(path+label): + path = path+label + elif not os.path.ismount(path+label): + path = path+label + else: + for i in range(1, len(getMounted())): + if not os.path.exists(path+label+'-'+str(i)): + path = path+label+'-'+str(i) + break + elif not os.path.ismount(path+label+'-'+str(i)): + path = path+label+'-'+str(i) + break + return path + +def mount(device, path): + if not path: + path = getPath(device) + if not createPath(device, path): + # Can't create new path + fail(_(FAIL_PATH) % path) + elif device in [x[0] for x in getMounted()]: + # Device is mounted + fail(_(FAIL_MOUNTED) % device) + runCommand(['/bin/mount', device, path]) + +def umount(device): + for dev, path in getMounted(): + if dev == device and path == "/": + fail(_(FAIL_ROOT) % device) + runCommand(['/bin/umount', device]) + +def listEntries(): + try: + devices = [x[0] for x in parseFstab(FSTAB)] + return devices + except DMException: + return [] + +def listPaths(): + """ + Return paths of the entries in fstab. + """ + try: + paths = [x[1] for x in parseFstab(FSTAB)] + return paths + except DMException: + return [] + +def isLabelRecord(device): + for line in open(FSTAB): + line = line.strip().replace('\t', ' ').split() + if line: + if line[0] == 'LABEL=' + getLabel(device): + return True + +def addEntry(device, path, fsType, options): + path_own = False + if device in listEntries(): + old_path, old_fsType, old_options = getEntry(device) + # Do not change root + if old_path == "/" and not old_path == path: + fail(_(FAIL_ROOT) % device) + # Who has that mount point? me? + if old_path == path: + path_own = True + else: + # If the path value already exist in fstab, cut the operation + if path in listPaths(): + fail(_(FAIL_PATH_ALREADY_EXIST) % path) + old_path = None + if not createPath(device, path): + # Can't create new path + fail(_(FAIL_PATH) % path) + #elif device in [x[0] for x in getMounted()]: + # Device is mounted + #fail(_(FAIL_MOUNTED) % device) + partText = '' + # Before removing the entry check if it is a label record or uuid record + # Remove previous one to prevent duplicates + if old_path: + if isLabelRecord(device): + partText = 'LABEL='+getLabel(device) + else: + partText = 'UUID='+getUUID(device) + else: + partText = 'UUID='+getUUID(device) + # Add new entry + _options = [] + for key, value in options.iteritems(): + if value: + _options.append('%s=%s' % (key, value)) + else: + _options.append(key) + if not file(FSTAB).read()[-1] == '\n': + file(FSTAB, 'a').write('\n') + _options = ','.join(_options) + + addit = True + # If the partition is not already mounted the given path and, + # if the partition is not mounted anywhere, try to create a path + # and mount there. + if not path_own: + if not createPath(device, path): + addit = False + # Can't create new path + fail(_(FAIL_PATH) % path) + if not device in [x[0] for x in getMounted()]: + # Mount device + try: + mount(device, path) + except: + addit = False + raise + if addit: + # try to remove old entry before + if old_path: + removeEntry(device, silent=True) + if _options: + file(FSTAB, 'a').write('%s %s %s %s 0 0\n' % (partText, path, fsType, _options)) + else: + file(FSTAB, 'a').write('%s %s %s defaults 0 0\n' % (partText, path, fsType)) + # Notify clients + notify("Disk.Manager", "changed", ()) + +def getEntry(device): + entries = parseFstab(FSTAB) + for entry in entries: + if entry[0] == device: + _path, _fsType, _options, _dump, _pass = entry[1:] + options = {} + for part in _options.split(','): + if "=" in part: + key, value = part.split('=', 1) + options[key] = value + else: + options[part] = "" + return _path, _fsType, options + fail(_(FAIL_ENTRY) % device) + +def removeEntry(device, silent=False): + if isMounted(device) == '/': + fail(_(FAIL_ROOT) % device) + if device not in listEntries(): + return + newlines = [] + for line in open(FSTAB): + line = line.strip() + if not len(line) == 0 and not (line.replace('\t', ' ').split()[0] == 'UUID='+getUUID(device) or line.replace('\t', ' ').split()[0] == 'LABEL='+getLabel(device) or line.replace('\t', ' ').split()[0] == device): + newlines.append(line) + file(FSTAB, 'w').write('\n'.join(newlines)) + if not file(FSTAB).read()[-1] == '\n': + file(FSTAB, 'a').write('\n') + # Notify clients + if not silent: + notify("Disk.Manager", "changed", ()) + + +import errno +from time import sleep +from fcntl import ioctl + +# Path to sync executable +PATH_SYNC = '/bin/sync' + +# Emulate required asm-generic/ioctl.h macros +_IOC_NRBITS = 8 +_IOC_TYPEBITS = 8 +_IOC_SIZEBITS = 14 +_IOC_DIRBITS = 2 + +_IOC_NRMASK = ((1 << _IOC_NRBITS) - 1) +_IOC_TYPEMASK = ((1 << _IOC_TYPEBITS) - 1) +_IOC_SIZEMASK = ((1 << _IOC_SIZEBITS) - 1) +_IOC_DIRMASK = ((1 << _IOC_DIRBITS) - 1) + +_IOC_NRSHIFT = 0 +_IOC_TYPESHIFT = (_IOC_NRSHIFT + _IOC_NRBITS) +_IOC_SIZESHIFT = (_IOC_TYPESHIFT + _IOC_TYPEBITS) +_IOC_DIRSHIFT = (_IOC_SIZESHIFT + _IOC_SIZEBITS) + +# Direction bits. +_IOC_NONE = 0 +_IOC_WRITE = 1 +_IOC_READ = 2 + +def _IOC(dir,type,nr,size): + return (((dir) << _IOC_DIRSHIFT) | \ + (type << _IOC_TYPESHIFT) | \ + ((nr) << _IOC_NRSHIFT) | \ + ((size) << _IOC_SIZESHIFT)) + +def _IO(type, nr): + """Note: type is specified in hex and nr in decimal.""" + return _IOC(_IOC_NONE,(type),(nr),0) + +def BLKRRPART(): + """Returns ioctl number for re-reading partition table.""" + # Kernels >2.6.17 have BLKRRPART defined in include/linux/fs.h. + return _IO(0x12, 95) +# ------------------------------------------- + +def refreshPartitionTable(device): + """Re-Read partition table on device.""" + + try: + fd = os.open(device, os.O_RDONLY) + except EnvironmentError, (error, strerror): + print 'Could not open device %s. Reason: %s.'%(device, strerror) + sys.exit(-1) + + # Sync and wait for Sync to complete + os.system(PATH_SYNC) + sleep(2) + + # Call required ioctl to re-read partition table + try: + ioctl(fd, BLKRRPART()) + except EnvironmentError, (error, message): + # Attempt ioctl call twice in case an older kernel (1.2.x) is being used + os.system(PATH_SYNC) + sleep(2) + + try: + ioctl(fd, BLKRRPART()) + except EnvironmentError, (error, strerror): + print 'IOCTL Error: %s for device %s.'%(strerror, device) + sys.exit(-1) + + print 'Successfully re-read partition table on device %s.'%(device) + # Sync file buffers + os.fsync(fd) + os.close(fd) + + # Final sync + print "Syncing %s ... " % (device), + os.system(PATH_SYNC) + sleep(4) # for sync() + print "Done." + + + diff --git a/system/base/mudur/comar/netfs.py b/system/base/mudur/comar/netfs.py new file mode 100644 index 00000000..291173ca --- /dev/null +++ b/system/base/mudur/comar/netfs.py @@ -0,0 +1,48 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +from comar.service import * +import time + +from pardus.fstabutils import Fstab + +serviceType = "local" +serviceDefault = "off" +serviceDesc = _({"en": "Remote Filesystem Mounter", + "tr": "Uzak Dosyasistemi Bağlayıcı"}) + +DATAFILE = "/var/run/netfs.status" + +MSG_NM_NOT_RUNNING = _({"en": "NetworkManager service is not running", + "tr": "NetworkManager hizmeti çalışmıyor", + }) + +@synchronized +def start(): + # Mount all remote filesystems + if run("/usr/bin/nm-online -q -t 10") != 0: + # NM is not running + fail(MSG_NM_NOT_RUNNING) + + fstab = Fstab() + for entry in fstab.get_entries(): + if entry.is_remote_mount(): + if entry.is_nfs(): + # Start rpcbind if fs is nfs|nfs4 + startDependencies("rpcbind") + # Mount it + entry.mount() + +@synchronized +def stop(): + # Unmount all remote filesystems + fstab = Fstab() + for entry in fstab.get_entries(): + if entry.is_remote_mount(): + entry.unmount() + +def status(): + fstab = Fstab() + for entry in fstab.get_entries(): + if entry.is_remote_mount() and entry.is_mounted(): + return True diff --git a/system/base/mudur/comar/package.py b/system/base/mudur/comar/package.py new file mode 100644 index 00000000..5a814f1c --- /dev/null +++ b/system/base/mudur/comar/package.py @@ -0,0 +1,17 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +import os +import re +import shutil + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + shutil.copyfile("/etc/fstab", "/etc/fstab.bak") + new = [] + for line in [line.strip() for line in open("/etc/fstab.bak")]: + if re.search("\s+\/(run|dev\/shm)\s+", line): continue + new.append(line) + new.append("tmpfs /run tmpfs nodev,nosuid,size=10%,mode=755 0 0\n") + with open("/etc/fstab", "w") as f: f.write("\n".join(new)) + + # add disks into fstab + # os.system("/sbin/update-fstab") diff --git a/system/base/mudur/comar/pakhandler.py b/system/base/mudur/comar/pakhandler.py new file mode 100644 index 00000000..45c2972c --- /dev/null +++ b/system/base/mudur/comar/pakhandler.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +import piksemel +import imp + +def doenv(filetag): + for item in filetag: + path = item.getTagData("Path") + if path.startswith("etc/env.d"): + updenv = imp.load_source("updenv", "/sbin/update-environment") + updenv.update_environment("/") + return + +def setupPackage(metapath, filepath): + doc = piksemel.parse(filepath) + doenv(doc.tags("File")) + +def cleanupPackage(metapath, filepath): + pass + +def postCleanupPackage(metapath, filepath): + doc = piksemel.parse(filepath) + doenv(doc.tags("File")) diff --git a/system/base/mudur/comar/system.py b/system/base/mudur/comar/system.py new file mode 100644 index 00000000..d615a6fb --- /dev/null +++ b/system/base/mudur/comar/system.py @@ -0,0 +1,122 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +from pardus.fileutils import FileLock +from pardus.localedata import languages as LANGUAGES + +# Mudur configuration file + +CONF = "/etc/conf.d/mudur" +TTY_DEFAULT = 6 + +# Required utils + +def getConf(key, default=None): + lock = FileLock(CONF) + lock.lock(shared=True) + value = default + for line in file(CONF): + line = line.strip() + try: + _key, _value = line.split("=", 1) + except ValueError: + continue + _key = _key.strip() + if key == _key: + value = _value.strip() + if value.startswith('"') or value.startswith("'"): + value = value[1:-1] + break + lock.unlock() + return value + +def setConf(key, value=None): + lock = FileLock(CONF) + lock.lock(shared=False) + data = file(CONF).read() + lines = data.split("\n") + for index, line in enumerate(lines): + try: + _key, _value = line.split("=", 1) + except ValueError: + continue + _key = _key.strip() + if key == _key or (_key.startswith("#") and _key[1:].strip() == key): + if value: + lines[index] = "%s = '%s'" % (key, value) + elif not line.startswith("#"): + lines[index] = "# %s" % line + file(CONF, "w").write("\n".join(lines)) + lock.unlock() + +# System.Settings methods + +def listLanguages(): + languages = [] + for code, info in LANGUAGES.iteritems(): + languages.append((code, str(info.name))) + return languages + +def getLanguage(): + return getConf("language", "en") + +def setLanguage(lang): + if not len(lang): + lang = None + setConf("language", lang) + + +def listKeymaps(language): + keymaps = [] + if language and language in LANGUAGES: + for keymap in LANGUAGES[language].keymaps: + keymaps.append((keymap.console_layout, str(keymap.name))) + else: + for language in LANGUAGES: + for keymap in LANGUAGES[language].keymaps: + keymaps.append((keymap.console_layout, str(keymap.name))) + return keymaps + +def getKeymap(): + return getConf("keymap", "us") + +def setKeymap(keymap): + if not len(keymap): + keymap = None + setConf("keymap", keymap) + + +def getHeadStart(): + return getConf("head_start") + +def setHeadStart(package): + if not len(package): + package = None + setConf("head_start", package) + + +def getClock(): + is_utc = getConf("clock", "local") == "UTC" + adjust = getConf("clock_adjust", "no") == "yes" + return is_utc, adjust + +def setClock(is_utc, adjust): + if is_utc: + setConf("clock", "UTC") + else: + setConf("clock", "local") + if adjust: + setConf("clock_adjust", "yes") + else: + setConf("clock_adjust", "no") + + +def getTTYs(): + count = getConf("tty_number", TTY_DEFAULT) + try: + return int(count) + except (ValueError, TypeError): + return TypeError + +def setTTYs(count): + setConf("tty_number", count) diff --git a/system/base/mudur/files/boot_option.patch b/system/base/mudur/files/boot_option.patch new file mode 100644 index 00000000..4e90c66e --- /dev/null +++ b/system/base/mudur/files/boot_option.patch @@ -0,0 +1,43 @@ +fix issue #562 +https://github.com/pisilinux/PisiLinux/issues/562 + +--- bin/mudur.py.orig 2015-05-11 20:46:23.509195049 +0200 ++++ bin/mudur.py 2015-05-11 22:26:06.000000000 +0200 +@@ -1406,7 +1406,7 @@ + UI.info(_("Creating tmpfiles")) + if not os.path.isdir("/run/tmpfiles.d"): create_directory("/run/tmpfiles.d") + run("/usr/bin/kmod", "static-nodes", "--format=tmpfiles", "--output=/run/tmpfiles.d/kmod.conf") +- out = [line for line in capture("/sbin/mudur_tmpfiles.py")[0].split("\n") if line.strip()] ++ out = [line for line in capture("/sbin/mudur_tmpfiles.py", "--boot")[0].split("\n") if line.strip()] + if out: LOGGER.log("Errors during tmpfiles creation.\n\t%s" % "\n\t".join(out)) + run("mount", "-t", "tmpfs", "tmpfs", "/dev/shm") + +--- bin/mudur_tmpfiles.py.orig 2015-05-11 20:46:23.519200049 +0200 ++++ bin/mudur_tmpfiles.py 2015-05-11 20:40:04.000000000 +0200 +@@ -80,6 +80,7 @@ + + if __name__ == "__main__": + if ("-h" or "--help") in sys.argv: usage() ++ boot = True if "--boot" in sys.argv else False + + config_files = {} + errors = [] +@@ -90,7 +91,7 @@ + except KeyError: + config_files[head] = [tail] + +- if sys.argv[1:]: ++ if sys.argv[1:] and not boot: + for arg in sys.argv[1:]: + (head, tail) = os.path.split(arg) + if not tail.endswith(".conf"): errors.append("%s is not .conf file" % tail) +@@ -130,6 +131,9 @@ + if i == "-": fields[n] = "" + if not fields[3]: fields[3] = "root" + if not fields[4]: fields[4] = "root" ++ if fields[0].endswith("!"): ++ if not boot: continue ++ else: fields[0] = fields[0].replace("!", "") + if not fields[0] in ["c", "d", "D", "f", "F", "L", "w"]: errors.append("%s - wrong type in file: %s" % (fields[0], os.path.join(d, f))) + elif fields[0] == "L": + if not fields[6]: errors.append("No arg for type 'L' specified in file: %s" % os.path.join(d, f)) diff --git a/system/base/mudur/files/mount_cgroupfs.patch b/system/base/mudur/files/mount_cgroupfs.patch new file mode 100644 index 00000000..009d1be5 --- /dev/null +++ b/system/base/mudur/files/mount_cgroupfs.patch @@ -0,0 +1,115 @@ +diff -Nuar mudur-4.4.0.orig/bin/mudur_cgroupfs.py mudur-4.4.0/bin/mudur_cgroupfs.py +--- mudur-4.4.0.orig/bin/mudur_cgroupfs.py 1970-01-01 02:00:00.000000000 +0200 ++++ mudur-4.4.0/bin/mudur_cgroupfs.py 2015-05-13 22:58:43.264005210 +0300 +@@ -0,0 +1,81 @@ ++# -*- coding : utf-8 -*- ++import os, sys ++ ++def mountpoint(path): ++ status = os.system("mountpoint -q %s" % path) ++ if status == 0: ++ return True ++ else: ++ return False ++ ++class Controller: ++ def __init__(self, subsysname, hierarchy, num_cgroups, enabled ): ++ self.subsysname = subsysname ++ self.hierarchy = hierarchy ++ self.num_cgroups = num_cgroups ++ self.enabled = enabled ++ ++ def mount(self): ++ if self.enabled == 1: ++ os.chdir("/sys/fs/cgroup") ++ if mountpoint(self.subsysname) == False: ++ s = self.subsysname ++ status = os.system("mkdir -p %s; mount -n -t cgroup -o %s cgroup %s" % (s, s,s)) ++ if status == 0: ++ return True ++ else: ++ return False ++ ++ ++class Cgroupfs: ++ def __init__(self): ++ self.controllers = {} ++ if self.check_fstab == True: ++ print("cgroupfs in fstab, exiting.") ++ sys.exit(-1) ++ ++ if self.kernel_support() == False: ++ print("No kernel support for cgroupfs, exiting.") ++ sys.exit(-2) ++ ++ if self.check_sysfs() == False: ++ print("/sys/fs/cgroups directory not found, exiting") ++ sys.exit(-3) ++ ++ self.mount_cgroup() ++ self.find_controllers() ++ for cname, c in self.controllers.items(): ++ c.mount() ++ ++ def check_fstab(self): ++ found = False ++ for line in open("/etc/fstab").readlines(): ++ if line[0] == "#": ++ continue ++ else: ++ if line.find("cgroup"): ++ found = True ++ return found ++ ++ def kernel_support(self): ++ return os.path.isfile("/proc/cgroups") ++ ++ def check_sysfs(self): ++ return os.path.isdir("/sys/fs/cgroup") ++ ++ def mount_cgroup(self): ++ if mountpoint("/sys/fs/cgroup") == False: ++ cmd = " mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup" ++ return os.system(cmd) ++ ++ def find_controllers(self): ++ for line in open("/proc/cgroups").readlines(): ++ line = line.strip() ++ if line[0] == "#": ++ continue ++ else: ++ subsysname, hierarchy, num_cgroups, enabled = line.split() ++ enb = int(enabled) ++ hie = int(hierarchy) ++ numc= int(num_cgroups) ++ self.controllers[subsysname] = Controller(subsysname, hie, numc, enb) +diff -Nuar mudur-4.4.0.orig/bin/mudur.py mudur-4.4.0/bin/mudur.py +--- mudur-4.4.0.orig/bin/mudur.py 2015-05-13 22:57:33.660007190 +0300 ++++ mudur-4.4.0/bin/mudur.py 2015-05-13 22:59:17.161004246 +0300 +@@ -22,6 +22,7 @@ + import signal + import gettext + import subprocess ++from mudur_cgroupfs import Cgroupfs + + ######## + # i18n # +@@ -1025,6 +1026,7 @@ + break + df.close() + run_full("/bin/mount", "-t", "tmpfs", "-o", "nodev,nosuid,size=10%,mode=755", "tmpfs", "/run") ++ c = Cgroupfs() + + def mount_remote_filesystems(): + """Mounts remote filesystems.""" +diff -Nuar mudur-4.4.0.orig/setup.py mudur-4.4.0/setup.py +--- mudur-4.4.0.orig/setup.py 2014-03-07 23:15:31.000000000 +0200 ++++ mudur-4.4.0/setup.py 2015-05-13 23:05:23.092993840 +0300 +@@ -77,6 +77,7 @@ + + install_file("bin/mudur.py", prefix, "sbin/mudur.py") + install_file("bin/mudur_tmpfiles.py", prefix, "sbin/mudur_tmpfiles.py") ++ install_file("bin/mudur_cgroupfs.py", prefix, "sbin/mudur_cgroupfs.py") + install_file("bin/update-environment.py", prefix, "sbin/update-environment") + install_file("bin/update-fstab.py", prefix, "sbin/update-fstab") + install_file("bin/compat.py", prefix, "etc/init.d/compat.py") diff --git a/system/base/mudur/files/no_err-no_msg.patch b/system/base/mudur/files/no_err-no_msg.patch new file mode 100644 index 00000000..bc5e8715 --- /dev/null +++ b/system/base/mudur/files/no_err-no_msg.patch @@ -0,0 +1,11 @@ +--- bin/mudur.py~ 2014-06-14 14:28:45.136961885 +0200 ++++ bin/mudur.py 2014-06-14 14:29:12.000000000 +0200 +@@ -1406,7 +1406,7 @@ + UI.info(_("Creating tmpfiles")) + if not os.path.isdir("/run/tmpfiles.d"): create_directory("/run/tmpfiles.d") + run("/usr/bin/kmod", "static-nodes", "--format=tmpfiles", "--output=/run/tmpfiles.d/kmod.conf") +- out = capture("/sbin/mudur_tmpfiles.py")[0].strip().split("\n") ++ out = [line for line in capture("/sbin/mudur_tmpfiles.py")[0].split("\n") if line.strip()] + if out: LOGGER.log("Errors during tmpfiles creation.\n\t%s" % "\n\t".join(out)) + run("mount", "-t", "tmpfs", "tmpfs", "/dev/shm") + diff --git a/system/base/mudur/files/recreate_dir_if_new_uid_or_gid.patch b/system/base/mudur/files/recreate_dir_if_new_uid_or_gid.patch new file mode 100644 index 00000000..556614aa --- /dev/null +++ b/system/base/mudur/files/recreate_dir_if_new_uid_or_gid.patch @@ -0,0 +1,13 @@ +--- bin/mudur_tmpfiles.py~ 2014-05-16 03:56:41.000000000 +0200 ++++ bin/mudur_tmpfiles.py 2014-06-11 21:54:58.333421994 +0200 +@@ -37,6 +37,10 @@ + open(path, mode).write(content) + + def create(type, path, mode, uid, gid, age, arg): ++ if type == "d" and \ ++ os.path.isdir(path) and \ ++ (not uid == os.stat(path).st_uid or not gid == os.stat(path).st_gid): ++ type = "D" + if type == "L": + if not os.path.islink(path): os.symlink(arg, path) + return diff --git a/system/base/mudur/files/set_file_mode.patch b/system/base/mudur/files/set_file_mode.patch new file mode 100644 index 00000000..1b17a63b --- /dev/null +++ b/system/base/mudur/files/set_file_mode.patch @@ -0,0 +1,10 @@ +--- bin/mudur_tmpfiles.py~ 2014-08-03 17:48:07.461463934 +0200 ++++ bin/mudur_tmpfiles.py 2014-08-03 17:49:06.951461761 +0200 +@@ -63,6 +63,7 @@ + os.makedirs(os.path.dirname(path)) + os.chown(os.path.dirname(path), uid, gid) + write_file(path, arg, mode = "a" if type == "f" else "w") ++ os.chmod(path, mode) + os.chown(path, uid, gid) + + USAGE = """\ diff --git a/system/base/mudur/pspec.xml b/system/base/mudur/pspec.xml new file mode 100644 index 00000000..8bfea587 --- /dev/null +++ b/system/base/mudur/pspec.xml @@ -0,0 +1,188 @@ + + + + + mudur + http://www.pisilinux.org + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + Pisi Linux boot and initialization system + mudur handles mounting of the filesystems, loading of the device drivers, starting of the system services, and other jobs during the Pisi Linux boot and shutdown sequences. + http://source.pisilinux.org/1.0/mudur-4.4.0.tar.xz + + set_file_mode.patch + no_err-no_msg.patch + recreate_dir_if_new_uid_or_gid.patch + boot_option.patch + mount_cgroupfs.patch + + + + + mudur + + kbd + bash + dbus + kmod + eudev + comar + procps + python + rsyslog + sysvinit + coreutils + e2fsprogs + net-tools + baselayout + util-linux + wireless-tools + pisilinux-python + + + /etc/conf.d + /etc/mudur/services + /etc/init.d + /sbin + /bin + /usr/share/locale + + + System.PackageHandler + System.Service + System.Package + System.Settings + Disk.Manager + + + + + + 2015-05-13 + 4.4.0 + fix issue #562, rebuild, depend new kbd and eudev, mount cgroups + Marcin Bojara + marcin@pisilinux.org + + + 2014-08-03 + 4.4.0 + Set mode for newly created files. + Marcin Bojara + marcin@pisilinux.org + + + 2014-06-11 + 4.4.0 + Recreate dir if uid or gid has been changed. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 4.4.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-06 + 4.4.0 + No error line in log file when tmpfiles created successfully. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-16 + 4.4.0 + Remove /dev/shm line from /etc/fstab. + Add mounting /run to fstab for fresh installed system. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 4.4.0 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-02-13 + 4.3.1 + Mount or remount tmpfs at /run. + Starts with kmod.conf and baselayout.conf at the begining. + Strip mudur_tmpfiles output. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-10 + 4.3.1 + Try to fix D-Bus start issue using cleanup_run. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-01-21 + 4.3.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-19 + 4.3.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-28 + 4.2.0 + rebuild + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-10 + 4.2.0 + Run udev after remount rootfs. + Fix /run/shm mode. + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-05 + 4.2.0 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-26 + 4.2.0 + Fix migration from /var/run to /run + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-15 + 4.2.0 + Fix default groups for /sbin/useradd + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-02 + 4.2.0 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + diff --git a/system/base/mudur/translations.xml b/system/base/mudur/translations.xml new file mode 100644 index 00000000..7449fd6e --- /dev/null +++ b/system/base/mudur/translations.xml @@ -0,0 +1,9 @@ + + + + mudur + Pisi Linux açılış sistemi + Pisi Linux açılış ve kapanışı sırasında, dosya sistemlerinin bağlanması, donanım sürücülerinin yüklenmesi, servislerin başlatılması gibi işleri yürütür. + Gère le montage de systèmes de fichier, le chargement de pilotes de périphérique, le démarrage des services système et d'autres tâches pendant les séquences de démarrage et d'arrêt de Pisi Linux. + + diff --git a/system/base/ncurses/pspec.xml b/system/base/ncurses/pspec.xml index 7ff72743..cb1500b0 100644 --- a/system/base/ncurses/pspec.xml +++ b/system/base/ncurses/pspec.xml @@ -52,6 +52,9 @@ emul32 32-bit shared libraries for ncurses _emul32 + + glibc-32bit + ncurses diff --git a/system/base/nettle/pspec.xml b/system/base/nettle/pspec.xml index 2418b57f..4237d5c6 100644 --- a/system/base/nettle/pspec.xml +++ b/system/base/nettle/pspec.xml @@ -9,7 +9,6 @@ admins@pisilinux.org LGPLv2.1 - util.crypt library The Nettle package contains the low-level cryptographic library The Nettle package contains the low-level cryptographic library that is designed to fit easily in many contexts. @@ -54,10 +53,12 @@ emul32 gmp-32bit + glibc-32bit - nettle-devel - gmp-32bit + nettle + glibc-32bit + gmp /usr/lib32/ diff --git a/system/base/nspr/pspec.xml b/system/base/nspr/pspec.xml index 79d5f187..6c577d5a 100644 --- a/system/base/nspr/pspec.xml +++ b/system/base/nspr/pspec.xml @@ -12,7 +12,7 @@ library Netscape Portable Runtime Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc like functions. The API is used in the Mozilla client, many of Netscape/AOL/iPlanet's and other software offerings. - ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.7/src/nspr-4.10.7.tar.gz + ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.8/src/nspr-4.10.8.tar.gz nspr.pc.in generate-pc-config.sh @@ -41,6 +41,13 @@ + + 2015-04-02 + 4.10.8 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + 2014-12-06 4.10.7 diff --git a/system/base/ntfs-3g/actions.py b/system/base/ntfs-3g/actions.py index 64538470..da1adee3 100644 --- a/system/base/ntfs-3g/actions.py +++ b/system/base/ntfs-3g/actions.py @@ -11,18 +11,21 @@ from pisi.actionsapi import get def setup(): shelltools.export("CFLAGS", "%s -D_FILE_OFFSET_BITS=64" % get.CFLAGS()) - autotools.configure("--disable-static \ - --with-fuse=external \ - --enable-extras \ - --enable-posix-acls \ - --enable-ldscript \ - --disable-ldconfig") + autotools.configure("--prefix=/usr \ + --sbin=/usr/bin \ + --mandir=/usr/share/man \ + --disable-ldconfig \ + --disable-static \ + --with-fuse=external \ + --enable-posix-acls \ + --enable-extras") def build(): autotools.make() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + autotools.rawInstall("DESTDIR=%s rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib" % get.installDIR()) + pisitools.domove("/usr/bin/ntfs-3g.*", "/bin") # Create some compat symlinks diff --git a/system/base/ntfs-3g/files/ntfsprogs_destdir.patch b/system/base/ntfs-3g/files/ntfsprogs_destdir.patch new file mode 100644 index 00000000..96723054 --- /dev/null +++ b/system/base/ntfs-3g/files/ntfsprogs_destdir.patch @@ -0,0 +1,47 @@ +diff -Naur ntfs-3g_ntfsprogs-2015.3.14.orig/ntfsprogs/Makefile.in ntfs-3g_ntfsprogs-2015.3.14/ntfsprogs/Makefile.in +--- ntfs-3g_ntfsprogs-2015.3.14.orig/ntfsprogs/Makefile.in 2015-03-14 16:10:28.000000000 +0200 ++++ ntfs-3g_ntfsprogs-2015.3.14/ntfsprogs/Makefile.in 2015-05-06 10:22:31.563526903 +0300 +@@ -1348,15 +1348,15 @@ + # mkfs.ntfs[.8] hard link + + @ENABLE_NTFSPROGS_TRUE@install-exec-hook: +-@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)/sbin +-@ENABLE_NTFSPROGS_TRUE@ $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs ++@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)/usr/bin ++@ENABLE_NTFSPROGS_TRUE@ $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/usr/bin/mkfs.ntfs + + @ENABLE_NTFSPROGS_TRUE@install-data-hook: + @ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)$(man8dir) + @ENABLE_NTFSPROGS_TRUE@ $(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8 + + @ENABLE_NTFSPROGS_TRUE@uninstall-local: +-@ENABLE_NTFSPROGS_TRUE@ $(RM) -f $(DESTDIR)/sbin/mkfs.ntfs ++@ENABLE_NTFSPROGS_TRUE@ $(RM) -f $(DESTDIR)/usr/bin/mkfs.ntfs + @ENABLE_NTFSPROGS_TRUE@ $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8 + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur ntfs-3g_ntfsprogs-2015.3.14.orig/src/Makefile.in ntfs-3g_ntfsprogs-2015.3.14/src/Makefile.in +--- ntfs-3g_ntfsprogs-2015.3.14.orig/src/Makefile.in 2015-03-14 16:10:28.000000000 +0200 ++++ ntfs-3g_ntfsprogs-2015.3.14/src/Makefile.in 2015-05-06 10:22:31.566526903 +0300 +@@ -1040,9 +1040,9 @@ + @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@ $(LDCONFIG) + + @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local: install-rootbinPROGRAMS +-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) "$(DESTDIR)/sbin" +-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" +-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" ++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) "$(DESTDIR)/usr/bin" ++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/usr/bin/mount.ntfs-3g" ++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/usr/bin/mount.lowntfs-3g" + + @ENABLE_NTFS_3G_TRUE@install-data-local: install-man8 + @ENABLE_NTFS_3G_TRUE@ $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" +@@ -1050,7 +1050,7 @@ + + @ENABLE_NTFS_3G_TRUE@uninstall-local: + @ENABLE_NTFS_3G_TRUE@ $(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" +-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" ++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(RM) -f "$(DESTDIR)/usr/bin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" + + # 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/system/base/ntfs-3g/pspec.xml b/system/base/ntfs-3g/pspec.xml index 83d4897c..707a842f 100644 --- a/system/base/ntfs-3g/pspec.xml +++ b/system/base/ntfs-3g/pspec.xml @@ -14,7 +14,10 @@ app:console Userspace driver for NTFS read/write support ntfs-3g allows regular users read/write access to NTFS filesystems. - http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2014.2.15.tgz + http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2015.3.14.tgz + + ntfsprogs_destdir.patch + @@ -47,8 +50,9 @@ Userspace tools for NTFS filesystems. The goals of the Linux-NTFS project are to develop reliable and full-featured access to NTFS by the Linux kernel driver and to provide a wide collection of NTFS utilities. ntfs-3g + fuse glibc - libuuid + libutil-linux /sbin/mkfs.ntfs @@ -60,6 +64,13 @@ + + 2015-05-06 + 2015.3.14 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-12-13 2014.2.15 diff --git a/system/base/openssl/pspec.xml b/system/base/openssl/pspec.xml index bc049ac7..221d00d7 100644 --- a/system/base/openssl/pspec.xml +++ b/system/base/openssl/pspec.xml @@ -13,12 +13,13 @@ library Toolkit for SSL v2/v3 and TLS v1 OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. - ftp://ftp.openssl.org/source/openssl-1.0.2.tar.gz + ftp://ftp.openssl.org/source/openssl-1.0.2a.tar.gz openssl-1.0.0-beta4-ca-dir.patch - zlib + zlib-devel + xorg-util perl sed @@ -26,12 +27,12 @@ openssl-1.0.0a-ldflags-norpath.patch openssl-1.0.0-beta4-ca-dir.patch openssl-1.0.0-beta5-enginesdir.patch - openssl-1.0.2-parallel-build.patch + openssl-1.0.2-ipv6.patch openssl-1.0.2-s_client-verify.patch openssl-include.patch openssl_fix_for_x32.patch - openssl-optflags.patch + @@ -79,6 +80,7 @@ openssl zlib-32bit + glibc-32bit /usr/lib32 @@ -86,6 +88,13 @@ + + 2015-04-11 + 1.0.2a + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-02-17 1.0.2 diff --git a/system/base/os-prober/pspec.xml b/system/base/os-prober/pspec.xml index 372bc290..a30dcb36 100644 --- a/system/base/os-prober/pspec.xml +++ b/system/base/os-prober/pspec.xml @@ -12,7 +12,7 @@ app:console Utility to detect other OSes on a set of drives os-probe detects other OSes available on a system and outputs the results in a generic machine-readable format. Support for new OSes and Linux distributions can be added easily. - ftp://ftp.debian.org/debian/pool/main/o/os-prober/os-prober_1.63.tar.gz + http://http.debian.net/debian/pool/main/o/os-prober/os-prober_1.65.tar.xz os-prober @@ -25,6 +25,13 @@ + + 2015-05-03 + 1.65 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.63 diff --git a/system/base/pam/actions.py b/system/base/pam/actions.py index 3404fab6..b9525ce6 100644 --- a/system/base/pam/actions.py +++ b/system/base/pam/actions.py @@ -14,8 +14,11 @@ def setup(): autotools.autoreconf("-fi") autotools.configure("--enable-nls \ + --disable-audit \ --enable-securedir=/lib/security \ --enable-isadir=/lib/security") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): # Update .po files diff --git a/system/base/pam/pspec.xml b/system/base/pam/pspec.xml index f7c95189..ceae70de 100644 --- a/system/base/pam/pspec.xml +++ b/system/base/pam/pspec.xml @@ -21,7 +21,6 @@ perl gettext cracklib - audit-devel @@ -35,7 +34,6 @@ pam - audit cracklib @@ -71,6 +69,13 @@ + + 2015-04-01 + 1.1.8 + Rebuild, remove unused. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-06-10 1.1.8 diff --git a/system/base/pcmciautils/pspec.xml b/system/base/pcmciautils/pspec.xml index b0fe6cc7..b740e6c4 100644 --- a/system/base/pcmciautils/pspec.xml +++ b/system/base/pcmciautils/pspec.xml @@ -12,9 +12,9 @@ app:console Various utilities dealing with the PCMCIA bus pcmciautils contains the initialization tools necessary to allow the PCMCIA subsystem to behave as every other hotpluggable bus system. - http://ftp.task.gda.pl/vol/d0s0/ftp.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-018.tar.bz2 + https://sources.archlinux.org/other/pcmciautils/pcmciautils-018.tar.xz - sysfsutils + sysfsutils-devel diff --git a/system/base/piksemel/pspec.xml b/system/base/piksemel/pspec.xml index 0bb3831b..88ca2b76 100644 --- a/system/base/piksemel/pspec.xml +++ b/system/base/piksemel/pspec.xml @@ -14,7 +14,7 @@ A simple, fast, small and robust XML parser for Python, based on iksemel. http://source.pisilinux.org/1.0/piksemel-1.3.1.tar.gz - python + python-devel symbol-visibility.patch diff --git a/system/base/pisi/files/qt5.py b/system/base/pisi/files/qt5.py new file mode 100644 index 00000000..5cbdbf00 --- /dev/null +++ b/system/base/pisi/files/qt5.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2010 TUBITAK/UEKAE +# +# 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. +# +# Please read the COPYING file. + +import glob +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + +# Pisi Modules +import pisi.context as ctx + +# ActionsAPI Modules +import pisi.actionsapi + +# ActionsAPI Modules +from pisi.actionsapi import get +from pisi.actionsapi import cmaketools +from pisi.actionsapi import shelltools + +basename = "qt5" + +prefix = "/%s" % get.defaultprefixDIR() +libdir = "%s/lib" % prefix +libexecdir = "%s/libexec" % prefix +sysconfdir= "/etc" +bindir = "%s/bin" % prefix +includedir = "%s/include" % prefix + +# qt5 spesific variables + +headerdir = "%s/include/%s" % (prefix, basename) +datadir = "%s/share/%s" % (prefix, basename) +docdir = "/%s/%s" % (get.docDIR(), basename) +archdatadir = "%s/%s" % (libdir, basename) +examplesdir = "%s/%s/examples" % (libdir, basename) +importdir = "%s/%s/imports" % (libdir, basename) +plugindir = "%s/%s/plugins" % (libdir, basename) +qmldir = "%s/%s/qmldir" % (libdir, basename) +testdir = "%s/share/%s" % (prefix, basename) +translationdir = "%s/translations" % datadir + +qmake = "%s/qmake-qt5" % bindir + +class ConfigureError(pisi.actionsapi.Error): + def __init__(self, value=''): + pisi.actionsapi.Error.__init__(self, value) + self.value = value + ctx.ui.error(value) + +def configure(projectfile='', parameters='', installPrefix=prefix): + if projectfile != '' and not shelltools.can_access_file(projectfile): + raise ConfigureError(_("Project file '%s' not found.") % projectfile) + + profiles = glob.glob("*.pro") + if len(profiles) > 1 and projectfile == '': + raise ConfigureError(_("It seems there are more than one .pro file, you must specify one. (Possible .pro files: %s)") % ", ".join(profiles)) + + shelltools.system("%s -makefile %s PREFIX='%s' QMAKE_CFLAGS+='%s' QMAKE_CXXFLAGS+='%s' %s" % (qmake, projectfile, installPrefix, get.CFLAGS(), get.CXXFLAGS(), parameters)) + +def make(parameters=''): + cmaketools.make(parameters) + +def install(parameters='', argument='install'): + cmaketools.install('INSTALL_ROOT="%s" %s' % (get.installDIR(), parameters), argument) + diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index ed9321d4..b8b1438b 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -22,6 +22,7 @@ plyvel python gettext + intltool leveldb-devel @@ -48,6 +49,9 @@ comar-api urlgrabber python-psutil + libunwind + python-pyliblzma mudur @@ -70,6 +74,7 @@ pisi.xml pkgconfig.py tmpfiles.conf + qt5.py System.Package @@ -78,6 +83,13 @@ + + 2015-05-04 + 2.6 + Add qt5 api + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-12-07 2.6 @@ -303,4 +315,4 @@ marcin@pisilinux.org - \ No newline at end of file + diff --git a/system/base/pisilinux-python/files/remove_libX11_dep.patch b/system/base/pisilinux-python/files/remove_libX11_dep.patch new file mode 100644 index 00000000..691ffc77 --- /dev/null +++ b/system/base/pisilinux-python/files/remove_libX11_dep.patch @@ -0,0 +1,147 @@ +diff -Nuar pardus-python-0.4.8.orig/pardus/__init__.py pardus-python-0.4.8/pardus/__init__.py +--- pardus-python-0.4.8.orig/pardus/__init__.py 2010-12-09 14:47:32.000000000 +0200 ++++ pardus-python-0.4.8/pardus/__init__.py 2015-03-06 17:46:44.000000000 +0200 +@@ -24,8 +24,7 @@ + "netfilterutils", + "shellutils", + "strutils", +- "sysutils", +- "xorg"] ++ "sysutils"] + + + def versionString(): +diff -Nuar pardus-python-0.4.8.orig/pardus/xorg/capslock.c pardus-python-0.4.8/pardus/xorg/capslock.c +--- pardus-python-0.4.8.orig/pardus/xorg/capslock.c 2010-12-09 14:47:32.000000000 +0200 ++++ pardus-python-0.4.8/pardus/xorg/capslock.c 1970-01-01 02:00:00.000000000 +0200 +@@ -1,59 +0,0 @@ +-/* +-* Copyright (c) 2005, TUBITAK/UEKAE +-* +-* 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. Please read the COPYING file. +-*/ +- +-#include +-#include +- +- +-PyDoc_STRVAR(isOn__doc__, +-"isOn()\n" +-"\n" +-"method checked if CapsLock is on\n"); +- +-PyObject* +-capslock_isOn(PyObject *self, PyObject *args) +-{ +- int capsLocked; +- unsigned int lmask; +- Window dummy1, dummy2; +- int dummy3, dummy4, dummy5, dummy6; +- Display *display; +- +- display = XOpenDisplay(0); +- XQueryPointer(display, DefaultRootWindow(display), +- &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, +- &lmask); +- capsLocked = lmask & LockMask; +- XCloseDisplay(display); +- +- if (capsLocked) +- { +- Py_INCREF(Py_True); +- return Py_True; +- } +- +- Py_INCREF(Py_False); +- return Py_False; +-} +- +-static PyMethodDef capslock_methods[] = { +- {"isOn", (PyCFunction)capslock_isOn, METH_NOARGS, isOn__doc__}, +- {NULL, NULL} +-}; +- +-PyMODINIT_FUNC +-initcapslock(void) +-{ +- PyObject *m; +- +- m = Py_InitModule("capslock", capslock_methods); +- +- return; +-} +- +diff -Nuar pardus-python-0.4.8.orig/pardus/xorg/__init__.py pardus-python-0.4.8/pardus/xorg/__init__.py +--- pardus-python-0.4.8.orig/pardus/xorg/__init__.py 2010-12-09 14:47:32.000000000 +0200 ++++ pardus-python-0.4.8/pardus/xorg/__init__.py 1970-01-01 02:00:00.000000000 +0200 +@@ -1,6 +0,0 @@ +-# -*- coding: utf-8 -*- +- +-import capslock +-import xterm +- +-__all__ = ["capslock", "xterm"] +diff -Nuar pardus-python-0.4.8.orig/pardus/xorg/xterm.py pardus-python-0.4.8/pardus/xorg/xterm.py +--- pardus-python-0.4.8.orig/pardus/xorg/xterm.py 2010-12-09 14:47:32.000000000 +0200 ++++ pardus-python-0.4.8/pardus/xorg/xterm.py 1970-01-01 02:00:00.000000000 +0200 +@@ -1,31 +0,0 @@ +-# -*- coding: utf-8 -*- +-# +-# Copyright (C) 2006, TUBITAK/UEKAE +-# +-# 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. +-# +-# Please read the COPYING file. +-# +- +-import sys +-import os +- +- +-def set_title(message): +- """Set message as console window title.""" +- if os.environ.has_key("TERM") and sys.stderr.isatty(): +- terminalType = os.environ["TERM"] +- for term in ["xterm", "Eterm", "aterm", "rxvt", "screen", "kterm", "rxvt-unicode"]: +- if terminalType.startswith(term): +- sys.stderr.write("\x1b]2;"+str(message)+"\x07") +- sys.stderr.flush() +- break +- +- +-def reset_title(): +- """Reset console window title.""" +- if os.environ.has_key("TERM"): +- set_title("") +diff -Nuar pardus-python-0.4.8.orig/setup.py pardus-python-0.4.8/setup.py +--- pardus-python-0.4.8.orig/setup.py 2010-12-09 14:47:32.000000000 +0200 ++++ pardus-python-0.4.8/setup.py 2015-03-06 17:50:11.000000000 +0200 +@@ -15,8 +15,6 @@ + setup.py + pardus/*.py + pardus/*.c +- pardus/xorg/*.py +- pardus/xorg/*.c + po/*.po + po/*.pot + tools/*.py +@@ -82,11 +80,8 @@ + author="Pardus Developers", + author_email="info@pardus.org.tr", + url="http://www.pardus.org.tr/", +- packages = ['pardus', 'pardus.xorg'], +- ext_modules = [Extension('pardus.xorg.capslock', +- sources=['pardus/xorg/capslock.c'], +- libraries=['X11']), +- Extension('pardus.csapi', ++ packages = ['pardus'], ++ ext_modules = [Extension('pardus.csapi', + sources=['pardus/csapi.c'], + libraries=[]), + ], diff --git a/system/base/pisilinux-python/pspec.xml b/system/base/pisilinux-python/pspec.xml index f35ba7a4..c076e1d5 100644 --- a/system/base/pisilinux-python/pspec.xml +++ b/system/base/pisilinux-python/pspec.xml @@ -14,16 +14,19 @@ Python modules for Pisi Linux provides functions for common task, with the aim of easing development. http://source.pisilinux.org/1.0/pisilinux-python-0.4.8.tar.gz - python - libX11-devel + python-devel + + + remove_libX11_dep.patch + pisilinux-python python - libX11 + /usr/lib @@ -33,6 +36,13 @@ + + 2015-03-11 + 0.4.8 + Remove libX11 dependency. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 0.4.8 diff --git a/system/base/plyvel/pspec.xml b/system/base/plyvel/pspec.xml index 079a033b..2035903a 100644 --- a/system/base/plyvel/pspec.xml +++ b/system/base/plyvel/pspec.xml @@ -11,7 +11,10 @@ Plyvel, a fast and feature-rich Python interface to LevelDB. Plyvel has a rich feature set, high performance, and a friendly Pythonic API. - cython + cython + python-devel + leveldb-devel + python-setuptools https://pypi.python.org/packages/source/p/plyvel/plyvel-0.8.tar.gz diff --git a/system/base/polkit/actions.py b/system/base/polkit/actions.py index 2c03cc7d..40c46a66 100644 --- a/system/base/polkit/actions.py +++ b/system/base/polkit/actions.py @@ -10,21 +10,19 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): - #Use it for root user instead of wheel group - #shelltools.system("sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules") - # Use it if we have spidermonkey 1.8.7 or newer... - #shelltools.system("sed -i -e '/mozjs/s:185:187:g' configure") - #look http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-auth/polkit/polkit-0.107.ebuild - #shelltools.system("cmd='sed -i -e "/mozjs/s:185:187:g" configure src/polkitbackend/polkitbackendjsauthority.c'") - autotools.autoreconf("-fi") + #autotools.autoreconf("-fi") autotools.configure("--with-pam-module-dir=/lib/security/ \ - --with-os-type=PisiLinux \ + --with-os-type=pardus \ + --with-mozjs=mozjs-17.0 \ + --with-dbus \ --enable-examples \ - --enable-introspection \ + --disable-introspection \ --enable-libsystemd-login=no \ + --with-systemdsystemunitdir=no \ --disable-man-pages \ --disable-gtk-doc \ --disable-static") + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") def build(): diff --git a/system/base/polkit/pspec.xml b/system/base/polkit/pspec.xml index c0888a7d..1e1e7508 100644 --- a/system/base/polkit/pspec.xml +++ b/system/base/polkit/pspec.xml @@ -22,6 +22,7 @@ expat-devel dbus-glib-devel spidermonkey-devel + intltool disable-docs.patch @@ -84,6 +85,13 @@ + + 2015-05-08 + 0.112 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-06-10 0.112 diff --git a/system/base/procps/pspec.xml b/system/base/procps/pspec.xml index a39502a9..6cc35f57 100644 --- a/system/base/procps/pspec.xml +++ b/system/base/procps/pspec.xml @@ -14,7 +14,7 @@ procps is the package that has a bunch of small useful utilities that give information about processes using the /proc filesystem. The package includes the programs ps, top, vmstat, w, kill, free, slabtop, and skill. http://procps.sf.net/procps-3.2.8.tar.gz - ncurses + ncurses-devel procps-3.2.5-proc-mount.patch diff --git a/system/base/psmisc/files/psmisc-fuser.patch b/system/base/psmisc/files/psmisc-fuser.patch new file mode 100644 index 00000000..b7645f20 --- /dev/null +++ b/system/base/psmisc/files/psmisc-fuser.patch @@ -0,0 +1,11 @@ +--- a/src/fuser.c ++++ b/src/fuser.c +@@ -1174,7 +1174,7 @@ + usage(_("No process specification given")); + + /* Check if -M flag was used and if so check mounts */ +- if (opts * OPT_ISMOUNTPOINT) { ++ if (opts & OPT_ISMOUNTPOINT) { + check_mountpoints(&mounts, &names_head, &names_tail); + } + diff --git a/system/base/psmisc/pspec.xml b/system/base/psmisc/pspec.xml index dc22952f..217a19cc 100644 --- a/system/base/psmisc/pspec.xml +++ b/system/base/psmisc/pspec.xml @@ -12,11 +12,14 @@ app:console A set of tools that use the proc filesystem PSmisc is a collection of small utilities using /proc file system, and providing the system administrator with some help in common tasks. - mirrors://sourceforge/psmisc/psmisc-22.20.tar.gz + mirrors://sourceforge/psmisc/psmisc-22.21.tar.gz - ncurses + ncurses-devel gettext + + psmisc-fuser.patch + @@ -34,6 +37,13 @@ + + 2015-05-03 + 22.21 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 22.20 diff --git a/system/base/pycurl/actions.py b/system/base/pycurl/actions.py index 9efee7f8..874532a8 100644 --- a/system/base/pycurl/actions.py +++ b/system/base/pycurl/actions.py @@ -6,8 +6,11 @@ from pisi.actionsapi import pythonmodules from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools from pisi.actionsapi import get +shelltools.export("PYCURL_SSL_LIBRARY", "openssl") + def install(): # no static libs pisitools.dosed("setup.py", ", \"--static-libs\"") diff --git a/system/base/pycurl/pspec.xml b/system/base/pycurl/pspec.xml index fefebe3f..9d642c50 100644 --- a/system/base/pycurl/pspec.xml +++ b/system/base/pycurl/pspec.xml @@ -14,9 +14,9 @@ PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program. http://pycurl.sourceforge.net/download/pycurl-7.19.3.1.tar.gz - curl - python - openssl + curl-devel + python-devel + openssl-devel diff --git a/system/base/pypolkit/pspec.xml b/system/base/pypolkit/pspec.xml index 619f96ed..065ed896 100644 --- a/system/base/pypolkit/pspec.xml +++ b/system/base/pypolkit/pspec.xml @@ -14,9 +14,9 @@ pypolkit is a Python binding for the PolicyKit library. http://source.pisilinux.org/1.0/pypolkit-1.0.2.tar.gz - glib2 - python - polkit-devel + glib2-devel + python-devel + polkit-devel @@ -34,6 +34,13 @@ + + 2015-05-08 + 1.0.2 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.0.2 diff --git a/system/base/python-psutil/actions.py b/system/base/python-psutil/actions.py new file mode 100644 index 00000000..46897e82 --- /dev/null +++ b/system/base/python-psutil/actions.py @@ -0,0 +1,16 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt. + +from pisi.actionsapi import pythonmodules +from pisi.actionsapi import pisitools + +def build(): + pythonmodules.compile() + +def install(): + pythonmodules.install() + + pisitools.dodoc("LICENSE", "README.rst", "INSTALL.rst") diff --git a/system/base/python-psutil/pspec.xml b/system/base/python-psutil/pspec.xml new file mode 100644 index 00000000..1757a0a7 --- /dev/null +++ b/system/base/python-psutil/pspec.xml @@ -0,0 +1,55 @@ + + + + + python-psutil + https://github.com/giampaolo/psutil + + PisiLinux Community + admins@pisilinux.org + + BSD + library + A cross-platform process utilities module for Python + python-psutil is a module providing an interface for retrieving information on all running processes and system utilization (CPU, memory) in a portable way by using Python, implementing many functionalities offered by command line tools like ps, top, kill, lsof and netstat. + https://github.com/giampaolo/psutil/archive/release-2.2.1.tar.gz + + python-devel + + + + + python-psutil + + python + + + /usr/lib + /usr/share/doc + + + + + + 2015-04-12 + 2.2.1 + Version bump + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-11-19 + 1.1.3 + Version bump + Burak Fazıl Ertürk + burakerturk@pisilinux.org + + + 2012-11-16 + 0.6.1 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/system/base/python-psutil/translations.xml b/system/base/python-psutil/translations.xml new file mode 100644 index 00000000..95d95c82 --- /dev/null +++ b/system/base/python-psutil/translations.xml @@ -0,0 +1,8 @@ + + + + python-psutil + Platform bağımsız, süreçler hakkında bilgi sağlayan bir Python modülü + python-psutil, bütün çalışan süreçler ve sistem kullanımı (MİB - Merkezi İşlem Birim(CPU) ve hafıza gibi) hakkında bilgilere erişimek için arayüz sunan bir Python modülüdür. ps, top, kill, lsof, netstat gibi bir çok komut satırı araçlarının sunduğu işlevselliği sağlamaktadır. + + diff --git a/system/base/python-pyliblzma/pspec.xml b/system/base/python-pyliblzma/pspec.xml index 26399655..0dd6ef01 100644 --- a/system/base/python-pyliblzma/pspec.xml +++ b/system/base/python-pyliblzma/pspec.xml @@ -14,7 +14,9 @@ pyliblzma provides a python interface for the liblzma library to read/write data that has been compressed/decompressed with lzma utils. http://pypi.python.org/packages/source/p/pyliblzma/pyliblzma-0.5.3.tar.bz2 - xz + xz-devel + python-setuptools + python-devel diff --git a/system/base/python/pspec.xml b/system/base/python/pspec.xml index 9314ac48..76087d7a 100644 --- a/system/base/python/pspec.xml +++ b/system/base/python/pspec.xml @@ -15,11 +15,11 @@ http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz bzip2 - tcl-devel + gdbm-devel zlib-devel expat-devel - tcltk-devel + libffi-devel sqlite-devel ncurses-devel @@ -93,7 +93,7 @@ - + - + diff --git a/system/base/readline/pspec.xml b/system/base/readline/pspec.xml index eeb87e4a..facd29b6 100644 --- a/system/base/readline/pspec.xml +++ b/system/base/readline/pspec.xml @@ -40,6 +40,9 @@ readline-devel system.devel Development files for readline + + glibc-32bit + readline @@ -60,6 +63,7 @@ readline ncurses-32bit + glibc-32bit /usr/lib32 diff --git a/system/base/rsyslog/actions.py b/system/base/rsyslog/actions.py index b3aa2e4b..6aa2836f 100644 --- a/system/base/rsyslog/actions.py +++ b/system/base/rsyslog/actions.py @@ -9,7 +9,7 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools def setup(): - pisitools.cflags.add('-fpie -DSYSLOGD_PIDNAME=\\"syslogd.pid\\"') + #pisitools.cflags.add('-fpie -DSYSLOGD_PIDNAME=\\"syslogd.pid\\"') pisitools.ldflags.add("-pie -Wl,-z,relro -Wl,-z,now") autotools.configure("\ @@ -25,8 +25,9 @@ def setup(): --disable-testbench \ --disable-mmnormalize \ --disable-gssapi-krb5 \ + --disable-generate-man-pages \ + --disable-uuid \ --enable-mail \ - --enable-uuid \ --enable-zlib \ --enable-imdiag \ --enable-imfile \ @@ -47,6 +48,7 @@ def setup(): --enable-unlimited-select \ --enable-pmaixforwardedfrom \ --enable-cached-man-pages \ + --with-systemdsystemunitdir=no \ ") pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") diff --git a/system/base/rsyslog/comar/service.py b/system/base/rsyslog/comar/service.py index 00b5d989..68e12266 100644 --- a/system/base/rsyslog/comar/service.py +++ b/system/base/rsyslog/comar/service.py @@ -6,12 +6,12 @@ serviceDesc = _({"en": "System Message Logger", "tr": "Sistem Günlükleme Hizmeti"}) serviceDefault = "on" -PIDFILE = "/run/syslogd.pid" +PIDFILE = "/var/run/rsyslogd.pid" @synchronized def start(): startService(command="/usr/bin/rsyslogd", - args=config.get("SYSLOGD_OPTIONS", "-c 4"), + args=config.get("SYSLOGD_OPTIONS", ""), pidfile=PIDFILE, detach=True) diff --git a/system/base/rsyslog/files/50-default.conf b/system/base/rsyslog/files/50-default.conf new file mode 100644 index 00000000..9ae85782 --- /dev/null +++ b/system/base/rsyslog/files/50-default.conf @@ -0,0 +1,95 @@ +####################### +### DEFAULT ACTIONS ### +####################### + +auth,authpriv.* action( + type="omfile" + File="/var/log/auth.log" + FileCreateMode="0600" + FileOwner="root" + FileGroup="adm" + Sync="off" +) + +cron.* action( + type="omfile" + File="/var/log/cron.log" + FileOwner="root" + FileGroup="adm" +) + +daemon.* action( + type="omfile" + File="/var/log/daemon.log" + FileOwner="root" + FileGroup="adm" +) + +kern.* action( + type="omfile" + File="/var/log/kern.log" + FileOwner="root" + FileGroup="adm" +) + +lpr.* action( + type="omfile" + File="/var/log/lpr.log" + FileOwner="root" + FileGroup="adm" +) + +mail.* action( + type="omfile" + File="/var/log/mail.log" + FileOwner="root" + FileGroup="adm" +) + +news.* action( + type="omfile" + File="/var/log/news.log" + FileOwner="root" + FileGroup="adm" +) + +user.* action( + type="omfile" + File="/var/log/user.log" + FileOwner="root" + FileGroup="adm" +) + +*.=debug;auth,authpriv,news,mail.none action( + type="omfile" + File="/var/log/debug.log" + FileOwner="root" + FileGroup="adm" +) + +*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action( + type="omfile" + File="/var/log/messages" + FileOwner="root" + FileGroup="adm" +) + +# Uncomment the following directive to re-enable the +# deprecated "/var/log/syslog" log file (don't forget to re-enable log +# rotation in "/etc/logrotate.d/rsyslog" if you do that!) +#*.*;auth,authpriv.none action( +# type="omfile" +# File="/var/log/syslog" +# FileOwner="root" +# FileGroup="adm" +#) + +*.emerg action( + type="omusrmsg" + Users="*" + action.execOnlyOnceEveryInterval="10" +) + +# Create an additional socket for the default chroot location +# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744) +input(type="imuxsock" Socket="/var/empty/dev/log") diff --git a/system/base/rsyslog/files/rsyslog.conf b/system/base/rsyslog/files/rsyslog.conf index 9d83e590..da484598 100644 --- a/system/base/rsyslog/files/rsyslog.conf +++ b/system/base/rsyslog/files/rsyslog.conf @@ -1,95 +1,61 @@ -#rsyslog v3 config file +# /etc/rsyslog.conf +# +# This configuration is based on RainerScript, the new recommended syntax +# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further +# details. +# +# But if you don't want to learn something new at moment, don't worry: The +# legacy syntax is still supported. +# +# You may want to use the new RSYSLOG configuration builder to create your +# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/ -# if you experience problems, check -# http://www.rsyslog.com/troubleshoot for assistance - -#### MODULES #### - -$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command) -$ModLoad imklog.so # provides kernel logging support (previously done by rklogd) -$ModLoad immark.so # provides --MARK-- message capability - -# Provides UDP syslog reception -#$ModLoad imudp.so -#$UDPServerRun 514 - -# Provides TCP syslog reception -#$ModLoad imtcp.so -#$InputTCPServerRun 514 +# Check config syntax on startup and abort if unclean (default: off) +#$AbortOnUncleanConfig on -#### GLOBAL DIRECTIVES #### +############### +### MODULES ### +############### -# Use default timestamp format -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +# Read syslog messages from default Unix socket /dev/log (e.g. via logger command) +module(load="imuxsock") -# File syncing capability is disabled by default. This feature is usually not required, -# not useful and an extreme performance hit -#$ActionFileEnableSync on +# Read messages from the kernel log and submits them to the syslog engine +module(load="imklog") + +# Inject "--MARK--" messages every $Interval (seconds) +#module(load="immark" Interval="600") + +# Read syslog messages from UDP +#module(load="imudp") +#input(type="imudp" port="514") + +# Read syslog messages from TCP +#module(load="imtcp") +#input(type="imtcp" port="514") -## ### begin forwarding rule ### -# The statement between the begin ... end define a SINGLE forwarding -# rule. They belong together, do NOT split them. If you create multiple -# forwarding rules, duplicate the whole block! -# Remote Logging (we use TCP for reliable delivery) -# -# An on-disk queue is created for this action. If the remote host is -# down, messages are spooled to disk and sent when it is up again. -#$WorkDirectory /var/spppl/rsyslog # where to place spool files -#$ActionQueueFileName fwdRule1 # unique name prefix for spool files -#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible) -#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown -#$ActionQueueType LinkedList # run asynchronously -#$ActionResumeRetryCount -1 # infinite retries if host is down -# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional -#*.* @@remote-host:514 -# ### end of the forwarding rule ### +######################### +### GLOBAL DIRECTIVES ### +######################### + +# Where to place spool and state files +$WorkDirectory /var/spool/rsyslog + +# Reduce repeating messages (default: off) +#$RepeatedMsgReduction on + +# Set defaults for every output file +$Umask 0022 + +module( + load="builtin:omfile" + Template="RSYSLOG_TraditionalFileFormat" + FileCreateMode="0644" + DirCreateMode="0755" +) -#### RULES #### - -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none -/var/log/syslog - -daemon.* -/var/log/daemon.log -user.* -/var/log/user.log - -# Log kernel stuff -kern.* -/var/log/kern.log - -# Log all the mail messages in one place. -mail.* -/var/log/mail.log - -# Log cron stuff -cron.* /var/log/cron.log - -# -# Logging for the mail system. Split it up so that -# it is easy to write scripts to parse these files. -# -mail.info -/var/log/mail.info -mail.warn -/var/log/mail.warn -mail.err /var/log/mail.err - -# Logging for INN news system -# -news.crit /var/log/news/news.crit -news.err /var/log/news/news.err -news.notice -/var/log/news/news.notice - -# -# Some `catch-all' logfiles. -# -*.=debug;\ - auth,authpriv.none;\ - news.none;mail.none -/var/log/debug -*.=info;*.=notice;*.=warn;\ - auth,authpriv.none;\ - cron,daemon.none;\ - mail,news.none -/var/log/messages - -# Emergencies are sent to everybody logged in. -# -*.emerg * - +# Include all conf files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/system/base/rsyslog/files/rsyslog.logrotate b/system/base/rsyslog/files/rsyslog.logrotate index 640a16cc..1eae30e0 100644 --- a/system/base/rsyslog/files/rsyslog.logrotate +++ b/system/base/rsyslog/files/rsyslog.logrotate @@ -1,6 +1,37 @@ -/var/log/messages /var/log/mail.log /var/log/cron.log { - sharedscripts - postrotate - /bin/kill -HUP `cat /run/syslogd.pid 2> /dev/null` 2> /dev/null || true - endscript +# Uncomment the following directive if you have re-enabled +# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf" +#/var/log/syslog +#{ +# rotate 7 +# daily +# missingok +# notifempty +# delaycompress +# compress +# postrotate +# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null +# endscript +#} + +/var/log/auth.log +/var/log/cron.log +/var/log/daemon.log +/var/log/kern.log +/var/log/lpr.log +/var/log/mail.log +/var/log/news.log +/var/log/user.log +/var/log/debug.log +/var/log/messages +{ + rotate 4 + weekly + missingok + notifempty + compress + delaycompress + sharedscripts + postrotate + test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null + endscript } diff --git a/system/base/rsyslog/files/rsyslog.sysconfig b/system/base/rsyslog/files/rsyslog.sysconfig index 6f10db83..d8cbe875 100644 --- a/system/base/rsyslog/files/rsyslog.sysconfig +++ b/system/base/rsyslog/files/rsyslog.sysconfig @@ -1,5 +1,30 @@ -# Options to syslogd -# syslogd options are deprecated since rsyslog v3 -# if you want to use them, switch to compatibility mode 2 by "-c 2" -SYSLOGD_OPTIONS="-c 4" +# /etc/conf.d/rsyslog +# Configuration file +RSYSLOG_CONFIGFILE="/etc/rsyslog.conf" + +# PID file +# If you should ever change this, remember to update +# "/etc/logrotate.d/rsyslog", too. +RSYSLOG_PIDFILE="/run/rsyslogd.pid" + +# You can use this configuration option to pass additional options to the +# start-stop-daemon, see start-stop-daemon(8) for more details. +# Per default we wait 1000ms after we have started the service to ensure +# that the daemon is really up and running. +RSYSLOG_SSDARGS="--wait 1000" + +# The termination timeout (start-stop-daemon parameter "retry") ensures +# that the service will be terminated within a given time (60 + 5 seconds +# per default) when you are stopping the service. +# You need to increase the value when you are working with a large queue. +# See http://www.rsyslog.com/doc/queues.html for further information. +RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5" + + +# Options to rsyslogd +# See rsyslogd(8) for more details +# Notes: +# * Do not specify another PIDFILE but use the variable above to change the location +# * Do not specify another CONFIGFILE but use the variable above to change the location +RSYSLOG_OPTS="" diff --git a/system/base/rsyslog/pspec.xml b/system/base/rsyslog/pspec.xml index 53707d4f..8c118646 100644 --- a/system/base/rsyslog/pspec.xml +++ b/system/base/rsyslog/pspec.xml @@ -12,7 +12,7 @@ service Enhanced system logging and kernel message trapping daemons rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any message part, and fine grain output format control. It is quite compatible with stock sysklogd and can be used as a drop-in replacement. - http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz + http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.9.0.tar.gz zlib-devel json-c-devel @@ -28,7 +28,6 @@ zlib json-c libestr - libuuid libgcrypt liblogging @@ -39,11 +38,13 @@ /usr/share/doc /etc/logrotate.d /etc/conf.d + /etc/rsyslog.d /etc/rsyslog.conf rsyslog.logrotate rsyslog.conf + 50-default.conf rsyslog.sysconfig @@ -52,6 +53,13 @@ + + 2015-05-05 + 8.9.0 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 7.6.3 diff --git a/system/base/run-parts/pspec.xml b/system/base/run-parts/pspec.xml index bd29e759..efd312a8 100644 --- a/system/base/run-parts/pspec.xml +++ b/system/base/run-parts/pspec.xml @@ -9,7 +9,7 @@ GPLv2+ run scripts or programs in a directory run scripts or programs in a directory - ftp://ftp.archlinux.org/other/run-parts/debianutils_4.4.tar.gz + https://sources.archlinux.org/other/run-parts/debianutils_4.4.tar.gz @@ -23,9 +23,9 @@ - 2014-05-11 + 2015-04-11 4.4 - Release bump. + Release bump, fix source url Marcin Bojara marcin@pisilinux.org diff --git a/system/base/shadow/actions.py b/system/base/shadow/actions.py index a5881c7d..66287e9d 100644 --- a/system/base/shadow/actions.py +++ b/system/base/shadow/actions.py @@ -12,7 +12,7 @@ from pisi.actionsapi import get def setup(): autotools.configure("--enable-shadowgrp \ --without-selinux \ - --with-audit \ + --without-audit \ --without-libcrack \ --with-libpam \ --with-sha-crypt \ diff --git a/system/base/shadow/pspec.xml b/system/base/shadow/pspec.xml index 8dd7093b..4e2f9463 100644 --- a/system/base/shadow/pspec.xml +++ b/system/base/shadow/pspec.xml @@ -15,9 +15,8 @@ http://pkg-shadow.alioth.debian.org/releases/shadow-4.2.1.tar.xz pam-devel - audit-devel gettext-devel - skey-devel + shadow-strncpy-usage.patch @@ -31,7 +30,6 @@ acl attr pam - audit /bin @@ -71,9 +69,9 @@ - 2014-12-13 + 2015-04-01 4.2.1 - Version bump. + Version bump., remove build with audit Yusuf Aydemir yusuf.aydemir@pisilinux.org diff --git a/system/base/snappy/pspec.xml b/system/base/snappy/pspec.xml index 57fdf76b..a677d2ba 100755 --- a/system/base/snappy/pspec.xml +++ b/system/base/snappy/pspec.xml @@ -14,6 +14,7 @@ Snappy is a compression/decompression library. It does not aim for maximum compression, or compatibility with any other compression library; instead, it aims for very high speeds and reasonable compression. lzo-devel + zlib-devel http://snappy.googlecode.com/files/snappy-1.1.1.tar.gz @@ -22,6 +23,9 @@ snappy + + libgcc + /usr/lib /usr/share/doc diff --git a/system/base/spidermonkey/pspec.xml b/system/base/spidermonkey/pspec.xml index ed040c7c..2fe96352 100644 --- a/system/base/spidermonkey/pspec.xml +++ b/system/base/spidermonkey/pspec.xml @@ -17,6 +17,7 @@ zlib-devel nspr-devel readline-devel + libffi-devel @@ -53,6 +54,13 @@ + + 2015-05-08 + 17.0.0 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 17.0.0 diff --git a/system/base/sqlite/actions.py b/system/base/sqlite/actions.py index 3f58c4bb..3266033d 100644 --- a/system/base/sqlite/actions.py +++ b/system/base/sqlite/actions.py @@ -13,23 +13,45 @@ from pisi.actionsapi import get # but cannot be seen with sqlite query. However, it can be seen by opening the file with a text editor. # SQLITE_SECURE_DELETE overwrites written data with zeros. def setup(): - pisitools.cflags.add("-DSQLITE_SECURE_DELETE=1", - "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1", - "-DSQLITE_ENABLE_COLUMN_METADATA=1", - "-DSQLITE_DISABLE_DIRSYNC=1", - "-DSQLITE_ENABLE_FTS3=3", - "-DSQLITE_ENABLE_RTREE=1", - "-DNDEBUG=1", - "-fno-strict-aliasing") + pisitools.cflags.add("-DSQLITE_SECURE_DELETE", + "-DSQLITE_ENABLE_UNLOCK_NOTIFY", + "-DSQLITE_ENABLE_COLUMN_METADATA", + "-DSQLITE_DISABLE_DIRSYNC", + "-DSQLITE_ENABLE_FTS3", + "-DSQLITE_ENABLE_FTS4", + "-DSQLITE_ENABLE_FTS3_PARENTHESIS", + "-DSQLITE_ENABLE_STMT_SCANSTATUS", + "-DSQLITE_SOUNDEX", + "-DSQLITE_ENABLE_RTREE", + "-DSQLITE_ENABLE_API_ARMOR") + pisitools.cflags.sub("-O[s\d]", "-O3") + autotools.configure("--disable-static \ --enable-readline \ --enable-threadsafe") - + + shelltools.cd("tea") + autotools.configure(" \ + --enable-shared \ + --with-tcl='/usr/lib/' \ + --with-tclinclude='/usr/include' \ + --enable-64bit \ + --enable-threads") + + #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + def build(): autotools.make() - + + shelltools.cd("tea") + autotools.make() + def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + shelltools.cd("%s/sqlite-autoconf-3080803/tea" % get.workDIR()) + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.dodoc("README*") diff --git a/system/base/sqlite/pspec.xml b/system/base/sqlite/pspec.xml index d8b200e2..61abdd95 100644 --- a/system/base/sqlite/pspec.xml +++ b/system/base/sqlite/pspec.xml @@ -12,7 +12,8 @@ library An SQL Database Engine in a C Library SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. Supports databases up to 2 terabytes in size. - http://www.sqlite.org/2014/sqlite-autoconf-3080702.tar.gz + http://www.sqlite.org/2015/sqlite-autoconf-3080803.tar.gz + http://www.sqlite.org/2015/sqlite-doc-3080803.zip readline-devel @@ -50,16 +51,54 @@ emul32 32-bit shared libraries for sqlite emul32 + + glibc-32bit + sqlite + glibc-32bit /usr/lib32 + + + sqlite-tcl + + tcl-devel + + + sqlite + + + /usr/lib/sqlite3.8.8.3 + + + + + sqlite-tcl-32bit + + glibc-32bit + + + sqlite + glibc-32bit + + + /usr/lib32/sqlite3.8.8.3/ + + - + + 2015-02-28 + 3.8.8.3 + Version bump. + Vedat Demir + vedat@pisilinux.org + + 2015-01-31 3.8.8.2 Version bump. diff --git a/system/base/timezone/actions.py b/system/base/timezone/actions.py index 9b072dd9..6a6114ff 100644 --- a/system/base/timezone/actions.py +++ b/system/base/timezone/actions.py @@ -10,6 +10,7 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import get WorkDir = "." + ZoneDir = "/usr/share/zoneinfo" TargetDir = "%s/%s" % (get.installDIR(), ZoneDir) @@ -18,8 +19,8 @@ PosixDir = "%s/posix" % TargetDir timezones = ["etcetera", "southamerica", "northamerica", "europe", "africa", "antarctica", \ - "asia", "australasia", "factory", "backward", "pacificnew", \ - "systemv" ] + "asia", "australasia", "factory", "backward", "pacificnew", \ + "systemv" ] def setup(): pisitools.dodir (ZoneDir) @@ -38,7 +39,9 @@ def install(): shelltools.system (part2) part3 = "zic -L leapseconds -d %s -y \"%s/yearistype.sh\" %s" % (RightDir, get.workDIR(), tzdata) shelltools.system (part3) + shelltools.system ("zic -d %s -y \"%s/yearistype.sh\" %s -p Europe/Istanbul" % (TargetDir, get.workDIR(), tzdata)) - shelltools.system ("zic -d %s -p Europe/Istanbul" % TargetDir) + #shelltools.system ("zic -d %s -p Europe/Istanbul" % TargetDir) + diff --git a/system/base/timezone/files/timezone-data-2015c-makefile.patch b/system/base/timezone/files/timezone-data-2015c-makefile.patch new file mode 100644 index 00000000..082cf648 --- /dev/null +++ b/system/base/timezone/files/timezone-data-2015c-makefile.patch @@ -0,0 +1,86 @@ + - Fix up default paths + - Support env CC + - Don't build/install libtz.a + - Don't install man-pages provided by sys-apps/man-pages + - Move zic, zdump to sbin and tzselect to bin ala glibc + - Do not run network based unittests + +--- a/Makefile ++++ b/Makefile +@@ -45,21 +45,21 @@ POSIXRULES= America/New_York + + # Everything gets put in subdirectories of. . . + +-TOPDIR= /usr/local ++TOPDIR= /usr + + # "Compiled" time zone information is placed in the "TZDIR" directory + # (and subdirectories). + # Use an absolute path name for TZDIR unless you're just testing the software. + + TZDIR_BASENAME= zoneinfo +-TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) ++TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) + + # Types to try, as an alternative to time_t. int64_t should be first. + TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t + + # The "tzselect", "zic", and "zdump" commands get installed in. . . + +-ETCDIR= $(TOPDIR)/etc ++SBINDIR= $(TOPDIR)/sbin + + # If you "make INSTALL", the "date" command gets installed in. . . + +@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin + + # Manual pages go in subdirectories of. . . + +-MANDIR= $(TOPDIR)/man ++MANDIR= $(TOPDIR)/share/man + + # Library functions are put in an archive in LIBDIR. + +@@ -298,8 +298,10 @@ GZIPFLAGS= -9n + + ############################################################################### + +-cc= cc +-CC= $(cc) -DTZDIR=\"$(TZDIR)\" ++CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" ++ifeq ($(NLS),1) ++CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" ++endif + + AR= ar + +@@ -352,17 +354,14 @@ ALL: all date + install: all $(DATA) $(REDO) $(MANS) + mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ +- $(DESTDIR)$(LIBDIR) \ ++ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 + $(ZIC) -y $(YEARISTYPE) \ + -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. +- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. ++ cp zic zdump $(DESTDIR)$(SBINDIR)/. ++ cp tzselect $(DESTDIR)$(BINDIR)/. +- cp libtz.a $(DESTDIR)$(LIBDIR)/. +- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/. +- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. + + INSTALL: ALL install date.1 + mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 +@@ -440,7 +442,7 @@ tzselect: tzselect.ksh + chmod +x $@ + + check: check_character_set check_white_space check_links check_sorted \ +- check_tables check_web ++ check_tables + + check_character_set: $(ENCHILADA) + LC_ALL=en_US.utf8 && export LC_ALL && \ diff --git a/system/base/timezone/pspec.xml b/system/base/timezone/pspec.xml index 50a4cede..15c8cc03 100644 --- a/system/base/timezone/pspec.xml +++ b/system/base/timezone/pspec.xml @@ -14,11 +14,18 @@ data Timezone data files and tools timezone includes timezone data files and tools to use them. Package contents are synchronized with glibc tree. - http://www.iana.org/time-zones/repository/releases/tzdata2014b.tar.gz + http://www.iana.org/time-zones/repository/releases/tzdata2015d.tar.gz + perl gawk + + timezone-data-2015c-makefile.patch + + + + @@ -29,6 +36,13 @@ + + 2015-05-09 + 2015d + Version bump. + Vedat Demir + vedat@pisilinux.org + 2014-05-11 2014b diff --git a/system/base/udev/pspec.xml b/system/base/udev/pspec.xml index 439be79e..ffb1ae86 100644 --- a/system/base/udev/pspec.xml +++ b/system/base/udev/pspec.xml @@ -14,11 +14,11 @@ udev allows Linux users to have a dynamic /dev directory and it provides the ability to have persistent device names. http://www.freedesktop.org/software/systemd/systemd-214.tar.xz - glib2 + glib2-devel gperf acl-devel libkmod-devel - libblkid-devel + libutil-linux-devel @@ -28,7 +28,7 @@ libudev acl libkmod - libblkid + libutil-linux util-linux @@ -138,7 +138,7 @@ emul32 libkmod-32bit - libblkid-32bit + libutil-linux-32bit libudev @@ -169,7 +169,7 @@ - 2014-07-01 + 2015-05-01 214 Version bump. Marcin Bojara diff --git a/system/base/util-linux/actions.py b/system/base/util-linux/actions.py index 87b0073d..048f4bea 100644 --- a/system/base/util-linux/actions.py +++ b/system/base/util-linux/actions.py @@ -58,14 +58,13 @@ def setup(): options += "\ --bindir=/bin \ --sbindir=/sbin \ - --enable-static \ --enable-partx \ --enable-raw \ --enable-write \ --enable-tunelp \ - --with-audit \ + --without-audit \ --with-udev \ - --with-utempter \ + --without-utempter \ " autotools.autoreconf("-fi") @@ -87,5 +86,7 @@ def install(): if get.buildTYPE() == "emul32": return + #pisitools.removeDir("/usr/lib32/pkgconfig") + pisitools.dodoc("ABOUT-NLS", "AUTHORS", "ChangeLog", "COPYING", "README*") pisitools.insinto("/%s/%s" % (get.docDIR(), get.srcNAME()), "Documentation") diff --git a/system/base/util-linux/files/uuidd.tmpfiles b/system/base/util-linux/files/uuidd.tmpfiles new file mode 100644 index 00000000..d4bf4f75 --- /dev/null +++ b/system/base/util-linux/files/uuidd.tmpfiles @@ -0,0 +1 @@ +d /run/uuidd 0755 root root diff --git a/system/base/util-linux/pspec.xml b/system/base/util-linux/pspec.xml index 4581aa9e..fb4f5424 100644 --- a/system/base/util-linux/pspec.xml +++ b/system/base/util-linux/pspec.xml @@ -13,38 +13,41 @@ library Various useful Linux utilities The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. - http://www.kernel.org/pub/linux/utils/util-linux/v2.24/util-linux-2.24.1.tar.xz + https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz - zlib - audit + zlib-devel + eudev-devel + python-devel shadow - ncurses + ncurses-devel libcap-ng-devel - utempter-devel + glibc-32bit + - ntfs-3g.patch + - upstream/util-linux-ng-2.21-login-lastlog.patch - + upstream/util-linux-ng-2.21-login-lastlog.patch + util-linux - libuuid - libblkid + libutil-linux zlib perl - audit ncurses - libudev - utempter + eudev + libcap-ng + + util-linux + /etc /bin @@ -58,9 +61,6 @@ /usr/share/getopt /usr/share/bash-completion/completions /usr/share/locale - /usr/include - /usr/lib - /lib @@ -71,101 +71,107 @@ util.misc Helper daemon to guarantee uniqueness of time-based UUIDs - libuuid + libutil-linux + + uuidd + /usr/bin/uuidgen /usr/sbin/uuidd + /usr/lib/tmpfiles.d/uuidd.conf /usr/share/man/man1/uuidgen.1 /usr/share/man/man8/uuidd.8 + + uuidd.tmpfiles + - libuuid + libutil-linux library - A library for UUID processing + util-linux runtime library + + python + + + libblkid + libuuid + + + libblkid + libuuid + + /lib + /usr/lib /usr/share/man/man3/uuid* - /lib/libuuid.* - /usr/lib/libuuid.so - - - - - libuuid-devel - header - system.devel - libuuid header files - - libuuid - - - /usr/include/uuid/* - /usr/lib/pkgconfig/ - /usr/lib32/pkgconfig/uuid.pc - /usr/lib32/pkgconfig/blkid.pc - - - - - libblkid - library - A library for block device identifying - - libuuid - - /usr/share/man/man3/libblkid* /usr/share/man/man8/blkid* - /lib/libblkid.* - /usr/lib/libblkid.so + - libblkid-devel + libutil-linux-devel header system.devel - libblkid header files + libutil-linux header files - libblkid + libutil-linux + + libblkid-devel + libuuid-devel + + + libblkid-devel + libuuid-devel + - /usr/include/blkid/* - /usr/lib/pkgconfig/blkid.pc + /usr/include/ + /usr/lib/pkgconfig/*.pc - libuuid-32bit + libutil-linux-32bit emul32 - 32-bit shared libraries for libuuid + 32-bit shared libraries for libutil-linux emul32 - libuuid + glibc-32bit + + libblkid-32bit + libuuid-32bit + + + libblkid-32bit + libuuid-32bit + - /usr/lib32/libuuid.* - - - - - libblkid-32bit - emul32 - 32-bit shared libraries for libblkid - emul32 - - libblkid - libuuid-32bit - - - /usr/lib32/libblkid.* + /usr/lib32/ + + 2015-04-29 + 2.26.1 + Version bump, change pisi + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2015-04-01 + 2.26.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 2.24.1 diff --git a/system/base/util-linux/pspec.xml.new b/system/base/util-linux/pspec.xml.new new file mode 100644 index 00000000..aefea02f --- /dev/null +++ b/system/base/util-linux/pspec.xml.new @@ -0,0 +1,236 @@ + + + + + util-linux + http://userweb.kernel.org/~kzak/util-linux-ng/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + library + Various useful Linux utilities + The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. + https://www.kernel.org/pub/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz + + zlib-devel + udev-devel + python-devel + libudev-devel + shadow + ncurses-devel + libcap-ng-devel + glibc-32bit + + + + + + upstream/util-linux-ng-2.21-login-lastlog.patch + + + + + util-linux + + libuuid + libblkid + zlib + perl + python + ncurses + libudev + + libcap-ng + + + /etc + /bin + /sbin + /usr/bin + /usr/sbin + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/misc + /usr/share/getopt + /usr/share/bash-completion/completions + /usr/share/locale + /usr/include + /usr/lib + /lib + + + + + + uuidd + service + app:console + util.misc + Helper daemon to guarantee uniqueness of time-based UUIDs + + libuuid + + + + /usr/bin/uuidgen + /usr/sbin/uuidd + /usr/lib/tmpfiles.d/uuidd.conf + /usr/share/man/man1/uuidgen.1 + /usr/share/man/man8/uuidd.8 + + + uuidd.tmpfiles + + + + + libuuid + library + A library for UUID processing + + /usr/share/man/man3/uuid* + /lib/libuuid.* + /usr/lib/libuuid.so + + + + + libuuid-devel + header + system.devel + libuuid header files + + libuuid + + + /usr/include/uuid/* + /usr/lib/pkgconfig/ + /usr/lib32/pkgconfig/uuid.pc + + + + + libblkid + library + A library for block device identifying + + libuuid + + + /usr/share/man/man3/libblkid* + /usr/share/man/man8/blkid* + /lib/libblkid.* + /usr/lib/libblkid.so + + + + + libblkid-devel + header + system.devel + libblkid header files + + libblkid + + + /usr/include/blkid/* + /usr/lib/pkgconfig/blkid.pc + /usr/lib32/pkgconfig/blkid.pc + + + + + libuuid-32bit + emul32 + 32-bit shared libraries for libuuid + emul32 + + glibc-32bit + + + /usr/lib32/libuuid.* + + + + + libblkid-32bit + emul32 + 32-bit shared libraries for libblkid + emul32 + + libblkid + libuuid-32bit + libuuid + glibc-32bit + + + /usr/lib32/libblkid.* + + + + + + 2015-04-01 + 2.26.1 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 2.24.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-08 + 2.24.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-20 + 2.24 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-27 + 2.22.2 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-07-26 + 2.22.2 + Release bump for rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2013-01-14 + 2.22.2 + New release + PisiLinux Community + admins@pisilinux.org + + + 2012-11-17 + 2.22.1 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/system/base/util-linux/translations.xml b/system/base/util-linux/translations.xml index 5f4eb08d..9554333c 100644 --- a/system/base/util-linux/translations.xml +++ b/system/base/util-linux/translations.xml @@ -8,13 +8,13 @@ - libuuid - UUID üretimi için bir kitaplık + libutil-linux + util-linux için kitaplıklar - + - libblkid - Disk tanımlama için bir kitaplık + libutil-linux-devel + util-linux kitaplıkları için başlık dosyaları @@ -23,7 +23,7 @@ - libuuid-32bit - libuuid için 32-bit paylaşımlı kitaplıklar + libutil-linux-32bit + util-linux için 32-bit paylaşımlı kitaplıklar diff --git a/system/base/vixie-cron/pspec.xml b/system/base/vixie-cron/pspec.xml index 72588a23..378bffc0 100644 --- a/system/base/vixie-cron/pspec.xml +++ b/system/base/vixie-cron/pspec.xml @@ -15,7 +15,7 @@ ftp://ftp.linux.org.tr/pub/gentoo/distfiles/vixie-cron-4.1.tar.bz2 sed - pam + pam-devel vixie-cron-4.1-gentoo-r4.patch.bz2 @@ -56,7 +56,7 @@ - 2014-05-11 + 2015-05-04 4.1 Release bump. Marcin Bojara diff --git a/system/base/which/pspec.xml b/system/base/which/pspec.xml index 8c8903e4..ddac1e8d 100644 --- a/system/base/which/pspec.xml +++ b/system/base/which/pspec.xml @@ -12,9 +12,9 @@ app:console Prints the location of specified executable in your path which , Locates a program file in the user's path. - mirrors://gnu/which/which-2.20.tar.gz + mirrors://gnu/which/which-2.21.tar.gz - which-gentoo.patch + @@ -29,6 +29,13 @@ + + 2015-04-06 + 2.21 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-05-11 2.20 diff --git a/system/base/wireless-tools/pspec.xml b/system/base/wireless-tools/pspec.xml index ad8aac31..a4bad7fb 100644 --- a/system/base/wireless-tools/pspec.xml +++ b/system/base/wireless-tools/pspec.xml @@ -12,7 +12,7 @@ app:console A collection of tools to configure wireless lan cards The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions, a generic application programming interface allowing a driver to expose to the user space configuration and statistics specific to common Wireless LANs. They use a textual interface and are rather crude, but aim to support the full Wireless Extension. - http://svn.mandriva.com/svn/packages/cooker/wireless-tools/current/SOURCES/wireless_tools.30.pre9.tar.gz + http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.30.pre9.tar.gz no-ldconfig.patch wireless_tools.27-wireless-man-upd.patch @@ -49,6 +49,13 @@ + + 2015-05-08 + 30 + Release bump. + Vedat Demir + vedat@pisilinux.org + 2014-05-11 30 diff --git a/system/base/xz/pspec.xml b/system/base/xz/pspec.xml index 6288a2ec..81181d20 100644 --- a/system/base/xz/pspec.xml +++ b/system/base/xz/pspec.xml @@ -15,7 +15,7 @@ library XZ compression utilities XZ Utils provide a general purpose data compression library and command line tools. The .xz format supports multiple compression algorithms, which are called "filters" in context of XZ Utils. The primary filter is currently LZMA2. - http://tukaani.org/xz/xz-5.0.7.tar.gz + http://tukaani.org/xz/xz-5.2.1.tar.xz @@ -48,7 +48,11 @@ emul32 32bit shared libraries for xz emul32 + + glibc-32bit + + glibc-32bit xz @@ -57,6 +61,13 @@ + + 2015-03-08 + 5.2.1 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + 2014-10-01 5.0.7 diff --git a/system/base/zlib/pspec.xml b/system/base/zlib/pspec.xml index 43f1191f..b9d4a5bf 100644 --- a/system/base/zlib/pspec.xml +++ b/system/base/zlib/pspec.xml @@ -79,7 +79,11 @@ emul32 32-bit shared libraries for zlib emul32 + + glibc-32bit + + glibc-32bit zlib diff --git a/system/boot/component.xml b/system/boot/component.xml new file mode 100644 index 00000000..6b85d682 --- /dev/null +++ b/system/boot/component.xml @@ -0,0 +1,3 @@ + + system.boot + diff --git a/system/base/grub2/actions.py b/system/boot/grub2/actions.py similarity index 100% rename from system/base/grub2/actions.py rename to system/boot/grub2/actions.py diff --git a/system/base/grub2/files/grub-defaults b/system/boot/grub2/files/grub-defaults similarity index 100% rename from system/base/grub2/files/grub-defaults rename to system/boot/grub2/files/grub-defaults diff --git a/system/base/grub2/files/grub-defaults.orig b/system/boot/grub2/files/grub-defaults.orig similarity index 100% rename from system/base/grub2/files/grub-defaults.orig rename to system/boot/grub2/files/grub-defaults.orig diff --git a/system/base/grub2/files/mkconfig-fix.patch b/system/boot/grub2/files/mkconfig-fix.patch similarity index 100% rename from system/base/grub2/files/mkconfig-fix.patch rename to system/boot/grub2/files/mkconfig-fix.patch diff --git a/system/base/grub2/files/pisi-grub-bg.png b/system/boot/grub2/files/pisi-grub-bg.png similarity index 100% rename from system/base/grub2/files/pisi-grub-bg.png rename to system/boot/grub2/files/pisi-grub-bg.png diff --git a/system/base/grub2/files/pisi_name_and_initramfs.patch b/system/boot/grub2/files/pisi_name_and_initramfs.patch similarity index 100% rename from system/base/grub2/files/pisi_name_and_initramfs.patch rename to system/boot/grub2/files/pisi_name_and_initramfs.patch diff --git a/system/base/grub2/pspec.xml b/system/boot/grub2/pspec.xml similarity index 99% rename from system/base/grub2/pspec.xml rename to system/boot/grub2/pspec.xml index bf2b58a4..0c2c026c 100644 --- a/system/base/grub2/pspec.xml +++ b/system/boot/grub2/pspec.xml @@ -26,6 +26,7 @@ help2man texinfo freetype-devel + freetype zlib-devel ncurses-devel xz-devel diff --git a/system/base/grub2/translations.xml b/system/boot/grub2/translations.xml similarity index 100% rename from system/base/grub2/translations.xml rename to system/boot/grub2/translations.xml diff --git a/system/devel/autogen/actions.py b/system/devel/autogen/actions.py index d6c65b12..14f603ab 100644 --- a/system/devel/autogen/actions.py +++ b/system/devel/autogen/actions.py @@ -13,6 +13,8 @@ from pisi.actionsapi import get def setup(): autotools.autoreconf("-vfi") autotools.configure("--disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): autotools.make() diff --git a/system/devel/autogen/pspec.xml b/system/devel/autogen/pspec.xml index b3284e8c..e146e5a5 100644 --- a/system/devel/autogen/pspec.xml +++ b/system/devel/autogen/pspec.xml @@ -14,8 +14,11 @@ autogen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text. ftp://ftp.gnu.org/gnu/autogen/rel5.18.4/autogen-5.18.4.tar.xz + gc-devel + gmp-devel guile-devel libxml2-devel + which diff --git a/system/devel/binutils/actions.py b/system/devel/binutils/actions.py index 66cb3ba9..6d35e26f 100644 --- a/system/devel/binutils/actions.py +++ b/system/devel/binutils/actions.py @@ -78,6 +78,6 @@ def install(): for i in unneeded_man: pisitools.remove("/usr/share/man/man1/%s" %i) - pisitools.remove("/usr/share/info/configure.info") - pisitools.remove("/usr/share/info/standards.info") + #pisitools.remove("/usr/share/info/configure.info") + #pisitools.remove("/usr/share/info/standards.info") diff --git a/system/devel/binutils/files/binutils-2.24-gold-testsuite-plugin.patch b/system/devel/binutils/files/binutils-2.24-gold-testsuite-plugin.patch index 43302a42..9f5acad6 100644 --- a/system/devel/binutils/files/binutils-2.24-gold-testsuite-plugin.patch +++ b/system/devel/binutils/files/binutils-2.24-gold-testsuite-plugin.patch @@ -1,2888 +1,229 @@ - - - -svntogit/packages.git - Git clone of the 'packages' repository - - - - - - - -
    - -
    - -
    -
    -
    - - - -
    -summaryrefslogtreecommitdiffstats
    - - - -
    -
    -
    path: root/trunk/binutils-2.24-gold-testsuite-plugin.patch
    blob: 9f5acad662239ae07827cf009a51c92b7fc336d3 (plain) - - -
    1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
-200
-201
-202
-203
-204
-205
-206
-207
-208
-209
-210
-211
-212
-213
-214
-215
-216
-217
-218
-219
-220
-221
-222
-223
-224
-225
-226
-227
-228
-229
-
    diff --git a/gold/configure b/gold/configure
+diff --git a/gold/configure b/gold/configure
 index 2257324..f61307b 100755
---- a/gold/configure
-+++ b/gold/configure
-@@ -594,10 +594,12 @@ LTLIBOBJS
+--- a/gold/configure
++++ b/gold/configure
+@@ -594,10 +594,12 @@ LTLIBOBJS
  MAINT
  MAINTAINER_MODE_FALSE
  MAINTAINER_MODE_TRUE
--HAVE_PUBNAMES_FALSE
--HAVE_PUBNAMES_TRUE
+-HAVE_PUBNAMES_FALSE
+-HAVE_PUBNAMES_TRUE
  DLOPEN_LIBS
  CXXCPP
-+HAVE_NO_USE_LINKER_PLUGIN_FALSE
-+HAVE_NO_USE_LINKER_PLUGIN_TRUE
-+HAVE_PUBNAMES_FALSE
-+HAVE_PUBNAMES_TRUE
++HAVE_NO_USE_LINKER_PLUGIN_FALSE
++HAVE_NO_USE_LINKER_PLUGIN_TRUE
++HAVE_PUBNAMES_FALSE
++HAVE_PUBNAMES_TRUE
  HAVE_ZLIB_FALSE
  HAVE_ZLIB_TRUE
  LIBOBJS
-@@ -6991,6 +6993,50 @@ cat >>confdefs.h <<_ACEOF
+@@ -6991,6 +6993,50 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Werror -gpubnames"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int i;
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  have_pubnames=yes
-+else
-+  have_pubnames=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$save_CFLAGS"
-+ if test "$have_pubnames" = "yes"; then
-+  HAVE_PUBNAMES_TRUE=
-+  HAVE_PUBNAMES_FALSE='#'
-+else
-+  HAVE_PUBNAMES_TRUE='#'
-+  HAVE_PUBNAMES_FALSE=
-+fi
-+
-+
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int i;
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  have_no_use_linker_plugin=yes
-+else
-+  have_no_use_linker_plugin=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS="$save_CFLAGS"
-+ if test "$have_no_use_linker_plugin" = "yes"; then
-+  HAVE_NO_USE_LINKER_PLUGIN_TRUE=
-+  HAVE_NO_USE_LINKER_PLUGIN_FALSE='#'
-+else
-+  HAVE_NO_USE_LINKER_PLUGIN_TRUE='#'
-+  HAVE_NO_USE_LINKER_PLUGIN_FALSE=
-+fi
-+
-+
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -Werror -gpubnames"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++int i;
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  have_pubnames=yes
++else
++  have_pubnames=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++ if test "$have_pubnames" = "yes"; then
++  HAVE_PUBNAMES_TRUE=
++  HAVE_PUBNAMES_FALSE='#'
++else
++  HAVE_PUBNAMES_TRUE='#'
++  HAVE_PUBNAMES_FALSE=
++fi
++
++
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++int i;
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  have_no_use_linker_plugin=yes
++else
++  have_no_use_linker_plugin=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++ if test "$have_no_use_linker_plugin" = "yes"; then
++  HAVE_NO_USE_LINKER_PLUGIN_TRUE=
++  HAVE_NO_USE_LINKER_PLUGIN_FALSE='#'
++else
++  HAVE_NO_USE_LINKER_PLUGIN_TRUE='#'
++  HAVE_NO_USE_LINKER_PLUGIN_FALSE=
++fi
++
++
  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7515,28 +7561,6 @@ $as_echo "#define HAVE_STAT_ST_MTIM 1" >>confdefs.h
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -7515,28 +7561,6 @@ $as_echo "#define HAVE_STAT_ST_MTIM 1" >>confdefs.h
  
  fi
  
--save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS -Werror -gpubnames"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--int i;
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  have_pubnames=yes
--else
--  have_pubnames=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--CXXFLAGS="$save_CXXFLAGS"
-- if test "$have_pubnames" = "yes"; then
--  HAVE_PUBNAMES_TRUE=
--  HAVE_PUBNAMES_FALSE='#'
--else
--  HAVE_PUBNAMES_TRUE='#'
--  HAVE_PUBNAMES_FALSE=
--fi
--
--
+-save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror -gpubnames"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-int i;
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-  have_pubnames=yes
+-else
+-  have_pubnames=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-CXXFLAGS="$save_CXXFLAGS"
+- if test "$have_pubnames" = "yes"; then
+-  HAVE_PUBNAMES_TRUE=
+-  HAVE_PUBNAMES_FALSE='#'
+-else
+-  HAVE_PUBNAMES_TRUE='#'
+-  HAVE_PUBNAMES_FALSE=
+-fi
+-
+-
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7837,6 +7861,10 @@ if test -z "${HAVE_PUBNAMES_TRUE}" && test -z "${HAVE_PUBNAMES_FALSE}"; then
-   as_fn_error "conditional \"HAVE_PUBNAMES\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -7837,6 +7861,10 @@ if test -z "${HAVE_PUBNAMES_TRUE}" && test -z "${HAVE_PUBNAMES_FALSE}"; then
+   as_fn_error "conditional \"HAVE_PUBNAMES\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
-+if test -z "${HAVE_NO_USE_LINKER_PLUGIN_TRUE}" && test -z "${HAVE_NO_USE_LINKER_PLUGIN_FALSE}"; then
-+  as_fn_error "conditional \"HAVE_NO_USE_LINKER_PLUGIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-   as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
++if test -z "${HAVE_NO_USE_LINKER_PLUGIN_TRUE}" && test -z "${HAVE_NO_USE_LINKER_PLUGIN_FALSE}"; then
++  as_fn_error "conditional \"HAVE_NO_USE_LINKER_PLUGIN\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+   as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 diff --git a/gold/configure.ac b/gold/configure.ac
 index 803cf46..7ad7302 100644
---- a/gold/configure.ac
-+++ b/gold/configure.ac
-@@ -520,6 +520,25 @@ dnl multiple declarations of functions like basename when compiling
+--- a/gold/configure.ac
++++ b/gold/configure.ac
+@@ -520,6 +520,25 @@ dnl multiple declarations of functions like basename when compiling
  dnl with C++.
  AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp])
  
-+dnl Check if gcc supports the -gpubnames option.
-+dnl Use -Werror in case of compilers that make unknown -g options warnings.
-+dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS
-+dnl gets set later by default Autoconf magic to include -Werror.  (We are
-+dnl assuming here that there is no compiler that groks -gpubnames
-+dnl but does not grok -Werror.)
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Werror -gpubnames"
-+AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no])
-+CFLAGS="$save_CFLAGS"
-+AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes")
-+
-+dnl Check if gcc supports the -fno-use-linker-plugin option.
-+save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin"
-+AC_COMPILE_IFELSE([int i;], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no])
-+CFLAGS="$save_CFLAGS"
-+AM_CONDITIONAL(HAVE_NO_USE_LINKER_PLUGIN, test "$have_no_use_linker_plugin" = "yes")
-+
++dnl Check if gcc supports the -gpubnames option.
++dnl Use -Werror in case of compilers that make unknown -g options warnings.
++dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS
++dnl gets set later by default Autoconf magic to include -Werror.  (We are
++dnl assuming here that there is no compiler that groks -gpubnames
++dnl but does not grok -Werror.)
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -Werror -gpubnames"
++AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no])
++CFLAGS="$save_CFLAGS"
++AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes")
++
++dnl Check if gcc supports the -fno-use-linker-plugin option.
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin"
++AC_COMPILE_IFELSE([int i;], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no])
++CFLAGS="$save_CFLAGS"
++AM_CONDITIONAL(HAVE_NO_USE_LINKER_PLUGIN, test "$have_no_use_linker_plugin" = "yes")
++
  AC_LANG_PUSH(C++)
  
  AC_CHECK_HEADERS(unordered_set unordered_map)
-@@ -601,18 +620,6 @@ if test "$gold_cv_stat_st_mtim" = "yes"; then
+@@ -601,18 +620,6 @@ if test "$gold_cv_stat_st_mtim" = "yes"; then
  	    [Define if struct stat has a field st_mtim with timespec for mtime])
  fi
  
--dnl Check if gcc supports the -gpubnames option.
--dnl Use -Werror in case of compilers that make unknown -g options warnings.
--dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS
--dnl gets set later by default Autoconf magic to include -Werror.  (We are
--dnl assuming here that there is no compiler that groks -gpubnames
--dnl but does not grok -Werror.)
--save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS="$CXXFLAGS -Werror -gpubnames"
--AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no])
--CXXFLAGS="$save_CXXFLAGS"
--AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes")
--
+-dnl Check if gcc supports the -gpubnames option.
+-dnl Use -Werror in case of compilers that make unknown -g options warnings.
+-dnl They would pass the test here, but fail in actual use when $WARN_CFLAGS
+-dnl gets set later by default Autoconf magic to include -Werror.  (We are
+-dnl assuming here that there is no compiler that groks -gpubnames
+-dnl but does not grok -Werror.)
+-save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS="$CXXFLAGS -Werror -gpubnames"
+-AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no])
+-CXXFLAGS="$save_CXXFLAGS"
+-AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes")
+-
  AC_LANG_POP(C++)
  
  AC_CHECK_HEADERS(locale.h)
 diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
 index aa41290..52cc05e 100644
---- a/gold/testsuite/Makefile.am
-+++ b/gold/testsuite/Makefile.am
-@@ -19,18 +19,25 @@ AM_CPPFLAGS = \
- 	-DLOCALEDIR="\"$(datadir)/locale\"" \
- 	@INCINTL@
+--- a/gold/testsuite/Makefile.am
++++ b/gold/testsuite/Makefile.am
+@@ -19,18 +19,25 @@ AM_CPPFLAGS = \
+ 	-DLOCALEDIR="\"$(datadir)/locale\"" \
+ 	@INCINTL@
  
-+# Some versions of GCC now automatically enable linker plugins,
-+# but we want to run our tests without GCC's plugins.
-+if HAVE_NO_USE_LINKER_PLUGIN
-+OPT_NO_PLUGINS = -fno-use-linker-plugin
-+endif
-+
++# Some versions of GCC now automatically enable linker plugins,
++# but we want to run our tests without GCC's plugins.
++if HAVE_NO_USE_LINKER_PLUGIN
++OPT_NO_PLUGINS = -fno-use-linker-plugin
++endif
++
  # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK,
  # CXXCOMPILE and CXXLINK generated by automake 1.11.1.  FIXME: they should
  # be updated if they are different from automake used by gold.
  COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
--	-o $@
-+CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+-	-o $@
++CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  
--# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold
-+# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold
+-# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold
++# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold
  # testsuite and incompatible with -O0 used in gold tests, from
  # COMPILE, LINK, CXXCOMPILE and CXXLINK.
  COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'`
 diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
 index 60c2c10..da0a338 100644
---- a/gold/testsuite/Makefile.in
-+++ b/gold/testsuite/Makefile.in
-@@ -2096,21 +2096,27 @@ AM_CPPFLAGS = \
- 	@INCINTL@
+--- a/gold/testsuite/Makefile.in
++++ b/gold/testsuite/Makefile.in
+@@ -2096,21 +2096,27 @@ AM_CPPFLAGS = \
+ 	@INCINTL@
  
  
-+# Some versions of GCC now automatically enable linker plugins,
-+# but we want to run our tests without GCC's plugins.
-+@HAVE_NO_USE_LINKER_PLUGIN_TRUE@OPT_NO_PLUGINS = -fno-use-linker-plugin
-+
++# Some versions of GCC now automatically enable linker plugins,
++# but we want to run our tests without GCC's plugins.
++@HAVE_NO_USE_LINKER_PLUGIN_TRUE@OPT_NO_PLUGINS = -fno-use-linker-plugin
++
  # COMPILE1, LINK1, CXXCOMPILE1, CXXLINK1 are renamed from COMPILE, LINK,
  # CXXCOMPILE and CXXLINK generated by automake 1.11.1.  FIXME: they should
  # be updated if they are different from automake used by gold.
  COMPILE1 = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  
--LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+
+-LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK1 = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(OPT_NO_PLUGINS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++
  CXXCOMPILE1 = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  
--CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
--	-o $@
-+CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+-	-o $@
++CXXLINK1 = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(OPT_NO_PLUGINS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  
  
--# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold
-+# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold
+-# Strip out -Wp,-D_FORTIFY_SOURCE=, which is rrelevant for the gold
++# Strip out -Wp,-D_FORTIFY_SOURCE=, which is irrelevant for the gold
  # testsuite and incompatible with -O0 used in gold tests, from
  # COMPILE, LINK, CXXCOMPILE and CXXLINK.
  COMPILE = `echo $(COMPILE1) | sed -e 's/-Wp,-D_FORTIFY_SOURCE=[0-9[0-9]]*//'`
-
    -
    -
    -

    Copyright © 2002-2014 Judd Vinet and Aaron Griffin. The Arch Linux name and logo -are recognized trademarks. Some rights reserved. The registered trademark -Linux® is used pursuant to a sublicense from LMI, the exclusive licensee -of Linus Torvalds, owner of the mark on a world-wide basis.

    -
    -
    - - diff --git a/system/devel/binutils/files/binutils-2.25-roundup.patch b/system/devel/binutils/files/binutils-2.25-roundup.patch new file mode 100644 index 00000000..3113e11b --- /dev/null +++ b/system/devel/binutils/files/binutils-2.25-roundup.patch @@ -0,0 +1,1660 @@ +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index f2ee1ba..6d936e2 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,34 @@ ++2015-01-22 Thomas Preud'homme ++ ++ Backport from mainline ++ 2015-01-13 Thomas Preud'homme ++ ++ * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use SYMBOLIC_BIND ++ to check if a symbol should be bound symbolically. ++ ++2015-01-20 Chung-Lin Tang ++ ++ Backport from master ++ * elf32-nios2.c (elf_backend_default_execstack): Define as 0. ++ ++2015-01-11 H.J. Lu ++ ++ PR ld/17827 ++ * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): For PIE, ++ only discard space for pc-relative relocs symbols which turn ++ out to need copy relocs. ++ ++2015-01-05 H.J. Lu ++ ++ PR ld/17773 ++ * elflink.c (bfd_elf_final_link): Assign the file position for ++ the symbol string table only there are symbols to be emitted. ++ ++2014-12-23 Tristan Gingold ++ ++ * version.m4: Bump version to 2.25.0 ++ * configure: Regenerate. ++ + 2014-12-23 Tristan Gingold + + * version.m4: Bump version to 2.25 +diff --git a/bfd/configure b/bfd/configure +index 7016194..85e6b82 100755 +--- a/bfd/configure ++++ b/bfd/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for bfd 2.25. ++# Generated by GNU Autoconf 2.64 for bfd 2.25.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +@@ -556,8 +556,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='bfd' + PACKAGE_TARNAME='bfd' +-PACKAGE_VERSION='2.25' +-PACKAGE_STRING='bfd 2.25' ++PACKAGE_VERSION='2.25.0' ++PACKAGE_STRING='bfd 2.25.0' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1349,7 +1349,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 bfd 2.25 to adapt to many kinds of systems. ++\`configure' configures bfd 2.25.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1420,7 +1420,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of bfd 2.25:";; ++ short | recursive ) echo "Configuration of bfd 2.25.0:";; + esac + cat <<\_ACEOF + +@@ -1541,7 +1541,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-bfd configure 2.25 ++bfd configure 2.25.0 + generated by GNU Autoconf 2.64 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -2183,7 +2183,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 bfd $as_me 2.25, which was ++It was created by bfd $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ +@@ -3991,7 +3991,7 @@ fi + + # Define the identity of the package. + PACKAGE='bfd' +- VERSION='2.25' ++ VERSION='2.25.0' + + + cat >>confdefs.h <<_ACEOF +@@ -16567,7 +16567,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 bfd $as_me 2.25, which was ++This file was extended by bfd $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -16631,7 +16631,7 @@ Report bugs to the package provider." + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ +-bfd config.status 2.25 ++bfd config.status 2.25.0 + configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index 9b3f436..2739961 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -5307,5 +5307,6 @@ const struct bfd_elf_special_section elf32_nios2_special_sections[] = + #define TARGET_BIG_NAME "elf32-bignios2" + + #define elf_backend_got_header_size 12 ++#define elf_backend_default_execstack 0 + + #include "elf32-target.h" +diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c +index fefb08c..706ab5a 100644 +--- a/bfd/elf64-x86-64.c ++++ b/bfd/elf64-x86-64.c +@@ -2677,13 +2677,23 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) + && ! bfd_elf_link_record_dynamic_symbol (info, h)) + return FALSE; + } +- /* For PIE, discard space for relocs against symbols which +- turn out to need copy relocs. */ ++ /* For PIE, discard space for pc-relative relocs against ++ symbols which turn out to need copy relocs. */ + else if (info->executable + && (h->needs_copy || eh->needs_copy) + && h->def_dynamic + && !h->def_regular) +- eh->dyn_relocs = NULL; ++ { ++ struct elf_dyn_relocs **pp; ++ ++ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) ++ { ++ if (p->pc_count != 0) ++ *pp = p->next; ++ else ++ pp = &p->next; ++ } ++ } + } + } + else if (ELIMINATE_COPY_RELOCS) +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 94ab762..e9bd56c 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -10438,7 +10438,6 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info) + unsigned int i; + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Shdr *symtab_shndx_hdr; +- Elf_Internal_Shdr *symstrtab_hdr; + const struct elf_backend_data *bed = get_elf_backend_data (abfd); + struct elf_outext_info eoinfo; + bfd_boolean merged; +@@ -11139,25 +11138,28 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info) + } + + +- /* Finish up and write out the symbol string table (.strtab) +- section. */ +- symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr; +- /* sh_name was set in prep_headers. */ +- symstrtab_hdr->sh_type = SHT_STRTAB; +- symstrtab_hdr->sh_flags = 0; +- symstrtab_hdr->sh_addr = 0; +- symstrtab_hdr->sh_size = _bfd_stringtab_size (flinfo.symstrtab); +- symstrtab_hdr->sh_entsize = 0; +- symstrtab_hdr->sh_link = 0; +- symstrtab_hdr->sh_info = 0; +- /* sh_offset is set just below. */ +- symstrtab_hdr->sh_addralign = 1; +- +- off = _bfd_elf_assign_file_position_for_section (symstrtab_hdr, off, TRUE); +- elf_next_file_pos (abfd) = off; +- + if (bfd_get_symcount (abfd) > 0) + { ++ /* Finish up and write out the symbol string table (.strtab) ++ section. */ ++ Elf_Internal_Shdr *symstrtab_hdr; ++ ++ symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr; ++ /* sh_name was set in prep_headers. */ ++ symstrtab_hdr->sh_type = SHT_STRTAB; ++ symstrtab_hdr->sh_flags = 0; ++ symstrtab_hdr->sh_addr = 0; ++ symstrtab_hdr->sh_size = _bfd_stringtab_size (flinfo.symstrtab); ++ symstrtab_hdr->sh_entsize = 0; ++ symstrtab_hdr->sh_link = 0; ++ symstrtab_hdr->sh_info = 0; ++ /* sh_offset is set just below. */ ++ symstrtab_hdr->sh_addralign = 1; ++ ++ off = _bfd_elf_assign_file_position_for_section (symstrtab_hdr, ++ off, TRUE); ++ elf_next_file_pos (abfd) = off; ++ + if (bfd_seek (abfd, symstrtab_hdr->sh_offset, SEEK_SET) != 0 + || ! _bfd_stringtab_emit (abfd, flinfo.symstrtab)) + return FALSE; +diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c +index 0879db9..9939fcf 100644 +--- a/bfd/elfnn-aarch64.c ++++ b/bfd/elfnn-aarch64.c +@@ -4329,7 +4329,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, + memset (&outrel, 0, sizeof outrel); + else if (h != NULL + && h->dynindx != -1 +- && (!info->shared || !info->symbolic || !h->def_regular)) ++ && (!info->shared || !SYMBOLIC_BIND (info, h) || !h->def_regular)) + outrel.r_info = ELFNN_R_INFO (h->dynindx, r_type); + else + { +diff --git a/bfd/version.h b/bfd/version.h +index c806928..8a10575 100644 +--- a/bfd/version.h ++++ b/bfd/version.h +@@ -1,4 +1,4 @@ +-#define BFD_VERSION_DATE 20141223 ++#define BFD_VERSION_DATE 20150207 + #define BFD_VERSION @bfd_version@ + #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ + #define REPORT_BUGS_TO @report_bugs_to@ +diff --git a/bfd/version.m4 b/bfd/version.m4 +index 4c966bc..57a10f8 100644 +--- a/bfd/version.m4 ++++ b/bfd/version.m4 +@@ -1 +1 @@ +-m4_define([BFD_VERSION], [2.25]) ++m4_define([BFD_VERSION], [2.25.0]) +diff --git a/binutils/ChangeLog b/binutils/ChangeLog +index db0941d..f26c706 100644 +--- a/binutils/ChangeLog ++++ b/binutils/ChangeLog +@@ -2,6 +2,10 @@ + + * configure: Regenerate. + ++2014-12-23 Tristan Gingold ++ ++ * configure: Regenerate. ++ + 2014-11-17 Nick Clifton + + Apply trunk patches: +diff --git a/binutils/configure b/binutils/configure +index b31248f..7c5b074 100755 +--- a/binutils/configure ++++ b/binutils/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for binutils 2.25. ++# Generated by GNU Autoconf 2.64 for binutils 2.25.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +@@ -556,8 +556,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='binutils' + PACKAGE_TARNAME='binutils' +-PACKAGE_VERSION='2.25' +-PACKAGE_STRING='binutils 2.25' ++PACKAGE_VERSION='2.25.0' ++PACKAGE_STRING='binutils 2.25.0' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1333,7 +1333,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 binutils 2.25 to adapt to many kinds of systems. ++\`configure' configures binutils 2.25.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1404,7 +1404,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of binutils 2.25:";; ++ short | recursive ) echo "Configuration of binutils 2.25.0:";; + esac + cat <<\_ACEOF + +@@ -1525,7 +1525,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-binutils configure 2.25 ++binutils configure 2.25.0 + generated by GNU Autoconf 2.64 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -1935,7 +1935,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 binutils $as_me 2.25, which was ++It was created by binutils $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ +@@ -3743,7 +3743,7 @@ fi + + # Define the identity of the package. + PACKAGE='binutils' +- VERSION='2.25' ++ VERSION='2.25.0' + + + cat >>confdefs.h <<_ACEOF +@@ -14850,7 +14850,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 binutils $as_me 2.25, which was ++This file was extended by binutils $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -14914,7 +14914,7 @@ Report bugs to the package provider." + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ +-binutils config.status 2.25 ++binutils config.status 2.25.0 + configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +diff --git a/gas/ChangeLog b/gas/ChangeLog +index de5e997..b4f0eea 100644 +--- a/gas/ChangeLog ++++ b/gas/ChangeLog +@@ -1,3 +1,12 @@ ++2015-01-28 Matthew Wahab ++ ++ * config/tc-arm.c (parse_ifimm_zero): Accept #0x0 as a synonym for #0, ++ restoring previous behaviour. ++ ++2014-12-23 Tristan Gingold ++ ++ * configure: Regenerate. ++ + 2014-12-23 Tristan Gingold + + * configure: Regenerate. +diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c +index 5077f87..2db6c2d 100644 +--- a/gas/config/tc-arm.c ++++ b/gas/config/tc-arm.c +@@ -4959,6 +4959,16 @@ parse_ifimm_zero (char **in) + return FALSE; + + ++*in; ++ ++ /* Accept #0x0 as a synonym for #0. */ ++ if (strncmp (*in, "0x", 2) == 0) ++ { ++ int val; ++ if (parse_immediate (in, &val, 0, 0, TRUE) == FAIL) ++ return FALSE; ++ return TRUE; ++ } ++ + error_code = atof_generic (in, ".", EXP_CHARS, + &generic_floating_point_number); + +diff --git a/gas/configure b/gas/configure +index 76b5f20..e9ba550 100755 +--- a/gas/configure ++++ b/gas/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for gas 2.25. ++# Generated by GNU Autoconf 2.64 for gas 2.25.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +@@ -556,8 +556,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='gas' + PACKAGE_TARNAME='gas' +-PACKAGE_VERSION='2.25' +-PACKAGE_STRING='gas 2.25' ++PACKAGE_VERSION='2.25.0' ++PACKAGE_STRING='gas 2.25.0' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1320,7 +1320,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 gas 2.25 to adapt to many kinds of systems. ++\`configure' configures gas 2.25.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1391,7 +1391,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of gas 2.25:";; ++ short | recursive ) echo "Configuration of gas 2.25.0:";; + esac + cat <<\_ACEOF + +@@ -1505,7 +1505,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-gas configure 2.25 ++gas configure 2.25.0 + generated by GNU Autoconf 2.64 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -1915,7 +1915,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 gas $as_me 2.25, which was ++It was created by gas $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ +@@ -3723,7 +3723,7 @@ fi + + # Define the identity of the package. + PACKAGE='gas' +- VERSION='2.25' ++ VERSION='2.25.0' + + + cat >>confdefs.h <<_ACEOF +@@ -15061,7 +15061,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 gas $as_me 2.25, which was ++This file was extended by gas $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -15125,7 +15125,7 @@ Report bugs to the package provider." + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ +-gas config.status 2.25 ++gas config.status 2.25.0 + configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog +index d53d518..cea61aa 100644 +--- a/gas/testsuite/ChangeLog ++++ b/gas/testsuite/ChangeLog +@@ -1,3 +1,9 @@ ++2015-01-28 Matthew Fortune ++ ++ * gas/arm/ual-vcmp.s: Add vcmp, vcmpe with #0x0 operand. ++ * gas/ual/vcmp.d: Update expected output. ++ * gas/ual/vcmp-zero-bad.l: Likewise ++ + 2014-12-19 Matthew Fortune + + * gas/mips/r6-64.s: Remove .align directives from LDPC +diff --git a/gas/testsuite/gas/arm/ual-vcmp.d b/gas/testsuite/gas/arm/ual-vcmp.d +index 2e9fb3d..5b1b6ce 100644 +--- a/gas/testsuite/gas/arm/ual-vcmp.d ++++ b/gas/testsuite/gas/arm/ual-vcmp.d +@@ -14,11 +14,15 @@ Disassembly of section .text: + 0+014 <[^>]*> eeb53a40 vcmp.f32 s6, #0.0 + 0+018 <[^>]*> eef53ac0 vcmpe.f32 s7, #0.0 + 0+01c <[^>]*> eeb54ac0 vcmpe.f32 s8, #0.0 +-0+020 <[^>]*> eeb50b40 vcmp.f64 d0, #0.0 +-0+024 <[^>]*> eeb51b40 vcmp.f64 d1, #0.0 +-0+028 <[^>]*> eeb52bc0 vcmpe.f64 d2, #0.0 +-0+02c <[^>]*> eeb53bc0 vcmpe.f64 d3, #0.0 +-0+030 <[^>]*> eeb54b40 vcmp.f64 d4, #0.0 +-0+034 <[^>]*> eeb55b40 vcmp.f64 d5, #0.0 +-0+038 <[^>]*> eeb56bc0 vcmpe.f64 d6, #0.0 +-0+03c <[^>]*> eeb57bc0 vcmpe.f64 d7, #0.0 +\ No newline at end of file ++0+020 <[^>]*> eef54a40 vcmp.f32 s9, #0.0 ++0+024 <[^>]*> eeb55ac0 vcmpe.f32 s10, #0.0 ++0+028 <[^>]*> eeb50b40 vcmp.f64 d0, #0.0 ++0+02c <[^>]*> eeb51b40 vcmp.f64 d1, #0.0 ++0+030 <[^>]*> eeb52bc0 vcmpe.f64 d2, #0.0 ++0+034 <[^>]*> eeb53bc0 vcmpe.f64 d3, #0.0 ++0+038 <[^>]*> eeb54b40 vcmp.f64 d4, #0.0 ++0+03c <[^>]*> eeb55b40 vcmp.f64 d5, #0.0 ++0+040 <[^>]*> eeb56bc0 vcmpe.f64 d6, #0.0 ++0+044 <[^>]*> eeb57bc0 vcmpe.f64 d7, #0.0 ++0+048 <[^>]*> eeb58b40 vcmp.f64 d8, #0.0 ++0+04c <[^>]*> eeb59bc0 vcmpe.f64 d9, #0.0 +\ No newline at end of file +diff --git a/gas/testsuite/gas/arm/ual-vcmp.s b/gas/testsuite/gas/arm/ual-vcmp.s +index 79efa4e..1b9ffa6 100644 +--- a/gas/testsuite/gas/arm/ual-vcmp.s ++++ b/gas/testsuite/gas/arm/ual-vcmp.s +@@ -10,6 +10,8 @@ vcmp.f32 s5, #0.0e2 + vcmp.f32 s6, #0e-3 + vcmpe.f32 s7, #0.0000 + vcmpe.f32 s8, #.0 ++vcmp.f32 s9, #0x0 ++vcmpe.f32 s10, #0x0 + + vcmp.f64 d0, #0.0 + vcmp.f64 d1, #0 +@@ -19,3 +21,5 @@ vcmp.f64 d4, #0.0e5 + vcmp.f64 d5, #0e-2 + vcmpe.f64 d6, #0.00 + vcmpe.f64 d7, #.0 ++vcmp.f64 d8, #0x0 ++vcmpe.f64 d9, #0x0 +diff --git a/gas/testsuite/gas/arm/vcmp-zero-bad.l b/gas/testsuite/gas/arm/vcmp-zero-bad.l +index 975d02b..bce8e4a 100644 +--- a/gas/testsuite/gas/arm/vcmp-zero-bad.l ++++ b/gas/testsuite/gas/arm/vcmp-zero-bad.l +@@ -4,5 +4,5 @@ + [^:]*:7: Error: only floating point zero is allowed as immediate value -- `vcmpe.f32 s3,5' + [^:]*:8: Error: only floating point zero is allowed as immediate value -- `vcmpe.f32 s4,#-0.0' + [^:]*:10: Error: only floating point zero is allowed as immediate value -- `vcmp.f64 d0,#-1' +-[^:]*:11: Error: garbage following instruction -- `vcmpe.f64 d3,#0x35' ++[^:]*:11: Error: only floating point zero is allowed as immediate value -- `vcmpe.f64 d3,#0x35' + [^:]*:12: Error: only floating point zero is allowed as immediate value -- `vcmpe.f64 d4,0xf' +diff --git a/gold/ChangeLog b/gold/ChangeLog +index 2220da2..f10d114 100644 +--- a/gold/ChangeLog ++++ b/gold/ChangeLog +@@ -1,3 +1,36 @@ ++2015-01-06 H.J. Lu ++ Cary Coutant ++ ++ PR gold/17729 ++ * configure.ac (DEFAULT_TARGET_X86_64): Don't set for x32. ++ (DEFAULT_TARGET_X32): Set for x32. ++ * x86_64.cc (cmp_insn_32): New. ++ (lea_r10_insn_32): Likewise. ++ (lea_r11_insn_32): Likewise. ++ (cmp_insn_64): Likewise. ++ (lea_r10_insn_64): Likewise. ++ (lea_r11_insn_64): Likewise. ++ (Target_x86_64::do_calls_non_split): Handle x32. ++ * testsuite/Makefile.am (check_SCRIPTS): Add split_x32.sh. ++ (check_DATA): Add split_x32 files. ++ (split_x32_[1234n].o): New targets. ++ (split_x32_[124]): New targets. ++ (split_x32_[1234r].stdout): New targets. ++ * testsuite/split_x32.sh: New file. ++ * testsuite/split_x32_1.s: Likewise. ++ * testsuite/split_x32_2.s: Likewise. ++ * testsuite/split_x32_3.s: Likewise. ++ * testsuite/split_x32_4.s: Likewise. ++ * testsuite/split_x32_n.s: Likewise. ++ * configure: Regenerated. ++ * testsuite/Makefile.in: Likewise. ++ ++2015-01-06 H.J. Lu ++ ++ PR gold/17809 ++ * x86_64.cc (Target_x86_64::Relocate::tls_ie_to_le): Handle ++ x32. ++ + 2014-12-04 Alan Modra + + * Powerpc.cc (Target_powerpc::Branch_info::make_stub): Ignore +diff --git a/gold/configure b/gold/configure +index 7d7b849..23e4735 100755 +--- a/gold/configure ++++ b/gold/configure +@@ -688,6 +688,8 @@ DEFAULT_TARGET_MIPS_FALSE + DEFAULT_TARGET_MIPS_TRUE + DEFAULT_TARGET_TILEGX_FALSE + DEFAULT_TARGET_TILEGX_TRUE ++DEFAULT_TARGET_X32_FALSE ++DEFAULT_TARGET_X32_TRUE + DEFAULT_TARGET_X86_64_FALSE + DEFAULT_TARGET_X86_64_TRUE + DEFAULT_TARGET_SPARC_FALSE +@@ -3475,7 +3477,19 @@ else + DEFAULT_TARGET_SPARC_FALSE= + fi + +- if test "$targ_obj" = "x86_64"; then ++ target_x86_64=no ++ target_x32=no ++ if test "$targ_obj" = "x86_64"; then ++ case "$target" in ++ x86_64*-linux-gnux32) ++ target_x32=yes ++ ;; ++ *) ++ target_x86_64=yes ++ ;; ++ esac ++ fi ++ if test "$target_x86_64" = "yes"; then + DEFAULT_TARGET_X86_64_TRUE= + DEFAULT_TARGET_X86_64_FALSE='#' + else +@@ -3483,6 +3497,14 @@ else + DEFAULT_TARGET_X86_64_FALSE= + fi + ++ if test "$target_x32" = "yes"; then ++ DEFAULT_TARGET_X32_TRUE= ++ DEFAULT_TARGET_X32_FALSE='#' ++else ++ DEFAULT_TARGET_X32_TRUE='#' ++ DEFAULT_TARGET_X32_FALSE= ++fi ++ + if test "$targ_obj" = "tilegx"; then + DEFAULT_TARGET_TILEGX_TRUE= + DEFAULT_TARGET_TILEGX_FALSE='#' +@@ -7811,6 +7833,10 @@ if test -z "${DEFAULT_TARGET_X86_64_TRUE}" && test -z "${DEFAULT_TARGET_X86_64_F + as_fn_error "conditional \"DEFAULT_TARGET_X86_64\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${DEFAULT_TARGET_X32_TRUE}" && test -z "${DEFAULT_TARGET_X32_FALSE}"; then ++ as_fn_error "conditional \"DEFAULT_TARGET_X32\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${DEFAULT_TARGET_TILEGX_TRUE}" && test -z "${DEFAULT_TARGET_TILEGX_FALSE}"; then + as_fn_error "conditional \"DEFAULT_TARGET_TILEGX\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +diff --git a/gold/configure.ac b/gold/configure.ac +index 0478011..64e603a 100644 +--- a/gold/configure.ac ++++ b/gold/configure.ac +@@ -204,7 +204,20 @@ for targ in $target $canon_targets; do + AM_CONDITIONAL(DEFAULT_TARGET_I386, test "$targ_obj" = "i386") + AM_CONDITIONAL(DEFAULT_TARGET_POWERPC, test "$targ_obj" = "powerpc") + AM_CONDITIONAL(DEFAULT_TARGET_SPARC, test "$targ_obj" = "sparc") +- AM_CONDITIONAL(DEFAULT_TARGET_X86_64, test "$targ_obj" = "x86_64") ++ target_x86_64=no ++ target_x32=no ++ if test "$targ_obj" = "x86_64"; then ++ case "$target" in ++ x86_64*-linux-gnux32) ++ target_x32=yes ++ ;; ++ *) ++ target_x86_64=yes ++ ;; ++ esac ++ fi ++ AM_CONDITIONAL(DEFAULT_TARGET_X86_64, test "$target_x86_64" = "yes") ++ AM_CONDITIONAL(DEFAULT_TARGET_X32, test "$target_x32" = "yes") + AM_CONDITIONAL(DEFAULT_TARGET_TILEGX, test "$targ_obj" = "tilegx") + AM_CONDITIONAL(DEFAULT_TARGET_MIPS, test "$targ_obj" = "mips") + DEFAULT_TARGET=${targ_obj} +diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am +index 35cd013..e015a3d 100644 +--- a/gold/testsuite/Makefile.am ++++ b/gold/testsuite/Makefile.am +@@ -2483,6 +2483,43 @@ MOSTLYCLEANFILES += split_x86_64_1 split_x86_64_2 split_x86_64_3 \ + + endif DEFAULT_TARGET_X86_64 + ++if DEFAULT_TARGET_X32 ++ ++check_SCRIPTS += split_x32.sh ++check_DATA += split_x32_1.stdout split_x32_2.stdout \ ++ split_x32_3.stdout split_x32_4.stdout split_x32_r.stdout ++SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 ++split_x32_1.o: split_x32_1.s ++ $(TEST_AS) -o $@ $< ++split_x32_2.o: split_x32_2.s ++ $(TEST_AS) -o $@ $< ++split_x32_3.o: split_x32_3.s ++ $(TEST_AS) -o $@ $< ++split_x32_4.o: split_x32_4.s ++ $(TEST_AS) -o $@ $< ++split_x32_n.o: split_x32_n.s ++ $(TEST_AS) -o $@ $< ++split_x32_1: split_x32_1.o split_x32_n.o ../ld-new ++ ../ld-new $(SPLIT_DEFSYMS) -o $@ split_x32_1.o split_x32_n.o ++split_x32_1.stdout: split_x32_1 ++ $(TEST_OBJDUMP) -d $< > $@ ++split_x32_2: split_x32_2.o split_x32_n.o ../ld-new ++ ../ld-new $(SPLIT_DEFSYMS) -o $@ split_x32_2.o split_x32_n.o ++split_x32_2.stdout: split_x32_2 ++ $(TEST_OBJDUMP) -d $< > $@ ++split_x32_3.stdout: split_x32_3.o split_x32_n.o ../ld-new ++ ../ld-new $(SPLIT_DEFSYMS) -o split_x32_3 split_x32_3.o split_x32_n.o > $@ 2>&1 || exit 0 ++split_x32_4: split_x32_4.o split_x32_n.o ../ld-new ++ ../ld-new $(SPLIT_DEFSYMS) -o $@ split_x32_4.o split_x32_n.o ++split_x32_4.stdout: split_x32_4 ++ $(TEST_OBJDUMP) -d $< > $@ ++split_x32_r.stdout: split_x32_1.o split_x32_n.o ../ld-new ++ ../ld-new -r split_x32_1.o split_x32_n.o -o split_x32_r > $@ 2>&1 || exit 0 ++MOSTLYCLEANFILES += split_x32_1 split_x32_2 split_x32_3 \ ++ split_x32_4 split_x32_r ++ ++endif DEFAULT_TARGET_X32 ++ + if DEFAULT_TARGET_ARM + + check_SCRIPTS += arm_abs_global.sh +diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in +index 8fbb644..befef5f 100644 +--- a/gold/testsuite/Makefile.in ++++ b/gold/testsuite/Makefile.in +@@ -623,6 +623,13 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_83 = split_x86_64_1 split_x86_64_2 split_x86_64_3 \ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x86_64_4 split_x86_64_r + ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_84 = split_x32.sh ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_85 = split_x32_1.stdout split_x32_2.stdout \ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x32_3.stdout split_x32_4.stdout split_x32_r.stdout ++ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_86 = split_x32_1 split_x32_2 split_x32_3 \ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ split_x32_4 split_x32_r ++ + + # ARM1176 workaround test. + +@@ -635,7 +642,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + # Check Thumb to Thumb farcall veneers + + # Check Thumb to ARM farcall veneers +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_84 = arm_abs_global.sh \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_87 = arm_abs_global.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_branch_in_range.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_branch_out_of_range.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_fix_v4bx.sh \ +@@ -649,7 +656,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_arm_thumb.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_thumb.sh \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_arm.sh +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_85 = arm_abs_global.stdout \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_88 = arm_abs_global.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_in_range.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_out_of_range.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ thumb_bl_in_range.stdout \ +@@ -694,7 +701,7 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_thumb_6m.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_arm.stdout \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_arm_5t.stdout +-@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_86 = arm_abs_global \ ++@DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@am__append_89 = arm_abs_global \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_in_range \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_bl_out_of_range \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ thumb_bl_in_range \ +@@ -737,10 +744,10 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_thumb_6m \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_arm \ + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ arm_farcall_thumb_arm_5t +-@DEFAULT_TARGET_X86_64_TRUE@am__append_87 = *.dwo *.dwp +-@DEFAULT_TARGET_X86_64_TRUE@am__append_88 = dwp_test_1.sh \ ++@DEFAULT_TARGET_X86_64_TRUE@am__append_90 = *.dwo *.dwp ++@DEFAULT_TARGET_X86_64_TRUE@am__append_91 = dwp_test_1.sh \ + @DEFAULT_TARGET_X86_64_TRUE@ dwp_test_2.sh +-@DEFAULT_TARGET_X86_64_TRUE@am__append_89 = dwp_test_1.stdout \ ++@DEFAULT_TARGET_X86_64_TRUE@am__append_92 = dwp_test_1.stdout \ + @DEFAULT_TARGET_X86_64_TRUE@ dwp_test_2.stdout + subdir = testsuite + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +@@ -2224,7 +2231,8 @@ MOSTLYCLEANFILES = *.so *.syms *.stdout $(am__append_4) \ + $(am__append_41) $(am__append_47) $(am__append_63) \ + $(am__append_66) $(am__append_69) $(am__append_72) \ + $(am__append_74) $(am__append_77) $(am__append_80) \ +- $(am__append_83) $(am__append_86) $(am__append_87) ++ $(am__append_83) $(am__append_86) $(am__append_89) \ ++ $(am__append_90) + + # We will add to these later, for each individual test. Note + # that we add each test under check_SCRIPTS or check_PROGRAMS; +@@ -2233,13 +2241,13 @@ check_SCRIPTS = $(am__append_2) $(am__append_34) $(am__append_38) \ + $(am__append_42) $(am__append_45) $(am__append_61) \ + $(am__append_64) $(am__append_67) $(am__append_70) \ + $(am__append_75) $(am__append_78) $(am__append_81) \ +- $(am__append_84) $(am__append_88) ++ $(am__append_84) $(am__append_87) $(am__append_91) + check_DATA = $(am__append_3) $(am__append_27) $(am__append_29) \ + $(am__append_35) $(am__append_39) $(am__append_43) \ + $(am__append_46) $(am__append_62) $(am__append_65) \ + $(am__append_68) $(am__append_71) $(am__append_76) \ + $(am__append_79) $(am__append_82) $(am__append_85) \ +- $(am__append_89) ++ $(am__append_88) $(am__append_92) + BUILT_SOURCES = $(am__append_25) + TESTS = $(check_SCRIPTS) $(check_PROGRAMS) + +@@ -2736,6 +2744,7 @@ LDADD = libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL) \ + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDFLAGS = $(exception_test_LDFLAGS) + @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@exception_x86_64_bnd_test_LDADD = exception_x86_64_bnd_1.o exception_x86_64_bnd_2.o + @DEFAULT_TARGET_I386_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@SPLIT_DEFSYMS = --defsym __morestack=0x100 --defsym __morestack_non_split=0x200 + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am +@@ -4166,6 +4175,8 @@ split_i386.sh.log: split_i386.sh + @p='split_i386.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) + split_x86_64.sh.log: split_x86_64.sh + @p='split_x86_64.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) ++split_x32.sh.log: split_x32.sh ++ @p='split_x32.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) + arm_abs_global.sh.log: arm_abs_global.sh + @p='arm_abs_global.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) + arm_branch_in_range.sh.log: arm_branch_in_range.sh +@@ -5777,6 +5788,32 @@ uninstall-am: + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -d $< > $@ + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x86_64_r.stdout: split_x86_64_1.o split_x86_64_n.o ../ld-new + @DEFAULT_TARGET_X86_64_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new -r split_x86_64_1.o split_x86_64_n.o -o split_x86_64_r > $@ 2>&1 || exit 0 ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_1.o: split_x32_1.s ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $< ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_2.o: split_x32_2.s ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $< ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_3.o: split_x32_3.s ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $< ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_4.o: split_x32_4.s ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $< ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_n.o: split_x32_n.s ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -o $@ $< ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_1: split_x32_1.o split_x32_n.o ../ld-new ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new $(SPLIT_DEFSYMS) -o $@ split_x32_1.o split_x32_n.o ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_1.stdout: split_x32_1 ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -d $< > $@ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_2: split_x32_2.o split_x32_n.o ../ld-new ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new $(SPLIT_DEFSYMS) -o $@ split_x32_2.o split_x32_n.o ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_2.stdout: split_x32_2 ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -d $< > $@ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_3.stdout: split_x32_3.o split_x32_n.o ../ld-new ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new $(SPLIT_DEFSYMS) -o split_x32_3 split_x32_3.o split_x32_n.o > $@ 2>&1 || exit 0 ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_4: split_x32_4.o split_x32_n.o ../ld-new ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new $(SPLIT_DEFSYMS) -o $@ split_x32_4.o split_x32_n.o ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_4.stdout: split_x32_4 ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_OBJDUMP) -d $< > $@ ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@split_x32_r.stdout: split_x32_1.o split_x32_n.o ../ld-new ++@DEFAULT_TARGET_X32_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ ../ld-new -r split_x32_1.o split_x32_n.o -o split_x32_r > $@ 2>&1 || exit 0 + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@arm_abs_lib.o: arm_abs_lib.s + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ $(TEST_AS) -march=armv7-a -o $@ $< + @DEFAULT_TARGET_ARM_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@libarm_abs.so: arm_abs_lib.o ../ld-new +diff --git a/gold/testsuite/split_x32.sh b/gold/testsuite/split_x32.sh +new file mode 100755 +index 0000000..0bc0cf3 +--- /dev/null ++++ b/gold/testsuite/split_x32.sh +@@ -0,0 +1,55 @@ ++#!/bin/sh ++ ++# split_x32.sh -- test -fstack-split for x32 ++ ++# Copyright (C) 2014 Free Software Foundation, Inc. ++# Written by Ian Lance Taylor . ++# Modified by H.J. Lu . ++ ++# This file is part of gold. ++ ++# 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, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++# MA 02110-1301, USA. ++ ++match() ++{ ++ if ! egrep "$1" "$2" >/dev/null 2>&1; then ++ echo 1>&2 "could not find '$1' in $2" ++ exit 1 ++ fi ++} ++ ++nomatch() ++{ ++ if egrep "$1" "$2" >/dev/null 2>&1; then ++ echo 1>&2 "found unexpected '$1' in $2" ++ exit 1 ++ fi ++} ++ ++match 'cmp.*+%fs:[^,]*,%esp' split_x32_1.stdout ++match 'callq.*__morestack>?$' split_x32_1.stdout ++match 'lea.*-0x200\(%rsp\),' split_x32_1.stdout ++ ++match 'stc' split_x32_2.stdout ++match 'callq.*__morestack_non_split>?$' split_x32_2.stdout ++nomatch 'callq.*__morestack>?$' split_x32_2.stdout ++match 'lea.*-0x4200\(%rsp\),' split_x32_2.stdout ++ ++match 'failed to match' split_x32_3.stdout ++ ++match 'callq.*__morestack>?$' split_x32_4.stdout ++ ++match 'cannot mix' split_x32_r.stdout +diff --git a/gold/testsuite/split_x32_1.s b/gold/testsuite/split_x32_1.s +new file mode 100644 +index 0000000..b78936e +--- /dev/null ++++ b/gold/testsuite/split_x32_1.s +@@ -0,0 +1,33 @@ ++# split_x32_1.s: x32 specific test case for -fsplit-stack. ++ ++ .text ++ ++ .global fn1 ++ .type fn1,@function ++fn1: ++ cmp %fs:0x40,%esp ++ jae 1f ++ callq __morestack ++ retq ++1: ++ callq fn2 ++ retq ++ ++ .size fn1,. - fn1 ++ ++ .global fn2 ++ .type fn2,@function ++fn2: ++ lea -0x200(%rsp),%r10d ++ cmp %fs:0x40,%r10d ++ jae 1f ++ callq __morestack ++ retq ++1: ++ callq fn1 ++ retq ++ ++ .size fn2,. - fn2 ++ ++ .section .note.GNU-stack,"",@progbits ++ .section .note.GNU-split-stack,"",@progbits +diff --git a/gold/testsuite/split_x32_2.s b/gold/testsuite/split_x32_2.s +new file mode 100644 +index 0000000..b789afd +--- /dev/null ++++ b/gold/testsuite/split_x32_2.s +@@ -0,0 +1,33 @@ ++# split_x32_2.s: x32 specific, -fsplit-stack calling non-split ++ ++ .text ++ ++ .global fn1 ++ .type fn1,@function ++fn1: ++ cmp %fs:0x40,%esp ++ jae 1f ++ callq __morestack ++ retq ++1: ++ callq fn3 ++ retq ++ ++ .size fn1,. - fn1 ++ ++ .global fn2 ++ .type fn2,@function ++fn2: ++ lea -0x200(%rsp),%r10d ++ cmp %fs:0x40,%r10d ++ jae 1f ++ callq __morestack ++ retq ++1: ++ callq fn3 ++ retq ++ ++ .size fn2,. - fn2 ++ ++ .section .note.GNU-stack,"",@progbits ++ .section .note.GNU-split-stack,"",@progbits +diff --git a/gold/testsuite/split_x32_3.s b/gold/testsuite/split_x32_3.s +new file mode 100644 +index 0000000..d7b09bd +--- /dev/null ++++ b/gold/testsuite/split_x32_3.s +@@ -0,0 +1,22 @@ ++# split_x32_3.s: x32 specific, adjustment failure ++ ++ .text ++ ++ .global fn1 ++ .type fn1,@function ++fn1: ++ push %rbp ++ mov %esp,%ebp ++ cmp %fs:0x40,%esp ++ jae 1f ++ callq __morestack ++ retq ++1: ++ callq fn3 ++ leaveq ++ retq ++ ++ .size fn1,. - fn1 ++ ++ .section .note.GNU-stack,"",@progbits ++ .section .note.GNU-split-stack,"",@progbits +diff --git a/gold/testsuite/split_x32_4.s b/gold/testsuite/split_x32_4.s +new file mode 100644 +index 0000000..1f4eece +--- /dev/null ++++ b/gold/testsuite/split_x32_4.s +@@ -0,0 +1,23 @@ ++# split_x32_4.s: x32 specific, permitted adjustment failure ++ ++ .text ++ ++ .global fn1 ++ .type fn1,@function ++fn1: ++ push %rbp ++ mov %esp,%ebp ++ cmp %fs:0x40,%esp ++ jae 1f ++ callq __morestack ++ retq ++1: ++ callq fn3 ++ leaveq ++ retq ++ ++ .size fn1,. - fn1 ++ ++ .section .note.GNU-stack,"",@progbits ++ .section .note.GNU-split-stack,"",@progbits ++ .section .note.GNU-no-split-stack,"",@progbits +diff --git a/gold/testsuite/split_x32_n.s b/gold/testsuite/split_x32_n.s +new file mode 100644 +index 0000000..54c0db6 +--- /dev/null ++++ b/gold/testsuite/split_x32_n.s +@@ -0,0 +1,12 @@ ++# split_x32_n.s: x32 specific, -fsplit-stack calling non-split ++ ++ .text ++ ++ .global fn3 ++ .type fn3,@function ++fn3: ++ retq ++ ++ .size fn3,. - fn3 ++ ++ .section .note.GNU-stack,"",@progbits +diff --git a/gold/x86_64.cc b/gold/x86_64.cc +index f58c843..10c75a2 100644 +--- a/gold/x86_64.cc ++++ b/gold/x86_64.cc +@@ -4100,6 +4100,8 @@ Target_x86_64::Relocate::tls_ie_to_le( + // movq + if (op1 == 0x4c) + view[-3] = 0x49; ++ else if (size == 32 && op1 == 0x44) ++ view[-3] = 0x41; + view[-2] = 0xc7; + view[-1] = 0xc0 | reg; + } +@@ -4108,6 +4110,8 @@ Target_x86_64::Relocate::tls_ie_to_le( + // Special handling for %rsp. + if (op1 == 0x4c) + view[-3] = 0x49; ++ else if (size == 32 && op1 == 0x44) ++ view[-3] = 0x41; + view[-2] = 0x81; + view[-1] = 0xc0 | reg; + } +@@ -4116,6 +4120,8 @@ Target_x86_64::Relocate::tls_ie_to_le( + // addq + if (op1 == 0x4c) + view[-3] = 0x4d; ++ else if (size == 32 && op1 == 0x44) ++ view[-3] = 0x45; + view[-2] = 0x8d; + view[-1] = 0x80 | reg | (reg << 3); + } +@@ -4457,6 +4463,14 @@ Target_x86_64::do_ehframe_datarel_base() const + // code. We have to change the function so that it always ensures + // that it has enough stack space to run some random function. + ++static const unsigned char cmp_insn_32[] = { 0x64, 0x3b, 0x24, 0x25 }; ++static const unsigned char lea_r10_insn_32[] = { 0x44, 0x8d, 0x94, 0x24 }; ++static const unsigned char lea_r11_insn_32[] = { 0x44, 0x8d, 0x9c, 0x24 }; ++ ++static const unsigned char cmp_insn_64[] = { 0x64, 0x48, 0x3b, 0x24, 0x25 }; ++static const unsigned char lea_r10_insn_64[] = { 0x4c, 0x8d, 0x94, 0x24 }; ++static const unsigned char lea_r11_insn_64[] = { 0x4c, 0x8d, 0x9c, 0x24 }; ++ + template + void + Target_x86_64::do_calls_non_split(Relobj* object, unsigned int shndx, +@@ -4467,25 +4481,40 @@ Target_x86_64::do_calls_non_split(Relobj* object, unsigned int shndx, + std::string* from, + std::string* to) const + { ++ const char* const cmp_insn = reinterpret_cast ++ (size == 32 ? cmp_insn_32 : cmp_insn_64); ++ const char* const lea_r10_insn = reinterpret_cast ++ (size == 32 ? lea_r10_insn_32 : lea_r10_insn_64); ++ const char* const lea_r11_insn = reinterpret_cast ++ (size == 32 ? lea_r11_insn_32 : lea_r11_insn_64); ++ ++ const size_t cmp_insn_len = ++ (size == 32 ? sizeof(cmp_insn_32) : sizeof(cmp_insn_64)); ++ const size_t lea_r10_insn_len = ++ (size == 32 ? sizeof(lea_r10_insn_32) : sizeof(lea_r10_insn_64)); ++ const size_t lea_r11_insn_len = ++ (size == 32 ? sizeof(lea_r11_insn_32) : sizeof(lea_r11_insn_64)); ++ const size_t nop_len = (size == 32 ? 7 : 8); ++ + // The function starts with a comparison of the stack pointer and a + // field in the TCB. This is followed by a jump. + + // cmp %fs:NN,%rsp +- if (this->match_view(view, view_size, fnoffset, "\x64\x48\x3b\x24\x25", 5) +- && fnsize > 9) ++ if (this->match_view(view, view_size, fnoffset, cmp_insn, cmp_insn_len) ++ && fnsize > nop_len + 1) + { + // We will call __morestack if the carry flag is set after this + // comparison. We turn the comparison into an stc instruction + // and some nops. + view[fnoffset] = '\xf9'; +- this->set_view_to_nop(view, view_size, fnoffset + 1, 8); ++ this->set_view_to_nop(view, view_size, fnoffset + 1, nop_len); + } + // lea NN(%rsp),%r10 + // lea NN(%rsp),%r11 + else if ((this->match_view(view, view_size, fnoffset, +- "\x4c\x8d\x94\x24", 4) ++ lea_r10_insn, lea_r10_insn_len) + || this->match_view(view, view_size, fnoffset, +- "\x4c\x8d\x9c\x24", 4)) ++ lea_r11_insn, lea_r11_insn_len)) + && fnsize > 8) + { + // This is loading an offset from the stack pointer for a +diff --git a/gprof/ChangeLog b/gprof/ChangeLog +index 866eb0d..af2ce55 100644 +--- a/gprof/ChangeLog ++++ b/gprof/ChangeLog +@@ -2,6 +2,10 @@ + + * configure: Regenerate. + ++2014-12-23 Tristan Gingold ++ ++ * configure: Regenerate. ++ + 2014-11-03 Nick Clifton + + * po/fi.po: Updated Finnish translation. +diff --git a/gprof/configure b/gprof/configure +index a6f7ac7..b09c8fb 100755 +--- a/gprof/configure ++++ b/gprof/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for gprof 2.25. ++# Generated by GNU Autoconf 2.64 for gprof 2.25.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +@@ -556,8 +556,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='gprof' + PACKAGE_TARNAME='gprof' +-PACKAGE_VERSION='2.25' +-PACKAGE_STRING='gprof 2.25' ++PACKAGE_VERSION='2.25.0' ++PACKAGE_STRING='gprof 2.25.0' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1299,7 +1299,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 gprof 2.25 to adapt to many kinds of systems. ++\`configure' configures gprof 2.25.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1370,7 +1370,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of gprof 2.25:";; ++ short | recursive ) echo "Configuration of gprof 2.25.0:";; + esac + cat <<\_ACEOF + +@@ -1476,7 +1476,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-gprof configure 2.25 ++gprof configure 2.25.0 + generated by GNU Autoconf 2.64 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -1841,7 +1841,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 gprof $as_me 2.25, which was ++It was created by gprof $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ +@@ -3649,7 +3649,7 @@ fi + + # Define the identity of the package. + PACKAGE='gprof' +- VERSION='2.25' ++ VERSION='2.25.0' + + + cat >>confdefs.h <<_ACEOF +@@ -12706,7 +12706,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 gprof $as_me 2.25, which was ++This file was extended by gprof $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -12770,7 +12770,7 @@ Report bugs to the package provider." + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ +-gprof config.status 2.25 ++gprof config.status 2.25.0 + configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +diff --git a/ld/ChangeLog b/ld/ChangeLog +index 28dd353..3a6e3c3 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -2,6 +2,10 @@ + + * configure: Regenerate. + ++2014-12-23 Tristan Gingold ++ ++ * configure: Regenerate. ++ + 2014-11-24 Alan Modra + + * ld.texinfo: Correct --plt-align documentation. +diff --git a/ld/configure b/ld/configure +index 66d8024..4408b0d 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for ld 2.25. ++# Generated by GNU Autoconf 2.64 for ld 2.25.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +@@ -556,8 +556,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='ld' + PACKAGE_TARNAME='ld' +-PACKAGE_VERSION='2.25' +-PACKAGE_STRING='ld 2.25' ++PACKAGE_VERSION='2.25.0' ++PACKAGE_STRING='ld 2.25.0' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1347,7 +1347,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 ld 2.25 to adapt to many kinds of systems. ++\`configure' configures ld 2.25.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1418,7 +1418,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of ld 2.25:";; ++ short | recursive ) echo "Configuration of ld 2.25.0:";; + esac + cat <<\_ACEOF + +@@ -1541,7 +1541,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-ld configure 2.25 ++ld configure 2.25.0 + generated by GNU Autoconf 2.64 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -2250,7 +2250,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 ld $as_me 2.25, which was ++It was created by ld $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ +@@ -4059,7 +4059,7 @@ fi + + # Define the identity of the package. + PACKAGE='ld' +- VERSION='2.25' ++ VERSION='2.25.0' + + + cat >>confdefs.h <<_ACEOF +@@ -17594,7 +17594,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 ld $as_me 2.25, which was ++This file was extended by ld $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -17658,7 +17658,7 @@ Report bugs to the package provider." + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ +-ld config.status 2.25 ++ld config.status 2.25.0 + configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog +index f0344fd..1b1d935 100644 +--- a/ld/testsuite/ChangeLog ++++ b/ld/testsuite/ChangeLog +@@ -1,3 +1,29 @@ ++2015-01-22 Thomas Preud'homme ++ ++ Backport from mainline ++ 2015-01-13 Thomas Preud'homme ++ ++ * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use SYMBOLIC_BIND ++ to check if a symbol should be bound symbolically. ++ ++2015-01-11 H.J. Lu ++ ++ PR ld/17827 ++ * ld-x86-64/pr17689.out: Updated. ++ * ld-x86-64/pr17689b.S: Likewise. ++ ++ * ld-x86-64/pr17827.rd: New file. ++ ++ * ld-x86-64/x86-64.exp: Run PR ld/17827 test. ++ ++2015-01-05 H.J. Lu ++ ++ PR ld/17773 ++ * ld-elf/binutils.exp (binutils_test): Add an optional ++ readelf_options. Replace -l with $readelf_options. Add a ++ gap test. ++ * ld/testsuite/ld-elf/gap.s: New file. ++ + 2014-12-19 Matthew Fortune + + * ld-mips-elf/attr-gnu-4-00.d: Relax check for ISA extension. +diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp +index a75e070..c0bd39a 100644 +--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp ++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp +@@ -175,6 +175,7 @@ run_dump_test "ifunc-21" + run_dump_test "ifunc-22" + + run_dump_test "relasz" ++run_dump_test "relocs-257-symbolic-func" + + set aarch64elflinktests { + {"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s} +diff --git a/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.d b/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.d +new file mode 100644 +index 0000000..810fd43 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.d +@@ -0,0 +1,5 @@ ++#source: relocs-257-symbolic-func.s ++#ld: -shared -Bsymbolic-functions ++#readelf: -r --wide ++#... ++.* +R_AARCH64_RELATIVE +.* +diff --git a/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.s b/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.s +new file mode 100644 +index 0000000..35d5ba8 +--- /dev/null ++++ b/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.s +@@ -0,0 +1,11 @@ ++ .text ++ .global tempy ++ .type tempy, %function ++tempy: ++ .size tempy, .-tempy ++ .section .data.rel ++ .align 3 ++ .type tempy_ptr, %object ++ .size tempy_ptr, 8 ++tempy_ptr: ++ .xword tempy +diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp +index 4ade8cb..37ab6b3 100644 +--- a/ld/testsuite/ld-elf/binutils.exp ++++ b/ld/testsuite/ld-elf/binutils.exp +@@ -38,8 +38,9 @@ if { [istarget *-*-linux*aout*] + # to hardwire the test name. This is important if ld_options contains + # absolute path names because the default test name is constructed + # from the prog_name and ld_options and we do not want absolute paths +-# to appear in the test_name. +-proc binutils_test { prog_name ld_options test {test_name ""}} { ++# to appear in the test_name. The optional readelf_options can be ++# used to specify different options for readelf. ++proc binutils_test { prog_name ld_options test {test_name ""} {readelf_options "-l"}} { + global as + global ld + global READELF +@@ -71,8 +72,8 @@ proc binutils_test { prog_name ld_options test {test_name ""}} { + return + } + +- send_log "$READELF -l --wide tmpdir/$test > tmpdir/$test.exp\n" +- set got [remote_exec host "$READELF -l --wide tmpdir/$test" "" "/dev/null" "tmpdir/$test.exp"] ++ send_log "$READELF $readelf_options --wide tmpdir/$test > tmpdir/$test.exp\n" ++ set got [remote_exec host "$READELF $readelf_options --wide tmpdir/$test" "" "/dev/null" "tmpdir/$test.exp"] + if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { + send_log "$got\n" + unresolved "$test_name" +@@ -111,8 +112,8 @@ proc binutils_test { prog_name ld_options test {test_name ""}} { + return + } + +- send_log "$READELF -l --wide tmpdir/$test > tmpdir/$test.out\n" +- set got [remote_exec host "$READELF -l --wide tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"] ++ send_log "$READELF $readelf_options --wide tmpdir/$test > tmpdir/$test.out\n" ++ set got [remote_exec host "$READELF $readelf_options --wide tmpdir/$test" "" "/dev/null" "tmpdir/$test.out"] + if { [lindex $got 0] != 0 || ![string match "" [lindex $got 1]] } then { + send_log "$got\n" + unresolved "$test_name" +@@ -176,3 +177,5 @@ foreach testitem $tls_tests { + binutils_test objcopy $testopt $testitem + } + } ++ ++binutils_test strip "-s" gap "" "-lS" +diff --git a/ld/testsuite/ld-elf/gap.s b/ld/testsuite/ld-elf/gap.s +new file mode 100644 +index 0000000..039d26b +--- /dev/null ++++ b/ld/testsuite/ld-elf/gap.s +@@ -0,0 +1,4 @@ ++ .text ++ .global _start ++_start: ++ .long 0 +diff --git a/ld/testsuite/ld-x86-64/pr17689.out b/ld/testsuite/ld-x86-64/pr17689.out +index 7ef22e9..38e0352 100644 +--- a/ld/testsuite/ld-x86-64/pr17689.out ++++ b/ld/testsuite/ld-x86-64/pr17689.out +@@ -1 +1,2 @@ + PASS ++PASS +diff --git a/ld/testsuite/ld-x86-64/pr17689b.S b/ld/testsuite/ld-x86-64/pr17689b.S +index c95f891..64485c7 100644 +--- a/ld/testsuite/ld-x86-64/pr17689b.S ++++ b/ld/testsuite/ld-x86-64/pr17689b.S +@@ -5,8 +5,18 @@ main: + subq $8, %rsp + movq bar_alias(%rip), %rdi + call foo@PLT ++ movq ptr(%rip), %rax ++ movq (%rax), %rdi ++ call foo@PLT + xorl %eax, %eax + addq $8, %rsp + ret + .size main, .-main ++ .globl ptr ++ .section .data.rel,"aw",@progbits ++ .align 8 ++ .type ptr, @object ++ .size ptr, 8 ++ptr: ++ .quad bar_alias + .section .note.GNU-stack,"",@progbits +diff --git a/ld/testsuite/ld-x86-64/pr17827.rd b/ld/testsuite/ld-x86-64/pr17827.rd +new file mode 100644 +index 0000000..d78ea2f +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr17827.rd +@@ -0,0 +1,4 @@ ++#failif ++#... ++[0-9a-f ]+R_X86_64_NONE.* ++#... +diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp +index 1119133..28e8108 100644 +--- a/ld/testsuite/ld-x86-64/x86-64.exp ++++ b/ld/testsuite/ld-x86-64/x86-64.exp +@@ -373,6 +373,14 @@ if { [isnative] && [which $CC] != 0 } { + {{readelf {-Wr} pr17689.rd}} \ + "pr17689" \ + ] \ ++ [list \ ++ "Build pr17827 with PIE without -fPIE" \ ++ "tmpdir/pr17689.so -pie" \ ++ "" \ ++ { pr17689b.S } \ ++ {{readelf {-Wr} pr17827.rd}} \ ++ "pr17827" \ ++ ] \ + ] + + run_ld_link_exec_tests [] [list \ +diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog +index 38de39a..e19e382 100644 +--- a/opcodes/ChangeLog ++++ b/opcodes/ChangeLog +@@ -2,6 +2,10 @@ + + * configure: Regenerate. + ++2014-12-23 Tristan Gingold ++ ++ * configure: Regenerate. ++ + 2014-12-16 Matthew Fortune + + * mips-opc.c (mips_builtin_opcodes): Add JALRC alias for +diff --git a/opcodes/configure b/opcodes/configure +index 1361ef6..c9c04ce 100755 +--- a/opcodes/configure ++++ b/opcodes/configure +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for opcodes 2.25. ++# Generated by GNU Autoconf 2.64 for opcodes 2.25.0. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +@@ -556,8 +556,8 @@ MAKEFLAGS= + # Identity of this package. + PACKAGE_NAME='opcodes' + PACKAGE_TARNAME='opcodes' +-PACKAGE_VERSION='2.25' +-PACKAGE_STRING='opcodes 2.25' ++PACKAGE_VERSION='2.25.0' ++PACKAGE_STRING='opcodes 2.25.0' + PACKAGE_BUGREPORT='' + PACKAGE_URL='' + +@@ -1319,7 +1319,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 opcodes 2.25 to adapt to many kinds of systems. ++\`configure' configures opcodes 2.25.0 to adapt to many kinds of systems. + + Usage: $0 [OPTION]... [VAR=VALUE]... + +@@ -1390,7 +1390,7 @@ fi + + if test -n "$ac_init_help"; then + case $ac_init_help in +- short | recursive ) echo "Configuration of opcodes 2.25:";; ++ short | recursive ) echo "Configuration of opcodes 2.25.0:";; + esac + cat <<\_ACEOF + +@@ -1497,7 +1497,7 @@ fi + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF +-opcodes configure 2.25 ++opcodes configure 2.25.0 + generated by GNU Autoconf 2.64 + + Copyright (C) 2009 Free Software Foundation, Inc. +@@ -1907,7 +1907,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 opcodes $as_me 2.25, which was ++It was created by opcodes $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ +@@ -3715,7 +3715,7 @@ fi + + # Define the identity of the package. + PACKAGE='opcodes' +- VERSION='2.25' ++ VERSION='2.25.0' + + + cat >>confdefs.h <<_ACEOF +@@ -13209,7 +13209,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 opcodes $as_me 2.25, which was ++This file was extended by opcodes $as_me 2.25.0, which was + generated by GNU Autoconf 2.64. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES +@@ -13273,7 +13273,7 @@ Report bugs to the package provider." + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_version="\\ +-opcodes config.status 2.25 ++opcodes config.status 2.25.0 + configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + diff --git a/system/devel/binutils/pspec.xml b/system/devel/binutils/pspec.xml index e75ef7ef..a0155180 100644 --- a/system/devel/binutils/pspec.xml +++ b/system/devel/binutils/pspec.xml @@ -11,9 +11,10 @@ app:console Assembler and linker tools Contains commands like as, ld, nm, objdump, ar, ranlib for compiling assembly code to the machine language, and for linking and manipulating the binary object files. - http://ftp.gnu.org/gnu/binutils/binutils-2.24.tar.bz2 + http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2 - binutils-2.24-lto-testsuite.patch + binutils-2.25-roundup.patch + + + glibc-32bit + @@ -43,6 +47,13 @@ + + 2015-03-09 + 2.25 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-11-28 2.24 diff --git a/system/devel/bison/pspec.xml b/system/devel/bison/pspec.xml index 8742f119..05f953f4 100644 --- a/system/devel/bison/pspec.xml +++ b/system/devel/bison/pspec.xml @@ -12,7 +12,7 @@ app:console A yacc-compatible parser generator A yacc-compatible parser generator. Once you are proficient with Bison, you can use it to develop a wide range of language parsers, from those used in simple desk calculators to complex programming languages - mirrors://gnu/bison/bison-3.0.2.tar.xz + mirrors://gnu/bison/bison-3.0.4.tar.xz m4 gettext @@ -40,6 +40,13 @@ + + 2015-03-01 + 3.0.4 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2014-09-06 3.0.2 diff --git a/system/devel/catbox/pspec.xml b/system/devel/catbox/pspec.xml index 5068892d..bd9c3785 100644 --- a/system/devel/catbox/pspec.xml +++ b/system/devel/catbox/pspec.xml @@ -13,6 +13,10 @@ Python sandboxing module catbox is a Python sandboxing module commonly used by the package management system of PiSi Linux, PiSi. https://github.com/baris/catbox/archive/catbox-1.6.1.tar.gz + + python-setuptools + python-devel + @@ -28,6 +32,13 @@ + + 2015-03-19 + 1.6.1 + Fix Buildeps. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-11 1.6.1 diff --git a/system/devel/ccache/actions.py b/system/devel/ccache/actions.py index 618768d9..0def369a 100644 --- a/system/devel/ccache/actions.py +++ b/system/devel/ccache/actions.py @@ -17,8 +17,8 @@ def setup(): def build(): autotools.make() -def check(): - autotools.make("check") +#def check(): +# autotools.make("check") def install(): autotools.install() diff --git a/system/devel/ccache/pspec.xml b/system/devel/ccache/pspec.xml index 386a1659..15f90095 100644 --- a/system/devel/ccache/pspec.xml +++ b/system/devel/ccache/pspec.xml @@ -13,6 +13,9 @@ Fast C/C++ compiler cache ccache is a compiler cache. It speeds up recompilation of C/C++ code by caching previous compiles and detecting when the same compile is being done. http://samba.org/ftp/ccache/ccache-3.2.tar.xz + + zlib-devel + diff --git a/system/devel/cloog/pspec.xml b/system/devel/cloog/pspec.xml index 1d53e61e..196abc46 100644 --- a/system/devel/cloog/pspec.xml +++ b/system/devel/cloog/pspec.xml @@ -17,6 +17,7 @@ gmp-devel ppl-devel + isl-devel cloog-0.18.1-isl-compat.patch diff --git a/system/devel/cmake/actions.py b/system/devel/cmake/actions.py index 91c52aa4..4ae7bd61 100644 --- a/system/devel/cmake/actions.py +++ b/system/devel/cmake/actions.py @@ -11,6 +11,7 @@ def setup(): autotools.rawConfigure("--parallel=%s \ --system-libs \ --no-qt-gui \ + --no-system-jsoncpp \ --prefix=/usr \ --datadir=/share/cmake \ --docdir=/share/doc/cmake \ diff --git a/system/devel/cmake/pspec.xml b/system/devel/cmake/pspec.xml index d4846c78..bcb715d6 100644 --- a/system/devel/cmake/pspec.xml +++ b/system/devel/cmake/pspec.xml @@ -12,7 +12,7 @@ app:console Cross-platform, open-source make system CMake, the cross-platform, open-source make system. CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. - http://www.cmake.org/files/v3.0/cmake-3.0.2.tar.gz + http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz curl-devel expat-devel @@ -42,6 +42,27 @@ + + 2015-04-17 + 3.2.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-04-04 + 3.2.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-02-27 + 3.1.3 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2014-12-17 3.0.2 diff --git a/system/devel/elfutils/pspec.xml b/system/devel/elfutils/pspec.xml index f174da48..92bfa43b 100644 --- a/system/devel/elfutils/pspec.xml +++ b/system/devel/elfutils/pspec.xml @@ -13,7 +13,7 @@ library Libraries/utilities to handle ELF objects elfutils contains libraries and utilities to handle ELF objects and is a replacement for libelf. - https://fedorahosted.org/releases/e/l/elfutils/0.160/elfutils-0.160.tar.bz2 + https://fedorahosted.org/releases/e/l/elfutils/0.161/elfutils-0.161.tar.bz2 bzip2 xz-devel @@ -27,6 +27,7 @@ xz zlib bzip2 + libgcc     /usr/bin @@ -37,6 +38,13 @@ + + 2015-04-09 + 0.161 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-11-23 0.160 diff --git a/system/devel/gmp/pspec.xml b/system/devel/gmp/pspec.xml index 1b256fa1..8043359f 100644 --- a/system/devel/gmp/pspec.xml +++ b/system/devel/gmp/pspec.xml @@ -44,6 +44,9 @@ emul32 32-bit shared libraries for gmp emul32 + + glibc-32bit + gmp diff --git a/system/devel/gobject-introspection/pspec.xml b/system/devel/gobject-introspection/pspec.xml index 7a027614..ea74157f 100644 --- a/system/devel/gobject-introspection/pspec.xml +++ b/system/devel/gobject-introspection/pspec.xml @@ -14,11 +14,12 @@ app:console Introspection system for GObject-based libraries gobject-introspection can scan C header and source files in order to generate introspection typelib files. It also provides an API to examine typelib files, useful for creating language bindings among other things. - mirrors://gnome/gobject-introspection/1.40/gobject-introspection-1.40.0.tar.xz + mirrors://gnome/gobject-introspection/1.44/gobject-introspection-1.44.0.tar.xz cairo-devel python-devel python-mako + glib2-devel @@ -57,6 +58,13 @@ + + 2015-04-06 + 1.44.0 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-05-11 1.40.0 diff --git a/system/devel/guile/actions.py b/system/devel/guile/actions.py index e36eb64e..75df0f70 100644 --- a/system/devel/guile/actions.py +++ b/system/devel/guile/actions.py @@ -37,5 +37,7 @@ def install(): major = ".".join(get.srcVERSION().split(".")[:2]) pisitools.dodir("/etc/env.d") shelltools.echo("%s/etc/env.d/50guile" % get.installDIR(), 'GUILE_LOAD_PATH="/usr/share/guile/%s"' % major) + + pisitools.domove("/usr/lib/libguile-2.0.so.22.7.2-gdb.scm", "/usr/share/gdb/auto-load") pisitools.dodoc("AUTHORS", "ChangeLog", "HACKING", "NEWS", "README", "THANKS") diff --git a/system/devel/guile/pspec.xml b/system/devel/guile/pspec.xml index 2b7b608b..ab6ec0bf 100644 --- a/system/devel/guile/pspec.xml +++ b/system/devel/guile/pspec.xml @@ -17,6 +17,8 @@ mirrors://gnu/guile/guile-2.0.11.tar.xz gc-devel + gettext-devel + gmp-devel @@ -30,6 +32,7 @@ libffi libtool-ltdl libunistring + readline /etc @@ -40,6 +43,7 @@ /usr/lib/lib* /usr/share/guile /usr/share/emacs + /usr/share/gdb/auto-load /usr/lib/guile/2.0 diff --git a/system/devel/isl/pspec.xml b/system/devel/isl/pspec.xml index 61524e00..2223b506 100644 --- a/system/devel/isl/pspec.xml +++ b/system/devel/isl/pspec.xml @@ -13,6 +13,9 @@ Integer Set Library isl is a library for manipulating sets and relations of integer points bounded by linear constraints. http://isl.gforge.inria.fr/isl-0.13.tar.bz2 + + gmp-devel + @@ -40,7 +43,7 @@ - 2014-09-06 + 2015-05-05 0.13 Version bump. Serdar Soytetir diff --git a/system/devel/libmpc/actions.py b/system/devel/libmpc/actions.py index 58964f02..94a8f17c 100644 --- a/system/devel/libmpc/actions.py +++ b/system/devel/libmpc/actions.py @@ -11,6 +11,9 @@ from pisi.actionsapi import get def setup(): autotools.configure() + + # for unused + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): autotools.make() diff --git a/system/devel/libmpc/pspec.xml b/system/devel/libmpc/pspec.xml index 7ba194ed..35c520f0 100644 --- a/system/devel/libmpc/pspec.xml +++ b/system/devel/libmpc/pspec.xml @@ -12,7 +12,7 @@ library High precision and correct rounding library libmpc is a library for arithmetic of complex numbers with arbitrarily high precision and correct rounding. - ftp://ftp.gnu.org/gnu/mpc/mpc-1.0.2.tar.gz + ftp://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz gmp-devel mpfr-devel @@ -44,6 +44,13 @@ + + 2015-03-08 + 1.0.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-09-06 1.0.2 diff --git a/system/devel/python-setuptools/pspec.xml b/system/devel/python-setuptools/pspec.xml index b98cfba2..208a5f6d 100644 --- a/system/devel/python-setuptools/pspec.xml +++ b/system/devel/python-setuptools/pspec.xml @@ -12,7 +12,7 @@ library Python setuptools python-setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages. - http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz + http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz @@ -25,7 +25,7 @@ - + 2014-05-11 0.6.49 Release bump. diff --git a/system/devel/quilt/pspec.xml b/system/devel/quilt/pspec.xml index 7e02740a..dfccbb90 100644 --- a/system/devel/quilt/pspec.xml +++ b/system/devel/quilt/pspec.xml @@ -12,7 +12,7 @@ app:console Scripts for working with series of patches quilt allow one to manage a series of patches by keeping track of the changes each patch makes. - http://mirror.rackdc.com/savannah/quilt/quilt-0.61.tar.gz + http://mirror.rackdc.com/savannah/quilt/quilt-0.64.tar.gz gawk gettext @@ -37,6 +37,13 @@ + + 2015-03-01 + 0.64 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2014-05-11 0.61 diff --git a/system/devel/xorg-proto/actions.py b/system/devel/xorg-proto/actions.py deleted file mode 100644 index 24b007ed..00000000 --- a/system/devel/xorg-proto/actions.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt - -from pisi.actionsapi import autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import get - -WorkDir = "." -SkipFiles = [".pc", "filelist", "patches", "pisiBuildState"] - -def setup(): - pisitools.dosed("*/Makefile.am", r"/doc/\$\(PACKAGE\)", "/doc/xorg-proto") - - for package in shelltools.ls("."): - if package in SkipFiles: - continue - shelltools.cd(package) - autotools.autoreconf("-vif") - autotools.configure("--without-xmlto --without-fop") - shelltools.cd("../") - -def build(): - for package in shelltools.ls("."): - if package in SkipFiles: - continue - shelltools.cd(package) - autotools.make() - shelltools.cd("../") - -def install(): - for package in shelltools.ls("."): - if package in SkipFiles: - continue - shelltools.cd(package) - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - shelltools.cd("../") diff --git a/system/devel/xorg-proto/files/docdir.patch b/system/devel/xorg-proto/files/docdir.patch deleted file mode 100644 index e54071a7..00000000 --- a/system/devel/xorg-proto/files/docdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: work/xproxymanagementprotocol-1.0.3/Makefile.am -=================================================================== ---- work.orig/xproxymanagementprotocol-1.0.3/Makefile.am -+++ work/xproxymanagementprotocol-1.0.3/Makefile.am -@@ -6,7 +6,8 @@ xproxymng_HEADERS = \ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = xproxymngproto.pc - --dist_doc_DATA = PM_spec -+xproxymngdocdir = $(datadir)/doc/$(PACKAGE) -+xproxymngdoc_DATA = PM_spec - - EXTRA_DIST = xproxymngproto.pc.in - diff --git a/system/devel/xorg-proto/pspec.xml b/system/devel/xorg-proto/pspec.xml deleted file mode 100644 index 5bdc3eab..00000000 --- a/system/devel/xorg-proto/pspec.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - xorg-proto - http://x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - X.Org Protocol Headers - This package includes the protocol headers needed for X11 development. - mirrors://xorg/individual/proto/bigreqsproto-1.1.2.tar.bz2 - mirrors://xorg/individual/proto/presentproto-1.0.tar.bz2 - mirrors://xorg/individual/proto/compositeproto-0.4.2.tar.bz2 - mirrors://xorg/individual/proto/damageproto-1.2.1.tar.bz2 - mirrors://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 - mirrors://xorg/individual/proto/dri2proto-2.8.tar.bz2 - mirrors://xorg/individual/proto/dri3proto-1.0.tar.bz2 - mirrors://xorg/individual/proto/fixesproto-5.0.tar.bz2 - mirrors://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 - mirrors://xorg/individual/proto/glproto-1.4.17.tar.bz2 - mirrors://xorg/individual/proto/inputproto-2.3.1.tar.bz2 - mirrors://xorg/individual/proto/kbproto-1.0.6.tar.bz2 - mirrors://xorg/individual/proto/printproto-1.0.5.tar.bz2 - mirrors://xorg/individual/proto/randrproto-1.4.0.tar.bz2 - mirrors://xorg/individual/proto/recordproto-1.14.2.tar.bz2 - mirrors://xorg/individual/proto/renderproto-0.11.1.tar.bz2 - mirrors://xorg/individual/proto/resourceproto-1.2.0.tar.bz2 - mirrors://xorg/individual/proto/scrnsaverproto-1.2.2.tar.bz2 - mirrors://xorg/individual/proto/videoproto-2.3.2.tar.bz2 - mirrors://xorg/individual/proto/xcmiscproto-1.2.2.tar.bz2 - mirrors://xorg/individual/proto/xextproto-7.3.0.tar.bz2 - mirrors://xorg/individual/proto/xf86bigfontproto-1.2.0.tar.bz2 - mirrors://xorg/individual/proto/xf86dgaproto-2.1.tar.bz2 - mirrors://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 - mirrors://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 - mirrors://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 - mirrors://xorg/individual/proto/xproto-7.0.27.tar.bz2 - mirrors://xorg/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2 - https://github.com/bbidulock/vncproto/releases/download/vncproto-1.1/vncproto-1.1.tar.bz2 - - util-macros - libXau-devel - - - docdir.patch - - - - - xorg-proto - - libXau-devel - - - /usr/include - /usr/lib/pkgconfig - /usr/share/doc - /usr/share/man/man7/Xprint.7 - - - - - - 2015-01-27 - 7.6 - Update xproto - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-09-20 - 7.6 - Update vncproto, fix dependencies. - Marcin Bojara - marcin@pisilinux.org - - - 2014-08-31 - 7.6 - Update. - Marcin Bojara - marcin@pisilinux.org - - - 2014-05-11 - 7.6 - Release bump. - Marcin Bojara - marcin@pisilinux.org - - - 2014-04-15 - 7.6 - xproto fontsproto version bump - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2014-03-07 - 7.6 - add presentproto dri3proto - Yusuf Aydemir - yusuf.aydemir@pisilinux.org - - - 2013-04-13 - 7.6 - Update: - xproto to version 7.0.24 - inputproto to version 2.3 (needed for xorg-server-0.14.0) - Marcin Bojara - marcin@pisilinux.org - - - 2012-10-15 - 7.6 - First release - Marcin Bojara - marcin@pisilinux.org - - - diff --git a/system/devel/xorg-proto/translations.xml b/system/devel/xorg-proto/translations.xml deleted file mode 100644 index 1a917dfe..00000000 --- a/system/devel/xorg-proto/translations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - xorg-proto - Entêtes de protocole de X.Org. - X.Org Protokoll Header - X.Org Protokol Başlıkları - Bu paket, X11 geliştirme için gerekli protokol başlıklarını içerir. - - diff --git a/system/devel/xtrans/pspec.xml b/system/devel/xtrans/pspec.xml index ca5171ce..a6f9d1d9 100644 --- a/system/devel/xtrans/pspec.xml +++ b/system/devel/xtrans/pspec.xml @@ -12,9 +12,9 @@ library X.Org trans library xtrans includes a number of routines to make X implementations transport-independent. - mirrors://xorg/individual/lib/xtrans-1.3.4.tar.bz2 + mirrors://xorg/individual/lib/xtrans-1.3.5.tar.bz2 - xorg-proto + util-macros @@ -31,6 +31,13 @@ + + 2015-05-05 + 1.3.5 + Version bump. + Marcin Bojara + marcin@pisilinux.org + 2014-07-11 1.3.4